DG4MLK/MeshCore-Evo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move GPS preference initialization to UITask

Browse Source
This commit is contained in:
csrutil
2025-11-29 18:35:10 +08:00
parent 4aebc57add
commit 39503ad0b4
2 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
examples/companion_radio/main.cpp
View File

@@ -216,16 +216,6 @@ void setup() {
sensors.begin(); sensors.begin();
#if ENV_INCLUDE_GPS == 1
// Apply GPS preferences after sensors.begin() so gps_detected is set
sensors.setSettingValue("gps", the_mesh.getNodePrefs()->gps_enabled ? "1" : "0");
if (the_mesh.getNodePrefs()->gps_interval > 0) {
char interval_str[12];
sprintf(interval_str, "%u", the_mesh.getNodePrefs()->gps_interval);
sensors.setSettingValue("gps_interval", interval_str);
}
#endif
#ifdef DISPLAY_CLASS #ifdef DISPLAY_CLASS
ui_task.begin(disp, &sensors, the_mesh.getNodePrefs()); // still want to pass this in as dependency, as prefs might be moved ui_task.begin(disp, &sensors, the_mesh.getNodePrefs()); // still want to pass this in as dependency, as prefs might be moved
#endif #endif

13
examples/companion_radio/ui-new/UITask.cpp
View File

@@ -537,6 +537,19 @@ void UITask::begin(DisplayDriver* display, SensorManager* sensors, NodePrefs* no
#endif #endif
_node_prefs = node_prefs; _node_prefs = node_prefs;
#if ENV_INCLUDE_GPS == 1
// Apply GPS preferences from stored prefs
if (_sensors != NULL && _node_prefs != NULL) {
_sensors->setSettingValue("gps", _node_prefs->gps_enabled ? "1" : "0");
if (_node_prefs->gps_interval > 0) {
char interval_str[12]; // Max: 24 hours = 86400 seconds (5 digits + null)
sprintf(interval_str, "%u", _node_prefs->gps_interval);
_sensors->setSettingValue("gps_interval", interval_str);
}
}
#endif
if (_display != NULL) { if (_display != NULL) {
_display->turnOn(); _display->turnOn();
} }