Merge branch 'master' of github.com:meshtastic/Meshtastic-device

.github/workflows/main_matrix.yml

@@ -162,6 +162,7 @@ jobs:
           - board: rak4631_19003
           - board: rak4631_5005_eink
           - board: t-echo
+          - board: pca10059_diy_eink
 
     runs-on: ubuntu-latest
     steps:

README.md

@@ -2,6 +2,8 @@
 [![Open in Visual Studio Code](https://open.vscode.dev/badges/open-in-vscode.svg)](https://open.vscode.dev/meshtastic/Meshtastic-device)
 [![Continuous Integration](https://github.com/meshtastic/Meshtastic-device/actions/workflows/main.yml/badge.svg)](https://github.com/meshtastic/Meshtastic-device/actions/workflows/main.yml)
 ![GitHub all releases](https://img.shields.io/github/downloads/meshtastic/meshtastic-device/total)
+[![CLA assistant](https://cla-assistant.io/readme/badge/meshtastic/Meshtastic-device)](https://cla-assistant.io/meshtastic/Meshtastic-device)
+[![Fiscal Contributors](https://opencollective.com/meshtastic/tiers/badge.svg)](https://opencollective.com/meshtastic/tiers/badge.svg)
 
 ## This repository contains the device firmware used in the [Meshtastic](https://meshtastic.org) project.
 
@@ -16,3 +18,7 @@ Manual Method
 [For nRF52 devices click here](https://meshtastic.org/docs/getting-started/flashing-nrf52)
 
 For developer information and specific building instructions, please see the [developer documentation](https://meshtastic.org/docs/developers)
+
+## Stats
+
+![Alt](https://repobeats.axiom.co/api/embed/99a2cf5622bb4807f9e8c3b86589f1133cce58a2.svg 'Repobeats analytics image')

platformio.ini

@@ -42,7 +42,7 @@ build_flags = -Wno-missing-field-initializers
 monitor_speed = 921600
 
 lib_deps =
-  https://github.com/meshtastic/esp8266-oled-ssd1306.git ; ESP8266_SSD1306 
+  https://github.com/meshtastic/esp8266-oled-ssd1306.git#53580644255b48ebb7a737343c6b4e71c7e11cf2 ; ESP8266_SSD1306 
   mathertel/OneButton@^2.0.3 ; OneButton library for non-blocking button debounce
   1202 ; CRC32, explicitly needed because dependency is missing in the ble ota update lib
   https://github.com/meshtastic/arduino-fsm.git
@@ -102,7 +102,6 @@ lib_deps =
   ${environmental.lib_deps}
   https://github.com/meshtastic/esp32_https_server.git
   h2zero/NimBLE-Arduino@1.3.7
-  tobozo/ESP32-targz@^1.1.4
   arduino-libraries/NTPClient@^3.1.0
   lorol/LittleFS_esp32@^1.0.6
 lib_ignore = 
@@ -110,11 +109,15 @@ lib_ignore =
   ESP32 BLE Arduino
 platform_packages =
     framework-arduinoespressif32@https://github.com/meshtastic/arduino-esp32.git#4cde0f5d412d2695184f32e8a47e9bea57b45276
-; leave this commented out to avoid breaking Windows
 
+; leave this commented out to avoid breaking Windows
 ;upload_port = /dev/ttyUSB0
 ;monitor_port = /dev/ttyUSB0
 
+; Please don't delete these lines. JM uses them.
+;upload_port = /dev/cu.SLAB_USBtoUART
+;monitor_port = /dev/cu.SLAB_USBtoUART
+
 ; customize the partition table
 ; http://docs.platformio.org/en/latest/platforms/espressif32.html#partition-tables
 board_build.partitions = partition-table.csv

src/Observer.h

@@ -11,13 +11,13 @@ template <class T> class Observable;
  */
 template <class T> class Observer
 {
-    Observable<T> *observed = NULL;
+  std::list<Observable<T> *> observed;
 
   public:
     virtual ~Observer();
 
-    /// Stop watching our current obserable
+    /// Stop watching the obserable
-    void unobserve();
+    void unobserve(Observable<T> *o);
 
     /// Start watching a specified observable
     void observe(Observable<T> *o);
@@ -87,21 +87,21 @@ template <class T> class Observable
 
 template <class T> Observer<T>::~Observer()
 {
-    unobserve();
+    for (typename std::list<Observable<T> *>::const_iterator iterator = observed.begin(); iterator != observed.end();
+        ++iterator) {
+        (*iterator)->removeObserver(this);
+    }
+    observed.clear();
 }
 
-template <class T> void Observer<T>::unobserve()
+template <class T> void Observer<T>::unobserve(Observable<T> *o)
 {
-    if (observed)
+    o->removeObserver(this);
-        observed->removeObserver(this);
+    observed.remove(o);
-    observed = NULL;
 }
 
 template <class T> void Observer<T>::observe(Observable<T> *o)
 {
-    // We can only watch one thing at a time
+    observed.push_back(o);
-    assert(!observed);
-
-    observed = o;
     o->addObserver(this);
 }

src/PowerFSM.cpp

@@ -363,9 +363,6 @@ void PowerFSM_setup()
 
     if (meshSds != UINT32_MAX)
         powerFSM.add_timed_transition(lowPowerState, &stateSDS, meshSds * 1000, NULL, "mesh timeout");
-    // removing for now, because some users don't even have phones
-    // powerFSM.add_timed_transition(lowPowerState, &stateSDS, getPref_phone_sds_timeout_sec() * 1000, NULL, "phone
-    // timeout");
 
     powerFSM.run_machine(); // run one interation of the state machine, so we run our on enter tasks for the initial DARK state
 }

src/configuration.h

@@ -125,6 +125,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define RTC_DATA_ATTR
 #endif
 
+// -----------------------------------------------------------------------------
+// Feature toggles
+// -----------------------------------------------------------------------------
+
+// Disable use of the NTP library and related features
+//#define DISABLE_NTP
+
+// Disable the welcome screen and allow 
+// #define DISABLE_WELCOME_UNSET
+
 // -----------------------------------------------------------------------------
 // OLED & Input
 // -----------------------------------------------------------------------------

src/debug/i2cScan.h

@@ -6,21 +6,28 @@
 uint8_t oled_probe(byte addr)
 {
     uint8_t r = 0;
+    uint8_t r_prev = 0;
+    uint8_t c = 0;
     uint8_t o_probe = 0;
-    Wire.beginTransmission(addr);
+    do {
-    Wire.write(0x00);
+        r_prev = r;
-    Wire.endTransmission();
+        Wire.beginTransmission(addr);
-    Wire.requestFrom((int)addr, 1);
+        Wire.write(0x00);
-    if (Wire.available()) {
+        Wire.endTransmission();
-        r = Wire.read();
+        Wire.requestFrom((int)addr, 1);
-    }
+        if (Wire.available()) {
-    r &= 0x0f;
+            r = Wire.read();
-    if (r == 0x08 || r == 0x00) {
+        }
-        o_probe = 2; // SH1106
+        r &= 0x0f;
-    } else if ( r == 0x03 || r == 0x06 || r == 0x07) {
+
-        o_probe = 1; // SSD1306
+        if (r == 0x08 || r == 0x00) {
-    }
+            o_probe = 2; // SH1106
-    DEBUG_MSG("0x%x subtype probed\n", r);
+        } else if ( r == 0x03 || r == 0x06 || r == 0x07) {
+            o_probe = 1; // SSD1306
+        }
+        c++;
+    } while ((r != r_prev) && (c < 4));
+    DEBUG_MSG("0x%x subtype probed in %i tries \n", r, c);
     return o_probe;
 }
 

src/gps/GPS.cpp

@@ -95,8 +95,8 @@ bool GPS::setup()
 GPS::~GPS()
 {
     // we really should unregister our sleep observer
-    notifySleepObserver.unobserve();
+    notifySleepObserver.unobserve(&notifySleep);
-    notifyDeepSleepObserver.unobserve();
+    notifyDeepSleepObserver.unobserve(&notifyDeepSleep);
 }
 
 bool GPS::hasLock() { return hasValidLocation; }

src/graphics/Screen.cpp

@@ -31,6 +31,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "graphics/images.h"
 #include "main.h"
 #include "mesh-pb-constants.h"
+#include "mesh/generated/deviceonly.pb.h"
 #include "mesh/Channels.h"
 #include "modules/TextMessageModule.h"
 #include "sleep.h"
@@ -44,6 +45,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 using namespace meshtastic; /** @todo remove */
 
+extern bool loadProto(const char *filename, size_t protoSize, size_t objSize, const pb_msgdesc_t *fields, void *dest_struct);
+
 namespace graphics
 {
 
@@ -77,6 +80,10 @@ static char ourId[5];
 // GeoCoord object for the screen
 GeoCoord geoCoord;
 
+// OEM Config File
+static const char *oemConfigFile = "/prefs/oem.proto";
+OEMStore oemStore;
+
 #ifdef SHOW_REDRAWS
 static bool heartbeat = false;
 #endif
@@ -148,6 +155,54 @@ static void drawBootScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int1
     drawIconScreen(region, display, state, x, y);
 }
 
+static void drawOEMIconScreen(const char *upperMsg, OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
+{
+    // draw an xbm image.
+    // Please note that everything that should be transitioned
+    // needs to be drawn relative to x and y
+
+    // draw centered icon left to right and centered above the one line of app text
+    display->drawXbm(x + (SCREEN_WIDTH - oemStore.oem_icon_width) / 2, y + (SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM - oemStore.oem_icon_height) / 2 + 2,
+                     oemStore.oem_icon_width, oemStore.oem_icon_height, (const uint8_t *)oemStore.oem_icon_bits.bytes);
+
+    switch(oemStore.oem_font){
+        case 0:
+            display->setFont(FONT_SMALL);
+        break;
+        case 2:
+            display->setFont(FONT_LARGE);
+        break;
+        default:
+            display->setFont(FONT_MEDIUM);
+        break;
+    }
+    
+    display->setTextAlignment(TEXT_ALIGN_LEFT);
+    const char *title = oemStore.oem_text;
+    display->drawString(x + getStringCenteredX(title), y + SCREEN_HEIGHT - FONT_HEIGHT_MEDIUM, title);
+    display->setFont(FONT_SMALL);
+
+    // Draw region in upper left
+    if (upperMsg)
+        display->drawString(x + 0, y + 0, upperMsg);
+
+    // Draw version in upper right
+    char buf[16];
+    snprintf(buf, sizeof(buf), "%s",
+             xstr(APP_VERSION_SHORT)); // Note: we don't bother printing region or now, it makes the string too long
+    display->drawString(x + SCREEN_WIDTH - display->getStringWidth(buf), y + 0, buf);
+    screen->forceDisplay();
+
+    // FIXME - draw serial # somewhere?
+}
+
+static void drawOEMBootScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
+{
+    // Draw region in upper left
+    const char *region = myRegion ? myRegion->name : NULL;
+    drawOEMIconScreen(region, display, state, x, y);
+}
+
 // Used on boot when a certificate is being created
 static void drawSSLScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
@@ -168,6 +223,40 @@ static void drawSSLScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     }
 }
 
+// Used when booting without a region set
+static void drawWelcomeScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
+{
+
+    if ((millis() / 10000) % 2) {
+        display->setFont(FONT_SMALL);
+
+        display->setTextAlignment(TEXT_ALIGN_CENTER);
+        display->drawString(64 + x, y, "//\\ E S H T /\\ S T / C");
+
+        display->setTextAlignment(TEXT_ALIGN_LEFT);
+
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 2 - 3, "Set the region using the");
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 3 - 3, "Meshtastic Android, iOS,");
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 4 - 3, "Flasher or CLI client.");
+    } else {
+        display->setFont(FONT_SMALL);
+
+        display->setTextAlignment(TEXT_ALIGN_CENTER);
+        display->drawString(64 + x, y, "//\\ E S H T /\\ S T / C");
+
+        display->setTextAlignment(TEXT_ALIGN_LEFT);
+
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 2 - 3, "Visit meshtastic.org");
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 3 - 3, "for more information.");
+        display->drawString(x, y + FONT_HEIGHT_SMALL * 4 - 3, "");
+    }
+
+#ifndef NO_ESP32
+    yield();
+    esp_task_wdt_reset();
+#endif
+}
+
 #ifdef HAS_EINK
 /// Used on eink displays while in deep sleep
 static void drawSleepScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
@@ -256,7 +345,7 @@ static void drawCriticalFaultFrame(OLEDDisplay *display, OLEDDisplayUiState *sta
     display->drawString(0 + x, 0 + y, tempBuf);
     display->setTextAlignment(TEXT_ALIGN_LEFT);
     display->setFont(FONT_SMALL);
-    display->drawString(0 + x, FONT_HEIGHT_MEDIUM + y, "For help, please post on\nmeshtastic.discourse.group");
+    display->drawString(0 + x, FONT_HEIGHT_MEDIUM + y, "For help, please visit \nmeshtastic.org");
 }
 
 // Ignore messages orginating from phone (from the current node 0x0) unless range test or store and forward module are enabled
@@ -646,8 +735,18 @@ static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_
         snprintf(lastStr, sizeof(lastStr), "%u seconds ago", agoSecs);
     else if (agoSecs < 120 * 60) // last 2 hrs
         snprintf(lastStr, sizeof(lastStr), "%u minutes ago", agoSecs / 60);
-    else
+    else {
-        snprintf(lastStr, sizeof(lastStr), "%u hours ago", agoSecs / 60 / 60);
+
+        uint32_t hours_in_month = 730;
+
+        // Only show hours ago if it's been less than 6 months. Otherwise, we may have bad
+        //   data.
+        if ((agoSecs / 60 / 60) < (hours_in_month * 6)) {
+            snprintf(lastStr, sizeof(lastStr), "%u hours ago", agoSecs / 60 / 60);
+        } else {
+            snprintf(lastStr, sizeof(lastStr), "unknown age");
+        }
+    }
 
     static char distStr[20];
     strcpy(distStr, "? km"); // might not have location data
@@ -766,11 +865,11 @@ void Screen::setup()
     useDisplay = true;
 
 #ifdef AutoOLEDWire_h
-       dispdev.setDetected(screen_model);
+    dispdev.setDetected(screen_model);
 #endif
 
-    // I think this is not needed - redundant with ui.init
+    // Load OEM config from Proto file if existent
-    // dispdev.resetOrientation();
+    loadProto(oemConfigFile, OEMStore_size, sizeof(oemConfigFile), OEMStore_fields, &oemStore);
 
     // Initialising the UI will init the display too.
     ui.init();
@@ -823,6 +922,7 @@ void Screen::setup()
     // twice initially.
     ui.update();
     ui.update();
+    serialSinceMsec = millis();
 
     // Subscribe to status updates
     powerStatusObserver.observe(&powerStatus->onNewStatus);
@@ -853,7 +953,7 @@ int32_t Screen::runOnce()
         return RUN_SAME;
     }
 
-    // Show boot screen for first 3 seconds, then switch to normal operation.
+    // Show boot screen for first 5 seconds, then switch to normal operation.
     // serialSinceMsec adjusts for additional serial wait time during nRF52 bootup
     static bool showingBootScreen = true;
     if (showingBootScreen && (millis() > (5000 + serialSinceMsec))) {
@@ -862,6 +962,27 @@ int32_t Screen::runOnce()
         showingBootScreen = false;
     }
 
+    // If we have an OEM Boot screen, toggle after 2,5 seconds
+    if(strlen(oemStore.oem_text) > 0){
+        static bool showingOEMBootScreen = true;
+        if (showingOEMBootScreen && (millis() > (2500 + serialSinceMsec))) {
+            DEBUG_MSG("Switch to OEM screen...\n");
+            // Change frames.
+            static FrameCallback bootOEMFrames[] = {drawOEMBootScreen};
+            static const int bootOEMFrameCount = sizeof(bootOEMFrames) / sizeof(bootOEMFrames[0]);
+            ui.setFrames(bootOEMFrames, bootOEMFrameCount);
+            ui.update();
+            ui.update();
+            showingOEMBootScreen = false;
+        }
+    }
+
+#ifndef DISABLE_WELCOME_UNSET
+    if (showingNormalScreen && radioConfig.preferences.region == RegionCode_Unset) {
+        setWelcomeFrames();
+    }
+#endif
+
     // Process incoming commands.
     for (;;) {
         ScreenCmd cmd;
@@ -975,6 +1096,20 @@ void Screen::setSSLFrames()
     }
 }
 
+/* show a message that the SSL cert is being built
+ * it is expected that this will be used during the boot phase */
+void Screen::setWelcomeFrames()
+{
+    if (address_found) {
+        // DEBUG_MSG("showing Welcome frames\n");
+        ui.disableAllIndicators();
+
+        static FrameCallback welcomeFrames[] = {drawWelcomeScreen};
+        ui.setFrames(welcomeFrames, 1);
+        ui.update();
+    }
+}
+
 // restore our regular frame list
 void Screen::setFrames()
 {
@@ -1366,7 +1501,7 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
     }
 
     auto mode = "";
-    
+
     if (channels.getPrimary().modem_config == 0) {
         mode = "VLongSlow";
     } else if (channels.getPrimary().modem_config == 1) {
@@ -1380,7 +1515,7 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
     } else if (channels.getPrimary().modem_config == 5) {
         mode = "ShortSlow";
     } else if (channels.getPrimary().modem_config == 6) {
-        mode = "ShortFast";    
+        mode = "ShortFast";
     } else {
         mode = "Custom";
     }
@@ -1432,8 +1567,7 @@ void DebugInfo::drawFrameSettings(OLEDDisplay *display, OLEDDisplayUiState *stat
     // Display Channel Utilization
     char chUtil[13];
     sprintf(chUtil, "ChUtil %2.0f%%", airTime->channelUtilizationPercent());
-    display->drawString(x + SCREEN_WIDTH - display->getStringWidth(chUtil),
+    display->drawString(x + SCREEN_WIDTH - display->getStringWidth(chUtil), y + FONT_HEIGHT_SMALL * 1, chUtil);
-                        y + FONT_HEIGHT_SMALL * 1, chUtil);
 
     // Line 3
     if (radioConfig.preferences.gps_format != GpsCoordinateFormat_GpsFormatDMS) // if DMS then don't draw altitude
@@ -1491,16 +1625,13 @@ int Screen::handleTextMessage(const MeshPacket *packet)
 int Screen::handleUIFrameEvent(const UIFrameEvent *event)
 {
     if (showingNormalScreen) {
-        if (event->frameChanged)
+        if (event->frameChanged) {
-        {
             setFrames(); // Regen the list of screens (will show new text message)
-        }
+        } else if (event->needRedraw) {
-        else if (event->needRedraw)
-        {
             setFastFramerate();
             // TODO: We might also want switch to corresponding frame,
             //       but we don't know the exact frame number.
-            //ui.switchToFrame(0);
+            // ui.switchToFrame(0);
         }
     }
 

src/graphics/Screen.h

@@ -235,6 +235,8 @@ class Screen : public concurrency::OSThread
     /// Draws our SSL cert screen during boot (called from WebServer)
     void setSSLFrames();
 
+    void setWelcomeFrames();
+
   protected:
     /// Updates the UI.
     //

src/mesh/DSRRouter.cpp

@@ -1,250 +0,0 @@
-#include "configuration.h"
-#include "DSRRouter.h"
-
-/* when we receive any packet
-
-- sniff and update tables (especially useful to find adjacent nodes). Update user, network and position info.
-- if we need to route() that packet, resend it to the next_hop based on our nodedb.
-- if it is broadcast or destined for our node, deliver locally
-- handle routereply/routeerror/routediscovery messages as described below
-- then free it
-
-routeDiscovery
-
-- if we've already passed through us (or is from us), then it ignore it
-- use the nodes already mentioned in the request to update our routing table
-- if they were looking for us, send back a routereply
-- if max_hops is zero and they weren't looking for us, drop (FIXME, send back error - I think not though?)
-- if we receive a discovery packet, we use it to populate next_hop (if needed) towards the requester (after decrementing max_hops)
-- if we receive a discovery packet, and we have a next_hop in our nodedb for that destination we send a (reliable) we send a route
-reply towards the requester
-
-when sending any reliable packet
-
-- if timeout doing retries, send a routeError (nak) message back towards the original requester. all nodes eavesdrop on that
-packet and update their route caches.
-
-when we receive a routereply packet
-
-- update next_hop on the node, if the new reply needs fewer hops than the existing one (we prefer shorter paths). fixme, someday
-use a better heuristic
-
-when we receive a routeError packet
-
-- delete the route for that failed recipient, restartRouteDiscovery()
-- if we receive routeerror in response to a discovery,
-- fixme, eventually keep caches of possible other routes.
-*/
-
-ErrorCode DSRRouter::send(MeshPacket *p)
-{
-    // We only consider multihop routing packets (i.e. those with dest set)
-    if (p->decoded.dest) {
-        // add an entry for this pending message
-        auto pending = startRetransmission(p);
-        // FIXME - when acks come in for this packet, we should _not_ delete the record unless the ack was from
-        // the final dest.  We need to keep that record around until FIXME
-        // Also we should not retransmit multihop entries in that table at all
-
-        // If we have an entry in our routing tables, just send it, otherwise start a route discovery
-        NodeNum nextHop = getNextHop(p->decoded.dest);
-        if (nextHop) {
-            sendNextHop(nextHop, p); // start a reliable single hop send
-        } else {
-            pending->wantRoute = true;
-
-            // start discovery, but only if we don't already a discovery in progress for that node number
-            startDiscovery(p->decoded.dest);
-        }
-
-        return ERRNO_OK;
-    } else
-        return ReliableRouter::send(p);
-}
-
-void DSRRouter::sniffReceived(const MeshPacket *p, const Routing *c)
-{
-    // Learn 0 hop routes by just hearing any adjacent nodes
-    // But treat broadcasts carefully, because when flood broadcasts go out they keep the same original "from".  So we want to
-    // ignore rebroadcasts.
-    // this will also add records for any ACKs we receive for our messages
-    if (p->to != NODENUM_BROADCAST || p->hop_limit != HOP_RELIABLE) {
-        addRoute(getFrom(p), getFrom(p), 0); // We are adjacent with zero hops
-    }
-
-    if (c)
-        switch (c->which_variant) {
-        case Routing_route_request_tag:
-            // Handle route discovery packets (will be a broadcast message)
-            // FIXME - always start request with the senders nodenum
-            if (weAreInRoute(c->route_request)) {
-                DEBUG_MSG("Ignoring a route request that contains us\n");
-            } else {
-                updateRoutes(c->route_request,
-                             true); // Update our routing tables based on the route that came in so far on this request
-
-                if (p->decoded.dest == getNodeNum()) {
-                    // They were looking for us, send back a route reply (the sender address will be first in the list)
-                    sendRouteReply(c->route_request);
-                } else {
-                    // They were looking for someone else, forward it along (as a zero hop broadcast)
-                    NodeNum nextHop = getNextHop(p->decoded.dest);
-                    if (nextHop) {
-                        // in our route cache, reply to the requester (the sender address will be first in the list)
-                        sendRouteReply(c->route_request, nextHop);
-                    } else {
-                        // Not in our route cache, rebroadcast on their behalf (after adding ourselves to the request route)
-                        resendRouteRequest(p);
-                    }
-                }
-            }
-            break;
-        case Routing_route_reply_tag:
-            updateRoutes(c->route_reply, false);
-
-            // FIXME, if any of our current pending packets were waiting for this route, send them (and leave them as regular
-            // pending packets until ack arrives)
-            // FIXME, if we don't get a route reply at all (or a route error), timeout and generate a routeerror TIMEOUT on our
-            // own...
-            break;
-        case Routing_error_reason_tag:
-            removeRoute(p->decoded.dest);
-
-            // FIXME: if any pending packets were waiting on this route, delete them
-            break;
-        default:
-            break;
-        }
-
-    // We simply ignore ACKs - because ReliableRouter will delete the pending packet for us
-
-    // Handle regular packets
-    if (p->to == getNodeNum()) { // Destined for us (at least for this hop)
-
-        // We need to route this packet to some other node
-        if (p->decoded.dest && p->decoded.dest != p->to) {
-            // if we have a route out, resend the packet to the next hop, otherwise return RouteError no-route available
-
-            NodeNum nextHop = getNextHop(p->decoded.dest);
-            if (nextHop) {
-                sendNextHop(nextHop, p); // start a reliable single hop send
-            } else {
-                // We don't have a route out
-                assert(p->decoded.source); // I think this is guaranteed by now
-
-                // FIXME - what if the current packet _is_ a route error packet?
-                sendRouteError(p, Routing_Error_NO_ROUTE);
-            }
-
-            // FIXME, stop local processing of this packet
-        }
-
-        if (c) {
-            // handle naks - convert them to route error packets
-            // All naks are generated locally, because we failed resending the packet too many times
-            PacketId nakId = c->error_reason ? p->decoded.request_id : 0;
-            if (nakId) {
-                auto pending = findPendingPacket(p->to, nakId);
-                if (pending &&
-                    pending->packet->decoded.source) {          // if source not set, this was not a multihop packet, just ignore
-                    removeRoute(pending->packet->decoded.dest); // We no longer have a route to the specified node
-
-                    sendRouteError(p, Routing_Error_GOT_NAK);
-                }
-            }
-        }
-    }
-
-    ReliableRouter::sniffReceived(p, c);
-}
-
-/**
- * Does our node appear in the specified route
- */
-bool DSRRouter::weAreInRoute(const RouteDiscovery &route)
-{
-    return true; // FIXME
-}
-
-/**
- * Given a DSR route, use that route to update our DB of possible routes
- *
- * Note: routes are always listed in the same order - from sender to receipient (i.e. route_replies also use this some order)
- *
- * @param isRequest is true if we are looking at a route request, else we are looking at a reply
- **/
-void DSRRouter::updateRoutes(const RouteDiscovery &route, bool isRequest)
-{
-    DEBUG_MSG("FIXME not implemented updateRoutes\n");
-}
-
-/**
- * send back a route reply (the sender address will be first in the list)
- */
-void DSRRouter::sendRouteReply(const RouteDiscovery &route, NodeNum toAppend)
-{
-    DEBUG_MSG("FIXME not implemented sendRoute\n");
-}
-
-/**
- * Given a nodenum return the next node we should forward to if we want to reach that node.
- *
- * @return 0 if no route found
- */
-NodeNum DSRRouter::getNextHop(NodeNum dest)
-{
-    DEBUG_MSG("FIXME not implemented getNextHop\n");
-    return 0;
-}
-
-/** Not in our route cache, rebroadcast on their behalf (after adding ourselves to the request route)
- *
- * We will bump down hop_limit in this call.
- */
-void DSRRouter::resendRouteRequest(const MeshPacket *p)
-{
-    DEBUG_MSG("FIXME not implemented resendRoute\n");
-}
-
-/**
- * Record that forwarder can reach dest for us, but they will need numHops to get there.
- * If our routing tables already have something that can reach that node in fewer hops we will keep the existing route
- * instead.
- */
-void DSRRouter::addRoute(NodeNum dest, NodeNum forwarder, uint8_t numHops)
-{
-    DEBUG_MSG("FIXME not implemented addRoute\n");
-}
-
-/**
- * Record that we no longer have a route to the dest
- */
-void DSRRouter::removeRoute(NodeNum dest)
-{
-    DEBUG_MSG("FIXME not implemented removeRoute\n");
-}
-
-/**
- * Forward the specified packet to the specified node
- */
-void DSRRouter::sendNextHop(NodeNum n, const MeshPacket *p)
-{
-    DEBUG_MSG("FIXME not implemented sendNextHop\n");
-}
-
-/**
- * Send a route error packet towards whoever originally sent this message
- */
-void DSRRouter::sendRouteError(const MeshPacket *p, Routing_Error err)
-{
-    DEBUG_MSG("FIXME not implemented sendRouteError\n");
-}
-
-/** make a copy of p, start discovery, but only if we don't
- *  already a discovery in progress for that node number.  Caller has already scheduled this message for retransmission
- *  when the discovery is complete.
- */
-void DSRRouter::startDiscovery(NodeNum dest)
-{
-    DEBUG_MSG("FIXME not implemented startDiscovery\n");
-}

src/mesh/DSRRouter.h

@@ -1,80 +0,0 @@
-#include "ReliableRouter.h"
-
-class DSRRouter : public ReliableRouter
-{
-
-  protected:
-    /**
-     * Every (non duplicate) packet this node receives will be passed through this method.  This allows subclasses to
-     * update routing tables etc... based on what we overhear (even for messages not destined to our node)
-     */
-    virtual void sniffReceived(const MeshPacket *p, const Routing *c) override;
-
-    /**
-     * Send a packet on a suitable interface.  This routine will
-     * later free() the packet to pool.  This routine is not allowed to stall.
-     * If the txmit queue is full it might return an error
-     */
-    virtual ErrorCode send(MeshPacket *p) override;
-
-  private:
-    /**
-     * Does our node appear in the specified route
-     */
-    bool weAreInRoute(const RouteDiscovery &route);
-
-    /**
-     * Given a DSR route, use that route to update our DB of possible routes
-     *
-     * Note: routes are always listed in the same order - from sender to receipient (i.e. route_replies also use this some order)
-     *
-     * @param isRequest is true if we are looking at a route request, else we are looking at a reply
-     **/
-    void updateRoutes(const RouteDiscovery &route, bool isRequest);
-
-    /**
-     * send back a route reply (the sender address will be first in the list)
-     */
-    void sendRouteReply(const RouteDiscovery &route, NodeNum toAppend = 0);
-
-    /**
-     * Given a nodenum return the next node we should forward to if we want to reach that node.
-     *
-     * @return 0 if no route found
-     */
-    NodeNum getNextHop(NodeNum dest);
-
-    /** Not in our route cache, rebroadcast on their behalf (after adding ourselves to the request route)
-     *
-     * We will bump down hop_limit in this call.
-     */
-    void resendRouteRequest(const MeshPacket *p);
-
-    /**
-     * Record that forwarder can reach dest for us, but they will need numHops to get there.
-     * If our routing tables already have something that can reach that node in fewer hops we will keep the existing route
-     * instead.
-     */
-    void addRoute(NodeNum dest, NodeNum forwarder, uint8_t numHops);
-
-    /**
-     * Record that we no longer have a route to the dest
-     */
-    void removeRoute(NodeNum dest);
-
-    /**
-     * Forward the specified packet to the specified node
-     */
-    void sendNextHop(NodeNum n, const MeshPacket *p);
-
-    /**
-     * Send a route error packet towards whoever originally sent this message
-     */
-    void sendRouteError(const MeshPacket *p, Routing_Error err);
-
-    /** make a copy of p, start discovery, but only if we don't
-     *  already a discovery in progress for that node number.  Caller has already scheduled this message for retransmission
-     *  when the discovery is complete.
-     */
-    void startDiscovery(NodeNum dest);
-};

src/mesh/NodeDB.cpp

@@ -276,11 +276,9 @@ void NodeDB::pickNewNodeNum()
     myNodeInfo.my_node_num = r;
 }
 
-static const char *preffileOld = "/db.proto";
 static const char *preffile = "/prefs/db.proto";
 static const char *radiofile = "/prefs/radio.proto";
 static const char *channelfile = "/prefs/channels.proto";
-// const char *preftmp = "/db.proto.tmp";
 
 /** Load a protobuf from a file, return true for success */
 bool loadProto(const char *filename, size_t protoSize, size_t objSize, const pb_msgdesc_t *fields, void *dest_struct)
@@ -290,13 +288,6 @@ bool loadProto(const char *filename, size_t protoSize, size_t objSize, const pb_
 
     auto f = FSCom.open(filename);
 
-    // FIXME, temporary hack until every node in the universe is 1.2 or later - look for prefs in the old location (so we can
-    // preserve region)
-    if (!f && filename == preffile) {
-        filename = preffileOld;
-        f = FSCom.open(filename);
-    }
-
     bool okay = false;
     if (f) {
         DEBUG_MSG("Loading %s\n", filename);
@@ -399,8 +390,6 @@ void NodeDB::saveToDisk()
         saveProto(radiofile, RadioConfig_size, sizeof(RadioConfig), RadioConfig_fields, &radioConfig);
         saveChannelsToDisk();
 
-        // remove any pre 1.2 pref files, turn on after 1.2 is in beta
-        // if(okay) FSCom.remove(preffileOld);
     } else {
         DEBUG_MSG("***** DEVELOPMENT MODE - DO NOT RELEASE - not saving to flash *****\n");
     }

src/mesh/NodeDB.h

@@ -141,12 +141,10 @@ extern NodeDB nodeDB;
         # prefs.position_broadcast_secs = FIXME possibly broadcast only once an hr
         prefs.wait_bluetooth_secs = 1  # Don't stay in bluetooth mode
         prefs.mesh_sds_timeout_secs = never
-        prefs.phone_sds_timeout_sec = never
         # try to stay in light sleep one full day, then briefly wake and sleep again
 
         prefs.ls_secs = oneday
 
-        prefs.send_owner_interval = 2 # Send an owner packet every other network ping
         prefs.position_broadcast_secs = 12 hours # send either position or owner every 12hrs
         
         # get a new GPS position once per day
@@ -166,7 +164,6 @@ extern NodeDB nodeDB;
 #define PREF_GET(name, defaultVal)                                                                                               \
     inline uint32_t getPref_##name() { return radioConfig.preferences.name ? radioConfig.preferences.name : (defaultVal); }
 
-PREF_GET(send_owner_interval, IF_ROUTER(2, 4))
 PREF_GET(position_broadcast_secs, IF_ROUTER(12 * 60 * 60, 15 * 60))
 // Defaulting Telemetry to the same as position interval for now
 PREF_GET(telemetry_module_device_update_interval, IF_ROUTER(12 * 60 * 60, 15 * 60))
@@ -178,7 +175,6 @@ PREF_GET(wait_bluetooth_secs, IF_ROUTER(1, 60))
 
 PREF_GET(screen_on_secs, 60)
 PREF_GET(mesh_sds_timeout_secs, IF_ROUTER(NODE_DELAY_FOREVER, 2 * 60 * 60))
-PREF_GET(phone_sds_timeout_sec, IF_ROUTER(NODE_DELAY_FOREVER, 2 * 60 * 60))
 PREF_GET(sds_secs, 365 * 24 * 60 * 60)
 
 // We default to sleeping (with bluetooth off for 5 minutes at a time).  This seems to be a good tradeoff between

src/mesh/PhoneAPI.cpp

@@ -48,7 +48,7 @@ void PhoneAPI::close()
     if (state != STATE_SEND_NOTHING) {
         state = STATE_SEND_NOTHING;
 
-        unobserve();
+        unobserve(&service.fromNumChanged);
         releasePhonePacket(); // Don't leak phone packets on shutdown
 
         onConnectionChanged(false);

src/mesh/RadioLibInterface.cpp

@@ -1,8 +1,8 @@
-#include "configuration.h"
 #include "RadioLibInterface.h"
 #include "MeshTypes.h"
 #include "NodeDB.h"
 #include "SPILock.h"
+#include "configuration.h"
 #include "error.h"
 #include "mesh-pb-constants.h"
 #include <pb_decode.h>
@@ -93,8 +93,15 @@ bool RadioLibInterface::canSendImmediately()
 /// bluetooth comms code.  If the txmit queue is empty it might return an error
 ErrorCode RadioLibInterface::send(MeshPacket *p)
 {
-    if (disabled || radioConfig.preferences.is_lora_tx_disabled) {
+    if (radioConfig.preferences.region != RegionCode_Unset) {
-        DEBUG_MSG("send - lora_tx_disabled\n");
+        if (disabled || radioConfig.preferences.is_lora_tx_disabled) {
+            DEBUG_MSG("send - lora_tx_disabled\n");
+            packetPool.release(p);
+            return ERRNO_DISABLED;
+        }
+
+    } else {
+        DEBUG_MSG("send - lora_tx_disabled because RegionCode_Unset\n");
         packetPool.release(p);
         return ERRNO_DISABLED;
     }
@@ -115,9 +122,9 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
     // in response to a packet we just received.  So we want to make sure the other side has had a chance to reconfigure its radio
 
     /* We assume if rx_snr = 0 and rx_rssi = 0, the packet was not generated locally.
-    *   This assumption is valid because of the offset generated by the radio to account for the noise
+     *   This assumption is valid because of the offset generated by the radio to account for the noise
-    *   floor.
+     *   floor.
-    */  
+     */
     if (p->rx_snr == 0 && p->rx_rssi == 0) {
         startTransmitTimer(true);
     } else {
@@ -125,7 +132,6 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
         DEBUG_MSG("rx_snr found. hop_limit:%d rx_snr:%f\n", p->hop_limit, p->rx_snr);
         startTransmitTimerSNR(p->rx_snr);
     }
-    
 
     return res;
 #else
@@ -311,7 +317,7 @@ void RadioLibInterface::handleReceiveInterrupt()
 
             printPacket("Lora RX", mp);
 
-            //xmitMsec = getPacketTime(mp);
+            // xmitMsec = getPacketTime(mp);
             airTime->logAirtime(RX_LOG, xmitMsec);
 
             deliverToReceiver(mp);
@@ -334,7 +340,7 @@ void RadioLibInterface::startSend(MeshPacket *txp)
         size_t numbytes = beginSending(txp);
 
         int res = iface->startTransmit(radiobuf, numbytes);
-        if(res != ERR_NONE) {
+        if (res != ERR_NONE) {
             RECORD_CRITICALERROR(CriticalErrorCode_RadioSpiBug);
 
             // This send failed, but make sure to 'complete' it properly

src/mesh/Router.cpp

@@ -1,12 +1,15 @@
-#include "configuration.h"
 #include "Router.h"
 #include "Channels.h"
 #include "CryptoEngine.h"
 #include "NodeDB.h"
 #include "RTC.h"
+#include "configuration.h"
 #include "main.h"
 #include "mesh-pb-constants.h"
 #include "modules/RoutingModule.h"
+extern "C" {
+#include "mesh/compression/unishox2.h"
+}
 
 #if defined(HAS_WIFI) || defined(PORTDUINO)
 #include "mqtt/MQTT.h"
@@ -210,29 +213,27 @@ ErrorCode Router::send(MeshPacket *p)
     if (p->which_payloadVariant == MeshPacket_decoded_tag) {
         ChannelIndex chIndex = p->channel; // keep as a local because we are about to change it
 
-
-
 #if defined(HAS_WIFI) || defined(PORTDUINO)
-        //check if we should send decrypted packets to mqtt
+        // check if we should send decrypted packets to mqtt
 
-        //truth table:
+        // truth table:
         /* mqtt_server  mqtt_encryption_enabled should_encrypt
          *    not set                        0              1
          *    not set                        1              1
          *        set                        0              0
          *        set                        1              1
-         * 
+         *
          * => so we only decrypt mqtt if they have a custom mqtt server AND mqtt_encryption_enabled is FALSE
-         */ 
+         */
 
         bool shouldActuallyEncrypt = true;
         if (*radioConfig.preferences.mqtt_server && !radioConfig.preferences.mqtt_encryption_enabled) {
             shouldActuallyEncrypt = false;
         }
-        
+
         DEBUG_MSG("Should encrypt MQTT?: %d\n", shouldActuallyEncrypt);
 
-        //the packet is currently in a decrypted state.  send it now if they want decrypted packets
+        // the packet is currently in a decrypted state.  send it now if they want decrypted packets
         if (mqtt && !shouldActuallyEncrypt)
             mqtt->onSend(*p, chIndex);
 #endif
@@ -244,8 +245,8 @@ ErrorCode Router::send(MeshPacket *p)
         }
 
 #if defined(HAS_WIFI) || defined(PORTDUINO)
-        //the packet is now encrypted.
+        // the packet is now encrypted.
-        //check if we should send encrypted packets to mqtt
+        // check if we should send encrypted packets to mqtt
         if (mqtt && shouldActuallyEncrypt)
             mqtt->onSend(*p, chIndex);
 #endif
@@ -276,7 +277,7 @@ bool perhapsDecode(MeshPacket *p)
     if (p->which_payloadVariant == MeshPacket_decoded_tag)
         return true; // If packet was already decoded just return
 
-    //assert(p->which_payloadVariant == MeshPacket_encrypted_tag);
+    // assert(p->which_payloadVariant == MeshPacket_encrypted_tag);
 
     // Try to find a channel that works with this hash
     for (ChannelIndex chIndex = 0; chIndex < channels.getNumChannels(); chIndex++) {
@@ -302,6 +303,14 @@ bool perhapsDecode(MeshPacket *p)
                 // parsing was successful
                 p->which_payloadVariant = MeshPacket_decoded_tag; // change type to decoded
                 p->channel = chIndex;                             // change to store the index instead of the hash
+
+
+                // Decompress if needed. jm
+                if (p->decoded.which_payloadVariant == Data_payload_compressed_tag) {
+                    // Decompress the file
+                }
+
+
                 printPacket("decoded message", p);
                 return true;
             }
@@ -320,10 +329,56 @@ Routing_Error perhapsEncode(MeshPacket *p)
     if (p->which_payloadVariant == MeshPacket_decoded_tag) {
         static uint8_t bytes[MAX_RHPACKETLEN]; // we have to use a scratch buffer because a union
 
-        // printPacket("pre encrypt", p); // portnum valid here
-
         size_t numbytes = pb_encode_to_bytes(bytes, sizeof(bytes), Data_fields, &p->decoded);
 
+        // Only allow encryption on the text message app.
+        //  TODO: Allow modules to opt into compression.
+        if (p->decoded.portnum == PortNum_TEXT_MESSAGE_APP) {
+
+            char original_payload[Constants_DATA_PAYLOAD_LEN];
+            memcpy(original_payload, p->decoded.payload.bytes, p->decoded.payload.size);
+
+            char compressed_out[Constants_DATA_PAYLOAD_LEN] = {0};
+
+            int compressed_len;
+            // compressed_len = unishox2_compress_simple(original_payload, p->decoded.payload.size, compressed_out);
+
+            Serial.print("Original length - ");
+            Serial.println(p->decoded.payload.size);
+
+            Serial.print("Compressed length - ");
+            Serial.println(compressed_len);
+            // Serial.println(compressed_out);
+
+            // If the compressed length is greater than or equal to the original size, don't use the compressed form
+            if (compressed_len >= p->decoded.payload.size) {
+
+                DEBUG_MSG("Not compressing message. Not enough benefit from doing so.\n");
+                // Set the uncompressed payload varient anyway. Shouldn't hurt?
+                p->decoded.which_payloadVariant = Data_payload_tag;
+
+                // Otherwise we use the compressor
+            } else {
+                DEBUG_MSG("Compressing message.\n");
+                // Copy the compressed data into the meshpacket
+                //p->decoded.payload_compressed.size = compressed_len;
+                //memcpy(p->decoded.payload_compressed.bytes, compressed_out, compressed_len);
+
+                //p->decoded.which_payloadVariant = Data_payload_compressed_tag;
+            }
+
+            if (0) {
+                char decompressed_out[Constants_DATA_PAYLOAD_LEN] = {};
+                int decompressed_len;
+
+                // decompressed_len = unishox2_decompress_simple(compressed_out, compressed_len, decompressed_out);
+
+                Serial.print("Decompressed length - ");
+                Serial.println(decompressed_len);
+                Serial.println(decompressed_out);
+            }
+        }
+
         if (numbytes > MAX_RHPACKETLEN)
             return Routing_Error_TOO_LARGE;
 

src/mesh/compression/unishox2.h

@@ -0,0 +1,278 @@
+/*
+ * Copyright (C) 2020 Siara Logics (cc)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @author Arundale Ramanathan
+ *
+ */
+
+/**
+ * @file unishox2.h
+ * @author Arundale Ramanathan, James Z. M. Gao
+ * @brief API for Unishox2 Compression and Decompression
+ *
+ * This file describes each function of the Unishox2 API \n
+ * For finding out how this API can be used in your program, \n
+ * please see test_unishox2.c.
+ */
+
+#ifndef unishox2
+#define unishox2
+
+#define UNISHOX_VERSION "2.0"   ///< Unicode spec version
+
+/**
+ * Macro switch to enable/disable output buffer length parameter in low level api \n
+ * Disabled by default \n
+ * When this macro is defined, the all the API functions \n
+ * except the simple API functions accept an additional parameter olen \n
+ * that enables the developer to pass the size of the output buffer provided \n
+ * so that the api function may not write beyond that length. \n
+ * This can be disabled if the developer knows that the buffer provided is sufficient enough \n
+ * so no additional parameter is passed and the program is faster since additional check \n
+ * for output length is not performed at each step \n
+ * The simple api, i.e. unishox2_(de)compress_simple will always omit the buffer length
+ */
+#ifndef UNISHOX_API_WITH_OUTPUT_LEN
+#  define UNISHOX_API_WITH_OUTPUT_LEN 0
+#endif
+
+/// Upto 8 bits of initial magic bit sequence can be included. Bit count can be specified with UNISHOX_MAGIC_BIT_LEN
+#ifndef UNISHOX_MAGIC_BITS
+#  define UNISHOX_MAGIC_BITS 0xFF
+#endif
+
+/// Desired length of Magic bits defined by UNISHOX_MAGIC_BITS
+#ifdef UNISHOX_MAGIC_BIT_LEN
+#  if UNISHOX_MAGIC_BIT_LEN < 0 || 9 <= UNISHOX_MAGIC_BIT_LEN
+#    error "UNISHOX_MAGIC_BIT_LEN need between [0, 8)"
+#  endif
+#else
+#  define UNISHOX_MAGIC_BIT_LEN 1
+#endif
+
+//enum {USX_ALPHA = 0, USX_SYM, USX_NUM, USX_DICT, USX_DELTA};
+
+/// Default Horizontal codes. When composition of text is know beforehand, the other hcodes in this section can be used to achieve more compression.
+#define USX_HCODES_DFLT (const unsigned char[]) {0x00, 0x40, 0x80, 0xC0, 0xE0}
+/// Length of each default hcode
+#define USX_HCODE_LENS_DFLT (const unsigned char[]) {2, 2, 2, 3, 3}
+
+/// Horizontal codes preset for English Alphabet content only
+#define USX_HCODES_ALPHA_ONLY (const unsigned char[]) {0x00, 0x00, 0x00, 0x00, 0x00}
+/// Length of each Alpha only hcode
+#define USX_HCODE_LENS_ALPHA_ONLY (const unsigned char[]) {0, 0, 0, 0, 0}
+
+/// Horizontal codes preset for Alpha Numeric content only
+#define USX_HCODES_ALPHA_NUM_ONLY (const unsigned char[]) {0x00, 0x00, 0x80, 0x00, 0x00}
+/// Length of each Alpha numeric hcode
+#define USX_HCODE_LENS_ALPHA_NUM_ONLY (const unsigned char[]) {1, 0, 1, 0, 0}
+
+/// Horizontal codes preset for Alpha Numeric and Symbol content only
+#define USX_HCODES_ALPHA_NUM_SYM_ONLY (const unsigned char[]) {0x00, 0x80, 0xC0, 0x00, 0x00}
+/// Length of each Alpha numeric and symbol hcodes
+#define USX_HCODE_LENS_ALPHA_NUM_SYM_ONLY (const unsigned char[]) {1, 2, 2, 0, 0}
+
+/// Horizontal codes preset favouring Alphabet content
+#define USX_HCODES_FAVOR_ALPHA (const unsigned char[]) {0x00, 0x80, 0xA0, 0xC0, 0xE0}
+/// Length of each hcode favouring Alpha content
+#define USX_HCODE_LENS_FAVOR_ALPHA (const unsigned char[]) {1, 3, 3, 3, 3}
+
+/// Horizontal codes preset favouring repeating sequences
+#define USX_HCODES_FAVOR_DICT (const unsigned char[]) {0x00, 0x40, 0xC0, 0x80, 0xE0}
+/// Length of each hcode favouring repeating sequences
+#define USX_HCODE_LENS_FAVOR_DICT (const unsigned char[]) {2, 2, 3, 2, 3}
+
+/// Horizontal codes preset favouring symbols
+#define USX_HCODES_FAVOR_SYM (const unsigned char[]) {0x80, 0x00, 0xA0, 0xC0, 0xE0}
+/// Length of each hcode favouring symbols
+#define USX_HCODE_LENS_FAVOR_SYM (const unsigned char[]) {3, 1, 3, 3, 3}
+
+//#define USX_HCODES_FAVOR_UMLAUT {0x00, 0x40, 0xE0, 0xC0, 0x80}
+//#define USX_HCODE_LENS_FAVOR_UMLAUT {2, 2, 3, 3, 2}
+
+/// Horizontal codes preset favouring umlaut letters
+#define USX_HCODES_FAVOR_UMLAUT (const unsigned char[]) {0x80, 0xA0, 0xC0, 0xE0, 0x00}
+/// Length of each hcode favouring umlaut letters
+#define USX_HCODE_LENS_FAVOR_UMLAUT (const unsigned char[]) {3, 3, 3, 3, 1}
+
+/// Horizontal codes preset for no repeating sequences
+#define USX_HCODES_NO_DICT (const unsigned char[]) {0x00, 0x40, 0x80, 0x00, 0xC0}
+/// Length of each hcode for no repeating sequences
+#define USX_HCODE_LENS_NO_DICT (const unsigned char[]) {2, 2, 2, 0, 2}
+
+/// Horizontal codes preset for no Unicode characters
+#define USX_HCODES_NO_UNI (const unsigned char[]) {0x00, 0x40, 0x80, 0xC0, 0x00}
+/// Length of each hcode for no Unicode characters
+#define USX_HCODE_LENS_NO_UNI (const unsigned char[]) {2, 2, 2, 2, 0}
+
+/// Default frequently occuring sequences. When composition of text is know beforehand, the other sequences in this section can be used to achieve more compression.
+#define USX_FREQ_SEQ_DFLT (const char *[]) {"\": \"", "\": ", "</", "=\"", "\":\"", "://"}
+/// Frequently occuring sequences in text content
+#define USX_FREQ_SEQ_TXT (const char *[]) {" the ", " and ", "tion", " with", "ing", "ment"}
+/// Frequently occuring sequences in URL content
+#define USX_FREQ_SEQ_URL (const char *[]) {"https://", "www.", ".com", "http://", ".org", ".net"}
+/// Frequently occuring sequences in JSON content
+#define USX_FREQ_SEQ_JSON (const char *[]) {"\": \"", "\": ", "\",", "}}}", "\":\"", "}}"}
+/// Frequently occuring sequences in HTML content
+#define USX_FREQ_SEQ_HTML (const char *[]) {"</", "=\"", "div", "href", "class", "<p>"}
+/// Frequently occuring sequences in XML content
+#define USX_FREQ_SEQ_XML (const char *[]) {"</", "=\"", "\">", "<?xml version=\"1.0\"", "xmlns:", "://"}
+
+/// Commonly occuring templates (ISO Date/Time, ISO Date, US Phone number, ISO Time, Unused)
+#define USX_TEMPLATES (const char *[]) {"tfff-of-tfTtf:rf:rf.fffZ", "tfff-of-tf", "(fff) fff-ffff", "tf:rf:rf", 0}
+
+/// Default preset parameter set. When composition of text is know beforehand, the other parameter sets in this section can be used to achieve more compression.
+#define USX_PSET_DFLT USX_HCODES_DFLT, USX_HCODE_LENS_DFLT, USX_FREQ_SEQ_DFLT, USX_TEMPLATES
+/// Preset parameter set for English Alphabet only content
+#define USX_PSET_ALPHA_ONLY USX_HCODES_ALPHA_ONLY, USX_HCODE_LENS_ALPHA_ONLY, USX_FREQ_SEQ_TXT, USX_TEMPLATES
+/// Preset parameter set for Alpha numeric content
+#define USX_PSET_ALPHA_NUM_ONLY USX_HCODES_ALPHA_NUM_ONLY, USX_HCODE_LENS_ALPHA_NUM_ONLY, USX_FREQ_SEQ_TXT, USX_TEMPLATES
+/// Preset parameter set for Alpha numeric and symbol content
+#define USX_PSET_ALPHA_NUM_SYM_ONLY USX_HCODES_ALPHA_NUM_SYM_ONLY, USX_HCODE_LENS_ALPHA_NUM_SYM_ONLY, USX_FREQ_SEQ_DFLT, USX_TEMPLATES
+/// Preset parameter set for Alpha numeric symbol content having predominantly text
+#define USX_PSET_ALPHA_NUM_SYM_ONLY_TXT USX_HCODES_ALPHA_NUM_SYM_ONLY, USX_HCODE_LENS_ALPHA_NUM_SYM_ONLY, USX_FREQ_SEQ_DFLT, USX_TEMPLATES
+/// Preset parameter set favouring Alphabet content
+#define USX_PSET_FAVOR_ALPHA USX_HCODES_FAVOR_ALPHA, USX_HCODE_LENS_FAVOR_ALPHA, USX_FREQ_SEQ_TXT, USX_TEMPLATES
+/// Preset parameter set favouring repeating sequences
+#define USX_PSET_FAVOR_DICT USX_HCODES_FAVOR_DICT, USX_HCODE_LENS_FAVOR_DICT, USX_FREQ_SEQ_DFLT, USX_TEMPLATES
+/// Preset parameter set favouring symbols
+#define USX_PSET_FAVOR_SYM USX_HCODES_FAVOR_SYM, USX_HCODE_LENS_FAVOR_SYM, USX_FREQ_SEQ_DFLT, USX_TEMPLATES
+/// Preset parameter set favouring unlaut letters
+#define USX_PSET_FAVOR_UMLAUT USX_HCODES_FAVOR_UMLAUT, USX_HCODE_LENS_FAVOR_UMLAUT, USX_FREQ_SEQ_DFLT, USX_TEMPLATES
+/// Preset parameter set for when there are no repeating sequences
+#define USX_PSET_NO_DICT USX_HCODES_NO_DICT, USX_HCODE_LENS_NO_DICT, USX_FREQ_SEQ_DFLT, USX_TEMPLATES
+/// Preset parameter set for when there are no unicode symbols
+#define USX_PSET_NO_UNI USX_HCODES_NO_UNI, USX_HCODE_LENS_NO_UNI, USX_FREQ_SEQ_DFLT, USX_TEMPLATES
+/// Preset parameter set for when there are no unicode symbols favouring text
+#define USX_PSET_NO_UNI_FAVOR_TEXT USX_HCODES_NO_UNI, USX_HCODE_LENS_NO_UNI, USX_FREQ_SEQ_TXT, USX_TEMPLATES
+/// Preset parameter set favouring URL content
+#define USX_PSET_URL USX_HCODES_DFLT, USX_HCODE_LENS_DFLT, USX_FREQ_SEQ_URL, USX_TEMPLATES
+/// Preset parameter set favouring JSON content
+#define USX_PSET_JSON USX_HCODES_DFLT, USX_HCODE_LENS_DFLT, USX_FREQ_SEQ_JSON, USX_TEMPLATES
+/// Preset parameter set favouring JSON content having no Unicode symbols
+#define USX_PSET_JSON_NO_UNI USX_HCODES_NO_UNI, USX_HCODE_LENS_NO_UNI, USX_FREQ_SEQ_JSON, USX_TEMPLATES
+/// Preset parameter set favouring XML content
+#define USX_PSET_XML USX_HCODES_DFLT, USX_HCODE_LENS_DFLT, USX_FREQ_SEQ_XML, USX_TEMPLATES
+/// Preset parameter set favouring HTML content
+#define USX_PSET_HTML USX_HCODES_DFLT, USX_HCODE_LENS_DFLT, USX_FREQ_SEQ_HTML, USX_TEMPLATES
+
+/**
+ * This structure is used when a string array needs to be compressed.
+ * This is passed as a parameter to the unishox2_decompress_lines() function
+ */
+struct us_lnk_lst {
+  char *data;
+  struct us_lnk_lst *previous;
+};
+
+/**
+ * This macro is for internal use, but builds upon the macro UNISHOX_API_WITH_OUTPUT_LEN
+ * When the macro UNISHOX_API_WITH_OUTPUT_LEN is defined, the all the API functions
+ * except the simple API functions accept an additional parameter olen
+ * that enables the developer to pass the size of the output buffer provided
+ * so that the api function may not write beyond that length.
+ * This can be disabled if the developer knows that the buffer provided is sufficient enough
+ * so no additional parameter is passed and the program is faster since additional check
+ * for output length is not performed at each step
+ */
+#if defined(UNISHOX_API_WITH_OUTPUT_LEN) && UNISHOX_API_WITH_OUTPUT_LEN != 0
+#  define UNISHOX_API_OUT_AND_LEN(out, olen) out, olen
+#else
+#  define UNISHOX_API_OUT_AND_LEN(out, olen) out
+#endif
+
+/** 
+ * Simple API for compressing a string
+ * @param[in] in    Input ASCII / UTF-8 string
+ * @param[in] len   length in bytes
+ * @param[out] out  output buffer - should be large enough to hold compressed output
+ */
+extern int unishox2_compress_simple(const char *in, int len, char *out);
+/** 
+ * Simple API for decompressing a string
+ * @param[in] in    Input compressed bytes (output of unishox2_compress functions)
+ * @param[in] len   length of 'in' in bytes
+ * @param[out] out  output buffer for ASCII / UTF-8 string - should be large enough
+ */
+extern int unishox2_decompress_simple(const char *in, int len, char *out);
+/** 
+ * Comprehensive API for compressing a string
+ * 
+ * Presets are available for the last four parameters so they can be passed as single parameter. \n
+ * See USX_PSET_* macros. Example call: \n
+ *    unishox2_compress(in, len, out, olen, USX_PSET_ALPHA_ONLY);
+ * 
+ * @param[in] in             Input ASCII / UTF-8 string
+ * @param[in] len            length in bytes
+ * @param[out] out           output buffer - should be large enough to hold compressed output
+ * @param[in] olen           length of 'out' buffer in bytes. Can be omitted if sufficient buffer is provided
+ * @param[in] usx_hcodes     Horizontal codes (array of bytes). See macro section for samples.
+ * @param[in] usx_hcode_lens Length of each element in usx_hcodes array
+ * @param[in] usx_freq_seq   Frequently occuring sequences. See USX_FREQ_SEQ_* macros for samples
+ * @param[in] usx_templates  Templates of frequently occuring patterns. See USX_TEMPLATES macro.
+ */
+extern int unishox2_compress(const char *in, int len, UNISHOX_API_OUT_AND_LEN(char *out, int olen),
+              const unsigned char usx_hcodes[], const unsigned char usx_hcode_lens[],
+              const char *usx_freq_seq[], const char *usx_templates[]);
+/** 
+ * Comprehensive API for de-compressing a string
+ * 
+ * Presets are available for the last four parameters so they can be passed as single parameter. \n
+ * See USX_PSET_* macros. Example call: \n
+ *    unishox2_decompress(in, len, out, olen, USX_PSET_ALPHA_ONLY);
+ * 
+ * @param[in] in             Input compressed bytes (output of unishox2_compress functions)
+ * @param[in] len            length of 'in' in bytes
+ * @param[out] out           output buffer - should be large enough to hold de-compressed output
+ * @param[in] olen           length of 'out' buffer in bytes. Can be omitted if sufficient buffer is provided
+ * @param[in] usx_hcodes     Horizontal codes (array of bytes). See macro section for samples.
+ * @param[in] usx_hcode_lens Length of each element in usx_hcodes array
+ * @param[in] usx_freq_seq   Frequently occuring sequences. See USX_FREQ_SEQ_* macros for samples
+ * @param[in] usx_templates  Templates of frequently occuring patterns. See USX_TEMPLATES macro.
+ */
+extern int unishox2_decompress(const char *in, int len, UNISHOX_API_OUT_AND_LEN(char *out, int olen),
+              const unsigned char usx_hcodes[], const unsigned char usx_hcode_lens[],
+              const char *usx_freq_seq[], const char *usx_templates[]);
+/** 
+ * More Comprehensive API for compressing array of strings
+ * 
+ * See unishox2_compress() function for parameter definitions. \n
+ * This function takes an additional parameter, i.e. 'prev_lines' - the usx_lnk_lst structure \n
+ * See -g parameter in test_unishox2.c to find out how this can be used. \n
+ * This function is used when an array of strings need to be compressed \n
+ * and stored in a compressed array of bytes for use as a constant in other programs \n
+ * where each element of the array can be decompressed and used at runtime.
+ */
+extern int unishox2_compress_lines(const char *in, int len, UNISHOX_API_OUT_AND_LEN(char *out, int olen),
+              const unsigned char usx_hcodes[], const unsigned char usx_hcode_lens[],
+              const char *usx_freq_seq[], const char *usx_templates[],
+              struct us_lnk_lst *prev_lines);
+/** 
+ * More Comprehensive API for de-compressing array of strings \n
+ * This function is not be used in conjuction with unishox2_compress_lines()
+ * 
+ * See unishox2_decompress() function for parameter definitions. \n
+ * Typically an array is compressed using unishox2_compress_lines() and \n
+ * a header (.h) file is generated using the resultant compressed array. \n
+ * This header file can be used in another program with another decompress \n
+ * routine which takes this compressed array as parameter and index to be \n
+ * decompressed.
+ */
+extern int unishox2_decompress_lines(const char *in, int len, UNISHOX_API_OUT_AND_LEN(char *out, int olen),
+              const unsigned char usx_hcodes[], const unsigned char usx_hcode_lens[],
+              const char *usx_freq_seq[], const char *usx_templates[],
+              struct us_lnk_lst *prev_lines);
+
+#endif

src/mesh/generated/admin.pb.h

@@ -129,7 +129,7 @@ extern const pb_msgdesc_t AdminMessage_msg;
 #define AdminMessage_fields &AdminMessage_msg
 
 /* Maximum encoded size of messages (where known) */
-#define AdminMessage_size                        610
+#define AdminMessage_size                        598
 
 #ifdef __cplusplus
 } /* extern "C" */

src/mesh/generated/deviceonly.pb.c

@@ -12,4 +12,8 @@ PB_BIND(DeviceState, DeviceState, 4)
 PB_BIND(ChannelFile, ChannelFile, 2)
 
 
+PB_BIND(OEMStore, OEMStore, 2)
+
+
+
 

src/mesh/generated/deviceonly.pb.h

@@ -11,6 +11,17 @@
 #error Regenerate this file with the current version of nanopb generator.
 #endif
 
+/* Enum definitions */
+/* TODO: REPLACE */
+typedef enum _ScreenFonts { 
+    /* TODO: REPLACE */
+    ScreenFonts_FONT_SMALL = 0, 
+    /* TODO: REPLACE */
+    ScreenFonts_FONT_MEDIUM = 1, 
+    /* TODO: REPLACE */
+    ScreenFonts_FONT_LARGE = 2 
+} ScreenFonts;
+
 /* Struct definitions */
 /* The on-disk saved channels */
 typedef struct _ChannelFile { 
@@ -33,7 +44,7 @@ typedef struct _DeviceState {
     User owner; 
     /* TODO: REPLACE */
     pb_size_t node_db_count;
-    NodeInfo node_db[80]; 
+    NodeInfo node_db[64]; 
     /* Received packets saved for delivery to the phone */
     pb_size_t receive_queue_count;
     MeshPacket receive_queue[1]; 
@@ -53,16 +64,40 @@ typedef struct _DeviceState {
     bool did_gps_reset; 
 } DeviceState;
 
+typedef PB_BYTES_ARRAY_T(2048) OEMStore_oem_icon_bits_t;
+/* This can be used for customizing the firmware distribution. If populated,
+ show a secondary bootup screen with cuatom logo and text for 2.5 seconds. */
+typedef struct _OEMStore { 
+    /* The Logo width in Px */
+    uint32_t oem_icon_width; 
+    /* The Logo height in Px */
+    uint32_t oem_icon_height; 
+    /* The Logo in xbm bytechar format */
+    OEMStore_oem_icon_bits_t oem_icon_bits; 
+    /* Use this font for the OEM text. */
+    ScreenFonts oem_font; 
+    /* Use this font for the OEM text. */
+    char oem_text[40]; 
+} OEMStore;
+
+
+/* Helper constants for enums */
+#define _ScreenFonts_MIN ScreenFonts_FONT_SMALL
+#define _ScreenFonts_MAX ScreenFonts_FONT_LARGE
+#define _ScreenFonts_ARRAYSIZE ((ScreenFonts)(ScreenFonts_FONT_LARGE+1))
+
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 /* 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 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}, 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 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 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}, 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 OEMStore_init_zero                       {0, 0, {0, {0}}, _ScreenFonts_MIN, ""}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define ChannelFile_channels_tag                 1
@@ -74,6 +109,11 @@ extern "C" {
 #define DeviceState_version_tag                  8
 #define DeviceState_no_save_tag                  9
 #define DeviceState_did_gps_reset_tag            11
+#define OEMStore_oem_icon_width_tag              1
+#define OEMStore_oem_icon_height_tag             2
+#define OEMStore_oem_icon_bits_tag               3
+#define OEMStore_oem_font_tag                    4
+#define OEMStore_oem_text_tag                    5
 
 /* Struct field encoding specification for nanopb */
 #define DeviceState_FIELDLIST(X, a) \
@@ -99,16 +139,28 @@ X(a, STATIC,   REPEATED, MESSAGE,  channels,          1)
 #define ChannelFile_DEFAULT NULL
 #define ChannelFile_channels_MSGTYPE Channel
 
+#define OEMStore_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UINT32,   oem_icon_width,    1) \
+X(a, STATIC,   SINGULAR, UINT32,   oem_icon_height,   2) \
+X(a, STATIC,   SINGULAR, BYTES,    oem_icon_bits,     3) \
+X(a, STATIC,   SINGULAR, UENUM,    oem_font,          4) \
+X(a, STATIC,   SINGULAR, STRING,   oem_text,          5)
+#define OEMStore_CALLBACK NULL
+#define OEMStore_DEFAULT NULL
+
 extern const pb_msgdesc_t DeviceState_msg;
 extern const pb_msgdesc_t ChannelFile_msg;
+extern const pb_msgdesc_t OEMStore_msg;
 
 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define DeviceState_fields &DeviceState_msg
 #define ChannelFile_fields &ChannelFile_msg
+#define OEMStore_fields &OEMStore_msg
 
 /* Maximum encoded size of messages (where known) */
 #define ChannelFile_size                         832
-#define DeviceState_size                         23903
+#define DeviceState_size                         19327
+#define OEMStore_size                            2106
 
 #ifdef __cplusplus
 } /* extern "C" */

src/mesh/generated/mesh.pb.h

@@ -500,6 +500,7 @@ typedef struct _User {
 } User;
 
 typedef PB_BYTES_ARRAY_T(237) Data_payload_t;
+typedef PB_BYTES_ARRAY_T(237) Data_payload_compressed_t;
 /* (Formerly called SubPacket)
  The payload portion fo a packet, this is the actual bytes that are sent
  inside a radio packet (because from/to are broken out by the comms library) */
@@ -507,30 +508,34 @@ typedef struct _Data {
     /* Formerly named typ and of type Type */
     PortNum portnum; 
     /* TODO: REPLACE */
-    Data_payload_t payload; 
+    pb_size_t which_payloadVariant;
+    union {
+        Data_payload_t payload;
+        Data_payload_compressed_t payload_compressed;
+    }; 
+    /* TODO: REPLACE */
+    bool want_response; 
     /* Not normally used, but for testing a sender can request that recipient
  responds in kind (i.e. if it received a position, it should unicast back it's position).
  Note: that if you set this on a broadcast you will receive many replies. */
-    bool want_response; 
+    uint32_t dest; 
     /* The address of the destination node.
  This field is is filled in by the mesh radio device software, application
  layer software should never need it.
  RouteDiscovery messages _must_ populate this.
  Other message types might need to if they are doing multihop routing. */
-    uint32_t dest; 
+    uint32_t source; 
     /* The address of the original sender for this message.
  This field should _only_ be populated for reliable multihop packets (to keep
  packets small). */
-    uint32_t source; 
+    uint32_t request_id; 
     /* Only used in routing or response messages.
  Indicates the original message ID that this message is reporting failure on. (formerly called original_id) */
-    uint32_t request_id; 
-    /* If set, this message is intened to be a reply to a previously sent message with the defined id. */
     uint32_t reply_id; 
+    /* If set, this message is intened to be a reply to a previously sent message with the defined id. */
+    uint32_t emoji; 
     /* Defaults to false. If true, then what is in the payload should be treated as an emoji like giving
  a message a heart or poop emoji. */
-    uint32_t emoji; 
-    /* Location structure */
     bool has_location;
     Location location; 
 } Data;
@@ -738,7 +743,7 @@ extern "C" {
 #define User_init_default                        {"", "", "", {0}, _HardwareModel_MIN, 0, _Team_MIN, 0, 0, 0}
 #define RouteDiscovery_init_default              {0, {0, 0, 0, 0, 0, 0, 0, 0}}
 #define Routing_init_default                     {0, {RouteDiscovery_init_default}}
-#define Data_init_default                        {_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, Location_init_default}
+#define Data_init_default                        {_PortNum_MIN, 0, {{0, {0}}}, 0, 0, 0, 0, 0, 0, false, Location_init_default}
 #define Location_init_default                    {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, _MeshPacket_Delayed_MIN}
 #define NodeInfo_init_default                    {0, false, User_init_default, false, Position_init_default, 0, 0, false, DeviceMetrics_init_default}
@@ -751,7 +756,7 @@ extern "C" {
 #define User_init_zero                           {"", "", "", {0}, _HardwareModel_MIN, 0, _Team_MIN, 0, 0, 0}
 #define RouteDiscovery_init_zero                 {0, {0, 0, 0, 0, 0, 0, 0, 0}}
 #define Routing_init_zero                        {0, {RouteDiscovery_init_zero}}
-#define Data_init_zero                           {_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, Location_init_zero}
+#define Data_init_zero                           {_PortNum_MIN, 0, {{0, {0}}}, 0, 0, 0, 0, 0, 0, false, Location_init_zero}
 #define Location_init_zero                       {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, _MeshPacket_Delayed_MIN}
 #define NodeInfo_init_zero                       {0, false, User_init_zero, false, Position_init_zero, 0, 0, false, DeviceMetrics_init_zero}
@@ -825,6 +830,7 @@ extern "C" {
 #define User_ant_azimuth_tag                     12
 #define Data_portnum_tag                         1
 #define Data_payload_tag                         2
+#define Data_payload_compressed_tag              10
 #define Data_want_response_tag                   3
 #define Data_dest_tag                            4
 #define Data_source_tag                          5
@@ -923,14 +929,15 @@ X(a, STATIC,   ONEOF,    UENUM,    (variant,error_reason,error_reason),   3)
 
 #define Data_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UENUM,    portnum,           1) \
-X(a, STATIC,   SINGULAR, BYTES,    payload,           2) \
+X(a, STATIC,   ONEOF,    BYTES,    (payloadVariant,payload,payload),   2) \
 X(a, STATIC,   SINGULAR, BOOL,     want_response,     3) \
 X(a, STATIC,   SINGULAR, FIXED32,  dest,              4) \
 X(a, STATIC,   SINGULAR, FIXED32,  source,            5) \
 X(a, STATIC,   SINGULAR, FIXED32,  request_id,        6) \
 X(a, STATIC,   SINGULAR, FIXED32,  reply_id,          7) \
 X(a, STATIC,   SINGULAR, FIXED32,  emoji,             8) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  location,          9)
+X(a, STATIC,   OPTIONAL, MESSAGE,  location,          9) \
+X(a, STATIC,   ONEOF,    BYTES,    (payloadVariant,payload_compressed,payload_compressed),  10)
 #define Data_CALLBACK NULL
 #define Data_DEFAULT NULL
 #define Data_location_MSGTYPE Location

src/mesh/generated/radioconfig.pb.h

@@ -210,7 +210,12 @@ typedef enum _RadioConfig_UserPreferences_Serial_Baud {
     /* TODO: REPLACE */
     RadioConfig_UserPreferences_Serial_Baud_BAUD_576000 = 10, 
     /* TODO: REPLACE */
-    RadioConfig_UserPreferences_Serial_Baud_BAUD_921600 = 11 
+    RadioConfig_UserPreferences_Serial_Baud_BAUD_921600 = 11, 
+    /* TODO: REPLACE */
+    RadioConfig_UserPreferences_Serial_Baud_BAUD_110 = 12, 
+    RadioConfig_UserPreferences_Serial_Baud_BAUD_300 = 13, 
+    RadioConfig_UserPreferences_Serial_Baud_BAUD_600 = 14, 
+    RadioConfig_UserPreferences_Serial_Baud_BAUD_1200 = 15 
 } RadioConfig_UserPreferences_Serial_Baud;
 
 /* Defines the device's role on the Mesh network
@@ -260,11 +265,9 @@ typedef enum _RadioConfig_UserPreferences_TelemetrySensorType {
 /* Struct definitions */
 typedef struct _RadioConfig_UserPreferences { 
     uint32_t position_broadcast_secs; 
-    uint32_t send_owner_interval; 
     uint32_t wait_bluetooth_secs; 
     uint32_t screen_on_secs; 
     uint32_t phone_timeout_secs; 
-    uint32_t phone_sds_timeout_sec; 
     uint32_t mesh_sds_timeout_secs; 
     uint32_t sds_secs; 
     uint32_t ls_secs; 
@@ -383,8 +386,8 @@ typedef struct _RadioConfig {
 #define _InputEventChar_ARRAYSIZE ((InputEventChar)(InputEventChar_KEY_BACK+1))
 
 #define _RadioConfig_UserPreferences_Serial_Baud_MIN RadioConfig_UserPreferences_Serial_Baud_BAUD_Default
-#define _RadioConfig_UserPreferences_Serial_Baud_MAX RadioConfig_UserPreferences_Serial_Baud_BAUD_921600
+#define _RadioConfig_UserPreferences_Serial_Baud_MAX RadioConfig_UserPreferences_Serial_Baud_BAUD_1200
-#define _RadioConfig_UserPreferences_Serial_Baud_ARRAYSIZE ((RadioConfig_UserPreferences_Serial_Baud)(RadioConfig_UserPreferences_Serial_Baud_BAUD_921600+1))
+#define _RadioConfig_UserPreferences_Serial_Baud_ARRAYSIZE ((RadioConfig_UserPreferences_Serial_Baud)(RadioConfig_UserPreferences_Serial_Baud_BAUD_1200+1))
 
 #define _RadioConfig_UserPreferences_Serial_Mode_MIN RadioConfig_UserPreferences_Serial_Mode_MODE_Default
 #define _RadioConfig_UserPreferences_Serial_Mode_MAX RadioConfig_UserPreferences_Serial_Mode_MODE_PROTO
@@ -401,17 +404,15 @@ 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, _Role_MIN, 0, 0, 0, 0, 0, 0, 0, 0, "", 0, _GpsCoordinateFormat_MIN, 0, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_Serial_Mode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_TelemetrySensorType_MIN, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, 0, 0, 0, 0, 0, _InputEventChar_MIN, _InputEventChar_MIN, _InputEventChar_MIN, 0, 0, "", 0, 0, 0, _RadioConfig_UserPreferences_Serial_Baud_MIN, 0}
+#define RadioConfig_UserPreferences_init_default {0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, _RegionCode_MIN, _ChargeCurrent_MIN, 0, _Role_MIN, 0, 0, 0, 0, 0, 0, 0, 0, "", 0, _GpsCoordinateFormat_MIN, 0, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_Serial_Mode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_TelemetrySensorType_MIN, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, 0, 0, 0, 0, 0, _InputEventChar_MIN, _InputEventChar_MIN, _InputEventChar_MIN, 0, 0, "", 0, 0, 0, _RadioConfig_UserPreferences_Serial_Baud_MIN, 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, _Role_MIN, 0, 0, 0, 0, 0, 0, 0, 0, "", 0, _GpsCoordinateFormat_MIN, 0, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_Serial_Mode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_TelemetrySensorType_MIN, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, 0, 0, 0, 0, 0, _InputEventChar_MIN, _InputEventChar_MIN, _InputEventChar_MIN, 0, 0, "", 0, 0, 0, _RadioConfig_UserPreferences_Serial_Baud_MIN, 0}
+#define RadioConfig_UserPreferences_init_zero    {0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, _RegionCode_MIN, _ChargeCurrent_MIN, 0, _Role_MIN, 0, 0, 0, 0, 0, 0, 0, 0, "", 0, _GpsCoordinateFormat_MIN, 0, 0, 0, 0, 0, {0, 0, 0}, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_Serial_Mode_MIN, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, _RadioConfig_UserPreferences_TelemetrySensorType_MIN, 0, 0, 0, 0, 0, 0, 0, 0, "", "", 0, 0, 0, 0, 0, 0, _InputEventChar_MIN, _InputEventChar_MIN, _InputEventChar_MIN, 0, 0, "", 0, 0, 0, _RadioConfig_UserPreferences_Serial_Baud_MIN, 0}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define RadioConfig_UserPreferences_position_broadcast_secs_tag 1
-#define RadioConfig_UserPreferences_send_owner_interval_tag 2
 #define RadioConfig_UserPreferences_wait_bluetooth_secs_tag 4
 #define RadioConfig_UserPreferences_screen_on_secs_tag 5
 #define RadioConfig_UserPreferences_phone_timeout_secs_tag 6
-#define RadioConfig_UserPreferences_phone_sds_timeout_sec_tag 7
 #define RadioConfig_UserPreferences_mesh_sds_timeout_secs_tag 8
 #define RadioConfig_UserPreferences_sds_secs_tag 9
 #define RadioConfig_UserPreferences_ls_secs_tag  10
@@ -502,11 +503,9 @@ X(a, STATIC,   OPTIONAL, MESSAGE,  preferences,       1)
 
 #define RadioConfig_UserPreferences_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   position_broadcast_secs,   1) \
-X(a, STATIC,   SINGULAR, UINT32,   send_owner_interval,   2) \
 X(a, STATIC,   SINGULAR, UINT32,   wait_bluetooth_secs,   4) \
 X(a, STATIC,   SINGULAR, UINT32,   screen_on_secs,    5) \
 X(a, STATIC,   SINGULAR, UINT32,   phone_timeout_secs,   6) \
-X(a, STATIC,   SINGULAR, UINT32,   phone_sds_timeout_sec,   7) \
 X(a, STATIC,   SINGULAR, UINT32,   mesh_sds_timeout_secs,   8) \
 X(a, STATIC,   SINGULAR, UINT32,   sds_secs,          9) \
 X(a, STATIC,   SINGULAR, UINT32,   ls_secs,          10) \
@@ -597,8 +596,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_UserPreferences_size         604
+#define RadioConfig_UserPreferences_size         592
-#define RadioConfig_size                         607
+#define RadioConfig_size                         595
 
 #ifdef __cplusplus
 } /* extern "C" */

src/mesh/http/ContentHandler.cpp

@@ -47,11 +47,9 @@ using namespace httpsserver;
 #include <WiFiClientSecure.h>
 HTTPClient httpClient;
 
-// needed for ESP32-targz
 #define DEST_FS_USES_LITTLEFS
 #define ESP_ARDUINO_VERSION_VAL(major, minor, patch) ((major << 16) | (minor << 8) | (patch))
 #define ESP_ARDUINO_VERSION ESP_ARDUINO_VERSION_VAL(1, 0, 4)
-#include <ESP32-targz.h>
 
 // We need to specify some content-type mapping, so the resources get delivered with the
 // right content type and are displayed correctly in the browser
@@ -63,57 +61,13 @@ char contentTypes[][2][32] = {{".txt", "text/plain"},     {".html", "text/html"}
                               {".svg", "image/svg+xml"},  {"", ""}};
 
 // const char *tarURL = "https://www.casler.org/temp/meshtastic-web.tar";
-const char *tarURL = "https://api-production-871d.up.railway.app/mirror/webui";
+// const char *tarURL = "https://api-production-871d.up.railway.app/mirror/webui";
-const char *certificate = NULL; // change this as needed, leave as is for no TLS check (yolo security)
+// const char *certificate = NULL; // change this as needed, leave as is for no TLS check (yolo security)
 
 // Our API to handle messages to and from the radio.
 HttpAPI webAPI;
 
-WiFiClient *getTarHTTPClientPtr(WiFiClientSecure *client, const char *url, const char *cert = NULL)
+
-{
-    if (cert == NULL) {
-        // New versions don't have setInsecure
-        // client->setInsecure();
-    } else {
-        client->setCACert(cert);
-    }
-    const char *UserAgent = "ESP32-HTTP-GzUpdater-Client";
-    httpClient.setReuse(true); // handle 301 redirects gracefully
-    httpClient.setUserAgent(UserAgent);
-    httpClient.setConnectTimeout(10000); // 10s timeout = 10000
-    if (!httpClient.begin(*client, url)) {
-        log_e("Can't open url %s", url);
-        return nullptr;
-    }
-    const char *headerKeys[] = {"location", "redirect", "Content-Type", "Content-Length", "Content-Disposition"};
-    const size_t numberOfHeaders = 5;
-    httpClient.collectHeaders(headerKeys, numberOfHeaders);
-    int httpCode = httpClient.GET();
-    // file found at server
-    if (httpCode == HTTP_CODE_FOUND || httpCode == HTTP_CODE_MOVED_PERMANENTLY) {
-        String newlocation = "";
-        String headerLocation = httpClient.header("location");
-        String headerRedirect = httpClient.header("redirect");
-        if (headerLocation != "") {
-            newlocation = headerLocation;
-            Serial.printf("302 (location): %s => %s\n", url, headerLocation.c_str());
-        } else if (headerRedirect != "") {
-            Serial.printf("301 (redirect): %s => %s\n", url, headerLocation.c_str());
-            newlocation = headerRedirect;
-        }
-        httpClient.end();
-        if (newlocation != "") {
-            log_w("Found 302/301 location header: %s", newlocation.c_str());
-            return getTarHTTPClientPtr(client, newlocation.c_str(), cert);
-        } else {
-            log_e("Empty redirect !!");
-            return nullptr;
-        }
-    }
-    if (httpCode != 200)
-        return nullptr;
-    return httpClient.getStreamPtr();
-}
 
 void registerHandlers(HTTPServer *insecureServer, HTTPSServer *secureServer)
 {
@@ -131,9 +85,9 @@ void registerHandlers(HTTPServer *insecureServer, HTTPSServer *secureServer)
     ResourceNode *nodeAdmin = new ResourceNode("/admin", "GET", &handleAdmin);
     ResourceNode *nodeAdminSettings = new ResourceNode("/admin/settings", "GET", &handleAdminSettings);
     ResourceNode *nodeAdminSettingsApply = new ResourceNode("/admin/settings/apply", "POST", &handleAdminSettingsApply);
-    ResourceNode *nodeAdminFs = new ResourceNode("/admin/fs", "GET", &handleFs);
+//    ResourceNode *nodeAdminFs = new ResourceNode("/admin/fs", "GET", &handleFs);
-    ResourceNode *nodeUpdateFs = new ResourceNode("/admin/fs/update", "POST", &handleUpdateFs);
+//    ResourceNode *nodeUpdateFs = new ResourceNode("/admin/fs/update", "POST", &handleUpdateFs);
-    ResourceNode *nodeDeleteFs = new ResourceNode("/admin/fs/delete", "GET", &handleDeleteFsContent);
+//    ResourceNode *nodeDeleteFs = new ResourceNode("/admin/fs/delete", "GET", &handleDeleteFsContent);
 
     ResourceNode *nodeRestart = new ResourceNode("/restart", "POST", &handleRestart);
     ResourceNode *nodeFormUpload = new ResourceNode("/upload", "POST", &handleFormUpload);
@@ -160,10 +114,10 @@ void registerHandlers(HTTPServer *insecureServer, HTTPSServer *secureServer)
     secureServer->registerNode(nodeJsonFsBrowseStatic);
     secureServer->registerNode(nodeJsonDelete);
     secureServer->registerNode(nodeJsonReport);
-    secureServer->registerNode(nodeUpdateFs);
+//    secureServer->registerNode(nodeUpdateFs);
-    secureServer->registerNode(nodeDeleteFs);
+//    secureServer->registerNode(nodeDeleteFs);
     secureServer->registerNode(nodeAdmin);
-    secureServer->registerNode(nodeAdminFs);
+//    secureServer->registerNode(nodeAdminFs);
     secureServer->registerNode(nodeAdminSettings);
     secureServer->registerNode(nodeAdminSettingsApply);
     secureServer->registerNode(nodeRoot); // This has to be last
@@ -181,10 +135,10 @@ void registerHandlers(HTTPServer *insecureServer, HTTPSServer *secureServer)
     insecureServer->registerNode(nodeJsonFsBrowseStatic);
     insecureServer->registerNode(nodeJsonDelete);
     insecureServer->registerNode(nodeJsonReport);
-    insecureServer->registerNode(nodeUpdateFs);
+//    insecureServer->registerNode(nodeUpdateFs);
-    insecureServer->registerNode(nodeDeleteFs);
+//    insecureServer->registerNode(nodeDeleteFs);
     insecureServer->registerNode(nodeAdmin);
-    insecureServer->registerNode(nodeAdminFs);
+//    insecureServer->registerNode(nodeAdminFs);
     insecureServer->registerNode(nodeAdminSettings);
     insecureServer->registerNode(nodeAdminSettingsApply);
     insecureServer->registerNode(nodeRoot); // This has to be last
@@ -727,86 +681,6 @@ void handleHotspot(HTTPRequest *req, HTTPResponse *res)
     res->println("<meta http-equiv=\"refresh\" content=\"0;url=/\" />\n");
 }
 
-void handleUpdateFs(HTTPRequest *req, HTTPResponse *res)
-{
-    res->setHeader("Content-Type", "text/html");
-    res->setHeader("Access-Control-Allow-Origin", "*");
-    // res->setHeader("Access-Control-Allow-Methods", "POST");
-
-    res->println("<h1>Meshtastic</h1>\n");
-    res->println("Downloading Meshtastic Web Content...");
-
-    WiFiClientSecure *client = new WiFiClientSecure;
-    Stream *streamptr = getTarHTTPClientPtr(client, tarURL, certificate);
-
-    delay(5); // Let other network operations run
-
-    if (streamptr != nullptr) {
-        DEBUG_MSG("Connection to content server ... success!\n");
-
-        DEBUG_MSG("Deleting files from /static : \n");
-
-        htmlDeleteDir("/static");
-
-        delay(5); // Let other network operations run
-
-        TarUnpacker *TARUnpacker = new TarUnpacker();
-        TARUnpacker->haltOnError(false);  // stop on fail (manual restart/reset required)
-        TARUnpacker->setTarVerify(false); // true = enables health checks but slows down the overall process
-        TARUnpacker->setupFSCallbacks(targzTotalBytesFn, targzFreeBytesFn); // prevent the partition from exploding, recommended
-        TARUnpacker->setLoggerCallback(BaseUnpacker::targzPrintLoggerCallback); // gz log verbosity
-        TARUnpacker->setTarProgressCallback(
-            BaseUnpacker::defaultProgressCallback); // prints the untarring progress for each individual file
-        TARUnpacker->setTarStatusProgressCallback(
-            BaseUnpacker::defaultTarStatusProgressCallback);                        // print the filenames as they're expanded
-        TARUnpacker->setTarMessageCallback(BaseUnpacker::targzPrintLoggerCallback); // tar log verbosity
-
-        String contentLengthStr = httpClient.header("Content-Length");
-        contentLengthStr.trim();
-        int64_t streamSize = -1;
-        if (contentLengthStr != "") {
-            streamSize = atoi(contentLengthStr.c_str());
-            Serial.printf("Stream size %d\n", streamSize);
-            res->printf("Stream size %d<br><br>\n", streamSize);
-        }
-
-        if (!TARUnpacker->tarStreamExpander(streamptr, streamSize, FSCom, "/static")) {
-            res->printf("tarStreamExpander failed with return code #%d\n", TARUnpacker->tarGzGetError());
-            Serial.printf("tarStreamExpander failed with return code #%d\n", TARUnpacker->tarGzGetError());
-            // Close the connection on error and free up memory
-            client->stop();
-
-            return;
-        } else {
-            /*
-            // print leftover bytes if any (probably zero-fill from the server)
-            while (httpClient.connected()) {
-                size_t streamSize = streamptr->available();
-                if (streamSize) {
-                    Serial.printf("%02x ", streamptr->read());
-                } else
-                    break;
-            }
-            */
-        }
-
-    } else {
-        res->printf("Failed to establish http connection\n");
-        Serial.println("Failed to establish http connection");
-        return;
-        // Close the connection on error and free up memory
-        client->stop();
-    }
-
-    res->println("Done! Restarting the device. <a href=/>Click this in 10 seconds</a>");
-
-    /*
-     * This is a work around for a bug where we run out of memory.
-     *   TODO: Fixme!
-     */
-    // ESP.restart();
-    webServerThread->requestRestart = (millis() / 1000) + 5;
-}
 
 void handleDeleteFsContent(HTTPRequest *req, HTTPResponse *res)
 {

src/mesh/http/WiFiAPClient.cpp

@@ -10,10 +10,13 @@
 #include "target_specific.h"
 #include <DNSServer.h>
 #include <ESPmDNS.h>
-#include <NTPClient.h>
 #include <WiFi.h>
 #include <WiFiUdp.h>
 
+#ifndef DISABLE_NTP
+#include <NTPClient.h>
+#endif
+
 using namespace concurrency;
 
 static void WiFiEvent(WiFiEvent_t event);
@@ -23,7 +26,10 @@ DNSServer dnsServer;
 
 // NTP
 WiFiUDP ntpUDP;
+
+#ifndef DISABLE_NTP
 NTPClient timeClient(ntpUDP, "0.pool.ntp.org");
+#endif
 
 uint8_t wifiDisconnectReason = 0;
 
@@ -67,13 +73,13 @@ static int32_t reconnectWiFi()
             DEBUG_MSG("... Reconnecting to WiFi access point\n");
             WiFi.mode(WIFI_MODE_STA);
             WiFi.begin(wifiName, wifiPsw);
-            
 
             // Starting timeClient;
         }
     }
 
-    //if (*wifiName) {
+#ifndef DISABLE_NTP
+    // if (*wifiName) {
     if (WiFi.isConnected()) {
         DEBUG_MSG("Updating NTP time\n");
         if (timeClient.update()) {
@@ -89,6 +95,7 @@ static int32_t reconnectWiFi()
             DEBUG_MSG("NTP Update failed\n");
         }
     }
+#endif
 
     return 30 * 1000; // every 30 seconds
 }
@@ -155,9 +162,11 @@ static void onNetworkConnected()
             MDNS.addService("https", "tcp", 443);
         }
 
+#ifndef DISABLE_NTP
         DEBUG_MSG("Starting NTP time client\n");
         timeClient.begin();
-        timeClient.setUpdateInterval(60*60); // Update once an hour
+        timeClient.setUpdateInterval(60 * 60); // Update once an hour
+#endif
 
         initWebServer();
         initApiServer();

src/modules/esp32/SerialModule.cpp

@@ -93,6 +93,18 @@ int32_t SerialModule::runOnce()
 
             if (radioConfig.preferences.serial_module_baud == RadioConfig_UserPreferences_Serial_Baud_BAUD_Default) {
                 baud = 38400;
+            
+            } else if (radioConfig.preferences.serial_module_baud == RadioConfig_UserPreferences_Serial_Baud_BAUD_110) {
+                baud = 110;
+
+            } else if (radioConfig.preferences.serial_module_baud == RadioConfig_UserPreferences_Serial_Baud_BAUD_300) {
+                baud = 300;
+
+            } else if (radioConfig.preferences.serial_module_baud == RadioConfig_UserPreferences_Serial_Baud_BAUD_600) {
+                baud = 600;
+
+            } else if (radioConfig.preferences.serial_module_baud == RadioConfig_UserPreferences_Serial_Baud_BAUD_1200) {
+                baud = 1200;
 
             } else if (radioConfig.preferences.serial_module_baud == RadioConfig_UserPreferences_Serial_Baud_BAUD_2400) {
                 baud = 2400;

src/mqtt/MQTT.cpp

@@ -290,8 +290,8 @@ String MQTT::downstreamPacketToJson(MeshPacket *mp)
             memset(&scratch, 0, sizeof(scratch));
             if (pb_decode_from_bytes(mp->decoded.payload.bytes, mp->decoded.payload.size, &Telemetry_msg,
                                      &scratch)) {
+                decoded = &scratch;
                 if (decoded->which_variant == Telemetry_environment_metrics_tag) {
-                    decoded = &scratch;
                     msgPayload = Json::object{
                         {"temperature", decoded->variant.environment_metrics.temperature},
                         {"relative_humidity", decoded->variant.environment_metrics.relative_humidity},

variants/tlora_v2_1_16/variant.h

@@ -22,7 +22,5 @@
 
 #define USE_RF95
 #define LORA_DIO0 26 // a No connect on the SX1262 module
-#define LORA_RESET 14
+#define LORA_RESET 23
-#define LORA_DIO1 35 // Not really used
-#define LORA_DIO2 34 // Not really used
 

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 1
 minor = 3
-build = 5
+build = 8