Merge branch 'master' into master

.github/workflows/nightly.yml

@@ -21,6 +21,7 @@ jobs:
           trunk-token: ${{ secrets.TRUNK_TOKEN }}
 
   trunk_upgrade:
+    # See: https://github.com/trunk-io/trunk-action/blob/v1/readme.md#automatic-upgrades
     name: Trunk Upgrade (PR)
     runs-on: ubuntu-latest
     permissions:
@@ -30,6 +31,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
-      # See https://github.com/trunk-io/trunk-action/blob/v1/readme.md#automatic-upgrades
       - name: Trunk Upgrade
         uses: trunk-io/trunk-action/upgrade@v1
+        with:
+          base: master

.github/workflows/trunk_check.yml

@@ -20,3 +20,5 @@ jobs:
 
       - name: Trunk Check
         uses: trunk-io/trunk-action@v1
+        with:
+          save-annotations: true

.trunk/trunk.yaml

@@ -1,37 +1,35 @@
 version: 0.1
 cli:
-  version: 1.22.8
+  version: 1.22.10
 plugins:
   sources:
     - id: trunk
-      ref: v1.6.6
+      ref: v1.6.7
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - prettier@3.4.2
-    - trufflehog@3.86.1
+    - prettier@3.5.1
+    - trufflehog@3.88.10
     - yamllint@1.35.1
-    - bandit@1.8.0
-    - checkov@3.2.334
+    - bandit@1.8.3
+    - checkov@3.2.372
     - terrascan@1.19.9
-    - trivy@0.58.0
-    #- trufflehog@3.63.2-rc0
+    - trivy@0.59.1
     - taplo@0.9.3
-    - ruff@0.8.3
-    - isort@5.13.2
-    - markdownlint@0.43.0
-    - oxipng@9.1.3
+    - ruff@0.9.6
+    - isort@6.0.0
+    - markdownlint@0.44.0
+    - oxipng@9.1.4
     - svgo@3.3.2
-    - actionlint@1.7.4
-    - flake8@7.1.1
+    - actionlint@1.7.7
+    - flake8@7.1.2
     - hadolint@2.12.1-beta
     - shfmt@3.6.0
     - shellcheck@0.10.0
-    - black@24.10.0
+    - black@25.1.0
     - git-diff-check
-    - gitleaks@8.21.2
+    - gitleaks@8.23.3
     - clang-format@16.0.3
-    #- prettier@3.3.3
   ignore:
     - linters: [ALL]
       paths:

arch/nrf52/nrf52.ini

@@ -4,8 +4,8 @@ platform = platformio/nordicnrf52@^10.7.0
 extends = arduino_base
 platform_packages =
   ; our custom Git version until they merge our PR
-  framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino.git#e13f5820002a4fb2a5e6754b42ace185277e5adf
-  toolchain-gccarmnoneeabi@~1.90301.0
+  platformio/framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino.git#e13f5820002a4fb2a5e6754b42ace185277e5adf
+  platformio/toolchain-gccarmnoneeabi@~1.90301.0
 
 build_type = debug
 build_flags =

arch/stm32/stm32.ini

@@ -1,6 +1,6 @@
 [stm32_base]
 extends = arduino_base
-platform = ststm32
+platform = platformio/ststm32
 platform_packages = platformio/framework-arduinoststm32@^4.20900.0
 
 build_type = release
@@ -41,4 +41,4 @@ lib_deps =
 
 lib_ignore =
   mathertel/OneButton@2.6.1
-  Wire
+  Wire

variants/MakePython_nRF52840_eink/platformio.ini

@@ -5,13 +5,13 @@ 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
+  -DEINK_HEIGHT=128
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/MakePython_nRF52840_eink>
 lib_deps = 
   ${nrf52840_base.lib_deps}
   https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
   zinggjm/GxEPD2@^1.6.2
-  -DEINK_DISPLAY_MODEL=GxEPD2_290_T5D
-  -DEINK_WIDTH=296
-  -DEINK_HEIGHT=128
 debug_tool = jlink
-;upload_port = /dev/ttyACM4
+;upload_port = /dev/ttyACM4

variants/icarus/platformio.ini

@@ -6,7 +6,7 @@ board_check = true
 board_build.mcu = esp32s3
 upload_protocol = esptool
 upload_speed = 921600
-platform_packages = framework-arduinoespressif32@https://github.com/PowerFeather/powerfeather-meshtastic-arduino-lib/releases/download/2.0.16a/esp32-2.0.16.zip
+platform_packages = platformio/framework-arduinoespressif32@https://github.com/PowerFeather/powerfeather-meshtastic-arduino-lib/releases/download/2.0.16a/esp32-2.0.16.zip
 lib_deps =
   ${esp32s3_base.lib_deps}
 build_unflags =
@@ -16,4 +16,4 @@ build_flags =
   ${esp32s3_base.build_flags} -D PRIVATE_HW -I variants/icarus
   -DBOARD_HAS_PSRAM 
 
-  -DARDUINO_USB_MODE=0
+  -DARDUINO_USB_MODE=0

variants/my_esp32s3_diy_eink/platformio.ini

@@ -9,7 +9,7 @@ upload_protocol = esptool
 ;upload_port = /dev/ttyACM1
 upload_speed = 921600
 platform_packages =
-  tool-esptoolpy@^1.40801.0
+  platformio/tool-esptoolpy@^1.40801.0
 lib_deps =
   ${esp32_base.lib_deps}
   zinggjm/GxEPD2@^1.6.2
@@ -26,4 +26,4 @@ build_flags =
   -DEINK_HEIGHT=128
   -DBOARD_HAS_PSRAM
   -mfix-esp32-psram-cache-issue
-  -DARDUINO_USB_MODE=0
+  -DARDUINO_USB_MODE=0

variants/my_esp32s3_diy_oled/platformio.ini

@@ -9,7 +9,7 @@ upload_protocol = esptool
 ;upload_port = /dev/ttyACM0
 upload_speed = 921600
 platform_packages =
-  tool-esptoolpy@^1.40801.0
+  platformio/tool-esptoolpy@^1.40801.0
 lib_deps =
   ${esp32_base.lib_deps}
   adafruit/Adafruit NeoPixel @ ^1.12.0
@@ -21,4 +21,4 @@ build_flags =
   ${esp32_base.build_flags} -D PRIVATE_HW -I variants/my_esp32s3_diy_oled
   -DBOARD_HAS_PSRAM
   -mfix-esp32-psram-cache-issue
-  -DARDUINO_USB_MODE=0
+  -DARDUINO_USB_MODE=0

variants/rak11310/platformio.ini

@@ -18,4 +18,4 @@ lib_deps =
   ${networking_base.lib_deps}
   https://github.com/RAKWireless/RAK13800-W5100S.git#1.0.2
 debug_build_flags = ${rp2040_base.build_flags}, -g
-debug_tool = cmsis-dap ; for e.g. Picotool
+debug_tool = cmsis-dap ; for e.g. Picotool

variants/trackerd/platformio.ini

@@ -1,13 +1,8 @@
 [env:trackerd]
 extends = esp32_base
-;platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-upstream
-platform = espressif32
 board = pico32
 board_build.f_flash = 80000000L
 
 build_flags = 
   ${esp32_base.build_flags} -D PRIVATE_HW -I variants/trackerd -D BSFILE=\"boards/dragino_lbt2.h\"
-;board_build.partitions = no_ota.csv
-;platform_packages =
-;   platformio/framework-arduinoespressif32@3
-;platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#2.0.1-RC1
+;board_build.partitions = no_ota.csv