Fixup some compile errors

This commit is contained in:
Jonathan Bennett 2025-06-09 13:29:32 -05:00
parent 59ea85c85f
commit cb7370e073
3 changed files with 2 additions and 3 deletions

View File

@ -71,7 +71,6 @@ class ButtonThread : public Observable<const InputEvent *>, public concurrency::
int afterLightSleep(esp_sleep_wakeup_cause_t cause);
#endif
private:
input_broker_event currentEvent;
input_broker_event _singlePress = INPUT_BROKER_NONE;
input_broker_event _longPress = INPUT_BROKER_NONE;
input_broker_event _doublePress = INPUT_BROKER_NONE;

View File

@ -882,7 +882,7 @@ void setup()
setupModules();
// buttons are now inputBroker, so have to come after setupModules
#if defined(HAS_BUTTON)
#if HAS_BUTTON
int pullup_sense = 0;
#ifdef INPUT_PULLUP_SENSE
// Some platforms (nrf52) have a SENSE variant which allows wake from sleep - override what OneButton did

View File

@ -111,9 +111,9 @@ void setupModules()
#if (HAS_BUTTON || ARCH_PORTDUINO) && !MESHTASTIC_EXCLUDE_INPUTBROKER
if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
inputBroker = new InputBroker();
systemCommandsModule = new SystemCommandsModule();
}
#endif
systemCommandsModule = new SystemCommandsModule();
#if !MESHTASTIC_EXCLUDE_ADMIN
adminModule = new AdminModule();
#endif