Merge remote-tracking branch 'upstream/dev' into 2026/remote-lna

2026-04-20 22:13:47 +00:00 · 2026-03-16 09:37:55 +00:00 · 2026-03-16 09:37:55 +00:00 · 274e00df50
commit 274e00df50
parent 75895895f0 5ac8ab2a62
74 changed files with 1019 additions and 713 deletions
--- a/variants/heltec_mesh_solar/target.cpp
+++ b/variants/heltec_mesh_solar/target.cpp
@ -11,7 +11,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 VolatileRTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
-MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
+MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
 SolarSensorManager sensors = SolarSensorManager(nmea);

 #ifdef DISPLAY_CLASS
--- a/variants/heltec_tracker_v2/HeltecTrackerV2Board.cpp
+++ b/variants/heltec_tracker_v2/HeltecTrackerV2Board.cpp
@ -6,19 +6,7 @@ void HeltecTrackerV2Board::begin() {
    pinMode(PIN_ADC_CTRL, OUTPUT);
    digitalWrite(PIN_ADC_CTRL, LOW); // Initially inactive

-    // Set up digital GPIO registers before releasing RTC hold. The hold latches
-    // the pad state including function select, so register writes accumulate
-    // without affecting the pad. On hold release, all changes apply atomically
-    // (IO MUX switches to digital GPIO with output already HIGH — no glitch).
-    pinMode(P_LORA_PA_POWER, OUTPUT);
-    digitalWrite(P_LORA_PA_POWER,HIGH);
-    rtc_gpio_hold_dis((gpio_num_t)P_LORA_PA_POWER);
-
-    pinMode(P_LORA_PA_EN, OUTPUT);
-    digitalWrite(P_LORA_PA_EN,HIGH);
-    rtc_gpio_hold_dis((gpio_num_t)P_LORA_PA_EN);
-    pinMode(P_LORA_PA_TX_EN, OUTPUT);
-    digitalWrite(P_LORA_PA_TX_EN,LOW);
+    loRaFEMControl.init();

    esp_reset_reason_t reason = esp_reset_reason();
    if (reason != ESP_RST_DEEPSLEEP) {
@ -39,12 +27,12 @@ void HeltecTrackerV2Board::begin() {

  void HeltecTrackerV2Board::onBeforeTransmit(void) {
    digitalWrite(P_LORA_TX_LED, HIGH);   // turn TX LED on
-    digitalWrite(P_LORA_PA_TX_EN,HIGH);
+    loRaFEMControl.setTxModeEnable();
  }

  void HeltecTrackerV2Board::onAfterTransmit(void) {
    digitalWrite(P_LORA_TX_LED, LOW);   // turn TX LED off
-    digitalWrite(P_LORA_PA_TX_EN,LOW);
+    loRaFEMControl.setRxModeEnable();
  }

  void HeltecTrackerV2Board::enterDeepSleep(uint32_t secs, int pin_wake_btn) {
@ -56,9 +44,7 @@ void HeltecTrackerV2Board::begin() {

    rtc_gpio_hold_en((gpio_num_t)P_LORA_NSS);

-    // Hold GC1109 FEM pins during sleep to keep LNA active for RX wake
-    rtc_gpio_hold_en((gpio_num_t)P_LORA_PA_POWER);
-    rtc_gpio_hold_en((gpio_num_t)P_LORA_PA_EN);
+    loRaFEMControl.setRxModeEnableWhenMCUSleep();//It also needs to be enabled in receive mode

    if (pin_wake_btn < 0) {
      esp_sleep_enable_ext1_wakeup( (1L << P_LORA_DIO_1), ESP_EXT1_WAKEUP_ANY_HIGH);  // wake up on: recv LoRa packet
--- a/variants/heltec_tracker_v2/HeltecTrackerV2Board.h
+++ b/variants/heltec_tracker_v2/HeltecTrackerV2Board.h
@ -4,11 +4,13 @@
 #include <helpers/RefCountedDigitalPin.h>
 #include <helpers/ESP32Board.h>
 #include <driver/rtc_io.h>
+#include "LoRaFEMControl.h"

 class HeltecTrackerV2Board : public ESP32Board {

 public:
  RefCountedDigitalPin periph_power;
+  LoRaFEMControl loRaFEMControl;

  HeltecTrackerV2Board() : periph_power(PIN_VEXT_EN,PIN_VEXT_EN_ACTIVE) { }

--- a/variants/heltec_tracker_v2/LoRaFEMControl.cpp
+++ b/variants/heltec_tracker_v2/LoRaFEMControl.cpp
@ -0,0 +1,58 @@
+#include "LoRaFEMControl.h"
+#include <driver/rtc_io.h>
+#include <esp_sleep.h>
+#include <Arduino.h>
+
+void LoRaFEMControl::init(void)
+{
+    pinMode(P_LORA_PA_POWER, OUTPUT);
+    digitalWrite(P_LORA_PA_POWER, HIGH);
+    rtc_gpio_hold_dis((gpio_num_t)P_LORA_PA_POWER);
+    rtc_gpio_hold_dis((gpio_num_t)P_LORA_KCT8103L_PA_CSD);
+    rtc_gpio_hold_dis((gpio_num_t)P_LORA_KCT8103L_PA_CTX);
+    delay(1);
+    pinMode(P_LORA_KCT8103L_PA_CSD, OUTPUT);
+    digitalWrite(P_LORA_KCT8103L_PA_CSD, HIGH);
+    pinMode(P_LORA_KCT8103L_PA_CTX, OUTPUT);
+    digitalWrite(P_LORA_KCT8103L_PA_CTX, HIGH);
+    setLnaCanControl(true);
+}
+
+void LoRaFEMControl::setSleepModeEnable(void)
+{
+    // shutdown the PA
+    digitalWrite(P_LORA_KCT8103L_PA_CSD, LOW);
+}
+
+void LoRaFEMControl::setTxModeEnable(void)
+{
+    digitalWrite(P_LORA_KCT8103L_PA_CSD, HIGH);
+    digitalWrite(P_LORA_KCT8103L_PA_CTX, HIGH);
+}
+
+void LoRaFEMControl::setRxModeEnable(void)
+{
+    digitalWrite(P_LORA_KCT8103L_PA_CSD, HIGH);
+    if (lna_enabled) {
+        digitalWrite(P_LORA_KCT8103L_PA_CTX, LOW);
+    } else {
+        digitalWrite(P_LORA_KCT8103L_PA_CTX, HIGH);
+    }
+}
+
+void LoRaFEMControl::setRxModeEnableWhenMCUSleep(void)
+{
+    digitalWrite(P_LORA_KCT8103L_PA_CSD, HIGH);
+    rtc_gpio_hold_en((gpio_num_t)P_LORA_KCT8103L_PA_CSD);
+    if (lna_enabled) {
+        digitalWrite(P_LORA_KCT8103L_PA_CTX, LOW);
+    } else {
+        digitalWrite(P_LORA_KCT8103L_PA_CTX, HIGH);
+    }
+    rtc_gpio_hold_en((gpio_num_t)P_LORA_KCT8103L_PA_CTX);
+}
+
+void LoRaFEMControl::setLNAEnable(bool enabled)
+{
+    lna_enabled = enabled;
+}
--- a/variants/heltec_tracker_v2/LoRaFEMControl.h
+++ b/variants/heltec_tracker_v2/LoRaFEMControl.h
@ -0,0 +1,21 @@
+#pragma once
+#include <stdint.h>
+
+class LoRaFEMControl
+{
+  public:
+    LoRaFEMControl() {}
+    virtual ~LoRaFEMControl() {}
+    void init(void);
+    void setSleepModeEnable(void);
+    void setTxModeEnable(void);
+    void setRxModeEnable(void);
+    void setRxModeEnableWhenMCUSleep(void);
+    void setLNAEnable(bool enabled);
+    bool isLnaCanControl(void) { return lna_can_control; }
+    void setLnaCanControl(bool can_control) { lna_can_control = can_control; }
+
+  private:
+    bool lna_enabled = false;
+    bool lna_can_control = false;
+};
--- a/variants/heltec_tracker_v2/platformio.ini
+++ b/variants/heltec_tracker_v2/platformio.ini
@ -18,18 +18,18 @@ build_flags =
  -D P_LORA_SCLK=9
  -D P_LORA_MISO=11
  -D P_LORA_MOSI=10
-  -D P_LORA_PA_POWER=7   ; VFEM_Ctrl - GC1109 LDO power enable
-  -D P_LORA_PA_EN=4      ; CSD - GC1109 chip enable (HIGH=on)
-  -D P_LORA_PA_TX_EN=46  ; CPS - GC1109 PA mode (HIGH=full PA, LOW=bypass)
-  -D LORA_TX_POWER=10    ; 10dBm + ~11dB GC1109 gain = ~21dBm output
+  -D P_LORA_PA_POWER=7  ;VFEM_Ctrl -LDO power enable
+  -D P_LORA_KCT8103L_PA_CSD=4
+  -D P_LORA_KCT8103L_PA_CTX=5
+  -D LORA_TX_POWER=9    ; 9dBm + ~13dB KCT8103L gain = ~22dBm output
  -D MAX_LORA_TX_POWER=22 ; Max SX1262 output -> ~28dBm at antenna
  -D SX126X_DIO2_AS_RF_SWITCH=true
  -D SX126X_DIO3_TCXO_VOLTAGE=1.8
  -D SX126X_CURRENT_LIMIT=140
  -D SX126X_RX_BOOSTED_GAIN=1
  -D SX126X_REGISTER_PATCH=1
-  -D PIN_BOARD_SDA=5
-  -D PIN_BOARD_SCL=6
+  -D PIN_BOARD_SDA=6
+  -D PIN_BOARD_SCL=17
  -D PIN_USER_BTN=0
  -D PIN_TFT_SDA=42   ; SDIN
  -D PIN_TFT_SCL=41   ; SCLK
@ -208,8 +208,6 @@ build_flags =
  -D ADVERT_LAT=0.0
  -D ADVERT_LON=0.0
  -D ADMIN_PASSWORD='"password"'
-  -D ENV_PIN_SDA=3
-  -D ENV_PIN_SCL=4
  -D DISPLAY_CLASS=ST7735Display
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
--- a/variants/heltec_tracker_v2/target.cpp
+++ b/variants/heltec_tracker_v2/target.cpp
@ -17,7 +17,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock);

 #if ENV_INCLUDE_GPS
  #include <helpers/sensors/MicroNMEALocationProvider.h>
-  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, NULL, GPS_RESET, GPS_EN, &board.periph_power);
+  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock, GPS_RESET, GPS_EN, &board.periph_power);
  EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
 #else
  EnvironmentSensorManager sensors;
--- a/variants/heltec_v3/target.cpp
+++ b/variants/heltec_v3/target.cpp
@ -17,7 +17,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock);

 #if ENV_INCLUDE_GPS
  #include <helpers/sensors/MicroNMEALocationProvider.h>
-  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
+  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
  EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
 #else
  EnvironmentSensorManager sensors;
--- a/variants/heltec_v4/target.cpp
+++ b/variants/heltec_v4/target.cpp
@ -17,7 +17,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock);

 #if ENV_INCLUDE_GPS
  #include <helpers/sensors/MicroNMEALocationProvider.h>
-  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
+  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
  EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
 #else
  EnvironmentSensorManager sensors;
--- a/variants/keepteen_lt1/target.cpp
+++ b/variants/keepteen_lt1/target.cpp
@ -12,7 +12,7 @@ VolatileRTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
 #if ENV_INCLUDE_GPS
  #include <helpers/sensors/MicroNMEALocationProvider.h>
-  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
+  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
  EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
 #else
  EnvironmentSensorManager sensors;
--- a/variants/lilygo_tbeam_1w/target.cpp
+++ b/variants/lilygo_tbeam_1w/target.cpp
@ -19,7 +19,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock);

 #if ENV_INCLUDE_GPS
  #include <helpers/sensors/MicroNMEALocationProvider.h>
-  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
+  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
  EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
 #else
  EnvironmentSensorManager sensors;
--- a/variants/lilygo_tbeam_SX1262/target.cpp
+++ b/variants/lilygo_tbeam_SX1262/target.cpp
@ -17,7 +17,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock);

 #if ENV_INCLUDE_GPS
  #include <helpers/sensors/MicroNMEALocationProvider.h>
-  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
+  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
  EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
 #else
  EnvironmentSensorManager sensors;
--- a/variants/lilygo_tbeam_SX1276/target.cpp
+++ b/variants/lilygo_tbeam_SX1276/target.cpp
@ -17,7 +17,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock);

 #if ENV_INCLUDE_GPS
  #include <helpers/sensors/MicroNMEALocationProvider.h>
-  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
+  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
  EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
 #else
  EnvironmentSensorManager sensors;
--- a/variants/lilygo_tbeam_supreme_SX1262/target.cpp
+++ b/variants/lilygo_tbeam_supreme_SX1262/target.cpp
@ -19,7 +19,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock);

 #if ENV_INCLUDE_GPS
  #include <helpers/sensors/MicroNMEALocationProvider.h>
-  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
+  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
  EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
 #else
  EnvironmentSensorManager sensors;
--- a/variants/meshadventurer/target.cpp
+++ b/variants/meshadventurer/target.cpp
@ -11,7 +11,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 ESP32RTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
-MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
+MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
 MASensorManager sensors = MASensorManager(nmea);

 #ifdef DISPLAY_CLASS
--- a/variants/nano_g2_ultra/target.cpp
+++ b/variants/nano_g2_ultra/target.cpp
@ -12,7 +12,7 @@ WRAPPER_CLASS radio_driver(radio, board);

 VolatileRTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
-MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
+MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
 NanoG2UltraSensorManager sensors = NanoG2UltraSensorManager(nmea);

 #ifdef DISPLAY_CLASS
--- a/variants/promicro/target.cpp
+++ b/variants/promicro/target.cpp
@ -12,7 +12,7 @@ VolatileRTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
 #if ENV_INCLUDE_GPS
  #include <helpers/sensors/MicroNMEALocationProvider.h>
-  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
+  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
  EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
 #else
  EnvironmentSensorManager sensors;
--- a/variants/rak3112/target.cpp
+++ b/variants/rak3112/target.cpp
@ -17,7 +17,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock);

 #if ENV_INCLUDE_GPS
  #include <helpers/sensors/MicroNMEALocationProvider.h>
-  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
+  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
  EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
 #else
  EnvironmentSensorManager sensors;
--- a/variants/rak3401/target.cpp
+++ b/variants/rak3401/target.cpp
@ -26,7 +26,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock);

 #if ENV_INCLUDE_GPS
  #include <helpers/sensors/MicroNMEALocationProvider.h>
-  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
+  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
  EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
 #else
  EnvironmentSensorManager sensors;
--- a/variants/rak4631/target.cpp
+++ b/variants/rak4631/target.cpp
@ -26,7 +26,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock);

 #if ENV_INCLUDE_GPS
  #include <helpers/sensors/MicroNMEALocationProvider.h>
-  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
+  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
  EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
 #else
  EnvironmentSensorManager sensors;
--- a/variants/rak_wismesh_tag/target.cpp
+++ b/variants/rak_wismesh_tag/target.cpp
@ -22,7 +22,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock);

 #if ENV_INCLUDE_GPS
  #include <helpers/sensors/MicroNMEALocationProvider.h>
-  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
+  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
  EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
 #else
  EnvironmentSensorManager sensors;
--- a/variants/sensecap_solar/platformio.ini
+++ b/variants/sensecap_solar/platformio.ini
@ -8,7 +8,6 @@ build_flags = ${nrf52_base.build_flags}
  -I lib/nrf52/s140_nrf52_7.3.0_API/include/nrf52
  -I variants/sensecap_solar
  -I src/helpers/nrf52
-  -UENV_INCLUDE_GPS
  -D NRF52_PLATFORM=1
  -D USE_SX1262
  -D RADIO_CLASS=CustomSX1262
@ -25,6 +24,7 @@ build_flags = ${nrf52_base.build_flags}
  -D SX126X_DIO3_TCXO_VOLTAGE=1.8
  -D SX126X_CURRENT_LIMIT=140
  -D SX126X_RX_BOOSTED_GAIN=1
+  -D ENV_INCLUDE_GPS=1
 build_src_filter = ${nrf52_base.build_src_filter}
  +<helpers/*.cpp>
  +<helpers/sensors>
--- a/variants/sensecap_solar/target.cpp
+++ b/variants/sensecap_solar/target.cpp
@ -1,7 +1,9 @@
 #include <Arduino.h>
 #include "target.h"
 #include <helpers/ArduinoHelpers.h>
-
+#ifdef ENV_INCLUDE_GPS
+#include <helpers/sensors/MicroNMEALocationProvider.h>
+#endif
 SenseCapSolarBoard board;

 RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI);
@ -10,7 +12,12 @@ WRAPPER_CLASS radio_driver(radio, board);

 VolatileRTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
-EnvironmentSensorManager sensors;
+#ifdef ENV_INCLUDE_GPS
+MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
+EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
+#else
+EnvironmentSensorManager sensors = EnvironmentSensorManager();
+#endif

 bool radio_init() {
    rtc_clock.begin(Wire);
--- a/variants/sensecap_solar/variant.cpp
+++ b/variants/sensecap_solar/variant.cpp
@ -18,8 +18,8 @@ const uint32_t g_ADigitalPinMap[] = {
    47, // D10 P1.15 (SPI_MOSI) LORA_MOSI

    // D11-D12 - LED outputs
-    15, // D11 P0.15 User LED
-    19, // D12 P0.19 Breathing LED
+    15, // D11 P0.15 User LED (White LED)
+    19, // D12 P0.19 Breathing LED (Blue LED - LoRa TX)

    // D13 - User input
    33, // D13 P1.01 User Button
@ -58,14 +58,9 @@ void initVariant() {
    pinMode(PIN_QSPI_CS, OUTPUT);
    digitalWrite(PIN_QSPI_CS, HIGH);

-    pinMode(LED_GREEN, OUTPUT);
-    digitalWrite(LED_GREEN, LOW);
+    pinMode(LED_WHITE, OUTPUT);
+    digitalWrite(LED_WHITE, LOW);

    pinMode(LED_BLUE, OUTPUT);
    digitalWrite(LED_BLUE, LOW);
-
-    /* disable gps until we actually support it.
-    pinMode(GPS_EN, OUTPUT);
-    digitalWrite(GPS_EN, HIGH);
-    */
 }
--- a/variants/sensecap_solar/variant.h
+++ b/variants/sensecap_solar/variant.h
@ -24,8 +24,8 @@
 #define LED_BUILTIN             (PIN_LED)

 #define LED_RED                 (PINS_COUNT)
-#define LED_GREEN               (12)
-#define LED_BLUE                (11)
+#define LED_WHITE               (11)
+#define LED_BLUE                (12)    // LoRa TX indicator

 #define LED_STATE_ON            (1)     // State when LED is litted

--- a/variants/t1000-e/t1000e_sensors.cpp
+++ b/variants/t1000-e/t1000e_sensors.cpp
@ -21,7 +21,7 @@ static unsigned int ntc_res2[136] = {
  1081,   1053,   1026,   999,   974,   949,   925,   902,   880,   858,
 };

-static char ntc_temp2[136] = {
+static int8_t ntc_temp2[136] = {
  -30, -29, -28, -27, -26, -25, -24, -23, -22, -21, -20, -19, -18, -17, -16, -15, -14, -13, -12, -11,
  -10, -9,  -8,  -7,  -6,  -5,  -4,  -3,  -2,  -1,  0,   1,   2,   3,   4,   5,   6,   7,   8,   9,
  10,  11,  12,  13,  14,  15,  16,  17,  18,  19,  20,  21,  22,  23,  24,  25,  26,  27,  28,  29,
--- a/variants/thinknode_m3/target.cpp
+++ b/variants/thinknode_m3/target.cpp
@ -11,7 +11,7 @@ WRAPPER_CLASS radio_driver(radio, board);
 VolatileRTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
 #ifdef ENV_INCLUDE_GPS
-MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
+MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
 EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
 #else
 EnvironmentSensorManager sensors = EnvironmentSensorManager();
--- a/variants/xiao_c3/target.cpp
+++ b/variants/xiao_c3/target.cpp
@ -17,7 +17,7 @@ AutoDiscoverRTCClock rtc_clock(fallback_clock);

 #if ENV_INCLUDE_GPS
  #include <helpers/sensors/MicroNMEALocationProvider.h>
-  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1);
+  MicroNMEALocationProvider nmea = MicroNMEALocationProvider(Serial1, &rtc_clock);
  EnvironmentSensorManager sensors = EnvironmentSensorManager(nmea);
 #else
  EnvironmentSensorManager sensors;