Merge branch 'master' into tft-gui-work

.github/workflows/build_native.yml

@@ -14,7 +14,7 @@ jobs:
         shell: bash
         run: |
           sudo apt-get update --fix-missing
-          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev
+          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev libi2c-dev
 
       - name: Checkout code
         uses: actions/checkout@v4

.github/workflows/build_raspbian.yml

@@ -14,7 +14,7 @@ jobs:
         shell: bash
         run: |
           sudo apt-get update -y --fix-missing
-          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev
+          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev libi2c-dev
 
       - name: Checkout code
         uses: actions/checkout@v4

.github/workflows/build_raspbian_armv7l.yml

@@ -14,7 +14,7 @@ jobs:
         shell: bash
         run: |
           sudo apt-get update -y --fix-missing
-          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev
+          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev libi2c-dev
 
       - name: Checkout code
         uses: actions/checkout@v4

.github/workflows/package_amd64.yml

@@ -79,7 +79,7 @@ jobs:
           maintainer: Jonathan Bennett
           version: ${{ steps.version.outputs.version }} # refs/tags/v*.*.*
           arch: amd64
-          depends: libyaml-cpp0.7, openssl, libulfius2.7
+          depends: libyaml-cpp0.7, openssl, libulfius2.7, libi2c0
           desc: Native Linux Meshtastic binary.
 
       - uses: actions/upload-artifact@v4
@@ -87,4 +87,4 @@ jobs:
           name: meshtasticd_${{ steps.version.outputs.version }}_amd64.deb
           overwrite: true
           path: |
-            ./*.deb
+            ./*.deb

.github/workflows/package_raspbian.yml

@@ -79,7 +79,7 @@ jobs:
           maintainer: Jonathan Bennett
           version: ${{ steps.version.outputs.version }} # refs/tags/v*.*.*
           arch: arm64
-          depends: libyaml-cpp0.7, openssl, libulfius2.7
+          depends: libyaml-cpp0.7, openssl, libulfius2.7, libi2c0
           desc: Native Linux Meshtastic binary.
 
       - uses: actions/upload-artifact@v4
@@ -87,4 +87,4 @@ jobs:
           name: meshtasticd_${{ steps.version.outputs.version }}_arm64.deb
           overwrite: true
           path: |
-            ./*.deb
+            ./*.deb

.github/workflows/package_raspbian_armv7l.yml

@@ -79,7 +79,7 @@ jobs:
           maintainer: Jonathan Bennett
           version: ${{ steps.version.outputs.version }} # refs/tags/v*.*.*
           arch: armhf
-          depends: libyaml-cpp0.7, openssl, libulfius2.7
+          depends: libyaml-cpp0.7, openssl, libulfius2.7, libi2c0
           desc: Native Linux Meshtastic binary.
 
       - uses: actions/upload-artifact@v4
@@ -87,4 +87,4 @@ jobs:
           name: meshtasticd_${{ steps.version.outputs.version }}_armhf.deb
           overwrite: true
           path: |
-            ./*.deb
+            ./*.deb

.github/workflows/tests.yml

@@ -8,12 +8,15 @@ on:
 jobs:
   test-simulator:
     runs-on: ubuntu-latest
+    env:
+      LCOV_CAPTURE_FLAGS: --quiet --capture --include "${PWD}/src/*" --exclude '*/src/mesh/generated/*' --directory .pio/build/coverage/src --base-directory "${PWD}"
     steps:
-      - name: Install libbluetooth
+      - name: Install libs needed for native build
         shell: bash
         run: |
           sudo apt-get update --fix-missing
-          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev
+          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev libi2c-dev
+          sudo apt-get install -y lcov
 
       - name: Checkout code
         uses: actions/checkout@v4
@@ -24,7 +27,7 @@ jobs:
         shell: bash
         run: |
           python -m pip install --upgrade pip
-          pip install -U platformio adafruit-nrfutil
+          pip install -U platformio adafruit-nrfutil dotmap
           pip install -U meshtastic --pre
 
       - name: Upgrade platformio
@@ -36,17 +39,25 @@ jobs:
         run: bin/build-native.sh
 
       # We now run integration test before other build steps (to quickly see runtime failures)
-      - name: Build for native
-        run: platformio run -e native
+      - name: Build for native/coverage
+        run: |
+          platformio run -e coverage
+          lcov ${{ env.LCOV_CAPTURE_FLAGS }} --initial --output-file coverage_base.info
 
       - name: Integration test
         run: |
-          .pio/build/native/program & sleep 10 # 5 seconds was not enough
+          .pio/build/coverage/program &
+          PID=$!
+          timeout 20 bash -c "until ls -al /proc/$PID/fd | grep socket; do sleep 1; done"
           echo "Simulator started, launching python test..."
           python3 -c 'from meshtastic.test import testSimulator; testSimulator()'
+          wait
+          lcov ${{ env.LCOV_CAPTURE_FLAGS }} --test-name integration --output-file coverage_integration.info
 
       - name: PlatformIO Tests
-        run: platformio test -e native --junit-output-path testreport.xml
+        run: |
+          platformio test -e coverage --junit-output-path testreport.xml
+          lcov ${{ env.LCOV_CAPTURE_FLAGS }} --test-name tests --output-file coverage_tests.info
 
       - name: Test Report
         uses: dorny/test-reporter@v1.9.1
@@ -56,6 +67,19 @@ jobs:
           path: testreport.xml
           reporter: java-junit
 
+      - name: Generate Code Coverage Report
+        run: |
+          lcov --quiet --add-tracefile coverage_base.info --add-tracefile coverage_integration.info --add-tracefile coverage_tests.info --output-file coverage_src.info
+          mkdir code-coverage-report
+          genhtml --quiet --legend --prefix "${PWD}" coverage_src.info --output-directory code-coverage-report
+          mv coverage_*.info code-coverage-report
+
+      - name: Save Code Coverage Report
+        uses: actions/upload-artifact@v4
+        with:
+          name: code-coverage-report
+          path: code-coverage-report
+
   hardware-tests:
     runs-on: test-runner
     steps:

arch/portduino/portduino.ini

@@ -1,6 +1,6 @@
 ; The Portduino based 'native' environment. Currently supported on Linux targets with real LoRa hardware (or simulated).
 [portduino_base]
-platform = https://github.com/meshtastic/platform-native.git#0e10e92627802594576ce831bb84e3127525b7dd
+platform = https://github.com/meshtastic/platform-native.git#562d189828f09fbf4c4093b3c0104bae9d8e9ff9
 framework = arduino
 
 build_src_filter = 
@@ -26,7 +26,7 @@ lib_deps =
   ${radiolib_base.lib_deps}
   rweather/Crypto@^0.4.0
   https://github.com/lovyan03/LovyanGFX.git#1401c28a47646fe00538d487adcb2eb3c72de805
-  https://github.com/pine64/libch341-spi-userspace#8695637adeabf5abf5601d8e82cb0ba19ce9ec46
+  https://github.com/pine64/libch341-spi-userspace#a9b17e3452f7fb747000d9b4ad4409155b39f6ef
 
 build_flags =
   ${arduino_base.build_flags}
@@ -39,4 +39,5 @@ build_flags =
   -lbluetooth
   -lgpiod
   -lyaml-cpp
+  -li2c
   -std=c++17

protobufs

@@ -1 +1 @@
-Subproject commit 2cffaf53e3faf1b6e41a8b8f05312f2f893be413
+Subproject commit c55f120a9c1ce90c85e4826907a0b9bcb2d5f5a2

src/DebugConfiguration.h

@@ -45,7 +45,7 @@
 #define LOG_CRIT(...) SEGGER_RTT_printf(0, __VA_ARGS__)
 #define LOG_TRACE(...) SEGGER_RTT_printf(0, __VA_ARGS__)
 #else
-#if defined(DEBUG_PORT) && !defined(DEBUG_MUTE) && !defined(PIO_UNIT_TESTING)
+#if defined(DEBUG_PORT) && !defined(DEBUG_MUTE)
 #define LOG_DEBUG(...) DEBUG_PORT.log(MESHTASTIC_LOG_LEVEL_DEBUG, __VA_ARGS__)
 #define LOG_INFO(...) DEBUG_PORT.log(MESHTASTIC_LOG_LEVEL_INFO, __VA_ARGS__)
 #define LOG_WARN(...) DEBUG_PORT.log(MESHTASTIC_LOG_LEVEL_WARN, __VA_ARGS__)

src/detect/ScanI2C.h

@@ -64,7 +64,8 @@ class ScanI2C
         TPS65233,
         MPR121KB,
         CGRADSENS,
-        INA226
+        INA226,
+        NXP_SE050,
     } DeviceType;
 
     // typedef uint8_t DeviceAddress;

src/detect/ScanI2CTwoWire.cpp

@@ -154,9 +154,14 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
         }
         i2cBus->beginTransmission(addr.address);
 #ifdef ARCH_PORTDUINO
-        if (i2cBus->read() != -1)
-            err = 0;
-        else
+        err = 2;
+        if ((addr.address >= 0x30 && addr.address <= 0x37) || (addr.address >= 0x50 && addr.address <= 0x5F)) {
+            if (i2cBus->read() != -1)
+                err = 0;
+        } else {
+            err = i2cBus->writeQuick((uint8_t)0);
+        }
+        if (err != 0)
             err = 2;
 #else
         err = i2cBus->endTransmission();
@@ -396,7 +401,6 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                 SCAN_SIMPLE_CASE(OPT3001_ADDR, OPT3001, "OPT3001", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(MLX90632_ADDR, MLX90632, "MLX90632", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(NAU7802_ADDR, NAU7802, "NAU7802", (uint8_t)addr.address);
-                SCAN_SIMPLE_CASE(FT6336U_ADDR, FT6336U, "FT6336U", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(MAX1704X_ADDR, MAX17048, "MAX17048", (uint8_t)addr.address);
 #ifdef HAS_TPS65233
                 SCAN_SIMPLE_CASE(TPS65233_ADDR, TPS65233, "TPS65233", (uint8_t)addr.address);
@@ -444,6 +448,26 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                 }
                 break;
 
+            case 0x48: {
+                i2cBus->beginTransmission(addr.address);
+                uint8_t getInfo[] = {0x5A, 0xC0, 0x00, 0xFF, 0xFC};
+                uint8_t expectedInfo[] = {0xa5, 0xE0, 0x00, 0x3F, 0x19};
+                uint8_t info[5];
+                size_t len = 0;
+                i2cBus->write(getInfo, 5);
+                i2cBus->endTransmission();
+                len = i2cBus->readBytes(info, 5);
+                if (len == 5 && memcmp(expectedInfo, info, len) == 0) {
+                    LOG_INFO("NXP SE050 crypto chip found\n");
+                    type = NXP_SE050;
+
+                } else {
+                    LOG_INFO("FT6336U touchscreen found\n");
+                    type = FT6336U;
+                }
+                break;
+            }
+
             default:
                 LOG_INFO("Device found at address 0x%x was not able to be enumerated", (uint8_t)addr.address);
             }

src/graphics/Screen.cpp

@@ -126,7 +126,7 @@ static bool heartbeat = false;
 /// Check if the display can render a string (detect special chars; emoji)
 static bool haveGlyphs(const char *str)
 {
-#if defined(OLED_PL) || defined(OLED_UA) || defined(OLED_RU)
+#if defined(OLED_PL) || defined(OLED_UA) || defined(OLED_RU) || defined(OLED_CS)
     // Don't want to make any assumptions about custom language support
     return true;
 #endif

src/graphics/Screen.h

@@ -427,6 +427,86 @@ class Screen : public concurrency::OSThread
         if (ch == 0xC2 || ch == 0xC3 || ch == 0x82 || ch == 0xD0 || ch == 0xD1)
             return (uint8_t)0;
 
+#endif
+
+#if defined(OLED_CS)
+
+        switch (last) {
+        case 0xC2: {
+            SKIPREST = false;
+            return (uint8_t)ch;
+        }
+
+        case 0xC3: {
+            SKIPREST = false;
+            return (uint8_t)(ch | 0xC0);
+        }
+
+        case 0xC4: {
+            SKIPREST = false;
+            if (ch == 140)
+                return (uint8_t)(129); // Č
+            if (ch == 141)
+                return (uint8_t)(138); // č
+            if (ch == 142)
+                return (uint8_t)(130); // Ď
+            if (ch == 143)
+                return (uint8_t)(139); // ď
+            if (ch == 154)
+                return (uint8_t)(131); // Ě
+            if (ch == 155)
+                return (uint8_t)(140); // ě
+            // Slovak specific glyphs
+            if (ch == 185)
+                return (uint8_t)(147); // Ĺ
+            if (ch == 186)
+                return (uint8_t)(148); // ĺ
+            if (ch == 189)
+                return (uint8_t)(149); // Ľ
+            if (ch == 190)
+                return (uint8_t)(150); // ľ
+            break;
+        }
+
+        case 0xC5: {
+            SKIPREST = false;
+            if (ch == 135)
+                return (uint8_t)(132); // Ň
+            if (ch == 136)
+                return (uint8_t)(141); // ň
+            if (ch == 152)
+                return (uint8_t)(133); // Ř
+            if (ch == 153)
+                return (uint8_t)(142); // ř
+            if (ch == 160)
+                return (uint8_t)(134); // Š
+            if (ch == 161)
+                return (uint8_t)(143); // š
+            if (ch == 164)
+                return (uint8_t)(135); // Ť
+            if (ch == 165)
+                return (uint8_t)(144); // ť
+            if (ch == 174)
+                return (uint8_t)(136); // Ů
+            if (ch == 175)
+                return (uint8_t)(145); // ů
+            if (ch == 189)
+                return (uint8_t)(137); // Ž
+            if (ch == 190)
+                return (uint8_t)(146); // ž
+            // Slovak specific glyphs
+            if (ch == 148)
+                return (uint8_t)(151); // Ŕ
+            if (ch == 149)
+                return (uint8_t)(152); // ŕ
+            break;
+        }
+        }
+
+        // We want to strip out prefix chars for two-byte char formats
+        if (ch == 0xC2 || ch == 0xC3 || ch == 0xC4 || ch == 0xC5)
+            return (uint8_t)0;
+
 #endif
 
         // If we already returned an unconvertable-character symbol for this unconvertable-character sequence, return NULs for the

src/graphics/ScreenFonts.h

@@ -12,6 +12,10 @@
 #include "graphics/fonts/OLEDDisplayFontsUA.h"
 #endif
 
+#ifdef OLED_CS
+#include "graphics/fonts/OLEDDisplayFontsCS.h"
+#endif
+
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
      defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS)) &&                                                         \
     !defined(DISPLAY_FORCE_SMALL_FONTS)
@@ -29,21 +33,33 @@
 #ifdef OLED_UA
 #define FONT_SMALL ArialMT_Plain_10_UA // Height: 13
 #else
+#ifdef OLED_CS
+#define FONT_SMALL ArialMT_Plain_10_CS
+#else
 #define FONT_SMALL ArialMT_Plain_10 // Height: 13
 #endif
 #endif
 #endif
+#endif
 #ifdef OLED_UA
 #define FONT_MEDIUM ArialMT_Plain_16_UA // Height: 19
 #else
+#ifdef OLED_CS
+#define FONT_MEDIUM ArialMT_Plain_16_CS
+#else
 #define FONT_MEDIUM ArialMT_Plain_16 // Height: 19
 #endif
+#endif
 #ifdef OLED_UA
 #define FONT_LARGE ArialMT_Plain_24_UA // Height: 28
 #else
+#ifdef OLED_CS
+#define FONT_LARGE ArialMT_Plain_24_CS // Height: 28
+#else
 #define FONT_LARGE ArialMT_Plain_24 // Height: 28
 #endif
 #endif
+#endif
 
 #define _fontHeight(font) ((font)[1] + 1) // height is position 1
 

src/graphics/fonts/OLEDDisplayFontsCS.h

@@ -0,0 +1,16 @@
+#ifndef OLEDDISPLAYFONTSCS_h
+#define OLEDDISPLAYFONTSCS_h
+
+#ifdef ARDUINO
+#include <Arduino.h>
+#elif __MBED__
+#define PROGMEM
+#endif
+
+/**
+ * Localization for Czech and Slovak language containing glyphs with diacritic.
+ */
+extern const uint8_t ArialMT_Plain_10_CS[] PROGMEM;
+extern const uint8_t ArialMT_Plain_16_CS[] PROGMEM;
+extern const uint8_t ArialMT_Plain_24_CS[] PROGMEM;
+#endif

src/mesh/Channels.cpp

@@ -318,7 +318,7 @@ bool Channels::anyMqttEnabled()
 {
 #if USERPREFS_EVENT_MODE
     // Don't publish messages on the public MQTT broker if we are in event mode
-    if (strcmp(moduleConfig.mqtt.address, default_mqtt_address) == 0) {
+    if (mqtt && mqtt.isUsingDefaultServer()) {
         return false;
     }
 #endif

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

@@ -58,7 +58,13 @@ typedef enum _meshtastic_Config_DeviceConfig_Role {
  Technical Details: Turns off many of the routine broadcasts to favor ATAK CoT packet stream
     and automatic TAK PLI (position location information) broadcasts.
     Uses position module configuration to determine TAK PLI broadcast interval. */
-    meshtastic_Config_DeviceConfig_Role_TAK_TRACKER = 10
+    meshtastic_Config_DeviceConfig_Role_TAK_TRACKER = 10,
+    /* Description: Will always rebroadcast packets, but will do so after all other modes.
+ Technical Details: Used for router nodes that are intended to provide additional coverage
+    in areas not already covered by other routers, or to bridge around problematic terrain,
+    but should not be given priority over other routers in order to avoid unnecessaraily
+    consuming hops. */
+    meshtastic_Config_DeviceConfig_Role_ROUTER_LATE = 11
 } meshtastic_Config_DeviceConfig_Role;
 
 /* Defines the device's behavior for how messages are rebroadcast */
@@ -588,8 +594,8 @@ extern "C" {
 
 /* Helper constants for enums */
 #define _meshtastic_Config_DeviceConfig_Role_MIN meshtastic_Config_DeviceConfig_Role_CLIENT
-#define _meshtastic_Config_DeviceConfig_Role_MAX meshtastic_Config_DeviceConfig_Role_TAK_TRACKER
-#define _meshtastic_Config_DeviceConfig_Role_ARRAYSIZE ((meshtastic_Config_DeviceConfig_Role)(meshtastic_Config_DeviceConfig_Role_TAK_TRACKER+1))
+#define _meshtastic_Config_DeviceConfig_Role_MAX meshtastic_Config_DeviceConfig_Role_ROUTER_LATE
+#define _meshtastic_Config_DeviceConfig_Role_ARRAYSIZE ((meshtastic_Config_DeviceConfig_Role)(meshtastic_Config_DeviceConfig_Role_ROUTER_LATE+1))
 
 #define _meshtastic_Config_DeviceConfig_RebroadcastMode_MIN meshtastic_Config_DeviceConfig_RebroadcastMode_ALL
 #define _meshtastic_Config_DeviceConfig_RebroadcastMode_MAX meshtastic_Config_DeviceConfig_RebroadcastMode_CORE_PORTNUMS_ONLY

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

@@ -770,6 +770,10 @@ typedef struct _meshtastic_MeshPacket {
     /* Last byte of the node number of the node that will relay/relayed this packet.
  Set by the firmware internally, clients are not supposed to set this. */
     uint8_t relay_node;
+    /* *Never* sent over the radio links.
+ Timestamp after which this packet may be sent.
+ Set by the firmware internally, clients are not supposed to set this. */
+    uint32_t tx_after;
 } meshtastic_MeshPacket;
 
 /* The bluetooth to device link:
@@ -1178,7 +1182,7 @@ extern "C" {
 #define meshtastic_Data_init_default             {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, 0}
 #define meshtastic_Waypoint_init_default         {0, false, 0, false, 0, 0, 0, "", "", 0}
 #define meshtastic_MqttClientProxyMessage_init_default {"", 0, {{0, {0}}}, 0}
-#define meshtastic_MeshPacket_init_default       {0, 0, 0, 0, {meshtastic_Data_init_default}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0, 0, 0}
+#define meshtastic_MeshPacket_init_default       {0, 0, 0, 0, {meshtastic_Data_init_default}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0, 0, 0, 0}
 #define meshtastic_NodeInfo_init_default         {0, false, meshtastic_User_init_default, false, meshtastic_Position_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, false, 0, 0, 0}
 #define meshtastic_MyNodeInfo_init_default       {0, 0, 0, {0, {0}}, ""}
 #define meshtastic_LogRecord_init_default        {"", 0, "", _meshtastic_LogRecord_Level_MIN}
@@ -1203,7 +1207,7 @@ extern "C" {
 #define meshtastic_Data_init_zero                {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, 0}
 #define meshtastic_Waypoint_init_zero            {0, false, 0, false, 0, 0, 0, "", "", 0}
 #define meshtastic_MqttClientProxyMessage_init_zero {"", 0, {{0, {0}}}, 0}
-#define meshtastic_MeshPacket_init_zero          {0, 0, 0, 0, {meshtastic_Data_init_zero}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0, 0, 0}
+#define meshtastic_MeshPacket_init_zero          {0, 0, 0, 0, {meshtastic_Data_init_zero}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0, 0, 0, 0}
 #define meshtastic_NodeInfo_init_zero            {0, false, meshtastic_User_init_zero, false, meshtastic_Position_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, false, 0, 0, 0}
 #define meshtastic_MyNodeInfo_init_zero          {0, 0, 0, {0, {0}}, ""}
 #define meshtastic_LogRecord_init_zero           {"", 0, "", _meshtastic_LogRecord_Level_MIN}
@@ -1301,6 +1305,7 @@ extern "C" {
 #define meshtastic_MeshPacket_pki_encrypted_tag  17
 #define meshtastic_MeshPacket_next_hop_tag       18
 #define meshtastic_MeshPacket_relay_node_tag     19
+#define meshtastic_MeshPacket_tx_after_tag       20
 #define meshtastic_NodeInfo_num_tag              1
 #define meshtastic_NodeInfo_user_tag             2
 #define meshtastic_NodeInfo_position_tag         3
@@ -1497,7 +1502,8 @@ X(a, STATIC,   SINGULAR, UINT32,   hop_start,        15) \
 X(a, STATIC,   SINGULAR, BYTES,    public_key,       16) \
 X(a, STATIC,   SINGULAR, BOOL,     pki_encrypted,    17) \
 X(a, STATIC,   SINGULAR, UINT32,   next_hop,         18) \
-X(a, STATIC,   SINGULAR, UINT32,   relay_node,       19)
+X(a, STATIC,   SINGULAR, UINT32,   relay_node,       19) \
+X(a, STATIC,   SINGULAR, UINT32,   tx_after,         20)
 #define meshtastic_MeshPacket_CALLBACK NULL
 #define meshtastic_MeshPacket_DEFAULT NULL
 #define meshtastic_MeshPacket_payload_variant_decoded_MSGTYPE meshtastic_Data
@@ -1747,7 +1753,7 @@ extern const pb_msgdesc_t meshtastic_ChunkedPayloadResponse_msg;
 #define meshtastic_FromRadio_size                510
 #define meshtastic_Heartbeat_size                0
 #define meshtastic_LogRecord_size                426
-#define meshtastic_MeshPacket_size               371
+#define meshtastic_MeshPacket_size               378
 #define meshtastic_MqttClientProxyMessage_size   501
 #define meshtastic_MyNodeInfo_size               77
 #define meshtastic_NeighborInfo_size             258

src/modules/AdminModule.cpp

@@ -370,7 +370,7 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
 #ifdef ARCH_PORTDUINO
     case meshtastic_AdminMessage_exit_simulator_tag:
         LOG_INFO("Exiting simulator");
-        _exit(0);
+        exit(0);
         break;
 #endif
 

src/motion/LIS3DHSensor.cpp

@@ -22,7 +22,7 @@ int32_t LIS3DHSensor::runOnce()
 {
     if (sensor.getClick() > 0) {
         uint8_t click = sensor.getClick();
-        if (!config.device.double_tap_as_button_press) {
+        if (!config.device.double_tap_as_button_press && config.display.wake_on_tap_or_motion) {
             wakeScreen();
         }
 
@@ -34,4 +34,4 @@ int32_t LIS3DHSensor::runOnce()
     return MOTION_SENSOR_CHECK_INTERVAL_MS;
 }
 
-#endif
+#endif

src/mqtt/MQTT.cpp

@@ -96,6 +96,9 @@ inline void onReceiveProto(char *topic, byte *payload, size_t length)
 
     UniquePacketPoolPacket p = packetPool.allocUniqueCopy(*e.packet);
     p->via_mqtt = true; // Mark that the packet was received via MQTT
+    // Unset received SNR/RSSI which might have been added by the MQTT gateway
+    p->rx_snr = 0;
+    p->rx_rssi = 0;
 
     if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
         if (moduleConfig.mqtt.encryption_enabled) {
@@ -324,9 +327,10 @@ MQTT::MQTT() : concurrency::OSThread("mqtt"), mqttQueue(MAX_MQTT_QUEUE)
                 moduleConfig.mqtt.map_report_settings.publish_interval_secs, default_map_publish_interval_secs);
         }
 
+        String host = parseHostAndPort(moduleConfig.mqtt.address).first;
+        isConfiguredForDefaultServer = host.length() == 0 || host == default_mqtt_address;
         IPAddress ip;
-        isMqttServerAddressPrivate =
-            ip.fromString(parseHostAndPort(moduleConfig.mqtt.address).first.c_str()) && isPrivateIpAddress(ip);
+        isMqttServerAddressPrivate = ip.fromString(host.c_str()) && isPrivateIpAddress(ip);
 
 #if HAS_NETWORKING
         if (!moduleConfig.mqtt.proxy_to_client_enabled)
@@ -457,6 +461,7 @@ void MQTT::reconnect()
             enabled = true; // Start running background process again
             runASAP = true;
             reconnectCount = 0;
+            isMqttServerAddressPrivate = isPrivateIpAddress(mqttClient.remoteIP());
 
             publishNodeInfo();
             sendSubscriptions();
@@ -632,9 +637,8 @@ void MQTT::onSend(const meshtastic_MeshPacket &mp_encrypted, const meshtastic_Me
             return;
         }
 
-        if (strcmp(moduleConfig.mqtt.address, default_mqtt_address) == 0 &&
-            (mp_decoded.decoded.portnum == meshtastic_PortNum_RANGE_TEST_APP ||
-             mp_decoded.decoded.portnum == meshtastic_PortNum_DETECTION_SENSOR_APP)) {
+        if (isConfiguredForDefaultServer && (mp_decoded.decoded.portnum == meshtastic_PortNum_RANGE_TEST_APP ||
+                                             mp_decoded.decoded.portnum == meshtastic_PortNum_DETECTION_SENSOR_APP)) {
             LOG_DEBUG("MQTT onSend - Ignoring range test or detection sensor message on public mqtt");
             return;
         }

src/mqtt/MQTT.h

@@ -79,6 +79,8 @@ class MQTT : private concurrency::OSThread
 
     void start() { setIntervalFromNow(0); };
 
+    bool isUsingDefaultServer() { return isConfiguredForDefaultServer; }
+
   protected:
     struct QueueEntry {
         std::string topic;
@@ -87,6 +89,7 @@ class MQTT : private concurrency::OSThread
     PointerQueue<QueueEntry> mqttQueue;
 
     int reconnectCount = 0;
+    bool isConfiguredForDefaultServer = true;
 
     virtual int32_t runOnce() override;
 

test/TestUtil.cpp

@@ -0,0 +1,18 @@
+#include "SerialConsole.h"
+#include "concurrency/OSThread.h"
+#include "gps/RTC.h"
+
+#include "TestUtil.h"
+
+void initializeTestEnvironment()
+{
+    concurrency::hasBeenSetup = true;
+    consoleInit();
+#if ARCH_PORTDUINO
+    struct timeval tv;
+    tv.tv_sec = time(NULL);
+    tv.tv_usec = 0;
+    perhapsSetRTC(RTCQualityNTP, &tv);
+#endif
+    concurrency::OSThread::setup();
+}

test/TestUtil.h

@@ -0,0 +1,4 @@
+#pragma once
+
+// Initialize testing environment.
+void initializeTestEnvironment();

test/test_crypto/test_main.cpp

@@ -1,5 +1,6 @@
 #include "CryptoEngine.h"
 
+#include "TestUtil.h"
 #include <unity.h>
 
 void HexToBytes(uint8_t *result, const std::string hex, size_t len = 0)
@@ -170,15 +171,14 @@ void setup()
     delay(10);
     delay(2000);
 
+    initializeTestEnvironment();
     UNITY_BEGIN(); // IMPORTANT LINE!
     RUN_TEST(test_SHA256);
     RUN_TEST(test_ECB_AES256);
     RUN_TEST(test_DH25519);
     RUN_TEST(test_AES_CTR);
     RUN_TEST(test_PKC_Decrypt);
+    exit(UNITY_END()); // stop unit testing
 }
 
-void loop()
-{
-    UNITY_END(); // stop unit testing
-}
+void loop() {}

variants/nibble_rp2040/variant.h

@@ -6,7 +6,7 @@
 
 #define HAS_CPU_SHUTDOWN 1
 
-#define USE_RFM95
+#define USE_RF95
 #define LORA_SCK 10
 #define LORA_MISO 12
 #define LORA_MOSI 11

variants/portduino/platformio.ini

@@ -72,4 +72,8 @@ build_flags = ${native_base.build_flags} -O0 -fsanitize=address -lX11 -linput -l
   -I lib/device-ui/generated/ui_320x240
   !pkg-config --libs libulfius --silence-errors || :
   !pkg-config --libs openssl --silence-errors || :
-build_src_filter = ${env:native-tft.build_src_filter}
+build_src_filter = ${env:native-tft.build_src_filter}
+
+[env:coverage]
+extends = env:native
+build_flags = -lgcov --coverage -fprofile-abs-path ${env:native.build_flags}

version.properties

@@ -1,4 +1,4 @@
 [VERSION]  
 major = 2
 minor = 5
-build = 17
+build = 18