Macro guard heap_caps_malloc_extmem_enable from SENSECAP_INDICATOR (#9007)

* make channels.h getHash public

* router.* make the encrypted packet copy available for modules to access

* Update src/mesh/Router.h

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

* Set p_encrypted to nullptr after release

---------

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>

platformio.ini

@@ -103,17 +103,13 @@ lib_deps =
 	thingsboard/TBPubSubClient@2.12.1
 	# renovate: datasource=custom.pio depName=NTPClient packageName=arduino-libraries/library/NTPClient
 	arduino-libraries/NTPClient@3.2.1
+
+; Extra TCP/IP networking libs for supported devices
+[networking_extra]
+lib_deps =
 	# renovate: datasource=custom.pio depName=Syslog packageName=arcao/library/Syslog
 	arcao/Syslog@2.0.0
 
-; Minimal networking libs for nrf52 (excludes Syslog to save flash)
-[nrf52_networking_base]
-lib_deps =
-	# renovate: datasource=custom.pio depName=TBPubSubClient packageName=thingsboard/library/TBPubSubClient
-	thingsboard/TBPubSubClient@2.12.1
-	# renovate: datasource=custom.pio depName=NTPClient packageName=arduino-libraries/library/NTPClient
-	arduino-libraries/NTPClient@3.2.1
-
 [radiolib_base]
 lib_deps =
 	# renovate: datasource=custom.pio depName=RadioLib packageName=jgromes/library/RadioLib
@@ -162,8 +158,8 @@ lib_deps =
 	emotibit/EmotiBit MLX90632@1.0.8
 	# renovate: datasource=custom.pio depName=Adafruit MLX90614 packageName=adafruit/library/Adafruit MLX90614 Library
 	adafruit/Adafruit MLX90614 Library@2.1.5
-	# renovate: datasource=github-tags depName=INA3221 packageName=sgtwilko/INA3221
-	https://github.com/sgtwilko/INA3221#bb03d7e9bfcc74fc798838a54f4f99738f29fc6a
+	# renovate: datasource=git-refs depName=INA3221 packageName=https://github.com/sgtwilko/INA3221 gitBranch=FixOverflow
+	https://github.com/sgtwilko/INA3221/archive/bb03d7e9bfcc74fc798838a54f4f99738f29fc6a.zip
 	# renovate: datasource=custom.pio depName=QMC5883L Compass packageName=mprograms/library/QMC5883LCompass
 	mprograms/QMC5883LCompass@1.2.3
 	# renovate: datasource=custom.pio depName=DFRobot_RTU packageName=dfrobot/library/DFRobot_RTU

src/graphics/niche/InkHUD/PlatformioConfig.ini

@@ -8,4 +8,5 @@ build_flags =
   -D MESHTASTIC_EXCLUDE_INPUTBROKER ; Suppress default input handling
   -D HAS_BUTTON=0 ; Suppress default ButtonThread
 lib_deps =
-  https://github.com/ZinggJM/GFX_Root#2.0.0 ; Used by InkHUD as a "slimmer" version of AdafruitGFX
+  # TODO renovate
+  https://github.com/ZinggJM/GFX_Root#2.0.0 ; Used by InkHUD as a "slimmer" version of AdafruitGFX

src/main.cpp

@@ -447,9 +447,11 @@ void setup()
     LOG_INFO("\n\n//\\ E S H T /\\ S T / C\n");
 
 #if defined(ARCH_ESP32) && defined(BOARD_HAS_PSRAM)
+#ifndef SENSECAP_INDICATOR
     // use PSRAM for malloc calls > 256 bytes
     heap_caps_malloc_extmem_enable(256);
 #endif
+#endif
 
 #if defined(DEBUG_MUTE) && defined(DEBUG_PORT)
     DEBUG_PORT.printf("\r\n\r\n//\\ E S H T /\\ S T / C\r\n");

src/mesh/Router.cpp

@@ -758,6 +758,7 @@ void Router::handleReceived(meshtastic_MeshPacket *p, RxSource src)
     }
 
     packetPool.release(p_encrypted); // Release the encrypted packet
+    p_encrypted = nullptr;
 }
 
 void Router::perhapsHandleReceived(meshtastic_MeshPacket *p)

src/mesh/Router.h

@@ -92,7 +92,7 @@ class Router : protected concurrency::OSThread, protected PacketHistory
     uint32_t rxDupe = 0, txRelayCanceled = 0;
 
     // pointer to the encrypted packet
-    meshtastic_MeshPacket *p_encrypted;
+    meshtastic_MeshPacket *p_encrypted = nullptr;
 
   protected:
     friend class RoutingModule;

src/mesh/generated/meshtastic/mesh.pb.cpp

@@ -24,9 +24,6 @@ PB_BIND(meshtastic_Data, meshtastic_Data, 2)
 PB_BIND(meshtastic_KeyVerification, meshtastic_KeyVerification, AUTO)
 
 
-PB_BIND(meshtastic_StoreForwardPlusPlus, meshtastic_StoreForwardPlusPlus, 2)
-
-
 PB_BIND(meshtastic_Waypoint, meshtastic_Waypoint, AUTO)
 
 
@@ -124,8 +121,6 @@ PB_BIND(meshtastic_ChunkedPayloadResponse, meshtastic_ChunkedPayloadResponse, AU
 
 
 
-
-
 
 
 

src/mesh/generated/meshtastic/mesh.pb.h

@@ -478,17 +478,6 @@ typedef enum _meshtastic_Routing_Error {
     meshtastic_Routing_Error_RATE_LIMIT_EXCEEDED = 38
 } meshtastic_Routing_Error;
 
-/* enum message type? */
-typedef enum _meshtastic_StoreForwardPlusPlus_SFPP_message_type {
-    /* message hash without chain hash means that no, it is not on the chain */
-    meshtastic_StoreForwardPlusPlus_SFPP_message_type_CANON_ANNOUNCE = 0,
-    meshtastic_StoreForwardPlusPlus_SFPP_message_type_CHAIN_QUERY = 1,
-    meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_REQUEST = 3,
-    meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_PROVIDE = 4,
-    meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_PROVIDE_FIRSTHALF = 5,
-    meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_PROVIDE_SECONDHALF = 6
-} meshtastic_StoreForwardPlusPlus_SFPP_message_type;
-
 /* The priority of this message for sending.
  Higher priorities are sent first (when managing the transmit queue).
  This field is never sent over the air, it is only used internally inside of a local device node.
@@ -793,24 +782,6 @@ typedef struct _meshtastic_KeyVerification {
     meshtastic_KeyVerification_hash2_t hash2;
 } meshtastic_KeyVerification;
 
-typedef PB_BYTES_ARRAY_T(32) meshtastic_StoreForwardPlusPlus_message_hash_t;
-typedef PB_BYTES_ARRAY_T(32) meshtastic_StoreForwardPlusPlus_commit_hash_t;
-typedef PB_BYTES_ARRAY_T(32) meshtastic_StoreForwardPlusPlus_root_hash_t;
-typedef PB_BYTES_ARRAY_T(240) meshtastic_StoreForwardPlusPlus_message_t;
-/* The actual over-the-mesh message doing store and forward++ */
-typedef struct _meshtastic_StoreForwardPlusPlus { /*  */
-    meshtastic_StoreForwardPlusPlus_SFPP_message_type sfpp_message_type;
-    meshtastic_StoreForwardPlusPlus_message_hash_t message_hash;
-    meshtastic_StoreForwardPlusPlus_commit_hash_t commit_hash;
-    meshtastic_StoreForwardPlusPlus_root_hash_t root_hash;
-    /* encapsulated message to share (may be split in half) */
-    meshtastic_StoreForwardPlusPlus_message_t message;
-    uint32_t encapsulated_id;
-    uint32_t encapsulated_to;
-    uint32_t encapsulated_from;
-    uint32_t encapsulated_rxtime;
-} meshtastic_StoreForwardPlusPlus;
-
 /* Waypoint message, used to share arbitrary locations across the mesh */
 typedef struct _meshtastic_Waypoint {
     /* Id of the waypoint */
@@ -1339,10 +1310,6 @@ extern "C" {
 #define _meshtastic_Routing_Error_MAX meshtastic_Routing_Error_RATE_LIMIT_EXCEEDED
 #define _meshtastic_Routing_Error_ARRAYSIZE ((meshtastic_Routing_Error)(meshtastic_Routing_Error_RATE_LIMIT_EXCEEDED+1))
 
-#define _meshtastic_StoreForwardPlusPlus_SFPP_message_type_MIN meshtastic_StoreForwardPlusPlus_SFPP_message_type_CANON_ANNOUNCE
-#define _meshtastic_StoreForwardPlusPlus_SFPP_message_type_MAX meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_PROVIDE_SECONDHALF
-#define _meshtastic_StoreForwardPlusPlus_SFPP_message_type_ARRAYSIZE ((meshtastic_StoreForwardPlusPlus_SFPP_message_type)(meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_PROVIDE_SECONDHALF+1))
-
 #define _meshtastic_MeshPacket_Priority_MIN meshtastic_MeshPacket_Priority_UNSET
 #define _meshtastic_MeshPacket_Priority_MAX meshtastic_MeshPacket_Priority_MAX
 #define _meshtastic_MeshPacket_Priority_ARRAYSIZE ((meshtastic_MeshPacket_Priority)(meshtastic_MeshPacket_Priority_MAX+1))
@@ -1371,8 +1338,6 @@ extern "C" {
 #define meshtastic_Data_portnum_ENUMTYPE meshtastic_PortNum
 
 
-#define meshtastic_StoreForwardPlusPlus_sfpp_message_type_ENUMTYPE meshtastic_StoreForwardPlusPlus_SFPP_message_type
-
 
 
 #define meshtastic_MeshPacket_priority_ENUMTYPE meshtastic_MeshPacket_Priority
@@ -1415,7 +1380,6 @@ extern "C" {
 #define meshtastic_Routing_init_default          {0, {meshtastic_RouteDiscovery_init_default}}
 #define meshtastic_Data_init_default             {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, 0}
 #define meshtastic_KeyVerification_init_default  {0, {0, {0}}, {0, {0}}}
-#define meshtastic_StoreForwardPlusPlus_init_default {_meshtastic_StoreForwardPlusPlus_SFPP_message_type_MIN, {0, {0}}, {0, {0}}, {0, {0}}, {0, {0}}, 0, 0, 0, 0}
 #define meshtastic_Waypoint_init_default         {0, false, 0, false, 0, 0, 0, "", "", 0}
 #define meshtastic_MqttClientProxyMessage_init_default {"", 0, {{0, {0}}}, 0}
 #define meshtastic_MeshPacket_init_default       {0, 0, 0, 0, {meshtastic_Data_init_default}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0, 0, 0, 0, _meshtastic_MeshPacket_TransportMechanism_MIN}
@@ -1447,7 +1411,6 @@ extern "C" {
 #define meshtastic_Routing_init_zero             {0, {meshtastic_RouteDiscovery_init_zero}}
 #define meshtastic_Data_init_zero                {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, 0}
 #define meshtastic_KeyVerification_init_zero     {0, {0, {0}}, {0, {0}}}
-#define meshtastic_StoreForwardPlusPlus_init_zero {_meshtastic_StoreForwardPlusPlus_SFPP_message_type_MIN, {0, {0}}, {0, {0}}, {0, {0}}, {0, {0}}, 0, 0, 0, 0}
 #define meshtastic_Waypoint_init_zero            {0, false, 0, false, 0, 0, 0, "", "", 0}
 #define meshtastic_MqttClientProxyMessage_init_zero {"", 0, {{0, {0}}}, 0}
 #define meshtastic_MeshPacket_init_zero          {0, 0, 0, 0, {meshtastic_Data_init_zero}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0, 0, 0, 0, _meshtastic_MeshPacket_TransportMechanism_MIN}
@@ -1526,15 +1489,6 @@ extern "C" {
 #define meshtastic_KeyVerification_nonce_tag     1
 #define meshtastic_KeyVerification_hash1_tag     2
 #define meshtastic_KeyVerification_hash2_tag     3
-#define meshtastic_StoreForwardPlusPlus_sfpp_message_type_tag 1
-#define meshtastic_StoreForwardPlusPlus_message_hash_tag 2
-#define meshtastic_StoreForwardPlusPlus_commit_hash_tag 3
-#define meshtastic_StoreForwardPlusPlus_root_hash_tag 4
-#define meshtastic_StoreForwardPlusPlus_message_tag 5
-#define meshtastic_StoreForwardPlusPlus_encapsulated_id_tag 6
-#define meshtastic_StoreForwardPlusPlus_encapsulated_to_tag 7
-#define meshtastic_StoreForwardPlusPlus_encapsulated_from_tag 8
-#define meshtastic_StoreForwardPlusPlus_encapsulated_rxtime_tag 9
 #define meshtastic_Waypoint_id_tag               1
 #define meshtastic_Waypoint_latitude_i_tag       2
 #define meshtastic_Waypoint_longitude_i_tag      3
@@ -1751,19 +1705,6 @@ X(a, STATIC,   SINGULAR, BYTES,    hash2,             3)
 #define meshtastic_KeyVerification_CALLBACK NULL
 #define meshtastic_KeyVerification_DEFAULT NULL
 
-#define meshtastic_StoreForwardPlusPlus_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, UENUM,    sfpp_message_type,   1) \
-X(a, STATIC,   SINGULAR, BYTES,    message_hash,      2) \
-X(a, STATIC,   SINGULAR, BYTES,    commit_hash,       3) \
-X(a, STATIC,   SINGULAR, BYTES,    root_hash,         4) \
-X(a, STATIC,   SINGULAR, BYTES,    message,           5) \
-X(a, STATIC,   SINGULAR, UINT32,   encapsulated_id,   6) \
-X(a, STATIC,   SINGULAR, UINT32,   encapsulated_to,   7) \
-X(a, STATIC,   SINGULAR, UINT32,   encapsulated_from,   8) \
-X(a, STATIC,   SINGULAR, UINT32,   encapsulated_rxtime,   9)
-#define meshtastic_StoreForwardPlusPlus_CALLBACK NULL
-#define meshtastic_StoreForwardPlusPlus_DEFAULT NULL
-
 #define meshtastic_Waypoint_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   id,                1) \
 X(a, STATIC,   OPTIONAL, SFIXED32, latitude_i,        2) \
@@ -2039,7 +1980,6 @@ extern const pb_msgdesc_t meshtastic_RouteDiscovery_msg;
 extern const pb_msgdesc_t meshtastic_Routing_msg;
 extern const pb_msgdesc_t meshtastic_Data_msg;
 extern const pb_msgdesc_t meshtastic_KeyVerification_msg;
-extern const pb_msgdesc_t meshtastic_StoreForwardPlusPlus_msg;
 extern const pb_msgdesc_t meshtastic_Waypoint_msg;
 extern const pb_msgdesc_t meshtastic_MqttClientProxyMessage_msg;
 extern const pb_msgdesc_t meshtastic_MeshPacket_msg;
@@ -2073,7 +2013,6 @@ extern const pb_msgdesc_t meshtastic_ChunkedPayloadResponse_msg;
 #define meshtastic_Routing_fields &meshtastic_Routing_msg
 #define meshtastic_Data_fields &meshtastic_Data_msg
 #define meshtastic_KeyVerification_fields &meshtastic_KeyVerification_msg
-#define meshtastic_StoreForwardPlusPlus_fields &meshtastic_StoreForwardPlusPlus_msg
 #define meshtastic_Waypoint_fields &meshtastic_Waypoint_msg
 #define meshtastic_MqttClientProxyMessage_fields &meshtastic_MqttClientProxyMessage_msg
 #define meshtastic_MeshPacket_fields &meshtastic_MeshPacket_msg
@@ -2130,7 +2069,6 @@ extern const pb_msgdesc_t meshtastic_ChunkedPayloadResponse_msg;
 #define meshtastic_QueueStatus_size              23
 #define meshtastic_RouteDiscovery_size           256
 #define meshtastic_Routing_size                  259
-#define meshtastic_StoreForwardPlusPlus_size     371
 #define meshtastic_ToRadio_size                  504
 #define meshtastic_User_size                     115
 #define meshtastic_Waypoint_size                 165

src/mesh/generated/meshtastic/portnums.pb.h

@@ -86,9 +86,6 @@ typedef enum _meshtastic_PortNum {
     /* Paxcounter lib included in the firmware
  ENCODING: protobuf */
     meshtastic_PortNum_PAXCOUNTER_APP = 34,
-    /* Store and Forward++ module included in the firmware
- ENCODING: protobuf */
-    meshtastic_PortNum_STORE_FORWARD_PLUSPLUS_APP = 35,
     /* Provides a hardware serial interface to send and receive from the Meshtastic network.
  Connect to the RX/TX pins of a device with 38400 8N1. Packets received from the Meshtastic
  network is forwarded to the RX pin while sending a packet to TX will go out to the Mesh network.

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,7 +243,6 @@ void setupModules()
 #endif
 #if ARCH_PORTDUINO
     new HostMetricsModule();
-    new StoreForwardPlusPlusModule();
 #endif
 #if HAS_TELEMETRY
     new DeviceTelemetryModule();

src/modules/Native/StoreForwardPlusPlus.cpp

@@ -1,976 +0,0 @@
-// I've done a lot of this in SQLite for now, but honestly it needs to happen in memory, and get saved to sqlite during downtime
-
-// TODO: Put some channel usage limits on this: Should be limited to 25% utilization, for instance
-
-// TODO: custom hops. 1 maybe 0
-
-// TODO: non-stratum0 nodes need to be pointed at their upstream source? Maybe
-
-// TODO: Work without sending some of the hashes/ short hashes
-
-// things may get weird if there are multiple stratum-0 nodes on a single mesh. Come up with mitigations
-
-// Basic design:
-// This module watches a channel for text messages.
-// each message gets sha256 summed, and then appended to a git-style blockchain. Probably need a counter, too
-// then the message, metadata, hash, and git hash information are saved. sqlite?
-
-// nodes/sub-controllers can subscribe to a database
-
-// A node can DM the controller, querying if a single message is on the chain, or asking for the last message hash
-
-// if the message is not on the chain, the node can resend the message
-
-// if the node lacks messages, it can request them
-
-// will need the concept of sub-controllers, that subscribe to the central controller, can help push updates
-
-// catch-up messages only go out when the mesh is low use %
-
-// Normal firmware will only attempt to sync the chain a few times, then just ask for the latest few messages. A phone app can try
-// harder
-
-// host will periodically advertise its presence
-
-// at least initially, there can only be one authoritative host
-
-// message objects get a hash value
-// the message chain gets a commit hash
-//
-
-#include "StoreForwardPlusPlus.h"
-#include "MeshService.h"
-#include "RTC.h"
-#include "SHA256.h"
-#include "meshUtils.h"
-#include "modules/RoutingModule.h"
-
-StoreForwardPlusPlusModule::StoreForwardPlusPlusModule()
-    : ProtobufModule("StoreForwardpp", meshtastic_PortNum_STORE_FORWARD_PLUSPLUS_APP, &meshtastic_StoreForwardPlusPlus_msg),
-      concurrency::OSThread("StoreForwardpp")
-{
-    LOG_WARN("StoreForwardPlusPlusModule init");
-
-    if (portduino_config.sfpp_stratum0)
-        LOG_WARN("SF++ stratum0");
-
-    int res = sqlite3_open("test.db", &ppDb);
-    LOG_WARN("Result1 %u", res);
-
-    char *err = nullptr;
-
-    res = sqlite3_exec(ppDb, "         \
-        CREATE TABLE channel_messages( \
-        destination INT NOT NULL,      \
-        sender INT NOT NULL,           \
-        packet_id INT NOT NULL,        \
-        rx_time INT NOT NULL,          \
-        root_hash BLOB NOT NULL,      \
-        encrypted_bytes BLOB NOT NULL, \
-        message_hash BLOB NOT NULL,    \
-        commit_hash BLOB NOT NULL,     \
-        payload TEXT,                  \
-        PRIMARY KEY (message_hash)     \
-        );",
-                       NULL, NULL, &err);
-    LOG_WARN("Result2 %u", res);
-    if (err != nullptr)
-        LOG_ERROR("%s", err);
-    sqlite3_free(err);
-
-    res = sqlite3_exec(ppDb, "         \
-        CREATE TABLE local_messages( \
-        destination INT NOT NULL,      \
-        sender INT NOT NULL,           \
-        packet_id INT NOT NULL,        \
-        rx_time INT NOT NULL,          \
-        channel_hash INT NOT NULL,      \
-        encrypted_bytes BLOB NOT NULL, \
-        message_hash BLOB NOT NULL,    \
-        payload TEXT,                  \
-        PRIMARY KEY (message_hash)     \
-        );",
-                       NULL, NULL, &err);
-    LOG_WARN("Result2 %u", res);
-    if (err != nullptr)
-        LOG_ERROR("%s", err);
-    sqlite3_free(err);
-
-    // create table DMs
-    res = sqlite3_exec(ppDb, "         \
-        CREATE TABLE direct_messages( \
-        destination INT NOT NULL,      \
-        sender INT NOT NULL,           \
-        packet_id INT NOT NULL,        \
-        rx_time INT NOT NULL,          \
-        channel_hash INT NOT NULL,     \
-        commit_hash BLOB NOT NULL,     \
-        encrypted_bytes BLOB NOT NULL, \
-        message_hash BLOB NOT NULL,    \
-        payload TEXT,                  \
-        PRIMARY KEY (message_hash)     \
-        );",
-                       NULL, NULL, &err);
-    LOG_WARN("Result2 %u", res);
-    if (err != nullptr)
-        LOG_ERROR("%s", err);
-    sqlite3_free(err);
-
-    // mappings table -- connects the root hashes to channel hashes and DM identifiers
-    res = sqlite3_exec(ppDb, "         \
-        CREATE TABLE mappings( \
-        chain_type INT NOT NULL,      \
-        identifier INT NOT NULL,           \
-        root_hash BLOB NOT NULL,     \
-        PRIMARY KEY (identifier)     \
-        );",
-                       NULL, NULL, &err);
-    LOG_WARN("Result2 %u", res);
-    if (err != nullptr)
-        LOG_ERROR("%s", err);
-    sqlite3_free(err);
-
-    // store schema version somewhere
-
-    // prepared statements *should* make this faster.
-    sqlite3_prepare_v2(ppDb, "INSERT INTO channel_messages (destination, sender, packet_id, root_hash, \
-        encrypted_bytes, message_hash, rx_time, commit_hash, payload) VALUES(?, ?, ?, ?, ?, ?, ?, ?, ?);",
-                       -1, &chain_insert_stmt, NULL);
-
-    sqlite3_prepare_v2(ppDb, "INSERT INTO local_messages (destination, sender, packet_id, channel_hash, \
-        encrypted_bytes, message_hash, rx_time, payload) VALUES(?, ?, ?, ?, ?, ?, ?, ?);",
-                       -1, &scratch_insert_stmt, NULL);
-
-    sqlite3_prepare_v2(ppDb, "select destination, sender, packet_id, encrypted_bytes, message_hash, rx_time, channel_hash \
-        from local_messages where channel_hash=? order by rx_time asc LIMIT 1;", // earliest first
-                       -1, &fromScratchStmt, NULL);
-
-    sqlite3_prepare_v2(ppDb,
-                       "select destination, sender, packet_id, encrypted_bytes, message_hash, rx_time, channel_hash, payload \
-        from local_messages where message_hash=? order by rx_time asc LIMIT 1;", // earliest first
-                       -1, &fromScratchByHashStmt, NULL);
-
-    sqlite3_prepare_v2(ppDb, "SELECT COUNT(*) from channel_messages where message_hash=?", -1, &checkDup, NULL);
-
-    sqlite3_prepare_v2(ppDb, "SELECT COUNT(*) from local_messages where message_hash=?", -1, &checkScratch, NULL);
-
-    sqlite3_prepare_v2(ppDb, "DELETE from local_messages where message_hash=?", -1, &removeScratch, NULL);
-
-    sqlite3_prepare_v2(ppDb, "UPDATE channel_messages SET payload=? WHERE message_hash=?", -1, &updatePayloadStmt, NULL);
-
-    sqlite3_prepare_v2(ppDb, "select commit_hash from channel_messages where root_hash=? order by rowid ASC;", -1,
-                       &getNextHashStmt, NULL);
-
-    sqlite3_prepare_v2(
-        ppDb, "select commit_hash, message_hash, rx_time from channel_messages where root_hash=? order by rowid desc LIMIT 1;",
-        -1, &getChainEndStmt, NULL);
-
-    sqlite3_prepare_v2(ppDb, "select destination, sender, packet_id, encrypted_bytes, message_hash, rx_time \
-        from channel_messages where commit_hash=?;",
-                       -1, &getLinkStmt, NULL);
-    encryptedOk = true;
-
-    // wait about 15 seconds after boot for the first runOnce()
-    // TODO: When not doing active development, adjust this to a longer time
-    this->setInterval(15 * 1000);
-}
-
-int32_t StoreForwardPlusPlusModule::runOnce()
-{
-    LOG_WARN("StoreForward++ runONce");
-    if (getRTCQuality() < RTCQualityNTP) {
-        LOG_WARN("StoreForward++ deferred due to time quality %u", getRTCQuality());
-        return 5 * 60 * 1000;
-    }
-    uint8_t root_hash_bytes[32] = {0};
-    ChannelHash hash = channels.getHash(0);
-    getOrAddRootFromChannelHash(hash, root_hash_bytes);
-
-    // get tip of chain for this channel
-    uint8_t last_message_commit_hash[32] = {0};
-    uint8_t last_message_hash[32] = {0};
-    uint32_t chain_end_rx_time = getChainEnd(hash, last_message_commit_hash, last_message_hash);
-    if (chain_end_rx_time == 0) {
-        LOG_WARN("Store and Forward++ database lookup returned null");
-        return 60 * 60 * 1000;
-    }
-
-    // broadcast the tip of the chain
-    canonAnnounce(last_message_hash, last_message_commit_hash, root_hash_bytes, chain_end_rx_time);
-
-    // eventually timeout things on the scratch queue
-    return 60 * 60 * 1000;
-}
-
-bool StoreForwardPlusPlusModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_StoreForwardPlusPlus *t)
-{
-    LOG_WARN("in handleReceivedProtobuf");
-    LOG_WARN("Sfp++ node %u sent us sf++ packet", mp.from);
-    printBytes("commit_hash ", t->commit_hash.bytes, t->commit_hash.size);
-    printBytes("root_hash ", t->root_hash.bytes, t->root_hash.size);
-
-    if (t->sfpp_message_type == meshtastic_StoreForwardPlusPlus_SFPP_message_type_CANON_ANNOUNCE) {
-        // check commit_hash.size
-
-        if (portduino_config.sfpp_stratum0) {
-            LOG_WARN("Received a CANON_ANNOUNCE while stratum 0");
-            uint8_t next_commit_hash[32] = {0};
-
-            if (getNextHash(t->root_hash.bytes, t->commit_hash.bytes, next_commit_hash)) {
-                printBytes("next chain hash: ", next_commit_hash, 32);
-
-                broadcastLink(next_commit_hash, t->root_hash.bytes);
-            }
-        } else {
-            uint8_t tmp_root_hash_bytes[32] = {0};
-
-            LOG_WARN("Received a CANON_ANNOUNCE");
-            if (getRootFromChannelHash(router->p_encrypted->channel, tmp_root_hash_bytes)) {
-                // we found the hash, check if it's the right one
-                if (memcmp(tmp_root_hash_bytes, t->root_hash.bytes, 32) != 0) {
-                    LOG_WARN("Found root hash, and it doesn't match!");
-                    return true;
-                }
-            } else {
-
-                addRootToMappings(router->p_encrypted->channel, t->root_hash.bytes);
-                LOG_WARN("Adding root hash to mappings");
-            }
-
-            // get tip of chain for this channel
-            uint8_t last_message_commit_hash[32] = {0};
-            uint8_t last_message_hash[32] = {0};
-
-            // get chain tip
-            if (getChainEnd(router->p_encrypted->channel, last_message_commit_hash, last_message_hash)) {
-                if (memcmp(last_message_commit_hash, t->commit_hash.bytes, 32) == 0) {
-                    LOG_WARN("End of chain matches!");
-                    sendFromScratch(router->p_encrypted->channel);
-                    // TODO: Send a message from the local queue
-                } else {
-                    ("End of chain does not match!");
-
-                    // We just got an end of chain announce, checking if we have seen this message and have it in scratch.
-                    if (isInScratch(t->message_hash.bytes)) {
-                        link_object scratch_object = getFromScratch(t->message_hash.bytes, t->message_hash.size);
-                        // if this matches, we don't need to request the message
-                        // we know exactly what it is
-                        if (checkCommitHash(scratch_object, t->commit_hash.bytes, t->message_hash.size)) {
-                            scratch_object.has_commit_hash = true;
-                            memcpy(scratch_object.commit_hash, t->commit_hash.bytes, 32);
-
-                            addToChain(scratch_object);
-                            removeFromScratch(t->message_hash.bytes);
-                            // short circuit and return
-                            // falls through to a request for the message
-                            return true;
-                        }
-                    }
-                    requestNextMessage(t->root_hash.bytes, last_message_commit_hash);
-                }
-            } else { // if chainEnd()
-                LOG_WARN("No Messages on this chain, request!");
-                requestNextMessage(t->root_hash.bytes, t->root_hash.bytes);
-            }
-        }
-    } else if (t->sfpp_message_type == meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_REQUEST) {
-        uint8_t next_commit_hash[32] = {0};
-
-        LOG_WARN("Received link request");
-        if (getNextHash(t->root_hash.bytes, t->commit_hash.bytes, next_commit_hash)) {
-            printBytes("next chain hash: ", next_commit_hash, 32);
-
-            broadcastLink(next_commit_hash, t->root_hash.bytes);
-        }
-
-        // if root and chain hashes are the same, grab the first message on the chain
-        // if different, get the message directly after.
-        // check if the root
-
-    } else if (t->sfpp_message_type == meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_PROVIDE) {
-        LOG_WARN("Link Provide received!");
-        // TODO: Check for root hash in mappings
-
-        link_object incoming_link = ingestLinkMessage(t);
-
-        if (portduino_config.sfpp_stratum0) {
-            if (isInDB(incoming_link.message_hash)) {
-                LOG_WARN("Received link already in chain");
-                // TODO: respond with last link?
-            }
-
-            if (!getRootFromChannelHash(router->p_encrypted->channel, incoming_link.root_hash)) {
-                LOG_WARN("Hash bytes not found for incoming link");
-                return true;
-            }
-
-            // calculate the commit_hash
-            addToChain(incoming_link);
-            // not super thrilled about doing two broadcasts. Maybe just schedule the canonAnnounce?
-            canonAnnounce(incoming_link.message_hash, incoming_link.commit_hash, incoming_link.root_hash, incoming_link.rx_time);
-            rebroadcastLinkObject(incoming_link);
-        } else {
-            addToChain(incoming_link);
-            if (isInScratch(incoming_link.message_hash)) {
-                link_object scratch_object = getFromScratch(incoming_link.message_hash, 32);
-                if (scratch_object.payload != "") {
-                    updatePayload(incoming_link.message_hash, scratch_object.payload);
-                }
-                removeFromScratch(incoming_link.message_hash);
-            } else {
-                // TODO: compare the time, and don't rebroadcast really old messages
-                // if this packet is new to us, we rebroadcast it
-                LOG_WARN("Attempting to Rebroadcast2");
-                rebroadcastLinkObject(incoming_link);
-            }
-            requestNextMessage(t->root_hash.bytes, t->commit_hash.bytes);
-        }
-    }
-
-    return true;
-}
-
-ProcessMessage StoreForwardPlusPlusModule::handleReceived(const meshtastic_MeshPacket &mp)
-{
-    // To avoid terrible time problems, require NTP or GPS time
-    if (getRTCQuality() < RTCQualityNTP) {
-        return ProcessMessage::CONTINUE;
-    }
-
-    // For the moment, this is strictly LoRa
-    if (mp.transport_mechanism != meshtastic_MeshPacket_TransportMechanism_TRANSPORT_LORA) {
-        return ProcessMessage::CONTINUE; // Let others look at this message also if they want
-    }
-
-    // will eventually host DMs and other undecodable messages
-    if (mp.which_payload_variant != meshtastic_MeshPacket_decoded_tag) {
-        return ProcessMessage::CONTINUE; // Let others look at this message also if they want
-    }
-    LOG_WARN("in handleReceived");
-    if (mp.decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_APP && mp.to == NODENUM_BROADCAST) {
-        link_object lo = ingestTextPacket(mp, router->p_encrypted);
-
-        if (isInDB(lo.message_hash)) {
-            LOG_WARN("found message in db");
-            // We may have this message already, but we may not have the payload
-            // if we do, we can update the payload in the database
-            if (lo.payload != "")
-                updatePayload(lo.message_hash, lo.payload);
-            return ProcessMessage::CONTINUE;
-        }
-
-        if (!portduino_config.sfpp_stratum0) {
-            if (!isInDB(lo.message_hash)) {
-                addToScratch(lo);
-                LOG_WARN("added message to scratch");
-                // send link to upstream?
-            }
-            return ProcessMessage::CONTINUE;
-        }
-        addToChain(lo);
-
-        // TODO: Limit to 25% bandwidth
-        canonAnnounce(lo.message_hash, lo.commit_hash, lo.root_hash, lo.rx_time);
-        return ProcessMessage::CONTINUE; // Let others look at this message also if they want
-    } else if (mp.decoded.portnum == meshtastic_PortNum_STORE_FORWARD_PLUSPLUS_APP) {
-        LOG_WARN("Got a STORE_FORWARD++ packet");
-        meshtastic_StoreForwardPlusPlus scratch;
-        pb_decode_from_bytes(mp.decoded.payload.bytes, mp.decoded.payload.size, meshtastic_StoreForwardPlusPlus_fields, &scratch);
-        handleReceivedProtobuf(mp, &scratch);
-        return ProcessMessage::CONTINUE;
-    }
-    return ProcessMessage::CONTINUE;
-}
-
-bool StoreForwardPlusPlusModule::getRootFromChannelHash(ChannelHash _ch_hash, uint8_t *_root_hash)
-{
-    bool found = false;
-    sqlite3_stmt *getHash;
-    int rc = sqlite3_prepare_v2(ppDb, "select root_hash from mappings where identifier=?;", -1, &getHash, NULL);
-    sqlite3_bind_int(getHash, 1, _ch_hash);
-    sqlite3_step(getHash);
-    uint8_t *tmp_root_hash = (uint8_t *)sqlite3_column_blob(getHash, 0);
-    if (tmp_root_hash) {
-        LOG_WARN("Found root hash!");
-        memcpy(_root_hash, tmp_root_hash, 32);
-        found = true;
-    }
-    sqlite3_finalize(getHash);
-    return found;
-}
-
-ChannelHash StoreForwardPlusPlusModule::getChannelHashFromRoot(uint8_t *_root_hash)
-{
-    sqlite3_stmt *getHash;
-    int rc = sqlite3_prepare_v2(ppDb, "select identifier from mappings where root_hash=?;", -1, &getHash, NULL);
-    sqlite3_bind_blob(getHash, 1, _root_hash, 32, NULL);
-    sqlite3_step(getHash);
-    ChannelHash tmp_hash = (ChannelHash)sqlite3_column_int(getHash, 0);
-    sqlite3_finalize(getHash);
-    return tmp_hash;
-}
-
-// return code indicates newly created chain
-bool StoreForwardPlusPlusModule::getOrAddRootFromChannelHash(ChannelHash _ch_hash, uint8_t *_root_hash)
-{
-    LOG_WARN("getOrAddRootFromChannelHash()");
-    bool isNew = !getRootFromChannelHash(_ch_hash, _root_hash);
-
-    if (isNew) {
-        if (portduino_config.sfpp_stratum0) {
-            LOG_WARN("Generating Root hash!");
-            // generate root hash
-            SHA256 commit_hash;
-            commit_hash.update(&_ch_hash, sizeof(_ch_hash));
-            NodeNum ourNode = nodeDB->getNodeNum();
-            commit_hash.update(&ourNode, sizeof(ourNode));
-            uint32_t rtc_sec = getValidTime(RTCQuality::RTCQualityDevice, true);
-            commit_hash.update(&rtc_sec, sizeof(rtc_sec));
-            commit_hash.finalize(_root_hash, 32);
-            addRootToMappings(_ch_hash, _root_hash);
-        }
-    }
-    return isNew;
-}
-
-bool StoreForwardPlusPlusModule::addRootToMappings(ChannelHash _ch_hash, uint8_t *_root_hash)
-{
-    LOG_WARN("addRootToMappings()");
-    printBytes("_root_hash", _root_hash, 32);
-    sqlite3_stmt *getHash;
-
-    // write to the table
-    int rc =
-        sqlite3_prepare_v2(ppDb, "INSERT INTO mappings (chain_type, identifier, root_hash) VALUES(?, ?, ?);", -1, &getHash, NULL);
-    LOG_WARN("%d", rc);
-    int type = chain_types::channel_chain;
-    // note, must be an int variable
-
-    sqlite3_bind_int(getHash, 1, type);
-    sqlite3_bind_int(getHash, 2, _ch_hash);
-    sqlite3_bind_blob(getHash, 3, _root_hash, 32, NULL);
-    // sqlite3_bind_int(getHash, 4, nodeToAdd);
-    rc = sqlite3_step(getHash);
-    LOG_WARN("result %u, %s", rc, sqlite3_errmsg(ppDb));
-    sqlite3_finalize(getHash);
-    return true;
-}
-
-uint32_t StoreForwardPlusPlusModule::getChainEnd(ChannelHash _ch_hash, uint8_t *_commit_hash, uint8_t *_message_hash)
-{
-    LOG_WARN("getChainEnd");
-    uint8_t _root_hash[32] = {0};
-    if (!getRootFromChannelHash(_ch_hash, _root_hash)) {
-        LOG_WARN("No root hash found for channel %u", _ch_hash);
-        return 0;
-    }
-
-    int rc;
-    sqlite3_bind_blob(getChainEndStmt, 1, _root_hash, 32, NULL);
-    sqlite3_step(getChainEndStmt);
-    uint8_t *last_message_commit_hash = (uint8_t *)sqlite3_column_blob(getChainEndStmt, 0);
-    uint8_t *last_message_hash = (uint8_t *)sqlite3_column_blob(getChainEndStmt, 1);
-    uint32_t _rx_time = sqlite3_column_int(getChainEndStmt, 2);
-    if (last_message_commit_hash != nullptr) {
-        memcpy(_commit_hash, last_message_commit_hash, 32);
-    }
-    if (last_message_hash != nullptr) {
-        memcpy(_message_hash, last_message_hash, 32);
-    }
-    if (last_message_commit_hash == nullptr || last_message_hash == nullptr) {
-        LOG_WARN("Store and Forward++ database lookup returned null");
-        sqlite3_reset(getChainEndStmt);
-
-        return 0;
-    }
-    sqlite3_reset(getChainEndStmt);
-    return _rx_time;
-}
-
-void StoreForwardPlusPlusModule::requestNextMessage(uint8_t *_root_hash, uint8_t *_commit_hash)
-{
-
-    meshtastic_StoreForwardPlusPlus storeforward = meshtastic_StoreForwardPlusPlus_init_zero;
-    storeforward.sfpp_message_type = meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_REQUEST;
-    // set root hash
-
-    // set chain hash
-    storeforward.commit_hash.size = 32;
-    memcpy(storeforward.commit_hash.bytes, _commit_hash, 32);
-
-    // set root hash
-    storeforward.root_hash.size = 32;
-    memcpy(storeforward.root_hash.bytes, _root_hash, 32);
-
-    // storeforward.
-    meshtastic_MeshPacket *p = allocDataProtobuf(storeforward);
-    p->to = NODENUM_BROADCAST;
-    p->decoded.want_response = false;
-    p->priority = meshtastic_MeshPacket_Priority_BACKGROUND;
-    p->channel = 0;
-    LOG_INFO("Send packet to mesh");
-    service->sendToMesh(p, RX_SRC_LOCAL, true);
-}
-
-bool StoreForwardPlusPlusModule::getNextHash(uint8_t *_root_hash, uint8_t *_commit_hash, uint8_t *next_commit_hash)
-{
-    LOG_WARN("getNextHash");
-
-    ChannelHash _channel_hash = getChannelHashFromRoot(_root_hash);
-    LOG_WARN("_channel_hash %u", _channel_hash);
-
-    int rc;
-    sqlite3_bind_blob(getNextHashStmt, 1, _root_hash, 32, NULL);
-
-    bool next_hash = false;
-
-    // asking for the first entry on the chain
-    if (memcmp(_root_hash, _commit_hash, 32) == 0) {
-        rc = sqlite3_step(getNextHashStmt);
-        if (rc != SQLITE_OK) {
-            LOG_WARN("here2 %u, %s", rc, sqlite3_errmsg(ppDb));
-        }
-        uint8_t *tmp_commit_hash = (uint8_t *)sqlite3_column_blob(getNextHashStmt, 0);
-        printBytes("commit_hash", tmp_commit_hash, 32);
-        memcpy(next_commit_hash, tmp_commit_hash, 32);
-        next_hash = true;
-    } else {
-        bool found_hash = false;
-
-        LOG_WARN("Looking for next hashes");
-        uint8_t *tmp_commit_hash;
-        while (sqlite3_step(getNextHashStmt) != SQLITE_DONE) {
-            tmp_commit_hash = (uint8_t *)sqlite3_column_blob(getNextHashStmt, 0);
-
-            if (found_hash) {
-                LOG_WARN("Found hash");
-                memcpy(next_commit_hash, tmp_commit_hash, 32);
-                next_hash = true;
-                break;
-            }
-            if (memcmp(tmp_commit_hash, _commit_hash, 32) == 0)
-                found_hash = true;
-        }
-    }
-
-    sqlite3_reset(getNextHashStmt);
-    return next_hash;
-}
-
-bool StoreForwardPlusPlusModule::broadcastLink(uint8_t *_commit_hash, uint8_t *_root_hash)
-{
-    int rc;
-
-    LOG_WARN("%d", rc);
-    if (rc != SQLITE_OK) {
-        LOG_WARN("here2 %u, %s", rc, sqlite3_errmsg(ppDb));
-    }
-    sqlite3_bind_blob(getLinkStmt, 1, _commit_hash, 32, NULL);
-    sqlite3_step(getLinkStmt);
-
-    meshtastic_StoreForwardPlusPlus storeforward = meshtastic_StoreForwardPlusPlus_init_zero;
-    storeforward.sfpp_message_type = meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_PROVIDE;
-
-    storeforward.encapsulated_to = sqlite3_column_int(getLinkStmt, 0);
-    storeforward.encapsulated_from = sqlite3_column_int(getLinkStmt, 1);
-    storeforward.encapsulated_id = sqlite3_column_int(getLinkStmt, 2);
-
-    uint8_t *_payload = (uint8_t *)sqlite3_column_blob(getLinkStmt, 3);
-    storeforward.message.size = sqlite3_column_bytes(getLinkStmt, 3);
-    memcpy(storeforward.message.bytes, _payload, storeforward.message.size);
-
-    uint8_t *_message_hash = (uint8_t *)sqlite3_column_blob(getLinkStmt, 4);
-    storeforward.message_hash.size = 32;
-    memcpy(storeforward.message_hash.bytes, _message_hash, storeforward.message_hash.size);
-
-    storeforward.encapsulated_rxtime = sqlite3_column_int(getLinkStmt, 5);
-    storeforward.commit_hash.size = 32;
-    memcpy(storeforward.commit_hash.bytes, _commit_hash, 32);
-
-    storeforward.root_hash.size = 32;
-    memcpy(storeforward.root_hash.bytes, _root_hash, 32);
-
-    sqlite3_reset(getLinkStmt);
-
-    meshtastic_MeshPacket *p = allocDataProtobuf(storeforward);
-    p->to = NODENUM_BROADCAST;
-    p->decoded.want_response = false;
-    p->priority = meshtastic_MeshPacket_Priority_BACKGROUND;
-    p->channel = 0;
-    LOG_INFO("Send link to mesh");
-    service->sendToMesh(p, RX_SRC_LOCAL, true);
-    return true;
-}
-
-bool StoreForwardPlusPlusModule::sendFromScratch(uint8_t _channel_hash)
-{
-    LOG_WARN("sendFromScratch");
-    //    "select destination, sender, packet_id, channel_hash, encrypted_bytes, message_hash, rx_time \
-    //    from local_messages order by rx_time desc LIMIT 1;"
-    sqlite3_bind_int(fromScratchStmt, 1, _channel_hash);
-    if (sqlite3_step(fromScratchStmt) == SQLITE_DONE) {
-        LOG_WARN("No messages in scratch to forward");
-        return false;
-    }
-    uint8_t _root_hash[32] = {0};
-    if (!getRootFromChannelHash(_channel_hash, _root_hash)) {
-        LOG_ERROR("Error getting root hash");
-        return false;
-    }
-
-    meshtastic_StoreForwardPlusPlus storeforward = meshtastic_StoreForwardPlusPlus_init_zero;
-    storeforward.sfpp_message_type = meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_PROVIDE;
-
-    storeforward.encapsulated_to = sqlite3_column_int(fromScratchStmt, 0);
-    storeforward.encapsulated_from = sqlite3_column_int(fromScratchStmt, 1);
-    storeforward.encapsulated_id = sqlite3_column_int(fromScratchStmt, 2);
-
-    uint8_t *_encrypted = (uint8_t *)sqlite3_column_blob(fromScratchStmt, 3);
-    storeforward.message.size = sqlite3_column_bytes(fromScratchStmt, 3);
-    memcpy(storeforward.message.bytes, _encrypted, storeforward.message.size);
-
-    uint8_t *_message_hash = (uint8_t *)sqlite3_column_blob(fromScratchStmt, 4);
-    storeforward.message_hash.size = 32;
-    memcpy(storeforward.message_hash.bytes, _message_hash, storeforward.message_hash.size);
-
-    storeforward.encapsulated_rxtime = sqlite3_column_int(fromScratchStmt, 5);
-
-    storeforward.root_hash.size = 32;
-    memcpy(storeforward.root_hash.bytes, _root_hash, 32);
-
-    sqlite3_reset(fromScratchStmt);
-
-    meshtastic_MeshPacket *p = allocDataProtobuf(storeforward);
-    p->to = NODENUM_BROADCAST;
-    p->decoded.want_response = false;
-    p->priority = meshtastic_MeshPacket_Priority_BACKGROUND;
-    p->channel = 0;
-    LOG_INFO("Send link to mesh");
-    service->sendToMesh(p, RX_SRC_LOCAL, true);
-    return true;
-}
-
-bool StoreForwardPlusPlusModule::addToChain(link_object &lo)
-{
-    LOG_WARN("Add to chain");
-    // we may need to calculate the commit hash at this point
-    if (!lo.has_commit_hash) {
-        SHA256 commit_hash;
-
-        uint8_t last_message_hash[32] = {0};
-        uint8_t last_commit_hash[32] = {0};
-
-        commit_hash.reset();
-
-        if (getChainEnd(lo.channel_hash, last_commit_hash, last_message_hash)) {
-            printBytes("last message: 0x", last_commit_hash, 32);
-            commit_hash.update(last_commit_hash, 32);
-        } else {
-            printBytes("new chain root: 0x", lo.root_hash, 32);
-            commit_hash.update(lo.root_hash, 32);
-        }
-
-        commit_hash.update(lo.message_hash, 32);
-        // message_hash.update(&mp.rx_time, sizeof(mp.rx_time));
-        commit_hash.finalize(lo.commit_hash, 32);
-    }
-    // push a message into the local chain DB
-    // destination
-    sqlite3_bind_int(chain_insert_stmt, 1, lo.to);
-    // sender
-    sqlite3_bind_int(chain_insert_stmt, 2, lo.from);
-    // packet_id
-    sqlite3_bind_int(chain_insert_stmt, 3, lo.id);
-    // root_hash
-    sqlite3_bind_blob(chain_insert_stmt, 4, lo.root_hash, 32, NULL);
-    // encrypted_bytes
-    sqlite3_bind_blob(chain_insert_stmt, 5, lo.encrypted_bytes, lo.encrypted_len, NULL);
-    // message_hash
-    sqlite3_bind_blob(chain_insert_stmt, 6, lo.message_hash, 32, NULL);
-    // rx_time
-    sqlite3_bind_int(chain_insert_stmt, 7, lo.rx_time);
-    // commit_hash
-    sqlite3_bind_blob(chain_insert_stmt, 8, lo.commit_hash, 32, NULL);
-    // payload
-    sqlite3_bind_text(chain_insert_stmt, 9, lo.payload.c_str(), lo.payload.length(), NULL);
-    sqlite3_step(chain_insert_stmt);
-    sqlite3_reset(chain_insert_stmt);
-    return true;
-}
-
-bool StoreForwardPlusPlusModule::addToScratch(link_object &lo)
-{
-    // TODO: Make a data structure for this data
-
-    // push a message into the local chain DB
-    // destination
-    sqlite3_bind_int(scratch_insert_stmt, 1, lo.to);
-    // sender
-    sqlite3_bind_int(scratch_insert_stmt, 2, lo.from);
-    // packet_id
-    sqlite3_bind_int(scratch_insert_stmt, 3, lo.id);
-    // root_hash
-    sqlite3_bind_blob(scratch_insert_stmt, 4, lo.root_hash, 32, NULL);
-    // encrypted_bytes
-    sqlite3_bind_blob(scratch_insert_stmt, 5, lo.encrypted_bytes, lo.encrypted_len, NULL);
-    // message_hash
-    sqlite3_bind_blob(scratch_insert_stmt, 6, lo.message_hash, 32, NULL);
-    // rx_time
-    sqlite3_bind_int(scratch_insert_stmt, 7, lo.rx_time);
-    // payload
-    sqlite3_bind_text(scratch_insert_stmt, 8, lo.payload.c_str(), lo.payload.length(), NULL);
-    const char *_error_mesg = sqlite3_errmsg(ppDb);
-
-    LOG_WARN("step %u, %s", sqlite3_step(scratch_insert_stmt), _error_mesg);
-    sqlite3_reset(scratch_insert_stmt);
-    return true;
-}
-
-void StoreForwardPlusPlusModule::canonAnnounce(uint8_t *_message_hash, uint8_t *_commit_hash, uint8_t *_root_hash,
-                                               uint32_t _rx_time)
-{
-    meshtastic_StoreForwardPlusPlus storeforward = meshtastic_StoreForwardPlusPlus_init_zero;
-    storeforward.sfpp_message_type = meshtastic_StoreForwardPlusPlus_SFPP_message_type_CANON_ANNOUNCE;
-    // set root hash
-
-    // set message hash
-    storeforward.message_hash.size = 32;
-    memcpy(storeforward.message_hash.bytes, _message_hash, 32);
-
-    // set chain hash
-    storeforward.commit_hash.size = 32;
-    memcpy(storeforward.commit_hash.bytes, _commit_hash, 32);
-
-    // set root hash
-    storeforward.root_hash.size = 32;
-    memcpy(storeforward.root_hash.bytes, _root_hash, 32);
-
-    storeforward.encapsulated_rxtime = _rx_time;
-    // storeforward.
-    meshtastic_MeshPacket *p = allocDataProtobuf(storeforward);
-    p->to = NODENUM_BROADCAST;
-    p->decoded.want_response = false;
-    p->priority = meshtastic_MeshPacket_Priority_BACKGROUND;
-    p->channel = 0;
-    LOG_INFO("Send packet to mesh");
-    service->sendToMesh(p, RX_SRC_LOCAL, true);
-}
-
-bool StoreForwardPlusPlusModule::isInDB(uint8_t *message_hash_bytes)
-{
-    sqlite3_bind_blob(checkDup, 1, message_hash_bytes, 32, NULL);
-    sqlite3_step(checkDup);
-    int numberFound = sqlite3_column_int(checkDup, 0);
-    sqlite3_reset(checkDup);
-    if (numberFound > 0)
-        return true;
-    return false;
-}
-
-bool StoreForwardPlusPlusModule::isInScratch(uint8_t *message_hash_bytes)
-{
-    LOG_WARN("isInScratch");
-    sqlite3_bind_blob(checkScratch, 1, message_hash_bytes, 32, NULL);
-    sqlite3_step(checkScratch);
-    int numberFound = sqlite3_column_int(checkScratch, 0);
-    sqlite3_reset(checkScratch);
-    if (numberFound > 0)
-        return true;
-    return false;
-}
-
-void StoreForwardPlusPlusModule::removeFromScratch(uint8_t *message_hash_bytes)
-{
-    LOG_WARN("removeFromScratch");
-    sqlite3_bind_blob(removeScratch, 1, message_hash_bytes, 32, NULL);
-    sqlite3_step(removeScratch);
-    int numberFound = sqlite3_column_int(removeScratch, 0);
-    sqlite3_reset(removeScratch);
-}
-
-void StoreForwardPlusPlusModule::updatePayload(uint8_t *message_hash_bytes, std::string payload)
-{
-    LOG_WARN("updatePayload");
-    sqlite3_bind_text(updatePayloadStmt, 1, payload.c_str(), payload.length(), NULL);
-    sqlite3_bind_blob(updatePayloadStmt, 2, message_hash_bytes, 32, NULL);
-    auto res = sqlite3_step(updatePayloadStmt);
-    const char *_error_mesg = sqlite3_errmsg(ppDb);
-    LOG_WARN("step %u, %s", res, _error_mesg);
-    sqlite3_reset(updatePayloadStmt);
-}
-
-StoreForwardPlusPlusModule::link_object StoreForwardPlusPlusModule::getFromScratch(uint8_t *message_hash_bytes, size_t hash_len)
-{
-
-    // vscode wrote this
-    LOG_WARN("getFromScratch");
-    link_object lo;
-
-    sqlite3_bind_blob(fromScratchByHashStmt, 1, message_hash_bytes, hash_len, NULL);
-    auto res = sqlite3_step(fromScratchByHashStmt);
-    const char *_error_mesg = sqlite3_errmsg(ppDb);
-    LOG_WARN("step %u, %s", res, _error_mesg);
-    lo.to = sqlite3_column_int(fromScratchByHashStmt, 0);
-    lo.from = sqlite3_column_int(fromScratchByHashStmt, 1);
-    lo.id = sqlite3_column_int(fromScratchByHashStmt, 2);
-
-    uint8_t *encrypted_bytes = (uint8_t *)sqlite3_column_blob(fromScratchByHashStmt, 3);
-    lo.encrypted_len = sqlite3_column_bytes(fromScratchByHashStmt, 3);
-    memcpy(lo.encrypted_bytes, encrypted_bytes, lo.encrypted_len);
-    uint8_t *message_hash = (uint8_t *)sqlite3_column_blob(fromScratchByHashStmt, 4);
-    memcpy(lo.message_hash, message_hash, 32);
-    lo.rx_time = sqlite3_column_int(fromScratchByHashStmt, 5);
-    lo.channel_hash - sqlite3_column_int(fromScratchByHashStmt, 6);
-    lo.payload =
-        std::string((char *)sqlite3_column_text(fromScratchByHashStmt, 7), sqlite3_column_bytes(fromScratchByHashStmt, 7));
-    sqlite3_reset(fromScratchByHashStmt);
-    return lo;
-}
-
-StoreForwardPlusPlusModule::link_object
-StoreForwardPlusPlusModule::ingestTextPacket(const meshtastic_MeshPacket &mp, const meshtastic_MeshPacket *encrypted_meshpacket)
-{
-    link_object lo;
-    SHA256 message_hash;
-    lo.to = mp.to;
-    lo.from = mp.from;
-    lo.id = mp.id;
-    lo.rx_time = mp.rx_time;
-    lo.channel_hash = encrypted_meshpacket->channel;
-    memcpy(lo.encrypted_bytes, encrypted_meshpacket->encrypted.bytes, encrypted_meshpacket->encrypted.size);
-    lo.encrypted_len = encrypted_meshpacket->encrypted.size;
-    lo.payload = std::string((char *)mp.decoded.payload.bytes, mp.decoded.payload.size);
-
-    message_hash.reset();
-    message_hash.update(encrypted_meshpacket->encrypted.bytes, encrypted_meshpacket->encrypted.size);
-    message_hash.update(&mp.to, sizeof(mp.to));
-    message_hash.update(&mp.from, sizeof(mp.from));
-    message_hash.update(&mp.id, sizeof(mp.id));
-    message_hash.finalize(lo.message_hash, 32);
-
-    getOrAddRootFromChannelHash(encrypted_meshpacket->channel, lo.root_hash);
-    return lo;
-}
-
-StoreForwardPlusPlusModule::link_object StoreForwardPlusPlusModule::ingestLinkMessage(meshtastic_StoreForwardPlusPlus *t)
-{
-    link_object lo;
-
-    lo.to = t->encapsulated_to;
-    lo.from = t->encapsulated_from;
-    lo.id = t->encapsulated_id;
-    lo.rx_time = t->encapsulated_rxtime;
-
-    // What if we don't have this root hash? Should drop this packet before this point.
-    lo.channel_hash = getChannelHashFromRoot(t->root_hash.bytes);
-
-    SHA256 message_hash;
-
-    memcpy(lo.encrypted_bytes, t->message.bytes, t->message.size);
-    lo.encrypted_len = t->message.size;
-
-    memcpy(lo.message_hash, t->message_hash.bytes, t->message_hash.size);
-    memcpy(lo.root_hash, t->root_hash.bytes, t->root_hash.size);
-    memcpy(lo.commit_hash, t->commit_hash.bytes, t->commit_hash.size);
-    if (t->commit_hash.size == 32)
-        lo.has_commit_hash = true;
-    // we don't ever get the payload here, so it's always an empty string
-    lo.payload = "";
-
-    return lo;
-}
-
-void StoreForwardPlusPlusModule::rebroadcastLinkObject(StoreForwardPlusPlusModule::link_object &lo)
-{
-    LOG_WARN("Attempting to Rebroadcast1");
-    meshtastic_MeshPacket *p = router->allocForSending();
-    p->to = lo.to;
-    p->from = lo.from;
-    p->id = lo.id;
-    p->channel = lo.channel_hash;
-    p->which_payload_variant = meshtastic_MeshPacket_encrypted_tag;
-    p->encrypted.size = lo.encrypted_len;
-    memcpy(p->encrypted.bytes, lo.encrypted_bytes, lo.encrypted_len);
-    p->transport_mechanism = meshtastic_MeshPacket_TransportMechanism_TRANSPORT_LORA; // only a tiny white lie
-    service->sendToMesh(p, RX_SRC_RADIO, true);                                       // Send to mesh, cc to phone
-}
-
-bool StoreForwardPlusPlusModule::checkCommitHash(StoreForwardPlusPlusModule::link_object &lo, uint8_t *commit_hash_bytes,
-                                                 size_t hash_len)
-{
-    SHA256 commit_hash;
-    uint8_t last_message_hash[32] = {0};
-    uint8_t last_commit_hash[32] = {0};
-
-    commit_hash.reset();
-
-    if (getChainEnd(lo.channel_hash, last_commit_hash, last_message_hash)) {
-        printBytes("last message: 0x", last_commit_hash, 32);
-        commit_hash.update(last_commit_hash, 32);
-    } else {
-        printBytes("new chain root: 0x", lo.root_hash, 32);
-        commit_hash.update(lo.root_hash, 32);
-    }
-
-    commit_hash.update(lo.message_hash, 32);
-    commit_hash.finalize(commit_hash_bytes, 32);
-
-    if (memcmp(commit_hash_bytes, lo.commit_hash, 32) == 0) {
-        return true;
-    }
-    return false;
-}
-
-// announce latest hash
-// chain_end_announce
-
-// check if hash is known
-// hash_query
-
-// request next message
-// link_request
-
-// send encapsulated message
-// link_provide_whole
-// link_provide_half1
-// link_provide_half2
-
-// onboard request message?
-
-// get x from top?
-
-// messages
-// Given this chain root, do you have a packet that matches this message hash?
-// responds with chain hash etc
-
-// given this chain root, what is your last chain and message hash?
-// given this chain root, what is your next message after this chain hash? (do we have an overhead problem here?) (blegh,
-// fragmentation) (but also, trunking)
-
-// broadcast on this chain root, here is my last chain hash
-
-// consider third-order nodes
-
-// I can't talk directly to strata, I can talk to a satellite. Inform sat of a message. Sat stores it as if had seen it locally,
-// and pushes it to central
-
-// message Eventually works out through chain
-
-// sat can capture time of receipt
-
-// terms:
-// CANON
-// stratum
-// chain
-// links on the chain
-
-// the sender+destination pair is an interesting unique id (though ordering) (smaller one goes first?)
-// so messages with a unique pair become a chain
-// These get a table
-
-// message to broadcast get a chain per channel hash
-// second table
-// for now, channel messages are limited to decryptable
-// limited to text messages
-
-// create a unique-from-nodenums() class that returns a 64-bit value

src/modules/Native/StoreForwardPlusPlus.h

@@ -1,125 +0,0 @@
-#pragma once
-#include "Channels.h"
-#include "ProtobufModule.h"
-#include "Router.h"
-#include "SinglePortModule.h"
-#include "sqlite3.h"
-
-/**
- * A simple example module that just replies with "Message received" to any message it receives.
- */
-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;
-        ChannelHash channel_hash;
-        uint8_t encrypted_bytes[256] = {0};
-        size_t encrypted_len;
-        uint8_t message_hash[32] = {0};
-        uint8_t root_hash[32] = {0};
-        uint8_t commit_hash[32] = {0};
-        // TODO: Make these sizes instead?
-        bool has_commit_hash = false;
-        std::string payload;
-    };
-
-  public:
-    /** Constructor
-     * name is for debugging output
-     */
-    StoreForwardPlusPlusModule();
-
-    /*
-      -Override the wantPacket method.
-    */
-    virtual bool wantPacket(const meshtastic_MeshPacket *p) override
-    {
-        // if encrypted but not too FFFF
-        // want
-        switch (p->decoded.portnum) {
-        case meshtastic_PortNum_TEXT_MESSAGE_APP:
-        case 35:
-            return true;
-        default:
-            return false;
-        }
-    }
-
-  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 *checkDup;
-    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;
-
-    // returns wasfound
-    bool getRootFromChannelHash(ChannelHash, uint8_t *);
-
-    ChannelHash getChannelHashFromRoot(uint8_t *_root_hash);
-
-    bool getNextHash(uint8_t *_root_hash, uint8_t *, uint8_t *);
-
-    // returns isnew
-    bool getOrAddRootFromChannelHash(ChannelHash, uint8_t *);
-
-    bool addRootToMappings(ChannelHash, uint8_t *);
-
-    // return indicates message found
-    uint32_t getChainEnd(ChannelHash, uint8_t *, uint8_t *);
-
-    void requestNextMessage(uint8_t *, uint8_t *);
-
-    bool broadcastLink(uint8_t *, uint8_t *);
-
-    bool sendFromScratch(uint8_t);
-
-    bool addToChain(link_object &);
-
-    bool addToScratch(link_object &);
-
-    void canonAnnounce(uint8_t *, uint8_t *, uint8_t *, uint32_t);
-
-    bool isInDB(uint8_t *);
-
-    bool isInScratch(uint8_t *);
-
-    link_object getFromScratch(uint8_t *, size_t);
-
-    void removeFromScratch(uint8_t *);
-
-    void updatePayload(uint8_t *, std::string);
-
-    // does not set the root hash
-    link_object ingestTextPacket(const meshtastic_MeshPacket &, const meshtastic_MeshPacket *);
-
-    link_object ingestLinkMessage(meshtastic_StoreForwardPlusPlus *);
-
-    void rebroadcastLinkObject(link_object &);
-
-    bool checkCommitHash(link_object &lo, uint8_t *commit_hash_bytes, size_t hash_len);
-
-    enum chain_types {
-        channel_chain = 0,
-    };
-};

src/platform/portduino/PortduinoGlue.cpp

@@ -786,10 +786,6 @@ bool loadConfig(const char *configPath)
             }
         }
 
-        if (yamlConfig["StoreAndForward"]) {
-            portduino_config.sfpp_stratum0 = (yamlConfig["StoreAndForward"]["Stratum0"]).as<bool>(false);
-        }
-
         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

@@ -169,9 +169,6 @@ extern struct portduino_config_struct {
     int configDisplayMode = 0;
     bool has_configDisplayMode = false;
 
-    // Store and Forward++
-    bool sfpp_stratum0 = false;
-
     // General
     std::string mac_address = "";
     bool mac_address_explicit = false;

variants/esp32/betafpv_2400_tx_micro/platformio.ini

@@ -15,4 +15,5 @@ upload_protocol = esptool
 upload_speed = 460800
 lib_deps =
   ${esp32_base.lib_deps}
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
   adafruit/Adafruit NeoPixel@1.15.2

variants/esp32/chatter2/platformio.ini

@@ -9,4 +9,5 @@ build_flags =
   
 lib_deps =
   ${esp32_base.lib_deps}
+  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
   lovyan03/LovyanGFX@1.2.7

variants/esp32/esp32.ini

@@ -53,6 +53,7 @@ build_flags =
 lib_deps =
   ${arduino_base.lib_deps}
   ${networking_base.lib_deps}
+  ${networking_extra.lib_deps}
   ${environmental_base.lib_deps}
   ${environmental_extra.lib_deps}
   ${radiolib_base.lib_deps}
@@ -62,8 +63,8 @@ lib_deps =
   h2zero/NimBLE-Arduino@1.4.3
   # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
   https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
-  # renovate: datasource=github-tags depName=XPowersLib packageName=lewisxhe/XPowersLib
-  https://github.com/lewisxhe/XPowersLib/archive/v0.3.2.zip
+  # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
+  lewisxhe/XPowersLib@0.3.2
   # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
   https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
   # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto

variants/esp32/m5stack_core/platformio.ini

@@ -25,4 +25,5 @@ lib_ignore =
   m5stack-core
 lib_deps = 
   ${esp32_base.lib_deps}
+  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
   lovyan03/LovyanGFX@1.2.7

variants/esp32/m5stack_coreink/platformio.ini

@@ -18,7 +18,9 @@ build_flags =
   -DM5STACK
 lib_deps = 
   ${esp32_base.lib_deps}
+  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
   zinggjm/GxEPD2@1.6.5
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
   lewisxhe/PCF8563_Library@1.0.1
 lib_ignore =
   m5stack-coreink

variants/esp32/radiomaster_900_bandit/platformio.ini

@@ -13,4 +13,5 @@ board_build.f_cpu = 240000000L
 upload_protocol = esptool
 lib_deps =
   ${esp32_base.lib_deps}
+  # renovate: datasource=github-tags depName=STK8xxx-Accelerometer packageName=gjelsoe/STK8xxx-Accelerometer
   https://github.com/gjelsoe/STK8xxx-Accelerometer/archive/v0.1.1.zip

variants/esp32/tbeam/platformio.ini

@@ -20,5 +20,7 @@ build_flags =
 
 lib_deps =
   ${env:tbeam.lib_deps}
-  https://github.com/meshtastic/st7796/archive/refs/tags/1.0.5.zip ; display addon
-  lewisxhe/SensorLib@0.3.1 ; touchscreen addon
+  # renovate: datasource=github-tags depName=meshtastic-st7796 packageName=meshtastic/st7796
+  https://github.com/meshtastic/st7796/archive/1.0.5.zip
+  # renovate: datasource=custom.pio depName=lewisxhe-SensorLib packageName=lewisxhe/library/SensorLib
+  lewisxhe/SensorLib@0.3.1

variants/esp32/wiphone/platformio.ini

@@ -10,6 +10,9 @@ build_flags =
   -I variants/esp32/wiphone
 lib_deps = 
   ${esp32_base.lib_deps}
+  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
   lovyan03/LovyanGFX@1.2.7
+  # renovate: datasource=custom.pio depName=SX1509 IO Expander packageName=sparkfun/library/SX1509 IO Expander
   sparkfun/SX1509 IO Expander@3.0.6
+  # renovate: datasource=custom.pio depName=APA102 packageName=pololu/library/APA102
   pololu/APA102@3.0.0

variants/esp32c3/heltec_hru_3601/platformio.ini

@@ -6,4 +6,5 @@ build_flags =
   -D HELTEC_HRU_3601
   -I variants/esp32c3/heltec_hru_3601
 lib_deps = ${esp32c3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
   adafruit/Adafruit NeoPixel@1.15.2

variants/esp32c6/m5stack_unitc6l/platformio.ini

@@ -12,7 +12,9 @@ build_unflags =
   -D HAS_WIFI
 lib_deps =
   ${esp32c6_base.lib_deps}
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
   adafruit/Adafruit NeoPixel@1.15.2
+  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
   h2zero/NimBLE-Arduino@2.3.7
 build_flags = 
   ${esp32c6_base.build_flags}

variants/esp32s3/ELECROW-ThinkNode-M5/platformio.ini

@@ -16,6 +16,9 @@ build_flags =
   -DEINK_BACKGROUND_USES_FAST          ; (Optional) Use FAST refresh for both BACKGROUND and RESPONSIVE, until a limit is reached.
 
 lib_deps = ${esp32s3_base.lib_deps}
+  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
   https://github.com/meshtastic/GxEPD2/archive/1655054ba298e0e29fc2044741940f927f9c2a43.zip
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
   lewisxhe/PCF8563_Library@1.0.1
+  # renovate: datasource=custom.pio depName=PCA9557-arduino packageName=maxpromer/library/PCA9557-arduino
   maxpromer/PCA9557-arduino@1.0.0

variants/esp32s3/bpi_picow_esp32_s3/platformio.ini

@@ -9,6 +9,7 @@ upload_protocol = esptool
 ;upload_port = /dev/ttyACM2
 lib_deps =
   ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=caveman99-ESP32_Codec2 packageName=caveman99/library/ESP32 Codec2
   caveman99/ESP32 Codec2@1.0.1
 build_flags = 
   ${esp32s3_base.build_flags}

variants/esp32s3/crowpanel-esp32s3-5-epaper/platformio.ini

@@ -25,6 +25,7 @@ build_flags =
   ;-DEINK_LIMIT_RATE_RESPONSIVE_SEC=1 
 lib_deps =
   ${esp32s3_base.lib_deps}
+  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
   https://github.com/meshtastic/GxEPD2/archive/33db3fa8ee6fc47d160bdb44f8f127c9a9203a10.zip
 
 [env:crowpanel-esp32s3-4-epaper]
@@ -54,6 +55,7 @@ build_flags =
   ;-DEINK_LIMIT_RATE_RESPONSIVE_SEC=1 
 lib_deps =
   ${esp32s3_base.lib_deps}
+  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
   https://github.com/meshtastic/GxEPD2/archive/33db3fa8ee6fc47d160bdb44f8f127c9a9203a10.zip
 
 [env:crowpanel-esp32s3-2-epaper]
@@ -83,4 +85,5 @@ build_flags =
   ;-DEINK_LIMIT_RATE_RESPONSIVE_SEC=1 
 lib_deps =
   ${esp32s3_base.lib_deps}
+  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
   https://github.com/meshtastic/GxEPD2/archive/33db3fa8ee6fc47d160bdb44f8f127c9a9203a10.zip

variants/esp32s3/diy/my_esp32s3_diy_eink/platformio.ini

@@ -10,7 +10,9 @@ upload_protocol = esptool
 upload_speed = 921600
 lib_deps =
   ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
   zinggjm/GxEPD2@1.6.5
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
   adafruit/Adafruit NeoPixel@1.15.2
 build_unflags =
   ${esp32s3_base.build_unflags}

variants/esp32s3/diy/my_esp32s3_diy_oled/platformio.ini

@@ -10,6 +10,7 @@ upload_protocol = esptool
 upload_speed = 921600
 lib_deps =
   ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
   adafruit/Adafruit NeoPixel@1.15.2
 build_unflags =
   ${esp32s3_base.build_unflags}

variants/esp32s3/dreamcatcher/platformio.ini

@@ -12,7 +12,9 @@ build_flags =
   -D ARDUINO_USB_CDC_ON_BOOT=1
 
 lib_deps = ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=ESP8266Audio packageName=earlephilhower/library/ESP8266Audio
   earlephilhower/ESP8266Audio@1.9.9
+  # renovate: datasource=custom.pio depName=ESP8266SAM packageName=earlephilhower/library/ESP8266SAM
   earlephilhower/ESP8266SAM@1.1.0
 
 [env:dreamcatcher-2206] 

variants/esp32s3/elecrow_panel/platformio.ini

@@ -41,9 +41,13 @@ build_flags = ${esp32s3_base.build_flags} -Os
 
 lib_deps = ${esp32s3_base.lib_deps}
   ${device-ui_base.lib_deps}
+  # renovate: datasource=custom.pio depName=ESP8266Audio packageName=earlephilhower/library/ESP8266Audio
   earlephilhower/ESP8266Audio@1.9.9
+  # renovate: datasource=custom.pio depName=ESP8266SAM packageName=earlephilhower/library/ESP8266SAM
   earlephilhower/ESP8266SAM@1.0.1
+  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
   lovyan03/LovyanGFX@1.2.0 ; note: v1.2.7 breaks the elecrow 7" display functionality
+  # renovate: datasource=custom.pio depName=TCA9534 packageName=hideakitai/library/TCA9534
   hideakitai/TCA9534@0.1.1
 
 [crowpanel_small_esp32s3_base] ; 2.4, 2.8, 3.5 inch

variants/esp32s3/esp32-s3-pico/platformio.ini

@@ -22,5 +22,7 @@ build_flags = ${esp32s3_base.build_flags}
   -DEINK_HEIGHT=128
 
 lib_deps = ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
   zinggjm/GxEPD2@1.6.5
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
   adafruit/Adafruit NeoPixel@1.15.2

variants/esp32s3/hackaday-communicator/platformio.ini

@@ -12,4 +12,5 @@ build_flags = ${esp32s3_base.build_flags}
   -I variants/esp32s3/hackaday-communicator
 
 lib_deps = ${esp32s3_base.lib_deps}
-  https://github.com/meshtastic/Arduino_GFX/archive/054e81ffaf23784830a734e3c184346789349406.zip
+  # renovate: datasource=git-refs depName=meshtastic-Arduino_GFX packageName=https://github.com/meshtastic/Arduino_GFX gitBranch=master
+  https://github.com/meshtastic/Arduino_GFX/archive/054e81ffaf23784830a734e3c184346789349406.zip

variants/esp32s3/heltec_sensor_hub/platformio.ini

@@ -9,4 +9,5 @@ build_flags =
   -D HELTEC_SENSOR_HUB
 
 lib_deps = ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
   adafruit/Adafruit NeoPixel@1.15.2

variants/esp32s3/heltec_v4/platformio.ini

@@ -21,8 +21,6 @@ build_flags =
   -D I2C_SCL=18
   -D I2C_SDA1=4
   -D I2C_SCL1=3
-lib_deps = 
-  ${heltec_v4_base.lib_deps}
 
 [env:heltec-v4-tft]
 extends = heltec_v4_base
@@ -105,6 +103,10 @@ build_flags =
 
 lib_deps = ${heltec_v4_base.lib_deps}
   ; ${device-ui_base.lib_deps}
+  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
   lovyan03/LovyanGFX@1.2.0
+  # renovate: datasource=git-refs depName=Quency-D_chsc6x packageName=https://github.com/Quency-D/chsc6x gitBranch=master
   https://github.com/Quency-D/chsc6x/archive/5cbead829d6b432a8d621ed1aafd4eb474fd4f27.zip
+  ; TODO revert to official device-ui (when merged)
+  # renovate: datasource=git-refs depName=Quency-D_device-ui packageName=https://github.com/Quency-D/device-ui gitBranch=heltec-v4-tft
   https://github.com/Quency-D/device-ui/archive/7c9870b8016641190b059bdd90fe16c1012a39eb.zip

variants/esp32s3/heltec_vision_master_e213/platformio.ini

@@ -17,7 +17,9 @@ build_flags =
   -DEINK_HASQUIRK_GHOSTING             ; Display model is identified as "prone to ghosting"
 lib_deps =
   ${esp32s3_base.lib_deps}
+  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
   https://github.com/meshtastic/GxEPD2/archive/1655054ba298e0e29fc2044741940f927f9c2a43.zip
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
   lewisxhe/PCF8563_Library@1.0.1
 upload_speed = 115200
 

variants/esp32s3/heltec_vision_master_e290/platformio.ini

@@ -20,7 +20,9 @@ build_flags =
 
 lib_deps =
   ${esp32s3_base.lib_deps}
+  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
   https://github.com/meshtastic/GxEPD2/archive/448c8538129fde3d02a7cb5e6fc81971ad92547f.zip
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
   lewisxhe/PCF8563_Library@1.0.1
 upload_speed = 115200
 

variants/esp32s3/heltec_vision_master_t190/platformio.ini

@@ -8,6 +8,8 @@ build_flags =
   -D HELTEC_VISION_MASTER_T190
 lib_deps =
   ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
   lewisxhe/PCF8563_Library@1.0.1
+  # renovate: datasource=git-refs depName=meshtastic-st7789 packageName=https://github.com/meshtastic/st7789 gitBranch=main
   https://github.com/meshtastic/st7789/archive/bd33ea58ddfe4a5e4a66d53300ccbd38d66ac21f.zip
 upload_speed = 921600

variants/esp32s3/heltec_wireless_paper/platformio.ini

@@ -18,7 +18,9 @@ build_flags =
   -D EINK_HASQUIRK_GHOSTING             ; Display model is identified as "prone to ghosting"
 lib_deps =
   ${esp32s3_base.lib_deps}
+  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
   https://github.com/meshtastic/GxEPD2/archive/1655054ba298e0e29fc2044741940f927f9c2a43.zip
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
   lewisxhe/PCF8563_Library@1.0.1
 upload_speed = 115200
 

variants/esp32s3/heltec_wireless_paper_v1/platformio.ini

@@ -15,6 +15,8 @@ build_flags =
   -D EINK_LIMIT_GHOSTING_PX=2000        ; (Optional) How much image ghosting is tolerated
 lib_deps =
   ${esp32s3_base.lib_deps}
+  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
   https://github.com/meshtastic/GxEPD2/archive/55f618961db45a23eff0233546430f1e5a80f63a.zip
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
   lewisxhe/PCF8563_Library@1.0.1
 upload_speed = 115200

variants/esp32s3/heltec_wireless_tracker/platformio.ini

@@ -12,4 +12,5 @@ build_flags =
 
 lib_deps =
   ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
   lovyan03/LovyanGFX@1.2.7

variants/esp32s3/heltec_wireless_tracker_V1_0/platformio.ini

@@ -11,4 +11,5 @@ build_flags =
   ;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output
 lib_deps =
   ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
   lovyan03/LovyanGFX@1.2.7

variants/esp32s3/heltec_wireless_tracker_v2/platformio.ini

@@ -10,4 +10,5 @@ build_flags =
   -D HELTEC_WIRELESS_TRACKER_V2
 lib_deps =
   ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
   lovyan03/LovyanGFX@1.2.7

variants/esp32s3/icarus/platformio.ini

@@ -7,6 +7,7 @@ board_build.mcu = esp32s3
 board_build.partitions = default_8MB.csv
 upload_protocol = esptool
 upload_speed = 921600
+; TODO renovate or remove
 platform_packages = platformio/framework-arduinoespressif32@https://github.com/PowerFeather/powerfeather-meshtastic-arduino-lib/releases/download/2.0.16a/esp32-2.0.16.zip
 build_unflags =
   ${esp32s3_base.build_unflags}

variants/esp32s3/mesh-tab/platformio.ini

@@ -50,6 +50,7 @@ build_src_filter = ${esp32s3_base.build_src_filter}
 lib_deps =
   ${esp32s3_base.lib_deps}
   ${device-ui_base.lib_deps}
+  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
   lovyan03/LovyanGFX@1.2.7
 
 [mesh_tab_xpt2046]

variants/esp32s3/picomputer-s3/platformio.ini

@@ -15,6 +15,7 @@ build_flags =
 
 lib_deps = 
   ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
   lovyan03/LovyanGFX@1.2.7
 
 build_src_filter =

variants/esp32s3/rak_wismesh_tap_v2/platformio.ini

@@ -15,6 +15,7 @@ build_flags =
 
 lib_deps =
   ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
   lovyan03/LovyanGFX@1.2.7
 
 [ft5x06]

variants/esp32s3/seeed-sensecap-indicator/platformio.ini

@@ -24,11 +24,13 @@ build_flags = ${esp32s3_base.build_flags}
   -DUSE_ARDUINO_HAL_GPIO
 
 lib_deps = ${esp32s3_base.lib_deps}
+  ; TODO switch back to official LovyanGFX
   https://github.com/mverch67/LovyanGFX/archive/4c76238c1344162a234ae917b27651af146d6fb2.zip
+  # renovate: datasource=custom.pio depName=ESP8266Audio packageName=earlephilhower/library/ESP8266Audio
   earlephilhower/ESP8266Audio@1.9.9
+  # renovate: datasource=custom.pio depName=ESP8266SAM packageName=earlephilhower/library/ESP8266SAM
   earlephilhower/ESP8266SAM@1.1.0
 
-
 [env:seeed-sensecap-indicator-tft]
 extends = env:seeed-sensecap-indicator
 board_level = pr
@@ -64,4 +66,5 @@ build_flags =
 lib_deps =
   ${env:seeed-sensecap-indicator.lib_deps}
   ${device-ui_base.lib_deps}
+  ; TODO switch back to official bb_captouch
   https://github.com/mverch67/bb_captouch/archive/8626412fe650d808a267791c0eae6e5860c85a5d.zip ; alternative touch library supporting FT6x36

variants/esp32s3/t-deck-pro/platformio.ini

@@ -17,7 +17,11 @@ build_flags =
 
 lib_deps =
   ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
   zinggjm/GxEPD2@1.6.4
+  # renovate: datasource=git-refs depName=CSE_Touch packageName=https://github.com/CIRCUITSTATE/CSE_Touch gitBranch=main
   https://github.com/CIRCUITSTATE/CSE_Touch/archive/b44f23b6f870b848f1fbe453c190879bc6cfaafa.zip
+  # renovate: datasource=github-tags depName=CSE_CST328 packageName=CIRCUITSTATE/CSE_CST328
   https://github.com/CIRCUITSTATE/CSE_CST328/archive/refs/tags/v0.0.4.zip
+  # renovate: datasource=git-refs depName=BQ27220 packageName=https://github.com/mverch67/BQ27220 gitBranch=main
   https://github.com/mverch67/BQ27220/archive/07d92be846abd8a0258a50c23198dac0858b22ed.zip

variants/esp32s3/t-deck/platformio.ini

@@ -12,8 +12,11 @@ build_flags = ${esp32s3_base.build_flags}
   -I variants/esp32s3/t-deck
 
 lib_deps = ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
   lovyan03/LovyanGFX@1.2.7
+  # renovate: datasource=custom.pio depName=ESP8266Audio packageName=earlephilhower/library/ESP8266Audio
   earlephilhower/ESP8266Audio@1.9.9
+  # renovate: datasource=custom.pio depName=ESP8266SAM packageName=earlephilhower/library/ESP8266SAM
   earlephilhower/ESP8266SAM@1.1.0
 
 [env:t-deck-tft]
@@ -68,4 +71,5 @@ build_flags =
 lib_deps =
   ${env:t-deck.lib_deps}
   ${device-ui_base.lib_deps}
+  # renovate: datasource=github-tags depName=bb_captouch packageName=bitbank2/bb_captouch
   https://github.com/bitbank2/bb_captouch/archive/refs/tags/1.3.1.zip

variants/esp32s3/t-eth-elite/platformio.ini

@@ -15,4 +15,5 @@ lib_ignore =
 
 lib_deps = 
   ${esp32s3_base.lib_deps}
+  # renovate: datasource=github-tags depName=ETHClass2 packageName=meshtastic/ETHClass2
   https://github.com/meshtastic/ETHClass2/archive/v1.0.0.zip

variants/esp32s3/t-watch-s3/platformio.ini

@@ -13,9 +13,15 @@ build_flags = ${esp32s3_base.build_flags}
   -DHAS_BMA423=1
 
 lib_deps = ${esp32s3_base.lib_deps}
-	lovyan03/LovyanGFX@1.2.7
+  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
+  lovyan03/LovyanGFX@1.2.7
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
   lewisxhe/PCF8563_Library@1.0.1
+  # renovate: datasource=custom.pio depName=Adafruit DRV2605 packageName=adafruit/library/Adafruit DRV2605 Library
   adafruit/Adafruit DRV2605 Library@1.2.4
+  # renovate: datasource=custom.pio depName=ESP8266Audio packageName=earlephilhower/library/ESP8266Audio
   earlephilhower/ESP8266Audio@1.9.9
+  # renovate: datasource=custom.pio depName=ESP8266SAM packageName=earlephilhower/library/ESP8266SAM
   earlephilhower/ESP8266SAM@1.1.0
+  # renovate: datasource=custom.pio depName=lewisxhe-SensorLib packageName=lewisxhe/library/SensorLib
   lewisxhe/SensorLib@0.2.0

variants/esp32s3/tbeam-s3-core/platformio.ini

@@ -7,6 +7,7 @@ board_check = true
 
 lib_deps =
   ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
   lewisxhe/PCF8563_Library@1.0.1
 
 build_flags = 

variants/esp32s3/tlora-pager/platformio.ini

@@ -17,14 +17,23 @@ build_flags = ${esp32s3_base.build_flags}
   -D ROTARY_BUXTRONICS
 
 lib_deps = ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
   lovyan03/LovyanGFX@1.2.7
+  # renovate: datasource=custom.pio depName=ESP8266Audio packageName=earlephilhower/library/ESP8266Audio
   earlephilhower/ESP8266Audio@1.9.9
+  # renovate: datasource=custom.pio depName=ESP8266SAM packageName=earlephilhower/library/ESP8266SAM
   earlephilhower/ESP8266SAM@1.0.1
+  # renovate: datasource=custom.pio depName=Adafruit DRV2605 packageName=adafruit/library/Adafruit DRV2605 Library
   adafruit/Adafruit DRV2605 Library@1.2.4
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
   lewisxhe/PCF8563_Library@1.0.1
+  # renovate: datasource=custom.pio depName=lewisxhe-SensorLib packageName=lewisxhe/library/SensorLib
   lewisxhe/SensorLib@0.3.1
-  https://github.com/pschatzmann/arduino-audio-driver/archive/refs/tags/v0.1.3.zip
+  # renovate: datasource=github-tags depName=pschatzmann_arduino-audio-driver packageName=pschatzmann/arduino-audio-driver
+  https://github.com/pschatzmann/arduino-audio-driver/archive/v0.1.3.zip
+  # TODO renovate
   https://github.com/mverch67/BQ27220/archive/07d92be846abd8a0258a50c23198dac0858b22ed.zip
+  # TODO renovate
   https://github.com/mverch67/RotaryEncoder/archive/da958a21389cbcd485989705df602a33e092dd88.zip
 
 [env:tlora-pager-tft]

variants/esp32s3/tlora_t3s3_epaper/platformio.ini

@@ -20,6 +20,7 @@ build_flags =
 
 lib_deps =
   ${esp32s3_base.lib_deps}
+  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
   https://github.com/meshtastic/GxEPD2/archive/b202ebfec6a4821e098cf7a625ba0f6f2400292d.zip
 
 [env:tlora-t3s3-epaper-inkhud]

variants/esp32s3/tracksenger/platformio.ini

@@ -12,6 +12,7 @@ build_flags =
 
 lib_deps =
   ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
   lovyan03/LovyanGFX@1.2.7
 
 [env:tracksenger-lcd]
@@ -28,6 +29,7 @@ build_flags =
 
 lib_deps =
   ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
   lovyan03/LovyanGFX@1.2.7
 
 [env:tracksenger-oled]

variants/esp32s3/unphone/platformio.ini

@@ -27,11 +27,13 @@ build_src_filter =
   +<../variants/esp32s3/unphone>
 
 lib_deps = ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
   lovyan03/LovyanGFX@1.2.0
+  # TODO renovate
   https://gitlab.com/hamishcunningham/unphonelibrary#meshtastic@9.0.0
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
   adafruit/Adafruit NeoPixel@1.15.2
 
-
 [env:unphone-tft]
 board_level = extra
 extends = env:unphone

variants/native/portduino.ini

@@ -21,6 +21,7 @@ build_src_filter =
 lib_deps =
   ${env.lib_deps}
   ${networking_base.lib_deps}
+  ${networking_extra.lib_deps}
   ${radiolib_base.lib_deps}
   ${environmental_base.lib_deps}
   # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto

variants/native/portduino/platformio.ini

@@ -6,6 +6,7 @@ board = cross_platform
 board_level = extra
 lib_deps = 
   ${portduino_base.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}
@@ -45,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}
 

variants/nrf52840/Dongle_nRF52840-pca10059-v1/platformio.ini

@@ -11,5 +11,6 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/Dongle_nRF52840-pca10059-v1>
 lib_deps = 
   ${nrf52840_base.lib_deps}
+  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
   zinggjm/GxEPD2@1.6.5
 debug_tool = jlink

variants/nrf52840/ELECROW-ThinkNode-M1/platformio.ini

@@ -23,8 +23,11 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/ELECROW-ThinkNode-M1>
 lib_deps = 
   ${nrf52840_base.lib_deps}
+  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
   https://github.com/meshtastic/GxEPD2/archive/33db3fa8ee6fc47d160bdb44f8f127c9a9203a10.zip
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
   lewisxhe/PCF8563_Library@1.0.1
+  # renovate: datasource=custom.pio depName=nRF52_PWM packageName=khoih-prog/library/nRF52_PWM
   khoih-prog/nRF52_PWM@1.0.1
 ;upload_protocol = fs
 
@@ -45,4 +48,5 @@ build_src_filter =
 lib_deps = 
   ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX
   ${nrf52840_base.lib_deps}
-  lewisxhe/PCF8563_Library@1.0.1
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
+  lewisxhe/PCF8563_Library@1.0.1

variants/nrf52840/ELECROW-ThinkNode-M3/platformio.ini

@@ -13,5 +13,7 @@ build_flags =
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/ELECROW-ThinkNode-M3>
 lib_deps = 
   ${nrf52840_base.lib_deps}
+  # renovate: datasource=custom.pio depName=nRF52_PWM packageName=khoih-prog/library/nRF52_PWM
   khoih-prog/nRF52_PWM@1.0.1
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
   lewisxhe/PCF8563_Library@1.0.1

variants/nrf52840/ELECROW-ThinkNode-M6/platformio.ini

@@ -12,4 +12,5 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/ELECROW-ThinkNode-M6>
 lib_deps =
   ${nrf52840_base.lib_deps}
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
   lewisxhe/PCF8563_Library@1.0.1

variants/nrf52840/ME25LS01-4Y10TD_e-ink/platformio.ini

@@ -15,6 +15,7 @@ board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/ME25LS01-4Y10TD_e-ink>
 lib_deps = 
   ${nrf52840_base.lib_deps}
+  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
   zinggjm/GxEPD2@1.6.5
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
 upload_protocol = nrfutil

variants/nrf52840/MakePython_nRF52840_eink/platformio.ini

@@ -12,7 +12,9 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/MakePython_nRF52840_eink>
 lib_deps = 
   ${nrf52840_base.lib_deps}
+  # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
   https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
+  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
   zinggjm/GxEPD2@1.6.5
 debug_tool = jlink
 ;upload_port = /dev/ttyACM4

variants/nrf52840/MakePython_nRF52840_oled/platformio.ini

@@ -8,5 +8,6 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/MakePython_nRF52840_oled>
 lib_deps = 
   ${nrf52840_base.lib_deps}
+  # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
   https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
 debug_tool = jlink

variants/nrf52840/TWC_mesh_v4/platformio.ini

@@ -8,5 +8,6 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/TWC_mesh_v4>
 lib_deps = 
   ${nrf52840_base.lib_deps}
+  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
   zinggjm/GxEPD2@1.6.5
 debug_tool = jlink

variants/nrf52840/canaryone/platformio.ini

@@ -11,5 +11,6 @@ build_flags =
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/canaryone>
 lib_deps = 
   ${nrf52840_base.lib_deps}
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
   lewisxhe/PCF8563_Library@1.0.1
 ;upload_protocol = fs

variants/nrf52840/heltec_mesh_node_t114-inkhud/platformio.ini

@@ -14,6 +14,7 @@ build_src_filter =
 lib_deps = 
   ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX
   ${nrf52840_base.lib_deps}
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
   lewisxhe/PCF8563_Library@1.0.1
 extra_scripts =
   ${env.extra_scripts}

variants/nrf52840/heltec_mesh_node_t114/platformio.ini

@@ -13,5 +13,7 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/heltec_mesh_node_t114>
 lib_deps = 
   ${nrf52840_base.lib_deps}
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
   lewisxhe/PCF8563_Library@1.0.1
-  https://github.com/meshtastic/st7789/archive/bd33ea58ddfe4a5e4a66d53300ccbd38d66ac21f.zip
+  # renovate: datasource=git-refs depName=meshtastic-st7789 packageName=https://github.com/meshtastic/st7789 gitBranch=main
+  https://github.com/meshtastic/st7789/archive/bd33ea58ddfe4a5e4a66d53300ccbd38d66ac21f.zip

variants/nrf52840/heltec_mesh_pocket/platformio.ini

@@ -25,9 +25,10 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/heltec_mesh_pocket> 
 lib_deps = 
   ${nrf52840_base.lib_deps}
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
   lewisxhe/PCF8563_Library@1.0.1
-  https://github.com/meshtastic/GxEPD2#b202ebfec6a4821e098cf7a625ba0f6f2400292d
-
+  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
+  https://github.com/meshtastic/GxEPD2/archive/b202ebfec6a4821e098cf7a625ba0f6f2400292d.zip
 
 [env:heltec-mesh-pocket-5000-inkhud]
 extends = nrf52840_base, inkhud
@@ -71,9 +72,10 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/heltec_mesh_pocket> 
 lib_deps = 
   ${nrf52840_base.lib_deps}
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
   lewisxhe/PCF8563_Library@1.0.1
-  https://github.com/meshtastic/GxEPD2#b202ebfec6a4821e098cf7a625ba0f6f2400292d
-
+  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
+  https://github.com/meshtastic/GxEPD2/archive/b202ebfec6a4821e098cf7a625ba0f6f2400292d.zip
 
 [env:heltec-mesh-pocket-10000-inkhud]
 extends = nrf52840_base, inkhud

variants/nrf52840/heltec_mesh_solar/platformio.ini

@@ -13,9 +13,13 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/heltec_mesh_solar>
 lib_deps = 
   ${nrf52840_base.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=PCF8563 packageName=lewisxhe/library/PCF8563_Library
   lewisxhe/PCF8563_Library@1.0.1
-  ArduinoJson@6.21.4
+  # renovate: datasource=custom.pio depName=ArduinoJson packageName=bblanchon/library/ArduinoJson
+  bblanchon/ArduinoJson@6.21.4
+
 [env:heltec-mesh-solar]
 extends = heltec_mesh_solar_base
 build_flags = ${heltec_mesh_solar_base.build_flags}
@@ -48,6 +52,7 @@ build_flags = ${heltec_mesh_solar_base.build_flags}
   -DEINK_HASQUIRK_GHOSTING             ; Display model is identified as "prone to ghosting"
 lib_deps =
   ${heltec_mesh_solar_base.lib_deps}
+  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
   https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip
 
 [env:heltec-mesh-solar-inkhud]
@@ -71,7 +76,6 @@ lib_deps =
   ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX
   ${heltec_mesh_solar_base.lib_deps}
 
-
 [env:heltec-mesh-solar-oled]
 extends = heltec_mesh_solar_base
 build_flags = ${heltec_mesh_solar_base.build_flags}
@@ -112,4 +116,5 @@ build_flags = ${heltec_mesh_solar_base.build_flags}
   -DPIN_SPI1_SCK=ST7789_SCK
 lib_deps =
   ${heltec_mesh_solar_base.lib_deps}
+  # renovate: datasource=git-refs depName=meshtastic-st7789 packageName=https://github.com/meshtastic/st7789 gitBranch=main
   https://github.com/meshtastic/st7789/archive/bd33ea58ddfe4a5e4a66d53300ccbd38d66ac21f.zip

variants/nrf52840/meshlink/platformio.ini

@@ -46,6 +46,7 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/meshlink>
 lib_deps = 
   ${nrf52840_base.lib_deps}
+  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
   https://github.com/meshtastic/GxEPD2/archive/55f618961db45a23eff0233546430f1e5a80f63a.zip
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)

variants/nrf52840/monteops_hw1/platformio.ini

@@ -10,6 +10,7 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/monteop
 lib_deps = 
   ${nrf52840_base.lib_deps}
   ${networking_base.lib_deps}
+  # renovate: datasource=github-tags depName=RAK13800-W5100S packageName=RAKWireless/RAK13800-W5100S
   https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)

variants/nrf52840/muzi_base/platformio.ini

@@ -10,6 +10,5 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52840_base.build_src_filter} +<../variants/nrf52840/muzi_base>
 lib_deps = 
   ${nrf52840_base.lib_deps}
+  # renovate: datasource=custom.pio depName=ArtronShop_RX8130CE packageName=artronshop/library/ArtronShop_RX8130CE
   artronshop/ArtronShop_RX8130CE@1.0.0
-
-

variants/nrf52840/nano-g2-ultra/platformio.ini

@@ -10,5 +10,6 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/nano-g2-ultra>
 lib_deps = 
   ${nrf52840_base.lib_deps}
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
   lewisxhe/PCF8563_Library@1.0.1
 ;upload_protocol = fs

variants/nrf52840/r1-neo/platformio.ini

@@ -13,6 +13,9 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/r1-neo>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   ${networking_base.lib_deps}
+  # renovate: datasource=github-tags depName=RAK13800-W5100S packageName=RAKWireless/RAK13800-W5100S
   https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip
+  # renovate: datasource=custom.pio depName=RAK NCP5623 RGB LED packageName=rakwireless/library/RAKwireless NCP5623 RGB LED library
   rakwireless/RAKwireless NCP5623 RGB LED library@1.0.3
+  # renovate: datasource=custom.pio depName=ArtronShop_RX8130CE packageName=artronshop/library/ArtronShop_RX8130CE
   artronshop/ArtronShop_RX8130CE@1.0.0

variants/nrf52840/rak2560/platformio.ini

@@ -13,8 +13,10 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/rak2560> +<mesh/api/> +<mqtt/> +<serialization/>
 lib_deps = 
   ${nrf52840_base.lib_deps}
-  ${nrf52_networking_base.lib_deps}
+  ${networking_base.lib_deps}
+  # renovate: datasource=custom.pio depName=Melopero RV3028 packageName=melopero/library/Melopero RV3028
   melopero/Melopero RV3028@1.2.0
+  # renovate: datasource=github-tags depName=RAK-OneWireSerial packageName=beegee-tokyo/RAK-OneWireSerial
   https://github.com/beegee-tokyo/RAK-OneWireSerial/archive/0.0.2.zip
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)

variants/nrf52840/rak3401_1watt/platformio.ini

@@ -16,9 +16,13 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/rak3401
 lib_deps = 
   ${nrf52840_base.lib_deps}
   ${networking_base.lib_deps}
+  # renovate: datasource=custom.pio depName=Melopero RV3028 packageName=melopero/library/Melopero RV3028
   melopero/Melopero RV3028@1.2.0
+  # renovate: datasource=custom.pio depName=RAK NCP5623 RGB LED packageName=rakwireless/library/RAKwireless NCP5623 RGB LED library
   rakwireless/RAKwireless NCP5623 RGB LED library@1.0.3
+  # renovate: datasource=custom.pio depName=RAK12035_SoilMoisture packageName=beegee-tokyo/library/RAK12035_SoilMoisture
   beegee-tokyo/RAK12035_SoilMoisture@1.0.4
+  # 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
 
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)

variants/nrf52840/rak4631/platformio.ini

@@ -22,10 +22,14 @@ build_src_filter = ${nrf52_base.build_src_filter} \
   -<graphics/fonts/EinkDisplayFonts.cpp>
 lib_deps = 
   ${nrf52840_base.lib_deps}
-  ${nrf52_networking_base.lib_deps}
+  ${networking_base.lib_deps}
+  # renovate: datasource=custom.pio depName=Melopero RV3028 packageName=melopero/library/Melopero RV3028
   melopero/Melopero RV3028@1.2.0
+  # renovate: datasource=github-tags depName=RAK13800-W5100S packageName=RAKWireless/RAK13800-W5100S
   https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip
+  # renovate: datasource=custom.pio depName=RAK NCP5623 RGB LED packageName=rakwireless/library/RAKwireless NCP5623 RGB LED library
   rakwireless/RAKwireless NCP5623 RGB LED library@1.0.3
+  # renovate: datasource=custom.pio depName=RAK12035_SoilMoisture packageName=beegee-tokyo/library/RAK12035_SoilMoisture
   beegee-tokyo/RAK12035_SoilMoisture@1.0.4
   # 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
@@ -50,6 +54,7 @@ build_flags =
 
 lib_deps =
   ${env:rak4631.lib_deps}
+  # TODO renovate
   https://github.com/geeksville/Armduino-Semihosting/archive/35b538fdf208c3530c1434cd099a08e486672ee4.zip
 
 ; NOTE: the pyocd support for semihosting is buggy.  So I switched to using the builtin platformio support for the stlink adapter which worked much better.

variants/nrf52840/rak4631_epaper/platformio.ini

@@ -14,10 +14,15 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/rak4631_epaper>
 lib_deps = 
   ${nrf52840_base.lib_deps}
+  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
   zinggjm/GxEPD2@1.6.5
+  # renovate: datasource=custom.pio depName=Melopero RV3028 packageName=melopero/library/Melopero RV3028
   melopero/Melopero RV3028@1.2.0
+  # renovate: datasource=custom.pio depName=RAK NCP5623 RGB LED packageName=rakwireless/library/RAKwireless NCP5623 RGB LED library
   rakwireless/RAKwireless NCP5623 RGB LED library@1.0.3
+  # renovate: datasource=custom.pio depName=RAK12034 packageName=beegee-tokyo/library/RAKwireless RAK12034
   beegee-tokyo/RAKwireless RAK12034@1.0.0
+  # renovate: datasource=custom.pio depName=RAK12035_SoilMoisture packageName=beegee-tokyo/library/RAK12035_SoilMoisture
   beegee-tokyo/RAK12035_SoilMoisture@1.0.4
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)

variants/nrf52840/rak4631_epaper_onrxtx/platformio.ini

@@ -16,10 +16,15 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/rak4631_epaper_onrxtx>
 lib_deps = 
   ${nrf52840_base.lib_deps}
+  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
   zinggjm/GxEPD2@1.6.5
+  # renovate: datasource=custom.pio depName=Melopero RV3028 packageName=melopero/library/Melopero RV3028
   melopero/Melopero RV3028@1.2.0
+  # renovate: datasource=custom.pio depName=RAK NCP5623 RGB LED packageName=rakwireless/library/RAKwireless NCP5623 RGB LED library
   rakwireless/RAKwireless NCP5623 RGB LED library@1.0.3
+  # renovate: datasource=custom.pio depName=RAK12034 packageName=beegee-tokyo/library/RAKwireless RAK12034
   beegee-tokyo/RAKwireless RAK12034@1.0.0
+  # renovate: datasource=custom.pio depName=RAK12035_SoilMoisture packageName=beegee-tokyo/library/RAK12035_SoilMoisture
   beegee-tokyo/RAK12035_SoilMoisture@1.0.4
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)

variants/nrf52840/rak4631_eth_gw/platformio.ini

@@ -27,11 +27,15 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/rak4631
 lib_deps = 
   ${nrf52840_base.lib_deps}
   ${networking_base.lib_deps}
+  # renovate: datasource=custom.pio depName=Melopero RV3028 packageName=melopero/library/Melopero RV3028
   melopero/Melopero RV3028@1.2.0
+  # renovate: datasource=github-tags depName=RAK13800-W5100S packageName=RAKWireless/RAK13800-W5100S
   https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip
+  # renovate: datasource=custom.pio depName=RAK NCP5623 RGB LED packageName=rakwireless/library/RAKwireless NCP5623 RGB LED library
   rakwireless/RAKwireless NCP5623 RGB LED library@1.0.3
   # 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.4
 ; 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
@@ -53,6 +57,7 @@ build_flags =
 
 lib_deps =
   ${env:rak4631_eth_gw.lib_deps}
+  # TODO renovate
   https://github.com/geeksville/Armduino-Semihosting/archive/35b538fdf208c3530c1434cd099a08e486672ee4.zip
 
 ; NOTE: the pyocd support for semihosting is buggy.  So I switched to using the builtin platformio support for the stlink adapter which worked much better.

variants/nrf52840/rak4631_nomadstar_meteor_pro/platformio.ini

@@ -15,6 +15,7 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/rak4631_nomadstar_meteor_pro> +<mesh/api/> +<mqtt/>
 lib_deps =
   ${nrf52840_base.lib_deps}
+  # TODO renovate
   https://github.com/NomadStar-outdoor/IOBoard-RGB-LP5562-Library.git#9c366c8
 
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)
@@ -37,6 +38,7 @@ build_flags =
 
 lib_deps =
   ${env:rak4631.lib_deps}
+  # TODO renovate
   https://github.com/geeksville/Armduino-Semihosting/archive/35b538fdf208c3530c1434cd099a08e486672ee4.zip
 
 ; NOTE: the pyocd support for semihosting is buggy.  So I switched to using the builtin platformio support for the stlink adapter which worked much better.

variants/nrf52840/rak_wismeshtap/platformio.ini

@@ -17,13 +17,20 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/rak_wismeshtap> +<mesh/eth/> +<mesh/api/> +<mqtt/>
 lib_deps = 
   ${nrf52840_base.lib_deps}
-  ${nrf52_networking_base.lib_deps}
+  ${networking_base.lib_deps}
+  # renovate: datasource=custom.pio depName=Melopero RV3028 packageName=melopero/library/Melopero RV3028
   melopero/Melopero RV3028@1.2.0
+  # renovate: datasource=github-tags depName=RAK13800-W5100S packageName=RAKWireless/RAK13800-W5100S
   https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip
+  # renovate: datasource=custom.pio depName=RAK NCP5623 RGB LED packageName=rakwireless/library/RAKwireless NCP5623 RGB LED library
   rakwireless/RAKwireless NCP5623 RGB LED library@1.0.3
+  # renovate: datasource=custom.pio depName=TFT_eSPI packageName=bodmer/library/TFT_eSPI
   bodmer/TFT_eSPI@2.5.43
+  # renovate: datasource=custom.pio depName=RAK12034 packageName=beegee-tokyo/library/RAKwireless RAK12034
   beegee-tokyo/RAKwireless RAK12034@1.0.0
+  # renovate: datasource=custom.pio depName=RAK14014-FT6336U packageName=beegee-tokyo/library/RAK14014-FT6336U
   beegee-tokyo/RAK14014-FT6336U@1.0.1
+  # renovate: datasource=custom.pio depName=RAK12035_SoilMoisture packageName=beegee-tokyo/library/RAK12035_SoilMoisture
   beegee-tokyo/RAK12035_SoilMoisture@1.0.4
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)

variants/nrf52840/seeed_wio_tracker_L1_eink/platformio.ini

@@ -24,7 +24,8 @@ board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/seeed_wio_tracker_L1_eink>
 lib_deps =
   ${nrf52840_base.lib_deps}
-  https://github.com/meshtastic/GxEPD2#b202ebfec6a4821e098cf7a625ba0f6f2400292d
+  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
+  https://github.com/meshtastic/GxEPD2/archive/b202ebfec6a4821e098cf7a625ba0f6f2400292d.zip
 debug_tool = jlink
 
 [env:seeed_wio_tracker_L1_eink-inkhud]

variants/nrf52840/t-echo-lite/platformio.ini

@@ -20,5 +20,6 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/t-echo-lite>
 lib_deps = 
   ${nrf52840_base.lib_deps}
+  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
   https://github.com/meshtastic/GxEPD2/archive/a05c11c02862624266b61599b0d6ba93e33c6f24.zip
 ;upload_protocol = fs

variants/nrf52840/t-echo/platformio.ini

@@ -20,7 +20,9 @@ build_flags = ${nrf52840_base.build_flags}
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/t-echo>
 lib_deps = 
   ${nrf52840_base.lib_deps}
+  # renovate: datasource=git-refs depName=meshtastic-GxEPD2 packageName=https://github.com/meshtastic/GxEPD2 gitBranch=master
   https://github.com/meshtastic/GxEPD2/archive/55f618961db45a23eff0233546430f1e5a80f63a.zip
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
   lewisxhe/PCF8563_Library@1.0.1
 ;upload_protocol = fs
 
@@ -41,4 +43,5 @@ build_src_filter =
 lib_deps = 
   ${inkhud.lib_deps} ; InkHUD libs first, so we get GFXRoot instead of AdafruitGFX
   ${nrf52840_base.lib_deps}
+  # renovate: datasource=custom.pio depName=PCF8563 packageName=lewisxhe/library/PCF8563_Library
   lewisxhe/PCF8563_Library@1.0.1

variants/nrf52840/tracker-t1000-e/platformio.ini

@@ -16,6 +16,7 @@ board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/tracker-t1000-e>
 lib_deps = 
   ${nrf52840_base.lib_deps}
+  # TODO renovate
   https://github.com/meshtastic/QMA6100P_Arduino_Library/archive/14c900b8b2e4feaac5007a7e41e0c1b7f0841136.zip
 debug_tool = jlink
 ; If not set we will default to uploading over serial (first it forces bootloader entry by talking 1200bps to cdcacm)

variants/rp2040/rak11310/platformio.ini

@@ -14,7 +14,10 @@ build_src_filter = ${rp2040_base.build_src_filter} +<../variants/rp2040/rak11310
 lib_deps =
   ${rp2040_base.lib_deps}
   ${networking_base.lib_deps}
+  ${networking_extra.lib_deps}
+  # renovate: datasource=custom.pio depName=Melopero RV3028 packageName=melopero/library/Melopero RV3028
   melopero/Melopero RV3028@1.2.0
+  # renovate: datasource=github-tags depName=RAK13800-W5100S packageName=RAKWireless/RAK13800-W5100S
   https://github.com/RAKWireless/RAK13800-W5100S/archive/1.0.2.zip
 debug_build_flags = ${rp2040_base.build_flags}, -g
 debug_tool = cmsis-dap ; for e.g. Picotool

variants/rp2040/rpipico/platformio.ini

@@ -3,7 +3,6 @@ extends = rp2040_base
 board = rpipico
 board_level = pr
 upload_protocol = picotool
-
 # add our variants files to the include and src paths
 build_flags =
   ${rp2040_base.build_flags}

variants/rp2040/rpipicow/platformio.ini

@@ -16,5 +16,6 @@ build_src_filter = ${rp2040_base.build_src_filter} +<mesh/wifi/>
 lib_deps =
   ${rp2040_base.lib_deps}
   ${networking_base.lib_deps}
+  ${networking_extra.lib_deps}
 debug_build_flags = ${rp2040_base.build_flags}, -g
 debug_tool = cmsis-dap ; for e.g. Picotool

variants/rp2350/rpipico2w/platformio.ini

@@ -30,4 +30,5 @@ build_src_filter = ${rp2350_base.build_src_filter} +<mesh/wifi/>
 lib_deps =
   ${rp2350_base.lib_deps}
   ${networking_base.lib_deps}
+  ${networking_extra.lib_deps}
 debug_build_flags = ${rp2350_base.build_flags}, -g

variants/stm32/stm32.ini

@@ -4,7 +4,7 @@ platform =
   # renovate: datasource=custom.pio depName=platformio/ststm32 packageName=platformio/platform/ststm32
   platformio/ststm32@19.4.0
 platform_packages =
-  # TODO renovate
+  # renovate: datasource=github-tags depName=Arduino_Core_STM32 packageName=stm32duino/Arduino_Core_STM32
   platformio/framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/2.10.1.zip
 extra_scripts =
   ${env.extra_scripts}
@@ -51,7 +51,6 @@ debug_tool = stlink
 lib_deps =
   ${env.lib_deps}
   ${radiolib_base.lib_deps}
-
   # renovate: datasource=git-refs depName=caveman99-stm32-Crypto packageName=https://github.com/caveman99/Crypto gitBranch=main
   https://github.com/caveman99/Crypto/archive/1aa30eb536bd52a576fde6dfa393bf7349cf102d.zip