mirror of
https://github.com/meshtastic/firmware.git
synced 2026-08-01 19:08:59 -04:00
beb268ff25
I thought git would be smart enough to understand all the whitespace changes but even with all the flags I know to make it ignore theses it still blows up if there are identical changes on both sides.
I have a solution but it require creating a new commit at the merge base for each conflicting PR and merging it into develop.
I don't think blowing up all PRs is worth for now, maybe if we can coordinate this for V3 let's say.
This reverts commit 0d11331d18.
29 lines
575 B
C++
29 lines
575 B
C++
#pragma once
|
|
#ifdef ARCH_PORTDUINO
|
|
|
|
#include "Adafruit_seesaw.h"
|
|
#include "InputBroker.h"
|
|
#include "concurrency/OSThread.h"
|
|
#include "configuration.h"
|
|
|
|
#define SS_SWITCH 24
|
|
#define SS_NEOPIX 6
|
|
|
|
#define SEESAW_ADDR 0x36
|
|
|
|
class SeesawRotary : public Observable<const InputEvent *>, public concurrency::OSThread
|
|
{
|
|
public:
|
|
const char *_originName;
|
|
bool init();
|
|
SeesawRotary(const char *name);
|
|
int32_t runOnce() override;
|
|
|
|
private:
|
|
Adafruit_seesaw ss;
|
|
int32_t encoder_position;
|
|
bool wasPressed = false;
|
|
};
|
|
|
|
extern SeesawRotary *seesawRotary;
|
|
#endif |