pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-08-04 04:40:50 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge branch 'master' into 2.7-MiscFixes-Week1

Browse Source
This commit is contained in:
Ben Meadors 2025-06-22 05:53:35 -05:00 committed by GitHub
commit 574cbe55c0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/graphics/Screen.cpp
View File

@ -1289,12 +1289,13 @@ int Screen::handleInputEvent(const InputEvent *event)
config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_ENABLED; config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_ENABLED;
playGPSEnableBeep(); playGPSEnableBeep();
gps->enable(); gps->enable();
service->reloadConfig(SEGMENT_CONFIG);
} else if (selected == 2) { } else if (selected == 2) {
config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_DISABLED; config.position.gps_mode = meshtastic_Config_PositionConfig_GpsMode_DISABLED;
playGPSDisableBeep(); playGPSDisableBeep();
gps->disable(); gps->disable();
}
service->reloadConfig(SEGMENT_CONFIG); service->reloadConfig(SEGMENT_CONFIG);
}
}, },
config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_ENABLED ? 1 config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_ENABLED ? 1
: 2); // set inital selection : 2); // set inital selection
@ -1479,9 +1480,10 @@ void Screen::TZPicker()
} else if (selected == 16) { // NZ } else if (selected == 16) { // NZ
strncpy(config.device.tzdef, "NZST-12NZDT,M9.5.0,M4.1.0/3", sizeof(config.device.tzdef)); strncpy(config.device.tzdef, "NZST-12NZDT,M9.5.0,M4.1.0/3", sizeof(config.device.tzdef));
} }
if (selected != 0) {
setenv("TZ", config.device.tzdef, 1); setenv("TZ", config.device.tzdef, 1);
service->reloadConfig(SEGMENT_CONFIG); service->reloadConfig(SEGMENT_CONFIG);
}
}); });
} }

2
src/input/UpDownInterruptBase.h
View File

@ -32,6 +32,6 @@ class UpDownInterruptBase : public Observable<const InputEvent *>, public concur
unsigned long lastUpKeyTime = 0; unsigned long lastUpKeyTime = 0;
unsigned long lastDownKeyTime = 0; unsigned long lastDownKeyTime = 0;
unsigned long lastPressKeyTime = 0; unsigned long lastPressKeyTime = 0;
unsigned long updownDebounceMs; unsigned long updownDebounceMs = 50;
const unsigned long pressDebounceMs = 200; const unsigned long pressDebounceMs = 200;
}; };