* timing fixes (courtesy of Taco)

examples/companion_radio/ui-new/UITask.cpp

@@ -697,10 +697,8 @@ void UITask::shutdown(bool restart){
   if (restart) {
     _board->reboot();
   } else {
-    // still necessary until all boards are refactored to use poweroff
     _display->turnOff();
     radio_driver.powerOff();
-    // Power off board including radio, display, GPS and components
     _board->powerOff();
   }
 }

examples/companion_radio/ui-orig/UITask.cpp

@@ -307,9 +307,7 @@ void UITask::shutdown(bool restart){
   if (restart) {
     _board->reboot();
   } else {
-    _display->turnOff();
     radio_driver.powerOff();
-    // Power off board including radio, display, GPS and components
     _board->powerOff();
   }
 }

examples/companion_radio/ui-tiny/UITask.cpp

@@ -568,7 +568,6 @@ void UITask::shutdown(bool restart){
   } else {
     _display->turnOff();
     radio_driver.powerOff();
-    // Power off board including radio, display, GPS and components
     _board->powerOff();
   }
 }

src/helpers/ESP32Board.cpp

@@ -1,7 +1,6 @@
 #ifdef ESP_PLATFORM
 
 #include "ESP32Board.h"
-#include <target.h>
 
 #if defined(ADMIN_PASSWORD) && !defined(DISABLE_WIFI_OTA)   // Repeater or Room Server only
 #include <WiFi.h>
@@ -45,45 +44,4 @@ bool ESP32Board::startOTAUpdate(const char* id, char reply[]) {
 }
 #endif
 
-void ESP32Board::powerOff() {
-  enterDeepSleep(0); // Do not wakeup
-}
-
-void ESP32Board::enterDeepSleep(uint32_t secs) {
-  // Power off the display if any
-#ifdef DISPLAY_CLASS
-  display.turnOff();
-#endif
-
-  // Power off LoRa
-  radio_driver.powerOff();
-
-  // Keep LoRa inactive during deepsleep
-  digitalWrite(P_LORA_NSS, HIGH);
-#if defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32C6)
-  gpio_hold_en((gpio_num_t)P_LORA_NSS);
-#else
-  rtc_gpio_hold_en((gpio_num_t)P_LORA_NSS);
-#endif
-
-  // Power off GPS if any
-  if (sensors.getLocationProvider() != NULL) {
-    sensors.getLocationProvider()->stop();
-  }
-
-  // Flush serial buffers
-  Serial.flush();
-  delay(100);
-
-  // Clear stale wakeup sources to avoid ghost wakeup
-  // This is required when Power Management and automatic lightsleep are enabled
-  esp_sleep_disable_wakeup_source(ESP_SLEEP_WAKEUP_ALL);
-
-  if (secs > 0) {
-    esp_sleep_enable_timer_wakeup(secs * 1000000ULL);
-  }
-
-  // Finally set ESP32 into deepsleep
-  esp_deep_sleep_start(); // CPU halts here and never returns!
-}
 #endif

src/helpers/ESP32Board.h

@@ -14,7 +14,6 @@
 #include <Wire.h>
 #include "soc/rtc.h"
 #include "esp_system.h"
-#include <driver/rtc_io.h>
 
 class ESP32Board : public mesh::MainBoard {
 protected:
@@ -63,9 +62,6 @@ public:
     return raw / 4;
   }
 
-  virtual void powerOff() override;
-  void enterDeepSleep(uint32_t secs);
-
   uint32_t getIRQGpio() override {
     return P_LORA_DIO_1; // default for SX1262
   }

src/helpers/MeshadventurerBoard.h

@@ -15,6 +15,8 @@
 
 #include "ESP32Board.h"
 
+#include <driver/rtc_io.h>
+
 class MeshadventurerBoard : public ESP32Board {
 
 public:
@@ -33,6 +35,34 @@ 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 held 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 {
+    // TODO: re-enable this when there is a definite wake-up source pin:
+    //  enterDeepSleep(0);
+  }
+
   uint16_t getBattMilliVolts() override {
     analogReadResolution(12);
 

src/helpers/NRF52Board.cpp

@@ -1,6 +1,5 @@
 #if defined(NRF52_PLATFORM)
 #include "NRF52Board.h"
-#include <target.h>
 
 #include <bluefruit.h>
 #include <nrf_soc.h>
@@ -298,37 +297,6 @@ float NRF52Board::getMCUTemperature() {
   return temp * 0.25f; // Convert to *C
 }
 
-void NRF52Board::powerOff() {
-  // Power off the display if any
-#ifdef DISPLAY_CLASS
-  display.turnOff();
-#endif
-
-  // Power off LoRa
-  radio_driver.powerOff();
-
-  // Keep LoRa inactive during deepsleep
-  digitalWrite(P_LORA_NSS, HIGH);
-
-  // Power off GPS if any
-  if(sensors.getLocationProvider() != NULL) {
-    sensors.getLocationProvider()->stop();
-  }
-
-  // Flush serial buffers
-  Serial.flush();
-  delay(100);
-
-  // Enter SYSTEMOFF
-  uint8_t sd_enabled = 0;
-  sd_softdevice_is_enabled(&sd_enabled);
-  if (sd_enabled) { // SoftDevice is enabled
-    sd_power_system_off();
-  } else { // SoftDevice is not enable
-    NRF_POWER->SYSTEMOFF = POWER_SYSTEMOFF_SYSTEMOFF_Enter;
-  }
-}
-
 bool NRF52Board::getBootloaderVersion(char* out, size_t max_len) {
     static const char BOOTLOADER_MARKER[] = "UF2 Bootloader ";
     const uint8_t* flash = (const uint8_t*)0x000FB000; // earliest known info.txt location is 0xFB90B, latest is 0xFCC4B

src/helpers/NRF52Board.h

@@ -50,7 +50,6 @@ public:
   virtual uint8_t getStartupReason() const override { return startup_reason; }
   virtual float getMCUTemperature() override;
   virtual void reboot() override { NVIC_SystemReset(); }
-  virtual void powerOff() override;
   virtual bool getBootloaderVersion(char* version, size_t max_len) override;
   virtual bool startOTAUpdate(const char *id, char reply[]) override;
   virtual void sleep(uint32_t secs) override;

src/helpers/radiolib/CustomLLCC68.h

@@ -66,11 +66,11 @@ class CustomLLCC68 : public LLCC68 {
       setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
   #endif
   #if defined(SX126X_RXEN) || defined(SX126X_TXEN)
-    #ifndef SX126X_RXEN
-      #define SX126X_RXEN RADIOLIB_NC
+    #ifndef SX1262X_RXEN
+      #define SX1262X_RXEN RADIOLIB_NC
     #endif
-    #ifndef SX126X_TXEN
-      #define SX126X_TXEN RADIOLIB_NC
+    #ifndef SX1262X_TXEN
+      #define SX1262X_TXEN RADIOLIB_NC
     #endif
       setRfSwitchPins(SX126X_RXEN, SX126X_TXEN);
   #endif 

src/helpers/radiolib/CustomSX1268.h

@@ -66,11 +66,11 @@ class CustomSX1268 : public SX1268 {
       setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
   #endif
   #if defined(SX126X_RXEN) || defined(SX126X_TXEN)
-    #ifndef SX126X_RXEN
-      #define SX126X_RXEN RADIOLIB_NC
+    #ifndef SX1262X_RXEN
+      #define SX1262X_RXEN RADIOLIB_NC
     #endif
-    #ifndef SX126X_TXEN
-      #define SX126X_TXEN RADIOLIB_NC
+    #ifndef SX1262X_TXEN
+      #define SX1262X_TXEN RADIOLIB_NC
     #endif
       setRfSwitchPins(SX126X_RXEN, SX126X_TXEN);
   #endif 

src/helpers/radiolib/CustomSX1276.h

@@ -50,14 +50,14 @@ class CustomSX1276 : public SX1276 {
       setCurrentLimit(SX127X_CURRENT_LIMIT);
   #endif
 
-  #if defined(SX127X_RXEN) || defined(SX127X_TXEN)
-    #ifndef SX127X_RXEN
-      #define SX127X_RXEN RADIOLIB_NC
+  #if defined(SX176X_RXEN) || defined(SX176X_TXEN)
+    #ifndef SX176X_RXEN
+      #define SX176X_RXEN RADIOLIB_NC
     #endif
-    #ifndef SX127X_TXEN
-      #define SX127X_TXEN RADIOLIB_NC
+    #ifndef SX176X_TXEN
+      #define SX176X_TXEN RADIOLIB_NC
     #endif
-      setRfSwitchPins(SX127X_RXEN, SX127X_TXEN);
+      setRfSwitchPins(SX176X_RXEN, SX176X_TXEN);
   #endif
 
       setCRC(1);

src/helpers/ui/ST7735Display.cpp

@@ -1,12 +1,400 @@
 #include "ST7735Display.h"
 
-#ifndef DISPLAY_ROTATION
-  #define DISPLAY_ROTATION 2
-#endif
+//#include <Fonts/GFXFF/FreeSans9pt7b.h>
+
+// Optimised ST7735 display driver, derived from Adafruit_ST7735 library.
+
+#define ST_CMD_DELAY 0x80 // special signifier for command lists
+
+#define ST77XX_NOP 0x00
+#define ST77XX_SWRESET 0x01
+#define ST77XX_RDDID 0x04
+#define ST77XX_RDDST 0x09
+
+#define ST77XX_SLPIN 0x10
+#define ST77XX_SLPOUT 0x11
+#define ST77XX_PTLON 0x12
+#define ST77XX_NORON 0x13
+
+#define ST77XX_INVOFF 0x20
+#define ST77XX_INVON 0x21
+#define ST77XX_DISPOFF 0x28
+#define ST77XX_DISPON 0x29
+#define ST77XX_CASET 0x2A
+#define ST77XX_RASET 0x2B
+#define ST77XX_RAMWR 0x2C
+#define ST77XX_RAMRD 0x2E
+
+#define ST77XX_PTLAR 0x30
+#define ST77XX_TEOFF 0x34
+#define ST77XX_TEON 0x35
+#define ST77XX_MADCTL 0x36
+#define ST77XX_COLMOD 0x3A
+
+#define ST77XX_MADCTL_MY 0x80
+#define ST77XX_MADCTL_MX 0x40
+#define ST77XX_MADCTL_MV 0x20
+#define ST77XX_MADCTL_ML 0x10
+#define ST77XX_MADCTL_RGB 0x00
+
+#define ST77XX_RDID1 0xDA
+#define ST77XX_RDID2 0xDB
+#define ST77XX_RDID3 0xDC
+#define ST77XX_RDID4 0xDD
+
+// Some ready-made 16-bit ('565') color settings:
+#define ST77XX_BLACK 0x0000
+#define ST77XX_WHITE 0xFFFF
+#define ST77XX_RED 0xF800
+#define ST77XX_GREEN 0x07E0
+#define ST77XX_BLUE 0x001F
+#define ST77XX_CYAN 0x07FF
+#define ST77XX_MAGENTA 0xF81F
+#define ST77XX_YELLOW 0xFFE0
+#define ST77XX_ORANGE 0xFC00
+
+
+// some flags for initR() :(
+#define INITR_GREENTAB 0x00
+#define INITR_REDTAB 0x01
+#define INITR_BLACKTAB 0x02
+#define INITR_18GREENTAB INITR_GREENTAB
+#define INITR_18REDTAB INITR_REDTAB
+#define INITR_18BLACKTAB INITR_BLACKTAB
+#define INITR_144GREENTAB 0x01
+#define INITR_MINI160x80 0x04
+#define INITR_HALLOWING 0x05
+#define INITR_MINI160x80_PLUGIN 0x06
+
+// Some register settings
+#define ST7735_MADCTL_BGR 0x08
+#define ST7735_MADCTL_MH 0x04
+
+#define ST7735_FRMCTR1 0xB1
+#define ST7735_FRMCTR2 0xB2
+#define ST7735_FRMCTR3 0xB3
+#define ST7735_INVCTR 0xB4
+#define ST7735_DISSET5 0xB6
+
+#define ST7735_PWCTR1 0xC0
+#define ST7735_PWCTR2 0xC1
+#define ST7735_PWCTR3 0xC2
+#define ST7735_PWCTR4 0xC3
+#define ST7735_PWCTR5 0xC4
+#define ST7735_VMCTR1 0xC5
+
+#define ST7735_PWCTR6 0xFC
+
+#define ST7735_GMCTRP1 0xE0
+#define ST7735_GMCTRN1 0xE1
+
+// Some ready-made 16-bit ('565') color settings:
+#define ST7735_BLACK ST77XX_BLACK
+#define ST7735_WHITE ST77XX_WHITE
+#define ST7735_RED ST77XX_RED
+#define ST7735_GREEN ST77XX_GREEN
+#define ST7735_BLUE ST77XX_BLUE
+#define ST7735_CYAN ST77XX_CYAN
+#define ST7735_MAGENTA ST77XX_MAGENTA
+#define ST7735_YELLOW ST77XX_YELLOW
+#define ST7735_ORANGE ST77XX_ORANGE
+
+static TFT_eSPI lcd = TFT_eSPI(160, 80);
+static uint32_t curr_color;
+
+#define  _spi   (&SPI1)
+
+SPISettings  _spiSettings = SPISettings(40000000, MSBFIRST, SPI_MODE0);
+
+// clang-format off
+static const uint8_t PROGMEM
+  Bcmd[] = {                        // Init commands for 7735B screens
+    18,                             // 18 commands in list:
+    ST77XX_SWRESET,   ST_CMD_DELAY, //  1: Software reset, no args, w/delay
+      50,                           //     50 ms delay
+    ST77XX_SLPOUT,    ST_CMD_DELAY, //  2: Out of sleep mode, no args, w/delay
+      255,                          //     255 = max (500 ms) delay
+    ST77XX_COLMOD,  1+ST_CMD_DELAY, //  3: Set color mode, 1 arg + delay:
+      0x05,                         //     16-bit color
+      10,                           //     10 ms delay
+    ST7735_FRMCTR1, 3+ST_CMD_DELAY, //  4: Frame rate control, 3 args + delay:
+      0x00,                         //     fastest refresh
+      0x06,                         //     6 lines front porch
+      0x03,                         //     3 lines back porch
+      10,                           //     10 ms delay
+    ST77XX_MADCTL,  1,              //  5: Mem access ctl (directions), 1 arg:
+      0x08,                         //     Row/col addr, bottom-top refresh
+    ST7735_DISSET5, 2,              //  6: Display settings #5, 2 args:
+      0x15,                         //     1 clk cycle nonoverlap, 2 cycle gate
+                                    //     rise, 3 cycle osc equalize
+      0x02,                         //     Fix on VTL
+    ST7735_INVCTR,  1,              //  7: Display inversion control, 1 arg:
+      0x0,                          //     Line inversion
+    ST7735_PWCTR1,  2+ST_CMD_DELAY, //  8: Power control, 2 args + delay:
+      0x02,                         //     GVDD = 4.7V
+      0x70,                         //     1.0uA
+      10,                           //     10 ms delay
+    ST7735_PWCTR2,  1,              //  9: Power control, 1 arg, no delay:
+      0x05,                         //     VGH = 14.7V, VGL = -7.35V
+    ST7735_PWCTR3,  2,              // 10: Power control, 2 args, no delay:
+      0x01,                         //     Opamp current small
+      0x02,                         //     Boost frequency
+    ST7735_VMCTR1,  2+ST_CMD_DELAY, // 11: Power control, 2 args + delay:
+      0x3C,                         //     VCOMH = 4V
+      0x38,                         //     VCOML = -1.1V
+      10,                           //     10 ms delay
+    ST7735_PWCTR6,  2,              // 12: Power control, 2 args, no delay:
+      0x11, 0x15,
+    ST7735_GMCTRP1,16,              // 13: Gamma Adjustments (pos. polarity), 16 args + delay:
+      0x09, 0x16, 0x09, 0x20,       //     (Not entirely necessary, but provides
+      0x21, 0x1B, 0x13, 0x19,       //      accurate colors)
+      0x17, 0x15, 0x1E, 0x2B,
+      0x04, 0x05, 0x02, 0x0E,
+    ST7735_GMCTRN1,16+ST_CMD_DELAY, // 14: Gamma Adjustments (neg. polarity), 16 args + delay:
+      0x0B, 0x14, 0x08, 0x1E,       //     (Not entirely necessary, but provides
+      0x22, 0x1D, 0x18, 0x1E,       //      accurate colors)
+      0x1B, 0x1A, 0x24, 0x2B,
+      0x06, 0x06, 0x02, 0x0F,
+      10,                           //     10 ms delay
+    ST77XX_CASET,   4,              // 15: Column addr set, 4 args, no delay:
+      0x00, 0x02,                   //     XSTART = 2
+      0x00, 0x81,                   //     XEND = 129
+    ST77XX_RASET,   4,              // 16: Row addr set, 4 args, no delay:
+      0x00, 0x02,                   //     XSTART = 1
+      0x00, 0x81,                   //     XEND = 160
+    ST77XX_NORON,     ST_CMD_DELAY, // 17: Normal display on, no args, w/delay
+      10,                           //     10 ms delay
+    ST77XX_DISPON,    ST_CMD_DELAY, // 18: Main screen turn on, no args, delay
+      255 },                        //     255 = max (500 ms) delay
+
+  Rcmd1[] = {                       // 7735R init, part 1 (red or green tab)
+    14,                             // 14 commands in list:
+    /*ST77XX_SWRESET,   ST_CMD_DELAY, //  1: Software reset, 0 args, w/delay
+      150,  */                        //     150 ms delay
+    ST77XX_SLPOUT,    ST_CMD_DELAY, //  2: Out of sleep mode, 0 args, w/delay
+      120,                          //     120 ms delay
+    ST7735_FRMCTR1, 3,              //  3: Framerate ctrl - normal mode, 3 arg:
+      0x01, 0x2C, 0x2D,             //     Rate = fosc/(1x2+40) * (LINE+2C+2D)
+    ST7735_FRMCTR2, 3,              //  4: Framerate ctrl - idle mode, 3 args:
+      0x01, 0x2C, 0x2D,             //     Rate = fosc/(1x2+40) * (LINE+2C+2D)
+    ST7735_FRMCTR3, 6,              //  5: Framerate - partial mode, 6 args:
+      0x01, 0x2C, 0x2D,             //     Dot inversion mode
+      0x01, 0x2C, 0x2D,             //     Line inversion mode
+    ST7735_INVCTR,  1,              //  6: Display inversion ctrl, 1 arg:
+      0x07,                         //     No inversion
+    ST7735_PWCTR1,  3,              //  7: Power control, 3 args, no delay:
+      0xA2,
+      0x02,                         //     -4.6V
+      0x84,                         //     AUTO mode
+    ST7735_PWCTR2,  1,              //  8: Power control, 1 arg, no delay:
+      0xC5,                         //     VGH25=2.4C VGSEL=-10 VGH=3 * AVDD
+    ST7735_PWCTR3,  2,              //  9: Power control, 2 args, no delay:
+      0x0A,                         //     Opamp current small
+      0x00,                         //     Boost frequency
+    ST7735_PWCTR4,  2,              // 10: Power control, 2 args, no delay:
+      0x8A,                         //     BCLK/2,
+      0x2A,                         //     opamp current small & medium low
+    ST7735_PWCTR5,  2,              // 11: Power control, 2 args, no delay:
+      0x8A, 0xEE,
+    ST7735_VMCTR1,  1,              // 12: Power control, 1 arg, no delay:
+      0x0E,
+    ST77XX_INVOFF,  0,              // 13: Don't invert display, no args
+    ST77XX_MADCTL,  1,              // 14: Mem access ctl (directions), 1 arg:
+      0xC8,                         //     row/col addr, bottom-top refresh
+    ST77XX_COLMOD,  1,              // 15: set color mode, 1 arg, no delay:
+      0x05 },                       //     16-bit color
+
+  Rcmd2green[] = {                  // 7735R init, part 2 (green tab only)
+    2,                              //  2 commands in list:
+    ST77XX_CASET,   4,              //  1: Column addr set, 4 args, no delay:
+      0x00, 0x02,                   //     XSTART = 0
+      0x00, 0x7F+0x02,              //     XEND = 127
+    ST77XX_RASET,   4,              //  2: Row addr set, 4 args, no delay:
+      0x00, 0x01,                   //     XSTART = 0
+      0x00, 0x9F+0x01 },            //     XEND = 159
+
+  Rcmd2red[] = {                    // 7735R init, part 2 (red tab only)
+    2,                              //  2 commands in list:
+    ST77XX_CASET,   4,              //  1: Column addr set, 4 args, no delay:
+      0x00, 0x00,                   //     XSTART = 0
+      0x00, 0x7F,                   //     XEND = 127
+    ST77XX_RASET,   4,              //  2: Row addr set, 4 args, no delay:
+      0x00, 0x00,                   //     XSTART = 0
+      0x00, 0x9F },                 //     XEND = 159
+
+  Rcmd2green144[] = {               // 7735R init, part 2 (green 1.44 tab)
+    2,                              //  2 commands in list:
+    ST77XX_CASET,   4,              //  1: Column addr set, 4 args, no delay:
+      0x00, 0x00,                   //     XSTART = 0
+      0x00, 0x7F,                   //     XEND = 127
+    ST77XX_RASET,   4,              //  2: Row addr set, 4 args, no delay:
+      0x00, 0x00,                   //     XSTART = 0
+      0x00, 0x7F },                 //     XEND = 127
+
+  Rcmd2green160x80[] = {            // 7735R init, part 2 (mini 160x80)
+    2,                              //  2 commands in list:
+    ST77XX_CASET,   4,              //  1: Column addr set, 4 args, no delay:
+      0x00, 0x00,                   //     XSTART = 0
+      0x00, 0x4F,                   //     XEND = 79
+    ST77XX_RASET,   4,              //  2: Row addr set, 4 args, no delay:
+      0x00, 0x00,                   //     XSTART = 0
+      0x00, 0x9F },                 //     XEND = 159
+
+  Rcmd2green160x80plugin[] = {      // 7735R init, part 2 (mini 160x80 with plugin FPC)
+    3,                              //  3 commands in list:
+    ST77XX_INVON,  0,              //   1: Display is inverted
+    ST77XX_CASET,   4,              //  2: Column addr set, 4 args, no delay:
+      0x00, 0x00,                   //     XSTART = 0
+      0x00, 0x4F,                   //     XEND = 79
+    ST77XX_RASET,   4,              //  3: Row addr set, 4 args, no delay:
+      0x00, 0x00,                   //     XSTART = 0
+      0x00, 0x9F },                 //     XEND = 159
+
+  Rcmd3[] = {                       // 7735R init, part 3 (red or green tab)
+    2,                              //  2 commands in list:
+    ST7735_GMCTRP1, 16      ,       //  1: Gamma Adjustments (pos. polarity), 16 args + delay:
+      0x02, 0x1c, 0x07, 0x12,       //     (Not entirely necessary, but provides
+      0x37, 0x32, 0x29, 0x2d,       //      accurate colors)
+      0x29, 0x25, 0x2B, 0x39,
+      0x00, 0x01, 0x03, 0x10,
+    ST7735_GMCTRN1, 16      ,       //  2: Gamma Adjustments (neg. polarity), 16 args + delay:
+      0x03, 0x1d, 0x07, 0x06,       //     (Not entirely necessary, but provides
+      0x2E, 0x2C, 0x29, 0x2D,       //      accurate colors)
+      0x2E, 0x2E, 0x37, 0x3F,
+      0x00, 0x00, 0x02, 0x10 };                        //     100 ms delay
+
+static int16_t _xstart = 0;          ///< Internal framebuffer X offset
+static int16_t _ystart = 0;          ///< Internal framebuffer Y offset
+static uint8_t _colstart = 0;   ///< Some displays need this changed to offset
+static uint8_t _rowstart = 0;       ///< Some displays need this changed to offset
+static uint8_t rotation = 0;
+static int16_t _width = 0;       ///< Display width as modified by current rotation
+static int16_t _height = 0;      ///< Display height as modified by current rotation
+
+static void set_CS(uint8_t level) {
+  //if (_cs != (uint8_t) -1) {
+    digitalWrite(PIN_TFT_CS, level);
+  //}
+}
+static void sendCommand(uint8_t com) {
+    set_CS(HIGH);
+    digitalWrite(PIN_TFT_DC, LOW);
+    set_CS(LOW);
+    _spi->beginTransaction(_spiSettings);
+    _spi->transfer(com);
+    _spi->endTransaction();
+    set_CS(HIGH);
+    digitalWrite(PIN_TFT_DC, HIGH);
+}
+    
+static void WriteData(uint8_t data) {
+    digitalWrite(PIN_TFT_CS, LOW);
+    _spi->beginTransaction(_spiSettings);
+    _spi->transfer(data);
+    _spi->endTransaction();
+    digitalWrite(PIN_TFT_CS, HIGH);
+}
+static void SPI_WRITE32(uint32_t l) {
+    _spi->transfer(l >> 24);
+    _spi->transfer(l >> 16);
+    _spi->transfer(l >> 8);
+    _spi->transfer(l);
+}
+static void writeCommand(uint8_t cmd) {
+    digitalWrite(PIN_TFT_DC, LOW);
+    _spi->transfer(cmd);
+    digitalWrite(PIN_TFT_DC, HIGH);
+}
+
+static void displayInit(const uint8_t *addr) {
+  uint8_t numCommands, cmd, numArgs;
+  uint16_t ms;
+
+  numCommands = pgm_read_byte(addr++); // Number of commands to follow
+  while (numCommands--) {              // For each command...
+    cmd = pgm_read_byte(addr++);       // Read command
+    numArgs = pgm_read_byte(addr++);   // Number of args to follow
+    ms = numArgs & ST_CMD_DELAY;       // If hibit set, delay follows args
+    numArgs &= ~ST_CMD_DELAY;          // Mask out delay bit
+    sendCommand(cmd);
+    for (int k = 0; k < numArgs; k++) {
+      WriteData(addr[k]);
+    }
+    addr += numArgs;
+
+    if (ms) {
+      ms = pgm_read_byte(addr++); // Read post-command delay time (ms)
+      if (ms == 255)
+        ms = 500; // If 255, delay for 500 ms
+      delay(ms);
+    }
+  }
+}
+
+static void setRotation(uint8_t m) {
+  uint8_t madctl = 0;
+
+  rotation = m & 3; // can't be higher than 3
+
+  switch (rotation) {
+  case 0:
+    madctl = ST77XX_MADCTL_MX | ST77XX_MADCTL_MY | ST7735_MADCTL_BGR;
+
+    _height = 160;
+    _width = 80;
+    _xstart = _colstart;
+    _ystart = _rowstart;
+    break;
+  case 1:
+    madctl = ST77XX_MADCTL_MY | ST77XX_MADCTL_MV | ST7735_MADCTL_BGR;
+
+    _width = 160;
+    _height = 80;
+    _ystart = _colstart;
+    _xstart = _rowstart;
+    break;
+  case 2:
+    madctl = ST7735_MADCTL_BGR;
+
+    _height = 160;
+    _width = 80;
+    _xstart = _colstart;
+    _ystart = _rowstart;
+    break;
+  case 3:
+    madctl = ST77XX_MADCTL_MX | ST77XX_MADCTL_MV | ST7735_MADCTL_BGR;
+
+    _width = 160;
+    _height = 80;
+    _ystart = _colstart;
+    _xstart = _rowstart;
+    break;
+  }
+
+  sendCommand(ST77XX_MADCTL);
+  WriteData(madctl);
+}
+
+static void setAddrWindow(uint16_t x, uint16_t y, uint16_t w, uint16_t h) {
+  x += _xstart;
+  y += _ystart;
+  uint32_t xa = ((uint32_t)x << 16) | (x + w - 1);
+  uint32_t ya = ((uint32_t)y << 16) | (y + h - 1);
+
+  writeCommand(ST77XX_CASET); // Column addr set
+  SPI_WRITE32(xa);
+
+  writeCommand(ST77XX_RASET); // Row addr set
+  SPI_WRITE32(ya);
+
+  writeCommand(ST77XX_RAMWR); // write to RAM
+}
 
 #define SCALE_X  1.25f     // 160 / 128
 #define SCALE_Y  1.25f      // 80 / 64
 
+static TFT_eSprite *sprite = NULL;
+
 bool ST7735Display::i2c_probe(TwoWire& wire, uint8_t addr) {
   return true;
 /*
@@ -16,53 +404,103 @@ bool ST7735Display::i2c_probe(TwoWire& wire, uint8_t addr) {
 */
 }
 
+#ifndef PIN_TFT_LEDA_CTL_ACTIVE
+  #define PIN_TFT_LEDA_CTL_ACTIVE  HIGH
+#endif
+
 bool ST7735Display::begin() {
+  if (!sprite) {
+    // alloc offscreen canvas
+    sprite = new TFT_eSprite(&lcd);
+    if (sprite) {
+      if (sprite->createSprite(160, 80)) {
+        sprite->fillScreen(ST77XX_BLACK);
+        sprite->setTextColor(curr_color = ST77XX_WHITE);
+      } else {
+        Serial.printf("ST7735Display: failed to alloc canvas pixels");
+      }
+    } else {
+      Serial.printf("ST7735Display: failed to alloc canvas");
+    }
+  }
+  
   if (!_isOn) {
     if (_peripher_power) _peripher_power->claim();
 
+    delay(100); // TEMP!!
+    pinMode(PIN_TFT_RST, OUTPUT);
+    pinMode(PIN_TFT_CS, OUTPUT);
+    pinMode(PIN_TFT_DC, OUTPUT);
     pinMode(PIN_TFT_LEDA_CTL, OUTPUT);
-#if defined(PIN_TFT_LEDA_CTL_ACTIVE)
-    digitalWrite(PIN_TFT_LEDA_CTL, PIN_TFT_LEDA_CTL_ACTIVE);
-#else
-    digitalWrite(PIN_TFT_LEDA_CTL, HIGH); 
-#endif
-    digitalWrite(PIN_TFT_RST, HIGH);
 
-#if defined(HELTEC_T1)
-    display.initR(INITR_MINI160x80);
-    display.setRotation(DISPLAY_ROTATION);
-#elif defined(HELTEC_TRACKER_V2) || defined(HELTEC_T096)
-    display.initR(INITR_MINI160x80);
-    display.setRotation(DISPLAY_ROTATION);
-    uint8_t madctl = ST77XX_MADCTL_MY | ST77XX_MADCTL_MV |ST7735_MADCTL_BGR;//Adjust color to BGR
-    display.sendCommand(ST77XX_MADCTL, &madctl, 1);
+#ifdef ESP_PLATFORM
+    _spi->begin(_clk,_miso,_mosi,-1);
 #else
-    display.initR(INITR_MINI160x80_PLUGIN);
-    display.setRotation(DISPLAY_ROTATION);
+    _spi->begin(); 
 #endif
-    display.setSPISpeed(40000000);
-    display.fillScreen(ST77XX_BLACK);
-    display.setTextColor(ST77XX_WHITE);
-    display.setTextSize(2); 
-    display.cp437(true);         // Use full 256 char 'Code Page 437' font
+    _spi->setClockDivider(SPI_CLOCK_DIV2);
+
+    _height = 80;
+    _width = 160;
+    _colstart = 24;
+    _rowstart = 0;
+
+    _resetAndInit();
+    
+    sendCommand(ST77XX_DISPON);
     
     _isOn = true;
   }
   return true;
 }
 
+void ST7735Display::_resetAndInit() {
+    // Pulse Reset low for 10ms
+    digitalWrite(PIN_TFT_RST, HIGH);
+    delay(2);
+    digitalWrite(PIN_TFT_RST, LOW);
+    delay(10);
+    digitalWrite(PIN_TFT_RST, HIGH);
+    delay(2);
+
+    // run init commands
+    displayInit(Rcmd1);
+#if defined(HELTEC_TRACKER_V2) || defined(HELTEC_T096)
+    displayInit(Rcmd2green160x80);
+    //uint8_t madctl = ST77XX_MADCTL_MY | ST77XX_MADCTL_MV |ST7735_MADCTL_BGR;//Adjust color to BGR
+    //display.sendCommand(ST77XX_MADCTL, &madctl, 1);
+#endif
+    displayInit(Rcmd3);
+    setRotation(DISPLAY_ROTATION);
+    
+    // clear the buffer before display on
+    sprite->fillScreen(ST77XX_BLACK);
+    endFrame();
+    
+    // turn on backlight
+    digitalWrite(PIN_TFT_LEDA_CTL, PIN_TFT_LEDA_CTL_ACTIVE);
+
+}
+
 void ST7735Display::turnOn() {
-  ST7735Display::begin();
+  if (!_isOn) {
+    if (_peripher_power) _peripher_power->claim();
+    _resetAndInit();
+    sendCommand(ST77XX_DISPON);
+
+    // Now turn on the backlight
+    // digitalWrite(PIN_TFT_LEDA_CTL, PIN_TFT_LEDA_CTL_ACTIVE);
+    _isOn = true;
+  }
 }
 
 void ST7735Display::turnOff() {
   if (_isOn) {
-    digitalWrite(PIN_TFT_RST, LOW);
-#if defined(PIN_TFT_LEDA_CTL_ACTIVE)
+    sendCommand(ST77XX_DISPOFF);
+
+    //digitalWrite(PIN_TFT_RST, LOW);
+    // Now turn off the backlight
     digitalWrite(PIN_TFT_LEDA_CTL, !PIN_TFT_LEDA_CTL_ACTIVE);
-#else
-    digitalWrite(PIN_TFT_LEDA_CTL, LOW); 
-#endif
     _isOn = false;
 
     if (_peripher_power) _peripher_power->release();
@@ -70,78 +508,90 @@ void ST7735Display::turnOff() {
 }
 
 void ST7735Display::clear() {
-  //Serial.println("DBG: display.Clear");
-  display.fillScreen(ST77XX_BLACK);
+  sprite->fillScreen(ST77XX_BLACK);
 }
 
 void ST7735Display::startFrame(Color bkg) {
-  display.fillScreen(0x00);
-  display.setTextColor(ST77XX_WHITE);
-  display.setTextSize(1);      // This one affects size of Please wait... message
-  display.cp437(true);         // Use full 256 char 'Code Page 437' font
+  sprite->fillScreen(ST77XX_BLACK);
+  sprite->setTextColor(curr_color = ST77XX_WHITE);
+  sprite->setFreeFont();
+  sprite->setTextSize(1);      // This one affects size of Please wait... message
+  //sprite->cp437(true);         // Use full 256 char 'Code Page 437' font
 }
 
 void ST7735Display::setTextSize(int sz) {
-  display.setTextSize(sz);
+  sprite->setTextSize(sz);
 }
 
 void ST7735Display::setColor(Color c) {
   switch (c) {
     case DisplayDriver::DARK :
-      _color = ST77XX_BLACK;
+      curr_color = ST77XX_BLACK;
       break;
     case DisplayDriver::LIGHT : 
-      _color = ST77XX_WHITE;
+      curr_color = ST77XX_WHITE;
       break;
     case DisplayDriver::RED : 
-      _color = ST77XX_RED;
+      curr_color = ST77XX_RED;
       break;
     case DisplayDriver::GREEN : 
-      _color = ST77XX_GREEN;
+      curr_color = ST77XX_GREEN;
       break;
     case DisplayDriver::BLUE : 
-      _color = ST77XX_BLUE;
+      curr_color = ST77XX_BLUE;
       break;
     case DisplayDriver::YELLOW : 
-      _color = ST77XX_YELLOW;
+      curr_color = ST77XX_YELLOW;
       break;
     case DisplayDriver::ORANGE : 
-      _color = ST77XX_ORANGE;
+      curr_color = ST77XX_ORANGE;
       break;
     default:
-      _color = ST77XX_WHITE;
+      curr_color = ST77XX_WHITE;
       break;
   }
-  display.setTextColor(_color);
+  sprite->setTextColor(curr_color);
 }
 
 void ST7735Display::setCursor(int x, int y) {
-  display.setCursor(x*SCALE_X, y*SCALE_Y);
+  sprite->setCursor(x*SCALE_X, y*SCALE_Y);
 }
 
 void ST7735Display::print(const char* str) {
-  display.print(str);
+  sprite->print(str);
 }
 
 void ST7735Display::fillRect(int x, int y, int w, int h) {
-  display.fillRect(x*SCALE_X, y*SCALE_Y, w*SCALE_X, h*SCALE_Y, _color);
+  sprite->fillRect(x*SCALE_X, y*SCALE_Y, w*SCALE_X, h*SCALE_Y, curr_color);
 }
 
 void ST7735Display::drawRect(int x, int y, int w, int h) {
-  display.drawRect(x*SCALE_X, y*SCALE_Y, w*SCALE_X, h*SCALE_Y, _color);
+  sprite->drawRect(x*SCALE_X, y*SCALE_Y, w*SCALE_X, h*SCALE_Y, curr_color);
 }
 
 void ST7735Display::drawXbm(int x, int y, const uint8_t* bits, int w, int h) {
-  display.drawBitmap(x*SCALE_X, y*SCALE_Y, bits, w, h, _color);
+  sprite->drawBitmap(x*SCALE_X, y*SCALE_Y, bits, w, h, curr_color);
 }
 
 uint16_t ST7735Display::getTextWidth(const char* str) {
-  int16_t x1, y1;
-  uint16_t w, h;
-  display.getTextBounds(str, 0, 0, &x1, &y1, &w, &h);
-  return w / SCALE_X;
+  return sprite->textWidth(str) / SCALE_X;
 }
 
 void ST7735Display::endFrame() {
-  // display.display();
+  // blit the canvas buffer to LCD
+  set_CS(LOW);
+  _spi->beginTransaction(_spiSettings);
+  uint16_t x, y;
+  uint16_t* pixels = (uint16_t *) ((TFT_eSprite *) sprite)->getPointer();
+  for (y = 0; y < 80; y++, pixels += 160) {
+    setAddrWindow(0, y, 160, 1);
+#ifdef ESP_PLATFORM
+    _spi->transferBytes((uint8_t *)pixels, NULL, 2 * 160);
+#else
+    _spi->transfer(pixels, NULL, 2 * 160);
+#endif
+  }
+
+  _spi->endTransaction();
+  set_CS(HIGH);
 }

src/helpers/ui/ST7735Display.h

@@ -3,28 +3,25 @@
 #include "DisplayDriver.h"
 #include <Wire.h>
 #include <SPI.h>
-#include <Adafruit_GFX.h>
-#include <Adafruit_ST7735.h>
+#include "TFT_eSPI.h"
 #include <helpers/RefCountedDigitalPin.h>
 
 class ST7735Display : public DisplayDriver {
-  Adafruit_ST7735 display;
   bool _isOn;
-  uint16_t _color;
   RefCountedDigitalPin* _peripher_power;
 
   bool i2c_probe(TwoWire& wire, uint8_t addr);
 public:
 #ifdef USE_PIN_TFT
   ST7735Display(RefCountedDigitalPin* peripher_power=NULL) : DisplayDriver(128, 64), 
-      display(PIN_TFT_CS, PIN_TFT_DC, PIN_TFT_SDA, PIN_TFT_SCL, PIN_TFT_RST),
+    //  display(PIN_TFT_CS, PIN_TFT_DC, PIN_TFT_SDA, PIN_TFT_SCL, PIN_TFT_RST),
       _peripher_power(peripher_power)
   {
     _isOn = false;
   }
 #else
   ST7735Display(RefCountedDigitalPin* peripher_power=NULL) : DisplayDriver(128, 64),
-      display(&SPI1, PIN_TFT_CS, PIN_TFT_DC, PIN_TFT_RST),
+    //  display(&SPI1, PIN_TFT_CS, PIN_TFT_DC, PIN_TFT_RST),
       _peripher_power(peripher_power)
   {
     _isOn = false;
@@ -46,4 +43,7 @@ public:
   void drawXbm(int x, int y, const uint8_t* bits, int w, int h) override;
   uint16_t getTextWidth(const char* str) override;
   void endFrame() override;
+
+protected:
+  void _resetAndInit();
 };

variants/gat562_30s_mesh_kit/GAT56230SMeshKitBoard.h

@@ -47,7 +47,7 @@ public:
     uint32_t button_pin = PIN_BUTTON1;
     nrf_gpio_cfg_input(button_pin, NRF_GPIO_PIN_PULLUP);
     nrf_gpio_cfg_sense_set(button_pin, NRF_GPIO_PIN_SENSE_LOW);
-    NRF52Board::powerOff();
+    sd_power_system_off(); 
   }
 
 };

variants/gat562_mesh_evb_pro/GAT562EVBProBoard.h

@@ -47,7 +47,7 @@ public:
     uint32_t button_pin = PIN_BUTTON1;
     nrf_gpio_cfg_input(button_pin, NRF_GPIO_PIN_PULLUP);
     nrf_gpio_cfg_sense_set(button_pin, NRF_GPIO_PIN_SENSE_LOW);
-    NRF52Board::powerOff();
+    sd_power_system_off(); 
   }
 
 };

variants/gat562_mesh_tracker_pro/GAT562MeshTrackerProBoard.h

@@ -47,7 +47,7 @@ public:
     uint32_t button_pin = PIN_BUTTON1;
     nrf_gpio_cfg_input(button_pin, NRF_GPIO_PIN_PULLUP);
     nrf_gpio_cfg_sense_set(button_pin, NRF_GPIO_PIN_SENSE_LOW);
-    NRF52Board::powerOff();
+    sd_power_system_off(); 
   }
 
 };

variants/gat562_mesh_watch13/GAT56MeshWatch13Board.h

@@ -38,7 +38,7 @@ public:
     uint32_t button_pin = PIN_BUTTON1;
     nrf_gpio_cfg_input(button_pin, NRF_GPIO_PIN_PULLUP);
     nrf_gpio_cfg_sense_set(button_pin, NRF_GPIO_PIN_SENSE_LOW);
-    NRF52Board::powerOff();
+    sd_power_system_off(); 
   }
 
 };

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/T096Board.cpp

@@ -112,9 +112,13 @@ void T096Board::variant_shutdown() {
 }
 
 void T096Board::powerOff() {
-  loRaFEMControl.setSleepModeEnable();
-  nrf_gpio_cfg_default(PIN_GPS_EN); // 363uA down to 39uA
-  NRF52Board::powerOff();
+#if ENV_INCLUDE_GPS == 1
+    pinMode(PIN_GPS_EN, OUTPUT);
+    digitalWrite(PIN_GPS_EN, !PIN_GPS_EN_ACTIVE);
+#endif
+    loRaFEMControl.setSleepModeEnable();
+    variant_shutdown();
+    sd_power_system_off();
 }
 
 const char* T096Board::getManufacturerName() const {

variants/heltec_t096/platformio.ini

@@ -51,7 +51,7 @@ build_src_filter = ${nrf52_base.build_src_filter}
 lib_deps =
   ${nrf52_base.lib_deps}
   ${sensor_base.lib_deps}
-  adafruit/Adafruit ST7735 and ST7789 Library @ ^1.11.0
+  bodmer/TFT_eSPI @ ^2.4.31
 debug_tool = jlink
 upload_protocol = nrfutil
 

variants/heltec_t1/T1Board.cpp

@@ -81,6 +81,34 @@ uint16_t T1Board::getBattMilliVolts() {
 }
 
 void T1Board::variant_shutdown() {
+  nrf_gpio_cfg_default(PIN_TFT_CS);
+  nrf_gpio_cfg_default(PIN_TFT_DC);
+  nrf_gpio_cfg_default(PIN_TFT_SDA);
+  nrf_gpio_cfg_default(PIN_TFT_SCL);
+  nrf_gpio_cfg_default(PIN_TFT_RST);
+  nrf_gpio_cfg_default(PIN_TFT_LEDA_CTL);
+  nrf_gpio_cfg_default(PIN_TFT_VDD_CTL);
+
+  nrf_gpio_cfg_default(PIN_WIRE_SDA);
+  nrf_gpio_cfg_default(PIN_WIRE_SCL);
+
+  nrf_gpio_cfg_default(LORA_CS);
+  nrf_gpio_cfg_default(SX126X_DIO1);
+  nrf_gpio_cfg_default(SX126X_BUSY);
+  nrf_gpio_cfg_default(SX126X_RESET);
+  nrf_gpio_cfg_default(PIN_SPI_MISO);
+  nrf_gpio_cfg_default(PIN_SPI_MOSI);
+  nrf_gpio_cfg_default(PIN_SPI_SCK);
+
+  nrf_gpio_cfg_default(PIN_SPI1_MOSI);
+  nrf_gpio_cfg_default(PIN_SPI1_SCK);
+
+  nrf_gpio_cfg_default(PIN_GPS_RESET);
+  nrf_gpio_cfg_default(PIN_GPS_EN);
+  nrf_gpio_cfg_default(PIN_GPS_PPS);
+  nrf_gpio_cfg_default(PIN_GPS_RX);
+  nrf_gpio_cfg_default(PIN_GPS_TX);
+
   nrf_gpio_cfg_default(PIN_BUZZER_VOLTAGE_MULTIPLIER_1);
   nrf_gpio_cfg_default(PIN_BUZZER_VOLTAGE_MULTIPLIER_2);
 
@@ -99,7 +127,7 @@ void T1Board::variant_shutdown() {
 
 void T1Board::powerOff() {
   variant_shutdown();
-  NRF52Board::powerOff();
+  sd_power_system_off();
 }
 
 const char* T1Board::getManufacturerName() const {

variants/heltec_t114/T114Board.h

@@ -50,7 +50,10 @@ public:
 #ifdef LED_PIN
     digitalWrite(LED_PIN, HIGH);
 #endif
-
-    NRF52Board::powerOff();
+#if ENV_INCLUDE_GPS == 1
+    pinMode(GPS_EN, OUTPUT);
+    digitalWrite(GPS_EN, LOW);
+#endif
+    sd_power_system_off();
   }
 };

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_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_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_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_v4/HeltecV4Board.cpp

@@ -32,12 +32,33 @@ void HeltecV4Board::begin() {
     loRaFEMControl.setRxModeEnable();
   }
 
-  void HeltecV4Board::powerOff() {
-    // Turn off PA
-    digitalWrite(P_LORA_PA_POWER, LOW);
-    rtc_gpio_hold_en((gpio_num_t)P_LORA_PA_POWER);
+  void HeltecV4Board::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 HeltecV4Board::powerOff()  {
+    enterDeepSleep(0);
   }
 
   uint16_t HeltecV4Board::getBattMilliVolts()  {

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/keepteen_lt1/KeepteenLT1Board.h

@@ -37,4 +37,8 @@ public:
     digitalWrite(P_LORA_TX_LED, LOW);   // turn TX LED off
   }
 #endif
+
+  void powerOff() override {
+    sd_power_system_off();
+  }
 };

variants/lilygo_t3s3_sx1276/platformio.ini

@@ -21,8 +21,8 @@ build_flags =
   -D RADIO_CLASS=CustomSX1276
   -D WRAPPER_CLASS=CustomSX1276Wrapper
   -D SX127X_CURRENT_LIMIT=120
-  -D SX127X_RXEN=21
-  -D SX127X_TXEN=10
+  -D SX176X_RXEN=21
+  -D SX176X_TXEN=10
   -D LORA_TX_POWER=20
 build_src_filter = ${esp32_base.build_src_filter}
   +<../variants/lilygo_t3s3_sx1276>

variants/lilygo_t_impulse_plus/TImpulsePlusBoard.h

@@ -48,10 +48,12 @@ public:
   }
 
   void powerOff() override {
-    // power off system
-    NRF52Board::powerOff();
 
     // turn off 3.3v
     digitalWrite(RT9080_EN, LOW);
+
+    // power off system
+    sd_power_system_off();
+
   }
 };

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_techo/TechoBoard.h

@@ -24,7 +24,6 @@ public:
   }
 
   void powerOff() override {
-    NRF52Board::powerOff();
     #ifdef LED_RED
     digitalWrite(LED_RED, HIGH);
     #endif
@@ -40,5 +39,6 @@ public:
     #ifdef PIN_PWR_EN
     digitalWrite(PIN_PWR_EN, LOW);
     #endif
+    sd_power_system_off();
   }
 };

variants/lilygo_techo_card/TechoCardBoard.cpp

@@ -91,7 +91,7 @@ void TechoCardBoard::powerOff() {
   nrf_gpio_cfg_sense_input(BUTTON_PIN, NRF_GPIO_PIN_PULLUP, NRF_GPIO_PIN_SENSE_LOW);
   turnOffLeds();
   digitalWrite(PIN_PWR_EN, LOW);
-  NRF52Board::powerOff();
+  sd_power_system_off();
 }
 
 #endif

variants/lilygo_techo_lite/TechoBoard.h

@@ -22,8 +22,6 @@ public:
   }
 
   void powerOff() override {
-    NRF52Board::powerOff();
-
     digitalWrite(PIN_VBAT_MEAS_EN, LOW);
     #ifdef LED_RED
     digitalWrite(LED_RED, LOW);
@@ -40,5 +38,6 @@ public:
     #ifdef PIN_PWR_EN
     digitalWrite(PIN_PWR_EN, LOW);
     #endif
+    sd_power_system_off();
   }
 };

variants/mesh_pocket/MeshPocket.h

@@ -32,4 +32,8 @@ public:
   const char* getManufacturerName() const override {
     return "Heltec MeshPocket";
   }
+
+  void powerOff() override {
+    sd_power_system_off();
+  }
 };

variants/meshtiny/MeshtinyBoard.h

@@ -60,7 +60,7 @@ public:
     nrf_gpio_cfg_sense_input(g_ADigitalPinMap[PIN_USER_BTN], NRF_GPIO_PIN_PULLUP, NRF_GPIO_PIN_SENSE_LOW);
 #endif
 
-    NRF52Board::powerOff();
+    sd_power_system_off();
   }
 
 };

variants/minewsemi_me25ls01/MinewsemiME25LS01Board.h

@@ -65,7 +65,7 @@ public:
     #ifdef BUTTON_PIN
     nrf_gpio_cfg_sense_input(digitalPinToInterrupt(BUTTON_PIN), NRF_GPIO_PIN_PULLUP, NRF_GPIO_PIN_SENSE_LOW);
     #endif
-    NRF52Board::powerOff();
+    sd_power_system_off();
   }
 
   #if defined(P_LORA_TX_LED)

variants/nano_g2_ultra/nano-g2.h

@@ -52,6 +52,6 @@ public:
     nrf_gpio_cfg_sense_input(digitalPinToInterrupt(PIN_USER_BTN), NRF_GPIO_PIN_NOPULL,
                              NRF_GPIO_PIN_SENSE_LOW);
 
-    NRF52Board::powerOff();
+    sd_power_system_off();
   }
 };

variants/promicro/PromicroBoard.h

@@ -72,4 +72,8 @@ public:
     #endif
       return 0;
   }
+
+  void powerOff() override {
+    sd_power_system_off();
+  }
 };

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/rak_wismesh_tag/RAKWismeshTagBoard.h

@@ -69,6 +69,6 @@ public:
     nrf_gpio_cfg_sense_input(digitalPinToInterrupt(BUTTON_PIN), NRF_GPIO_PIN_PULLUP, NRF_GPIO_PIN_SENSE_LOW);
     #endif
 
-    NRF52Board::powerOff();
+    sd_power_system_off();
   }
 };

variants/sensecap_solar/SenseCapSolarBoard.h

@@ -54,7 +54,7 @@ public:
 #ifdef NRF52_POWER_MANAGEMENT
     initiateShutdown(SHUTDOWN_REASON_USER);
 #else
-    NRF52Board::powerOff();
+    sd_power_system_off();
 #endif
   }
 };

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_g3_esp32/StationG3Board.cpp

@@ -1,15 +0,0 @@
-#include "StationG3Board.h"
-
-void StationG3Board::powerOff() {
-#ifdef P_PA1_EN
-  setPAModeHigh(false);
-  rtc_gpio_hold_en((gpio_num_t)P_PA1_EN);
-#endif
-
-#ifdef P_PRIMARY_LNA_EN
-  setPrimaryLNAControl(true);
-  rtc_gpio_hold_en((gpio_num_t)P_PRIMARY_LNA_EN);
-#endif
-
-  ESP32Board::powerOff();
-}

variants/station_g3_esp32/StationG3Board.h

@@ -73,7 +73,36 @@ public:
     setPrimaryLNAControl(true);
   }
 
-  void powerOff() override;
+  void enterDeepSleep(uint32_t secs, int pin_wake_btn = -1) {
+    esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
+
+    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);
+
+#ifdef P_PA1_EN
+    setPAModeHigh(false);
+    rtc_gpio_hold_en((gpio_num_t)P_PA1_EN);
+#endif
+
+#ifdef P_PRIMARY_LNA_EN
+    setPrimaryLNAControl(true);
+    rtc_gpio_hold_en((gpio_num_t)P_PRIMARY_LNA_EN);
+#endif
+
+    if (pin_wake_btn < 0) {
+      esp_sleep_enable_ext1_wakeup((1ULL << P_LORA_DIO_1), ESP_EXT1_WAKEUP_ANY_HIGH);
+    } else {
+      esp_sleep_enable_ext1_wakeup((1ULL << P_LORA_DIO_1) | (1ULL << pin_wake_btn), ESP_EXT1_WAKEUP_ANY_HIGH);
+    }
+
+    if (secs > 0) {
+      esp_sleep_enable_timer_wakeup(secs * 1000000);
+    }
+
+    esp_deep_sleep_start();
+  }
 
   uint16_t getBattMilliVolts() override {
     return 0;

variants/t1000-e/T1000eBoard.h

@@ -88,6 +88,6 @@ public:
     nrf_gpio_cfg_sense_input(BUTTON_PIN, NRF_GPIO_PIN_NOPULL, NRF_GPIO_PIN_SENSE_HIGH);
     #endif
 
-    NRF52Board::powerOff();
+    sd_power_system_off();
   }
 };

variants/tenstar_c3/target.h

@@ -3,7 +3,7 @@
 #define RADIOLIB_STATIC_ONLY 1
 #include <RadioLib.h>
 #include <helpers/radiolib/RadioLibWrappers.h>
-#include <../variants/xiao_c3/XiaoC3Board.h>
+#include <helpers/XiaoC3Board.h>
 #include <helpers/radiolib/CustomSX1262Wrapper.h>
 #include <helpers/radiolib/CustomSX1268Wrapper.h>
 #include <helpers/AutoDiscoverRTCClock.h>

variants/thinknode_m1/ThinkNodeM1Board.h

@@ -40,6 +40,7 @@ public:
     #endif
 
     // power off board
-    NRF52Board::powerOff();
+    sd_power_system_off();
+
   }
 };

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_m3/ThinkNodeM3Board.h

@@ -49,6 +49,6 @@ public:
     #endif
 
     // power off board
-    NRF52Board::powerOff();
+    sd_power_system_off();
   }
 };

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/thinknode_m6/ThinkNodeM6Board.h

@@ -44,6 +44,6 @@ public:
     #endif
 
     // power off board
-    NRF52Board::powerOff();
+    sd_power_system_off();
   }
 };

variants/wio-tracker-l1/WioTrackerL1Board.h

@@ -35,6 +35,6 @@ public:
   }
 
   void powerOff() override {
-    NRF52Board::powerOff();
+    sd_power_system_off();
   }
 };

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_nrf52/XiaoNrf52Board.h

@@ -50,7 +50,7 @@ public:
     nrf_gpio_cfg_sense_input(digitalPinToInterrupt(g_ADigitalPinMap[PIN_USER_BTN]), NRF_GPIO_PIN_NOPULL, NRF_GPIO_PIN_SENSE_LOW);
 #endif
 
-    NRF52Board::powerOff();
+    sd_power_system_off();
   }
 };