From 38fa18efb76c5a5abca3958a512fbb2fb4aed526 Mon Sep 17 00:00:00 2001 From: Florent Date: Thu, 5 Nov 2026 10:16:28 -0400 Subject: [PATCH] gps: move detection into LocationProvider, remove the legacy constructor --- .../sensors/EnvironmentSensorManager.cpp | 23 ++----------------- src/helpers/sensors/LocationProvider.h | 16 +++++++++++++ .../sensors/MicroNMEALocationProvider.h | 16 ------------- 3 files changed, 18 insertions(+), 37 deletions(-) diff --git a/src/helpers/sensors/EnvironmentSensorManager.cpp b/src/helpers/sensors/EnvironmentSensorManager.cpp index ee942df14..eafa11a3c 100644 --- a/src/helpers/sensors/EnvironmentSensorManager.cpp +++ b/src/helpers/sensors/EnvironmentSensorManager.cpp @@ -696,31 +696,12 @@ bool EnvironmentSensorManager::setSettingValue(const char* name, const char* val #if ENV_INCLUDE_GPS void EnvironmentSensorManager::initBasicGPS() { - start_gps(); - #ifndef PIN_GPS_EN MESH_DEBUG_PRINTLN("No GPS wake/reset pin found for this board. Continuing on..."); #endif -#ifdef ENV_SKIP_GPS_DETECT - gps_detected = true; -#else - gps_detected = _location->detect(5000); -#endif - - if (gps_detected) { - MESH_DEBUG_PRINTLN("GPS detected"); - #if defined(PERSISTANT_GPS) - return; - #else - if (_location->keepEnabledAfterDetection()) { - return; - } - #endif - } else { - MESH_DEBUG_PRINTLN("No GPS detected"); - } - stop_gps(); + gps_detected = _location->autoDetect(); + MESH_DEBUG_PRINTLN("%s", gps_detected ? "GPS detected" : "No GPS detected"); } void EnvironmentSensorManager::start_gps() { diff --git a/src/helpers/sensors/LocationProvider.h b/src/helpers/sensors/LocationProvider.h index 3d7abd7ae..ad2bba1d3 100644 --- a/src/helpers/sensors/LocationProvider.h +++ b/src/helpers/sensors/LocationProvider.h @@ -61,6 +61,22 @@ public: virtual void drain() { } virtual bool detect(uint32_t timeout_ms) { return false; } virtual bool keepEnabledAfterDetection() const { return false; } + // Power on, detect, then leave the GPS on or off as the board wants. + // Returns true if a GPS is present. + virtual bool autoDetect() { + setGpsOn(true); + #ifdef ENV_SKIP_GPS_DETECT + bool found = true; + #else + bool found = detect(5000); + #endif + #ifdef PERSISTANT_GPS + if (found) return true; + #endif + if (found && keepEnabledAfterDetection()) return true; + setGpsOn(false); + return found; + } virtual void setGpsPeriod(uint32_t seconds) { } virtual uint32_t getGpsPeriod() const { return 0; } virtual uint32_t getLastFixAge() const { // in seconds, UINT32_MAX if never diff --git a/src/helpers/sensors/MicroNMEALocationProvider.h b/src/helpers/sensors/MicroNMEALocationProvider.h index dddcce197..ea87ad193 100644 --- a/src/helpers/sensors/MicroNMEALocationProvider.h +++ b/src/helpers/sensors/MicroNMEALocationProvider.h @@ -24,7 +24,6 @@ class MicroNMEALocationProvider : public LocationProvider { MicroNMEA nmea; mesh::RTCClock* _clock; NmeaGpsDriver* _driver; - bool _ownsDriver = false; unsigned long next_check = 0; long time_valid = 0; unsigned long _last_time_sync = 0; @@ -118,21 +117,6 @@ public: MicroNMEALocationProvider(NmeaGpsDriver& driver, mesh::RTCClock* clock = nullptr) : nmea(_nmeaBuffer, sizeof(_nmeaBuffer)), _clock(clock), _driver(&driver) {} - // Temporary migration adapter for targets and downstream boards. New code - // should inject a GpsDriver; this constructor will be removed once targets - // have been migrated. - MicroNMEALocationProvider(UART_TYPE& serial, mesh::RTCClock* clock = nullptr, - int pin_reset = GPS_RESET, int pin_en = GPS_EN, - RefCountedDigitalPin* peripher_power = nullptr) - : nmea(_nmeaBuffer, sizeof(_nmeaBuffer)), _clock(clock), - _driver(new NmeaGpsDriver(serial, PIN_GPS_TX, PIN_GPS_RX, pin_reset, pin_en, - peripher_power)), - _ownsDriver(true) {} - - ~MicroNMEALocationProvider() override { - if (_ownsDriver) delete _driver; - } - void begin() override { _begin_calls++; const bool wasActive = _driver->isActive();