* NRF52BoardDCDC constructor chain fixes

nrf52: call nRFCrypto.begin()/end() only once

build.sh

@@ -34,6 +34,9 @@ $ sh build.sh build-repeater-firmwares
 Build all chat room server firmwares
 $ sh build.sh build-room-server-firmwares
 
+Build all kiss radio firmwares
+$ sh build.sh build-kiss-radio-firmwares
+
 Environment Variables:
   DISABLE_DEBUG=1: Disables all debug logging flags (MESH_DEBUG, MESH_PACKET_LOGGING, etc.)
                    If not set, debug flags from variant platformio.ini files are used.
@@ -242,6 +245,17 @@ build_room_server_firmwares() {
 
 }
 
+build_kiss_modem_firmwares() {
+
+#  # build specific kiss radio firmwares
+#  build_firmware "Heltec_v3_kiss_modem"
+#  build_firmware "RAK_4631_kiss_modem"
+
+  # build all room server firmwares
+  build_all_firmwares_by_suffix "_kiss_modem"
+
+}
+
 build_firmwares() {
   build_companion_firmwares
   build_repeater_firmwares
@@ -278,6 +292,8 @@ elif [[ $1 == "build-repeater-firmwares" ]]; then
   build_repeater_firmwares
 elif [[ $1 == "build-room-server-firmwares" ]]; then
   build_room_server_firmwares
+elif [[ $1 == "build-kiss-radio-firmwares" ]]; then
+  build_kiss_modem_firmwares
 elif [[ $1 == "get-companion-firmwares-to-build" ]]; then
   get_pio_envs_ending_with_string "_companion_radio_usb"
   get_pio_envs_ending_with_string "_companion_radio_ble"

src/Identity.cpp

@@ -27,11 +27,9 @@ bool Identity::verify(const uint8_t* sig, const uint8_t* message, int msg_len) c
   // needs much less, around 600-700bytes. The CC310 workspace is static, faster,
   // should save power at scale as well.
   static CRYS_ECEDW_TempBuff_t cc310_tmp;
-  nRFCrypto.begin();
   CRYSError_t rc = CRYS_ECEDW_Verify((uint8_t*)sig, CRYS_ECEDW_SIGNATURE_BYTES,
                                      (uint8_t*)pub_key, CRYS_ECEDW_MOD_SIZE_IN_BYTES,
                                      (uint8_t*)message, (size_t)msg_len, &cc310_tmp);
-  nRFCrypto.end();
   return rc == CRYS_OK;
 #elif 0
   // NOTE:  memory corruption bug was found in this function!!

src/Utils.cpp

@@ -24,9 +24,7 @@ uint32_t RNG::nextInt(uint32_t _min, uint32_t _max) {
 void Utils::sha256(uint8_t *hash, size_t hash_len, const uint8_t* msg, int msg_len) {
 #ifdef USE_CC310_HW_CRYPTO
   static CRYS_HASH_Result_t result;
-  nRFCrypto.begin();
   CRYS_HASH(CRYS_HASH_SHA256_mode, (uint8_t*)msg, (size_t)msg_len, result);
-  nRFCrypto.end();
   memcpy(hash, result, hash_len);
 #else
   SHA256 sha;
@@ -39,12 +37,10 @@ void Utils::sha256(uint8_t *hash, size_t hash_len, const uint8_t* frag1, int fra
 #ifdef USE_CC310_HW_CRYPTO
   static CRYS_HASHUserContext_t ctx;
   static CRYS_HASH_Result_t result;
-  nRFCrypto.begin();
   CRYS_HASH_Init(&ctx, CRYS_HASH_SHA256_mode);
   CRYS_HASH_Update(&ctx, (uint8_t*)frag1, (size_t)frag1_len);
   CRYS_HASH_Update(&ctx, (uint8_t*)frag2, (size_t)frag2_len);
   CRYS_HASH_Finish(&ctx, result);
-  nRFCrypto.end();
   memcpy(hash, result, hash_len);
 #else
   SHA256 sha;
@@ -62,7 +58,6 @@ int Utils::decrypt(const uint8_t* shared_secret, uint8_t* dest, const uint8_t* s
   const uint8_t* sp = src;
   size_t dummy_out = 0;
 
-  nRFCrypto.begin();
   SaSi_AesInit(&ctx, SASI_AES_DECRYPT, SASI_AES_MODE_ECB, SASI_AES_PADDING_NONE);
   SaSi_AesSetKey(&ctx, SASI_AES_USER_KEY, &keyData, sizeof(keyData));
   while (sp - src < src_len) {
@@ -71,7 +66,6 @@ int Utils::decrypt(const uint8_t* shared_secret, uint8_t* dest, const uint8_t* s
   }
   SaSi_AesFinish(&ctx, 0, NULL, 0, NULL, &dummy_out);
   SaSi_AesFree(&ctx);
-  nRFCrypto.end();
   return sp - src;
 #else
   AES128 aes;
@@ -95,7 +89,6 @@ int Utils::encrypt(const uint8_t* shared_secret, uint8_t* dest, const uint8_t* s
   uint8_t* dp = dest;
   size_t dummy_out = 0;
 
-  nRFCrypto.begin();
   SaSi_AesInit(&ctx, SASI_AES_ENCRYPT, SASI_AES_MODE_ECB, SASI_AES_PADDING_NONE);
   SaSi_AesSetKey(&ctx, SASI_AES_USER_KEY, &keyData, sizeof(keyData));
   while (src_len >= 16) {
@@ -110,7 +103,6 @@ int Utils::encrypt(const uint8_t* shared_secret, uint8_t* dest, const uint8_t* s
   }
   SaSi_AesFinish(&ctx, 0, NULL, 0, NULL, &dummy_out);
   SaSi_AesFree(&ctx);
-  nRFCrypto.end();
   return dp - dest;
 #else
   AES128 aes;
@@ -138,11 +130,9 @@ int Utils::encryptThenMAC(const uint8_t* shared_secret, uint8_t* dest, const uin
 #ifdef USE_CC310_HW_CRYPTO
   static CRYS_HMACUserContext_t hmac_ctx;
   static CRYS_HASH_Result_t hmac_result;
-  nRFCrypto.begin();
   CRYS_HMAC_Init(&hmac_ctx, CRYS_HASH_SHA256_mode, (uint8_t*)shared_secret, PUB_KEY_SIZE);
   CRYS_HMAC_Update(&hmac_ctx, dest + CIPHER_MAC_SIZE, enc_len);
   CRYS_HMAC_Finish(&hmac_ctx, hmac_result);
-  nRFCrypto.end();
   memcpy(dest, hmac_result, CIPHER_MAC_SIZE);
 #else
   SHA256 sha;
@@ -162,11 +152,9 @@ int Utils::MACThenDecrypt(const uint8_t* shared_secret, uint8_t* dest, const uin
   {
     static CRYS_HMACUserContext_t hmac_ctx;
     static CRYS_HASH_Result_t hmac_result;
-    nRFCrypto.begin();
     CRYS_HMAC_Init(&hmac_ctx, CRYS_HASH_SHA256_mode, (uint8_t*)shared_secret, PUB_KEY_SIZE);
     CRYS_HMAC_Update(&hmac_ctx, (uint8_t*)(src + CIPHER_MAC_SIZE), src_len - CIPHER_MAC_SIZE);
     CRYS_HMAC_Finish(&hmac_ctx, hmac_result);
-    nRFCrypto.end();
     memcpy(hmac, hmac_result, CIPHER_MAC_SIZE);
   }
 #else

src/helpers/NRF52Board.cpp

@@ -5,6 +5,10 @@
 #include <bluefruit.h>
 #include <nrf_soc.h>
 
+#ifdef USE_CC310_HW_CRYPTO
+#include <Adafruit_nRFCrypto.h>
+#endif
+
 static BLEDfu bledfu;
 
 static void connect_callback(uint16_t conn_handle) {
@@ -21,6 +25,11 @@ static void disconnect_callback(uint16_t conn_handle, uint8_t reason) {
 
 void NRF52Board::begin() {
   startup_reason = BD_STARTUP_NORMAL;
+
+  #ifdef USE_CC310_HW_CRYPTO
+    // CC310 TRNG is higher quality and environment-independent vs radio RSSI noise.
+    nRFCrypto.begin();
+  #endif
 }
 
 #ifdef NRF52_POWER_MANAGEMENT
@@ -352,6 +361,10 @@ void NRF52Board::shutdownPeripherals() {
     sensors.getLocationProvider()->stop();
   }
 
+#ifdef USE_CC310_HW_CRYPTO
+    nRFCrypto.end();
+#endif
+
   // Flush serial buffers
   Serial.flush();
   delay(100);

src/helpers/NRF52Board.h

@@ -31,7 +31,7 @@ class NRF52Board : public mesh::MainBoard {
 
 protected:
   uint8_t startup_reason;
-  char *ota_name;
+  const char *ota_name;
 
 #ifdef NRF52_POWER_MANAGEMENT
   uint32_t reset_reason;              // RESETREAS register value
@@ -45,7 +45,7 @@ protected:
 #endif
 
 public:
-  NRF52Board(char *otaname) : ota_name(otaname) {}
+  NRF52Board(const char *otaname) : ota_name(otaname) {}
   virtual void begin();
   virtual uint8_t getStartupReason() const override { return startup_reason; }
   virtual float getMCUTemperature() override;
@@ -73,9 +73,11 @@ public:
  * hardware requirements are met, this subclass can be used to enable the DC/DC
  * regulator.
  */
-class NRF52BoardDCDC : virtual public NRF52Board {
+class NRF52BoardDCDC : public NRF52Board {
 public:
-  NRF52BoardDCDC() {}
+  NRF52BoardDCDC() : NRF52Board(NULL) {}
+  NRF52BoardDCDC(const char *otaname) : NRF52Board(otaname) {}
+
   virtual void begin() override;
 };
 #endif

src/helpers/radiolib/CustomLR1110Wrapper.h

@@ -19,7 +19,6 @@ public:
     ((CustomLR1110 *)_radio)->setMaxPayloadMillis(pm.payloadMillis);
   }
 
-  void doResetAGC() override { lr11x0ResetAGC((LR11x0 *)_radio, ((CustomLR1110 *)_radio)->getFreqMHz()); }
   bool isReceivingPacket() override {
     return ((CustomLR1110 *)_radio)->isReceiving();
   }
@@ -50,4 +49,6 @@ public:
   bool getRxBoostedGainMode() const override {
     return ((CustomLR1110 *)_radio)->getRxBoostedGainMode();
   }
+
+  void doResetAGC() override { lr11x0ResetAGC((LR11x0 *)_radio, ((CustomLR1110 *)_radio)->getFreqMHz(), getRxBoostedGainMode()); }
 };

src/helpers/radiolib/CustomLR2021.h

@@ -4,6 +4,10 @@
 #include "MeshCore.h"
 
 class CustomLR2021 : public LR2021 {
+  uint32_t _preambleMillis = 66;
+  uint32_t _maxPayloadMillis = 3934;
+  uint32_t _activityAt = 0;
+  bool _headerSeen = false;
   bool _rx_boosted = false;
 
   public:
@@ -66,11 +70,62 @@ class CustomLR2021 : public LR2021 {
 
     bool getRxBoostedGainMode() const { return _rx_boosted; }
 
+    int16_t startReceive() override {
+      // include the PREAMBLE_DETECTED irq bit in reported flags
+      return LR2021::startReceive(RADIOLIB_LR2021_RX_TIMEOUT_INF, RADIOLIB_IRQ_RX_DEFAULT_FLAGS | (1UL << RADIOLIB_LR2021_IRQ_PREAMBLE_DETECTED), RADIOLIB_IRQ_RX_DEFAULT_MASK, 0);
+    }
+
     bool isReceiving() {
       uint32_t irq = getIrqStatus();
-      bool detected = ((irq & RADIOLIB_LR2021_IRQ_SYNCWORD_VALID) || (irq & RADIOLIB_LR2021_IRQ_PREAMBLE_DETECTED));
-      return detected;
+      bool preamble = irq & RADIOLIB_LR2021_IRQ_PREAMBLE_DETECTED;  // bit 5
+      bool header   = irq & RADIOLIB_LR2021_IRQ_LORA_HEADER_VALID;  // bit 6
+      bool hdrErr   = irq & RADIOLIB_LR2021_IRQ_LORA_HDR_CRC_ERROR; // bit 9
+      uint32_t now  = millis();
+      if (hdrErr) {
+        clearIrqFlags(RADIOLIB_LR2021_IRQ_PREAMBLE_DETECTED | RADIOLIB_LR2021_IRQ_LORA_HEADER_VALID | RADIOLIB_LR2021_IRQ_LORA_HDR_CRC_ERROR);
+        _activityAt = 0;
+        _headerSeen = false;
+        return false;
+      }
+      if (!header && _headerSeen) {
+        // something cleared the header flag, reset our state.
+        _activityAt = 0; _headerSeen = false;
+        return false;
+      }
+
+      if (header) {
+        if (!_headerSeen) { _headerSeen = true; _activityAt = now; };
+        if (now - _activityAt > _maxPayloadMillis) {
+          MESH_DEBUG_PRINTLN("Clearing header IRQ after %ums", _maxPayloadMillis);
+          clearIrqFlags(RADIOLIB_LR2021_IRQ_PREAMBLE_DETECTED | RADIOLIB_LR2021_IRQ_LORA_HEADER_VALID | RADIOLIB_LR2021_IRQ_LORA_HDR_CRC_ERROR);
+          _activityAt = 0; _headerSeen = false;
+          return false;
+        }
+        return true;
+      }
+      if (preamble) {
+        if (_activityAt == 0) _activityAt = now;
+        if (now - _activityAt > _preambleMillis) {
+          clearIrqFlags(RADIOLIB_LR2021_IRQ_PREAMBLE_DETECTED);
+          _activityAt = 0;
+          MESH_DEBUG_PRINTLN("Clearing preamble IRQ after %ums", _preambleMillis);
+          return false;
+        }
+        return true;
+      }
+      _activityAt = 0; _headerSeen = false;
+      return false;
     }
+    
+    void setPreambleMillis(uint32_t preambleMillis) {
+      _preambleMillis = preambleMillis;
+      MESH_DEBUG_PRINTLN("Set _preambleMillis=%u", _preambleMillis);
+    }
+    void setMaxPayloadMillis(uint32_t payloadMillis) {
+      _maxPayloadMillis = payloadMillis;
+      MESH_DEBUG_PRINTLN("Set _maxPayloadMillis=%u", _maxPayloadMillis);
+    }
+
 
     uint8_t getSpreadingFactor() const { return spreadingFactor; }
 };

src/helpers/radiolib/CustomLR2021Wrapper.h

@@ -22,6 +22,10 @@ public:
     ((CustomLR2021 *)_radio)->setCodingRate(cr);
     updatePreamble(sf);
     applySideDetectorConfig();
+    PacketMillis pm = calcMaxPacketMillis(sf, bw, cr, preambleLengthForSF(sf));
+    ((CustomLR2021 *)_radio)->setPreambleMillis(pm.preambleMillis);
+    ((CustomLR2021 *)_radio)->setMaxPayloadMillis(pm.payloadMillis);
+
   }
 
   bool configSideDetectors(const uint8_t* sideDetSFs, uint8_t num, float bw) override {

src/helpers/radiolib/CustomSTM32WLxWrapper.h

@@ -35,5 +35,5 @@ public:
   }
   uint8_t getSpreadingFactor() const override { return ((CustomSTM32WLx *)_radio)->spreadingFactor; }
 
-  void doResetAGC() override { sx126xResetAGC((SX126x *)_radio); }
+  void doResetAGC() override { sx126xResetAGC((SX126x *)_radio, getRxBoostedGainMode()); }
 };

src/helpers/radiolib/CustomSX1262Wrapper.h

@@ -41,12 +41,12 @@ public:
     ((CustomSX1262 *)_radio)->sleep(false);
   }
 
-  void doResetAGC() override { sx126xResetAGC((SX126x *)_radio); }
-
   bool setRxBoostedGainMode(bool en) override {
     return ((CustomSX1262 *)_radio)->setRxBoostedGainMode(en) == RADIOLIB_ERR_NONE;
   }
   bool getRxBoostedGainMode() const override {
     return ((CustomSX1262 *)_radio)->getRxBoostedGainMode();
   }
+
+  void doResetAGC() override { sx126xResetAGC((SX126x *)_radio, getRxBoostedGainMode()); }
 };

src/helpers/radiolib/CustomSX1268Wrapper.h

@@ -38,12 +38,12 @@ public:
   }
   uint8_t getSpreadingFactor() const override { return ((CustomSX1268 *)_radio)->spreadingFactor; }
 
-  void doResetAGC() override { sx126xResetAGC((SX126x *)_radio); }
-
   bool setRxBoostedGainMode(bool en) override {
     return ((CustomSX1268 *)_radio)->setRxBoostedGainMode(en) == RADIOLIB_ERR_NONE;
   }
   bool getRxBoostedGainMode() const override {
     return ((CustomSX1268 *)_radio)->getRxBoostedGainMode();
   }
+
+  void doResetAGC() override { sx126xResetAGC((SX126x *)_radio, getRxBoostedGainMode()); }
 };

src/helpers/radiolib/LR11x0Reset.h

@@ -5,7 +5,7 @@
 // Full receiver reset for LR11x0-family chips (LR1110, LR1120, LR1121).
 // Warm sleep powers down analog, calibrate(0x3F) refreshes all calibration blocks,
 // then re-applies RX settings that calibration may reset.
-inline void lr11x0ResetAGC(LR11x0* radio, float freqMHz) {
+inline void lr11x0ResetAGC(LR11x0* radio, float freqMHz, bool rx_boost_gain) {
   radio->sleep(true, 0);
   radio->standby(RADIOLIB_LR11X0_STANDBY_RC, true);
 
@@ -16,6 +16,6 @@ inline void lr11x0ResetAGC(LR11x0* radio, float freqMHz) {
   radio->calibrateImageRejection(freqMHz - 4.0f, freqMHz + 4.0f);
 
 #ifdef RX_BOOSTED_GAIN
-  radio->setRxBoostedGainMode(RX_BOOSTED_GAIN);
+  radio->setRxBoostedGainMode(rx_boost_gain);
 #endif
 }

src/helpers/radiolib/RadioLibWrappers.cpp

@@ -15,7 +15,7 @@ static volatile uint8_t state = STATE_IDLE;
 
 // this function is called when a complete packet
 // is transmitted by the module
-static 
+static
 #if defined(ESP8266) || defined(ESP32)
   ICACHE_RAM_ATTR
 #endif
@@ -100,7 +100,9 @@ void RadioLibWrapper::loop() {
     }
     _floor_sample_sum = 0;
 
+    #ifdef MESH_DEBUG_NOISE_FLOOR
     MESH_DEBUG_PRINTLN("RadioLibWrapper: noise_floor = %d", (int)_noise_floor);
+    #endif
   }
 }
 
@@ -224,10 +226,10 @@ static float snr_threshold[] = {
     -17.5,// SF11 needs at least -17.5 dB SNR
     -20   // SF12 needs at least -20 dB SNR
 };
-  
+
 float RadioLibWrapper::packetScoreInt(float snr, int sf, int packet_len) {
   if (sf < 7) return 0.0f;
-  
+
   if (snr < snr_threshold[sf - 7]) return 0.0f;    // Below threshold, no chance of success
 
   auto success_rate_based_on_snr = (snr - snr_threshold[sf - 7]) / 10.0;
@@ -243,7 +245,7 @@ PacketMillis RadioLibWrapper::calcMaxPacketMillis(uint8_t sf, float bw, uint8_t
 
   // preamble + syncword + sfd + header
   uint32_t preamble_us = (((preambleSymbols + 8) * 4 + sfCoeff1_x4) * tsym_us) / 4;
-  
+
   // airtime for max packet at current radio settings
   uint32_t total_us   = _radio->getTimeOnAir(MAX_TRANS_UNIT);
   // airtime for payload only (no preamble, header or SOF)

src/helpers/radiolib/RadioLibWrappers.h

@@ -93,9 +93,7 @@ public:
   void random(uint8_t* dest, size_t sz) override {
 #ifdef USE_CC310_HW_CRYPTO
     // CC310 TRNG is higher quality and environment-independent vs radio RSSI noise.
-    nRFCrypto.begin();
     nRFCrypto.Random.generate(dest, (uint16_t)sz);
-    nRFCrypto.end();
 #else
     for (int i = 0; i < sz; i++) {
       dest[i] = _radio->randomByte() ^ (::random(0, 256) & 0xFF);

src/helpers/radiolib/SX126xReset.h

@@ -5,7 +5,7 @@
 // Full receiver reset for all SX126x-family chips (SX1262, SX1268, LLCC68, STM32WLx).
 // Warm sleep powers down analog, Calibrate(0x7F) refreshes ADC/PLL/image calibration,
 // then re-applies RX settings that calibration may reset.
-inline void sx126xResetAGC(SX126x* radio) {
+inline void sx126xResetAGC(SX126x* radio, bool rx_boost_gain) {
   radio->sleep(true);
   radio->standby(RADIOLIB_SX126X_STANDBY_RC, true);
 
@@ -26,7 +26,7 @@ inline void sx126xResetAGC(SX126x* radio) {
   radio->setDio2AsRfSwitch(SX126X_DIO2_AS_RF_SWITCH);
 #endif
 #ifdef SX126X_RX_BOOSTED_GAIN
-  radio->setRxBoostedGainMode(SX126X_RX_BOOSTED_GAIN);
+  radio->setRxBoostedGainMode(rx_boost_gain);
 #endif
 #ifdef SX126X_REGISTER_PATCH
   uint8_t r_data = 0;

src/helpers/ui/SH1106Display.cpp

@@ -24,8 +24,21 @@ bool SH1106Display::begin()
 {
   // Wire must already be initialised by board.begin() before this is called.
   // Boards with non-standard SH1106 addresses should define DISPLAY_ADDRESS
-  // in their variant/platformio configuration.
-  return i2c_probe(Wire, DISPLAY_ADDRESS) && display.begin(DISPLAY_ADDRESS, true);
+  // in their variant/platformio configuration. The SA0 strap selects 0x3C or
+  // 0x3D and differs between revisions of the same board (e.g. T-Beam
+  // Supreme), so fall back to the other address of the pair.
+  uint8_t addr = 0;
+  if (i2c_probe(Wire, DISPLAY_ADDRESS)) {
+    addr = DISPLAY_ADDRESS;
+  } else if (i2c_probe(Wire, DISPLAY_ADDRESS ^ 1)) {
+    addr = DISPLAY_ADDRESS ^ 1;
+  }
+  // Run the Adafruit init even when no panel answered: it is what allocates
+  // the frame buffer and the I2C device. Skipping it leaves i2c_dev and
+  // spi_dev NULL, and UITask::begin() calls turnOn() regardless of our
+  // return value, which then dereferences the null spi_dev.
+  bool ok = display.begin(addr ? addr : DISPLAY_ADDRESS, true);
+  return addr != 0 && ok;
 }
 
 void SH1106Display::turnOn()

variants/gat562_30s_mesh_kit/GAT56230SMeshKitBoard.h

@@ -12,7 +12,7 @@ protected:
 #endif
 
 public:
-  GAT56230SMeshKitBoard() : NRF52Board("GAT562_OTA") {}
+  GAT56230SMeshKitBoard() : NRF52BoardDCDC("GAT562_OTA") {}
   void begin();
 
   #define BATTERY_SAMPLES 8

variants/gat562_mesh_evb_pro/GAT562EVBProBoard.h

@@ -12,7 +12,7 @@ protected:
 #endif
 
 public:
-  GAT562EVBProBoard() : NRF52Board("GAT562_OTA") {}
+  GAT562EVBProBoard() : NRF52BoardDCDC("GAT562_OTA") {}
   void begin();
 
   #define BATTERY_SAMPLES 8

variants/gat562_mesh_tracker_pro/GAT562MeshTrackerProBoard.h

@@ -12,7 +12,7 @@ protected:
 #endif
 
 public:
-  GAT562MeshTrackerProBoard() : NRF52Board("GAT562_OTA") {}
+  GAT562MeshTrackerProBoard() : NRF52BoardDCDC("GAT562_OTA") {}
   void begin();
 
   #define BATTERY_SAMPLES 8

variants/gat562_mesh_watch13/GAT56MeshWatch13Board.h

@@ -12,7 +12,7 @@ protected:
 #endif
 
 public:
-  GAT56MeshWatch13Board() : NRF52Board("GAT562_OTA") {}
+  GAT56MeshWatch13Board() : NRF52BoardDCDC("GAT562_OTA") {}
   void begin();
 
   #define BATTERY_SAMPLES 8

variants/heltec_mesh_solar/MeshSolarBoard.h

@@ -22,7 +22,7 @@
 
 class MeshSolarBoard : public NRF52BoardDCDC {
 public:
-  MeshSolarBoard() : NRF52Board("MESH_SOLAR_OTA") {}
+  MeshSolarBoard() : NRF52BoardDCDC("MESH_SOLAR_OTA") {}
   void begin();
 
   uint16_t getBattMilliVolts() override {

variants/heltec_t096/T096Board.h

@@ -17,7 +17,7 @@ public:
   RefCountedDigitalPin periph_power;
   LoRaFEMControl loRaFEMControl;
 
-  T096Board() :periph_power(PIN_VEXT_EN,PIN_VEXT_EN_ACTIVE), NRF52Board("T096_OTA") {}
+  T096Board() : NRF52BoardDCDC("T096_OTA"), periph_power(PIN_VEXT_EN,PIN_VEXT_EN_ACTIVE) {}
   void begin();
 
   void onBeforeTransmit(void) override;

variants/heltec_t1/T1Board.h

@@ -15,7 +15,7 @@ protected:
 public:
   RefCountedDigitalPin periph_power;
 
-  T1Board() : periph_power(PIN_TFT_VDD_CTL, PIN_TFT_VDD_CTL_ACTIVE), NRF52Board("T1_OTA") {}
+  T1Board() : NRF52BoardDCDC("T1_OTA"), periph_power(PIN_TFT_VDD_CTL, PIN_TFT_VDD_CTL_ACTIVE) {}
 
   void begin();
   void onBeforeTransmit() override;

variants/heltec_t114/T114Board.h

@@ -16,7 +16,7 @@ protected:
 #endif
 
 public:
-  T114Board() : NRF52Board("T114_OTA") {}
+  T114Board() : NRF52BoardDCDC("T114_OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)

variants/heltec_tower_v2/HeltecTowerV2Board.h

@@ -14,7 +14,7 @@ protected:
 public:
   LoRaFEMControl loRaFEMControl;
 
-  HeltecTowerV2Board() : NRF52Board("TOWER_V2_OTA") {}
+  HeltecTowerV2Board() : NRF52BoardDCDC("TOWER_V2_OTA") {}
   void begin();
   void onBeforeTransmit() override;
   void onAfterTransmit() override;

variants/ikoka_handheld_nrf/IkokaNrf52Board.h

@@ -8,7 +8,7 @@
 
 class IkokaNrf52Board : public NRF52BoardDCDC {
 public:
-  IkokaNrf52Board() : NRF52Board("XIAO_NRF52_OTA") {}
+  IkokaNrf52Board() : NRF52BoardDCDC("XIAO_NRF52_OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)

variants/ikoka_nano_nrf/IkokaNanoNRFBoard.h

@@ -8,7 +8,7 @@
 
 class IkokaNanoNRFBoard : public NRF52BoardDCDC {
 public:
-  IkokaNanoNRFBoard() : NRF52Board("XIAO_NRF52_OTA") {}
+  IkokaNanoNRFBoard() : NRF52BoardDCDC("XIAO_NRF52_OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)

variants/ikoka_stick_nrf/IkokaStickNRFBoard.h

@@ -8,7 +8,7 @@
 
 class IkokaStickNRFBoard : public NRF52BoardDCDC {
 public:
-  IkokaStickNRFBoard() : NRF52Board("XIAO_NRF52_OTA") {}
+  IkokaStickNRFBoard() : NRF52BoardDCDC("XIAO_NRF52_OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)

variants/lilygo_t_impulse_plus/TImpulsePlusBoard.h

@@ -9,7 +9,7 @@ protected:
   uint8_t btn_prev_state;
 
 public:
-  TImpulsePlusBoard() : NRF52Board("T-Impulse-Plus OTA") {}
+  TImpulsePlusBoard() : NRF52BoardDCDC("T-Impulse-Plus OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)

variants/lilygo_techo/TechoBoard.h

@@ -15,7 +15,7 @@
 
 class TechoBoard : public NRF52BoardDCDC {
 public:
-  TechoBoard() : NRF52Board("TECHO_OTA") {}
+  TechoBoard() : NRF52BoardDCDC("TECHO_OTA") {}
   void begin();
   uint16_t getBattMilliVolts() override;
 

variants/lilygo_techo_card/TechoCardBoard.h

@@ -17,7 +17,7 @@
 class TechoCardBoard : public NRF52BoardDCDC {
   bool _torchStatus = false;
 public:
-  TechoCardBoard() : NRF52Board("TECHO_OTA") {}
+  TechoCardBoard() : NRF52BoardDCDC("TECHO_OTA") {}
   void begin();
   uint16_t getBattMilliVolts() override;
   void onBeforeTransmit(void) override;

variants/lilygo_techo_card/platformio.ini

@@ -119,3 +119,8 @@ lib_deps =
   ${LilyGo_T-Echo_Card.lib_deps}
   end2endzone/NonBlockingRTTTL@^1.3.0
   densaugeo/base64 @ ~1.4.0
+
+[env:LilyGo_T-Echo_Card_kiss_modem]
+extends = LilyGo_T-Echo_Card
+build_src_filter = ${LilyGo_T-Echo_Card.build_src_filter}
+  +<../examples/kiss_modem/>

variants/lilygo_techo_lite/TechoBoard.h

@@ -13,7 +13,7 @@
 
 class TechoBoard : public NRF52BoardDCDC {
 public:
-  TechoBoard() : NRF52Board("TECHO_OTA") {}
+  TechoBoard() : NRF52BoardDCDC("TECHO_OTA") {}
   void begin();
   uint16_t getBattMilliVolts() override;
 

variants/lilygo_techo_lite/platformio.ini

@@ -12,10 +12,9 @@ build_flags = ${nrf52_base.build_flags}
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_POWER_EN=30
-  -D SX126X_DIO3_TCXO_VOLTAGE=1.8
+  -D SX126X_DIO3_TCXO_VOLTAGE=3.0
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_RX_BOOSTED_GAIN=1
-  -D SX126X_USE_REGULATOR_LDO=1
   -D P_LORA_TX_LED=LED_GREEN
   -D DISABLE_DIAGNOSTIC_OUTPUT
   -D ENV_INCLUDE_GPS=1
@@ -117,7 +116,7 @@ build_flags =
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_POWER_EN=30
-  -D SX126X_DIO3_TCXO_VOLTAGE=1.8
+  -D SX126X_DIO3_TCXO_VOLTAGE=3.0
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_RX_BOOSTED_GAIN=1
   -D P_LORA_TX_LED=LED_GREEN
@@ -162,6 +161,7 @@ build_flags =
   -D WRAPPER_CLASS=CustomSX1262Wrapper
   -D LORA_TX_POWER=22
   -D SX126X_POWER_EN=30
+  -D SX126X_DIO3_TCXO_VOLTAGE=3.0
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_RX_BOOSTED_GAIN=1
   -D P_LORA_TX_LED=LED_GREEN

variants/lilygo_techo_lite/variant.h

@@ -105,12 +105,14 @@
 #define LORA_CS                 _PINNUM(0, 11)
 #define SX126X_POWER_EN         _PINNUM(0, 30)
 #define SX126X_DIO1             _PINNUM(1, 8)
+#define SX126X_DIO2             _PINNUM(0, 5)
 #define SX126X_BUSY             _PINNUM(0, 14)
 #define SX126X_RESET            _PINNUM(0, 7)
 #define SX126X_RXEN             _PINNUM(1, 1)
 #define SX126X_TXEN             _PINNUM(0, 27)
 
 #define P_LORA_DIO_1            SX126X_DIO1
+#define P_LORA_DIO_2            SX126X_DIO2
 #define P_LORA_NSS              LORA_CS
 #define P_LORA_RESET            SX126X_RESET
 #define P_LORA_BUSY             SX126X_BUSY

variants/lilygo_teth_elite/platformio.ini

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

variants/mesh_pocket/MeshPocket.h

@@ -11,7 +11,7 @@
 
 class HeltecMeshPocket : public NRF52BoardDCDC {
 public:
-  HeltecMeshPocket() : NRF52Board("MESH_POCKET_OTA") {}
+  HeltecMeshPocket() : NRF52BoardDCDC("MESH_POCKET_OTA") {}
   void begin();
 
   uint16_t getBattMilliVolts() override {

variants/meshtiny/MeshtinyBoard.h

@@ -9,7 +9,7 @@ protected:
   uint8_t btn_prev_state;
 
 public:
-  MeshtinyBoard() : NRF52Board("Meshtiny OTA") {}
+  MeshtinyBoard() : NRF52BoardDCDC("Meshtiny OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)

variants/meshtracker_x1/MeshTrackerX1Board.h

@@ -9,7 +9,7 @@ protected:
   uint8_t btn_prev_state;
 
 public:
-  MeshTrackerX1Board() : NRF52Board("X1_OTA") {}
+  MeshTrackerX1Board() : NRF52BoardDCDC("X1_OTA") {}
   void begin();
 
   uint16_t getBattMilliVolts() override {

variants/meshtracker_x1/platformio.ini

@@ -130,3 +130,8 @@ lib_deps = ${MeshTracker_X1.lib_deps}
   stevemarple/MicroNMEA @ ^2.0.6
   end2endzone/NonBlockingRTTTL@^1.3.0
   adafruit/Adafruit DRV2605 Library @ ^1.2.4
+
+[env:MeshTracker_X1_kiss_modem]
+extends = MeshTracker_X1
+build_src_filter = ${MeshTracker_X1.build_src_filter}
+  +<../examples/kiss_modem/>

variants/minewsemi_me25ls01/MinewsemiME25LS01Board.h

@@ -25,7 +25,7 @@ protected:
   uint8_t btn_prev_state;
 
 public:
-  MinewsemiME25LS01Board() : NRF52Board("Minewsemi_OTA") {}
+  MinewsemiME25LS01Board() : NRF52BoardDCDC("Minewsemi_OTA") {}
   void begin();
 
 #define BATTERY_SAMPLES 8

variants/minewsemi_me25ls01/platformio.ini

@@ -21,6 +21,7 @@ build_flags = ${nrf52_base.build_flags}
   -D ENV_INCLUDE_INA219=1
 build_src_filter = ${nrf52_base.build_src_filter}
   +<helpers/*.cpp>
+  +<helpers/ui/NullDisplayDriver.cpp>
   +<../variants/minewsemi_me25ls01>
   +<helpers/sensors>
 debug_tool = jlink
@@ -55,7 +56,6 @@ build_flags = ${me25ls01.build_flags}
   ;-D PIN_BUZZER=25
   ;-D PIN_BUZZER_EN=37
 build_src_filter = ${me25ls01.build_src_filter}
-  +<helpers/ui/NullDisplayDriver.cpp>
   +<helpers/nrf52/SerialBLEInterface.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-orig/*.cpp>
@@ -63,10 +63,6 @@ build_src_filter = ${me25ls01.build_src_filter}
 [env:Minewsemi_me25ls01_repeater]
 extends = me25ls01
 build_flags = ${me25ls01.build_flags}
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
-  -D BLE_PIN_CODE=123456
-;  -D BLE_DEBUG_LOGGING=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
   -D OFFLINE_QUEUE_SIZE=256
@@ -85,10 +81,6 @@ build_src_filter = ${me25ls01.build_src_filter}
 [env:Minewsemi_me25ls01_room_server]
 extends = me25ls01
 build_flags = ${me25ls01.build_flags}
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
-;  -D BLE_PIN_CODE=123456
-;  -D BLE_DEBUG_LOGGING=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
   -D OFFLINE_QUEUE_SIZE=256
@@ -103,15 +95,10 @@ build_flags = ${me25ls01.build_flags}
   -D DISPLAY_CLASS=NullDisplayDriver
 build_src_filter = ${me25ls01.build_src_filter}
   +<../examples/simple_room_server>
-  +<helpers/ui/NullDisplayDriver.cpp>
 
 [env:Minewsemi_me25ls01_terminal_chat]
 extends = me25ls01
 build_flags = ${me25ls01.build_flags}
-  -D MAX_CONTACTS=100
-  -D MAX_GROUP_CHANNELS=8
-  -D BLE_PIN_CODE=123456
-;  -D BLE_DEBUG_LOGGING=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
   -D OFFLINE_QUEUE_SIZE=256
@@ -126,7 +113,6 @@ build_flags = ${me25ls01.build_flags}
   -D DISPLAY_CLASS=NullDisplayDriver
 build_src_filter = ${me25ls01.build_src_filter}
   +<../examples/simple_secure_chat/main.cpp>
-  +<helpers/ui/NullDisplayDriver.cpp>
 
 [env:Minewsemi_me25ls01_companion_radio_usb]
 extends = me25ls01
@@ -137,7 +123,6 @@ build_flags = ${me25ls01.build_flags}
   -D MAX_CONTACTS=350
   -D MAX_GROUP_CHANNELS=40
   ;-D BLE_PIN_CODE=123456
-;  -D BLE_DEBUG_LOGGING=1
 ;  -D MESH_PACKET_LOGGING=1
 ;  -D MESH_DEBUG=1
   -D OFFLINE_QUEUE_SIZE=256
@@ -147,7 +132,6 @@ build_flags = ${me25ls01.build_flags}
   -D ENABLE_USB_INTERFACE
 build_src_filter = ${me25ls01.build_src_filter}
   +<helpers/nrf52/*.cpp>
-  +<helpers/ui/NullDisplayDriver.cpp>
   +<../examples/companion_radio/*.cpp>
   +<../examples/companion_radio/ui-orig/*.cpp>
 

variants/minewsemi_me25ls01/target.cpp

@@ -4,7 +4,6 @@
 MinewsemiME25LS01Board board;
 
 RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI);
-
 WRAPPER_CLASS radio_driver(radio, board);
 
 VolatileRTCClock rtc_clock;
@@ -18,7 +17,8 @@ extern EnvironmentSensorManager sensors;
 #endif
 
 #ifdef DISPLAY_CLASS
-  NullDisplayDriver display;
+  DISPLAY_CLASS display;
+  MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
 #endif
 
 #ifndef LORA_CR

variants/minewsemi_me25ls01/target.h

@@ -11,16 +11,17 @@
 #include <helpers/sensors/EnvironmentSensorManager.h>
 #ifdef DISPLAY_CLASS
   #include <helpers/ui/NullDisplayDriver.h>
-#endif
-
-#ifdef DISPLAY_CLASS
-  extern NullDisplayDriver display;
+  #include <helpers/ui/MomentaryButton.h>
 #endif
 
 extern MinewsemiME25LS01Board board;
 extern WRAPPER_CLASS radio_driver;
 extern VolatileRTCClock rtc_clock;
 extern EnvironmentSensorManager sensors;
+#ifdef DISPLAY_CLASS
+  extern DISPLAY_CLASS display;
+  extern MomentaryButton user_btn;
+#endif
 
 bool radio_init();
 mesh::LocalIdentity radio_new_identity();

variants/muziworks_r1_neo/R1NeoBoard.h

@@ -15,7 +15,7 @@ protected:
 #endif
 
 public:
-  R1NeoBoard() : NRF52Board("R1NEO_OTA") {}
+  R1NeoBoard() : NRF52BoardDCDC("R1NEO_OTA") {}
   void begin();
 
 #ifdef NRF52_POWER_MANAGEMENT

variants/muziworks_r1_neo/platformio.ini

@@ -10,6 +10,7 @@ build_flags = ${nrf52_base.build_flags}
   -D NRF52_POWER_MANAGEMENT
   -D RADIO_CLASS=CustomSX1262
   -D WRAPPER_CLASS=CustomSX1262Wrapper
+  -D DISPLAY_CLASS=NullDisplayDriver
   -D LORA_TX_POWER=22
   -D SX126X_CURRENT_LIMIT=140
   -D SX126X_RX_BOOSTED_GAIN=1
@@ -100,7 +101,6 @@ build_src_filter = ${R1Neo.build_src_filter}
   +<../examples/companion_radio/ui-orig/*.cpp>
 lib_deps =
   ${R1Neo.lib_deps}
-  ${rak4631.lib_deps}
   densaugeo/base64 @ ~1.4.0
   end2endzone/NonBlockingRTTTL@^1.3.0
 

variants/muziworks_r1_neo/target.cpp

@@ -4,12 +4,17 @@
 
 R1NeoBoard board;
 
-DISPLAY_CLASS display;
-
 RADIO_CLASS radio = new Module(P_LORA_NSS, P_LORA_DIO_1, P_LORA_RESET, P_LORA_BUSY, SPI);
-
 WRAPPER_CLASS radio_driver(radio, board);
 
+#ifdef DISPLAY_CLASS
+  NullDisplayDriver display;
+#endif
+
+#ifdef PIN_USER_BTN 
+MomentaryButton user_btn(PIN_USER_BTN, 1000, true);
+#endif
+
 VolatileRTCClock fallback_clock;
 AutoDiscoverRTCClock rtc_clock(fallback_clock);
 

variants/promicro/PromicroBoard.h

@@ -4,19 +4,6 @@
 #include <Arduino.h>
 #include <helpers/NRF52Board.h>
 
-#define P_LORA_NSS 13 //P1.13 45
-#define P_LORA_DIO_1 11 //P0.10 10
-#define P_LORA_RESET 10 //P0.09 9
-#define P_LORA_BUSY  16 //P0.29 29
-#define P_LORA_MISO  15 //P0.02 2
-#define P_LORA_SCLK  12 //P1.11 43
-#define P_LORA_MOSI  14 //P1.15 47
-#define SX126X_POWER_EN 21 //P0.13 13
-#define SX126X_RXEN 2 //P0.17
-#define SX126X_TXEN RADIOLIB_NC
-#define SX126X_DIO2_AS_RF_SWITCH  true
-#define SX126X_DIO3_TCXO_VOLTAGE (1.8f)
-
 #define  PIN_VBAT_READ 17
 #define  ADC_MULTIPLIER   (1.815f) // dependent on voltage divider resistors. TODO: more accurate battery tracking
 
@@ -26,7 +13,7 @@ protected:
   float adc_mult = ADC_MULTIPLIER;
 
 public:
-  PromicroBoard() : NRF52Board("ProMicro_OTA") {}
+  PromicroBoard() : NRF52BoardDCDC("ProMicro_OTA") {}
   void begin();
 
   #define BATTERY_SAMPLES 8

variants/promicro/variant.cpp

@@ -3,13 +3,29 @@
 #include "wiring_digital.h"
 
 const uint32_t g_ADigitalPinMap[] = {
-  8, 6, 17, 20, 22, 24, 32, 11, 36, 38,
-  9, 10, 43, 45, 47, 2, 29, 31,
-  33, 34, 37,
-  13, 15
+  8,  // P0.08 = 0
+  6,  // P0.06 = 1
+  17, // P0.17 = 2
+  20, // P0.20 = 3
+  22, // P0.22 = 4
+  24, // P0.24 = 5
+  32, // P1.00 = 6
+  11, // P0.11 = 7
+  36, // P1.04 = 8
+  38, // P1.06 = 9
+  9,  // P0.09 = 10
+  10, // P0.10 = 11
+  43, // P1.11 = 12
+  45, // P1.13 = 13
+  47, // P1.15 = 14
+  2,  // P0.02 = 15
+  29, // P0.29 = 16
+  31, // P0.31 = 17
+  33, // P1.01 = 18
+  34, // P1.02 = 19
+  37, // P1.05 = 20
+  13, // P0.13 = 21
+  15  // P0.15 = 22
 };
 
-void initVariant()
-{
-}
-
+void initVariant() {}

variants/promicro/variant.h

@@ -7,9 +7,9 @@
  #pragma once
 
  #include "WVariant.h"
- 
+
  ////////////////////////////////////////////////////////////////////////////////
- // Low frequency clock source 
+ // Low frequency clock source
 
 #define VARIANT_MCK       (64000000ul)
 
@@ -79,4 +79,18 @@
 #define PIN_BUTTON1          (6)
 #define BUTTON_PIN           PIN_BUTTON1
 
+//////////////////////////////////////////////////////////////////////////////
+// LoRa
 
+#define P_LORA_NSS                (13)
+#define P_LORA_DIO_1              (11)
+#define P_LORA_RESET              (10)
+#define P_LORA_BUSY               (16)
+#define P_LORA_MISO               (15)
+#define P_LORA_SCLK               (12)
+#define P_LORA_MOSI               (14)
+#define SX126X_POWER_EN           (21)
+#define SX126X_RXEN               (2)
+#define SX126X_TXEN               (-1)
+#define SX126X_DIO2_AS_RF_SWITCH  true
+#define SX126X_DIO3_TCXO_VOLTAGE  (1.8f)

variants/rak3401/RAK3401Board.h

@@ -17,7 +17,7 @@ protected:
   void initiateShutdown(uint8_t reason) override;
 #endif
 public:
-  RAK3401Board() : NRF52Board("RAK3401_OTA") {}
+  RAK3401Board() : NRF52BoardDCDC("RAK3401_OTA") {}
   void begin();
 
   #define BATTERY_SAMPLES 8

variants/rak4631/RAK4631Board.h

@@ -15,7 +15,7 @@ protected:
 #endif
 
 public:
-  RAK4631Board() : NRF52Board("RAK4631_OTA") {}
+  RAK4631Board() : NRF52BoardDCDC("RAK4631_OTA") {}
   void begin();
 
   #define BATTERY_SAMPLES 8

variants/rak_wismesh_tag/RAKWismeshTagBoard.h

@@ -10,7 +10,7 @@
 
 class RAKWismeshTagBoard : public NRF52BoardDCDC {
 public:
-  RAKWismeshTagBoard() : NRF52Board("WISMESHTAG_OTA") {}
+  RAKWismeshTagBoard() : NRF52BoardDCDC("WISMESHTAG_OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED) && defined(LED_STATE_ON)

variants/sensecap_indicator-espnow/platformio.ini

@@ -33,7 +33,7 @@ lib_deps=${esp32_base.lib_deps}
   lovyan03/LovyanGFX @ ^1.2.7
 
 [env:SenseCapIndicator-ESPNow_comp_radio_usb]
-extends =SenseCapIndicator-ESPNow
+extends = SenseCapIndicator-ESPNow
 build_flags =
   ${SenseCapIndicator-ESPNow.build_flags}
   -I examples/companion_radio/ui-new
@@ -47,4 +47,4 @@ build_src_filter = ${SenseCapIndicator-ESPNow.build_src_filter}
   +<../examples/companion_radio/*.cpp>
 lib_deps =
   ${SenseCapIndicator-ESPNow.lib_deps}
-  densaugeo/base64 @ ~1.4.0
+  densaugeo/base64 @ ~1.4.0

variants/sensecap_solar/SenseCapSolarBoard.h

@@ -11,7 +11,7 @@ protected:
 #endif
 
 public:
-  SenseCapSolarBoard() : NRF52Board("SENSECAP_SOLAR_OTA") {}
+  SenseCapSolarBoard() : NRF52BoardDCDC("SENSECAP_SOLAR_OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)

variants/sensecap_solar/platformio.ini

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

variants/station_g2/platformio.ini

@@ -229,7 +229,7 @@ build_flags =
   -D WIFI_DEBUG_LOGGING=1
   -D WIFI_SSID='"myssid"'
   -D WIFI_PWD='"mypwd"'
-  -D OFFLINE_QUEUE_SIZE=256  
+  -D OFFLINE_QUEUE_SIZE=256
 ; -D MESH_PACKET_LOGGING=1
 ; -D MESH_DEBUG=1
 build_src_filter = ${Station_G2.build_src_filter}
@@ -242,10 +242,8 @@ lib_deps =
 
 [env:Station_G2_kiss_modem]
 extends = Station_G2
-build_unflags =
-  -DARDUINO_USB_MODE=0
 build_flags =
   ${Station_G2.build_flags}
-  -DARDUINO_USB_MODE=1
+  -D ARDUINO_USB_MODE=1
 build_src_filter = ${Station_G2.build_src_filter}
   +<../examples/kiss_modem/>

variants/t1000-e/T1000eBoard.h

@@ -9,7 +9,7 @@ protected:
   uint8_t btn_prev_state;
 
 public:
-  T1000eBoard() : NRF52Board("T1000E_OTA") {}
+  T1000eBoard() : NRF52BoardDCDC("T1000E_OTA") {}
   void begin();
 
   uint16_t getBattMilliVolts() override {

variants/thinknode_m3/ThinkNodeM3Board.h

@@ -14,7 +14,7 @@ protected:
   uint8_t btn_prev_state;
 
 public:
-  ThinkNodeM3Board() : NRF52Board("THINKNODE_M3_OTA") {}
+  ThinkNodeM3Board() : NRF52BoardDCDC("THINKNODE_M3_OTA") {}
   void begin();
   uint16_t getBattMilliVolts() override;
 

variants/thinknode_m6/ThinkNodeM6Board.h

@@ -19,7 +19,7 @@ protected:
 #endif
 
 public:
-  ThinkNodeM6Board() : NRF52Board("THINKNODE_M6_OTA") {}
+  ThinkNodeM6Board() : NRF52BoardDCDC("THINKNODE_M6_OTA") {}
   void begin();
   uint16_t getBattMilliVolts() override;
 

variants/wio-tracker-l1/WioTrackerL1Board.h

@@ -9,7 +9,7 @@ protected:
   uint8_t btn_prev_state;
 
 public:
-  WioTrackerL1Board() : NRF52Board("WioTrackerL1 OTA") {}
+  WioTrackerL1Board() : NRF52BoardDCDC("WioTrackerL1 OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)

variants/wio_wm1110/WioWM1110Board.h

@@ -13,7 +13,7 @@
 
 class WioWM1110Board : public NRF52BoardDCDC {
 public:
-  WioWM1110Board() : NRF52Board("WM1110_OTA") {}
+  WioWM1110Board() : NRF52BoardDCDC("WM1110_OTA") {}
   void begin();
 
 #if defined(LED_GREEN)

variants/xiao_nrf52/XiaoNrf52Board.h

@@ -17,7 +17,7 @@ protected:
 #endif
 
 public:
-  XiaoNrf52Board() : NRF52Board("XIAO_NRF52_OTA") {}
+  XiaoNrf52Board() : NRF52BoardDCDC("XIAO_NRF52_OTA") {}
   void begin();
 
 #if defined(P_LORA_TX_LED)