Upgrade trunk (#9128)

Co-authored-by: vidplace7 <1779290+vidplace7@users.noreply.github.com>

.github/workflows/test_native.yml

@@ -143,7 +143,7 @@ jobs:
           merge-multiple: true
 
       - name: Test Report
-        uses: dorny/test-reporter@v2.3.0
+        uses: dorny/test-reporter@v2.4.0
         with:
           name: PlatformIO Tests
           path: testreport.xml

.trunk/trunk.yaml

@@ -8,8 +8,8 @@ plugins:
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - checkov@3.2.496
-    - renovate@42.66.14
+    - checkov@3.2.497
+    - renovate@42.69.2
     - prettier@3.7.4
     - trufflehog@3.92.4
     - yamllint@1.37.1
@@ -21,7 +21,7 @@ lint:
     - markdownlint@0.47.0
     - oxipng@10.0.0
     - svgo@4.0.0
-    - actionlint@1.7.9
+    - actionlint@1.7.10
     - flake8@7.3.0
     - hadolint@2.14.0
     - shfmt@3.6.0

platformio.ini

@@ -123,7 +123,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/14dc991a4b57066e0a83599be1a87ff08e5e5308.zip
+	https://github.com/meshtastic/device-ui/archive/a8e2f947f7abaf0c5ac8e6dd189a22156335beaa.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]

src/configuration.h

@@ -269,9 +269,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TCA9535_ADDR 0x20
 #define TCA9555_ADDR 0x26
 
-// used for display brightness control
-#define STC8H1K28_ADDR 0x30
-
 // -----------------------------------------------------------------------------
 // Touchscreen
 // -----------------------------------------------------------------------------

src/detect/ScanI2C.h

@@ -61,7 +61,6 @@ class ScanI2C
         NAU7802,
         FT6336U,
         STK8BAXX,
-        STC8H1K28,
         ICM20948,
         SCD4X,
         MAX30102,

src/detect/ScanI2CTwoWire.cpp

@@ -234,8 +234,6 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
 #endif
 #ifdef HAS_LP5562
                 SCAN_SIMPLE_CASE(LP5562_ADDR, LP5562, "LP5562", (uint8_t)addr.address);
-#else
-                SCAN_SIMPLE_CASE(STC8H1K28_ADDR, LP5562, "STC8H1K28", (uint8_t)addr.address);
 #endif
             case XPOWERS_AXP192_AXP2101_ADDRESS:
                 // Do we have the axp2101/192 or the TCA8418

src/mesh/Router.cpp

@@ -744,15 +744,19 @@ void Router::handleReceived(meshtastic_MeshPacket *p, RxSource src)
         MeshModule::callModules(*p, src);
 
 #if !MESHTASTIC_EXCLUDE_MQTT
-        // Mark as pki_encrypted if it is not yet decoded and MQTT encryption is also enabled, hash matches and it's a DM not to
-        // us (because we would be able to decrypt it)
-        if (decodedState == DecodeState::DECODE_FAILURE && moduleConfig.mqtt.encryption_enabled && p->channel == 0x00 &&
-            !isBroadcast(p->to) && !isToUs(p))
-            p_encrypted->pki_encrypted = true;
-        // After potentially altering it, publish received message to MQTT if we're not the original transmitter of the packet
-        if ((decodedState == DecodeState::DECODE_SUCCESS || p_encrypted->pki_encrypted) && moduleConfig.mqtt.enabled &&
-            !isFromUs(p) && mqtt)
-            mqtt->onSend(*p_encrypted, *p, p->channel);
+        if (p_encrypted == nullptr) {
+            LOG_WARN("p_encrypted is null, skipping MQTT publish");
+        } else {
+            // Mark as pki_encrypted if it is not yet decoded and MQTT encryption is also enabled, hash matches and it's a DM not
+            // to us (because we would be able to decrypt it)
+            if (decodedState == DecodeState::DECODE_FAILURE && moduleConfig.mqtt.encryption_enabled && p->channel == 0x00 &&
+                !isBroadcast(p->to) && !isToUs(p))
+                p_encrypted->pki_encrypted = true;
+            // After potentially altering it, publish received message to MQTT if we're not the original transmitter of the packet
+            if ((decodedState == DecodeState::DECODE_SUCCESS || p_encrypted->pki_encrypted) && moduleConfig.mqtt.enabled &&
+                !isFromUs(p) && mqtt)
+                mqtt->onSend(*p_encrypted, *p, p->channel);
+        }
 #endif
     }
 

variants/esp32/tbeam/platformio.ini

@@ -2,7 +2,7 @@
 [env:tbeam]
 extends = esp32_base
 board = ttgo-t-beam
-board_level = extra
+
 board_check = true
 lib_deps = ${esp32_base.lib_deps}
 build_flags = ${esp32_base.build_flags}
@@ -14,7 +14,7 @@ upload_speed = 921600
 
 [env:tbeam-displayshield]
 extends = env:tbeam
-
+board_level = extra
 build_flags =
   ${env:tbeam.build_flags}
   -D USE_ST7796

variants/esp32s3/elecrow_panel/platformio.ini

@@ -128,6 +128,3 @@ build_flags =
   ${crowpanel_large_esp32s3_base.build_flags}
   -D VIEW_320x240
   -D DISPLAY_SIZE=800x480 ; landscape mode
-build_src_filter =
-  ${esp32s3_base.build_src_filter}
-  +<../variants/esp32s3/elecrow_panel>

variants/esp32s3/elecrow_panel/variant.cpp

@@ -1,21 +0,0 @@
-// meshtastic/firmware/variants/elecrow_panel/variant.cpp
-
-#include "variant.h"
-#include "Arduino.h"
-#include "Wire.h"
-
-bool elecrow_v2 = false; // false = v1, true = v2
-
-extern "C" {
-
-void initVariant()
-{
-    Wire.begin(I2C_SDA, I2C_SCL, 100000);
-    delay(50);
-    Wire.beginTransmission(0x30);
-    if (Wire.endTransmission() == 0) {
-        elecrow_v2 = true;
-    }
-    Wire.end();
-}
-}

variants/esp32s3/elecrow_panel/variant.h

@@ -1,8 +1,6 @@
 #define I2C_SDA 15
 #define I2C_SCL 16
 
-extern bool elecrow_v2; // false = v1, true = v2
-
 #if CROW_SELECT == 1
 #define WAKE_ON_TOUCH
 #define SCREEN_TOUCH_INT 47
@@ -19,7 +17,7 @@ extern bool elecrow_v2; // false = v1, true = v2
 #define DAC_I2S_DOUT 12
 #define DAC_I2S_MCLK 8 // don't use GPIO0 because it's assigned to LoRa or button
 #else
-#define PIN_BUZZER (elecrow_v2 ? 0 : 8)
+#define PIN_BUZZER 8
 #endif
 
 // GPS via UART1 connector
@@ -74,7 +72,7 @@ extern bool elecrow_v2; // false = v1, true = v2
 #define SENSOR_POWER_ON LOW
 #else
 // 4.3", 5.0", 7.0"
-#define LORA_CS (elecrow_v2 ? 8 : 0)
+#define LORA_CS 0
 #define LORA_SCK 5
 #define LORA_MISO 4
 #define LORA_MOSI 6