Merge branch 'master' into usbhost

2026-01-09 03:17:31 +00:00 · 2025-06-05 14:28:02 +02:00
parent b4cb6f2eb2 070deb290f
commit 44be39cef3
361 changed files with 9840 additions and 1868 deletions
--- a/variants/Dongle_nRF52840-pca10059-v1/platformio.ini
+++ b/variants/Dongle_nRF52840-pca10059-v1/platformio.ini
@@ -3,7 +3,6 @@ board_level = extra
 extends = nrf52840_base
 board = nordic_pca10059
 build_flags = ${nrf52840_base.build_flags} -Ivariants/Dongle_nRF52840-pca10059-v1 -D NORDIC_PCA10059
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
  -DEINK_DISPLAY_MODEL=GxEPD2_420_M01
  -DEINK_WIDTH=300
  -DEINK_HEIGHT=400
--- a/variants/ELECROW-ThinkNode-M1/nicheGraphics.h
+++ b/variants/ELECROW-ThinkNode-M1/nicheGraphics.h
@@ -22,10 +22,6 @@
 #include "graphics/niche/Drivers/EInk/GDEY0154D67.h"
 #include "graphics/niche/Inputs/TwoButton.h"

-#include "graphics/niche/Fonts/FreeSans6pt7b.h"
-#include "graphics/niche/Fonts/FreeSans6pt8bCyrillic.h"
-#include <Fonts/FreeSans9pt7b.h>
-
 void setupNicheGraphics()
 {
    using namespace NicheGraphics;
@@ -33,14 +29,13 @@ void setupNicheGraphics()
    // SPI
    // -----------------------------

-    // For NRF52 platforms, SPI pins are defined in variant.h, not passed to begin()
+    // For NRF52 platforms, SPI pins are defined in variant.h
    SPI1.begin();

-    // Driver
+    // E-Ink Driver
    // -----------------------------

-    // Use E-Ink driver
-    Drivers::EInk *driver = new Drivers::GDEY0154D67; // Todo: confirm display model
+    Drivers::EInk *driver = new Drivers::GDEY0154D67;
    driver->begin(&SPI1, PIN_EINK_DC, PIN_EINK_CS, PIN_EINK_BUSY, PIN_EINK_RES);

    // InkHUD
@@ -48,7 +43,7 @@ void setupNicheGraphics()

    InkHUD::InkHUD *inkhud = InkHUD::InkHUD::getInstance();

-    // Set the driver
+    // Set the E-Ink driver
    inkhud->setDriver(driver);

    // Set how many FAST updates per FULL update
@@ -57,33 +52,27 @@ void setupNicheGraphics()
    // Currently set to the values given by Elecrow for EInkDynamicDisplay.
    inkhud->setDisplayResilience(10, 1.5);

-    // Prepare fonts
-    InkHUD::Applet::fontLarge = InkHUD::AppletFont(FreeSans9pt7b);
-    InkHUD::Applet::fontSmall = InkHUD::AppletFont(FreeSans6pt7b);
-    /*
-    // Font localization demo: Cyrillic
-    InkHUD::Applet::fontSmall = InkHUD::AppletFont(FreeSans6pt8bCyrillic);
-    InkHUD::Applet::fontSmall.addSubstitutionsWin1251();
-    */
+    // Select fonts
+    InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1252;
+    InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252;

    // Customize default settings
    inkhud->persistence->settings.userTiles.maxCount = 2;              // Two applets side-by-side
-    inkhud->persistence->settings.rotation = 0;                        // To be confirmed?
    inkhud->persistence->settings.optionalFeatures.batteryIcon = true; // Device definitely has a battery

-    // Setup backlight
-    // Note: button mapping for this configured further down
+    // Setup backlight controller
+    // Note: button is attached further down
    Drivers::LatchingBacklight *backlight = Drivers::LatchingBacklight::getInstance();
    backlight->setPin(PIN_EINK_EN);

    // Pick applets
    // Note: order of applets determines priority of "auto-show" feature
    inkhud->addApplet("All Messages", new InkHUD::AllMessageApplet, true, true); // Activated, autoshown
-    inkhud->addApplet("DMs", new InkHUD::DMApplet);                              // Inactive
-    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));        // Inactive
-    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));        // Inactive
+    inkhud->addApplet("DMs", new InkHUD::DMApplet);                              // -
+    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));        // -
+    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));        // -
    inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true);           // Activated
-    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);            // Inactive
+    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);            // -
    inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0);         // Activated, no autoshow, default on tile 0

    // Start running InkHUD
@@ -94,25 +83,25 @@ void setupNicheGraphics()

    Inputs::TwoButton *buttons = Inputs::TwoButton::getInstance(); // Shared NicheGraphics component

-    // As labeled on Elecrow diagram: https://www.elecrow.com/download/product/CIL12901M/ThinkNode-M1_User_Manual.pdf
-    constexpr uint8_t PAGE_TURN_BUTTON = 0;
-    constexpr uint8_t FUNCTION_BUTTON = 1;
+    // Elecrow diagram: https://www.elecrow.com/download/product/CIL12901M/ThinkNode-M1_User_Manual.pdf

-    // Setup the main user button
-    buttons->setWiring(PAGE_TURN_BUTTON, PIN_BUTTON2);
-    buttons->setTiming(PAGE_TURN_BUTTON, 50, 500); // Todo: confirm 50ms is adequate debounce
-    buttons->setHandlerShortPress(PAGE_TURN_BUTTON, []() { InkHUD::InkHUD::getInstance()->shortpress(); });
-    buttons->setHandlerLongPress(PAGE_TURN_BUTTON, []() { InkHUD::InkHUD::getInstance()->longpress(); });
+    // #0: Main User Button
+    // Labeled "Page Turn Button" by manual
+    buttons->setWiring(0, PIN_BUTTON2);
+    buttons->setTiming(0, 50, 500); // Todo: confirm 50ms is adequate debounce
+    buttons->setHandlerShortPress(0, [inkhud]() { inkhud->shortpress(); });
+    buttons->setHandlerLongPress(0, [inkhud]() { inkhud->longpress(); });

-    // Setup the aux button
-    // Initial testing only: mapped to the backlight
+    // #1: Aux Button
+    // Labeled "Function Button" by manual
    // Todo: additional features
-    buttons->setWiring(FUNCTION_BUTTON, PIN_BUTTON1);
-    buttons->setTiming(FUNCTION_BUTTON, 50, 500); // 500ms before latch
-    buttons->setHandlerDown(FUNCTION_BUTTON, [backlight]() { backlight->peek(); });
-    buttons->setHandlerLongPress(FUNCTION_BUTTON, [backlight]() { backlight->latch(); });
-    buttons->setHandlerShortPress(FUNCTION_BUTTON, [backlight]() { backlight->off(); });
+    buttons->setWiring(1, PIN_BUTTON1);
+    buttons->setTiming(1, 50, 500); // 500ms before latch
+    buttons->setHandlerDown(1, [backlight]() { backlight->peek(); });
+    buttons->setHandlerLongPress(1, [backlight]() { backlight->latch(); });
+    buttons->setHandlerShortPress(1, [backlight]() { backlight->off(); });

+    // Begin handling button events
    buttons->start();
 }

--- a/variants/ELECROW-ThinkNode-M1/platformio.ini
+++ b/variants/ELECROW-ThinkNode-M1/platformio.ini
@@ -9,7 +9,6 @@ debug_tool = jlink
 build_flags = ${nrf52840_base.build_flags} -Ivariants/ELECROW-ThinkNode-M1
  -DELECROW_ThinkNode_M1
  -DGPS_POWER_TOGGLE
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
  -DUSE_EINK
  -DEINK_DISPLAY_MODEL=GxEPD2_154_D67
  -DEINK_WIDTH=200
@@ -39,7 +38,6 @@ build_flags =
  ${inkhud.build_flags}
  -I variants/ELECROW-ThinkNode-M1
  -D ELECROW_ThinkNode_M1
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = 
  ${nrf52_base.build_src_filter} 
  ${inkhud.build_src_filter}
--- a/variants/ELECROW-ThinkNode-M1/variant.h
+++ b/variants/ELECROW-ThinkNode-M1/variant.h
@@ -41,16 +41,15 @@ extern "C" {
 #define NUM_ANALOG_INPUTS (1)
 #define NUM_ANALOG_OUTPUTS (0)

-#define PIN_LED1 -1
 #define PIN_LED2 -1
 #define PIN_LED3 -1

 // LED
-#define POWER_LED (32 + 6) // red
+#define PIN_LED1 (32 + 6) // red
 #define LED_POWER (32 + 4)
 #define USER_LED (0 + 13) // green
 // USB_CHECK
-#define USB_CHECK (32 + 3)
+#define EXT_PWR_DETECT (32 + 3)
 #define ADC_V (0 + 8)

 #define LED_RED PIN_LED3
@@ -59,7 +58,7 @@ extern "C" {
 #define LED_BUILTIN LED_BLUE
 #define LED_CONN PIN_GREEN
 #define LED_STATE_ON 0 // State when LED is lit  // LED灯亮时的状态
-#define M1_buzzer (0 + 6)
+#define PIN_BUZZER (0 + 6)
 /*
 * Buttons
 */
@@ -82,6 +81,7 @@ extern "C" {
 static const uint8_t A0 = PIN_A0;

 #define ADC_RESOLUTION 14
+#define BATTERY_SENSE_SAMPLES 30

 #define PIN_NFC1 (9)
 #define PIN_NFC2 (10)
@@ -159,7 +159,7 @@ External serial flash WP25R1635FZUIL0

 #define GPS_THREAD_INTERVAL 50

-#define PIN_GPS_PPS (32 + 1) // GPS开关判断
+#define PIN_GPS_SWITCH (32 + 1) // GPS开关判断

 #define PIN_SERIAL1_RX GPS_TX_PIN
 #define PIN_SERIAL1_TX GPS_RX_PIN
--- a/variants/ELECROW-ThinkNode-M2/variant.h
+++ b/variants/ELECROW-ThinkNode-M2/variant.h
@@ -1,14 +1,13 @@
 // Status
-#define LED_PIN_POWER 1
-#define BIAS_T_ENABLE LED_PIN_POWER
-#define BIAS_T_VALUE HIGH
+#define LED_PIN 1

 #define PIN_BUTTON1 47 // 功能键
 #define PIN_BUTTON2 4  // 电源键

-#define POWER_CFG
-#define POWER_CHRG 6
-#define POWER_FULL 42
+#define LED_POWER 6
+#define ADC_V 42
+// USB_CHECK
+#define EXT_PWR_DETECT 7

 #define PIN_BUZZER 5

--- a/variants/ME25LS01-4Y10TD/platformio.ini
+++ b/variants/ME25LS01-4Y10TD/platformio.ini
@@ -4,7 +4,6 @@ board = me25ls01-4y10td
 board_level = extra
 ; platform = https://github.com/maxgerhardt/platform-nordicnrf52#cac6fcf943a41accd2aeb4f3659ae297a73f422e
 build_flags = ${nrf52840_base.build_flags} -Ivariants/ME25LS01-4Y10TD -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DME25LS01_4Y10TD
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/ME25LS01-4Y10TD>
--- a/variants/ME25LS01-4Y10TD_e-ink/platformio.ini
+++ b/variants/ME25LS01-4Y10TD_e-ink/platformio.ini
@@ -4,7 +4,6 @@ board = me25ls01-4y10td
 board_level = extra
 ; platform = https://github.com/maxgerhardt/platform-nordicnrf52#cac6fcf943a41accd2aeb4f3659ae297a73f422e
 build_flags = ${nrf52840_base.build_flags} -Ivariants/ME25LS01-4Y10TD_e-ink -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DME25LS01_4Y10TD
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  -DEINK_DISPLAY_MODEL=GxEPD2_420_GDEY042T81
  -DEINK_WIDTH=400
--- a/variants/MS24SF1/platformio.ini
+++ b/variants/MS24SF1/platformio.ini
@@ -4,7 +4,6 @@ board = ms24sf1
 board_level = extra
 ; platform = https://github.com/maxgerhardt/platform-nordicnrf52#cac6fcf943a41accd2aeb4f3659ae297a73f422e
 build_flags = ${nrf52840_base.build_flags} -Ivariants/MS24SF1 -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/MS24SF1>
--- a/variants/MakePython_nRF52840_eink/platformio.ini
+++ b/variants/MakePython_nRF52840_eink/platformio.ini
@@ -3,7 +3,6 @@ board_level = extra
 extends = nrf52840_base
 board = nordic_pca10059
 build_flags = ${nrf52840_base.build_flags} -Ivariants/MakePython_nRF52840_eink -D PRIVATE_HW
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
  -D PIN_EINK_EN
  -DEINK_DISPLAY_MODEL=GxEPD2_290_T5D
  -DEINK_WIDTH=296
--- a/variants/MakePython_nRF52840_oled/platformio.ini
+++ b/variants/MakePython_nRF52840_oled/platformio.ini
@@ -3,7 +3,6 @@ board_level = extra
 extends = nrf52840_base
 board = nordic_pca10059
 build_flags = ${nrf52840_base.build_flags} -Ivariants/MakePython_nRF52840_oled -D PRIVATE_HW
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/MakePython_nRF52840_oled>
 lib_deps = 
  ${nrf52840_base.lib_deps}
--- a/variants/canaryone/platformio.ini
+++ b/variants/canaryone/platformio.ini
@@ -6,7 +6,6 @@ debug_tool = jlink

 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = ${nrf52840_base.build_flags} -Ivariants/canaryone
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/canaryone>
 lib_deps = 
  ${nrf52840_base.lib_deps}
--- a/variants/crowpanel-esp32s3-5-epaper/platformio.ini
+++ b/variants/crowpanel-esp32s3-5-epaper/platformio.ini
@@ -11,7 +11,7 @@ board = esp32-s3-devkitc-1
 board_level = extra
 upload_protocol = esptool
 build_flags = 
-  ${esp32_base.build_flags} -D CROWPANEL_ESP32S3_5_EPAPER -I variants/crowpanel-esp32s3-5-epaper
+  ${esp32s3_base.build_flags} -D CROWPANEL_ESP32S3_5_EPAPER -I variants/crowpanel-esp32s3-5-epaper
  -D PRIVATE_HW
  -DBOARD_HAS_PSRAM
  -DGPS_POWER_TOGGLE
@@ -39,7 +39,7 @@ board = esp32-s3-devkitc-1
 board_level = extra
 upload_protocol = esptool
 build_flags = 
-  ${esp32_base.build_flags} -D CROWPANEL_ESP32S3_4_EPAPER -I variants/crowpanel-esp32s3-5-epaper
+  ${esp32s3_base.build_flags} -D CROWPANEL_ESP32S3_4_EPAPER -I variants/crowpanel-esp32s3-5-epaper
  -D PRIVATE_HW
  -DBOARD_HAS_PSRAM
  -DGPS_POWER_TOGGLE
@@ -67,7 +67,7 @@ board = esp32-s3-devkitc-1
 board_level = extra
 upload_protocol = esptool
 build_flags = 
-  ${esp32_base.build_flags} -D CROWPANEL_ESP32S3_2_EPAPER -I variants/crowpanel-esp32s3-5-epaper
+  ${esp32s3_base.build_flags} -D CROWPANEL_ESP32S3_2_EPAPER -I variants/crowpanel-esp32s3-5-epaper
  -D PRIVATE_HW
  -DBOARD_HAS_PSRAM
  -DGPS_POWER_TOGGLE
--- a/variants/diy/platformio.ini
+++ b/variants/diy/platformio.ini
@@ -50,7 +50,6 @@ board_level = extra
 build_flags = ${nrf52840_base.build_flags}
  -I variants/diy/nrf52_promicro_diy_xtal
  -D NRF52_PROMICRO_DIY
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/diy/nrf52_promicro_diy_xtal>
 lib_deps = 
  ${nrf52840_base.lib_deps}
@@ -64,7 +63,6 @@ board = promicro-nrf52840
 build_flags = ${nrf52840_base.build_flags}
  -I variants/diy/nrf52_promicro_diy_tcxo
  -D NRF52_PROMICRO_DIY
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/diy/nrf52_promicro_diy_tcxo>
 lib_deps = 
  ${nrf52840_base.lib_deps}
@@ -77,7 +75,6 @@ extends = nrf52840_base
 board_level = extra
 build_flags = ${nrf52840_base.build_flags} -Ivariants/diy/seeed-xiao-nrf52840-wio-sx1262 -D PRIVATE_HW
  -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/diy/seeed-xiao-nrf52840-wio-sx1262>
 lib_deps =
--- a/variants/diy/seeed-xiao-nrf52840-wio-sx1262/variant.cpp
+++ b/variants/diy/seeed-xiao-nrf52840-wio-sx1262/variant.cpp
@@ -52,4 +52,11 @@ const uint32_t g_ADigitalPinMap[] = {

    // VBAT
    31, // D32 is P0.10 (VBAT)
-};
+};
+
+void initVariant()
+{
+    // Set BQ25101 ISET to 100mA instead of 50mA
+    pinMode(HICHG, OUTPUT);
+    digitalWrite(HICHG, LOW);
+}
--- a/variants/diy/seeed-xiao-nrf52840-wio-sx1262/variant.h
+++ b/variants/diy/seeed-xiao-nrf52840-wio-sx1262/variant.h
@@ -164,7 +164,8 @@ static const uint8_t SCK = PIN_SPI_SCK;
 // -------
 // P0_14 = 14  Reads battery voltage from divider on signal board.
 // PIN_VBAT is reading voltage divider on XIAO and is program pin 32 / or P0.31
-#define BAT_READ 14
+#define ADC_CTRL VBAT_ENABLE
+#define ADC_CTRL_ENABLED LOW
 #define BATTERY_SENSE_RESOLUTION_BITS 10
 #define CHARGE_LED 23 // P0_17 = 17  D23   YELLOW CHARGE LED
 #define HICHG 22      // P0_13 = 13  D22   Charge-select pin for Lipo for 100 mA instead of default 50mA charge
--- a/variants/diy/v1/variant.h
+++ b/variants/diy/v1/variant.h
@@ -53,4 +53,5 @@
 // Internally the TTGO module hooks the SX126x-DIO2 in to control the TX/RX switch
 // (which is the default for the sx1262interface code)
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8
+#define TCXO_OPTIONAL // make it so that the firmware can try both TCXO and XTAL
 #endif
--- a/variants/diy/v1_1/variant.h
+++ b/variants/diy/v1_1/variant.h
@@ -54,4 +54,5 @@
 // Internally the TTGO module hooks the SX126x-DIO2 in to control the TX/RX switch
 // (which is the default for the sx1262interface code)
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8
+#define TCXO_OPTIONAL // make it so that the firmware can try both TCXO and XTAL
 #endif
--- a/variants/ec_catsniffer/platformio.ini
+++ b/variants/ec_catsniffer/platformio.ini
@@ -0,0 +1,14 @@
+[env:catsniffer]
+extends = rp2040_base
+board = rpipico
+upload_protocol = picotool
+
+build_flags = ${rp2040_base.build_flags} 
+  -DRPI_PICO
+  -Ivariants/ec_catsniffer
+  -DDEBUG_RP2040_PORT=Serial
+  # -DHW_SPI1_DEVICE
+lib_deps =
+  ${rp2040_base.lib_deps}
+debug_build_flags = ${rp2040_base.build_flags}, -g
+debug_tool = cmsis-dap
--- a/variants/ec_catsniffer/variant.cpp
+++ b/variants/ec_catsniffer/variant.cpp
@@ -0,0 +1,39 @@
+/*
+  Copyright (c) 2014-2015 Arduino LLC.  All right reserved.
+  Copyright (c) 2016 Sandeep Mistry All right reserved.
+  Copyright (c) 2018, Adafruit Industries (adafruit.com)
+
+  This library is free software; you can redistribute it and/or
+  modify it under the terms of the GNU Lesser General Public
+  License as published by the Free Software Foundation; either
+  version 2.1 of the License, or (at your option) any later version.
+
+  This library is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+  See the GNU Lesser General Public License for more details.
+
+  You should have received a copy of the GNU Lesser General Public
+  License along with this library; if not, write to the Free Software
+  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
+#include "variant.h"
+#include "wiring_constants.h"
+#include "wiring_digital.h"
+
+#define CTF1 8
+#define CTF2 9
+#define CTF3 10
+
+void initVariant()
+{
+    // Config the LoRa Switch
+    pinMode(CTF1, OUTPUT);
+    pinMode(CTF2, OUTPUT);
+    pinMode(CTF3, OUTPUT);
+
+    digitalWrite(CTF1, HIGH);
+    digitalWrite(CTF2, LOW);
+    digitalWrite(CTF3, LOW);
+}
--- a/variants/ec_catsniffer/variant.h
+++ b/variants/ec_catsniffer/variant.h
@@ -0,0 +1,41 @@
+// #define RADIOLIB_CUSTOM_ARDUINO 1
+// #define RADIOLIB_TONE_UNSUPPORTED 1
+// #define RADIOLIB_SOFTWARE_SERIAL_UNSUPPORTED 1
+
+#define ARDUINO_ARCH_AVR
+
+#define HAS_SCREEN 0
+#define HAS_GPS 0
+#undef GPS_RX_PIN
+#undef GPS_TX_PIN
+
+#define LED_PIN 27
+
+#define USE_SX1262
+
+#undef LORA_SCK
+#undef LORA_MISO
+#undef LORA_MOSI
+#undef LORA_CS
+
+#define LORA_SCK 18
+#define LORA_MISO 16
+#define LORA_MOSI 19
+#define LORA_CS 17 // NSS
+
+#define LORA_DIO0 5
+#define LORA_RESET 24
+#define LORA_DIO1 4
+#define LORA_DIO2 23
+#define LORA_DIO3 25
+#define SX126X_RXEN 21
+#define SX126X_TXEN 20
+
+#ifdef USE_SX1262
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 LORA_DIO0
+#define SX126X_BUSY LORA_DIO1
+#define SX126X_RESET LORA_RESET
+// #define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_DIO3_TCXO_VOLTAGE 0
+#endif
--- a/variants/elecrow_panel/pins_arduino.h
+++ b/variants/elecrow_panel/pins_arduino.h
@@ -0,0 +1,58 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+static const uint8_t TX = 43;
+static const uint8_t RX = 44;
+
+static const uint8_t SDA = 15;
+static const uint8_t SCL = 16;
+
+// Default SPI will be mapped to Radio
+static const uint8_t SS = -1;
+static const uint8_t MOSI = 48;
+static const uint8_t MISO = 47;
+static const uint8_t SCK = 41;
+
+static const uint8_t SPI_MOSI = 6;
+static const uint8_t SPI_SCK = 5;
+static const uint8_t SPI_MISO = 4;
+
+static const uint8_t A0 = 1;
+static const uint8_t A1 = 2;
+static const uint8_t A2 = 3;
+static const uint8_t A3 = 4;
+static const uint8_t A4 = 5;
+static const uint8_t A5 = 6;
+static const uint8_t A6 = 7;
+static const uint8_t A7 = 8;
+static const uint8_t A8 = 9;
+static const uint8_t A9 = 10;
+static const uint8_t A10 = 11;
+static const uint8_t A11 = 12;
+static const uint8_t A12 = 13;
+static const uint8_t A13 = 14;
+static const uint8_t A14 = 15;
+static const uint8_t A15 = 16;
+static const uint8_t A16 = 17;
+static const uint8_t A17 = 18;
+static const uint8_t A18 = 19;
+static const uint8_t A19 = 20;
+
+static const uint8_t T1 = 1;
+static const uint8_t T2 = 2;
+static const uint8_t T3 = 3;
+static const uint8_t T4 = 4;
+static const uint8_t T5 = 5;
+static const uint8_t T6 = 6;
+static const uint8_t T7 = 7;
+static const uint8_t T8 = 8;
+static const uint8_t T9 = 9;
+static const uint8_t T10 = 10;
+static const uint8_t T11 = 11;
+static const uint8_t T12 = 12;
+static const uint8_t T13 = 13;
+static const uint8_t T14 = 14;
+
+#endif /* Pins_Arduino_h */
--- a/variants/elecrow_panel/platformio.ini
+++ b/variants/elecrow_panel/platformio.ini
@@ -0,0 +1,128 @@
+[crowpanel_base]
+extends = esp32s3_base
+board = crowpanel
+board_check = true
+upload_protocol = esptool
+board_build.partitions = default_16MB.csv ; must be here for some reason, board.json is not enough !?
+build_flags = ${esp32s3_base.build_flags} -Os
+  -I variants/elecrow_panel
+  -D ELECROW_PANEL
+  -D CONFIG_ARDUHAL_LOG_COLORS
+  -D RADIOLIB_DEBUG_SPI=0
+  -D RADIOLIB_DEBUG_PROTOCOL=0
+  -D RADIOLIB_DEBUG_BASIC=0
+  -D RADIOLIB_VERBOSE_ASSERT=0
+  -D RADIOLIB_SPI_PARANOID=0
+  -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
+  -D MESHTASTIC_EXCLUDE_INPUTBROKER=1
+  -D MESHTASTIC_EXCLUDE_WEBSERVER=1
+  -D MESHTASTIC_EXCLUDE_SERIAL=1
+  -D MESHTASTIC_EXCLUDE_SOCKETAPI=1
+  -D MESHTASTIC_EXCLUDE_SCREEN=1
+  -D MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR=1
+  -D HAS_TELEMETRY=0
+  -D CONFIG_DISABLE_HAL_LOCKS=1
+  -D USE_PIN_BUZZER
+  -D HAS_SCREEN=0
+  -D HAS_TFT=1
+  -D RAM_SIZE=6144
+  -D LV_LVGL_H_INCLUDE_SIMPLE
+  -D LV_CONF_INCLUDE_SIMPLE
+  -D LV_COMP_CONF_INCLUDE_SIMPLE
+  -D LV_USE_SYSMON=0
+  -D LV_USE_PROFILER=0
+  -D LV_USE_PERF_MONITOR=0
+  -D LV_USE_MEM_MONITOR=0
+  -D LV_USE_LOG=0
+  -D LV_BUILD_TEST=0
+  -D USE_LOG_DEBUG
+  -D LOG_DEBUG_INC=\"DebugConfiguration.h\"
+  -D USE_PACKET_API
+  -D HAS_SDCARD
+  -D SD_SPI_FREQUENCY=75000000
+
+lib_deps = ${esp32s3_base.lib_deps}
+  ${device-ui_base.lib_deps}
+  earlephilhower/ESP8266Audio@1.9.9
+  earlephilhower/ESP8266SAM@1.0.1
+  lovyan03/LovyanGFX@1.2.0 ; note: v1.2.7 breaks the elecrow 7" display functionality
+  hideakitai/TCA9534@0.1.1
+
+[crowpanel_small] ; 2.4, 2.8, 3.5 inch
+extends = crowpanel_base
+build_flags =
+  ${crowpanel_base.build_flags}
+  -D CROW_SELECT=1
+  -D SDCARD_USE_SOFT_SPI
+  -D SDCARD_CS=7
+  -D SPI_DRIVER_SELECT=2
+  -D LGFX_DRIVER_TEMPLATE
+  -D LGFX_DRIVER=LGFX_GENERIC
+  -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_GENERIC.h\"
+  -D VIEW_320x240
+  -D MAP_FULL_REDRAW
+
+[crowpanel_large] ; 4.3, 5.0, 7.0 inch
+extends = crowpanel_base
+build_flags =
+  ${crowpanel_base.build_flags}
+  -D CROW_SELECT=2
+  -D SDCARD_CS=7
+  -D LGFX_DRIVER=LGFX_ELECROW70
+  -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_ELECROW70.h\"
+  -D DISPLAY_SET_RESOLUTION
+
+[env:elecrow-adv-24-28-tft]
+extends = crowpanel_small
+build_flags =
+  ${crowpanel_small.build_flags}
+  -D SPI_FREQUENCY=80000000
+  -D LGFX_SCREEN_WIDTH=240
+  -D LGFX_SCREEN_HEIGHT=320
+  -D LGFX_PANEL=ST7789
+  -D LGFX_ROTATION=1
+  -D LGFX_CFG_HOST=SPI2_HOST
+  -D LGFX_PIN_SCK=42
+  -D LGFX_PIN_MOSI=39
+  -D LGFX_PIN_DC=41
+  -D LGFX_PIN_CS=40
+  -D LGFX_PIN_BL=38
+  -D LGFX_TOUCH=FT5x06
+  -D LGFX_TOUCH_I2C_ADDR=0x38
+  -D LGFX_TOUCH_I2C_SDA=15
+  -D LGFX_TOUCH_I2C_SCL=16
+  -D LGFX_TOUCH_INT=47
+  -D LGFX_TOUCH_RST=48
+  -D LGFX_TOUCH_ROTATION=0
+
+[env:elecrow-adv-35-tft]
+extends = crowpanel_small
+build_flags =
+  ${crowpanel_small.build_flags}
+  -D LV_CACHE_DEF_SIZE=2097152
+  -D SPI_FREQUENCY=60000000
+  -D LGFX_SCREEN_WIDTH=320
+  -D LGFX_SCREEN_HEIGHT=480
+  -D LGFX_PANEL=ILI9488
+  -D LGFX_ROTATION=0
+  -D LGFX_CFG_HOST=SPI2_HOST
+  -D LGFX_PIN_SCK=42
+  -D LGFX_PIN_MOSI=39
+  -D LGFX_PIN_DC=41
+  -D LGFX_PIN_CS=40
+  -D LGFX_PIN_BL=38
+  -D LGFX_TOUCH=GT911
+  -D LGFX_TOUCH_I2C_ADDR=0x5D
+  -D LGFX_TOUCH_I2C_SDA=15
+  -D LGFX_TOUCH_I2C_SCL=16
+  -D LGFX_TOUCH_INT=47
+  -D LGFX_TOUCH_RST=48
+  -D LGFX_TOUCH_ROTATION=0
+  -D DISPLAY_SET_RESOLUTION
+
+; 4.3, 5.0, 7.0 inch 800x480 IPS (V1)
+[env:elecrow-adv1-43-50-70-tft]
+extends = crowpanel_large
+build_flags =
+  ${crowpanel_large.build_flags}
+  -D VIEW_320x240
--- a/variants/elecrow_panel/variant.h
+++ b/variants/elecrow_panel/variant.h
@@ -0,0 +1,90 @@
+#define I2C_SDA 15
+#define I2C_SCL 16
+
+#if CROW_SELECT == 1
+#define WAKE_ON_TOUCH
+#define SCREEN_TOUCH_INT 47
+#define USE_POWERSAVE
+#define SLEEP_TIME 180
+#endif
+
+#if CROW_SELECT == 1
+// dac / amp
+// #define HAS_I2S // didn't get I2S sound working
+#define PIN_BUZZER 8 // using pwm buzzer instead (nobody will notice, lol)
+#define DAC_I2S_BCK 13
+#define DAC_I2S_WS 11
+#define DAC_I2S_DOUT 12
+#define DAC_I2S_MCLK 8 // don't use GPIO0 because it's assigned to LoRa or button
+#else
+#define PIN_BUZZER 8
+#endif
+
+// GPS via UART1 connector
+#define GPS_DEFAULT_NOT_PRESENT 1
+#define HAS_GPS 1
+#if CROW_SELECT == 1
+#define GPS_RX_PIN 18
+#define GPS_TX_PIN 17
+#else
+// GPIOs shared with LoRa or MIC module
+#define GPS_RX_PIN 19
+#define GPS_TX_PIN 20
+#endif
+
+// Extension Slot Layout, viewed from above (2.4-3.5)
+// DIO1/IO1 o   o IO2/NRESET
+// SCK/IO10 o   o IO16/NC
+// MISO/IO9 o   o IO15/NC
+// MOSI/IO3 o   o NC/DIO2
+//      3V3 o   o IO46/BUSY
+//      GND o   o IO0/NSS
+//    5V/NC o   o NC/DIO3
+//         J9   J8
+
+// Extension Slot Layout, viewed from above (4.3-7.0)
+// !! DIO1/IO20 o   o IO19/NRESET !!
+// !!   SCK/IO5 o   o IO16/NC
+// !!  MISO/IO4 o   o IO15/NC
+// !!  MOSI/IO6 o   o NC/DIO2
+//          3V3 o   o IO2/BUSY !!
+//          GND o   o IO0/NSS
+//        5V/NC o   o NC/DIO3
+//             J9   J8
+
+// LoRa
+#define USE_SX1262
+
+#if CROW_SELECT == 1
+// 2.4", 2.8, 3.5"""
+#define HW_SPI1_DEVICE
+#define LORA_CS 0
+#define LORA_SCK 10
+#define LORA_MISO 9
+#define LORA_MOSI 3
+
+#define LORA_RESET 2
+#define LORA_DIO1 1  // SX1262 IRQ
+#define LORA_DIO2 46 // SX1262 BUSY
+
+// need to pull IO45 low to enable LORA and disable Microphone on 24 28 35
+#define SENSOR_POWER_CTRL_PIN 45
+#define SENSOR_POWER_ON LOW
+#else
+// 4.3", 5.0", 7.0"
+#define LORA_CS 0
+#define LORA_SCK 5
+#define LORA_MISO 4
+#define LORA_MOSI 6
+
+#define LORA_RESET 19
+#define LORA_DIO1 20 // SX1262 IRQ
+#define LORA_DIO2 2  // SX1262 BUSY
+#endif
+
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_DIO2
+#define SX126X_RESET LORA_RESET
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_DIO3_TCXO_VOLTAGE 3.3
--- a/variants/feather_diy/platformio.ini
+++ b/variants/feather_diy/platformio.ini
@@ -3,7 +3,6 @@
 extends = nrf52840_base
 board = adafruit_feather_nrf52840
 build_flags = ${nrf52840_base.build_flags} -Ivariants/feather_diy -Dfeather_diy
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/feather_diy>
 lib_deps = 
  ${nrf52840_base.lib_deps}
--- a/variants/feather_rp2040_rfm95/platformio.ini
+++ b/variants/feather_rp2040_rfm95/platformio.ini
@@ -9,7 +9,6 @@ build_flags = ${rp2040_base.build_flags}
  -Ivariants/feather_rp2040_rfm95
  -DDEBUG_RP2040_PORT=Serial
  -DHW_SPI1_DEVICE
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
 lib_deps =
  ${rp2040_base.lib_deps}
 debug_build_flags = ${rp2040_base.build_flags}
--- a/variants/heltec_mesh_node_t114/platformio.ini
+++ b/variants/heltec_mesh_node_t114/platformio.ini
@@ -6,7 +6,6 @@ debug_tool = jlink

 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = ${nrf52840_base.build_flags} -Ivariants/heltec_mesh_node_t114
-        -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
        -DGPS_POWER_TOGGLE
        -DHELTEC_T114

--- a/variants/heltec_mesh_pocket/nicheGraphics.h
+++ b/variants/heltec_mesh_pocket/nicheGraphics.h
@@ -0,0 +1,89 @@
+#pragma once
+
+#include "configuration.h"
+
+#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
+
+// InkHUD-specific components
+// ---------------------------
+#include "graphics/niche/InkHUD/InkHUD.h"
+
+// Applets
+#include "graphics/niche/InkHUD/Applets/User/AllMessage/AllMessageApplet.h"
+#include "graphics/niche/InkHUD/Applets/User/DM/DMApplet.h"
+#include "graphics/niche/InkHUD/Applets/User/Heard/HeardApplet.h"
+#include "graphics/niche/InkHUD/Applets/User/Positions/PositionsApplet.h"
+#include "graphics/niche/InkHUD/Applets/User/RecentsList/RecentsListApplet.h"
+#include "graphics/niche/InkHUD/Applets/User/ThreadedMessage/ThreadedMessageApplet.h"
+
+// Shared NicheGraphics components
+// --------------------------------
+#include "graphics/niche/Drivers/EInk/LCMEN2R13ECC1.h"
+#include "graphics/niche/Inputs/TwoButton.h"
+
+void setupNicheGraphics()
+{
+    using namespace NicheGraphics;
+
+    // SPI
+    // -----------------------------
+
+    // For NRF52 platforms, SPI pins are defined in variant.h
+    SPI1.begin();
+
+    // E-Ink Driver
+    // -----------------------------
+
+    Drivers::EInk *driver = new Drivers::LCMEN2R13ECC1;
+    driver->begin(&SPI1, PIN_EINK_DC, PIN_EINK_CS, PIN_EINK_BUSY, PIN_EINK_RES);
+
+    // InkHUD
+    // ----------------------------
+
+    InkHUD::InkHUD *inkhud = InkHUD::InkHUD::getInstance();
+
+    // Set the E-Ink driver
+    inkhud->setDriver(driver);
+
+    // Set how many FAST updates per FULL update
+    // Set how unhealthy additional FAST updates beyond this number are
+    inkhud->setDisplayResilience(10, 1.5);
+
+    // Select fonts
+    InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1252;
+    InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252;
+
+    // Customize default settings
+    inkhud->persistence->settings.userTiles.maxCount = 2; // How many tiles can the display handle?
+    inkhud->persistence->settings.rotation = 3;           // 270 degrees clockwise
+    inkhud->persistence->settings.userTiles.count = 1;    // One tile only by default, keep things simple for new users
+    inkhud->persistence->settings.optionalMenuItems.nextTile = true;
+
+    // Pick applets
+    // Note: order of applets determines priority of "auto-show" feature
+    inkhud->addApplet("All Messages", new InkHUD::AllMessageApplet, true, true); // Activated, autoshown
+    inkhud->addApplet("DMs", new InkHUD::DMApplet);                              // -
+    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));        // -
+    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));        // -
+    inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true);           // Activated
+    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);            // -
+    inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0);         // Activated, no autoshow, default on tile 0
+
+    // Start running InkHUD
+    inkhud->begin();
+
+    // Buttons
+    // --------------------------
+
+    Inputs::TwoButton *buttons = Inputs::TwoButton::getInstance(); // Shared NicheGraphics component
+
+    // #0: Main User Button
+    buttons->setWiring(0, Inputs::TwoButton::getUserButtonPin());
+    buttons->setHandlerShortPress(0, [inkhud]() { inkhud->shortpress(); });
+    buttons->setHandlerLongPress(0, [inkhud]() { inkhud->longpress(); });
+
+    // Begin handling button events
+    buttons->start();
+}
+
+#endif
--- a/variants/heltec_mesh_pocket/platformio.ini
+++ b/variants/heltec_mesh_pocket/platformio.ini
@@ -0,0 +1,88 @@
+; First prototype nrf52840/sx1262 device
+[env:heltec-mesh-pocket-5000]
+extends = nrf52840_base
+board = heltec_mesh_pocket
+debug_tool = jlink
+
+# add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
+build_flags = ${nrf52840_base.build_flags} -Ivariants/heltec_mesh_pocket
+  -DHELTEC_MESH_POCKET
+  -DHELTEC_MESH_POCKET_BATTERY_5000
+  -DUSE_EINK
+  -DEINK_DISPLAY_MODEL=GxEPD2_213_B74
+  -DEINK_WIDTH=250
+  -DEINK_HEIGHT=122
+  -DUSE_EINK_DYNAMICDISPLAY            ; Enable Dynamic EInk
+  -DEINK_LIMIT_FASTREFRESH=10          ; How many consecutive fast-refreshes are permitted
+  -DEINK_LIMIT_RATE_BACKGROUND_SEC=30  ; Minimum interval between BACKGROUND updates
+  -DEINK_LIMIT_RATE_RESPONSIVE_SEC=1   ; Minimum interval between RESPONSIVE updates
+;   -D EINK_LIMIT_GHOSTING_PX=2000      ; (Optional) How much image ghosting is tolerated
+  -DEINK_BACKGROUND_USES_FAST          ; (Optional) Use FAST refresh for both BACKGROUND and RESPONSIVE, until a limit is reached.
+  -DEINK_HASQUIRK_GHOSTING             ; Display model is identified as "prone to ghosting"
+  -DEINK_HASQUIRK_WEAKFASTREFRESH      ; Pixels set with fast-refresh are easy to clear, disrupted by sunlight
+
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/heltec_mesh_pocket> 
+lib_deps = 
+  ${nrf52840_base.lib_deps}
+  lewisxhe/PCF8563_Library@^1.0.1
+  https://github.com/meshtastic/GxEPD2#b202ebfec6a4821e098cf7a625ba0f6f2400292d
+
+
+[env:heltec-mesh-pocket-inkhud-5000]
+extends = nrf52840_base, inkhud
+board = heltec_mesh_pocket
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/heltec_mesh_pocket> ${inkhud.build_src_filter}
+build_flags = 
+  ${inkhud.build_flags}
+  ${nrf52840_base.build_flags} 
+  -I variants/heltec_mesh_pocket
+  -D HELTEC_MESH_POCKET
+  -D HELTEC_MESH_POCKET_BATTERY_5000
+lib_deps =
+  ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX
+  ${nrf52840_base.lib_deps}
+
+
+; First prototype nrf52840/sx1262 device
+[env:heltec-mesh-pocket-10000]
+extends = nrf52840_base
+board = heltec_mesh_pocket
+debug_tool = jlink
+
+# add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
+build_flags = ${nrf52840_base.build_flags} -Ivariants/heltec_mesh_pocket
+  -DHELTEC_MESH_POCKET
+  -DHELTEC_MESH_POCKET_BATTERY_10000
+  -DUSE_EINK
+  -DEINK_DISPLAY_MODEL=GxEPD2_213_B74
+  -DEINK_WIDTH=250
+  -DEINK_HEIGHT=122
+  -DUSE_EINK_DYNAMICDISPLAY            ; Enable Dynamic EInk
+  -DEINK_LIMIT_FASTREFRESH=10          ; How many consecutive fast-refreshes are permitted
+  -DEINK_LIMIT_RATE_BACKGROUND_SEC=30  ; Minimum interval between BACKGROUND updates
+  -DEINK_LIMIT_RATE_RESPONSIVE_SEC=1   ; Minimum interval between RESPONSIVE updates
+;   -D EINK_LIMIT_GHOSTING_PX=2000      ; (Optional) How much image ghosting is tolerated
+  -DEINK_BACKGROUND_USES_FAST          ; (Optional) Use FAST refresh for both BACKGROUND and RESPONSIVE, until a limit is reached.
+  -DEINK_HASQUIRK_GHOSTING             ; Display model is identified as "prone to ghosting"
+  -DEINK_HASQUIRK_WEAKFASTREFRESH      ; Pixels set with fast-refresh are easy to clear, disrupted by sunlight
+
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/heltec_mesh_pocket> 
+lib_deps = 
+  ${nrf52840_base.lib_deps}
+  lewisxhe/PCF8563_Library@^1.0.1
+  https://github.com/meshtastic/GxEPD2#b202ebfec6a4821e098cf7a625ba0f6f2400292d
+
+
+[env:heltec-mesh-pocket-inkhud-10000]
+extends = nrf52840_base, inkhud
+board = heltec_mesh_pocket
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/heltec_mesh_pocket> ${inkhud.build_src_filter}
+build_flags = 
+  ${inkhud.build_flags}
+  ${nrf52840_base.build_flags} 
+  -I variants/heltec_mesh_pocket
+  -D HELTEC_MESH_POCKET
+  -D HELTEC_MESH_POCKET_BATTERY_10000
+lib_deps =
+  ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX
+  ${nrf52840_base.lib_deps}
--- a/variants/heltec_mesh_pocket/variant.cpp
+++ b/variants/heltec_mesh_pocket/variant.cpp
@@ -0,0 +1,11 @@
+#include "variant.h"
+#include "nrf.h"
+#include "wiring_constants.h"
+#include "wiring_digital.h"
+
+const uint32_t g_ADigitalPinMap[] = {
+    // P0 - pins 0 and 1 are hardwired for xtal and should never be enabled
+    0xff, 0xff, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+
+    // P1
+    32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47};
--- a/variants/heltec_mesh_pocket/variant.h
+++ b/variants/heltec_mesh_pocket/variant.h
@@ -0,0 +1,132 @@
+#ifndef _VARIANT_HELTEC_NRF_
+#define _VARIANT_HELTEC_NRF_
+/** Master clock frequency */
+#define VARIANT_MCK (64000000ul)
+
+#define USE_LFXO // Board uses 32khz crystal for LF
+
+/*----------------------------------------------------------------------------
+ *        Headers
+ *----------------------------------------------------------------------------*/
+
+#include "WVariant.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+// Number of pins defined in PinDescription array
+#define PINS_COUNT (48)
+#define NUM_DIGITAL_PINS (48)
+#define NUM_ANALOG_INPUTS (1)
+#define NUM_ANALOG_OUTPUTS (0)
+
+// LEDs
+#define PIN_LED1 (13) // 13 red (confirmed on 1.0 board)
+#define LED_RED PIN_LED1
+#define LED_BLUE PIN_LED1
+#define LED_GREEN PIN_LED1
+#define LED_BUILTIN LED_BLUE
+#define LED_CONN LED_BLUE
+#define LED_STATE_ON 0 // State when LED is lit
+
+/*
+ * Buttons
+ */
+#define PIN_BUTTON1 (32 + 10)
+// #define PIN_BUTTON2 (0 + 18)      // 0.18 is labeled on the board as RESET but we configure it in the bootloader as a regular
+// GPIO
+
+/*
+No longer populated on PCB
+*/
+#define PIN_SERIAL2_RX (0 + 7)
+#define PIN_SERIAL2_TX (0 + 8)
+//  #define PIN_SERIAL2_EN (0 + 17)
+
+/**
+    Wire Interfaces
+    */
+#define WIRE_INTERFACES_COUNT 1
+
+#define PIN_WIRE_SDA (32 + 15)
+#define PIN_WIRE_SCL (32 + 13)
+
+/*
+ * Lora radio
+ */
+
+#define USE_SX1262
+#define SX126X_CS (0 + 26) // FIXME - we really should define LORA_CS instead
+#define LORA_CS (0 + 26)
+#define SX126X_DIO1 (0 + 16)
+// Note DIO2 is attached internally to the module to an analog switch for TX/RX switching
+// #define SX1262_DIO3 (0 + 21)
+// This is used as an *output* from the sx1262 and connected internally to power the tcxo, do not drive from the
+//    main
+// CPU?
+#define SX126X_BUSY (0 + 15)
+#define SX126X_RESET (0 + 12)
+// Not really an E22 but TTGO seems to be trying to clone that
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8
+
+// Display (E-Ink)
+#define PIN_EINK_CS 24
+#define PIN_EINK_BUSY 32 + 6
+#define PIN_EINK_DC 31
+#define PIN_EINK_RES 32 + 4
+#define PIN_EINK_SCLK 22
+#define PIN_EINK_MOSI 20
+
+#define PIN_SPI1_MISO -1
+#define PIN_SPI1_MOSI PIN_EINK_MOSI
+#define PIN_SPI1_SCK PIN_EINK_SCLK
+
+/*
+ * GPS pins
+ */
+
+#define PIN_SERIAL1_RX 32 + 5
+#define PIN_SERIAL1_TX 32 + 7
+
+/*
+ * SPI Interfaces
+ */
+#define SPI_INTERFACES_COUNT 2
+
+// For LORA, spi 0
+#define PIN_SPI_MISO (32 + 9)
+#define PIN_SPI_MOSI (0 + 5)
+#define PIN_SPI_SCK (0 + 4)
+
+// #define PIN_PWR_EN (0 + 6)
+
+// To debug via the segger JLINK console rather than the CDC-ACM serial device
+// #define USE_SEGGER
+
+// Battery
+// The battery sense is hooked to pin A0 (4)
+// it is defined in the anlaolgue pin section of this file
+// and has 12 bit resolution
+
+#define ADC_CTRL 32 + 2
+#define ADC_CTRL_ENABLED HIGH
+#define BATTERY_PIN 29
+#define ADC_RESOLUTION 14
+
+#define BATTERY_SENSE_RESOLUTION_BITS 12
+#define BATTERY_SENSE_RESOLUTION 4096.0
+#undef AREF_VOLTAGE
+#define AREF_VOLTAGE 3.0
+#define VBAT_AR_INTERNAL AR_INTERNAL_3_0
+#define ADC_MULTIPLIER (4.90F)
+
+#undef HAS_GPS
+#define HAS_GPS 0
+#define HAS_RTC 0
+#ifdef __cplusplus
+}
+#endif
+
+#endif
--- a/variants/heltec_vision_master_e213/nicheGraphics.h
+++ b/variants/heltec_vision_master_e213/nicheGraphics.h
@@ -16,18 +16,11 @@
 #include "graphics/niche/InkHUD/Applets/User/RecentsList/RecentsListApplet.h"
 #include "graphics/niche/InkHUD/Applets/User/ThreadedMessage/ThreadedMessageApplet.h"

-// #include "graphics/niche/InkHUD/Applets/Examples/BasicExample/BasicExampleApplet.h"
-// #include "graphics/niche/InkHUD/Applets/Examples/NewMsgExample/NewMsgExampleApplet.h"
-
 // Shared NicheGraphics components
 // --------------------------------
 #include "graphics/niche/Drivers/EInk/LCMEN2R13EFC1.h"
 #include "graphics/niche/Inputs/TwoButton.h"

-#include "graphics/niche/Fonts/FreeSans6pt7b.h"
-#include "graphics/niche/Fonts/FreeSans6pt8bCyrillic.h"
-#include <Fonts/FreeSans9pt7b.h>
-
 void setupNicheGraphics()
 {
    using namespace NicheGraphics;
@@ -42,7 +35,6 @@ void setupNicheGraphics()
    // E-Ink Driver
    // -----------------------------

-    // Use E-Ink driver
    Drivers::EInk *driver = new Drivers::LCMEN213EFC1;
    driver->begin(hspi, PIN_EINK_DC, PIN_EINK_CS, PIN_EINK_BUSY, PIN_EINK_RES);

@@ -51,21 +43,16 @@ void setupNicheGraphics()

    InkHUD::InkHUD *inkhud = InkHUD::InkHUD::getInstance();

-    // Set the driver
+    // Set the E-Ink driver
    inkhud->setDriver(driver);

    // Set how many FAST updates per FULL update
    // Set how unhealthy additional FAST updates beyond this number are
    inkhud->setDisplayResilience(10, 1.5);

-    // Prepare fonts
-    InkHUD::Applet::fontLarge = InkHUD::AppletFont(FreeSans9pt7b);
-    InkHUD::Applet::fontSmall = InkHUD::AppletFont(FreeSans6pt7b);
-    /*
-    // Font localization demo: Cyrillic
-    InkHUD::Applet::fontSmall = InkHUD::AppletFont(FreeSans6pt8bCyrillic);
-    InkHUD::Applet::fontSmall.addSubstitutionsWin1251();
-    */
+    // Select fonts
+    InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1252;
+    InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252;

    // Customize default settings
    inkhud->persistence->settings.userTiles.maxCount = 2; // How many tiles can the display handle?
@@ -74,15 +61,14 @@ void setupNicheGraphics()
    inkhud->persistence->settings.optionalMenuItems.nextTile = false; // Behavior handled by aux button instead

    // Pick applets
+    // Note: order of applets determines priority of "auto-show" feature
    inkhud->addApplet("All Messages", new InkHUD::AllMessageApplet, true, true); // Activated, autoshown
-    inkhud->addApplet("DMs", new InkHUD::DMApplet);                              // Inactive
-    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));        // Inactive
-    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));        // Inactive
+    inkhud->addApplet("DMs", new InkHUD::DMApplet);                              // -
+    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));        // -
+    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));        // -
    inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true);           // Activated
-    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);            // Inactive
+    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);            // -
    inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0);         // Activated, not autoshown, default on tile 0
-    // inkhud->addApplet("Basic", new InkHUD::BasicExampleApplet);
-    // inkhud->addApplet("NewMsg", new InkHUD::NewMsgExampleApplet);

    // Start running InkHUD
    inkhud->begin();
@@ -91,18 +77,17 @@ void setupNicheGraphics()
    // --------------------------

    Inputs::TwoButton *buttons = Inputs::TwoButton::getInstance(); // Shared NicheGraphics component
-    constexpr uint8_t MAIN_BUTTON = 0;
-    constexpr uint8_t AUX_BUTTON = 1;

-    // Setup the main user button
-    buttons->setWiring(MAIN_BUTTON, Inputs::TwoButton::getUserButtonPin());
-    buttons->setHandlerShortPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->shortpress(); });
-    buttons->setHandlerLongPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->longpress(); });
+    // #0: Main User Button
+    buttons->setWiring(0, Inputs::TwoButton::getUserButtonPin());
+    buttons->setHandlerShortPress(0, [inkhud]() { inkhud->shortpress(); });
+    buttons->setHandlerLongPress(0, [inkhud]() { inkhud->longpress(); });

-    // Setup the aux button
-    // Bonus feature of VME213
-    buttons->setWiring(AUX_BUTTON, BUTTON_PIN_SECONDARY);
-    buttons->setHandlerShortPress(AUX_BUTTON, []() { InkHUD::InkHUD::getInstance()->nextTile(); });
+    // #1: Aux Button
+    buttons->setWiring(1, BUTTON_PIN_SECONDARY);
+    buttons->setHandlerShortPress(1, [inkhud]() { inkhud->nextTile(); });
+
+    // Begin handling button events
    buttons->start();
 }

--- a/variants/heltec_vision_master_e213/variant.h
+++ b/variants/heltec_vision_master_e213/variant.h
@@ -31,7 +31,6 @@
 #define ADC_CHANNEL ADC1_GPIO7_CHANNEL
 #define ADC_MULTIPLIER 4.9 * 1.03
 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5
-#define HAS_32768HZ

 // LoRa
 #define USE_SX1262
--- a/variants/heltec_vision_master_e290/nicheGraphics.h
+++ b/variants/heltec_vision_master_e290/nicheGraphics.h
@@ -29,18 +29,11 @@ Different NicheGraphics UIs and different hardware variants will each have their
 #include "graphics/niche/InkHUD/Applets/User/RecentsList/RecentsListApplet.h"
 #include "graphics/niche/InkHUD/Applets/User/ThreadedMessage/ThreadedMessageApplet.h"

-// #include "graphics/niche/InkHUD/Applets/Examples/BasicExample/BasicExampleApplet.h"
-// #include "graphics/niche/InkHUD/Applets/Examples/NewMsgExample/NewMsgExampleApplet.h"
-
 // Shared NicheGraphics components
 // --------------------------------
 #include "graphics/niche/Drivers/EInk/DEPG0290BNS800.h"
 #include "graphics/niche/Inputs/TwoButton.h"

-#include "graphics/niche/Fonts/FreeSans6pt7b.h"
-#include "graphics/niche/Fonts/FreeSans6pt8bCyrillic.h"
-#include <Fonts/FreeSans9pt7b.h>
-
 void setupNicheGraphics()
 {
    using namespace NicheGraphics;
@@ -55,7 +48,6 @@ void setupNicheGraphics()
    // E-Ink Driver
    // -----------------------------

-    // Use E-Ink driver
    Drivers::EInk *driver = new Drivers::DEPG0290BNS800;
    driver->begin(hspi, PIN_EINK_DC, PIN_EINK_CS, PIN_EINK_BUSY);

@@ -64,21 +56,16 @@ void setupNicheGraphics()

    InkHUD::InkHUD *inkhud = InkHUD::InkHUD::getInstance();

-    // Set the driver
+    // Set the E-Ink driver
    inkhud->setDriver(driver);

    // Set how many FAST updates per FULL update
    // Set how unhealthy additional FAST updates beyond this number are
    inkhud->setDisplayResilience(7, 1.5);

-    // Prepare fonts
-    InkHUD::Applet::fontLarge = InkHUD::AppletFont(FreeSans9pt7b);
-    InkHUD::Applet::fontSmall = InkHUD::AppletFont(FreeSans6pt7b);
-    /*
-    // Font localization demo: Cyrillic
-    InkHUD::Applet::fontSmall = InkHUD::AppletFont(FreeSans6pt8bCyrillic);
-    InkHUD::Applet::fontSmall.addSubstitutionsWin1251();
-    */
+    // Select fonts
+    InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1252;
+    InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252;

    // Customize default settings
    inkhud->persistence->settings.userTiles.maxCount = 2; // How many tiles can the display handle?
@@ -87,22 +74,14 @@ void setupNicheGraphics()
    inkhud->persistence->settings.optionalMenuItems.nextTile = false; // Behavior handled by aux button instead

    // Pick applets
-
-    // Order of applets determines priority of "auto-show" feature.
-    // Optional arguments for default state:
-    //   - is activated?
-    //   - is autoshown?
-    //   - is foreground on a specific tile (index)?
-
+    // Note: order of applets determines priority of "auto-show" feature
    inkhud->addApplet("All Messages", new InkHUD::AllMessageApplet, true, true); // Activated, autoshown
-    inkhud->addApplet("DMs", new InkHUD::DMApplet);                              // Inactive
-    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));        // Inactive
-    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));        // Inactive
+    inkhud->addApplet("DMs", new InkHUD::DMApplet);                              // -
+    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));        // -
+    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));        // -
    inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true);           // Activated
-    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);            // Inactive
+    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);            // -
    inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0);         // Activated, not autoshown, default on tile 0
-    // inkhud->addApplet("Basic", new InkHUD::BasicExampleApplet);
-    // inkhud->addApplet("NewMsg", new InkHUD::NewMsgExampleApplet);

    // Start running InkHUD
    inkhud->begin();
@@ -112,16 +91,16 @@ void setupNicheGraphics()

    Inputs::TwoButton *buttons = Inputs::TwoButton::getInstance(); // A shared NicheGraphics component

-    // Setup the main user button (0)
+    // #0: Main User Button
    buttons->setWiring(0, Inputs::TwoButton::getUserButtonPin());
-    buttons->setHandlerShortPress(0, []() { InkHUD::InkHUD::getInstance()->shortpress(); });
-    buttons->setHandlerLongPress(0, []() { InkHUD::InkHUD::getInstance()->longpress(); });
+    buttons->setHandlerShortPress(0, [inkhud]() { inkhud->shortpress(); });
+    buttons->setHandlerLongPress(0, [inkhud]() { inkhud->longpress(); });

-    // Setup the aux button (1)
-    // Bonus feature of VME290
+    // #1: Aux Button
    buttons->setWiring(1, BUTTON_PIN_SECONDARY);
-    buttons->setHandlerShortPress(1, []() { InkHUD::InkHUD::getInstance()->nextTile(); });
+    buttons->setHandlerShortPress(1, [inkhud]() { inkhud->nextTile(); });

+    // Begin handling button events
    buttons->start();
 }

--- a/variants/heltec_vision_master_e290/variant.h
+++ b/variants/heltec_vision_master_e290/variant.h
@@ -30,7 +30,6 @@
 #define ADC_CHANNEL ADC1_GPIO7_CHANNEL
 #define ADC_MULTIPLIER 4.9 * 1.03
 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5
-#define HAS_32768HZ

 // LoRa
 #define USE_SX1262
--- a/variants/heltec_vision_master_t190/variant.h
+++ b/variants/heltec_vision_master_t190/variant.h
@@ -47,7 +47,6 @@
 #define ADC_CHANNEL ADC1_GPIO6_CHANNEL
 #define ADC_MULTIPLIER 4.9 * 1.03        // Voltage divider is roughly 1:1
 #define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // Voltage divider output is quite high
-#define HAS_32768HZ

 // LoRa
 #define USE_SX1262
--- a/variants/heltec_wireless_paper/nicheGraphics.h
+++ b/variants/heltec_wireless_paper/nicheGraphics.h
@@ -16,18 +16,11 @@
 #include "graphics/niche/InkHUD/Applets/User/RecentsList/RecentsListApplet.h"
 #include "graphics/niche/InkHUD/Applets/User/ThreadedMessage/ThreadedMessageApplet.h"

-// #include "graphics/niche/InkHUD/Applets/Examples/BasicExample/BasicExampleApplet.h"
-// #include "graphics/niche/InkHUD/Applets/Examples/NewMsgExample/NewMsgExampleApplet.h"
-
 // Shared NicheGraphics components
 // --------------------------------
 #include "graphics/niche/Drivers/EInk/LCMEN2R13EFC1.h"
 #include "graphics/niche/Inputs/TwoButton.h"

-#include "graphics/niche/Fonts/FreeSans6pt7b.h"
-#include "graphics/niche/Fonts/FreeSans6pt8bCyrillic.h"
-#include <Fonts/FreeSans9pt7b.h>
-
 void setupNicheGraphics()
 {
    using namespace NicheGraphics;
@@ -42,7 +35,6 @@ void setupNicheGraphics()
    // E-Ink Driver
    // -----------------------------

-    // Use E-Ink driver
    Drivers::EInk *driver = new Drivers::LCMEN213EFC1;
    driver->begin(hspi, PIN_EINK_DC, PIN_EINK_CS, PIN_EINK_BUSY, PIN_EINK_RES);

@@ -51,21 +43,16 @@ void setupNicheGraphics()

    InkHUD::InkHUD *inkhud = InkHUD::InkHUD::getInstance();

-    // Set the driver
+    // Set the E-Ink driver
    inkhud->setDriver(driver);

    // Set how many FAST updates per FULL update
    // Set how unhealthy additional FAST updates beyond this number are
    inkhud->setDisplayResilience(10, 1.5);

-    // Prepare fonts
-    InkHUD::Applet::fontLarge = InkHUD::AppletFont(FreeSans9pt7b);
-    InkHUD::Applet::fontSmall = InkHUD::AppletFont(FreeSans6pt7b);
-    /*
-    // Font localization demo: Cyrillic
-    InkHUD::Applet::fontSmall = InkHUD::AppletFont(FreeSans6pt8bCyrillic);
-    InkHUD::Applet::fontSmall.addSubstitutionsWin1251();
-    */
+    // Select fonts
+    InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1252;
+    InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252;

    // Customize default settings
    inkhud->persistence->settings.userTiles.maxCount = 2; // How many tiles can the display handle?
@@ -73,15 +60,14 @@ void setupNicheGraphics()
    inkhud->persistence->settings.userTiles.count = 1;    // One tile only by default, keep things simple for new users

    // Pick applets
+    // Note: order of applets determines priority of "auto-show" feature
    inkhud->addApplet("All Messages", new InkHUD::AllMessageApplet, true, true); // Activated, autoshown
-    inkhud->addApplet("DMs", new InkHUD::DMApplet);                              // Inactive
-    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));        // Inactive
-    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));        // Inactive
+    inkhud->addApplet("DMs", new InkHUD::DMApplet);                              // -
+    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));        // -
+    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));        // -
    inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true);           // Activated
-    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);            // Inactive
+    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);            // -
    inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0);         // Activated, not autoshown, default on tile 0
-    // inkhud->addApplet("Basic", new InkHUD::BasicExampleApplet);
-    // inkhud->addApplet("NewMsg", new InkHUD::NewMsgExampleApplet);

    // Start running InkHUD
    inkhud->begin();
@@ -90,15 +76,15 @@ void setupNicheGraphics()
    // --------------------------

    Inputs::TwoButton *buttons = Inputs::TwoButton::getInstance(); // Shared NicheGraphics component
-    constexpr uint8_t MAIN_BUTTON = 0;

-    // Setup the main user button
-    buttons->setWiring(MAIN_BUTTON, Inputs::TwoButton::getUserButtonPin());
-    buttons->setHandlerShortPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->shortpress(); });
-    buttons->setHandlerLongPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->longpress(); });
+    // #0: Main User Button
+    buttons->setWiring(0, Inputs::TwoButton::getUserButtonPin());
+    buttons->setHandlerShortPress(0, [inkhud]() { inkhud->shortpress(); });
+    buttons->setHandlerLongPress(0, [inkhud]() { inkhud->longpress(); });

    // No aux button on this board

+    // Begin handling button events
    buttons->start();
 }

--- a/variants/heltec_wireless_paper/variant.h
+++ b/variants/heltec_wireless_paper/variant.h
@@ -28,7 +28,6 @@
 #define ADC_MULTIPLIER 2                // Voltage divider is roughly 1:1
 #define BAT_MEASURE_ADC_UNIT 2          // Use ADC2
 #define ADC_ATTENUATION ADC_ATTEN_DB_12 // Voltage divider output is quite high
-#define HAS_32768HZ
 #define ADC_CTRL_ENABLED LOW

 #define NO_EXT_GPIO 1
--- a/variants/heltec_wireless_paper_v1/variant.h
+++ b/variants/heltec_wireless_paper_v1/variant.h
@@ -29,7 +29,6 @@
 #define ADC_MULTIPLIER 2                // Voltage divider is roughly 1:1
 #define BAT_MEASURE_ADC_UNIT 2          // Use ADC2
 #define ADC_ATTENUATION ADC_ATTEN_DB_12 // Voltage divider output is quite high
-#define HAS_32768HZ
 #define ADC_CTRL_ENABLED LOW

 #define NO_EXT_GPIO 1
--- a/variants/link32_s3_v1/pins_arduino.h
+++ b/variants/link32_s3_v1/pins_arduino.h
@@ -0,0 +1,19 @@
+#ifndef Pins_Arduino_h
+#define Pins_Arduino_h
+
+#include <stdint.h>
+
+#define USB_VID 0x303a
+#define USB_PID 0x1001
+
+// The default Wire will be mapped to PMU and RTC
+static const uint8_t SDA = 47;
+static const uint8_t SCL = 48;
+
+// Default SPI will be mapped to Radio
+static const uint8_t SS = 21;
+static const uint8_t MOSI = 34;
+static const uint8_t MISO = 33;
+static const uint8_t SCK = 16;
+
+#endif /* Pins_Arduino_h */
--- a/variants/link32_s3_v1/platformio.ini
+++ b/variants/link32_s3_v1/platformio.ini
@@ -0,0 +1,11 @@
+[env:link32-s3-v1]
+extends = esp32s3_base
+board = esp32-s3-devkitc-1
+build_flags = 
+  ${esp32_base.build_flags} -D LINK_32 -I variants/link32_s3_v1
+  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
+  -DARDUINO_USB_CDC_ON_BOOT
+  -DARDUINO_USB_MODE=1
+  -DRADIOLIB_EXCLUDE_SX128X=1
+  -DRADIOLIB_EXCLUDE_SX127X=1
+  -DRADIOLIB_EXCLUDE_LR11X0=1
--- a/variants/link32_s3_v1/variant.h
+++ b/variants/link32_s3_v1/variant.h
@@ -0,0 +1,42 @@
+#define BATTERY_PIN 15
+#define ADC_CHANNEL ADC2_GPIO15_CHANNEL // ADC channel for battery voltage measurement
+#define BATTERY_SENSE_SAMPLES 30
+#define BAT_MEASURE_ADC_UNIT 2 // Use ADC2 for battery measurement
+
+#define USE_SSD1306
+
+#define BUTTON_PIN 0 // Button pin for this board
+#define BUTTON_PIN_ALT 36
+
+#define HAS_NEOPIXEL                         // If defined, we will use the neopixel library
+#define NEOPIXEL_DATA 35                     // Neopixel pin for this board
+#define NEOPIXEL_COUNT 1                     // Number of neopixels on this board
+#define NEOPIXEL_TYPE (NEO_GRB + NEO_KHZ800) // type of neopixels in use
+
+#define ADC_MULTIPLIER 2
+
+#define I2C_SDA 47 // I2C pins for this board
+#define I2C_SCL 48
+
+#define USE_SX1262
+
+#define LORA_SCK 16
+#define LORA_MISO 33
+#define LORA_MOSI 34
+#define LORA_CS 21
+#define LORA_RESET 18
+
+#define LORA_DIO0 12 // a No connect on the SX1262 module
+#define LORA_DIO1 13
+#define LORA_DIO2 14 // Not really used
+
+#define LORA_TCXO_GPIO 17
+
+#define TCXO_OPTIONAL
+
+#define SX126X_CS LORA_CS
+#define SX126X_DIO1 LORA_DIO1
+#define SX126X_BUSY LORA_DIO2
+#define SX126X_RESET LORA_RESET
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8
--- a/variants/mesh-tab/variant.h
+++ b/variants/mesh-tab/variant.h
@@ -3,7 +3,8 @@

 #define HAS_TOUCHSCREEN 1

-#define SLEEP_TIME 120
+#define USE_POWERSAVE
+#define SLEEP_TIME 180

 // Analog pins
 #define BATTERY_PIN 4 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
--- a/variants/meshlink/platformio.ini
+++ b/variants/meshlink/platformio.ini
@@ -6,7 +6,6 @@ extends = nrf52840_base
 board = meshlink
 ;board_check = true
 build_flags = ${nrf52840_base.build_flags} -I variants/meshlink -D MESHLINK
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  -D EINK_DISPLAY_MODEL=GxEPD2_213_B74
  -D EINK_WIDTH=250
--- a/variants/meshlink_eink/platformio.ini
+++ b/variants/meshlink_eink/platformio.ini
@@ -6,7 +6,6 @@ extends = nrf52840_base
 board = meshlink
 ;board_check = true
 build_flags = ${nrf52840_base.build_flags} -I variants/meshlink_eink -D MESHLINK
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  -D EINK_DISPLAY_MODEL=GxEPD2_213_B74
  -D EINK_WIDTH=250
--- a/variants/monteops_hw1/platformio.ini
+++ b/variants/monteops_hw1/platformio.ini
@@ -4,7 +4,6 @@ board_level = extra
 extends = nrf52840_base
 board = wiscore_rak4631
 build_flags = ${nrf52840_base.build_flags} -Ivariants/monteops_hw1 -D MONTEOPS_HW1
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/monteops_hw1> +<mesh/eth/> +<mesh/api/> +<mqtt/>
 lib_deps = 
  ${nrf52840_base.lib_deps}
--- a/variants/nano-g2-ultra/platformio.ini
+++ b/variants/nano-g2-ultra/platformio.ini
@@ -5,7 +5,6 @@ board = nano-g2-ultra
 debug_tool = jlink

 build_flags = ${nrf52840_base.build_flags} -Ivariants/nano-g2-ultra -D NANO_G2_ULTRA
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nano-g2-ultra>
 lib_deps = 
  ${nrf52840_base.lib_deps}
--- a/variants/nibble_rp2040/platformio.ini
+++ b/variants/nibble_rp2040/platformio.ini
@@ -10,7 +10,6 @@ build_flags = ${rp2040_base.build_flags}
  -Ivariants/nibble_rp2040
  -DDEBUG_RP2040_PORT=Serial
  -DHW_SPI1_DEVICE
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
 lib_deps =
  ${rp2040_base.lib_deps}
 debug_build_flags = ${rp2040_base.build_flags}, -g
--- a/variants/portduino/platformio.ini
+++ b/variants/portduino/platformio.ini
@@ -43,6 +43,37 @@ build_src_filter =
  ${native_base.build_src_filter}
  -<graphics/TFTDisplay.cpp>

+[env:native-fb]
+extends = native_base
+build_type = release
+lib_deps =
+  ${native_base.lib_deps}
+  ${device-ui_base.lib_deps}
+board_level = extra
+build_flags = ${native_base.build_flags} -Os -ffunction-sections -fdata-sections -Wl,--gc-sections
+  -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
+  -D RAM_SIZE=8192
+  -D USE_FRAMEBUFFER=1
+  -D LV_COLOR_DEPTH=32
+  -D HAS_TFT=1
+  -D HAS_SCREEN=0
+  -D LV_BUILD_TEST=0
+  -D LV_USE_LOG=0
+  -D LV_USE_EVDEV=1
+  -D LV_LVGL_H_INCLUDE_SIMPLE
+  -D LV_CONF_INCLUDE_SIMPLE
+  -D LV_COMP_CONF_INCLUDE_SIMPLE
+  -D USE_LOG_DEBUG
+  -D LOG_DEBUG_INC=\"DebugConfiguration.h\"
+  -D USE_PACKET_API
+  -D VIEW_320x240
+  -D MAP_FULL_REDRAW
+  !pkg-config --libs libulfius --silence-errors || :
+  !pkg-config --libs openssl --silence-errors || :
+build_src_filter =
+  ${native_base.build_src_filter}
+  -<graphics/TFTDisplay.cpp>
+
 [env:native-tft-debug]
 extends = native_base
 build_type = debug
--- a/variants/rak11310/platformio.ini
+++ b/variants/rak11310/platformio.ini
@@ -9,7 +9,6 @@ build_flags = ${rp2040_base.build_flags}
  -Ivariants/rak11310
  -DDEBUG_RP2040_PORT=Serial
  -DRV3028_RTC=0x52
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
 build_src_filter = ${rp2040_base.build_src_filter} +<../variants/rak11310> +<mesh/eth/> +<mesh/api/> +<mqtt/>
 lib_deps =
  ${rp2040_base.lib_deps}
--- a/variants/rak2560/platformio.ini
+++ b/variants/rak2560/platformio.ini
@@ -4,7 +4,6 @@ extends = nrf52840_base
 board = wiscore_rak4631
 board_check = true
 build_flags = ${nrf52840_base.build_flags} -Ivariants/rak2560 -D RAK_4631
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  -DRADIOLIB_EXCLUDE_SX128X=1
  -DRADIOLIB_EXCLUDE_SX127X=1
--- a/variants/rak4631/platformio.ini
+++ b/variants/rak4631/platformio.ini
@@ -4,7 +4,6 @@ extends = nrf52840_base
 board = wiscore_rak4631
 board_check = true
 build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631 -D RAK_4631
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
  -DEINK_WIDTH=250
--- a/variants/rak4631/variant.h
+++ b/variants/rak4631/variant.h
@@ -197,6 +197,12 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG

 */

+// configure the SET pin on the RAK12039 sensor board to disable the sensor while not reading
+// air quality telemetry.  PIN_NFC2 doesn't seem to be used anywhere else in the codebase, but if
+// you're having problems with your node behaving weirdly when a RAK12039 board isn't connected,
+// try disabling this.
+#define PMSA003I_ENABLE_PIN PIN_NFC2
+
 #define DETECTION_SENSOR_EN 4

 #define USE_SX1262
--- a/variants/rak4631_epaper/platformio.ini
+++ b/variants/rak4631_epaper/platformio.ini
@@ -3,7 +3,6 @@
 extends = nrf52840_base
 board = wiscore_rak4631
 build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631_epaper -D RAK_4631
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
  -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
  -DEINK_WIDTH=250
  -DEINK_HEIGHT=122
--- a/variants/rak4631_epaper_onrxtx/platformio.ini
+++ b/variants/rak4631_epaper_onrxtx/platformio.ini
@@ -4,7 +4,6 @@ board_level = extra
 extends = nrf52840_base
 board = wiscore_rak4631
 build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631_epaper -D RAK_4631
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
  -D PIN_EINK_EN=34
  -D EINK_DISPLAY_MODEL=GxEPD2_213_BN
  -D EINK_WIDTH=250
--- a/variants/rak4631_eth_gw/platformio.ini
+++ b/variants/rak4631_eth_gw/platformio.ini
@@ -4,7 +4,6 @@ extends = nrf52840_base
 board = wiscore_rak4631
 board_check = true
 build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631_eth_gw -D RAK_4631
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
  -DEINK_WIDTH=250
--- a/variants/rak_wismeshtap/platformio.ini
+++ b/variants/rak_wismeshtap/platformio.ini
@@ -3,7 +3,6 @@
 extends = nrf52840_base
 board = wiscore_rak4631
 build_flags = ${nrf52840_base.build_flags} -Ivariants/rak_wismeshtap -DWISMESH_TAP -DRAK_4631
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
  -DEINK_WIDTH=250
--- a/variants/rak_wismeshtap/variant.h
+++ b/variants/rak_wismeshtap/variant.h
@@ -305,6 +305,9 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
 #define HAS_TOUCHSCREEN 1
 #define SCREEN_TOUCH_INT WB_IO6

+#define USE_POWERSAVE
+#define SLEEP_TIME 120
+
 #define CANNED_MESSAGE_MODULE_ENABLE 1
 #define USE_VIRTUAL_KEYBOARD 1
 /*----------------------------------------------------------------------------
--- a/variants/rp2040-lora/platformio.ini
+++ b/variants/rp2040-lora/platformio.ini
@@ -9,7 +9,6 @@ build_flags = ${rp2040_base.build_flags}
  -Ivariants/rp2040-lora
  -DDEBUG_RP2040_PORT=Serial
  -DHW_SPI1_DEVICE
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
 lib_deps =
  ${rp2040_base.lib_deps}
 debug_build_flags = ${rp2040_base.build_flags}, -g
--- a/variants/rpipico-slowclock/platformio.ini
+++ b/variants/rpipico-slowclock/platformio.ini
@@ -19,7 +19,6 @@ build_flags = ${rp2040_base.build_flags}
  -Ivariants/rpipico-slowclock
  -DDEBUG_RP2040_PORT=Serial2
  -DHW_SPI1_DEVICE
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
  -g
  -DNO_USB
 lib_deps =
--- a/variants/rpipico/platformio.ini
+++ b/variants/rpipico/platformio.ini
@@ -9,7 +9,6 @@ build_flags = ${rp2040_base.build_flags}
  -Ivariants/rpipico
  -DDEBUG_RP2040_PORT=Serial
  -DHW_SPI1_DEVICE
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
 lib_deps =
  ${rp2040_base.lib_deps}
 debug_build_flags = ${rp2040_base.build_flags}, -g
--- a/variants/rpipico2/platformio.ini
+++ b/variants/rpipico2/platformio.ini
@@ -9,7 +9,6 @@ build_flags = ${rp2350_base.build_flags}
  -Ivariants/rpipico2
  -DDEBUG_RP2040_PORT=Serial
  -DHW_SPI1_DEVICE
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m33"
 lib_deps =
  ${rp2350_base.lib_deps}
 debug_build_flags = ${rp2350_base.build_flags}, -g
--- a/variants/rpipico2w/platformio.ini
+++ b/variants/rpipico2w/platformio.ini
@@ -21,7 +21,6 @@ build_flags = ${rp2350_base.build_flags}
  -DARDUINO_RASPBERRY_PI_PICO_2W
  -DARDUINO_ARCH_RP2040
  -DHAS_WIFI=1
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m33"
  -fexceptions  # for exception handling in MQTT
  -DHAS_UDP_MULTICAST=1
 build_src_filter = ${rp2350_base.build_src_filter} +<mesh/wifi/>
--- a/variants/rpipicow/platformio.ini
+++ b/variants/rpipicow/platformio.ini
@@ -8,7 +8,6 @@ build_flags = ${rp2040_base.build_flags}
  -DRPI_PICO
  -Ivariants/rpipicow
  -DHW_SPI1_DEVICE
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
  -fexceptions  # for exception handling in MQTT
  -DHAS_UDP_MULTICAST=1
 build_src_filter = ${rp2040_base.build_src_filter} +<mesh/wifi/>
--- a/variants/seeed-sensecap-indicator/platformio.ini
+++ b/variants/seeed-sensecap-indicator/platformio.ini
@@ -49,7 +49,6 @@ build_flags =
  -D HAS_SCREEN=0
  -D HAS_TFT=1
  -D DISPLAY_SET_RESOLUTION
-  -D USE_PIN_BUZZER
  -D RAM_SIZE=4096
 	-D LV_LVGL_H_INCLUDE_SIMPLE
 	-D LV_CONF_INCLUDE_SIMPLE
--- a/variants/seeed_solar_node/platformio.ini
+++ b/variants/seeed_solar_node/platformio.ini
@@ -0,0 +1,13 @@
+[env:seeed_solar_node]
+board = seeed_solar_node
+extends = nrf52840_base
+;board_level = extra
+build_flags = ${nrf52840_base.build_flags} 
+  -I $PROJECT_DIR/variants/seeed_solar_node 
+  -D SEEED_SOLAR_NODE 
+  -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52
+board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/seeed_solar_node>
+lib_deps =
+  ${nrf52840_base.lib_deps}
+debug_tool = jlink
--- a/variants/seeed_solar_node/variant.cpp
+++ b/variants/seeed_solar_node/variant.cpp
@@ -0,0 +1,108 @@
+/*
+ * variant.cpp - Digital pin mapping for nRF52-based development board
+ *
+ * This file defines the pin mapping array that maps logical digital pins (D0-D17)
+ * to physical GPIO ports/pins on the Nordic nRF52 series microcontroller.
+ *
+ * Board: [Seeed Studio XIAO nRF52840 Sense (Seeed Solar Node)]
+ * Hardware Features:
+ *  - LoRa module (CS/SCK/MISO/MOSI control pins)
+ *  - GNSS module (TX/RX/Reset/Wakeup)
+ *  - User LEDs (D11-D12)
+ *  - User button (D13)
+ *  - Grove/NFC interface (D14-D15)
+ *  - Battery voltage monitoring (D16)
+ *
+ * Created [20250225]
+ * By [Dylan]
+ * Version 1.0
+ * License: [MIT]
+ */
+
+#include "variant.h"
+#include "nrf.h"
+#include "wiring_constants.h"
+#include "wiring_digital.h"
+
+/**
+ * @brief Digital pin to GPIO port/pin mapping table
+ *
+ * Format: Logical Pin (Dx) -> nRF Port.Pin (Px.xx)
+ *
+ * Pin Groupings:
+ * [D0-D10]  - Peripheral control (LoRa, GNSS)
+ * [D11-D12] - LED outputs
+ * [D13]     - User button
+ * [D14-D15] - Grove/NFC interface
+ * [D16]     - Battery voltage ADC input
+ * [D17]     - GNSS module reset
+ */
+
+extern "C" {
+const uint32_t g_ADigitalPinMap[] = {
+    // D0 .. D10 - Peripheral control pins
+    2,  // D0  P0.02 (A0)    GNSS_WAKEUP
+    3,  // D1  P0.03 (A1)    LORA_DIO1
+    28, // D2  P0.28 (A2)    LORA_RESET
+    29, // D3  P0.29 (A3)    LORA_BUSY
+    4,  // D4  P0.04 (A4/SDA) LORA_CS
+    5,  // D5  P0.05 (A5/SCL) LORA_SW
+    43, // D6  P1.11 (UART_TX) GNSS_TX
+    44, // D7  P1.12 (UART_RX) GNSS_RX
+    45, // D8  P1.13 (SPI_SCK) LORA_SCK
+    46, // D9  P1.14 (SPI_MISO) LORA_MISO
+    47, // D10 P1.15 (SPI_MOSI) LORA_MOSI
+
+    // D11-D12 - LED outputs
+    15, // D11 P0.15 User LED
+    19, // D12 P0.19 Breathing LED
+
+    // D13 - User input
+    33, // D13 P1.01 User Button
+
+    // D14-D15 - Grove/NFC interface
+    9,  // D14 P0.09 NFC1/GROVE_D1
+    10, // D15 P0.10 NFC2/GROVE_D0
+
+    // D16 - Power management
+    // 31, // D16 P0.31 VBAT_ADC (Battery voltage)
+    31, // D16 P0.31 VBAT_ADC (Battery voltage)
+    // D17 - GNSS control
+    35, // D17 P1.03 GNSS_RESET
+
+    37, // D18 P1.05 GNSS_ENABLE
+    14, // D19 P0.14 BAT_READ
+    39, // D20 P1.07 USER_BUTTON
+
+    //
+    21, // D21 P0.21 (QSPI_SCK)
+    25, // D22 P0.25 (QSPI_CSN)
+    20, // D23 P0.20 (QSPI_SIO_0 DI)
+    24, // D24 P0.24 (QSPI_SIO_1 DO)
+    22, // D25 P0.22 (QSPI_SIO_2 WP)
+    23, // D26 P0.23 (QSPI_SIO_3 HOLD)
+};
+}
+
+void initVariant()
+{
+    pinMode(PIN_QSPI_CS, OUTPUT);
+    digitalWrite(PIN_QSPI_CS, HIGH);
+    // This setup is crucial for ensuring low power consumption and proper initialization of the hardware components.
+    pinMode(GPS_EN, OUTPUT);
+    digitalWrite(GPS_EN, LOW);
+
+    // VBAT_ENABLE
+    pinMode(BAT_READ, OUTPUT);
+    digitalWrite(BAT_READ, LOW);
+
+    pinMode(PIN_LED1, OUTPUT);
+    digitalWrite(PIN_LED1, LOW);
+    pinMode(PIN_LED2, OUTPUT);
+    digitalWrite(PIN_LED2, LOW);
+    pinMode(PIN_LED2, OUTPUT);
+    // digitalWrite(LED_PIN, LOW);
+
+    pinMode(GPS_EN, OUTPUT);
+    digitalWrite(GPS_EN, HIGH);
+}
--- a/variants/seeed_solar_node/variant.h
+++ b/variants/seeed_solar_node/variant.h
@@ -0,0 +1,157 @@
+#ifndef _SEEED_SOLAR_NODE_H_
+#define _SEEED_SOLAR_NODE_H_
+#include "WVariant.h"
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Clock Configuration
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+#define VARIANT_MCK (64000000ul) // Master clock frequency
+#define USE_LFXO                 // 32.768kHz crystal for LFCLK
+
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Pin Capacity Definitions
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+#define PINS_COUNT (33u)       // Total GPIO pins
+#define NUM_DIGITAL_PINS (33u) // Digital I/O pins
+#define NUM_ANALOG_INPUTS (8u) // Analog inputs (A0-A5 + VBAT + AREF)
+#define NUM_ANALOG_OUTPUTS (0u)
+
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  LED Configuration
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  LEDs
+//  LEDs
+#define PIN_LED1 (12) // LED        P1.15
+#define PIN_LED2 (11) //
+
+#define LED_BUILTIN PIN_LED1
+#define LED_CONN PIN_LED2
+
+#define LED_GREEN PIN_LED1
+#define LED_BLUE PIN_LED2
+// #define LED_PIN PIN_LED2
+#define LED_STATE_ON 1 // State when LED is litted
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Button Configuration
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+#define BUTTON_PIN D13 // This is the Program Button
+// #define BUTTON_NEED_PULLUP   1
+#define BUTTON_ACTIVE_LOW true
+#define BUTTON_ACTIVE_PULLUP false
+
+#define BUTTON_PIN_TOUCH 20 // Touch button
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Digital Pin Mapping (D0-D10)
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+#define D0 0   // P0.02 GNSS_WAKEUP/IO0
+#define D1 1   // P0.03 LORA_DIO1
+#define D2 2   // P0.28 LORA_RESET
+#define D3 3   // P0.29 LORA_BUSY
+#define D4 4   // P0.04 LORA_CS/I2C_SDA
+#define D5 5   // P0.05 LORA_SW/I2C_SCL
+#define D6 6   // P1.11 GNSS_TX
+#define D7 7   // P1.12 GNSS_RX
+#define D8 8   // P1.13 SPI_SCK
+#define D9 9   // P1.14 SPI_MISO
+#define D10 10 // P1.15 SPI_MOSI
+#define D13 13 // P1.01 User Button
+#define D14 14 // P0.09 NFC1/GROVE_D1
+#define D15 15 // P0.10 NFC2/GROVE_D0
+#define D16 16 // P0.31 VBAT_ADC (Battery voltage)
+#define D17 17 // P1.03 GNSS_RESET
+#define D18 18 // P1.05 GNSS_ENABLE
+#define D19 19 // P0.14 BAT_READ
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Analog Pin Definitions
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+#define PIN_A0 0     // P0.02 Analog Input 0
+#define PIN_A1 1     // P0.03 Analog Input 1
+#define PIN_A2 2     // P0.28 Analog Input 2
+#define PIN_A3 3     // P0.29 Analog Input 3
+#define PIN_A4 4     // P0.04 Analog Input 4
+#define PIN_A5 5     // P0.05 Analog Input 5
+#define PIN_VBAT D16 // P0.31 Battery voltage sense
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Communication Interfaces
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  I2C Configuration
+#define HAS_WIRE 1
+#define PIN_WIRE_SDA D14 // P0.09
+#define PIN_WIRE_SCL D15 // P0.10
+#define WIRE_INTERFACES_COUNT 1
+#define I2C_NO_RESCAN
+
+static const uint8_t SDA = PIN_WIRE_SDA;
+static const uint8_t SCL = PIN_WIRE_SCL;
+// SPI Configuration (SX1262)
+
+#define SPI_INTERFACES_COUNT 1
+#define PIN_SPI_MISO 9  // P1.14 (D9)
+#define PIN_SPI_MOSI 10 // P1.15 (D10)
+#define PIN_SPI_SCK 8   // P1.13 (D8)
+
+// SX1262 LoRa Module Pins
+#define USE_SX1262
+#define SX126X_CS D4                 // Chip select
+#define SX126X_DIO1 D1               // Digital IO 1 (Interrupt)
+#define SX126X_BUSY D3               // Busy status
+#define SX126X_RESET D2              // Reset control
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8 // TCXO supply voltage
+#define SX126X_RXEN D5               // RX enable control
+#define SX126X_TXEN RADIOLIB_NC
+#define SX126X_DIO2_AS_RF_SWITCH // This Line is really necessary for SX1262  to work with RF switch or will loss TX power
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Power Management
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+#define BAT_READ                                                                                                                 \
+    D19 // P0_14 = 14  Reads battery voltage from divider on signal board. (PIN_VBAT is reading voltage divider on XIAO and is
+        // program pin 32 / or P0.31)
+#define BATTERY_SENSE_RESOLUTION_BITS 12
+#define ADC_MULTIPLIER 3.3
+#define BATTERY_PIN PIN_VBAT // PIN_A7
+#define AREF_VOLTAGE 3.3
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  GPS L76KB
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+#define GPS_L76K
+#ifdef GPS_L76K
+#define PIN_GPS_RX D6 // 44
+#define PIN_GPS_TX D7 // 43
+#define HAS_GPS 1
+#define GPS_BAUDRATE 9600
+#define GPS_THREAD_INTERVAL 50
+#define PIN_SERIAL1_RX PIN_GPS_TX
+#define PIN_SERIAL1_TX PIN_GPS_RX
+#define PIN_GPS_STANDBY D0
+#define GPS_EN D18 // P1.05
+#endif
+
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  On-board QSPI Flash
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+// On-board QSPI Flash
+#define PIN_QSPI_SCK (21)
+#define PIN_QSPI_CS (22)
+#define PIN_QSPI_IO0 (23)
+#define PIN_QSPI_IO1 (24)
+#define PIN_QSPI_IO2 (25)
+#define PIN_QSPI_IO3 (26)
+
+#define EXTERNAL_FLASH_DEVICES P25Q16H
+#define EXTERNAL_FLASH_USE_QSPI
+
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Compatibility Definitions
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+#ifdef __cplusplus
+extern "C" {
+#endif
+// Serial port placeholders
+
+#define PIN_SERIAL2_RX (-1)
+#define PIN_SERIAL2_TX (-1)
+#ifdef __cplusplus
+}
+#endif
+
+#endif //  _SEEED_SOLAR_NODE_H_
--- a/variants/seeed_wio_tracker_L1/platformio.ini
+++ b/variants/seeed_wio_tracker_L1/platformio.ini
@@ -0,0 +1,13 @@
+[env:seeed_wio_tracker_L1]
+board = seeed_wio_tracker_L1
+extends = nrf52840_base
+;board_level = extra
+build_flags = ${nrf52840_base.build_flags} 
+  -I $PROJECT_DIR/variants/seeed_wio_tracker_L1
+  -D  SEEED_WIO_TRACKER_L1
+  -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52
+board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/seeed_wio_tracker_L1>
+lib_deps =
+  ${nrf52840_base.lib_deps}
+debug_tool = jlink
--- a/variants/seeed_wio_tracker_L1/variant.cpp
+++ b/variants/seeed_wio_tracker_L1/variant.cpp
@@ -0,0 +1,96 @@
+/*
+ * variant.cpp - Digital pin mapping for TRACKER L1
+ *
+ * This file defines the pin mapping array that maps logical digital pins (D0-D17)
+ * to physical GPIO ports/pins on the Nordic nRF52 series microcontroller.
+ *
+ * Board: [Seeed Studio WIO TRACKER L1]
+ * Hardware Features:
+ *  - LoRa module (CS/SCK/MISO/MOSI control pins)
+ *  - GNSS module (TX/RX/Reset/Wakeup)
+ *  - User LEDs (D11-D12)
+ *  - User button (D13)
+ *  - Grove/NFC interface (D14-D15)
+ *  - Battery voltage monitoring (D16)
+ *
+ * Created [20250521]
+ * By [Dylan]
+ */
+
+#include "variant.h"
+#include "nrf.h"
+#include "wiring_constants.h"
+#include "wiring_digital.h"
+
+/**
+ * @brief Digital pin to GPIO port/pin mapping table
+ *
+ * Format: Logical Pin (Dx) -> nRF Port.Pin (Px.xx)
+ *
+ */
+
+extern "C" {
+const uint32_t g_ADigitalPinMap[] = {
+    // D0 .. D10 - Peripheral control pins
+    41, // D0  P1.09    GNSS_WAKEUP
+    7,  // D1  P0.07     LORA_DIO1
+    39, // D2  P1,07     LORA_RESET
+    42, // D3  P1.10     LORA_BUSY
+    46, // D4  P1.14 (A4/SDA) LORA_CS
+    40, // D5  P1.08 (A5/SCL) LORA_SW
+    27, // D6  P0.27 (UART_TX) GNSS_TX
+    26, // D7  P0.26 (UART_RX) GNSS_RX
+    30, // D8  P0.30 (SPI_SCK) LORA_SCK
+    3,  // D9  P0.3 (SPI_MISO) LORA_MISO
+    28, // D10 P0.28 (SPI_MOSI) LORA_MOSI
+
+    // D11-D12 - LED outputs
+    33, // D11 P1.1 User LED
+    // Buzzzer
+    32, // D12 P1.0 Buzzer
+
+    // D13 - User input
+    8, // D13 P0.08 User Button
+
+    // D14-D15 - Grove interface
+    6, // D14 P0.06 OLED SDA
+    5, // D15 P0.05 OLED SCL
+
+    // D16 - Battery voltage ADC input
+    31, // D16 P0.31 VBAT_ADC
+    // GROVE
+    0, // D17 P0.00 GROVESDA
+    1, // D18 P0.01 GROVESCL
+
+    // FLASH
+    21, // D19 P0.21 (QSPI_SCK)
+    25, // D20 P0.25 (QSPI_CSN)
+    20, // D21 P0.20 (QSPI_SIO_0 DI)
+    24, // D22 P0.24 (QSPI_SIO_1 DO)
+    22, // D23 P0.22 (QSPI_SIO_2 WP)
+    23, // D24 P0.23 (QSPI_SIO_3 HOLD)
+
+    36, // D25 TB_UP
+    12, // D26 TB_DOWN
+    11, // D27 TB_LEFT
+    35, // D28 TB_RIGHT
+    37, // D29 TB_PRESS
+    4,  // D30 BAT_CTL
+};
+}
+
+void initVariant()
+{
+    pinMode(PIN_QSPI_CS, OUTPUT);
+    digitalWrite(PIN_QSPI_CS, HIGH);
+    // This setup is crucial for ensuring low power consumption and proper initialization of the hardware components.
+    // VBAT_ENABLE
+    pinMode(BAT_READ, OUTPUT);
+    digitalWrite(BAT_READ, HIGH);
+
+    pinMode(PIN_LED1, OUTPUT);
+    digitalWrite(PIN_LED1, LOW);
+    pinMode(PIN_LED2, OUTPUT);
+    digitalWrite(PIN_LED2, LOW);
+    pinMode(PIN_LED2, OUTPUT);
+}
--- a/variants/seeed_wio_tracker_L1/variant.h
+++ b/variants/seeed_wio_tracker_L1/variant.h
@@ -0,0 +1,184 @@
+#ifndef _SEEED_TRACKER_L1_H_
+#define _SEEED_TRACKER_L1_H_
+#include "WVariant.h"
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Clock Configuration
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+#define VARIANT_MCK (64000000ul) // Master clock frequency
+#define USE_LFXO                 // 32.768kHz crystal for LFCLK
+
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Pin Capacity Definitions
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+#define PINS_COUNT (33u)       // Total GPIO pins
+#define NUM_DIGITAL_PINS (33u) // Digital I/O pins
+#define NUM_ANALOG_INPUTS (8u) // Analog inputs (A0-A5 + VBAT + AREF)
+#define NUM_ANALOG_OUTPUTS (0u)
+
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  LED Configuration
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  LEDs
+//  LEDs
+#define PIN_LED1 (11) // LED        P1.15
+#define PIN_LED2 (12) //
+
+#define LED_BUILTIN PIN_LED1
+#define LED_CONN PIN_LED2
+
+#define LED_GREEN PIN_LED1
+#define LED_BLUE PIN_LED2
+// #define LED_PIN PIN_LED2
+#define LED_STATE_ON 1 // State when LED is litted
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Button Configuration
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+#define BUTTON_PIN D13 // This is the Program Button
+// #define BUTTON_NEED_PULLUP   1
+#define BUTTON_ACTIVE_LOW true
+#define BUTTON_ACTIVE_PULLUP false
+
+#define BUTTON_PIN_TOUCH 13 // Touch button
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Digital Pin Mapping (D0-D10)
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+#define D0 0   // P1.06 GNSS_WAKEUP/IO0
+#define D1 1   // P0.07 LORA_DIO1
+#define D2 2   // P1.07 LORA_RESET
+#define D3 3   // P1.10 LORA_BUSY
+#define D4 4   // P1.14 LORA_CS
+#define D5 5   // P1.08 LORA_SW
+#define D6 6   // P0.27 GNSS_TX
+#define D7 7   // P0.26 GNSS_RX
+#define D8 8   // P0.30 SPI_SCK
+#define D9 9   // P0.03 SPI_MISO
+#define D10 10 // P0.28 SPI_MOSI
+#define D12 12 // P1.00 Buzzer
+#define D13 13 // P0.08 User Button
+#define D14 14 // P0.05 OLED SCL
+#define D15 15 // P0.06 OLED SDA
+#define D16 16 // P0.31 VBAT_ADC
+#define D17 17 // P0.00 GROVE SDA
+#define D18 18 // P0.01 GROVE_SCL
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Analog Pin Definitions
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+#define PIN_A0 0     // P0.02 Analog Input 0
+#define PIN_A1 1     // P0.03 Analog Input 1
+#define PIN_A2 2     // P0.28 Analog Input 2
+#define PIN_A3 3     // P0.29 Analog Input 3
+#define PIN_A4 4     // P0.04 Analog Input 4
+#define PIN_A5 5     // P0.05 Analog Input 5
+#define PIN_VBAT D16 // P0.31 Battery voltage sense
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Communication Interfaces
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  I2C Configuration
+#define HAS_WIRE 1
+#define PIN_WIRE_SDA D14 // P0.09
+#define PIN_WIRE_SCL D15 // P0.10
+#define WIRE_INTERFACES_COUNT 1
+#define I2C_NO_RESCAN
+
+static const uint8_t SDA = PIN_WIRE_SDA;
+static const uint8_t SCL = PIN_WIRE_SCL;
+
+#define HAS_SCREEN 1
+#define USE_SSD1306 1
+
+// SPI Configuration (SX1262)
+
+#define SPI_INTERFACES_COUNT 1
+#define PIN_SPI_MISO 9  // P0.03 (D9)
+#define PIN_SPI_MOSI 10 // P0.28 (D10)
+#define PIN_SPI_SCK 8   // P0.30 (D8)
+
+// SX1262 LoRa Module Pins
+#define USE_SX1262
+#define SX126X_CS D4                 // Chip select
+#define SX126X_DIO1 D1               // Digital IO 1 (Interrupt)
+#define SX126X_BUSY D3               // Busy status
+#define SX126X_RESET D2              // Reset control
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8 // TCXO supply voltage
+#define SX126X_RXEN D5               // RX enable control
+#define SX126X_TXEN RADIOLIB_NC
+#define SX126X_DIO2_AS_RF_SWITCH // This Line is really necessary for SX1262  to work with RF switch or will loss TX power
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Power Management
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+#define BAT_READ 30 // D30 = P0.04  Reads battery voltage from divider on signal board.
+#define BATTERY_SENSE_RESOLUTION_BITS 12
+#define ADC_MULTIPLIER 2.0
+#define BATTERY_PIN PIN_VBAT // PIN_A7
+#define AREF_VOLTAGE 3.6
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  GPS L76KB
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+#define GPS_L76K
+#ifdef GPS_L76K
+#define PIN_GPS_RX D6 // P0.26
+#define PIN_GPS_TX D7
+#define HAS_GPS 1
+#define GPS_BAUDRATE 9600
+#define GPS_THREAD_INTERVAL 50
+#define PIN_SERIAL1_RX PIN_GPS_TX
+#define PIN_SERIAL1_TX PIN_GPS_RX
+
+#define GPS_RX_PIN PIN_GPS_TX
+#define GPS_TX_PIN PIN_GPS_RX
+#define PIN_GPS_STANDBY D0
+
+// #define GPS_DEBUG
+//  #define GPS_EN D18 // P1.05
+#endif
+
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  On-board QSPI Flash
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+// On-board QSPI Flash
+#define PIN_QSPI_SCK (21)
+#define PIN_QSPI_CS (22)
+#define PIN_QSPI_IO0 (23)
+#define PIN_QSPI_IO1 (24)
+#define PIN_QSPI_IO2 (25)
+#define PIN_QSPI_IO3 (26)
+
+#define EXTERNAL_FLASH_DEVICES P25Q16H
+#define EXTERNAL_FLASH_USE_QSPI
+
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Buzzer
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+// Buzzer
+
+#define PIN_BUZZER D12 // P1.00, pwm output
+
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  joystick
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+
+#define CANNED_MESSAGE_MODULE_ENABLE 1
+
+// trackball
+#define HAS_TRACKBALL 1
+#define TB_UP 25
+#define TB_DOWN 26
+#define TB_LEFT 27
+#define TB_RIGHT 28
+#define TB_PRESS 29
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+//  Compatibility Definitions
+// ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━
+#ifdef __cplusplus
+extern "C" {
+#endif
+// Serial port placeholders
+
+#define PIN_SERIAL2_RX (-1)
+#define PIN_SERIAL2_TX (-1)
+#ifdef __cplusplus
+}
+#endif
+
+#endif //  _SEEED_SOLAR_NODE_H_
--- a/variants/seeed_xiao_nrf52840_kit/platformio.ini
+++ b/variants/seeed_xiao_nrf52840_kit/platformio.ini
@@ -3,7 +3,6 @@
 extends = nrf52840_base
 board = xiao_ble_sense
 build_flags = ${nrf52840_base.build_flags} -Ivariants/seeed_xiao_nrf52840_kit -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52  -DSEEED_XIAO_NRF52840_KIT
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/seeed_xiao_nrf52840_kit>
 lib_deps = 
--- a/variants/seeed_xiao_nrf52840_kit/variant.cpp
+++ b/variants/seeed_xiao_nrf52840_kit/variant.cpp
@@ -34,9 +34,9 @@ const uint32_t g_ADigitalPinMap[] = {
    11, // D18 is P0.11 (6D_INT1)

    // MIC
-    42, // 17,//42,  // D19 is P1.10 (MIC_PWR)
-    32, // 26,//32,  // D20 is P1.00 (PDM_CLK)
-    16, // 25,//16,  // D21 is P0.16 (PDM_DATA)
+    42, // D19 is P1.10 (MIC_PWR)
+    32, // D20 is P1.00 (PDM_CLK)
+    16, // D21 is P0.16 (PDM_DATA)

    // BQ25100
    13, // D22 is P0.13 (HICHG)
@@ -80,13 +80,17 @@ const uint32_t g_ADigitalPinMap[] = {

 void initVariant()
 {
-    // LED1 & LED2
-    pinMode(21, OUTPUT);
-    digitalWrite(21, LOW);
-    // LED1 & LED2
-    pinMode(22, OUTPUT);
-    digitalWrite(22, LOW);
+    // Set BQ25101 ISET to 100mA instead of 50mA
+    pinMode(HICHG, OUTPUT);
+    digitalWrite(HICHG, LOW);

-    pinMode(PIN_WIRE_SDA, INPUT_PULLUP);
-    pinMode(PIN_WIRE_SCL, INPUT_PULLUP);
-}
+    // LEDs
+    pinMode(PIN_LED1, OUTPUT);
+    ledOff(PIN_LED1);
+
+    pinMode(PIN_LED2, OUTPUT);
+    ledOff(PIN_LED2);
+
+    pinMode(PIN_LED3, OUTPUT);
+    ledOff(PIN_LED3);
+}
--- a/variants/seeed_xiao_nrf52840_kit/variant.h
+++ b/variants/seeed_xiao_nrf52840_kit/variant.h
@@ -19,31 +19,12 @@ extern "C" {

 #define PINS_COUNT (33)
 #define NUM_DIGITAL_PINS (33)
-#define NUM_ANALOG_INPUTS (8) // A6 is used for battery, A7 is analog reference
+#define NUM_ANALOG_INPUTS (8)
 #define NUM_ANALOG_OUTPUTS (0)

-// LEDs
-
-#define LED_RED 11
-#define LED_BLUE 12
-#define LED_GREEN 13
-
-#define PIN_LED1 LED_GREEN
-#define PIN_LED2 LED_BLUE
-#define PIN_LED3 LED_RED
-
-#define PIN_LED PIN_LED1
-#define LED_PWR (PINS_COUNT)
-
-#define LED_BUILTIN PIN_LED
-
-#define LED_STATE_ON 1 // State when LED is lit
-
 /*
- * Buttons
+ * Digital Pins
 */
-
-// Digital PINs
 #define D0 (0ul)
 #define D1 (1ul)
 #define D2 (2ul)
@@ -56,15 +37,6 @@ extern "C" {
 #define D9 (9ul)
 #define D10 (10ul)

-/*Due to the lack of pins,and have to make sure gps standby work well we have temporarily removed the button.
-There are some technical solutions that can solve this problem,
-and we are currently exploring and researching them*/
-
-// #define BUTTON_PIN D0 // This is the Program Button
-// // #define BUTTON_NEED_PULLUP   1
-// #define BUTTON_ACTIVE_LOW true
-// #define BUTTON_ACTIVE_PULLUP false
-
 /*
 * Analog pins
 */
@@ -85,6 +57,38 @@ static const uint8_t A4 = PIN_A4;
 static const uint8_t A5 = PIN_A5;
 #define ADC_RESOLUTION 12

+/*
+ * LEDs
+ */
+#define LED_STATE_ON (0) // RGB LED is common anode
+#define LED_RED (11)
+#define LED_GREEN (13)
+#define LED_BLUE (12)
+
+#define PIN_LED1 LED_GREEN // PIN_LED1 is used in src/platform/nrf52/architecture.h to define LED_PIN
+#define PIN_LED2 LED_BLUE
+#define PIN_LED3 LED_RED
+
+#define LED_BUILTIN LED_RED // LED_BUILTIN is used by framework-arduinoadafruitnrf52 to indicate flash writes
+
+#define LED_PWR LED_RED
+#define USER_LED LED_BLUE
+
+/*
+ * Buttons
+ */
+
+/*
+ *  D0 is shared with PIN_GPS_STANDBY on the L76K GNSS Module.
+ *  There are some technical solutions that can solve this problem, and we are
+ *  currently exploring and researching them.
+ */
+
+// #define BUTTON_PIN D0
+
+/*
+ * Serial Interfaces
+ */
 #define PIN_SERIAL2_RX (-1)
 #define PIN_SERIAL2_TX (-1)

@@ -102,11 +106,9 @@ static const uint8_t MOSI = PIN_SPI_MOSI;
 static const uint8_t MISO = PIN_SPI_MISO;
 static const uint8_t SCK = PIN_SPI_SCK;

-// supported modules list
 #define USE_SX1262

-// common pinouts for SX126X modules
-
+// Pinout for SX126X
 #define SX126X_CS D4
 #define SX126X_DIO1 D1
 #define SX126X_BUSY D3
@@ -114,23 +116,26 @@ static const uint8_t SCK = PIN_SPI_SCK;

 #define SX126X_TXEN RADIOLIB_NC

-#define SX126X_RXEN D4
-#define SX126X_DIO2_AS_RF_SWITCH // DIO2 is used to control the RF switch really necessary!!!
+#define SX126X_RXEN D5           // This is used to control the RX side of the RF switch
+#define SX126X_DIO2_AS_RF_SWITCH // DIO2 is used to control the TX side of the RF switch
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8

 /*
 * Wire Interfaces
 */
-
 #define I2C_NO_RESCAN           // I2C is a bit finicky, don't scan too much
 #define WIRE_INTERFACES_COUNT 1 // 2

-#define PIN_WIRE_SDA (24) // change to use the correct pins if needed
-#define PIN_WIRE_SCL (25) // change to use the correct pins if needed
+// LSM6DS3TR on XIAO nRF52840 Series
+#define PIN_WIRE_SDA (17)
+#define PIN_WIRE_SCL (16)

 static const uint8_t SDA = PIN_WIRE_SDA;
 static const uint8_t SCL = PIN_WIRE_SCL;

+/*
+ * GPS
+ */
 // GPS L76KB
 #define GPS_L76K
 #ifdef GPS_L76K
@@ -144,20 +149,18 @@ static const uint8_t SCL = PIN_WIRE_SCL;
 #define PIN_GPS_STANDBY D0
 #endif

-// Battery
+/*
+ * Battery
+ */
+#define BATTERY_PIN PIN_VBAT      // P0.31: VBAT voltage divider
+#define ADC_MULTIPLIER (3)        // ... R17=1M, R18=510k
+#define ADC_CTRL VBAT_ENABLE      // P0.14: VBAT voltage divider
+#define ADC_CTRL_ENABLED LOW      // ... sink
+#define EXT_CHRG_DETECT (23)      // P0.17: Charge LED
+#define EXT_CHRG_DETECT_VALUE LOW // ... BQ25101 ~CHG indicates charging
+#define HICHG (22)                // P0.13: BQ25101 ISET 100mA instead of 50mA

-#define BAT_READ                                                                                                                 \
-    14 // P0_14 = 14  Reads battery voltage from divider on signal board. (PIN_VBAT is reading voltage divider on XIAO and is
-       // program pin 32 / or P0.31)
-#define BATTERY_SENSE_RESOLUTION_BITS 10
-#define CHARGE_LED 23 // P0_17 = 17  D23   YELLOW CHARGE LED
-#define HICHG 22      // P0_13 = 13  D22   Charge-select pin for Lipo for 100 mA instead of default 50mA charge
-
-// The battery sense is hooked to pin A0 (5)
-#define BATTERY_PIN PIN_VBAT // PIN_A0
-
-// ratio of voltage divider = 3.0 (R17=1M, R18=510k)
-#define ADC_MULTIPLIER 3 // 3.0 + a bit for being optimistic
+#define BATTERY_SENSE_RESOLUTION_BITS (10)

 #ifdef __cplusplus
 }
--- a/variants/senselora_rp2040/platformio.ini
+++ b/variants/senselora_rp2040/platformio.ini
@@ -9,6 +9,5 @@ build_flags = ${rp2040_base.build_flags}
  -DSENSELORA_RP2040
  -Ivariants/senselora_rp2040
  -DDEBUG_RP2040_PORT=Serial
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
 lib_deps =
  ${rp2040_base.lib_deps}
--- a/variants/t-deck/variant.h
+++ b/variants/t-deck/variant.h
@@ -31,6 +31,7 @@
 #define TOUCH_I2C_PORT 0
 #define TOUCH_SLAVE_ADDRESS 0x5D // GT911

+#define USE_POWERSAVE
 #define SLEEP_TIME 120

 #ifndef HAS_TFT
--- a/variants/t-echo/nicheGraphics.h
+++ b/variants/t-echo/nicheGraphics.h
@@ -16,18 +16,17 @@
 #include "graphics/niche/InkHUD/Applets/User/RecentsList/RecentsListApplet.h"
 #include "graphics/niche/InkHUD/Applets/User/ThreadedMessage/ThreadedMessageApplet.h"

-// #include "graphics/niche/InkHUD/Applets/Examples/BasicExample/BasicExampleApplet.h"
-// #include "graphics/niche/InkHUD/Applets/Examples/NewMsgExample/NewMsgExampleApplet.h"
-
 // Shared NicheGraphics components
 // --------------------------------
 #include "graphics/niche/Drivers/Backlight/LatchingBacklight.h"
 #include "graphics/niche/Drivers/EInk/GDEY0154D67.h"
 #include "graphics/niche/Inputs/TwoButton.h"

-#include "graphics/niche/Fonts/FreeSans6pt7b.h"
-#include "graphics/niche/Fonts/FreeSans6pt8bCyrillic.h"
-#include <Fonts/FreeSans9pt7b.h>
+// Special case - fix T-Echo's touch button
+// ----------------------------------------
+// On a handful of T-Echos, LoRa TX triggers the capacitive touch
+// To avoid this, we lockout the button during TX
+#include "mesh/RadioLibInterface.h"

 void setupNicheGraphics()
 {
@@ -36,37 +35,30 @@ void setupNicheGraphics()
    // SPI
    // -----------------------------

-    // For NRF52 platforms, SPI pins are defined in variant.h, not passed to begin()
-    SPIClass *inkSPI = &SPI1;
-    inkSPI->begin();
+    // For NRF52 platforms, SPI pins are defined in variant.h
+    SPI1.begin();

-    // Driver
+    // E-Ink Driver
    // -----------------------------

-    // Use E-Ink driver
    Drivers::EInk *driver = new Drivers::GDEY0154D67;
-    driver->begin(inkSPI, PIN_EINK_DC, PIN_EINK_CS, PIN_EINK_BUSY, PIN_EINK_RES);
+    driver->begin(&SPI1, PIN_EINK_DC, PIN_EINK_CS, PIN_EINK_BUSY, PIN_EINK_RES);

    // InkHUD
    // ----------------------------

    InkHUD::InkHUD *inkhud = InkHUD::InkHUD::getInstance();

-    // Set the driver
+    // Set the E-Ink driver
    inkhud->setDriver(driver);

    // Set how many FAST updates per FULL update
    // Set how unhealthy additional FAST updates beyond this number are
    inkhud->setDisplayResilience(20, 1.5);

-    // Prepare fonts
-    InkHUD::Applet::fontLarge = InkHUD::AppletFont(FreeSans9pt7b);
-    InkHUD::Applet::fontSmall = InkHUD::AppletFont(FreeSans6pt7b);
-    /*
-    // Font localization demo: Cyrillic
-    InkHUD::Applet::fontSmall = InkHUD::AppletFont(FreeSans6pt8bCyrillic);
-    InkHUD::Applet::fontSmall.addSubstitutionsWin1251();
-    */
+    // Select fonts
+    InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1252;
+    InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252;

    // Customize default settings
    inkhud->persistence->settings.userTiles.maxCount = 2;              // Two applets side-by-side
@@ -74,22 +66,20 @@ void setupNicheGraphics()
    inkhud->persistence->settings.optionalFeatures.batteryIcon = true; // Device definitely has a battery
    inkhud->persistence->settings.optionalMenuItems.backlight = true;  // Until proves capacitive button works by touching it

-    // Setup backlight
-    // Note: AUX button behavior configured further down
+    // Setup backlight controller
+    // Note: AUX button attached further down
    Drivers::LatchingBacklight *backlight = Drivers::LatchingBacklight::getInstance();
    backlight->setPin(PIN_EINK_EN);

    // Pick applets
    // Note: order of applets determines priority of "auto-show" feature
    inkhud->addApplet("All Messages", new InkHUD::AllMessageApplet, true, true); // Activated, autoshown
-    inkhud->addApplet("DMs", new InkHUD::DMApplet);
-    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));
-    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));
-    inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true); // Activated
-    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);
-    inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0); // Activated, no autoshow, default on tile 0
-    // inkhud->addApplet("Basic", new InkHUD::BasicExampleApplet);
-    // inkhud->addApplet("NewMsg", new InkHUD::NewMsgExampleApplet);
+    inkhud->addApplet("DMs", new InkHUD::DMApplet);                              // -
+    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));        // -
+    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));        // -
+    inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true);           // Activated
+    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);            // -
+    inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0);         // Activated, no autoshow, default on tile 0

    // Start running InkHUD
    inkhud->begin();
@@ -99,29 +89,36 @@ void setupNicheGraphics()

    Inputs::TwoButton *buttons = Inputs::TwoButton::getInstance(); // Shared NicheGraphics component

-    // (To improve code readability only)
-    constexpr uint8_t MAIN_BUTTON = 0;
-    constexpr uint8_t TOUCH_BUTTON = 1;
+    // #0: Main User Button
+    buttons->setWiring(0, Inputs::TwoButton::getUserButtonPin());
+    buttons->setTiming(0, 75, 500);
+    buttons->setHandlerShortPress(0, [inkhud]() { inkhud->shortpress(); });
+    buttons->setHandlerLongPress(0, [inkhud]() { inkhud->longpress(); });

-    // Setup the main user button
-    buttons->setWiring(MAIN_BUTTON, Inputs::TwoButton::getUserButtonPin());
-    buttons->setTiming(MAIN_BUTTON, 75, 500);
-    buttons->setHandlerShortPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->shortpress(); });
-    buttons->setHandlerLongPress(MAIN_BUTTON, []() { InkHUD::InkHUD::getInstance()->longpress(); });
-
-    // Setup the capacitive touch button
+    // #1: Aux Button (Capacitive Touch Button)
    // - short: momentary backlight
    // - long: latch backlight on
-    buttons->setWiring(TOUCH_BUTTON, PIN_BUTTON_TOUCH, LOW);
-    buttons->setTiming(TOUCH_BUTTON, 50, 5000); // 5 seconds before latch - limited by T-Echo's capacitive touch IC
-    buttons->setHandlerDown(TOUCH_BUTTON, [backlight]() {
-        backlight->peek();
-        InkHUD::InkHUD::getInstance()->persistence->settings.optionalMenuItems.backlight =
-            false; // We've proved user still has the button. No need to make backlight togglable via the menu.
-    });
-    buttons->setHandlerLongPress(TOUCH_BUTTON, [backlight]() { backlight->latch(); });
-    buttons->setHandlerShortPress(TOUCH_BUTTON, [backlight]() { backlight->off(); });
+    buttons->setWiring(1, PIN_BUTTON_TOUCH);
+    buttons->setTiming(1, 50, 5000); // 5 seconds before latch - limited by T-Echo's capacitive touch IC

+    buttons->setHandlerDown(1, [inkhud, backlight]() {
+        // Discard the button press if radio is active
+        // Rare hardware fault: LoRa activity triggers touch button
+        if (!RadioLibInterface::instance || RadioLibInterface::instance->isSending())
+            return;
+
+        // Backlight on (while held)
+        backlight->peek();
+
+        // Handler has run, which confirms touch button wasn't removed as part of DIY build.
+        // No longer need the fallback backlight toggle in menu.
+        inkhud->persistence->settings.optionalMenuItems.backlight = false;
+    });
+
+    buttons->setHandlerLongPress(1, [backlight]() { backlight->latch(); });
+    buttons->setHandlerShortPress(1, [backlight]() { backlight->off(); });
+
+    // Begin handling button events
    buttons->start();
 }

--- a/variants/t-echo/platformio.ini
+++ b/variants/t-echo/platformio.ini
@@ -8,7 +8,6 @@ debug_tool = jlink
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = ${nrf52840_base.build_flags} -Ivariants/t-echo
  -DGPS_POWER_TOGGLE
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
  -DEINK_DISPLAY_MODEL=GxEPD2_154_D67
  -DEINK_WIDTH=200
  -DEINK_HEIGHT=200
@@ -33,7 +32,6 @@ build_flags =
  ${nrf52840_base.build_flags}
  ${inkhud.build_flags}
  -I variants/t-echo
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = 
  ${nrf52_base.build_src_filter} 
  ${inkhud.build_src_filter}
--- a/variants/t-watch-s3/platformio.ini
+++ b/variants/t-watch-s3/platformio.ini
@@ -3,7 +3,7 @@
 extends = esp32s3_base
 board = t-watch-s3
 board_check = true
-board_build.partitions = default_8MB.csv
+board_build.partitions = default_16MB.csv
 upload_protocol = esptool

 build_flags = ${esp32_base.build_flags} 
--- a/variants/t-watch-s3/variant.h
+++ b/variants/t-watch-s3/variant.h
@@ -24,7 +24,9 @@
 #define SCREEN_TOUCH_USE_I2C1
 #define TOUCH_I2C_PORT 1
 #define TOUCH_SLAVE_ADDRESS 0x38
+#define WAKE_ON_TOUCH

+#define USE_POWERSAVE
 #define SLEEP_TIME 180

 #define I2C_SDA1 39 // Used for capacitive touch
--- a/variants/tlora_c6/platformio.ini
+++ b/variants/tlora_c6/platformio.ini
@@ -7,4 +7,3 @@ build_flags =
  -I variants/tlora_c6
  -DARDUINO_USB_CDC_ON_BOOT=1
  -DARDUINO_USB_MODE=1
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/esp32c3"
--- a/variants/tlora_t3s3_epaper/nicheGraphics.h
+++ b/variants/tlora_t3s3_epaper/nicheGraphics.h
@@ -0,0 +1,88 @@
+#pragma once
+
+#include "configuration.h"
+
+#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
+
+// InkHUD-specific components
+// ---------------------------
+#include "graphics/niche/InkHUD/InkHUD.h"
+
+// Applets
+#include "graphics/niche/InkHUD/Applets/User/AllMessage/AllMessageApplet.h"
+#include "graphics/niche/InkHUD/Applets/User/DM/DMApplet.h"
+#include "graphics/niche/InkHUD/Applets/User/Heard/HeardApplet.h"
+#include "graphics/niche/InkHUD/Applets/User/Positions/PositionsApplet.h"
+#include "graphics/niche/InkHUD/Applets/User/RecentsList/RecentsListApplet.h"
+#include "graphics/niche/InkHUD/Applets/User/ThreadedMessage/ThreadedMessageApplet.h"
+
+// Shared NicheGraphics components
+// --------------------------------
+#include "graphics/niche/Drivers/EInk/DEPG0213BNS800.h"
+#include "graphics/niche/Inputs/TwoButton.h"
+
+void setupNicheGraphics()
+{
+    using namespace NicheGraphics;
+
+    // SPI
+    // -----------------------------
+
+    // Display is connected to HSPI
+    SPIClass *hspi = new SPIClass(HSPI);
+    hspi->begin(PIN_EINK_SCLK, -1, PIN_EINK_MOSI, PIN_EINK_CS);
+
+    // E-Ink Driver
+    // -----------------------------
+
+    Drivers::EInk *driver = new Drivers::DEPG0213BNS800;
+    driver->begin(hspi, PIN_EINK_DC, PIN_EINK_CS, PIN_EINK_BUSY, PIN_EINK_RES);
+
+    // InkHUD
+    // ----------------------------
+
+    InkHUD::InkHUD *inkhud = InkHUD::InkHUD::getInstance();
+
+    // Set the driver
+    inkhud->setDriver(driver);
+
+    // Set how many FAST updates per FULL update
+    // Set how unhealthy additional FAST updates beyond this number are
+    inkhud->setDisplayResilience(15, 1.5);
+
+    // Select fonts
+    InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1252;
+    InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252;
+
+    // Customize default settings
+    inkhud->persistence->settings.userTiles.maxCount = 2; // How many tiles can the display handle?
+    inkhud->persistence->settings.rotation = 3;           // 270 degrees clockwise
+    inkhud->persistence->settings.userTiles.count = 1;    // One tile only by default, keep things simple for new users
+
+    // Pick applets
+    // Note: order of applets determines priority of "auto-show" feature
+    inkhud->addApplet("All Messages", new InkHUD::AllMessageApplet, true, true); // Activated, autoshown
+    inkhud->addApplet("DMs", new InkHUD::DMApplet);                              // -
+    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));        // -
+    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));        // -
+    inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true);           // Activated
+    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);            // -
+    inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0);         // Activated, not autoshown, default on tile 0
+
+    // Start running InkHUD
+    inkhud->begin();
+
+    // Buttons
+    // --------------------------
+
+    Inputs::TwoButton *buttons = Inputs::TwoButton::getInstance(); // Shared NicheGraphics component
+
+    // Setup the main user button
+    buttons->setWiring(0, Inputs::TwoButton::getUserButtonPin(), true);
+    buttons->setHandlerShortPress(0, [inkhud]() { inkhud->shortpress(); });
+    buttons->setHandlerLongPress(0, [inkhud]() { inkhud->longpress(); });
+
+    buttons->start();
+}
+
+#endif
--- a/variants/tlora_t3s3_epaper/platformio.ini
+++ b/variants/tlora_t3s3_epaper/platformio.ini
@@ -7,6 +7,7 @@ upload_protocol = esptool
 build_flags = 
  ${esp32_base.build_flags} -D TLORA_T3S3_EPAPER -I variants/tlora_t3s3_epaper
  -DGPS_POWER_TOGGLE
+  -DUSE_EINK
  -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
  -DEINK_WIDTH=250
  -DEINK_HEIGHT=122
@@ -16,3 +17,21 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  https://github.com/meshtastic/GxEPD2/archive/b202ebfec6a4821e098cf7a625ba0f6f2400292d.zip
+
+[env:tlora-t3s3-epaper-inkhud]
+extends = esp32s3_base, inkhud
+board = tlora-t3s3-v1
+board_check = true
+upload_protocol = esptool
+build_src_filter =
+  ${esp32_base.build_src_filter}
+  ${inkhud.build_src_filter}
+build_flags =
+  ${esp32s3_base.build_flags}
+  ${inkhud.build_flags}
+  -I variants/tlora_t3s3_epaper
+  -D TLORA_T3S3_EPAPER
+  -D MAX_THREADS=40 ; Required if used with WiFi
+lib_deps =
+  ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX
+  ${esp32s3_base.lib_deps}
--- a/variants/tlora_t3s3_epaper/variant.h
+++ b/variants/tlora_t3s3_epaper/variant.h
@@ -2,7 +2,6 @@
 #define SDCARD_USE_SPI1

 // Display (E-Ink)
-#define USE_EINK
 #define PIN_EINK_CS 15
 #define PIN_EINK_BUSY 48
 #define PIN_EINK_DC 16
--- a/variants/tlora_v1/platformio.ini
+++ b/variants/tlora_v1/platformio.ini
@@ -3,4 +3,5 @@ board_level = extra
 extends = esp32_base
 board = ttgo-lora32-v1
 build_flags = 
-  ${esp32_base.build_flags} -D TLORA_V1 -I variants/tlora_v1
+  ${esp32_base.build_flags} -D TLORA_V1 -I variants/tlora_v1
+upload_speed = 115200
--- a/variants/tlora_v1_3/platformio.ini
+++ b/variants/tlora_v1_3/platformio.ini
@@ -3,4 +3,5 @@ board_level = extra
 extends = esp32_base
 board = ttgo-lora32-v1
 build_flags = 
-  ${esp32_base.build_flags} -D TLORA_V1_3 -I variants/tlora_v1_3
+  ${esp32_base.build_flags} -D TLORA_V1_3 -I variants/tlora_v1_3
+upload_speed = 115200
--- a/variants/tlora_v2_1_16/platformio.ini
+++ b/variants/tlora_v2_1_16/platformio.ini
@@ -4,4 +4,5 @@ board = ttgo-lora32-v21
 board_check = true
 build_flags = 
  ${esp32_base.build_flags} -D TLORA_V2_1_16 -I variants/tlora_v2_1_16
-  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
+  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
+upload_speed = 115200
--- a/variants/tlora_v2_1_16_tcxo/platformio.ini
+++ b/variants/tlora_v2_1_16_tcxo/platformio.ini
@@ -7,4 +7,5 @@ build_flags =
  -D TLORA_V2_1_16
  -I variants/tlora_v2_1_16
  -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
-  -D LORA_TCXO_GPIO=33
+  -D LORA_TCXO_GPIO=33
+upload_speed = 115200
--- a/variants/tracker-t1000-e/platformio.ini
+++ b/variants/tracker-t1000-e/platformio.ini
@@ -2,9 +2,12 @@
 extends = nrf52840_base
 board = tracker-t1000-e
 build_flags = ${nrf52840_base.build_flags} -Ivariants/tracker-t1000-e -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DTRACKER_T1000_E
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
  -DGPS_POWER_TOGGLE
  -DMESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR_EXTERNAL=1
+  -DMESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
+  -DMESHTASTIC_EXCLUDE_SCREEN=1
+  -DMESHTASTIC_EXCLUDE_DETECTIONSENSOR=1
+  -DMESHTASTIC_EXCLUDE_WIFI=1
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/tracker-t1000-e>
 lib_deps = 
@@ -12,4 +15,4 @@ lib_deps =
  https://github.com/meshtastic/QMA6100P_Arduino_Library/archive/14c900b8b2e4feaac5007a7e41e0c1b7f0841136.zip
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
-upload_protocol = nrfutil
+upload_protocol = nrfutil
--- a/variants/tracker-t1000-e/variant.h
+++ b/variants/tracker-t1000-e/variant.h
@@ -152,6 +152,8 @@ extern "C" {
 #define T1000X_NTC_PIN (0 + 31) // P0.31/AIN7
 #define T1000X_LUX_PIN (0 + 29) // P0.29/AIN5

+#define HAS_SCREEN 0
+
 #ifdef __cplusplus
 }
 #endif
@@ -160,4 +162,4 @@ extern "C" {
 *        Arduino objects - C++ only
 *----------------------------------------------------------------------------*/

-#endif // _VARIANT_TRACKER_T1000_E_
+#endif // _VARIANT_TRACKER_T1000_E_
--- a/variants/unphone/variant.h
+++ b/variants/unphone/variant.h
@@ -41,6 +41,9 @@
 #define USE_XPT2046 1
 #define TOUCH_CS 38

+#define USE_POWERSAVE
+#define SLEEP_TIME 180
+
 #define HAS_GPS                                                                                                                  \
    0 // the unphone doesn't have a gps module by default (though
      // GPS featherwing -- https://www.adafruit.com/product/3133
--- a/variants/wio-sdk-wm1110/platformio.ini
+++ b/variants/wio-sdk-wm1110/platformio.ini
@@ -10,7 +10,6 @@ extra_scripts =
 # Remove adafruit USB serial from the build (it is incompatible with using the ch340 serial chip on this board)
 build_unflags = ${nrf52840_base:build_unflags} -DUSBCON -DUSE_TINYUSB
 build_flags = ${nrf52840_base.build_flags} -Ivariants/wio-sdk-wm1110 -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DWIO_WM1110
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
  -DCFG_TUD_CDC=0
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
--- a/variants/wio-t1000-s/platformio.ini
+++ b/variants/wio-t1000-s/platformio.ini
@@ -4,7 +4,6 @@ extends = nrf52840_base
 board = wio-t1000-s
 board_level = extra
 build_flags = ${nrf52840_base.build_flags} -Ivariants/wio-t1000-s -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DWIO_WM1110
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/wio-t1000-s>
--- a/variants/wio-tracker-wm1110/platformio.ini
+++ b/variants/wio-tracker-wm1110/platformio.ini
@@ -3,7 +3,6 @@
 extends = nrf52840_base
 board = wio-tracker-wm1110
 build_flags = ${nrf52840_base.build_flags} -Ivariants/wio-tracker-wm1110 -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DWIO_WM1110
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
  -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/wio-tracker-wm1110>
--- a/variants/wiphone/variant.h
+++ b/variants/wiphone/variant.h
@@ -24,7 +24,7 @@
 // This board has no GPS or Screen for now
 #undef GPS_RX_PIN
 #undef GPS_TX_PIN
-#define NO_GPS
+#define NO_GPS 1
 #define HAS_GPS 0
 #define NO_SCREEN
 #define HAS_SCREEN 0
--- a/variants/xiao_ble/platformio.ini
+++ b/variants/xiao_ble/platformio.ini
@@ -4,7 +4,6 @@ extends = nrf52840_base
 board = xiao_ble_sense
 board_level = extra
 build_flags = ${nrf52840_base.build_flags} -Ivariants/xiao_ble -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -D EBYTE_E22 -DEBYTE_E22_900M30S -DPRIVATE_HW
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/xiao_ble>
 lib_deps = 
--- a/variants/xiao_ble/variant.cpp
+++ b/variants/xiao_ble/variant.cpp
@@ -52,4 +52,11 @@ const uint32_t g_ADigitalPinMap[] = {

    // VBAT
    31, // D32 is P0.10 (VBAT)
-};
+};
+
+void initVariant()
+{
+    // Set BQ25101 ISET to 100mA instead of 50mA
+    pinMode(HICHG, OUTPUT);
+    digitalWrite(HICHG, LOW);
+}
--- a/variants/xiao_ble/variant.h
+++ b/variants/xiao_ble/variant.h
@@ -145,12 +145,12 @@ static const uint8_t SCK = PIN_SPI_SCK;
 #ifdef EBYTE_E22_900M30S
 // 10dB PA gain and 30dB rated output; based on measurements from
 // https://github.com/S5NC/EBYTE_ESP32-S3/blob/main/E22-900M30S%20power%20output%20testing.txt
-#define REGULATORY_GAIN_LORA 7
+#define TX_GAIN_LORA 7
 #define SX126X_MAX_POWER 22
 #endif
 #ifdef EBYTE_E22_900M33S
 // 25dB PA gain and 33dB rated output; based on TX Power Curve from E22-900M33S_UserManual_EN_v1.0.pdf
-#define REGULATORY_GAIN_LORA 25
+#define TX_GAIN_LORA 25
 #define SX126X_MAX_POWER 8
 #endif
 #endif
@@ -189,9 +189,8 @@ static const uint8_t SCL = PIN_WIRE_SCL;

 // Battery

-#define BAT_READ                                                                                                                 \
-    14 // P0_14 = 14  Reads battery voltage from divider on signal board. (PIN_VBAT is reading voltage divider on XIAO and is
-       // program pin 32 / or P0.31)
+#define ADC_CTRL VBAT_ENABLE // P0.14: VBAT voltage divider
+#define ADC_CTRL_ENABLED LOW // ... sink
 #define BATTERY_SENSE_RESOLUTION_BITS 10
 #define CHARGE_LED 23 // P0_17 = 17  D23   YELLOW CHARGE LED
 #define HICHG 22      // P0_13 = 13  D22   Charge-select pin for Lipo for 100 mA instead of default 50mA charge