Merge branch 'dev' into 2026/remote-lna

src/helpers/CommonCLI.cpp

@@ -4,6 +4,10 @@
 #include "AdvertDataHelpers.h"
 #include <RTClib.h>
 
+#ifndef BRIDGE_MAX_BAUD
+#define BRIDGE_MAX_BAUD 115200
+#endif
+
 // Believe it or not, this std C function is busted on some platforms!
 static uint32_t _atoi(const char* sp) {
   uint32_t n = 0;
@@ -103,7 +107,7 @@ void CommonCLI::loadPrefsInt(FILESYSTEM* fs, const char* filename) {
     _prefs->bridge_enabled = constrain(_prefs->bridge_enabled, 0, 1);
     _prefs->bridge_delay = constrain(_prefs->bridge_delay, 0, 10000);
     _prefs->bridge_pkt_src = constrain(_prefs->bridge_pkt_src, 0, 1);
-    _prefs->bridge_baud = constrain(_prefs->bridge_baud, 9600, 115200);
+    _prefs->bridge_baud = constrain(_prefs->bridge_baud, 9600, BRIDGE_MAX_BAUD);
     _prefs->bridge_channel = constrain(_prefs->bridge_channel, 0, 14);
 
     _prefs->powersaving_enabled = constrain(_prefs->powersaving_enabled, 0, 1);
@@ -202,7 +206,9 @@ uint8_t CommonCLI::buildAdvertData(uint8_t node_type, uint8_t* app_data) {
 }
 
 void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, char* reply) {
-    if (memcmp(command, "reboot", 6) == 0) {
+    if (memcmp(command, "poweroff", 8) == 0 || memcmp(command, "shutdown", 8) == 0) {
+      _board->powerOff();  // doesn't return
+    } else if (memcmp(command, "reboot", 6) == 0) {
       _board->reboot();  // doesn't return
     } else if (memcmp(command, "clkreboot", 9) == 0) {
       // Reset clock
@@ -653,13 +659,13 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
 #ifdef WITH_RS232_BRIDGE
       } else if (memcmp(config, "bridge.baud ", 12) == 0) {
         uint32_t baud = atoi(&config[12]);
-        if (baud >= 9600 && baud <= 115200) {
+        if (baud >= 9600 && baud <= BRIDGE_MAX_BAUD) {
           _prefs->bridge_baud = (uint32_t)baud;
           _callbacks->restartBridge();
           savePrefs();
           strcpy(reply, "OK");
         } else {
-          strcpy(reply, "Error: baud rate must be between 9600-115200");
+          sprintf(reply, "Error: baud rate must be between 9600-%d",BRIDGE_MAX_BAUD);
         }
 #endif
 #ifdef WITH_ESPNOW_BRIDGE

src/helpers/nrf52/SerialBLEInterface.cpp

@@ -246,6 +246,7 @@ void SerialBLEInterface::enable() {
   clearBuffers();
   _last_health_check = millis();
 
+  Bluefruit.Advertising.restartOnDisconnect(true);
   Bluefruit.Advertising.start(0);
 }
 
@@ -259,8 +260,9 @@ void SerialBLEInterface::disable() {
   _isEnabled = false;
   BLE_DEBUG_PRINTLN("SerialBLEInterface: disable");
 
-  disconnect();
+  Bluefruit.Advertising.restartOnDisconnect(false);
   Bluefruit.Advertising.stop();
+  disconnect();
   _last_health_check = 0;
 }
 

src/helpers/radiolib/CustomLLCC68.h

@@ -45,8 +45,7 @@ class CustomLLCC68 : public LLCC68 {
       int status = begin(LORA_FREQ, LORA_BW, LORA_SF, cr, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 16, tcxo);
       // if radio init fails with -707/-706, try again with tcxo voltage set to 0.0f
       if (status == RADIOLIB_ERR_SPI_CMD_FAILED || status == RADIOLIB_ERR_SPI_CMD_INVALID) {
-        #define SX126X_DIO3_TCXO_VOLTAGE (0.0f);
-        tcxo = SX126X_DIO3_TCXO_VOLTAGE;
+        tcxo = 0.0f;
         status = begin(LORA_FREQ, LORA_BW, LORA_SF, cr, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 16, tcxo);
       }
       if (status != RADIOLIB_ERR_NONE) {

src/helpers/radiolib/CustomSX1262.h

@@ -45,8 +45,7 @@ class CustomSX1262 : public SX1262 {
       int status = begin(LORA_FREQ, LORA_BW, LORA_SF, cr, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 16, tcxo);
       // if radio init fails with -707/-706, try again with tcxo voltage set to 0.0f
       if (status == RADIOLIB_ERR_SPI_CMD_FAILED || status == RADIOLIB_ERR_SPI_CMD_INVALID) {
-        #define SX126X_DIO3_TCXO_VOLTAGE (0.0f);
-        tcxo = SX126X_DIO3_TCXO_VOLTAGE;
+        tcxo = 0.0f;
         status = begin(LORA_FREQ, LORA_BW, LORA_SF, cr, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 16, tcxo);
       }
       if (status != RADIOLIB_ERR_NONE) {

src/helpers/radiolib/CustomSX1268.h

@@ -45,8 +45,7 @@ class CustomSX1268 : public SX1268 {
       int status = begin(LORA_FREQ, LORA_BW, LORA_SF, cr, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 16, tcxo);
       // if radio init fails with -707/-706, try again with tcxo voltage set to 0.0f
       if (status == RADIOLIB_ERR_SPI_CMD_FAILED || status == RADIOLIB_ERR_SPI_CMD_INVALID) {
-        #define SX126X_DIO3_TCXO_VOLTAGE (0.0f);
-        tcxo = SX126X_DIO3_TCXO_VOLTAGE;
+        tcxo = 0.0f;
         status = begin(LORA_FREQ, LORA_BW, LORA_SF, cr, RADIOLIB_SX126X_SYNC_WORD_PRIVATE, LORA_TX_POWER, 16, tcxo);
       }
       if (status != RADIOLIB_ERR_NONE) {

src/helpers/ui/E213Display.cpp

@@ -59,44 +59,58 @@ bool E213Display::begin() {
 }
 
 void E213Display::powerOn() {
+  if (_periph_power) {
+    _periph_power->claim();
+  } else {
 #ifdef PIN_VEXT_EN
-  pinMode(PIN_VEXT_EN, OUTPUT);
+    pinMode(PIN_VEXT_EN, OUTPUT);
 #ifdef PIN_VEXT_EN_ACTIVE
-  digitalWrite(PIN_VEXT_EN, PIN_VEXT_EN_ACTIVE); 
+    digitalWrite(PIN_VEXT_EN, PIN_VEXT_EN_ACTIVE);
 #else
-  digitalWrite(PIN_VEXT_EN, LOW); // Active low
+    digitalWrite(PIN_VEXT_EN, LOW); // Active low
 #endif
+#endif
+  }
   delay(50);                      // Allow power to stabilize
-#endif
 }
 
 void E213Display::powerOff() {
+  if (_periph_power) {
+    _periph_power->release();
+  } else {
 #ifdef PIN_VEXT_EN
 #ifdef PIN_VEXT_EN_ACTIVE
-  digitalWrite(PIN_VEXT_EN, !PIN_VEXT_EN_ACTIVE); 
+    digitalWrite(PIN_VEXT_EN, !PIN_VEXT_EN_ACTIVE);
 #else
-  digitalWrite(PIN_VEXT_EN, HIGH); // Turn off power
+    digitalWrite(PIN_VEXT_EN, HIGH); // Turn off power
 #endif
 #endif
+  }
 }
 
 void E213Display::turnOn() {
   if (!_init) begin();
-  powerOn();
+  else if (!_isOn) {
+    powerOn();
+    display->fastmodeOn();  // Reinitialize display controller after power was cut
+  }
   _isOn = true;
 }
 
 void E213Display::turnOff() {
-  powerOff();
-  _isOn = false;
+  if (_isOn) {
+    powerOff();
+    _isOn = false;
+  }
 }
 
 void E213Display::clear() {
   display->clear();
-
 }
 
 void E213Display::startFrame(Color bkg) {
+  display_crc.reset();
+
   // Fill screen with white first to ensure clean background
   display->fillRect(0, 0, width(), height(), WHITE);
 
@@ -107,31 +121,50 @@ void E213Display::startFrame(Color bkg) {
 }
 
 void E213Display::setTextSize(int sz) {
+  display_crc.update<int>(sz);
   // The library handles text size internally
     display->setTextSize(sz);
 }
 
 void E213Display::setColor(Color c) {
+  display_crc.update<Color>(c);
   // implemented in individual display methods
 }
 
 void E213Display::setCursor(int x, int y) {
+  display_crc.update<int>(x);
+  display_crc.update<int>(y);
     display->setCursor(x, y);
 }
 
 void E213Display::print(const char *str) {
+  display_crc.update<char>(str, strlen(str));
     display->print(str);
 }
 
 void E213Display::fillRect(int x, int y, int w, int h) {
+  display_crc.update<int>(x);
+  display_crc.update<int>(y);
+  display_crc.update<int>(w);
+  display_crc.update<int>(h);
     display->fillRect(x, y, w, h, BLACK);
 }
 
 void E213Display::drawRect(int x, int y, int w, int h) {
+  display_crc.update<int>(x);
+  display_crc.update<int>(y);
+  display_crc.update<int>(w);
+  display_crc.update<int>(h);
     display->drawRect(x, y, w, h, BLACK);
 }
 
 void E213Display::drawXbm(int x, int y, const uint8_t *bits, int w, int h) {
+  display_crc.update<int>(x);
+  display_crc.update<int>(y);
+  display_crc.update<int>(w);
+  display_crc.update<int>(h);
+  display_crc.update<uint8_t>(bits, w * h / 8);
+
   // Width in bytes for bitmap processing
   uint16_t widthInBytes = (w + 7) / 8;
 
@@ -160,5 +193,9 @@ uint16_t E213Display::getTextWidth(const char *str) {
 }
 
 void E213Display::endFrame() {
+  uint32_t crc = display_crc.finalize();
+  if (crc != last_display_crc_value) {
     display->update();
+    last_display_crc_value = crc;
+  }
 }

src/helpers/ui/E213Display.h

@@ -5,15 +5,20 @@
 #include <SPI.h>
 #include <Wire.h>
 #include <heltec-eink-modules.h>
+#include <CRC32.h>
+#include <helpers/RefCountedDigitalPin.h>
 
 // Display driver for E213 e-ink display
 class E213Display : public DisplayDriver {
   BaseDisplay* display=NULL;
   bool _init = false;
   bool _isOn = false;
+  RefCountedDigitalPin* _periph_power;
+  CRC32 display_crc;
+  uint32_t last_display_crc_value = 0;
 
 public:
-  E213Display() : DisplayDriver(250, 122) {}
+  E213Display(RefCountedDigitalPin* periph_power = NULL) : DisplayDriver(250, 122), _periph_power(periph_power) {}
   ~E213Display(){
     if(display!=NULL) {
       delete display;
@@ -39,4 +44,4 @@ private:
   BaseDisplay* detectEInk();
   void powerOn();
   void powerOff();
-};
+};

src/helpers/ui/E290Display.cpp

@@ -21,28 +21,41 @@ bool E290Display::begin() {
 }
 
 void E290Display::powerOn() {
+  if (_periph_power) {
+    _periph_power->claim();
+  } else {
 #ifdef PIN_VEXT_EN
-  pinMode(PIN_VEXT_EN, OUTPUT);
-  digitalWrite(PIN_VEXT_EN, PIN_VEXT_EN_ACTIVE);
-  delay(50);                      // Allow power to stabilize
+    pinMode(PIN_VEXT_EN, OUTPUT);
+    digitalWrite(PIN_VEXT_EN, PIN_VEXT_EN_ACTIVE);
 #endif
+  }
+  delay(50);                      // Allow power to stabilize
 }
 
 void E290Display::powerOff() {
+  if (_periph_power) {
+    _periph_power->release();
+  } else {
 #ifdef PIN_VEXT_EN
-  digitalWrite(PIN_VEXT_EN, !PIN_VEXT_EN_ACTIVE); // Turn off power
+    digitalWrite(PIN_VEXT_EN, !PIN_VEXT_EN_ACTIVE); // Turn off power
 #endif
+  }
 }
 
 void E290Display::turnOn() {
   if (!_init) begin();
-  powerOn();
+  else if (!_isOn) {
+    powerOn();
+    display.fastmodeOn();  // Reinitialize display controller after power was cut
+  }
   _isOn = true;
 }
 
 void E290Display::turnOff() {
-  powerOff();
-  _isOn = false;
+  if (_isOn) {
+    powerOff();
+    _isOn = false;
+  }
 }
 
 void E290Display::clear() {
@@ -50,6 +63,8 @@ void E290Display::clear() {
 }
 
 void E290Display::startFrame(Color bkg) {
+  display_crc.reset();
+
   // Fill screen with white first to ensure clean background
   display.fillRect(0, 0, width(), height(), WHITE);
   if (bkg == LIGHT) {
@@ -59,31 +74,50 @@ void E290Display::startFrame(Color bkg) {
 }
 
 void E290Display::setTextSize(int sz) {
+  display_crc.update<int>(sz);
   // The library handles text size internally
   display.setTextSize(sz);
 }
 
 void E290Display::setColor(Color c) {
+  display_crc.update<Color>(c);
   // implemented in individual display methods
 }
 
 void E290Display::setCursor(int x, int y) {
+  display_crc.update<int>(x);
+  display_crc.update<int>(y);
   display.setCursor(x, y);
 }
 
 void E290Display::print(const char *str) {
+  display_crc.update<char>(str, strlen(str));
   display.print(str);
 }
 
 void E290Display::fillRect(int x, int y, int w, int h) {
+  display_crc.update<int>(x);
+  display_crc.update<int>(y);
+  display_crc.update<int>(w);
+  display_crc.update<int>(h);
   display.fillRect(x, y, w, h, BLACK);
 }
 
 void E290Display::drawRect(int x, int y, int w, int h) {
+  display_crc.update<int>(x);
+  display_crc.update<int>(y);
+  display_crc.update<int>(w);
+  display_crc.update<int>(h);
   display.drawRect(x, y, w, h, BLACK);
 }
 
 void E290Display::drawXbm(int x, int y, const uint8_t *bits, int w, int h) {
+  display_crc.update<int>(x);
+  display_crc.update<int>(y);
+  display_crc.update<int>(w);
+  display_crc.update<int>(h);
+  display_crc.update<uint8_t>(bits, w * h / 8);
+
   // Width in bytes for bitmap processing
   uint16_t widthInBytes = (w + 7) / 8;
 
@@ -112,5 +146,9 @@ uint16_t E290Display::getTextWidth(const char *str) {
 }
 
 void E290Display::endFrame() {
-  display.update();
+  uint32_t crc = display_crc.finalize();
+  if (crc != last_display_crc_value) {
+    display.update();
+    last_display_crc_value = crc;
+  }
 }

src/helpers/ui/E290Display.h

@@ -5,15 +5,20 @@
 #include <SPI.h>
 #include <Wire.h>
 #include <heltec-eink-modules.h>
+#include <CRC32.h>
+#include <helpers/RefCountedDigitalPin.h>
 
 // Display driver for E290 e-ink display
 class E290Display : public DisplayDriver {
   EInkDisplay_VisionMasterE290 display;
   bool _init = false;
   bool _isOn = false;
+  RefCountedDigitalPin* _periph_power;
+  CRC32 display_crc;
+  uint32_t last_display_crc_value = 0;
 
 public:
-  E290Display() : DisplayDriver(296, 128) {}
+  E290Display(RefCountedDigitalPin* periph_power = NULL) : DisplayDriver(296, 128), _periph_power(periph_power) {}
 
   bool begin();
   bool isOn() override { return _isOn; }
@@ -34,4 +39,4 @@ public:
 private:
   void powerOn();
   void powerOff();
-};
+};