Merge branch 'master' into sketch

bin/device-install.bat

@@ -28,12 +28,12 @@ IF "__%FILENAME%__" == "____" (
 )
 IF EXIST %FILENAME% (
     echo Trying to flash update %FILENAME%, but first erasing and writing system information"
-	%PYTHON% -m esptool --baud 921600 erase_flash
+	%PYTHON% -m esptool --baud 115200 erase_flash
-	%PYTHON% -m esptool --baud 921600 write_flash 0x1000 system-info.bin
+	%PYTHON% -m esptool --baud 115200 write_flash 0x1000 system-info.bin
     for %%f in (littlefs-*.bin) do (
-        %PYTHON% -m esptool --baud 921600 write_flash 0x00390000 %%f
+        %PYTHON% -m esptool --baud 115200 write_flash 0x00390000 %%f
     )
-	%PYTHON% -m esptool --baud 921600 write_flash 0x10000 %FILENAME%
+	%PYTHON% -m esptool --baud 115200 write_flash 0x10000 %FILENAME%
 ) else (
     echo "Invalid file: %FILENAME%"
 	goto HELP

bin/device-update.bat

@@ -28,9 +28,9 @@ IF "__%FILENAME%__" == "____" (
 )
 IF EXIST %FILENAME% (
     echo Trying to flash update %FILENAME%
-    %PYTHON% -m esptool --baud 921600 write_flash 0x10000 %FILENAME%
+    %PYTHON% -m esptool --baud 115200 write_flash 0x10000 %FILENAME%
     echo Erasing the otadata partition, which will turn off flash flippy-flop and force the first image to be used
-    %PYTHON% -m esptool --baud 921600 erase_region 0xe000 0x2000
+    %PYTHON% -m esptool --baud 115200 erase_region 0xe000 0x2000
 ) else (
     echo "Invalid file: %FILENAME%"
 	goto HELP

bin/device-update.sh

@@ -44,9 +44,9 @@ shift "$((OPTIND-1))"
 
 if [ -f "${FILENAME}" ]; then
 	echo "Trying to flash update ${FILENAME}."
-	$PYTHON -m esptool --baud 921600 write_flash 0x10000 ${FILENAME}
+	$PYTHON -m esptool --baud 115200 write_flash 0x10000 ${FILENAME}
 	echo "Erasing the otadata partition, which will turn off flash flippy-flop and force the first image to be used"
-	$PYTHON -m esptool --baud 921600 erase_region 0xe000 0x2000
+	$PYTHON -m esptool --baud 115200 erase_region 0xe000 0x2000
 else
 	echo "Invalid file: ${FILENAME}"
 	show_help

bin/read-system-info.sh

@@ -1,3 +1,3 @@
 #!/usr/bin/env bash
 
-esptool.py --baud 921600 read_flash 0x1000 0xf000 system-info.img
+esptool.py --baud 115200 read_flash 0x1000 0xf000 system-info.img

platformio.ini

@@ -38,7 +38,7 @@ build_flags = -Wno-missing-field-initializers
   -DTINYGPS_OPTION_NO_CUSTOM_FIELDS
   -DPB_ENABLE_MALLOC=1
 
-monitor_speed = 921600
+monitor_speed = 115200
 
 lib_deps =
   https://github.com/meshtastic/esp8266-oled-ssd1306.git#53580644255b48ebb7a737343c6b4e71c7e11cf2 ; ESP8266_SSD1306 
@@ -61,7 +61,8 @@ framework = arduino
 lib_deps =
   ${env.lib_deps}
   ; Portduino is using meshtastic fork for now
-  https://github.com/jgromes/RadioLib.git#3df3b092ebf412bd0b26524e7b296733bd6a62f7
+  https://github.com/jgromes/RadioLib.git
+
 build_flags = ${env.build_flags} -Os 
 # -DRADIOLIB_GODMODE
 build_src_filter = ${env.build_src_filter} -<portduino/>
@@ -92,8 +93,9 @@ extends = arduino_base
 platform = espressif32@3.5.0
 build_src_filter = 
   ${arduino_base.build_src_filter} -<nrf52/>
-upload_speed = 921600
+upload_speed = 115200
 debug_init_break = tbreak setup
+
 # Remove -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL for low level BLE logging.
 # See library directory for BLE logging possible values: .pio/libdeps/tbeam/NimBLE-Arduino/src/log_common/log_common.h
 # This overrides the BLE logging default of LOG_LEVEL_INFO (1) from: .pio/libdeps/tbeam/NimBLE-Arduino/src/esp_nimble_cfg.h

protobufs

@@ -1 +1 @@
-Subproject commit e5b5adc196d3593ab15c04101093443ab8b36c9c
+Subproject commit a7bbc358664c83f5148bae2a502cb294e7cafee5

src/DebugConfiguration.h

@@ -10,7 +10,7 @@
 #ifdef CONSOLE_MAX_BAUD
 #define SERIAL_BAUD CONSOLE_MAX_BAUD
 #else
-#define SERIAL_BAUD 921600 // Serial debug baud rate
+#define SERIAL_BAUD 115200 // Serial debug baud rate
 #endif
 
 #include "SerialConsole.h"

src/FSCommon.cpp

@@ -28,6 +28,34 @@ void listDir(const char * dirname, uint8_t levels)
 #endif
 }
 
+void rmDir(const char * dirname)
+#ifdef FSCom
+{
+    File root = FSCom.open(dirname);
+    if(!root){
+        return;
+    }
+    if(!root.isDirectory()){
+        return;
+    }
+
+    File file = root.openNextFile();
+    while(file){
+        if(file.isDirectory() && !String(file.name()).endsWith(".")) {
+            file.close();
+            rmDir(file.name());
+            FSCom.rmdir(file.name());
+        } else {
+            file.close();
+            FSCom.remove(file.name());
+        }
+        file.close();
+        file = root.openNextFile();
+    }
+    file.close();
+#endif
+}
+
 void fsInit()
 {
 #ifdef FSCom

src/FSCommon.h

@@ -27,3 +27,5 @@ using namespace Adafruit_LittleFS_Namespace;
 #endif
 
 void fsInit();
+void listDir(const char * dirname, uint8_t levels);
+void rmDir(const char * dirname);

src/PowerFSM.cpp

@@ -20,14 +20,14 @@ static bool isPowered()
 
     // If we are not a router and we already have AC power go to POWER state after init, otherwise go to ON
     // We assume routers might be powered all the time, but from a low current (solar) source
-    bool isLowPower = config.power.is_low_power || isRouter;
+    bool isPowerSavingMode = config.power.is_power_saving || isRouter;
 
     /* To determine if we're externally powered, assumptions
         1) If we're powered up and there's no battery, we must be getting power externally. (because we'd be dead otherwise)
 
         2) If we detect USB power from the power management chip, we must be getting power externally.
     */
-    return !isLowPower && powerStatus && (!powerStatus->getHasBattery() || powerStatus->getHasUSB());
+    return !isPowerSavingMode && powerStatus && (!powerStatus->getHasBattery() || powerStatus->getHasUSB());
 }
 
 static void sdsEnter()

src/esp32/ESP32CryptoEngine.cpp

@@ -49,7 +49,6 @@ class ESP32CryptoEngine : public CryptoEngine
      */
     virtual void encrypt(uint32_t fromNode, uint64_t packetId, size_t numBytes, uint8_t *bytes) override
     {
-        hexDump("before", bytes, numBytes, 16);
         if (key.length > 0) {
             uint8_t stream_block[16];
             static uint8_t scratch[MAX_BLOCKSIZE];
@@ -65,7 +64,6 @@ class ESP32CryptoEngine : public CryptoEngine
             auto res = mbedtls_aes_crypt_ctr(&aes, numBytes, &nc_off, nonce, stream_block, scratch, bytes);
             assert(!res);
         }
-        hexDump("after", bytes, numBytes, 16);
     }
 
     virtual void decrypt(uint32_t fromNode, uint64_t packetId, size_t numBytes, uint8_t *bytes) override

src/mesh/CryptoEngine.cpp

@@ -4,10 +4,6 @@
 void CryptoEngine::setKey(const CryptoKey &k)
 {
     DEBUG_MSG("Using AES%d key!\n", k.length * 8);
-    /* for(uint8_t i = 0; i < k.length; i++)
-        DEBUG_MSG("%02x ", k.bytes[i]);
-    DEBUG_MSG("\n"); */
-
     key = k;
 }
 
@@ -26,78 +22,6 @@ void CryptoEngine::decrypt(uint32_t fromNode, uint64_t packetId, size_t numBytes
     DEBUG_MSG("WARNING: noop decryption!\n");
 }
 
-// Usage:
-//     hexDump(desc, addr, len, perLine);
-//         desc:    if non-NULL, printed as a description before hex dump.
-//         addr:    the address to start dumping from.
-//         len:     the number of bytes to dump.
-//         perLine: number of bytes on each output line.
-
-void CryptoEngine::hexDump (const char * desc, const void * addr, const int len, int perLine)
-{
-    // Silently ignore silly per-line values.
-
-    if (perLine < 4 || perLine > 64) perLine = 16;
-
-    int i;
-    unsigned char buff[perLine+1];
-    const unsigned char * pc = (const unsigned char *)addr;
-
-    // Output description if given.
-
-    if (desc != NULL) DEBUG_MSG ("%s:\n", desc);
-
-    // Length checks.
-
-    if (len == 0) {
-        DEBUG_MSG("  ZERO LENGTH\n");
-        return;
-    }
-    if (len < 0) {
-        DEBUG_MSG("  NEGATIVE LENGTH: %d\n", len);
-        return;
-    }
-
-    // Process every byte in the data.
-
-    for (i = 0; i < len; i++) {
-        // Multiple of perLine means new or first line (with line offset).
-
-        if ((i % perLine) == 0) {
-            // Only print previous-line ASCII buffer for lines beyond first.
-
-            if (i != 0) DEBUG_MSG ("  %s\n", buff);
-
-            // Output the offset of current line.
-
-            DEBUG_MSG ("  %04x ", i);
-        }
-
-        // Now the hex code for the specific character.
-
-        DEBUG_MSG (" %02x", pc[i]);
-
-        // And buffer a printable ASCII character for later.
-
-        if ((pc[i] < 0x20) || (pc[i] > 0x7e)) // isprint() may be better.
-            buff[i % perLine] = '.';
-        else
-            buff[i % perLine] = pc[i];
-        buff[(i % perLine) + 1] = '\0';
-    }
-
-    // Pad out last line if not exactly perLine characters.
-
-    while ((i % perLine) != 0) {
-        DEBUG_MSG ("   ");
-        i++;
-    }
-
-    // And print the final ASCII buffer.
-
-    DEBUG_MSG ("  %s\n", buff);
-}
-
 /**
  * Init our 128 bit nonce for a new packet
  */
@@ -108,6 +32,4 @@ void CryptoEngine::initNonce(uint32_t fromNode, uint64_t packetId)
     // use memcpy to avoid breaking strict-aliasing
     memcpy(nonce, &packetId, sizeof(uint64_t));
     memcpy(nonce + sizeof(uint64_t), &fromNode, sizeof(uint32_t));
-    //*((uint64_t *)&nonce[0]) = packetId;
-    //*((uint32_t *)&nonce[8]) = fromNode;
 }

src/mesh/CryptoEngine.h

@@ -56,8 +56,6 @@ class CryptoEngine
      * a 32 bit block counter (starts at zero)
      */
     void initNonce(uint32_t fromNode, uint64_t packetId);
-
-    void hexDump(const char * desc, const void * addr, const int len, int perLine);
 };
 
 extern CryptoEngine *crypto;

src/mesh/NodeDB.cpp

@@ -48,7 +48,7 @@ DeviceState versions used to be defined in the .proto file but really only this
 #define here.
 */
 
-#define DEVICESTATE_CUR_VER 11
+#define DEVICESTATE_CUR_VER 13
 #define DEVICESTATE_MIN_VER DEVICESTATE_CUR_VER
 
 // FIXME - move this somewhere else
@@ -90,18 +90,17 @@ bool NodeDB::resetRadioConfig()
     // radioConfig.has_preferences = true;
     if (config.device.factory_reset) {
         DEBUG_MSG("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)
         installDefaultDeviceState();
+        // third, write to disk
+        saveToDisk();
 #ifndef NO_ESP32
         // This will erase what's in NVS including ssl keys, persistant variables and ble pairing
         nvs_flash_erase();
 #endif
 #ifdef NRF52_SERIES
-        // first, remove the "/prefs" (this removes most prefs)
-        FSCom.rmdir_r("/prefs");
-        // second, install default state (this will deal with the duplicate mac address issue)
-        installDefaultDeviceState();
-        // third, write to disk
-        saveToDisk();
         Bluefruit.begin();
         DEBUG_MSG("Clearing bluetooth bonds!\n");
         bond_print_list(BLE_GAP_ROLE_PERIPH);
@@ -146,6 +145,7 @@ bool NodeDB::resetRadioConfig()
 void NodeDB::installDefaultConfig()
 {
     memset(&config, 0, sizeof(LocalConfig));
+    config.version = DEVICESTATE_CUR_VER;
     config.has_device = true;
     config.has_display = true;
     config.has_lora = true;
@@ -165,6 +165,7 @@ void NodeDB::installDefaultConfig()
 void NodeDB::installDefaultModuleConfig()
 {
     memset(&moduleConfig, 0, sizeof(ModuleConfig));
+    moduleConfig.version = DEVICESTATE_CUR_VER;
     moduleConfig.has_canned_message = true;
     moduleConfig.has_external_notification = true;
     moduleConfig.has_mqtt = true;
@@ -174,21 +175,10 @@ void NodeDB::installDefaultModuleConfig()
     moduleConfig.has_telemetry = true;
 }
 
-// void NodeDB::installDefaultRadioConfig()
-// {
-//     memset(&radioConfig, 0, sizeof(radioConfig));
-//     radioConfig.has_preferences = true;
-//     resetRadioConfig();
-
-//     // for backward compat, default position flags are BAT+ALT+MSL (0x23 = 35)
-//     config.position.position_flags =
-//         (Config_PositionConfig_PositionFlags_POS_BATTERY | Config_PositionConfig_PositionFlags_POS_ALTITUDE |
-//          Config_PositionConfig_PositionFlags_POS_ALT_MSL);
-// }
-
 void NodeDB::installDefaultChannels()
 {
     memset(&channelFile, 0, sizeof(ChannelFile));
+    channelFile.version = DEVICESTATE_CUR_VER;
 }
 
 void NodeDB::installDefaultDeviceState()
@@ -215,7 +205,7 @@ void NodeDB::installDefaultDeviceState()
     // Set default owner name
     pickNewNodeNum(); // based on macaddr now
     sprintf(owner.long_name, "Unknown %02x%02x", ourMacAddr[4], ourMacAddr[5]);
-    sprintf(owner.short_name, "?%02X", (unsigned)(myNodeInfo.my_node_num & 0xff));
+    sprintf(owner.short_name, "%02x%02x", ourMacAddr[4], ourMacAddr[5]);
 
     sprintf(owner.id, "!%08x", getNodeNum()); // Default node ID now based on nodenum
     memcpy(owner.macaddr, ourMacAddr, sizeof(owner.macaddr));
@@ -346,21 +336,54 @@ void NodeDB::loadFromDisk()
         if (devicestate.version < DEVICESTATE_MIN_VER) {
             DEBUG_MSG("Warn: devicestate %d is old, discarding\n", devicestate.version);
             installDefaultDeviceState();
+#ifndef NO_ESP32
+        // This will erase what's in NVS including ssl keys, persistant variables and ble pairing
+        nvs_flash_erase();
+#endif
+#ifdef NRF52_SERIES
+        Bluefruit.begin();
+        DEBUG_MSG("Clearing bluetooth bonds!\n");
+        bond_print_list(BLE_GAP_ROLE_PERIPH);
+        bond_print_list(BLE_GAP_ROLE_CENTRAL);
+        Bluefruit.Periph.clearBonds();
+        Bluefruit.Central.clearBonds();
+#endif
         } else {
-            DEBUG_MSG("Loaded saved preferences version %d\n", devicestate.version);
+            DEBUG_MSG("Loaded saved devicestate version %d\n", devicestate.version);
         }
     }
 
     if (!loadProto(configfile, LocalConfig_size, sizeof(LocalConfig), LocalConfig_fields, &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);
+            installDefaultConfig();
+        } else {
+            DEBUG_MSG("Loaded saved config version %d\n", config.version);
+        }
     }
 
     if (!loadProto(moduleConfigfile, LocalModuleConfig_size, sizeof(LocalModuleConfig), LocalModuleConfig_fields, &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);
+            installDefaultModuleConfig();
+        } else {
+            DEBUG_MSG("Loaded saved moduleConfig version %d\n", moduleConfig.version);
+        }
     }
 
     if (!loadProto(channelfile, ChannelFile_size, sizeof(ChannelFile), ChannelFile_fields, &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);
+            installDefaultChannels();
+        } else {
+            DEBUG_MSG("Loaded saved channelFile version %d\n", channelFile.version);
+        }
     }
 }
 

src/mesh/NodeDB.h

@@ -138,7 +138,7 @@ extern NodeDB nodeDB;
 /*
   If is_router is set, we use a number of different default values
 
-        # FIXME - after tuning, move these params into the on-device defaults based on is_router and is_low_power
+        # FIXME - after tuning, move these params into the on-device defaults based on is_router and is_power_saving
 
         # prefs.position_broadcast_secs = FIXME possibly broadcast only once an hr
         prefs.wait_bluetooth_secs = 1  # Don't stay in bluetooth mode
@@ -152,7 +152,7 @@ extern NodeDB nodeDB;
         # get a new GPS position once per day
         prefs.gps_update_interval = oneday
 
-        prefs.is_low_power = True
+        prefs.is_power_saving = True
 
         # allow up to five minutes for each new GPS lock attempt
         prefs.gps_attempt_time = 300

src/mesh/RadioInterface.cpp

@@ -159,61 +159,50 @@ uint32_t RadioInterface::getPacketTime(MeshPacket *p)
 /** The delay to use for retransmitting dropped packets */
 uint32_t RadioInterface::getRetransmissionMsec(const MeshPacket *p)
 {
-    assert(shortPacketMsec); // Better be non zero
+    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);
     uint32_t packetAirtime = getPacketTime(numbytes + sizeof(PacketHeader));
-    uint32_t tCADmsec = 2 * (1 << sf) / bw; // duration of CAD is roughly 2 symbols according to SX127x datasheet 
+    // Make sure enough time has elapsed for this packet to be sent and an ACK is received. 
-    /* 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);
-     * Right now we have to wait until another node floods the same packet, as that is our implicit ACK.
+    float channelUtil = airTime->channelUtilizationPercent();
-     * TODO: Revise when want_ack will be used (right now it is always set to 0 afterwards).
+    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
-    return 2*packetAirtime + 2*MIN_TX_WAIT_MSEC + shortPacketMsec + shortPacketMsec*2 + PROCESSING_TIME_MSEC + 2*tCADmsec;
+    return 2*packetAirtime + (pow(2, CWsize) + pow(2, int((CWmax+CWmin)/2))) * slotTimeMsec + PROCESSING_TIME_MSEC;
 }
 
-/** The delay to use when we want to send something but the ether is busy */
+/** The delay to use when we want to send something */
 uint32_t RadioInterface::getTxDelayMsec()
 {
-    /** At the low end we want to pick a delay large enough that anyone who just completed sending (some other node)
+    /** We wait a random multiple of 'slotTimes' (see definition in header file) in order to avoid collisions.
-     * has had enough time to switch their radio back into receive mode.
+    The pool to take a random multiple from is the contention window (CW), which size depends on the 
-     */
+    current channel utilization. */
-    const uint32_t MIN_TX_WAIT_MSEC = 100;
+    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);
-     * At the high end, this value is used to spread node attempts across time so when they are replying to a packet
+    return random(0, pow(2, CWsize)) * slotTimeMsec;
-     * they don't both check that the airwaves are clear at the same moment.  As long as they are off by some amount
-     * one of the two will be first to start transmitting and the other will see that.  I bet 500ms is more than enough
-     * to guarantee this.
-     */
-    // const uint32_t MAX_TX_WAIT_MSEC = 2000; // stress test would still fail occasionally with 1000
-
-    return random((MIN_TX_WAIT_MSEC), (MIN_TX_WAIT_MSEC + shortPacketMsec));
 }
 
-/** The delay to use when we want to send something but the ether is busy */
+/** The delay to use when we want to flood a message */
 uint32_t RadioInterface::getTxDelayMsecWeighted(float snr)
 {
-    /** At the low end we want to pick a delay large enough that anyone who just completed sending (some other node)
-     * has had enough time to switch their radio back into receive mode.
-     */
-    const uint32_t MIN_TX_WAIT_MSEC = 100;
-
     // The minimum value for a LoRa SNR
     const uint32_t SNR_MIN = -20;
 
     // The maximum value for a LoRa SNR
     const uint32_t SNR_MAX = 15;
 
-    //  high SNR = Long Delay
+    //  high SNR = large CW size (Long Delay)
-    //  low SNR = Short Delay
+    //  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);
     if (config.device.role == Config_DeviceConfig_Role_Router ||
         config.device.role == Config_DeviceConfig_Role_RouterClient) {
-        delay = map(snr, SNR_MIN, SNR_MAX, MIN_TX_WAIT_MSEC, (MIN_TX_WAIT_MSEC + (shortPacketMsec / 2)));
+        delay = random(0, 2*CWsize) * slotTimeMsec;
         DEBUG_MSG("rx_snr found in packet. As a router, setting tx delay:%d\n", delay);
     } else {
-        delay = map(snr, SNR_MIN, SNR_MAX, MIN_TX_WAIT_MSEC + (shortPacketMsec / 2), (MIN_TX_WAIT_MSEC + shortPacketMsec * 2));
+        delay = random(0, pow(2, CWsize)) * slotTimeMsec;
         DEBUG_MSG("rx_snr found in packet. Setting tx delay:%d\n", delay);
     }
 
@@ -411,9 +400,14 @@ void RadioInterface::applyModemConfig()
     }
 
     power = loraConfig.tx_power;
-    shortPacketMsec = getPacketTime(sizeof(PacketHeader));
     assert(myRegion); // Should have been found in init
 
+    if ((power == 0) || (power > myRegion->powerLimit))
+        power = myRegion->powerLimit;
+
+    if (power == 0)
+        power = 17; // Default to default power if we don't have a valid power
+    
     // Calculate the number of channels
     uint32_t numChannels = floor((myRegion->freqEnd - myRegion->freqStart) / (myRegion->spacing + (bw / 1000)));
 
@@ -431,7 +425,7 @@ void RadioInterface::applyModemConfig()
     DEBUG_MSG("Radio myRegion->numChannels: %d\n", numChannels);
     DEBUG_MSG("Radio channel_num: %d\n", channel_num);
     DEBUG_MSG("Radio frequency: %f\n", getFreq());
-    DEBUG_MSG("Short packet time: %u msec\n", shortPacketMsec);
+    DEBUG_MSG("Slot time: %u msec\n", slotTimeMsec);
 }
 
 /**

src/mesh/RadioInterface.h

@@ -52,8 +52,6 @@ class RadioInterface
     CallbackObserver<RadioInterface, void *> notifyDeepSleepObserver =
         CallbackObserver<RadioInterface, void *>(this, &RadioInterface::notifyDeepSleepCb);
 
-    /// Number of msecs we expect our shortest actual packet to be over the wire (used in retry timeout calcs)
-    uint32_t shortPacketMsec;
 
   protected:
     bool disabled = false;
@@ -61,10 +59,16 @@ class RadioInterface
     float bw = 125;
     uint8_t sf = 9;
     uint8_t cr = 7;
-
+    /** Slottime is the minimum time to wait, consisting of: 
+      - CAD duration (maximum of SX126x and SX127x);  
+      - roundtrip air propagation time (assuming max. 30km between nodes); 
+      - Tx/Rx turnaround time (maximum of SX126x and SX127x);
+      - MAC processing time (measured on T-beam) */
+    uint32_t slotTimeMsec = 8.5 * pow(2, sf)/bw + 0.2 + 0.4 + 7;
     uint16_t preambleLength = 32; // 8 is default, but we use longer to increase the amount of sleep time when receiving
-    const uint32_t MIN_TX_WAIT_MSEC = 100;  // minimum time to wait before transmitting after sensing the channel in ms 
     const uint32_t PROCESSING_TIME_MSEC = 4500;  // time to construct, process and construct a packet again (empirically determined)
+    const uint8_t CWmin = 2;  // minimum CWsize
+    const uint8_t CWmax = 8;  // maximum CWsize 
 
     MeshPacket *sendingPacket = NULL; // The packet we are currently sending
     uint32_t lastTxStart = 0L;
@@ -128,10 +132,10 @@ class RadioInterface
     /** The delay to use for retransmitting dropped packets */
     uint32_t getRetransmissionMsec(const MeshPacket *p);
 
-    /** The delay to use when we want to send something but the ether is busy */
+    /** The delay to use when we want to send something */
     uint32_t getTxDelayMsec();
 
-    /** The delay to use when we want to send something but the ether is busy. Use a weighted scale based on SNR */
+    /** The delay to use when we want to flood a message. Use a weighted scale based on SNR */
     uint32_t getTxDelayMsecWeighted(float snr);
 
 

src/mesh/RadioLibInterface.cpp

@@ -11,6 +11,8 @@
 // FIXME, we default to 4MHz SPI, SPI mode 0, check if the datasheet says it can really do that
 static SPISettings spiSettings(4000000, MSBFIRST, SPI_MODE0);
 
+#ifdef PORTDUINO
+
 void LockingModule::SPItransfer(uint8_t cmd, uint8_t reg, uint8_t *dataOut, uint8_t *dataIn, uint8_t numBytes)
 {
     concurrency::LockGuard g(spiLock);
@@ -18,6 +20,24 @@ void LockingModule::SPItransfer(uint8_t cmd, uint8_t reg, uint8_t *dataOut, uint
     Module::SPItransfer(cmd, reg, dataOut, dataIn, numBytes);
 }
 
+#else
+
+void LockingModule::SPIbeginTransaction()
+{
+    spiLock->lock();
+
+    Module::SPIbeginTransaction();
+}
+
+void LockingModule::SPIendTransaction()
+{
+    spiLock->unlock();
+
+    Module::SPIendTransaction();
+}
+
+#endif
+
 RadioLibInterface::RadioLibInterface(RADIOLIB_PIN_TYPE cs, RADIOLIB_PIN_TYPE irq, RADIOLIB_PIN_TYPE rst, RADIOLIB_PIN_TYPE busy,
                                      SPIClass &spi, PhysicalLayer *_iface)
     : NotifiedWorkerThread("RadioIf"), module(cs, irq, rst, busy, spi, spiSettings), iface(_iface)
@@ -170,17 +190,11 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
     }
 
     /** radio helper thread callback.
-
+    We never immediately transmit after any operation (either Rx or Tx). Instead we should wait a random multiple of 
-    We never immediately transmit after any operation (either rx or tx).  Instead we should start receiving and
+    'slotTimes' (see definition in RadioInterface.h) taken from a contention window (CW) to lower the chance of collision. 
-    wait a random delay of 100ms to 100ms+shortPacketMsec to make sure we are not stomping on someone else.  The 100ms delay
+    The CW size is determined by setTransmitDelay() and depends either on the current channel utilization or SNR in case 
-    at the beginning ensures all possible listeners have had time to finish processing the previous packet and now have their
+    of a flooding message. After this, we perform channel activity detection (CAD) and reset the transmit delay if it is
-    radio in RX state.  The up to 100ms+shortPacketMsec random delay gives a chance for all possible senders to have high odds
+    currently active. 
-    of detecting that someone else started transmitting first and then they will wait until that packet finishes.
-
-    NOTE: the large flood rebroadcast delay might still be needed even with this approach.  Because we might not be able to
-    hear other transmitters that we are potentially stomping on.  Requires further thought.
-
-    FIXME, the MIN_TX_WAIT_MSEC and MAX_TX_WAIT_MSEC values should be tuned via logic analyzer later.
     */
     void RadioLibInterface::onNotify(uint32_t notification)
     {

src/mesh/RadioLibInterface.h

@@ -41,20 +41,12 @@ class LockingModule : public Module
     {
     }
     
-    /*!
+#ifdef PORTDUINO
-    \brief SPI single transfer method.
+    void SPItransfer(uint8_t cmd, uint8_t reg, uint8_t *dataOut, uint8_t *dataIn, uint8_t numBytes) override;
-
+#else
-    \param cmd SPI access command (read/write/burst/...).
+    void SPIbeginTransaction() override;
-
+    void SPIendTransaction() override;
-    \param reg Address of SPI register to transfer to/from.
+#endif
-
-    \param dataOut Data that will be transfered from master to slave.
-
-    \param dataIn Data that was transfered from slave to master.
-
-    \param numBytes Number of bytes to transfer.
-    */
-    virtual void SPItransfer(uint8_t cmd, uint8_t reg, uint8_t *dataOut, uint8_t *dataIn, uint8_t numBytes);
 };
 
 class RadioLibInterface : public RadioInterface, protected concurrency::NotifiedWorkerThread

src/mesh/generated/config.pb.h

@@ -125,10 +125,9 @@ typedef struct _Config_PositionConfig {
 
 typedef struct _Config_PowerConfig { 
     Config_PowerConfig_ChargeCurrent charge_current; 
-    bool is_low_power; 
+    bool is_power_saving; 
     bool is_always_powered; 
     uint32_t on_battery_shutdown_after_secs; 
-    bool is_power_saving; 
     float adc_multiplier_override; 
     uint32_t wait_bluetooth_secs; 
     uint32_t mesh_sds_timeout_secs; 
@@ -192,14 +191,14 @@ extern "C" {
 #define Config_init_default                      {0, {Config_DeviceConfig_init_default}}
 #define Config_DeviceConfig_init_default         {_Config_DeviceConfig_Role_MIN, 0, 0, 0, ""}
 #define Config_PositionConfig_init_default       {0, 0, 0, 0, 0, 0, 0}
-#define Config_PowerConfig_init_default          {_Config_PowerConfig_ChargeCurrent_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define Config_PowerConfig_init_default          {_Config_PowerConfig_ChargeCurrent_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define Config_WiFiConfig_init_default           {"", "", 0, 0}
 #define Config_DisplayConfig_init_default        {0, _Config_DisplayConfig_GpsCoordinateFormat_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}}
 #define Config_init_zero                         {0, {Config_DeviceConfig_init_zero}}
 #define Config_DeviceConfig_init_zero            {_Config_DeviceConfig_Role_MIN, 0, 0, 0, ""}
 #define Config_PositionConfig_init_zero          {0, 0, 0, 0, 0, 0, 0}
-#define Config_PowerConfig_init_zero             {_Config_PowerConfig_ChargeCurrent_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
+#define Config_PowerConfig_init_zero             {_Config_PowerConfig_ChargeCurrent_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0}
 #define Config_WiFiConfig_init_zero              {"", "", 0, 0}
 #define Config_DisplayConfig_init_zero           {0, _Config_DisplayConfig_GpsCoordinateFormat_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}}
@@ -231,10 +230,9 @@ extern "C" {
 #define Config_PositionConfig_gps_attempt_time_tag 7
 #define Config_PositionConfig_position_flags_tag 10
 #define Config_PowerConfig_charge_current_tag    1
-#define Config_PowerConfig_is_low_power_tag      2
+#define Config_PowerConfig_is_power_saving_tag   2
 #define Config_PowerConfig_is_always_powered_tag 3
 #define Config_PowerConfig_on_battery_shutdown_after_secs_tag 4
-#define Config_PowerConfig_is_power_saving_tag   5
 #define Config_PowerConfig_adc_multiplier_override_tag 6
 #define Config_PowerConfig_wait_bluetooth_secs_tag 7
 #define Config_PowerConfig_mesh_sds_timeout_secs_tag 9
@@ -291,10 +289,9 @@ X(a, STATIC,   SINGULAR, UINT32,   position_flags,   10)
 
 #define Config_PowerConfig_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UENUM,    charge_current,    1) \
-X(a, STATIC,   SINGULAR, BOOL,     is_low_power,      2) \
+X(a, STATIC,   SINGULAR, BOOL,     is_power_saving,   2) \
 X(a, STATIC,   SINGULAR, BOOL,     is_always_powered,   3) \
 X(a, STATIC,   SINGULAR, UINT32,   on_battery_shutdown_after_secs,   4) \
-X(a, STATIC,   SINGULAR, BOOL,     is_power_saving,   5) \
 X(a, STATIC,   SINGULAR, FLOAT,    adc_multiplier_override,   6) \
 X(a, STATIC,   SINGULAR, UINT32,   wait_bluetooth_secs,   7) \
 X(a, STATIC,   SINGULAR, UINT32,   mesh_sds_timeout_secs,   9) \
@@ -355,7 +352,7 @@ extern const pb_msgdesc_t Config_LoRaConfig_msg;
 #define Config_DisplayConfig_size                14
 #define Config_LoRaConfig_size                   67
 #define Config_PositionConfig_size               30
-#define Config_PowerConfig_size                  49
+#define Config_PowerConfig_size                  47
 #define Config_WiFiConfig_size                   103
 #define Config_size                              105
 

src/mesh/generated/deviceonly.pb.h

@@ -28,6 +28,10 @@ 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
@@ -93,14 +97,15 @@ extern "C" {
 
 /* 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}
-#define ChannelFile_init_default                 {0, {Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default}}
+#define ChannelFile_init_default                 {0, {Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default, Channel_init_default}, 0}
 #define OEMStore_init_default                    {0, 0, {0, {0}}, _ScreenFonts_MIN, ""}
 #define DeviceState_init_zero                    {false, MyNodeInfo_init_zero, false, User_init_zero, 0, {NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero, NodeInfo_init_zero}, 0, {MeshPacket_init_zero}, false, MeshPacket_init_zero, 0, 0, 0}
-#define ChannelFile_init_zero                    {0, {Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero}}
+#define ChannelFile_init_zero                    {0, {Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero, Channel_init_zero}, 0}
 #define OEMStore_init_zero                       {0, 0, {0, {0}}, _ScreenFonts_MIN, ""}
 
 /* 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
@@ -134,7 +139,8 @@ X(a, STATIC,   SINGULAR, BOOL,     did_gps_reset,    11)
 #define DeviceState_rx_text_message_MSGTYPE MeshPacket
 
 #define ChannelFile_FIELDLIST(X, a) \
-X(a, STATIC,   REPEATED, MESSAGE,  channels,          1)
+X(a, STATIC,   REPEATED, MESSAGE,  channels,          1) \
+X(a, STATIC,   SINGULAR, UINT32,   version,           2)
 #define ChannelFile_CALLBACK NULL
 #define ChannelFile_DEFAULT NULL
 #define ChannelFile_channels_MSGTYPE Channel
@@ -158,7 +164,7 @@ extern const pb_msgdesc_t OEMStore_msg;
 #define OEMStore_fields &OEMStore_msg
 
 /* Maximum encoded size of messages (where known) */
-#define ChannelFile_size                         624
+#define ChannelFile_size                         630
 #define DeviceState_size                         23728
 #define OEMStore_size                            2106
 

src/mesh/generated/localonly.pb.h

@@ -13,48 +13,56 @@
 
 /* Struct definitions */
 typedef struct _LocalConfig { 
-    /* TODO: REPLACE */
+    /* The part of the config that is specific to the Device */
     bool has_device;
     Config_DeviceConfig device; 
-    /* TODO: REPLACE */
+    /* The part of the config that is specific to the GPS Position */
     bool has_position;
     Config_PositionConfig position; 
-    /* TODO: REPLACE */
+    /* The part of the config that is specific to the Power settings */
     bool has_power;
     Config_PowerConfig power; 
-    /* TODO: REPLACE */
+    /* The part of the config that is specific to the Wifi Settings */
     bool has_wifi;
     Config_WiFiConfig wifi; 
-    /* TODO: REPLACE */
+    /* The part of the config that is specific to the Display */
     bool has_display;
     Config_DisplayConfig display; 
-    /* TODO: REPLACE */
+    /* The part of the config that is specific to the Lora Radio */
     bool has_lora;
     Config_LoRaConfig lora; 
+    /* 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; 
 } LocalConfig;
 
 typedef struct _LocalModuleConfig { 
-    /* TODO: REPLACE */
+    /* The part of the config that is specific to the MQTT module */
     bool has_mqtt;
     ModuleConfig_MQTTConfig mqtt; 
-    /* TODO: REPLACE */
+    /* The part of the config that is specific to the Serial module */
     bool has_serial;
     ModuleConfig_SerialConfig serial; 
-    /* TODO: REPLACE */
+    /* The part of the config that is specific to the ExternalNotification module */
     bool has_external_notification;
     ModuleConfig_ExternalNotificationConfig external_notification; 
-    /* TODO: REPLACE */
+    /* The part of the config that is specific to the Store & Forward module */
     bool has_store_forward;
     ModuleConfig_StoreForwardConfig store_forward; 
-    /* TODO: REPLACE */
+    /* The part of the config that is specific to the RangeTest module */
     bool has_range_test;
     ModuleConfig_RangeTestConfig range_test; 
-    /* TODO: REPLACE */
+    /* The part of the config that is specific to the Telemetry module */
     bool has_telemetry;
     ModuleConfig_TelemetryConfig telemetry; 
-    /* TODO: REPLACE */
+    /* The part of the config that is specific to the Canned Message module */
     bool has_canned_message;
     ModuleConfig_CannedMessageConfig canned_message; 
+    /* 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; 
 } LocalModuleConfig;
 
 
@@ -63,10 +71,10 @@ extern "C" {
 #endif
 
 /* 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_WiFiConfig_init_default, false, Config_DisplayConfig_init_default, false, Config_LoRaConfig_init_default}
+#define LocalConfig_init_default                 {false, Config_DeviceConfig_init_default, false, Config_PositionConfig_init_default, false, Config_PowerConfig_init_default, false, Config_WiFiConfig_init_default, false, Config_DisplayConfig_init_default, false, Config_LoRaConfig_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}
+#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}
-#define LocalConfig_init_zero                    {false, Config_DeviceConfig_init_zero, false, Config_PositionConfig_init_zero, false, Config_PowerConfig_init_zero, false, Config_WiFiConfig_init_zero, false, Config_DisplayConfig_init_zero, false, Config_LoRaConfig_init_zero}
+#define LocalConfig_init_zero                    {false, Config_DeviceConfig_init_zero, false, Config_PositionConfig_init_zero, false, Config_PowerConfig_init_zero, false, Config_WiFiConfig_init_zero, false, Config_DisplayConfig_init_zero, false, Config_LoRaConfig_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}
+#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}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define LocalConfig_device_tag                   1
@@ -75,6 +83,7 @@ extern "C" {
 #define LocalConfig_wifi_tag                     4
 #define LocalConfig_display_tag                  5
 #define LocalConfig_lora_tag                     6
+#define LocalConfig_version_tag                  7
 #define LocalModuleConfig_mqtt_tag               1
 #define LocalModuleConfig_serial_tag             2
 #define LocalModuleConfig_external_notification_tag 3
@@ -82,6 +91,7 @@ extern "C" {
 #define LocalModuleConfig_range_test_tag         5
 #define LocalModuleConfig_telemetry_tag          6
 #define LocalModuleConfig_canned_message_tag     7
+#define LocalModuleConfig_version_tag            8
 
 /* Struct field encoding specification for nanopb */
 #define LocalConfig_FIELDLIST(X, a) \
@@ -90,7 +100,8 @@ X(a, STATIC,   OPTIONAL, MESSAGE,  position,          2) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  power,             3) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  wifi,              4) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  display,           5) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  lora,              6)
+X(a, STATIC,   OPTIONAL, MESSAGE,  lora,              6) \
+X(a, STATIC,   SINGULAR, UINT32,   version,           7)
 #define LocalConfig_CALLBACK NULL
 #define LocalConfig_DEFAULT NULL
 #define LocalConfig_device_MSGTYPE Config_DeviceConfig
@@ -107,7 +118,8 @@ X(a, STATIC,   OPTIONAL, MESSAGE,  external_notification,   3) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  store_forward,     4) \
 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,   OPTIONAL, MESSAGE,  canned_message,    7) \
+X(a, STATIC,   SINGULAR, UINT32,   version,           8)
 #define LocalModuleConfig_CALLBACK NULL
 #define LocalModuleConfig_DEFAULT NULL
 #define LocalModuleConfig_mqtt_MSGTYPE ModuleConfig_MQTTConfig
@@ -126,8 +138,8 @@ extern const pb_msgdesc_t LocalModuleConfig_msg;
 #define LocalModuleConfig_fields &LocalModuleConfig_msg
 
 /* Maximum encoded size of messages (where known) */
-#define LocalConfig_size                         317
+#define LocalConfig_size                         321
-#define LocalModuleConfig_size                   282
+#define LocalModuleConfig_size                   288
 
 #ifdef __cplusplus
 } /* extern "C" */

src/mesh/generated/mesh.pb.h

@@ -4,6 +4,7 @@
 #ifndef PB_MESH_PB_H_INCLUDED
 #define PB_MESH_PB_H_INCLUDED
 #include <pb.h>
+#include "localonly.pb.h"
 #include "portnums.pb.h"
 #include "telemetry.pb.h"
 
@@ -630,6 +631,7 @@ typedef struct _FromRadio {
     union {
         MyNodeInfo my_info;
         NodeInfo node_info;
+        LocalConfig config;
         LogRecord log_record;
         uint32_t config_complete_id;
         bool rebooted;
@@ -819,6 +821,7 @@ extern "C" {
 #define FromRadio_id_tag                         1
 #define FromRadio_my_info_tag                    3
 #define FromRadio_node_info_tag                  4
+#define FromRadio_config_tag                     6
 #define FromRadio_log_record_tag                 7
 #define FromRadio_config_complete_id_tag         8
 #define FromRadio_rebooted_tag                   9
@@ -968,6 +971,7 @@ X(a, STATIC,   SINGULAR, UENUM,    level,             4)
 X(a, STATIC,   SINGULAR, UINT32,   id,                1) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payloadVariant,my_info,my_info),   3) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payloadVariant,node_info,node_info),   4) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payloadVariant,config,config),   6) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payloadVariant,log_record,log_record),   7) \
 X(a, STATIC,   ONEOF,    UINT32,   (payloadVariant,config_complete_id,config_complete_id),   8) \
 X(a, STATIC,   ONEOF,    BOOL,     (payloadVariant,rebooted,rebooted),   9) \
@@ -976,6 +980,7 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payloadVariant,packet,packet),  11)
 #define FromRadio_DEFAULT NULL
 #define FromRadio_payloadVariant_my_info_MSGTYPE MyNodeInfo
 #define FromRadio_payloadVariant_node_info_MSGTYPE NodeInfo
+#define FromRadio_payloadVariant_config_MSGTYPE LocalConfig
 #define FromRadio_payloadVariant_log_record_MSGTYPE LogRecord
 #define FromRadio_payloadVariant_packet_MSGTYPE MeshPacket
 

src/mesh/generated/module_config.pb.h

@@ -115,7 +115,7 @@ typedef struct _ModuleConfig_TelemetryConfig {
     uint32_t environment_sensor_pin; 
 } ModuleConfig_TelemetryConfig;
 
-/* TODO: REPLACE */
+/* Module Config */
 typedef struct _ModuleConfig { 
     /* TODO: REPLACE */
     pb_size_t which_payloadVariant;

src/nrf52/NRF52CryptoEngine.cpp

@@ -16,7 +16,6 @@ class NRF52CryptoEngine : public CryptoEngine
      */
     virtual void encrypt(uint32_t fromNode, uint64_t packetId, size_t numBytes, uint8_t *bytes) override
     {
-        hexDump("before", bytes, numBytes, 16);
         if (key.length > 16) {
             DEBUG_MSG("Software encrypt fr=%x, num=%x, numBytes=%d!\n", fromNode, (uint32_t) packetId, numBytes);
             AES_ctx ctx;
@@ -28,7 +27,6 @@ class NRF52CryptoEngine : public CryptoEngine
             nRFCrypto.begin();
             nRFCrypto_AES ctx;
             uint8_t myLen = ctx.blockLen(numBytes);
-            DEBUG_MSG("nRF52 encBuf myLen=%d!\n", myLen);
             char encBuf[myLen] = {0};
             initNonce(fromNode, packetId);
             ctx.begin();
@@ -37,33 +35,12 @@ class NRF52CryptoEngine : public CryptoEngine
             nRFCrypto.end();
             memcpy(bytes, encBuf, numBytes);
         }
-        hexDump("after", bytes, numBytes, 16);
     }
 
     virtual void decrypt(uint32_t fromNode, uint64_t packetId, size_t numBytes, uint8_t *bytes) override
     {
-        hexDump("before", bytes, numBytes, 16);
+        // For CTR, the implementation is the same
-        if (key.length > 16) {
+        encrypt(fromNode, packetId, numBytes, bytes);
-            DEBUG_MSG("Software decrypt fr=%x, num=%x, numBytes=%d!\n", fromNode, (uint32_t) packetId, numBytes);
-            AES_ctx ctx;
-            initNonce(fromNode, packetId);
-            AES_init_ctx_iv(&ctx, key.bytes, nonce);
-            AES_CTR_xcrypt_buffer(&ctx, bytes, numBytes);
-        } else if (key.length > 0) {
-            DEBUG_MSG("nRF52 decrypt fr=%x, num=%x, numBytes=%d!\n", fromNode, (uint32_t) packetId, numBytes);
-            nRFCrypto.begin();
-            nRFCrypto_AES ctx;
-            uint8_t myLen = ctx.blockLen(numBytes);
-            DEBUG_MSG("nRF52 decBuf myLen=%d!\n", myLen);
-            char decBuf[myLen] = {0};
-            initNonce(fromNode, packetId);
-            ctx.begin();
-            ctx.Process((char*)bytes, numBytes, nonce, key.bytes, key.length, decBuf, ctx.decryptFlag, ctx.ctrMode);
-            ctx.end();
-            nRFCrypto.end();
-            memcpy(bytes, decBuf, numBytes);
-        }
-        hexDump("after", bytes, numBytes, 16);
     }
 
   private:

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 1
 minor = 3
-build = 16
+build = 19