mirror of
https://github.com/meshtastic/firmware.git
synced 2025-06-18 19:12:09 +00:00
Fixup some compile errors
This commit is contained in:
parent
59ea85c85f
commit
cb7370e073
@ -71,7 +71,6 @@ class ButtonThread : public Observable<const InputEvent *>, public concurrency::
|
|||||||
int afterLightSleep(esp_sleep_wakeup_cause_t cause);
|
int afterLightSleep(esp_sleep_wakeup_cause_t cause);
|
||||||
#endif
|
#endif
|
||||||
private:
|
private:
|
||||||
input_broker_event currentEvent;
|
|
||||||
input_broker_event _singlePress = INPUT_BROKER_NONE;
|
input_broker_event _singlePress = INPUT_BROKER_NONE;
|
||||||
input_broker_event _longPress = INPUT_BROKER_NONE;
|
input_broker_event _longPress = INPUT_BROKER_NONE;
|
||||||
input_broker_event _doublePress = INPUT_BROKER_NONE;
|
input_broker_event _doublePress = INPUT_BROKER_NONE;
|
||||||
|
@ -882,7 +882,7 @@ void setup()
|
|||||||
setupModules();
|
setupModules();
|
||||||
|
|
||||||
// buttons are now inputBroker, so have to come after setupModules
|
// buttons are now inputBroker, so have to come after setupModules
|
||||||
#if defined(HAS_BUTTON)
|
#if HAS_BUTTON
|
||||||
int pullup_sense = 0;
|
int pullup_sense = 0;
|
||||||
#ifdef INPUT_PULLUP_SENSE
|
#ifdef INPUT_PULLUP_SENSE
|
||||||
// Some platforms (nrf52) have a SENSE variant which allows wake from sleep - override what OneButton did
|
// Some platforms (nrf52) have a SENSE variant which allows wake from sleep - override what OneButton did
|
||||||
|
@ -111,9 +111,9 @@ void setupModules()
|
|||||||
#if (HAS_BUTTON || ARCH_PORTDUINO) && !MESHTASTIC_EXCLUDE_INPUTBROKER
|
#if (HAS_BUTTON || ARCH_PORTDUINO) && !MESHTASTIC_EXCLUDE_INPUTBROKER
|
||||||
if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
|
if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
|
||||||
inputBroker = new InputBroker();
|
inputBroker = new InputBroker();
|
||||||
|
systemCommandsModule = new SystemCommandsModule();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
systemCommandsModule = new SystemCommandsModule();
|
|
||||||
#if !MESHTASTIC_EXCLUDE_ADMIN
|
#if !MESHTASTIC_EXCLUDE_ADMIN
|
||||||
adminModule = new AdminModule();
|
adminModule = new AdminModule();
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user