From dea38936d7c24a3680044ca9871bf6bcf775cd29 Mon Sep 17 00:00:00 2001 From: Florent Date: Mon, 2 Nov 2026 11:09:16 -0400 Subject: [PATCH] gps: move the gps CLI to GpsPrefs and convert all targets --- examples/companion_radio/MyMesh.cpp | 5 + examples/companion_radio/MyMesh.h | 11 +- examples/companion_radio/NodePrefs.h | 14 ++- examples/companion_radio/ui-new/UITask.cpp | 8 +- examples/companion_radio/ui-orig/UITask.cpp | 5 +- examples/companion_radio/ui-tiny/UITask.cpp | 8 +- examples/simple_repeater/MyMesh.h | 12 +- examples/simple_room_server/MyMesh.h | 12 +- examples/simple_sensor/SensorMesh.h | 10 +- src/helpers/CommonCLI.cpp | 76 +----------- src/helpers/CommonCLI.h | 12 +- src/helpers/CommonGpsPrefs.cpp | 110 ++++++++++++++++++ src/helpers/CommonGpsPrefs.h | 26 +++++ .../sensors/EnvironmentSensorManager.cpp | 18 +-- variants/gat562_mesh_evb_pro/target.cpp | 3 +- variants/gat562_mesh_tracker_pro/target.cpp | 3 +- variants/heltec_mesh_solar/target.cpp | 15 +-- variants/heltec_mesh_solar/target.h | 1 - variants/heltec_rc32/target.cpp | 4 +- variants/heltec_t096/target.cpp | 4 +- variants/heltec_t1/target.cpp | 4 +- variants/heltec_t114/target.cpp | 3 +- variants/heltec_tower_v2/target.cpp | 3 +- variants/heltec_tracker/target.cpp | 30 +++-- variants/heltec_tracker/target.h | 1 - variants/heltec_tracker_v2/target.cpp | 5 +- variants/heltec_v3/target.cpp | 4 +- variants/heltec_v4/target.cpp | 4 +- variants/heltec_v4_r8/target.cpp | 4 +- variants/keepteen_lt1/target.cpp | 4 +- variants/lilygo_t_impulse_plus/target.cpp | 4 +- variants/lilygo_tbeam_1w/target.cpp | 4 +- variants/lilygo_tbeam_SX1262/target.cpp | 4 +- variants/lilygo_tbeam_SX1276/target.cpp | 3 +- .../lilygo_tbeam_supreme_SX1262/target.cpp | 4 +- variants/lilygo_tdeck/target.cpp | 3 +- variants/lilygo_techo_card/target.cpp | 3 +- variants/lilygo_techo_lite/target.cpp | 4 +- variants/meshadventurer/target.cpp | 19 ++- variants/meshadventurer/target.h | 3 +- variants/meshnology_w12/target.cpp | 4 +- variants/meshtracker_x1/target.cpp | 27 ++--- variants/meshtracker_x1/target.h | 2 - variants/minewsemi_me25ls01/target.cpp | 3 +- variants/muzi_base/target.cpp | 22 +--- variants/muzi_base/target.h | 6 +- variants/muzi_base/variant.h | 2 + variants/muziworks_r1_neo/target.cpp | 3 +- variants/nano_g2_ultra/NanoG2UltraGpsDriver.h | 31 +++++ variants/nano_g2_ultra/target.cpp | 35 ++---- variants/nano_g2_ultra/target.h | 8 +- variants/promicro/target.cpp | 4 +- variants/rak3112/target.cpp | 4 +- variants/rak_wismesh_tag/target.cpp | 4 +- variants/sensecap_indicator-espnow/target.cpp | 3 +- variants/sensecap_solar/target.cpp | 4 +- variants/station_g2/target.cpp | 4 +- variants/station_g3_esp32/target.cpp | 3 +- variants/t1000-e/target.cpp | 10 +- variants/t1000-e/target.h | 1 - variants/thinknode_m3/target.cpp | 3 +- variants/thinknode_m4/target.cpp | 3 +- variants/thinknode_m6/target.cpp | 4 +- variants/thinknode_m7/target.cpp | 4 +- variants/thinknode_m8/target.cpp | 3 +- variants/thinknode_m9/target.cpp | 3 +- variants/wio-tracker-l1-1w/target.cpp | 4 +- variants/wio-tracker-l1/target.cpp | 4 +- variants/xiao_c3/target.cpp | 4 +- 69 files changed, 381 insertions(+), 301 deletions(-) create mode 100644 src/helpers/CommonGpsPrefs.cpp create mode 100644 src/helpers/CommonGpsPrefs.h create mode 100644 variants/nano_g2_ultra/NanoG2UltraGpsDriver.h diff --git a/examples/companion_radio/MyMesh.cpp b/examples/companion_radio/MyMesh.cpp index 755c56d1..d12c7b8a 100644 --- a/examples/companion_radio/MyMesh.cpp +++ b/examples/companion_radio/MyMesh.cpp @@ -2093,6 +2093,11 @@ bool MyMesh::handleCommand(const char* command, uint32_t sender_timestamp, char* return true; } + if (_prefs.getGpsPrefs()->handleCommand(command, sensors, reply)) { + if (_prefs.getGpsPrefs()->isDirty()) { savePrefs(); } + return true; + } + // hook for variant-specific CLI processing if (board.handleCommand(command, sender_timestamp, reply)) { if (_prefs.isDirty()) { savePrefs(); } diff --git a/examples/companion_radio/MyMesh.h b/examples/companion_radio/MyMesh.h index 944790df..846708b5 100644 --- a/examples/companion_radio/MyMesh.h +++ b/examples/companion_radio/MyMesh.h @@ -203,12 +203,13 @@ public: #if ENV_INCLUDE_GPS == 1 void applyGpsPrefs() { - sensors.setSettingValue("gps", _prefs.gps_enabled ? "1" : "0"); - if (_prefs.gps_interval > 0) { - char interval_str[12]; // Max: 24 hours = 86400 seconds (5 digits + null) - sprintf(interval_str, "%u", _prefs.gps_interval); - sensors.setSettingValue("gps_interval", interval_str); + if (_prefs.gps_interval > 0 && + sensors.getSettingByKey("gps_interval") != nullptr) { + char interval[11]; + snprintf(interval, sizeof(interval), "%lu", (unsigned long)_prefs.gps_interval); + sensors.setSettingValue("gps_interval", interval); } + _prefs.getGpsPrefs()->apply(sensors); } #endif diff --git a/examples/companion_radio/NodePrefs.h b/examples/companion_radio/NodePrefs.h index c5d1df04..a54eca75 100644 --- a/examples/companion_radio/NodePrefs.h +++ b/examples/companion_radio/NodePrefs.h @@ -2,6 +2,7 @@ #include // For uint8_t, uint32_t #include #include +#include #include #define TELEM_MODE_DENY 0 @@ -35,6 +36,7 @@ public: uint8_t vibe_quiet = 0; uint8_t gps_enabled = 0; // GPS enabled flag (0=disabled, 1=enabled) uint32_t gps_interval = 0; // GPS read interval in seconds + uint32_t gps_period = 0; // periodic acquisition interval in seconds uint8_t autoadd_config = 0; // bitmask for auto-add contacts config uint8_t rx_boosted_gain = 0; // SX126x RX boosted gain mode (0=power saving, 1=boosted) uint8_t radio_fem_rxgain = 0; // external LoRa FEM RX gain (LNA) @@ -151,16 +153,21 @@ private: }; RadioPrefs radio; - class GPSPrefs : public ConfigSerializer { // COPIED from CommonCLI (for now) + class GPSPrefs : public CommonGpsPrefs { NodePrefs* _parent; protected: void structure() override { def("en", _parent->gps_enabled); // boolean def("int", _parent->gps_interval); // interval in seconds + def("period", _parent->gps_period); // periodic acquisition interval in seconds def("adv_loc", _parent->advert_loc_policy); } public: GPSPrefs(NodePrefs* parent) : _parent(parent) { } + bool isGpsEnabled() const override { return _parent->gps_enabled; } + void setGpsEnabled(bool enabled) override { _parent->gps_enabled = enabled; markDirty(); } + uint32_t getGpsPeriod() const override { return _parent->gps_period; } + void setGpsPeriod(uint32_t seconds) override { _parent->gps_period = seconds; markDirty(); } }; GPSPrefs gps; @@ -275,8 +282,9 @@ public: void setRepeatEn(bool en) { repeat.disable_fwd = en ? 0 : 1; } CommonRadioPrefs* getRadioPrefs() { return &radio; } + CommonGpsPrefs* getGpsPrefs() { return &gps; } KeyValueStore* getCustom() { return &custom; } - bool isDirty() const override { return ConfigSerializer::isDirty() || radio.isDirty() || custom.isDirty(); } - void clearDirty() override { ConfigSerializer::clearDirty(); radio.clearDirty(); custom.clearDirty(); } + bool isDirty() const override { return ConfigSerializer::isDirty() || radio.isDirty() || gps.isDirty() || custom.isDirty(); } + void clearDirty() override { ConfigSerializer::clearDirty(); radio.clearDirty(); gps.clearDirty(); custom.clearDirty(); } }; diff --git a/examples/companion_radio/ui-new/UITask.cpp b/examples/companion_radio/ui-new/UITask.cpp index cfe34cf2..a1400669 100644 --- a/examples/companion_radio/ui-new/UITask.cpp +++ b/examples/companion_radio/ui-new/UITask.cpp @@ -1182,16 +1182,14 @@ void UITask::toggleGPS() { for (int i = 0; i < num; i++) { if (strcmp(_sensors->getSettingName(i), "gps") == 0) { if (strcmp(_sensors->getSettingValue(i), "1") == 0) { - _sensors->setSettingValue("gps", "0"); - _node_prefs->gps_enabled = 0; + _node_prefs->getGpsPrefs()->setGpsEnabled(*_sensors, false); notify(UIEventType::ack); } else { - _sensors->setSettingValue("gps", "1"); - _node_prefs->gps_enabled = 1; + _node_prefs->getGpsPrefs()->setGpsEnabled(*_sensors, true); notify(UIEventType::ack); } the_mesh.savePrefs(); - showAlert(_node_prefs->gps_enabled ? "GPS: Enabled" : "GPS: Disabled", 800); + showAlert(_node_prefs->getGpsPrefs()->isGpsEnabled() ? "GPS: Enabled" : "GPS: Disabled", 800); _next_refresh = 0; break; } diff --git a/examples/companion_radio/ui-orig/UITask.cpp b/examples/companion_radio/ui-orig/UITask.cpp index 8ae57c7a..c2fd80fb 100644 --- a/examples/companion_radio/ui-orig/UITask.cpp +++ b/examples/companion_radio/ui-orig/UITask.cpp @@ -609,14 +609,15 @@ void UITask::handleButtonQuadruplePress() { for (int i = 0; i < num; i++) { if (strcmp(_sensors->getSettingName(i), "gps") == 0) { if (strcmp(_sensors->getSettingValue(i), "1") == 0) { - _sensors->setSettingValue("gps", "0"); + _node_prefs->getGpsPrefs()->setGpsEnabled(*_sensors, false); notify(UIEventType::ack); sprintf(_alert, "GPS: Disabled"); } else { - _sensors->setSettingValue("gps", "1"); + _node_prefs->getGpsPrefs()->setGpsEnabled(*_sensors, true); notify(UIEventType::ack); sprintf(_alert, "GPS: Enabled"); } + the_mesh.savePrefs(); break; } } diff --git a/examples/companion_radio/ui-tiny/UITask.cpp b/examples/companion_radio/ui-tiny/UITask.cpp index 035340a8..1b48cca8 100644 --- a/examples/companion_radio/ui-tiny/UITask.cpp +++ b/examples/companion_radio/ui-tiny/UITask.cpp @@ -833,16 +833,14 @@ void UITask::toggleGPS() { for (int i = 0; i < num; i++) { if (strcmp(_sensors->getSettingName(i), "gps") == 0) { if (strcmp(_sensors->getSettingValue(i), "1") == 0) { - _sensors->setSettingValue("gps", "0"); - _node_prefs->gps_enabled = 0; + _node_prefs->getGpsPrefs()->setGpsEnabled(*_sensors, false); notify(UIEventType::ack); } else { - _sensors->setSettingValue("gps", "1"); - _node_prefs->gps_enabled = 1; + _node_prefs->getGpsPrefs()->setGpsEnabled(*_sensors, true); notify(UIEventType::ack); } the_mesh.savePrefs(); - showAlert(_node_prefs->gps_enabled ? "GPS: Enabled" : "GPS: Disabled", 800); + showAlert(_node_prefs->getGpsPrefs()->isGpsEnabled() ? "GPS: Enabled" : "GPS: Disabled", 800); _next_refresh = 0; break; } diff --git a/examples/simple_repeater/MyMesh.h b/examples/simple_repeater/MyMesh.h index 1d975a94..7e4cfd4f 100644 --- a/examples/simple_repeater/MyMesh.h +++ b/examples/simple_repeater/MyMesh.h @@ -159,10 +159,14 @@ protected: #if ENV_INCLUDE_GPS == 1 void applyGpsPrefs() { - char period[11]; - snprintf(period, sizeof(period), "%lu", (unsigned long)_prefs.gps_period); - sensors.setSettingValue("gps_period", period); - sensors.setSettingValue("gps", _prefs.gps_enabled?"1":"0"); + if (sensors.getSettingByKey("gps_interval") != nullptr) { + // gps_interval was introduced only for EnvironmentSensorManager + // and has little interest ... kept only as a legacy + char interval[11]; + snprintf(interval, sizeof(interval), "%lu", (unsigned long)_prefs.gps_interval); + sensors.setSettingValue("gps_interval", interval); + } + _prefs.getGpsPrefs()->apply(sensors); } #endif diff --git a/examples/simple_room_server/MyMesh.h b/examples/simple_room_server/MyMesh.h index 5f8de73a..11367b12 100644 --- a/examples/simple_room_server/MyMesh.h +++ b/examples/simple_room_server/MyMesh.h @@ -168,10 +168,14 @@ protected: #if ENV_INCLUDE_GPS == 1 void applyGpsPrefs() { - char period[11]; - snprintf(period, sizeof(period), "%lu", (unsigned long)_prefs.gps_period); - sensors.setSettingValue("gps_period", period); - sensors.setSettingValue("gps", _prefs.gps_enabled?"1":"0"); + if (sensors.getSettingByKey("gps_interval") != nullptr) { + // gps_interval was introduced only for EnvironmentSensorManager + // and has little interest ... kept only as a legacy + char interval[11]; + snprintf(interval, sizeof(interval), "%lu", (unsigned long)_prefs.gps_interval); + sensors.setSettingValue("gps_interval", interval); + } + _prefs.getGpsPrefs()->apply(sensors); } #endif diff --git a/examples/simple_sensor/SensorMesh.h b/examples/simple_sensor/SensorMesh.h index b93939de..e6746d47 100644 --- a/examples/simple_sensor/SensorMesh.h +++ b/examples/simple_sensor/SensorMesh.h @@ -173,10 +173,12 @@ private: #if ENV_INCLUDE_GPS == 1 void applyGpsPrefs() { - char period[11]; - snprintf(period, sizeof(period), "%lu", (unsigned long)_prefs.gps_period); - sensors.setSettingValue("gps_period", period); - sensors.setSettingValue("gps", _prefs.gps_enabled?"1":"0"); + if (sensors.getSettingByKey("gps_interval") != nullptr) { + char interval[11]; + snprintf(interval, sizeof(interval), "%lu", (unsigned long)_prefs.gps_interval); + sensors.setSettingValue("gps_interval", interval); + } + _prefs.getGpsPrefs()->apply(sensors); } #endif }; diff --git a/src/helpers/CommonCLI.cpp b/src/helpers/CommonCLI.cpp index 613f2578..ed1b5199 100644 --- a/src/helpers/CommonCLI.cpp +++ b/src/helpers/CommonCLI.cpp @@ -349,65 +349,11 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, char* command, char* re *(dp-1) = 0; // remove last CR } } + } else if (_prefs->getGpsPrefs()->handleCommand(command, *_sensors, reply)) { + if (_prefs->getGpsPrefs()->isDirty()) savePrefs(); } else if (memcmp(command, "region", 6) == 0) { handleRegionCmd(command, reply); #if ENV_INCLUDE_GPS == 1 - } else if (memcmp(command, "gps on", 6) == 0) { - if (_sensors->setSettingValue("gps", "1")) { - _prefs->gps_enabled = 1; - savePrefs(); - strcpy(reply, "ok"); - } else { - strcpy(reply, "gps toggle not found"); - } - } else if (memcmp(command, "gps off", 7) == 0) { - if (_sensors->setSettingValue("gps", "0")) { - _prefs->gps_enabled = 0; - savePrefs(); - strcpy(reply, "ok"); - } else { - strcpy(reply, "gps toggle not found"); - } - } else if (memcmp(command, "gps period ", 11) == 0) { - char* end = nullptr; - unsigned long period = strtoul(command + 11, &end, 10); - if (command[11] == '\0' || *end != '\0' || period > 86400) { - strcpy(reply, "gps period must be 0-86400 seconds"); - } else { - char period_value[11]; - snprintf(period_value, sizeof(period_value), "%lu", period); - if (_sensors->setSettingValue("gps_period", period_value) && - _sensors->setSettingValue("gps", "1")) { - _prefs->gps_period = (uint32_t)period; - _prefs->gps_enabled = 1; - savePrefs(); - strcpy(reply, "ok"); - } else { - strcpy(reply, "gps provider not found"); - } - } - } else if (memcmp(command, "gps sync", 8) == 0) { - LocationProvider * l = _sensors->getLocationProvider(); - if (l != NULL) { - l->syncTime(); - strcpy(reply, "ok"); - } else { - strcpy(reply, "gps provider not found"); - } - } else if (strcmp(command, "gps diag") == 0) { - LocationProvider * l = _sensors->getLocationProvider(); - if (l != NULL) { - const char* setting = _sensors->getSettingByKey("gps"); - bool requested = setting != NULL && strcmp(setting, "1") == 0; - int prefix_len = snprintf(reply, 160, "req:%u ", requested ? 1U : 0U); - if (prefix_len < 0 || prefix_len >= 160) { - reply[159] = 0; - } else { - l->formatDiagnostics(reply + prefix_len, 160 - prefix_len); - } - } else { - strcpy(reply, "gps provider not found"); - } } else if (memcmp(command, "gps setloc", 10) == 0) { _prefs->node_lat = _sensors->node_lat; _prefs->node_lon = _sensors->node_lon; @@ -443,24 +389,6 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, char* command, char* re } else { strcpy(reply, "error"); } - } else if (memcmp(command, "gps", 3) == 0) { - LocationProvider * l = _sensors->getLocationProvider(); - if (l != NULL) { - bool enabled = l->isEnabled(); // is EN pin on ? - bool fix = l->isValid(); // has fix ? - int sats = l->satellitesCount(); - bool active = !strcmp(_sensors->getSettingByKey("gps"), "1"); - if (enabled) { - sprintf(reply, "on, %s, %s, %d sats", - active?"active":"deactivated", - fix?"fix":"no fix", - sats); - } else { - strcpy(reply, "off"); - } - } else { - strcpy(reply, "Can't find GPS"); - } #endif } else if (memcmp(command, "powersaving on", 14) == 0) { #if defined(NRF52_PLATFORM) diff --git a/src/helpers/CommonCLI.h b/src/helpers/CommonCLI.h index 06778a60..33e27d2d 100644 --- a/src/helpers/CommonCLI.h +++ b/src/helpers/CommonCLI.h @@ -7,6 +7,7 @@ #include #include #include +#include #include #if defined(WITH_RS232_BRIDGE) || defined(WITH_ESPNOW_BRIDGE) @@ -153,7 +154,7 @@ private: }; BridgePrefs bridge; - class GPSPrefs : public ConfigSerializer { + class GPSPrefs : public CommonGpsPrefs { NodePrefs* _parent; protected: void structure() override { @@ -164,6 +165,10 @@ private: } public: GPSPrefs(NodePrefs* parent) : _parent(parent) { } + bool isGpsEnabled() const override { return _parent->gps_enabled; } + void setGpsEnabled(bool enabled) override { _parent->gps_enabled = enabled; markDirty(); } + uint32_t getGpsPeriod() const override { return _parent->gps_period; } + void setGpsPeriod(uint32_t seconds) override { _parent->gps_period = seconds; markDirty(); } }; GPSPrefs gps; @@ -236,10 +241,11 @@ public: } CommonRadioPrefs* getRadioPrefs() { return &radio; } + CommonGpsPrefs* getGpsPrefs() { return &gps; } KeyValueStore* getCustom() { return &custom; } - bool isDirty() const override { return ConfigSerializer::isDirty() || radio.isDirty() || custom.isDirty(); } - void clearDirty() override { ConfigSerializer::clearDirty(); radio.clearDirty(); custom.clearDirty(); } + bool isDirty() const override { return ConfigSerializer::isDirty() || radio.isDirty() || gps.isDirty() || custom.isDirty(); } + void clearDirty() override { ConfigSerializer::clearDirty(); radio.clearDirty(); gps.clearDirty(); custom.clearDirty(); } }; class CommonCLICallbacks { diff --git a/src/helpers/CommonGpsPrefs.cpp b/src/helpers/CommonGpsPrefs.cpp new file mode 100644 index 00000000..fe29c0c0 --- /dev/null +++ b/src/helpers/CommonGpsPrefs.cpp @@ -0,0 +1,110 @@ +#include "CommonGpsPrefs.h" +#include + +bool CommonGpsPrefs::setGpsEnabled(SensorManager& sensors, bool enabled) { + LocationProvider* location = sensors.getLocationProvider(); + if (location == nullptr) return false; + location->setGpsOn(enabled); + setGpsEnabled(enabled); + return true; +} + +bool CommonGpsPrefs::setGpsPeriod(SensorManager& sensors, uint32_t seconds) { + LocationProvider* location = sensors.getLocationProvider(); + if (location == nullptr) return false; + location->setGpsPeriod(seconds); + setGpsPeriod(seconds); + return true; +} + +bool CommonGpsPrefs::apply(SensorManager& sensors) const { + LocationProvider* location = sensors.getLocationProvider(); + if (location == nullptr) return false; + location->setGpsPeriod(getGpsPeriod()); + location->setGpsOn(isGpsEnabled()); + return true; +} + +bool CommonGpsPrefs::handleCommand(const char* command, SensorManager& sensors, char* reply) { + if (strcmp(command, "gps") == 0) { + LocationProvider* location = sensors.getLocationProvider(); + char mode[32]; + if (getGpsPeriod() == 0) { + strcpy(mode, "tracking"); + } else { + snprintf(mode, sizeof(mode), "periodic (%lus)", + (unsigned long)getGpsPeriod()); + } + if (location == nullptr) { + strcpy(reply, "gps provider not found"); + } else if (location->isEnabled()) { + sprintf(reply, "on, %s, %s, %d sats, mode: %s", + isGpsEnabled() ? "active" : "deactivated", + location->isValid() ? "fix" : "no fix", + location->satellitesCount(), mode); + } else { + snprintf(reply, 160, "off, mode: %s", mode); + } + return true; + } + if (memcmp(command, "gps on", 6) == 0) { + if (!setGpsEnabled(sensors, true)) { + strcpy(reply, "gps toggle not found"); + } else { + strcpy(reply, "ok"); + } + return true; + } + if (memcmp(command, "gps off", 7) == 0) { + if (!setGpsEnabled(sensors, false)) { + strcpy(reply, "gps toggle not found"); + } else { + strcpy(reply, "ok"); + } + return true; + } + if (strcmp(command, "gps period") == 0) { + if (getGpsPeriod() == 0) { + strcpy(reply, "> 0 (continuous)"); + } else { + sprintf(reply, "> %lu", (unsigned long)getGpsPeriod()); + } + return true; + } + if (memcmp(command, "gps period ", 11) == 0) { + char* end = nullptr; + unsigned long period = strtoul(command + 11, &end, 10); + if (command[11] == '\0' || *end != '\0' || period > 86400) { + strcpy(reply, "gps period must be 0-86400 seconds"); + } else { + if (!setGpsPeriod(sensors, (uint32_t)period) || + !setGpsEnabled(sensors, true)) { + strcpy(reply, "gps provider not found"); + } else { + strcpy(reply, "ok"); + } + } + return true; + } + if (memcmp(command, "gps sync", 8) == 0) { + LocationProvider* location = sensors.getLocationProvider(); + if (location == nullptr) { + strcpy(reply, "gps provider not found"); + } else { + location->syncTime(); + strcpy(reply, "ok"); + } + return true; + } + if (strcmp(command, "gps diag") == 0) { + LocationProvider* location = sensors.getLocationProvider(); + if (location == nullptr) { + strcpy(reply, "gps provider not found"); + } else { + int prefix = snprintf(reply, 160, "req:%u ", isGpsEnabled() ? 1U : 0U); + if (prefix >= 0 && prefix < 160) location->formatDiagnostics(reply + prefix, 160 - prefix); + } + return true; + } + return false; +} diff --git a/src/helpers/CommonGpsPrefs.h b/src/helpers/CommonGpsPrefs.h new file mode 100644 index 00000000..25cce1b1 --- /dev/null +++ b/src/helpers/CommonGpsPrefs.h @@ -0,0 +1,26 @@ +#pragma once + +#include "ConfigSerializer.h" +#include "SensorManager.h" + +class CommonGpsPrefs : public ConfigSerializer { + bool _is_dirty = false; + +protected: + CommonGpsPrefs() = default; + +public: + void markDirty() { _is_dirty = true; } + void clearDirty() { _is_dirty = false; } + bool isDirty() const { return _is_dirty; } + + virtual bool isGpsEnabled() const = 0; + virtual void setGpsEnabled(bool enabled) = 0; + virtual uint32_t getGpsPeriod() const = 0; + virtual void setGpsPeriod(uint32_t seconds) = 0; + + bool setGpsEnabled(SensorManager& sensors, bool enabled); + bool setGpsPeriod(SensorManager& sensors, uint32_t seconds); + bool apply(SensorManager& sensors) const; + bool handleCommand(const char* command, SensorManager& sensors, char* reply); +}; diff --git a/src/helpers/sensors/EnvironmentSensorManager.cpp b/src/helpers/sensors/EnvironmentSensorManager.cpp index 2861fac2..2cf8b66b 100644 --- a/src/helpers/sensors/EnvironmentSensorManager.cpp +++ b/src/helpers/sensors/EnvironmentSensorManager.cpp @@ -650,7 +650,7 @@ bool EnvironmentSensorManager::querySensors(uint8_t requester_permissions, Cayen int EnvironmentSensorManager::getNumSettings() const { int settings = 0; #if ENV_INCLUDE_GPS - if (gps_detected) settings += 2; // GPS enablement and periodic acquisition + if (gps_detected) settings += 1; // GPS enablement #endif return settings; } @@ -661,9 +661,6 @@ const char* EnvironmentSensorManager::getSettingName(int i) const { if (gps_detected && i == settings++) { return "gps"; } - if (gps_detected && i == settings++) { - return "gps_period"; - } #endif return NULL; } @@ -674,12 +671,6 @@ const char* EnvironmentSensorManager::getSettingValue(int i) const { if (gps_detected && i == settings++) { return _location->isGpsOn() ? "1" : "0"; } - if (gps_detected && i == settings++) { - static char period[11]; - snprintf(period, sizeof(period), "%lu", - (unsigned long)_location->getGpsPeriod()); - return period; - } #endif return NULL; } @@ -694,13 +685,6 @@ bool EnvironmentSensorManager::setSettingValue(const char* name, const char* val } return true; } - if (gps_detected && strcmp(name, "gps_period") == 0) { - char* end = nullptr; - unsigned long period = strtoul(value, &end, 10); - if (*value == '\0' || *end != '\0' || period > 86400) return false; - _location->setGpsPeriod((uint32_t)period); - return true; - } if (strcmp(name, "gps_interval") == 0) { uint32_t interval_seconds = atoi(value); gps_update_interval_sec = interval_seconds > 0 ? interval_seconds : 1; diff --git a/variants/gat562_mesh_evb_pro/target.cpp b/variants/gat562_mesh_evb_pro/target.cpp index 8dc203de..0aac297a 100644 --- a/variants/gat562_mesh_evb_pro/target.cpp +++ b/variants/gat562_mesh_evb_pro/target.cpp @@ -26,7 +26,8 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include - MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); + NmeaGpsDriver gps_driver(Serial1); + MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; diff --git a/variants/gat562_mesh_tracker_pro/target.cpp b/variants/gat562_mesh_tracker_pro/target.cpp index d16b4538..225aa161 100644 --- a/variants/gat562_mesh_tracker_pro/target.cpp +++ b/variants/gat562_mesh_tracker_pro/target.cpp @@ -27,7 +27,8 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include - MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); + NmeaGpsDriver gps_driver(Serial1); + MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; diff --git a/variants/heltec_mesh_solar/target.cpp b/variants/heltec_mesh_solar/target.cpp index 94e2684c..9468f8fc 100644 --- a/variants/heltec_mesh_solar/target.cpp +++ b/variants/heltec_mesh_solar/target.cpp @@ -11,7 +11,8 @@ WRAPPER_CLASS radio_driver(radio, board); VolatileRTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); +NmeaGpsDriver gps_driver(Serial1); +MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); SolarSensorManager sensors = SolarSensorManager(nmea); SolarExternalWatchdog external_watchdog; @@ -30,17 +31,11 @@ mesh::LocalIdentity radio_new_identity() { } void SolarSensorManager::start_gps() { - if (!gps_active) { - gps_active = true; - _location->begin(); - } + _location->setGpsOn(true); } void SolarSensorManager::stop_gps() { - if (gps_active) { - gps_active = false; - _location->stop(); - } + _location->setGpsOn(false); } bool SolarSensorManager::begin() { @@ -91,7 +86,7 @@ const char* SolarSensorManager::getSettingName(int i) const { const char* SolarSensorManager::getSettingValue(int i) const { if (gps_detected && i == 0) { - return gps_active ? "1" : "0"; + return _location->isGpsOn() ? "1" : "0"; } return NULL; } diff --git a/variants/heltec_mesh_solar/target.h b/variants/heltec_mesh_solar/target.h index 8e13a960..97550a00 100644 --- a/variants/heltec_mesh_solar/target.h +++ b/variants/heltec_mesh_solar/target.h @@ -14,7 +14,6 @@ #endif class SolarSensorManager : public SensorManager { - bool gps_active = false; bool gps_detected = false; LocationProvider* _location; diff --git a/variants/heltec_rc32/target.cpp b/variants/heltec_rc32/target.cpp index cc7e4deb..e095baab 100644 --- a/variants/heltec_rc32/target.cpp +++ b/variants/heltec_rc32/target.cpp @@ -20,7 +20,9 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include - MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock, PIN_GPS_RESET, PIN_GPS_EN); + NmeaGpsDriver gps_driver(Serial1, PIN_GPS_TX, PIN_GPS_RX, PIN_GPS_RESET, + PIN_GPS_EN); + MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; diff --git a/variants/heltec_t096/target.cpp b/variants/heltec_t096/target.cpp index 30509977..d0c2c07e 100644 --- a/variants/heltec_t096/target.cpp +++ b/variants/heltec_t096/target.cpp @@ -22,7 +22,9 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock, GPS_RESET, GPS_EN, &board.periph_power); +NmeaGpsDriver gps_driver(Serial1, PIN_GPS_TX, PIN_GPS_RX, GPS_RESET, GPS_EN, + &board.periph_power); +MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; diff --git a/variants/heltec_t1/target.cpp b/variants/heltec_t1/target.cpp index af771582..1d9c8baa 100644 --- a/variants/heltec_t1/target.cpp +++ b/variants/heltec_t1/target.cpp @@ -21,7 +21,9 @@ VolatileRTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock, GPS_RESET, GPS_EN, &board.periph_power); +NmeaGpsDriver gps_driver(Serial1, PIN_GPS_TX, PIN_GPS_RX, GPS_RESET, GPS_EN, + &board.periph_power); +MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; diff --git a/variants/heltec_t114/target.cpp b/variants/heltec_t114/target.cpp index 90a902f8..dc62f83b 100644 --- a/variants/heltec_t114/target.cpp +++ b/variants/heltec_t114/target.cpp @@ -22,7 +22,8 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); +NmeaGpsDriver gps_driver(Serial1); +MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; diff --git a/variants/heltec_tower_v2/target.cpp b/variants/heltec_tower_v2/target.cpp index ec8e7a17..ae627a0b 100644 --- a/variants/heltec_tower_v2/target.cpp +++ b/variants/heltec_tower_v2/target.cpp @@ -12,7 +12,8 @@ WRAPPER_CLASS radio_driver(radio, board); VolatileRTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); +NmeaGpsDriver gps_driver(Serial1); +MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); TowerV2ExternalWatchdog external_watchdog; diff --git a/variants/heltec_tracker/target.cpp b/variants/heltec_tracker/target.cpp index f32c41ff..5903f659 100644 --- a/variants/heltec_tracker/target.cpp +++ b/variants/heltec_tracker/target.cpp @@ -17,7 +17,20 @@ WRAPPER_CLASS radio_driver(radio, board); ESP32RTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); // GPS_EN (GPIO35) drives N-ch MOSFET → P-ch high-side switch; GPS_RESET (GPIO36) active LOW -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock, GPS_RESET, GPS_EN, &board.periph_power); +class HeltecTrackerGpsDriver : public NmeaGpsDriver { +public: + HeltecTrackerGpsDriver() + : NmeaGpsDriver(Serial1, PIN_GPS_TX, PIN_GPS_RX, GPS_RESET, GPS_EN, + &board.periph_power) {} + + void begin() override { + NmeaGpsDriver::begin(); + sendNmeaSentence("$CFGSYS,h35155*68"); + } +}; + +HeltecTrackerGpsDriver gps_driver; +MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); HWTSensorManager sensors = HWTSensorManager(nmea); #ifdef DISPLAY_CLASS @@ -43,18 +56,11 @@ mesh::LocalIdentity radio_new_identity() { } void HWTSensorManager::start_gps() { - if (!gps_active) { - _location->begin(); // Claims periph_power via RefCountedDigitalPin - gps_active = true; - Serial1.println("$CFGSYS,h35155*68"); // Configure GPS for all constellations - } + _location->setGpsOn(true); } void HWTSensorManager::stop_gps() { - if (gps_active) { - gps_active = false; - _location->stop(); // Releases periph_power via RefCountedDigitalPin - } + _location->setGpsOn(false); } bool HWTSensorManager::begin() { @@ -76,7 +82,7 @@ void HWTSensorManager::loop() { _location->loop(); if (millis() > next_gps_update) { - if (gps_active && _location->isValid()) { + if (_location->isEnabled() && _location->isValid()) { node_lat = ((double)_location->getLatitude())/1000000.; node_lon = ((double)_location->getLongitude())/1000000.; node_altitude = ((double)_location->getAltitude()) / 1000.0; @@ -93,7 +99,7 @@ const char* HWTSensorManager::getSettingName(int i) const { } const char* HWTSensorManager::getSettingValue(int i) const { if (i == 0) { - return gps_active ? "1" : "0"; + return _location->isGpsOn() ? "1" : "0"; } return NULL; } diff --git a/variants/heltec_tracker/target.h b/variants/heltec_tracker/target.h index 2931eda8..f6fea637 100644 --- a/variants/heltec_tracker/target.h +++ b/variants/heltec_tracker/target.h @@ -14,7 +14,6 @@ #endif class HWTSensorManager : public SensorManager { - bool gps_active = false; LocationProvider * _location; void start_gps(); diff --git a/variants/heltec_tracker_v2/target.cpp b/variants/heltec_tracker_v2/target.cpp index c48a29f6..12b01bcc 100644 --- a/variants/heltec_tracker_v2/target.cpp +++ b/variants/heltec_tracker_v2/target.cpp @@ -17,7 +17,9 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include - MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock, GPS_RESET, GPS_EN, &board.periph_power); + NmeaGpsDriver gps_driver(Serial1, PIN_GPS_TX, PIN_GPS_RX, GPS_RESET, GPS_EN, + &board.periph_power); + MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; @@ -43,4 +45,3 @@ mesh::LocalIdentity radio_new_identity() { RadioNoiseListener rng(radio); return mesh::LocalIdentity(&rng); // create new random identity } - diff --git a/variants/heltec_v3/target.cpp b/variants/heltec_v3/target.cpp index e6af466a..f2f712eb 100644 --- a/variants/heltec_v3/target.cpp +++ b/variants/heltec_v3/target.cpp @@ -17,7 +17,8 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include - MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); + NmeaGpsDriver gps_driver(Serial1); + MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; @@ -43,4 +44,3 @@ mesh::LocalIdentity radio_new_identity() { RadioNoiseListener rng(radio); return mesh::LocalIdentity(&rng); // create new random identity } - diff --git a/variants/heltec_v4/target.cpp b/variants/heltec_v4/target.cpp index 8483f276..0f87c6b3 100644 --- a/variants/heltec_v4/target.cpp +++ b/variants/heltec_v4/target.cpp @@ -17,7 +17,8 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include - MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); + NmeaGpsDriver gps_driver(Serial1); + MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; @@ -43,4 +44,3 @@ mesh::LocalIdentity radio_new_identity() { RadioNoiseListener rng(radio); return mesh::LocalIdentity(&rng); // create new random identity } - diff --git a/variants/heltec_v4_r8/target.cpp b/variants/heltec_v4_r8/target.cpp index 0b38531e..27e9f468 100644 --- a/variants/heltec_v4_r8/target.cpp +++ b/variants/heltec_v4_r8/target.cpp @@ -17,7 +17,9 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include - MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock, GPS_RESET, GPS_EN, &board.periph_power); + NmeaGpsDriver gps_driver(Serial1, PIN_GPS_TX, PIN_GPS_RX, GPS_RESET, GPS_EN, + &board.periph_power); + MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; diff --git a/variants/keepteen_lt1/target.cpp b/variants/keepteen_lt1/target.cpp index f1879ac5..dd7c6741 100644 --- a/variants/keepteen_lt1/target.cpp +++ b/variants/keepteen_lt1/target.cpp @@ -12,7 +12,8 @@ VolatileRTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include - MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); + NmeaGpsDriver gps_driver(Serial1); + MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; @@ -34,4 +35,3 @@ mesh::LocalIdentity radio_new_identity() { return mesh::LocalIdentity(&rng); // create new random identity } - diff --git a/variants/lilygo_t_impulse_plus/target.cpp b/variants/lilygo_t_impulse_plus/target.cpp index 87b3dbfe..b6b0c82c 100644 --- a/variants/lilygo_t_impulse_plus/target.cpp +++ b/variants/lilygo_t_impulse_plus/target.cpp @@ -13,7 +13,8 @@ VolatileRTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef ENV_INCLUDE_GPS -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); +NmeaGpsDriver gps_driver(Serial1); +MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors = EnvironmentSensorManager(); @@ -34,4 +35,3 @@ mesh::LocalIdentity radio_new_identity() { RadioNoiseListener rng(radio); return mesh::LocalIdentity(&rng); // create new random identity } - diff --git a/variants/lilygo_tbeam_1w/target.cpp b/variants/lilygo_tbeam_1w/target.cpp index 6755df09..db11747f 100644 --- a/variants/lilygo_tbeam_1w/target.cpp +++ b/variants/lilygo_tbeam_1w/target.cpp @@ -19,7 +19,8 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include - MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); + NmeaGpsDriver gps_driver(Serial1); + MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; @@ -47,4 +48,3 @@ mesh::LocalIdentity radio_new_identity() { RadioNoiseListener rng(radio); return mesh::LocalIdentity(&rng); } - diff --git a/variants/lilygo_tbeam_SX1262/target.cpp b/variants/lilygo_tbeam_SX1262/target.cpp index 6e5292a7..b97dda41 100644 --- a/variants/lilygo_tbeam_SX1262/target.cpp +++ b/variants/lilygo_tbeam_SX1262/target.cpp @@ -17,7 +17,8 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include - MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); + NmeaGpsDriver gps_driver(Serial1); + MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; @@ -38,4 +39,3 @@ mesh::LocalIdentity radio_new_identity() { RadioNoiseListener rng(radio); return mesh::LocalIdentity(&rng); // create new random identity } - diff --git a/variants/lilygo_tbeam_SX1276/target.cpp b/variants/lilygo_tbeam_SX1276/target.cpp index 30f23dab..be7c8287 100644 --- a/variants/lilygo_tbeam_SX1276/target.cpp +++ b/variants/lilygo_tbeam_SX1276/target.cpp @@ -17,7 +17,8 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include - MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); + NmeaGpsDriver gps_driver(Serial1); + MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; diff --git a/variants/lilygo_tbeam_supreme_SX1262/target.cpp b/variants/lilygo_tbeam_supreme_SX1262/target.cpp index a0b765bf..86b9116c 100644 --- a/variants/lilygo_tbeam_supreme_SX1262/target.cpp +++ b/variants/lilygo_tbeam_supreme_SX1262/target.cpp @@ -19,7 +19,8 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include - MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); + NmeaGpsDriver gps_driver(Serial1); + MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; @@ -35,4 +36,3 @@ mesh::LocalIdentity radio_new_identity() { RadioNoiseListener rng(radio); return mesh::LocalIdentity(&rng); // create new random identity } - diff --git a/variants/lilygo_tdeck/target.cpp b/variants/lilygo_tdeck/target.cpp index d20c56a3..4084a73b 100644 --- a/variants/lilygo_tdeck/target.cpp +++ b/variants/lilygo_tdeck/target.cpp @@ -14,7 +14,8 @@ WRAPPER_CLASS radio_driver(radio, board); ESP32RTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); -MicroNMEALocationProvider gps(Serial1, &rtc_clock); +NmeaGpsDriver gps_driver(Serial1); +MicroNMEALocationProvider gps(gps_driver, &rtc_clock); EnvironmentSensorManager sensors(gps); #ifdef DISPLAY_CLASS diff --git a/variants/lilygo_techo_card/target.cpp b/variants/lilygo_techo_card/target.cpp index 8bbe0363..ea74bd0c 100644 --- a/variants/lilygo_techo_card/target.cpp +++ b/variants/lilygo_techo_card/target.cpp @@ -13,7 +13,8 @@ VolatileRTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef ENV_INCLUDE_GPS -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); +NmeaGpsDriver gps_driver(Serial1); +MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors = EnvironmentSensorManager(); diff --git a/variants/lilygo_techo_lite/target.cpp b/variants/lilygo_techo_lite/target.cpp index 95a62fcd..6d199fff 100644 --- a/variants/lilygo_techo_lite/target.cpp +++ b/variants/lilygo_techo_lite/target.cpp @@ -13,7 +13,8 @@ VolatileRTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef ENV_INCLUDE_GPS -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); +NmeaGpsDriver gps_driver(Serial1); +MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors = EnvironmentSensorManager(); @@ -35,4 +36,3 @@ mesh::LocalIdentity radio_new_identity() { return mesh::LocalIdentity(&rng); // create new random identity } - diff --git a/variants/meshadventurer/target.cpp b/variants/meshadventurer/target.cpp index 8795a4cb..faf2e30e 100644 --- a/variants/meshadventurer/target.cpp +++ b/variants/meshadventurer/target.cpp @@ -11,7 +11,8 @@ WRAPPER_CLASS radio_driver(radio, board); ESP32RTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); +NmeaGpsDriver gps_driver(Serial1); +MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); MASensorManager sensors = MASensorManager(nmea); #ifdef DISPLAY_CLASS @@ -37,17 +38,13 @@ mesh::LocalIdentity radio_new_identity() { void MASensorManager::start_gps() { - if(!gps_active) { - MESH_DEBUG_PRINTLN("starting GPS"); - gps_active = true; - } + MESH_DEBUG_PRINTLN("starting GPS"); + _location->setGpsOn(true); } void MASensorManager::stop_gps() { - if(gps_active) { - MESH_DEBUG_PRINTLN("stopping GPS"); - gps_active = false; - } + MESH_DEBUG_PRINTLN("stopping GPS"); + _location->setGpsOn(false); } bool MASensorManager::begin() { @@ -67,7 +64,7 @@ bool MASensorManager::querySensors(uint8_t requester_permissions, CayenneLPP& te void MASensorManager::loop() { static long next_gps_update = 0; _location->loop(); - if(millis() > next_gps_update && gps_active) { + if(millis() > next_gps_update && _location->isEnabled()) { if(_location->isValid()) { node_lat = ((double)_location->getLatitude()) / 1000000.; node_lon = ((double)_location->getLongitude()) / 1000000.; @@ -85,7 +82,7 @@ const char* MASensorManager::getSettingName(int i) const { } const char* MASensorManager::getSettingValue(int i) const { if(i == 0) { - return gps_active ? "1" : "0"; + return _location->isGpsOn() ? "1" : "0"; } return NULL; } diff --git a/variants/meshadventurer/target.h b/variants/meshadventurer/target.h index 0749565d..9581d422 100644 --- a/variants/meshadventurer/target.h +++ b/variants/meshadventurer/target.h @@ -15,8 +15,7 @@ #endif class MASensorManager : public SensorManager { - bool gps_active = false; - LocationProvider * _location; + LocationProvider* _location; void start_gps(); void stop_gps(); diff --git a/variants/meshnology_w12/target.cpp b/variants/meshnology_w12/target.cpp index bf04ba36..a3d6089f 100644 --- a/variants/meshnology_w12/target.cpp +++ b/variants/meshnology_w12/target.cpp @@ -17,7 +17,8 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include - MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); + NmeaGpsDriver gps_driver(Serial1); + MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; @@ -70,4 +71,3 @@ mesh::LocalIdentity radio_new_identity() { RadioNoiseListener rng(radio); return mesh::LocalIdentity(&rng); // create new random identity } - diff --git a/variants/meshtracker_x1/target.cpp b/variants/meshtracker_x1/target.cpp index 5b90d660..2dee0ebd 100644 --- a/variants/meshtracker_x1/target.cpp +++ b/variants/meshtracker_x1/target.cpp @@ -1,7 +1,7 @@ #include #include "target.h" +#include #include -#include MeshTrackerX1Board board; @@ -10,7 +10,8 @@ RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BU WRAPPER_CLASS radio_driver(radio, board); VolatileRTCClock rtc_clock; -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); +AirohaGpsDriver gps_driver(Serial1); +MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); MeshTrackerX1SensorManager sensors = MeshTrackerX1SensorManager(nmea); #ifdef DISPLAY_CLASS @@ -27,28 +28,16 @@ mesh::LocalIdentity radio_new_identity() { } void MeshTrackerX1SensorManager::start_gps() { - gps_active = true; - digitalWrite(GPS_EN, HIGH); - delay(10); - digitalWrite(GPS_RTC_INT, HIGH); - delay(5); - digitalWrite(GPS_RTC_INT, LOW); + _nmea->setGpsOn(true); } void MeshTrackerX1SensorManager::stop_gps() { - gps_active = false; - digitalWrite(GPS_VRTC_EN, HIGH); // keep GPS RTC alive for faster fix on wake - digitalWrite(GPS_RTC_INT, LOW); // make sure this is LOW so we can pulse it to wake - airohaEnterSleep(_nmea); - digitalWrite(GPS_EN, LOW); + _nmea->setGpsOn(false); } bool MeshTrackerX1SensorManager::begin() { // init GPS - Serial1.begin(GPS_BAUD_RATE); - digitalWrite(GPS_RESET, HIGH); - delay(10); - digitalWrite(GPS_RESET, LOW); + gps_driver.initialize(); // init SPA06-003 barometer baro_ok = spa06.begin(SPA06_003_DEFAULT_ADDR, &Wire) || spa06.begin(0x76, &Wire); @@ -81,7 +70,7 @@ void MeshTrackerX1SensorManager::loop() { _nmea->loop(); if (millis() > next_gps_update) { - if (gps_active && _nmea->isValid()) { + if (_nmea->isEnabled() && _nmea->isValid()) { node_lat = ((double)_nmea->getLatitude())/1000000.; node_lon = ((double)_nmea->getLongitude())/1000000.; node_altitude = ((double)_nmea->getAltitude()) / 1000.0; @@ -97,7 +86,7 @@ const char* MeshTrackerX1SensorManager::getSettingName(int i) const { } const char* MeshTrackerX1SensorManager::getSettingValue(int i) const { if (i == 0) { - return gps_active ? "1" : "0"; + return _nmea->isGpsOn() ? "1" : "0"; } return NULL; } diff --git a/variants/meshtracker_x1/target.h b/variants/meshtracker_x1/target.h index 9741efb6..e678e29c 100644 --- a/variants/meshtracker_x1/target.h +++ b/variants/meshtracker_x1/target.h @@ -14,13 +14,11 @@ #endif class MeshTrackerX1SensorManager: public SensorManager { - bool gps_active = false; bool baro_ok = false; Adafruit_SPA06_003 spa06; LocationProvider * _nmea; void start_gps(); - void sleep_gps(); void stop_gps(); public: MeshTrackerX1SensorManager(LocationProvider &nmea): _nmea(&nmea) { } diff --git a/variants/minewsemi_me25ls01/target.cpp b/variants/minewsemi_me25ls01/target.cpp index 41fc71a7..8d9a6e07 100644 --- a/variants/minewsemi_me25ls01/target.cpp +++ b/variants/minewsemi_me25ls01/target.cpp @@ -10,7 +10,8 @@ VolatileRTCClock rtc_clock; extern EnvironmentSensorManager sensors; #if ENV_INCLUDE_GPS #include - MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); + NmeaGpsDriver gps_driver(Serial1); + MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; diff --git a/variants/muzi_base/target.cpp b/variants/muzi_base/target.cpp index 5bd846c9..b65bafa1 100644 --- a/variants/muzi_base/target.cpp +++ b/variants/muzi_base/target.cpp @@ -13,7 +13,8 @@ VolatileRTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include - MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); + NmeaGpsDriver gps_driver(Serial1); + MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); MuziBaseSensorManager sensors = MuziBaseSensorManager(nmea); #else MuziBaseSensorManager sensors; @@ -38,13 +39,7 @@ static void muziPowerOff() { bool MuziBaseSensorManager::begin() { pwr_btn.begin(); - bool ok = EnvironmentSensorManager::begin(); -#if ENV_INCLUDE_GPS - pinMode(PIN_GPS_SWITCH, INPUT); - _last_gps_sw = digitalRead(PIN_GPS_SWITCH); // initial gps state from the switch - if (_last_gps_sw == HIGH) start_gps(); else stop_gps(); -#endif - return ok; + return EnvironmentSensorManager::begin(); } void MuziBaseSensorManager::loop() { @@ -55,17 +50,6 @@ void MuziBaseSensorManager::loop() { _pwr_last_click = t; if (++_pwr_clicks >= USER_BTN_POWER_OFF_CLICKS) muziPowerOff(); } -#if ENV_INCLUDE_GPS - unsigned long now = millis(); - if (now > _next_sw_check) { // check the mode switch ~once a sec - _next_sw_check = now + 1000; - int sw = digitalRead(PIN_GPS_SWITCH); - if (sw != _last_gps_sw) { - _last_gps_sw = sw; - if (sw == HIGH) start_gps(); else stop_gps(); - } - } -#endif EnvironmentSensorManager::loop(); } diff --git a/variants/muzi_base/target.h b/variants/muzi_base/target.h index 45cd595f..3f7dcbf5 100644 --- a/variants/muzi_base/target.h +++ b/variants/muzi_base/target.h @@ -38,14 +38,10 @@ extern AutoDiscoverRTCClock rtc_clock; // muzi sensor manager, polled from main loop via sensors.loop(): // - user button: USER_BTN_POWER_OFF_CLICKS quick presses -> power off (all builds) -// - gps mode switch on/off (superIO only, see thinknode_m1) +// gps mode is now handled by GpsDriver on superIO class MuziBaseSensorManager : public EnvironmentSensorManager { unsigned long _pwr_last_click = 0; uint8_t _pwr_clicks = 0; -#if ENV_INCLUDE_GPS - int _last_gps_sw = -1; - unsigned long _next_sw_check = 0; -#endif public: #if ENV_INCLUDE_GPS MuziBaseSensorManager(LocationProvider& location) : EnvironmentSensorManager(location) {} diff --git a/variants/muzi_base/variant.h b/variants/muzi_base/variant.h index b007c1f8..0c1245a8 100644 --- a/variants/muzi_base/variant.h +++ b/variants/muzi_base/variant.h @@ -162,6 +162,8 @@ static const uint8_t AREF = (PIN_AREF); // not used #define SWITCH_MODE1 (32+9) // P1.09 #define SWITCH_MODE2 (12) // P0.12 #define PIN_GPS_SWITCH SWITCH_MODE2 +#define GPS_SWITCH_IS_HARDWARE (0) +#define GPS_SWITCH_TURNS_GPS_ON (1) //////////////////////////////////////////////////////////////////////////////// // Buzzer diff --git a/variants/muziworks_r1_neo/target.cpp b/variants/muziworks_r1_neo/target.cpp index f667a282..3081de2c 100644 --- a/variants/muziworks_r1_neo/target.cpp +++ b/variants/muziworks_r1_neo/target.cpp @@ -20,7 +20,8 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include - MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); + NmeaGpsDriver gps_driver(Serial1); + MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; diff --git a/variants/nano_g2_ultra/NanoG2UltraGpsDriver.h b/variants/nano_g2_ultra/NanoG2UltraGpsDriver.h new file mode 100644 index 00000000..3772084b --- /dev/null +++ b/variants/nano_g2_ultra/NanoG2UltraGpsDriver.h @@ -0,0 +1,31 @@ +#pragma once + +#include + +class NanoG2UltraGpsDriver : public NmeaGpsDriver { +public: + NanoG2UltraGpsDriver(HardwareSerial& serial) : NmeaGpsDriver(serial) { + pinMode(PIN_GPS_STANDBY, OUTPUT); + digitalWrite(PIN_GPS_STANDBY, LOW); + } + + void begin() override { + if (isEnabled()) return; + + digitalWrite(PIN_GPS_STANDBY, HIGH); + NmeaGpsDriver::begin(); + delay(1000); + } + + void stop() override { + NmeaGpsDriver::stop(); + digitalWrite(PIN_GPS_STANDBY, LOW); + } + + bool detectAtBoot() { + begin(); + const bool wasActive = detect(0); + if (!wasActive) stop(); + return wasActive; + } +}; diff --git a/variants/nano_g2_ultra/target.cpp b/variants/nano_g2_ultra/target.cpp index 69a2772c..ee258f2d 100644 --- a/variants/nano_g2_ultra/target.cpp +++ b/variants/nano_g2_ultra/target.cpp @@ -3,6 +3,7 @@ #include #include #include +#include "NanoG2UltraGpsDriver.h" NanoG2Ultra board; @@ -12,8 +13,10 @@ WRAPPER_CLASS radio_driver(radio, board); VolatileRTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); -NanoG2UltraSensorManager sensors = NanoG2UltraSensorManager(nmea); +// NanoG2UltraGpsDriver now handles the special init needed for NanoG2 +NanoG2UltraGpsDriver gps_driver(Serial1); +MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); +NanoG2UltraSensorManager sensors = NanoG2UltraSensorManager(nmea, gps_driver); #ifdef DISPLAY_CLASS DISPLAY_CLASS display; @@ -27,35 +30,19 @@ bool radio_init() { void NanoG2UltraSensorManager::start_gps() { MESH_DEBUG_PRINTLN("Starting GPS"); - if (!gps_active) { - digitalWrite(PIN_GPS_STANDBY, HIGH); // Wake GPS from standby - Serial1.setPins(PIN_GPS_TX, PIN_GPS_RX); - Serial1.begin(9600); - MESH_DEBUG_PRINTLN("Waiting for gps to power up"); - delay(1000); - gps_active = true; - } - _location->begin(); + _location->setGpsOn(true); } void NanoG2UltraSensorManager::stop_gps() { MESH_DEBUG_PRINTLN("Stopping GPS"); - if (gps_active) { - digitalWrite(PIN_GPS_STANDBY, LOW); // sleep GPS - gps_active = false; - } - _location->stop(); + _location->setGpsOn(false); } bool NanoG2UltraSensorManager::begin() { - digitalWrite(PIN_GPS_STANDBY, HIGH); // Wake GPS from standby - Serial1.setPins(PIN_GPS_TX, PIN_GPS_RX); - Serial1.begin(9600); MESH_DEBUG_PRINTLN("Checking GPS switch state"); - delay(1000); // Check initial switch state to determine if GPS should be active - if (Serial1.available() > 0) { + if (_gps_driver->detectAtBoot()) { MESH_DEBUG_PRINTLN("GPS was on at boot, GPS enabled"); start_gps(); } else { @@ -75,14 +62,14 @@ bool NanoG2UltraSensorManager::querySensors(uint8_t requester_permissions, Cayen void NanoG2UltraSensorManager::loop() { static long next_gps_update = 0; - if (!gps_active) { + if (!_location->isEnabled()) { return; // GPS is not active, skip further processing } _location->loop(); if (millis() > next_gps_update) { - if (_location->isValid()) { + if (_location->isEnabled() && _location->isValid()) { node_lat = ((double)_location->getLatitude()) / 1000000.; node_lon = ((double)_location->getLongitude()) / 1000000.; node_altitude = ((double)_location->getAltitude()) / 1000.0; @@ -105,7 +92,7 @@ const char *NanoG2UltraSensorManager::getSettingName(int i) const { const char *NanoG2UltraSensorManager::getSettingValue(int i) const { if (i == 0) { - return gps_active ? "1" : "0"; + return _location->isGpsOn() ? "1" : "0"; } return NULL; } diff --git a/variants/nano_g2_ultra/target.h b/variants/nano_g2_ultra/target.h index 5c6ebee1..d540b9ec 100644 --- a/variants/nano_g2_ultra/target.h +++ b/variants/nano_g2_ultra/target.h @@ -14,15 +14,18 @@ #endif #include +class NanoG2UltraGpsDriver; + class NanoG2UltraSensorManager : public SensorManager { - bool gps_active = false; LocationProvider *_location; + NanoG2UltraGpsDriver *_gps_driver; void start_gps(); void stop_gps(); public: - NanoG2UltraSensorManager(LocationProvider &location) : _location(&location) {} + NanoG2UltraSensorManager(LocationProvider &location, NanoG2UltraGpsDriver &gps_driver) + : _location(&location), _gps_driver(&gps_driver) {} bool begin() override; bool querySensors(uint8_t requester_permissions, CayenneLPP &telemetry) override; void loop() override; @@ -44,4 +47,3 @@ extern MomentaryButton user_btn; bool radio_init(); mesh::LocalIdentity radio_new_identity(); - diff --git a/variants/promicro/target.cpp b/variants/promicro/target.cpp index b5a74c90..5758d9cd 100644 --- a/variants/promicro/target.cpp +++ b/variants/promicro/target.cpp @@ -12,7 +12,8 @@ VolatileRTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include - MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); + NmeaGpsDriver gps_driver(Serial1); + MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; @@ -34,4 +35,3 @@ mesh::LocalIdentity radio_new_identity() { return mesh::LocalIdentity(&rng); // create new random identity } - diff --git a/variants/rak3112/target.cpp b/variants/rak3112/target.cpp index 9df1bf8f..9b1d11a0 100644 --- a/variants/rak3112/target.cpp +++ b/variants/rak3112/target.cpp @@ -17,7 +17,8 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include - MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); + NmeaGpsDriver gps_driver(Serial1); + MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; @@ -43,4 +44,3 @@ mesh::LocalIdentity radio_new_identity() { RadioNoiseListener rng(radio); return mesh::LocalIdentity(&rng); // create new random identity } - diff --git a/variants/rak_wismesh_tag/target.cpp b/variants/rak_wismesh_tag/target.cpp index cdf81f4f..3e80ae63 100644 --- a/variants/rak_wismesh_tag/target.cpp +++ b/variants/rak_wismesh_tag/target.cpp @@ -22,7 +22,8 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include - MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); + NmeaGpsDriver gps_driver(Serial1); + MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; @@ -37,4 +38,3 @@ mesh::LocalIdentity radio_new_identity() { RadioNoiseListener rng(radio); return mesh::LocalIdentity(&rng); // create new random identity } - diff --git a/variants/sensecap_indicator-espnow/target.cpp b/variants/sensecap_indicator-espnow/target.cpp index c84d1883..4895447c 100644 --- a/variants/sensecap_indicator-espnow/target.cpp +++ b/variants/sensecap_indicator-espnow/target.cpp @@ -8,7 +8,8 @@ ESPNOWRadio radio_driver; ESP32RTCClock rtc_clock; #if defined(ENV_INCLUDE_GPS) -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, (mesh::RTCClock*)&rtc_clock); +NmeaGpsDriver gps_driver(Serial1); +MicroNMEALocationProvider nmea(gps_driver, (mesh::RTCClock*)&rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors = EnvironmentSensorManager(); diff --git a/variants/sensecap_solar/target.cpp b/variants/sensecap_solar/target.cpp index 46641517..11586ecd 100644 --- a/variants/sensecap_solar/target.cpp +++ b/variants/sensecap_solar/target.cpp @@ -13,7 +13,8 @@ WRAPPER_CLASS radio_driver(radio, board); VolatileRTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef ENV_INCLUDE_GPS -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); +NmeaGpsDriver gps_driver(Serial1); +MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors = EnvironmentSensorManager(); @@ -29,4 +30,3 @@ mesh::LocalIdentity radio_new_identity() { RadioNoiseListener rng(radio); return mesh::LocalIdentity(&rng); // create new random identity } - diff --git a/variants/station_g2/target.cpp b/variants/station_g2/target.cpp index 8018c20e..f5365eb5 100644 --- a/variants/station_g2/target.cpp +++ b/variants/station_g2/target.cpp @@ -17,7 +17,8 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include - MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); + NmeaGpsDriver gps_driver(Serial1); + MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; @@ -44,4 +45,3 @@ mesh::LocalIdentity radio_new_identity() { RadioNoiseListener rng(radio); return mesh::LocalIdentity(&rng); // create new random identity } - diff --git a/variants/station_g3_esp32/target.cpp b/variants/station_g3_esp32/target.cpp index d3de074b..189169d2 100644 --- a/variants/station_g3_esp32/target.cpp +++ b/variants/station_g3_esp32/target.cpp @@ -17,7 +17,8 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include - MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); + NmeaGpsDriver gps_driver(Serial1); + MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; diff --git a/variants/t1000-e/target.cpp b/variants/t1000-e/target.cpp index 0d7710b3..b96d01f8 100644 --- a/variants/t1000-e/target.cpp +++ b/variants/t1000-e/target.cpp @@ -82,13 +82,11 @@ mesh::LocalIdentity radio_new_identity() { } void T1000SensorManager::start_gps() { - gps_active = true; - _nmea->begin(); + _nmea->setGpsOn(true); } void T1000SensorManager::stop_gps() { - gps_active = false; - _nmea->stop(); + _nmea->setGpsOn(false); } @@ -115,7 +113,7 @@ void T1000SensorManager::loop() { _nmea->loop(); if (millis() > next_gps_update) { - if (gps_active && _nmea->isValid()) { + if (_nmea->isEnabled() && _nmea->isValid()) { node_lat = ((double)_nmea->getLatitude())/1000000.; node_lon = ((double)_nmea->getLongitude())/1000000.; node_altitude = ((double)_nmea->getAltitude()) / 1000.0; @@ -131,7 +129,7 @@ const char* T1000SensorManager::getSettingName(int i) const { } const char* T1000SensorManager::getSettingValue(int i) const { if (i == 0) { - return gps_active ? "1" : "0"; + return _nmea->isGpsOn() ? "1" : "0"; } return NULL; } diff --git a/variants/t1000-e/target.h b/variants/t1000-e/target.h index 4a1a2bb7..68508bcb 100644 --- a/variants/t1000-e/target.h +++ b/variants/t1000-e/target.h @@ -15,7 +15,6 @@ class AirohaGpsDriver; class T1000SensorManager: public SensorManager { - bool gps_active = false; LocationProvider * _nmea; AirohaGpsDriver* _gps_driver; diff --git a/variants/thinknode_m3/target.cpp b/variants/thinknode_m3/target.cpp index 1e6c2ad1..bb5746ca 100644 --- a/variants/thinknode_m3/target.cpp +++ b/variants/thinknode_m3/target.cpp @@ -11,7 +11,8 @@ WRAPPER_CLASS radio_driver(radio, board); VolatileRTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef ENV_INCLUDE_GPS -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); +NmeaGpsDriver gps_driver(Serial1); +MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors = EnvironmentSensorManager(); diff --git a/variants/thinknode_m4/target.cpp b/variants/thinknode_m4/target.cpp index 7da3f400..59a898f5 100644 --- a/variants/thinknode_m4/target.cpp +++ b/variants/thinknode_m4/target.cpp @@ -11,7 +11,8 @@ WRAPPER_CLASS radio_driver(radio, board); VolatileRTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef ENV_INCLUDE_GPS -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); +NmeaGpsDriver gps_driver(Serial1); +MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors = EnvironmentSensorManager(); diff --git a/variants/thinknode_m6/target.cpp b/variants/thinknode_m6/target.cpp index de167194..061f7ad4 100644 --- a/variants/thinknode_m6/target.cpp +++ b/variants/thinknode_m6/target.cpp @@ -12,7 +12,8 @@ WRAPPER_CLASS radio_driver(radio, board); VolatileRTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef ENV_INCLUDE_GPS -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); +NmeaGpsDriver gps_driver(Serial1); +MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors = EnvironmentSensorManager(); @@ -32,4 +33,3 @@ mesh::LocalIdentity radio_new_identity() { RadioNoiseListener rng(radio); return mesh::LocalIdentity(&rng); // create new random identity } - diff --git a/variants/thinknode_m7/target.cpp b/variants/thinknode_m7/target.cpp index f4b898d8..8e7e8a05 100644 --- a/variants/thinknode_m7/target.cpp +++ b/variants/thinknode_m7/target.cpp @@ -12,7 +12,8 @@ ESP32RTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef ENV_INCLUDE_GPS -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); +NmeaGpsDriver gps_driver(Serial1); +MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors = EnvironmentSensorManager(); @@ -81,4 +82,3 @@ mesh::LocalIdentity radio_new_identity() { return mesh::LocalIdentity(&rng); // create new random identity } - diff --git a/variants/thinknode_m8/target.cpp b/variants/thinknode_m8/target.cpp index 69f3cc52..04496d3f 100644 --- a/variants/thinknode_m8/target.cpp +++ b/variants/thinknode_m8/target.cpp @@ -13,7 +13,8 @@ WRAPPER_CLASS radio_driver(radio, board); VolatileRTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef ENV_INCLUDE_GPS -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); +NmeaGpsDriver gps_driver(Serial1); +MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors = EnvironmentSensorManager(); diff --git a/variants/thinknode_m9/target.cpp b/variants/thinknode_m9/target.cpp index 3cbd7d75..990f0388 100644 --- a/variants/thinknode_m9/target.cpp +++ b/variants/thinknode_m9/target.cpp @@ -11,7 +11,8 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef ENV_INCLUDE_GPS #include -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); +NmeaGpsDriver gps_driver(Serial1); +MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors = EnvironmentSensorManager(); diff --git a/variants/wio-tracker-l1-1w/target.cpp b/variants/wio-tracker-l1-1w/target.cpp index 7a573258..cd4b8dac 100644 --- a/variants/wio-tracker-l1-1w/target.cpp +++ b/variants/wio-tracker-l1-1w/target.cpp @@ -13,7 +13,8 @@ VolatileRTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef ENV_INCLUDE_GPS -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); +NmeaGpsDriver gps_driver(Serial1); +MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors = EnvironmentSensorManager(); @@ -37,4 +38,3 @@ mesh::LocalIdentity radio_new_identity() { RadioNoiseListener rng(radio); return mesh::LocalIdentity(&rng); // create new random identity } - diff --git a/variants/wio-tracker-l1/target.cpp b/variants/wio-tracker-l1/target.cpp index 7a573258..cd4b8dac 100644 --- a/variants/wio-tracker-l1/target.cpp +++ b/variants/wio-tracker-l1/target.cpp @@ -13,7 +13,8 @@ VolatileRTCClock fallback_clock; AutoDiscoverRTCClock rtc_clock(fallback_clock); #ifdef ENV_INCLUDE_GPS -MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); +NmeaGpsDriver gps_driver(Serial1); +MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors = EnvironmentSensorManager(); @@ -37,4 +38,3 @@ mesh::LocalIdentity radio_new_identity() { RadioNoiseListener rng(radio); return mesh::LocalIdentity(&rng); // create new random identity } - diff --git a/variants/xiao_c3/target.cpp b/variants/xiao_c3/target.cpp index 7f30dc8b..d3bbdf1c 100644 --- a/variants/xiao_c3/target.cpp +++ b/variants/xiao_c3/target.cpp @@ -17,7 +17,8 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock); #if ENV_INCLUDE_GPS #include - MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock); + NmeaGpsDriver gps_driver(Serial1); + MicroNMEALocationProvider nmea(gps_driver, &rtc_clock); EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea); #else EnvironmentSensorManager sensors; @@ -39,4 +40,3 @@ mesh::LocalIdentity radio_new_identity() { RadioNoiseListener rng(radio); return mesh::LocalIdentity(&rng); // create new random identity } -