Bump version to 1.2.49

Updated formula for position plugin & Improve time to generate the SSL certificate

.github/workflows/release.yml

@@ -4,12 +4,12 @@ on:
   # workflow_dispatch:
   #  inputs:
 
-  # Only want to be run if a new tag starting with v is pushed.
+  # Only want to run if version.properties is bumped in master
   push:
     branches:
-      - "!*"
-    tags:
-      - "v1*"
+      - master
+    paths:
+    - 'version.properties'
 
 jobs:
   release-build:
@@ -21,19 +21,15 @@ jobs:
       with:
         submodules: 'recursive'
 
-    # get github branch and tag names as ${{ steps.branch_name.outputs.SOURCE_TAG }}
-    - name: Branch name
-      id: branch_name
-      run: |
-        echo ::set-output name=SOURCE_NAME::${GITHUB_REF#refs/*/}
-        echo ::set-output name=SOURCE_BRANCH::${GITHUB_REF#refs/heads/}
-        echo ::set-output name=SOURCE_TAG::${GITHUB_REF#refs/tags/}
-
     - name: Setup Python
       uses: actions/setup-python@v2
       with:
         python-version: 3.x
-
+        
+    # Will be available in steps.version.outputs.version	
+    - name: Get release version string
+      run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
+      id: version
     # Note: we don't use caches on release builds because we don't want to accidentally not have a virgin build machine
 
     - name: Upgrade python tools
@@ -60,11 +56,6 @@ jobs:
         tar -xf build.tar -C data/static
         rm build.tar
 
-    # Will be available in steps.version.outputs.version
-    - name: Get version string
-      run: echo "::set-output name=version::$(./bin/buildinfo.py long)"
-      id: version
-
     - name: Build everything
       run: bin/build-all.sh
 
@@ -75,8 +66,7 @@ jobs:
         draft: true
         prerelease: true
         release_name: ${{ steps.version.outputs.version }} alpha
-        tag_name: ${{ steps.branch_name.outputs.SOURCE_TAG }}
-        # was ${{ github.ref }}
+        tag_name: v${{ steps.version.outputs.version }}
         body: |
           Autogenerated by github action, developer should edit as required before publishing...
       env:
@@ -100,4 +90,4 @@ jobs:
         upload_url: ${{ steps.create_release.outputs.upload_url }}
         asset_path: release/archive/elfs-${{ steps.version.outputs.version }}.zip
         asset_name: debug-elfs-${{ steps.version.outputs.version }}.zip
-        asset_content_type: application/zip        
+        asset_content_type: application/zip

bin/build-all.sh

@@ -5,11 +5,11 @@ set -e
 VERSION=`bin/buildinfo.py long`
 SHORT_VERSION=`bin/buildinfo.py short`
 
-BOARDS_ESP32="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v2.0 heltec-v2.1 tbeam0.7"
+BOARDS_ESP32="tlora-v2 tlora-v1 tlora_v1_3 tlora-v2-1-1.6 tbeam heltec-v2.0 heltec-v2.1 tbeam0.7 meshtastic-diy-v1"
 #BOARDS_ESP32=tbeam
 
 # FIXME note nrf52840dk build is for some reason only generating a BIN file but not a HEX file nrf52840dk-geeksville is fine
-BOARDS_NRF52="rak4631 t-echo"
+BOARDS_NRF52="rak4631_5005 rak4631_19003 t-echo"
 #BOARDS_NRF52=""
 
 OUTDIR=release/latest

platformio.ini

@@ -325,12 +325,21 @@ monitor_speed = 115200
 # board_build.ldscript = linker/nrf52840_s140_sim832.ld
 
 ; The very slick RAK wireless RAK 4631 / 4630 board
-[env:rak4631]
+[env:rak4631_5005]
 extends = nrf52840_base
 board = wiscore_rak4631
 # add our variants files to the include and src paths
 # define build flags for the TFT_eSPI library
-build_flags = ${nrf52840_base.build_flags} -Ivariants/WisCore_RAK4631_Board
+build_flags = ${nrf52840_base.build_flags} -Ivariants/WisCore_RAK4631_Board -D RAK_BASE_5005
+src_filter = ${nrf52_base.src_filter} +<../variants/WisCore_RAK4631_Board>
+debug_tool = jlink
+
+[env:rak4631_19003]
+extends = nrf52840_base
+board = wiscore_rak4631
+# add our variants files to the include and src paths
+# define build flags for the TFT_eSPI library
+build_flags = ${nrf52840_base.build_flags} -Ivariants/WisCore_RAK4631_Board -D RAK_BASE_19003
 src_filter = ${nrf52_base.src_filter} +<../variants/WisCore_RAK4631_Board>
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)

src/PowerFSM.cpp

@@ -37,6 +37,14 @@ static void sdsEnter()
     doDeepSleep(getPref_sds_secs() * 1000LL);
 }
 
+extern Power *power;
+
+static void shutdownEnter()
+{
+    DEBUG_MSG("Enter state: SHUTDOWN\n");
+    power->shutdown();
+}
+
 #include "error.h"
 
 static uint32_t secsSlept;
@@ -217,6 +225,7 @@ static void bootEnter() {
     DEBUG_MSG("Enter state: BOOT\n");
 }
 
+State stateSHUTDOWN(shutdownEnter, NULL, NULL, "SHUTDOWN");
 State stateSDS(sdsEnter, NULL, NULL, "SDS");
 State stateLS(lsEnter, lsIdle, lsExit, "LS");
 State stateNB(nbEnter, NULL, NULL, "NB");
@@ -260,6 +269,14 @@ void PowerFSM_setup()
     powerFSM.add_transition(&stateON, &stateSDS, EVENT_LOW_BATTERY, NULL, "LowBat");
     powerFSM.add_transition(&stateSERIAL, &stateSDS, EVENT_LOW_BATTERY, NULL, "LowBat");
 
+    // Handle being told to power off
+    powerFSM.add_transition(&stateBOOT, &stateSHUTDOWN, EVENT_SHUTDOWN, NULL, "Shutdown");
+    powerFSM.add_transition(&stateLS, &stateSHUTDOWN, EVENT_SHUTDOWN, NULL, "Shutdown");
+    powerFSM.add_transition(&stateNB, &stateSHUTDOWN, EVENT_SHUTDOWN, NULL, "Shutdown");
+    powerFSM.add_transition(&stateDARK, &stateSHUTDOWN, EVENT_SHUTDOWN, NULL, "Shutdown");
+    powerFSM.add_transition(&stateON, &stateSHUTDOWN, EVENT_SHUTDOWN, NULL, "Shutdown");
+    powerFSM.add_transition(&stateSERIAL, &stateSHUTDOWN, EVENT_SHUTDOWN, NULL, "Shutdown");
+
     powerFSM.add_transition(&stateDARK, &stateON, EVENT_BLUETOOTH_PAIR, NULL, "Bluetooth pairing");
     powerFSM.add_transition(&stateON, &stateON, EVENT_BLUETOOTH_PAIR, NULL, "Bluetooth pairing");
 

src/PowerFSM.h

@@ -19,6 +19,7 @@
 #define EVENT_POWER_CONNECTED 13
 #define EVENT_POWER_DISCONNECTED 14
 #define EVENT_FIRMWARE_UPDATE 15 // We just received a new firmware update packet from the phone
+#define EVENT_SHUTDOWN 16 //force a full shutdown now (not just sleep)
 
 extern Fsm powerFSM;
 extern State statePOWER, stateSERIAL;

src/airtime.cpp

@@ -1,7 +1,8 @@
 #include "configuration.h"
 #include "airtime.h"
+#include "NodeDB.h"
 
-#define periodsToLog 48
+#define periodsToLog 24
 
 AirTime *airTime;
 
@@ -24,9 +25,11 @@ void AirTime::logAirtime(reportTypes reportType, uint32_t airtime_ms)
     if (reportType == TX_LOG) {
         DEBUG_MSG("AirTime - Packet transmitted : %ums\n", airtime_ms);
         airtimes.periodTX[0] = airtimes.periodTX[0] + airtime_ms;
+        myNodeInfo.air_period_tx[0] = myNodeInfo.air_period_tx[0] + airtime_ms;
     } else if (reportType == RX_LOG) {
         DEBUG_MSG("AirTime - Packet received : %ums\n", airtime_ms);
         airtimes.periodRX[0] = 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);
         airtimes.periodRX_ALL[0] = airtimes.periodRX_ALL[0] + airtime_ms;
@@ -50,11 +53,18 @@ void airtimeRotatePeriod()
             airtimes.periodTX[i + 1] = airtimes.periodTX[i];
             airtimes.periodRX[i + 1] = airtimes.periodRX[i];
             airtimes.periodRX_ALL[i + 1] = airtimes.periodRX_ALL[i];
+
+            myNodeInfo.air_period_tx[i + 1] = myNodeInfo.air_period_tx[i];
+            myNodeInfo.air_period_rx[i + 1] = myNodeInfo.air_period_rx[i];
         }
         airtimes.periodTX[0] = 0;
         airtimes.periodRX[0] = 0;
         airtimes.periodRX_ALL[0] = 0;
 
+        myNodeInfo.air_period_tx[0] = 0;
+        myNodeInfo.air_period_rx[0] = 0;
+
+
         airtimes.lastPeriodIndex = currentPeriodIndex();
     }
 }

src/configuration.h

@@ -171,7 +171,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define I2C_SCL 22
 
 #define BUTTON_PIN 38     // The middle button GPIO on the T-Beam
-#define BUTTON_PIN_ALT 13 // Alternate GPIO for an external button if needed
+//#define BUTTON_PIN_ALT 13 // Alternate GPIO for an external button if needed. Does anyone use this? It is not documented anywhere.
+#define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Plugin.
 
 #define LED_INVERTED 1
 #define LED_PIN 4 // Newer tbeams (1.1) have an extra led on GPIO4
@@ -213,6 +214,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #define BUTTON_PIN 39
 #define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
+#define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Plugin.
 
 #define USE_RF95
 #define LORA_DIO0 26 // a No connect on the SX1262 module
@@ -316,6 +318,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define HW_VENDOR HardwareModel_HELTEC_V2_1
 
 #define BATTERY_PIN 37 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
+#define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Plugin.
 
 #endif
 
@@ -327,8 +330,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define GPS_RX_PIN 36
 #define GPS_TX_PIN 37
 
-#define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-
 #define I2C_SDA 4 // I2C pins for this board
 #define I2C_SCL 15
 
@@ -338,6 +339,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LED_PIN 2     // If defined we will blink this LED
 #define BUTTON_PIN 0  // If defined, this will be used for user button presses
 #define BUTTON_NEED_PULLUP
+#define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Plugin.
 
 #define USE_RF95
 #define LORA_DIO0 26 // a No connect on the SX1262 module

src/graphics/Screen.cpp

@@ -36,6 +36,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "target_specific.h"
 #include "utils.h"
 #include "gps/GeoCoord.h"
+#include "sleep.h"
 
 #ifndef NO_ESP32
 #include "mesh/http/WiFiAPClient.h"
@@ -155,7 +156,11 @@ static void drawSSLScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     display->drawString(64 + x, y, "Creating SSL certificate");
 
     display->setFont(FONT_SMALL);
-    display->drawString(64 + x, FONT_HEIGHT_SMALL + y + 2, "Please wait...");
+    if ((millis() / 1000) % 2) {
+        display->drawString(64 + x, FONT_HEIGHT_SMALL + y + 2, "Please wait . . .");
+    } else {
+        display->drawString(64 + x, FONT_HEIGHT_SMALL + y + 2, "Please wait . .  ");
+    }
 }
 
 #ifdef HAS_EINK
@@ -215,7 +220,11 @@ static void drawFrameFirmware(OLEDDisplay *display, OLEDDisplayUiState *state, i
     display->drawString(64 + x, y, "Updating");
 
     display->setFont(FONT_SMALL);
-    display->drawString(64 + x, FONT_HEIGHT_SMALL + y + 2, "Please wait...");
+    if ((millis() / 1000) % 2) {
+        display->drawString(64 + x, FONT_HEIGHT_SMALL + y + 2, "Please wait . . .");
+    } else {
+        display->drawString(64 + x, FONT_HEIGHT_SMALL + y + 2, "Please wait . .  ");
+    }
 
     // display->setFont(FONT_LARGE);
     // display->drawString(64 + x, 26 + y, btPIN);
@@ -875,6 +884,11 @@ int32_t Screen::runOnce()
         // oldFrameState = ui.getUiState()->frameState;
         DEBUG_MSG("Setting idle framerate\n");
         targetFramerate = IDLE_FRAMERATE;
+
+#ifndef NO_ESP32
+        setCPUFast(false); // Turn up the CPU to improve screen animations
+#endif
+
         ui.setTargetFPS(targetFramerate);
         forceDisplay();
     }
@@ -1074,6 +1088,11 @@ void Screen::setFastFramerate()
 
     // We are about to start a transition so speed up fps
     targetFramerate = SCREEN_TRANSITION_FRAMERATE;
+
+#ifndef NO_ESP32
+    setCPUFast(true); // Turn up the CPU to improve screen animations
+#endif
+
     ui.setTargetFPS(targetFramerate);
     setInterval(0); // redraw ASAP
     runASAP = true;
@@ -1299,7 +1318,24 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
         display->drawString(x, y, String("USB"));
     }
 
-    auto mode = "Mode " + String(channels.getPrimary().modem_config);
+    auto mode = "";
+
+    if (channels.getPrimary().modem_config == 0) {
+        mode = "ShrtSlow";
+    } else if (channels.getPrimary().modem_config == 1) {
+        mode = "ShrtFast";
+    } else if (channels.getPrimary().modem_config == 2) {
+        mode = "LngFast";
+    } else if (channels.getPrimary().modem_config == 3) {
+        mode = "LngSlow";
+    } else if (channels.getPrimary().modem_config == 4) {
+        mode = "MedSlow";
+    } else if (channels.getPrimary().modem_config == 5) {
+        mode = "MedFast";
+    } else {
+        mode = "Custom";
+    }
+
     display->drawString(x + SCREEN_WIDTH - display->getStringWidth(mode), y, mode);
 
     // Line 2

src/main.cpp

@@ -134,6 +134,8 @@ static int32_t ledBlinker()
     return powerStatus->getIsCharging() ? 1000 : (ledOn ? 1 : 1000);
 }
 
+uint32_t timeLastPowered = 0;
+
 /// Wrapper to convert our powerFSM stuff into a 'thread'
 class PowerFSMThread : public OSThread
 {
@@ -151,6 +153,13 @@ class PowerFSMThread : public OSThread
         auto state = powerFSM.getState();
         canSleep = (state != &statePOWER) && (state != &stateSERIAL);
 
+        if (powerStatus->getHasUSB()) {
+            timeLastPowered = millis();
+        } else if (radioConfig.preferences.on_battery_shutdown_after_secs > 0 && 
+                    millis() > timeLastPowered + (1000 * radioConfig.preferences.on_battery_shutdown_after_secs)) { //shutdown after 30 minutes unpowered
+            powerFSM.trigger(EVENT_SHUTDOWN);
+        }
+        
         return 10;
     }
 };
@@ -590,6 +599,13 @@ void setup()
     else
         router->addInterface(rIf);
 
+    // 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);
+
     // This must be _after_ service.init because we need our preferences loaded from flash to have proper timeout values
     PowerFSM_setup(); // we will transition to ON in a couple of seconds, FIXME, only do this for cold boots, not waking from SDS
     powerFSMthread = new PowerFSMThread();

src/mesh/Channels.cpp

@@ -217,17 +217,23 @@ const char *Channels::getName(size_t chIndex)
         else
             switch (channelSettings.modem_config) {
             case ChannelSettings_ModemConfig_Bw125Cr45Sf128:
-                channelName = "Medium";
+                channelName = "ShortSlow";
                 break;
             case ChannelSettings_ModemConfig_Bw500Cr45Sf128:
                 channelName = "ShortFast";
                 break;
             case ChannelSettings_ModemConfig_Bw31_25Cr48Sf512:
-                channelName = "LongAlt";
+                channelName = "LongFast";
                 break;
             case ChannelSettings_ModemConfig_Bw125Cr48Sf4096:
                 channelName = "LongSlow";
                 break;
+            case ChannelSettings_ModemConfig_Bw250Cr46Sf2048:
+                channelName = "MediumSlow";
+                break;
+            case ChannelSettings_ModemConfig_Bw250Cr47Sf1024:
+                channelName = "MediumFast";
+                break;
             default:
                 channelName = "Invalid";
                 break;

src/mesh/NodeDB.cpp

@@ -245,6 +245,10 @@ void NodeDB::init()
     preferences.end();
     DEBUG_MSG("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.
+    */
+    myNodeInfo.has_wifi = true;
 #endif
 
     resetRadioConfig(); // If bogus settings got saved, then fix them
@@ -429,7 +433,7 @@ uint32_t sinceLastSeen(const NodeInfo *n)
     return delta;
 }
 
-#define NUM_ONLINE_SECS (60 * 2) // 2 hrs to consider someone offline
+#define NUM_ONLINE_SECS (60 & 60 * 2) // 2 hrs to consider someone offline
 
 size_t NodeDB::getNumOnlineNodes()
 {

src/mesh/RadioInterface.cpp

@@ -297,6 +297,16 @@ void RadioInterface::applyModemConfig()
             cr = 8;
             sf = 12;
             break;
+        case ChannelSettings_ModemConfig_Bw250Cr46Sf2048:
+            bw = 250;
+            cr = 6;
+            sf = 11;
+            break;
+        case ChannelSettings_ModemConfig_Bw250Cr47Sf1024:
+            bw = 250;
+            cr = 7;
+            sf = 10;
+            break;
         default:
             assert(0); // Unknown enum
         }

src/mesh/generated/admin.pb.h

@@ -5,8 +5,8 @@
 #define PB_ADMIN_PB_H_INCLUDED
 #include <pb.h>
 #include "channel.pb.h"
-#include "mesh.pb.h"
 #include "radioconfig.pb.h"
+#include "mesh.pb.h"
 
 #if PB_PROTO_HEADER_VERSION != 40
 #error Regenerate this file with the current version of nanopb generator.
@@ -23,6 +23,8 @@ typedef struct _AdminMessage {
         RadioConfig get_radio_response;
         uint32_t get_channel_request;
         Channel get_channel_response;
+        bool get_owner_request;
+        User get_owner_response;
         bool confirm_set_channel;
         bool confirm_set_radio;
         bool exit_simulator;
@@ -47,6 +49,8 @@ extern "C" {
 #define AdminMessage_get_radio_response_tag      5
 #define AdminMessage_get_channel_request_tag     6
 #define AdminMessage_get_channel_response_tag    7
+#define AdminMessage_get_owner_request_tag       8
+#define AdminMessage_get_owner_response_tag      9
 #define AdminMessage_confirm_set_channel_tag     32
 #define AdminMessage_confirm_set_radio_tag       33
 #define AdminMessage_exit_simulator_tag          34
@@ -61,6 +65,8 @@ X(a, STATIC,   ONEOF,    BOOL,     (variant,get_radio_request,get_radio_request)
 X(a, STATIC,   ONEOF,    MESSAGE,  (variant,get_radio_response,get_radio_response),   5) \
 X(a, STATIC,   ONEOF,    UINT32,   (variant,get_channel_request,get_channel_request),   6) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (variant,get_channel_response,get_channel_response),   7) \
+X(a, STATIC,   ONEOF,    BOOL,     (variant,get_owner_request,get_owner_request),   8) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (variant,get_owner_response,get_owner_response),   9) \
 X(a, STATIC,   ONEOF,    BOOL,     (variant,confirm_set_channel,confirm_set_channel),  32) \
 X(a, STATIC,   ONEOF,    BOOL,     (variant,confirm_set_radio,confirm_set_radio),  33) \
 X(a, STATIC,   ONEOF,    BOOL,     (variant,exit_simulator,exit_simulator),  34) \
@@ -72,6 +78,7 @@ X(a, STATIC,   ONEOF,    INT32,    (variant,reboot_seconds,reboot_seconds),  35)
 #define AdminMessage_variant_set_channel_MSGTYPE Channel
 #define AdminMessage_variant_get_radio_response_MSGTYPE RadioConfig
 #define AdminMessage_variant_get_channel_response_MSGTYPE Channel
+#define AdminMessage_variant_get_owner_response_MSGTYPE User
 
 extern const pb_msgdesc_t AdminMessage_msg;
 
@@ -79,7 +86,7 @@ extern const pb_msgdesc_t AdminMessage_msg;
 #define AdminMessage_fields &AdminMessage_msg
 
 /* Maximum encoded size of messages (where known) */
-#define AdminMessage_size                        447
+#define AdminMessage_size                        454
 
 #ifdef __cplusplus
 } /* extern "C" */

src/mesh/generated/channel.pb.h

@@ -14,7 +14,9 @@ typedef enum _ChannelSettings_ModemConfig {
     ChannelSettings_ModemConfig_Bw125Cr45Sf128 = 0,
     ChannelSettings_ModemConfig_Bw500Cr45Sf128 = 1,
     ChannelSettings_ModemConfig_Bw31_25Cr48Sf512 = 2,
-    ChannelSettings_ModemConfig_Bw125Cr48Sf4096 = 3
+    ChannelSettings_ModemConfig_Bw125Cr48Sf4096 = 3,
+    ChannelSettings_ModemConfig_Bw250Cr46Sf2048 = 4,
+    ChannelSettings_ModemConfig_Bw250Cr47Sf1024 = 5
 } ChannelSettings_ModemConfig;
 
 typedef enum _Channel_Role {
@@ -49,8 +51,8 @@ typedef struct _Channel {
 
 /* Helper constants for enums */
 #define _ChannelSettings_ModemConfig_MIN ChannelSettings_ModemConfig_Bw125Cr45Sf128
-#define _ChannelSettings_ModemConfig_MAX ChannelSettings_ModemConfig_Bw125Cr48Sf4096
-#define _ChannelSettings_ModemConfig_ARRAYSIZE ((ChannelSettings_ModemConfig)(ChannelSettings_ModemConfig_Bw125Cr48Sf4096+1))
+#define _ChannelSettings_ModemConfig_MAX ChannelSettings_ModemConfig_Bw250Cr47Sf1024
+#define _ChannelSettings_ModemConfig_ARRAYSIZE ((ChannelSettings_ModemConfig)(ChannelSettings_ModemConfig_Bw250Cr47Sf1024+1))
 
 #define _Channel_Role_MIN Channel_Role_DISABLED
 #define _Channel_Role_MAX Channel_Role_SECONDARY

src/mesh/generated/deviceonly.pb.h

@@ -125,7 +125,7 @@ extern const pb_msgdesc_t ChannelFile_msg;
 /* Maximum encoded size of messages (where known) */
 #define LegacyRadioConfig_size                   4
 #define LegacyRadioConfig_LegacyPreferences_size 2
-#define DeviceState_size                         9594
+#define DeviceState_size                         9939
 #define ChannelFile_size                         832
 
 #ifdef __cplusplus

src/mesh/generated/mesh.pb.c

@@ -27,7 +27,7 @@ PB_BIND(MeshPacket, MeshPacket, 2)
 PB_BIND(NodeInfo, NodeInfo, AUTO)
 
 
-PB_BIND(MyNodeInfo, MyNodeInfo, AUTO)
+PB_BIND(MyNodeInfo, MyNodeInfo, 2)
 
 
 PB_BIND(LogRecord, LogRecord, AUTO)

src/mesh/generated/mesh.pb.h

@@ -149,9 +149,15 @@ typedef struct _MyNodeInfo {
     uint32_t error_address;
     uint32_t error_count;
     uint32_t reboot_count;
+    float bitrate;
     uint32_t message_timeout_msec;
     uint32_t min_app_version;
     uint32_t max_channels;
+    pb_size_t air_period_tx_count;
+    uint32_t air_period_tx[24];
+    pb_size_t air_period_rx_count;
+    uint32_t air_period_rx[24];
+    bool has_wifi;
 } MyNodeInfo;
 
 typedef struct _Position {
@@ -315,7 +321,7 @@ extern "C" {
 #define Data_init_default                        {_PortNum_MIN, {0, {0}}, 0, 0, 0, 0}
 #define MeshPacket_init_default                  {0, 0, 0, 0, {Data_init_default}, 0, 0, 0, 0, 0, _MeshPacket_Priority_MIN, 0}
 #define NodeInfo_init_default                    {0, false, User_init_default, false, Position_init_default, 0, 0}
-#define MyNodeInfo_init_default                  {0, 0, 0, "", "", "", _CriticalErrorCode_MIN, 0, 0, 0, 0, 0, 0}
+#define MyNodeInfo_init_default                  {0, 0, 0, "", "", "", _CriticalErrorCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0}
 #define LogRecord_init_default                   {"", 0, "", _LogRecord_Level_MIN}
 #define FromRadio_init_default                   {0, 0, {MyNodeInfo_init_default}}
 #define ToRadio_init_default                     {0, {MeshPacket_init_default}}
@@ -327,7 +333,7 @@ extern "C" {
 #define Data_init_zero                           {_PortNum_MIN, {0, {0}}, 0, 0, 0, 0}
 #define MeshPacket_init_zero                     {0, 0, 0, 0, {Data_init_zero}, 0, 0, 0, 0, 0, _MeshPacket_Priority_MIN, 0}
 #define NodeInfo_init_zero                       {0, false, User_init_zero, false, Position_init_zero, 0, 0}
-#define MyNodeInfo_init_zero                     {0, 0, 0, "", "", "", _CriticalErrorCode_MIN, 0, 0, 0, 0, 0, 0}
+#define MyNodeInfo_init_zero                     {0, 0, 0, "", "", "", _CriticalErrorCode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0, {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}, 0}
 #define LogRecord_init_zero                      {"", 0, "", _LogRecord_Level_MIN}
 #define FromRadio_init_zero                      {0, 0, {MyNodeInfo_init_zero}}
 #define ToRadio_init_zero                        {0, {MeshPacket_init_zero}}
@@ -354,9 +360,13 @@ extern "C" {
 #define MyNodeInfo_error_address_tag             8
 #define MyNodeInfo_error_count_tag               9
 #define MyNodeInfo_reboot_count_tag              10
+#define MyNodeInfo_bitrate_tag                   11
 #define MyNodeInfo_message_timeout_msec_tag      13
 #define MyNodeInfo_min_app_version_tag           14
 #define MyNodeInfo_max_channels_tag              15
+#define MyNodeInfo_air_period_tx_tag             16
+#define MyNodeInfo_air_period_rx_tag             17
+#define MyNodeInfo_has_wifi_tag                  18
 #define Position_latitude_i_tag                  1
 #define Position_longitude_i_tag                 2
 #define Position_altitude_tag                    3
@@ -530,9 +540,13 @@ X(a, STATIC,   SINGULAR, UENUM,    error_code,        7) \
 X(a, STATIC,   SINGULAR, UINT32,   error_address,     8) \
 X(a, STATIC,   SINGULAR, UINT32,   error_count,       9) \
 X(a, STATIC,   SINGULAR, UINT32,   reboot_count,     10) \
+X(a, STATIC,   SINGULAR, FLOAT,    bitrate,          11) \
 X(a, STATIC,   SINGULAR, UINT32,   message_timeout_msec,  13) \
 X(a, STATIC,   SINGULAR, UINT32,   min_app_version,  14) \
-X(a, STATIC,   SINGULAR, UINT32,   max_channels,     15)
+X(a, STATIC,   SINGULAR, UINT32,   max_channels,     15) \
+X(a, STATIC,   REPEATED, UINT32,   air_period_tx,    16) \
+X(a, STATIC,   REPEATED, UINT32,   air_period_rx,    17) \
+X(a, STATIC,   SINGULAR, BOOL,     has_wifi,         18)
 #define MyNodeInfo_CALLBACK NULL
 #define MyNodeInfo_DEFAULT NULL
 
@@ -610,9 +624,9 @@ extern const pb_msgdesc_t ToRadio_PeerInfo_msg;
 #define Data_size                                260
 #define MeshPacket_size                          309
 #define NodeInfo_size                            270
-#define MyNodeInfo_size                          101
+#define MyNodeInfo_size                          445
 #define LogRecord_size                           81
-#define FromRadio_size                           318
+#define FromRadio_size                           454
 #define ToRadio_size                             312
 #define ToRadio_PeerInfo_size                    8
 

src/mesh/generated/radioconfig.pb.h

@@ -151,6 +151,7 @@ typedef struct _RadioConfig_UserPreferences {
     uint32_t position_flags;
     bool is_always_powered;
     uint32_t auto_screen_carousel_secs;
+    uint32_t on_battery_shutdown_after_secs;
 } RadioConfig_UserPreferences;
 
 typedef struct _RadioConfig {
@@ -195,9 +196,9 @@ extern "C" {
 
 /* Initializer values for message structs */
 #define RadioConfig_init_default                 {false, RadioConfig_UserPreferences_init_default}
-#define RadioConfig_UserPreferences_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, _RegionCode_MIN, _ChargeCurrent_MIN, 0, _LocationSharing_MIN, _GpsOperation_MIN, 0, 0, 0, 0, 0, 0, 0, "", 0, _GpsCoordinateFormat_MIN, 0, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MIN, 0, 0, 0, 0, 0, 0}
+#define RadioConfig_UserPreferences_init_default {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, _RegionCode_MIN, _ChargeCurrent_MIN, 0, _LocationSharing_MIN, _GpsOperation_MIN, 0, 0, 0, 0, 0, 0, 0, "", 0, _GpsCoordinateFormat_MIN, 0, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MIN, 0, 0, 0, 0, 0, 0, 0}
 #define RadioConfig_init_zero                    {false, RadioConfig_UserPreferences_init_zero}
-#define RadioConfig_UserPreferences_init_zero    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, _RegionCode_MIN, _ChargeCurrent_MIN, 0, _LocationSharing_MIN, _GpsOperation_MIN, 0, 0, 0, 0, 0, 0, 0, "", 0, _GpsCoordinateFormat_MIN, 0, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MIN, 0, 0, 0, 0, 0, 0}
+#define RadioConfig_UserPreferences_init_zero    {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, _RegionCode_MIN, _ChargeCurrent_MIN, 0, _LocationSharing_MIN, _GpsOperation_MIN, 0, 0, 0, 0, 0, 0, 0, "", 0, _GpsCoordinateFormat_MIN, 0, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_EnvironmentalMeasurementSensorType_MIN, 0, 0, 0, 0, 0, 0, 0}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define RadioConfig_UserPreferences_position_broadcast_secs_tag 1
@@ -264,6 +265,7 @@ extern "C" {
 #define RadioConfig_UserPreferences_position_flags_tag 150
 #define RadioConfig_UserPreferences_is_always_powered_tag 151
 #define RadioConfig_UserPreferences_auto_screen_carousel_secs_tag 152
+#define RadioConfig_UserPreferences_on_battery_shutdown_after_secs_tag 153
 #define RadioConfig_preferences_tag              1
 
 /* Struct field encoding specification for nanopb */
@@ -337,7 +339,8 @@ X(a, STATIC,   SINGULAR, BOOL,     store_forward_plugin_enabled, 148) \
 X(a, STATIC,   SINGULAR, BOOL,     store_forward_plugin_heartbeat, 149) \
 X(a, STATIC,   SINGULAR, UINT32,   position_flags,  150) \
 X(a, STATIC,   SINGULAR, BOOL,     is_always_powered, 151) \
-X(a, STATIC,   SINGULAR, UINT32,   auto_screen_carousel_secs, 152)
+X(a, STATIC,   SINGULAR, UINT32,   auto_screen_carousel_secs, 152) \
+X(a, STATIC,   SINGULAR, UINT32,   on_battery_shutdown_after_secs, 153)
 #define RadioConfig_UserPreferences_CALLBACK NULL
 #define RadioConfig_UserPreferences_DEFAULT NULL
 
@@ -349,8 +352,8 @@ extern const pb_msgdesc_t RadioConfig_UserPreferences_msg;
 #define RadioConfig_UserPreferences_fields &RadioConfig_UserPreferences_msg
 
 /* Maximum encoded size of messages (where known) */
-#define RadioConfig_size                         444
-#define RadioConfig_UserPreferences_size         441
+#define RadioConfig_size                         451
+#define RadioConfig_UserPreferences_size         448
 
 #ifdef __cplusplus
 } /* extern "C" */

src/mesh/generated/storeforward.pb.c

@@ -15,5 +15,8 @@ PB_BIND(StoreAndForward_Statistics, StoreAndForward_Statistics, AUTO)
 PB_BIND(StoreAndForward_History, StoreAndForward_History, AUTO)
 
 
+PB_BIND(StoreAndForward_Heartbeat, StoreAndForward_Heartbeat, AUTO)
+
+
 
 

src/mesh/generated/storeforward.pb.h

@@ -17,29 +17,37 @@ typedef enum _StoreAndForward_RequestResponse {
     StoreAndForward_RequestResponse_ROUTER_PING = 3,
     StoreAndForward_RequestResponse_ROUTER_PONG = 4,
     StoreAndForward_RequestResponse_ROUTER_BUSY = 5,
+    StoreAndForward_RequestResponse_ROUTER_HISTORY = 6,
     StoreAndForward_RequestResponse_CLIENT_ERROR = 101,
     StoreAndForward_RequestResponse_CLIENT_HISTORY = 102,
     StoreAndForward_RequestResponse_CLIENT_STATS = 103,
     StoreAndForward_RequestResponse_CLIENT_PING = 104,
-    StoreAndForward_RequestResponse_CLIENT_PONG = 105
+    StoreAndForward_RequestResponse_CLIENT_PONG = 105,
+    StoreAndForward_RequestResponse_CLIENT_ABORT = 106
 } StoreAndForward_RequestResponse;
 
 /* Struct definitions */
+typedef struct _StoreAndForward_Heartbeat {
+    uint32_t period;
+    uint32_t secondary;
+} StoreAndForward_Heartbeat;
+
 typedef struct _StoreAndForward_History {
-    uint32_t HistoryMessages;
-    uint32_t Window;
+    uint32_t history_messages;
+    uint32_t window;
+    uint32_t last_request;
 } StoreAndForward_History;
 
 typedef struct _StoreAndForward_Statistics {
-    uint32_t MessagesTotal;
-    uint32_t MessagesSaved;
-    uint32_t MessagesMax;
-    uint32_t UpTime;
-    uint32_t Requests;
-    uint32_t RequestsHistory;
-    bool Heartbeat;
-    uint32_t ReturnMax;
-    uint32_t ReturnWindow;
+    uint32_t messages_total;
+    uint32_t messages_saved;
+    uint32_t messages_max;
+    uint32_t up_time;
+    uint32_t requests;
+    uint32_t requests_history;
+    bool heartbeat;
+    uint32_t return_max;
+    uint32_t return_window;
 } StoreAndForward_Statistics;
 
 typedef struct _StoreAndForward {
@@ -48,13 +56,15 @@ typedef struct _StoreAndForward {
     StoreAndForward_Statistics stats;
     bool has_history;
     StoreAndForward_History history;
+    bool has_heartbeat;
+    StoreAndForward_Heartbeat heartbeat;
 } StoreAndForward;
 
 
 /* Helper constants for enums */
 #define _StoreAndForward_RequestResponse_MIN StoreAndForward_RequestResponse_UNSET
-#define _StoreAndForward_RequestResponse_MAX StoreAndForward_RequestResponse_CLIENT_PONG
-#define _StoreAndForward_RequestResponse_ARRAYSIZE ((StoreAndForward_RequestResponse)(StoreAndForward_RequestResponse_CLIENT_PONG+1))
+#define _StoreAndForward_RequestResponse_MAX StoreAndForward_RequestResponse_CLIENT_ABORT
+#define _StoreAndForward_RequestResponse_ARRAYSIZE ((StoreAndForward_RequestResponse)(StoreAndForward_RequestResponse_CLIENT_ABORT+1))
 
 
 #ifdef __cplusplus
@@ -62,71 +72,89 @@ extern "C" {
 #endif
 
 /* Initializer values for message structs */
-#define StoreAndForward_init_default             {_StoreAndForward_RequestResponse_MIN, false, StoreAndForward_Statistics_init_default, false, StoreAndForward_History_init_default}
+#define StoreAndForward_init_default             {_StoreAndForward_RequestResponse_MIN, false, StoreAndForward_Statistics_init_default, false, StoreAndForward_History_init_default, false, StoreAndForward_Heartbeat_init_default}
 #define StoreAndForward_Statistics_init_default  {0, 0, 0, 0, 0, 0, 0, 0, 0}
-#define StoreAndForward_History_init_default     {0, 0}
-#define StoreAndForward_init_zero                {_StoreAndForward_RequestResponse_MIN, false, StoreAndForward_Statistics_init_zero, false, StoreAndForward_History_init_zero}
+#define StoreAndForward_History_init_default     {0, 0, 0}
+#define StoreAndForward_Heartbeat_init_default   {0, 0}
+#define StoreAndForward_init_zero                {_StoreAndForward_RequestResponse_MIN, false, StoreAndForward_Statistics_init_zero, false, StoreAndForward_History_init_zero, false, StoreAndForward_Heartbeat_init_zero}
 #define StoreAndForward_Statistics_init_zero     {0, 0, 0, 0, 0, 0, 0, 0, 0}
-#define StoreAndForward_History_init_zero        {0, 0}
+#define StoreAndForward_History_init_zero        {0, 0, 0}
+#define StoreAndForward_Heartbeat_init_zero      {0, 0}
 
 /* Field tags (for use in manual encoding/decoding) */
-#define StoreAndForward_History_HistoryMessages_tag 1
-#define StoreAndForward_History_Window_tag       2
-#define StoreAndForward_Statistics_MessagesTotal_tag 1
-#define StoreAndForward_Statistics_MessagesSaved_tag 2
-#define StoreAndForward_Statistics_MessagesMax_tag 3
-#define StoreAndForward_Statistics_UpTime_tag    4
-#define StoreAndForward_Statistics_Requests_tag  5
-#define StoreAndForward_Statistics_RequestsHistory_tag 6
-#define StoreAndForward_Statistics_Heartbeat_tag 7
-#define StoreAndForward_Statistics_ReturnMax_tag 8
-#define StoreAndForward_Statistics_ReturnWindow_tag 9
+#define StoreAndForward_Heartbeat_period_tag     1
+#define StoreAndForward_Heartbeat_secondary_tag  2
+#define StoreAndForward_History_history_messages_tag 1
+#define StoreAndForward_History_window_tag       2
+#define StoreAndForward_History_last_request_tag 3
+#define StoreAndForward_Statistics_messages_total_tag 1
+#define StoreAndForward_Statistics_messages_saved_tag 2
+#define StoreAndForward_Statistics_messages_max_tag 3
+#define StoreAndForward_Statistics_up_time_tag   4
+#define StoreAndForward_Statistics_requests_tag  5
+#define StoreAndForward_Statistics_requests_history_tag 6
+#define StoreAndForward_Statistics_heartbeat_tag 7
+#define StoreAndForward_Statistics_return_max_tag 8
+#define StoreAndForward_Statistics_return_window_tag 9
 #define StoreAndForward_rr_tag                   1
 #define StoreAndForward_stats_tag                2
 #define StoreAndForward_history_tag              3
+#define StoreAndForward_heartbeat_tag            4
 
 /* Struct field encoding specification for nanopb */
 #define StoreAndForward_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UENUM,    rr,                1) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  stats,             2) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  history,           3)
+X(a, STATIC,   OPTIONAL, MESSAGE,  history,           3) \
+X(a, STATIC,   OPTIONAL, MESSAGE,  heartbeat,         4)
 #define StoreAndForward_CALLBACK NULL
 #define StoreAndForward_DEFAULT NULL
 #define StoreAndForward_stats_MSGTYPE StoreAndForward_Statistics
 #define StoreAndForward_history_MSGTYPE StoreAndForward_History
+#define StoreAndForward_heartbeat_MSGTYPE StoreAndForward_Heartbeat
 
 #define StoreAndForward_Statistics_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, UINT32,   MessagesTotal,     1) \
-X(a, STATIC,   SINGULAR, UINT32,   MessagesSaved,     2) \
-X(a, STATIC,   SINGULAR, UINT32,   MessagesMax,       3) \
-X(a, STATIC,   SINGULAR, UINT32,   UpTime,            4) \
-X(a, STATIC,   SINGULAR, UINT32,   Requests,          5) \
-X(a, STATIC,   SINGULAR, UINT32,   RequestsHistory,   6) \
-X(a, STATIC,   SINGULAR, BOOL,     Heartbeat,         7) \
-X(a, STATIC,   SINGULAR, UINT32,   ReturnMax,         8) \
-X(a, STATIC,   SINGULAR, UINT32,   ReturnWindow,      9)
+X(a, STATIC,   SINGULAR, UINT32,   messages_total,    1) \
+X(a, STATIC,   SINGULAR, UINT32,   messages_saved,    2) \
+X(a, STATIC,   SINGULAR, UINT32,   messages_max,      3) \
+X(a, STATIC,   SINGULAR, UINT32,   up_time,           4) \
+X(a, STATIC,   SINGULAR, UINT32,   requests,          5) \
+X(a, STATIC,   SINGULAR, UINT32,   requests_history,   6) \
+X(a, STATIC,   SINGULAR, BOOL,     heartbeat,         7) \
+X(a, STATIC,   SINGULAR, UINT32,   return_max,        8) \
+X(a, STATIC,   SINGULAR, UINT32,   return_window,     9)
 #define StoreAndForward_Statistics_CALLBACK NULL
 #define StoreAndForward_Statistics_DEFAULT NULL
 
 #define StoreAndForward_History_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, UINT32,   HistoryMessages,   1) \
-X(a, STATIC,   SINGULAR, UINT32,   Window,            2)
+X(a, STATIC,   SINGULAR, UINT32,   history_messages,   1) \
+X(a, STATIC,   SINGULAR, UINT32,   window,            2) \
+X(a, STATIC,   SINGULAR, UINT32,   last_request,      3)
 #define StoreAndForward_History_CALLBACK NULL
 #define StoreAndForward_History_DEFAULT NULL
 
+#define StoreAndForward_Heartbeat_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UINT32,   period,            1) \
+X(a, STATIC,   SINGULAR, UINT32,   secondary,         2)
+#define StoreAndForward_Heartbeat_CALLBACK NULL
+#define StoreAndForward_Heartbeat_DEFAULT NULL
+
 extern const pb_msgdesc_t StoreAndForward_msg;
 extern const pb_msgdesc_t StoreAndForward_Statistics_msg;
 extern const pb_msgdesc_t StoreAndForward_History_msg;
+extern const pb_msgdesc_t StoreAndForward_Heartbeat_msg;
 
 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define StoreAndForward_fields &StoreAndForward_msg
 #define StoreAndForward_Statistics_fields &StoreAndForward_Statistics_msg
 #define StoreAndForward_History_fields &StoreAndForward_History_msg
+#define StoreAndForward_Heartbeat_fields &StoreAndForward_Heartbeat_msg
 
 /* Maximum encoded size of messages (where known) */
-#define StoreAndForward_size                     68
+#define StoreAndForward_size                     88
 #define StoreAndForward_Statistics_size          50
-#define StoreAndForward_History_size             12
+#define StoreAndForward_History_size             18
+#define StoreAndForward_Heartbeat_size           12
 
 #ifdef __cplusplus
 } /* extern "C" */

src/mesh/http/WebServer.cpp

@@ -5,6 +5,7 @@
 #include <HTTPBodyParser.hpp>
 #include <HTTPMultipartBodyParser.hpp>
 #include <HTTPURLEncodedBodyParser.hpp>
+#include "sleep.h"
 
 #include <WebServer.h>
 #include <WiFi.h>
@@ -79,12 +80,14 @@ static void taskCreateCert(void *parameter)
     prefs.begin("MeshtasticHTTPS", false);
 
     // Delete the saved certs (used in debugging)
-    if (0) {
+
+#if 0
         DEBUG_MSG("Deleting any saved SSL keys ...\n");
         // prefs.clear();
         prefs.remove("PK");
         prefs.remove("cert");
-    }
+#endif
+
 
     DEBUG_MSG("Checking if we have a previously saved SSL Certificate.\n");
 
@@ -103,16 +106,12 @@ static void taskCreateCert(void *parameter)
         cert = new SSLCert(certBuffer, certLen, pkBuffer, pkLen);
 
         DEBUG_MSG("Retrieved Private Key: %d Bytes\n", cert->getPKLength());
-        // DEBUG_MSG("Retrieved Private Key: " + String(cert->getPKLength()) + " Bytes");
-        // for (int i = 0; i < cert->getPKLength(); i++)
-        //  Serial.print(cert->getPKData()[i], HEX);
-        // Serial.println();
-
         DEBUG_MSG("Retrieved Certificate: %d Bytes\n", cert->getCertLength());
-        // for (int i = 0; i < cert->getCertLength(); i++)
-        //  Serial.print(cert->getCertData()[i], HEX);
-        // Serial.println();
+
     } else {
+
+        setCPUFast(true);
+
         DEBUG_MSG("Creating the certificate. This may take a while. Please wait...\n");
         yield();
         cert = new SSLCert();
@@ -144,6 +143,9 @@ static void taskCreateCert(void *parameter)
             prefs.putBytes("PK", (uint8_t *)cert->getPKData(), cert->getPKLength());
             prefs.putBytes("cert", (uint8_t *)cert->getCertData(), cert->getCertLength());
         }
+
+        setCPUFast(false);
+
     }
 
     isCertReady = true;

src/mesh/http/WiFiAPClient.cpp

@@ -271,7 +271,7 @@ static void WiFiEvent(WiFiEvent_t event)
         break;
     case SYSTEM_EVENT_AP_START:
         DEBUG_MSG("WiFi access point started\n");
-        Serial.println(WiFi.softAPIP());
+        //Serial.println(WiFi.softAPIP());
         onNetworkConnected();
         break;
     case SYSTEM_EVENT_AP_STOP:

src/plugins/ExternalNotificationPlugin.cpp

@@ -44,7 +44,7 @@
 */
 
 // Default configurations
-#define EXT_NOTIFICATION_PLUGIN_OUTPUT 13
+#define EXT_NOTIFICATION_PLUGIN_OUTPUT EXT_NOTIFY_OUT
 #define EXT_NOTIFICATION_PLUGIN_OUTPUT_MS 1000
 
 #define ASCII_BELL 0x07
@@ -84,21 +84,25 @@ int32_t ExternalNotificationPlugin::runOnce()
 
 void ExternalNotificationPlugin::setExternalOn()
 {
+    #ifdef EXT_NOTIFY_OUT
     externalCurrentState = 1;
     externalTurnedOn = millis();
 
     digitalWrite((radioConfig.preferences.ext_notification_plugin_output ? radioConfig.preferences.ext_notification_plugin_output
                                                                          : EXT_NOTIFICATION_PLUGIN_OUTPUT),
                  (radioConfig.preferences.ext_notification_plugin_active ? true : false));
+    #endif
 }
 
 void ExternalNotificationPlugin::setExternalOff()
 {
+    #ifdef EXT_NOTIFY_OUT
     externalCurrentState = 0;
 
     digitalWrite((radioConfig.preferences.ext_notification_plugin_output ? radioConfig.preferences.ext_notification_plugin_output
                                                                          : EXT_NOTIFICATION_PLUGIN_OUTPUT),
                  (radioConfig.preferences.ext_notification_plugin_active ? false : true));
+    #endif
 }
 
 // --------
@@ -111,6 +115,7 @@ ExternalNotificationPlugin::ExternalNotificationPlugin()
     boundChannel = Channels::gpioChannel;
 
 #ifndef NO_ESP32
+    #ifdef EXT_NOTIFY_OUT
 
     /*
         Uncomment the preferences below if you want to use the plugin
@@ -140,12 +145,14 @@ ExternalNotificationPlugin::ExternalNotificationPlugin()
         DEBUG_MSG("External Notification Plugin Disabled\n");
         enabled = false;
     }
+    #endif
 #endif
 }
 
 ProcessMessage ExternalNotificationPlugin::handleReceived(const MeshPacket &mp)
 {
 #ifndef NO_ESP32
+    #ifdef EXT_NOTIFY_OUT
 
     if (radioConfig.preferences.ext_notification_plugin_enabled) {
 
@@ -173,6 +180,7 @@ ProcessMessage ExternalNotificationPlugin::handleReceived(const MeshPacket &mp)
     } else {
         DEBUG_MSG("External Notification Plugin Disabled\n");
     }
+    #endif
 
 #endif
 

src/plugins/PositionPlugin.cpp

@@ -127,7 +127,7 @@ int32_t PositionPlugin::runOnce()
 {
     NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
 
-    // radioConfig.preferences.position_broadcast_smart = true;
+    radioConfig.preferences.position_broadcast_smart = true;
 
     // We limit our GPS broadcasts to a max rate
     uint32_t now = millis();
@@ -148,27 +148,32 @@ int32_t PositionPlugin::runOnce()
         NodeInfo *node = service.refreshMyNodeInfo(); // should guarantee there is now a position
 
         if (node->has_position && (node->position.latitude_i != 0 || node->position.longitude_i != 0)) {
+            // The minimum distance to travel before we are able to send a new position packet.
+            const uint32_t distanceTravelMinimum = 30;
+
+            // The minimum time that would pass before we are able to send a new position packet.
+            const uint32_t timeTravelMinimum = 30;
+
+            // Determine the distance in meters between two points on the globe
             float distance = GeoCoord::latLongToMeter(lastGpsLatitude * 1e-7, lastGpsLongitude * 1e-7,
                                                       node->position.latitude_i * 1e-7, node->position.longitude_i * 1e-7);
 
-            /* Please don't change these values. This accomodates for possible poor positioning
-               in the event the GPS has a poor satelite lock.
-               */
-            const uint8_t distanceTravel = 150;
+            // Yes, this has a bunch of magic numbers. Sorry. This is to make the scale non-linear.
+            const float distanceTravelMath = 1203 / (sqrt( pow(myNodeInfo.bitrate, 1.5) / 1.1 ) ) ;
+            uint32_t distanceTravel = (distanceTravelMath >= distanceTravelMinimum) ? distanceTravelMath : distanceTravelMinimum;
 
-            /* Minimum time between position updates.
-               Note: At an average walking speed of 3.5mph, it takes 90 seconds to travel 150 meters.
-            */
-            const uint8_t timeTravel = 60;
+            // Yes, this has a bunch of magic numbers. Sorry.
+            uint32_t timeTravel = ((1500 / myNodeInfo.bitrate) >= timeTravelMinimum) ? (1500 / myNodeInfo.bitrate) : timeTravelMinimum;
 
             // If the distance traveled since the last update is greater than 100 meters
             //   and it's been at least 60 seconds since the last update
             if ((abs(distance) >= distanceTravel) &&
-                (lastGpsSend == 0 || now - timeTravel >= getPref_position_broadcast_secs() * 1000)) {
+                (now - lastGpsSend >= timeTravel * 1000)
+                ) {
                 bool requestReplies = currentGeneration != radioGeneration;
                 currentGeneration = radioGeneration;
 
-                DEBUG_MSG("Sending smart pos@%x:6 to mesh (wantReplies=%d)\n", node->position.pos_timestamp, requestReplies);
+                DEBUG_MSG("Sending smart pos@%x:6 to mesh (wantReplies=%d, dt=%d, tt=%d)\n", node->position.pos_timestamp, requestReplies, distanceTravel, timeTravel);
                 sendOurPosition(NODENUM_BROADCAST, requestReplies);
 
                 /* Update lastGpsSend to now. This means if the device is stationary, then

src/plugins/PositionPlugin.h

@@ -14,8 +14,8 @@ class PositionPlugin : public ProtobufPlugin<Position>, private concurrency::OST
     uint32_t lastGpsSend = 0;
 
     // Store the latest good lat / long
-    uint32_t lastGpsLatitude = 0;
-    uint32_t lastGpsLongitude = 0;
+    int32_t lastGpsLatitude = 0;
+    int32_t lastGpsLongitude = 0;
 
     /// We force a rebroadcast if the radio settings change
     uint32_t currentGeneration = 0;

src/plugins/esp32/RangeTestPlugin.cpp

@@ -48,9 +48,6 @@ int32_t RangeTestPlugin::runOnce()
     if (radioConfig.preferences.range_test_plugin_enabled) {
 
         if (firstTime) {
-
-            // Interface with the serial peripheral from in here.
-
             rangeTestPluginRadio = new RangeTestPluginRadio();
 
             firstTime = 0;
@@ -130,28 +127,21 @@ ProcessMessage RangeTestPluginRadio::handleReceived(const MeshPacket &mp)
 
     if (radioConfig.preferences.range_test_plugin_enabled) {
 
-        auto &p = mp.decoded;
-        // DEBUG_MSG("Received text msg self=0x%0x, from=0x%0x, to=0x%0x, id=%d, msg=%.*s\n",
-        //          nodeDB.getNodeNum(), mp.from, mp.to, mp.id, p.payload.size, p.payload.bytes);
+        /*
+            auto &p = mp.decoded;
+            DEBUG_MSG("Received text msg self=0x%0x, from=0x%0x, to=0x%0x, id=%d, msg=%.*s\n",
+                  nodeDB.getNodeNum(), mp.from, mp.to, mp.id, p.payload.size, p.payload.bytes);
+        */
 
         if (getFrom(&mp) != nodeDB.getNodeNum()) {
 
-            // DEBUG_MSG("* * Message came from the mesh\n");
-            // Serial2.println("* * Message came from the mesh");
-            // Serial2.printf("%s", p.payload.bytes);
-            /*
-
-
-
-            */
-
-            NodeInfo *n = nodeDB.getNode(getFrom(&mp));
-
             if (radioConfig.preferences.range_test_plugin_save) {
                 appendFile(mp);
             }
 
             /*
+            NodeInfo *n = nodeDB.getNode(getFrom(&mp));
+
             DEBUG_MSG("-----------------------------------------\n");
             DEBUG_MSG("p.payload.bytes  \"%s\"\n", p.payload.bytes);
             DEBUG_MSG("p.payload.size   %d\n", p.payload.size);
@@ -159,12 +149,12 @@ ProcessMessage RangeTestPluginRadio::handleReceived(const MeshPacket &mp)
             DEBUG_MSG("mp.from          %d\n", mp.from);
             DEBUG_MSG("mp.rx_snr        %f\n", mp.rx_snr);
             DEBUG_MSG("mp.hop_limit     %d\n", mp.hop_limit);
-            // DEBUG_MSG("mp.decoded.position.latitude_i     %d\n", mp.decoded.position.latitude_i); // Depricated
-            // DEBUG_MSG("mp.decoded.position.longitude_i    %d\n", mp.decoded.position.longitude_i); // Depricated
+            DEBUG_MSG("mp.decoded.position.latitude_i     %d\n", mp.decoded.position.latitude_i); // Depricated
+            DEBUG_MSG("mp.decoded.position.longitude_i    %d\n", mp.decoded.position.longitude_i); // Depricated
             DEBUG_MSG("---- Node Information of Received Packet (mp.from):\n");
             DEBUG_MSG("n->user.long_name         %s\n", n->user.long_name);
             DEBUG_MSG("n->user.short_name        %s\n", n->user.short_name);
-            // DEBUG_MSG("n->user.macaddr           %X\n", n->user.macaddr);
+            DEBUG_MSG("n->user.macaddr           %X\n", n->user.macaddr);
             DEBUG_MSG("n->has_position           %d\n", n->has_position);
             DEBUG_MSG("n->position.latitude_i    %d\n", n->position.latitude_i);
             DEBUG_MSG("n->position.longitude_i   %d\n", n->position.longitude_i);
@@ -239,7 +229,7 @@ bool RangeTestPluginRadio::appendFile(const MeshPacket &mp)
 
         // Print the CSV header
         if (fileToWrite.println(
-                "time,from,sender name,sender lat,sender long,rx lat,rx long,rx elevation,rx snr,distance,payload")) {
+                "time,from,sender name,sender lat,sender long,rx lat,rx long,rx elevation,rx snr,distance,hop limit,payload")) {
             DEBUG_MSG("File was written\n");
         } else {
             DEBUG_MSG("File write failed\n");
@@ -259,9 +249,6 @@ bool RangeTestPluginRadio::appendFile(const MeshPacket &mp)
     struct timeval tv;
     if (!gettimeofday(&tv, NULL)) {
         long hms = tv.tv_sec % SEC_PER_DAY;
-        // hms += tz.tz_dsttime * SEC_PER_HOUR;
-        // hms -= tz.tz_minuteswest * SEC_PER_MIN;
-        // mod `hms` to ensure in positive range of [0...SEC_PER_DAY)
         hms = (hms + SEC_PER_DAY) % SEC_PER_DAY;
 
         // Tear apart hms into h:m:s
@@ -292,9 +279,10 @@ bool RangeTestPluginRadio::appendFile(const MeshPacket &mp)
         fileToAppend.printf("0,");
     }
 
+    fileToAppend.printf("%d,", mp.hop_limit); // Packet Hop Limit
+
     // TODO: If quotes are found in the payload, it has to be escaped.
     fileToAppend.printf("\"%s\"\n", p.payload.bytes);
-
     fileToAppend.close();
 
     return 1;

src/plugins/esp32/StoreForwardPlugin.cpp

@@ -68,8 +68,6 @@ void StoreForwardPlugin::populatePSRAM()
         https://learn.upesy.com/en/programmation/psram.html#psram-tab
     */
 
-    uint32_t store_forward_plugin_replay_max_records = 250;
-
     DEBUG_MSG("Before PSRAM initilization:\n");
 
     DEBUG_MSG("  Total heap: %d\n", ESP.getHeapSize());
@@ -77,14 +75,17 @@ void StoreForwardPlugin::populatePSRAM()
     DEBUG_MSG("  Total PSRAM: %d\n", ESP.getPsramSize());
     DEBUG_MSG("  Free PSRAM: %d\n", ESP.getFreePsram());
 
-    // Use a maximum of 2/3 the available PSRAM unless otherwise specified.
+    this->packetHistoryTXQueue =
+        static_cast<PacketHistoryStruct *>(ps_calloc(this->historyReturnMax, sizeof(PacketHistoryStruct)));
+
+    /* Use a maximum of 2/3 the available PSRAM unless otherwise specified.
+        Note: This needs to be done after every thing that would use PSRAM
+    */
     uint32_t numberOfPackets =
-        (radioConfig.preferences.store_forward_plugin_records ? radioConfig.preferences.store_forward_plugin_records
-                                                              : (((ESP.getFreePsram() / 3) * 2) / sizeof(PacketHistoryStruct)));
+        (this->records ? this->records : (((ESP.getFreePsram() / 3) * 2) / sizeof(PacketHistoryStruct)));
 
     this->packetHistory = static_cast<PacketHistoryStruct *>(ps_calloc(numberOfPackets, sizeof(PacketHistoryStruct)));
-    this->packetHistoryTXQueue =
-        static_cast<PacketHistoryStruct *>(ps_calloc(store_forward_plugin_replay_max_records, sizeof(PacketHistoryStruct)));
+
     DEBUG_MSG("After PSRAM initilization:\n");
 
     DEBUG_MSG("  Total heap: %d\n", ESP.getHeapSize());
@@ -107,7 +108,7 @@ void StoreForwardPlugin::historyReport()
 void StoreForwardPlugin::historySend(uint32_t msAgo, uint32_t to)
 {
 
-    uint32_t packetsSent = 0;
+    //uint32_t packetsSent = 0;
 
     uint32_t queueSize = storeForwardPlugin->historyQueueCreate(msAgo, to);
 
@@ -229,12 +230,6 @@ ProcessMessage StoreForwardPlugin::handleReceived(const MeshPacket &mp)
 
         DEBUG_MSG("--- S&F Received something\n");
 
-        /*
-        StoreAndForwardMessage sfm = StoreAndForwardMessage_init_default;
-
-        switch (sfm.rr) {
-        }
-*/
         auto &p = mp.decoded;
 
         // The router node should not be sending messages as a client.
@@ -287,49 +282,74 @@ ProcessMessage StoreForwardPlugin::handleReceivedProtobuf(const MeshPacket &mp,
         return ProcessMessage::CONTINUE;
     }
 
-    //auto sfp = *p;
-    //auto p = *p;
+    if (mp.decoded.portnum == PortNum_TEXT_MESSAGE_APP) {
+        DEBUG_MSG("Packet came from an PortNum_TEXT_MESSAGE_APP port %u\n", mp.decoded.portnum);
+        return ProcessMessage::CONTINUE;
+    } else if (mp.decoded.portnum == PortNum_STORE_FORWARD_APP) {
+        DEBUG_MSG("Packet came from an PortNum_STORE_FORWARD_APP port %u\n", mp.decoded.portnum);
+
+    } else {
+        DEBUG_MSG("Packet came from an UNKNOWN port %u\n", mp.decoded.portnum);
+        return ProcessMessage::CONTINUE;
+    }
 
-   // Advance states as needed
     switch (p->rr) {
     case StoreAndForward_RequestResponse_CLIENT_ERROR:
         // Do nothing
+        DEBUG_MSG("StoreAndForward_RequestResponse_CLIENT_ERROR\n");
         break;
 
     case StoreAndForward_RequestResponse_CLIENT_HISTORY:
-        // Do nothing
+        DEBUG_MSG("StoreAndForward_RequestResponse_CLIENT_HISTORY\n");
+
+        // Send the last 60 minutes of messages.
+        if (this->busy) {
+            strcpy(this->routerMessage, "** S&F - Busy. Try again shortly.");
+            storeForwardPlugin->sendMessage(getFrom(&mp), this->routerMessage);
+        } else {
+            storeForwardPlugin->historySend(1000 * 60, getFrom(&mp));
+        }
+
         break;
 
     case StoreAndForward_RequestResponse_CLIENT_PING:
         // Do nothing
+        DEBUG_MSG("StoreAndForward_RequestResponse_CLIENT_PING\n");
         break;
 
     case StoreAndForward_RequestResponse_CLIENT_PONG:
         // Do nothing
+        DEBUG_MSG("StoreAndForward_RequestResponse_CLIENT_PONG\n");
         break;
 
     case StoreAndForward_RequestResponse_CLIENT_STATS:
         // Do nothing
+        DEBUG_MSG("StoreAndForward_RequestResponse_CLIENT_STATS\n");
         break;
 
     case StoreAndForward_RequestResponse_ROUTER_BUSY:
         // Do nothing
+        DEBUG_MSG("StoreAndForward_RequestResponse_ROUTER_BUSY\n");
         break;
 
     case StoreAndForward_RequestResponse_ROUTER_ERROR:
         // Do nothing
+        DEBUG_MSG("StoreAndForward_RequestResponse_ROUTER_ERROR\n");
         break;
 
     case StoreAndForward_RequestResponse_ROUTER_HEARTBEAT:
         // Do nothing
+        DEBUG_MSG("StoreAndForward_RequestResponse_ROUTER_HEARTBEAT\n");
         break;
 
     case StoreAndForward_RequestResponse_ROUTER_PING:
         // Do nothing
+        DEBUG_MSG("StoreAndForward_RequestResponse_ROUTER_PING\n");
         break;
 
     case StoreAndForward_RequestResponse_ROUTER_PONG:
         // Do nothing
+        DEBUG_MSG("StoreAndForward_RequestResponse_ROUTER_PONG\n");
         break;
 
 
@@ -337,7 +357,7 @@ ProcessMessage StoreForwardPlugin::handleReceivedProtobuf(const MeshPacket &mp,
         assert(0); // unexpected state - FIXME, make an error code and reboot
     }
 
-    return ProcessMessage::CONTINUE; // Let others look at this message also if they want
+    return ProcessMessage::STOP; // There's no need for others to look at this message.
 }
 
 StoreForwardPlugin::StoreForwardPlugin()
@@ -354,9 +374,9 @@ StoreForwardPlugin::StoreForwardPlugin()
             without having to configure it from the PythonAPI or WebUI.
         */
 
-        // radioConfig.preferences.store_forward_plugin_enabled = 1;
-        // radioConfig.preferences.is_router = 1;
-        // radioConfig.preferences.is_always_powered = 1;
+        radioConfig.preferences.store_forward_plugin_enabled = 1;
+        radioConfig.preferences.is_router = 1;
+        radioConfig.preferences.is_always_powered = 1;
     }
 
     if (radioConfig.preferences.store_forward_plugin_enabled) {
@@ -369,9 +389,31 @@ StoreForwardPlugin::StoreForwardPlugin()
 
                     // Do the startup here
 
+                    // Maximum number of records to return.
+                    if (radioConfig.preferences.store_forward_plugin_history_return_max)
+                        this->historyReturnMax = radioConfig.preferences.store_forward_plugin_history_return_max;
+
+                    // Maximum time window for records to return (in minutes)
+                    if (radioConfig.preferences.store_forward_plugin_history_return_window)
+                        this->historyReturnWindow = radioConfig.preferences.store_forward_plugin_history_return_window;
+
+                    // Maximum number of records to store in memory
+                    if (radioConfig.preferences.store_forward_plugin_records)
+                        this->records = radioConfig.preferences.store_forward_plugin_records;
+
+                    // Maximum number of records to store in memory
+                    if (radioConfig.preferences.store_forward_plugin_heartbeat)
+                        this->heartbeat = radioConfig.preferences.store_forward_plugin_heartbeat;
+
                     // Popupate PSRAM with our data structures.
                     this->populatePSRAM();
 
+                    // Calculate the packet time.
+                    // this->packetTimeMax = RadioLibInterface::instance->getPacketTime(Constants_DATA_PAYLOAD_LEN);
+                    // RadioLibInterface::instance->getPacketTime(Constants_DATA_PAYLOAD_LEN);
+                    // RadioLibInterface::instance->getPacketTime(Constants_DATA_PAYLOAD_LEN);
+                    // RadioInterface::getPacketTime(500)l
+
                     this->packetTimeMax = 2000;
 
                 } else {

src/plugins/esp32/StoreForwardPlugin.h

@@ -62,6 +62,12 @@ class StoreForwardPlugin : public SinglePortPlugin, private concurrency::OSThrea
   private:
     void populatePSRAM();
 
+    // S&F Defaults
+    uint32_t historyReturnMax = 250; // 250 records
+    uint32_t historyReturnWindow = 240; // 4 hours
+    uint32_t records = 0; // Calculated
+    bool heartbeat = false; // No heartbeat.
+
   protected:
     virtual int32_t runOnce();
 

variants/WisCore_RAK4631_Board/variant.h

@@ -58,11 +58,16 @@ extern "C" {
 /*
  * Buttons
  */
-#define PIN_BUTTON1 11
+
+#ifdef RAK_BASE_5005
+#define PIN_BUTTON1 9 // Pin for button on E-ink button module or IO expansion
+#define BUTTON_NEED_PULLUP
+#endif
 #define PIN_BUTTON2 12
 #define PIN_BUTTON3 24
 #define PIN_BUTTON4 25
 
+
 /*
  * Analog pins
  */
@@ -147,7 +152,7 @@ static const uint8_t SCK = PIN_SPI_SCK;
    SW1       <->  P0.01 (Arduino GPIO number 1)
    A0        <->  P0.04/AIN2 (Arduino Analog A2
    A1        <->  P0.31/AIN7 (Arduino Analog A7
-   SPI_CS    <->  P0.26 (Arduino GPIO number 26)
+   SPI_CS    <->  P0.26 (Arduino GPIO number 26) 
  */
 
 // RAK4630 LoRa module
@@ -169,8 +174,11 @@ static const uint8_t SCK = PIN_SPI_SCK;
 // #define PIN_GPS_RESET (34)
 #define PIN_GPS_EN (34)
 #define PIN_GPS_PPS (17) // Pulse per second input from the GPS
+
+#ifdef RAK_BASE_5005
 #define GPS_RX_PIN PIN_SERIAL1_RX
 #define GPS_TX_PIN PIN_SERIAL1_TX
+#endif
 
 // Battery
 // The battery sense is hooked to pin A0 (5)

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 1  
 minor = 2
-build = 48
+build = 49