Merge branch 'meshtastic:master' into T-beam-display-no-touch

.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.8
     - 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]

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

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> 

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

arch/portduino/portduino.ini

@@ -2,7 +2,7 @@
 [portduino_base]
 platform =
   # renovate: datasource=git-refs depName=platform-native packageName=https://github.com/meshtastic/platform-native gitBranch=develop
-  https://github.com/meshtastic/platform-native/archive/e19f77e034590669feaaf26214667b76d0821d06.zip
+  https://github.com/meshtastic/platform-native/archive/622341c6de8a239704318b10c3dbb00c21a3eab3.zip
 framework = arduino
 
 build_src_filter = 
@@ -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

platformio.ini

@@ -107,8 +107,8 @@ 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/8113d4ff5a63280834acfeb7584f179cdc6376b6.zip
+	# 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
 [environmental_base]
@@ -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

protobufs

@@ -1 +1 @@
-Subproject commit 27fac39141d99fe727a0a1824c5397409b1aea75
+Subproject commit 078ac8dfbe5f7533d7755cbe2ca3d08d86e5af34

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}}"
+    }
+  ]
 }

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};

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,

src/graphics/Screen.cpp

@@ -2883,9 +2883,6 @@ int Screen::handleInputEvent(const InputEvent *event)
 
 int Screen::handleAdminMessage(const meshtastic_AdminMessage *arg)
 {
-    // Note: only selected admin messages notify this observer
-    // If you wish to handle a new type of message, you should modify AdminModule.cpp first
-
     switch (arg->which_payload_variant) {
     // Node removed manually (i.e. via app)
     case meshtastic_AdminMessage_remove_by_nodenum_tag:

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()

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()

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();
 
@@ -135,6 +143,32 @@ template <typename T> class FlashData
     }
 };
 
+// Erase contents of the NicheGraphics data directory
+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
+
+    // While the directory still contains files
+    while (file) {
+        std::string path = "/NicheGraphics/";
+        path += file.name();
+        LOG_DEBUG("Erasing %s", path.c_str());
+        file.close();
+        FSCom.remove(path.c_str());
+
+        file = dir.openNextFile();
+    }
+#else
+    LOG_ERROR("ERROR: Filesystem not implemented\n");
+#endif
+}
+
 } // namespace NicheGraphics
 
 #endif

src/graphics/niche/InkHUD/Events.cpp

@@ -3,11 +3,13 @@
 #include "./Events.h"
 
 #include "RTC.h"
+#include "modules/AdminModule.h"
 #include "modules/TextMessageModule.h"
 #include "sleep.h"
 
 #include "./Applet.h"
 #include "./SystemApplet.h"
+#include "graphics/niche/FlashData.h"
 
 using namespace NicheGraphics;
 
@@ -25,6 +27,9 @@ void InkHUD::Events::begin()
     deepSleepObserver.observe(&notifyDeepSleep);
     rebootObserver.observe(&notifyReboot);
     textMessageObserver.observe(textMessageModule);
+#if !MESHTASTIC_EXCLUDE_ADMIN
+    adminMessageObserver.observe(adminModule);
+#endif
 #ifdef ARCH_ESP32
     lightSleepObserver.observe(&notifyLightSleep);
 #endif
@@ -117,8 +122,13 @@ int InkHUD::Events::beforeReboot(void *unused)
         sa->onReboot();
     }
 
+    // Save settings to flash, or erase if factory reset in progress
+    if (!eraseOnReboot) {
         inkhud->persistence->saveSettings();
         inkhud->persistence->saveLatestMessage();
+    } else {
+        NicheGraphics::clearFlashData();
+    }
 
     // Note: no forceUpdate call here
     // We don't have any final screen to draw, although LogoApplet::onReboot did already display a "rebooting" screen
@@ -171,6 +181,23 @@ int InkHUD::Events::onReceiveTextMessage(const meshtastic_MeshPacket *packet)
     return 0; // Tell caller to continue notifying other observers. (No reason to abort this event)
 }
 
+int InkHUD::Events::onAdminMessage(const meshtastic_AdminMessage *message)
+{
+    switch (message->which_payload_variant) {
+    // Factory reset
+    // Two possible messages. One preserves BLE bonds, other wipes. Both should clear InkHUD data.
+    case meshtastic_AdminMessage_factory_reset_device_tag:
+    case meshtastic_AdminMessage_factory_reset_config_tag:
+        eraseOnReboot = true;
+        break;
+
+    default:
+        break;
+    }
+
+    return 0; // Tell caller to continue notifying other observers. (No reason to abort this event)
+}
+
 #ifdef ARCH_ESP32
 // Callback for lightSleepObserver
 // Make sure the display is not partway through an update when we begin light sleep

src/graphics/niche/InkHUD/Events.h

@@ -33,6 +33,7 @@ class Events
     int beforeDeepSleep(void *unused);                             // Prepare for shutdown
     int beforeReboot(void *unused);                                // Prepare for reboot
     int onReceiveTextMessage(const meshtastic_MeshPacket *packet); // Store most recent text message
+    int onAdminMessage(const meshtastic_AdminMessage *message);    // Handle incoming admin messages
 #ifdef ARCH_ESP32
     int beforeLightSleep(void *unused); // Prepare for light sleep
 #endif
@@ -52,10 +53,17 @@ class Events
     CallbackObserver<Events, const meshtastic_MeshPacket *> textMessageObserver =
         CallbackObserver<Events, const meshtastic_MeshPacket *>(this, &Events::onReceiveTextMessage);
 
+    // Get notified of incoming admin messages, and handle any which are relevant to InkHUD
+    CallbackObserver<Events, const meshtastic_AdminMessage *> adminMessageObserver =
+        CallbackObserver<Events, const meshtastic_AdminMessage *>(this, &Events::onAdminMessage);
+
 #ifdef ARCH_ESP32
     // Get notified when the system is entering light sleep
     CallbackObserver<Events, void *> lightSleepObserver = CallbackObserver<Events, void *>(this, &Events::beforeLightSleep);
 #endif
+
+    // If set, InkHUD's data will be erased during onReboot
+    bool eraseOnReboot = false;
 };
 
 } // namespace NicheGraphics::InkHUD

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());

src/graphics/niche/InkHUD/docs/README.md

@@ -502,6 +502,10 @@ Applets themselves do also listen separately for various events, but for the pur
 
 Button input is sometimes handled by a system applet. `InkHUD::Events` determines whether the button should be handled by a specific system applet, or should instead trigger a default behavior
 
+#### Factory Reset
+
+The Events class handles the admin messages(s) which trigger factory reset. We set `Events::eraseOnReboot = true`, which causes `Events::onReboot` to erase the contents of InkHUD's data directory. We do this because some applets (e.g. ThreadedMessageApplet) save their own data to flash, so if we erased earlier, that data would get re-written during reboot.
+
 ---
 
 ### `InkHUD::Applet`

src/graphics/tftSetup.cpp

@@ -11,6 +11,7 @@
 
 #ifdef ARCH_PORTDUINO
 #include "PortduinoGlue.h"
+#include <thread>
 #endif
 
 DeviceScreen *deviceScreen = nullptr;
@@ -26,14 +27,12 @@ CallbackObserver<DeviceScreen, esp_sleep_wakeup_cause_t> endSleepObserver =
 void tft_task_handler(void *param = nullptr)
 {
     while (true) {
-        if (deviceScreen) {
         spiLock->lock();
         deviceScreen->task_handler();
         spiLock->unlock();
         deviceScreen->sleep();
     }
 }
-}
 
 void tftSetup(void)
 {
@@ -44,10 +43,10 @@ void tftSetup(void)
 #else
     if (settingsMap[displayPanel] != no_screen) {
         DisplayDriverConfig displayConfig;
-        static char *panels[] = {"NOSCREEN", "X11",     "ST7789",  "ST7735",  "ST7735S", "ST7796",
-                                 "ILI9341",  "ILI9342", "ILI9486", "ILI9488", "HX8357D"};
+        static char *panels[] = {"NOSCREEN", "X11",     "FB",      "ST7789",  "ST7735",  "ST7735S",
+                                 "ST7796",   "ILI9341", "ILI9342", "ILI9486", "ILI9488", "HX8357D"};
         static char *touch[] = {"NOTOUCH", "XPT2046", "STMPE610", "GT911", "FT5x06"};
-#ifdef USE_X11
+#if defined(USE_X11)
         if (settingsMap[displayPanel] == x11) {
             if (settingsMap[displayWidth] && settingsMap[displayHeight])
                 displayConfig = DisplayDriverConfig(DisplayDriverConfig::device_t::X11, (uint16_t)settingsMap[displayWidth],
@@ -55,6 +54,14 @@ void tftSetup(void)
             else
                 displayConfig.device(DisplayDriverConfig::device_t::X11);
         } else
+#elif defined(USE_FRAMEBUFFER)
+        if (settingsMap[displayPanel] == fb) {
+            if (settingsMap[displayWidth] && settingsMap[displayHeight])
+                displayConfig = DisplayDriverConfig(DisplayDriverConfig::device_t::FB, (uint16_t)settingsMap[displayWidth],
+                                                    (uint16_t)settingsMap[displayHeight]);
+            else
+                displayConfig.device(DisplayDriverConfig::device_t::FB);
+        } else
 #endif
         {
             displayConfig.device(DisplayDriverConfig::device_t::CUSTOM_TFT)
@@ -116,11 +123,15 @@ void tftSetup(void)
     }
 #endif
 
+    if (deviceScreen) {
 #ifdef ARCH_ESP32
         tftSleepObserver.observe(&notifyLightSleep);
         endSleepObserver.observe(&notifyLightSleepEnd);
         xTaskCreatePinnedToCore(tft_task_handler, "tft", 10240, NULL, 1, NULL, 0);
+#elif defined(ARCH_PORTDUINO)
+        std::thread *tft_task = new std::thread([] { tft_task_handler(); });
 #endif
     }
+}
 
 #endif

src/main.cpp

@@ -124,8 +124,8 @@ extern void tftSetup(void);
 #endif
 
 #ifdef HAS_UDP_MULTICAST
-#include "mesh/udp/UdpMulticastThread.h"
-UdpMulticastThread *udpThread = nullptr;
+#include "mesh/udp/UdpMulticastHandler.h"
+UdpMulticastHandler *udpHandler = nullptr;
 #endif
 
 #if defined(TCXO_OPTIONAL)
@@ -918,12 +918,12 @@ void setup()
 
 #ifdef HAS_UDP_MULTICAST
     LOG_DEBUG("Start multicast thread");
-    udpThread = new UdpMulticastThread();
+    udpHandler = new UdpMulticastHandler();
 #ifdef ARCH_PORTDUINO
     // FIXME: portduino does not ever call onNetworkConnected so call it here because I don't know what happen if I call
     // onNetworkConnected there
     if (config.network.enabled_protocols & meshtastic_Config_NetworkConfig_ProtocolFlags_UDP_BROADCAST) {
-        udpThread->start();
+        udpHandler->start();
     }
 #endif
 #endif

src/main.h

@@ -51,8 +51,8 @@ extern AudioThread *audioThread;
 #endif
 
 #ifdef HAS_UDP_MULTICAST
-#include "mesh/udp/UdpMulticastThread.h"
-extern UdpMulticastThread *udpThread;
+#include "mesh/udp/UdpMulticastHandler.h"
+extern UdpMulticastHandler *udpHandler;
 #endif
 
 // Global Screen singleton.

src/mesh/Default.h

@@ -6,6 +6,7 @@
 #define ONE_MINUTE_MS 60 * 1000
 #define THIRTY_SECONDS_MS 30 * 1000
 #define FIVE_SECONDS_MS 5 * 1000
+#define TEN_SECONDS_MS 10 * 1000
 
 #define min_default_telemetry_interval_secs 30 * 60
 #define default_gps_update_interval IF_ROUTER(ONE_DAY, 2 * 60)

src/mesh/PhoneAPI.cpp

@@ -649,8 +649,10 @@ bool PhoneAPI::handleToRadioPacket(meshtastic_MeshPacket &p)
         meshtastic_QueueStatus qs = router->getQueueStatus();
         service->sendQueueStatusToPhone(qs, 0, p.id);
         return false;
-    } else if (p.decoded.portnum == meshtastic_PortNum_POSITION_APP && lastPortNumToRadio[p.decoded.portnum] &&
-               Throttle::isWithinTimespanMs(lastPortNumToRadio[p.decoded.portnum], FIVE_SECONDS_MS)) {
+    } else if (IS_ONE_OF(meshtastic_PortNum_POSITION_APP, meshtastic_PortNum_WAYPOINT_APP, meshtastic_PortNum_ALERT_APP) &&
+               lastPortNumToRadio[p.decoded.portnum] &&
+               Throttle::isWithinTimespanMs(lastPortNumToRadio[p.decoded.portnum], TEN_SECONDS_MS)) {
+        // TODO: [Issue #6700] Make this rate limit throttling scale up / down with the preset
         LOG_WARN("Rate limit portnum %d", p.decoded.portnum);
         meshtastic_QueueStatus qs = router->getQueueStatus();
         service->sendQueueStatusToPhone(qs, 0, p.id);

src/mesh/Router.cpp

@@ -293,8 +293,8 @@ ErrorCode Router::send(meshtastic_MeshPacket *p)
     }
 
 #if HAS_UDP_MULTICAST
-    if (udpThread && config.network.enabled_protocols & meshtastic_Config_NetworkConfig_ProtocolFlags_UDP_BROADCAST) {
-        udpThread->onSend(const_cast<meshtastic_MeshPacket *>(p));
+    if (udpHandler && config.network.enabled_protocols & meshtastic_Config_NetworkConfig_ProtocolFlags_UDP_BROADCAST) {
+        udpHandler->onSend(const_cast<meshtastic_MeshPacket *>(p));
     }
 #endif
 

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

src/mesh/udp/UdpMulticastHandler.h

@@ -13,12 +13,11 @@
 #endif // HAS_ETHERNET
 
 #define UDP_MULTICAST_DEFAUL_PORT 4403 // Default port for UDP multicast is same as TCP api server
-#define UDP_MULTICAST_THREAD_INTERVAL_MS 15000
 
-class UdpMulticastThread : public concurrency::OSThread
+class UdpMulticastHandler final
 {
   public:
-    UdpMulticastThread() : OSThread("UdpMulticast") { udpIpAddress = IPAddress(224, 0, 0, 69); }
+    UdpMulticastHandler() { udpIpAddress = IPAddress(224, 0, 0, 69); }
 
     void start()
     {
@@ -71,14 +70,6 @@ class UdpMulticastThread : public concurrency::OSThread
         return true;
     }
 
-  protected:
-    int32_t runOnce() override
-    {
-        canSleep = true;
-        // TODO: Implement nodeinfo broadcast
-        return UDP_MULTICAST_THREAD_INTERVAL_MS;
-    }
-
   private:
     IPAddress udpIpAddress;
     AsyncUDP udp;

src/mesh/wifi/WiFiAPClient.cpp

@@ -133,8 +133,8 @@ static void onNetworkConnected()
     }
 
 #if HAS_UDP_MULTICAST
-    if (udpThread && config.network.enabled_protocols & meshtastic_Config_NetworkConfig_ProtocolFlags_UDP_BROADCAST) {
-        udpThread->start();
+    if (udpHandler && config.network.enabled_protocols & meshtastic_Config_NetworkConfig_ProtocolFlags_UDP_BROADCAST) {
+        udpHandler->start();
     }
 #endif
 }

src/modules/AdminModule.cpp

@@ -284,7 +284,6 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
     case meshtastic_AdminMessage_remove_by_nodenum_tag: {
         LOG_INFO("Client received remove_nodenum command");
         nodeDB->removeNodeByNum(r->remove_by_nodenum);
-        this->notifyObservers(r); // Observed by screen
         break;
     }
     case meshtastic_AdminMessage_set_favorite_node_tag: {
@@ -444,6 +443,9 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
         myReply = allocErrorResponse(meshtastic_Routing_Error_NONE, &mp);
     }
 
+    // Allow any observers (e.g. the UI) to respond to this event
+    notifyObservers(r);
+
     return handled;
 }
 

src/platform/portduino/PortduinoGlue.cpp

@@ -531,6 +531,8 @@ bool loadConfig(const char *configPath)
                 settingsMap[displayPanel] = hx8357d;
             else if (yamlConfig["Display"]["Panel"].as<std::string>("") == "X11")
                 settingsMap[displayPanel] = x11;
+            else if (yamlConfig["Display"]["Panel"].as<std::string>("") == "FB")
+                settingsMap[displayPanel] = fb;
             settingsMap[displayHeight] = yamlConfig["Display"]["Height"].as<int>(0);
             settingsMap[displayWidth] = yamlConfig["Display"]["Width"].as<int>(0);
             settingsMap[displayDC] = yamlConfig["Display"]["DC"].as<int>(-1);

src/platform/portduino/PortduinoGlue.h

@@ -102,7 +102,7 @@ enum configNames {
     available_directory,
     mac_address
 };
-enum { no_screen, x11, st7789, st7735, st7735s, st7796, ili9341, ili9342, ili9486, ili9488, hx8357d };
+enum { no_screen, x11, fb, st7789, st7735, st7735s, st7796, ili9341, ili9342, ili9486, ili9488, hx8357d };
 enum { no_touchscreen, xpt2046, stmpe610, gt911, ft5x06 };
 enum { level_error, level_warn, level_info, level_debug, level_trace };
 

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",

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

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}

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>

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

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>

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

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}

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 =

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}

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 =

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

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}

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}

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
 

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

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

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

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}

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}

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

variants/portduino/platformio.ini

@@ -43,6 +43,37 @@ build_src_filter =
   ${native_base.build_src_filter}
   -<graphics/TFTDisplay.cpp>
 
+[env:native-fb]
+extends = native_base
+build_type = release
+lib_deps =
+  ${native_base.lib_deps}
+  ${device-ui_base.lib_deps}
+board_level = extra
+build_flags = ${native_base.build_flags} -Os -ffunction-sections -fdata-sections -Wl,--gc-sections
+  -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
+  -D RAM_SIZE=8192
+  -D USE_FRAMEBUFFER=1
+  -D LV_COLOR_DEPTH=32
+  -D HAS_TFT=1
+  -D HAS_SCREEN=0
+  -D LV_BUILD_TEST=0
+  -D LV_USE_LOG=0
+  -D LV_USE_EVDEV=1
+  -D LV_LVGL_H_INCLUDE_SIMPLE
+  -D LV_CONF_INCLUDE_SIMPLE
+  -D LV_COMP_CONF_INCLUDE_SIMPLE
+  -D USE_LOG_DEBUG
+  -D LOG_DEBUG_INC=\"DebugConfiguration.h\"
+  -D USE_PACKET_API
+  -D VIEW_320x240
+  -D MAP_FULL_REDRAW
+  !pkg-config --libs libulfius --silence-errors || :
+  !pkg-config --libs openssl --silence-errors || :
+build_src_filter =
+  ${native_base.build_src_filter}
+  -<graphics/TFTDisplay.cpp>
+
 [env:native-tft-debug]
 extends = native_base
 build_type = debug

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}

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

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

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

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

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

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

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

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 =

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

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

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/>

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/>

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 = 

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}

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}

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"

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

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

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>

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>

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 =