Merge pull request #2018 from got-root/fix/companion-radio-gps-persistence

fix(companion_radio): apply persisted GPS enabled setting on boot for ui-orig devices
Šī revīzija ir iekļauta:
Liam Cottle
2026-03-25 09:38:03 +13:00
revīziju iesūtīja GitHub
revīzija 8637a749f7
2 mainīti faili ar 10 papildinājumiem un 0 dzēšanām
+6
Parādīt failu
@@ -165,6 +165,12 @@ protected:
public: public:
void savePrefs() { _store->savePrefs(_prefs, sensors.node_lat, sensors.node_lon); } void savePrefs() { _store->savePrefs(_prefs, sensors.node_lat, sensors.node_lon); }
#if ENV_INCLUDE_GPS == 1
void applyGpsPrefs() {
sensors.setSettingValue("gps", _prefs.gps_enabled ? "1" : "0");
}
#endif
private: private:
void writeOKFrame(); void writeOKFrame();
void writeErrFrame(uint8_t err_code); void writeErrFrame(uint8_t err_code);
+4
Parādīt failu
@@ -213,6 +213,10 @@ void setup() {
sensors.begin(); sensors.begin();
#if ENV_INCLUDE_GPS == 1
the_mesh.applyGpsPrefs();
#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