Merge pull request #2094 from meshtastic/yank-mqtt-queue

Yank mqtt service envelope queue

.github/workflows/main_matrix.yml

@@ -32,7 +32,8 @@ jobs:
           - board: station-g1
           - board: m5stack-coreink
           - board: tbeam-s3-core
-
+          - board: tlora-t3s3-v1
+          
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
@@ -53,6 +54,7 @@ jobs:
           - board: tlora-v1
           - board: tlora_v1_3
           - board: tlora-v2-1-1.6
+          - board: tlora-v2-1-1.8
           - board: tbeam
           - board: heltec-v1
           - board: heltec-v2.0
@@ -67,6 +69,7 @@ jobs:
           - board: m5stack-core
           - board: m5stack-coreink
           - board: tbeam-s3-core
+          - board: tlora-t3s3-v1
     uses: ./.github/workflows/build_esp32.yml
     with:
       board: ${{ matrix.board }}

README.md

@@ -1,7 +1,7 @@
 # Meshtastic Firmware
 
 ![GitHub release downloads](https://img.shields.io/github/downloads/meshtastic/firmware/total)
-[![CI](https://img.shields.io/github/workflow/status/meshtastic/firmware/CI?label=actions&logo=github&color=yellow)](https://github.com/meshtastic/firmware/actions/workflows/main_matrix.yml)
+[![CI](https://img.shields.io/github/actions/workflow/status/meshtastic/firmware/main_matrix.yml?branch=master&label=actions&logo=github&color=yellow)](https://github.com/meshtastic/firmware/actions/workflows/ci.yml)
 [![CLA assistant](https://cla-assistant.io/readme/badge/meshtastic/firmware)](https://cla-assistant.io/meshtastic/firmware)
 [![Fiscal Contributors](https://opencollective.com/meshtastic/tiers/badge.svg?label=Fiscal%20Contributors&color=deeppink)](https://opencollective.com/meshtastic/)
 [![Vercel](https://img.shields.io/static/v1?label=Powered%20by&message=Vercel&style=flat&logo=vercel&color=000000)](https://vercel.com?utm_source=meshtastic&utm_campaign=oss)

arch/esp32/esp32.ini

@@ -26,7 +26,6 @@ build_flags =
   -DCONFIG_NIMBLE_CPP_LOG_LEVEL=2
   -DCONFIG_BT_NIMBLE_MAX_CCCDS=20
   -DESP_OPENSSL_SUPPRESS_LEGACY_WARNING
-  -DDEBUG_HEAP
 
 lib_deps =
   ${arduino_base.lib_deps}

arch/esp32/esp32s2.ini

@@ -27,7 +27,6 @@ build_flags =
   -DCONFIG_BT_NIMBLE_MAX_CCCDS=20
   -DESP_OPENSSL_SUPPRESS_LEGACY_WARNING
   -DHAS_BLUETOOTH=0
-  -DDEBUG_HEAP 
   
 lib_deps =
   ${arduino_base.lib_deps}

arch/esp32/esp32s3.ini

@@ -26,7 +26,6 @@ build_flags =
   -DCONFIG_NIMBLE_CPP_LOG_LEVEL=2
   -DCONFIG_BT_NIMBLE_MAX_CCCDS=20
   -DESP_OPENSSL_SUPPRESS_LEGACY_WARNING
-  -DDEBUG_HEAP 
   
 lib_deps =
   ${arduino_base.lib_deps}

arch/rp2040/rp2040.ini

@@ -1,6 +1,8 @@
 ; Common settings for rp2040 Processor based targets
 [rp2040_base]
-platform = https://github.com/maxgerhardt/platform-raspberrypi.git#5ce1a228e7cae453f366deb8962252b9b7356bbc
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#20c7dbfcfe6677c5305fa28ecf5e3870321cb157
+platform_packages = 
+  earlephilhower/toolchain-rp2040-earlephilhower@^5.100300.221223
 extends = arduino_base
 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m

boards/tlora-t3s3-v1.json

@@ -0,0 +1,47 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DLILYGO_T3S3_V1",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_MODE=0",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "dio",
+    "hwids": [
+      [
+        "0X303A",
+        "0x1001"
+      ]
+    ],
+    "mcu": "esp32s3",
+    "variant": "tlora-t3s3-v1"
+  },
+  "connectivity": [
+    "wifi"
+  ],
+  "debug": {
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": [
+    "arduino",
+    "espidf"
+  ],
+  "name": "LilyGo TLora-T3S3-V1",
+  "upload": {
+    "flash_size": "4MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 4194304,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "http://www.lilygo.cn/",
+  "vendor": "LilyGo"
+}

platformio.ini

@@ -10,7 +10,6 @@
 ;default_envs = heltec-v2.0
 ;default_envs = heltec-v2.1
 ;default_envs = tlora-v1
-;default_envs = tlora-v1
 ;default_envs = tlora_v1_3
 ;default_envs = tlora-v2
 ;default_envs = tlora-v2-1-1.6
@@ -66,7 +65,8 @@ lib_deps =
   https://github.com/meshtastic/ArduinoThread.git#72921ac222eed6f526ba1682023cee290d9aa1b3
   nanopb/Nanopb@^0.4.6
   erriez/ErriezCRC32@^1.0.1
-  jgromes/RadioLib@^5.5.0
+;  jgromes/RadioLib@^5.5.1
+  https://github.com/jgromes/RadioLib.git#395844922c5d88d5db0481a9c91479931172428d
 
 ; Used for the code analysis in PIO Home / Inspect
 check_tool = cppcheck
@@ -82,6 +82,7 @@ framework = arduino
 lib_deps =
   ${env.lib_deps}
   mprograms/QMC5883LCompass@^1.1.1
+  end2endzone/NonBlockingRTTTL@^1.3.0
   https://github.com/meshtastic/SparkFun_ATECCX08a_Arduino_Library.git#52b5282639d08a8cbd4b748363089eed6102dc76
 
 build_flags = ${env.build_flags} -Os -DRADIOLIB_SPI_PARANOID=0
@@ -106,4 +107,5 @@ lib_deps =
   adafruit/Adafruit INA260 Library@^1.5.0
   adafruit/Adafruit INA219@^1.2.0
   adafruit/Adafruit SHTC3 Library@^1.0.0
-  adafruit/Adafruit LPS2X@^2.0.4
+  adafruit/Adafruit LPS2X@^2.0.4
+  adafruit/Adafruit SHT31 Library@^2.2.0

src/ButtonThread.h

@@ -98,8 +98,8 @@ class ButtonThread : public concurrency::OSThread
         userButtonTouch.tick();
         canSleep &= userButtonTouch.isIdle();
 #endif
-        // if (!canSleep) DEBUG_MSG("Supressing sleep!\n");
-        // else DEBUG_MSG("sleep ok\n");
+        // if (!canSleep) LOG_DEBUG("Supressing sleep!\n");
+        // else LOG_DEBUG("sleep ok\n");
 
         return 5;
     }
@@ -108,12 +108,12 @@ class ButtonThread : public concurrency::OSThread
     static void touchPressed()
     {
         screen->forceDisplay();
-        DEBUG_MSG("touch press!\n");
+        LOG_DEBUG("touch press!\n");
     }
 
     static void userButtonPressed()
     {
-        // DEBUG_MSG("press!\n");
+        // LOG_DEBUG("press!\n");
 #ifdef BUTTON_PIN
         if ((BUTTON_PIN != moduleConfig.canned_message.inputbroker_pin_press) ||
             !moduleConfig.canned_message.enabled) {
@@ -123,7 +123,7 @@ class ButtonThread : public concurrency::OSThread
     }
     static void userButtonPressedLong()
     {
-        // DEBUG_MSG("Long press!\n");
+        // LOG_DEBUG("Long press!\n");
 #ifdef ARCH_ESP32
         screen->adjustBrightness();
 #endif
@@ -139,7 +139,7 @@ class ButtonThread : public concurrency::OSThread
             // may wake the board immediatedly.
             if ((!shutdown_on_long_stop) && (millis() > 30 * 1000)) {
                 screen->startShutdownScreen();
-                DEBUG_MSG("Shutdown from long press");
+                LOG_INFO("Shutdown from long press");
                 playBeep();
 #ifdef PIN_LED1
                 ledOff(PIN_LED1);
@@ -154,7 +154,7 @@ class ButtonThread : public concurrency::OSThread
             }
 #endif
         } else {
-            // DEBUG_MSG("Long press %u\n", (millis() - longPressTime));
+            // LOG_DEBUG("Long press %u\n", (millis() - longPressTime));
         }
     }
 
@@ -166,11 +166,11 @@ class ButtonThread : public concurrency::OSThread
     #if defined(GPS_POWER_TOGGLE)
         if(config.position.gps_enabled)
         {
-        DEBUG_MSG("Flag set to false for gps power\n");
+        LOG_DEBUG("Flag set to false for gps power\n");
         } 
         else 
         {
-        DEBUG_MSG("Flag set to true to restore power\n");
+        LOG_DEBUG("Flag set to true to restore power\n");
         }
     config.position.gps_enabled = !(config.position.gps_enabled);
     doGPSpowersave(config.position.gps_enabled);
@@ -187,7 +187,7 @@ class ButtonThread : public concurrency::OSThread
     static void userButtonPressedLongStart()
     {
         if (millis() > 30 * 1000) {
-            DEBUG_MSG("Long press start!\n");
+            LOG_DEBUG("Long press start!\n");
             longPressTime = millis();
         }
     }
@@ -195,7 +195,7 @@ class ButtonThread : public concurrency::OSThread
     static void userButtonPressedLongStop()
     {
         if (millis() > 30 * 1000) {
-            DEBUG_MSG("Long press stop!\n");
+            LOG_DEBUG("Long press stop!\n");
             longPressTime = 0;
             if (shutdown_on_long_stop) {
                 playShutdownMelody();

src/DebugConfiguration.h

@@ -13,17 +13,33 @@
 #define SERIAL_BAUD 115200 // Serial debug baud rate
 #endif
 
+#define MESHTASTIC_LOG_LEVEL_DEBUG "DEBUG"
+#define MESHTASTIC_LOG_LEVEL_INFO "INFO "
+#define MESHTASTIC_LOG_LEVEL_WARN "WARN "
+#define MESHTASTIC_LOG_LEVEL_ERROR "ERROR"
+#define MESHTASTIC_LOG_LEVEL_TRACE "TRACE"
+
 #include "SerialConsole.h"
 
 #define DEBUG_PORT (*console) // Serial debug port
 
 #ifdef USE_SEGGER
-#define DEBUG_MSG(...) SEGGER_RTT_printf(0, __VA_ARGS__)
+#define LOG_DEBUG(...) SEGGER_RTT_printf(0, __VA_ARGS__)
+#define LOG_INFO(...) SEGGER_RTT_printf(0, __VA_ARGS__)
+#define LOG_WARN(...) SEGGER_RTT_printf(0, __VA_ARGS__)
+#define LOG_ERROR(...) SEGGER_RTT_printf(0, __VA_ARGS__)
 #else
 #ifdef DEBUG_PORT
-#define DEBUG_MSG(...) DEBUG_PORT.logDebug(__VA_ARGS__)
+#define LOG_DEBUG(...) DEBUG_PORT.log(MESHTASTIC_LOG_LEVEL_DEBUG, __VA_ARGS__)
+#define LOG_INFO(...) DEBUG_PORT.log(MESHTASTIC_LOG_LEVEL_INFO, __VA_ARGS__)
+#define LOG_WARN(...) DEBUG_PORT.log(MESHTASTIC_LOG_LEVEL_WARN, __VA_ARGS__)
+#define LOG_ERROR(...) DEBUG_PORT.log(MESHTASTIC_LOG_LEVEL_ERROR, __VA_ARGS__)
+#define LOG_TRACE(...) DEBUG_PORT.log(MESHTASTIC_LOG_TRACE, __VA_ARGS__)
 #else
-#define DEBUG_MSG(...)
+#define LOG_DEBUG(...)
+#define LOG_INFO(...)
+#define LOG_WARN(...)
+#define LOG_ERROR(...)
 #endif
 #endif
 

src/FSCommon.cpp

@@ -21,13 +21,13 @@ bool copyFile(const char* from, const char* to)
    
     File f1 = FSCom.open(from, FILE_O_READ);
     if (!f1){
-        DEBUG_MSG("Failed to open source file %s\n", from);
+        LOG_ERROR("Failed to open source file %s\n", from);
         return false;
     }
 
     File f2 = FSCom.open(to, FILE_O_WRITE);
     if (!f2) {
-        DEBUG_MSG("Failed to open destination file %s\n", to);
+        LOG_ERROR("Failed to open destination file %s\n", to);
         return false;
     }
    
@@ -79,7 +79,7 @@ void listDir(const char * dirname, uint8_t levels, boolean del = false)
 #ifdef ARCH_ESP32
                 listDir(file.path(), levels -1, del);
                 if(del) { 
-                    DEBUG_MSG("Removing %s\n", file.path());
+                    LOG_DEBUG("Removing %s\n", file.path());
                     strcpy(buffer, file.path());
                     file.close();
                     FSCom.rmdir(buffer);
@@ -89,7 +89,7 @@ void listDir(const char * dirname, uint8_t levels, boolean del = false)
 #elif (defined(ARCH_RP2040) || defined(ARCH_PORTDUINO))
                 listDir(file.name(), levels -1, del);
                 if(del) { 
-                    DEBUG_MSG("Removing %s\n", file.name());
+                    LOG_DEBUG("Removing %s\n", file.name());
                     strcpy(buffer, file.name());
                     file.close();
                     FSCom.rmdir(buffer);
@@ -104,26 +104,26 @@ void listDir(const char * dirname, uint8_t levels, boolean del = false)
         } else {
 #ifdef ARCH_ESP32
             if(del) {
-                DEBUG_MSG("Deleting %s\n", file.path());
+                LOG_DEBUG("Deleting %s\n", file.path());
                 strcpy(buffer, file.path());
                 file.close();
                 FSCom.remove(buffer);
             } else {
-            DEBUG_MSG(" %s (%i Bytes)\n", file.path(), file.size());
+            LOG_DEBUG(" %s (%i Bytes)\n", file.path(), file.size());
                 file.close();
             }
 #elif (defined(ARCH_RP2040) || defined(ARCH_PORTDUINO))
             if(del) {
-                DEBUG_MSG("Deleting %s\n", file.name());
+                LOG_DEBUG("Deleting %s\n", file.name());
                 strcpy(buffer, file.name());
                 file.close();
                 FSCom.remove(buffer);
             } else {
-                DEBUG_MSG(" %s (%i Bytes)\n", file.name(), file.size());
+                LOG_DEBUG(" %s (%i Bytes)\n", file.name(), file.size());
                 file.close();
             }
 #else
-            DEBUG_MSG(" %s (%i Bytes)\n", file.name(), file.size());
+            LOG_DEBUG(" %s (%i Bytes)\n", file.name(), file.size());
             file.close();
 #endif            
         }
@@ -131,7 +131,7 @@ void listDir(const char * dirname, uint8_t levels, boolean del = false)
     }
 #ifdef ARCH_ESP32    
     if(del) { 
-        DEBUG_MSG("Removing %s\n", root.path());
+        LOG_DEBUG("Removing %s\n", root.path());
         strcpy(buffer, root.path());
         root.close();
         FSCom.rmdir(buffer);
@@ -140,7 +140,7 @@ void listDir(const char * dirname, uint8_t levels, boolean del = false)
     }
 #elif (defined(ARCH_RP2040) || defined(ARCH_PORTDUINO))
     if(del) { 
-        DEBUG_MSG("Removing %s\n", root.name());
+        LOG_DEBUG("Removing %s\n", root.name());
         strcpy(buffer, root.name());
         root.close();
         FSCom.rmdir(buffer);
@@ -170,13 +170,13 @@ void fsInit()
 #ifdef FSCom
     if (!FSBegin())
     {
-        DEBUG_MSG("ERROR filesystem mount Failed. Formatting...\n");
+        LOG_ERROR("Filesystem mount Failed. Formatting...\n");
         assert(0); // FIXME - report failure to phone
     }
 #ifdef ARCH_ESP32
-    DEBUG_MSG("Filesystem files (%d/%d Bytes):\n", FSCom.usedBytes(), FSCom.totalBytes());
+    LOG_DEBUG("Filesystem files (%d/%d Bytes):\n", FSCom.usedBytes(), FSCom.totalBytes());
 #else
-    DEBUG_MSG("Filesystem files:\n");
+    LOG_DEBUG("Filesystem files:\n");
 #endif
     listDir("/", 10);
 #endif
@@ -189,29 +189,29 @@ void setupSDCard()
     SDHandler.begin(SPI_SCK, SPI_MISO, SPI_MOSI);
 
     if (!SD.begin(SDCARD_CS, SDHandler)) {
-        DEBUG_MSG("No SD_MMC card detected\n");
+        LOG_DEBUG("No SD_MMC card detected\n");
         return ;
     }
     uint8_t cardType = SD.cardType();
     if (cardType == CARD_NONE) {
-        DEBUG_MSG("No SD_MMC card attached\n");
+        LOG_DEBUG("No SD_MMC card attached\n");
         return ;
     }
-    DEBUG_MSG("SD_MMC Card Type: ");
+    LOG_DEBUG("SD_MMC Card Type: ");
     if (cardType == CARD_MMC) {
-        DEBUG_MSG("MMC\n");
+        LOG_DEBUG("MMC\n");
     } else if (cardType == CARD_SD) {
-        DEBUG_MSG("SDSC\n");
+        LOG_DEBUG("SDSC\n");
     } else if (cardType == CARD_SDHC) {
-        DEBUG_MSG("SDHC\n");
+        LOG_DEBUG("SDHC\n");
     } else {
-        DEBUG_MSG("UNKNOWN\n");
+        LOG_DEBUG("UNKNOWN\n");
     }
 
     uint64_t cardSize = SD.cardSize() / (1024 * 1024);
-    DEBUG_MSG("SD Card Size: %lluMB\n", cardSize);
-    DEBUG_MSG("Total space: %llu MB\n", SD.totalBytes() / (1024 * 1024));
-    DEBUG_MSG("Used space: %llu MB\n", SD.usedBytes() / (1024 * 1024));
+    LOG_DEBUG("SD Card Size: %lluMB\n", cardSize);
+    LOG_DEBUG("Total space: %llu MB\n", SD.totalBytes() / (1024 * 1024));
+    LOG_DEBUG("Used space: %llu MB\n", SD.usedBytes() / (1024 * 1024));
 #endif
 }
 

src/GPSStatus.h

@@ -53,7 +53,7 @@ class GPSStatus : public Status
     {
         if (config.position.fixed_position) {
 #ifdef GPS_EXTRAVERBOSE
-            DEBUG_MSG("WARNING: Using fixed latitude\n");
+            LOG_WARN("Using fixed latitude\n");
 #endif
             NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
             return node->position.latitude_i;
@@ -66,7 +66,7 @@ class GPSStatus : public Status
     {
         if (config.position.fixed_position) {
 #ifdef GPS_EXTRAVERBOSE
-            DEBUG_MSG("WARNING: Using fixed longitude\n");
+            LOG_WARN("Using fixed longitude\n");
 #endif
             NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
             return node->position.longitude_i;
@@ -79,7 +79,7 @@ class GPSStatus : public Status
     {
         if (config.position.fixed_position) {
 #ifdef GPS_EXTRAVERBOSE
-            DEBUG_MSG("WARNING: Using fixed altitude\n");
+            LOG_WARN("Using fixed altitude\n");
 #endif
             NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
             return node->position.altitude;
@@ -97,7 +97,7 @@ class GPSStatus : public Status
     bool matches(const GPSStatus *newStatus) const
     {
 #ifdef GPS_EXTRAVERBOSE
-        DEBUG_MSG("GPSStatus.match() new pos@%x to old pos@%x\n", newStatus->p.pos_timestamp, p.pos_timestamp);
+        LOG_DEBUG("GPSStatus.match() new pos@%x to old pos@%x\n", newStatus->p.pos_timestamp, p.pos_timestamp);
 #endif
         return (newStatus->hasLock != hasLock || newStatus->isConnected != isConnected || newStatus->isPowerSaving !=isPowerSaving ||
                 newStatus->p.latitude_i != p.latitude_i || newStatus->p.longitude_i != p.longitude_i ||
@@ -114,7 +114,7 @@ class GPSStatus : public Status
 
         if (isDirty && p.timestamp && (newStatus->p.timestamp == p.timestamp)) {
             // We can NEVER be in two locations at the same time! (also PR #886)
-            DEBUG_MSG("BUG!! positional timestamp unchanged from prev solution\n");
+            LOG_ERROR("BUG: Positional timestamp unchanged from prev solution\n");
         }
 
         initialized = true;
@@ -126,11 +126,11 @@ class GPSStatus : public Status
         if (isDirty) {
             if (hasLock) {
                 // In debug logs, identify position by @timestamp:stage (stage 3 = notify)
-                DEBUG_MSG("New GPS pos@%x:3 lat=%f, lon=%f, alt=%d, pdop=%.2f, track=%.2f, speed=%.2f, sats=%d\n", p.timestamp,
+                LOG_DEBUG("New GPS pos@%x:3 lat=%f, lon=%f, alt=%d, pdop=%.2f, track=%.2f, speed=%.2f, sats=%d\n", p.timestamp,
                           p.latitude_i * 1e-7, p.longitude_i * 1e-7, p.altitude, p.PDOP * 1e-2, p.ground_track * 1e-5,
                           p.ground_speed * 1e-2, p.sats_in_view);
             } else
-                DEBUG_MSG("No GPS lock\n");
+                LOG_DEBUG("No GPS lock\n");
             onNewStatus.notifyObservers(this);
         }
         return 0;

src/NodeStatus.h

@@ -70,7 +70,7 @@ namespace meshtastic {
                 numTotal = newStatus->getNumTotal();
             }
             if(isDirty || newStatus->forceUpdate) {
-                DEBUG_MSG("Node status update: %d online, %d total\n", numOnline, numTotal);            
+                LOG_DEBUG("Node status update: %d online, %d total\n", numOnline, numTotal);            
                 onNewStatus.notifyObservers(this);
             }
             return 0;

src/Power.cpp

@@ -129,7 +129,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
 #else
             scaled = VBAT_RAW_TO_SCALED(raw); // defined in variant.h
 #endif
-            // DEBUG_MSG("battery gpio %d raw val=%u scaled=%u\n", BATTERY_PIN, raw, (uint32_t)(scaled));
+            // LOG_DEBUG("battery gpio %d raw val=%u scaled=%u\n", BATTERY_PIN, raw, (uint32_t)(scaled));
             last_read_value = scaled;
             return scaled;
         } else {
@@ -190,7 +190,7 @@ Power::Power() : OSThread("Power")
 bool Power::analogInit()
 {
 #ifdef BATTERY_PIN
-    DEBUG_MSG("Using analog input %d for battery level\n", BATTERY_PIN);
+    LOG_DEBUG("Using analog input %d for battery level\n", BATTERY_PIN);
 
     // disable any internal pullups
     pinMode(BATTERY_PIN, INPUT);
@@ -242,7 +242,7 @@ void Power::shutdown()
 #endif
 
 #ifdef HAS_PMU
-    DEBUG_MSG("Shutting down\n");
+    LOG_INFO("Shutting down\n");
     if(PMU) {
         PMU->setChargingLedMode(XPOWERS_CHG_LED_OFF);
         PMU->shutdown();
@@ -283,12 +283,22 @@ void Power::readPowerStatus()
         const PowerStatus powerStatus2 =
             PowerStatus(hasBattery ? OptTrue : OptFalse, batteryLevel->isVbusIn() ? OptTrue : OptFalse,
                         batteryLevel->isCharging() ? OptTrue : OptFalse, batteryVoltageMv, batteryChargePercent);
-        DEBUG_MSG("Battery: usbPower=%d, isCharging=%d, batMv=%d, batPct=%d\n", powerStatus2.getHasUSB(),
+        LOG_DEBUG("Battery: usbPower=%d, isCharging=%d, batMv=%d, batPct=%d\n", powerStatus2.getHasUSB(),
                   powerStatus2.getIsCharging(), powerStatus2.getBatteryVoltageMv(), powerStatus2.getBatteryChargePercent());
         newStatus.notifyObservers(&powerStatus2);
 #ifdef DEBUG_HEAP
-        if (lastheap != ESP.getFreeHeap()){
-            DEBUG_MSG("Heap status: %d/%d bytes free (%d), running %d threads\n", ESP.getFreeHeap(), ESP.getHeapSize(), ESP.getFreeHeap() - lastheap , concurrency::mainController.size(false));
+        if (lastheap != ESP.getFreeHeap()) {
+            LOG_DEBUG("Threads running:");
+            int running = 0;
+            for(int i = 0; i < MAX_THREADS; i++){
+                auto thread = concurrency::mainController.get(i);
+                if((thread != nullptr) && (thread->enabled)) {
+                    LOG_DEBUG(" %s", thread->ThreadName.c_str());
+                    running++;
+                }
+            }
+            LOG_DEBUG("\n");
+            LOG_DEBUG("Heap status: %d/%d bytes free (%d), running %d/%d threads\n", ESP.getFreeHeap(), ESP.getHeapSize(), ESP.getFreeHeap() - lastheap, running, concurrency::mainController.size(false));
             lastheap = ESP.getFreeHeap();
         }
 #endif
@@ -299,11 +309,11 @@ void Power::readPowerStatus()
         if (powerStatus2.getHasBattery() && !powerStatus2.getHasUSB()) {
             if (batteryLevel->getBattVoltage() < MIN_BAT_MILLIVOLTS) {
                 low_voltage_counter++;
-                DEBUG_MSG("Warning RAK4631 Low voltage counter: %d/10\n", low_voltage_counter);
+                LOG_DEBUG("Warning RAK4631 Low voltage counter: %d/10\n", low_voltage_counter);
                 if (low_voltage_counter > 10) {
                     // We can't trigger deep sleep on NRF52, it's freezing the board
                     //powerFSM.trigger(EVENT_LOW_BATTERY);
-                    DEBUG_MSG("Low voltage detected, but not triggering deep sleep\n");
+                    LOG_DEBUG("Low voltage detected, but not triggering deep sleep\n");
                 }
             } else {
                 low_voltage_counter = 0;
@@ -333,12 +343,12 @@ int32_t Power::runOnce()
         PMU->getIrqStatus();
 
         if(PMU->isVbusRemoveIrq()){
-            DEBUG_MSG("USB unplugged\n");
+            LOG_INFO("USB unplugged\n");
             powerFSM.trigger(EVENT_POWER_DISCONNECTED);
         }
 
         if (PMU->isVbusInsertIrq()) {
-            DEBUG_MSG("USB plugged In\n");
+            LOG_INFO("USB plugged In\n");
             powerFSM.trigger(EVENT_POWER_CONNECTED);
         }
 
@@ -346,20 +356,20 @@ int32_t Power::runOnce()
         Other things we could check if we cared...
 
         if (PMU->isBatChagerStartIrq()) {
-            DEBUG_MSG("Battery start charging\n");
+            LOG_DEBUG("Battery start charging\n");
         }
         if (PMU->isBatChagerDoneIrq()) {
-            DEBUG_MSG("Battery fully charged\n");
+            LOG_DEBUG("Battery fully charged\n");
         }
         if (PMU->isBatInsertIrq()) {
-            DEBUG_MSG("Battery inserted\n");
+            LOG_DEBUG("Battery inserted\n");
         }
         if (PMU->isBatRemoveIrq()) {
-            DEBUG_MSG("Battery removed\n");
+            LOG_DEBUG("Battery removed\n");
         }
         */
         if (PMU->isPekeyLongPressIrq()) {
-            DEBUG_MSG("PEK long button press\n");
+            LOG_DEBUG("PEK long button press\n");
             screen->setOn(false);
         }
 
@@ -401,22 +411,22 @@ bool Power::axpChipInit()
     if (!PMU) {
         PMU = new XPowersAXP2101(*w);
         if (!PMU->init()) {
-            DEBUG_MSG("Warning: Failed to find AXP2101 power management\n");
+            LOG_WARN("Failed to find AXP2101 power management\n");
             delete PMU;
             PMU = NULL;
         } else {
-            DEBUG_MSG("AXP2101 PMU init succeeded, using AXP2101 PMU\n");
+            LOG_INFO("AXP2101 PMU init succeeded, using AXP2101 PMU\n");
         }
     }
 
     if (!PMU) {
         PMU = new XPowersAXP192(*w);
         if (!PMU->init()) {
-            DEBUG_MSG("Warning: Failed to find AXP192 power management\n");
+            LOG_WARN("Failed to find AXP192 power management\n");
             delete PMU;
             PMU = NULL;
         } else {
-            DEBUG_MSG("AXP192 PMU init succeeded, using AXP192 PMU\n");
+            LOG_INFO("AXP192 PMU init succeeded, using AXP192 PMU\n");
         }
     }
 
@@ -538,44 +548,44 @@ bool Power::axpChipInit()
     PMU->enableVbusVoltageMeasure();
     PMU->enableBattVoltageMeasure();
 
-    DEBUG_MSG("=======================================================================\n");
+    LOG_DEBUG("=======================================================================\n");
     if (PMU->isChannelAvailable(XPOWERS_DCDC1)) {
-        DEBUG_MSG("DC1  : %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_DCDC1)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_DCDC1));
+        LOG_DEBUG("DC1  : %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_DCDC1)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_DCDC1));
     }
     if (PMU->isChannelAvailable(XPOWERS_DCDC2)) {
-        DEBUG_MSG("DC2  : %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_DCDC2)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_DCDC2));
+        LOG_DEBUG("DC2  : %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_DCDC2)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_DCDC2));
     }
     if (PMU->isChannelAvailable(XPOWERS_DCDC3)) {
-        DEBUG_MSG("DC3  : %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_DCDC3)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_DCDC3));
+        LOG_DEBUG("DC3  : %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_DCDC3)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_DCDC3));
     }
     if (PMU->isChannelAvailable(XPOWERS_DCDC4)) {
-        DEBUG_MSG("DC4  : %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_DCDC4)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_DCDC4));
+        LOG_DEBUG("DC4  : %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_DCDC4)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_DCDC4));
     }
     if (PMU->isChannelAvailable(XPOWERS_LDO2)) {
-        DEBUG_MSG("LDO2 : %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_LDO2)   ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_LDO2));
+        LOG_DEBUG("LDO2 : %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_LDO2)   ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_LDO2));
     }
     if (PMU->isChannelAvailable(XPOWERS_LDO3)) {
-        DEBUG_MSG("LDO3 : %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_LDO3)   ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_LDO3));
+        LOG_DEBUG("LDO3 : %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_LDO3)   ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_LDO3));
     }
     if (PMU->isChannelAvailable(XPOWERS_ALDO1)) {
-        DEBUG_MSG("ALDO1: %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_ALDO1)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_ALDO1));
+        LOG_DEBUG("ALDO1: %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_ALDO1)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_ALDO1));
     }
     if (PMU->isChannelAvailable(XPOWERS_ALDO2)) {
-        DEBUG_MSG("ALDO2: %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_ALDO2)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_ALDO2));
+        LOG_DEBUG("ALDO2: %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_ALDO2)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_ALDO2));
     }
     if (PMU->isChannelAvailable(XPOWERS_ALDO3)) {
-        DEBUG_MSG("ALDO3: %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_ALDO3)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_ALDO3));
+        LOG_DEBUG("ALDO3: %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_ALDO3)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_ALDO3));
     }
     if (PMU->isChannelAvailable(XPOWERS_ALDO4)) {
-        DEBUG_MSG("ALDO4: %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_ALDO4)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_ALDO4));
+        LOG_DEBUG("ALDO4: %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_ALDO4)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_ALDO4));
     }
     if (PMU->isChannelAvailable(XPOWERS_BLDO1)) {
-        DEBUG_MSG("BLDO1: %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_BLDO1)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_BLDO1));
+        LOG_DEBUG("BLDO1: %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_BLDO1)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_BLDO1));
     }
     if (PMU->isChannelAvailable(XPOWERS_BLDO2)) {
-        DEBUG_MSG("BLDO2: %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_BLDO2)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_BLDO2));
+        LOG_DEBUG("BLDO2: %s   Voltage:%u mV \n",  PMU->isPowerChannelEnable(XPOWERS_BLDO2)  ? "+" : "-",  PMU->getPowerChannelVoltage(XPOWERS_BLDO2));
     }
-    DEBUG_MSG("=======================================================================\n");
+    LOG_DEBUG("=======================================================================\n");
 
 // We can safely ignore this approach for most (or all) boards because MCU turned off
 // earlier than battery discharged to 2.6V.

src/PowerFSM.cpp

@@ -32,7 +32,7 @@ static bool isPowered()
 
 static void sdsEnter()
 {
-    DEBUG_MSG("Enter state: SDS\n");
+    LOG_INFO("Enter state: SDS\n");
     // FIXME - make sure GPS and LORA radio are off first - because we want close to zero current draw
     doDeepSleep(getConfiguredOrDefaultMs(config.power.sds_secs));
 }
@@ -41,7 +41,7 @@ extern Power *power;
 
 static void shutdownEnter()
 {
-    DEBUG_MSG("Enter state: SHUTDOWN\n");
+    LOG_INFO("Enter state: SHUTDOWN\n");
     power->shutdown();
 }
 
@@ -51,16 +51,16 @@ static uint32_t secsSlept;
 
 static void lsEnter()
 {
-    DEBUG_MSG("lsEnter begin, ls_secs=%u\n", config.power.ls_secs);
+    LOG_INFO("lsEnter begin, ls_secs=%u\n", config.power.ls_secs);
     screen->setOn(false);
     secsSlept = 0; // How long have we been sleeping this time
 
-    // DEBUG_MSG("lsEnter end\n");
+    // LOG_INFO("lsEnter end\n");
 }
 
 static void lsIdle()
 {
-    // DEBUG_MSG("lsIdle begin ls_secs=%u\n", getPref_ls_secs());
+    // LOG_INFO("lsIdle begin ls_secs=%u\n", getPref_ls_secs());
 
 #ifdef ARCH_ESP32
 
@@ -82,7 +82,7 @@ static void lsIdle()
                 wakeCause2 = doLightSleep(1); // leave led on for 1ms
 
                 secsSlept += sleepTime;
-                // DEBUG_MSG("sleeping, flash led!\n");
+                // LOG_INFO("sleeping, flash led!\n");
                 break;
 
             case ESP_SLEEP_WAKEUP_UART:
@@ -93,7 +93,7 @@ static void lsIdle()
             default:
                 // We woke for some other reason (button press, device interrupt)
                 // uint64_t status = esp_sleep_get_ext1_wakeup_status();
-                DEBUG_MSG("wakeCause2 %d\n", wakeCause2);
+                LOG_INFO("wakeCause2 %d\n", wakeCause2);
 
 #ifdef BUTTON_PIN
                 bool pressed = !digitalRead(BUTTON_PIN);
@@ -117,7 +117,7 @@ static void lsIdle()
     } else {
         // Time to stop sleeping!
         setLed(false);
-        DEBUG_MSG("reached ls_secs, servicing loop()\n");
+        LOG_INFO("Reached ls_secs, servicing loop()\n");
         powerFSM.trigger(EVENT_WAKE_TIMER);
     }
 #endif
@@ -125,7 +125,7 @@ static void lsIdle()
 
 static void lsExit()
 {
-    DEBUG_MSG("Exit state: LS\n");
+    LOG_INFO("Exit state: LS\n");
     // setGPSPower(true); // restore GPS power
     if (gps)
         gps->forceWake(true);
@@ -133,7 +133,7 @@ static void lsExit()
 
 static void nbEnter()
 {
-    DEBUG_MSG("Enter state: NB\n");
+    LOG_INFO("Enter state: NB\n");
     screen->setOn(false);
     setBluetoothEnable(false);
 
@@ -148,7 +148,7 @@ static void darkEnter()
 
 static void serialEnter()
 {
-    DEBUG_MSG("Enter state: SERIAL\n");
+    LOG_INFO("Enter state: SERIAL\n");
     setBluetoothEnable(false);
     screen->setOn(true);
     screen->print("Serial connected\n");
@@ -161,10 +161,10 @@ static void serialExit()
 
 static void powerEnter()
 {
-    DEBUG_MSG("Enter state: POWER\n");
+    LOG_INFO("Enter state: POWER\n");
     if (!isPowered()) {
         // If we got here, we are in the wrong state - we should be in powered, let that state ahndle things
-        DEBUG_MSG("Loss of power in Powered\n");
+        LOG_INFO("Loss of power in Powered\n");
         powerFSM.trigger(EVENT_POWER_DISCONNECTED);
     } else {
         screen->setOn(true);
@@ -177,7 +177,7 @@ static void powerIdle()
 {
     if (!isPowered()) {
         // If we got here, we are in the wrong state
-        DEBUG_MSG("Loss of power in Powered\n");
+        LOG_INFO("Loss of power in Powered\n");
         powerFSM.trigger(EVENT_POWER_DISCONNECTED);
     }
 }
@@ -191,7 +191,7 @@ static void powerExit()
 
 static void onEnter()
 {
-    DEBUG_MSG("Enter state: ON\n");
+    LOG_INFO("Enter state: ON\n");
     screen->setOn(true);
     setBluetoothEnable(true);
 
@@ -221,7 +221,7 @@ static void screenPress()
 
 static void bootEnter()
 {
-    DEBUG_MSG("Enter state: BOOT\n");
+    LOG_INFO("Enter state: BOOT\n");
 }
 
 State stateSHUTDOWN(shutdownEnter, NULL, NULL, "SHUTDOWN");
@@ -240,7 +240,7 @@ void PowerFSM_setup()
     bool isRouter = (config.device.role == Config_DeviceConfig_Role_ROUTER ? 1 : 0);
     bool hasPower = isPowered();
 
-    DEBUG_MSG("PowerFSM init, USB power=%d\n", hasPower ? 1 : 0);
+    LOG_INFO("PowerFSM init, USB power=%d\n", hasPower ? 1 : 0);
     powerFSM.add_timed_transition(&stateBOOT, hasPower ? &statePOWER : &stateON, 3 * 1000, NULL, "boot timeout");
 
     // wake timer expired or a packet arrived
@@ -327,9 +327,7 @@ void PowerFSM_setup()
     powerFSM.add_timed_transition(&stateON, &stateDARK, getConfiguredOrDefaultMs(config.display.screen_on_secs, default_screen_on_secs), NULL, "Screen-on timeout");
 
 #ifdef ARCH_ESP32
-    // On most boards we use light-sleep to be our main state, but on NRF52 we just stay in DARK
     State *lowPowerState = &stateLS;
-
     // We never enter light-sleep or NB states on NRF52 (because the CPU uses so little power normally)
 
     // See: https://github.com/meshtastic/firmware/issues/1071

src/PowerStatus.h

@@ -82,7 +82,7 @@ class PowerStatus : public Status
             isCharging = newStatus->isCharging;
         }
         if (isDirty) {
-            // DEBUG_MSG("Battery %dmV %d%%\n", batteryVoltageMv, batteryChargePercent);
+            // LOG_DEBUG("Battery %dmV %d%%\n", batteryVoltageMv, batteryChargePercent);
             onNewStatus.notifyObservers(this);
         }
         return 0;

src/RedirectablePrint.cpp

@@ -58,7 +58,7 @@ size_t RedirectablePrint::vprintf(const char *format, va_list arg)
     return len;
 }
 
-size_t RedirectablePrint::logDebug(const char *format, ...)
+size_t RedirectablePrint::log(const char *logLevel, const char *format, ...)
 {
     size_t r = 0;
 
@@ -86,9 +86,9 @@ size_t RedirectablePrint::logDebug(const char *format, ...)
                 int min = (hms % SEC_PER_HOUR) / SEC_PER_MIN;
                 int sec = (hms % SEC_PER_HOUR) % SEC_PER_MIN; // or hms % SEC_PER_MIN
 
-                r += printf("%02d:%02d:%02d %u ", hour, min, sec, millis() / 1000);
+                r += printf("%s | %02d:%02d:%02d %u ", logLevel, hour, min, sec, millis() / 1000);
             } else
-                r += printf("??:??:?? %u ", millis() / 1000);
+                r += printf("%s | ??:??:?? %u ", logLevel, millis() / 1000);
 
             auto thread = concurrency::OSThread::currentThread;
             if (thread) {
@@ -99,7 +99,6 @@ size_t RedirectablePrint::logDebug(const char *format, ...)
                 print("] ");
             }
         }
-
         r += vprintf(format, arg);
         va_end(arg);
 

src/RedirectablePrint.h

@@ -33,11 +33,8 @@ class RedirectablePrint : public Print
      * If the provide format string ends with a newline we assume it is the final print of a single
      * log message.  Otherwise we assume more prints will come before the log message ends.  This
      * allows you to call logDebug a few times to build up a single log message line if you wish.
-     * 
-     * FIXME, eventually add log levels (INFO, WARN, ERROR) and subsystems.  Move into 
-     * a different class.
      */
-    size_t logDebug(const char * format, ...)  __attribute__ ((format (printf, 2, 3)));
+    size_t log(const char *logLevel, const char *format, ...) __attribute__ ((format (printf, 3, 4)));
 
     /** like printf but va_list based */
     size_t vprintf(const char *format, va_list arg);

src/SerialConsole.cpp

@@ -25,7 +25,7 @@ void consolePrintf(const char *format, ...)
 #endif
 }
 
-SerialConsole::SerialConsole() : StreamAPI(&Port), RedirectablePrint(&Port)
+SerialConsole::SerialConsole() : StreamAPI(&Port), RedirectablePrint(&Port), concurrency::OSThread("SerialConsole")
 {
     assert(!console);
     console = this;
@@ -33,7 +33,7 @@ SerialConsole::SerialConsole() : StreamAPI(&Port), RedirectablePrint(&Port)
                       // setDestination(&noopPrint); for testing, try turning off 'all' debug output and see what leaks
 
     Port.begin(SERIAL_BAUD);
-#ifdef ARCH_NRF52
+#if defined(ARCH_NRF52) || defined(CONFIG_IDF_TARGET_ESP32S2) || defined(CONFIG_IDF_TARGET_ESP32S3)
     time_t timeout = millis();
     while (!Port) {
         if ((millis() - timeout) < 5000) {
@@ -46,6 +46,10 @@ SerialConsole::SerialConsole() : StreamAPI(&Port), RedirectablePrint(&Port)
     emitRebooted();
 }
 
+int32_t SerialConsole::runOnce()
+{
+    return runOncePart();
+}
 
 // For the serial port we can't really detect if any client is on the other side, so instead just look for recent messages
 bool SerialConsole::checkIsConnected()

src/SerialConsole.h

@@ -6,7 +6,7 @@
  * Provides both debug printing and, if the client starts sending protobufs to us, switches to send/receive protobufs
  * (and starts dropping debug printing - FIXME, eventually those prints should be encapsulated in protobufs).
  */
-class SerialConsole : public StreamAPI, public RedirectablePrint
+class SerialConsole : public StreamAPI, public RedirectablePrint, private concurrency::OSThread
 {
   public:
     SerialConsole();
@@ -24,6 +24,8 @@ class SerialConsole : public StreamAPI, public RedirectablePrint
         return RedirectablePrint::write(c);
     }
 
+    virtual int32_t runOnce() override;
+
   protected:
 
     /// Check the current underlying physical link to see if the client is currently connected

src/airtime.cpp

@@ -10,18 +10,18 @@ void AirTime::logAirtime(reportTypes reportType, uint32_t airtime_ms)
 {
 
     if (reportType == TX_LOG) {
-        DEBUG_MSG("AirTime - Packet transmitted : %ums\n", airtime_ms);
+        LOG_DEBUG("AirTime - Packet transmitted : %ums\n", airtime_ms);
         this->airtimes.periodTX[0] = this->airtimes.periodTX[0] + airtime_ms;
         myNodeInfo.air_period_tx[0] = myNodeInfo.air_period_tx[0] + airtime_ms;
 
         this->utilizationTX[this->getPeriodUtilHour()] = this->utilizationTX[this->getPeriodUtilHour()] + airtime_ms;
 
     } else if (reportType == RX_LOG) {
-        DEBUG_MSG("AirTime - Packet received : %ums\n", airtime_ms);
+        LOG_DEBUG("AirTime - Packet received : %ums\n", airtime_ms);
         this->airtimes.periodRX[0] = this->airtimes.periodRX[0] + airtime_ms;
         myNodeInfo.air_period_rx[0] = myNodeInfo.air_period_rx[0] + airtime_ms;
     } else if (reportType == RX_ALL_LOG) {
-        DEBUG_MSG("AirTime - Packet received (noise?) : %ums\n", airtime_ms);
+        LOG_DEBUG("AirTime - Packet received (noise?) : %ums\n", airtime_ms);
         this->airtimes.periodRX_ALL[0] = this->airtimes.periodRX_ALL[0] + airtime_ms;
     }
 
@@ -46,7 +46,7 @@ void AirTime::airtimeRotatePeriod()
 {
 
     if (this->airtimes.lastPeriodIndex != this->currentPeriodIndex()) {
-        DEBUG_MSG("Rotating airtimes to a new period = %u\n", this->currentPeriodIndex());
+        LOG_DEBUG("Rotating airtimes to a new period = %u\n", this->currentPeriodIndex());
 
         for (int i = PERIODS_TO_LOG - 2; i >= 0; --i) {
             this->airtimes.periodTX[i + 1] = this->airtimes.periodTX[i];
@@ -101,7 +101,7 @@ float AirTime::channelUtilizationPercent()
     uint32_t sum = 0;
     for (uint32_t i = 0; i < CHANNEL_UTILIZATION_PERIODS; i++) {
         sum += this->channelUtilization[i];
-        // DEBUG_MSG("ChanUtilArray %u %u\n", i, this->channelUtilization[i]);
+        // LOG_DEBUG("ChanUtilArray %u %u\n", i, this->channelUtilization[i]);
     }
 
     return (float(sum) / float(CHANNEL_UTILIZATION_PERIODS * 10 * 1000)) * 100;
@@ -189,13 +189,13 @@ int32_t AirTime::runOnce()
         myNodeInfo.air_util_tx = airTime->utilizationTXPercent();
     }
 /*
-    DEBUG_MSG("utilPeriodTX %d TX Airtime %3.2f%\n", utilPeriodTX, airTime->utilizationTXPercent());
+    LOG_DEBUG("utilPeriodTX %d TX Airtime %3.2f%\n", utilPeriodTX, airTime->utilizationTXPercent());
     for (uint32_t i = 0; i < MINUTES_IN_HOUR; i++) {
-        DEBUG_MSG(
+        LOG_DEBUG(
             "%d,", this->utilizationTX[i]
             );
     }
-    DEBUG_MSG("\n");
+    LOG_DEBUG("\n");
 */
     return (1000 * 1);
 }

src/concurrency/InterruptableDelay.cpp

@@ -13,12 +13,12 @@ InterruptableDelay::~InterruptableDelay() {}
  */
 bool InterruptableDelay::delay(uint32_t msec)
 {
-    // DEBUG_MSG("delay %u ", msec);
+    // LOG_DEBUG("delay %u ", msec);
 
     // sem take will return false if we timed out (i.e. were not interrupted)
     bool r = semaphore.take(msec);
 
-    // DEBUG_MSG("interrupt=%d\n", r);
+    // LOG_DEBUG("interrupt=%d\n", r);
     return !r;
 }
 

src/concurrency/NotifiedWorkerThread.cpp

@@ -33,11 +33,11 @@ IRAM_ATTR bool NotifiedWorkerThread::notifyCommon(uint32_t v, bool overwrite)
 
         notification = v;
         if (debugNotification)
-            DEBUG_MSG("setting notification %d\n", v);
+            LOG_DEBUG("setting notification %d\n", v);
         return true;
     } else {
         if (debugNotification)
-            DEBUG_MSG("dropping notification %d\n", v);
+            LOG_DEBUG("dropping notification %d\n", v);
         return false;
     }
 }
@@ -66,7 +66,7 @@ bool NotifiedWorkerThread::notifyLater(uint32_t delay, uint32_t v, bool overwrit
     if (didIt) {                   // If we didn't already have something queued, override the delay to be larger
         setIntervalFromNow(delay); // a new version of setInterval relative to the current time
         if (debugNotification)
-            DEBUG_MSG("delaying notification %u\n", delay);
+            LOG_DEBUG("delaying notification %u\n", delay);
     }
 
     return didIt;

src/concurrency/OSThread.cpp

@@ -61,21 +61,31 @@ bool OSThread::shouldRun(unsigned long time)
     bool r = Thread::shouldRun(time);
 
     if (showRun && r)
-        DEBUG_MSG("Thread %s: run\n", ThreadName.c_str());
+        LOG_DEBUG("Thread %s: run\n", ThreadName.c_str());
 
     if (showWaiting && enabled && !r)
-        DEBUG_MSG("Thread %s: wait %lu\n", ThreadName.c_str(), interval);
+        LOG_DEBUG("Thread %s: wait %lu\n", ThreadName.c_str(), interval);
 
     if (showDisabled && !enabled)
-        DEBUG_MSG("Thread %s: disabled\n", ThreadName.c_str());
+        LOG_DEBUG("Thread %s: disabled\n", ThreadName.c_str());
 
     return r;
 }
 
 void OSThread::run()
 {
+#ifdef DEBUG_HEAP
+    auto heap = ESP.getFreeHeap();
+#endif    
     currentThread = this;
     auto newDelay = runOnce();
+#ifdef DEBUG_HEAP
+    auto newHeap = ESP.getFreeHeap();
+    if (newHeap < heap)
+        LOG_DEBUG("------ Thread %s leaked heap %d -> %d (%d) ------\n", ThreadName.c_str(), heap, newHeap, newHeap - heap);
+    if (heap < newHeap)
+        LOG_DEBUG("++++++ Thread %s freed heap %d -> %d (%d) ++++++\n", ThreadName.c_str(), heap, newHeap, newHeap - heap);
+#endif
 
     runned();
 
@@ -85,6 +95,14 @@ void OSThread::run()
     currentThread = NULL;
 }
 
+int32_t OSThread::disable() 
+{
+    enabled = false;
+    setInterval(INT32_MAX);
+    
+    return INT32_MAX;
+}
+
 /**
  * This flag is set **only** when setup() starts, to provide a way for us to check for sloppy static constructor calls.
  * Call assertIsSetup() to force a crash if someone tries to create an instance too early.

src/concurrency/OSThread.h

@@ -53,6 +53,8 @@ class OSThread : public Thread
 
     static void setup();
 
+    int32_t disable();
+
     /**
      * Wait a specified number msecs starting from the current time (rather than the last time we were run)
      */

src/configuration.h

@@ -114,6 +114,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define SHTC3_ADDR 0x70
 #define LPS22HB_ADDR 0x5C
 #define LPS22HB_ADDR_ALT 0x5D
+#define SHT31_ADDR 0x44
 
 // -----------------------------------------------------------------------------
 // Security

src/detect/axpDebug.h

@@ -3,13 +3,13 @@
 uint32_t axpDebugRead()
 {
   axp.debugCharging();
-  DEBUG_MSG("vbus current %f\n", axp.getVbusCurrent());
-  DEBUG_MSG("charge current %f\n", axp.getBattChargeCurrent());
-  DEBUG_MSG("bat voltage %f\n", axp.getBattVoltage());
-  DEBUG_MSG("batt pct %d\n", axp.getBattPercentage());
-  DEBUG_MSG("is battery connected %d\n", axp.isBatteryConnect());
-  DEBUG_MSG("is USB connected %d\n", axp.isVBUSPlug());
-  DEBUG_MSG("is charging %d\n", axp.isChargeing());
+  LOG_DEBUG("vbus current %f\n", axp.getVbusCurrent());
+  LOG_DEBUG("charge current %f\n", axp.getBattChargeCurrent());
+  LOG_DEBUG("bat voltage %f\n", axp.getBattVoltage());
+  LOG_DEBUG("batt pct %d\n", axp.getBattPercentage());
+  LOG_DEBUG("is battery connected %d\n", axp.isBatteryConnect());
+  LOG_DEBUG("is USB connected %d\n", axp.isVBUSPlug());
+  LOG_DEBUG("is charging %d\n", axp.isChargeing());
 
   return 30 * 1000;
 }

src/detect/einkScan.h

@@ -52,9 +52,9 @@ void scanEInkDevice(void)
     d_writeCommand(0x20);
     eink_found = (d_waitWhileBusy(150) > 0) ? true : false;
     if(eink_found)
-       DEBUG_MSG("EInk display found\n");
+      LOG_DEBUG("EInk display found\n");
     else
-       DEBUG_MSG("EInk display not found\n");
+      LOG_DEBUG("EInk display not found\n");
     SPI1.end();
 }
 #endif

src/detect/i2cScan.h

@@ -15,30 +15,30 @@ void printATECCInfo()
 #if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
     atecc.readConfigZone(false);
 
-    DEBUG_MSG("ATECC608B Serial Number: ");
+    LOG_DEBUG("ATECC608B Serial Number: ");
     for (int i = 0 ; i < 9 ; i++) {
-        DEBUG_MSG("%02x",atecc.serialNumber[i]);
+        LOG_DEBUG("%02x",atecc.serialNumber[i]);
     }
 
-    DEBUG_MSG(", Rev Number: ");
+    LOG_DEBUG(", Rev Number: ");
     for (int i = 0 ; i < 4 ; i++) {
-        DEBUG_MSG("%02x",atecc.revisionNumber[i]);
+        LOG_DEBUG("%02x",atecc.revisionNumber[i]);
     }
-    DEBUG_MSG("\n");
+    LOG_DEBUG("\n");
 
-    DEBUG_MSG("ATECC608B Config %s",atecc.configLockStatus ? "Locked" : "Unlocked");
-    DEBUG_MSG(", Data %s",atecc.dataOTPLockStatus ? "Locked" : "Unlocked");
-    DEBUG_MSG(", Slot 0 %s\n",atecc.slot0LockStatus ? "Locked" : "Unlocked");
+    LOG_DEBUG("ATECC608B Config %s",atecc.configLockStatus ? "Locked" : "Unlocked");
+    LOG_DEBUG(", Data %s",atecc.dataOTPLockStatus ? "Locked" : "Unlocked");
+    LOG_DEBUG(", Slot 0 %s\n",atecc.slot0LockStatus ? "Locked" : "Unlocked");
 
     if (atecc.configLockStatus && atecc.dataOTPLockStatus && atecc.slot0LockStatus) {
         if (atecc.generatePublicKey() == false) {
-            DEBUG_MSG("ATECC608B Error generating public key\n");
+            LOG_DEBUG("ATECC608B Error generating public key\n");
         } else {
-            DEBUG_MSG("ATECC608B Public Key: ");
+            LOG_DEBUG("ATECC608B Public Key: ");
             for (int i = 0 ; i < 64 ; i++) {
-                DEBUG_MSG("%02x",atecc.publicKey64Bytes[i]);
+                LOG_DEBUG("%02x",atecc.publicKey64Bytes[i]);
             }
-            DEBUG_MSG("\n");
+            LOG_DEBUG("\n");
         }
     }
 #endif
@@ -51,7 +51,7 @@ uint16_t getRegisterValue(uint8_t address, uint8_t reg, uint8_t length) {
     Wire.endTransmission();
     delay(20);
     Wire.requestFrom(address, length);
-    DEBUG_MSG("Wire.available() = %d\n", Wire.available());
+    LOG_DEBUG("Wire.available() = %d\n", Wire.available());
     if (Wire.available() == 2) {
         // Read MSB, then LSB
         value = (uint16_t)Wire.read() << 8;  
@@ -86,7 +86,7 @@ uint8_t oled_probe(byte addr)
         }
         c++;
     } while ((r != r_prev) && (c < 4));
-    DEBUG_MSG("0x%x subtype probed in %i tries \n", r, c);
+    LOG_DEBUG("0x%x subtype probed in %i tries \n", r, c);
     return o_probe;
 }
 
@@ -99,7 +99,7 @@ void scanI2Cdevice()
         Wire.beginTransmission(addr);
         err = Wire.endTransmission();
         if (err == 0) {
-            DEBUG_MSG("I2C device found at address 0x%x\n", addr);
+            LOG_DEBUG("I2C device found at address 0x%x\n", addr);
 
             nDevices++;
 
@@ -107,20 +107,20 @@ void scanI2Cdevice()
                 screen_found = addr;
                 screen_model = oled_probe(addr);
                 if (screen_model == 1) {
-                    DEBUG_MSG("ssd1306 display found\n");
+                    LOG_INFO("ssd1306 display found\n");
                 } else if (screen_model == 2) {
-                    DEBUG_MSG("sh1106 display found\n");
+                    LOG_INFO("sh1106 display found\n");
                 } else {
-                    DEBUG_MSG("unknown display found\n");
+                    LOG_INFO("unknown display found\n");
                 }
             }
 #if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
             if (addr == ATECC608B_ADDR) {
                 keystore_found = addr;
                 if (atecc.begin(keystore_found) == true) {
-                    DEBUG_MSG("ATECC608B initialized\n");
+                    LOG_INFO("ATECC608B initialized\n");
                 } else {
-                    DEBUG_MSG("ATECC608B initialization failed\n");
+                    LOG_WARN("ATECC608B initialization failed\n");
                 }
                 printATECCInfo();
             }
@@ -128,7 +128,7 @@ void scanI2Cdevice()
 #ifdef RV3028_RTC
             if (addr == RV3028_RTC){
                 rtc_found = addr;
-                DEBUG_MSG("RV3028 RTC found\n");
+                LOG_INFO("RV3028 RTC found\n");
                 Melopero_RV3028 rtc;
                 rtc.initI2C();
                 rtc.writeToRegister(0x35,0x07); // no Clkout
@@ -138,7 +138,7 @@ void scanI2Cdevice()
 #ifdef PCF8563_RTC
             if (addr == PCF8563_RTC){
                 rtc_found = addr;
-                DEBUG_MSG("PCF8563 RTC found\n");
+                LOG_INFO("PCF8563 RTC found\n");
             }
 #endif
             if (addr == CARDKB_ADDR) {
@@ -146,82 +146,86 @@ void scanI2Cdevice()
                 // Do we have the RAK14006 instead?
                 registerValue = getRegisterValue(addr, 0x04, 1);
                 if (registerValue == 0x02) { // KEYPAD_VERSION
-                    DEBUG_MSG("RAK14004 found\n");
+                    LOG_INFO("RAK14004 found\n");
                     kb_model = 0x02;
                 } else {
-                    DEBUG_MSG("m5 cardKB found\n");
+                    LOG_INFO("m5 cardKB found\n");
                     kb_model = 0x00;
                 }
             }
             if (addr == ST7567_ADDRESS) {
                 screen_found = addr;
-                DEBUG_MSG("st7567 display found\n");
+                LOG_INFO("st7567 display found\n");
             }
 #ifdef HAS_PMU
             if (addr == XPOWERS_AXP192_AXP2101_ADDRESS) {
                 pmu_found = true;
-                DEBUG_MSG("axp192/axp2101 PMU found\n");
+                LOG_INFO("axp192/axp2101 PMU found\n");
             }
 #endif
             if (addr == BME_ADDR || addr == BME_ADDR_ALTERNATE) {
                 registerValue = getRegisterValue(addr, 0xD0, 1); // GET_ID
                 if (registerValue == 0x61) {
-                    DEBUG_MSG("BME-680 sensor found at address 0x%x\n", (uint8_t)addr);
+                    LOG_INFO("BME-680 sensor found at address 0x%x\n", (uint8_t)addr);
                     nodeTelemetrySensorsMap[TelemetrySensorType_BME680] = addr;
                 } else if (registerValue == 0x60) {
-                    DEBUG_MSG("BME-280 sensor found at address 0x%x\n", (uint8_t)addr);
+                    LOG_INFO("BME-280 sensor found at address 0x%x\n", (uint8_t)addr);
                     nodeTelemetrySensorsMap[TelemetrySensorType_BME280] = addr;
                 } else {
-                    DEBUG_MSG("BMP-280 sensor found at address 0x%x\n", (uint8_t)addr);
+                    LOG_INFO("BMP-280 sensor found at address 0x%x\n", (uint8_t)addr);
                     nodeTelemetrySensorsMap[TelemetrySensorType_BMP280] = addr;
                 }
             }
             if (addr == INA_ADDR || addr == INA_ADDR_ALTERNATE) {
                 registerValue = getRegisterValue(addr, 0xFE, 2);
-                DEBUG_MSG("Register MFG_UID: 0x%x\n", registerValue);
+                LOG_DEBUG("Register MFG_UID: 0x%x\n", registerValue);
                 if (registerValue == 0x5449) {
-                    DEBUG_MSG("INA260 sensor found at address 0x%x\n", (uint8_t)addr);
+                    LOG_INFO("INA260 sensor found at address 0x%x\n", (uint8_t)addr);
                     nodeTelemetrySensorsMap[TelemetrySensorType_INA260] = addr;
                 } else { // Assume INA219 if INA260 ID is not found
-                    DEBUG_MSG("INA219 sensor found at address 0x%x\n", (uint8_t)addr);
+                    LOG_INFO("INA219 sensor found at address 0x%x\n", (uint8_t)addr);
                     nodeTelemetrySensorsMap[TelemetrySensorType_INA219] = addr;
                 }
             }
             if (addr == MCP9808_ADDR) {
                 nodeTelemetrySensorsMap[TelemetrySensorType_MCP9808] = addr;
-                DEBUG_MSG("MCP9808 sensor found\n");
+                LOG_INFO("MCP9808 sensor found\n");
+            }
+            if (addr == SHT31_ADDR) {
+                LOG_INFO("SHT31 sensor found\n");
+                nodeTelemetrySensorsMap[TelemetrySensorType_SHT31] = addr;
             }
             if (addr == SHTC3_ADDR) {
-                DEBUG_MSG("SHTC3 sensor found\n");
+                LOG_INFO("SHTC3 sensor found\n");
                 nodeTelemetrySensorsMap[TelemetrySensorType_SHTC3] = addr;
             }
             if (addr == LPS22HB_ADDR || addr == LPS22HB_ADDR_ALT) {
-                DEBUG_MSG("LPS22HB sensor found\n");
+                LOG_INFO("LPS22HB sensor found\n");
                 nodeTelemetrySensorsMap[TelemetrySensorType_LPS22] = addr;
             }
 
             // High rate sensors, will be processed internally
             if (addr == QMC6310_ADDR) {
-                DEBUG_MSG("QMC6310 Highrate 3-Axis magnetic sensor found\n");
+                LOG_INFO("QMC6310 Highrate 3-Axis magnetic sensor found\n");
                 nodeTelemetrySensorsMap[TelemetrySensorType_QMC6310] = addr;
             }
             if (addr == QMI8658_ADDR) {
-                DEBUG_MSG("QMI8658 Highrate 6-Axis inertial measurement sensor found\n");
+                LOG_INFO("QMI8658 Highrate 6-Axis inertial measurement sensor found\n");
                 nodeTelemetrySensorsMap[TelemetrySensorType_QMI8658] = addr;
             }
             if (addr == QMC5883L_ADDR) {
-                DEBUG_MSG("QMC5883L Highrate 3-Axis magnetic sensor found\n");
+                LOG_INFO("QMC5883L Highrate 3-Axis magnetic sensor found\n");
                 nodeTelemetrySensorsMap[TelemetrySensorType_QMC5883L] = addr;
             }
         } else if (err == 4) {
-            DEBUG_MSG("Unknow error at address 0x%x\n", addr);
+            LOG_ERROR("Unknow error at address 0x%x\n", addr);
         }
     }
 
     if (nDevices == 0)
-        DEBUG_MSG("No I2C devices found\n");
+        LOG_INFO("No I2C devices found\n");
     else
-        DEBUG_MSG("%i I2C devices found\n",nDevices);
+        LOG_INFO("%i I2C devices found\n",nDevices);
 }
 #else
 void scanI2Cdevice() {}

src/gps/GPS.cpp

@@ -203,7 +203,7 @@ if (!config.position.tx_gpio)
                                         0x80, 0x25, 0x00, 0x00, 0x07, 0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00, 0x91, 0xAF};
                 _serial_gps->write(_message_nmea, sizeof(_message_nmea));
                 if (!getACK(0x06, 0x00)) {
-                    DEBUG_MSG("WARNING: Unable to enable NMEA Mode.\n");
+                    LOG_WARN("Unable to enable NMEA Mode.\n");
                     return true;
                 }  
             */
@@ -214,7 +214,7 @@ if (!config.position.tx_gpio)
             byte _message_GGL[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x01, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x05, 0x3A};
             _serial_gps->write(_message_GGL, sizeof(_message_GGL));
             if (!getACK(0x06, 0x01)) {
-                DEBUG_MSG("WARNING: Unable to disable NMEA GGL.\n");
+                LOG_WARN("Unable to disable NMEA GGL.\n");
                 return true;
             }
 
@@ -222,7 +222,7 @@ if (!config.position.tx_gpio)
             byte _message_GSA[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x02, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x06, 0x41};
             _serial_gps->write(_message_GSA, sizeof(_message_GSA));
             if (!getACK(0x06, 0x01)) {
-                DEBUG_MSG("WARNING: Unable to disable NMEA GSA.\n");
+                LOG_WARN("Unable to disable NMEA GSA.\n");
                 return true;
             }
 
@@ -230,7 +230,7 @@ if (!config.position.tx_gpio)
             byte _message_GSV[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x03, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x07, 0x48};
             _serial_gps->write(_message_GSV, sizeof(_message_GSV));
             if (!getACK(0x06, 0x01)) {
-                DEBUG_MSG("WARNING: Unable to disable NMEA GSV.\n");
+                LOG_WARN("Unable to disable NMEA GSV.\n");
                 return true;
             }
 
@@ -238,7 +238,7 @@ if (!config.position.tx_gpio)
             byte _message_VTG[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x05, 0x01, 0x00, 0x01, 0x01, 0x01, 0x01, 0x09, 0x56};
             _serial_gps->write(_message_VTG, sizeof(_message_VTG));
             if (!getACK(0x06, 0x01)) {
-                DEBUG_MSG("WARNING: Unable to disable NMEA VTG.\n");
+                LOG_WARN("Unable to disable NMEA VTG.\n");
                 return true;
             }
 
@@ -246,7 +246,7 @@ if (!config.position.tx_gpio)
             byte _message_RMC[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x04, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x09, 0x54};
             _serial_gps->write(_message_RMC, sizeof(_message_RMC));
             if (!getACK(0x06, 0x01)) {
-                DEBUG_MSG("WARNING: Unable to enable NMEA RMC.\n");
+                LOG_WARN("Unable to enable NMEA RMC.\n");
                 return true;
             }
 
@@ -254,7 +254,7 @@ if (!config.position.tx_gpio)
             byte _message_GGA[] = {0xB5, 0x62, 0x06, 0x01, 0x08, 0x00, 0xF0, 0x00, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x05, 0x38};
             _serial_gps->write(_message_GGA, sizeof(_message_GGA));
             if (!getACK(0x06, 0x01)) {
-                DEBUG_MSG("WARNING: Unable to enable NMEA GGA.\n");
+                LOG_WARN("Unable to enable NMEA GGA.\n");
             }
         }
     }
@@ -361,12 +361,12 @@ void GPS::setNumSatellites(uint8_t n)
 void GPS::setAwake(bool on)
 {
     if (!wakeAllowed && on) {
-        DEBUG_MSG("Inhibiting because !wakeAllowed\n");
+        LOG_WARN("Inhibiting because !wakeAllowed\n");
         on = false;
     }
 
     if (isAwake != on) {
-        DEBUG_MSG("WANT GPS=%d\n", on);
+        LOG_DEBUG("WANT GPS=%d\n", on);
         if (on) {
             lastWakeStartMsec = millis();
             wake();
@@ -412,7 +412,7 @@ void GPS::publishUpdate()
         shouldPublish = false;
 
         // In debug logs, identify position by @timestamp:stage (stage 2 = publish)
-        DEBUG_MSG("publishing pos@%x:2, hasVal=%d, GPSlock=%d\n", p.timestamp, hasValidLocation, hasLock());
+        LOG_DEBUG("publishing pos@%x:2, hasVal=%d, GPSlock=%d\n", p.timestamp, hasValidLocation, hasLock());
 
         // Notify any status instances that are observing us
         const meshtastic::GPSStatus status = meshtastic::GPSStatus(hasValidLocation, isConnected(), isPowerSaving(), p);
@@ -429,7 +429,7 @@ int32_t GPS::runOnce()
         if((config.position.gps_enabled == 1) && (gnssModel == GNSS_MODEL_UBLOX)){
             // reset the GPS on next bootup
             if(devicestate.did_gps_reset && (millis() > 60000) && !hasFlow()) {
-                DEBUG_MSG("GPS is not communicating, trying factory reset on next bootup.\n");
+                LOG_DEBUG("GPS is not communicating, trying factory reset on next bootup.\n");
                 devicestate.did_gps_reset = false;
                 nodeDB.saveDeviceStateToDisk();
             }
@@ -447,7 +447,7 @@ int32_t GPS::runOnce()
 
     // While we are awake
     if (isAwake) {
-        // DEBUG_MSG("looking for location\n");
+        // LOG_DEBUG("looking for location\n");
         if ((now - lastWhileActiveMsec) > 5000) {
             lastWhileActiveMsec = now;
             whileActive();
@@ -462,7 +462,7 @@ int32_t GPS::runOnce()
 
         bool gotLoc = lookForLocation();
         if (gotLoc && !hasValidLocation) { // declare that we have location ASAP
-            DEBUG_MSG("hasValidLocation RISING EDGE\n");
+            LOG_DEBUG("hasValidLocation RISING EDGE\n");
             hasValidLocation = true;
             shouldPublish = true;
         }
@@ -473,13 +473,13 @@ int32_t GPS::runOnce()
         bool tooLong = wakeTime != UINT32_MAX && (now - lastWakeStartMsec) > wakeTime;
 
         // Once we get a location we no longer desperately want an update
-        // DEBUG_MSG("gotLoc %d, tooLong %d, gotTime %d\n", gotLoc, tooLong, gotTime);
+        // LOG_DEBUG("gotLoc %d, tooLong %d, gotTime %d\n", gotLoc, tooLong, gotTime);
         if ((gotLoc && gotTime) || tooLong) {
 
             if (tooLong) {
                 // we didn't get a location during this ack window, therefore declare loss of lock
                 if (hasValidLocation) {
-                    DEBUG_MSG("hasValidLocation FALLING EDGE (last read: %d)\n", gotLoc);
+                    LOG_DEBUG("hasValidLocation FALLING EDGE (last read: %d)\n", gotLoc);
                 }
                 p = Position_init_default;
                 hasValidLocation = false;
@@ -501,7 +501,7 @@ int32_t GPS::runOnce()
 void GPS::forceWake(bool on)
 {
     if (on) {
-        DEBUG_MSG("Allowing GPS lock\n");
+        LOG_DEBUG("Allowing GPS lock\n");
         // lastSleepStartMsec = 0; // Force an update ASAP
         wakeAllowed = true;
     } else {
@@ -516,7 +516,7 @@ void GPS::forceWake(bool on)
 /// Prepare the GPS for the cpu entering deep or light sleep, expect to be gone for at least 100s of msecs
 int GPS::prepareSleep(void *unused)
 {
-    DEBUG_MSG("GPS prepare sleep!\n");
+    LOG_INFO("GPS prepare sleep!\n");
     forceWake(false);
 
     return 0;
@@ -525,7 +525,7 @@ int GPS::prepareSleep(void *unused)
 /// Prepare the GPS for the cpu entering deep or light sleep, expect to be gone for at least 100s of msecs
 int GPS::prepareDeepSleep(void *unused)
 {
-    DEBUG_MSG("GPS deep sleep!\n");
+    LOG_INFO("GPS deep sleep!\n");
 
     // For deep sleep we also want abandon any lock attempts (because we want minimum power)
     getSleepTime();
@@ -568,7 +568,7 @@ GnssModel_t GPS::probe()
             if(index != -1){
                 ver = ver.substring(index);
                 if (ver.startsWith("$GPTXT,01,01,02")) {
-                    DEBUG_MSG("L76K GNSS init succeeded, using L76K GNSS Module\n");
+                    LOG_INFO("L76K GNSS init succeeded, using L76K GNSS Module\n");
                     return GNSS_MODEL_MTK;
                 }
             }
@@ -580,7 +580,7 @@ GnssModel_t GPS::probe()
     _serial_gps->write(cfg_rate, sizeof(cfg_rate));
     // Check that the returned response class and message ID are correct
     if (!getAck(buffer, 256, 0x06, 0x08)) {
-        DEBUG_MSG("Warning: Failed to find UBlox & MTK GNSS Module\n");
+        LOG_WARN("Failed to find UBlox & MTK GNSS Module\n");
         return GNSS_MODEL_UNKONW;
     } 
 
@@ -611,12 +611,12 @@ GnssModel_t GPS::probe()
                 break;
         }
 
-        DEBUG_MSG("Module Info : \n");
-        DEBUG_MSG("Soft version: %s\n",info.swVersion);
-        DEBUG_MSG("Hard version: %s\n",info.hwVersion);
-        DEBUG_MSG("Extensions:%d\n",info.extensionNo);
+        LOG_DEBUG("Module Info : \n");
+        LOG_DEBUG("Soft version: %s\n",info.swVersion);
+        LOG_DEBUG("Hard version: %s\n",info.hwVersion);
+        LOG_DEBUG("Extensions:%d\n",info.extensionNo);
         for (int i = 0; i < info.extensionNo; i++) {
-            DEBUG_MSG("  %s\n",info.extension[i]);
+            LOG_DEBUG("  %s\n",info.extension[i]);
         }
 
         memset(buffer,0,sizeof(buffer));
@@ -625,15 +625,15 @@ GnssModel_t GPS::probe()
         for (int i = 0; i < info.extensionNo; ++i) {
             if (!strncmp(info.extension[i], "OD=", 3)) {
                 strcpy((char *)buffer, &(info.extension[i][3]));
-                DEBUG_MSG("GetModel:%s\n",(char *)buffer);
+                LOG_DEBUG("GetModel:%s\n",(char *)buffer);
             }
         }
     }
 
     if (strlen((char*)buffer)) {
-        DEBUG_MSG("UBlox GNSS init succeeded, using UBlox %s GNSS Module\n" , buffer);
+        LOG_INFO("UBlox GNSS init succeeded, using UBlox %s GNSS Module\n" , buffer);
     }else{
-        DEBUG_MSG("UBlox GNSS init succeeded, using UBlox GNSS Module\n");
+        LOG_INFO("UBlox GNSS init succeeded, using UBlox GNSS Module\n");
     }
 
     return GNSS_MODEL_UBLOX;
@@ -652,9 +652,9 @@ GPS *createGps()
 #else
     if (config.position.gps_enabled) {
 #ifdef GPS_ALTITUDE_HAE
-        DEBUG_MSG("Using HAE altitude model\n");
+        LOG_DEBUG("Using HAE altitude model\n");
 #else
-        DEBUG_MSG("Using MSL altitude model\n");
+        LOG_DEBUG("Using MSL altitude model\n");
 #endif
         if (GPS::_serial_gps) {
             // Some boards might have only the TX line from the GPS connected, in that case, we can't configure it at all.  Just

src/gps/NMEAGPS.cpp

@@ -53,9 +53,9 @@ bool NMEAGPS::setupGPS()
     // see NMEAGPS.h
     gsafixtype.begin(reader, NMEA_MSG_GXGSA, 2);
     gsapdop.begin(reader, NMEA_MSG_GXGSA, 15);
-    DEBUG_MSG("Using " NMEA_MSG_GXGSA " for 3DFIX and PDOP\n");
+    LOG_DEBUG("Using " NMEA_MSG_GXGSA " for 3DFIX and PDOP\n");
 #else
-    DEBUG_MSG("GxGSA NOT available\n");
+    LOG_DEBUG("GxGSA NOT available\n");
 #endif
 
     return true;
@@ -85,7 +85,7 @@ The Unix epoch (or Unix time or POSIX time or Unix timestamp) is the number of s
         t.tm_year = d.year() - 1900;
         t.tm_isdst = false;
         if (t.tm_mon > -1){
-            DEBUG_MSG("NMEA GPS time %02d-%02d-%02d %02d:%02d:%02d\n", d.year(), d.month(), t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec);
+            LOG_DEBUG("NMEA GPS time %02d-%02d-%02d %02d:%02d:%02d\n", d.year(), d.month(), t.tm_mday, t.tm_hour, t.tm_min, t.tm_sec);
             perhapsSetRTC(RTCQualityGPS, t);
             return true;
         } else
@@ -109,7 +109,7 @@ bool NMEAGPS::lookForLocation()
 
 #ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
     fixType = atoi(gsafixtype.value());  // will set to zero if no data
-    // DEBUG_MSG("FIX QUAL=%d, TYPE=%d\n", fixQual, fixType);
+    // LOG_DEBUG("FIX QUAL=%d, TYPE=%d\n", fixQual, fixType);
 #endif
 
     // check if GPS has an acceptable lock
@@ -117,7 +117,7 @@ bool NMEAGPS::lookForLocation()
         return false;
 
 #ifdef GPS_EXTRAVERBOSE
-    DEBUG_MSG("AGE: LOC=%d FIX=%d DATE=%d TIME=%d\n", 
+    LOG_DEBUG("AGE: LOC=%d FIX=%d DATE=%d TIME=%d\n", 
                 reader.location.age(), 
 #ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
                 gsafixtype.age(),
@@ -137,7 +137,7 @@ bool NMEAGPS::lookForLocation()
             (reader.time.age() < GPS_SOL_EXPIRY_MS) &&
             (reader.date.age() < GPS_SOL_EXPIRY_MS)))
     {
-        DEBUG_MSG("SOME data is TOO OLD: LOC %u, TIME %u, DATE %u\n", reader.location.age(), reader.time.age(), reader.date.age());
+        LOG_WARN("SOME data is TOO OLD: LOC %u, TIME %u, DATE %u\n", reader.location.age(), reader.time.age(), reader.date.age());
         return false;
     }
 
@@ -151,13 +151,13 @@ bool NMEAGPS::lookForLocation()
     // Bail out EARLY to avoid overwriting previous good data (like #857)
     if (toDegInt(loc.lat) > 900000000) {
 #ifdef GPS_EXTRAVERBOSE        
-        DEBUG_MSG("Bail out EARLY on LAT %i\n",toDegInt(loc.lat));
+        LOG_DEBUG("Bail out EARLY on LAT %i\n",toDegInt(loc.lat));
 #endif
         return false;
     }
     if (toDegInt(loc.lng) > 1800000000) {
 #ifdef GPS_EXTRAVERBOSE        
-        DEBUG_MSG("Bail out EARLY on LNG %i\n",toDegInt(loc.lng));
+        LOG_DEBUG("Bail out EARLY on LNG %i\n",toDegInt(loc.lng));
 #endif
         return false;
     }
@@ -168,7 +168,7 @@ bool NMEAGPS::lookForLocation()
 #ifndef TINYGPS_OPTION_NO_CUSTOM_FIELDS
     p.HDOP = reader.hdop.value();
     p.PDOP = TinyGPSPlus::parseDecimal(gsapdop.value());
-    // DEBUG_MSG("PDOP=%d, HDOP=%d\n", p.PDOP, p.HDOP);
+    // LOG_DEBUG("PDOP=%d, HDOP=%d\n", p.PDOP, p.HDOP);
 #else
     // FIXME! naive PDOP emulation (assumes VDOP==HDOP)
     // correct formula is PDOP = SQRT(HDOP^2 + VDOP^2)
@@ -212,7 +212,7 @@ bool NMEAGPS::lookForLocation()
         if (reader.course.value() < 36000) {  // sanity check
             p.ground_track = reader.course.value() * 1e3; // Scale the heading (in degrees * 10^-2) to match the expected degrees * 10^-5
         } else {
-            DEBUG_MSG("BOGUS course.value() REJECTED: %d\n",
+            LOG_WARN("BOGUS course.value() REJECTED: %d\n",
                         reader.course.value());
         }
     }
@@ -251,7 +251,7 @@ bool NMEAGPS::whileIdle()
     // First consume any chars that have piled up at the receiver
     while (_serial_gps->available() > 0) {
         int c = _serial_gps->read();
-        // DEBUG_MSG("%c", c);
+        // LOG_DEBUG("%c", c);
         isValid |= reader.encode(c);
     }
 

src/gps/RTC.cpp

@@ -33,7 +33,7 @@ void readFromRTC()
         t.tm_sec = rtc.getSecond();
         tv.tv_sec = mktime(&t);
         tv.tv_usec = 0;
-        DEBUG_MSG("Read RTC time from RV3028 as %ld\n", tv.tv_sec);
+        LOG_DEBUG("Read RTC time from RV3028 as %ld\n", tv.tv_sec);
         timeStartMsec = now;
         zeroOffsetSecs = tv.tv_sec;
         if (currentQuality == RTCQualityNone) {
@@ -59,7 +59,7 @@ void readFromRTC()
         t.tm_sec = tc.second;
         tv.tv_sec = mktime(&t);
         tv.tv_usec = 0;
-        DEBUG_MSG("Read RTC time from PCF8563 as %ld\n", tv.tv_sec);
+        LOG_DEBUG("Read RTC time from PCF8563 as %ld\n", tv.tv_sec);
         timeStartMsec = now;
         zeroOffsetSecs = tv.tv_sec;
         if (currentQuality == RTCQualityNone) {
@@ -69,7 +69,7 @@ void readFromRTC()
 #else 
     if (!gettimeofday(&tv, NULL)) {
         uint32_t now = millis();
-        DEBUG_MSG("Read RTC time as %ld\n", tv.tv_sec);
+        LOG_DEBUG("Read RTC time as %ld\n", tv.tv_sec);
         timeStartMsec = now;
         zeroOffsetSecs = tv.tv_sec;
     }
@@ -86,11 +86,11 @@ bool perhapsSetRTC(RTCQuality q, const struct timeval *tv)
     if (q > currentQuality) {
         currentQuality = q;
         shouldSet = true;
-        DEBUG_MSG("Upgrading time to RTC %ld secs (quality %d)\n", tv->tv_sec, q);
+        LOG_DEBUG("Upgrading time to RTC %ld secs (quality %d)\n", tv->tv_sec, q);
     } else if(q == RTCQualityGPS && (now - lastSetMsec) > (12 * 60 * 60 * 1000UL)) {
         // Every 12 hrs we will slam in a new GPS time, to correct for local RTC clock drift
         shouldSet = true;
-        DEBUG_MSG("Reapplying external time to correct clock drift %ld secs\n", tv->tv_sec);
+        LOG_DEBUG("Reapplying external time to correct clock drift %ld secs\n", tv->tv_sec);
     }
     else
         shouldSet = false;
@@ -109,7 +109,7 @@ bool perhapsSetRTC(RTCQuality q, const struct timeval *tv)
             rtc.initI2C();
             tm *t = localtime(&tv->tv_sec);
             rtc.setTime(t->tm_year + 1900, t->tm_mon + 1, t->tm_wday, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
-            DEBUG_MSG("RV3028_RTC setTime %02d-%02d-%02d %02d:%02d:%02d %ld\n", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, tv->tv_sec);
+            LOG_DEBUG("RV3028_RTC setTime %02d-%02d-%02d %02d:%02d:%02d %ld\n", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, tv->tv_sec);
         }
 #elif defined(PCF8563_RTC)
         if(rtc_found == PCF8563_RTC) {
@@ -121,7 +121,7 @@ bool perhapsSetRTC(RTCQuality q, const struct timeval *tv)
 #endif
             tm *t = localtime(&tv->tv_sec);
             rtc.setDateTime(t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec);
-            DEBUG_MSG("PCF8563_RTC setDateTime %02d-%02d-%02d %02d:%02d:%02d %ld\n", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, tv->tv_sec);
+            LOG_DEBUG("PCF8563_RTC setDateTime %02d-%02d-%02d %02d:%02d:%02d %ld\n", t->tm_year + 1900, t->tm_mon + 1, t->tm_mday, t->tm_hour, t->tm_min, t->tm_sec, tv->tv_sec);
         }
 #elif defined(ARCH_ESP32)
         settimeofday(tv, NULL);
@@ -149,9 +149,9 @@ bool perhapsSetRTC(RTCQuality q, struct tm &t)
     tv.tv_sec = res;
     tv.tv_usec = 0; // time.centisecond() * (10 / 1000);
 
-    // DEBUG_MSG("Got time from GPS month=%d, year=%d, unixtime=%ld\n", t.tm_mon, t.tm_year, tv.tv_sec);
+    // LOG_DEBUG("Got time from GPS month=%d, year=%d, unixtime=%ld\n", t.tm_mon, t.tm_year, tv.tv_sec);
     if (t.tm_year < 0 || t.tm_year >= 300) {
-        // DEBUG_MSG("Ignoring invalid GPS month=%d, year=%d, unixtime=%ld\n", t.tm_mon, t.tm_year, tv.tv_sec);
+        // LOG_DEBUG("Ignoring invalid GPS month=%d, year=%d, unixtime=%ld\n", t.tm_mon, t.tm_year, tv.tv_sec);
         return false;
     } else {
         return perhapsSetRTC(q, &tv);

src/graphics/EInkDisplay2.cpp

@@ -103,7 +103,7 @@ bool EInkDisplay::forceDisplay(uint32_t msecLimit)
             }
         }
 
-        DEBUG_MSG("Updating E-Paper... ");
+        LOG_DEBUG("Updating E-Paper... ");
         
         #if defined(TTGO_T_ECHO)
         // ePaper.Reset(); // wake the screen from sleep
@@ -128,11 +128,11 @@ bool EInkDisplay::forceDisplay(uint32_t msecLimit)
         
         // Put screen to sleep to save power (possibly not necessary because we already did poweroff inside of display)
         adafruitDisplay->hibernate();
-        DEBUG_MSG("done\n");
+        LOG_DEBUG("done\n");
 
         return true;
     } else {
-        // DEBUG_MSG("Skipping eink display\n");
+        // LOG_DEBUG("Skipping eink display\n");
         return false;
     }
 }
@@ -162,7 +162,7 @@ void EInkDisplay::setDetected(uint8_t detected)
 // Connect to the display
 bool EInkDisplay::connect()
 {
-    DEBUG_MSG("Doing EInk init\n");
+    LOG_INFO("Doing EInk init\n");
 
 #ifdef PIN_EINK_PWR_ON
     digitalWrite(PIN_EINK_PWR_ON, HIGH); // If we need to assert a pin to power external peripherals

src/graphics/Screen.cpp

@@ -35,7 +35,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "mesh/Channels.h"
 #include "mesh/generated/deviceonly.pb.h"
 #include "modules/TextMessageModule.h"
-
+#include "modules/ExternalNotificationModule.h"
 #include "sleep.h"
 #include "target_specific.h"
 #include "utils.h"
@@ -276,9 +276,9 @@ static void drawModuleFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int
     } else {
         // otherwise, just display the module frame that's aligned with the current frame
         module_frame = state->currentFrame;
-        // DEBUG_MSG("Screen is not in transition.  Frame: %d\n\n", module_frame);
+        // LOG_DEBUG("Screen is not in transition.  Frame: %d\n\n", module_frame);
     }
-    // DEBUG_MSG("Drawing Module Frame %d\n\n", module_frame);
+    // LOG_DEBUG("Drawing Module Frame %d\n\n", module_frame);
     MeshModule &pi = *moduleFrames.at(module_frame);
     pi.drawFrame(display, state, x, y);
 }
@@ -368,7 +368,7 @@ static void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state
 
     MeshPacket &mp = devicestate.rx_text_message;
     NodeInfo *node = nodeDB.getNode(getFrom(&mp));
-    // DEBUG_MSG("drawing text message from 0x%x: %s\n", mp.from,
+    // LOG_DEBUG("drawing text message from 0x%x: %s\n", mp.from,
     // mp.decoded.variant.data.decoded.bytes);
 
     // Demo for drawStringMaxWidth:
@@ -376,10 +376,14 @@ static void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state
     // be wrapped. Currently only spaces and "-" are allowed for wrapping
     display->setTextAlignment(TEXT_ALIGN_LEFT);
     display->setFont(FONT_SMALL);
-    display->fillRect(0 + x, 0 + y, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
-    display->setColor(BLACK);
+    if (config.display.displaymode == Config_DisplayConfig_DisplayMode_INVERTED) {
+        display->fillRect(0 + x, 0 + y, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
+        display->setColor(BLACK);
+    }
     display->drawStringf(0 + x, 0 + y, tempBuf, "From: %s", (node && node->has_user) ? node->user.short_name : "???");
-    display->drawStringf(1 + x, 0 + y, tempBuf, "From: %s", (node && node->has_user) ? node->user.short_name : "???");
+    if(config.display.heading_bold) {
+        display->drawStringf(1 + x, 0 + y, tempBuf, "From: %s", (node && node->has_user) ? node->user.short_name : "???");
+    }
     display->setColor(WHITE);
     snprintf(tempBuf, sizeof(tempBuf), "%s", mp.decoded.payload.bytes);
     display->drawStringMaxWidth(0 + x, 0 + y + FONT_HEIGHT_SMALL, x + display->getWidth(), tempBuf);
@@ -395,7 +399,7 @@ static void drawColumns(OLEDDisplay *display, int16_t x, int16_t y, const char *
     int xo = x, yo = y;
     while (*f) {
         display->drawString(xo, yo, *f);
-        if (display->getColor() == BLACK)
+        if ((display->getColor() == BLACK) && config.display.heading_bold)
             display->drawString(xo + 1, yo, *f);
 
         display->setColor(WHITE);
@@ -473,7 +477,8 @@ static void drawNodes(OLEDDisplay *display, int16_t x, int16_t y, NodeStatus *no
     display->drawFastImage(x, y, 8, 8, imgUser);
 #endif
     display->drawString(x + 10, y - 2, usersString);
-    display->drawString(x + 11, y - 2, usersString);
+    if(config.display.heading_bold)
+        display->drawString(x + 11, y - 2, usersString);
 }
 
 // Draw GPS status summary
@@ -482,18 +487,21 @@ static void drawGPS(OLEDDisplay *display, int16_t x, int16_t y, const GPSStatus
     if (config.position.fixed_position) {
         // GPS coordinates are currently fixed
         display->drawString(x - 1, y - 2, "Fixed GPS");
-        display->drawString(x, y - 2, "Fixed GPS");
+        if(config.display.heading_bold)
+            display->drawString(x, y - 2, "Fixed GPS");
         return;
     }
     if (!gps->getIsConnected()) {
         display->drawString(x, y - 2, "No GPS");
-        display->drawString(x + 1, y - 2, "No GPS");
+        if(config.display.heading_bold)
+            display->drawString(x + 1, y - 2, "No GPS");
         return;
     }
     display->drawFastImage(x, y, 6, 8, gps->getHasLock() ? imgPositionSolid : imgPositionEmpty);
     if (!gps->getHasLock()) {
         display->drawString(x + 8, y - 2, "No sats");
-        display->drawString(x + 9, y - 2, "No sats");
+        if(config.display.heading_bold)
+            display->drawString(x + 9, y - 2, "No sats");
         return;
     } else {
         char satsString[3];
@@ -515,6 +523,8 @@ static void drawGPS(OLEDDisplay *display, int16_t x, int16_t y, const GPSStatus
         // Draw the number of satellites
         sprintf(satsString, "%u", gps->getNumSatellites());
         display->drawString(x + 34, y - 2, satsString);
+        if(config.display.heading_bold)
+            display->drawString(x + 35, y - 2, satsString);
     }
 }
 
@@ -697,17 +707,22 @@ static bool hasPosition(NodeInfo *n)
 static uint16_t getCompassDiam(OLEDDisplay *display)
 {
     uint16_t diam = 0;
+    uint16_t offset = 0;
+
+    if (config.display.displaymode != Config_DisplayConfig_DisplayMode_DEFAULT)
+        offset = FONT_HEIGHT_SMALL;
+
     // get the smaller of the 2 dimensions and subtract 20
-    if(display->getWidth() > (display->getHeight() - FONT_HEIGHT_SMALL)) {
-        diam = display->getHeight() - FONT_HEIGHT_SMALL;
+    if(display->getWidth() > (display->getHeight() - offset)) {
+        diam = display->getHeight() - offset;
         // if 2/3 of the other size would be smaller, use that
         if (diam > (display->getWidth() * 2 / 3)) {
             diam = display->getWidth() * 2 / 3;
         }
     } else {
         diam = display->getWidth();
-        if (diam > ((display->getHeight() - FONT_HEIGHT_SMALL) * 2 / 3)) {
-            diam = (display->getHeight() - FONT_HEIGHT_SMALL) * 2 / 3;
+        if (diam > ((display->getHeight() - offset) * 2 / 3)) {
+            diam = (display->getHeight() - offset) * 2 / 3;
         }
     }
     
@@ -787,7 +802,9 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
     // The coordinates define the left starting point of the text
     display->setTextAlignment(TEXT_ALIGN_LEFT);
 
-    display->fillRect(0 + x, 0 + y, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
+    if (config.display.displaymode == Config_DisplayConfig_DisplayMode_INVERTED) {
+        display->fillRect(0 + x, 0 + y, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
+    }
 
     const char *username = node->has_user ? node->user.long_name : "Unknown Name";
 
@@ -817,9 +834,16 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
     strcpy(distStr, "? km"); // might not have location data
     NodeInfo *ourNode = nodeDB.getNode(nodeDB.getNodeNum());
     const char *fields[] = {username, distStr, signalStr, lastStr, NULL};
+    int16_t compassX = 0, compassY = 0;
 
     // coordinates for the center of the compass/circle
-    int16_t compassX = x + SCREEN_WIDTH - getCompassDiam(display) / 2 - 5, compassY = y + FONT_HEIGHT_SMALL + (SCREEN_HEIGHT - FONT_HEIGHT_SMALL) / 2;
+    if (config.display.displaymode == Config_DisplayConfig_DisplayMode_DEFAULT) {
+        compassX = x + SCREEN_WIDTH - getCompassDiam(display) / 2 - 5;
+        compassY = y + SCREEN_HEIGHT / 2;
+    } else {
+        compassX = x + SCREEN_WIDTH - getCompassDiam(display) / 2 - 5;
+        compassY = y + FONT_HEIGHT_SMALL + (SCREEN_HEIGHT - FONT_HEIGHT_SMALL) / 2;
+    }
     bool hasNodeHeading = false;
 
     if (ourNode && hasPosition(ourNode)) {
@@ -855,14 +879,17 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
             drawNodeHeading(display, compassX, compassY, bearingToOther);
         }
     }
-    if (!hasNodeHeading)
+    if (!hasNodeHeading) {
         // direction to node is unknown so display question mark
         // Debug info for gps lock errors
-        // DEBUG_MSG("ourNode %d, ourPos %d, theirPos %d\n", !!ourNode, ourNode && hasPosition(ourNode), hasPosition(node));
+        // LOG_DEBUG("ourNode %d, ourPos %d, theirPos %d\n", !!ourNode, ourNode && hasPosition(ourNode), hasPosition(node));
         display->drawString(compassX - FONT_HEIGHT_SMALL / 4, compassY - FONT_HEIGHT_SMALL / 2, "?");
+    }
     display->drawCircle(compassX, compassY, getCompassDiam(display) / 2);
 
-    display->setColor(BLACK);
+    if (config.display.displaymode == Config_DisplayConfig_DisplayMode_INVERTED) {
+        display->setColor(BLACK);
+    }
     // Must be after distStr is populated
     drawColumns(display, x, y, fields);
 }
@@ -909,14 +936,14 @@ void Screen::handleSetOn(bool on)
 
     if (on != screenOn) {
         if (on) {
-            DEBUG_MSG("Turning on screen\n");
+            LOG_INFO("Turning on screen\n");
             dispdev.displayOn();
             dispdev.displayOn();
             enabled = true;
             setInterval(0); // Draw ASAP
             runASAP = true;
         } else {
-            DEBUG_MSG("Turning off screen\n");
+            LOG_INFO("Turning off screen\n");
             dispdev.displayOff();
             enabled = false;
         }
@@ -1029,7 +1056,7 @@ int32_t Screen::runOnce()
     // serialSinceMsec adjusts for additional serial wait time during nRF52 bootup
     static bool showingBootScreen = true;
     if (showingBootScreen && (millis() > (logo_timeout + serialSinceMsec))) {
-        DEBUG_MSG("Done with boot screen...\n");
+        LOG_INFO("Done with boot screen...\n");
         stopBootScreen();
         showingBootScreen = false;
     }
@@ -1038,7 +1065,7 @@ int32_t Screen::runOnce()
     if (strlen(oemStore.oem_text) > 0) {
         static bool showingOEMBootScreen = true;
         if (showingOEMBootScreen && (millis() > ((logo_timeout / 2) + serialSinceMsec))) {
-            DEBUG_MSG("Switch to OEM screen...\n");
+            LOG_INFO("Switch to OEM screen...\n");
             // Change frames.
             static FrameCallback bootOEMFrames[] = {drawOEMBootScreen};
             static const int bootOEMFrameCount = sizeof(bootOEMFrames) / sizeof(bootOEMFrames[0]);
@@ -1071,7 +1098,13 @@ int32_t Screen::runOnce()
             handleSetOn(false);
             break;
         case Cmd::ON_PRESS:
-            handleOnPress();
+            // If a nag notification is running, stop it
+            if (moduleConfig.external_notification.enabled && (externalNotificationModule->nagCycleCutoff != UINT32_MAX)) {
+                externalNotificationModule->stopNow();
+            } else {
+                // Don't advance the screen if we just wanted to switch off the nag notification
+                handleOnPress();
+            }
             break;
         case Cmd::START_BLUETOOTH_PIN_SCREEN:
             handleStartBluetoothPinScreen(cmd.bluetooth_pin);
@@ -1094,7 +1127,7 @@ int32_t Screen::runOnce()
             handleRebootScreen();
             break;
         default:
-            DEBUG_MSG("BUG: invalid cmd\n");
+            LOG_ERROR("Invalid screen cmd\n");
         }
     }
 
@@ -1125,12 +1158,12 @@ int32_t Screen::runOnce()
         // standard screen loop handling here
         if (config.display.auto_screen_carousel_secs > 0 &&
             (millis() - lastScreenTransition) > (config.display.auto_screen_carousel_secs * 1000)) {
-            DEBUG_MSG("LastScreenTransition exceeded %ums transitioning to next frame\n", (millis() - lastScreenTransition));
+            LOG_DEBUG("LastScreenTransition exceeded %ums transitioning to next frame\n", (millis() - lastScreenTransition));
             handleOnPress();
         }
     }
 
-    // DEBUG_MSG("want fps %d, fixed=%d\n", targetFramerate,
+    // LOG_DEBUG("want fps %d, fixed=%d\n", targetFramerate,
     // ui.getUiState()->frameState); If we are scrolling we need to be called
     // soon, otherwise just 1 fps (to save CPU) We also ask to be called twice
     // as fast as we really need so that any rounding errors still result with
@@ -1161,7 +1194,7 @@ void Screen::drawDebugInfoWiFiTrampoline(OLEDDisplay *display, OLEDDisplayUiStat
 void Screen::setSSLFrames()
 {
     if (address_found) {
-        // DEBUG_MSG("showing SSL frames\n");
+        // LOG_DEBUG("showing SSL frames\n");
         static FrameCallback sslFrames[] = {drawSSLScreen};
         ui.setFrames(sslFrames, 1);
         ui.update();
@@ -1173,7 +1206,7 @@ void Screen::setSSLFrames()
 void Screen::setWelcomeFrames()
 {
     if (address_found) {
-        // DEBUG_MSG("showing Welcome frames\n");
+        // LOG_DEBUG("showing Welcome frames\n");
         ui.disableAllIndicators();
 
         static FrameCallback welcomeFrames[] = {drawWelcomeScreen};
@@ -1185,13 +1218,13 @@ void Screen::setWelcomeFrames()
 // restore our regular frame list
 void Screen::setFrames()
 {
-    DEBUG_MSG("showing standard frames\n");
+    LOG_DEBUG("showing standard frames\n");
     showingNormalScreen = true;
 
     moduleFrames = MeshModule::GetMeshModulesWithUIFrames();
-    DEBUG_MSG("Showing %d module frames\n", moduleFrames.size());
+    LOG_DEBUG("Showing %d module frames\n", moduleFrames.size());
     int totalFrameCount = MAX_NUM_NODES + NUM_EXTRA_FRAMES + moduleFrames.size();
-    DEBUG_MSG("Total frame count: %d\n", totalFrameCount);
+    LOG_DEBUG("Total frame count: %d\n", totalFrameCount);
 
     // We don't show the node info our our node (if we have it yet - we should)
     size_t numnodes = nodeStatus->getNumTotal();
@@ -1210,7 +1243,7 @@ void Screen::setFrames()
         normalFrames[numframes++] = drawModuleFrame;
     }
 
-    DEBUG_MSG("Added modules.  numframes: %d\n", numframes);
+    LOG_DEBUG("Added modules.  numframes: %d\n", numframes);
 
     // If we have a critical fault, show it first
     if (myNodeInfo.error_code)
@@ -1243,7 +1276,7 @@ void Screen::setFrames()
     }
 #endif
 
-    DEBUG_MSG("Finished building frames. numframes: %d\n", numframes);
+    LOG_DEBUG("Finished building frames. numframes: %d\n", numframes);
 
     ui.setFrames(normalFrames, numframes);
     ui.enableAllIndicators();
@@ -1256,7 +1289,7 @@ void Screen::setFrames()
 
 void Screen::handleStartBluetoothPinScreen(uint32_t pin)
 {
-    DEBUG_MSG("showing bluetooth screen\n");
+    LOG_DEBUG("showing bluetooth screen\n");
     showingNormalScreen = false;
 
     static FrameCallback btFrames[] = {drawFrameBluetooth};
@@ -1270,7 +1303,7 @@ void Screen::handleStartBluetoothPinScreen(uint32_t pin)
 
 void Screen::handleShutdownScreen()
 {
-    DEBUG_MSG("showing shutdown screen\n");
+    LOG_DEBUG("showing shutdown screen\n");
     showingNormalScreen = false;
 
     static FrameCallback shutdownFrames[] = {drawFrameShutdown};
@@ -1282,7 +1315,7 @@ void Screen::handleShutdownScreen()
 
 void Screen::handleRebootScreen()
 {
-    DEBUG_MSG("showing reboot screen\n");
+    LOG_DEBUG("showing reboot screen\n");
     showingNormalScreen = false;
 
     static FrameCallback rebootFrames[] = {drawFrameReboot};
@@ -1294,7 +1327,7 @@ void Screen::handleRebootScreen()
 
 void Screen::handleStartFirmwareUpdateScreen()
 {
-    DEBUG_MSG("showing firmware screen\n");
+    LOG_DEBUG("showing firmware screen\n");
     showingNormalScreen = false;
 
     static FrameCallback btFrames[] = {drawFrameFirmware};
@@ -1325,7 +1358,7 @@ void Screen::handlePrint(const char *text)
 {
     // the string passed into us probably has a newline, but that would confuse the logging system
     // so strip it
-    DEBUG_MSG("Screen: %.*s\n", strlen(text) - 1, text);
+    LOG_DEBUG("Screen: %.*s\n", strlen(text) - 1, text);
     if (!useDisplay || !showingNormalScreen)
         return;
 
@@ -1366,8 +1399,10 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     // The coordinates define the left starting point of the text
     display->setTextAlignment(TEXT_ALIGN_LEFT);
 
-    display->fillRect(0 + x, 0 + y, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
-    display->setColor(BLACK);
+    if (config.display.displaymode == Config_DisplayConfig_DisplayMode_INVERTED) {
+        display->fillRect(0 + x, 0 + y, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
+        display->setColor(BLACK);
+    }
 
     char channelStr[20];
     {
@@ -1377,12 +1412,25 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     }
 
     // Display power status
-    if (powerStatus->getHasBattery())
-        drawBattery(display, x + 1, y + 3, imgBattery, powerStatus);
-    else if (powerStatus->knowsUSB())
-        display->drawFastImage(x + 1, y + 3, 16, 8, powerStatus->getHasUSB() ? imgUSB : imgPower);
+    if (powerStatus->getHasBattery()) {
+        if (config.display.displaymode == Config_DisplayConfig_DisplayMode_DEFAULT) {
+            drawBattery(display, x , y + 2, imgBattery, powerStatus);
+        } else {
+            drawBattery(display, x + 1, y + 3, imgBattery, powerStatus);
+        }
+    } else if (powerStatus->knowsUSB()) {
+        if (config.display.displaymode == Config_DisplayConfig_DisplayMode_DEFAULT) {
+            display->drawFastImage(x, y + 2, 16, 8, powerStatus->getHasUSB() ? imgUSB : imgPower);
+        } else {
+            display->drawFastImage(x + 1, y + 3, 16, 8, powerStatus->getHasUSB() ? imgUSB : imgPower);
+        }
+    }
     // Display nodes status
-    drawNodes(display, x + (SCREEN_WIDTH * 0.25), y + 3, nodeStatus);
+    if (config.display.displaymode == Config_DisplayConfig_DisplayMode_DEFAULT) {
+        drawNodes(display, x + (SCREEN_WIDTH * 0.25), y + 2, nodeStatus);
+    } else {
+        drawNodes(display, x + (SCREEN_WIDTH * 0.25), y + 3, nodeStatus);
+    }
     // Display GPS status
     if (!config.position.gps_enabled){
         int16_t yPos = y + 2;
@@ -1391,8 +1439,11 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
 #endif
         drawGPSpowerstat(display, x, yPos, gpsStatus);
     } else {
-        drawGPS(display, x + (SCREEN_WIDTH * 0.63), y + 2, gpsStatus);
-        drawGPS(display, x + (SCREEN_WIDTH * 0.63), y + 3, gpsStatus);
+        if (config.display.displaymode == Config_DisplayConfig_DisplayMode_DEFAULT) {
+            drawGPS(display, x + (SCREEN_WIDTH * 0.63), y + 2, gpsStatus);
+        } else {
+            drawGPS(display, x + (SCREEN_WIDTH * 0.63), y + 3, gpsStatus);
+        }
     }
 
     display->setColor(WHITE);
@@ -1400,7 +1451,7 @@ void DebugInfo::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     display->drawString(x, y + FONT_HEIGHT_SMALL, channelStr);
     // Draw our hardware ID to assist with bluetooth pairing. Either prefix with Info or S&F Logo
     if (moduleConfig.store_forward.enabled) {
-#if 0        
+#ifdef ARCH_ESP32        
         if (millis() - storeForwardModule->lastHeartbeat > (storeForwardModule->heartbeatInterval * 1200)) { //no heartbeat, overlap a bit
 #if defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ST7735_CS)
             display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8, imgQuestionL1);
@@ -1452,23 +1503,29 @@ void DebugInfo::drawFrameWiFi(OLEDDisplay *display, OLEDDisplayUiState *state, i
     // The coordinates define the left starting point of the text
     display->setTextAlignment(TEXT_ALIGN_LEFT);
 
-    display->fillRect(0 + x, 0 + y, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
-    display->setColor(BLACK);
+    if (config.display.displaymode == Config_DisplayConfig_DisplayMode_INVERTED) {
+        display->fillRect(0 + x, 0 + y, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
+        display->setColor(BLACK);
+    }
 
     if (WiFi.status() != WL_CONNECTED) {
         display->drawString(x, y, String("WiFi: Not Connected"));
-        display->drawString(x + 1, y, String("WiFi: Not Connected"));
+        if(config.display.heading_bold)
+            display->drawString(x + 1, y, String("WiFi: Not Connected"));
     } else {
         display->drawString(x, y, String("WiFi: Connected"));
-        display->drawString(x + 1, y, String("WiFi: Connected"));
+        if(config.display.heading_bold)
+            display->drawString(x + 1, y, String("WiFi: Connected"));
 
         display->drawString(x + SCREEN_WIDTH - display->getStringWidth("RSSI " + String(WiFi.RSSI())), y,
                             "RSSI " + String(WiFi.RSSI()));
-        display->drawString(x + SCREEN_WIDTH - display->getStringWidth("RSSI " + String(WiFi.RSSI())) - 1, y,
-                            "RSSI " + String(WiFi.RSSI()));
+        if(config.display.heading_bold) {
+            display->drawString(x + SCREEN_WIDTH - display->getStringWidth("RSSI " + String(WiFi.RSSI())) - 1, y,
+                                "RSSI " + String(WiFi.RSSI()));
+        }
     }
 
-        display->setColor(WHITE);
+    display->setColor(WHITE);
 
     /*
     - WL_CONNECTED: assigned when connected to a WiFi network;
@@ -1578,8 +1635,10 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
     // The coordinates define the left starting point of the text
     display->setTextAlignment(TEXT_ALIGN_LEFT);
 
-    display->fillRect(0 + x, 0 + y, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
-    display->setColor(BLACK);
+    if (config.display.displaymode == Config_DisplayConfig_DisplayMode_INVERTED) {
+        display->fillRect(0 + x, 0 + y, x + display->getWidth(), y + FONT_HEIGHT_SMALL);
+        display->setColor(BLACK);
+    }
 
     char batStr[20];
     if (powerStatus->getHasBattery()) {
@@ -1591,11 +1650,13 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
 
         // Line 1
         display->drawString(x, y, batStr);
-        display->drawString(x + 1, y, batStr);
+        if(config.display.heading_bold)
+            display->drawString(x + 1, y, batStr);
     } else {
         // Line 1
         display->drawString(x, y, String("USB"));
-        display->drawString(x + 1, y, String("USB"));
+        if(config.display.heading_bold)
+            display->drawString(x + 1, y, String("USB"));
     }
 
     auto mode = "";
@@ -1628,7 +1689,8 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
     }
 
     display->drawString(x + SCREEN_WIDTH - display->getStringWidth(mode), y, mode);
-    display->drawString(x + SCREEN_WIDTH - display->getStringWidth(mode) - 1, y, mode);
+    if(config.display.heading_bold)
+        display->drawString(x + SCREEN_WIDTH - display->getStringWidth(mode) - 1, y, mode);
 
     // Line 2
     uint32_t currentMillis = millis();
@@ -1716,7 +1778,7 @@ void Screen::adjustBrightness()
 
 int Screen::handleStatusUpdate(const meshtastic::Status *arg)
 {
-    // DEBUG_MSG("Screen got status update %d\n", arg->getStatusType());
+    // LOG_DEBUG("Screen got status update %d\n", arg->getStatusType());
     switch (arg->getStatusType()) {
     case STATUS_TYPE_NODE:
         if (showingNormalScreen && nodeStatus->getLastNumTotal() != nodeStatus->getNumTotal()) {

src/graphics/TFTDisplay.cpp

@@ -59,7 +59,7 @@ void TFTDisplay::setDetected(uint8_t detected)
 bool TFTDisplay::connect()
 {
     concurrency::LockGuard g(spiLock);
-    DEBUG_MSG("Doing TFT init\n");
+    LOG_INFO("Doing TFT init\n");
 
 #ifdef TFT_BL
     digitalWrite(TFT_BL, HIGH);

src/input/RotaryEncoderInterruptBase.cpp

@@ -28,7 +28,7 @@ void RotaryEncoderInterruptBase::init(
 
     this->rotaryLevelA = digitalRead(this->_pinA);
     this->rotaryLevelB = digitalRead(this->_pinB);
-    DEBUG_MSG("Rotary initialized (%d, %d, %d)\n", this->_pinA, this->_pinB, pinPress);
+    LOG_INFO("Rotary initialized (%d, %d, %d)\n", this->_pinA, this->_pinB, pinPress);
 }
 
 int32_t RotaryEncoderInterruptBase::runOnce()
@@ -38,13 +38,13 @@ int32_t RotaryEncoderInterruptBase::runOnce()
     e.source = this->_originName;
 
     if (this->action == ROTARY_ACTION_PRESSED) {
-        DEBUG_MSG("Rotary event Press\n");
+        LOG_DEBUG("Rotary event Press\n");
         e.inputEvent = this->_eventPressed;
     } else if (this->action == ROTARY_ACTION_CW) {
-        DEBUG_MSG("Rotary event CW\n");
+        LOG_DEBUG("Rotary event CW\n");
         e.inputEvent = this->_eventCw;
     } else if (this->action == ROTARY_ACTION_CCW) {
-        DEBUG_MSG("Rotary event CCW\n");
+        LOG_DEBUG("Rotary event CCW\n");
         e.inputEvent = this->_eventCcw;
     }
 
@@ -54,7 +54,7 @@ int32_t RotaryEncoderInterruptBase::runOnce()
 
     this->action = ROTARY_ACTION_NONE;
 
-    return 30000; // TODO: technically this can be MAX_INT
+    return INT32_MAX;
 }
 
 void RotaryEncoderInterruptBase::intPressHandler()
@@ -104,7 +104,7 @@ RotaryEncoderInterruptBaseStateType RotaryEncoderInterruptBase::intHandler(bool
             newState = ROTARY_EVENT_OCCURRED;
             if ((this->action != ROTARY_ACTION_PRESSED) && (this->action != action)) {
                 this->action = action;
-                DEBUG_MSG("Rotary action\n");
+                LOG_DEBUG("Rotary action\n");
             }
         }
     } else if (!actualPinRaising && (otherPinLevel == HIGH)) {

src/input/RotaryEncoderInterruptBase.h

@@ -7,7 +7,7 @@ enum RotaryEncoderInterruptBaseStateType { ROTARY_EVENT_OCCURRED, ROTARY_EVENT_C
 
 enum RotaryEncoderInterruptBaseActionType { ROTARY_ACTION_NONE, ROTARY_ACTION_PRESSED, ROTARY_ACTION_CW, ROTARY_ACTION_CCW };
 
-class RotaryEncoderInterruptBase : public Observable<const InputEvent *>, private concurrency::OSThread
+class RotaryEncoderInterruptBase : public Observable<const InputEvent *>, public concurrency::OSThread
 {
   public:
     explicit RotaryEncoderInterruptBase(const char *name);

src/input/RotaryEncoderInterruptImpl1.cpp

@@ -9,6 +9,7 @@ void RotaryEncoderInterruptImpl1::init()
 {
     if (!moduleConfig.canned_message.rotary1_enabled) {
         // Input device is disabled.
+        disable();
         return;
     }
 

src/input/UpDownInterruptBase.cpp

@@ -26,7 +26,7 @@ void UpDownInterruptBase::init(
     attachInterrupt(this->_pinDown, onIntDown, RISING);
     attachInterrupt(this->_pinUp, onIntUp, RISING);
 
-    DEBUG_MSG("GPIO initialized (%d, %d, %d)\n",
+    LOG_DEBUG("GPIO initialized (%d, %d, %d)\n",
         this->_pinDown, this->_pinUp, pinPress);
 }
 
@@ -34,7 +34,7 @@ void UpDownInterruptBase::intPressHandler()
 {
     InputEvent e;
     e.source = this->_originName;
-    DEBUG_MSG("GPIO event Press\n");
+    LOG_DEBUG("GPIO event Press\n");
     e.inputEvent = this->_eventPressed;
     this->notifyObservers(&e);
 }
@@ -43,7 +43,7 @@ void UpDownInterruptBase::intDownHandler()
 {
     InputEvent e;
     e.source = this->_originName;
-    DEBUG_MSG("GPIO event Down\n");
+    LOG_DEBUG("GPIO event Down\n");
     e.inputEvent = this->_eventDown;
     this->notifyObservers(&e);
 }
@@ -52,7 +52,7 @@ void UpDownInterruptBase::intUpHandler()
 {
     InputEvent e;
     e.source = this->_originName;
-    DEBUG_MSG("GPIO event Up\n");
+    LOG_DEBUG("GPIO event Up\n");
     e.inputEvent = this->_eventUp;
     this->notifyObservers(&e);
 }

src/input/cardKbI2cImpl.cpp

@@ -12,7 +12,7 @@ void CardKbI2cImpl::init()
 {
     if (cardkb_found != CARDKB_ADDR)
     {
-        // Input device is not detected.
+        disable();
         return;
     }
 

src/input/kbI2cBase.cpp

@@ -56,7 +56,7 @@ int32_t KbI2cBase::runOnce()
             }
         }
         if (PrintDataBuf != 0) {
-            DEBUG_MSG("RAK14004 key 0x%x pressed\n", PrintDataBuf);
+            LOG_DEBUG("RAK14004 key 0x%x pressed\n", PrintDataBuf);
             InputEvent e;
             e.inputEvent = MATRIXKEY;
             e.source = this->_originName;

src/input/kbI2cBase.h

@@ -5,7 +5,7 @@
 
 class KbI2cBase :
     public Observable<const InputEvent *>,
-    private concurrency::OSThread
+    public concurrency::OSThread
 {
   public:
     explicit KbI2cBase(const char *name);

src/main.cpp

@@ -174,7 +174,7 @@ void setup()
 
     serialSinceMsec = millis();
 
-    DEBUG_MSG("\n\n//\\ E S H T /\\ S T / C\n\n");
+    LOG_INFO("\n\n//\\ E S H T /\\ S T / C\n\n");
 
     initDeepSleep();
 
@@ -242,7 +242,6 @@ void setup()
     digitalWrite(PIN_3V3_EN, 1);
 #endif
 
-
     // Currently only the tbeam has a PMU
     // PMU initialization needs to be placed before scanI2Cdevice
     power = new Power();
@@ -257,7 +256,7 @@ void setup()
     Wire1.beginTransmission(PCF8563_RTC);
     if (Wire1.endTransmission() == 0){
         rtc_found = PCF8563_RTC;
-        DEBUG_MSG("PCF8563 RTC found\n");
+        LOG_INFO("PCF8563 RTC found\n");
     }
 #endif
 
@@ -283,7 +282,7 @@ void setup()
 #endif
 
     // Hello
-    DEBUG_MSG("Meshtastic hwvendor=%d, swver=%s\n", HW_VENDOR, optstr(APP_VERSION));
+    LOG_INFO("Meshtastic hwvendor=%d, swver=%s\n", HW_VENDOR, optstr(APP_VERSION));
 
 #ifdef ARCH_ESP32
     // Don't init display if we don't have one or we are waking headless due to a timer event
@@ -326,7 +325,7 @@ void setup()
     if (gps)
         gpsStatus->observe(&gps->newStatus);
     else
-        DEBUG_MSG("Warning: No GPS found - running without GPS\n");
+        LOG_WARN("No GPS found - running without GPS\n");
 
     nodeStatus->observe(&nodeDB.newStatus);
 
@@ -356,7 +355,7 @@ void setup()
 
     // ONCE we will factory reset the GPS for bug #327
     if (gps && !devicestate.did_gps_reset) {
-        DEBUG_MSG("GPS FactoryReset requested\n");
+        LOG_WARN("GPS FactoryReset requested\n");
         if (gps->factoryReset()) { // If we don't succeed try again next time
             devicestate.did_gps_reset = true;
             nodeDB.saveToDisk(SEGMENT_DEVICESTATE);
@@ -375,11 +374,11 @@ void setup()
     if (!rIf) {
         rIf = new RF95Interface(RF95_NSS, RF95_IRQ, RF95_RESET, SPI);
         if (!rIf->init()) {
-            DEBUG_MSG("Warning: Failed to find RF95 radio\n");
+            LOG_WARN("Failed to find RF95 radio\n");
             delete rIf;
             rIf = NULL;
         } else {
-            DEBUG_MSG("RF95 Radio init succeeded, using RF95 radio\n");
+            LOG_INFO("RF95 Radio init succeeded, using RF95 radio\n");
         }
     }
 #endif
@@ -388,11 +387,11 @@ void setup()
     if (!rIf) {
         rIf = new SX1280Interface(SX128X_CS, SX128X_DIO1, SX128X_RESET, SX128X_BUSY, SPI);
         if (!rIf->init()) {
-            DEBUG_MSG("Warning: Failed to find SX1280 radio\n");
+            LOG_WARN("Failed to find SX1280 radio\n");
             delete rIf;
             rIf = NULL;
         } else {
-            DEBUG_MSG("SX1280 Radio init succeeded, using SX1280 radio\n");
+            LOG_INFO("SX1280 Radio init succeeded, using SX1280 radio\n");
         }
     }
 #endif
@@ -401,11 +400,11 @@ void setup()
     if (!rIf) {
         rIf = new SX1262Interface(SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY, SPI);
         if (!rIf->init()) {
-            DEBUG_MSG("Warning: Failed to find SX1262 radio\n");
+            LOG_WARN("Failed to find SX1262 radio\n");
             delete rIf;
             rIf = NULL;
         } else {
-            DEBUG_MSG("SX1262 Radio init succeeded, using SX1262 radio\n");
+            LOG_INFO("SX1262 Radio init succeeded, using SX1262 radio\n");
         }
     }
 #endif
@@ -414,11 +413,11 @@ void setup()
     if (!rIf) {
         rIf = new SX1268Interface(SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY, SPI);
         if (!rIf->init()) {
-            DEBUG_MSG("Warning: Failed to find SX1268 radio\n");
+            LOG_WARN("Failed to find SX1268 radio\n");
             delete rIf;
             rIf = NULL;
         } else {
-            DEBUG_MSG("SX1268 Radio init succeeded, using SX1268 radio\n");
+            LOG_INFO("SX1268 Radio init succeeded, using SX1268 radio\n");
         }
     }
 #endif
@@ -427,11 +426,11 @@ void setup()
     if (!rIf) {
         rIf = new LLCC68Interface(SX126X_CS, SX126X_DIO1, SX126X_RESET, SX126X_BUSY, SPI);
         if (!rIf->init()) {
-            DEBUG_MSG("Warning: Failed to find LLCC68 radio\n");
+            LOG_WARN("Failed to find LLCC68 radio\n");
             delete rIf;
             rIf = NULL;
         } else {
-            DEBUG_MSG("LLCC68 Radio init succeeded, using LLCC68 radio\n");
+            LOG_INFO("LLCC68 Radio init succeeded, using LLCC68 radio\n");
         }
     }
 #endif
@@ -440,11 +439,11 @@ void setup()
     if (!rIf) {
         rIf = new SimRadio;
         if (!rIf->init()) {
-            DEBUG_MSG("Warning: Failed to find simulated radio\n");
+            LOG_WARN("Failed to find simulated radio\n");
             delete rIf;
             rIf = NULL;
         } else {
-            DEBUG_MSG("Using SIMULATED radio!\n");
+            LOG_INFO("Using SIMULATED radio!\n");
         }
     }
 #endif
@@ -452,22 +451,11 @@ void setup()
 // check if the radio chip matches the selected region
 
 if((config.lora.region == Config_LoRaConfig_RegionCode_LORA_24) && (!rIf->wideLora())){
-    DEBUG_MSG("Warning: Radio chip does not support 2.4GHz LoRa. Reverting to unset.\n");
+    LOG_WARN("Radio chip does not support 2.4GHz LoRa. Reverting to unset.\n");
     config.lora.region = Config_LoRaConfig_RegionCode_UNSET;
     nodeDB.saveToDisk(SEGMENT_CONFIG);
     if(!rIf->reconfigure()) {
-        DEBUG_MSG("Reconfigure failed, rebooting\n");
-        screen->startRebootScreen();
-        rebootAtMsec = millis() + 5000;
-    }
-}
-
-if((config.lora.region != Config_LoRaConfig_RegionCode_LORA_24) && (rIf->wideLora())){
-    DEBUG_MSG("Warning: Radio chip only supports 2.4GHz LoRa. Adjusting Region.\n");
-    config.lora.region = Config_LoRaConfig_RegionCode_LORA_24;
-    nodeDB.saveToDisk(SEGMENT_CONFIG);
-    if(!rIf->reconfigure()) {
-        DEBUG_MSG("Reconfigure failed, rebooting\n");
+        LOG_WARN("Reconfigure failed, rebooting\n");
         screen->startRebootScreen();
         rebootAtMsec = millis() + 5000;
     }
@@ -505,7 +493,7 @@ if((config.lora.region != Config_LoRaConfig_RegionCode_LORA_24) && (rIf->wideLor
         // Calculate and save the bit rate to myNodeInfo
         // TODO: This needs to be added what ever method changes the channel from the phone.
         myNodeInfo.bitrate = (float(Constants_DATA_PAYLOAD_LEN) / (float(rIf->getPacketTime(Constants_DATA_PAYLOAD_LEN)))) * 1000;
-        DEBUG_MSG("myNodeInfo.bitrate = %f bytes / sec\n", myNodeInfo.bitrate);
+        LOG_DEBUG("myNodeInfo.bitrate = %f bytes / sec\n", myNodeInfo.bitrate);
     }
 
     // This must be _after_ service.init because we need our preferences loaded from flash to have proper timeout values
@@ -558,13 +546,13 @@ void loop()
     long delayMsec = mainController.runOrDelay();
 
     /* if (mainController.nextThread && delayMsec)
-        DEBUG_MSG("Next %s in %ld\n", mainController.nextThread->ThreadName.c_str(),
+        LOG_DEBUG("Next %s in %ld\n", mainController.nextThread->ThreadName.c_str(),
                   mainController.nextThread->tillRun(millis())); */
 
     // We want to sleep as long as possible here - because it saves power
     if (!runASAP && loopCanSleep()) {
-        // if(delayMsec > 100) DEBUG_MSG("sleeping %ld\n", delayMsec);
+        // if(delayMsec > 100) LOG_DEBUG("sleeping %ld\n", delayMsec);
         mainDelay.delay(delayMsec);
     }
-    // if (didWake) DEBUG_MSG("wake!\n");
+    // if (didWake) LOG_DEBUG("wake!\n");
 }

src/memtest.cpp

@@ -255,10 +255,10 @@ static int mem_test(uint32_t *_start, size_t len, bool doRead = true, bool doWri
     int rcode = 0;
     incr = 1;
 
-    //DEBUG_MSG("memtest read=%d, write=%d\n", doRead, doWrite);
+    //LOG_DEBUG("memtest read=%d, write=%d\n", doRead, doWrite);
 
     if (doWrite) {
-        //DEBUG_MSG("writing\n");
+        //LOG_DEBUG("writing\n");
         for (addr = start, val = pattern; addr < end; addr++) {
             *addr = val;
             val += incr;
@@ -266,11 +266,11 @@ static int mem_test(uint32_t *_start, size_t len, bool doRead = true, bool doWri
     }
 
     if (doRead) {
-        //DEBUG_MSG("reading\n");
+        //LOG_DEBUG("reading\n");
         for (addr = start, val = pattern; addr < end; addr++) {
             readback = *addr;
             if (readback != val) {
-                DEBUG_MSG("Mem error @ 0x%08X: "
+                LOG_ERROR("Mem error @ 0x%08X: "
                        "found 0x%08lX, expected 0x%08lX\n",
                        addr, readback, val);
                 rcode++;

src/mesh/Channels.cpp

@@ -106,30 +106,30 @@ CryptoKey Channels::getKey(ChannelIndex chIndex)
         k.length = channelSettings.psk.size;
         if (k.length == 0) {
             if (ch.role == Channel_Role_SECONDARY) {
-                DEBUG_MSG("Unset PSK for secondary channel %s. using primary key\n", ch.settings.name);
+                LOG_DEBUG("Unset PSK for secondary channel %s. using primary key\n", ch.settings.name);
                 k = getKey(primaryIndex);
             } else
-                DEBUG_MSG("Warning: User disabled encryption\n");
+                LOG_WARN("User disabled encryption\n");
         } else if (k.length == 1) {
             // Convert the short single byte variants of psk into variant that can be used more generally
 
             uint8_t pskIndex = k.bytes[0];
-            DEBUG_MSG("Expanding short PSK #%d\n", pskIndex);
+            LOG_DEBUG("Expanding short PSK #%d\n", pskIndex);
             if (pskIndex == 0)
                 k.length = 0; // Turn off encryption
             else if (oemStore.oem_aes_key.size > 1) {
                 // Use the OEM key
-                DEBUG_MSG("Using OEM Key with %d bytes\n", oemStore.oem_aes_key.size);
+                LOG_DEBUG("Using OEM Key with %d bytes\n", oemStore.oem_aes_key.size);
                 memcpy(k.bytes, oemStore.oem_aes_key.bytes , oemStore.oem_aes_key.size);
                 k.length = oemStore.oem_aes_key.size;
                 // Bump up the last byte of PSK as needed
                 uint8_t *last = k.bytes + oemStore.oem_aes_key.size - 1;
                 *last = *last + pskIndex - 1; // index of 1 means no change vs defaultPSK
                 if (k.length < 16) {
-                    DEBUG_MSG("Warning: OEM provided a too short AES128 key - padding\n");
+                    LOG_WARN("OEM provided a too short AES128 key - padding\n");
                     k.length = 16;
                 } else if (k.length < 32 && k.length != 16) {
-                    DEBUG_MSG("Warning: OEM provided a too short AES256 key - padding\n");
+                    LOG_WARN("OEM provided a too short AES256 key - padding\n");
                     k.length = 32;
                 }
             } else {
@@ -142,12 +142,12 @@ CryptoKey Channels::getKey(ChannelIndex chIndex)
         } else if (k.length < 16) {
             // Error! The user specified only the first few bits of an AES128 key.  So by convention we just pad the rest of the
             // key with zeros
-            DEBUG_MSG("Warning: User provided a too short AES128 key - padding\n");
+            LOG_WARN("User provided a too short AES128 key - padding\n");
             k.length = 16;
         } else if (k.length < 32 && k.length != 16) {
             // Error! The user specified only the first few bits of an AES256 key.  So by convention we just pad the rest of the
             // key with zeros
-            DEBUG_MSG("Warning: User provided a too short AES256 key - padding\n");
+            LOG_WARN("User provided a too short AES256 key - padding\n");
             k.length = 32;
         }
     }
@@ -308,11 +308,11 @@ const char *Channels::getPrimaryName()
 bool Channels::decryptForHash(ChannelIndex chIndex, ChannelHash channelHash)
 {
     if (chIndex > getNumChannels() || getHash(chIndex) != channelHash) {
-        // DEBUG_MSG("Skipping channel %d (hash %x) due to invalid hash/index, want=%x\n", chIndex, getHash(chIndex),
+        // LOG_DEBUG("Skipping channel %d (hash %x) due to invalid hash/index, want=%x\n", chIndex, getHash(chIndex),
         // channelHash);
         return false;
     } else {
-        DEBUG_MSG("Using channel %d (hash 0x%x)\n", chIndex, channelHash);
+        LOG_DEBUG("Using channel %d (hash 0x%x)\n", chIndex, channelHash);
         setCrypto(chIndex);
         return true;
     }

src/mesh/CryptoEngine.cpp

@@ -3,7 +3,7 @@
 
 void CryptoEngine::setKey(const CryptoKey &k)
 {
-    DEBUG_MSG("Using AES%d key!\n", k.length * 8);
+    LOG_DEBUG("Using AES%d key!\n", k.length * 8);
     key = k;
 }
 
@@ -14,12 +14,12 @@ void CryptoEngine::setKey(const CryptoKey &k)
  */
 void CryptoEngine::encrypt(uint32_t fromNode, uint64_t packetId, size_t numBytes, uint8_t *bytes)
 {
-    DEBUG_MSG("WARNING: noop encryption!\n");
+    LOG_WARN("noop encryption!\n");
 }
 
 void CryptoEngine::decrypt(uint32_t fromNode, uint64_t packetId, size_t numBytes, uint8_t *bytes)
 {
-    DEBUG_MSG("WARNING: noop decryption!\n");
+    LOG_WARN("noop decryption!\n");
 }
 
 /**

src/mesh/FloodingRouter.cpp

@@ -17,7 +17,7 @@ ErrorCode FloodingRouter::send(MeshPacket *p)
     return Router::send(p);
 }
 
-bool FloodingRouter::shouldFilterReceived(MeshPacket *p)
+bool FloodingRouter::shouldFilterReceived(const MeshPacket *p)
 {
     if (wasSeenRecently(p)) { // Note: this will also add a recent packet record
         printPacket("Ignoring incoming msg, because we've already seen it", p);
@@ -32,9 +32,10 @@ void FloodingRouter::sniffReceived(const MeshPacket *p, const Routing *c)
     bool isAck = ((c && c->error_reason == Routing_Error_NONE)); // consider only ROUTING_APP message without error as ACK
     if (isAck && p->to != getNodeNum()) {
         // do not flood direct message that is ACKed 
-        DEBUG_MSG("Receiving an ACK not for me, but don't need to rebroadcast this direct message anymore.\n");
+        LOG_DEBUG("Receiving an ACK not for me, but don't need to rebroadcast this direct message anymore.\n");
         Router::cancelSending(p->to, p->decoded.request_id);   // cancel rebroadcast for this DM
-    } else if ((p->to != getNodeNum()) && (p->hop_limit > 0) && (getFrom(p) != getNodeNum())) {
+    } 
+    if ((p->to != getNodeNum()) && (p->hop_limit > 0) && (getFrom(p) != getNodeNum())) {
         if (p->id != 0) {
             if (config.device.role != Config_DeviceConfig_Role_CLIENT_MUTE) {
                 MeshPacket *tosend = packetPool.allocCopy(*p); // keep a copy because we will be sending it
@@ -46,17 +47,17 @@ void FloodingRouter::sniffReceived(const MeshPacket *p, const Routing *c)
                     traceRouteModule->updateRoute(tosend);
                 }
 
-                printPacket("Rebroadcasting received floodmsg to neighbors", p);
+                LOG_INFO("Rebroadcasting received floodmsg to neighbors", p);
                 // Note: we are careful to resend using the original senders node id
                 // We are careful not to call our hooked version of send() - because we don't want to check this again
                 Router::send(tosend);
 
             } else {
-                DEBUG_MSG("Not rebroadcasting. Role = Role_ClientMute\n");
+                LOG_DEBUG("Not rebroadcasting. Role = Role_ClientMute\n");
             }
 
         } else {
-            DEBUG_MSG("Ignoring a simple (0 id) broadcast\n");
+            LOG_DEBUG("Ignoring a simple (0 id) broadcast\n");
         }
     }
 

src/mesh/FloodingRouter.h

@@ -51,7 +51,7 @@ class FloodingRouter : public Router, protected PacketHistory
      * Called immedately on receiption, before any further processing.
      * @return true to abandon the packet
      */
-    virtual bool shouldFilterReceived(MeshPacket *p) override;
+    virtual bool shouldFilterReceived(const MeshPacket *p) override;
 
     /**
      * Look for broadcasts we need to rebroadcast

src/mesh/MeshModule.cpp

@@ -44,15 +44,15 @@ MeshPacket *MeshModule::allocAckNak(Routing_Error err, NodeNum to, PacketId idFr
     // auto p = allocDataProtobuf(c);
     MeshPacket *p = router->allocForSending();
     p->decoded.portnum = PortNum_ROUTING_APP;
-    p->decoded.payload.size = pb_encode_to_bytes(p->decoded.payload.bytes, sizeof(p->decoded.payload.bytes), Routing_fields, &c);
+    p->decoded.payload.size = pb_encode_to_bytes(p->decoded.payload.bytes, sizeof(p->decoded.payload.bytes), &Routing_msg, &c);
 
     p->priority = MeshPacket_Priority_ACK;
 
-    p->hop_limit = 0; // Assume just immediate neighbors for now
+    p->hop_limit = config.lora.hop_limit; // Flood ACK back to original sender
     p->to = to;
     p->decoded.request_id = idFrom;
     p->channel = chIndex;
-    DEBUG_MSG("Alloc an err=%d,to=0x%x,idFrom=0x%x,id=0x%x\n", err, to, idFrom, p->id);
+    LOG_ERROR("Alloc an err=%d,to=0x%x,idFrom=0x%x,id=0x%x\n", err, to, idFrom, p->id);
 
     return p;
 }
@@ -68,7 +68,7 @@ MeshPacket *MeshModule::allocErrorResponse(Routing_Error err, const MeshPacket *
 
 void MeshModule::callPlugins(const MeshPacket &mp, RxSource src)
 {
-    // DEBUG_MSG("In call modules\n");
+    // LOG_DEBUG("In call modules\n");
     bool moduleFound = false;
 
     // We now allow **encrypted** packets to pass through the modules
@@ -96,7 +96,7 @@ void MeshModule::callPlugins(const MeshPacket &mp, RxSource src)
         assert(!pi.myReply); // If it is !null it means we have a bug, because it should have been sent the previous time
 
         if (wantsPacket) {
-            DEBUG_MSG("Module '%s' wantsPacket=%d\n", pi.name, wantsPacket);
+            LOG_DEBUG("Module '%s' wantsPacket=%d\n", pi.name, wantsPacket);
 
             moduleFound = true;
 
@@ -134,20 +134,20 @@ void MeshModule::callPlugins(const MeshPacket &mp, RxSource src)
                 // any other node.
                 if (mp.decoded.want_response && toUs && (getFrom(&mp) != ourNodeNum || mp.to == ourNodeNum) && !currentReply) {
                     pi.sendResponse(mp);
-                    DEBUG_MSG("Module '%s' sent a response\n", pi.name);
+                    LOG_INFO("Module '%s' sent a response\n", pi.name);
                 } else {
-                    DEBUG_MSG("Module '%s' considered\n", pi.name);
+                    LOG_DEBUG("Module '%s' considered\n", pi.name);
                 }
 
                 // If the requester didn't ask for a response we might need to discard unused replies to prevent memory leaks
                 if (pi.myReply) {
-                    DEBUG_MSG("Discarding an unneeded response\n");
+                    LOG_DEBUG("Discarding an unneeded response\n");
                     packetPool.release(pi.myReply);
                     pi.myReply = NULL;
                 }
 
                 if (handled == ProcessMessage::STOP) {
-                    DEBUG_MSG("Module '%s' handled and skipped other processing\n", pi.name);
+                    LOG_DEBUG("Module '%s' handled and skipped other processing\n", pi.name);
                     break;
                 }
             }
@@ -165,7 +165,7 @@ void MeshModule::callPlugins(const MeshPacket &mp, RxSource src)
             // Note: if the message started with the local node we don't want to send a no response reply
 
             // No one wanted to reply to this requst, tell the requster that happened
-            DEBUG_MSG("No one responded, send a nak\n");
+            LOG_DEBUG("No one responded, send a nak\n");
 
             // SECURITY NOTE! I considered sending back a different error code if we didn't find the psk (i.e. !isDecoded)
             // but opted NOT TO.  Because it is not a good idea to let remote nodes 'probe' to find out which PSKs were "good" vs
@@ -175,7 +175,7 @@ void MeshModule::callPlugins(const MeshPacket &mp, RxSource src)
     }
 
     if (!moduleFound)
-        DEBUG_MSG("No modules interested in portnum=%d, src=%s\n",
+        LOG_DEBUG("No modules interested in portnum=%d, src=%s\n",
                     mp.decoded.portnum,
                     (src == RX_SRC_LOCAL) ? "LOCAL":"REMOTE");
 }
@@ -199,7 +199,7 @@ void MeshModule::sendResponse(const MeshPacket &req)
         currentReply = r;
     } else {
         // Ignore - this is now expected behavior for routing module (because it ignores some replies)
-        // DEBUG_MSG("WARNING: Client requested response but this module did not provide\n");
+        // LOG_WARN("Client requested response but this module did not provide\n");
     }
 }
 
@@ -227,7 +227,7 @@ std::vector<MeshModule *> MeshModule::GetMeshModulesWithUIFrames()
         for (auto i = modules->begin(); i != modules->end(); ++i) {
             auto &pi = **i;
             if (pi.wantUIFrame()) {
-                DEBUG_MSG("Module wants a UI Frame\n");
+                LOG_DEBUG("Module wants a UI Frame\n");
                 modulesWithUIFrames.push_back(&pi);
             }
         }
@@ -244,7 +244,7 @@ void MeshModule::observeUIEvents(
             Observable<const UIFrameEvent *> *observable =
                 pi.getUIFrameObservable();
             if (observable != NULL) {
-                DEBUG_MSG("Module wants a UI Frame\n");
+                LOG_DEBUG("Module wants a UI Frame\n");
                 observer->observe(observable);
             }
         }
@@ -261,7 +261,7 @@ AdminMessageHandleResult MeshModule::handleAdminMessageForAllPlugins(const MeshP
             if (h == AdminMessageHandleResult::HANDLED_WITH_RESPONSE)
             {
                 // In case we have a response it always has priority.
-                DEBUG_MSG("Reply prepared by module '%s' of variant: %d\n",
+                LOG_DEBUG("Reply prepared by module '%s' of variant: %d\n",
                     pi.name,
                     response->which_payload_variant);
                 handled = h;

src/mesh/MeshService.cpp

@@ -106,7 +106,7 @@ bool MeshService::reloadConfig(int saveWhat)
 /// The owner User record just got updated, update our node DB and broadcast the info into the mesh
 void MeshService::reloadOwner(bool shouldSave)
 {
-    // DEBUG_MSG("reloadOwner()\n");
+    // LOG_DEBUG("reloadOwner()\n");
     // update our local data directly
     nodeDB.updateUser(nodeDB.getNodeNum(), owner);
     assert(nodeInfoModule);
@@ -140,7 +140,7 @@ void MeshService::handleToRadio(MeshPacket &p)
                 // Switch the port from PortNum_SIMULATOR_APP back to the original PortNum 
                 p.decoded.portnum = decoded->portnum;
             } else
-                DEBUG_MSG("Error decoding protobuf for simulator message!\n");
+                LOG_ERROR("Error decoding protobuf for simulator message!\n");
         }
         // Let SimRadio receive as if it did via its LoRa chip
         SimRadio::instance->startReceive(&p); 
@@ -148,7 +148,7 @@ void MeshService::handleToRadio(MeshPacket &p)
     }
     #endif
     if (p.from != 0) { // We don't let phones assign nodenums to their sent messages
-        DEBUG_MSG("Warning: phone tried to pick a nodenum, we don't allow that.\n");
+        LOG_WARN("phone tried to pick a nodenum, we don't allow that.\n");
         p.from = 0;
     } else {
         // p.from = nodeDB.getNodeNum();
@@ -198,12 +198,12 @@ void MeshService::sendNetworkPing(NodeNum dest, bool wantReplies)
 
     if (node->has_position && (node->position.latitude_i != 0 || node->position.longitude_i != 0)) {
         if (positionModule) {
-            DEBUG_MSG("Sending position ping to 0x%x, wantReplies=%d\n", dest, wantReplies);
+            LOG_INFO("Sending position ping to 0x%x, wantReplies=%d\n", dest, wantReplies);
             positionModule->sendOurPosition(dest, wantReplies);
         }
     } else {
         if (nodeInfoModule) {
-            DEBUG_MSG("Sending nodeinfo ping to 0x%x, wantReplies=%d\n", dest, wantReplies);
+            LOG_INFO("Sending nodeinfo ping to 0x%x, wantReplies=%d\n", dest, wantReplies);
             nodeInfoModule->sendOurNodeInfo(dest, wantReplies);
         }
     }
@@ -212,7 +212,7 @@ void MeshService::sendNetworkPing(NodeNum dest, bool wantReplies)
 void MeshService::sendToPhone(MeshPacket *p)
 {
     if (toPhoneQueue.numFree() == 0) {
-        DEBUG_MSG("NOTE: tophone queue is full, discarding oldest\n");
+        LOG_WARN("ToPhone queue is full, discarding oldest\n");
         MeshPacket *d = toPhoneQueue.dequeuePtr(0);
         if (d)
             releaseToPool(d);
@@ -262,10 +262,10 @@ int MeshService::onGPSChanged(const meshtastic::GPSStatus *newStatus)
         // The GPS has lost lock, if we are fixed position we should just keep using
         // the old position
 #ifdef GPS_EXTRAVERBOSE
-        DEBUG_MSG("onGPSchanged() - lost validLocation\n");
+        LOG_DEBUG("onGPSchanged() - lost validLocation\n");
 #endif
         if (config.position.fixed_position) {
-            DEBUG_MSG("WARNING: Using fixed position\n");
+            LOG_WARN("Using fixed position\n");
             pos = node->position;
         }
     }
@@ -276,7 +276,7 @@ int MeshService::onGPSChanged(const meshtastic::GPSStatus *newStatus)
     pos.time = getValidTime(RTCQualityGPS);
 
     // In debug logs, identify position by @timestamp:stage (stage 4 = nodeDB)
-    DEBUG_MSG("onGPSChanged() pos@%x, time=%u, lat=%d, lon=%d, alt=%d\n", pos.timestamp, pos.time, pos.latitude_i,
+    LOG_DEBUG("onGPSChanged() pos@%x, time=%u, lat=%d, lon=%d, alt=%d\n", pos.timestamp, pos.time, pos.latitude_i,
               pos.longitude_i, pos.altitude);
 
     // Update our current position in the local DB

src/mesh/NodeDB.cpp

@@ -86,7 +86,7 @@ bool NodeDB::resetRadioConfig(bool factory_reset)
     }
 
     if (channelFile.channels_count != MAX_NUM_CHANNELS) {
-        DEBUG_MSG("Setting default channel and radio preferences!\n");
+        LOG_INFO("Setting default channel and radio preferences!\n");
 
         channels.initDefaults();
     }
@@ -96,7 +96,7 @@ bool NodeDB::resetRadioConfig(bool factory_reset)
     // temp hack for quicker testing
     // devicestate.no_save = true;
     if (devicestate.no_save) {
-        DEBUG_MSG("***** DEVELOPMENT MODE - DO NOT RELEASE *****\n");
+        LOG_DEBUG("***** DEVELOPMENT MODE - DO NOT RELEASE *****\n");
 
         // Sleep quite frequently to stress test the BLE comms, broadcast position every 6 mins
         config.display.screen_on_secs = 10;
@@ -114,7 +114,7 @@ bool NodeDB::resetRadioConfig(bool factory_reset)
     initRegion();
 
     if (didFactoryReset) {
-        DEBUG_MSG("Rebooting due to factory reset");
+        LOG_INFO("Rebooting due to factory reset");
         screen->startRebootScreen();
         rebootAtMsec = millis() + (5 * 1000);
     }
@@ -124,7 +124,7 @@ bool NodeDB::resetRadioConfig(bool factory_reset)
 
 bool NodeDB::factoryReset() 
 {
-    DEBUG_MSG("Performing factory reset!\n");
+    LOG_INFO("Performing factory reset!\n");
     // first, remove the "/prefs" (this removes most prefs)
     rmDir("/prefs");
     // second, install default state (this will deal with the duplicate mac address issue)
@@ -140,7 +140,7 @@ bool NodeDB::factoryReset()
 #endif
 #ifdef ARCH_NRF52
     Bluefruit.begin();
-    DEBUG_MSG("Clearing bluetooth bonds!\n");
+    LOG_INFO("Clearing bluetooth bonds!\n");
     bond_print_list(BLE_GAP_ROLE_PERIPH);
     bond_print_list(BLE_GAP_ROLE_CENTRAL);
     Bluefruit.Periph.clearBonds();
@@ -151,7 +151,7 @@ bool NodeDB::factoryReset()
 
 void NodeDB::installDefaultConfig()
 {
-    DEBUG_MSG("Installing default LocalConfig\n");
+    LOG_INFO("Installing default LocalConfig\n");
     memset(&config, 0, sizeof(LocalConfig));
     config.version = DEVICESTATE_CUR_VER;
     config.has_device = true;
@@ -203,7 +203,7 @@ void NodeDB::initConfigIntervals()
 
 void NodeDB::installDefaultModuleConfig()
 {
-    DEBUG_MSG("Installing default ModuleConfig\n");
+    LOG_INFO("Installing default ModuleConfig\n");
     memset(&moduleConfig, 0, sizeof(ModuleConfig));
     
     moduleConfig.version = DEVICESTATE_CUR_VER;
@@ -230,7 +230,7 @@ void NodeDB::initModuleConfigIntervals()
 
 void NodeDB::installDefaultChannels()
 {
-    DEBUG_MSG("Installing default ChannelFile\n");
+    LOG_INFO("Installing default ChannelFile\n");
     memset(&channelFile, 0, sizeof(ChannelFile));
     channelFile.version = DEVICESTATE_CUR_VER;
 }
@@ -244,7 +244,7 @@ void NodeDB::resetNodes()
 
 void NodeDB::installDefaultDeviceState()
 {
-    DEBUG_MSG("Installing default DeviceState\n");
+    LOG_INFO("Installing default DeviceState\n");
     memset(&devicestate, 0, sizeof(DeviceState));
 
     *numNodes = 0;
@@ -275,7 +275,7 @@ void NodeDB::installDefaultDeviceState()
 
 void NodeDB::init()
 {
-    DEBUG_MSG("Initializing NodeDB\n");
+    LOG_INFO("Initializing NodeDB\n");
     loadFromDisk();
 
     uint32_t devicestateCRC = crc32Buffer(&devicestate, sizeof(devicestate));
@@ -311,7 +311,7 @@ void NodeDB::init()
     preferences.begin("meshtastic", false);
     myNodeInfo.reboot_count = preferences.getUInt("rebootCounter", 0);
     preferences.end();
-    DEBUG_MSG("Number of Device Reboots: %d\n", myNodeInfo.reboot_count);
+    LOG_DEBUG("Number of Device Reboots: %d\n", myNodeInfo.reboot_count);
 
     /* The ESP32 has a wifi radio. This will need to be modified at some point so
      *    the test isn't so simplistic.
@@ -320,7 +320,7 @@ void NodeDB::init()
 #endif
 
     resetRadioConfig(); // If bogus settings got saved, then fix them
-    DEBUG_MSG("region=%d, NODENUM=0x%x, dbsize=%d\n", config.lora.region, myNodeInfo.my_node_num, *numNodes);
+    LOG_DEBUG("region=%d, NODENUM=0x%x, dbsize=%d\n", config.lora.region, myNodeInfo.my_node_num, *numNodes);
 
     if (devicestateCRC != crc32Buffer(&devicestate, sizeof(devicestate)))
         saveWhat |= SEGMENT_DEVICESTATE;
@@ -352,7 +352,7 @@ void NodeDB::pickNewNodeNum()
     NodeInfo *found;
     while ((found = getNode(r)) && memcmp(found->user.macaddr, owner.macaddr, sizeof(owner.macaddr))) {
         NodeNum n = random(NUM_RESERVED, NODENUM_BROADCAST); // try a new random choice
-        DEBUG_MSG("NOTE! Our desired nodenum 0x%x is in use, so trying for 0x%x\n", r, n);
+        LOG_DEBUG("NOTE! Our desired nodenum 0x%x is in use, so trying for 0x%x\n", r, n);
         r = n;
     }
 
@@ -367,7 +367,7 @@ static const char *oemConfigFile = "/oem/oem.proto";
 
 
 /** Load a protobuf from a file, return true for success */
-bool loadProto(const char *filename, size_t protoSize, size_t objSize, const pb_msgdesc_t *fields, void *dest_struct)
+bool NodeDB::loadProto(const char *filename, size_t protoSize, size_t objSize, const pb_msgdesc_t *fields, void *dest_struct)
 {
     bool okay = false;
 #ifdef FSCom
@@ -376,24 +376,24 @@ bool loadProto(const char *filename, size_t protoSize, size_t objSize, const pb_
     auto f = FSCom.open(filename, FILE_O_READ);
 
     if (f) {
-        DEBUG_MSG("Loading %s\n", filename);
+        LOG_INFO("Loading %s\n", filename);
         pb_istream_t stream = {&readcb, &f, protoSize};
 
-        // DEBUG_MSG("Preload channel name=%s\n", channelSettings.name);
+        // LOG_DEBUG("Preload channel name=%s\n", channelSettings.name);
 
         memset(dest_struct, 0, objSize);
         if (!pb_decode(&stream, fields, dest_struct)) {
-            DEBUG_MSG("Error: can't decode protobuf %s\n", PB_GET_ERROR(&stream));
+            LOG_ERROR("Error: can't decode protobuf %s\n", PB_GET_ERROR(&stream));
         } else {
             okay = true;
         }
 
         f.close();
     } else {
-        DEBUG_MSG("No %s preferences found\n", filename);
+        LOG_INFO("No %s preferences found\n", filename);
     }
 #else
-    DEBUG_MSG("ERROR: Filesystem not implemented\n");
+    LOG_ERROR("ERROR: Filesystem not implemented\n");
 #endif
     return okay;
 }
@@ -401,56 +401,56 @@ bool loadProto(const char *filename, size_t protoSize, size_t objSize, const pb_
 void NodeDB::loadFromDisk()
 {
     // static DeviceState scratch; We no longer read into a tempbuf because this structure is 15KB of valuable RAM
-    if (!loadProto(prefFileName, DeviceState_size, sizeof(devicestate), DeviceState_fields, &devicestate)) {
+    if (!loadProto(prefFileName, DeviceState_size, sizeof(DeviceState), &DeviceState_msg, &devicestate)) {
         installDefaultDeviceState(); // Our in RAM copy might now be corrupt
     } else {
         if (devicestate.version < DEVICESTATE_MIN_VER) {
-            DEBUG_MSG("Warn: devicestate %d is old, discarding\n", devicestate.version);
+            LOG_WARN("Devicestate %d is old, discarding\n", devicestate.version);
             factoryReset();
         } else {
-            DEBUG_MSG("Loaded saved devicestate version %d\n", devicestate.version);
+            LOG_INFO("Loaded saved devicestate version %d\n", devicestate.version);
         }
     }
 
-    if (!loadProto(configFileName, LocalConfig_size, sizeof(LocalConfig), LocalConfig_fields, &config)) {
+    if (!loadProto(configFileName, LocalConfig_size, sizeof(LocalConfig), &LocalConfig_msg, &config)) {
         installDefaultConfig(); // Our in RAM copy might now be corrupt
     } else {
         if (config.version < DEVICESTATE_MIN_VER) {
-            DEBUG_MSG("Warn: config %d is old, discarding\n", config.version);
+            LOG_WARN("config %d is old, discarding\n", config.version);
             installDefaultConfig();
         } else {
-            DEBUG_MSG("Loaded saved config version %d\n", config.version);
+            LOG_INFO("Loaded saved config version %d\n", config.version);
         }
     }
 
-    if (!loadProto(moduleConfigFileName, LocalModuleConfig_size, sizeof(LocalModuleConfig), LocalModuleConfig_fields, &moduleConfig)) {
+    if (!loadProto(moduleConfigFileName, LocalModuleConfig_size, sizeof(LocalModuleConfig), &LocalModuleConfig_msg, &moduleConfig)) {
         installDefaultModuleConfig(); // Our in RAM copy might now be corrupt
     } else {
         if (moduleConfig.version < DEVICESTATE_MIN_VER) {
-            DEBUG_MSG("Warn: moduleConfig %d is old, discarding\n", moduleConfig.version);
+            LOG_WARN("moduleConfig %d is old, discarding\n", moduleConfig.version);
             installDefaultModuleConfig();
         } else {
-            DEBUG_MSG("Loaded saved moduleConfig version %d\n", moduleConfig.version);
+            LOG_INFO("Loaded saved moduleConfig version %d\n", moduleConfig.version);
         }
     }
 
-    if (!loadProto(channelFileName, ChannelFile_size, sizeof(ChannelFile), ChannelFile_fields, &channelFile)) {
+    if (!loadProto(channelFileName, ChannelFile_size, sizeof(ChannelFile), &ChannelFile_msg, &channelFile)) {
         installDefaultChannels(); // Our in RAM copy might now be corrupt
     } else {
         if (channelFile.version < DEVICESTATE_MIN_VER) {
-            DEBUG_MSG("Warn: channelFile %d is old, discarding\n", channelFile.version);
+            LOG_WARN("channelFile %d is old, discarding\n", channelFile.version);
             installDefaultChannels();
         } else {
-            DEBUG_MSG("Loaded saved channelFile version %d\n", channelFile.version);
+            LOG_INFO("Loaded saved channelFile version %d\n", channelFile.version);
         }
     }
 
-    if (loadProto(oemConfigFile, OEMStore_size, sizeof(OEMStore), OEMStore_fields, &oemStore))
-        DEBUG_MSG("Loaded OEMStore\n");
+    if (loadProto(oemConfigFile, OEMStore_size, sizeof(OEMStore), &OEMStore_msg, &oemStore))
+        LOG_INFO("Loaded OEMStore\n");
 }
 
 /** Save a protobuf from a file, return true for success */
-bool saveProto(const char *filename, size_t protoSize, size_t objSize, const pb_msgdesc_t *fields, const void *dest_struct)
+bool NodeDB::saveProto(const char *filename, size_t protoSize, const pb_msgdesc_t *fields, const void *dest_struct)
 {
     bool okay = false;
 #ifdef FSCom
@@ -459,11 +459,11 @@ bool saveProto(const char *filename, size_t protoSize, size_t objSize, const pb_
     filenameTmp += ".tmp";
     auto f = FSCom.open(filenameTmp.c_str(), FILE_O_WRITE);
     if (f) {
-        DEBUG_MSG("Saving %s\n", filename);
+        LOG_INFO("Saving %s\n", filename);
         pb_ostream_t stream = {&writecb, &f, protoSize};
 
         if (!pb_encode(&stream, fields, dest_struct)) {
-            DEBUG_MSG("Error: can't encode protobuf %s\n", PB_GET_ERROR(&stream));
+            LOG_ERROR("Error: can't encode protobuf %s\n", PB_GET_ERROR(&stream));
         } else {
             okay = true;
         }
@@ -471,11 +471,11 @@ bool saveProto(const char *filename, size_t protoSize, size_t objSize, const pb_
 
         // brief window of risk here ;-)
         if (FSCom.exists(filename) && !FSCom.remove(filename))
-            DEBUG_MSG("Warning: Can't remove old pref file\n");
+            LOG_WARN("Can't remove old pref file\n");
         if (!renameFile(filenameTmp.c_str(), filename))
-            DEBUG_MSG("Error: can't rename new pref file\n");
+            LOG_ERROR("Error: can't rename new pref file\n");
     } else {
-        DEBUG_MSG("Can't write prefs\n");
+        LOG_ERROR("Can't write prefs\n");
 #ifdef ARCH_NRF52
         static uint8_t failedCounter = 0;
         failedCounter++;
@@ -487,7 +487,7 @@ bool saveProto(const char *filename, size_t protoSize, size_t objSize, const pb_
 #endif
     }
 #else
-    DEBUG_MSG("ERROR: Filesystem not implemented\n");
+    LOG_ERROR("ERROR: Filesystem not implemented\n");
 #endif
     return okay;
 }
@@ -498,7 +498,7 @@ void NodeDB::saveChannelsToDisk()
 #ifdef FSCom
         FSCom.mkdir("/prefs");
 #endif
-        saveProto(channelFileName, ChannelFile_size, sizeof(channelFile), ChannelFile_fields, &channelFile);
+        saveProto(channelFileName, ChannelFile_size, &ChannelFile_msg, &channelFile);
     }
 }
 
@@ -508,7 +508,7 @@ void NodeDB::saveDeviceStateToDisk()
 #ifdef FSCom
         FSCom.mkdir("/prefs");
 #endif
-        saveProto(prefFileName, DeviceState_size, sizeof(devicestate), DeviceState_fields, &devicestate);
+        saveProto(prefFileName, DeviceState_size, &DeviceState_msg, &devicestate);
     }
 }
 
@@ -530,7 +530,7 @@ void NodeDB::saveToDisk(int saveWhat)
             config.has_power = true;
             config.has_network = true;
             config.has_bluetooth = true;
-            saveProto(configFileName, LocalConfig_size, sizeof(config), LocalConfig_fields, &config);
+            saveProto(configFileName, LocalConfig_size, &LocalConfig_msg, &config);
         }
 
         if (saveWhat & SEGMENT_MODULECONFIG) {
@@ -541,14 +541,14 @@ void NodeDB::saveToDisk(int saveWhat)
             moduleConfig.has_serial = true;
             moduleConfig.has_store_forward = true;
             moduleConfig.has_telemetry = true;
-            saveProto(moduleConfigFileName, LocalModuleConfig_size, sizeof(moduleConfig), LocalModuleConfig_fields, &moduleConfig);
+            saveProto(moduleConfigFileName, LocalModuleConfig_size, &LocalModuleConfig_msg, &moduleConfig);
         }
 
         if (saveWhat & SEGMENT_CHANNELS) {
             saveChannelsToDisk();
         }
     } else {
-        DEBUG_MSG("***** DEVELOPMENT MODE - DO NOT RELEASE - not saving to flash *****\n");
+        LOG_DEBUG("***** DEVELOPMENT MODE - DO NOT RELEASE - not saving to flash *****\n");
     }
 }
 
@@ -599,14 +599,14 @@ void NodeDB::updatePosition(uint32_t nodeId, const Position &p, RxSource src)
 
     if (src == RX_SRC_LOCAL) {
         // Local packet, fully authoritative
-        DEBUG_MSG("updatePosition LOCAL pos@%x, time=%u, latI=%d, lonI=%d, alt=%d\n", p.timestamp, p.time, p.latitude_i,
+        LOG_INFO("updatePosition LOCAL pos@%x, time=%u, latI=%d, lonI=%d, alt=%d\n", p.timestamp, p.time, p.latitude_i,
                   p.longitude_i, p.altitude);
         info->position = p;
 
     } else if ((p.time > 0) && !p.latitude_i && !p.longitude_i && !p.timestamp && !p.location_source) {
         // FIXME SPECIAL TIME SETTING PACKET FROM EUD TO RADIO
         // (stop-gap fix for issue #900)
-        DEBUG_MSG("updatePosition SPECIAL time setting time=%u\n", p.time);
+        LOG_DEBUG("updatePosition SPECIAL time setting time=%u\n", p.time);
         info->position.time = p.time;
 
     } else {
@@ -615,7 +615,7 @@ void NodeDB::updatePosition(uint32_t nodeId, const Position &p, RxSource src)
         // recorded based on the packet rxTime
         //
         // FIXME perhaps handle RX_SRC_USER separately?
-        DEBUG_MSG("updatePosition REMOTE node=0x%x time=%u, latI=%d, lonI=%d\n", nodeId, p.time, p.latitude_i, p.longitude_i);
+        LOG_INFO("updatePosition REMOTE node=0x%x time=%u, latI=%d, lonI=%d\n", nodeId, p.time, p.latitude_i, p.longitude_i);
 
         // First, back up fields that we want to protect from overwrite
         uint32_t tmp_time = info->position.time;
@@ -645,9 +645,9 @@ void NodeDB::updateTelemetry(uint32_t nodeId, const Telemetry &t, RxSource src)
 
     if (src == RX_SRC_LOCAL) {
         // Local packet, fully authoritative
-        DEBUG_MSG("updateTelemetry LOCAL\n");
+        LOG_DEBUG("updateTelemetry LOCAL\n");
     } else {
-        DEBUG_MSG("updateTelemetry REMOTE node=0x%x \n", nodeId);
+        LOG_DEBUG("updateTelemetry REMOTE node=0x%x \n", nodeId);
     }
     info->device_metrics = t.variant.device_metrics;
     info->has_device_metrics = true;
@@ -664,13 +664,13 @@ void NodeDB::updateUser(uint32_t nodeId, const User &p)
         return;
     }
 
-    DEBUG_MSG("old user %s/%s/%s\n", info->user.id, info->user.long_name, info->user.short_name);
+    LOG_DEBUG("old user %s/%s/%s\n", info->user.id, info->user.long_name, info->user.short_name);
 
     bool changed = memcmp(&info->user, &p,
                           sizeof(info->user)); // Both of these blocks start as filled with zero so I think this is okay
 
     info->user = p;
-    DEBUG_MSG("updating changed=%d user %s/%s/%s\n", changed, info->user.id, info->user.long_name, info->user.short_name);
+    LOG_DEBUG("updating changed=%d user %s/%s/%s\n", changed, info->user.id, info->user.long_name, info->user.short_name);
     info->has_user = true;
 
     if (changed) {
@@ -689,7 +689,7 @@ void NodeDB::updateUser(uint32_t nodeId, const User &p)
 void NodeDB::updateFrom(const MeshPacket &mp)
 {
     if (mp.which_payload_variant == MeshPacket_decoded_tag && mp.from) {
-        DEBUG_MSG("Update DB node 0x%x, rx_time=%u\n", mp.from, mp.rx_time);
+        LOG_DEBUG("Update DB node 0x%x, rx_time=%u\n", mp.from, mp.rx_time);
 
         NodeInfo *info = getOrCreateNode(getFrom(&mp));
         if (!info) {
@@ -756,9 +756,9 @@ void recordCriticalError(CriticalErrorCode code, uint32_t address, const char *f
     String lcd = String("Critical error ") + code + "!\n";
     screen->print(lcd.c_str());
     if (filename)
-        DEBUG_MSG("NOTE! Recording critical error %d at %s:%lu\n", code, filename, address);
+        LOG_ERROR("NOTE! Recording critical error %d at %s:%lu\n", code, filename, address);
     else
-        DEBUG_MSG("NOTE! Recording critical error %d, address=0x%lx\n", code, address);
+        LOG_ERROR("NOTE! Recording critical error %d, address=0x%lx\n", code, address);
 
     // Record error to DB
     myNodeInfo.error_code = code;
@@ -767,7 +767,7 @@ void recordCriticalError(CriticalErrorCode code, uint32_t address, const char *f
 
     // Currently portuino is mostly used for simulation.  Make sue the user notices something really bad happend
 #ifdef ARCH_PORTDUINO
-    DEBUG_MSG("A critical failure occurred, portduino is exiting...");
+    LOG_ERROR("A critical failure occurred, portduino is exiting...");
     exit(2);
 #endif
 }

src/mesh/NodeDB.h

@@ -125,6 +125,9 @@ class NodeDB
     
     bool factoryReset();
 
+    bool loadProto(const char *filename, size_t protoSize, size_t objSize, const pb_msgdesc_t *fields, void *dest_struct);
+    bool saveProto(const char *filename, size_t protoSize, const pb_msgdesc_t *fields, const void *dest_struct);
+
   private:
     /// Find a node in our DB, create an empty NodeInfo if missing
     NodeInfo *getOrCreateNode(NodeNum n);

src/mesh/PacketHistory.cpp

@@ -14,7 +14,7 @@ PacketHistory::PacketHistory()
 bool PacketHistory::wasSeenRecently(const MeshPacket *p, bool withUpdate)
 {
     if (p->id == 0) {
-        DEBUG_MSG("Ignoring message with zero id\n");
+        LOG_DEBUG("Ignoring message with zero id\n");
         return false; // Not a floodable message ID, so we don't care
     }
 
@@ -35,7 +35,7 @@ bool PacketHistory::wasSeenRecently(const MeshPacket *p, bool withUpdate)
     }
 
     if (seenRecently) {
-        DEBUG_MSG("Found existing packet record for fr=0x%x,to=0x%x,id=0x%x\n", p->from, p->to, p->id);
+        LOG_DEBUG("Found existing packet record for fr=0x%x,to=0x%x,id=0x%x\n", p->from, p->to, p->id);
     }
 
     if (withUpdate) {
@@ -61,7 +61,7 @@ bool PacketHistory::wasSeenRecently(const MeshPacket *p, bool withUpdate)
 void PacketHistory::clearExpiredRecentPackets() {
     uint32_t now = millis();
 
-    DEBUG_MSG("recentPackets size=%ld\n", recentPackets.size());
+    LOG_DEBUG("recentPackets size=%ld\n", recentPackets.size());
 
     for (auto it = recentPackets.begin(); it != recentPackets.end(); ) {
         if ((now - it->rxTimeMsec) >= FLOOD_EXPIRE_TIME) {
@@ -71,5 +71,5 @@ void PacketHistory::clearExpiredRecentPackets() {
         }
     }
 
-    DEBUG_MSG("recentPackets size=%ld (after clearing expired packets)\n", recentPackets.size());
+    LOG_DEBUG("recentPackets size=%ld (after clearing expired packets)\n", recentPackets.size());
 }

src/mesh/PhoneAPI.cpp

@@ -37,7 +37,7 @@ void PhoneAPI::handleStartConfig()
     // even if we were already connected - restart our state machine
     state = STATE_SEND_MY_INFO;
 
-    DEBUG_MSG("Starting API client config\n");
+    LOG_INFO("Starting API client config\n");
     nodeInfoForPhone = NULL;   // Don't keep returning old nodeinfos
     nodeDB.resetReadPointer(); // FIXME, this read pointer should be moved out of nodeDB and into this class - because
                                // this will break once we have multiple instances of PhoneAPI running independently
@@ -60,7 +60,7 @@ void PhoneAPI::checkConnectionTimeout()
     if (isConnected()) {
         bool newContact = checkIsConnected();
         if (!newContact) {
-            DEBUG_MSG("Lost phone connection\n");
+            LOG_INFO("Lost phone connection\n");
             close();
         }
     }
@@ -77,26 +77,26 @@ bool PhoneAPI::handleToRadio(const uint8_t *buf, size_t bufLength)
     // return (lastContactMsec != 0) &&
 
     memset(&toRadioScratch, 0, sizeof(toRadioScratch));
-    if (pb_decode_from_bytes(buf, bufLength, ToRadio_fields, &toRadioScratch)) {
+    if (pb_decode_from_bytes(buf, bufLength, &ToRadio_msg, &toRadioScratch)) {
         switch (toRadioScratch.which_payload_variant) {
         case ToRadio_packet_tag:
             return handleToRadioPacket(toRadioScratch.packet);
         case ToRadio_want_config_id_tag:
             config_nonce = toRadioScratch.want_config_id;
-            DEBUG_MSG("Client wants config, nonce=%u\n", config_nonce);
+            LOG_INFO("Client wants config, nonce=%u\n", config_nonce);
             handleStartConfig();
             break;
         case ToRadio_disconnect_tag:
-            DEBUG_MSG("Disconnecting from phone\n");
+            LOG_INFO("Disconnecting from phone\n");
             close();
             break;
         default:
             // Ignore nop messages
-            // DEBUG_MSG("Error: unexpected ToRadio variant\n");
+            // LOG_DEBUG("Error: unexpected ToRadio variant\n");
             break;
         }
     } else {
-        DEBUG_MSG("Error: ignoring malformed toradio\n");
+        LOG_ERROR("Error: ignoring malformed toradio\n");
     }
 
     return false;
@@ -119,7 +119,7 @@ bool PhoneAPI::handleToRadio(const uint8_t *buf, size_t bufLength)
 size_t PhoneAPI::getFromRadio(uint8_t *buf)
 {
     if (!available()) {
-        // DEBUG_MSG("getFromRadio=not available\n");
+        // LOG_DEBUG("getFromRadio=not available\n");
         return 0;
     }
     // In case we send a FromRadio packet
@@ -128,11 +128,11 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
     // Advance states as needed
     switch (state) {
     case STATE_SEND_NOTHING:
-        DEBUG_MSG("getFromRadio=STATE_SEND_NOTHING\n");
+        LOG_INFO("getFromRadio=STATE_SEND_NOTHING\n");
         break;
 
     case STATE_SEND_MY_INFO:
-        DEBUG_MSG("getFromRadio=STATE_SEND_MY_INFO\n");
+        LOG_INFO("getFromRadio=STATE_SEND_MY_INFO\n");
         // If the user has specified they don't want our node to share its location, make sure to tell the phone
         // app not to send locations on our behalf.
         myNodeInfo.has_gps = gps && gps->isConnected(); // Update with latest GPS connect info
@@ -144,18 +144,18 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
         break;
 
     case STATE_SEND_NODEINFO: {
-        DEBUG_MSG("getFromRadio=STATE_SEND_NODEINFO\n");
+        LOG_INFO("getFromRadio=STATE_SEND_NODEINFO\n");
         const NodeInfo *info = nodeInfoForPhone;
         nodeInfoForPhone = NULL; // We just consumed a nodeinfo, will need a new one next time
 
         if (info) {
-            DEBUG_MSG("Sending nodeinfo: num=0x%x, lastseen=%u, id=%s, name=%s\n", info->num, info->last_heard, info->user.id,
+            LOG_INFO("Sending nodeinfo: num=0x%x, lastseen=%u, id=%s, name=%s\n", info->num, info->last_heard, info->user.id,
                       info->user.long_name);
             fromRadioScratch.which_payload_variant = FromRadio_node_info_tag;
             fromRadioScratch.node_info = *info;
             // Stay in current state until done sending nodeinfos
         } else {
-            DEBUG_MSG("Done sending nodeinfos\n");
+            LOG_INFO("Done sending nodeinfos\n");
             state = STATE_SEND_CHANNELS;
             // Go ahead and send that ID right now
             return getFromRadio(buf);
@@ -164,19 +164,19 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
     }
 
     case STATE_SEND_CHANNELS:
-        DEBUG_MSG("getFromRadio=STATE_SEND_CHANNELS\n");
+        LOG_INFO("getFromRadio=STATE_SEND_CHANNELS\n");
         fromRadioScratch.which_payload_variant = FromRadio_channel_tag;
         fromRadioScratch.channel = channels.getByIndex(config_state);
         config_state++;
         // Advance when we have sent all of our Channels
         if (config_state >= MAX_NUM_CHANNELS) {
             state = STATE_SEND_CONFIG;
-            config_state = Config_device_tag;
+            config_state = _AdminMessage_ConfigType_MIN + 1;
         }
         break;
 
     case STATE_SEND_CONFIG:
-        DEBUG_MSG("getFromRadio=STATE_SEND_CONFIG\n");
+        LOG_INFO("getFromRadio=STATE_SEND_CONFIG\n");
         fromRadioScratch.which_payload_variant = FromRadio_config_tag;
         switch (config_state) {
         case Config_device_tag:
@@ -215,14 +215,14 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
 
         config_state++;
         // Advance when we have sent all of our config objects
-        if (config_state > Config_bluetooth_tag) {
+        if (config_state > (_AdminMessage_ConfigType_MAX + 1)) {
             state = STATE_SEND_MODULECONFIG;
-            config_state = ModuleConfig_mqtt_tag;
+            config_state = _AdminMessage_ModuleConfigType_MIN + 1;
         }
         break;
 
     case STATE_SEND_MODULECONFIG:
-        DEBUG_MSG("getFromRadio=STATE_SEND_MODULECONFIG\n");
+        LOG_INFO("getFromRadio=STATE_SEND_MODULECONFIG\n");
         fromRadioScratch.which_payload_variant = FromRadio_moduleConfig_tag;
         switch (config_state) {
         case ModuleConfig_mqtt_tag:
@@ -237,6 +237,10 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
             fromRadioScratch.moduleConfig.which_payload_variant = ModuleConfig_external_notification_tag;
             fromRadioScratch.moduleConfig.payload_variant.external_notification = moduleConfig.external_notification;
             break;
+        case ModuleConfig_store_forward_tag:
+            fromRadioScratch.moduleConfig.which_payload_variant = ModuleConfig_store_forward_tag;
+            fromRadioScratch.moduleConfig.payload_variant.store_forward = moduleConfig.store_forward;
+            break;
         case ModuleConfig_range_test_tag:
             fromRadioScratch.moduleConfig.which_payload_variant = ModuleConfig_range_test_tag;
             fromRadioScratch.moduleConfig.payload_variant.range_test = moduleConfig.range_test;
@@ -253,18 +257,22 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
             fromRadioScratch.moduleConfig.which_payload_variant = ModuleConfig_audio_tag;
             fromRadioScratch.moduleConfig.payload_variant.audio = moduleConfig.audio;
             break;
+        case ModuleConfig_remote_hardware_tag:
+            fromRadioScratch.moduleConfig.which_payload_variant = ModuleConfig_remote_hardware_tag;
+            fromRadioScratch.moduleConfig.payload_variant.remote_hardware = moduleConfig.remote_hardware;
+            break;
         }
 
         config_state++;
         // Advance when we have sent all of our ModuleConfig objects
-        if (config_state > ModuleConfig_audio_tag) {
+        if (config_state > (_AdminMessage_ModuleConfigType_MAX + 1)) {
             state = STATE_SEND_COMPLETE_ID;
             config_state = 0;
         }
         break;
 
     case STATE_SEND_COMPLETE_ID:
-        DEBUG_MSG("getFromRadio=STATE_SEND_COMPLETE_ID\n");
+        LOG_INFO("getFromRadio=STATE_SEND_COMPLETE_ID\n");
         fromRadioScratch.which_payload_variant = FromRadio_config_complete_id_tag;
         fromRadioScratch.config_complete_id = config_nonce;
         config_nonce = 0;
@@ -273,7 +281,7 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
 
     case STATE_SEND_PACKETS:
         // Do we have a message from the mesh?
-        DEBUG_MSG("getFromRadio=STATE_SEND_PACKETS\n");
+        LOG_INFO("getFromRadio=STATE_SEND_PACKETS\n");
         if (packetForPhone) {
             printPacket("phone downloaded packet", packetForPhone);
 
@@ -291,19 +299,19 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
     // Do we have a message from the mesh?
     if (fromRadioScratch.which_payload_variant != 0) {
         // Encapsulate as a FromRadio packet
-        size_t numbytes = pb_encode_to_bytes(buf, FromRadio_size, FromRadio_fields, &fromRadioScratch);
+        size_t numbytes = pb_encode_to_bytes(buf, FromRadio_size, &FromRadio_msg, &fromRadioScratch);
 
-        DEBUG_MSG("encoding toPhone packet to phone variant=%d, %d bytes\n", fromRadioScratch.which_payload_variant, numbytes);
+        LOG_DEBUG("encoding toPhone packet to phone variant=%d, %d bytes\n", fromRadioScratch.which_payload_variant, numbytes);
         return numbytes;
     }
 
-    DEBUG_MSG("no FromRadio packet available\n");
+    LOG_DEBUG("no FromRadio packet available\n");
     return 0;
 }
 
 void PhoneAPI::handleDisconnect()
 {
-    DEBUG_MSG("PhoneAPI disconnect\n");
+    LOG_INFO("PhoneAPI disconnect\n");
 }
 
 void PhoneAPI::releasePhonePacket()
@@ -337,7 +345,7 @@ bool PhoneAPI::available()
         if (!packetForPhone)
             packetForPhone = service.getForPhone();
         bool hasPacket = !!packetForPhone;
-        // DEBUG_MSG("available hasPacket=%d\n", hasPacket);
+        // LOG_DEBUG("available hasPacket=%d\n", hasPacket);
         return hasPacket;
     }
     default:
@@ -365,10 +373,10 @@ int PhoneAPI::onNotify(uint32_t newValue)
                               // from idle)
 
     if (state == STATE_SEND_PACKETS) {
-        DEBUG_MSG("Telling client we have new packets %u\n", newValue);
+        LOG_INFO("Telling client we have new packets %u\n", newValue);
         onNowHasData(newValue);
     } else
-        DEBUG_MSG("(Client not yet interested in packets)\n");
+        LOG_DEBUG("(Client not yet interested in packets)\n");
 
     return 0;
 }

src/mesh/ProtobufModule.h

@@ -44,7 +44,7 @@ template <class T> class ProtobufModule : protected SinglePortModule
 
         p->decoded.payload.size =
             pb_encode_to_bytes(p->decoded.payload.bytes, sizeof(p->decoded.payload.bytes), fields, &payload);
-        // DEBUG_MSG("did encode\n");
+        // LOG_DEBUG("did encode\n");
         return p;
     }
 
@@ -70,7 +70,7 @@ template <class T> class ProtobufModule : protected SinglePortModule
         // it would be better to update even if the message was destined to others.
 
         auto &p = mp.decoded;
-        DEBUG_MSG("Received %s from=0x%0x, id=0x%x, portnum=%d, payloadlen=%d\n", name, mp.from, mp.id, p.portnum,
+        LOG_INFO("Received %s from=0x%0x, id=0x%x, portnum=%d, payloadlen=%d\n", name, mp.from, mp.id, p.portnum,
                   p.payload.size);
 
         T scratch;
@@ -80,7 +80,7 @@ template <class T> class ProtobufModule : protected SinglePortModule
             if (pb_decode_from_bytes(p.payload.bytes, p.payload.size, fields, &scratch)) {
                 decoded = &scratch;
             } else {
-                DEBUG_MSG("Error decoding protobuf module!\n");
+                LOG_ERROR("Error decoding protobuf module!\n");
                 // if we can't decode it, nobody can process it!
                 return ProcessMessage::STOP;
             }

src/mesh/RF95Interface.cpp

@@ -68,17 +68,17 @@ bool RF95Interface::init()
     setTransmitEnable(false);
 
     int res = lora->begin(getFreq(), bw, sf, cr, syncWord, power, currentLimit, preambleLength);
-    DEBUG_MSG("RF95 init result %d\n", res);
+    LOG_INFO("RF95 init result %d\n", res);
 
-    DEBUG_MSG("Frequency set to %f\n", getFreq());    
-    DEBUG_MSG("Bandwidth set to %f\n", bw);    
-    DEBUG_MSG("Power output set to %d\n", power);    
+    LOG_INFO("Frequency set to %f\n", getFreq());    
+    LOG_INFO("Bandwidth set to %f\n", bw);    
+    LOG_INFO("Power output set to %d\n", power);    
 
     // current limit was removed from module' ctor
     // override default value (60 mA)
     res = lora->setCurrentLimit(currentLimit);
-    DEBUG_MSG("Current limit set to %f\n", currentLimit);
-    DEBUG_MSG("Current limit set result %d\n", res);
+    LOG_DEBUG("Current limit set to %f\n", currentLimit);
+    LOG_DEBUG("Current limit set result %d\n", res);
 
     if (res == RADIOLIB_ERR_NONE)
         res = lora->setCRC(RADIOLIB_SX126X_LORA_CRC_ON);
@@ -190,12 +190,12 @@ bool RF95Interface::isChannelActive()
     result = lora->scanChannel();
     
     if (result == RADIOLIB_PREAMBLE_DETECTED) {
-        // DEBUG_MSG("Channel is busy!\n");
+        // LOG_DEBUG("Channel is busy!\n");
         return true;
     }
     assert(result != RADIOLIB_ERR_WRONG_MODEM);
     
-    // DEBUG_MSG("Channel is free!\n");
+    // LOG_DEBUG("Channel is free!\n");
     return false;
 }
 

src/mesh/RadioInterface.cpp

@@ -117,7 +117,7 @@ void initRegion()
     for (; r->code != Config_LoRaConfig_RegionCode_UNSET && r->code != config.lora.region; r++)
         ;
     myRegion = r;
-    DEBUG_MSG("Wanted region %d, using %s\n", config.lora.region, r->name);
+    LOG_INFO("Wanted region %d, using %s\n", config.lora.region, r->name);
 }
 
 /**
@@ -157,7 +157,7 @@ uint32_t RadioInterface::getPacketTime(uint32_t pl)
 
     uint32_t msecs = tPacket * 1000;
 
-    DEBUG_MSG("(bw=%d, sf=%d, cr=4/%d) packet symLen=%d ms, payloadSize=%u, time %d ms\n", (int)bw, sf, cr, (int)(tSym * 1000),
+    LOG_DEBUG("(bw=%d, sf=%d, cr=4/%d) packet symLen=%d ms, payloadSize=%u, time %d ms\n", (int)bw, sf, cr, (int)(tSym * 1000),
               pl, msecs);
     return msecs;
 }
@@ -175,10 +175,10 @@ uint32_t RadioInterface::getRetransmissionMsec(const MeshPacket *p)
 {
     assert(slotTimeMsec); // Better be non zero
     static uint8_t bytes[MAX_RHPACKETLEN];
-    size_t numbytes = pb_encode_to_bytes(bytes, sizeof(bytes), Data_fields, &p->decoded);
+    size_t numbytes = pb_encode_to_bytes(bytes, sizeof(bytes), &Data_msg, &p->decoded);
     uint32_t packetAirtime = getPacketTime(numbytes + sizeof(PacketHeader));
     // Make sure enough time has elapsed for this packet to be sent and an ACK is received.
-    // DEBUG_MSG("Waiting for flooding message with airtime %d and slotTime is %d\n", packetAirtime, slotTimeMsec);
+    // LOG_DEBUG("Waiting for flooding message with airtime %d and slotTime is %d\n", packetAirtime, slotTimeMsec);
     float channelUtil = airTime->channelUtilizationPercent();
     uint8_t CWsize = map(channelUtil, 0, 100, CWmin, CWmax);
     // Assuming we pick max. of CWsize and there will be a receiver with SNR at half the range
@@ -193,7 +193,7 @@ uint32_t RadioInterface::getTxDelayMsec()
     current channel utilization. */
     float channelUtil = airTime->channelUtilizationPercent();
     uint8_t CWsize = map(channelUtil, 0, 100, CWmin, CWmax);
-    // DEBUG_MSG("Current channel utilization is %f so setting CWsize to %d\n", channelUtil, CWsize);
+    // LOG_DEBUG("Current channel utilization is %f so setting CWsize to %d\n", channelUtil, CWsize);
     return random(0, pow(2, CWsize)) * slotTimeMsec;
 }
 
@@ -210,14 +210,14 @@ uint32_t RadioInterface::getTxDelayMsecWeighted(float snr)
     //  low SNR = small CW size (Short Delay)
     uint32_t delay = 0;
     uint8_t CWsize = map(snr, SNR_MIN, SNR_MAX, CWmin, CWmax);
-    // DEBUG_MSG("rx_snr of %f so setting CWsize to:%d\n", snr, CWsize);
+    // LOG_DEBUG("rx_snr of %f so setting CWsize to:%d\n", snr, CWsize);
     if (config.device.role == Config_DeviceConfig_Role_ROUTER ||
         config.device.role == Config_DeviceConfig_Role_ROUTER_CLIENT) {
         delay = random(0, 2*CWsize) * slotTimeMsec;
-        DEBUG_MSG("rx_snr found in packet. As a router, setting tx delay:%d\n", delay);
+        LOG_DEBUG("rx_snr found in packet. As a router, setting tx delay:%d\n", delay);
     } else {
         delay = random(0, pow(2, CWsize)) * slotTimeMsec;
-        DEBUG_MSG("rx_snr found in packet. Setting tx delay:%d\n", delay);
+        LOG_DEBUG("rx_snr found in packet. Setting tx delay:%d\n", delay);
     }
 
     return delay;
@@ -225,47 +225,47 @@ uint32_t RadioInterface::getTxDelayMsecWeighted(float snr)
 
 void printPacket(const char *prefix, const MeshPacket *p)
 {
-    DEBUG_MSG("%s (id=0x%08x fr=0x%02x to=0x%02x, WantAck=%d, HopLim=%d Ch=0x%x", prefix, p->id, p->from & 0xff, p->to & 0xff,
+    LOG_DEBUG("%s (id=0x%08x fr=0x%02x to=0x%02x, WantAck=%d, HopLim=%d Ch=0x%x", prefix, p->id, p->from & 0xff, p->to & 0xff,
               p->want_ack, p->hop_limit, p->channel);
     if (p->which_payload_variant == MeshPacket_decoded_tag) {
         auto &s = p->decoded;
 
-        DEBUG_MSG(" Portnum=%d", s.portnum);
+        LOG_DEBUG(" Portnum=%d", s.portnum);
 
         if (s.want_response)
-            DEBUG_MSG(" WANTRESP");
+            LOG_DEBUG(" WANTRESP");
 
         if (s.source != 0)
-            DEBUG_MSG(" source=%08x", s.source);
+            LOG_DEBUG(" source=%08x", s.source);
 
         if (s.dest != 0)
-            DEBUG_MSG(" dest=%08x", s.dest);
+            LOG_DEBUG(" dest=%08x", s.dest);
 
         if (s.request_id)
-            DEBUG_MSG(" requestId=%0x", s.request_id);
+            LOG_DEBUG(" requestId=%0x", s.request_id);
 
         /* now inside Data and therefore kinda opaque
         if (s.which_ackVariant == SubPacket_success_id_tag)
-            DEBUG_MSG(" successId=%08x", s.ackVariant.success_id);
+            LOG_DEBUG(" successId=%08x", s.ackVariant.success_id);
         else if (s.which_ackVariant == SubPacket_fail_id_tag)
-            DEBUG_MSG(" failId=%08x", s.ackVariant.fail_id); */
+            LOG_DEBUG(" failId=%08x", s.ackVariant.fail_id); */
     } else {
-        DEBUG_MSG(" encrypted");
+        LOG_DEBUG(" encrypted");
     }
 
     if (p->rx_time != 0) {
-        DEBUG_MSG(" rxtime=%u", p->rx_time);
+        LOG_DEBUG(" rxtime=%u", p->rx_time);
     }
     if (p->rx_snr != 0.0) {
-        DEBUG_MSG(" rxSNR=%g", p->rx_snr);
+        LOG_DEBUG(" rxSNR=%g", p->rx_snr);
     }
     if (p->rx_rssi != 0) {
-        DEBUG_MSG(" rxRSSI=%g", p->rx_rssi);
+        LOG_DEBUG(" rxRSSI=%g", p->rx_rssi);
     }
     if (p->priority != 0)
-        DEBUG_MSG(" priority=%d", p->priority);
+        LOG_DEBUG(" priority=%d", p->priority);
 
-    DEBUG_MSG(")\n");
+    LOG_DEBUG(")\n");
 }
 
 RadioInterface::RadioInterface()
@@ -273,7 +273,7 @@ RadioInterface::RadioInterface()
     assert(sizeof(PacketHeader) == 16); // make sure the compiler did what we expected
 
     // Can't print strings this early - serial not setup yet
-    // DEBUG_MSG("Set meshradio defaults name=%s\n", channelSettings.name);
+    // LOG_DEBUG("Set meshradio defaults name=%s\n", channelSettings.name);
 }
 
 bool RadioInterface::reconfigure()
@@ -284,7 +284,7 @@ bool RadioInterface::reconfigure()
 
 bool RadioInterface::init()
 {
-    DEBUG_MSG("Starting meshradio init...\n");
+    LOG_INFO("Starting meshradio init...\n");
 
     configChangedObserver.observe(&service.configChanged);
     preflightSleepObserver.observe(&preflightSleep);
@@ -449,13 +449,13 @@ void RadioInterface::applyModemConfig()
     saveChannelNum(channel_num);
     saveFreq(freq + config.lora.frequency_offset);
 
-    DEBUG_MSG("Radio freq=%.3f, config.lora.frequency_offset=%.3f\n", freq, config.lora.frequency_offset);
-    DEBUG_MSG("Set radio: region=%s, name=%s, config=%u, ch=%d, power=%d\n", myRegion->name, channelName, loraConfig.modem_preset, channel_num, power);
-    DEBUG_MSG("Radio myRegion->freqStart -> myRegion->freqEnd: %f -> %f (%f mhz)\n", myRegion->freqStart, myRegion->freqEnd, myRegion->freqEnd - myRegion->freqStart);
-    DEBUG_MSG("Radio myRegion->numChannels: %d x %.3fkHz\n", numChannels, bw);
-    DEBUG_MSG("Radio channel_num: %d\n", channel_num);
-    DEBUG_MSG("Radio frequency: %f\n", getFreq());
-    DEBUG_MSG("Slot time: %u msec\n", slotTimeMsec);
+    LOG_INFO("Radio freq=%.3f, config.lora.frequency_offset=%.3f\n", freq, config.lora.frequency_offset);
+    LOG_INFO("Set radio: region=%s, name=%s, config=%u, ch=%d, power=%d\n", myRegion->name, channelName, loraConfig.modem_preset, channel_num, power);
+    LOG_INFO("Radio myRegion->freqStart -> myRegion->freqEnd: %f -> %f (%f mhz)\n", myRegion->freqStart, myRegion->freqEnd, myRegion->freqEnd - myRegion->freqStart);
+    LOG_INFO("Radio myRegion->numChannels: %d x %.3fkHz\n", numChannels, bw);
+    LOG_INFO("Radio channel_num: %d\n", channel_num);
+    LOG_INFO("Radio frequency: %f\n", getFreq());
+    LOG_INFO("Slot time: %u msec\n", slotTimeMsec);
 }
 
 /**
@@ -470,11 +470,11 @@ void RadioInterface::limitPower()
         maxPower = myRegion->powerLimit;
 
     if ((power > maxPower) && !devicestate.owner.is_licensed) {
-        DEBUG_MSG("Lowering transmit power because of regulatory limits\n");
+        LOG_INFO("Lowering transmit power because of regulatory limits\n");
         power = maxPower;
     }
 
-    DEBUG_MSG("Set radio: final power level=%d\n", power);
+    LOG_INFO("Set radio: final power level=%d\n", power);
 }
 
 
@@ -491,7 +491,7 @@ size_t RadioInterface::beginSending(MeshPacket *p)
 {
     assert(!sendingPacket);
 
-    // DEBUG_MSG("sending queued packet on mesh (txGood=%d,rxGood=%d,rxBad=%d)\n", rf95.txGood(), rf95.rxGood(), rf95.rxBad());
+    // LOG_DEBUG("sending queued packet on mesh (txGood=%d,rxGood=%d,rxBad=%d)\n", rf95.txGood(), rf95.rxGood(), rf95.rxBad());
     assert(p->which_payload_variant == MeshPacket_encrypted_tag); // It should have already been encoded by now
 
     lastTxStart = millis();

src/mesh/RadioLibInterface.cpp

@@ -82,17 +82,17 @@ bool RadioLibInterface::canSendImmediately()
 
     if (busyTx || busyRx) {
         if (busyTx)
-            DEBUG_MSG("Can not send yet, busyTx\n");
+            LOG_WARN("Can not send yet, busyTx\n");
         // If we've been trying to send the same packet more than one minute and we haven't gotten a
         // TX IRQ from the radio, the radio is probably broken.
         if (busyTx && (millis() - lastTxStart > 60000)) {
-            DEBUG_MSG("Hardware Failure! busyTx for more than 60s\n");
+            LOG_ERROR("Hardware Failure! busyTx for more than 60s\n");
             RECORD_CRITICALERROR(CriticalErrorCode_TRANSMIT_FAILED);
             // reboot in 5 seconds when this condition occurs.
             rebootAtMsec = lastTxStart + 65000;
         }
         if (busyRx)
-            DEBUG_MSG("Can not send yet, busyRx\n");
+            LOG_WARN("Can not send yet, busyRx\n");
         return false;
     } else
         return true;
@@ -111,13 +111,13 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
 
             if (config.lora.region != Config_LoRaConfig_RegionCode_UNSET) {
                 if (disabled || !config.lora.tx_enabled) {
-                    DEBUG_MSG("send - !config.lora.tx_enabled\n");
+                    LOG_WARN("send - !config.lora.tx_enabled\n");
                     packetPool.release(p);
                     return ERRNO_DISABLED;
                 }
 
             } else {
-                DEBUG_MSG("send - lora tx disable because RegionCode_Unset\n");
+                LOG_WARN("send - lora tx disable because RegionCode_Unset\n");
                 packetPool.release(p);
                 return ERRNO_DISABLED;
             }
@@ -127,7 +127,7 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
 #else
 
     if (disabled || !config.lora.tx_enabled) {
-        DEBUG_MSG("send - !config.lora.tx_enabled\n");
+        LOG_WARN("send - !config.lora.tx_enabled\n");
         packetPool.release(p);
         return ERRNO_DISABLED;
     }
@@ -138,7 +138,7 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
 #ifndef LORA_DISABLE_SENDING
         printPacket("enqueuing for send", p);
 
-        DEBUG_MSG("txGood=%d,rxGood=%d,rxBad=%d\n", txGood, rxGood, rxBad);
+        LOG_DEBUG("txGood=%d,rxGood=%d,rxBad=%d\n", txGood, rxGood, rxBad);
         ErrorCode res = txQueue.enqueue(p) ? ERRNO_OK : ERRNO_UNKNOWN;
 
         if (res != ERRNO_OK) { // we weren't able to queue it, so we must drop it to prevent leaks
@@ -148,7 +148,7 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
 
         // set (random) transmit delay to let others reconfigure their radio,
         // to avoid collisions and implement timing-based flooding
-        // DEBUG_MSG("Set random delay before transmitting.\n");
+        // LOG_DEBUG("Set random delay before transmitting.\n");
         setTransmitDelay();
 
         return res;
@@ -162,7 +162,7 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
     {
         bool res = txQueue.empty();
         if (!res) // only print debug messages if we are vetoing sleep
-            DEBUG_MSG("radio wait to sleep, txEmpty=%d\n", res);
+            LOG_DEBUG("radio wait to sleep, txEmpty=%d\n", res);
 
         return res;
     }
@@ -175,7 +175,7 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
             packetPool.release(p); // free the packet we just removed
 
         bool result = (p != NULL);
-        DEBUG_MSG("cancelSending id=0x%x, removed=%d\n", id, result);
+        LOG_DEBUG("cancelSending id=0x%x, removed=%d\n", id, result);
         return result;
     }
 
@@ -192,27 +192,27 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
         case ISR_TX:
             handleTransmitInterrupt();
             startReceive();
-            // DEBUG_MSG("tx complete - starting timer\n");
+            // LOG_DEBUG("tx complete - starting timer\n");
             startTransmitTimer();
             break;
         case ISR_RX:
             handleReceiveInterrupt();
             startReceive();
-            // DEBUG_MSG("rx complete - starting timer\n");
+            // LOG_DEBUG("rx complete - starting timer\n");
             startTransmitTimer();
             break;
         case TRANSMIT_DELAY_COMPLETED:
-            // DEBUG_MSG("delay done\n");
+            // LOG_DEBUG("delay done\n");
 
             // If we are not currently in receive mode, then restart the random delay (this can happen if the main thread
             // has placed the unit into standby)  FIXME, how will this work if the chipset is in sleep mode?
             if (!txQueue.empty()) {
                 if (!canSendImmediately()) {
-                    // DEBUG_MSG("Currently Rx/Tx-ing: set random delay\n");
+                    // LOG_DEBUG("Currently Rx/Tx-ing: set random delay\n");
                     setTransmitDelay(); // currently Rx/Tx-ing: reset random delay
                 } else {
                     if (isChannelActive()) { // check if there is currently a LoRa packet on the channel
-                        // DEBUG_MSG("Channel is active: set random delay\n");
+                        // LOG_DEBUG("Channel is active: set random delay\n");
                         setTransmitDelay(); // reset random delay
                     } else {
                         // Send any outgoing packets we have ready
@@ -226,7 +226,7 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
                     }
                 }
             } else {
-                // DEBUG_MSG("done with txqueue\n");
+                // LOG_DEBUG("done with txqueue\n");
             }
             break;
         default:
@@ -249,7 +249,7 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
             startTransmitTimer(true);
         } else {
             // If there is a SNR, start a timer scaled based on that SNR.
-            DEBUG_MSG("rx_snr found. hop_limit:%d rx_snr:%f\n", p->hop_limit, p->rx_snr);
+            LOG_DEBUG("rx_snr found. hop_limit:%d rx_snr:%f\n", p->hop_limit, p->rx_snr);
             startTransmitTimerSNR(p->rx_snr);
         }
     }
@@ -259,7 +259,7 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
         // If we have work to do and the timer wasn't already scheduled, schedule it now
         if (!txQueue.empty()) {
             uint32_t delay = !withDelay ? 1 : getTxDelayMsec();
-            // DEBUG_MSG("xmit timer %d\n", delay);
+            // LOG_DEBUG("xmit timer %d\n", delay);
             notifyLater(delay, TRANSMIT_DELAY_COMPLETED, false); // This will implicitly enable
         }
     }
@@ -269,14 +269,14 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
         // If we have work to do and the timer wasn't already scheduled, schedule it now
         if (!txQueue.empty()) {
             uint32_t delay = getTxDelayMsecWeighted(snr);
-            // DEBUG_MSG("xmit timer %d\n", delay);
+            // LOG_DEBUG("xmit timer %d\n", delay);
             notifyLater(delay, TRANSMIT_DELAY_COMPLETED, false); // This will implicitly enable
         }
     }
 
     void RadioLibInterface::handleTransmitInterrupt()
     {
-        // DEBUG_MSG("handling lora TX interrupt\n");
+        // LOG_DEBUG("handling lora TX interrupt\n");
         // This can be null if we forced the device to enter standby mode.  In that case
         // ignore the transmit interrupt
         if (sendingPacket)
@@ -296,7 +296,7 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
 
             // We are done sending that packet, release it
             packetPool.release(p);
-            // DEBUG_MSG("Done with send\n");
+            // LOG_DEBUG("Done with send\n");
         }
     }
 
@@ -306,7 +306,7 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
         
         // when this is called, we should be in receive mode - if we are not, just jump out instead of bombing. Possible Race Condition?
         if (!isReceiving) {
-            DEBUG_MSG("*** WAS_ASSERT *** handleReceiveInterrupt called when not in receive mode\n");
+            LOG_DEBUG("*** WAS_ASSERT *** handleReceiveInterrupt called when not in receive mode\n");
             return;
         }
         
@@ -319,7 +319,7 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
 
         int state = iface->readData(radiobuf, length);
         if (state != RADIOLIB_ERR_NONE) {
-            DEBUG_MSG("ignoring received packet due to error=%d\n", state);
+            LOG_ERROR("ignoring received packet due to error=%d\n", state);
             rxBad++;
 
             airTime->logAirtime(RX_ALL_LOG, xmitMsec);
@@ -331,7 +331,7 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
 
             // check for short packets
             if (payloadLen < 0) {
-                DEBUG_MSG("ignoring received packet too short\n");
+                LOG_WARN("ignoring received packet too short\n");
                 rxBad++;
                 airTime->logAirtime(RX_ALL_LOG, xmitMsec);
             } else {
@@ -374,7 +374,7 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
     {
         printPacket("Starting low level send", txp);
         if (disabled || !config.lora.tx_enabled) {
-            DEBUG_MSG("startSend is dropping tx packet because we are disabled\n");
+            LOG_WARN("startSend is dropping tx packet because we are disabled\n");
             packetPool.release(txp);
         } else {
             setStandby(); // Cancel any already in process receives
@@ -385,7 +385,7 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
 
             int res = iface->startTransmit(radiobuf, numbytes);
             if (res != RADIOLIB_ERR_NONE) {
-                DEBUG_MSG("startTransmit failed, error=%d\n", res);
+                LOG_ERROR("startTransmit failed, error=%d\n", res);
                 RECORD_CRITICALERROR(CriticalErrorCode_RADIO_SPI_BUG);
 
                 // This send failed, but make sure to 'complete' it properly

src/mesh/RadioLibRF95.cpp

@@ -22,8 +22,8 @@ int16_t RadioLibRF95::begin(float freq, float bw, uint8_t sf, uint8_t cr, uint8_
     // current limit was removed from module' ctor
     // override default value (60 mA)
     state = setCurrentLimit(currentLimit);
-    DEBUG_MSG("Current limit set to %f\n", currentLimit);
-    DEBUG_MSG("Current limit set result %d\n", state);
+    LOG_DEBUG("Current limit set to %f\n", currentLimit);
+    LOG_DEBUG("Current limit set result %d\n", state);
 
     // configure settings not accessible by API
     state = config();

src/mesh/RadioLibRF95.h

@@ -66,10 +66,5 @@ class RadioLibRF95: public SX1278 {
     // since default current limit for SX126x/127x in updated RadioLib is 60mA
     // use the previous value
     float currentLimit = 100;
-
-#ifndef RADIOLIB_GODMODE
-  private:
-#endif
-
 };
 

src/mesh/ReliableRouter.cpp

@@ -27,7 +27,7 @@ ErrorCode ReliableRouter::send(MeshPacket *p)
     return FloodingRouter::send(p);
 }
 
-bool ReliableRouter::shouldFilterReceived(MeshPacket *p)
+bool ReliableRouter::shouldFilterReceived(const MeshPacket *p)
 {
     // Note: do not use getFrom() here, because we want to ignore messages sent from phone
     if (p->from == getNodeNum()) {
@@ -37,35 +37,29 @@ bool ReliableRouter::shouldFilterReceived(MeshPacket *p)
         // If this is the first time we saw this, cancel any retransmissions we have queued up and generate an internal ack for
         // the original sending process.
 
-        // FIXME - we might want to turn off this "optimization", it does save lots of airtime but it assumes that once we've
-        // heard one one adjacent node hear our packet that a) probably other adjacent nodes heard it and b) we can trust those
-        // nodes to reach our destination.  Both of which might be incorrect.
+        // This "optimization", does save lots of airtime. For DMs, you also get a real ACK back
+	// from the intended recipient.
         auto key = GlobalPacketId(getFrom(p), p->id);
         auto old = findPendingPacket(key);
         if (old) {
-            DEBUG_MSG("generating implicit ack\n");
+            LOG_DEBUG("generating implicit ack\n");
             // NOTE: we do NOT check p->wantAck here because p is the INCOMING rebroadcast and that packet is not expected to be
             // marked as wantAck
             sendAckNak(Routing_Error_NONE, getFrom(p), p->id, old->packet->channel);
 
             stopRetransmission(key);
         } else {
-            DEBUG_MSG("didn't find pending packet\n");
+            LOG_DEBUG("didn't find pending packet\n");
         }
     }
 
-    /* send acks for repeated packets that want acks and are destined for us
-     * this way if an ACK is dropped and a packet is resent we'll ACK the resent packet
-     * make sure wasSeenRecently _doesn't_ update
-     * finding the channel requires decoding the packet. */
-    if (p->want_ack && (p->to == getNodeNum()) && wasSeenRecently(p, false) && !MeshModule::currentReply) {
-        if (perhapsDecode(p)) {
-            sendAckNak(Routing_Error_NONE, getFrom(p), p->id, p->channel);
-            DEBUG_MSG("acking a repeated want_ack packet\n");
-        }
-    } else if (wasSeenRecently(p, false) && p->hop_limit == HOP_RELIABLE && !MeshModule::currentReply && p->to != nodeDB.getNodeNum()) {
+    /* Resend implicit ACKs for repeated packets (assuming the original packet was sent with HOP_RELIABLE)
+    * this way if an implicit ACK is dropped and a packet is resent we'll rebroadcast again.
+    * Resending real ACKs is omitted, as you might receive a packet multiple times due to flooding and 
+    * flooding this ACK back to the original sender already adds redundancy. */ 
+    if (wasSeenRecently(p, false) && p->hop_limit == HOP_RELIABLE && !MeshModule::currentReply && p->to != nodeDB.getNodeNum()) {
         // retransmission on broadcast has hop_limit still equal to HOP_RELIABLE
-        DEBUG_MSG("Resending implicit ack for a repeated floodmsg\n");
+        LOG_DEBUG("Resending implicit ack for a repeated floodmsg\n");
         MeshPacket *tosend = packetPool.allocCopy(*p);
         tosend->hop_limit--; // bump down the hop count
         Router::send(tosend);
@@ -93,7 +87,7 @@ void ReliableRouter::sniffReceived(const MeshPacket *p, const Routing *c)
     if (p->to == ourNode) { // ignore ack/nak/want_ack packets that are not address to us (we only handle 0 hop reliability)
         if (p->want_ack) {
             if (MeshModule::currentReply)
-                DEBUG_MSG("Some other module has replied to this message, no need for a 2nd ack\n");
+                LOG_DEBUG("Some other module has replied to this message, no need for a 2nd ack\n");
             else
                 if (p->which_payload_variant == MeshPacket_decoded_tag)
                     sendAckNak(Routing_Error_NONE, getFrom(p), p->id, p->channel);
@@ -111,10 +105,10 @@ void ReliableRouter::sniffReceived(const MeshPacket *p, const Routing *c)
         // We intentionally don't check wasSeenRecently, because it is harmless to delete non existent retransmission records
         if (ackId || nakId) {
             if (ackId) {
-                DEBUG_MSG("Received an ack for 0x%x, stopping retransmissions\n", ackId);
+                LOG_DEBUG("Received an ack for 0x%x, stopping retransmissions\n", ackId);
                 stopRetransmission(p->to, ackId);
             } else {
-                DEBUG_MSG("Received a nak for 0x%x, stopping retransmissions\n", nakId);
+                LOG_DEBUG("Received a nak for 0x%x, stopping retransmissions\n", nakId);
                 stopRetransmission(p->to, nakId);
             }
         }
@@ -196,14 +190,14 @@ int32_t ReliableRouter::doRetransmissions()
         // FIXME, handle 51 day rolloever here!!!
         if (p.nextTxMsec <= now) {
             if (p.numRetransmissions == 0) {
-                DEBUG_MSG("Reliable send failed, returning a nak for fr=0x%x,to=0x%x,id=0x%x\n", p.packet->from, p.packet->to,
+                LOG_DEBUG("Reliable send failed, returning a nak for fr=0x%x,to=0x%x,id=0x%x\n", p.packet->from, p.packet->to,
                           p.packet->id);
                 sendAckNak(Routing_Error_MAX_RETRANSMIT, getFrom(p.packet), p.packet->id, p.packet->channel);
                 // Note: we don't stop retransmission here, instead the Nak packet gets processed in sniffReceived
                 stopRetransmission(it->first);
                 stillValid = false; // just deleted it
             } else {
-                DEBUG_MSG("Sending reliable retransmission fr=0x%x,to=0x%x,id=0x%x, tries left=%d\n", p.packet->from,
+                LOG_DEBUG("Sending reliable retransmission fr=0x%x,to=0x%x,id=0x%x, tries left=%d\n", p.packet->from,
                           p.packet->to, p.packet->id, p.numRetransmissions);
 
                 // Note: we call the superclass version because we don't want to have our version of send() add a new
@@ -232,7 +226,7 @@ void ReliableRouter::setNextTx(PendingPacket *pending)
     assert(iface);
     auto d = iface->getRetransmissionMsec(pending->packet);
     pending->nextTxMsec = millis() + d;
-    DEBUG_MSG("Setting next retransmission in %u msecs: ", d);
+    LOG_DEBUG("Setting next retransmission in %u msecs: ", d);
     printPacket("", pending->packet);
     setReceivedMessage(); // Run ASAP, so we can figure out our correct sleep time
 }

src/mesh/ReliableRouter.h

@@ -96,7 +96,7 @@ class ReliableRouter : public FloodingRouter
     /**
      * We hook this method so we can see packets before FloodingRouter says they should be discarded
      */
-    virtual bool shouldFilterReceived(MeshPacket *p) override;
+    virtual bool shouldFilterReceived(const MeshPacket *p) override;
 
     /**
      * Add p to the list of packets to retransmit occasionally.  We will free it once we stop retransmitting.

src/mesh/Router.cpp

@@ -48,9 +48,9 @@ Router::Router() : concurrency::OSThread("Router"), fromRadioQueue(MAX_RX_FROMRA
 {
     // This is called pre main(), don't touch anything here, the following code is not safe
 
-    /* DEBUG_MSG("Size of NodeInfo %d\n", sizeof(NodeInfo));
-    DEBUG_MSG("Size of SubPacket %d\n", sizeof(SubPacket));
-    DEBUG_MSG("Size of MeshPacket %d\n", sizeof(MeshPacket)); */
+    /* LOG_DEBUG("Size of NodeInfo %d\n", sizeof(NodeInfo));
+    LOG_DEBUG("Size of SubPacket %d\n", sizeof(SubPacket));
+    LOG_DEBUG("Size of MeshPacket %d\n", sizeof(MeshPacket)); */
 
     fromRadioQueue.setReader(this);
 }
@@ -67,7 +67,7 @@ int32_t Router::runOnce()
         perhapsHandleReceived(mp);
     }
 
-    // DEBUG_MSG("sleeping forever!\n");
+    // LOG_DEBUG("sleeping forever!\n");
     return INT32_MAX; // Wait a long time - until we get woken for the message queue
 }
 
@@ -103,7 +103,7 @@ PacketId generatePacketId()
         // pick a random initial sequence number at boot (to prevent repeated reboots always starting at 0)
         // Note: we mask the high order bit to ensure that we never pass a 'negative' number to random
         i = random(numPacketId & 0x7fffffff);
-        DEBUG_MSG("Initial packet id %u, numPacketId %u\n", i, numPacketId);
+        LOG_DEBUG("Initial packet id %u, numPacketId %u\n", i, numPacketId);
     }
 
     i++;
@@ -136,14 +136,14 @@ void Router::sendAckNak(Routing_Error err, NodeNum to, PacketId idFrom, ChannelI
 
 void Router::abortSendAndNak(Routing_Error err, MeshPacket *p)
 {
-    DEBUG_MSG("Error=%d, returning NAK and dropping packet.\n", err);
+    LOG_ERROR("Error=%d, returning NAK and dropping packet.\n", err);
     sendAckNak(Routing_Error_NO_INTERFACE, getFrom(p), p->id, p->channel);
     packetPool.release(p);
 }
 
 void Router::setReceivedMessage()
 {
-    // DEBUG_MSG("set interval to ASAP\n");
+    // LOG_DEBUG("set interval to ASAP\n");
     setInterval(0); // Run ASAP, so we can figure out our correct sleep time
     runASAP = true;
 }
@@ -173,10 +173,10 @@ ErrorCode Router::sendLocal(MeshPacket *p, RxSource src)
 
 void printBytes(const char *label, const uint8_t *p, size_t numbytes)
 {
-    DEBUG_MSG("%s: ", label);
+    LOG_DEBUG("%s: ", label);
     for (size_t i = 0; i < numbytes; i++)
-        DEBUG_MSG("%02x ", p[i]);
-    DEBUG_MSG("\n");
+        LOG_DEBUG("%02x ", p[i]);
+    LOG_DEBUG("\n");
 }
 
 /**
@@ -193,7 +193,7 @@ ErrorCode Router::send(MeshPacket *p)
       float hourlyTxPercent = airTime->utilizationTXPercent();
       if (hourlyTxPercent > myRegion->dutyCycle) {
           uint8_t silentMinutes = airTime->getSilentMinutes(hourlyTxPercent, myRegion->dutyCycle); 
-          DEBUG_MSG("WARNING: Duty cycle limit exceeded. Aborting send for now, you can send again in %d minutes.\n", silentMinutes);
+          LOG_WARN("Duty cycle limit exceeded. Aborting send for now, you can send again in %d minutes.\n", silentMinutes);
           Routing_Error err = Routing_Error_DUTY_CYCLE_LIMIT;
           abortSendAndNak(err, p);
           return err;
@@ -221,29 +221,32 @@ ErrorCode Router::send(MeshPacket *p)
     if (p->which_payload_variant == MeshPacket_decoded_tag) {
         ChannelIndex chIndex = p->channel; // keep as a local because we are about to change it
 
+    bool shouldActuallyEncrypt = true;
+
 #if HAS_WIFI || HAS_ETHERNET
-        // check if we should send decrypted packets to mqtt
+        if(moduleConfig.mqtt.enabled) {
+            // check if we should send decrypted packets to mqtt
 
-        // truth table:
-        /* mqtt_server  mqtt_encryption_enabled should_encrypt
-         *    not set                        0              1
-         *    not set                        1              1
-         *        set                        0              0
-         *        set                        1              1
-         *
-         * => so we only decrypt mqtt if they have a custom mqtt server AND mqtt_encryption_enabled is FALSE
-         */
+            // truth table:
+            /* mqtt_server  mqtt_encryption_enabled should_encrypt
+            *    not set                        0              1
+            *    not set                        1              1
+            *        set                        0              0
+            *        set                        1              1
+            *
+            * => so we only decrypt mqtt if they have a custom mqtt server AND mqtt_encryption_enabled is FALSE
+            */
 
-        bool shouldActuallyEncrypt = true;
-        if (*moduleConfig.mqtt.address && !moduleConfig.mqtt.encryption_enabled) {
-            shouldActuallyEncrypt = false;
+            if (*moduleConfig.mqtt.address && !moduleConfig.mqtt.encryption_enabled) {
+                shouldActuallyEncrypt = false;
+            }
+
+            LOG_INFO("Should encrypt MQTT?: %d\n", shouldActuallyEncrypt);
+
+            // the packet is currently in a decrypted state.  send it now if they want decrypted packets
+            if (mqtt && !shouldActuallyEncrypt)
+                mqtt->onSend(*p, chIndex);
         }
-
-        DEBUG_MSG("Should encrypt MQTT?: %d\n", shouldActuallyEncrypt);
-
-        // the packet is currently in a decrypted state.  send it now if they want decrypted packets
-        if (mqtt && !shouldActuallyEncrypt)
-            mqtt->onSend(*p, chIndex);
 #endif
 
         auto encodeResult = perhapsEncode(p);
@@ -253,10 +256,12 @@ ErrorCode Router::send(MeshPacket *p)
         }
 
 #if HAS_WIFI || HAS_ETHERNET
-        // the packet is now encrypted.
-        // check if we should send encrypted packets to mqtt
-        if (mqtt && shouldActuallyEncrypt)
-            mqtt->onSend(*p, chIndex);
+        if (moduleConfig.mqtt.enabled) {
+            // the packet is now encrypted.
+            // check if we should send encrypted packets to mqtt
+            if (mqtt && shouldActuallyEncrypt)
+                mqtt->onSend(*p, chIndex);
+        }
 #endif
     }
 
@@ -276,14 +281,14 @@ bool Router::cancelSending(NodeNum from, PacketId id)
  */
 void Router::sniffReceived(const MeshPacket *p, const Routing *c)
 {
-    DEBUG_MSG("FIXME-update-db Sniffing packet\n");
+    LOG_DEBUG("FIXME-update-db Sniffing packet\n");
     // FIXME, update nodedb here for any packet that passes through us
 }
 
 bool perhapsDecode(MeshPacket *p)
 {
 
-    // DEBUG_MSG("\n\n** perhapsDecode payloadVariant - %d\n\n", p->which_payloadVariant);
+    // LOG_DEBUG("\n\n** perhapsDecode payloadVariant - %d\n\n", p->which_payloadVariant);
 
     if (p->which_payload_variant == MeshPacket_decoded_tag)
         return true; // If packet was already decoded just return
@@ -306,10 +311,10 @@ bool perhapsDecode(MeshPacket *p)
 
             // Take those raw bytes and convert them back into a well structured protobuf we can understand
             memset(&p->decoded, 0, sizeof(p->decoded));
-            if (!pb_decode_from_bytes(bytes, rawSize, Data_fields, &p->decoded)) {
-                DEBUG_MSG("Invalid protobufs in received mesh packet (bad psk?)!\n");
+            if (!pb_decode_from_bytes(bytes, rawSize, &Data_msg, &p->decoded)) {
+                LOG_ERROR("Invalid protobufs in received mesh packet (bad psk?)!\n");
             } else if (p->decoded.portnum == PortNum_UNKNOWN_APP) {
-                DEBUG_MSG("Invalid portnum (bad psk?)!\n");
+                LOG_ERROR("Invalid portnum (bad psk?)!\n");
             } else {
                 // parsing was successful
                 p->which_payload_variant = MeshPacket_decoded_tag; // change type to decoded
@@ -317,9 +322,9 @@ bool perhapsDecode(MeshPacket *p)
 
                 /*
                 if (p->decoded.portnum == PortNum_TEXT_MESSAGE_APP) {
-                    DEBUG_MSG("\n\n** TEXT_MESSAGE_APP\n");
+                    LOG_DEBUG("\n\n** TEXT_MESSAGE_APP\n");
                 } else if (p->decoded.portnum == PortNum_TEXT_MESSAGE_COMPRESSED_APP) {
-                    DEBUG_MSG("\n\n** PortNum_TEXT_MESSAGE_COMPRESSED_APP\n");
+                    LOG_DEBUG("\n\n** PortNum_TEXT_MESSAGE_COMPRESSED_APP\n");
                 }
                 */
 
@@ -334,7 +339,7 @@ bool perhapsDecode(MeshPacket *p)
 
                     decompressed_len = unishox2_decompress_simple(compressed_in, p->decoded.payload.size, decompressed_out);
 
-                    // DEBUG_MSG("\n\n**\n\nDecompressed length - %d \n", decompressed_len);
+                    // LOG_DEBUG("\n\n**\n\nDecompressed length - %d \n", decompressed_len);
 
                     memcpy(p->decoded.payload.bytes, decompressed_out, decompressed_len);
 
@@ -348,7 +353,7 @@ bool perhapsDecode(MeshPacket *p)
         }
     }
 
-    DEBUG_MSG("No suitable channel found for decoding, hash was 0x%x!\n", p->channel);
+    LOG_WARN("No suitable channel found for decoding, hash was 0x%x!\n", p->channel);
     return false;
 }
 
@@ -360,7 +365,7 @@ Routing_Error perhapsEncode(MeshPacket *p)
     if (p->which_payload_variant == MeshPacket_decoded_tag) {
         static uint8_t bytes[MAX_RHPACKETLEN]; // we have to use a scratch buffer because a union
 
-        size_t numbytes = pb_encode_to_bytes(bytes, sizeof(bytes), Data_fields, &p->decoded);
+        size_t numbytes = pb_encode_to_bytes(bytes, sizeof(bytes), &Data_msg, &p->decoded);
 
         // Only allow encryption on the text message app.
         //  TODO: Allow modules to opt into compression.
@@ -374,20 +379,20 @@ Routing_Error perhapsEncode(MeshPacket *p)
             int compressed_len;
             compressed_len = unishox2_compress_simple(original_payload, p->decoded.payload.size, compressed_out);
 
-            DEBUG_MSG("Original length - %d \n", p->decoded.payload.size);
-            DEBUG_MSG("Compressed length - %d \n", compressed_len);
-            DEBUG_MSG("Original message - %s \n", p->decoded.payload.bytes);
+            LOG_DEBUG("Original length - %d \n", p->decoded.payload.size);
+            LOG_DEBUG("Compressed length - %d \n", compressed_len);
+            LOG_DEBUG("Original message - %s \n", p->decoded.payload.bytes);
 
             // If the compressed length is greater than or equal to the original size, don't use the compressed form
             if (compressed_len >= p->decoded.payload.size) {
 
-                DEBUG_MSG("Not using compressing message.\n");
+                LOG_DEBUG("Not using compressing message.\n");
                 // Set the uncompressed payload varient anyway. Shouldn't hurt?
                 // p->decoded.which_payloadVariant = Data_payload_tag;
 
                 // Otherwise we use the compressor
             } else {
-                DEBUG_MSG("Using compressed message.\n");
+                LOG_DEBUG("Using compressed message.\n");
                 // Copy the compressed data into the meshpacket
 
                 p->decoded.payload.size = compressed_len;
@@ -459,9 +464,9 @@ void Router::perhapsHandleReceived(MeshPacket *p)
     bool ignore = is_in_repeated(config.lora.ignore_incoming, p->from);
 
     if (ignore)
-        DEBUG_MSG("Ignoring incoming message, 0x%x is in our ignore list\n", p->from);
+        LOG_DEBUG("Ignoring incoming message, 0x%x is in our ignore list\n", p->from);
     else if (ignore |= shouldFilterReceived(p)) {
-        DEBUG_MSG("Incoming message was filtered 0x%x\n", p->from);
+        LOG_DEBUG("Incoming message was filtered 0x%x\n", p->from);
     }
 
     // Note: we avoid calling shouldFilterReceived if we are supposed to ignore certain nodes - because some overrides might

src/mesh/Router.h

@@ -90,7 +90,7 @@ class Router : protected concurrency::OSThread
      * Called immedately on receiption, before any further processing.
      * @return true to abandon the packet
      */
-    virtual bool shouldFilterReceived(MeshPacket *p) { return false; }
+    virtual bool shouldFilterReceived(const MeshPacket *p) { return false; }
 
     /**
      * Every (non duplicate) packet this node receives will be passed through this method.  This allows subclasses to

src/mesh/SX126xInterface.cpp

@@ -12,7 +12,7 @@ SX126xInterface<T>::SX126xInterface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq,
                                  SPIClass &spi)
     : RadioLibInterface(cs, irq, rst, busy, spi, &lora), lora(&module)
 {
-    DEBUG_MSG("SX126xInterface(cs=%d, irq=%d, rst=%d, busy=%d)\n", cs, irq, rst, busy);
+    LOG_WARN("SX126xInterface(cs=%d, irq=%d, rst=%d, busy=%d)\n", cs, irq, rst, busy);
 }
 
 /// Initialise the Driver transport hardware and software.
@@ -55,17 +55,17 @@ bool SX126xInterface<T>::init()
 
     int res = lora.begin(getFreq(), bw, sf, cr, syncWord, power, preambleLength, tcxoVoltage, useRegulatorLDO);
     // \todo Display actual typename of the adapter, not just `SX126x`
-    DEBUG_MSG("SX126x init result %d\n", res);
+    LOG_INFO("SX126x init result %d\n", res);
 
-    DEBUG_MSG("Frequency set to %f\n", getFreq());
-    DEBUG_MSG("Bandwidth set to %f\n", bw);
-    DEBUG_MSG("Power output set to %d\n", power);
+    LOG_INFO("Frequency set to %f\n", getFreq());
+    LOG_INFO("Bandwidth set to %f\n", bw);
+    LOG_INFO("Power output set to %d\n", power);
 
     // current limit was removed from module' ctor
     // override default value (60 mA)
     res = lora.setCurrentLimit(currentLimit);
-    DEBUG_MSG("Current limit set to %f\n", currentLimit);
-    DEBUG_MSG("Current limit set result %d\n", res);
+    LOG_DEBUG("Current limit set to %f\n", currentLimit);
+    LOG_DEBUG("Current limit set result %d\n", res);
 
 #if defined(SX126X_TXEN) && (SX126X_TXEN != RADIOLIB_NC)
     // lora.begin sets Dio2 as RF switch control, which is not true if we are manually controlling RX and TX
@@ -170,7 +170,7 @@ void SX126xInterface<T>::setStandby()
     int err = lora.standby();
 
     if (err != RADIOLIB_ERR_NONE)
-        DEBUG_MSG("SX126x standby failed with error %d\n", err);
+        LOG_DEBUG("SX126x standby failed with error %d\n", err);
 
     assert(err == RADIOLIB_ERR_NONE);
 
@@ -192,7 +192,7 @@ void SX126xInterface<T>::setStandby()
 template<typename T>
 void SX126xInterface<T>::addReceiveMetadata(MeshPacket *mp)
 {
-    // DEBUG_MSG("PacketStatus %x\n", lora.getPacketStatus());
+    // LOG_DEBUG("PacketStatus %x\n", lora.getPacketStatus());
     mp->rx_snr = lora.getSNR();
     mp->rx_rssi = lround(lora.getRSSI());
 }
@@ -275,7 +275,7 @@ bool SX126xInterface<T>::isActivelyReceiving()
     // this is not correct - often always true - need to add an extra conditional
     // size_t bytesPending = lora.getPacketLength();
 
-    // if (hasPreamble) DEBUG_MSG("rx hasPreamble\n");
+    // if (hasPreamble) LOG_DEBUG("rx hasPreamble\n");
     return hasPreamble;
 }
 
@@ -284,7 +284,7 @@ bool SX126xInterface<T>::sleep()
 {
     // Not keeping config is busted - next time nrf52 board boots lora sending fails  tcxo related? - see datasheet
     // \todo Display actual typename of the adapter, not just `SX126x`
-    DEBUG_MSG("sx126x entering sleep mode (FIXME, don't keep config)\n");
+    LOG_DEBUG("sx126x entering sleep mode (FIXME, don't keep config)\n");
     setStandby(); // Stop any pending operations
 
     // turn off TCXO if it was powered

src/mesh/SX128xInterface.cpp

@@ -1,5 +1,6 @@
 #include "configuration.h"
 #include "SX128xInterface.h"
+#include "mesh/NodeDB.h"
 #include "error.h"
 
 // Particular boards might define a different max power based on what their hardware can do
@@ -48,11 +49,25 @@ bool SX128xInterface<T>::init()
 
     int res = lora.begin(getFreq(), bw, sf, cr, syncWord, power, preambleLength);
     // \todo Display actual typename of the adapter, not just `SX128x`
-    DEBUG_MSG("SX128x init result %d\n", res);
+    LOG_INFO("SX128x init result %d\n", res);
 
-    DEBUG_MSG("Frequency set to %f\n", getFreq());    
-    DEBUG_MSG("Bandwidth set to %f\n", bw);    
-    DEBUG_MSG("Power output set to %d\n", power);    
+    if((config.lora.region != Config_LoRaConfig_RegionCode_LORA_24) && (res == RADIOLIB_ERR_INVALID_FREQUENCY)) {
+        LOG_WARN("Radio chip only supports 2.4GHz LoRa. Adjusting Region and rebooting.\n");
+        config.lora.region = Config_LoRaConfig_RegionCode_LORA_24;
+        nodeDB.saveToDisk(SEGMENT_CONFIG);
+        delay(2000);
+#if defined(ARCH_ESP32)
+        ESP.restart();
+#elif defined(ARCH_NRF52)
+        NVIC_SystemReset();
+#else
+        LOG_ERROR("FIXME implement reboot for this platform. Skipping for now.\n");
+#endif
+    }
+
+    LOG_INFO("Frequency set to %f\n", getFreq());    
+    LOG_INFO("Bandwidth set to %f\n", bw);    
+    LOG_INFO("Power output set to %d\n", power);    
 
     if (res == RADIOLIB_ERR_NONE)
         res = lora.setCRC(2);
@@ -130,7 +145,7 @@ void SX128xInterface<T>::setStandby()
     int err = lora.standby();
 
     if (err != RADIOLIB_ERR_NONE)
-        DEBUG_MSG("SX128x standby failed with error %d\n", err);
+        LOG_ERROR("SX128x standby failed with error %d\n", err);
 
     assert(err == RADIOLIB_ERR_NONE);
 
@@ -152,7 +167,7 @@ void SX128xInterface<T>::setStandby()
 template<typename T>
 void SX128xInterface<T>::addReceiveMetadata(MeshPacket *mp)
 {
-    // DEBUG_MSG("PacketStatus %x\n", lora.getPacketStatus());
+    // LOG_DEBUG("PacketStatus %x\n", lora.getPacketStatus());
     mp->rx_snr = lora.getSNR();
     mp->rx_rssi = lround(lora.getRSSI());
 }
@@ -223,13 +238,9 @@ bool SX128xInterface<T>::isChannelActive()
 template<typename T>
 bool SX128xInterface<T>::isActivelyReceiving()
 {
-#ifdef RADIOLIB_GODMODE
     uint16_t irq = lora.getIrqStatus();
     bool hasPreamble = (irq & RADIOLIB_SX128X_IRQ_HEADER_VALID);
     return hasPreamble;
-#else
-    return isChannelActive();
-#endif
 }
 
 template<typename T>
@@ -237,7 +248,7 @@ bool SX128xInterface<T>::sleep()
 {
     // Not keeping config is busted - next time nrf52 board boots lora sending fails  tcxo related? - see datasheet
     // \todo Display actual typename of the adapter, not just `SX128x`
-    DEBUG_MSG("SX128x entering sleep mode (FIXME, don't keep config)\n");
+    LOG_DEBUG("SX128x entering sleep mode (FIXME, don't keep config)\n");
     setStandby(); // Stop any pending operations
 
     // turn off TCXO if it was powered

src/mesh/SX128xInterface.h

@@ -27,9 +27,7 @@ class SX128xInterface : public RadioLibInterface
     /// Prepare hardware for sleep.  Call this _only_ for deep sleep, not needed for light sleep.
     virtual bool sleep() override;
 
-#ifdef RADIOLIB_GODMODE
     bool isIRQPending() override { return lora.getIrqStatus() != 0; }
-#endif
 
   protected:
 

src/mesh/StreamAPI.cpp

@@ -6,7 +6,7 @@
 #define START2 0xc3
 #define HEADER_LEN 4
 
-int32_t StreamAPI::runOnce()
+int32_t StreamAPI::runOncePart()
 {
     auto result = readStream();
     writeStream();
@@ -95,7 +95,7 @@ void StreamAPI::writeStream()
 void StreamAPI::emitTxBuffer(size_t len)
 {
     if (len != 0) {
-        // DEBUG_MSG("emit tx %d\n", len);
+        // LOG_DEBUG("emit tx %d\n", len);
         txBuf[0] = START1;
         txBuf[1] = START2;
         txBuf[2] = (len >> 8) & 0xff;
@@ -114,8 +114,8 @@ void StreamAPI::emitRebooted()
     fromRadioScratch.which_payload_variant = FromRadio_rebooted_tag;
     fromRadioScratch.rebooted = true;
 
-    // DEBUG_MSG("Emitting reboot packet for serial shell\n");
-    emitTxBuffer(pb_encode_to_bytes(txBuf + HEADER_LEN, FromRadio_size, FromRadio_fields, &fromRadioScratch));
+    // LOG_DEBUG("Emitting reboot packet for serial shell\n");
+    emitTxBuffer(pb_encode_to_bytes(txBuf + HEADER_LEN, FromRadio_size, &FromRadio_msg, &fromRadioScratch));
 }
 
 /// Hookable to find out when connection changes

src/mesh/StreamAPI.h

@@ -28,7 +28,7 @@ valid utf8 encoding. This makes it a bit easier to start a device outputting reg
 after it has received a valid packet from the PC, turn off unencoded debug printing and switch to this packet encoding.
 
  */
-class StreamAPI : public PhoneAPI, protected concurrency::OSThread
+class StreamAPI : public PhoneAPI
 {
     /**
      * The stream we read/write from
@@ -42,13 +42,13 @@ class StreamAPI : public PhoneAPI, protected concurrency::OSThread
     uint32_t lastRxMsec = 0;
 
   public:
-    StreamAPI(Stream *_stream) : concurrency::OSThread("StreamAPI"), stream(_stream) {}
+    StreamAPI(Stream *_stream) : stream(_stream) {}
 
     /**
      * Currently we require frequent invocation from loop() to check for arrived serial packets and to send new packets to the
      * phone.
      */
-    virtual int32_t runOnce() override;
+    virtual int32_t runOncePart();
 
   private:
     /**

src/mesh/eth/ethClient.cpp

@@ -29,10 +29,10 @@ static int32_t reconnectETH()
         Ethernet.maintain();
         if (!ethStartupComplete) {
             // Start web server
-            DEBUG_MSG("... Starting network services\n");
+            LOG_INFO("... Starting network services\n");
 
 #ifndef DISABLE_NTP
-            DEBUG_MSG("Starting NTP time client\n");
+            LOG_INFO("Starting NTP time client\n");
             timeClient.begin();
             timeClient.setUpdateInterval(60 * 60); // Update once an hour
 #endif            
@@ -51,9 +51,9 @@ static int32_t reconnectETH()
 #ifndef DISABLE_NTP
     if (isEthernetAvailable() && (ntp_renew < millis())) {
 	    
-        DEBUG_MSG("Updating NTP time from %s\n", config.network.ntp_server);
+        LOG_INFO("Updating NTP time from %s\n", config.network.ntp_server);
         if (timeClient.update()) {
-            DEBUG_MSG("NTP Request Success - Setting RTCQualityNTP if needed\n");
+            LOG_DEBUG("NTP Request Success - Setting RTCQualityNTP if needed\n");
 
             struct timeval tv;
             tv.tv_sec = timeClient.getEpochTime();
@@ -64,7 +64,7 @@ static int32_t reconnectETH()
             ntp_renew = millis() + 43200 * 1000; // success, refresh every 12 hours
 
         } else {
-            DEBUG_MSG("NTP Update failed\n");
+            LOG_ERROR("NTP Update failed\n");
             ntp_renew = millis() + 300 * 1000; // failure, retry every 5 minutes
         }
     }
@@ -95,33 +95,33 @@ bool initEthernet()
 
         getMacAddr(mac); // FIXME use the BLE MAC for now...
 
-        if (config.network.eth_mode == Config_NetworkConfig_EthMode_DHCP) {
-            DEBUG_MSG("starting Ethernet DHCP\n");
+        if (config.network.address_mode == Config_NetworkConfig_AddressMode_DHCP) {
+            LOG_INFO("starting Ethernet DHCP\n");
             status = Ethernet.begin(mac);
-        } else if (config.network.eth_mode == Config_NetworkConfig_EthMode_STATIC) {
-            DEBUG_MSG("starting Ethernet Static\n");
+        } else if (config.network.address_mode == Config_NetworkConfig_AddressMode_STATIC) {
+            LOG_INFO("starting Ethernet Static\n");
             Ethernet.begin(mac, config.network.ipv4_config.ip, config.network.ipv4_config.dns, config.network.ipv4_config.subnet);
         } else {
-            DEBUG_MSG("Ethernet Disabled\n");
+            LOG_INFO("Ethernet Disabled\n");
             return false;
         }
 
         if (status == 0) {
             if (Ethernet.hardwareStatus() == EthernetNoHardware) {
-                DEBUG_MSG("Ethernet shield was not found.\n");
+                LOG_ERROR("Ethernet shield was not found.\n");
                 return false;
             } else if (Ethernet.linkStatus() == LinkOFF) {
-                DEBUG_MSG("Ethernet cable is not connected.\n");
+                LOG_ERROR("Ethernet cable is not connected.\n");
                 return false;
             } else{
-                DEBUG_MSG("Unknown Ethernet error.\n");
+                LOG_ERROR("Unknown Ethernet error.\n");
                 return false;
             }
         } else {
-            DEBUG_MSG("Local IP %u.%u.%u.%u\n",Ethernet.localIP()[0], Ethernet.localIP()[1], Ethernet.localIP()[2], Ethernet.localIP()[3]);
-            DEBUG_MSG("Subnet Mask %u.%u.%u.%u\n",Ethernet.subnetMask()[0], Ethernet.subnetMask()[1], Ethernet.subnetMask()[2], Ethernet.subnetMask()[3]);
-            DEBUG_MSG("Gateway IP %u.%u.%u.%u\n",Ethernet.gatewayIP()[0], Ethernet.gatewayIP()[1], Ethernet.gatewayIP()[2], Ethernet.gatewayIP()[3]);
-            DEBUG_MSG("DNS Server IP %u.%u.%u.%u\n",Ethernet.dnsServerIP()[0], Ethernet.dnsServerIP()[1], Ethernet.dnsServerIP()[2], Ethernet.dnsServerIP()[3]);
+            LOG_INFO("Local IP %u.%u.%u.%u\n",Ethernet.localIP()[0], Ethernet.localIP()[1], Ethernet.localIP()[2], Ethernet.localIP()[3]);
+            LOG_INFO("Subnet Mask %u.%u.%u.%u\n",Ethernet.subnetMask()[0], Ethernet.subnetMask()[1], Ethernet.subnetMask()[2], Ethernet.subnetMask()[3]);
+            LOG_INFO("Gateway IP %u.%u.%u.%u\n",Ethernet.gatewayIP()[0], Ethernet.gatewayIP()[1], Ethernet.gatewayIP()[2], Ethernet.gatewayIP()[3]);
+            LOG_INFO("DNS Server IP %u.%u.%u.%u\n",Ethernet.dnsServerIP()[0], Ethernet.dnsServerIP()[1], Ethernet.dnsServerIP()[2], Ethernet.dnsServerIP()[3]);
         }
 
         ethEvent = new Periodic("ethConnect", reconnectETH);
@@ -129,7 +129,7 @@ bool initEthernet()
         return true;
 
     } else {
-        DEBUG_MSG("Not using Ethernet\n");
+        LOG_INFO("Not using Ethernet\n");
         return false;
     }
 }

src/mesh/eth/ethServerAPI.cpp

@@ -9,14 +9,14 @@ void initApiServer(int port)
     // Start API server on port 4403
     if (!apiPort) {
         apiPort = new ethServerPort(port);
-        DEBUG_MSG("API server listening on TCP port %d\n", port);
+        LOG_INFO("API server listening on TCP port %d\n", port);
         apiPort->init();
     }
 }
 
-ethServerAPI::ethServerAPI(EthernetClient &_client) : StreamAPI(&client), client(_client)
+ethServerAPI::ethServerAPI(EthernetClient &_client) : StreamAPI(&client), concurrency::OSThread("ethServerAPI"), client(_client)
 {
-    DEBUG_MSG("Incoming ethernet connection\n");
+    LOG_INFO("Incoming ethernet connection\n");
 }
 
 ethServerAPI::~ethServerAPI()
@@ -42,9 +42,9 @@ bool ethServerAPI::checkIsConnected()
 int32_t ethServerAPI::runOnce()
 {
     if (client.connected()) {
-        return StreamAPI::runOnce();
+        return StreamAPI::runOncePart();
     } else {
-        DEBUG_MSG("Client dropped connection, suspending API service\n");
+        LOG_INFO("Client dropped connection, suspending API service\n");
         enabled = false; // we no longer need to run
         return 0;
     }
@@ -71,7 +71,7 @@ int32_t ethServerPort::runOnce()
     if (client) {
         // Close any previous connection (see FIXME in header file)
         if (openAPI) {
-            DEBUG_MSG("Force closing previous TCP connection\n");
+            LOG_WARN("Force closing previous TCP connection\n");
             delete openAPI;
         }
 

src/mesh/eth/ethServerAPI.h

@@ -7,7 +7,7 @@
  * Provides both debug printing and, if the client starts sending protobufs to us, switches to send/receive protobufs
  * (and starts dropping debug printing - FIXME, eventually those prints should be encapsulated in protobufs).
  */
-class ethServerAPI : public StreamAPI
+class ethServerAPI : public StreamAPI, private concurrency::OSThread
 {
   private:
     EthernetClient client;

src/mesh/generated/admin.pb.c

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #include "admin.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40

src/mesh/generated/admin.pb.h

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #ifndef PB_ADMIN_PB_H_INCLUDED
 #define PB_ADMIN_PB_H_INCLUDED
@@ -15,32 +15,51 @@
 #endif
 
 /* Enum definitions */
-typedef enum _AdminMessage_ConfigType { 
-    AdminMessage_ConfigType_DEVICE_CONFIG = 0, 
-    AdminMessage_ConfigType_POSITION_CONFIG = 1, 
-    AdminMessage_ConfigType_POWER_CONFIG = 2, 
-    AdminMessage_ConfigType_NETWORK_CONFIG = 3, 
-    AdminMessage_ConfigType_DISPLAY_CONFIG = 4, 
-    AdminMessage_ConfigType_LORA_CONFIG = 5, 
-    AdminMessage_ConfigType_BLUETOOTH_CONFIG = 6 
+/* TODO: REPLACE */
+typedef enum _AdminMessage_ConfigType {
+    /* TODO: REPLACE */
+    AdminMessage_ConfigType_DEVICE_CONFIG = 0,
+    /* TODO: REPLACE */
+    AdminMessage_ConfigType_POSITION_CONFIG = 1,
+    /* TODO: REPLACE */
+    AdminMessage_ConfigType_POWER_CONFIG = 2,
+    /* TODO: REPLACE */
+    AdminMessage_ConfigType_NETWORK_CONFIG = 3,
+    /* TODO: REPLACE */
+    AdminMessage_ConfigType_DISPLAY_CONFIG = 4,
+    /* TODO: REPLACE */
+    AdminMessage_ConfigType_LORA_CONFIG = 5,
+    /* TODO: REPLACE */
+    AdminMessage_ConfigType_BLUETOOTH_CONFIG = 6
 } AdminMessage_ConfigType;
 
-typedef enum _AdminMessage_ModuleConfigType { 
-    AdminMessage_ModuleConfigType_MQTT_CONFIG = 0, 
-    AdminMessage_ModuleConfigType_SERIAL_CONFIG = 1, 
-    AdminMessage_ModuleConfigType_EXTNOTIF_CONFIG = 2, 
-    AdminMessage_ModuleConfigType_STOREFORWARD_CONFIG = 3, 
-    AdminMessage_ModuleConfigType_RANGETEST_CONFIG = 4, 
-    AdminMessage_ModuleConfigType_TELEMETRY_CONFIG = 5, 
-    AdminMessage_ModuleConfigType_CANNEDMSG_CONFIG = 6, 
-    AdminMessage_ModuleConfigType_AUDIO_CONFIG = 7 
+/* TODO: REPLACE */
+typedef enum _AdminMessage_ModuleConfigType {
+    /* TODO: REPLACE */
+    AdminMessage_ModuleConfigType_MQTT_CONFIG = 0,
+    /* TODO: REPLACE */
+    AdminMessage_ModuleConfigType_SERIAL_CONFIG = 1,
+    /* TODO: REPLACE */
+    AdminMessage_ModuleConfigType_EXTNOTIF_CONFIG = 2,
+    /* TODO: REPLACE */
+    AdminMessage_ModuleConfigType_STOREFORWARD_CONFIG = 3,
+    /* TODO: REPLACE */
+    AdminMessage_ModuleConfigType_RANGETEST_CONFIG = 4,
+    /* TODO: REPLACE */
+    AdminMessage_ModuleConfigType_TELEMETRY_CONFIG = 5,
+    /* TODO: REPLACE */
+    AdminMessage_ModuleConfigType_CANNEDMSG_CONFIG = 6,
+    /* TODO: REPLACE */
+    AdminMessage_ModuleConfigType_AUDIO_CONFIG = 7,
+    /* TODO: REPLACE */
+    AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG = 8
 } AdminMessage_ModuleConfigType;
 
 /* Struct definitions */
 /* This message is handled by the Admin module and is responsible for all settings/channel read/write operations.
  This message is used to do settings operations to both remote AND local nodes.
  (Prior to 1.2 these operations were done via special ToRadio operations) */
-typedef struct _AdminMessage { 
+typedef struct _AdminMessage {
     pb_size_t which_payload_variant;
     union {
         /* Send the specified channel in the response to this message
@@ -68,6 +87,10 @@ typedef struct _AdminMessage {
         bool get_device_metadata_request;
         /* Device metadata response */
         DeviceMetadata get_device_metadata_response;
+        /* Get the Ringtone in the response to this message. */
+        bool get_ringtone_request;
+        /* Get the Ringtone in the response to this message. */
+        char get_ringtone_response[231];
         /* Set the owner for this node */
         User set_owner;
         /* Set channels (using the new API).
@@ -82,6 +105,8 @@ typedef struct _AdminMessage {
         ModuleConfig set_module_config;
         /* Set the Canned Message Module messages text. */
         char set_canned_message_module_messages[201];
+        /* Set the ringtone for ExternalNotification. */
+        char set_ringtone_message[231];
         /* Begins an edit transaction for config, module config, owner, and channel settings changes
      This will delay the standard *implicit* save to the file system and subsequent reboot behavior until committed (commit_edit_settings) */
         bool begin_edit_settings;
@@ -112,19 +137,22 @@ typedef struct _AdminMessage {
 } AdminMessage;
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Helper constants for enums */
 #define _AdminMessage_ConfigType_MIN AdminMessage_ConfigType_DEVICE_CONFIG
 #define _AdminMessage_ConfigType_MAX AdminMessage_ConfigType_BLUETOOTH_CONFIG
 #define _AdminMessage_ConfigType_ARRAYSIZE ((AdminMessage_ConfigType)(AdminMessage_ConfigType_BLUETOOTH_CONFIG+1))
 
 #define _AdminMessage_ModuleConfigType_MIN AdminMessage_ModuleConfigType_MQTT_CONFIG
-#define _AdminMessage_ModuleConfigType_MAX AdminMessage_ModuleConfigType_AUDIO_CONFIG
-#define _AdminMessage_ModuleConfigType_ARRAYSIZE ((AdminMessage_ModuleConfigType)(AdminMessage_ModuleConfigType_AUDIO_CONFIG+1))
+#define _AdminMessage_ModuleConfigType_MAX AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG
+#define _AdminMessage_ModuleConfigType_ARRAYSIZE ((AdminMessage_ModuleConfigType)(AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG+1))
 
+#define AdminMessage_payload_variant_get_config_request_ENUMTYPE AdminMessage_ConfigType
+#define AdminMessage_payload_variant_get_module_config_request_ENUMTYPE AdminMessage_ModuleConfigType
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 /* Initializer values for message structs */
 #define AdminMessage_init_default                {0, {0}}
@@ -143,11 +171,14 @@ extern "C" {
 #define AdminMessage_get_canned_message_module_messages_response_tag 11
 #define AdminMessage_get_device_metadata_request_tag 12
 #define AdminMessage_get_device_metadata_response_tag 13
+#define AdminMessage_get_ringtone_request_tag    14
+#define AdminMessage_get_ringtone_response_tag   15
 #define AdminMessage_set_owner_tag               32
 #define AdminMessage_set_channel_tag             33
 #define AdminMessage_set_config_tag              34
 #define AdminMessage_set_module_config_tag       35
 #define AdminMessage_set_canned_message_module_messages_tag 36
+#define AdminMessage_set_ringtone_message_tag    37
 #define AdminMessage_begin_edit_settings_tag     64
 #define AdminMessage_commit_edit_settings_tag    65
 #define AdminMessage_confirm_set_channel_tag     66
@@ -173,11 +204,14 @@ X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,get_canned_message_module_me
 X(a, STATIC,   ONEOF,    STRING,   (payload_variant,get_canned_message_module_messages_response,get_canned_message_module_messages_response),  11) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,get_device_metadata_request,get_device_metadata_request),  12) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,get_device_metadata_response,get_device_metadata_response),  13) \
+X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,get_ringtone_request,get_ringtone_request),  14) \
+X(a, STATIC,   ONEOF,    STRING,   (payload_variant,get_ringtone_response,get_ringtone_response),  15) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,set_owner,set_owner),  32) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,set_channel,set_channel),  33) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,set_config,set_config),  34) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,set_module_config,set_module_config),  35) \
 X(a, STATIC,   ONEOF,    STRING,   (payload_variant,set_canned_message_module_messages,set_canned_message_module_messages),  36) \
+X(a, STATIC,   ONEOF,    STRING,   (payload_variant,set_ringtone_message,set_ringtone_message),  37) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,begin_edit_settings,begin_edit_settings),  64) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,commit_edit_settings,commit_edit_settings),  65) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,confirm_set_channel,confirm_set_channel),  66) \
@@ -206,7 +240,7 @@ extern const pb_msgdesc_t AdminMessage_msg;
 #define AdminMessage_fields &AdminMessage_msg
 
 /* Maximum encoded size of messages (where known) */
-#define AdminMessage_size                        204
+#define AdminMessage_size                        234
 
 #ifdef __cplusplus
 } /* extern "C" */

src/mesh/generated/apponly.pb.c

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #include "apponly.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40

src/mesh/generated/apponly.pb.h

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #ifndef PB_APPONLY_PB_H_INCLUDED
 #define PB_APPONLY_PB_H_INCLUDED
@@ -17,7 +17,7 @@
  any SECONDARY channels.
  No DISABLED channels are included.
  This abstraction is used only on the the 'app side' of the world (ie python, javascript and android etc) to show a group of Channels as a (long) URL */
-typedef struct _ChannelSet { 
+typedef struct _ChannelSet {
     /* Channel list with settings */
     pb_size_t settings_count;
     ChannelSettings settings[8];

src/mesh/generated/cannedmessages.pb.c

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #include "cannedmessages.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40

src/mesh/generated/cannedmessages.pb.h

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #ifndef PB_CANNEDMESSAGES_PB_H_INCLUDED
 #define PB_CANNEDMESSAGES_PB_H_INCLUDED
@@ -11,7 +11,7 @@
 
 /* Struct definitions */
 /* Canned message module configuration. */
-typedef struct _CannedMessageModuleConfig { 
+typedef struct _CannedMessageModuleConfig {
     /* Predefined messages for canned message module separated by '|' characters. */
     char messages[201];
 } CannedMessageModuleConfig;

src/mesh/generated/channel.pb.c

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #include "channel.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40

src/mesh/generated/channel.pb.h

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #ifndef PB_CHANNEL_PB_H_INCLUDED
 #define PB_CHANNEL_PB_H_INCLUDED
@@ -10,10 +10,23 @@
 #endif
 
 /* Enum definitions */
-typedef enum _Channel_Role { 
-    Channel_Role_DISABLED = 0, 
-    Channel_Role_PRIMARY = 1, 
-    Channel_Role_SECONDARY = 2 
+/* How this channel is being used (or not).
+ Note: this field is an enum to give us options for the future.
+ In particular, someday we might make a 'SCANNING' option.
+ SCANNING channels could have different frequencies and the radio would
+ occasionally check that freq to see if anything is being transmitted.
+ For devices that have multiple physical radios attached, we could keep multiple PRIMARY/SCANNING channels active at once to allow
+ cross band routing as needed.
+ If a device has only a single radio (the common case) only one channel can be PRIMARY at a time
+ (but any number of SECONDARY channels can't be sent received on that common frequency) */
+typedef enum _Channel_Role {
+    /* This channel is not in use right now */
+    Channel_Role_DISABLED = 0,
+    /* This channel is used to set the frequency for the radio - all other enabled channels must be SECONDARY */
+    Channel_Role_PRIMARY = 1,
+    /* Secondary channels are only used for encryption/decryption/authentication purposes.
+ Their radio settings (freq etc) are ignored, only psk is used. */
+    Channel_Role_SECONDARY = 2
 } Channel_Role;
 
 /* Struct definitions */
@@ -37,7 +50,7 @@ typedef PB_BYTES_ARRAY_T(32) ChannelSettings_psk_t;
  FIXME: Add description of multi-channel support and how primary vs secondary channels are used.
  FIXME: explain how apps use channels for security.
  explain how remote settings and remote gpio are managed as an example */
-typedef struct _ChannelSettings { 
+typedef struct _ChannelSettings {
     /* Deprecated in favor of LoraConfig.channel_num */
     uint32_t channel_num;
     /* A simple pre-shared key for now for crypto.
@@ -79,7 +92,7 @@ typedef struct _ChannelSettings {
 } ChannelSettings;
 
 /* A pair of a channel number, mode and the (sharable) settings for that channel */
-typedef struct _Channel { 
+typedef struct _Channel {
     /* The index of this channel in the channel table (from 0 to MAX_NUM_CHANNELS-1)
  (Someday - not currently implemented) An index of -1 could be used to mean "set by name",
  in which case the target node will find and set the channel by settings.name. */
@@ -92,15 +105,18 @@ typedef struct _Channel {
 } Channel;
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Helper constants for enums */
 #define _Channel_Role_MIN Channel_Role_DISABLED
 #define _Channel_Role_MAX Channel_Role_SECONDARY
 #define _Channel_Role_ARRAYSIZE ((Channel_Role)(Channel_Role_SECONDARY+1))
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#define Channel_role_ENUMTYPE Channel_Role
+
 
 /* Initializer values for message structs */
 #define ChannelSettings_init_default             {0, {0, {0}}, "", 0, 0, 0}

src/mesh/generated/config.pb.c

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #include "config.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40
@@ -43,3 +43,4 @@ PB_BIND(Config_BluetoothConfig, Config_BluetoothConfig, AUTO)
 
 
 
+

src/mesh/generated/config.pb.h

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #ifndef PB_CONFIG_PB_H_INCLUDED
 #define PB_CONFIG_PB_H_INCLUDED
@@ -10,169 +10,386 @@
 #endif
 
 /* Enum definitions */
-typedef enum _Config_DeviceConfig_Role { 
-    Config_DeviceConfig_Role_CLIENT = 0, 
-    Config_DeviceConfig_Role_CLIENT_MUTE = 1, 
-    Config_DeviceConfig_Role_ROUTER = 2, 
-    Config_DeviceConfig_Role_ROUTER_CLIENT = 3 
+/* Defines the device's role on the Mesh network */
+typedef enum _Config_DeviceConfig_Role {
+    /* Client device role */
+    Config_DeviceConfig_Role_CLIENT = 0,
+    /* Client Mute device role
+   Same as a client except packets will not hop over this node, does not contribute to routing packets for mesh. */
+    Config_DeviceConfig_Role_CLIENT_MUTE = 1,
+    /* Router device role.
+   Mesh packets will prefer to be routed over this node. This node will not be used by client apps. 
+   The wifi/ble radios and the oled screen will be put to sleep. */
+    Config_DeviceConfig_Role_ROUTER = 2,
+    /* Router Client device role
+   Mesh packets will prefer to be routed over this node. The Router Client can be used as both a Router and an app connected Client. */
+    Config_DeviceConfig_Role_ROUTER_CLIENT = 3
 } Config_DeviceConfig_Role;
 
-typedef enum _Config_PositionConfig_PositionFlags { 
-    Config_PositionConfig_PositionFlags_UNSET = 0, 
-    Config_PositionConfig_PositionFlags_ALTITUDE = 1, 
-    Config_PositionConfig_PositionFlags_ALTITUDE_MSL = 2, 
-    Config_PositionConfig_PositionFlags_GEOIDAL_SEPARATION = 4, 
-    Config_PositionConfig_PositionFlags_DOP = 8, 
-    Config_PositionConfig_PositionFlags_HVDOP = 16, 
-    Config_PositionConfig_PositionFlags_SATINVIEW = 32, 
-    Config_PositionConfig_PositionFlags_SEQ_NO = 64, 
-    Config_PositionConfig_PositionFlags_TIMESTAMP = 128, 
-    Config_PositionConfig_PositionFlags_HEADING = 256, 
-    Config_PositionConfig_PositionFlags_SPEED = 512 
+/* Bit field of boolean configuration options, indicating which optional
+   fields to include when assembling POSITION messages
+ Longitude and latitude are always included (also time if GPS-synced)
+ NOTE: the more fields are included, the larger the message will be -
+   leading to longer airtime and a higher risk of packet loss */
+typedef enum _Config_PositionConfig_PositionFlags {
+    /* Required for compilation */
+    Config_PositionConfig_PositionFlags_UNSET = 0,
+    /* Include an altitude value (if available) */
+    Config_PositionConfig_PositionFlags_ALTITUDE = 1,
+    /* Altitude value is MSL */
+    Config_PositionConfig_PositionFlags_ALTITUDE_MSL = 2,
+    /* Include geoidal separation */
+    Config_PositionConfig_PositionFlags_GEOIDAL_SEPARATION = 4,
+    /* Include the DOP value ; PDOP used by default, see below */
+    Config_PositionConfig_PositionFlags_DOP = 8,
+    /* If POS_DOP set, send separate HDOP / VDOP values instead of PDOP */
+    Config_PositionConfig_PositionFlags_HVDOP = 16,
+    /* Include number of "satellites in view" */
+    Config_PositionConfig_PositionFlags_SATINVIEW = 32,
+    /* Include a sequence number incremented per packet */
+    Config_PositionConfig_PositionFlags_SEQ_NO = 64,
+    /* Include positional timestamp (from GPS solution) */
+    Config_PositionConfig_PositionFlags_TIMESTAMP = 128,
+    /* Include positional heading
+ Intended for use with vehicle not walking speeds
+ walking speeds are likely to be error prone like the compass */
+    Config_PositionConfig_PositionFlags_HEADING = 256,
+    /* Include positional speed
+ Intended for use with vehicle not walking speeds
+ walking speeds are likely to be error prone like the compass */
+    Config_PositionConfig_PositionFlags_SPEED = 512
 } Config_PositionConfig_PositionFlags;
 
-typedef enum _Config_NetworkConfig_EthMode { 
-    Config_NetworkConfig_EthMode_DHCP = 0, 
-    Config_NetworkConfig_EthMode_STATIC = 1 
-} Config_NetworkConfig_EthMode;
+typedef enum _Config_NetworkConfig_AddressMode {
+    /* obtain ip address via DHCP */
+    Config_NetworkConfig_AddressMode_DHCP = 0,
+    /* use static ip address */
+    Config_NetworkConfig_AddressMode_STATIC = 1
+} Config_NetworkConfig_AddressMode;
 
-typedef enum _Config_DisplayConfig_GpsCoordinateFormat { 
-    Config_DisplayConfig_GpsCoordinateFormat_DEC = 0, 
-    Config_DisplayConfig_GpsCoordinateFormat_DMS = 1, 
-    Config_DisplayConfig_GpsCoordinateFormat_UTM = 2, 
-    Config_DisplayConfig_GpsCoordinateFormat_MGRS = 3, 
-    Config_DisplayConfig_GpsCoordinateFormat_OLC = 4, 
-    Config_DisplayConfig_GpsCoordinateFormat_OSGR = 5 
+/* How the GPS coordinates are displayed on the OLED screen. */
+typedef enum _Config_DisplayConfig_GpsCoordinateFormat {
+    /* GPS coordinates are displayed in the normal decimal degrees format:
+ DD.DDDDDD DDD.DDDDDD */
+    Config_DisplayConfig_GpsCoordinateFormat_DEC = 0,
+    /* GPS coordinates are displayed in the degrees minutes seconds format:
+ DD°MM'SS"C DDD°MM'SS"C, where C is the compass point representing the locations quadrant */
+    Config_DisplayConfig_GpsCoordinateFormat_DMS = 1,
+    /* Universal Transverse Mercator format:
+ ZZB EEEEEE NNNNNNN, where Z is zone, B is band, E is easting, N is northing */
+    Config_DisplayConfig_GpsCoordinateFormat_UTM = 2,
+    /* Military Grid Reference System format:
+ ZZB CD EEEEE NNNNN, where Z is zone, B is band, C is the east 100k square, D is the north 100k square,
+ E is easting, N is northing */
+    Config_DisplayConfig_GpsCoordinateFormat_MGRS = 3,
+    /* Open Location Code (aka Plus Codes). */
+    Config_DisplayConfig_GpsCoordinateFormat_OLC = 4,
+    /* Ordnance Survey Grid Reference (the National Grid System of the UK).
+ Format: AB EEEEE NNNNN, where A is the east 100k square, B is the north 100k square,
+ E is the easting, N is the northing */
+    Config_DisplayConfig_GpsCoordinateFormat_OSGR = 5
 } Config_DisplayConfig_GpsCoordinateFormat;
 
-typedef enum _Config_DisplayConfig_DisplayUnits { 
-    Config_DisplayConfig_DisplayUnits_METRIC = 0, 
-    Config_DisplayConfig_DisplayUnits_IMPERIAL = 1 
+/* Unit display preference */
+typedef enum _Config_DisplayConfig_DisplayUnits {
+    /* Metric (Default) */
+    Config_DisplayConfig_DisplayUnits_METRIC = 0,
+    /* Imperial */
+    Config_DisplayConfig_DisplayUnits_IMPERIAL = 1
 } Config_DisplayConfig_DisplayUnits;
 
-typedef enum _Config_DisplayConfig_OledType { 
-    Config_DisplayConfig_OledType_OLED_AUTO = 0, 
-    Config_DisplayConfig_OledType_OLED_SSD1306 = 1, 
-    Config_DisplayConfig_OledType_OLED_SH1106 = 2 
+/* Override OLED outo detect with this if it fails. */
+typedef enum _Config_DisplayConfig_OledType {
+    /* Default / Auto */
+    Config_DisplayConfig_OledType_OLED_AUTO = 0,
+    /* Default / Auto */
+    Config_DisplayConfig_OledType_OLED_SSD1306 = 1,
+    /* Default / Auto */
+    Config_DisplayConfig_OledType_OLED_SH1106 = 2
 } Config_DisplayConfig_OledType;
 
-typedef enum _Config_LoRaConfig_RegionCode { 
-    Config_LoRaConfig_RegionCode_UNSET = 0, 
-    Config_LoRaConfig_RegionCode_US = 1, 
-    Config_LoRaConfig_RegionCode_EU_433 = 2, 
-    Config_LoRaConfig_RegionCode_EU_868 = 3, 
-    Config_LoRaConfig_RegionCode_CN = 4, 
-    Config_LoRaConfig_RegionCode_JP = 5, 
-    Config_LoRaConfig_RegionCode_ANZ = 6, 
-    Config_LoRaConfig_RegionCode_KR = 7, 
-    Config_LoRaConfig_RegionCode_TW = 8, 
-    Config_LoRaConfig_RegionCode_RU = 9, 
-    Config_LoRaConfig_RegionCode_IN = 10, 
-    Config_LoRaConfig_RegionCode_NZ_865 = 11, 
-    Config_LoRaConfig_RegionCode_TH = 12, 
-    Config_LoRaConfig_RegionCode_LORA_24 = 13 
+typedef enum _Config_DisplayConfig_DisplayMode {
+    /* Default. The old style for the 128x64 OLED screen */
+    Config_DisplayConfig_DisplayMode_DEFAULT = 0,
+    /* Rearrange display elements to cater for bicolor OLED displays */
+    Config_DisplayConfig_DisplayMode_TWOCOLOR = 1,
+    /* Same as TwoColor, but with inverted top bar. Not so good for Epaper displays */
+    Config_DisplayConfig_DisplayMode_INVERTED = 2,
+    /* TFT Full Color Displays (not implemented yet) */
+    Config_DisplayConfig_DisplayMode_COLOR = 3
+} Config_DisplayConfig_DisplayMode;
+
+typedef enum _Config_LoRaConfig_RegionCode {
+    /* Region is not set */
+    Config_LoRaConfig_RegionCode_UNSET = 0,
+    /* United States */
+    Config_LoRaConfig_RegionCode_US = 1,
+    /* European Union 433mhz */
+    Config_LoRaConfig_RegionCode_EU_433 = 2,
+    /* European Union 433mhz */
+    Config_LoRaConfig_RegionCode_EU_868 = 3,
+    /* China */
+    Config_LoRaConfig_RegionCode_CN = 4,
+    /* Japan */
+    Config_LoRaConfig_RegionCode_JP = 5,
+    /* Australia / New Zealand */
+    Config_LoRaConfig_RegionCode_ANZ = 6,
+    /* Korea */
+    Config_LoRaConfig_RegionCode_KR = 7,
+    /* Taiwan */
+    Config_LoRaConfig_RegionCode_TW = 8,
+    /* Russia */
+    Config_LoRaConfig_RegionCode_RU = 9,
+    /* India */
+    Config_LoRaConfig_RegionCode_IN = 10,
+    /* New Zealand 865mhz */
+    Config_LoRaConfig_RegionCode_NZ_865 = 11,
+    /* Thailand */
+    Config_LoRaConfig_RegionCode_TH = 12,
+    /* WLAN Band */
+    Config_LoRaConfig_RegionCode_LORA_24 = 13
 } Config_LoRaConfig_RegionCode;
 
-typedef enum _Config_LoRaConfig_ModemPreset { 
-    Config_LoRaConfig_ModemPreset_LONG_FAST = 0, 
-    Config_LoRaConfig_ModemPreset_LONG_SLOW = 1, 
-    Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW = 2, 
-    Config_LoRaConfig_ModemPreset_MEDIUM_SLOW = 3, 
-    Config_LoRaConfig_ModemPreset_MEDIUM_FAST = 4, 
-    Config_LoRaConfig_ModemPreset_SHORT_SLOW = 5, 
-    Config_LoRaConfig_ModemPreset_SHORT_FAST = 6 
+/* Standard predefined channel settings
+ Note: these mappings must match ModemPreset Choice in the device code. */
+typedef enum _Config_LoRaConfig_ModemPreset {
+    /* Long Range - Fast */
+    Config_LoRaConfig_ModemPreset_LONG_FAST = 0,
+    /* Long Range - Slow */
+    Config_LoRaConfig_ModemPreset_LONG_SLOW = 1,
+    /* Very Long Range - Slow */
+    Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW = 2,
+    /* Medium Range - Slow */
+    Config_LoRaConfig_ModemPreset_MEDIUM_SLOW = 3,
+    /* Medium Range - Fast */
+    Config_LoRaConfig_ModemPreset_MEDIUM_FAST = 4,
+    /* Short Range - Slow */
+    Config_LoRaConfig_ModemPreset_SHORT_SLOW = 5,
+    /* Short Range - Fast */
+    Config_LoRaConfig_ModemPreset_SHORT_FAST = 6
 } Config_LoRaConfig_ModemPreset;
 
-typedef enum _Config_BluetoothConfig_PairingMode { 
-    Config_BluetoothConfig_PairingMode_RANDOM_PIN = 0, 
-    Config_BluetoothConfig_PairingMode_FIXED_PIN = 1, 
-    Config_BluetoothConfig_PairingMode_NO_PIN = 2 
+typedef enum _Config_BluetoothConfig_PairingMode {
+    /* Device generates a random pin that will be shown on the screen of the device for pairing */
+    Config_BluetoothConfig_PairingMode_RANDOM_PIN = 0,
+    /* Device requires a specified fixed pin for pairing */
+    Config_BluetoothConfig_PairingMode_FIXED_PIN = 1,
+    /* Device requires no pin for pairing */
+    Config_BluetoothConfig_PairingMode_NO_PIN = 2
 } Config_BluetoothConfig_PairingMode;
 
 /* Struct definitions */
-typedef struct _Config_BluetoothConfig { 
-    bool enabled;
-    Config_BluetoothConfig_PairingMode mode;
-    uint32_t fixed_pin;
-} Config_BluetoothConfig;
-
-typedef struct _Config_DeviceConfig { 
+/* Configuration */
+typedef struct _Config_DeviceConfig {
+    /* Sets the role of node */
     Config_DeviceConfig_Role role;
+    /* Disabling this will disable the SerialConsole by not initilizing the StreamAPI */
     bool serial_enabled;
+    /* By default we turn off logging as soon as an API client connects (to keep shared serial link quiet).
+ Set this to true to leave the debug log outputting even when API is active. */
     bool debug_log_enabled;
+    /* For boards without a hard wired button, this is the pin number that will be used
+ Boards that have more than one button can swap the function with this one. defaults to BUTTON_PIN if defined. */
     uint32_t button_gpio;
+    /* For boards without a PWM buzzer, this is the pin number that will be used
+ Defaults to PIN_BUZZER if defined. */
     uint32_t buzzer_gpio;
 } Config_DeviceConfig;
 
-typedef struct _Config_DisplayConfig { 
-    uint32_t screen_on_secs;
-    Config_DisplayConfig_GpsCoordinateFormat gps_format;
-    uint32_t auto_screen_carousel_secs;
-    bool compass_north_top;
-    bool flip_screen;
-    Config_DisplayConfig_DisplayUnits units;
-    Config_DisplayConfig_OledType oled;
-} Config_DisplayConfig;
-
-typedef struct _Config_LoRaConfig { 
-    bool use_preset;
-    Config_LoRaConfig_ModemPreset modem_preset;
-    uint16_t bandwidth;
-    uint32_t spread_factor;
-    uint8_t coding_rate;
-    float frequency_offset;
-    Config_LoRaConfig_RegionCode region;
-    uint32_t hop_limit;
-    bool tx_enabled;
-    int8_t tx_power;
-    uint16_t channel_num;
-    bool override_duty_cycle;
-    pb_size_t ignore_incoming_count;
-    uint32_t ignore_incoming[3];
-} Config_LoRaConfig;
-
-typedef struct _Config_NetworkConfig_IpV4Config { 
-    uint32_t ip;
-    uint32_t gateway;
-    uint32_t subnet;
-    uint32_t dns;
-} Config_NetworkConfig_IpV4Config;
-
-typedef struct _Config_PositionConfig { 
+/* Position Config */
+typedef struct _Config_PositionConfig {
+    /* We should send our position this often (but only if it has changed significantly)
+ Defaults to 15 minutes */
     uint32_t position_broadcast_secs;
+    /* Adaptive position braoadcast, which is now the default. */
     bool position_broadcast_smart_enabled;
+    /* If set, this node is at a fixed position.
+ We will generate GPS position updates at the regular interval, but use whatever the last lat/lon/alt we have for the node.
+ The lat/lon/alt can be set by an internal GPS or with the help of the app. */
     bool fixed_position;
+    /* Is GPS enabled for this node? */
     bool gps_enabled;
+    /* How often should we try to get GPS position (in seconds)
+ or zero for the default of once every 30 seconds
+ or a very large value (maxint) to update only once at boot. */
     uint32_t gps_update_interval;
+    /* How long should we try to get our position during each gps_update_interval attempt?  (in seconds)
+ Or if zero, use the default of 30 seconds.
+ If we don't get a new gps fix in that time, the gps will be put into sleep until  the next gps_update_rate
+ window. */
     uint32_t gps_attempt_time;
+    /* Bit field of boolean configuration options for POSITION messages
+ (bitwise OR of PositionFlags) */
     uint32_t position_flags;
+    /* (Re)define GPS_RX_PIN for your board. */
     uint32_t rx_gpio;
+    /* (Re)define GPS_TX_PIN for your board. */
     uint32_t tx_gpio;
 } Config_PositionConfig;
 
-typedef struct _Config_PowerConfig { 
+/* Power Config\
+ See [Power Config](/docs/settings/config/power) for additional power config details. */
+typedef struct _Config_PowerConfig {
+    /* If set, we are powered from a low-current source (i.e. solar), so even if it looks like we have power flowing in
+ we should try to minimize power consumption as much as possible.
+ YOU DO NOT NEED TO SET THIS IF YOU'VE set is_router (it is implied in that case).
+ Advanced Option */
     bool is_power_saving;
+    /* If non-zero, the device will fully power off this many seconds after external power is removed. */
     uint32_t on_battery_shutdown_after_secs;
+    /* Ratio of voltage divider for battery pin eg. 3.20 (R1=100k, R2=220k)
+ Overrides the ADC_MULTIPLIER defined in variant for battery voltage calculation.
+ Should be set to floating point value between 2 and 4
+ Fixes issues on Heltec v2 */
     float adc_multiplier_override;
+    /* Wait Bluetooth Seconds
+ The number of seconds for to wait before turning off BLE in No Bluetooth states
+ 0 for default of 1 minute */
     uint32_t wait_bluetooth_secs;
+    /* Mesh Super Deep Sleep Timeout Seconds
+ While in Light Sleep if this value is exceeded we will lower into super deep sleep 
+ for sds_secs (default 1 year) or a button press
+ 0 for default of two hours, MAXUINT for disabled */
     uint32_t mesh_sds_timeout_secs;
+    /* Super Deep Sleep Seconds
+ While in Light Sleep if mesh_sds_timeout_secs is exceeded we will lower into super deep sleep
+ for this value (default 1 year) or a button press
+ 0 for default of one year */
     uint32_t sds_secs;
+    /* Light Sleep Seconds
+ In light sleep the CPU is suspended, LoRa radio is on, BLE is off an GPS is on
+ ESP32 Only
+ 0 for default of 300 */
     uint32_t ls_secs;
+    /* Minimum Wake Seconds
+ While in light sleep when we receive packets on the LoRa radio we will wake and handle them and stay awake in no BLE mode for this value
+ 0 for default of 10 seconds */
     uint32_t min_wake_secs;
 } Config_PowerConfig;
 
-typedef struct _Config_NetworkConfig { 
+typedef struct _Config_NetworkConfig_IpV4Config {
+    /* Static IP address */
+    uint32_t ip;
+    /* Static gateway address */
+    uint32_t gateway;
+    /* Static subnet mask */
+    uint32_t subnet;
+    /* Static DNS server address */
+    uint32_t dns;
+} Config_NetworkConfig_IpV4Config;
+
+/* Network Config */
+typedef struct _Config_NetworkConfig {
+    /* Enable WiFi (disables Bluetooth) */
     bool wifi_enabled;
+    /* If set, this node will try to join the specified wifi network and
+ acquire an address via DHCP */
     char wifi_ssid[33];
+    /* If set, will be use to authenticate to the named wifi */
     char wifi_psk[64];
+    /* NTP server to use if WiFi is conneced, defaults to `0.pool.ntp.org` */
     char ntp_server[33];
+    /* Enable Ethernet */
     bool eth_enabled;
-    Config_NetworkConfig_EthMode eth_mode;
+    /* acquire an address via DHCP or assign static */
+    Config_NetworkConfig_AddressMode address_mode;
+    /* struct to keep static address */
     bool has_ipv4_config;
     Config_NetworkConfig_IpV4Config ipv4_config;
 } Config_NetworkConfig;
 
-typedef struct _Config { 
+/* Display Config */
+typedef struct _Config_DisplayConfig {
+    /* Number of seconds the screen stays on after pressing the user button or receiving a message
+ 0 for default of one minute MAXUINT for always on */
+    uint32_t screen_on_secs;
+    /* How the GPS coordinates are formatted on the OLED screen. */
+    Config_DisplayConfig_GpsCoordinateFormat gps_format;
+    /* Automatically toggles to the next page on the screen like a carousel, based the specified interval in seconds.
+ Potentially useful for devices without user buttons. */
+    uint32_t auto_screen_carousel_secs;
+    /* If this is set, the displayed compass will always point north. if unset, the old behaviour 
+ (top of display is heading direction) is used. */
+    bool compass_north_top;
+    /* Flip screen vertically, for cases that mount the screen upside down */
+    bool flip_screen;
+    /* Perferred display units */
+    Config_DisplayConfig_DisplayUnits units;
+    /* Override auto-detect in screen */
+    Config_DisplayConfig_OledType oled;
+    /* Display Mode */
+    Config_DisplayConfig_DisplayMode displaymode;
+    /* Print first line in pseudo-bold? FALSE is original style, TRUE is bold */
+    bool heading_bold;
+} Config_DisplayConfig;
+
+/* Lora Config */
+typedef struct _Config_LoRaConfig {
+    /* When enabled, the `modem_preset` fields will be adheared to, else the `bandwidth`/`spread_factor`/`coding_rate`
+ will be taked from their respective manually defined fields */
+    bool use_preset;
+    /* Either modem_config or bandwidth/spreading/coding will be specified - NOT BOTH.
+ As a heuristic: If bandwidth is specified, do not use modem_config.
+ Because protobufs take ZERO space when the value is zero this works out nicely.
+ This value is replaced by bandwidth/spread_factor/coding_rate.
+ If you'd like to experiment with other options add them to MeshRadio.cpp in the device code. */
+    Config_LoRaConfig_ModemPreset modem_preset;
+    /* Bandwidth in MHz
+ Certain bandwidth numbers are 'special' and will be converted to the
+ appropriate floating point value: 31 -> 31.25MHz */
+    uint16_t bandwidth;
+    /* A number from 7 to 12.
+ Indicates number of chirps per symbol as 1<<spread_factor. */
+    uint32_t spread_factor;
+    /* The denominator of the coding rate.
+ ie for 4/5, the value is 5. 4/8 the value is 8. */
+    uint8_t coding_rate;
+    /* This parameter is for advanced users with advanced test equipment, we do not recommend most users use it.
+ A frequency offset that is added to to the calculated band center frequency.
+ Used to correct for crystal calibration errors. */
+    float frequency_offset;
+    /* The region code for the radio (US, CN, EU433, etc...) */
+    Config_LoRaConfig_RegionCode region;
+    /* Maximum number of hops. This can't be greater than 7.
+ Default of 3 */
+    uint32_t hop_limit;
+    /* Disable TX from the LoRa radio. Useful for hot-swapping antennas and other tests.
+ Defaults to false */
+    bool tx_enabled;
+    /* If zero then, use default max legal continuous power (ie. something that won't
+ burn out the radio hardware)
+ In most cases you should use zero here.
+ Units are in dBm. */
+    int8_t tx_power;
+    /* This is controlling the actual hardware frequency the radio is transmitting on.
+ Most users should never need to be exposed to this field/concept.
+ A channel number between 1 and NUM_CHANNELS (whatever the max is in the current region).
+ If ZERO then the rule is "use the old channel name hash based
+ algorithm to derive the channel number")
+ If using the hash algorithm the channel number will be: hash(channel_name) %
+ NUM_CHANNELS (Where num channels depends on the regulatory region). */
+    uint16_t channel_num;
+    /* If true, duty cycle limits will be exceeded and thus you're possibly not following 
+ the local regulations if you're not a HAM.
+ Has no effect if the duty cycle of the used region is 100%. */
+    bool override_duty_cycle;
+    /* For testing it is useful sometimes to force a node to never listen to
+ particular other nodes (simulating radio out of range). All nodenums listed
+ in ignore_incoming will have packets they send droped on receive (by router.cpp) */
+    pb_size_t ignore_incoming_count;
+    uint32_t ignore_incoming[3];
+} Config_LoRaConfig;
+
+typedef struct _Config_BluetoothConfig {
+    /* Enable Bluetooth on the device */
+    bool enabled;
+    /* Determines the pairing strategy for the device */
+    Config_BluetoothConfig_PairingMode mode;
+    /* Specified pin for PairingMode.FixedPin */
+    uint32_t fixed_pin;
+} Config_BluetoothConfig;
+
+typedef struct _Config {
     pb_size_t which_payload_variant;
     union {
         Config_DeviceConfig device;
@@ -186,6 +403,10 @@ typedef struct _Config {
 } Config;
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Helper constants for enums */
 #define _Config_DeviceConfig_Role_MIN Config_DeviceConfig_Role_CLIENT
 #define _Config_DeviceConfig_Role_MAX Config_DeviceConfig_Role_ROUTER_CLIENT
@@ -195,9 +416,9 @@ typedef struct _Config {
 #define _Config_PositionConfig_PositionFlags_MAX Config_PositionConfig_PositionFlags_SPEED
 #define _Config_PositionConfig_PositionFlags_ARRAYSIZE ((Config_PositionConfig_PositionFlags)(Config_PositionConfig_PositionFlags_SPEED+1))
 
-#define _Config_NetworkConfig_EthMode_MIN Config_NetworkConfig_EthMode_DHCP
-#define _Config_NetworkConfig_EthMode_MAX Config_NetworkConfig_EthMode_STATIC
-#define _Config_NetworkConfig_EthMode_ARRAYSIZE ((Config_NetworkConfig_EthMode)(Config_NetworkConfig_EthMode_STATIC+1))
+#define _Config_NetworkConfig_AddressMode_MIN Config_NetworkConfig_AddressMode_DHCP
+#define _Config_NetworkConfig_AddressMode_MAX Config_NetworkConfig_AddressMode_STATIC
+#define _Config_NetworkConfig_AddressMode_ARRAYSIZE ((Config_NetworkConfig_AddressMode)(Config_NetworkConfig_AddressMode_STATIC+1))
 
 #define _Config_DisplayConfig_GpsCoordinateFormat_MIN Config_DisplayConfig_GpsCoordinateFormat_DEC
 #define _Config_DisplayConfig_GpsCoordinateFormat_MAX Config_DisplayConfig_GpsCoordinateFormat_OSGR
@@ -211,6 +432,10 @@ typedef struct _Config {
 #define _Config_DisplayConfig_OledType_MAX Config_DisplayConfig_OledType_OLED_SH1106
 #define _Config_DisplayConfig_OledType_ARRAYSIZE ((Config_DisplayConfig_OledType)(Config_DisplayConfig_OledType_OLED_SH1106+1))
 
+#define _Config_DisplayConfig_DisplayMode_MIN Config_DisplayConfig_DisplayMode_DEFAULT
+#define _Config_DisplayConfig_DisplayMode_MAX Config_DisplayConfig_DisplayMode_COLOR
+#define _Config_DisplayConfig_DisplayMode_ARRAYSIZE ((Config_DisplayConfig_DisplayMode)(Config_DisplayConfig_DisplayMode_COLOR+1))
+
 #define _Config_LoRaConfig_RegionCode_MIN Config_LoRaConfig_RegionCode_UNSET
 #define _Config_LoRaConfig_RegionCode_MAX Config_LoRaConfig_RegionCode_LORA_24
 #define _Config_LoRaConfig_RegionCode_ARRAYSIZE ((Config_LoRaConfig_RegionCode)(Config_LoRaConfig_RegionCode_LORA_24+1))
@@ -224,63 +449,50 @@ typedef struct _Config {
 #define _Config_BluetoothConfig_PairingMode_ARRAYSIZE ((Config_BluetoothConfig_PairingMode)(Config_BluetoothConfig_PairingMode_NO_PIN+1))
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#define Config_DeviceConfig_role_ENUMTYPE Config_DeviceConfig_Role
+
+
+
+#define Config_NetworkConfig_address_mode_ENUMTYPE Config_NetworkConfig_AddressMode
+
+
+#define Config_DisplayConfig_gps_format_ENUMTYPE Config_DisplayConfig_GpsCoordinateFormat
+#define Config_DisplayConfig_units_ENUMTYPE Config_DisplayConfig_DisplayUnits
+#define Config_DisplayConfig_oled_ENUMTYPE Config_DisplayConfig_OledType
+#define Config_DisplayConfig_displaymode_ENUMTYPE Config_DisplayConfig_DisplayMode
+
+#define Config_LoRaConfig_modem_preset_ENUMTYPE Config_LoRaConfig_ModemPreset
+#define Config_LoRaConfig_region_ENUMTYPE Config_LoRaConfig_RegionCode
+
+#define Config_BluetoothConfig_mode_ENUMTYPE Config_BluetoothConfig_PairingMode
+
 
 /* Initializer values for message structs */
 #define Config_init_default                      {0, {Config_DeviceConfig_init_default}}
 #define Config_DeviceConfig_init_default         {_Config_DeviceConfig_Role_MIN, 0, 0, 0, 0}
 #define Config_PositionConfig_init_default       {0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define Config_PowerConfig_init_default          {0, 0, 0, 0, 0, 0, 0, 0}
-#define Config_NetworkConfig_init_default        {0, "", "", "", 0, _Config_NetworkConfig_EthMode_MIN, false, Config_NetworkConfig_IpV4Config_init_default}
+#define Config_NetworkConfig_init_default        {0, "", "", "", 0, _Config_NetworkConfig_AddressMode_MIN, false, Config_NetworkConfig_IpV4Config_init_default}
 #define Config_NetworkConfig_IpV4Config_init_default {0, 0, 0, 0}
-#define Config_DisplayConfig_init_default        {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _Config_DisplayConfig_DisplayUnits_MIN, _Config_DisplayConfig_OledType_MIN}
+#define Config_DisplayConfig_init_default        {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _Config_DisplayConfig_DisplayUnits_MIN, _Config_DisplayConfig_OledType_MIN, _Config_DisplayConfig_DisplayMode_MIN, 0}
 #define Config_LoRaConfig_init_default           {0, _Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, 0, {0, 0, 0}}
 #define Config_BluetoothConfig_init_default      {0, _Config_BluetoothConfig_PairingMode_MIN, 0}
 #define Config_init_zero                         {0, {Config_DeviceConfig_init_zero}}
 #define Config_DeviceConfig_init_zero            {_Config_DeviceConfig_Role_MIN, 0, 0, 0, 0}
 #define Config_PositionConfig_init_zero          {0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define Config_PowerConfig_init_zero             {0, 0, 0, 0, 0, 0, 0, 0}
-#define Config_NetworkConfig_init_zero           {0, "", "", "", 0, _Config_NetworkConfig_EthMode_MIN, false, Config_NetworkConfig_IpV4Config_init_zero}
+#define Config_NetworkConfig_init_zero           {0, "", "", "", 0, _Config_NetworkConfig_AddressMode_MIN, false, Config_NetworkConfig_IpV4Config_init_zero}
 #define Config_NetworkConfig_IpV4Config_init_zero {0, 0, 0, 0}
-#define Config_DisplayConfig_init_zero           {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _Config_DisplayConfig_DisplayUnits_MIN, _Config_DisplayConfig_OledType_MIN}
+#define Config_DisplayConfig_init_zero           {0, _Config_DisplayConfig_GpsCoordinateFormat_MIN, 0, 0, 0, _Config_DisplayConfig_DisplayUnits_MIN, _Config_DisplayConfig_OledType_MIN, _Config_DisplayConfig_DisplayMode_MIN, 0}
 #define Config_LoRaConfig_init_zero              {0, _Config_LoRaConfig_ModemPreset_MIN, 0, 0, 0, 0, _Config_LoRaConfig_RegionCode_MIN, 0, 0, 0, 0, 0, 0, {0, 0, 0}}
 #define Config_BluetoothConfig_init_zero         {0, _Config_BluetoothConfig_PairingMode_MIN, 0}
 
 /* Field tags (for use in manual encoding/decoding) */
-#define Config_BluetoothConfig_enabled_tag       1
-#define Config_BluetoothConfig_mode_tag          2
-#define Config_BluetoothConfig_fixed_pin_tag     3
 #define Config_DeviceConfig_role_tag             1
 #define Config_DeviceConfig_serial_enabled_tag   2
 #define Config_DeviceConfig_debug_log_enabled_tag 3
 #define Config_DeviceConfig_button_gpio_tag      4
 #define Config_DeviceConfig_buzzer_gpio_tag      5
-#define Config_DisplayConfig_screen_on_secs_tag  1
-#define Config_DisplayConfig_gps_format_tag      2
-#define Config_DisplayConfig_auto_screen_carousel_secs_tag 3
-#define Config_DisplayConfig_compass_north_top_tag 4
-#define Config_DisplayConfig_flip_screen_tag     5
-#define Config_DisplayConfig_units_tag           6
-#define Config_DisplayConfig_oled_tag            7
-#define Config_LoRaConfig_use_preset_tag         1
-#define Config_LoRaConfig_modem_preset_tag       2
-#define Config_LoRaConfig_bandwidth_tag          3
-#define Config_LoRaConfig_spread_factor_tag      4
-#define Config_LoRaConfig_coding_rate_tag        5
-#define Config_LoRaConfig_frequency_offset_tag   6
-#define Config_LoRaConfig_region_tag             7
-#define Config_LoRaConfig_hop_limit_tag          8
-#define Config_LoRaConfig_tx_enabled_tag         9
-#define Config_LoRaConfig_tx_power_tag           10
-#define Config_LoRaConfig_channel_num_tag        11
-#define Config_LoRaConfig_override_duty_cycle_tag 12
-#define Config_LoRaConfig_ignore_incoming_tag    103
-#define Config_NetworkConfig_IpV4Config_ip_tag   1
-#define Config_NetworkConfig_IpV4Config_gateway_tag 2
-#define Config_NetworkConfig_IpV4Config_subnet_tag 3
-#define Config_NetworkConfig_IpV4Config_dns_tag  4
 #define Config_PositionConfig_position_broadcast_secs_tag 1
 #define Config_PositionConfig_position_broadcast_smart_enabled_tag 2
 #define Config_PositionConfig_fixed_position_tag 3
@@ -298,13 +510,42 @@ extern "C" {
 #define Config_PowerConfig_sds_secs_tag          6
 #define Config_PowerConfig_ls_secs_tag           7
 #define Config_PowerConfig_min_wake_secs_tag     8
+#define Config_NetworkConfig_IpV4Config_ip_tag   1
+#define Config_NetworkConfig_IpV4Config_gateway_tag 2
+#define Config_NetworkConfig_IpV4Config_subnet_tag 3
+#define Config_NetworkConfig_IpV4Config_dns_tag  4
 #define Config_NetworkConfig_wifi_enabled_tag    1
 #define Config_NetworkConfig_wifi_ssid_tag       3
 #define Config_NetworkConfig_wifi_psk_tag        4
 #define Config_NetworkConfig_ntp_server_tag      5
 #define Config_NetworkConfig_eth_enabled_tag     6
-#define Config_NetworkConfig_eth_mode_tag        7
+#define Config_NetworkConfig_address_mode_tag    7
 #define Config_NetworkConfig_ipv4_config_tag     8
+#define Config_DisplayConfig_screen_on_secs_tag  1
+#define Config_DisplayConfig_gps_format_tag      2
+#define Config_DisplayConfig_auto_screen_carousel_secs_tag 3
+#define Config_DisplayConfig_compass_north_top_tag 4
+#define Config_DisplayConfig_flip_screen_tag     5
+#define Config_DisplayConfig_units_tag           6
+#define Config_DisplayConfig_oled_tag            7
+#define Config_DisplayConfig_displaymode_tag     8
+#define Config_DisplayConfig_heading_bold_tag    9
+#define Config_LoRaConfig_use_preset_tag         1
+#define Config_LoRaConfig_modem_preset_tag       2
+#define Config_LoRaConfig_bandwidth_tag          3
+#define Config_LoRaConfig_spread_factor_tag      4
+#define Config_LoRaConfig_coding_rate_tag        5
+#define Config_LoRaConfig_frequency_offset_tag   6
+#define Config_LoRaConfig_region_tag             7
+#define Config_LoRaConfig_hop_limit_tag          8
+#define Config_LoRaConfig_tx_enabled_tag         9
+#define Config_LoRaConfig_tx_power_tag           10
+#define Config_LoRaConfig_channel_num_tag        11
+#define Config_LoRaConfig_override_duty_cycle_tag 12
+#define Config_LoRaConfig_ignore_incoming_tag    103
+#define Config_BluetoothConfig_enabled_tag       1
+#define Config_BluetoothConfig_mode_tag          2
+#define Config_BluetoothConfig_fixed_pin_tag     3
 #define Config_device_tag                        1
 #define Config_position_tag                      2
 #define Config_power_tag                         3
@@ -372,7 +613,7 @@ X(a, STATIC,   SINGULAR, STRING,   wifi_ssid,         3) \
 X(a, STATIC,   SINGULAR, STRING,   wifi_psk,          4) \
 X(a, STATIC,   SINGULAR, STRING,   ntp_server,        5) \
 X(a, STATIC,   SINGULAR, BOOL,     eth_enabled,       6) \
-X(a, STATIC,   SINGULAR, UENUM,    eth_mode,          7) \
+X(a, STATIC,   SINGULAR, UENUM,    address_mode,      7) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  ipv4_config,       8)
 #define Config_NetworkConfig_CALLBACK NULL
 #define Config_NetworkConfig_DEFAULT NULL
@@ -393,7 +634,9 @@ X(a, STATIC,   SINGULAR, UINT32,   auto_screen_carousel_secs,   3) \
 X(a, STATIC,   SINGULAR, BOOL,     compass_north_top,   4) \
 X(a, STATIC,   SINGULAR, BOOL,     flip_screen,       5) \
 X(a, STATIC,   SINGULAR, UENUM,    units,             6) \
-X(a, STATIC,   SINGULAR, UENUM,    oled,              7)
+X(a, STATIC,   SINGULAR, UENUM,    oled,              7) \
+X(a, STATIC,   SINGULAR, UENUM,    displaymode,       8) \
+X(a, STATIC,   SINGULAR, BOOL,     heading_bold,      9)
 #define Config_DisplayConfig_CALLBACK NULL
 #define Config_DisplayConfig_DEFAULT NULL
 
@@ -445,7 +688,7 @@ extern const pb_msgdesc_t Config_BluetoothConfig_msg;
 /* Maximum encoded size of messages (where known) */
 #define Config_BluetoothConfig_size              10
 #define Config_DeviceConfig_size                 18
-#define Config_DisplayConfig_size                22
+#define Config_DisplayConfig_size                26
 #define Config_LoRaConfig_size                   70
 #define Config_NetworkConfig_IpV4Config_size     20
 #define Config_NetworkConfig_size                161

src/mesh/generated/device_metadata.pb.c

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #include "device_metadata.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40

src/mesh/generated/device_metadata.pb.h

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #ifndef PB_DEVICE_METADATA_PB_H_INCLUDED
 #define PB_DEVICE_METADATA_PB_H_INCLUDED
@@ -11,7 +11,7 @@
 
 /* Struct definitions */
 /* Device metadata response */
-typedef struct _DeviceMetadata { 
+typedef struct _DeviceMetadata {
     /* Device firmware version string */
     char firmware_version[18];
     /* Device state version */

src/mesh/generated/deviceonly.pb.c

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #include "deviceonly.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40

src/mesh/generated/deviceonly.pb.h

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #ifndef PB_DEVICEONLY_PB_H_INCLUDED
 #define PB_DEVICEONLY_PB_H_INCLUDED
@@ -13,33 +13,22 @@
 
 /* Enum definitions */
 /* TODO: REPLACE */
-typedef enum _ScreenFonts { 
+typedef enum _ScreenFonts {
     /* TODO: REPLACE */
-    ScreenFonts_FONT_SMALL = 0, 
+    ScreenFonts_FONT_SMALL = 0,
     /* TODO: REPLACE */
-    ScreenFonts_FONT_MEDIUM = 1, 
+    ScreenFonts_FONT_MEDIUM = 1,
     /* TODO: REPLACE */
-    ScreenFonts_FONT_LARGE = 2 
+    ScreenFonts_FONT_LARGE = 2
 } ScreenFonts;
 
 /* Struct definitions */
-/* The on-disk saved channels */
-typedef struct _ChannelFile { 
-    /* The channels our node knows about */
-    pb_size_t channels_count;
-    Channel channels[8];
-    /* A version integer used to invalidate old save files when we make
- incompatible changes This integer is set at build time and is private to
- NodeDB.cpp in the device code. */
-    uint32_t version;
-} ChannelFile;
-
 /* This message is never sent over the wire, but it is used for serializing DB
  state to flash in the device code
  FIXME, since we write this each time we enter deep sleep (and have infinite
  flash) it would be better to use some sort of append only data structure for
  the receive queue and use the preferences store for the other stuff */
-typedef struct _DeviceState { 
+typedef struct _DeviceState {
     /* Read only settings/info about this node */
     bool has_my_node;
     MyNodeInfo my_node;
@@ -68,11 +57,22 @@ typedef struct _DeviceState {
     bool did_gps_reset;
 } DeviceState;
 
+/* The on-disk saved channels */
+typedef struct _ChannelFile {
+    /* The channels our node knows about */
+    pb_size_t channels_count;
+    Channel channels[8];
+    /* A version integer used to invalidate old save files when we make
+ incompatible changes This integer is set at build time and is private to
+ NodeDB.cpp in the device code. */
+    uint32_t version;
+} ChannelFile;
+
 typedef PB_BYTES_ARRAY_T(2048) OEMStore_oem_icon_bits_t;
 typedef PB_BYTES_ARRAY_T(32) OEMStore_oem_aes_key_t;
 /* This can be used for customizing the firmware distribution. If populated,
  show a secondary bootup screen with cuatom logo and text for 2.5 seconds. */
-typedef struct _OEMStore { 
+typedef struct _OEMStore {
     /* The Logo width in Px */
     uint32_t oem_icon_width;
     /* The Logo height in Px */
@@ -88,15 +88,19 @@ typedef struct _OEMStore {
 } OEMStore;
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Helper constants for enums */
 #define _ScreenFonts_MIN ScreenFonts_FONT_SMALL
 #define _ScreenFonts_MAX ScreenFonts_FONT_LARGE
 #define _ScreenFonts_ARRAYSIZE ((ScreenFonts)(ScreenFonts_FONT_LARGE+1))
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+
+#define OEMStore_oem_font_ENUMTYPE ScreenFonts
+
 
 /* Initializer values for message structs */
 #define DeviceState_init_default                 {false, MyNodeInfo_init_default, false, User_init_default, 0, {NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default, NodeInfo_init_default}, 0, {MeshPacket_init_default}, false, MeshPacket_init_default, 0, 0, 0}
@@ -107,8 +111,6 @@ extern "C" {
 #define OEMStore_init_zero                       {0, 0, {0, {0}}, _ScreenFonts_MIN, "", {0, {0}}}
 
 /* Field tags (for use in manual encoding/decoding) */
-#define ChannelFile_channels_tag                 1
-#define ChannelFile_version_tag                  2
 #define DeviceState_my_node_tag                  2
 #define DeviceState_owner_tag                    3
 #define DeviceState_node_db_tag                  4
@@ -117,6 +119,8 @@ extern "C" {
 #define DeviceState_version_tag                  8
 #define DeviceState_no_save_tag                  9
 #define DeviceState_did_gps_reset_tag            11
+#define ChannelFile_channels_tag                 1
+#define ChannelFile_version_tag                  2
 #define OEMStore_oem_icon_width_tag              1
 #define OEMStore_oem_icon_height_tag             2
 #define OEMStore_oem_icon_bits_tag               3

src/mesh/generated/localonly.pb.c

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #include "localonly.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40

src/mesh/generated/localonly.pb.h

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #ifndef PB_LOCALONLY_PB_H_INCLUDED
 #define PB_LOCALONLY_PB_H_INCLUDED
@@ -12,7 +12,7 @@
 #endif
 
 /* Struct definitions */
-typedef struct _LocalConfig { 
+typedef struct _LocalConfig {
     /* The part of the config that is specific to the Device */
     bool has_device;
     Config_DeviceConfig device;
@@ -40,7 +40,7 @@ typedef struct _LocalConfig {
     uint32_t version;
 } LocalConfig;
 
-typedef struct _LocalModuleConfig { 
+typedef struct _LocalModuleConfig {
     /* The part of the config that is specific to the MQTT module */
     bool has_mqtt;
     ModuleConfig_MQTTConfig mqtt;
@@ -69,6 +69,9 @@ typedef struct _LocalModuleConfig {
     /* The part of the config that is specific to the Audio module */
     bool has_audio;
     ModuleConfig_AudioConfig audio;
+    /* The part of the config that is specific to the Remote Hardware module */
+    bool has_remote_hardware;
+    ModuleConfig_RemoteHardwareConfig remote_hardware;
 } LocalModuleConfig;
 
 
@@ -78,9 +81,9 @@ extern "C" {
 
 /* Initializer values for message structs */
 #define LocalConfig_init_default                 {false, Config_DeviceConfig_init_default, false, Config_PositionConfig_init_default, false, Config_PowerConfig_init_default, false, Config_NetworkConfig_init_default, false, Config_DisplayConfig_init_default, false, Config_LoRaConfig_init_default, false, Config_BluetoothConfig_init_default, 0}
-#define LocalModuleConfig_init_default           {false, ModuleConfig_MQTTConfig_init_default, false, ModuleConfig_SerialConfig_init_default, false, ModuleConfig_ExternalNotificationConfig_init_default, false, ModuleConfig_StoreForwardConfig_init_default, false, ModuleConfig_RangeTestConfig_init_default, false, ModuleConfig_TelemetryConfig_init_default, false, ModuleConfig_CannedMessageConfig_init_default, 0, false, ModuleConfig_AudioConfig_init_default}
+#define LocalModuleConfig_init_default           {false, ModuleConfig_MQTTConfig_init_default, false, ModuleConfig_SerialConfig_init_default, false, ModuleConfig_ExternalNotificationConfig_init_default, false, ModuleConfig_StoreForwardConfig_init_default, false, ModuleConfig_RangeTestConfig_init_default, false, ModuleConfig_TelemetryConfig_init_default, false, ModuleConfig_CannedMessageConfig_init_default, 0, false, ModuleConfig_AudioConfig_init_default, false, ModuleConfig_RemoteHardwareConfig_init_default}
 #define LocalConfig_init_zero                    {false, Config_DeviceConfig_init_zero, false, Config_PositionConfig_init_zero, false, Config_PowerConfig_init_zero, false, Config_NetworkConfig_init_zero, false, Config_DisplayConfig_init_zero, false, Config_LoRaConfig_init_zero, false, Config_BluetoothConfig_init_zero, 0}
-#define LocalModuleConfig_init_zero              {false, ModuleConfig_MQTTConfig_init_zero, false, ModuleConfig_SerialConfig_init_zero, false, ModuleConfig_ExternalNotificationConfig_init_zero, false, ModuleConfig_StoreForwardConfig_init_zero, false, ModuleConfig_RangeTestConfig_init_zero, false, ModuleConfig_TelemetryConfig_init_zero, false, ModuleConfig_CannedMessageConfig_init_zero, 0, false, ModuleConfig_AudioConfig_init_zero}
+#define LocalModuleConfig_init_zero              {false, ModuleConfig_MQTTConfig_init_zero, false, ModuleConfig_SerialConfig_init_zero, false, ModuleConfig_ExternalNotificationConfig_init_zero, false, ModuleConfig_StoreForwardConfig_init_zero, false, ModuleConfig_RangeTestConfig_init_zero, false, ModuleConfig_TelemetryConfig_init_zero, false, ModuleConfig_CannedMessageConfig_init_zero, 0, false, ModuleConfig_AudioConfig_init_zero, false, ModuleConfig_RemoteHardwareConfig_init_zero}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define LocalConfig_device_tag                   1
@@ -100,6 +103,7 @@ extern "C" {
 #define LocalModuleConfig_canned_message_tag     7
 #define LocalModuleConfig_version_tag            8
 #define LocalModuleConfig_audio_tag              9
+#define LocalModuleConfig_remote_hardware_tag    10
 
 /* Struct field encoding specification for nanopb */
 #define LocalConfig_FIELDLIST(X, a) \
@@ -130,7 +134,8 @@ X(a, STATIC,   OPTIONAL, MESSAGE,  range_test,        5) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  telemetry,         6) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  canned_message,    7) \
 X(a, STATIC,   SINGULAR, UINT32,   version,           8) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  audio,             9)
+X(a, STATIC,   OPTIONAL, MESSAGE,  audio,             9) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  remote_hardware,  10)
 #define LocalModuleConfig_CALLBACK NULL
 #define LocalModuleConfig_DEFAULT NULL
 #define LocalModuleConfig_mqtt_MSGTYPE ModuleConfig_MQTTConfig
@@ -141,6 +146,7 @@ X(a, STATIC,   OPTIONAL, MESSAGE,  audio,             9)
 #define LocalModuleConfig_telemetry_MSGTYPE ModuleConfig_TelemetryConfig
 #define LocalModuleConfig_canned_message_MSGTYPE ModuleConfig_CannedMessageConfig
 #define LocalModuleConfig_audio_MSGTYPE ModuleConfig_AudioConfig
+#define LocalModuleConfig_remote_hardware_MSGTYPE ModuleConfig_RemoteHardwareConfig
 
 extern const pb_msgdesc_t LocalConfig_msg;
 extern const pb_msgdesc_t LocalModuleConfig_msg;
@@ -150,8 +156,8 @@ extern const pb_msgdesc_t LocalModuleConfig_msg;
 #define LocalModuleConfig_fields &LocalModuleConfig_msg
 
 /* Maximum encoded size of messages (where known) */
-#define LocalConfig_size                         387
-#define LocalModuleConfig_size                   358
+#define LocalConfig_size                         391
+#define LocalModuleConfig_size                   380
 
 #ifdef __cplusplus
 } /* extern "C" */

src/mesh/generated/mesh.pb.c

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #include "mesh.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40

src/mesh/generated/mesh.pb.h

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #ifndef PB_MESH_PB_H_INCLUDED
 #define PB_MESH_PB_H_INCLUDED
@@ -19,350 +19,247 @@
  bin/build-all.sh script.
  Because they will be used to find firmware filenames in the android app for OTA updates.
  To match the old style filenames, _ is converted to -, p is converted to . */
-typedef enum _HardwareModel { 
+typedef enum _HardwareModel {
     /* TODO: REPLACE */
-    HardwareModel_UNSET = 0, 
+    HardwareModel_UNSET = 0,
     /* TODO: REPLACE */
-    HardwareModel_TLORA_V2 = 1, 
+    HardwareModel_TLORA_V2 = 1,
     /* TODO: REPLACE */
-    HardwareModel_TLORA_V1 = 2, 
+    HardwareModel_TLORA_V1 = 2,
     /* TODO: REPLACE */
-    HardwareModel_TLORA_V2_1_1P6 = 3, 
+    HardwareModel_TLORA_V2_1_1P6 = 3,
     /* TODO: REPLACE */
-    HardwareModel_TBEAM = 4, 
+    HardwareModel_TBEAM = 4,
     /* The original heltec WiFi_Lora_32_V2, which had battery voltage sensing hooked to GPIO 13
  (see HELTEC_V2 for the new version). */
-    HardwareModel_HELTEC_V2_0 = 5, 
+    HardwareModel_HELTEC_V2_0 = 5,
     /* TODO: REPLACE */
-    HardwareModel_TBEAM_V0P7 = 6, 
+    HardwareModel_TBEAM_V0P7 = 6,
     /* TODO: REPLACE */
-    HardwareModel_T_ECHO = 7, 
+    HardwareModel_T_ECHO = 7,
     /* TODO: REPLACE */
-    HardwareModel_TLORA_V1_1P3 = 8, 
+    HardwareModel_TLORA_V1_1P3 = 8,
     /* TODO: REPLACE */
-    HardwareModel_RAK4631 = 9, 
+    HardwareModel_RAK4631 = 9,
     /* The new version of the heltec WiFi_Lora_32_V2 board that has battery sensing hooked to GPIO 37.
  Sadly they did not update anything on the silkscreen to identify this board */
-    HardwareModel_HELTEC_V2_1 = 10, 
+    HardwareModel_HELTEC_V2_1 = 10,
     /* Ancient heltec WiFi_Lora_32 board */
-    HardwareModel_HELTEC_V1 = 11, 
+    HardwareModel_HELTEC_V1 = 11,
     /* New T-BEAM with ESP32-S3 CPU */
-    HardwareModel_LILYGO_TBEAM_S3_CORE = 12, 
+    HardwareModel_LILYGO_TBEAM_S3_CORE = 12,
     /* RAK WisBlock ESP32 core: https://docs.rakwireless.com/Product-Categories/WisBlock/RAK11200/Overview/ */
-    HardwareModel_RAK11200 = 13, 
+    HardwareModel_RAK11200 = 13,
     /* B&Q Consulting Nano Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:nano */
-    HardwareModel_NANO_G1 = 14, 
+    HardwareModel_NANO_G1 = 14,
     /* TODO: REPLACE */
-    HardwareModel_TLORA_V2_1_1P8 = 15, 
+    HardwareModel_TLORA_V2_1_1P8 = 15,
+    /* TODO: REPLACE */
+    HardwareModel_TLORA_T3_S3 = 16,
     /* B&Q Consulting Station Edition G1: https://uniteng.com/wiki/doku.php?id=meshtastic:station */
-    HardwareModel_STATION_G1 = 25, 
+    HardwareModel_STATION_G1 = 25,
     /* Less common/prototype boards listed here (needs one more byte over the air) */
-    HardwareModel_LORA_RELAY_V1 = 32, 
+    HardwareModel_LORA_RELAY_V1 = 32,
     /* TODO: REPLACE */
-    HardwareModel_NRF52840DK = 33, 
+    HardwareModel_NRF52840DK = 33,
     /* TODO: REPLACE */
-    HardwareModel_PPR = 34, 
+    HardwareModel_PPR = 34,
     /* TODO: REPLACE */
-    HardwareModel_GENIEBLOCKS = 35, 
+    HardwareModel_GENIEBLOCKS = 35,
     /* TODO: REPLACE */
-    HardwareModel_NRF52_UNKNOWN = 36, 
+    HardwareModel_NRF52_UNKNOWN = 36,
     /* TODO: REPLACE */
-    HardwareModel_PORTDUINO = 37, 
+    HardwareModel_PORTDUINO = 37,
     /* The simulator built into the android app */
-    HardwareModel_ANDROID_SIM = 38, 
+    HardwareModel_ANDROID_SIM = 38,
     /* Custom DIY device based on @NanoVHF schematics: https://github.com/NanoVHF/Meshtastic-DIY/tree/main/Schematics */
-    HardwareModel_DIY_V1 = 39, 
+    HardwareModel_DIY_V1 = 39,
     /* nRF52840 Dongle : https://www.nordicsemi.com/Products/Development-hardware/nrf52840-dongle/ */
-    HardwareModel_NRF52840_PCA10059 = 40, 
+    HardwareModel_NRF52840_PCA10059 = 40,
     /* Custom Disaster Radio esp32 v3 device https://github.com/sudomesh/disaster-radio/tree/master/hardware/board_esp32_v3 */
-    HardwareModel_DR_DEV = 41, 
+    HardwareModel_DR_DEV = 41,
     /* M5 esp32 based MCU modules with enclosure, TFT and LORA Shields. All Variants (Basic, Core, Fire, Core2, Paper) https://m5stack.com/ */
-    HardwareModel_M5STACK = 42, 
+    HardwareModel_M5STACK = 42,
     /* New Heltec LoRA32 with ESP32-S3 CPU */
-    HardwareModel_HELTEC_V3 = 43, 
+    HardwareModel_HELTEC_V3 = 43,
     /* New Heltec Wireless Stick Lite with ESP32-S3 CPU */
-    HardwareModel_HELTEC_WSL_V3 = 44, 
+    HardwareModel_HELTEC_WSL_V3 = 44,
     /* Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits. */
-    HardwareModel_PRIVATE_HW = 255 
+    HardwareModel_PRIVATE_HW = 255
 } HardwareModel;
 
 /* Shared constants between device and phone */
-typedef enum _Constants { 
+typedef enum _Constants {
     /* First enum must be zero, and we are just using this enum to
  pass int constants between two very different environments */
-    Constants_ZERO = 0, 
+    Constants_ZERO = 0,
     /* From mesh.options
  note: this payload length is ONLY the bytes that are sent inside of the Data protobuf (excluding protobuf overhead). The 16 byte header is
  outside of this envelope */
-    Constants_DATA_PAYLOAD_LEN = 237 
+    Constants_DATA_PAYLOAD_LEN = 237
 } Constants;
 
 /* Error codes for critical errors
  The device might report these fault codes on the screen.
  If you encounter a fault code, please post on the meshtastic.discourse.group
  and we'll try to help. */
-typedef enum _CriticalErrorCode { 
+typedef enum _CriticalErrorCode {
     /* TODO: REPLACE */
-    CriticalErrorCode_NONE = 0, 
+    CriticalErrorCode_NONE = 0,
     /* A software bug was detected while trying to send lora */
-    CriticalErrorCode_TX_WATCHDOG = 1, 
+    CriticalErrorCode_TX_WATCHDOG = 1,
     /* A software bug was detected on entry to sleep */
-    CriticalErrorCode_SLEEP_ENTER_WAIT = 2, 
+    CriticalErrorCode_SLEEP_ENTER_WAIT = 2,
     /* No Lora radio hardware could be found */
-    CriticalErrorCode_NO_RADIO = 3, 
+    CriticalErrorCode_NO_RADIO = 3,
     /* Not normally used */
-    CriticalErrorCode_UNSPECIFIED = 4, 
+    CriticalErrorCode_UNSPECIFIED = 4,
     /* We failed while configuring a UBlox GPS */
-    CriticalErrorCode_UBLOX_UNIT_FAILED = 5, 
+    CriticalErrorCode_UBLOX_UNIT_FAILED = 5,
     /* This board was expected to have a power management chip and it is missing or broken */
-    CriticalErrorCode_NO_AXP192 = 6, 
+    CriticalErrorCode_NO_AXP192 = 6,
     /* The channel tried to set a radio setting which is not supported by this chipset,
  radio comms settings are now undefined. */
-    CriticalErrorCode_INVALID_RADIO_SETTING = 7, 
+    CriticalErrorCode_INVALID_RADIO_SETTING = 7,
     /* Radio transmit hardware failure. We sent data to the radio chip, but it didn't
  reply with an interrupt. */
-    CriticalErrorCode_TRANSMIT_FAILED = 8, 
+    CriticalErrorCode_TRANSMIT_FAILED = 8,
     /* We detected that the main CPU voltage dropped below the minumum acceptable value */
-    CriticalErrorCode_BROWNOUT = 9, 
+    CriticalErrorCode_BROWNOUT = 9,
     /* Selftest of SX1262 radio chip failed */
-    CriticalErrorCode_SX1262_FAILURE = 10, 
+    CriticalErrorCode_SX1262_FAILURE = 10,
     /* A (likely software but possibly hardware) failure was detected while trying to send packets.
  If this occurs on your board, please post in the forum so that we can ask you to collect some information to allow fixing this bug */
-    CriticalErrorCode_RADIO_SPI_BUG = 11 
+    CriticalErrorCode_RADIO_SPI_BUG = 11
 } CriticalErrorCode;
 
-/* Note: these enum names must EXACTLY match the string used in the device
- bin/build-all.sh script.
- Because they will be used to find firmware filenames in the android app for OTA updates.
- To match the old style filenames, _ is converted to -, p is converted to . */
-typedef enum _Position_LocSource { 
+/* How the location was acquired: manual, onboard GPS, external (EUD) GPS */
+typedef enum _Position_LocSource {
     /* TODO: REPLACE */
-    Position_LocSource_LOC_UNSET = 0, 
+    Position_LocSource_LOC_UNSET = 0,
     /* TODO: REPLACE */
-    Position_LocSource_LOC_MANUAL = 1, 
+    Position_LocSource_LOC_MANUAL = 1,
     /* TODO: REPLACE */
-    Position_LocSource_LOC_INTERNAL = 2, 
+    Position_LocSource_LOC_INTERNAL = 2,
     /* TODO: REPLACE */
-    Position_LocSource_LOC_EXTERNAL = 3 
+    Position_LocSource_LOC_EXTERNAL = 3
 } Position_LocSource;
 
-/* Shared constants between device and phone */
-typedef enum _Position_AltSource { 
-    /* First enum must be zero, and we are just using this enum to
- pass int constants between two very different environments */
-    Position_AltSource_ALT_UNSET = 0, 
-    /* From mesh.options
- note: this payload length is ONLY the bytes that are sent inside of the Data protobuf (excluding protobuf overhead). The 16 byte header is
- outside of this envelope */
-    Position_AltSource_ALT_MANUAL = 1, 
-    Position_AltSource_ALT_INTERNAL = 2, 
-    Position_AltSource_ALT_EXTERNAL = 3, 
-    Position_AltSource_ALT_BAROMETRIC = 4 
+/* How the altitude was acquired: manual, GPS int/ext, etc
+ Default: same as location_source if present */
+typedef enum _Position_AltSource {
+    /* TODO: REPLACE */
+    Position_AltSource_ALT_UNSET = 0,
+    /* TODO: REPLACE */
+    Position_AltSource_ALT_MANUAL = 1,
+    /* TODO: REPLACE */
+    Position_AltSource_ALT_INTERNAL = 2,
+    /* TODO: REPLACE */
+    Position_AltSource_ALT_EXTERNAL = 3,
+    /* TODO: REPLACE */
+    Position_AltSource_ALT_BAROMETRIC = 4
 } Position_AltSource;
 
-/* Note: these enum names must EXACTLY match the string used in the device
- bin/build-all.sh script.
- Because they will be used to find firmware filenames in the android app for OTA updates.
- To match the old style filenames, _ is converted to -, p is converted to . */
-typedef enum _Routing_Error { 
+/* A failure in delivering a message (usually used for routing control messages, but might be provided in addition to ack.fail_id to provide
+ details on the type of failure). */
+typedef enum _Routing_Error {
+    /* This message is not a failure */
+    Routing_Error_NONE = 0,
+    /* Our node doesn't have a route to the requested destination anymore. */
+    Routing_Error_NO_ROUTE = 1,
+    /* We received a nak while trying to forward on your behalf */
+    Routing_Error_GOT_NAK = 2,
     /* TODO: REPLACE */
-    Routing_Error_NONE = 0, 
-    /* TODO: REPLACE */
-    Routing_Error_NO_ROUTE = 1, 
-    /* TODO: REPLACE */
-    Routing_Error_GOT_NAK = 2, 
-    /* TODO: REPLACE */
-    Routing_Error_TIMEOUT = 3, 
-    /* TODO: REPLACE */
-    Routing_Error_NO_INTERFACE = 4, 
-    /* The original heltec WiFi_Lora_32_V2, which had battery voltage sensing hooked to GPIO 13
- (see HELTEC_V2 for the new version). */
-    Routing_Error_MAX_RETRANSMIT = 5, 
-    /* TODO: REPLACE */
-    Routing_Error_NO_CHANNEL = 6, 
-    /* TODO: REPLACE */
-    Routing_Error_TOO_LARGE = 7, 
-    /* TODO: REPLACE */
-    Routing_Error_NO_RESPONSE = 8, 
-    /* TODO: REPLACE */
-    Routing_Error_DUTY_CYCLE_LIMIT = 9, 
-    /* The new version of the heltec WiFi_Lora_32_V2 board that has battery sensing hooked to GPIO 37.
- Sadly they did not update anything on the silkscreen to identify this board */
-    Routing_Error_BAD_REQUEST = 32, 
-    /* Ancient heltec WiFi_Lora_32 board */
-    Routing_Error_NOT_AUTHORIZED = 33 
+    Routing_Error_TIMEOUT = 3,
+    /* No suitable interface could be found for delivering this packet */
+    Routing_Error_NO_INTERFACE = 4,
+    /* We reached the max retransmission count (typically for naive flood routing) */
+    Routing_Error_MAX_RETRANSMIT = 5,
+    /* No suitable channel was found for sending this packet (i.e. was requested channel index disabled?) */
+    Routing_Error_NO_CHANNEL = 6,
+    /* The packet was too big for sending (exceeds interface MTU after encoding) */
+    Routing_Error_TOO_LARGE = 7,
+    /* The request had want_response set, the request reached the destination node, but no service on that node wants to send a response
+ (possibly due to bad channel permissions) */
+    Routing_Error_NO_RESPONSE = 8,
+    /* Cannot send currently because duty cycle regulations will be violated. */
+    Routing_Error_DUTY_CYCLE_LIMIT = 9,
+    /* The application layer service on the remote node received your request, but considered your request somehow invalid */
+    Routing_Error_BAD_REQUEST = 32,
+    /* The application layer service on the remote node received your request, but considered your request not authorized
+ (i.e you did not send the request on the required bound channel) */
+    Routing_Error_NOT_AUTHORIZED = 33
 } Routing_Error;
 
-/* Note: these enum names must EXACTLY match the string used in the device
- bin/build-all.sh script.
- Because they will be used to find firmware filenames in the android app for OTA updates.
- To match the old style filenames, _ is converted to -, p is converted to . */
-typedef enum _MeshPacket_Priority { 
+/* The priority of this message for sending.
+ Higher priorities are sent first (when managing the transmit queue).
+ This field is never sent over the air, it is only used internally inside of a local device node.
+ API clients (either on the local node or connected directly to the node)
+ can set this parameter if necessary.
+ (values must be <= 127 to keep protobuf field to one byte in size.
+ Detailed background on this field:
+ I noticed a funny side effect of lora being so slow: Usually when making
+ a protocol there isn’t much need to use message priority to change the order
+ of transmission (because interfaces are fairly fast).
+ But for lora where packets can take a few seconds each, it is very important
+ to make sure that critical packets are sent ASAP.
+ In the case of meshtastic that means we want to send protocol acks as soon as possible
+ (to prevent unneeded retransmissions), we want routing messages to be sent next,
+ then messages marked as reliable and finally ‘background’ packets like periodic position updates.
+ So I bit the bullet and implemented a new (internal - not sent over the air)
+ field in MeshPacket called ‘priority’.
+ And the transmission queue in the router object is now a priority queue. */
+typedef enum _MeshPacket_Priority {
+    /* Treated as Priority.DEFAULT */
+    MeshPacket_Priority_UNSET = 0,
     /* TODO: REPLACE */
-    MeshPacket_Priority_UNSET = 0, 
+    MeshPacket_Priority_MIN = 1,
+    /* Background position updates are sent with very low priority -
+ if the link is super congested they might not go out at all */
+    MeshPacket_Priority_BACKGROUND = 10,
+    /* This priority is used for most messages that don't have a priority set */
+    MeshPacket_Priority_DEFAULT = 64,
+    /* If priority is unset but the message is marked as want_ack,
+ assume it is important and use a slightly higher priority */
+    MeshPacket_Priority_RELIABLE = 70,
+    /* Ack/naks are sent with very high priority to ensure that retransmission
+ stops as soon as possible */
+    MeshPacket_Priority_ACK = 120,
     /* TODO: REPLACE */
-    MeshPacket_Priority_MIN = 1, 
-    /* TODO: REPLACE */
-    MeshPacket_Priority_BACKGROUND = 10, 
-    /* TODO: REPLACE */
-    MeshPacket_Priority_DEFAULT = 64, 
-    /* TODO: REPLACE */
-    MeshPacket_Priority_RELIABLE = 70, 
-    /* The original heltec WiFi_Lora_32_V2, which had battery voltage sensing hooked to GPIO 13
- (see HELTEC_V2 for the new version). */
-    MeshPacket_Priority_ACK = 120, 
-    /* TODO: REPLACE */
-    MeshPacket_Priority_MAX = 127 
+    MeshPacket_Priority_MAX = 127
 } MeshPacket_Priority;
 
-/* Shared constants between device and phone */
-typedef enum _MeshPacket_Delayed { 
-    /* First enum must be zero, and we are just using this enum to
- pass int constants between two very different environments */
-    MeshPacket_Delayed_NO_DELAY = 0, 
-    /* From mesh.options
- note: this payload length is ONLY the bytes that are sent inside of the Data protobuf (excluding protobuf overhead). The 16 byte header is
- outside of this envelope */
-    MeshPacket_Delayed_DELAYED_BROADCAST = 1, 
-    MeshPacket_Delayed_DELAYED_DIRECT = 2 
+/* Identify if this is a delayed packet */
+typedef enum _MeshPacket_Delayed {
+    /* If unset, the message is being sent in real time. */
+    MeshPacket_Delayed_NO_DELAY = 0,
+    /* The message is delayed and was originally a broadcast */
+    MeshPacket_Delayed_DELAYED_BROADCAST = 1,
+    /* The message is delayed and was originally a direct message */
+    MeshPacket_Delayed_DELAYED_DIRECT = 2
 } MeshPacket_Delayed;
 
-/* Note: these enum names must EXACTLY match the string used in the device
- bin/build-all.sh script.
- Because they will be used to find firmware filenames in the android app for OTA updates.
- To match the old style filenames, _ is converted to -, p is converted to . */
-typedef enum _LogRecord_Level { 
-    /* TODO: REPLACE */
-    LogRecord_Level_UNSET = 0, 
-    /* TODO: REPLACE */
-    LogRecord_Level_CRITICAL = 50, 
-    /* TODO: REPLACE */
-    LogRecord_Level_ERROR = 40, 
-    /* TODO: REPLACE */
-    LogRecord_Level_WARNING = 30, 
-    /* TODO: REPLACE */
-    LogRecord_Level_INFO = 20, 
-    /* The original heltec WiFi_Lora_32_V2, which had battery voltage sensing hooked to GPIO 13
- (see HELTEC_V2 for the new version). */
-    LogRecord_Level_DEBUG = 10, 
-    /* TODO: REPLACE */
-    LogRecord_Level_TRACE = 5 
+/* Log levels, chosen to match python logging conventions. */
+typedef enum _LogRecord_Level {
+    /* Log levels, chosen to match python logging conventions. */
+    LogRecord_Level_UNSET = 0,
+    /* Log levels, chosen to match python logging conventions. */
+    LogRecord_Level_CRITICAL = 50,
+    /* Log levels, chosen to match python logging conventions. */
+    LogRecord_Level_ERROR = 40,
+    /* Log levels, chosen to match python logging conventions. */
+    LogRecord_Level_WARNING = 30,
+    /* Log levels, chosen to match python logging conventions. */
+    LogRecord_Level_INFO = 20,
+    /* Log levels, chosen to match python logging conventions. */
+    LogRecord_Level_DEBUG = 10,
+    /* Log levels, chosen to match python logging conventions. */
+    LogRecord_Level_TRACE = 5
 } LogRecord_Level;
 
 /* Struct definitions */
-typedef PB_BYTES_ARRAY_T(237) Compressed_data_t;
-/* Compressed message payload */
-typedef struct _Compressed { 
-    /* PortNum to determine the how to handle the compressed payload. */
-    PortNum portnum;
-    /* Compressed data. */
-    Compressed_data_t data;
-} Compressed;
-
-typedef PB_BYTES_ARRAY_T(237) Data_payload_t;
-/* (Formerly called SubPacket)
- The payload portion fo a packet, this is the actual bytes that are sent
- inside a radio packet (because from/to are broken out by the comms library) */
-typedef struct _Data { 
-    /* Formerly named typ and of type Type */
-    PortNum portnum;
-    /* TODO: REPLACE */
-    Data_payload_t payload;
-    /* Not normally used, but for testing a sender can request that recipient
- responds in kind (i.e. if it received a position, it should unicast back it's position).
- Note: that if you set this on a broadcast you will receive many replies. */
-    bool want_response;
-    /* The address of the destination node.
- This field is is filled in by the mesh radio device software, application
- layer software should never need it.
- RouteDiscovery messages _must_ populate this.
- Other message types might need to if they are doing multihop routing. */
-    uint32_t dest;
-    /* The address of the original sender for this message.
- This field should _only_ be populated for reliable multihop packets (to keep
- packets small). */
-    uint32_t source;
-    /* Only used in routing or response messages.
- Indicates the original message ID that this message is reporting failure on. (formerly called original_id) */
-    uint32_t request_id;
-    /* If set, this message is intened to be a reply to a previously sent message with the defined id. */
-    uint32_t reply_id;
-    /* Defaults to false. If true, then what is in the payload should be treated as an emoji like giving
- a message a heart or poop emoji. */
-    uint32_t emoji;
-} Data;
-
-/* Debug output from the device.
- To minimize the size of records inside the device code, if a time/source/level is not set
- on the message it is assumed to be a continuation of the previously sent message.
- This allows the device code to use fixed maxlen 64 byte strings for messages,
- and then extend as needed by emitting multiple records. */
-typedef struct _LogRecord { 
-    /* Log levels, chosen to match python logging conventions. */
-    char message[64];
-    /* Seconds since 1970 - or 0 for unknown/unset */
-    uint32_t time;
-    /* Usually based on thread name - if known */
-    char source[8];
-    /* Not yet set */
-    LogRecord_Level level;
-} LogRecord;
-
-/* Unique local debugging info for this node
- Note: we don't include position or the user info, because that will come in the
- Sent to the phone in response to WantNodes. */
-typedef struct _MyNodeInfo { 
-    /* Tells the phone what our node number is, default starting value is
- lowbyte of macaddr, but it will be fixed if that is already in use */
-    uint32_t my_node_num;
-    /* Note: This flag merely means we detected a hardware GPS in our node.
- Not the same as UserPreferences.location_sharing */
-    bool has_gps;
-    /* The maximum number of 'software' channels that can be set on this node. */
-    uint32_t max_channels;
-    /* 0.0.5 etc... */
-    char firmware_version[18];
-    /* An error message we'd like to report back to the mothership through analytics.
- It indicates a serious bug occurred on the device, the device coped with it,
- but we still want to tell the devs about the bug.
- This field will be cleared after the phone reads MyNodeInfo
- (i.e. it will only be reported once)
- a numeric error code to go with error message, zero means no error */
-    CriticalErrorCode error_code;
-    /* A numeric error address (nonzero if available) */
-    uint32_t error_address;
-    /* The total number of errors this node has ever encountered
- (well - since the last time we discarded preferences) */
-    uint32_t error_count;
-    /* The total number of reboots this node has ever encountered
- (well - since the last time we discarded preferences) */
-    uint32_t reboot_count;
-    /* Calculated bitrate of the current channel (in Bytes Per Second) */
-    float bitrate;
-    /* How long before we consider a message abandoned and we can clear our
- caches of any messages in flight Normally quite large to handle the worst case
- message delivery time, 5 minutes.
- Formerly called FLOOD_EXPIRE_TIME in the device code */
-    uint32_t message_timeout_msec;
-    /* The minimum app version that can talk to this device.
- Phone/PC apps should compare this to their build number and if too low tell the user they must update their app */
-    uint32_t min_app_version;
-    /* 24 time windows of 1hr each with the airtime transmitted out of the device per hour. */
-    pb_size_t air_period_tx_count;
-    uint32_t air_period_tx[8];
-    /* 24 time windows of 1hr each with the airtime of valid packets for your mesh. */
-    pb_size_t air_period_rx_count;
-    uint32_t air_period_rx[8];
-    /* Is the device wifi capable? */
-    bool has_wifi;
-    /* Utilization for the current channel, including well formed TX, RX and malformed RX (aka noise). */
-    float channel_utilization;
-    /* Percent of airtime for transmission used within the last hour. */
-    float air_util_tx;
-} MyNodeInfo;
-
 /* a gps position */
-typedef struct _Position { 
+typedef struct _Position {
     /* The new preferred location encoding, multiply by 1e-7 to get degrees
  in floating point */
     int32_t latitude_i;
@@ -429,13 +326,6 @@ typedef struct _Position {
     uint32_t seq_number;
 } Position;
 
-/* A message used in our Dynamic Source Routing protocol (RFC 4728 based) */
-typedef struct _RouteDiscovery { 
-    /* The list of nodenums this packet has visited so far */
-    pb_size_t route_count;
-    uint32_t route[8];
-} RouteDiscovery;
-
 /* Broadcast when a newly powered mesh node wants to find a node num it can use
  Sent from the phone over bluetooth to set the user id for the owner of this node.
  Also sent from nodes to each other when a new node signs on (so all clients can have this info)
@@ -456,7 +346,7 @@ typedef struct _RouteDiscovery {
  A few nodenums are reserved and will never be requested:
  0xff - broadcast
  0 through 3 - for future use */
-typedef struct _User { 
+typedef struct _User {
     /* A globally unique ID string for this user.
  In the case of Signal that would mean +16504442323, for the default macaddr derived id it would be !<8 hexidecimal bytes>.
  Note: app developers are encouraged to also use the following standard
@@ -481,8 +371,62 @@ typedef struct _User {
     bool is_licensed;
 } User;
 
+/* A message used in our Dynamic Source Routing protocol (RFC 4728 based) */
+typedef struct _RouteDiscovery {
+    /* The list of nodenums this packet has visited so far */
+    pb_size_t route_count;
+    uint32_t route[8];
+} RouteDiscovery;
+
+/* A Routing control Data packet handled by the routing module */
+typedef struct _Routing {
+    pb_size_t which_variant;
+    union {
+        /* A route request going from the requester */
+        RouteDiscovery route_request;
+        /* A route reply */
+        RouteDiscovery route_reply;
+        /* A failure in delivering a message (usually used for routing control messages, but might be provided
+     in addition to ack.fail_id to provide details on the type of failure). */
+        Routing_Error error_reason;
+    };
+} Routing;
+
+typedef PB_BYTES_ARRAY_T(237) Data_payload_t;
+/* (Formerly called SubPacket)
+ The payload portion fo a packet, this is the actual bytes that are sent
+ inside a radio packet (because from/to are broken out by the comms library) */
+typedef struct _Data {
+    /* Formerly named typ and of type Type */
+    PortNum portnum;
+    /* TODO: REPLACE */
+    Data_payload_t payload;
+    /* Not normally used, but for testing a sender can request that recipient
+ responds in kind (i.e. if it received a position, it should unicast back it's position).
+ Note: that if you set this on a broadcast you will receive many replies. */
+    bool want_response;
+    /* The address of the destination node.
+ This field is is filled in by the mesh radio device software, application
+ layer software should never need it.
+ RouteDiscovery messages _must_ populate this.
+ Other message types might need to if they are doing multihop routing. */
+    uint32_t dest;
+    /* The address of the original sender for this message.
+ This field should _only_ be populated for reliable multihop packets (to keep
+ packets small). */
+    uint32_t source;
+    /* Only used in routing or response messages.
+ Indicates the original message ID that this message is reporting failure on. (formerly called original_id) */
+    uint32_t request_id;
+    /* If set, this message is intened to be a reply to a previously sent message with the defined id. */
+    uint32_t reply_id;
+    /* Defaults to false. If true, then what is in the payload should be treated as an emoji like giving
+ a message a heart or poop emoji. */
+    uint32_t emoji;
+} Data;
+
 /* Waypoint message, used to share arbitrary locations across the mesh */
-typedef struct _Waypoint { 
+typedef struct _Waypoint {
     /* Id of the waypoint */
     uint32_t id;
     /* latitude_i */
@@ -504,7 +448,7 @@ typedef PB_BYTES_ARRAY_T(256) MeshPacket_encrypted_t;
 /* A packet envelope sent/received over the mesh
  only payload_variant is sent in the payload portion of the LORA packet.
  The other fields are either not sent at all, or sent in the special 16 byte LORA header. */
-typedef struct _MeshPacket { 
+typedef struct _MeshPacket {
     /* The sending node number.
  Note: Our crypto implementation uses this field as well.
  See [crypto](/docs/overview/encryption) for details.
@@ -588,7 +532,7 @@ typedef struct _MeshPacket {
  level etc) SET_CONFIG (switches device to a new set of radio params and
  preshared key, drops all existing nodes, force our node to rejoin this new group)
  Full information about a node on the mesh */
-typedef struct _NodeInfo { 
+typedef struct _NodeInfo {
     /* The node number */
     uint32_t num;
     /* The user info for this node */
@@ -608,25 +552,80 @@ typedef struct _NodeInfo {
     DeviceMetrics device_metrics;
 } NodeInfo;
 
-/* A Routing control Data packet handled by the routing module */
-typedef struct _Routing { 
-    pb_size_t which_variant;
-    union {
-        /* A route request going from the requester */
-        RouteDiscovery route_request;
-        /* A route reply */
-        RouteDiscovery route_reply;
-        /* A failure in delivering a message (usually used for routing control messages, but might be provided
-     in addition to ack.fail_id to provide details on the type of failure). */
-        Routing_Error error_reason;
-    };
-} Routing;
+/* Unique local debugging info for this node
+ Note: we don't include position or the user info, because that will come in the
+ Sent to the phone in response to WantNodes. */
+typedef struct _MyNodeInfo {
+    /* Tells the phone what our node number is, default starting value is
+ lowbyte of macaddr, but it will be fixed if that is already in use */
+    uint32_t my_node_num;
+    /* Note: This flag merely means we detected a hardware GPS in our node.
+ Not the same as UserPreferences.location_sharing */
+    bool has_gps;
+    /* The maximum number of 'software' channels that can be set on this node. */
+    uint32_t max_channels;
+    /* 0.0.5 etc... */
+    char firmware_version[18];
+    /* An error message we'd like to report back to the mothership through analytics.
+ It indicates a serious bug occurred on the device, the device coped with it,
+ but we still want to tell the devs about the bug.
+ This field will be cleared after the phone reads MyNodeInfo
+ (i.e. it will only be reported once)
+ a numeric error code to go with error message, zero means no error */
+    CriticalErrorCode error_code;
+    /* A numeric error address (nonzero if available) */
+    uint32_t error_address;
+    /* The total number of errors this node has ever encountered
+ (well - since the last time we discarded preferences) */
+    uint32_t error_count;
+    /* The total number of reboots this node has ever encountered
+ (well - since the last time we discarded preferences) */
+    uint32_t reboot_count;
+    /* Calculated bitrate of the current channel (in Bytes Per Second) */
+    float bitrate;
+    /* How long before we consider a message abandoned and we can clear our
+ caches of any messages in flight Normally quite large to handle the worst case
+ message delivery time, 5 minutes.
+ Formerly called FLOOD_EXPIRE_TIME in the device code */
+    uint32_t message_timeout_msec;
+    /* The minimum app version that can talk to this device.
+ Phone/PC apps should compare this to their build number and if too low tell the user they must update their app */
+    uint32_t min_app_version;
+    /* 24 time windows of 1hr each with the airtime transmitted out of the device per hour. */
+    pb_size_t air_period_tx_count;
+    uint32_t air_period_tx[8];
+    /* 24 time windows of 1hr each with the airtime of valid packets for your mesh. */
+    pb_size_t air_period_rx_count;
+    uint32_t air_period_rx[8];
+    /* Is the device wifi capable? */
+    bool has_wifi;
+    /* Utilization for the current channel, including well formed TX, RX and malformed RX (aka noise). */
+    float channel_utilization;
+    /* Percent of airtime for transmission used within the last hour. */
+    float air_util_tx;
+} MyNodeInfo;
+
+/* Debug output from the device.
+ To minimize the size of records inside the device code, if a time/source/level is not set
+ on the message it is assumed to be a continuation of the previously sent message.
+ This allows the device code to use fixed maxlen 64 byte strings for messages,
+ and then extend as needed by emitting multiple records. */
+typedef struct _LogRecord {
+    /* Log levels, chosen to match python logging conventions. */
+    char message[64];
+    /* Seconds since 1970 - or 0 for unknown/unset */
+    uint32_t time;
+    /* Usually based on thread name - if known */
+    char source[8];
+    /* Not yet set */
+    LogRecord_Level level;
+} LogRecord;
 
 /* Packets from the radio to the phone will appear on the fromRadio characteristic.
  It will support READ and NOTIFY. When a new packet arrives the device will BLE notify?
  It will sit in that descriptor until consumed by the phone,
  at which point the next item in the FIFO will be populated. */
-typedef struct _FromRadio { 
+typedef struct _FromRadio {
     /* The packet id, used to allow the phone to request missing read packets from the FIFO,
  see our bluetooth docs */
     uint32_t id;
@@ -663,7 +662,7 @@ typedef struct _FromRadio {
 
 /* Packets/commands to the radio will be written (reliably) to the toRadio characteristic.
  Once the write completes the phone can assume it is handled. */
-typedef struct _ToRadio { 
+typedef struct _ToRadio {
     pb_size_t which_payload_variant;
     union {
         /* Send this packet on the mesh */
@@ -684,6 +683,19 @@ typedef struct _ToRadio {
     };
 } ToRadio;
 
+typedef PB_BYTES_ARRAY_T(237) Compressed_data_t;
+/* Compressed message payload */
+typedef struct _Compressed {
+    /* PortNum to determine the how to handle the compressed payload. */
+    PortNum portnum;
+    /* Compressed data. */
+    Compressed_data_t data;
+} Compressed;
+
+
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /* Helper constants for enums */
 #define _HardwareModel_MIN HardwareModel_UNSET
@@ -722,10 +734,29 @@ typedef struct _ToRadio {
 #define _LogRecord_Level_MAX LogRecord_Level_CRITICAL
 #define _LogRecord_Level_ARRAYSIZE ((LogRecord_Level)(LogRecord_Level_CRITICAL+1))
 
+#define Position_location_source_ENUMTYPE Position_LocSource
+#define Position_altitude_source_ENUMTYPE Position_AltSource
+
+#define User_hw_model_ENUMTYPE HardwareModel
+
+
+#define Routing_variant_error_reason_ENUMTYPE Routing_Error
+
+#define Data_portnum_ENUMTYPE PortNum
+
+
+#define MeshPacket_priority_ENUMTYPE MeshPacket_Priority
+#define MeshPacket_delayed_ENUMTYPE MeshPacket_Delayed
+
+
+#define MyNodeInfo_error_code_ENUMTYPE CriticalErrorCode
+
+#define LogRecord_level_ENUMTYPE LogRecord_Level
+
+
+
+#define Compressed_portnum_ENUMTYPE PortNum
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 /* Initializer values for message structs */
 #define Position_init_default                    {0, 0, 0, 0, _Position_LocSource_MIN, _Position_AltSource_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
@@ -756,36 +787,6 @@ extern "C" {
 #define Compressed_init_zero                     {_PortNum_MIN, {0, {0}}}
 
 /* Field tags (for use in manual encoding/decoding) */
-#define Compressed_portnum_tag                   1
-#define Compressed_data_tag                      2
-#define Data_portnum_tag                         1
-#define Data_payload_tag                         2
-#define Data_want_response_tag                   3
-#define Data_dest_tag                            4
-#define Data_source_tag                          5
-#define Data_request_id_tag                      6
-#define Data_reply_id_tag                        7
-#define Data_emoji_tag                           8
-#define LogRecord_message_tag                    1
-#define LogRecord_time_tag                       2
-#define LogRecord_source_tag                     3
-#define LogRecord_level_tag                      4
-#define MyNodeInfo_my_node_num_tag               1
-#define MyNodeInfo_has_gps_tag                   2
-#define MyNodeInfo_max_channels_tag              3
-#define MyNodeInfo_firmware_version_tag          4
-#define MyNodeInfo_error_code_tag                5
-#define MyNodeInfo_error_address_tag             6
-#define MyNodeInfo_error_count_tag               7
-#define MyNodeInfo_reboot_count_tag              8
-#define MyNodeInfo_bitrate_tag                   9
-#define MyNodeInfo_message_timeout_msec_tag      10
-#define MyNodeInfo_min_app_version_tag           11
-#define MyNodeInfo_air_period_tx_tag             12
-#define MyNodeInfo_air_period_rx_tag             13
-#define MyNodeInfo_has_wifi_tag                  14
-#define MyNodeInfo_channel_utilization_tag       15
-#define MyNodeInfo_air_util_tx_tag               16
 #define Position_latitude_i_tag                  1
 #define Position_longitude_i_tag                 2
 #define Position_altitude_tag                    3
@@ -808,13 +809,24 @@ extern "C" {
 #define Position_sensor_id_tag                   20
 #define Position_next_update_tag                 21
 #define Position_seq_number_tag                  22
-#define RouteDiscovery_route_tag                 1
 #define User_id_tag                              1
 #define User_long_name_tag                       2
 #define User_short_name_tag                      3
 #define User_macaddr_tag                         4
 #define User_hw_model_tag                        5
 #define User_is_licensed_tag                     6
+#define RouteDiscovery_route_tag                 1
+#define Routing_route_request_tag                1
+#define Routing_route_reply_tag                  2
+#define Routing_error_reason_tag                 3
+#define Data_portnum_tag                         1
+#define Data_payload_tag                         2
+#define Data_want_response_tag                   3
+#define Data_dest_tag                            4
+#define Data_source_tag                          5
+#define Data_request_id_tag                      6
+#define Data_reply_id_tag                        7
+#define Data_emoji_tag                           8
 #define Waypoint_id_tag                          1
 #define Waypoint_latitude_i_tag                  2
 #define Waypoint_longitude_i_tag                 3
@@ -841,9 +853,26 @@ extern "C" {
 #define NodeInfo_snr_tag                         4
 #define NodeInfo_last_heard_tag                  5
 #define NodeInfo_device_metrics_tag              6
-#define Routing_route_request_tag                1
-#define Routing_route_reply_tag                  2
-#define Routing_error_reason_tag                 3
+#define MyNodeInfo_my_node_num_tag               1
+#define MyNodeInfo_has_gps_tag                   2
+#define MyNodeInfo_max_channels_tag              3
+#define MyNodeInfo_firmware_version_tag          4
+#define MyNodeInfo_error_code_tag                5
+#define MyNodeInfo_error_address_tag             6
+#define MyNodeInfo_error_count_tag               7
+#define MyNodeInfo_reboot_count_tag              8
+#define MyNodeInfo_bitrate_tag                   9
+#define MyNodeInfo_message_timeout_msec_tag      10
+#define MyNodeInfo_min_app_version_tag           11
+#define MyNodeInfo_air_period_tx_tag             12
+#define MyNodeInfo_air_period_rx_tag             13
+#define MyNodeInfo_has_wifi_tag                  14
+#define MyNodeInfo_channel_utilization_tag       15
+#define MyNodeInfo_air_util_tx_tag               16
+#define LogRecord_message_tag                    1
+#define LogRecord_time_tag                       2
+#define LogRecord_source_tag                     3
+#define LogRecord_level_tag                      4
 #define FromRadio_id_tag                         1
 #define FromRadio_packet_tag                     2
 #define FromRadio_my_info_tag                    3
@@ -857,6 +886,8 @@ extern "C" {
 #define ToRadio_packet_tag                       1
 #define ToRadio_want_config_id_tag               3
 #define ToRadio_disconnect_tag                   4
+#define Compressed_portnum_tag                   1
+#define Compressed_data_tag                      2
 
 /* Struct field encoding specification for nanopb */
 #define Position_FIELDLIST(X, a) \

src/mesh/generated/module_config.pb.c

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #include "module_config.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40
@@ -12,6 +12,9 @@ PB_BIND(ModuleConfig, ModuleConfig, AUTO)
 PB_BIND(ModuleConfig_MQTTConfig, ModuleConfig_MQTTConfig, AUTO)
 
 
+PB_BIND(ModuleConfig_RemoteHardwareConfig, ModuleConfig_RemoteHardwareConfig, AUTO)
+
+
 PB_BIND(ModuleConfig_AudioConfig, ModuleConfig_AudioConfig, AUTO)
 
 

src/mesh/generated/module_config.pb.h

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #ifndef PB_MODULE_CONFIG_PB_H_INCLUDED
 #define PB_MODULE_CONFIG_PB_H_INCLUDED
@@ -10,134 +10,250 @@
 #endif
 
 /* Enum definitions */
-typedef enum _ModuleConfig_AudioConfig_Audio_Baud { 
-    ModuleConfig_AudioConfig_Audio_Baud_CODEC2_DEFAULT = 0, 
-    ModuleConfig_AudioConfig_Audio_Baud_CODEC2_3200 = 1, 
-    ModuleConfig_AudioConfig_Audio_Baud_CODEC2_2400 = 2, 
-    ModuleConfig_AudioConfig_Audio_Baud_CODEC2_1600 = 3, 
-    ModuleConfig_AudioConfig_Audio_Baud_CODEC2_1400 = 4, 
-    ModuleConfig_AudioConfig_Audio_Baud_CODEC2_1300 = 5, 
-    ModuleConfig_AudioConfig_Audio_Baud_CODEC2_1200 = 6, 
-    ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700 = 7, 
-    ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700B = 8 
+/* Baudrate for codec2 voice */
+typedef enum _ModuleConfig_AudioConfig_Audio_Baud {
+    ModuleConfig_AudioConfig_Audio_Baud_CODEC2_DEFAULT = 0,
+    ModuleConfig_AudioConfig_Audio_Baud_CODEC2_3200 = 1,
+    ModuleConfig_AudioConfig_Audio_Baud_CODEC2_2400 = 2,
+    ModuleConfig_AudioConfig_Audio_Baud_CODEC2_1600 = 3,
+    ModuleConfig_AudioConfig_Audio_Baud_CODEC2_1400 = 4,
+    ModuleConfig_AudioConfig_Audio_Baud_CODEC2_1300 = 5,
+    ModuleConfig_AudioConfig_Audio_Baud_CODEC2_1200 = 6,
+    ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700 = 7,
+    ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700B = 8
 } ModuleConfig_AudioConfig_Audio_Baud;
 
-typedef enum _ModuleConfig_SerialConfig_Serial_Baud { 
-    ModuleConfig_SerialConfig_Serial_Baud_BAUD_DEFAULT = 0, 
-    ModuleConfig_SerialConfig_Serial_Baud_BAUD_110 = 1, 
-    ModuleConfig_SerialConfig_Serial_Baud_BAUD_300 = 2, 
-    ModuleConfig_SerialConfig_Serial_Baud_BAUD_600 = 3, 
-    ModuleConfig_SerialConfig_Serial_Baud_BAUD_1200 = 4, 
-    ModuleConfig_SerialConfig_Serial_Baud_BAUD_2400 = 5, 
-    ModuleConfig_SerialConfig_Serial_Baud_BAUD_4800 = 6, 
-    ModuleConfig_SerialConfig_Serial_Baud_BAUD_9600 = 7, 
-    ModuleConfig_SerialConfig_Serial_Baud_BAUD_19200 = 8, 
-    ModuleConfig_SerialConfig_Serial_Baud_BAUD_38400 = 9, 
-    ModuleConfig_SerialConfig_Serial_Baud_BAUD_57600 = 10, 
-    ModuleConfig_SerialConfig_Serial_Baud_BAUD_115200 = 11, 
-    ModuleConfig_SerialConfig_Serial_Baud_BAUD_230400 = 12, 
-    ModuleConfig_SerialConfig_Serial_Baud_BAUD_460800 = 13, 
-    ModuleConfig_SerialConfig_Serial_Baud_BAUD_576000 = 14, 
-    ModuleConfig_SerialConfig_Serial_Baud_BAUD_921600 = 15 
+/* TODO: REPLACE */
+typedef enum _ModuleConfig_SerialConfig_Serial_Baud {
+    ModuleConfig_SerialConfig_Serial_Baud_BAUD_DEFAULT = 0,
+    ModuleConfig_SerialConfig_Serial_Baud_BAUD_110 = 1,
+    ModuleConfig_SerialConfig_Serial_Baud_BAUD_300 = 2,
+    ModuleConfig_SerialConfig_Serial_Baud_BAUD_600 = 3,
+    ModuleConfig_SerialConfig_Serial_Baud_BAUD_1200 = 4,
+    ModuleConfig_SerialConfig_Serial_Baud_BAUD_2400 = 5,
+    ModuleConfig_SerialConfig_Serial_Baud_BAUD_4800 = 6,
+    ModuleConfig_SerialConfig_Serial_Baud_BAUD_9600 = 7,
+    ModuleConfig_SerialConfig_Serial_Baud_BAUD_19200 = 8,
+    ModuleConfig_SerialConfig_Serial_Baud_BAUD_38400 = 9,
+    ModuleConfig_SerialConfig_Serial_Baud_BAUD_57600 = 10,
+    ModuleConfig_SerialConfig_Serial_Baud_BAUD_115200 = 11,
+    ModuleConfig_SerialConfig_Serial_Baud_BAUD_230400 = 12,
+    ModuleConfig_SerialConfig_Serial_Baud_BAUD_460800 = 13,
+    ModuleConfig_SerialConfig_Serial_Baud_BAUD_576000 = 14,
+    ModuleConfig_SerialConfig_Serial_Baud_BAUD_921600 = 15
 } ModuleConfig_SerialConfig_Serial_Baud;
 
-typedef enum _ModuleConfig_SerialConfig_Serial_Mode { 
-    ModuleConfig_SerialConfig_Serial_Mode_DEFAULT = 0, 
-    ModuleConfig_SerialConfig_Serial_Mode_SIMPLE = 1, 
-    ModuleConfig_SerialConfig_Serial_Mode_PROTO = 2, 
-    ModuleConfig_SerialConfig_Serial_Mode_TEXTMSG = 3, 
-    ModuleConfig_SerialConfig_Serial_Mode_NMEA = 4 
+/* TODO: REPLACE */
+typedef enum _ModuleConfig_SerialConfig_Serial_Mode {
+    ModuleConfig_SerialConfig_Serial_Mode_DEFAULT = 0,
+    ModuleConfig_SerialConfig_Serial_Mode_SIMPLE = 1,
+    ModuleConfig_SerialConfig_Serial_Mode_PROTO = 2,
+    ModuleConfig_SerialConfig_Serial_Mode_TEXTMSG = 3,
+    ModuleConfig_SerialConfig_Serial_Mode_NMEA = 4
 } ModuleConfig_SerialConfig_Serial_Mode;
 
-typedef enum _ModuleConfig_CannedMessageConfig_InputEventChar { 
-    ModuleConfig_CannedMessageConfig_InputEventChar_NONE = 0, 
-    ModuleConfig_CannedMessageConfig_InputEventChar_UP = 17, 
-    ModuleConfig_CannedMessageConfig_InputEventChar_DOWN = 18, 
-    ModuleConfig_CannedMessageConfig_InputEventChar_LEFT = 19, 
-    ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT = 20, 
-    ModuleConfig_CannedMessageConfig_InputEventChar_SELECT = 10, 
-    ModuleConfig_CannedMessageConfig_InputEventChar_BACK = 27, 
-    ModuleConfig_CannedMessageConfig_InputEventChar_CANCEL = 24 
+/* TODO: REPLACE */
+typedef enum _ModuleConfig_CannedMessageConfig_InputEventChar {
+    /* TODO: REPLACE */
+    ModuleConfig_CannedMessageConfig_InputEventChar_NONE = 0,
+    /* TODO: REPLACE */
+    ModuleConfig_CannedMessageConfig_InputEventChar_UP = 17,
+    /* TODO: REPLACE */
+    ModuleConfig_CannedMessageConfig_InputEventChar_DOWN = 18,
+    /* TODO: REPLACE */
+    ModuleConfig_CannedMessageConfig_InputEventChar_LEFT = 19,
+    /* TODO: REPLACE */
+    ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT = 20,
+    /* '\n' */
+    ModuleConfig_CannedMessageConfig_InputEventChar_SELECT = 10,
+    /* TODO: REPLACE */
+    ModuleConfig_CannedMessageConfig_InputEventChar_BACK = 27,
+    /* TODO: REPLACE */
+    ModuleConfig_CannedMessageConfig_InputEventChar_CANCEL = 24
 } ModuleConfig_CannedMessageConfig_InputEventChar;
 
 /* Struct definitions */
-typedef struct _ModuleConfig_AudioConfig { 
-    bool codec2_enabled;
-    uint8_t ptt_pin;
-    ModuleConfig_AudioConfig_Audio_Baud bitrate;
-    uint8_t i2s_ws;
-    uint8_t i2s_sd;
-    uint8_t i2s_din;
-    uint8_t i2s_sck;
-} ModuleConfig_AudioConfig;
-
-typedef struct _ModuleConfig_CannedMessageConfig { 
-    bool rotary1_enabled;
-    uint32_t inputbroker_pin_a;
-    uint32_t inputbroker_pin_b;
-    uint32_t inputbroker_pin_press;
-    ModuleConfig_CannedMessageConfig_InputEventChar inputbroker_event_cw;
-    ModuleConfig_CannedMessageConfig_InputEventChar inputbroker_event_ccw;
-    ModuleConfig_CannedMessageConfig_InputEventChar inputbroker_event_press;
-    bool updown1_enabled;
-    bool enabled;
-    char allow_input_source[16];
-    bool send_bell;
-} ModuleConfig_CannedMessageConfig;
-
-typedef struct _ModuleConfig_ExternalNotificationConfig { 
-    bool enabled;
-    uint32_t output_ms;
-    uint32_t output;
-    bool active;
-    bool alert_message;
-    bool alert_bell;
-    bool use_pwm;
-} ModuleConfig_ExternalNotificationConfig;
-
-typedef struct _ModuleConfig_MQTTConfig { 
+/* MQTT Client Config */
+typedef struct _ModuleConfig_MQTTConfig {
+    /* If a meshtastic node is able to reach the internet it will normally attempt to gateway any channels that are marked as
+ is_uplink_enabled or is_downlink_enabled. */
     bool enabled;
+    /* The server to use for our MQTT global message gateway feature.
+ If not set, the default server will be used */
     char address[32];
+    /* MQTT username to use (most useful for a custom MQTT server).
+ If using a custom server, this will be honoured even if empty.
+ If using the default server, this will only be honoured if set, otherwise the device will use the default username */
     char username[64];
+    /* MQTT password to use (most useful for a custom MQTT server).
+ If using a custom server, this will be honoured even if empty.
+ If using the default server, this will only be honoured if set, otherwise the device will use the default password */
     char password[64];
+    /* Whether to send encrypted or decrypted packets to MQTT.
+ This parameter is only honoured if you also set server
+ (the default official mqtt.meshtastic.org server can handle encrypted packets)
+ Decrypted packets may be useful for external systems that want to consume meshtastic packets */
     bool encryption_enabled;
+    /* Whether to send / consume json packets on MQTT */
     bool json_enabled;
 } ModuleConfig_MQTTConfig;
 
-typedef struct _ModuleConfig_RangeTestConfig { 
+/* RemoteHardwareModule Config */
+typedef struct _ModuleConfig_RemoteHardwareConfig {
+    /* Whether the Module is enabled */
     bool enabled;
-    uint32_t sender;
-    bool save;
-} ModuleConfig_RangeTestConfig;
+} ModuleConfig_RemoteHardwareConfig;
 
-typedef struct _ModuleConfig_SerialConfig { 
+/* Audio Config for codec2 voice */
+typedef struct _ModuleConfig_AudioConfig {
+    /* Whether Audio is enabled */
+    bool codec2_enabled;
+    /* PTT Pin */
+    uint8_t ptt_pin;
+    /* The audio sample rate to use for codec2 */
+    ModuleConfig_AudioConfig_Audio_Baud bitrate;
+    /* I2S Word Select */
+    uint8_t i2s_ws;
+    /* I2S Data IN */
+    uint8_t i2s_sd;
+    /* I2S Data OUT */
+    uint8_t i2s_din;
+    /* I2S Clock */
+    uint8_t i2s_sck;
+} ModuleConfig_AudioConfig;
+
+/* Serial Config */
+typedef struct _ModuleConfig_SerialConfig {
+    /* Preferences for the SerialModule
+ FIXME - Move this out of UserPreferences and into a section for module configuration. */
     bool enabled;
+    /* TODO: REPLACE */
     bool echo;
+    /* TODO: REPLACE */
     uint32_t rxd;
+    /* TODO: REPLACE */
     uint32_t txd;
+    /* TODO: REPLACE */
     ModuleConfig_SerialConfig_Serial_Baud baud;
+    /* TODO: REPLACE */
     uint32_t timeout;
+    /* TODO: REPLACE */
     ModuleConfig_SerialConfig_Serial_Mode mode;
 } ModuleConfig_SerialConfig;
 
-typedef struct _ModuleConfig_StoreForwardConfig { 
+/* External Notifications Config */
+typedef struct _ModuleConfig_ExternalNotificationConfig {
+    /* Enable the ExternalNotificationModule */
     bool enabled;
+    /* When using in On/Off mode, keep the output on for this many
+ milliseconds. Default 1000ms (1 second). */
+    uint32_t output_ms;
+    /* Define the output pin GPIO setting Defaults to
+ EXT_NOTIFY_OUT if set for the board.
+ In standalone devices this pin should drive the LED to match the UI. */
+    uint32_t output;
+    /* IF this is true, the 'output' Pin will be pulled active high, false
+ means active low. */
+    bool active;
+    /* True: Alert when a text message arrives (output) */
+    bool alert_message;
+    /* True: Alert when the bell character is received (output) */
+    bool alert_bell;
+    /* use a PWM output instead of a simple on/off output. This will ignore
+ the 'output', 'output_ms' and 'active' settings and use the
+ device.buzzer_gpio instead. */
+    bool use_pwm;
+    /* Optional: Define a secondary output pin for a vibra motor
+ This is used in standalone devices to match the UI. */
+    uint8_t output_vibra;
+    /* Optional: Define a tertiary output pin for an active buzzer
+ This is used in standalone devices to to match the UI. */
+    uint8_t output_buzzer;
+    /* True: Alert when a text message arrives (output_vibra) */
+    bool alert_message_vibra;
+    /* True: Alert when a text message arrives (output_buzzer) */
+    bool alert_message_buzzer;
+    /* True: Alert when the bell character is received (output_vibra) */
+    bool alert_bell_vibra;
+    /* True: Alert when the bell character is received (output_buzzer) */
+    bool alert_bell_buzzer;
+    /* The notification will toggle with 'output_ms' for this time of seconds.
+ Default is 0 which means don't repeat at all. 60 would mean blink
+ and/or beep for 60 seconds */
+    uint16_t nag_timeout;
+} ModuleConfig_ExternalNotificationConfig;
+
+/* Store and Forward Module Config */
+typedef struct _ModuleConfig_StoreForwardConfig {
+    /* Enable the Store and Forward Module */
+    bool enabled;
+    /* TODO: REPLACE */
     bool heartbeat;
+    /* TODO: REPLACE */
     uint32_t records;
+    /* TODO: REPLACE */
     uint32_t history_return_max;
+    /* TODO: REPLACE */
     uint32_t history_return_window;
 } ModuleConfig_StoreForwardConfig;
 
-typedef struct _ModuleConfig_TelemetryConfig { 
+/* Preferences for the RangeTestModule */
+typedef struct _ModuleConfig_RangeTestConfig {
+    /* Enable the Range Test Module */
+    bool enabled;
+    /* Send out range test messages from this node */
+    uint32_t sender;
+    /* Bool value indicating that this node should save a RangeTest.csv file. 
+ ESP32 Only */
+    bool save;
+} ModuleConfig_RangeTestConfig;
+
+/* Configuration for both device and environment metrics */
+typedef struct _ModuleConfig_TelemetryConfig {
+    /* Interval in seconds of how often we should try to send our
+ device metrics to the mesh */
     uint32_t device_update_interval;
     uint32_t environment_update_interval;
+    /* Preferences for the Telemetry Module (Environment)
+ Enable/Disable the telemetry measurement module measurement collection */
     bool environment_measurement_enabled;
+    /* Enable/Disable the telemetry measurement module on-device display */
     bool environment_screen_enabled;
+    /* We'll always read the sensor in Celsius, but sometimes we might want to
+ display the results in Fahrenheit as a "user preference". */
     bool environment_display_fahrenheit;
 } ModuleConfig_TelemetryConfig;
 
+/* TODO: REPLACE */
+typedef struct _ModuleConfig_CannedMessageConfig {
+    /* Enable the rotary encoder #1. This is a 'dumb' encoder sending pulses on both A and B pins while rotating. */
+    bool rotary1_enabled;
+    /* GPIO pin for rotary encoder A port. */
+    uint32_t inputbroker_pin_a;
+    /* GPIO pin for rotary encoder B port. */
+    uint32_t inputbroker_pin_b;
+    /* GPIO pin for rotary encoder Press port. */
+    uint32_t inputbroker_pin_press;
+    /* Generate input event on CW of this kind. */
+    ModuleConfig_CannedMessageConfig_InputEventChar inputbroker_event_cw;
+    /* Generate input event on CCW of this kind. */
+    ModuleConfig_CannedMessageConfig_InputEventChar inputbroker_event_ccw;
+    /* Generate input event on Press of this kind. */
+    ModuleConfig_CannedMessageConfig_InputEventChar inputbroker_event_press;
+    /* Enable the Up/Down/Select input device. Can be RAK rotary encoder or 3 buttons. Uses the a/b/press definitions from inputbroker. */
+    bool updown1_enabled;
+    /* Enable/disable CannedMessageModule. */
+    bool enabled;
+    /* Input event origin accepted by the canned message module.
+ Can be e.g. "rotEnc1", "upDownEnc1" or keyword "_any" */
+    char allow_input_source[16];
+    /* CannedMessageModule also sends a bell character with the messages.
+ ExternalNotificationModule can benefit from this feature. */
+    bool send_bell;
+} ModuleConfig_CannedMessageConfig;
+
 /* Module Config */
-typedef struct _ModuleConfig { 
+typedef struct _ModuleConfig {
     pb_size_t which_payload_variant;
     union {
         /* TODO: REPLACE */
@@ -156,10 +272,16 @@ typedef struct _ModuleConfig {
         ModuleConfig_CannedMessageConfig canned_message;
         /* TODO: REPLACE */
         ModuleConfig_AudioConfig audio;
+        /* TODO: REPLACE */
+        ModuleConfig_RemoteHardwareConfig remote_hardware;
     } payload_variant;
 } ModuleConfig;
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Helper constants for enums */
 #define _ModuleConfig_AudioConfig_Audio_Baud_MIN ModuleConfig_AudioConfig_Audio_Baud_CODEC2_DEFAULT
 #define _ModuleConfig_AudioConfig_Audio_Baud_MAX ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700B
@@ -178,31 +300,51 @@ typedef struct _ModuleConfig {
 #define _ModuleConfig_CannedMessageConfig_InputEventChar_ARRAYSIZE ((ModuleConfig_CannedMessageConfig_InputEventChar)(ModuleConfig_CannedMessageConfig_InputEventChar_BACK+1))
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+
+#define ModuleConfig_AudioConfig_bitrate_ENUMTYPE ModuleConfig_AudioConfig_Audio_Baud
+
+#define ModuleConfig_SerialConfig_baud_ENUMTYPE ModuleConfig_SerialConfig_Serial_Baud
+#define ModuleConfig_SerialConfig_mode_ENUMTYPE ModuleConfig_SerialConfig_Serial_Mode
+
+
+
+
+
+#define ModuleConfig_CannedMessageConfig_inputbroker_event_cw_ENUMTYPE ModuleConfig_CannedMessageConfig_InputEventChar
+#define ModuleConfig_CannedMessageConfig_inputbroker_event_ccw_ENUMTYPE ModuleConfig_CannedMessageConfig_InputEventChar
+#define ModuleConfig_CannedMessageConfig_inputbroker_event_press_ENUMTYPE ModuleConfig_CannedMessageConfig_InputEventChar
+
 
 /* Initializer values for message structs */
 #define ModuleConfig_init_default                {0, {ModuleConfig_MQTTConfig_init_default}}
 #define ModuleConfig_MQTTConfig_init_default     {0, "", "", "", 0, 0}
+#define ModuleConfig_RemoteHardwareConfig_init_default {0}
 #define ModuleConfig_AudioConfig_init_default    {0, 0, _ModuleConfig_AudioConfig_Audio_Baud_MIN, 0, 0, 0, 0}
 #define ModuleConfig_SerialConfig_init_default   {0, 0, 0, 0, _ModuleConfig_SerialConfig_Serial_Baud_MIN, 0, _ModuleConfig_SerialConfig_Serial_Mode_MIN}
-#define ModuleConfig_ExternalNotificationConfig_init_default {0, 0, 0, 0, 0, 0, 0}
+#define ModuleConfig_ExternalNotificationConfig_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define ModuleConfig_StoreForwardConfig_init_default {0, 0, 0, 0, 0}
 #define ModuleConfig_RangeTestConfig_init_default {0, 0, 0}
 #define ModuleConfig_TelemetryConfig_init_default {0, 0, 0, 0, 0}
 #define ModuleConfig_CannedMessageConfig_init_default {0, 0, 0, 0, _ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _ModuleConfig_CannedMessageConfig_InputEventChar_MIN, 0, 0, "", 0}
 #define ModuleConfig_init_zero                   {0, {ModuleConfig_MQTTConfig_init_zero}}
 #define ModuleConfig_MQTTConfig_init_zero        {0, "", "", "", 0, 0}
+#define ModuleConfig_RemoteHardwareConfig_init_zero {0}
 #define ModuleConfig_AudioConfig_init_zero       {0, 0, _ModuleConfig_AudioConfig_Audio_Baud_MIN, 0, 0, 0, 0}
 #define ModuleConfig_SerialConfig_init_zero      {0, 0, 0, 0, _ModuleConfig_SerialConfig_Serial_Baud_MIN, 0, _ModuleConfig_SerialConfig_Serial_Mode_MIN}
-#define ModuleConfig_ExternalNotificationConfig_init_zero {0, 0, 0, 0, 0, 0, 0}
+#define ModuleConfig_ExternalNotificationConfig_init_zero {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define ModuleConfig_StoreForwardConfig_init_zero {0, 0, 0, 0, 0}
 #define ModuleConfig_RangeTestConfig_init_zero   {0, 0, 0}
 #define ModuleConfig_TelemetryConfig_init_zero   {0, 0, 0, 0, 0}
 #define ModuleConfig_CannedMessageConfig_init_zero {0, 0, 0, 0, _ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _ModuleConfig_CannedMessageConfig_InputEventChar_MIN, _ModuleConfig_CannedMessageConfig_InputEventChar_MIN, 0, 0, "", 0}
 
 /* Field tags (for use in manual encoding/decoding) */
+#define ModuleConfig_MQTTConfig_enabled_tag      1
+#define ModuleConfig_MQTTConfig_address_tag      2
+#define ModuleConfig_MQTTConfig_username_tag     3
+#define ModuleConfig_MQTTConfig_password_tag     4
+#define ModuleConfig_MQTTConfig_encryption_enabled_tag 5
+#define ModuleConfig_MQTTConfig_json_enabled_tag 6
+#define ModuleConfig_RemoteHardwareConfig_enabled_tag 1
 #define ModuleConfig_AudioConfig_codec2_enabled_tag 1
 #define ModuleConfig_AudioConfig_ptt_pin_tag     2
 #define ModuleConfig_AudioConfig_bitrate_tag     3
@@ -210,6 +352,40 @@ extern "C" {
 #define ModuleConfig_AudioConfig_i2s_sd_tag      5
 #define ModuleConfig_AudioConfig_i2s_din_tag     6
 #define ModuleConfig_AudioConfig_i2s_sck_tag     7
+#define ModuleConfig_SerialConfig_enabled_tag    1
+#define ModuleConfig_SerialConfig_echo_tag       2
+#define ModuleConfig_SerialConfig_rxd_tag        3
+#define ModuleConfig_SerialConfig_txd_tag        4
+#define ModuleConfig_SerialConfig_baud_tag       5
+#define ModuleConfig_SerialConfig_timeout_tag    6
+#define ModuleConfig_SerialConfig_mode_tag       7
+#define ModuleConfig_ExternalNotificationConfig_enabled_tag 1
+#define ModuleConfig_ExternalNotificationConfig_output_ms_tag 2
+#define ModuleConfig_ExternalNotificationConfig_output_tag 3
+#define ModuleConfig_ExternalNotificationConfig_active_tag 4
+#define ModuleConfig_ExternalNotificationConfig_alert_message_tag 5
+#define ModuleConfig_ExternalNotificationConfig_alert_bell_tag 6
+#define ModuleConfig_ExternalNotificationConfig_use_pwm_tag 7
+#define ModuleConfig_ExternalNotificationConfig_output_vibra_tag 8
+#define ModuleConfig_ExternalNotificationConfig_output_buzzer_tag 9
+#define ModuleConfig_ExternalNotificationConfig_alert_message_vibra_tag 10
+#define ModuleConfig_ExternalNotificationConfig_alert_message_buzzer_tag 11
+#define ModuleConfig_ExternalNotificationConfig_alert_bell_vibra_tag 12
+#define ModuleConfig_ExternalNotificationConfig_alert_bell_buzzer_tag 13
+#define ModuleConfig_ExternalNotificationConfig_nag_timeout_tag 14
+#define ModuleConfig_StoreForwardConfig_enabled_tag 1
+#define ModuleConfig_StoreForwardConfig_heartbeat_tag 2
+#define ModuleConfig_StoreForwardConfig_records_tag 3
+#define ModuleConfig_StoreForwardConfig_history_return_max_tag 4
+#define ModuleConfig_StoreForwardConfig_history_return_window_tag 5
+#define ModuleConfig_RangeTestConfig_enabled_tag 1
+#define ModuleConfig_RangeTestConfig_sender_tag  2
+#define ModuleConfig_RangeTestConfig_save_tag    3
+#define ModuleConfig_TelemetryConfig_device_update_interval_tag 1
+#define ModuleConfig_TelemetryConfig_environment_update_interval_tag 2
+#define ModuleConfig_TelemetryConfig_environment_measurement_enabled_tag 3
+#define ModuleConfig_TelemetryConfig_environment_screen_enabled_tag 4
+#define ModuleConfig_TelemetryConfig_environment_display_fahrenheit_tag 5
 #define ModuleConfig_CannedMessageConfig_rotary1_enabled_tag 1
 #define ModuleConfig_CannedMessageConfig_inputbroker_pin_a_tag 2
 #define ModuleConfig_CannedMessageConfig_inputbroker_pin_b_tag 3
@@ -221,39 +397,6 @@ extern "C" {
 #define ModuleConfig_CannedMessageConfig_enabled_tag 9
 #define ModuleConfig_CannedMessageConfig_allow_input_source_tag 10
 #define ModuleConfig_CannedMessageConfig_send_bell_tag 11
-#define ModuleConfig_ExternalNotificationConfig_enabled_tag 1
-#define ModuleConfig_ExternalNotificationConfig_output_ms_tag 2
-#define ModuleConfig_ExternalNotificationConfig_output_tag 3
-#define ModuleConfig_ExternalNotificationConfig_active_tag 4
-#define ModuleConfig_ExternalNotificationConfig_alert_message_tag 5
-#define ModuleConfig_ExternalNotificationConfig_alert_bell_tag 6
-#define ModuleConfig_ExternalNotificationConfig_use_pwm_tag 7
-#define ModuleConfig_MQTTConfig_enabled_tag      1
-#define ModuleConfig_MQTTConfig_address_tag      2
-#define ModuleConfig_MQTTConfig_username_tag     3
-#define ModuleConfig_MQTTConfig_password_tag     4
-#define ModuleConfig_MQTTConfig_encryption_enabled_tag 5
-#define ModuleConfig_MQTTConfig_json_enabled_tag 6
-#define ModuleConfig_RangeTestConfig_enabled_tag 1
-#define ModuleConfig_RangeTestConfig_sender_tag  2
-#define ModuleConfig_RangeTestConfig_save_tag    3
-#define ModuleConfig_SerialConfig_enabled_tag    1
-#define ModuleConfig_SerialConfig_echo_tag       2
-#define ModuleConfig_SerialConfig_rxd_tag        3
-#define ModuleConfig_SerialConfig_txd_tag        4
-#define ModuleConfig_SerialConfig_baud_tag       5
-#define ModuleConfig_SerialConfig_timeout_tag    6
-#define ModuleConfig_SerialConfig_mode_tag       7
-#define ModuleConfig_StoreForwardConfig_enabled_tag 1
-#define ModuleConfig_StoreForwardConfig_heartbeat_tag 2
-#define ModuleConfig_StoreForwardConfig_records_tag 3
-#define ModuleConfig_StoreForwardConfig_history_return_max_tag 4
-#define ModuleConfig_StoreForwardConfig_history_return_window_tag 5
-#define ModuleConfig_TelemetryConfig_device_update_interval_tag 1
-#define ModuleConfig_TelemetryConfig_environment_update_interval_tag 2
-#define ModuleConfig_TelemetryConfig_environment_measurement_enabled_tag 3
-#define ModuleConfig_TelemetryConfig_environment_screen_enabled_tag 4
-#define ModuleConfig_TelemetryConfig_environment_display_fahrenheit_tag 5
 #define ModuleConfig_mqtt_tag                    1
 #define ModuleConfig_serial_tag                  2
 #define ModuleConfig_external_notification_tag   3
@@ -262,6 +405,7 @@ extern "C" {
 #define ModuleConfig_telemetry_tag               6
 #define ModuleConfig_canned_message_tag          7
 #define ModuleConfig_audio_tag                   8
+#define ModuleConfig_remote_hardware_tag         9
 
 /* Struct field encoding specification for nanopb */
 #define ModuleConfig_FIELDLIST(X, a) \
@@ -272,7 +416,8 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,store_forward,payload_varian
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,range_test,payload_variant.range_test),   5) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,telemetry,payload_variant.telemetry),   6) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,canned_message,payload_variant.canned_message),   7) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,audio,payload_variant.audio),   8)
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,audio,payload_variant.audio),   8) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,remote_hardware,payload_variant.remote_hardware),   9)
 #define ModuleConfig_CALLBACK NULL
 #define ModuleConfig_DEFAULT NULL
 #define ModuleConfig_payload_variant_mqtt_MSGTYPE ModuleConfig_MQTTConfig
@@ -283,6 +428,7 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,audio,payload_variant.audio)
 #define ModuleConfig_payload_variant_telemetry_MSGTYPE ModuleConfig_TelemetryConfig
 #define ModuleConfig_payload_variant_canned_message_MSGTYPE ModuleConfig_CannedMessageConfig
 #define ModuleConfig_payload_variant_audio_MSGTYPE ModuleConfig_AudioConfig
+#define ModuleConfig_payload_variant_remote_hardware_MSGTYPE ModuleConfig_RemoteHardwareConfig
 
 #define ModuleConfig_MQTTConfig_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, BOOL,     enabled,           1) \
@@ -294,6 +440,11 @@ X(a, STATIC,   SINGULAR, BOOL,     json_enabled,      6)
 #define ModuleConfig_MQTTConfig_CALLBACK NULL
 #define ModuleConfig_MQTTConfig_DEFAULT NULL
 
+#define ModuleConfig_RemoteHardwareConfig_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, BOOL,     enabled,           1)
+#define ModuleConfig_RemoteHardwareConfig_CALLBACK NULL
+#define ModuleConfig_RemoteHardwareConfig_DEFAULT NULL
+
 #define ModuleConfig_AudioConfig_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, BOOL,     codec2_enabled,    1) \
 X(a, STATIC,   SINGULAR, UINT32,   ptt_pin,           2) \
@@ -323,7 +474,14 @@ X(a, STATIC,   SINGULAR, UINT32,   output,            3) \
 X(a, STATIC,   SINGULAR, BOOL,     active,            4) \
 X(a, STATIC,   SINGULAR, BOOL,     alert_message,     5) \
 X(a, STATIC,   SINGULAR, BOOL,     alert_bell,        6) \
-X(a, STATIC,   SINGULAR, BOOL,     use_pwm,           7)
+X(a, STATIC,   SINGULAR, BOOL,     use_pwm,           7) \
+X(a, STATIC,   SINGULAR, UINT32,   output_vibra,      8) \
+X(a, STATIC,   SINGULAR, UINT32,   output_buzzer,     9) \
+X(a, STATIC,   SINGULAR, BOOL,     alert_message_vibra,  10) \
+X(a, STATIC,   SINGULAR, BOOL,     alert_message_buzzer,  11) \
+X(a, STATIC,   SINGULAR, BOOL,     alert_bell_vibra,  12) \
+X(a, STATIC,   SINGULAR, BOOL,     alert_bell_buzzer,  13) \
+X(a, STATIC,   SINGULAR, UINT32,   nag_timeout,      14)
 #define ModuleConfig_ExternalNotificationConfig_CALLBACK NULL
 #define ModuleConfig_ExternalNotificationConfig_DEFAULT NULL
 
@@ -369,6 +527,7 @@ X(a, STATIC,   SINGULAR, BOOL,     send_bell,        11)
 
 extern const pb_msgdesc_t ModuleConfig_msg;
 extern const pb_msgdesc_t ModuleConfig_MQTTConfig_msg;
+extern const pb_msgdesc_t ModuleConfig_RemoteHardwareConfig_msg;
 extern const pb_msgdesc_t ModuleConfig_AudioConfig_msg;
 extern const pb_msgdesc_t ModuleConfig_SerialConfig_msg;
 extern const pb_msgdesc_t ModuleConfig_ExternalNotificationConfig_msg;
@@ -380,6 +539,7 @@ extern const pb_msgdesc_t ModuleConfig_CannedMessageConfig_msg;
 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define ModuleConfig_fields &ModuleConfig_msg
 #define ModuleConfig_MQTTConfig_fields &ModuleConfig_MQTTConfig_msg
+#define ModuleConfig_RemoteHardwareConfig_fields &ModuleConfig_RemoteHardwareConfig_msg
 #define ModuleConfig_AudioConfig_fields &ModuleConfig_AudioConfig_msg
 #define ModuleConfig_SerialConfig_fields &ModuleConfig_SerialConfig_msg
 #define ModuleConfig_ExternalNotificationConfig_fields &ModuleConfig_ExternalNotificationConfig_msg
@@ -391,9 +551,10 @@ extern const pb_msgdesc_t ModuleConfig_CannedMessageConfig_msg;
 /* Maximum encoded size of messages (where known) */
 #define ModuleConfig_AudioConfig_size            19
 #define ModuleConfig_CannedMessageConfig_size    49
-#define ModuleConfig_ExternalNotificationConfig_size 22
+#define ModuleConfig_ExternalNotificationConfig_size 40
 #define ModuleConfig_MQTTConfig_size             169
 #define ModuleConfig_RangeTestConfig_size        10
+#define ModuleConfig_RemoteHardwareConfig_size   2
 #define ModuleConfig_SerialConfig_size           26
 #define ModuleConfig_StoreForwardConfig_size     22
 #define ModuleConfig_TelemetryConfig_size        18

src/mesh/generated/mqtt.pb.c

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #include "mqtt.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40

src/mesh/generated/mqtt.pb.h

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #ifndef PB_MQTT_PB_H_INCLUDED
 #define PB_MQTT_PB_H_INCLUDED
@@ -12,7 +12,7 @@
 
 /* Struct definitions */
 /* This message wraps a MeshPacket with extra metadata about the sender and how it arrived. */
-typedef struct _ServiceEnvelope { 
+typedef struct _ServiceEnvelope {
     /* The (probably encrypted) packet */
     struct _MeshPacket *packet;
     /* The global channel ID it was sent on */

src/mesh/generated/portnums.pb.c

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #include "portnums.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40

src/mesh/generated/portnums.pb.h

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #ifndef PB_PORTNUMS_PB_H_INCLUDED
 #define PB_PORTNUMS_PB_H_INCLUDED
@@ -22,89 +22,89 @@
  Note: This was formerly a Type enum named 'typ' with the same id #
  We have change to this 'portnum' based scheme for specifying app handlers for particular payloads.
  This change is backwards compatible by treating the legacy OPAQUE/CLEAR_TEXT values identically. */
-typedef enum _PortNum { 
+typedef enum _PortNum {
     /* Deprecated: do not use in new code (formerly called OPAQUE)
  A message sent from a device outside of the mesh, in a form the mesh does not understand
  NOTE: This must be 0, because it is documented in IMeshService.aidl to be so */
-    PortNum_UNKNOWN_APP = 0, 
+    PortNum_UNKNOWN_APP = 0,
     /* A simple UTF-8 text message, which even the little micros in the mesh
  can understand and show on their screen eventually in some circumstances
  even signal might send messages in this form (see below) */
-    PortNum_TEXT_MESSAGE_APP = 1, 
+    PortNum_TEXT_MESSAGE_APP = 1,
     /* Reserved for built-in GPIO/example app.
  See remote_hardware.proto/HardwareMessage for details on the message sent/received to this port number */
-    PortNum_REMOTE_HARDWARE_APP = 2, 
+    PortNum_REMOTE_HARDWARE_APP = 2,
     /* The built-in position messaging app.
  Payload is a [Position](/docs/developers/protobufs/api#position) message */
-    PortNum_POSITION_APP = 3, 
+    PortNum_POSITION_APP = 3,
     /* The built-in user info app.
  Payload is a [User](/docs/developers/protobufs/api#user) message */
-    PortNum_NODEINFO_APP = 4, 
+    PortNum_NODEINFO_APP = 4,
     /* Protocol control packets for mesh protocol use.
  Payload is a [Routing](/docs/developers/protobufs/api#routing) message */
-    PortNum_ROUTING_APP = 5, 
+    PortNum_ROUTING_APP = 5,
     /* Admin control packets.
  Payload is a [AdminMessage](/docs/developers/protobufs/api#adminmessage) message */
-    PortNum_ADMIN_APP = 6, 
+    PortNum_ADMIN_APP = 6,
     /* Compressed TEXT_MESSAGE payloads. */
-    PortNum_TEXT_MESSAGE_COMPRESSED_APP = 7, 
+    PortNum_TEXT_MESSAGE_COMPRESSED_APP = 7,
     /* Waypoint payloads.
  Payload is a [Waypoint](/docs/developers/protobufs/api#waypoint) message */
-    PortNum_WAYPOINT_APP = 8, 
+    PortNum_WAYPOINT_APP = 8,
     /* Audio Payloads.
  Encapsulated codec2 packets. On 2.4 GHZ Bandwidths only for now */
-    PortNum_AUDIO_APP = 9, 
+    PortNum_AUDIO_APP = 9,
     /* Provides a 'ping' service that replies to any packet it receives.
  Also serves as a small example module. */
-    PortNum_REPLY_APP = 32, 
+    PortNum_REPLY_APP = 32,
     /* Used for the python IP tunnel feature */
-    PortNum_IP_TUNNEL_APP = 33, 
+    PortNum_IP_TUNNEL_APP = 33,
     /* Provides a hardware serial interface to send and receive from the Meshtastic network.
  Connect to the RX/TX pins of a device with 38400 8N1. Packets received from the Meshtastic
  network is forwarded to the RX pin while sending a packet to TX will go out to the Mesh network.
  Maximum packet size of 240 bytes.
  Module is disabled by default can be turned on by setting SERIAL_MODULE_ENABLED = 1 in SerialPlugh.cpp. */
-    PortNum_SERIAL_APP = 64, 
+    PortNum_SERIAL_APP = 64,
     /* STORE_FORWARD_APP (Work in Progress)
  Maintained by Jm Casler (MC Hamster) : jm@casler.org */
-    PortNum_STORE_FORWARD_APP = 65, 
+    PortNum_STORE_FORWARD_APP = 65,
     /* Optional port for messages for the range test module. */
-    PortNum_RANGE_TEST_APP = 66, 
+    PortNum_RANGE_TEST_APP = 66,
     /* Provides a format to send and receive telemetry data from the Meshtastic network.
  Maintained by Charles Crossan (crossan007) : crossan007@gmail.com */
-    PortNum_TELEMETRY_APP = 67, 
+    PortNum_TELEMETRY_APP = 67,
     /* Experimental tools for estimating node position without a GPS
  Maintained by Github user a-f-G-U-C (a Meshtastic contributor)
  Project files at https://github.com/a-f-G-U-C/Meshtastic-ZPS */
-    PortNum_ZPS_APP = 68, 
+    PortNum_ZPS_APP = 68,
     /* Used to let multiple instances of Linux native applications communicate 
  as if they did using their LoRa chip.
  Maintained by GitHub user GUVWAF. 
  Project files at https://github.com/GUVWAF/Meshtasticator */
-    PortNum_SIMULATOR_APP = 69, 
+    PortNum_SIMULATOR_APP = 69,
     /* Provides a traceroute functionality to show the route a packet towards
  a certain destination would take on the mesh. */
-    PortNum_TRACEROUTE_APP = 70, 
+    PortNum_TRACEROUTE_APP = 70,
     /* Private applications should use portnums >= 256.
  To simplify initial development and testing you can use "PRIVATE_APP"
  in your code without needing to rebuild protobuf files (via [regen-protos.sh](https://github.com/meshtastic/firmware/blob/master/bin/regen-protos.sh)) */
-    PortNum_PRIVATE_APP = 256, 
+    PortNum_PRIVATE_APP = 256,
     /* ATAK Forwarder Module https://github.com/paulmandal/atak-forwarder */
-    PortNum_ATAK_FORWARDER = 257, 
+    PortNum_ATAK_FORWARDER = 257,
     /* Currently we limit port nums to no higher than this value */
-    PortNum_MAX = 511 
+    PortNum_MAX = 511
 } PortNum;
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Helper constants for enums */
 #define _PortNum_MIN PortNum_UNKNOWN_APP
 #define _PortNum_MAX PortNum_MAX
 #define _PortNum_ARRAYSIZE ((PortNum)(PortNum_MAX+1))
 
 
-#ifdef __cplusplus
-extern "C" {
-#endif
-
 #ifdef __cplusplus
 } /* extern "C" */
 #endif

src/mesh/generated/remote_hardware.pb.c

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb constant definitions */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #include "remote_hardware.pb.h"
 #if PB_PROTO_HEADER_VERSION != 40

src/mesh/generated/remote_hardware.pb.h

@@ -1,5 +1,5 @@
 /* Automatically generated nanopb header */
-/* Generated by nanopb-0.4.6 */
+/* Generated by nanopb-0.4.7 */
 
 #ifndef PB_REMOTE_HARDWARE_PB_H_INCLUDED
 #define PB_REMOTE_HARDWARE_PB_H_INCLUDED
@@ -10,13 +10,22 @@
 #endif
 
 /* Enum definitions */
-typedef enum _HardwareMessage_Type { 
-    HardwareMessage_Type_UNSET = 0, 
-    HardwareMessage_Type_WRITE_GPIOS = 1, 
-    HardwareMessage_Type_WATCH_GPIOS = 2, 
-    HardwareMessage_Type_GPIOS_CHANGED = 3, 
-    HardwareMessage_Type_READ_GPIOS = 4, 
-    HardwareMessage_Type_READ_GPIOS_REPLY = 5 
+/* TODO: REPLACE */
+typedef enum _HardwareMessage_Type {
+    /* Unset/unused */
+    HardwareMessage_Type_UNSET = 0,
+    /* Set gpio gpios based on gpio_mask/gpio_value */
+    HardwareMessage_Type_WRITE_GPIOS = 1,
+    /* We are now interested in watching the gpio_mask gpios.
+ If the selected gpios change, please broadcast GPIOS_CHANGED.
+ Will implicitly change the gpios requested to be INPUT gpios. */
+    HardwareMessage_Type_WATCH_GPIOS = 2,
+    /* The gpios listed in gpio_mask have changed, the new values are listed in gpio_value */
+    HardwareMessage_Type_GPIOS_CHANGED = 3,
+    /* Read the gpios specified in gpio_mask, send back a READ_GPIOS_REPLY reply with gpio_value populated */
+    HardwareMessage_Type_READ_GPIOS = 4,
+    /* A reply to READ_GPIOS. gpio_mask and gpio_value will be populated */
+    HardwareMessage_Type_READ_GPIOS_REPLY = 5
 } HardwareMessage_Type;
 
 /* Struct definitions */
@@ -29,7 +38,7 @@ typedef enum _HardwareMessage_Type {
  because no security yet (beyond the channel mechanism).
  It should be off by default and then protected based on some TBD mechanism
  (a special channel once multichannel support is included?) */
-typedef struct _HardwareMessage { 
+typedef struct _HardwareMessage {
     /* What type of HardwareMessage is this? */
     HardwareMessage_Type type;
     /* What gpios are we changing. Not used for all MessageTypes, see MessageType for details */
@@ -40,15 +49,17 @@ typedef struct _HardwareMessage {
 } HardwareMessage;
 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
+
 /* Helper constants for enums */
 #define _HardwareMessage_Type_MIN HardwareMessage_Type_UNSET
 #define _HardwareMessage_Type_MAX HardwareMessage_Type_READ_GPIOS_REPLY
 #define _HardwareMessage_Type_ARRAYSIZE ((HardwareMessage_Type)(HardwareMessage_Type_READ_GPIOS_REPLY+1))
 
+#define HardwareMessage_type_ENUMTYPE HardwareMessage_Type
 
-#ifdef __cplusplus
-extern "C" {
-#endif
 
 /* Initializer values for message structs */
 #define HardwareMessage_init_default             {_HardwareMessage_Type_MIN, 0, 0}

src/mesh/generated/rtttl.pb.c

@@ -0,0 +1,12 @@
+/* Automatically generated nanopb constant definitions */
+/* Generated by nanopb-0.4.7 */
+
+#include "rtttl.pb.h"
+#if PB_PROTO_HEADER_VERSION != 40
+#error Regenerate this file with the current version of nanopb generator.
+#endif
+
+PB_BIND(RTTTLConfig, RTTTLConfig, AUTO)
+
+
+