Remove build and variant changes from Halo retry branch

boards/nrf52840_s140_v6.ld

@@ -7,9 +7,6 @@ MEMORY
 {
   FLASH (rx)     : ORIGIN = 0x26000, LENGTH = 0xED000 - 0x26000
 
-  /* To keep data in RAM across resets */
-  PERSISTENT_RAM (rwx) : ORIGIN = 0x20006000, LENGTH = 8
-
   /* SRAM required by Softdevice depend on
    * - Attribute Table Size (Number of Services and Characteristics)
    * - Vendor UUID count
@@ -17,19 +14,11 @@ MEMORY
    * - Concurrent connection peripheral + central + secure links
    * - Event Len, HVN queue, Write CMD queue
    */ 
-  RAM (rwx) :  ORIGIN = 0x20006000 + 8, LENGTH = 0x20040000 - 0x20006000 - 8
+  RAM (rwx) :  ORIGIN = 0x20006000, LENGTH = 0x20040000 - 0x20006000
 }
 
 SECTIONS
 {
-  . = ALIGN(4);
-  .persistent (NOLOAD) :
-  {
-    KEEP(*(.persistent_magic))
-    KEEP(*(.persistent_data))
-    . = ALIGN(4);
-  } > PERSISTENT_RAM
-
   . = ALIGN(4);
   .svc_data :
   {
@@ -44,6 +33,6 @@ SECTIONS
     KEEP(*(.fs_data))
     PROVIDE(__stop_fs_data = .);
   } > RAM
-}
+} INSERT AFTER .data;
 
 INCLUDE "nrf52_common.ld"

boards/nrf52840_s140_v6_extrafs.ld

@@ -7,9 +7,6 @@ MEMORY
 {
   FLASH (rx)     : ORIGIN = 0x26000, LENGTH = 0xD4000 - 0x26000
 
-  /* To keep data in RAM across resets */
-  PERSISTENT_RAM (rwx) : ORIGIN = 0x20006000, LENGTH = 8
-
   /* SRAM required by Softdevice depend on
    * - Attribute Table Size (Number of Services and Characteristics)
    * - Vendor UUID count
@@ -17,19 +14,11 @@ MEMORY
    * - Concurrent connection peripheral + central + secure links
    * - Event Len, HVN queue, Write CMD queue
    */ 
-  RAM (rwx) :  ORIGIN = 0x20006000 + 8, LENGTH = 0x20040000 - 0x20006000 - 8
+  RAM (rwx) :  ORIGIN = 0x20006000, LENGTH = 0x20040000 - 0x20006000
 }
 
 SECTIONS
 {
-  . = ALIGN(4);
-  .persistent (NOLOAD) :
-  {
-    KEEP(*(.persistent_magic))
-    KEEP(*(.persistent_data))
-    . = ALIGN(4);
-  } > PERSISTENT_RAM
-
   . = ALIGN(4);
   .svc_data :
   {
@@ -44,6 +33,6 @@ SECTIONS
     KEEP(*(.fs_data))
     PROVIDE(__stop_fs_data = .);
   } > RAM
-}
+} INSERT AFTER .data;
 
 INCLUDE "nrf52_common.ld"

boards/nrf52840_s140_v7.ld

@@ -7,9 +7,6 @@ MEMORY
 {
   FLASH (rx)     : ORIGIN = 0x27000, LENGTH = 0xED000 - 0x27000
 
-  /* To keep data in RAM across resets */
-  PERSISTENT_RAM (rwx) : ORIGIN = 0x20006000, LENGTH = 8
-
   /* SRAM required by Softdevice depend on
    * - Attribute Table Size (Number of Services and Characteristics)
    * - Vendor UUID count
@@ -17,19 +14,11 @@ MEMORY
    * - Concurrent connection peripheral + central + secure links
    * - Event Len, HVN queue, Write CMD queue
    */ 
-  RAM (rwx) :  ORIGIN = 0x20006000 + 8, LENGTH = 0x20040000 - 0x20006000 - 8
+  RAM (rwx) :  ORIGIN = 0x20006000, LENGTH = 0x20040000 - 0x20006000
 }
 
 SECTIONS
 {
-  . = ALIGN(4);
-  .persistent (NOLOAD) :
-  {
-    KEEP(*(.persistent_magic))
-    KEEP(*(.persistent_data))
-    . = ALIGN(4);
-  } > PERSISTENT_RAM
-
   . = ALIGN(4);
   .svc_data :
   {
@@ -44,6 +33,6 @@ SECTIONS
     KEEP(*(.fs_data))
     PROVIDE(__stop_fs_data = .);
   } > RAM
-}
+} INSERT AFTER .data;
 
 INCLUDE "nrf52_common.ld"

boards/nrf52840_s140_v7_extrafs.ld

@@ -14,19 +14,11 @@ MEMORY
    * - Concurrent connection peripheral + central + secure links
    * - Event Len, HVN queue, Write CMD queue
    */ 
-  RAM (rwx) :  ORIGIN = 0x20006000 + 8, LENGTH = 0x20040000 - 0x20006000 - 8
+  RAM (rwx) :  ORIGIN = 0x20006000, LENGTH = 0x20040000 - 0x20006000
 }
 
 SECTIONS
 {
-  . = ALIGN(4);
-  .persistent (NOLOAD) :
-  {
-    KEEP(*(.persistent_magic))
-    KEEP(*(.persistent_data))
-    . = ALIGN(4);
-  } > PERSISTENT_RAM
-
   . = ALIGN(4);
   .svc_data :
   {
@@ -41,6 +33,6 @@ SECTIONS
     KEEP(*(.fs_data))
     PROVIDE(__stop_fs_data = .);
   } > RAM
-}
+} INSERT AFTER .data;
 
 INCLUDE "nrf52_common.ld"

build.sh

@@ -134,8 +134,7 @@ build_firmware() {
 
   # set firmware version string
   # e.g: v1.0.0-abcdef
-  # FIRMWARE_VERSION_STRING="${FIRMWARE_VERSION}-${COMMIT_HASH}"
-  FIRMWARE_VERSION_STRING="${FIRMWARE_VERSION}"
+  FIRMWARE_VERSION_STRING="${FIRMWARE_VERSION}-${COMMIT_HASH}"
 
   # craft filename
   # e.g: RAK_4631_Repeater-v1.0.0-SHA
@@ -153,8 +152,8 @@ build_firmware() {
   # build merge-bin for esp32 fresh install, copy .bins to out folder (e.g: Heltec_v3_room_server-v1.0.0-SHA.bin)
   if [ "$ENV_PLATFORM" == "ESP32_PLATFORM" ]; then
     pio run -t mergebin -e $1
-    cp .pio/build/$1/firmware.bin out/${FIRMWARE_FILENAME}-upgrade.bin 2>/dev/null || true
-    cp .pio/build/$1/firmware-merged.bin out/${FIRMWARE_FILENAME}-freshInstall-merged.bin 2>/dev/null || true
+    cp .pio/build/$1/firmware.bin out/${FIRMWARE_FILENAME}.bin 2>/dev/null || true
+    cp .pio/build/$1/firmware-merged.bin out/${FIRMWARE_FILENAME}-merged.bin 2>/dev/null || true
   fi
 
   # build .uf2 for nrf52 boards, copy .uf2 and .zip to out folder (e.g: RAK_4631_Repeater-v1.0.0-SHA.uf2)

variants/gat562_30s_mesh_kit/platformio.ini

@@ -2,13 +2,12 @@
 extends = nrf52_base
 board = rak4631
 board_check = true
-board_build.ldscript = boards/nrf52840_s140_v6.ld
 build_flags = ${nrf52_base.build_flags}
   ${sensor_base.build_flags}
   -I variants/gat562_30s_mesh_kit
   -D RAK_4631
   -D RAK_BOARD
-;  -D NRF52_POWER_MANAGEMENT
+  -D NRF52_POWER_MANAGEMENT
   -D PIN_BOARD_SCL=14
   -D PIN_BOARD_SDA=13
   -D PIN_OLED_RESET=-1

variants/gat562_mesh_evb_pro/platformio.ini

@@ -5,7 +5,7 @@ board_check = true
 build_flags = ${nrf52_base.build_flags}
   ${sensor_base.build_flags}
   -I variants/gat562_mesh_evb_pro
-;  -D NRF52_POWER_MANAGEMENT
+  -D NRF52_POWER_MANAGEMENT
   -D PIN_BOARD_SCL=14
   -D PIN_BOARD_SDA=13
   -D RADIO_CLASS=CustomSX1262

variants/gat562_mesh_tracker_pro/platformio.ini

@@ -2,11 +2,10 @@
 extends = nrf52_base
 board = rak4631
 board_check = true
-board_build.ldscript = boards/nrf52840_s140_v6.ld
 build_flags = ${nrf52_base.build_flags}
   ${sensor_base.build_flags}
   -I variants/gat562_mesh_tracker_pro
-;  -D NRF52_POWER_MANAGEMENT
+  -D NRF52_POWER_MANAGEMENT
   -D PIN_BOARD_SCL=14
   -D PIN_BOARD_SDA=13
   -D PIN_OLED_RESET=-1

variants/gat562_mesh_watch13/platformio.ini

@@ -8,7 +8,7 @@ build_flags = ${nrf52_base.build_flags}
   -I variants/gat562_mesh_watch13
   -D RAK_4631
   -D RAK_BOARD
-;  -D NRF52_POWER_MANAGEMENT
+  -D NRF52_POWER_MANAGEMENT
   -D PIN_BOARD_SCL=14
   -D PIN_BOARD_SDA=13
   -D PIN_OLED_RESET=-1

variants/heltec_ct62/platformio.ini

@@ -130,10 +130,6 @@ lib_deps =
   ${esp32_ota.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:Heltec_ct62_companion_radio_ble_ps]
-extends = env:Heltec_ct62_companion_radio_ble
-platform_packages = framework-arduinoespressif32 @ symlink://D:/esp32-2.0.17
-
 [env:Heltec_ct62_sensor]
 extends = Heltec_ct62
 build_flags =

variants/heltec_e213/HeltecE213Board.cpp

@@ -20,6 +20,33 @@ void HeltecE213Board::begin() {
     }
   }
 
+  void HeltecE213Board::enterDeepSleep(uint32_t secs, int pin_wake_btn) {
+    esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
+
+    // Make sure the DIO1 and NSS GPIOs are hold on required levels during deep sleep
+    rtc_gpio_set_direction((gpio_num_t)P_LORA_DIO_1, RTC_GPIO_MODE_INPUT_ONLY);
+    rtc_gpio_pulldown_en((gpio_num_t)P_LORA_DIO_1);
+
+    rtc_gpio_hold_en((gpio_num_t)P_LORA_NSS);
+
+    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
+    } else {
+      esp_sleep_enable_ext1_wakeup( (1L << P_LORA_DIO_1) | (1L << pin_wake_btn), ESP_EXT1_WAKEUP_ANY_HIGH);  // wake up on: recv LoRa packet OR wake btn
+    }
+
+    if (secs > 0) {
+      esp_sleep_enable_timer_wakeup(secs * 1000000);
+    }
+
+    // Finally set ESP32 into sleep
+    esp_deep_sleep_start();   // CPU halts here and never returns!
+  }
+
+  void HeltecE213Board::powerOff()  {
+    enterDeepSleep(0);
+  }
+
   uint16_t HeltecE213Board::getBattMilliVolts()  {
     analogReadResolution(10);
     digitalWrite(PIN_ADC_CTRL, HIGH);

variants/heltec_e213/HeltecE213Board.h

@@ -3,6 +3,7 @@
 #include <Arduino.h>
 #include <helpers/RefCountedDigitalPin.h>
 #include <helpers/ESP32Board.h>
+#include <driver/rtc_io.h>
 
 class HeltecE213Board : public ESP32Board {
 
@@ -12,6 +13,8 @@ public:
   HeltecE213Board() : periph_power(PIN_VEXT_EN,PIN_VEXT_EN_ACTIVE) { }
 
   void begin();
+  void enterDeepSleep(uint32_t secs, int pin_wake_btn = -1);
+  void powerOff() override;
   uint16_t getBattMilliVolts() override;
   const char* getManufacturerName() const override ;
 };

variants/heltec_e290/HeltecE290Board.cpp

@@ -20,6 +20,33 @@ void HeltecE290Board::begin() {
     }
   }
 
+  void HeltecE290Board::enterDeepSleep(uint32_t secs, int pin_wake_btn) {
+    esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
+
+    // Make sure the DIO1 and NSS GPIOs are hold on required levels during deep sleep
+    rtc_gpio_set_direction((gpio_num_t)P_LORA_DIO_1, RTC_GPIO_MODE_INPUT_ONLY);
+    rtc_gpio_pulldown_en((gpio_num_t)P_LORA_DIO_1);
+
+    rtc_gpio_hold_en((gpio_num_t)P_LORA_NSS);
+
+    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
+    } else {
+      esp_sleep_enable_ext1_wakeup( (1L << P_LORA_DIO_1) | (1L << pin_wake_btn), ESP_EXT1_WAKEUP_ANY_HIGH);  // wake up on: recv LoRa packet OR wake btn
+    }
+
+    if (secs > 0) {
+      esp_sleep_enable_timer_wakeup(secs * 1000000);
+    }
+
+    // Finally set ESP32 into sleep
+    esp_deep_sleep_start();   // CPU halts here and never returns!
+  }
+
+  void HeltecE290Board::powerOff()  {
+    enterDeepSleep(0);
+  }
+
   uint16_t HeltecE290Board::getBattMilliVolts()  {
     analogReadResolution(10);
     digitalWrite(PIN_ADC_CTRL, HIGH);

variants/heltec_e290/HeltecE290Board.h

@@ -3,6 +3,7 @@
 #include <Arduino.h>
 #include <helpers/RefCountedDigitalPin.h>
 #include <helpers/ESP32Board.h>
+#include <driver/rtc_io.h>
 
 class HeltecE290Board : public ESP32Board {
 
@@ -12,6 +13,8 @@ public:
   HeltecE290Board() : periph_power(PIN_VEXT_EN, PIN_VEXT_EN_ACTIVE) { }
 
   void begin();
+  void enterDeepSleep(uint32_t secs, int pin_wake_btn = -1);
+  void powerOff() override;
   uint16_t getBattMilliVolts() override;
   const char* getManufacturerName() const override ;
 

variants/heltec_t096/LoRaFEMControl.h

@@ -17,6 +17,6 @@ class LoRaFEMControl
     bool isLNAEnabled(void) const { return lna_enabled; }
 
   private:
-    bool lna_enabled = true;
+    bool lna_enabled = false;
     bool lna_can_control = false;
 };

variants/heltec_t096/platformio.ini

@@ -9,7 +9,7 @@ build_flags = ${nrf52_base.build_flags}
   -I variants/heltec_t096
   -I src/helpers/ui
   -D HELTEC_T096
-;  -D NRF52_POWER_MANAGEMENT
+  -D NRF52_POWER_MANAGEMENT
   -D P_LORA_DIO_1=21
   -D P_LORA_NSS=5
   -D P_LORA_RESET=16
@@ -120,7 +120,7 @@ build_src_filter = ${Heltec_t096.build_src_filter}
 lib_deps =
   ${Heltec_t096.lib_deps}
 
-[env:Heltec_t096_companion_radio_ble_femon]
+[env:Heltec_t096_companion_radio_ble]
 extends = Heltec_t096
 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld
 board_upload.maximum_size = 712704
@@ -143,12 +143,6 @@ lib_deps =
   ${Heltec_t096.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:Heltec_t096_companion_radio_ble_femoff]
-extends = env:Heltec_t096_companion_radio_ble_femon
-build_flags =
-  ${env:Heltec_t096_companion_radio_ble_femon.build_flags}
-  -D RADIO_FEM_RXGAIN=0 ; undefined (default on), 1=on, 0=off
-
 [env:Heltec_t096_companion_radio_usb]
 extends = Heltec_t096
 board_build.ldscript = boards/nrf52840_s140_v6_extrafs.ld

variants/heltec_t114/platformio.ini

@@ -12,7 +12,7 @@ build_flags = ${nrf52_base.build_flags}
   -I variants/heltec_t114
   -I src/helpers/ui
   -D HELTEC_T114
-;  -D NRF52_POWER_MANAGEMENT
+  -D NRF52_POWER_MANAGEMENT
   -D P_LORA_DIO_1=20
   -D P_LORA_NSS=24
   -D P_LORA_RESET=25

variants/heltec_t190/HeltecT190Board.cpp

@@ -20,6 +20,33 @@ void HeltecT190Board::begin() {
     }
   }
 
+  void HeltecT190Board::enterDeepSleep(uint32_t secs, int pin_wake_btn) {
+    esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
+
+    // Make sure the DIO1 and NSS GPIOs are hold on required levels during deep sleep
+    rtc_gpio_set_direction((gpio_num_t)P_LORA_DIO_1, RTC_GPIO_MODE_INPUT_ONLY);
+    rtc_gpio_pulldown_en((gpio_num_t)P_LORA_DIO_1);
+
+    rtc_gpio_hold_en((gpio_num_t)P_LORA_NSS);
+
+    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
+    } else {
+      esp_sleep_enable_ext1_wakeup( (1L << P_LORA_DIO_1) | (1L << pin_wake_btn), ESP_EXT1_WAKEUP_ANY_HIGH);  // wake up on: recv LoRa packet OR wake btn
+    }
+
+    if (secs > 0) {
+      esp_sleep_enable_timer_wakeup(secs * 1000000);
+    }
+
+    // Finally set ESP32 into sleep
+    esp_deep_sleep_start();   // CPU halts here and never returns!
+  }
+
+  void HeltecT190Board::powerOff()  {
+    enterDeepSleep(0);
+  }
+
   uint16_t HeltecT190Board::getBattMilliVolts()  {
     analogReadResolution(10);
     digitalWrite(PIN_ADC_CTRL, HIGH);

variants/heltec_t190/HeltecT190Board.h

@@ -3,6 +3,7 @@
 #include <Arduino.h>
 #include <helpers/RefCountedDigitalPin.h>
 #include <helpers/ESP32Board.h>
+#include <driver/rtc_io.h>
 
 class HeltecT190Board : public ESP32Board {
 
@@ -12,6 +13,8 @@ public:
   HeltecT190Board() : periph_power(PIN_VEXT_EN,PIN_VEXT_EN_ACTIVE) { }
 
   void begin();
+  void enterDeepSleep(uint32_t secs, int pin_wake_btn = -1);
+  void powerOff() override;
   uint16_t getBattMilliVolts() override;
   const char* getManufacturerName() const override ;
 

variants/heltec_tracker/platformio.ini

@@ -99,10 +99,6 @@ lib_deps =
   ${Heltec_tracker_base.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:Heltec_Wireless_Tracker_companion_radio_ble_ps]
-extends = env:Heltec_Wireless_Tracker_companion_radio_ble
-platform_packages = framework-arduinoespressif32 @ symlink://D:/esp32-2.0.17
-
 [env:Heltec_Wireless_Tracker_repeater]
 extends = Heltec_tracker_base
 build_flags =

variants/heltec_tracker_v2/HeltecTrackerV2Board.cpp

@@ -35,12 +35,33 @@ void HeltecTrackerV2Board::begin() {
     loRaFEMControl.setRxModeEnable();
   }
 
-  void HeltecTrackerV2Board::powerOff() {
-    // Turn off PA
-    digitalWrite(P_LORA_PA_POWER, LOW);
-    rtc_gpio_hold_en((gpio_num_t)P_LORA_PA_POWER);
+  void HeltecTrackerV2Board::enterDeepSleep(uint32_t secs, int pin_wake_btn) {
+    esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
 
-    ESP32Board::powerOff();
+    // Make sure the DIO1 and NSS GPIOs are hold on required levels during deep sleep
+    rtc_gpio_set_direction((gpio_num_t)P_LORA_DIO_1, RTC_GPIO_MODE_INPUT_ONLY);
+    rtc_gpio_pulldown_en((gpio_num_t)P_LORA_DIO_1);
+
+    rtc_gpio_hold_en((gpio_num_t)P_LORA_NSS);
+
+    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
+    } else {
+      esp_sleep_enable_ext1_wakeup( (1L << P_LORA_DIO_1) | (1L << pin_wake_btn), ESP_EXT1_WAKEUP_ANY_HIGH);  // wake up on: recv LoRa packet OR wake btn
+    }
+
+    if (secs > 0) {
+      esp_sleep_enable_timer_wakeup(secs * 1000000);
+    }
+
+    // Finally set ESP32 into sleep
+    esp_deep_sleep_start();   // CPU halts here and never returns!
+  }
+
+  void HeltecTrackerV2Board::powerOff()  {
+    enterDeepSleep(0);
   }
 
   uint16_t HeltecTrackerV2Board::getBattMilliVolts()  {

variants/heltec_tracker_v2/HeltecTrackerV2Board.h

@@ -3,6 +3,7 @@
 #include <Arduino.h>
 #include <helpers/RefCountedDigitalPin.h>
 #include <helpers/ESP32Board.h>
+#include <driver/rtc_io.h>
 #include "LoRaFEMControl.h"
 
 class HeltecTrackerV2Board : public ESP32Board {
@@ -16,6 +17,7 @@ public:
   void begin();
   void onBeforeTransmit(void) override;
   void onAfterTransmit(void) override;
+  void enterDeepSleep(uint32_t secs, int pin_wake_btn = -1);
   void powerOff() override;
   uint16_t getBattMilliVolts() override;
   const char* getManufacturerName() const override ;

variants/heltec_tracker_v2/LoRaFEMControl.h

@@ -17,6 +17,6 @@ class LoRaFEMControl
     bool isLNAEnabled(void) const { return lna_enabled; }
 
   private:
-    bool lna_enabled = true;
+    bool lna_enabled = false;
     bool lna_can_control = false;
 };

variants/heltec_tracker_v2/platformio.ini

@@ -176,10 +176,6 @@ lib_deps =
   ${Heltec_tracker_v2.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:heltec_tracker_v2_companion_radio_ble_ps]
-extends = env:heltec_tracker_v2_companion_radio_ble
-platform_packages = framework-arduinoespressif32 @ symlink://D:/esp32-2.0.17
-
 [env:heltec_tracker_v2_companion_radio_wifi]
 extends = Heltec_tracker_v2
 build_flags =

variants/heltec_v2/HeltecV2Board.h

@@ -7,6 +7,8 @@
 #define  PIN_VBAT_READ   37
 #define  PIN_LED_BUILTIN 25
 
+#include <driver/rtc_io.h>
+
 class HeltecV2Board : public ESP32Board {
 public:
   void begin() {
@@ -24,6 +26,29 @@ public:
     }
   }
 
+  void enterDeepSleep(uint32_t secs, int pin_wake_btn = -1) {
+    esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
+
+    // Make sure the DIO1 and NSS GPIOs are hold on required levels during deep sleep
+    rtc_gpio_set_direction((gpio_num_t)P_LORA_DIO_0, RTC_GPIO_MODE_INPUT_ONLY);
+    rtc_gpio_pulldown_en((gpio_num_t)P_LORA_DIO_0);
+
+    rtc_gpio_hold_en((gpio_num_t)P_LORA_NSS);
+
+    if (pin_wake_btn < 0) {
+      esp_sleep_enable_ext1_wakeup( (1L << P_LORA_DIO_0), ESP_EXT1_WAKEUP_ANY_HIGH);  // wake up on: recv LoRa packet
+    } else {
+      esp_sleep_enable_ext1_wakeup( (1L << P_LORA_DIO_0) | (1L << pin_wake_btn), ESP_EXT1_WAKEUP_ANY_HIGH);  // wake up on: recv LoRa packet OR wake btn
+    }
+
+    if (secs > 0) {
+      esp_sleep_enable_timer_wakeup(secs * 1000000);
+    }
+
+    // Finally set ESP32 into sleep
+    esp_deep_sleep_start();   // CPU halts here and never returns!
+  }
+
   uint16_t getBattMilliVolts() override {
     analogReadResolution(10);
 

variants/heltec_v2/platformio.ini

@@ -172,10 +172,6 @@ lib_deps =
   ${Heltec_lora32_v2.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:Heltec_v2_companion_radio_ble_ps]
-extends = env:Heltec_v2_companion_radio_ble
-platform_packages = framework-arduinoespressif32 @ symlink://D:/esp32-2.0.17
-
 [env:Heltec_v2_companion_radio_wifi]
 extends = Heltec_lora32_v2
 build_flags =

variants/heltec_v3/HeltecV3Board.h

@@ -17,6 +17,8 @@
 #define  PIN_ADC_CTRL_ACTIVE    LOW
 #define  PIN_ADC_CTRL_INACTIVE  HIGH
 
+#include <driver/rtc_io.h>
+
 class HeltecV3Board : public ESP32Board {
 private:
   bool adc_active_state;
@@ -50,6 +52,33 @@ public:
     }
   }
 
+  void enterDeepSleep(uint32_t secs, int pin_wake_btn = -1) {
+    esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
+
+    // Make sure the DIO1 and NSS GPIOs are hold on required levels during deep sleep
+    rtc_gpio_set_direction((gpio_num_t)P_LORA_DIO_1, RTC_GPIO_MODE_INPUT_ONLY);
+    rtc_gpio_pulldown_en((gpio_num_t)P_LORA_DIO_1);
+
+    rtc_gpio_hold_en((gpio_num_t)P_LORA_NSS);
+
+    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
+    } else {
+      esp_sleep_enable_ext1_wakeup( (1L << P_LORA_DIO_1) | (1L << pin_wake_btn), ESP_EXT1_WAKEUP_ANY_HIGH);  // wake up on: recv LoRa packet OR wake btn
+    }
+
+    if (secs > 0) {
+      esp_sleep_enable_timer_wakeup(secs * 1000000);
+    }
+
+    // Finally set ESP32 into sleep
+    esp_deep_sleep_start();   // CPU halts here and never returns!
+  }
+
+  void powerOff() override {
+    enterDeepSleep(0);
+  }
+
   uint16_t getBattMilliVolts() override {
     analogReadResolution(10);
     digitalWrite(PIN_ADC_CTRL, adc_active_state);

variants/heltec_v3/platformio.ini

@@ -179,10 +179,6 @@ lib_deps =
   ${Heltec_lora32_v3.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:Heltec_v3_companion_radio_ble_ps]
-extends = env:Heltec_v3_companion_radio_ble
-platform_packages = framework-arduinoespressif32 @ symlink://D:/esp32-2.0.17
-
 [env:Heltec_v3_companion_radio_wifi]
 extends = Heltec_lora32_v3
 build_flags =
@@ -324,10 +320,6 @@ lib_deps =
   ${Heltec_lora32_v3.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:Heltec_WSL3_companion_radio_ble_ps]
-extends = env:Heltec_WSL3_companion_radio_ble
-platform_packages = framework-arduinoespressif32 @ symlink://D:/esp32-2.0.17
-
 [env:Heltec_WSL3_companion_radio_usb]
 extends = Heltec_lora32_v3
 build_flags =

variants/heltec_v4/HeltecV4Board.h

@@ -3,6 +3,7 @@
 #include <Arduino.h>
 #include <helpers/RefCountedDigitalPin.h>
 #include <helpers/ESP32Board.h>
+#include <driver/rtc_io.h>
 #include "LoRaFEMControl.h"
 
 #ifndef ADC_MULTIPLIER
@@ -22,6 +23,7 @@ public:
   void begin();
   void onBeforeTransmit(void) override;
   void onAfterTransmit(void) override;
+  void enterDeepSleep(uint32_t secs, int pin_wake_btn = -1);
   void powerOff() override;
   bool setLoRaFemLnaEnabled(bool enable) override;
   bool canControlLoRaFemLna() const override;

variants/heltec_v4/LoRaFEMControl.h

@@ -24,7 +24,7 @@ class LoRaFEMControl
     LoRaFEMType getFEMType(void) const { return fem_type; }
   private:
     LoRaFEMType fem_type=OTHER_FEM_TYPES;
-    bool lna_enabled=true;
+    bool lna_enabled=false;
     bool lna_can_control=false;
 };
 

variants/heltec_v4/platformio.ini

@@ -222,16 +222,6 @@ lib_deps =
   ${heltec_v4_oled.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:heltec_v4_companion_radio_ble_ps_femon]
-extends = env:heltec_v4_companion_radio_ble
-platform_packages = framework-arduinoespressif32 @ symlink://D:/esp32-2.0.17
-
-[env:heltec_v4_3_companion_radio_ble_ps_femoff]
-extends = env:heltec_v4_companion_radio_ble_ps_femon
-build_flags =
-  ${env:heltec_v4_companion_radio_ble_ps_femon.build_flags}
-  -D RADIO_FEM_RXGAIN=0 ; undefined (default on), 1=on, 0=off
-
 [env:heltec_v4_companion_radio_wifi]
 extends = heltec_v4_oled
 build_flags =
@@ -396,14 +386,6 @@ lib_deps =
   ${heltec_v4_tft.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:heltec_v4_expansionkit_tft_companion_radio_ble_ps]
-extends = env:heltec_v4_tft_companion_radio_ble
-platform_packages = framework-arduinoespressif32 @ symlink://D:/esp32-2.0.17
-build_flags =
-  ${env:heltec_v4_tft_companion_radio_ble.build_flags}
-  -D ENV_PIN_SDA=4
-  -D ENV_PIN_SCL=3
-
 [env:heltec_v4_tft_companion_radio_wifi]
 extends = heltec_v4_tft
 build_flags =

variants/heltec_wireless_paper/platformio.ini

@@ -64,10 +64,6 @@ lib_deps =
   densaugeo/base64 @ ~1.4.0
   bakercp/CRC32 @ ^2.0.0
 
-[env:Heltec_Wireless_Paper_companion_radio_ble_ps]
-extends = env:Heltec_Wireless_Paper_companion_radio_ble
-platform_packages = framework-arduinoespressif32 @ symlink://D:/esp32-2.0.17
-
 [env:Heltec_Wireless_Paper_companion_radio_usb]
 extends = Heltec_Wireless_Paper_base
 build_flags =

variants/lilygo_t3s3/platformio.ini

@@ -174,10 +174,6 @@ lib_deps =
   ${LilyGo_T3S3_sx1262.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:LilyGo_T3S3_sx1262_companion_radio_ble_ps]
-extends = env:LilyGo_T3S3_sx1262_companion_radio_ble
-platform_packages = framework-arduinoespressif32 @ symlink://D:/esp32-2.0.17
-
 [env:LilyGo_T3S3_sx1262_kiss_modem]
 extends = LilyGo_T3S3_sx1262
 build_src_filter = ${LilyGo_T3S3_sx1262.build_src_filter}

variants/lilygo_tbeam_1w/platformio.ini

@@ -146,11 +146,6 @@ lib_deps =
   ${LilyGo_TBeam_1W.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-; === LILYGO T-Beam 1W Companion Radio PS (BLE PS) ===
-[env:LilyGo_TBeam_1W_companion_radio_ble_ps]
-extends = env:LilyGo_TBeam_1W_companion_radio_ble
-platform_packages = framework-arduinoespressif32 @ symlink://D:/esp32-2.0.17
-
 ; === LILYGO T-Beam 1W Companion Radio (WiFi) ===
 [env:LilyGo_TBeam_1W_companion_radio_wifi]
 extends = LilyGo_TBeam_1W

variants/lilygo_tbeam_SX1262/platformio.ini

@@ -65,13 +65,6 @@ lib_deps =
   ${LilyGo_TBeam_SX1262.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:Tbeam_SX1262_companion_radio_ble_ps]
-extends = env:Tbeam_SX1262_companion_radio_ble
-platform_packages = framework-arduinoespressif32 @ symlink://D:/esp32-2.0.17
-build_flags =
-  ${env:Tbeam_SX1262_companion_radio_ble.build_flags}
-  -D MAX_CONTACTS=150
-
 [env:Tbeam_SX1262_repeater]
 extends = LilyGo_TBeam_SX1262
 build_flags =

variants/lilygo_tbeam_SX1276/platformio.ini

@@ -61,10 +61,6 @@ lib_deps =
   ${LilyGo_TBeam_SX1276.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:Tbeam_SX1276_companion_radio_ble_ps]
-extends = env:Tbeam_SX1276_companion_radio_ble
-platform_packages = framework-arduinoespressif32 @ symlink://D:/esp32-2.0.17
-
 [env:Tbeam_SX1276_repeater]
 extends = LilyGo_TBeam_SX1276
 build_flags =

variants/lilygo_tbeam_supreme_SX1262/platformio.ini

@@ -142,10 +142,6 @@ lib_deps =
   ${T_Beam_S3_Supreme_SX1262.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:T_Beam_S3_Supreme_SX1262_companion_radio_ble_ps]
-extends = env:T_Beam_S3_Supreme_SX1262_companion_radio_ble
-platform_packages = framework-arduinoespressif32 @ symlink://D:/esp32-2.0.17
-
 [env:T_Beam_S3_Supreme_SX1262_companion_radio_wifi]
 extends = T_Beam_S3_Supreme_SX1262
 build_flags =

variants/lilygo_tdeck/TDeckBoard.h

@@ -3,6 +3,7 @@
 #include <Wire.h>
 #include <Arduino.h>
 #include "helpers/ESP32Board.h"
+#include <driver/rtc_io.h>
 
 #define PIN_VBAT_READ 4
 #define BATTERY_SAMPLES 8
@@ -22,6 +23,29 @@ public:
     }
   #endif
 
+  void enterDeepSleep(uint32_t secs, int pin_wake_btn) {
+    esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
+
+    // Make sure the DIO1 and NSS GPIOs are hold on required levels during deep sleep
+    rtc_gpio_set_direction((gpio_num_t)P_LORA_DIO_1, RTC_GPIO_MODE_INPUT_ONLY);
+    rtc_gpio_pulldown_en((gpio_num_t)P_LORA_DIO_1);
+
+    rtc_gpio_hold_en((gpio_num_t)P_LORA_NSS);
+
+    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
+    } else {
+      esp_sleep_enable_ext1_wakeup( (1L << P_LORA_DIO_1) | (1L << pin_wake_btn), ESP_EXT1_WAKEUP_ANY_HIGH); // wake up on: recv LoRa packet OR wake btn
+    }
+
+    if (secs > 0) {
+      esp_sleep_enable_timer_wakeup(secs * 1000000);
+    }
+
+    // Finally set ESP32 into sleep
+    esp_deep_sleep_start(); // CPU halts here and never returns!
+  }
+
   uint16_t getBattMilliVolts() {
     #if defined(PIN_VBAT_READ) && defined(ADC_MULTIPLIER)
       analogReadResolution(12);

variants/lilygo_tlora_v2_1/platformio.ini

@@ -92,7 +92,7 @@ extends = LilyGo_TLora_V2_1_1_6
 build_flags =
   ${LilyGo_TLora_V2_1_1_6.build_flags}
   -I examples/companion_radio/ui-new
-  -D MAX_CONTACTS=100
+  -D MAX_CONTACTS=160
   -D MAX_GROUP_CHANNELS=8
   -D BLE_PIN_CODE=123456
   -D OFFLINE_QUEUE_SIZE=128
@@ -108,10 +108,6 @@ lib_deps =
   ${LilyGo_TLora_V2_1_1_6.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:LilyGo_TLora_V2_1_1_6_companion_radio_ble_ps]
-extends = env:LilyGo_TLora_V2_1_1_6_companion_radio_ble
-platform_packages = framework-arduinoespressif32 @ symlink://D:/esp32-2.0.17
-
 [env:LilyGo_TLora_V2_1_1_6_room_server]
 extends = LilyGo_TLora_V2_1_1_6
 build_src_filter = ${LilyGo_TLora_V2_1_1_6.build_src_filter}

variants/promicro/platformio.ini

@@ -1,7 +1,6 @@
 [Promicro]
 extends = nrf52_base
 board = promicro_nrf52840
-board_build.ldscript = boards/nrf52840_s140_v6.ld
 build_flags = ${nrf52_base.build_flags}
   -I variants/promicro
   -D PROMICRO

variants/rak3112/RAK3112Board.h

@@ -16,6 +16,8 @@
 #define  ADC_MULTIPLIER   (3 * 1.73 * 1.187 * 1000)
 #define  BATTERY_SAMPLES 8
 
+#include <driver/rtc_io.h>
+
 class RAK3112Board : public ESP32Board {
 private:
   bool adc_active_state;
@@ -49,6 +51,33 @@ public:
     }
   }
 
+  void enterDeepSleep(uint32_t secs, int pin_wake_btn = -1) {
+    esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
+
+    // Make sure the DIO1 and NSS GPIOs are hold on required levels during deep sleep
+    rtc_gpio_set_direction((gpio_num_t)P_LORA_DIO_1, RTC_GPIO_MODE_INPUT_ONLY);
+    rtc_gpio_pulldown_en((gpio_num_t)P_LORA_DIO_1);
+
+    rtc_gpio_hold_en((gpio_num_t)P_LORA_NSS);
+
+    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
+    } else {
+      esp_sleep_enable_ext1_wakeup( (1L << P_LORA_DIO_1) | (1L << pin_wake_btn), ESP_EXT1_WAKEUP_ANY_HIGH);  // wake up on: recv LoRa packet OR wake btn
+    }
+
+    if (secs > 0) {
+      esp_sleep_enable_timer_wakeup(secs * 1000000);
+    }
+
+    // Finally set ESP32 into sleep
+    esp_deep_sleep_start();   // CPU halts here and never returns!
+  }
+
+  void powerOff() override {
+    enterDeepSleep(0);
+  }
+
   uint16_t getBattMilliVolts() override {
     analogReadResolution(12);
 

variants/rak3401/platformio.ini

@@ -2,12 +2,11 @@
 extends = nrf52_base
 board = rak3401
 board_check = true
-board_build.ldscript = boards/nrf52840_s140_v6.ld
 build_flags = ${nrf52_base.build_flags}
   ${sensor_base.build_flags}
   -I variants/rak3401
   -D RAK_3401
-;  -D NRF52_POWER_MANAGEMENT
+  -D NRF52_POWER_MANAGEMENT
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22

variants/rak4631/platformio.ini

@@ -2,7 +2,6 @@
 extends = nrf52_base
 board = rak4631
 board_check = true
-board_build.ldscript = boards/nrf52840_s140_v6.ld
 extra_scripts = ${nrf52_base.extra_scripts}
   post:variants/rak4631/fix_bsec_lib.py
 build_flags = ${nrf52_base.build_flags}
@@ -10,7 +9,7 @@ build_flags = ${nrf52_base.build_flags}
   -I variants/rak4631
   -D RAK_4631
   -D RAK_BOARD
-;  -D NRF52_POWER_MANAGEMENT
+  -D NRF52_POWER_MANAGEMENT
   -D PIN_BOARD_SCL=14
   -D PIN_BOARD_SDA=13
   -D PIN_GPS_TX=PIN_SERIAL1_RX

variants/rak_wismesh_tag/platformio.ini

@@ -2,7 +2,6 @@
 extends = nrf52_base
 board = rak4631
 board_check = true
-board_build.ldscript = boards/nrf52840_s140_v6.ld
 build_flags = ${nrf52_base.build_flags}
   ${sensor_base.build_flags}
   -I variants/rak_wismesh_tag

variants/sensecap_solar/platformio.ini

@@ -10,7 +10,7 @@ build_flags = ${nrf52_base.build_flags}
   -I src/helpers/nrf52
   -D NRF52_PLATFORM=1
   -D USE_SX1262
-;  -D NRF52_POWER_MANAGEMENT
+  -D NRF52_POWER_MANAGEMENT
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D P_LORA_TX_LED=12

variants/station_g2/StationG2Board.h

@@ -2,6 +2,7 @@
 
 #include <Arduino.h>
 #include <helpers/ESP32Board.h>
+#include <driver/rtc_io.h>
 
 class StationG2Board : public ESP32Board {
 public:
@@ -20,6 +21,29 @@ public:
     }
   }
 
+  void enterDeepSleep(uint32_t secs, int pin_wake_btn = -1) {
+    esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
+
+    // Make sure the DIO1 and NSS GPIOs are hold on required levels during deep sleep
+    rtc_gpio_set_direction((gpio_num_t)P_LORA_DIO_1, RTC_GPIO_MODE_INPUT_ONLY);
+    rtc_gpio_pulldown_en((gpio_num_t)P_LORA_DIO_1);
+
+    rtc_gpio_hold_en((gpio_num_t)P_LORA_NSS);
+
+    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
+    } else {
+      esp_sleep_enable_ext1_wakeup( (1L << P_LORA_DIO_1) | (1L << pin_wake_btn), ESP_EXT1_WAKEUP_ANY_HIGH);  // wake up on: recv LoRa packet OR wake btn
+    }
+
+    if (secs > 0) {
+      esp_sleep_enable_timer_wakeup(secs * 1000000);
+    }
+
+    // Finally set ESP32 into sleep
+    esp_deep_sleep_start();   // CPU halts here and never returns!
+  }
+
   uint16_t getBattMilliVolts() override {
     return 0;
   }

variants/station_g2/platformio.ini

@@ -238,3 +238,8 @@ build_src_filter = ${Station_G2.build_src_filter}
 lib_deps =
   ${Station_G2.lib_deps}
   densaugeo/base64 @ ~1.4.0
+
+[env:Station_G2_kiss_modem]
+extends = Station_G2
+build_src_filter = ${Station_G2.build_src_filter}
+  +<../examples/kiss_modem/>

variants/station_g2/target.cpp

@@ -40,21 +40,6 @@ bool radio_init() {
 #endif
 }
 
-uint32_t radio_get_rng_seed() {
-  return radio.random(0x7FFFFFFF);
-}
-
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr) {
-  radio.setFrequency(freq);
-  radio.setSpreadingFactor(sf);
-  radio.setBandwidth(bw);
-  radio.setCodingRate(cr);
-}
-
-void radio_set_tx_power(int8_t dbm) {
-  radio.setOutputPower(dbm);
-}
-
 mesh::LocalIdentity radio_new_identity() {
   RadioNoiseListener rng(radio);
   return mesh::LocalIdentity(&rng);  // create new random identity

variants/station_g2/target.h

@@ -24,8 +24,5 @@ extern EnvironmentSensorManager sensors;
 #endif
 
 bool radio_init();
-uint32_t radio_get_rng_seed();
-void radio_set_params(float freq, float bw, uint8_t sf, uint8_t cr);
-void radio_set_tx_power(int8_t dbm);
 mesh::LocalIdentity radio_new_identity();
 

variants/thinknode_m2/ThinknodeM2Board.cpp

@@ -1,30 +1,40 @@
 #include "ThinknodeM2Board.h"
 
+
+
 void ThinknodeM2Board::begin() {
-  pinMode(PIN_VEXT_EN, OUTPUT);
-  digitalWrite(PIN_VEXT_EN, !PIN_VEXT_EN_ACTIVE); // force power cycle
-  delay(20);                                      // allow power rail to discharge
-  digitalWrite(PIN_VEXT_EN, PIN_VEXT_EN_ACTIVE);  // turn backlight back on
-  delay(120);                                     // give display time to bias on cold boot
-  ESP32Board::begin();
-  pinMode(PIN_STATUS_LED, OUTPUT); // init power led
-}
-
-uint16_t ThinknodeM2Board::getBattMilliVolts() {
-  analogReadResolution(12);
-  analogSetPinAttenuation(PIN_VBAT_READ, ADC_11db);
-
-  uint32_t mv = 0;
-  for (int i = 0; i < 8; ++i) {
-    mv += analogReadMilliVolts(PIN_VBAT_READ);
-    delayMicroseconds(200);
+    pinMode(PIN_VEXT_EN, OUTPUT); 
+    digitalWrite(PIN_VEXT_EN, !PIN_VEXT_EN_ACTIVE); // force power cycle
+    delay(20); // allow power rail to discharge
+    digitalWrite(PIN_VEXT_EN, PIN_VEXT_EN_ACTIVE); // turn backlight back on
+    delay(120); // give display time to bias on cold boot
+    ESP32Board::begin();
+    pinMode(PIN_STATUS_LED, OUTPUT); // init power led
   }
-  mv /= 8;
 
-  analogReadResolution(10);
-  return static_cast<uint16_t>(mv * ADC_MULTIPLIER);
+  void ThinknodeM2Board::enterDeepSleep(uint32_t secs, int pin_wake_btn) {
+    esp_deep_sleep_start();
+  }
+
+  void ThinknodeM2Board::powerOff()  {
+    enterDeepSleep(0);
+  }
+
+ uint16_t ThinknodeM2Board::getBattMilliVolts() {
+    analogReadResolution(12);
+    analogSetPinAttenuation(PIN_VBAT_READ, ADC_11db);
+
+    uint32_t mv = 0;
+      for (int i = 0; i < 8; ++i) {
+        mv += analogReadMilliVolts(PIN_VBAT_READ);
+        delayMicroseconds(200);
+      }
+    mv /= 8;
+
+    analogReadResolution(10);  
+    return static_cast<uint16_t>(mv * ADC_MULTIPLIER );
 }
 
-const char *ThinknodeM2Board::getManufacturerName() const {
-  return "Elecrow ThinkNode M2";
-}
+  const char* ThinknodeM2Board::getManufacturerName() const {
+    return "Elecrow ThinkNode M2";
+  }

variants/thinknode_m2/ThinknodeM2Board.h

@@ -3,11 +3,15 @@
 #include <Arduino.h>
 #include <helpers/RefCountedDigitalPin.h>
 #include <helpers/ESP32Board.h>
+#include <driver/rtc_io.h>
 
 class ThinknodeM2Board : public ESP32Board {
 
 public:
+
   void begin();
+  void enterDeepSleep(uint32_t secs, int pin_wake_btn = -1);
+  void powerOff() override;
   uint16_t getBattMilliVolts() override;
   const char* getManufacturerName() const override ;
 

variants/thinknode_m5/ThinknodeM5Board.cpp

@@ -19,6 +19,14 @@ void ThinknodeM5Board::begin() {
     ESP32Board::begin();
   }
 
+  void ThinknodeM5Board::enterDeepSleep(uint32_t secs, int pin_wake_btn) {
+    esp_deep_sleep_start();
+  }
+
+  void ThinknodeM5Board::powerOff()  {
+    enterDeepSleep(0);
+  }
+
  uint16_t ThinknodeM5Board::getBattMilliVolts() {
     analogReadResolution(12);
     analogSetPinAttenuation(PIN_VBAT_READ, ADC_11db);

variants/thinknode_m5/ThinknodeM5Board.h

@@ -3,6 +3,7 @@
 #include <Arduino.h>
 #include <helpers/RefCountedDigitalPin.h>
 #include <helpers/ESP32Board.h>
+#include <driver/rtc_io.h>
 #include <PCA9557.h>
 
 extern PCA9557 expander;
@@ -12,6 +13,8 @@ class ThinknodeM5Board : public ESP32Board {
 public:
 
   void begin();
+  void enterDeepSleep(uint32_t secs, int pin_wake_btn = -1);
+  void powerOff() override;
   uint16_t getBattMilliVolts() override;
   const char* getManufacturerName() const override ;
 

variants/xiao_c3/XiaoC3Board.h

@@ -3,6 +3,7 @@
 #include <helpers/ESP32Board.h>
 #include <Arduino.h>
 
+#include <driver/rtc_io.h>
 #include <driver/uart.h>
 
 class XiaoC3Board : public ESP32Board {
@@ -39,6 +40,37 @@ public:
   #endif
   }
 
+  void enterDeepSleep(uint32_t secs, int8_t wake_pin = -1) {
+    gpio_set_direction(gpio_num_t(P_LORA_DIO_1), GPIO_MODE_INPUT);
+    if (wake_pin >= 0) {
+      gpio_set_direction((gpio_num_t)wake_pin, GPIO_MODE_INPUT);
+    }
+
+    //hold disable, isolate and power domain config functions may be unnecessary
+    //gpio_deep_sleep_hold_dis();
+    //esp_sleep_config_gpio_isolate();
+    gpio_deep_sleep_hold_en();
+
+#if defined(LORA_TX_BOOST_PIN)
+    gpio_hold_en((gpio_num_t) LORA_TX_BOOST_PIN);
+    gpio_deep_sleep_hold_en();
+#endif
+    esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
+
+    if (wake_pin >= 0) {
+      esp_deep_sleep_enable_gpio_wakeup((1 << P_LORA_DIO_1) | (1 << wake_pin), ESP_GPIO_WAKEUP_GPIO_HIGH);
+    } else {
+      esp_deep_sleep_enable_gpio_wakeup(1 << P_LORA_DIO_1, ESP_GPIO_WAKEUP_GPIO_HIGH);
+    }
+
+    if (secs > 0) {
+      esp_sleep_enable_timer_wakeup(secs * 1000000);
+    }
+
+    // Finally set ESP32 into sleep
+    esp_deep_sleep_start();  // CPU halts here and never returns!
+  }
+
 #if defined(LORA_TX_BOOST_PIN) || defined(P_LORA_TX_LED)
   void onBeforeTransmit() override {
   #if defined(P_LORA_TX_LED)

variants/xiao_c3/platformio.ini

@@ -90,11 +90,6 @@ lib_deps =
   ${esp32_ota.lib_deps}
   densaugeo/base64 @ ~1.4.0
 
-[env:Xiao_C3_companion_radio_ble_ps]
-extends = env:Xiao_C3_companion_radio_ble
-platform_packages = framework-arduinoespressif32 @ symlink://D:/esp32-2.0.17
-board_build.partitions = min_spiffs.csv ; get around 4mb flash limit
-
 [env:Xiao_C3_companion_radio_usb]
 extends = Xiao_esp32_C3
 build_src_filter = ${Xiao_esp32_C3.build_src_filter}

variants/xiao_c6/platformio.ini

@@ -1,7 +1,6 @@
 [Xiao_C6]
 extends = esp32c6_base
 board = esp32-c6-devkitm-1
-board_build.flash_mode = dio
 board_build.partitions = min_spiffs.csv ; get around 4mb flash limit
 build_flags =
   ${esp32c6_base.build_flags}

variants/xiao_nrf52/platformio.ini

@@ -9,7 +9,7 @@ build_flags = ${nrf52_base.build_flags}
   -I variants/xiao_nrf52
   -UENV_INCLUDE_GPS
   -D NRF52_PLATFORM
-;  -D NRF52_POWER_MANAGEMENT
+  -D NRF52_POWER_MANAGEMENT
   -D XIAO_NRF52
   -D USE_SX1262
   -D RADIO_CLASS=CustomSX1262

variants/xiao_s3/platformio.ini

@@ -114,10 +114,6 @@ lib_deps =
   densaugeo/base64 @ ~1.4.0
   adafruit/Adafruit SSD1306 @ ^2.5.13
 
-[env:Xiao_S3_companion_radio_ble_ps]
-extends = env:Xiao_S3_companion_radio_ble
-platform_packages = framework-arduinoespressif32 @ symlink://D:/esp32-2.0.17
-
 [env:Xiao_S3_companion_radio_usb]
 extends = Xiao_S3
 build_flags =

variants/xiao_s3_wio/platformio.ini

@@ -173,10 +173,6 @@ lib_deps =
   densaugeo/base64 @ ~1.4.0
   adafruit/Adafruit SSD1306 @ ^2.5.13
 
-[env:Xiao_S3_WIO_companion_radio_ble_ps]
-extends = env:Xiao_S3_WIO_companion_radio_ble
-platform_packages = framework-arduinoespressif32 @ symlink://D:/esp32-2.0.17
-
 [env:Xiao_S3_WIO_companion_radio_serial]
 extends = Xiao_S3_WIO
 build_flags =