Update ArduinoJson to v7

* Initial commit of combined BLE and WiFi OTA

* Incorporate ota_hash in AdminMessage protobuf

* OTA protobuf changes

* Trunk fmt

* Partition header check for OTA type

* Guards

* Guards

* Derp

* Missed one

---------

Co-authored-by: Jake-B <jake-b@users.noreply.github.com>

.clusterfuzzlite/Dockerfile

@@ -20,7 +20,7 @@ ENV PIP_ROOT_USER_ACTION=ignore
 RUN apt-get update && apt-get install --no-install-recommends -y \
         cmake git zip libgpiod-dev libbluetooth-dev libi2c-dev \
         libunistring-dev libmicrohttpd-dev libgnutls28-dev libgcrypt20-dev \
-        libusb-1.0-0-dev libssl-dev pkg-config libsqlite3-dev && \
+        libusb-1.0-0-dev libssl-dev pkg-config && \
     apt-get clean && rm -rf /var/lib/apt/lists/* && \
     pip install --no-cache-dir -U \
         platformio==6.1.16 \

Dockerfile

@@ -14,7 +14,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
         curl wget g++ zip git ca-certificates pkg-config \
         libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev libuv1-dev \
         libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev \
-        libx11-dev libinput-dev libxkbcommon-x11-dev libsqlite3-dev \
+        libx11-dev libinput-dev libxkbcommon-x11-dev \
     && apt-get clean && rm -rf /var/lib/apt/lists/* \
     && pip install --no-cache-dir -U platformio \
     && mkdir /tmp/firmware

alpine.Dockerfile

@@ -11,7 +11,7 @@ RUN apk --no-cache add \
         bash g++ libstdc++-dev linux-headers zip git ca-certificates libbsd-dev \
         libgpiod-dev yaml-cpp-dev bluez-dev \
         libusb-dev i2c-tools-dev libuv-dev openssl-dev pkgconf argp-standalone \
-        libx11-dev libinput-dev libxkbcommon-dev sqlite-dev \
+        libx11-dev libinput-dev libxkbcommon-dev \
     && rm -rf /var/cache/apk/* \
     && pip install --no-cache-dir -U platformio \
     && mkdir /tmp/firmware

bin/config-dist.yaml

@@ -203,16 +203,6 @@ HostMetrics:
 #  UserStringCommand: cat /sys/firmware/devicetree/base/serial-number # Command to execute, to send the results as the userString
 
 
-StoreAndForward:
-#  Enabled: true # Enable Store and Forward++, true by default
-#  DBPath: /var/lib/meshtasticd/ # Path to the S&F++ Sqlite DB
-#  Stratum0: false # Specify if this node is a Stratum 0 node, the controller node.
-#  InitialSync: 10 # Number of messages to 
-#  Hops: 3 # Number of hops to use for SF++ messages
-#  AnnounceInterval: 5 # Interval in minutes between announcing tip of chain hash
-#  MaxChainLength: 1000 # Maximum number of messages to store in a chain
-
-
 Config:
 #  DisplayMode: TWOCOLOR # uncomment to force BaseUI
 #  DisplayMode: COLOR # uncomment to force MUI

debian/control

@@ -25,8 +25,7 @@ Build-Depends: debhelper-compat (= 13),
                liborcania-dev,
                libx11-dev,
                libinput-dev,
-               libxkbcommon-x11-dev,
-               libsqlite3-dev
+               libxkbcommon-x11-dev
 Standards-Version: 4.6.2
 Homepage: https://github.com/meshtastic/firmware
 Rules-Requires-Root: no

meshtasticd.spec.rpkg

@@ -39,7 +39,6 @@ BuildRequires: pkgconfig(bluez)
 BuildRequires: pkgconfig(libusb-1.0)
 BuildRequires: libi2c-devel
 BuildRequires: pkgconfig(libuv)
-BuildRequires: pkgconfig(sqlite3)
 # Web components:
 BuildRequires: pkgconfig(openssl)
 BuildRequires: pkgconfig(liborcania)

platformio.ini

@@ -95,7 +95,7 @@ lib_deps =
 	# renovate: datasource=custom.pio depName=NonBlockingRTTTL packageName=end2endzone/library/NonBlockingRTTTL
 	end2endzone/NonBlockingRTTTL@1.4.0
 build_flags = ${env.build_flags} -Os
-build_src_filter = ${env.build_src_filter} -<platform/portduino/> -<graphics/niche/> -<modules/Native/>
+build_src_filter = ${env.build_src_filter} -<platform/portduino/> -<graphics/niche/>
 
 ; Common libs for communicating over TCP/IP networks such as MQTT
 [networking_base]

src/main.cpp

@@ -105,6 +105,43 @@ NRF52Bluetooth *nrf52Bluetooth = nullptr;
 #include <string>
 #endif
 
+#ifdef ARCH_ESP32
+#ifdef DEBUG_PARTITION_TABLE
+#include "esp_partition.h"
+
+void printPartitionTable()
+{
+    printf("\n--- Partition Table ---\n");
+    // Print Column Headers
+    printf("| %-16s | %-4s | %-7s | %-10s | %-10s |\n", "Label", "Type", "Subtype", "Offset", "Size");
+    printf("|------------------|------|---------|------------|------------|\n");
+
+    // Create an iterator to find ALL partitions (Type ANY, Subtype ANY)
+    esp_partition_iterator_t it = esp_partition_find(ESP_PARTITION_TYPE_ANY, ESP_PARTITION_SUBTYPE_ANY, NULL);
+
+    // Loop through the iterator
+    if (it != NULL) {
+        do {
+            const esp_partition_t *part = esp_partition_get(it);
+
+            // Print details: Label, Type (Hex), Subtype (Hex), Offset (Hex), Size (Hex)
+            printf("| %-16s | 0x%02x | 0x%02x    | 0x%08x | 0x%08x |\n", part->label, part->type, part->subtype, part->address,
+                   part->size);
+
+            // Move to next partition
+            it = esp_partition_next(it);
+        } while (it != NULL);
+
+        // Release the iterator memory
+        esp_partition_iterator_release(it);
+    } else {
+        printf("No partitions found.\n");
+    }
+    printf("-----------------------\n");
+}
+#endif // DEBUG_PARTITION_TABLE
+#endif // ARCH_ESP32
+
 #if HAS_BUTTON || defined(ARCH_PORTDUINO)
 #include "input/ButtonThread.h"
 
@@ -648,7 +685,11 @@ void setup()
         sensor_detected = true;
 #endif
     }
-
+#ifdef ARCH_ESP32
+#ifdef DEBUG_PARTITION_TABLE
+    printPartitionTable();
+#endif
+#endif // ARCH_ESP32
 #ifdef ARCH_ESP32
     // Don't init display if we don't have one or we are waking headless due to a timer event
     if (wakeCause == ESP_SLEEP_WAKEUP_TIMER) {

src/mesh/NextHopRouter.cpp

@@ -145,18 +145,6 @@ bool NextHopRouter::perhapsRebroadcast(const meshtastic_MeshPacket *p)
                         tosend->hop_start -= (tosend->hop_limit - 2);
                         tosend->hop_limit = 2;
                     }
-#elif ARCH_PORTDUINO
-                    if (tosend->which_payload_variant == meshtastic_MeshPacket_decoded_tag &&
-                        portduino_config.nohop_ports.size()) {
-                        for (const auto &port : portduino_config.nohop_ports) {
-                            if (port == tosend->decoded.portnum) {
-                                LOG_DEBUG("0-hopping portnum %u", tosend->decoded.portnum);
-                                tosend->hop_start -= tosend->hop_limit;
-                                tosend->hop_limit = 0;
-                                break;
-                            }
-                        }
-                    }
 #endif
 
                     if (p->next_hop == NO_NEXT_HOP_PREFERENCE) {

src/mesh/RadioInterface.cpp

@@ -326,9 +326,9 @@ uint32_t RadioInterface::getTxDelayMsecWeighted(meshtastic_MeshPacket *p)
 void printPacket(const char *prefix, const meshtastic_MeshPacket *p)
 {
 #if defined(DEBUG_PORT) && !defined(DEBUG_MUTE)
-    std::string out = DEBUG_PORT.mt_sprintf(
-        "%s (id=0x%08x fr=0x%08x to=0x%08x, transport = %u, WantAck=%d, HopLim=%d HopStart=%d Ch=0x%x", prefix, p->id, p->from,
-        p->to, p->transport_mechanism, p->want_ack, p->hop_limit, p->hop_start, p->channel);
+    std::string out =
+        DEBUG_PORT.mt_sprintf("%s (id=0x%08x fr=0x%08x to=0x%08x, transport = %u, WantAck=%d, HopLim=%d Ch=0x%x", prefix, p->id,
+                              p->from, p->to, p->transport_mechanism, p->want_ack, p->hop_limit, p->channel);
     if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
         auto &s = p->decoded;
 

src/mesh/Router.cpp

@@ -17,7 +17,6 @@
 #endif
 #include "Default.h"
 #if ARCH_PORTDUINO
-#include "modules/Native/StoreForwardPlusPlus.h"
 #include "platform/portduino/PortduinoGlue.h"
 #endif
 #if ENABLE_JSON_LOGGING || ARCH_PORTDUINO
@@ -360,12 +359,6 @@ ErrorCode Router::send(meshtastic_MeshPacket *p)
             abortSendAndNak(encodeResult, p);
             return encodeResult; // FIXME - this isn't a valid ErrorCode
         }
-#if ARCH_PORTDUINO
-        if (p_decoded->decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_APP &&
-            (p->from == 0 || p->from == nodeDB->getNodeNum()) && storeForwardPlusPlusModule && portduino_config.sfpp_enabled) {
-            storeForwardPlusPlusModule->handleEncrypted(p_decoded, p);
-        }
-#endif
 #if !MESHTASTIC_EXCLUDE_MQTT
         // Only publish to MQTT if we're the original transmitter of the packet
         if (moduleConfig.mqtt.enabled && isFromUs(p) && mqtt) {
@@ -742,22 +735,6 @@ void Router::handleReceived(meshtastic_MeshPacket *p, RxSource src)
             cancelSending(p->from, p->id);
             skipHandle = true;
         }
-#if ARCH_PORTDUINO
-        if (portduino_config.whitelist_enabled) {
-            bool allowed = false;
-            for (const auto &port : portduino_config.whitelist_ports) {
-                if (port == p->decoded.portnum) {
-                    allowed = true;
-                    break;
-                }
-            }
-            if (!allowed) {
-                LOG_DEBUG("Dropping packet not on Portduino Whitelist");
-                cancelSending(p->from, p->id);
-                skipHandle = true;
-            }
-        }
-#endif
     } else {
         printPacket("packet decoding failed or skipped (no PSK?)", p);
     }

src/modules/AdminModule.cpp

@@ -235,22 +235,46 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
     }
     case meshtastic_AdminMessage_ota_request_tag: {
 #if defined(ARCH_ESP32)
+        LOG_INFO("OTA Requested");
+
         if (r->ota_request.ota_hash.size != 32) {
             suppressRebootBanner = true;
-            LOG_INFO("OTA Failed: Invalid `ota_hash` provided");
+            sendWarningAndLog("Cannot start OTA: Invalid `ota_hash` provided.");
             break;
         }
 
         meshtastic_OTAMode mode = r->ota_request.reboot_ota_mode;
+        const char *mode_name = (mode == METHOD_OTA_BLE ? "BLE" : "WiFi");
+
+        // Check that we have an OTA partition
+        const esp_partition_t *part = MeshtasticOTA::getAppPartition();
+        if (part == NULL) {
+            suppressRebootBanner = true;
+            sendWarningAndLog("Cannot start OTA: Cannot find OTA Loader partition.");
+            break;
+        }
+
+        static esp_app_desc_t app_desc;
+        if (!MeshtasticOTA::getAppDesc(part, &app_desc)) {
+            suppressRebootBanner = true;
+            sendWarningAndLog("Cannot start OTA: Device does have a valid OTA Loader.");
+            break;
+        }
+
+        if (!MeshtasticOTA::checkOTACapability(&app_desc, mode)) {
+            suppressRebootBanner = true;
+            sendWarningAndLog("OTA Loader does not support %s", mode_name);
+            break;
+        }
+
         if (MeshtasticOTA::trySwitchToOTA()) {
-            LOG_INFO("OTA Requested");
             suppressRebootBanner = true;
             if (screen)
                 screen->startFirmwareUpdateScreen();
             MeshtasticOTA::saveConfig(&config.network, mode, r->ota_request.ota_hash.bytes);
-            LOG_INFO("Rebooting to WiFi OTA");
+            sendWarningAndLog("Rebooting to %s OTA", mode_name);
         } else {
-            LOG_INFO("WIFI OTA Failed");
+            sendWarningAndLog("Unable to switch to the OTA partition.");
         }
 #endif
         int s = 1; // Reboot in 1 second, hard coded
@@ -1472,15 +1496,43 @@ void AdminModule::handleSendInputEvent(const meshtastic_AdminMessage_InputEvent
 #endif
 }
 
-void AdminModule::sendWarning(const char *message)
+void AdminModule::sendWarning(const char *format, ...)
 {
     meshtastic_ClientNotification *cn = clientNotificationPool.allocZeroed();
+    if (!cn)
+        return;
+
     cn->level = meshtastic_LogRecord_Level_WARNING;
     cn->time = getValidTime(RTCQualityFromNet);
-    strncpy(cn->message, message, sizeof(cn->message));
+
+    va_list args;
+    va_start(args, format);
+    // Format the arguments directly into the notification object
+    vsnprintf(cn->message, sizeof(cn->message), format, args);
+    va_end(args);
+
     service->sendClientNotification(cn);
 }
 
+void AdminModule::sendWarningAndLog(const char *format, ...)
+{
+    // We need a temporary buffer to hold the formatted text so we can log it
+    // Using 250 bytes as a safe upper limit for typical text notifications
+    char buf[250];
+
+    va_list args;
+    va_start(args, format);
+    vsnprintf(buf, sizeof(buf), format, args);
+    va_end(args);
+
+    LOG_WARN(buf);
+    // 2. Call sendWarning
+    // SECURITY NOTE: We pass "%s", buf instead of just 'buf'.
+    // If 'buf' contained a % symbol (e.g. "Battery 50%"), passing it directly
+    // would crash sendWarning. "%s" treats it purely as text.
+    sendWarning("%s", buf);
+}
+
 void disableBluetooth()
 {
 #if HAS_BLUETOOTH

src/modules/AdminModule.h

@@ -1,7 +1,9 @@
-#include <sys/types.h>
-
 #pragma once
+#ifdef ESP_PLATFORM
+#include <esp_ota_ops.h>
+#endif
 #include "ProtobufModule.h"
+#include <sys/types.h>
 #if HAS_WIFI
 #include "mesh/wifi/WiFiAPClient.h"
 #endif
@@ -71,7 +73,8 @@ class AdminModule : public ProtobufModule<meshtastic_AdminMessage>, public Obser
 
     bool messageIsResponse(const meshtastic_AdminMessage *r);
     bool messageIsRequest(const meshtastic_AdminMessage *r);
-    void sendWarning(const char *message);
+    void sendWarning(const char *format, ...) __attribute__((format(printf, 2, 3)));
+    void sendWarningAndLog(const char *format, ...) __attribute__((format(printf, 2, 3)));
 };
 
 static constexpr const char *licensedModeMessage =

src/modules/Modules.cpp

@@ -61,7 +61,6 @@
 #if ARCH_PORTDUINO
 #include "input/LinuxInputImpl.h"
 #include "input/SeesawRotary.h"
-#include "modules/Native/StoreForwardPlusPlus.h"
 #include "modules/Telemetry/HostMetrics.h"
 #if !MESHTASTIC_EXCLUDE_STOREFORWARD
 #include "modules/StoreForwardModule.h"
@@ -244,11 +243,6 @@ void setupModules()
 #endif
 #if ARCH_PORTDUINO
     new HostMetricsModule();
-#if SFPP_ENABLED
-    if (portduino_config.sfpp_enabled) {
-        storeForwardPlusPlusModule = new StoreForwardPlusPlusModule();
-    }
-#endif
 #endif
 #if HAS_TELEMETRY
     new DeviceTelemetryModule();

src/modules/Native/StoreForwardPlusPlus.h

@@ -1,310 +0,0 @@
-#pragma once
-#if __has_include("sqlite3.h")
-#define SFPP_ENABLED 1
-#include "Channels.h"
-#include "ProtobufModule.h"
-#include "Router.h"
-#include "SinglePortModule.h"
-#include "sqlite3.h"
-
-#define SFPP_HASH_SIZE 16
-#define SFPP_SHORT_HASH_SIZE 8
-
-/**
- * Store and forward ++ module
- * There's an obvious need for a store-and-forward mechanism in Meshtastic.
- * This module takes heavy inspiration from Git, building a chain of messages that can be synced between nodes.
- * Each message is hashed, and the chain is built by hashing the previous commit hash and the current message hash.
- * Nodes can request missing messages by requesting the next message after a given commit hash.
- *
- * The current focus is text messages, limited to the primary channel.
- *
- * Each chain is identified by a root hash, which is derived from the channelHash, the local nodenum, and the timestamp when
- * created.
- *
- * Each message is also given a message hash, derived from the encrypted payload, the to, from, id.
- * Notably not the timestamp, as we want these to match across nodes, even if the timestamps differ.
- *
- * The authoritative node for the chain will generate a commit hash for each message when adding it to the chain.
- * The first message's commit hash is derived from the root hash and the message hash.
- * Subsequent messages' commit hashes are derived from the previous commit hash and the current message hash.
- * This allows a node to see only the last commit hash, and confirm it hasn't missed any messages.
- *
- * Nodes can request the next message in the chain by sending a LINK_REQUEST message with the root hash and the last known commit
- * hash. Any node that has the next message can respond with a LINK_PROVIDE message containing the next message.
- *
- * When a satellite node sees a new text message, it stores it in a scratch database.
- * These messages are periodically offered to the authoritative node for inclusion in the chain.
- *
- * The LINK_PROVIDE message does double-duty, sending both on-chain and off-chain messages.
- * The differentiator is whether the commit hash is set or left empty.
- *
- * When a satellite node receives a canonical link message, it checks if it has the message in scratch.
- * And evicts it when adding it to the canonical chain.
- *
- * This approach allows a node to know whether it has seen a given message before, or if it is new coming via SFPP.
- * If new, and the timestamp is within the rebroadcast timeout, it will process that message as if it were just received from the
- * mesh, allowing it to be decrypted, shown to the user, and rebroadcast.
- */
-class StoreForwardPlusPlusModule : public ProtobufModule<meshtastic_StoreForwardPlusPlus>, private concurrency::OSThread
-{
-    struct link_object {
-        uint32_t to;
-        uint32_t from;
-        uint32_t id;
-        uint32_t rx_time = 0;
-        ChannelHash channel_hash;
-        uint8_t encrypted_bytes[256] = {0};
-        size_t encrypted_len;
-        uint8_t message_hash[SFPP_HASH_SIZE] = {0};
-        size_t message_hash_len = 0;
-        uint8_t root_hash[SFPP_HASH_SIZE] = {0};
-        size_t root_hash_len = 0;
-        uint8_t commit_hash[SFPP_HASH_SIZE] = {0};
-        size_t commit_hash_len = 0;
-        uint32_t counter = 0;
-        std::string payload;
-        bool validObject = true; // set this false when a chain calulation fails, etc.
-    };
-
-  public:
-    /** Constructor
-     *
-     */
-    StoreForwardPlusPlusModule();
-
-    /*
-      -Override the wantPacket method.
-    */
-    virtual bool wantPacket(const meshtastic_MeshPacket *p) override
-    {
-        if (p->decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_APP ||
-            p->decoded.portnum == (portduino_config.sfpp_steal_port ? meshtastic_PortNum_TEXT_MESSAGE_COMPRESSED_APP
-                                                                    : meshtastic_PortNum_STORE_FORWARD_PLUSPLUS_APP)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    void handleEncrypted(const meshtastic_MeshPacket *, const meshtastic_MeshPacket *);
-
-  protected:
-    /** Called to handle a particular incoming message
-    @return ProcessMessage::STOP if you've guaranteed you've handled this message and no other handlers should be considered for
-    it
-    */
-    virtual ProcessMessage handleReceived(const meshtastic_MeshPacket &mp) override;
-    virtual bool handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_StoreForwardPlusPlus *t) override;
-
-    virtual int32_t runOnce() override;
-
-  private:
-    sqlite3 *ppDb;
-    sqlite3_stmt *chain_insert_stmt;
-    sqlite3_stmt *scratch_insert_stmt;
-    sqlite3_stmt *checkDupMessageHash;
-    sqlite3_stmt *checkDupCommitHash;
-    sqlite3_stmt *checkScratch;
-    sqlite3_stmt *removeScratch;
-    sqlite3_stmt *updatePayloadStmt;
-    sqlite3_stmt *getPayloadFromScratchStmt;
-    sqlite3_stmt *fromScratchStmt;
-    sqlite3_stmt *fromScratchByHashStmt;
-    sqlite3_stmt *getNextHashStmt;
-    sqlite3_stmt *getChainEndStmt;
-    sqlite3_stmt *getLinkStmt;
-    sqlite3_stmt *getLinkFromMessageHashStmt;
-    sqlite3_stmt *getHashFromRootStmt;
-    sqlite3_stmt *addRootToMappingsStmt;
-    sqlite3_stmt *getRootFromChannelHashStmt;
-    sqlite3_stmt *getFullRootHashStmt;
-    sqlite3_stmt *setChainCountStmt;
-    sqlite3_stmt *getChainCountStmt;
-    sqlite3_stmt *getScratchCountStmt;
-    sqlite3_stmt *getRootCanonScratchCountStmt;
-    sqlite3_stmt *pruneScratchQueueStmt;
-    sqlite3_stmt *trimOldestLinkStmt;
-    sqlite3_stmt *maybeAddPeerStmt;
-    sqlite3_stmt *getPeerStmt;
-    sqlite3_stmt *updatePeerStmt;
-    sqlite3_stmt *clearChainStmt;
-    sqlite3_stmt *canon_scratch_insert_stmt;
-    sqlite3_stmt *getCanonScratchCountStmt;
-    sqlite3_stmt *getCanonScratchStmt;
-    sqlite3_stmt *removeCanonScratch;
-    sqlite3_stmt *clearCanonScratchStmt;
-
-    // For a given Meshtastic ChannelHash, fills the root_hash buffer with a 32-byte root hash
-    // returns true if the root hash was found
-    bool getRootFromChannelHash(ChannelHash, uint8_t *);
-
-    // For a given root hash, returns the ChannelHash
-    // can handle partial root hashes
-    ChannelHash getChannelHashFromRoot(uint8_t *_root_hash, size_t);
-
-    // given a root hash and commit hash, returns the next commit hash in the chain
-    // can handle partial root and commit hashes, always fills the buffer with 32 bytes
-    // returns true if a next hash was found
-    bool getNextHash(uint8_t *, size_t, uint8_t *, size_t, uint8_t *);
-
-    // For a given Meshtastic ChannelHash, fills the root_hash buffer with a 32-byte root hash
-    // but this function will add the root hash if it is not already present
-    // returns hash size or 0 if not found/added
-    size_t getOrAddRootFromChannelHash(ChannelHash, uint8_t *);
-
-    // adds the ChannelHash and root_hash to the mappings table
-    void addRootToMappings(ChannelHash, uint8_t *);
-
-    // requests the next message in the chain from the mesh network
-    // Sends a LINK_REQUEST message
-    void requestNextMessage(uint8_t *, size_t, uint8_t *, size_t);
-
-    // request the message X entries from the end.
-    // used to bootstrap a chain, without downloading all of the history
-    void requestMessageCount(uint8_t *, size_t, uint32_t);
-
-    // sends a LINK_PROVIDE message broadcasting the given link object
-    void broadcastLink(uint8_t *, size_t);
-
-    // sends a LINK_PROVIDE message broadcasting the given link object
-    void broadcastLink(link_object &, bool, bool = false);
-
-    // sends a LINK_PROVIDE message broadcasting the given link object from scratch message store
-    bool sendFromScratch(uint8_t *);
-
-    // Adds the given link object to the canonical chain database
-    bool addToChain(link_object &);
-
-    // Adds an incoming text message to the scratch database
-    bool addToScratch(link_object &);
-
-    // sends a CANON_ANNOUNCE message, specifying the given root and commit hashes
-    void canonAnnounce(link_object &);
-
-    // checks if the message hash is present in the canonical chain database
-    bool isInDB(uint8_t *, size_t);
-
-    // checks if the commit hash is present in the canonical chain database
-    bool isCommitInDB(uint8_t *, size_t);
-
-    // checks if the message hash is present in the scratch database
-    bool isInScratch(uint8_t *, size_t);
-
-    // retrieves a link object from the scratch database
-    link_object getFromScratch(uint8_t *, size_t);
-
-    // removes a link object from the scratch database
-    void removeFromScratch(uint8_t *, size_t);
-
-    // iterate through our scratch database, and see if we can speculate a chain up to the given commit hash
-    bool speculateScratchChain(uint8_t *, size_t, uint8_t *, uint8_t *);
-
-    // retrieves the next link object from scratch given a root hash
-    link_object getNextScratchObject(uint8_t *);
-
-    // fills the payload section with the decrypted data for the given message hash
-    // probably not needed for production, but useful for testing
-    void updatePayload(uint8_t *, size_t, std::string);
-
-    // Takes the decrypted MeshPacket and the encrypted packet copy, and builds a link_object
-    // Generates a message hash, but does not set the commit hash
-    link_object ingestTextPacket(const meshtastic_MeshPacket &, const meshtastic_MeshPacket *);
-
-    // ingests a LINK_PROVIDE message and builds a link_object
-    // confirms the root hash and commit hash
-    link_object ingestLinkMessage(meshtastic_StoreForwardPlusPlus *);
-
-    // retrieves a link object from the canonical chain database given a commit hash
-    link_object getLink(uint8_t *, size_t);
-
-    // retrieves a link object from the canonical chain database given a message hash
-    link_object getLinkFromMessageHash(uint8_t *, size_t);
-
-    // puts the encrypted payload back into the queue as if it were just received
-    void rebroadcastLinkObject(link_object &);
-
-    // Check if an incoming link object's commit hash matches the calculated commit hash
-    bool checkCommitHash(link_object &lo, uint8_t *commit_hash_bytes, size_t hash_len);
-
-    // given a partial root hash, looks up the full 32-byte root hash
-    // returns true if found
-    bool lookUpFullRootHash(uint8_t *partial_root_hash, size_t partial_root_hash_len, uint8_t *full_root_hash);
-
-    // update the mappings table to set the chain count for the given root hash
-    void setChainCount(uint8_t *, size_t, uint32_t);
-
-    // get the chain count for the given root hash
-    uint32_t getChainCount(uint8_t *, size_t);
-
-    // get the scratch count for the given root hash
-    uint32_t getScratchCount(uint8_t *, size_t);
-
-    // get the canon scratch count for the given root hash
-    uint32_t getCanonScratchCount(uint8_t *, size_t);
-
-    link_object getLinkFromPositionFromTip(uint32_t, uint8_t *, size_t);
-
-    void pruneScratchQueue();
-
-    void trimOldestLink(uint8_t *, size_t);
-
-    void clearChain(uint8_t *, size_t);
-
-    void recalculateMessageHash(link_object &);
-
-    // given a link object with a payload and other fields, recalculates the message hash
-    // returns true if a match
-    bool recalculateHash(link_object &, uint8_t *, size_t, uint8_t *, size_t);
-
-    void updatePeers(const meshtastic_MeshPacket &, meshtastic_StoreForwardPlusPlus_SFPP_message_type);
-
-    void maybeMoveFromCanonScratch(uint8_t *, size_t);
-
-    void addToCanonScratch(link_object &);
-
-    link_object getfromCanonScratch(uint8_t *, size_t);
-    void removeFromCanonScratch(uint8_t *, size_t);
-
-    void clearCanonScratch(uint8_t *, size_t, uint32_t);
-
-    bool isInCanonScratch(uint8_t *, size_t);
-
-    void logLinkObject(link_object &);
-
-    // Track if we have a scheduled runOnce pending
-    // useful to not accudentally delay a scheduled runOnce
-    bool pendingRun = false;
-
-    // Once we have multiple chain types, we can extend this
-    enum chain_types {
-        channel_chain = 0,
-    };
-
-    uint32_t rebroadcastTimeout = 3600; // Messages older than this (in seconds) will not be rebroadcast
-    bool doing_split_send = false;
-    link_object split_link_out;
-
-    bool doing_split_receive = false;
-    link_object split_link_in;
-
-    bool did_announce_last = false;
-
-    uint32_t texts_rebroadcast = 0;
-    uint32_t links_speculated = 0;
-    uint32_t canon_announces = 0;
-    uint32_t links_requested = 0;
-    uint32_t links_provided = 0;
-    uint32_t links_added = 0;
-    uint32_t links_from_canon_scratch = 0;
-    uint32_t links_from_scratch = 0;
-    uint32_t split_links_sent = 0;
-    uint32_t split_links_received = 0;
-    uint32_t links_pruned = 0;
-    uint32_t scratch_timed_out = 0;
-    uint32_t sent_from_scratch = 0;
-    uint32_t received_from_scratch = 0;
-};
-
-extern StoreForwardPlusPlusModule *storeForwardPlusPlusModule;
-#endif

src/modules/StatusLEDModule.cpp

@@ -50,9 +50,10 @@ int StatusLEDModule::handleStatusUpdate(const meshtastic::Status *arg)
             break;
         }
         case meshtastic::BluetoothStatus::ConnectionState::CONNECTED: {
-            ble_state = connected;
-            PAIRING_LED_starttime = millis();
-            break;
+            if (ble_state != connected) {
+                ble_state = connected;
+                PAIRING_LED_starttime = millis();
+            }
         }
         }
 

src/platform/esp32/MeshtasticOTA.cpp

@@ -1,13 +1,17 @@
 #include "MeshtasticOTA.h"
 #include "configuration.h"
+#ifdef ESP_PLATFORM
 #include <Preferences.h>
 #include <esp_ota_ops.h>
+#endif
 
 namespace MeshtasticOTA
 {
 
 static const char *nvsNamespace = "MeshtasticOTA";
-static const char *appProjectName = "MeshtasticOTA";
+static const char *combinedAppProjectName = "MeshtasticOTA";
+static const char *bleOnlyAppProjectName = "MeshtasticOTA-BLE";
+static const char *wifiOnlyAppProjectName = "MeshtasticOTA-WiFi";
 
 static bool updated = false;
 
@@ -68,21 +72,44 @@ bool getAppDesc(const esp_partition_t *part, esp_app_desc_t *app_desc)
         LOG_INFO("esp_ota_get_partition_description failed");
         return false;
     }
-    if (strcmp(app_desc->project_name, appProjectName) != 0) {
-        LOG_INFO("app_desc->project_name == 0");
-        return false;
-    }
     return true;
 }
 
+bool checkOTACapability(esp_app_desc_t *app_desc, uint8_t method)
+{
+    // Combined loader supports all (both) transports, BLE and WiFi
+    if (strcmp(app_desc->project_name, combinedAppProjectName) == 0) {
+        LOG_INFO("OTA partition contains combined BLE/WiFi OTA Loader");
+        return true;
+    }
+    if (method == METHOD_OTA_BLE && strcmp(app_desc->project_name, bleOnlyAppProjectName) == 0) {
+        LOG_INFO("OTA partition contains BLE-only OTA Loader");
+        return true;
+    }
+    if (method == METHOD_OTA_WIFI && strcmp(app_desc->project_name, wifiOnlyAppProjectName) == 0) {
+        LOG_INFO("OTA partition contains WiFi-only OTA Loader");
+        return true;
+    }
+    LOG_INFO("OTA partition does not contain a known OTA loader");
+    return false;
+}
+
 bool trySwitchToOTA()
 {
     const esp_partition_t *part = getAppPartition();
-    esp_app_desc_t app_desc;
-    if (!getAppDesc(part, &app_desc))
+
+    if (part == NULL) {
+        LOG_WARN("Unable to get app partition in preparation of OTA reboot");
         return false;
-    if (esp_ota_set_boot_partition(part) != ESP_OK)
+    }
+
+    uint8_t result = esp_ota_set_boot_partition(part);
+    // Partition and app checks should now be done in the AdminModule before this is called
+    if (result != ESP_OK) {
+        LOG_WARN("Unable to switch to OTA partiton.  (Reason %d)", result);
         return false;
+    }
+
     return true;
 }
 

src/platform/esp32/MeshtasticOTA.h

@@ -3,12 +3,20 @@
 
 #include "mesh-pb-constants.h"
 #include <Arduino.h>
+#ifdef ESP_PLATFORM
+#include <esp_ota_ops.h>
+#endif
+
+#define METHOD_OTA_BLE 1
+#define METHOD_OTA_WIFI 2
 
 namespace MeshtasticOTA
 {
 void initialize();
 bool isUpdated();
-
+const esp_partition_t *getAppPartition();
+bool getAppDesc(const esp_partition_t *part, esp_app_desc_t *app_desc);
+bool checkOTACapability(esp_app_desc_t *app_desc, uint8_t method);
 void recoverConfig(meshtastic_Config_NetworkConfig *network);
 void saveConfig(meshtastic_Config_NetworkConfig *network, meshtastic_OTAMode method, uint8_t *ota_hash);
 bool trySwitchToOTA();

src/platform/portduino/PortduinoGlue.cpp

@@ -177,7 +177,6 @@ void portduinoSetup()
 
     if (portduino_config.force_simradio == true) {
         portduino_config.lora_module = use_simradio;
-        portduino_config.sfpp_enabled = false;
     } else if (configPath != nullptr) {
         if (loadConfig(configPath)) {
             if (!yamlOnly)
@@ -860,28 +859,6 @@ bool loadConfig(const char *configPath)
             }
         }
 
-        if (yamlConfig["StoreAndForward"]) {
-            portduino_config.sfpp_stratum0 = (yamlConfig["StoreAndForward"]["Stratum0"]).as<bool>(false);
-            portduino_config.sfpp_enabled = (yamlConfig["StoreAndForward"]["Enabled"]).as<bool>(true);
-            portduino_config.sfpp_db_path = (yamlConfig["StoreAndForward"]["DBPath"]).as<std::string>("/var/lib/meshtasticd/");
-            portduino_config.sfpp_initial_sync = (yamlConfig["StoreAndForward"]["InitialSync"]).as<int>(10);
-            portduino_config.sfpp_hops = (yamlConfig["StoreAndForward"]["Hops"]).as<int>(3);
-            portduino_config.sfpp_announce_interval = (yamlConfig["StoreAndForward"]["AnnounceInterval"]).as<int>(5);
-            portduino_config.sfpp_max_chain = (yamlConfig["StoreAndForward"]["MaxChainLength"]).as<uint32_t>(1000);
-            portduino_config.sfpp_backlog_limit = (yamlConfig["StoreAndForward"]["BacklogLimit"]).as<uint32_t>(100);
-            portduino_config.sfpp_steal_port = (yamlConfig["StoreAndForward"]["StealPort"]).as<bool>(false);
-        }
-        if (yamlConfig["Routing"]) {
-            if (yamlConfig["Routing"]["WhitelistPorts"]) {
-                portduino_config.whitelist_ports = (yamlConfig["Routing"]["WhitelistPorts"]).as<std::vector<int>>();
-                if (portduino_config.whitelist_ports.size() > 0) {
-                    portduino_config.whitelist_enabled = true;
-                }
-            }
-            if (yamlConfig["Routing"]["NoHopPorts"]) {
-                portduino_config.nohop_ports = (yamlConfig["Routing"]["NoHopPorts"]).as<std::vector<int>>();
-            }
-        }
         if (yamlConfig["General"]) {
             portduino_config.MaxNodes = (yamlConfig["General"]["MaxNodes"]).as<int>(200);
             portduino_config.maxtophone = (yamlConfig["General"]["MaxMessageQueue"]).as<int>(100);

src/platform/portduino/PortduinoGlue.h

@@ -171,26 +171,6 @@ extern struct portduino_config_struct {
     int configDisplayMode = 0;
     bool has_configDisplayMode = false;
 
-    // Store and Forward++
-    std::string sfpp_db_path = "/var/lib/meshtasticd/";
-    bool sfpp_stratum0 = false;
-    bool sfpp_enabled = true;
-    bool sfpp_steal_port = false;
-    int sfpp_initial_sync = 10;
-    int sfpp_hops = 3;
-    int sfpp_announce_interval = 5; // minutes
-    uint32_t sfpp_max_chain = 1000;
-    uint32_t sfpp_backlog_limit = 100;
-    // allowed root hashes
-    // upstream node
-    // Are we allowing unknown channel hashes? Does this even make sense?
-    // Allow DMs
-
-    // Routing
-    bool whitelist_enabled = false;
-    std::vector<int> whitelist_ports = {};
-    std::vector<int> nohop_ports = {};
-
     // General
     std::string mac_address = "";
     bool mac_address_explicit = false;
@@ -524,29 +504,6 @@ extern struct portduino_config_struct {
             out << YAML::EndMap; // Config
         }
 
-        // StoreAndForward
-        if (sfpp_enabled) {
-            out << YAML::Key << "StoreAndForward" << YAML::Value << YAML::BeginMap;
-            out << YAML::Key << "Enabled" << YAML::Value << sfpp_enabled;
-            out << YAML::Key << "DBPath" << YAML::Value << sfpp_db_path;
-            out << YAML::Key << "Stratum0" << YAML::Value << sfpp_stratum0;
-            out << YAML::Key << "InitialSync" << YAML::Value << sfpp_initial_sync;
-            out << YAML::Key << "Hops" << YAML::Value << sfpp_hops;
-            out << YAML::Key << "AnnounceInterval" << YAML::Value << sfpp_announce_interval;
-            out << YAML::Key << "BacklogLimit" << YAML::Value << sfpp_backlog_limit;
-            out << YAML::Key << "MaxChainLength" << YAML::Value << sfpp_max_chain;
-            out << YAML::Key << "StealPort" << YAML::Value << sfpp_steal_port;
-            out << YAML::EndMap; // StoreAndForward
-        }
-
-        // Routing
-        if (whitelist_enabled || nohop_ports.size() > 0) {
-            out << YAML::Key << "Routing" << YAML::Value << YAML::BeginMap;
-            out << YAML::Key << "WhitelistPorts" << YAML::Value << whitelist_ports;
-            out << YAML::Key << "NoHopPorts" << YAML::Value << nohop_ports;
-            out << YAML::EndMap; // Routing
-        }
-
         // General
         out << YAML::Key << "General" << YAML::Value << YAML::BeginMap;
         if (config_directory != "")

variants/esp32c6/m5stack_unitc6l/platformio.ini

@@ -10,6 +10,8 @@ custom_meshtastic_tags = M5Stack
 
 extends = esp32c6_base
 board = esp32-c6-devkitc-1
+board_upload.flash_size = 16MB
+board_build.partitions = default_16MB.csv
 ;OpenOCD flash method
 ;upload_protocol = esp-builtin
 ;Normal method

variants/native/portduino/platformio.ini

@@ -9,7 +9,7 @@ lib_deps =
   # renovate: datasource=custom.pio depName=Melopero RV3028 packageName=melopero/library/Melopero RV3028
   melopero/Melopero RV3028@1.2.0
 
-build_src_filter = ${portduino_base.build_src_filter} +<modules/Native/>
+build_src_filter = ${portduino_base.build_src_filter}
 
 [env:native]
 extends = native_base
@@ -20,7 +20,6 @@ build_flags = ${native_base.build_flags}
   !pkg-config --libs openssl --silence-errors || :
   !pkg-config --cflags --libs sdl2 --silence-errors || :
   !pkg-config --cflags --libs libbsd-overlay --silence-errors || :
-  !pkg-config --cflags --libs sqlite3 --silence-errors || :
 
 [env:native-tft]
 extends = native_base
@@ -47,7 +46,6 @@ build_flags = ${native_base.build_flags} -Os -lX11 -linput -lxkbcommon -ffunctio
   !pkg-config --libs openssl --silence-errors || :
   !pkg-config --cflags --libs sdl2 --silence-errors || :
   !pkg-config --cflags --libs libbsd-overlay --silence-errors || :
-  !pkg-config --cflags --libs sqlite3 --silence-errors || :
 build_src_filter =
   ${native_base.build_src_filter}
 
@@ -77,7 +75,6 @@ build_flags = ${native_base.build_flags} -Os -ffunction-sections -fdata-sections
   !pkg-config --libs libulfius --silence-errors || :
   !pkg-config --libs openssl --silence-errors || :
   !pkg-config --cflags --libs libbsd-overlay --silence-errors || :
-  !pkg-config --cflags --libs sqlite3 --silence-errors || :
 build_src_filter =
   ${native_base.build_src_filter}
 
@@ -111,7 +108,6 @@ build_flags = ${native_base.build_flags} -O0 -fsanitize=address -lX11 -linput -l
   !pkg-config --libs libulfius --silence-errors || :
   !pkg-config --libs openssl --silence-errors || :
   !pkg-config --cflags --libs libbsd-overlay --silence-errors || :
-  !pkg-config --cflags --libs sqlite3 --silence-errors || :
 build_src_filter = ${env:native-tft.build_src_filter}
 
 [env:coverage]

variants/nrf52840/heltec_mesh_solar/platformio.ini

@@ -16,7 +16,7 @@ lib_deps =
   # renovate: datasource=git-refs depName=NMIoT-meshsolar packageName=https://github.com/NMIoT/meshsolar gitBranch=main
   https://github.com/NMIoT/meshsolar/archive/dfc5330dad443982e6cdd37a61d33fc7252f468b.zip
   # renovate: datasource=custom.pio depName=ArduinoJson packageName=bblanchon/library/ArduinoJson
-  bblanchon/ArduinoJson@6.21.5
+  bblanchon/ArduinoJson@7.4.2
 
 [env:heltec-mesh-solar]
 custom_meshtastic_hw_model = 108

variants/nrf52840/rak4631_eth_gw/platformio.ini

@@ -36,7 +36,7 @@ lib_deps =
   # renovate: datasource=git-refs depName=RAK12034-BMX160 packageName=https://github.com/RAKWireless/RAK12034-BMX160 gitBranch=main
   https://github.com/RAKWireless/RAK12034-BMX160/archive/dcead07ffa267d3c906e9ca4a1330ab989e957e2.zip
   # renovate: datasource=custom.pio depName=ArduinoJson packageName=bblanchon/library/ArduinoJson
-  bblanchon/ArduinoJson@6.21.5
+  bblanchon/ArduinoJson@7.4.2
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 ; Note: as of 6/2013 the serial/bootloader based programming takes approximately 30 seconds
 ;upload_protocol = jlink