Merge remote-tracking branch 'origin/dev' into mqtt-bridge-implementation

src/helpers/CommonCLI.cpp

@@ -164,7 +164,7 @@ void CommonCLI::loadPrefsInt(FILESYSTEM* fs, const char* filename) {
     _prefs->bw = constrain(_prefs->bw, 7.8f, 500.0f);
     _prefs->sf = constrain(_prefs->sf, 5, 12);
     _prefs->cr = constrain(_prefs->cr, 5, 8);
-    _prefs->tx_power_dbm = constrain(_prefs->tx_power_dbm, 1, 30);
+    _prefs->tx_power_dbm = constrain(_prefs->tx_power_dbm, -9, 30);
     _prefs->multi_acks = constrain(_prefs->multi_acks, 0, 1);
 
     // sanitise bad bridge pref values
@@ -599,7 +599,7 @@ void CommonCLI::handleCommand(uint32_t sender_timestamp, const char* command, ch
         }
         *reply = 0;  // set null terminator
       } else if (memcmp(config, "tx", 2) == 0 && (config[2] == 0 || config[2] == ' ')) {
-        sprintf(reply, "> %d", (uint32_t) _prefs->tx_power_dbm);
+        sprintf(reply, "> %d", (int32_t) _prefs->tx_power_dbm);
       } else if (memcmp(config, "freq", 4) == 0) {
         sprintf(reply, "> %s", StrHelper::ftoa(_prefs->freq));
       } else if (memcmp(config, "public.key", 10) == 0) {

src/helpers/CommonCLI.h

@@ -19,7 +19,7 @@ struct NodePrefs { // persisted to file
   double node_lat, node_lon;
   char password[16];
   float freq;
-  uint8_t tx_power_dbm;
+  int8_t tx_power_dbm;
   uint8_t disable_fwd;
   uint8_t advert_interval;       // minutes / 2
   uint8_t flood_advert_interval; // hours
@@ -131,7 +131,7 @@ public:
   virtual void setLoggingOn(bool enable) = 0;
   virtual void eraseLogFile() = 0;
   virtual void dumpLogFile() = 0;
-  virtual void setTxPower(uint8_t power_dbm) = 0;
+  virtual void setTxPower(int8_t power_dbm) = 0;
   virtual void formatNeighborsReply(char *reply) = 0;
   virtual void removeNeighbor(const uint8_t* pubkey, int key_len) {
     // no op by default

src/helpers/ui/SSD1306Display.cpp

@@ -18,17 +18,23 @@ bool SSD1306Display::begin() {
 }
 
 void SSD1306Display::turnOn() {
-  display.ssd1306_command(SSD1306_DISPLAYON);
   if (!_isOn) {
     if (_peripher_power) _peripher_power->claim();
-    _isOn = true;
+    _isOn = true;  // set before begin() to prevent double claim
+    if (_peripher_power) begin();  // re-init display after power was cut
   }
+  display.ssd1306_command(SSD1306_DISPLAYON);
 }
 
 void SSD1306Display::turnOff() {
   display.ssd1306_command(SSD1306_DISPLAYOFF);
   if (_isOn) {
-    if (_peripher_power) _peripher_power->release();
+    if (_peripher_power) {
+#if PIN_OLED_RESET >= 0
+      digitalWrite(PIN_OLED_RESET, LOW);
+#endif
+      _peripher_power->release();
+    }
     _isOn = false;
   }
 }