From 987623567ae06ce58e996b474d3659dd88495e05 Mon Sep 17 00:00:00 2001
From: Jorropo <jorropo.pgm@gmail.com>
Date: Thu, 1 May 2025 13:32:20 +0200
Subject: [PATCH 01/22] router: on linux add a mutex around the queue (#6709)

UDP reception happens on an other thread, avoid data races and potential data corruption issues.
---
 src/mesh/Router.cpp | 8 ++++++++
 src/mesh/Router.h   | 9 +++++++++
 2 files changed, 17 insertions(+)

diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp
index fef29388e..bb0858c8b 100644
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -64,6 +64,10 @@ Router::Router() : concurrency::OSThread("Router"), fromRadioQueue(MAX_RX_FROMRA
  */
 int32_t Router::runOnce()
 {
+#ifdef ARCH_PORTDUINO
+    const std::lock_guard<std::mutex> lock(queueMutex);
+#endif
+
     meshtastic_MeshPacket *mp;
     while ((mp = fromRadioQueue.dequeuePtr(0)) != NULL) {
         // printPacket("handle fromRadioQ", mp);
@@ -80,6 +84,10 @@ int32_t Router::runOnce()
  */
 void Router::enqueueReceivedMessage(meshtastic_MeshPacket *p)
 {
+#ifdef ARCH_PORTDUINO
+    const std::lock_guard<std::mutex> lock(queueMutex);
+#endif
+
     // Try enqueue until successful
     while (!fromRadioQueue.enqueue(p, 0)) {
         meshtastic_MeshPacket *old_p;
diff --git a/src/mesh/Router.h b/src/mesh/Router.h
index 58ca50f3d..f4782d863 100644
--- a/src/mesh/Router.h
+++ b/src/mesh/Router.h
@@ -8,6 +8,9 @@
 #include "PointerQueue.h"
 #include "RadioInterface.h"
 #include "concurrency/OSThread.h"
+#ifdef ARCH_PORTDUINO
+#include <mutex>
+#endif
 
 /**
  * A mesh aware router that supports multiple interfaces.
@@ -19,6 +22,12 @@ class Router : protected concurrency::OSThread, protected PacketHistory
     /// forwarded to the phone.
     PointerQueue<meshtastic_MeshPacket> fromRadioQueue;
 
+#ifdef ARCH_PORTDUINO
+    /// linux calls enqueueReceivedMessage from an other thread when receiving UDP packets,
+    /// to avoid a data race with LoRa, lock that method.
+    std::mutex queueMutex;
+#endif
+
   protected:
     RadioInterface *iface = NULL;
 

From 947191a7979bf394986d3c3920e8fd0da472be58 Mon Sep 17 00:00:00 2001
From: Ferdia McKeogh <frieze_tench_0k@icloud.com>
Date: Fri, 2 May 2025 03:11:09 +0100
Subject: [PATCH 02/22] Add PA1010D GPS support (#6691)

---
 src/gps/GPS.cpp | 15 +++++++++++++++
 src/gps/GPS.h   |  1 +
 2 files changed, 16 insertions(+)

diff --git a/src/gps/GPS.cpp b/src/gps/GPS.cpp
index 55f62d8ad..e234fdb4a 100644
--- a/src/gps/GPS.cpp
+++ b/src/gps/GPS.cpp
@@ -570,6 +570,19 @@ bool GPS::setup()
             // Switch to Fitness Mode, for running and walking purpose with low speed (<5 m/s)
             _serial_gps->write("$PMTK886,1*29\r\n");
             delay(250);
+        } else if (gnssModel == GNSS_MODEL_MTK_PA1010D) {
+            // PA1010D is used in the Pimoroni GPS board.
+
+            // Enable all constellations.
+            _serial_gps->write("$PMTK353,1,1,1,1,1*2A\r\n");
+            // Above command will reset the GPS and takes longer before it will accept new commands
+            delay(1000);
+            // Only ask for RMC and GGA (GNRMC and GNGGA)
+            _serial_gps->write("$PMTK314,0,1,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0*28\r\n");
+            delay(250);
+            // Enable SBAS / WAAS
+            _serial_gps->write("$PMTK301,2*2E\r\n");
+            delay(250);
         } else if (gnssModel == GNSS_MODEL_MTK_PA1616S) {
             // PA1616S is used in some GPS breakout boards from Adafruit
             // PA1616S does not have GLONASS capability. PA1616D does, but is not implemented here.
@@ -1238,9 +1251,11 @@ GnssModel_t GPS::probe(int serialSpeed)
     _serial_gps->write("$PMTK514,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0*2E\r\n");
     delay(20);
     std::vector<ChipInfo> mtk = {{"L76B", "Quectel-L76B", GNSS_MODEL_MTK_L76B},
+                                 {"PA1010D", "1010D", GNSS_MODEL_MTK_PA1010D},
                                  {"PA1616S", "1616S", GNSS_MODEL_MTK_PA1616S},
                                  {"LS20031", "MC-1513", GNSS_MODEL_MTK_L76B},
                                  {"L96", "Quectel-L96", GNSS_MODEL_MTK_L76B}};
+
     PROBE_FAMILY("MTK Family", "$PMTK605*31", mtk, 500);
 
     uint8_t cfg_rate[] = {0xB5, 0x62, 0x06, 0x08, 0x00, 0x00, 0x00, 0x00};
diff --git a/src/gps/GPS.h b/src/gps/GPS.h
index 240cf66d2..9be57017f 100644
--- a/src/gps/GPS.h
+++ b/src/gps/GPS.h
@@ -27,6 +27,7 @@ typedef enum {
     GNSS_MODEL_UC6580,
     GNSS_MODEL_UNKNOWN,
     GNSS_MODEL_MTK_L76B,
+    GNSS_MODEL_MTK_PA1010D,
     GNSS_MODEL_MTK_PA1616S,
     GNSS_MODEL_AG3335,
     GNSS_MODEL_AG3352,

From baae2503d53c1ce107fb69734ad88e8d8808367d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 2 May 2025 16:24:21 +0800
Subject: [PATCH 03/22] Upgrade trunk to 1.22.15 (#6608)

Co-authored-by: sachaw <11172820+sachaw@users.noreply.github.com>
---
 .trunk/trunk.yaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index 60e422312..92cd5b316 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -1,6 +1,6 @@
 version: 0.1
 cli:
-  version: 1.22.12
+  version: 1.22.15
 plugins:
   sources:
     - id: trunk
@@ -8,18 +8,18 @@ plugins:
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - renovate@39.243.0
+    - renovate@40.0.6
     - prettier@3.5.3
-    - trufflehog@3.88.23
+    - trufflehog@3.88.26
     - yamllint@1.37.0
     - bandit@1.8.3
     - terrascan@1.19.9
-    - trivy@0.61.0
+    - trivy@0.61.1
     - taplo@0.9.3
-    - ruff@0.11.5
+    - ruff@0.11.7
     - isort@6.0.1
     - markdownlint@0.44.0
-    - oxipng@9.1.4
+    - oxipng@9.1.5
     - svgo@3.3.2
     - actionlint@1.7.7
     - flake8@7.2.0
@@ -28,7 +28,7 @@ lint:
     - shellcheck@0.10.0
     - black@25.1.0
     - git-diff-check
-    - gitleaks@8.24.3
+    - gitleaks@8.25.1
     - clang-format@16.0.3
   ignore:
     - linters: [ALL]

From 7da8aea1df3b87c26d9c3f8002e95adeb83a93eb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 2 May 2025 06:16:53 -0500
Subject: [PATCH 04/22] chore(deps): update meshtastic-device-ui digest to
 aa38459 (#6706)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 73a9bbe1f..cfa6cd4ef 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -108,7 +108,7 @@ lib_deps =
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic-device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/33aa6890f7862d81c2bc1658f43eeea7a8081c6e.zip
+	https://github.com/meshtastic/device-ui/archive/aa38459f4e4c0bc6e4d1bda52d26393f0fcf1b97.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]

From 10693c4569b4bf33e02255c598693569f0950b18 Mon Sep 17 00:00:00 2001
From: todd-herbert <herbert.todd@gmail.com>
Date: Fri, 2 May 2025 23:20:56 +1200
Subject: [PATCH 05/22] Lock SPI bus while in use by InkHUD (#6719)

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
---
 .../niche/Drivers/EInk/LCMEN2R13EFC1.cpp        | 16 ++++++++++++++--
 src/graphics/niche/Drivers/EInk/SSD16XX.cpp     | 15 ++++++++++++++-
 src/graphics/niche/FlashData.h                  | 17 ++++++++++++++---
 src/graphics/niche/InkHUD/MessageStore.cpp      | 14 ++++++++++++++
 4 files changed, 56 insertions(+), 6 deletions(-)

diff --git a/src/graphics/niche/Drivers/EInk/LCMEN2R13EFC1.cpp b/src/graphics/niche/Drivers/EInk/LCMEN2R13EFC1.cpp
index 13a3f452d..fb37544b2 100644
--- a/src/graphics/niche/Drivers/EInk/LCMEN2R13EFC1.cpp
+++ b/src/graphics/niche/Drivers/EInk/LCMEN2R13EFC1.cpp
@@ -1,9 +1,11 @@
-#include "./LCMEN2R13EFC1.h"
-
 #ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
 
+#include "./LCMEN2R13EFC1.h"
+
 #include <assert.h>
 
+#include "SPILock.h"
+
 using namespace NicheGraphics::Drivers;
 
 // Look up table: fast refresh, common electrode
@@ -150,6 +152,9 @@ void LCMEN213EFC1::reset()
 
 void LCMEN213EFC1::sendCommand(const uint8_t command)
 {
+    // Take firmware's SPI lock
+    spiLock->lock();
+
     spi->beginTransaction(spiSettings);
     digitalWrite(pin_dc, LOW); // DC pin low indicates command
     digitalWrite(pin_cs, LOW);
@@ -157,6 +162,8 @@ void LCMEN213EFC1::sendCommand(const uint8_t command)
     digitalWrite(pin_cs, HIGH);
     digitalWrite(pin_dc, HIGH);
     spi->endTransaction();
+
+    spiLock->unlock();
 }
 
 void LCMEN213EFC1::sendData(uint8_t data)
@@ -166,6 +173,9 @@ void LCMEN213EFC1::sendData(uint8_t data)
 
 void LCMEN213EFC1::sendData(const uint8_t *data, uint32_t size)
 {
+    // Take firmware's SPI lock
+    spiLock->lock();
+
     spi->beginTransaction(spiSettings);
     digitalWrite(pin_dc, HIGH); // DC pin HIGH indicates data, instead of command
     digitalWrite(pin_cs, LOW);
@@ -183,6 +193,8 @@ void LCMEN213EFC1::sendData(const uint8_t *data, uint32_t size)
     digitalWrite(pin_cs, HIGH);
     digitalWrite(pin_dc, HIGH);
     spi->endTransaction();
+
+    spiLock->unlock();
 }
 
 void LCMEN213EFC1::configFull()
diff --git a/src/graphics/niche/Drivers/EInk/SSD16XX.cpp b/src/graphics/niche/Drivers/EInk/SSD16XX.cpp
index a2357a80b..d0d030be8 100644
--- a/src/graphics/niche/Drivers/EInk/SSD16XX.cpp
+++ b/src/graphics/niche/Drivers/EInk/SSD16XX.cpp
@@ -1,6 +1,9 @@
+#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
+
 #include "./SSD16XX.h"
 
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
+#include "SPILock.h"
+
 using namespace NicheGraphics::Drivers;
 
 SSD16XX::SSD16XX(uint16_t width, uint16_t height, UpdateTypes supported, uint8_t bufferOffsetX)
@@ -82,6 +85,9 @@ void SSD16XX::sendCommand(const uint8_t command)
     if (failed)
         return;
 
+    // Take firmware's SPI lock
+    spiLock->lock();
+
     spi->beginTransaction(spiSettings);
     digitalWrite(pin_dc, LOW); // DC pin low indicates command
     digitalWrite(pin_cs, LOW);
@@ -89,6 +95,8 @@ void SSD16XX::sendCommand(const uint8_t command)
     digitalWrite(pin_cs, HIGH);
     digitalWrite(pin_dc, HIGH);
     spi->endTransaction();
+
+    spiLock->unlock();
 }
 
 void SSD16XX::sendData(uint8_t data)
@@ -103,6 +111,9 @@ void SSD16XX::sendData(const uint8_t *data, uint32_t size)
     if (failed)
         return;
 
+    // Take firmware's SPI lock
+    spiLock->lock();
+
     spi->beginTransaction(spiSettings);
     digitalWrite(pin_dc, HIGH); // DC pin HIGH indicates data, instead of command
     digitalWrite(pin_cs, LOW);
@@ -119,6 +130,8 @@ void SSD16XX::sendData(const uint8_t *data, uint32_t size)
     digitalWrite(pin_cs, HIGH);
     digitalWrite(pin_dc, HIGH);
     spi->endTransaction();
+
+    spiLock->unlock();
 }
 
 void SSD16XX::configFullscreen()
diff --git a/src/graphics/niche/FlashData.h b/src/graphics/niche/FlashData.h
index a27c4aea0..233d0922e 100644
--- a/src/graphics/niche/FlashData.h
+++ b/src/graphics/niche/FlashData.h
@@ -13,6 +13,7 @@ Avoid bloating everyone's protobuf code for our one-off UI implementations
 
 #include "configuration.h"
 
+#include "SPILock.h"
 #include "SafeFile.h"
 
 namespace NicheGraphics
@@ -46,6 +47,9 @@ template <typename T> class FlashData
   public:
     static bool load(T *data, const char *label)
     {
+        // Take firmware's SPI lock
+        concurrency::LockGuard guard(spiLock);
+
         // Set false if we run into issues
         bool okay = true;
 
@@ -103,14 +107,18 @@ template <typename T> class FlashData
         return okay;
     }
 
-    // Save module's custom data (settings?) to flash. Does use protobufs
+    // Save module's custom data (settings?) to flash. Doesn't use protobufs
+    // Takes the firmware's SPI lock, in case the files are stored on SD card
+    // Need to lock and unlock around specific FS methods, as the SafeFile class takes the lock for itself internally.
     static void save(T *data, const char *label)
     {
         // Get a filename based on the label
         std::string filename = getFilename(label);
 
 #ifdef FSCom
+        spiLock->lock();
         FSCom.mkdir("/NicheGraphics");
+        spiLock->unlock();
 
         auto f = SafeFile(filename.c_str(), true); // "true": full atomic. Write new data to temp file, then rename.
 
@@ -119,10 +127,10 @@ template <typename T> class FlashData
         // Calculate a hash of the data
         uint32_t hash = getHash(data);
 
+        spiLock->lock();
         f.write((uint8_t *)data, sizeof(T));     // Write the actual data
         f.write((uint8_t *)&hash, sizeof(hash)); // Append the hash
-
-        // f.flush();
+        spiLock->unlock();
 
         bool writeSucceeded = f.close();
 
@@ -139,6 +147,9 @@ template <typename T> class FlashData
 inline void clearFlashData()
 {
 
+    // Take firmware's SPI lock, in case the files are stored on SD card
+    concurrency::LockGuard guard(spiLock);
+
 #ifdef FSCom
     File dir = FSCom.open("/NicheGraphics"); // Open the directory
     File file = dir.openNextFile();          // Attempt to open the first file in the directory
diff --git a/src/graphics/niche/InkHUD/MessageStore.cpp b/src/graphics/niche/InkHUD/MessageStore.cpp
index ac6fe1b35..94e0aa661 100644
--- a/src/graphics/niche/InkHUD/MessageStore.cpp
+++ b/src/graphics/niche/InkHUD/MessageStore.cpp
@@ -22,6 +22,8 @@ InkHUD::MessageStore::MessageStore(std::string label)
 }
 
 // Write the contents of the MessageStore::messages object to flash
+// Takes the firmware's SPI lock during FS operations. Implemented for consistency, but only relevant when using SD card.
+// Need to lock and unlock around specific FS methods, as the SafeFile class takes the lock for itself internally
 void InkHUD::MessageStore::saveToFlash()
 {
     assert(!filename.empty());
@@ -29,7 +31,9 @@ void InkHUD::MessageStore::saveToFlash()
 #ifdef FSCom
     // Make the directory, if doesn't already exist
     // This is the same directory accessed by NicheGraphics::FlashData
+    spiLock->lock();
     FSCom.mkdir("/NicheGraphics");
+    spiLock->unlock();
 
     // Open or create the file
     // No "full atomic": don't save then rename
@@ -37,6 +41,9 @@ void InkHUD::MessageStore::saveToFlash()
 
     LOG_INFO("Saving messages in %s", filename.c_str());
 
+    // Take firmware's SPI Lock while writing
+    spiLock->lock();
+
     // 1st byte: how many messages will be written to store
     f.write(messages.size());
 
@@ -51,6 +58,9 @@ void InkHUD::MessageStore::saveToFlash()
         LOG_DEBUG("Wrote message %u, length %u, text \"%s\"", (uint32_t)i, min(MAX_MESSAGE_SIZE, m.text.size()), m.text.c_str());
     }
 
+    // Release firmware's SPI lock, because SafeFile::close needs it
+    spiLock->unlock();
+
     bool writeSucceeded = f.close();
 
     if (!writeSucceeded) {
@@ -63,6 +73,7 @@ void InkHUD::MessageStore::saveToFlash()
 
 // Attempt to load the previous contents of the MessageStore:message deque from flash.
 // Filename is controlled by the "label" parameter
+// Takes the firmware's SPI lock during FS operations. Implemented for consistency, but only relevant when using SD card.
 void InkHUD::MessageStore::loadFromFlash()
 {
     // Hopefully redundant. Initial intention is to only load / save once per boot.
@@ -70,6 +81,9 @@ void InkHUD::MessageStore::loadFromFlash()
 
 #ifdef FSCom
 
+    // Take the firmware's SPI Lock, in case filesystem is on SD card
+    concurrency::LockGuard guard(spiLock);
+
     // Check that the file *does* actually exist
     if (!FSCom.exists(filename.c_str())) {
         LOG_WARN("'%s' not found. Using default values", filename.c_str());

From 152b8b1b0235bc461c6e4451fbcdac0987b8bf90 Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Fri, 2 May 2025 13:53:25 -0400
Subject: [PATCH 06/22] Revert "router: on linux add a mutex around the queue
 (#6709)" (#6726)

This reverts commit 987623567ae06ce58e996b474d3659dd88495e05.
---
 src/mesh/Router.cpp | 8 --------
 src/mesh/Router.h   | 9 ---------
 2 files changed, 17 deletions(-)

diff --git a/src/mesh/Router.cpp b/src/mesh/Router.cpp
index bb0858c8b..fef29388e 100644
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -64,10 +64,6 @@ Router::Router() : concurrency::OSThread("Router"), fromRadioQueue(MAX_RX_FROMRA
  */
 int32_t Router::runOnce()
 {
-#ifdef ARCH_PORTDUINO
-    const std::lock_guard<std::mutex> lock(queueMutex);
-#endif
-
     meshtastic_MeshPacket *mp;
     while ((mp = fromRadioQueue.dequeuePtr(0)) != NULL) {
         // printPacket("handle fromRadioQ", mp);
@@ -84,10 +80,6 @@ int32_t Router::runOnce()
  */
 void Router::enqueueReceivedMessage(meshtastic_MeshPacket *p)
 {
-#ifdef ARCH_PORTDUINO
-    const std::lock_guard<std::mutex> lock(queueMutex);
-#endif
-
     // Try enqueue until successful
     while (!fromRadioQueue.enqueue(p, 0)) {
         meshtastic_MeshPacket *old_p;
diff --git a/src/mesh/Router.h b/src/mesh/Router.h
index f4782d863..58ca50f3d 100644
--- a/src/mesh/Router.h
+++ b/src/mesh/Router.h
@@ -8,9 +8,6 @@
 #include "PointerQueue.h"
 #include "RadioInterface.h"
 #include "concurrency/OSThread.h"
-#ifdef ARCH_PORTDUINO
-#include <mutex>
-#endif
 
 /**
  * A mesh aware router that supports multiple interfaces.
@@ -22,12 +19,6 @@ class Router : protected concurrency::OSThread, protected PacketHistory
     /// forwarded to the phone.
     PointerQueue<meshtastic_MeshPacket> fromRadioQueue;
 
-#ifdef ARCH_PORTDUINO
-    /// linux calls enqueueReceivedMessage from an other thread when receiving UDP packets,
-    /// to avoid a data race with LoRa, lock that method.
-    std::mutex queueMutex;
-#endif
-
   protected:
     RadioInterface *iface = NULL;
 

From 9d31d9f43b25b5f2f388546f28ab64d0ce05ce48 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sat, 3 May 2025 22:18:39 +0200
Subject: [PATCH 07/22] chore(deps): update meshtastic-device-ui digest to
 b9e2ad1 (#6729)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index cfa6cd4ef..fcece8639 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -108,7 +108,7 @@ lib_deps =
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic-device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/aa38459f4e4c0bc6e4d1bda52d26393f0fcf1b97.zip
+	https://github.com/meshtastic/device-ui/archive/b9e2ad1222db9f5a5080248b2f018c250f0efae5.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]

From d75c91a760afbc1dd9f5192776c284338f52a2e4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 4 May 2025 08:39:59 -0500
Subject: [PATCH 08/22] [create-pull-request] automated change (#6732)

Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
---
 protobufs                                        | 2 +-
 src/mesh/generated/meshtastic/module_config.pb.h | 9 ++++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/protobufs b/protobufs
index 27fac3914..078ac8dfb 160000
--- a/protobufs
+++ b/protobufs
@@ -1 +1 @@
-Subproject commit 27fac39141d99fe727a0a1824c5397409b1aea75
+Subproject commit 078ac8dfbe5f7533d7755cbe2ca3d08d86e5af34
diff --git a/src/mesh/generated/meshtastic/module_config.pb.h b/src/mesh/generated/meshtastic/module_config.pb.h
index d5031cb89..dbf6ddb2e 100644
--- a/src/mesh/generated/meshtastic/module_config.pb.h
+++ b/src/mesh/generated/meshtastic/module_config.pb.h
@@ -79,7 +79,10 @@ typedef enum _meshtastic_ModuleConfig_SerialConfig_Serial_Mode {
     /* NMEA messages specifically tailored for CalTopo */
     meshtastic_ModuleConfig_SerialConfig_Serial_Mode_CALTOPO = 5,
     /* Ecowitt WS85 weather station */
-    meshtastic_ModuleConfig_SerialConfig_Serial_Mode_WS85 = 6
+    meshtastic_ModuleConfig_SerialConfig_Serial_Mode_WS85 = 6,
+    /* VE.Direct is a serial protocol used by Victron Energy products
+ https://beta.ivc.no/wiki/index.php/Victron_VE_Direct_DIY_Cable */
+    meshtastic_ModuleConfig_SerialConfig_Serial_Mode_VE_DIRECT = 7
 } meshtastic_ModuleConfig_SerialConfig_Serial_Mode;
 
 /* TODO: REPLACE */
@@ -467,8 +470,8 @@ extern "C" {
 #define _meshtastic_ModuleConfig_SerialConfig_Serial_Baud_ARRAYSIZE ((meshtastic_ModuleConfig_SerialConfig_Serial_Baud)(meshtastic_ModuleConfig_SerialConfig_Serial_Baud_BAUD_921600+1))
 
 #define _meshtastic_ModuleConfig_SerialConfig_Serial_Mode_MIN meshtastic_ModuleConfig_SerialConfig_Serial_Mode_DEFAULT
-#define _meshtastic_ModuleConfig_SerialConfig_Serial_Mode_MAX meshtastic_ModuleConfig_SerialConfig_Serial_Mode_WS85
-#define _meshtastic_ModuleConfig_SerialConfig_Serial_Mode_ARRAYSIZE ((meshtastic_ModuleConfig_SerialConfig_Serial_Mode)(meshtastic_ModuleConfig_SerialConfig_Serial_Mode_WS85+1))
+#define _meshtastic_ModuleConfig_SerialConfig_Serial_Mode_MAX meshtastic_ModuleConfig_SerialConfig_Serial_Mode_VE_DIRECT
+#define _meshtastic_ModuleConfig_SerialConfig_Serial_Mode_ARRAYSIZE ((meshtastic_ModuleConfig_SerialConfig_Serial_Mode)(meshtastic_ModuleConfig_SerialConfig_Serial_Mode_VE_DIRECT+1))
 
 #define _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MIN meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE
 #define _meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_MAX meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_BACK

From 8bb1f3e869efbd76abae794630d31352fe4896c8 Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Sun, 4 May 2025 14:18:48 -0400
Subject: [PATCH 09/22] Update template for event userprefs (#6720)

---
 userPrefs.jsonc | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/userPrefs.jsonc b/userPrefs.jsonc
index d522ad272..eb6dc64b6 100644
--- a/userPrefs.jsonc
+++ b/userPrefs.jsonc
@@ -1,21 +1,21 @@
 {
   // "USERPREFS_BUTTON_PIN": "36",
   // "USERPREFS_CHANNELS_TO_WRITE": "3",
-  // "USERPREFS_CHANNEL_0_DOWNLINK_ENABLED": "true",
-  // "USERPREFS_CHANNEL_0_NAME": "DEFCONnect",
+  // "USERPREFS_CHANNEL_0_DOWNLINK_ENABLED": "false",
+  // "USERPREFS_CHANNEL_0_NAME": "REPLACEME",
   // "USERPREFS_CHANNEL_0_PRECISION": "14",
   // "USERPREFS_CHANNEL_0_PSK": "{ 0x38, 0x4b, 0xbc, 0xc0, 0x1d, 0xc0, 0x22, 0xd1, 0x81, 0xbf, 0x36, 0xb8, 0x61, 0x21, 0xe1, 0xfb, 0x96, 0xb7, 0x2e, 0x55, 0xbf, 0x74, 0x22, 0x7e, 0x9d, 0x6a, 0xfb, 0x48, 0xd6, 0x4c, 0xb1, 0xa1 }",
   // "USERPREFS_CHANNEL_0_UPLINK_ENABLED": "true",
-  // "USERPREFS_CHANNEL_1_DOWNLINK_ENABLED": "true",
-  // "USERPREFS_CHANNEL_1_NAME": "REPLACEME",
+  // "USERPREFS_CHANNEL_1_DOWNLINK_ENABLED": "false",
+  // "USERPREFS_CHANNEL_1_NAME": "Node Build Chat",
   // "USERPREFS_CHANNEL_1_PRECISION": "14",
-  // "USERPREFS_CHANNEL_1_PSK": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }",
-  // "USERPREFS_CHANNEL_1_UPLINK_ENABLED": "true",
-  // "USERPREFS_CHANNEL_2_DOWNLINK_ENABLED": "true",
-  // "USERPREFS_CHANNEL_2_NAME": "REPLACEME",
+  // "USERPREFS_CHANNEL_1_PSK": "{ 0x38, 0x4b, 0xbc, 0xc0, 0x1d, 0xc0, 0x22, 0xd1, 0x81, 0xbf, 0x36, 0xb8, 0x61, 0x21, 0xe1, 0xfb, 0x96, 0xb7, 0x2e, 0x55, 0xbf, 0x74, 0x22, 0x7e, 0x9d, 0x6a, 0xfb, 0x48, 0xd6, 0x4c, 0xb1, 0xa2 }",
+  // "USERPREFS_CHANNEL_1_UPLINK_ENABLED": "false",
+  // "USERPREFS_CHANNEL_2_DOWNLINK_ENABLED": "false",
+  // "USERPREFS_CHANNEL_2_NAME": "Equipment Exchange",
   // "USERPREFS_CHANNEL_2_PRECISION": "14",
-  // "USERPREFS_CHANNEL_2_PSK": "{ 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00 }",
-  // "USERPREFS_CHANNEL_2_UPLINK_ENABLED": "true",
+  // "USERPREFS_CHANNEL_2_PSK": "{ 0x38, 0x4b, 0xbc, 0xc0, 0x1d, 0xc0, 0x22, 0xd1, 0x81, 0xbf, 0x36, 0xb8, 0x61, 0x21, 0xe1, 0xfb, 0x96, 0xb7, 0x2e, 0x55, 0xbf, 0x74, 0x22, 0x7e, 0x9d, 0x6a, 0xfb, 0x48, 0xd6, 0x4c, 0xb1, 0xa3 }",
+  // "USERPREFS_CHANNEL_2_UPLINK_ENABLED": "false",
   // "USERPREFS_CONFIG_GPS_MODE": "meshtastic_Config_PositionConfig_GpsMode_ENABLED",
   // "USERPREFS_CONFIG_LORA_IGNORE_MQTT": "true",
   // "USERPREFS_CONFIG_LORA_REGION": "meshtastic_Config_LoRaConfig_RegionCode_US",

From 055fdcb7f6f3f8e8c8b8810a072bf5c5a54a6cd7 Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Sun, 4 May 2025 20:08:39 -0400
Subject: [PATCH 10/22] Renovate: Add changelogs for device-ui, cleanup (#6733)

---
 arch/esp32/esp32.ini         | 2 +-
 arch/esp32/esp32c6.ini       | 4 ++--
 arch/nrf52/nrf52.ini         | 3 ++-
 arch/portduino/portduino.ini | 2 +-
 platformio.ini               | 2 +-
 renovate.json                | 8 +++++++-
 6 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/arch/esp32/esp32.ini b/arch/esp32/esp32.ini
index 3a6dc8323..a6eff7bf9 100644
--- a/arch/esp32/esp32.ini
+++ b/arch/esp32/esp32.ini
@@ -59,7 +59,7 @@ 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=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@^0.4.0
+  rweather/Crypto@0.4.0
 
 lib_ignore = 
   segger_rtt
diff --git a/arch/esp32/esp32c6.ini b/arch/esp32/esp32c6.ini
index 7c7e3e923..26b5c0f5b 100644
--- a/arch/esp32/esp32c6.ini
+++ b/arch/esp32/esp32c6.ini
@@ -1,7 +1,7 @@
 [esp32c6_base]
 extends = esp32_base
 platform =
-  # renovate: datasource=git-refs depName=ESP32c6 platform-espressif32 packageName=https://github.com/Jason2866/platform-espressif32 gitBranch=Arduino/IDF5
+  # Do not renovate until we have switched to pioarduino tagged builds
   https://github.com/Jason2866/platform-espressif32/archive/22faa566df8c789000f8136cd8d0aca49617af55.zip
 build_flags =
   ${arduino_base.build_flags}
@@ -32,7 +32,7 @@ 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=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@^0.4.0
+  rweather/Crypto@0.4.0
 
 build_src_filter = 
  ${esp32_base.build_src_filter} -<mesh/http> 
diff --git a/arch/nrf52/nrf52.ini b/arch/nrf52/nrf52.ini
index d49d8920c..4a77ec4b2 100644
--- a/arch/nrf52/nrf52.ini
+++ b/arch/nrf52/nrf52.ini
@@ -28,7 +28,8 @@ build_src_filter =
 lib_deps=
   ${arduino_base.lib_deps}
   ${radiolib_base.lib_deps}
-  rweather/Crypto@^0.4.0
+  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
+  rweather/Crypto@0.4.0
 
 lib_ignore =
   BluetoothOTA
diff --git a/arch/portduino/portduino.ini b/arch/portduino/portduino.ini
index 6af3a7717..a19c50319 100644
--- a/arch/portduino/portduino.ini
+++ b/arch/portduino/portduino.ini
@@ -25,7 +25,7 @@ lib_deps =
   ${radiolib_base.lib_deps}
   ${environmental_base.lib_deps}
   # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@^0.4.0
+  rweather/Crypto@0.4.0
   # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
   lovyan03/LovyanGFX@^1.2.0
   # renovate: datasource=git-refs depName=libch341-spi-userspace packageName=https://github.com/pine64/libch341-spi-userspace gitBranch=main
diff --git a/platformio.ini b/platformio.ini
index fcece8639..636ef3c25 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -107,7 +107,7 @@ lib_deps =
 
 [device-ui_base]
 lib_deps =
-	# renovate: datasource=git-refs depName=meshtastic-device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
+	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
 	https://github.com/meshtastic/device-ui/archive/b9e2ad1222db9f5a5080248b2f018c250f0efae5.zip
 
 ; Common libs for environmental measurements in telemetry module
diff --git a/renovate.json b/renovate.json
index 11d35aff8..e88bfb4e1 100644
--- a/renovate.json
+++ b/renovate.json
@@ -69,5 +69,11 @@
       "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}git{{/if}}"
     }
   ],
-  "packageRules": []
+  "packageRules": [
+    {
+      "matchPackageNames": ["meshtastic/device-ui"],
+      "reviewers": ["mverch67"],
+      "changelogUrl": "https://github.com/meshtastic/device-ui/compare/{{currentDigest}}...{{newDigest}}"
+    }
+  ]
 }

From a32e45f8f2082d2b009298018802bd646383d2a5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 5 May 2025 05:16:51 -0500
Subject: [PATCH 11/22] Upgrade trunk (#6737)

Co-authored-by: sachaw <11172820+sachaw@users.noreply.github.com>
---
 .trunk/trunk.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index 92cd5b316..c55635d9c 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -16,7 +16,7 @@ lint:
     - terrascan@1.19.9
     - trivy@0.61.1
     - taplo@0.9.3
-    - ruff@0.11.7
+    - ruff@0.11.8
     - isort@6.0.1
     - markdownlint@0.44.0
     - oxipng@9.1.5

From 2d6181fca0efabacb56ccc5a01f35df0ccc3cdbd Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Mon, 5 May 2025 07:03:36 -0400
Subject: [PATCH 12/22] update bosch bsec2 (#6727)

Co-authored-by: Ben Meadors <benmmeadors@gmail.com>
---
 platformio.ini                                      | 8 ++++----
 variants/Dongle_nRF52840-pca10059-v1/platformio.ini | 1 -
 variants/ELECROW-ThinkNode-M1/platformio.ini        | 2 --
 variants/ME25LS01-4Y10TD/platformio.ini             | 1 -
 variants/ME25LS01-4Y10TD_e-ink/platformio.ini       | 1 -
 variants/MS24SF1/platformio.ini                     | 1 -
 variants/MakePython_nRF52840_eink/platformio.ini    | 1 -
 variants/MakePython_nRF52840_oled/platformio.ini    | 1 -
 variants/Seeed_Solar_Node/platformio.ini            | 1 -
 variants/canaryone/platformio.ini                   | 1 -
 variants/diy/platformio.ini                         | 3 ---
 variants/ec_catsniffer/platformio.ini               | 1 -
 variants/feather_diy/platformio.ini                 | 1 -
 variants/feather_rp2040_rfm95/platformio.ini        | 1 -
 variants/heltec_mesh_node_t114/platformio.ini       | 1 -
 variants/heltec_mesh_pocket/platformio.ini          | 4 ----
 variants/meshlink/platformio.ini                    | 1 -
 variants/meshlink_eink/platformio.ini               | 1 -
 variants/monteops_hw1/platformio.ini                | 1 -
 variants/nano-g2-ultra/platformio.ini               | 1 -
 variants/nibble_rp2040/platformio.ini               | 1 -
 variants/rak11310/platformio.ini                    | 1 -
 variants/rak2560/platformio.ini                     | 1 -
 variants/rak4631/platformio.ini                     | 1 -
 variants/rak4631_epaper/platformio.ini              | 1 -
 variants/rak4631_epaper_onrxtx/platformio.ini       | 1 -
 variants/rak4631_eth_gw/platformio.ini              | 1 -
 variants/rak_wismeshtap/platformio.ini              | 1 -
 variants/rp2040-lora/platformio.ini                 | 1 -
 variants/rpipico-slowclock/platformio.ini           | 1 -
 variants/rpipico/platformio.ini                     | 1 -
 variants/rpipico2/platformio.ini                    | 1 -
 variants/rpipico2w/platformio.ini                   | 1 -
 variants/rpipicow/platformio.ini                    | 1 -
 variants/seeed_xiao_nrf52840_kit/platformio.ini     | 1 -
 variants/senselora_rp2040/platformio.ini            | 1 -
 variants/t-echo/platformio.ini                      | 2 --
 variants/tlora_c6/platformio.ini                    | 1 -
 variants/tracker-t1000-e/platformio.ini             | 1 -
 variants/wio-sdk-wm1110/platformio.ini              | 1 -
 variants/wio-t1000-s/platformio.ini                 | 1 -
 variants/wio-tracker-wm1110/platformio.ini          | 1 -
 variants/xiao_ble/platformio.ini                    | 1 -
 43 files changed, 4 insertions(+), 53 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index 636ef3c25..ba41b386d 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -148,7 +148,7 @@ lib_deps =
 	# renovate: datasource=custom.pio depName=Adafruit MLX90614 packageName=adafruit/library/Adafruit MLX90614 Library
 	adafruit/Adafruit MLX90614 Library@2.1.5
 	# renovate: datasource=custom.pio depName=Bosch BME68x packageName=boschsensortec/library/BME68x Sensor Library
-	boschsensortec/BME68x Sensor Library@1.1.40407
+	boschsensortec/BME68x Sensor Library@1.2.40408
 	# renovate: datasource=github-tags depName=INA3221 packageName=KodinLanewave/INA3221
 	https://github.com/KodinLanewave/INA3221/archive/1.0.1.zip
 	# renovate: datasource=custom.pio depName=QMC5883L Compass packageName=mprograms/library/QMC5883LCompass
@@ -185,7 +185,7 @@ lib_deps =
 	sparkfun/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library@1.3.0
 	# renovate: datasource=custom.pio depName=ClosedCube OPT3001 packageName=closedcube/library/ClosedCube OPT3001
 	ClosedCube OPT3001@1.1.2
-	# renovate: datasource=github-tags depName=Bosch BSEC2 packageName=boschsensortec/Bosch-BSEC2-Library
-	 https://github.com/boschsensortec/Bosch-BSEC2-Library/archive/v1.7.2502.zip
+	# renovate: datasource=git-refs depName=Bosch BSEC2 packageName=https://github.com/meshtastic/Bosch-BSEC2-Library gitBranch=extra_script
+	https://github.com/meshtastic/Bosch-BSEC2-Library/archive/e16952dfe5addd4287e1eb8c4f6ecac0fa3dd3de.zip
 	# renovate: datasource=git-refs depName=meshtastic-DFRobot_LarkWeatherStation packageName=https://github.com/meshtastic/DFRobot_LarkWeatherStation gitBranch=master
-	https://github.com/meshtastic/DFRobot_LarkWeatherStation/archive/4de3a9cadef0f6a5220a8a906cf9775b02b0040d.zip
\ No newline at end of file
+	https://github.com/meshtastic/DFRobot_LarkWeatherStation/archive/4de3a9cadef0f6a5220a8a906cf9775b02b0040d.zip
diff --git a/variants/Dongle_nRF52840-pca10059-v1/platformio.ini b/variants/Dongle_nRF52840-pca10059-v1/platformio.ini
index 9e87fd237..ad944779d 100644
--- a/variants/Dongle_nRF52840-pca10059-v1/platformio.ini
+++ b/variants/Dongle_nRF52840-pca10059-v1/platformio.ini
@@ -3,7 +3,6 @@ board_level = extra
 extends = nrf52840_base
 board = nordic_pca10059
 build_flags = ${nrf52840_base.build_flags} -Ivariants/Dongle_nRF52840-pca10059-v1 -D NORDIC_PCA10059
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DEINK_DISPLAY_MODEL=GxEPD2_420_M01
   -DEINK_WIDTH=300
   -DEINK_HEIGHT=400
diff --git a/variants/ELECROW-ThinkNode-M1/platformio.ini b/variants/ELECROW-ThinkNode-M1/platformio.ini
index 86fbde398..2e9a20dfe 100644
--- a/variants/ELECROW-ThinkNode-M1/platformio.ini
+++ b/variants/ELECROW-ThinkNode-M1/platformio.ini
@@ -9,7 +9,6 @@ debug_tool = jlink
 build_flags = ${nrf52840_base.build_flags} -Ivariants/ELECROW-ThinkNode-M1
   -DELECROW_ThinkNode_M1
   -DGPS_POWER_TOGGLE
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DUSE_EINK
   -DEINK_DISPLAY_MODEL=GxEPD2_154_D67
   -DEINK_WIDTH=200
@@ -39,7 +38,6 @@ build_flags =
   ${inkhud.build_flags}
   -I variants/ELECROW-ThinkNode-M1
   -D ELECROW_ThinkNode_M1
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = 
   ${nrf52_base.build_src_filter} 
   ${inkhud.build_src_filter}
diff --git a/variants/ME25LS01-4Y10TD/platformio.ini b/variants/ME25LS01-4Y10TD/platformio.ini
index bd764e107..b452f0ad8 100644
--- a/variants/ME25LS01-4Y10TD/platformio.ini
+++ b/variants/ME25LS01-4Y10TD/platformio.ini
@@ -4,7 +4,6 @@ board = me25ls01-4y10td
 board_level = extra
 ; platform = https://github.com/maxgerhardt/platform-nordicnrf52#cac6fcf943a41accd2aeb4f3659ae297a73f422e
 build_flags = ${nrf52840_base.build_flags} -Ivariants/ME25LS01-4Y10TD -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DME25LS01_4Y10TD
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/ME25LS01-4Y10TD>
diff --git a/variants/ME25LS01-4Y10TD_e-ink/platformio.ini b/variants/ME25LS01-4Y10TD_e-ink/platformio.ini
index fb9bd27d5..f9788a521 100644
--- a/variants/ME25LS01-4Y10TD_e-ink/platformio.ini
+++ b/variants/ME25LS01-4Y10TD_e-ink/platformio.ini
@@ -4,7 +4,6 @@ board = me25ls01-4y10td
 board_level = extra
 ; platform = https://github.com/maxgerhardt/platform-nordicnrf52#cac6fcf943a41accd2aeb4f3659ae297a73f422e
 build_flags = ${nrf52840_base.build_flags} -Ivariants/ME25LS01-4Y10TD_e-ink -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DME25LS01_4Y10TD
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DEINK_DISPLAY_MODEL=GxEPD2_420_GDEY042T81
   -DEINK_WIDTH=400
diff --git a/variants/MS24SF1/platformio.ini b/variants/MS24SF1/platformio.ini
index e109a3270..10e8d2c95 100644
--- a/variants/MS24SF1/platformio.ini
+++ b/variants/MS24SF1/platformio.ini
@@ -4,7 +4,6 @@ board = ms24sf1
 board_level = extra
 ; platform = https://github.com/maxgerhardt/platform-nordicnrf52#cac6fcf943a41accd2aeb4f3659ae297a73f422e
 build_flags = ${nrf52840_base.build_flags} -Ivariants/MS24SF1 -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/MS24SF1>
diff --git a/variants/MakePython_nRF52840_eink/platformio.ini b/variants/MakePython_nRF52840_eink/platformio.ini
index 9e2d5bbf7..ef97172e9 100644
--- a/variants/MakePython_nRF52840_eink/platformio.ini
+++ b/variants/MakePython_nRF52840_eink/platformio.ini
@@ -3,7 +3,6 @@ board_level = extra
 extends = nrf52840_base
 board = nordic_pca10059
 build_flags = ${nrf52840_base.build_flags} -Ivariants/MakePython_nRF52840_eink -D PRIVATE_HW
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -D PIN_EINK_EN
   -DEINK_DISPLAY_MODEL=GxEPD2_290_T5D
   -DEINK_WIDTH=296
diff --git a/variants/MakePython_nRF52840_oled/platformio.ini b/variants/MakePython_nRF52840_oled/platformio.ini
index 25dd36c08..57b9ecb79 100644
--- a/variants/MakePython_nRF52840_oled/platformio.ini
+++ b/variants/MakePython_nRF52840_oled/platformio.ini
@@ -3,7 +3,6 @@ board_level = extra
 extends = nrf52840_base
 board = nordic_pca10059
 build_flags = ${nrf52840_base.build_flags} -Ivariants/MakePython_nRF52840_oled -D PRIVATE_HW
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/MakePython_nRF52840_oled>
 lib_deps = 
   ${nrf52840_base.lib_deps}
diff --git a/variants/Seeed_Solar_Node/platformio.ini b/variants/Seeed_Solar_Node/platformio.ini
index 9651d3a77..5ee0a5e8f 100644
--- a/variants/Seeed_Solar_Node/platformio.ini
+++ b/variants/Seeed_Solar_Node/platformio.ini
@@ -6,7 +6,6 @@ build_flags = ${nrf52840_base.build_flags}
   -I $PROJECT_DIR/variants/Seeed_Solar_Node 
   -D SEEED_SOLAR_NODE 
   -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/Seeed_Solar_Node>
 lib_deps =
diff --git a/variants/canaryone/platformio.ini b/variants/canaryone/platformio.ini
index 5e01c3763..ad11305db 100644
--- a/variants/canaryone/platformio.ini
+++ b/variants/canaryone/platformio.ini
@@ -6,7 +6,6 @@ debug_tool = jlink
 
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = ${nrf52840_base.build_flags} -Ivariants/canaryone
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/canaryone>
 lib_deps = 
   ${nrf52840_base.lib_deps}
diff --git a/variants/diy/platformio.ini b/variants/diy/platformio.ini
index 825c464a2..d8ceee9cc 100644
--- a/variants/diy/platformio.ini
+++ b/variants/diy/platformio.ini
@@ -50,7 +50,6 @@ board_level = extra
 build_flags = ${nrf52840_base.build_flags}
   -I variants/diy/nrf52_promicro_diy_xtal
   -D NRF52_PROMICRO_DIY
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/diy/nrf52_promicro_diy_xtal>
 lib_deps = 
   ${nrf52840_base.lib_deps}
@@ -64,7 +63,6 @@ board = promicro-nrf52840
 build_flags = ${nrf52840_base.build_flags}
   -I variants/diy/nrf52_promicro_diy_tcxo
   -D NRF52_PROMICRO_DIY
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/diy/nrf52_promicro_diy_tcxo>
 lib_deps = 
   ${nrf52840_base.lib_deps}
@@ -77,7 +75,6 @@ extends = nrf52840_base
 board_level = extra
 build_flags = ${nrf52840_base.build_flags} -Ivariants/diy/seeed-xiao-nrf52840-wio-sx1262 -D PRIVATE_HW
   -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/diy/seeed-xiao-nrf52840-wio-sx1262>
 lib_deps =
diff --git a/variants/ec_catsniffer/platformio.ini b/variants/ec_catsniffer/platformio.ini
index 9afb44236..6db9abe90 100644
--- a/variants/ec_catsniffer/platformio.ini
+++ b/variants/ec_catsniffer/platformio.ini
@@ -8,7 +8,6 @@ build_flags = ${rp2040_base.build_flags}
   -Ivariants/ec_catsniffer
   -DDEBUG_RP2040_PORT=Serial
   # -DHW_SPI1_DEVICE
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
 lib_deps =
   ${rp2040_base.lib_deps}
 debug_build_flags = ${rp2040_base.build_flags}, -g
diff --git a/variants/feather_diy/platformio.ini b/variants/feather_diy/platformio.ini
index 82dbb317c..84c582ab0 100644
--- a/variants/feather_diy/platformio.ini
+++ b/variants/feather_diy/platformio.ini
@@ -3,7 +3,6 @@
 extends = nrf52840_base
 board = adafruit_feather_nrf52840
 build_flags = ${nrf52840_base.build_flags} -Ivariants/feather_diy -Dfeather_diy
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/feather_diy>
 lib_deps = 
   ${nrf52840_base.lib_deps}
diff --git a/variants/feather_rp2040_rfm95/platformio.ini b/variants/feather_rp2040_rfm95/platformio.ini
index a28ad7655..db1eb4f02 100644
--- a/variants/feather_rp2040_rfm95/platformio.ini
+++ b/variants/feather_rp2040_rfm95/platformio.ini
@@ -9,7 +9,6 @@ build_flags = ${rp2040_base.build_flags}
   -Ivariants/feather_rp2040_rfm95
   -DDEBUG_RP2040_PORT=Serial
   -DHW_SPI1_DEVICE
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
 lib_deps =
   ${rp2040_base.lib_deps}
 debug_build_flags = ${rp2040_base.build_flags}
diff --git a/variants/heltec_mesh_node_t114/platformio.ini b/variants/heltec_mesh_node_t114/platformio.ini
index 4f83d8516..3ba97bd04 100644
--- a/variants/heltec_mesh_node_t114/platformio.ini
+++ b/variants/heltec_mesh_node_t114/platformio.ini
@@ -6,7 +6,6 @@ debug_tool = jlink
 
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = ${nrf52840_base.build_flags} -Ivariants/heltec_mesh_node_t114
-        -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
         -DGPS_POWER_TOGGLE
         -DHELTEC_T114
 
diff --git a/variants/heltec_mesh_pocket/platformio.ini b/variants/heltec_mesh_pocket/platformio.ini
index 53f56e973..6632c10fe 100644
--- a/variants/heltec_mesh_pocket/platformio.ini
+++ b/variants/heltec_mesh_pocket/platformio.ini
@@ -6,7 +6,6 @@ debug_tool = jlink
 
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = ${nrf52840_base.build_flags} -Ivariants/heltec_mesh_pocket
-        -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DHELTEC_MESH_POCKET
   -DHELTEC_MESH_POCKET_BATTERY_5000
   -DUSE_EINK
@@ -36,7 +35,6 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/heltec_mesh_pock
 build_flags = 
   ${inkhud.build_flags}
   ${nrf52840_base.build_flags} 
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -I variants/heltec_mesh_pocket
   -D HELTEC_MESH_POCKET
   -D HELTEC_MESH_POCKET_BATTERY_5000
@@ -53,7 +51,6 @@ debug_tool = jlink
 
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = ${nrf52840_base.build_flags} -Ivariants/heltec_mesh_pocket
-        -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DHELTEC_MESH_POCKET
   -DHELTEC_MESH_POCKET_BATTERY_10000
   -DUSE_EINK
@@ -83,7 +80,6 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/heltec_mesh_pock
 build_flags = 
   ${inkhud.build_flags}
   ${nrf52840_base.build_flags} 
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -I variants/heltec_mesh_pocket
   -D HELTEC_MESH_POCKET
   -D HELTEC_MESH_POCKET_BATTERY_10000
diff --git a/variants/meshlink/platformio.ini b/variants/meshlink/platformio.ini
index ec3506b0e..384858576 100644
--- a/variants/meshlink/platformio.ini
+++ b/variants/meshlink/platformio.ini
@@ -6,7 +6,6 @@ extends = nrf52840_base
 board = meshlink
 ;board_check = true
 build_flags = ${nrf52840_base.build_flags} -I variants/meshlink -D MESHLINK
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -D EINK_DISPLAY_MODEL=GxEPD2_213_B74
   -D EINK_WIDTH=250
diff --git a/variants/meshlink_eink/platformio.ini b/variants/meshlink_eink/platformio.ini
index f8ee96fc3..550b1e2fc 100644
--- a/variants/meshlink_eink/platformio.ini
+++ b/variants/meshlink_eink/platformio.ini
@@ -6,7 +6,6 @@ extends = nrf52840_base
 board = meshlink
 ;board_check = true
 build_flags = ${nrf52840_base.build_flags} -I variants/meshlink_eink -D MESHLINK
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -D GPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -D EINK_DISPLAY_MODEL=GxEPD2_213_B74
   -D EINK_WIDTH=250
diff --git a/variants/monteops_hw1/platformio.ini b/variants/monteops_hw1/platformio.ini
index 1464ca7e7..82567f614 100644
--- a/variants/monteops_hw1/platformio.ini
+++ b/variants/monteops_hw1/platformio.ini
@@ -4,7 +4,6 @@ board_level = extra
 extends = nrf52840_base
 board = wiscore_rak4631
 build_flags = ${nrf52840_base.build_flags} -Ivariants/monteops_hw1 -D MONTEOPS_HW1
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/monteops_hw1> +<mesh/eth/> +<mesh/api/> +<mqtt/>
 lib_deps = 
   ${nrf52840_base.lib_deps}
diff --git a/variants/nano-g2-ultra/platformio.ini b/variants/nano-g2-ultra/platformio.ini
index 913b38e3f..7da168b47 100644
--- a/variants/nano-g2-ultra/platformio.ini
+++ b/variants/nano-g2-ultra/platformio.ini
@@ -5,7 +5,6 @@ board = nano-g2-ultra
 debug_tool = jlink
 
 build_flags = ${nrf52840_base.build_flags} -Ivariants/nano-g2-ultra -D NANO_G2_ULTRA
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nano-g2-ultra>
 lib_deps = 
   ${nrf52840_base.lib_deps}
diff --git a/variants/nibble_rp2040/platformio.ini b/variants/nibble_rp2040/platformio.ini
index ad987895f..c3a1923c5 100644
--- a/variants/nibble_rp2040/platformio.ini
+++ b/variants/nibble_rp2040/platformio.ini
@@ -10,7 +10,6 @@ build_flags = ${rp2040_base.build_flags}
   -Ivariants/nibble_rp2040
   -DDEBUG_RP2040_PORT=Serial
   -DHW_SPI1_DEVICE
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
 lib_deps =
   ${rp2040_base.lib_deps}
 debug_build_flags = ${rp2040_base.build_flags}, -g
diff --git a/variants/rak11310/platformio.ini b/variants/rak11310/platformio.ini
index c87304e61..fd7e842cc 100644
--- a/variants/rak11310/platformio.ini
+++ b/variants/rak11310/platformio.ini
@@ -9,7 +9,6 @@ build_flags = ${rp2040_base.build_flags}
   -Ivariants/rak11310
   -DDEBUG_RP2040_PORT=Serial
   -DRV3028_RTC=0x52
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
 build_src_filter = ${rp2040_base.build_src_filter} +<../variants/rak11310> +<mesh/eth/> +<mesh/api/> +<mqtt/>
 lib_deps =
   ${rp2040_base.lib_deps}
diff --git a/variants/rak2560/platformio.ini b/variants/rak2560/platformio.ini
index faed231f1..8a720ce5a 100644
--- a/variants/rak2560/platformio.ini
+++ b/variants/rak2560/platformio.ini
@@ -4,7 +4,6 @@ extends = nrf52840_base
 board = wiscore_rak4631
 board_check = true
 build_flags = ${nrf52840_base.build_flags} -Ivariants/rak2560 -D RAK_4631
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DRADIOLIB_EXCLUDE_SX128X=1
   -DRADIOLIB_EXCLUDE_SX127X=1
diff --git a/variants/rak4631/platformio.ini b/variants/rak4631/platformio.ini
index 1c6bdabcf..f2d68e704 100644
--- a/variants/rak4631/platformio.ini
+++ b/variants/rak4631/platformio.ini
@@ -4,7 +4,6 @@ extends = nrf52840_base
 board = wiscore_rak4631
 board_check = true
 build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631 -D RAK_4631
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
   -DEINK_WIDTH=250
diff --git a/variants/rak4631_epaper/platformio.ini b/variants/rak4631_epaper/platformio.ini
index b851691ed..7c8a299bb 100644
--- a/variants/rak4631_epaper/platformio.ini
+++ b/variants/rak4631_epaper/platformio.ini
@@ -3,7 +3,6 @@
 extends = nrf52840_base
 board = wiscore_rak4631
 build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631_epaper -D RAK_4631
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
   -DEINK_WIDTH=250
   -DEINK_HEIGHT=122
diff --git a/variants/rak4631_epaper_onrxtx/platformio.ini b/variants/rak4631_epaper_onrxtx/platformio.ini
index 8612a3f3d..c749fc686 100644
--- a/variants/rak4631_epaper_onrxtx/platformio.ini
+++ b/variants/rak4631_epaper_onrxtx/platformio.ini
@@ -4,7 +4,6 @@ board_level = extra
 extends = nrf52840_base
 board = wiscore_rak4631
 build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631_epaper -D RAK_4631
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -D PIN_EINK_EN=34
   -D EINK_DISPLAY_MODEL=GxEPD2_213_BN
   -D EINK_WIDTH=250
diff --git a/variants/rak4631_eth_gw/platformio.ini b/variants/rak4631_eth_gw/platformio.ini
index e3da21c55..492ca374b 100644
--- a/variants/rak4631_eth_gw/platformio.ini
+++ b/variants/rak4631_eth_gw/platformio.ini
@@ -4,7 +4,6 @@ extends = nrf52840_base
 board = wiscore_rak4631
 board_check = true
 build_flags = ${nrf52840_base.build_flags} -Ivariants/rak4631_eth_gw -D RAK_4631
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
   -DEINK_WIDTH=250
diff --git a/variants/rak_wismeshtap/platformio.ini b/variants/rak_wismeshtap/platformio.ini
index 78472783e..6ed97c7ad 100644
--- a/variants/rak_wismeshtap/platformio.ini
+++ b/variants/rak_wismeshtap/platformio.ini
@@ -3,7 +3,6 @@
 extends = nrf52840_base
 board = wiscore_rak4631
 build_flags = ${nrf52840_base.build_flags} -Ivariants/rak_wismeshtap -DWISMESH_TAP -DRAK_4631
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DEINK_DISPLAY_MODEL=GxEPD2_213_BN
   -DEINK_WIDTH=250
diff --git a/variants/rp2040-lora/platformio.ini b/variants/rp2040-lora/platformio.ini
index 4c578fb2b..7ac5b2cac 100644
--- a/variants/rp2040-lora/platformio.ini
+++ b/variants/rp2040-lora/platformio.ini
@@ -9,7 +9,6 @@ build_flags = ${rp2040_base.build_flags}
   -Ivariants/rp2040-lora
   -DDEBUG_RP2040_PORT=Serial
   -DHW_SPI1_DEVICE
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
 lib_deps =
   ${rp2040_base.lib_deps}
 debug_build_flags = ${rp2040_base.build_flags}, -g
diff --git a/variants/rpipico-slowclock/platformio.ini b/variants/rpipico-slowclock/platformio.ini
index c21994249..c56f9e78c 100644
--- a/variants/rpipico-slowclock/platformio.ini
+++ b/variants/rpipico-slowclock/platformio.ini
@@ -19,7 +19,6 @@ build_flags = ${rp2040_base.build_flags}
   -Ivariants/rpipico-slowclock
   -DDEBUG_RP2040_PORT=Serial2
   -DHW_SPI1_DEVICE
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
   -g
   -DNO_USB
 lib_deps =
diff --git a/variants/rpipico/platformio.ini b/variants/rpipico/platformio.ini
index 9c62ebcb5..e34cfa43b 100644
--- a/variants/rpipico/platformio.ini
+++ b/variants/rpipico/platformio.ini
@@ -9,7 +9,6 @@ build_flags = ${rp2040_base.build_flags}
   -Ivariants/rpipico
   -DDEBUG_RP2040_PORT=Serial
   -DHW_SPI1_DEVICE
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
 lib_deps =
   ${rp2040_base.lib_deps}
 debug_build_flags = ${rp2040_base.build_flags}, -g
diff --git a/variants/rpipico2/platformio.ini b/variants/rpipico2/platformio.ini
index de4954ea2..066809a91 100644
--- a/variants/rpipico2/platformio.ini
+++ b/variants/rpipico2/platformio.ini
@@ -9,7 +9,6 @@ build_flags = ${rp2350_base.build_flags}
   -Ivariants/rpipico2
   -DDEBUG_RP2040_PORT=Serial
   -DHW_SPI1_DEVICE
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m33"
 lib_deps =
   ${rp2350_base.lib_deps}
 debug_build_flags = ${rp2350_base.build_flags}, -g
diff --git a/variants/rpipico2w/platformio.ini b/variants/rpipico2w/platformio.ini
index 282be1a42..0fac1e9ce 100644
--- a/variants/rpipico2w/platformio.ini
+++ b/variants/rpipico2w/platformio.ini
@@ -21,7 +21,6 @@ build_flags = ${rp2350_base.build_flags}
   -DARDUINO_RASPBERRY_PI_PICO_2W
   -DARDUINO_ARCH_RP2040
   -DHAS_WIFI=1
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m33"
   -fexceptions  # for exception handling in MQTT
   -DHAS_UDP_MULTICAST=1
 build_src_filter = ${rp2350_base.build_src_filter} +<mesh/wifi/>
diff --git a/variants/rpipicow/platformio.ini b/variants/rpipicow/platformio.ini
index 4b714434a..e59944b5d 100644
--- a/variants/rpipicow/platformio.ini
+++ b/variants/rpipicow/platformio.ini
@@ -8,7 +8,6 @@ build_flags = ${rp2040_base.build_flags}
   -DRPI_PICO
   -Ivariants/rpipicow
   -DHW_SPI1_DEVICE
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
   -fexceptions  # for exception handling in MQTT
   -DHAS_UDP_MULTICAST=1
 build_src_filter = ${rp2040_base.build_src_filter} +<mesh/wifi/>
diff --git a/variants/seeed_xiao_nrf52840_kit/platformio.ini b/variants/seeed_xiao_nrf52840_kit/platformio.ini
index 41956249b..0a8bee31c 100644
--- a/variants/seeed_xiao_nrf52840_kit/platformio.ini
+++ b/variants/seeed_xiao_nrf52840_kit/platformio.ini
@@ -3,7 +3,6 @@
 extends = nrf52840_base
 board = xiao_ble_sense
 build_flags = ${nrf52840_base.build_flags} -Ivariants/seeed_xiao_nrf52840_kit -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52  -DSEEED_XIAO_NRF52840_KIT
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/seeed_xiao_nrf52840_kit>
 lib_deps = 
diff --git a/variants/senselora_rp2040/platformio.ini b/variants/senselora_rp2040/platformio.ini
index 852ecbbb9..b05fc1f8b 100644
--- a/variants/senselora_rp2040/platformio.ini
+++ b/variants/senselora_rp2040/platformio.ini
@@ -9,6 +9,5 @@ build_flags = ${rp2040_base.build_flags}
   -DSENSELORA_RP2040
   -Ivariants/senselora_rp2040
   -DDEBUG_RP2040_PORT=Serial
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m0plus"
 lib_deps =
   ${rp2040_base.lib_deps}
\ No newline at end of file
diff --git a/variants/t-echo/platformio.ini b/variants/t-echo/platformio.ini
index 59fd52ccd..85c3b5799 100644
--- a/variants/t-echo/platformio.ini
+++ b/variants/t-echo/platformio.ini
@@ -8,7 +8,6 @@ debug_tool = jlink
 # add -DCFG_SYSVIEW if you want to use the Segger systemview tool for OS profiling.
 build_flags = ${nrf52840_base.build_flags} -Ivariants/t-echo
   -DGPS_POWER_TOGGLE
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DEINK_DISPLAY_MODEL=GxEPD2_154_D67
   -DEINK_WIDTH=200
   -DEINK_HEIGHT=200
@@ -33,7 +32,6 @@ build_flags =
   ${nrf52840_base.build_flags}
   ${inkhud.build_flags}
   -I variants/t-echo
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = 
   ${nrf52_base.build_src_filter} 
   ${inkhud.build_src_filter}
diff --git a/variants/tlora_c6/platformio.ini b/variants/tlora_c6/platformio.ini
index d042cd78b..2da10138a 100644
--- a/variants/tlora_c6/platformio.ini
+++ b/variants/tlora_c6/platformio.ini
@@ -7,4 +7,3 @@ build_flags =
   -I variants/tlora_c6
   -DARDUINO_USB_CDC_ON_BOOT=1
   -DARDUINO_USB_MODE=1
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/esp32c3"
\ No newline at end of file
diff --git a/variants/tracker-t1000-e/platformio.ini b/variants/tracker-t1000-e/platformio.ini
index 64da61434..b1f11d524 100644
--- a/variants/tracker-t1000-e/platformio.ini
+++ b/variants/tracker-t1000-e/platformio.ini
@@ -2,7 +2,6 @@
 extends = nrf52840_base
 board = tracker-t1000-e
 build_flags = ${nrf52840_base.build_flags} -Ivariants/tracker-t1000-e -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DTRACKER_T1000_E
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DGPS_POWER_TOGGLE
   -DMESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR_EXTERNAL=1
   -DMESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
diff --git a/variants/wio-sdk-wm1110/platformio.ini b/variants/wio-sdk-wm1110/platformio.ini
index e77455bcf..4e1415678 100644
--- a/variants/wio-sdk-wm1110/platformio.ini
+++ b/variants/wio-sdk-wm1110/platformio.ini
@@ -10,7 +10,6 @@ extra_scripts =
 # Remove adafruit USB serial from the build (it is incompatible with using the ch340 serial chip on this board)
 build_unflags = ${nrf52840_base:build_unflags} -DUSBCON -DUSE_TINYUSB
 build_flags = ${nrf52840_base.build_flags} -Ivariants/wio-sdk-wm1110 -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DWIO_WM1110
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
   -DCFG_TUD_CDC=0
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
diff --git a/variants/wio-t1000-s/platformio.ini b/variants/wio-t1000-s/platformio.ini
index cb1cf86f7..2eab1e1c5 100644
--- a/variants/wio-t1000-s/platformio.ini
+++ b/variants/wio-t1000-s/platformio.ini
@@ -4,7 +4,6 @@ extends = nrf52840_base
 board = wio-t1000-s
 board_level = extra
 build_flags = ${nrf52840_base.build_flags} -Ivariants/wio-t1000-s -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DWIO_WM1110
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/wio-t1000-s>
diff --git a/variants/wio-tracker-wm1110/platformio.ini b/variants/wio-tracker-wm1110/platformio.ini
index 614fea588..a6960b435 100644
--- a/variants/wio-tracker-wm1110/platformio.ini
+++ b/variants/wio-tracker-wm1110/platformio.ini
@@ -3,7 +3,6 @@
 extends = nrf52840_base
 board = wio-tracker-wm1110
 build_flags = ${nrf52840_base.build_flags} -Ivariants/wio-tracker-wm1110 -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -DWIO_WM1110
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
   -DGPS_POWER_TOGGLE ; comment this line to disable triple press function on the user button to turn off gps entirely.
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/wio-tracker-wm1110>
diff --git a/variants/xiao_ble/platformio.ini b/variants/xiao_ble/platformio.ini
index 6c47780d5..6fa1dd611 100644
--- a/variants/xiao_ble/platformio.ini
+++ b/variants/xiao_ble/platformio.ini
@@ -4,7 +4,6 @@ extends = nrf52840_base
 board = xiao_ble_sense
 board_level = extra
 build_flags = ${nrf52840_base.build_flags} -Ivariants/xiao_ble -Isrc/platform/nrf52/softdevice -Isrc/platform/nrf52/softdevice/nrf52 -D EBYTE_E22 -DEBYTE_E22_900M30S -DPRIVATE_HW
-  -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 board_build.ldscript = src/platform/nrf52/nrf52840_s140_v7.ld
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/xiao_ble>
 lib_deps = 

From a2903921cd2cd2d949764318b931d7b5acd7b7dc Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Tue, 6 May 2025 12:09:01 -0400
Subject: [PATCH 13/22] Renovate: fix device-ui match (#6748)

---
 renovate.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/renovate.json b/renovate.json
index e88bfb4e1..3403e7211 100644
--- a/renovate.json
+++ b/renovate.json
@@ -71,7 +71,7 @@
   ],
   "packageRules": [
     {
-      "matchPackageNames": ["meshtastic/device-ui"],
+      "matchDepNames": ["meshtastic/device-ui"],
       "reviewers": ["mverch67"],
       "changelogUrl": "https://github.com/meshtastic/device-ui/compare/{{currentDigest}}...{{newDigest}}"
     }

From fdbe16f650f12e3b635b444933e4b244808256ee Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 6 May 2025 11:09:14 -0500
Subject: [PATCH 14/22] Bump release version (#6743)

* automated bumps

* Bump org.meshtastic.meshtasticd, fix GHA

---------

Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>
Co-authored-by: vidplace7 <vidplace7@gmail.com>
---
 .github/workflows/release_channels.yml      | 16 ++++++----------
 bin/org.meshtastic.meshtasticd.metainfo.xml |  3 +++
 debian/changelog                            |  8 ++++++--
 version.properties                          |  2 +-
 4 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/release_channels.yml b/.github/workflows/release_channels.yml
index 12d66b9c2..6f216b411 100644
--- a/.github/workflows/release_channels.yml
+++ b/.github/workflows/release_channels.yml
@@ -63,21 +63,17 @@ jobs:
         with:
           python-version: 3.x
 
-      - name: Get release version string
-        run: |
-          echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-          echo "short=$(./bin/buildinfo.py short)" >> $GITHUB_OUTPUT
-          echo "deb=$(./bin/buildinfo.py deb)" >> $GITHUB_OUTPUT
-        id: version
-        env:
-          BUILD_LOCATION: local
-
       - name: Bump version.properties
         run: |
           # Bump version.properties
           chmod +x ./bin/bump_version.py
           ./bin/bump_version.py
 
+      - name: Get new release version string
+        run: |
+          echo "short=$(./bin/buildinfo.py short)" >> $GITHUB_OUTPUT
+        id: new_version
+
       - name: Ensure debian deps are installed
         run: |
           sudo apt-get update -y --fix-missing
@@ -94,7 +90,7 @@ jobs:
           # Bump org.meshtastic.meshtasticd.metainfo.xml
           pip install -r bin/bump_metainfo/requirements.txt -q
           chmod +x ./bin/bump_metainfo/bump_metainfo.py
-          ./bin/bump_metainfo/bump_metainfo.py --file bin/org.meshtastic.meshtasticd.metainfo.xml "${{ steps.version.outputs.short }}"
+          ./bin/bump_metainfo/bump_metainfo.py --file bin/org.meshtastic.meshtasticd.metainfo.xml "${{ steps.new_version.outputs.short }}"
         env:
           PIP_DISABLE_PIP_VERSION_CHECK: 1
 
diff --git a/bin/org.meshtastic.meshtasticd.metainfo.xml b/bin/org.meshtastic.meshtasticd.metainfo.xml
index 2cfba3523..b98b54dd4 100644
--- a/bin/org.meshtastic.meshtasticd.metainfo.xml
+++ b/bin/org.meshtastic.meshtasticd.metainfo.xml
@@ -87,6 +87,9 @@
   </screenshots>
 
   <releases>
+    <release version="2.6.8" date="2025-05-05">
+      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.8</url>
+    </release>
     <release version="2.6.7" date="2025-04-28">
       <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.7</url>
     </release>
diff --git a/debian/changelog b/debian/changelog
index 3ec57b805..8fce06c14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,13 @@
-meshtasticd (2.5.22.0) UNRELEASED; urgency=medium
+meshtasticd (2.6.8.0) UNRELEASED; urgency=medium
 
+  [ Austin Lane ]
   * Initial packaging
   * GitHub Actions Automatic version bump
   * GitHub Actions Automatic version bump
   * GitHub Actions Automatic version bump
   * GitHub Actions Automatic version bump
 
- -- Austin Lane <github-actions[bot]@users.noreply.github.com>  Wed, 05 Feb 2025 01:10:33 +0000
+  [  ]
+  * GitHub Actions Automatic version bump
+
+ --  <github-actions[bot]@users.noreply.github.com>  Tue, 06 May 2025 01:32:49 +0000
diff --git a/version.properties b/version.properties
index 5baa63dc2..bedba21b7 100644
--- a/version.properties
+++ b/version.properties
@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 6
-build = 7
+build = 8

From dd2cf633b0e3e3df348e1aaef91fb009879cfe67 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 6 May 2025 11:09:25 -0500
Subject: [PATCH 15/22] Upgrade trunk (#6745)

Co-authored-by: sachaw <11172820+sachaw@users.noreply.github.com>
---
 .trunk/trunk.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.trunk/trunk.yaml b/.trunk/trunk.yaml
index c55635d9c..364ed746b 100644
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -10,8 +10,8 @@ lint:
   enabled:
     - renovate@40.0.6
     - prettier@3.5.3
-    - trufflehog@3.88.26
-    - yamllint@1.37.0
+    - trufflehog@3.88.27
+    - yamllint@1.37.1
     - bandit@1.8.3
     - terrascan@1.19.9
     - trivy@0.61.1

From 1e81ebed06ca954a22ea8046732e86a5d3b8844c Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 6 May 2025 11:14:45 -0500
Subject: [PATCH 16/22] chore(deps): update meshtastic/device-ui digest to
 35576e1 (#6747)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index ba41b386d..70a607f2f 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -108,7 +108,7 @@ lib_deps =
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/b9e2ad1222db9f5a5080248b2f018c250f0efae5.zip
+	https://github.com/meshtastic/device-ui/archive/35576e131e250f259878ea81819a90df837d1307.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]

From 867f50ab111cdb07269c123e9ecaf70b1d5fb2e3 Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Tue, 6 May 2025 13:03:01 -0400
Subject: [PATCH 17/22] Don't run `test-native` for event firmwares (#6749)

---
 .github/workflows/main_matrix.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/main_matrix.yml b/.github/workflows/main_matrix.yml
index a9c4cbb52..9b9877e04 100644
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -149,6 +149,7 @@ jobs:
     secrets: inherit
 
   test-native:
+    if: ${{ !contains(github.ref_name, 'event/') }}
     uses: ./.github/workflows/test_native.yml
 
   docker-deb-amd64:

From 62421a83fd602fc2c5fc17ed655de8ce1fe0d224 Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Tue, 6 May 2025 13:12:25 -0400
Subject: [PATCH 18/22] Fix EVENT_MODE on mqttless targets (#6750)

---
 src/mesh/Channels.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/mesh/Channels.cpp b/src/mesh/Channels.cpp
index 4d061f80f..2ba3499f1 100644
--- a/src/mesh/Channels.cpp
+++ b/src/mesh/Channels.cpp
@@ -345,7 +345,7 @@ void Channels::setChannel(const meshtastic_Channel &c)
 
 bool Channels::anyMqttEnabled()
 {
-#if USERPREFS_EVENT_MODE
+#if USERPREFS_EVENT_MODE && !MESHTASTIC_EXCLUDE_MQTT
     // Don't publish messages on the public MQTT broker if we are in event mode
     if (mqtt && mqtt->isUsingDefaultServer()) {
         return false;

From 57d6c1fa8512bf18c1a2483d2362857b1705c065 Mon Sep 17 00:00:00 2001
From: Austin <vidplace7@gmail.com>
Date: Tue, 6 May 2025 18:05:22 -0400
Subject: [PATCH 19/22] Fix event templates (names, PSKs) (#6753)

---
 userPrefs.jsonc | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/userPrefs.jsonc b/userPrefs.jsonc
index eb6dc64b6..06c4a7eec 100644
--- a/userPrefs.jsonc
+++ b/userPrefs.jsonc
@@ -7,14 +7,14 @@
   // "USERPREFS_CHANNEL_0_PSK": "{ 0x38, 0x4b, 0xbc, 0xc0, 0x1d, 0xc0, 0x22, 0xd1, 0x81, 0xbf, 0x36, 0xb8, 0x61, 0x21, 0xe1, 0xfb, 0x96, 0xb7, 0x2e, 0x55, 0xbf, 0x74, 0x22, 0x7e, 0x9d, 0x6a, 0xfb, 0x48, 0xd6, 0x4c, 0xb1, 0xa1 }",
   // "USERPREFS_CHANNEL_0_UPLINK_ENABLED": "true",
   // "USERPREFS_CHANNEL_1_DOWNLINK_ENABLED": "false",
-  // "USERPREFS_CHANNEL_1_NAME": "Node Build Chat",
+  // "USERPREFS_CHANNEL_1_NAME": "NodeChat",
   // "USERPREFS_CHANNEL_1_PRECISION": "14",
-  // "USERPREFS_CHANNEL_1_PSK": "{ 0x38, 0x4b, 0xbc, 0xc0, 0x1d, 0xc0, 0x22, 0xd1, 0x81, 0xbf, 0x36, 0xb8, 0x61, 0x21, 0xe1, 0xfb, 0x96, 0xb7, 0x2e, 0x55, 0xbf, 0x74, 0x22, 0x7e, 0x9d, 0x6a, 0xfb, 0x48, 0xd6, 0x4c, 0xb1, 0xa2 }",
+  // "USERPREFS_CHANNEL_1_PSK": "{ 0x4e, 0x22, 0x1d, 0x8b, 0xc3, 0x09, 0x1b, 0xe2, 0x11, 0x9c, 0x89, 0x12, 0xf2, 0x25, 0x19, 0x5d, 0x15, 0x3e, 0x30, 0x7b, 0x86, 0xb6, 0xec, 0xc4, 0x6a, 0xc3, 0x96, 0x5e, 0x9e, 0x10, 0x9d, 0xd5 }",
   // "USERPREFS_CHANNEL_1_UPLINK_ENABLED": "false",
   // "USERPREFS_CHANNEL_2_DOWNLINK_ENABLED": "false",
-  // "USERPREFS_CHANNEL_2_NAME": "Equipment Exchange",
+  // "USERPREFS_CHANNEL_2_NAME": "YardSale",
   // "USERPREFS_CHANNEL_2_PRECISION": "14",
-  // "USERPREFS_CHANNEL_2_PSK": "{ 0x38, 0x4b, 0xbc, 0xc0, 0x1d, 0xc0, 0x22, 0xd1, 0x81, 0xbf, 0x36, 0xb8, 0x61, 0x21, 0xe1, 0xfb, 0x96, 0xb7, 0x2e, 0x55, 0xbf, 0x74, 0x22, 0x7e, 0x9d, 0x6a, 0xfb, 0x48, 0xd6, 0x4c, 0xb1, 0xa3 }",
+  // "USERPREFS_CHANNEL_2_PSK": "{ 0x15, 0x6f, 0xfe, 0x46, 0xd4, 0x56, 0x63, 0x8a, 0x54, 0x43, 0x13, 0xf2, 0xef, 0x6c, 0x63, 0x89, 0xf0, 0x06, 0x30, 0x52, 0xce, 0x36, 0x5e, 0xb1, 0xe8, 0xbb, 0x86, 0xe6, 0x26, 0x5b, 0x1d, 0x58 }",
   // "USERPREFS_CHANNEL_2_UPLINK_ENABLED": "false",
   // "USERPREFS_CONFIG_GPS_MODE": "meshtastic_Config_PositionConfig_GpsMode_ENABLED",
   // "USERPREFS_CONFIG_LORA_IGNORE_MQTT": "true",

From 86217111b26885b2f92235388afc5d41575de94d Mon Sep 17 00:00:00 2001
From: Benjamin Faershtein <119711889+RCGV1@users.noreply.github.com>
Date: Wed, 7 May 2025 04:28:18 -0700
Subject: [PATCH 20/22] Update SECURITY.md (#6757)

---
 SECURITY.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/SECURITY.md b/SECURITY.md
index fb4d9005a..5092595e1 100644
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -4,8 +4,8 @@
 
 | Firmware Version | Supported          |
 | ---------------- | ------------------ |
-| 2.5.x            | :white_check_mark: |
-| <= 2.4.x         | :x:                |
+| 2.6.x            | :white_check_mark: |
+| <= 2.5.x         | :x:                |
 
 ## Reporting a Vulnerability
 

From 6f256c06f6ce078137bb6b6a06b60714a90964f5 Mon Sep 17 00:00:00 2001
From: Ben Meadors <benmmeadors@gmail.com>
Date: Wed, 7 May 2025 09:26:10 -0500
Subject: [PATCH 21/22] Fix warning

---
 src/modules/SerialModule.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/modules/SerialModule.cpp b/src/modules/SerialModule.cpp
index e088b4612..8d280581c 100644
--- a/src/modules/SerialModule.cpp
+++ b/src/modules/SerialModule.cpp
@@ -513,7 +513,7 @@ void SerialModule::processWXSerial()
                     // Extract the current line
                     char line[meshtastic_Constants_DATA_PAYLOAD_LEN];
                     memset(line, '\0', sizeof(line));
-                    if (lineEnd - lineStart < sizeof(line) - 1) {
+                    if ((size_t)(lineEnd - lineStart) < sizeof(line) - 1) {
                         memcpy(line, &serialBytes[lineStart], lineEnd - lineStart);
 
                         ParsedLine parsed = parseLine(line);

From b657ba1abbaad875ba11877cbc35e45ee737c031 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Wed, 7 May 2025 13:27:44 -0500
Subject: [PATCH 22/22] chore(deps): update sparkfun 9dof imu breakout icm
 20948 to v1.3.2 (#6761)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
 platformio.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platformio.ini b/platformio.ini
index 70a607f2f..706e01b44 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -182,7 +182,7 @@ lib_deps =
 	# renovate: datasource=custom.pio depName=SparkFun Qwiic Scale NAU7802 packageName=sparkfun/library/SparkFun Qwiic Scale NAU7802 Arduino Library
 	sparkfun/SparkFun Qwiic Scale NAU7802 Arduino Library@1.0.6
 	# renovate: datasource=custom.pio depName=SparkFun 9DoF IMU Breakout ICM 20948 packageName=sparkfun/library/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library
-	sparkfun/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library@1.3.0
+	sparkfun/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library@1.3.2
 	# renovate: datasource=custom.pio depName=ClosedCube OPT3001 packageName=closedcube/library/ClosedCube OPT3001
 	ClosedCube OPT3001@1.1.2
 	# renovate: datasource=git-refs depName=Bosch BSEC2 packageName=https://github.com/meshtastic/Bosch-BSEC2-Library gitBranch=extra_script