trunk fmt

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

.github/FUNDING.yml

@@ -0,0 +1,3 @@
+# These are supported funding model platforms
+
+open_collective: meshtastic

.github/actions/build-variant/action.yml

@@ -27,10 +27,10 @@ inputs:
     description: A newline separated list of paths to store as artifacts
     required: false
     default: ""
-  include-web-ui:
-    description: Include the web UI in the build
-    required: false
-    default: "false"
+  # include-web-ui:
+  #   description: Include the web UI in the build
+  #   required: false
+  #   default: "false"
   arch:
     description: Processor arch name
     required: true
@@ -43,29 +43,29 @@ runs:
       id: base
       uses: ./.github/actions/setup-base
 
-    - name: Get web ui version
-      if: inputs.include-web-ui == 'true'
-      id: webver
-      shell: bash
-      run: |
-        echo "ver=$(cat bin/web.version)" >> $GITHUB_OUTPUT
+    # - name: Get web ui version
+    #   if: inputs.include-web-ui == 'true'
+    #   id: webver
+    #   shell: bash
+    #   run: |
+    #     echo "ver=$(cat bin/web.version)" >> $GITHUB_OUTPUT
 
-    - name: Pull web ui
-      if: inputs.include-web-ui == 'true'
-      uses: dsaltares/fetch-gh-release-asset@master
-      with:
-        repo: meshtastic/web
-        file: build.tar
-        target: build.tar
-        token: ${{ inputs.github_token }}
-        version: tags/v${{ steps.webver.outputs.ver }}
+    # - name: Pull web ui
+    #   if: inputs.include-web-ui == 'true'
+    #   uses: dsaltares/fetch-gh-release-asset@master
+    #   with:
+    #     repo: meshtastic/web
+    #     file: build.tar
+    #     target: build.tar
+    #     token: ${{ inputs.github_token }}
+    #     version: tags/v${{ steps.webver.outputs.ver }}
 
-    - name: Unpack web ui
-      if: inputs.include-web-ui == 'true'
-      shell: bash
-      run: |
-        tar -xf build.tar -C data/static
-        rm build.tar
+    # - name: Unpack web ui
+    #   if: inputs.include-web-ui == 'true'
+    #   shell: bash
+    #   run: |
+    #     tar -xf build.tar -C data/static
+    #     rm build.tar
 
     - name: Remove debug flags for release
       shell: bash

.github/actions/setup-base/action.yml

@@ -5,7 +5,7 @@ runs:
   using: composite
   steps:
     - name: Checkout code
-      uses: actions/checkout@v4
+      uses: actions/checkout@v5
       with:
         submodules: recursive
         ref: ${{github.event.pull_request.head.ref}}

.github/pull_request_template.md

@@ -1,6 +1,7 @@
 ## 🙏 Thank you for sending in a pull request, here's some tips to get started!
 
 ### ❌ (Please delete all these tips and replace them with your text) ❌
+
 - Before starting on some new big chunk of code, it it is optional but highly recommended to open an issue first
   to say "Hey, I think this idea X should be implemented and I'm starting work on it. My general plan is Y, any feedback
   is appreciated." This will allow other devs to potentially save you time by not accidentially duplicating work etc...
@@ -15,12 +16,12 @@
 - If you do not have the affected hardware to test your code changes adequately against regressions, please indicate this, so that contributors and commnunity members can help test your changes.
 - If your PR gets accepted you can request a "Contributor" role in the Meshtastic Discord
 
-
 ## 🤝 Attestations
+
 - [ ] I have tested that my proposed changes behave as described.
 - [ ] I have tested that my proposed changes do not cause any obvious regressions on the following devices:
   - [ ] Heltec (Lora32) V3
-  - [ ] LilyGo T-Deck 
+  - [ ] LilyGo T-Deck
   - [ ] LilyGo T-Beam
   - [ ] RAK WisBlock 4631
   - [ ] Seeed Studio T-1000E tracker card

.github/workflows/build_debian_src.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
           path: meshtasticd

.github/workflows/build_esp32.yml

@@ -1,37 +0,0 @@
-name: Build ESP32
-
-on:
-  workflow_call:
-    inputs:
-      board:
-        required: true
-        type: string
-
-permissions: read-all
-
-jobs:
-  build-esp32:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Build ESP32
-        id: build
-        uses: ./.github/actions/build-variant
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          board: ${{ inputs.board }}
-          remove-debug-flags: >-
-            ./arch/esp32/esp32.ini
-            ./arch/esp32/esp32s2.ini
-            ./arch/esp32/esp32s3.ini
-            ./arch/esp32/esp32c3.ini
-            ./arch/esp32/esp32c6.ini
-          build-script-path: bin/build-esp32.sh
-          ota-firmware-source: firmware.bin
-          ota-firmware-target: release/bleota.bin
-          artifact-paths: |
-            release/*.bin
-            release/*.elf
-          include-web-ui: true
-          arch: esp32

.github/workflows/build_esp32_c3.yml

@@ -1,37 +0,0 @@
-name: Build ESP32-C3
-
-on:
-  workflow_call:
-    inputs:
-      board:
-        required: true
-        type: string
-
-permissions: read-all
-
-jobs:
-  build-esp32-c3:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Build ESP32-C3
-        id: build
-        uses: ./.github/actions/build-variant
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          board: ${{ inputs.board }}
-          remove-debug-flags: >-
-            ./arch/esp32/esp32.ini
-            ./arch/esp32/esp32s2.ini
-            ./arch/esp32/esp32s3.ini
-            ./arch/esp32/esp32c3.ini
-            ./arch/esp32/esp32c6.ini
-          build-script-path: bin/build-esp32.sh
-          ota-firmware-source: firmware-c3.bin
-          ota-firmware-target: release/bleota-c3.bin
-          artifact-paths: |
-            release/*.bin
-            release/*.elf
-          include-web-ui: true
-          arch: esp32c3

.github/workflows/build_esp32_c6.yml

@@ -1,37 +0,0 @@
-name: Build ESP32-C6
-
-on:
-  workflow_call:
-    inputs:
-      board:
-        required: true
-        type: string
-
-permissions: read-all
-
-jobs:
-  build-esp32-c6:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Build ESP32-C6
-        id: build
-        uses: ./.github/actions/build-variant
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          board: ${{ inputs.board }}
-          remove-debug-flags: >-
-            ./arch/esp32/esp32.ini
-            ./arch/esp32/esp32s2.ini
-            ./arch/esp32/esp32s3.ini
-            ./arch/esp32/esp32c3.ini
-            ./arch/esp32/esp32c6.ini
-          build-script-path: bin/build-esp32.sh
-          ota-firmware-source: firmware-c3.bin
-          ota-firmware-target: release/bleota-c3.bin
-          artifact-paths: |
-            release/*.bin
-            release/*.elf
-          include-web-ui: true
-          arch: esp32c6

.github/workflows/build_esp32_s3.yml

@@ -1,37 +0,0 @@
-name: Build ESP32-S3
-
-on:
-  workflow_call:
-    inputs:
-      board:
-        required: true
-        type: string
-
-permissions: read-all
-
-jobs:
-  build-esp32-s3:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Build ESP32-S3
-        id: build
-        uses: ./.github/actions/build-variant
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          board: ${{ inputs.board }}
-          remove-debug-flags: >-
-            ./arch/esp32/esp32.ini
-            ./arch/esp32/esp32s2.ini
-            ./arch/esp32/esp32s3.ini
-            ./arch/esp32/esp32c3.ini
-            ./arch/esp32/esp32c6.ini
-          build-script-path: bin/build-esp32.sh
-          ota-firmware-source: firmware-s3.bin
-          ota-firmware-target: release/bleota-s3.bin
-          artifact-paths: |
-            release/*.bin
-            release/*.elf
-          include-web-ui: true
-          arch: esp32s3

.github/workflows/build_firmware.yml

@@ -0,0 +1,66 @@
+name: Build
+
+on:
+  workflow_call:
+    inputs:
+      version:
+        required: true
+        type: string
+      platform:
+        required: true
+        type: string
+      pio_env:
+        required: true
+        type: string
+
+permissions: read-all
+
+jobs:
+  pio-build:
+    name: build-${{ inputs.platform }}
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - name: Set OTA firmware source and target
+        if: startsWith(inputs.platform, 'esp32')
+        id: ota_dir
+        env:
+          PIO_PLATFORM: ${{ inputs.platform }}
+        run: |
+          if [ "$PIO_PLATFORM" = "esp32s3" ]; then
+            echo "src=firmware-s3.bin" >> $GITHUB_OUTPUT
+            echo "tgt=release/bleota-s3.bin" >> $GITHUB_OUTPUT
+          elif [ "$PIO_PLATFORM" = "esp32c3" ] || [ "$PIO_PLATFORM" = "esp32c6" ]; then
+            echo "src=firmware-c3.bin" >> $GITHUB_OUTPUT
+            echo "tgt=release/bleota-c3.bin" >> $GITHUB_OUTPUT
+          elif [ "$PIO_PLATFORM" = "esp32" ]; then
+            echo "src=firmware.bin" >> $GITHUB_OUTPUT
+            echo "tgt=release/bleota.bin" >> $GITHUB_OUTPUT
+          fi
+
+      - name: Build ${{ inputs.platform }}
+        id: build
+        uses: meshtastic/gh-action-firmware@main
+        with:
+          pio_platform: ${{ inputs.platform }}
+          pio_env: ${{ inputs.pio_env }}
+          pio_target: build
+          ota_firmware_source: ${{ steps.ota_dir.outputs.src || '' }}
+          ota_firmware_target: ${{ steps.ota_dir.outputs.tgt || '' }}
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-${{ inputs.platform }}-${{ inputs.pio_env }}-${{ inputs.version }}.zip
+          overwrite: true
+          path: |
+            release/*.bin
+            release/*.elf
+            release/*.uf2
+            release/*.hex
+            release/*-ota.zip

.github/workflows/build_nrf52.yml

@@ -1,30 +0,0 @@
-name: Build NRF52
-
-on:
-  workflow_call:
-    inputs:
-      board:
-        required: true
-        type: string
-
-permissions: read-all
-
-jobs:
-  build-nrf52:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Build NRF52
-        id: build
-        uses: ./.github/actions/build-variant
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          board: ${{ inputs.board }}
-          build-script-path: bin/build-nrf52.sh
-          artifact-paths: |
-            release/*.hex
-            release/*.uf2
-            release/*.elf
-            release/*.zip
-          arch: nrf52840

.github/workflows/build_rpi2040.yml

@@ -1,28 +0,0 @@
-name: Build RPI2040
-
-on:
-  workflow_call:
-    inputs:
-      board:
-        required: true
-        type: string
-
-permissions: read-all
-
-jobs:
-  build-rpi2040:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Build Raspberry Pi 2040
-        id: build
-        uses: ./.github/actions/build-variant
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          board: ${{ inputs.board }}
-          build-script-path: bin/build-rpi2040.sh
-          artifact-paths: |
-            release/*.uf2
-            release/*.elf
-          arch: rp2040

.github/workflows/build_stm32.yml

@@ -1,29 +0,0 @@
-name: Build STM32
-
-on:
-  workflow_call:
-    inputs:
-      board:
-        required: true
-        type: string
-
-permissions: read-all
-
-jobs:
-  build-stm32:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v4
-
-      - name: Build STM32WL
-        id: build
-        uses: ./.github/actions/build-variant
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          board: ${{ inputs.board }}
-          build-script-path: bin/build-stm32.sh
-          artifact-paths: |
-            release/*.hex
-            release/*.bin
-            release/*.elf
-          arch: stm32

.github/workflows/daily_packaging.yml

@@ -1,7 +1,7 @@
 name: Daily Packaging
 on:
   schedule:
-    - cron: 0 9 * * *
+    - cron: 0 2 * * *
   workflow_dispatch:
   push:
     branches:
@@ -30,7 +30,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        series: [plucky, oracular, noble, jammy]
+        series:
+          - jammy # 22.04
+          - noble # 24.04
+          - plucky # 25.04
+          - questing # 25.10
     uses: ./.github/workflows/package_ppa.yml
     with:
       ppa_repo: ppa:meshtastic/daily

.github/workflows/docker_build.yml

@@ -47,7 +47,7 @@ jobs:
     runs-on: ${{ inputs.runs-on }}
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
           ref: ${{github.event.pull_request.head.ref}}

.github/workflows/docker_manifest.yml

@@ -83,7 +83,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
           ref: ${{github.event.pull_request.head.ref}}

.github/workflows/hook_copr.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
           ref: ${{ github.ref }}

.github/workflows/main_matrix.yml

@@ -30,18 +30,31 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [esp32, esp32s3, esp32c3, esp32c6, nrf52840, rp2040, stm32, check]
-    runs-on: ubuntu-latest
+        arch:
+          - esp32
+          - esp32s3
+          - esp32c3
+          - esp32c6
+          - nrf52840
+          - rp2040
+          - rp2350
+          - stm32
+          - check
+    runs-on: ubuntu-24.04
     steps:
-      - id: checkout
-        uses: actions/checkout@v4
-        name: Checkout base
-      - id: jsonStep
+      - uses: actions/checkout@v5
+      - uses: actions/setup-python@v5
+        with:
+          python-version: 3.x
+          cache: pip
+      - run: pip install -U platformio
+      - name: Generate matrix
+        id: jsonStep
         run: |
           if [[ "$GITHUB_HEAD_REF" == "" ]]; then
             TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}})
           else  
-            TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}} quick)
+            TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}} pr)
           fi
           echo "Name: $GITHUB_REF_NAME Base: $GITHUB_BASE_REF Ref: $GITHUB_REF Targets: $TARGETS"
           echo "${{matrix.arch}}=$(jq -cn --argjson environments "$TARGETS" '{board: $environments}')" >> $GITHUB_OUTPUT
@@ -52,9 +65,25 @@ jobs:
       esp32c6: ${{ steps.jsonStep.outputs.esp32c6 }}
       nrf52840: ${{ steps.jsonStep.outputs.nrf52840 }}
       rp2040: ${{ steps.jsonStep.outputs.rp2040 }}
+      rp2350: ${{ steps.jsonStep.outputs.rp2350 }}
       stm32: ${{ steps.jsonStep.outputs.stm32 }}
       check: ${{ steps.jsonStep.outputs.check }}
 
+  version:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v5
+      - name: Get release version string
+        run: |
+          echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+          echo "deb=$(./bin/buildinfo.py deb)" >> $GITHUB_OUTPUT
+        id: version
+        env:
+          BUILD_LOCATION: local
+    outputs:
+      long: ${{ steps.version.outputs.long }}
+      deb: ${{ steps.version.outputs.deb }}
+
   check:
     needs: setup
     strategy:
@@ -64,7 +93,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'workflow_dispatch' }}
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - name: Build base
         id: base
         uses: ./.github/actions/setup-base
@@ -72,69 +101,95 @@ jobs:
         run: bin/check-all.sh ${{ matrix.board }}
 
   build-esp32:
-    needs: setup
+    needs: [setup, version]
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.setup.outputs.esp32) }}
-    uses: ./.github/workflows/build_esp32.yml
+    uses: ./.github/workflows/build_firmware.yml
     with:
-      board: ${{ matrix.board }}
+      version: ${{ needs.version.outputs.long }}
+      pio_env: ${{ matrix.board }}
+      platform: esp32
 
-  build-esp32-s3:
-    needs: setup
+  build-esp32s3:
+    needs: [setup, version]
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.setup.outputs.esp32s3) }}
-    uses: ./.github/workflows/build_esp32_s3.yml
+    uses: ./.github/workflows/build_firmware.yml
     with:
-      board: ${{ matrix.board }}
+      version: ${{ needs.version.outputs.long }}
+      pio_env: ${{ matrix.board }}
+      platform: esp32s3
 
-  build-esp32-c3:
-    needs: setup
+  build-esp32c3:
+    needs: [setup, version]
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.setup.outputs.esp32c3) }}
-    uses: ./.github/workflows/build_esp32_c3.yml
+    uses: ./.github/workflows/build_firmware.yml
     with:
-      board: ${{ matrix.board }}
+      version: ${{ needs.version.outputs.long }}
+      pio_env: ${{ matrix.board }}
+      platform: esp32c3
 
-  build-esp32-c6:
-    needs: setup
+  build-esp32c6:
+    needs: [setup, version]
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.setup.outputs.esp32c6) }}
-    uses: ./.github/workflows/build_esp32_c6.yml
+    uses: ./.github/workflows/build_firmware.yml
     with:
-      board: ${{ matrix.board }}
+      version: ${{ needs.version.outputs.long }}
+      pio_env: ${{ matrix.board }}
+      platform: esp32c6
 
-  build-nrf52:
-    needs: setup
+  build-nrf52840:
+    needs: [setup, version]
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.setup.outputs.nrf52840) }}
-    uses: ./.github/workflows/build_nrf52.yml
+    uses: ./.github/workflows/build_firmware.yml
     with:
-      board: ${{ matrix.board }}
+      version: ${{ needs.version.outputs.long }}
+      pio_env: ${{ matrix.board }}
+      platform: nrf52840
 
-  build-rpi2040:
-    needs: setup
+  build-rp2040:
+    needs: [setup, version]
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.setup.outputs.rp2040) }}
-    uses: ./.github/workflows/build_rpi2040.yml
+    uses: ./.github/workflows/build_firmware.yml
     with:
-      board: ${{ matrix.board }}
+      version: ${{ needs.version.outputs.long }}
+      pio_env: ${{ matrix.board }}
+      platform: rp2040
+
+  build-rp2350:
+    needs: [setup, version]
+    strategy:
+      fail-fast: false
+      matrix: ${{ fromJson(needs.setup.outputs.rp2350) }}
+    uses: ./.github/workflows/build_firmware.yml
+    with:
+      version: ${{ needs.version.outputs.long }}
+      pio_env: ${{ matrix.board }}
+      platform: rp2350
 
   build-stm32:
-    needs: setup
+    needs: [setup, version]
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.setup.outputs.stm32) }}
-    uses: ./.github/workflows/build_stm32.yml
+    uses: ./.github/workflows/build_firmware.yml
     with:
-      board: ${{ matrix.board }}
+      version: ${{ needs.version.outputs.long }}
+      pio_env: ${{ matrix.board }}
+      platform: stm32
 
   build-debian-src:
+    if: github.repository == 'meshtastic/firmware'
     uses: ./.github/workflows/build_debian_src.yml
     with:
       series: UNRELEASED
@@ -209,26 +264,36 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [esp32, esp32s3, esp32c3, esp32c6, nrf52840, rp2040, stm32]
+        arch:
+          - esp32
+          - esp32s3
+          - esp32c3
+          - esp32c6
+          - nrf52840
+          - rp2040
+          - rp2350
+          - stm32
     runs-on: ubuntu-latest
     needs:
       [
+        version,
         build-esp32,
-        build-esp32-s3,
-        build-esp32-c3,
-        build-esp32-c6,
-        build-nrf52,
-        build-rpi2040,
+        build-esp32s3,
+        build-esp32c3,
+        build-esp32c6,
+        build-nrf52840,
+        build-rp2040,
+        build-rp2350,
         build-stm32,
       ]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
           path: ./
           pattern: firmware-${{matrix.arch}}-*
@@ -237,17 +302,13 @@ jobs:
       - name: Display structure of downloaded files
         run: ls -R
 
-      - name: Get release version string
-        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-        id: version
-
       - name: Move files up
         run: mv -b -t ./ ./bin/device-*.sh ./bin/device-*.bat
 
       - name: Repackage in single firmware zip
         uses: actions/upload-artifact@v4
         with:
-          name: firmware-${{matrix.arch}}-${{ steps.version.outputs.long }}
+          name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
           overwrite: true
           path: |
             ./firmware-*.bin
@@ -257,14 +318,13 @@ jobs:
             ./device-*.sh
             ./device-*.bat
             ./littlefs-*.bin
-            ./littlefswebui-*.bin
             ./bleota*bin
             ./Meshtastic_nRF52_factory_erase*.uf2
           retention-days: 30
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
-          name: firmware-${{matrix.arch}}-${{ steps.version.outputs.long }}
+          name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
           merge-multiple: true
           path: ./output
 
@@ -278,12 +338,12 @@ jobs:
           chmod +x ./output/device-update.sh
 
       - name: Zip firmware
-        run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip ./output
+        run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output
 
       - name: Repackage in single elfs zip
         uses: actions/upload-artifact@v4
         with:
-          name: debug-elfs-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip
+          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
           overwrite: true
           path: ./*.elf
           retention-days: 30
@@ -291,8 +351,8 @@ jobs:
       - uses: scruplelesswizard/comment-artifact@main
         if: ${{ github.event_name == 'pull_request' }}
         with:
-          name: firmware-${{matrix.arch}}-${{ steps.version.outputs.long }}
-          description: "Download firmware-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip. This artifact will be available for 90 days from creation"
+          name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          description: "Download firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip. This artifact will be available for 90 days from creation"
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
   release-artifacts:
@@ -301,56 +361,49 @@ jobs:
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
     needs:
+      - version
       - gather-artifacts
       - build-debian-src
       - package-pio-deps-native-tft
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
           python-version: 3.x
 
-      - name: Get release version string
-        run: |
-          echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-          echo "deb=$(./bin/buildinfo.py deb)" >> $GITHUB_OUTPUT
-        id: version
-        env:
-          BUILD_LOCATION: local
-
       - name: Create release
         uses: softprops/action-gh-release@v2
         id: create_release
         with:
           draft: true
           prerelease: true
-          name: Meshtastic Firmware ${{ steps.version.outputs.long }} Alpha
-          tag_name: v${{ steps.version.outputs.long }}
+          name: Meshtastic Firmware ${{ needs.version.outputs.long }} Alpha
+          tag_name: v${{ needs.version.outputs.long }}
           body: |
             Autogenerated by github action, developer should edit as required before publishing...
 
       - name: Download source deb
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
-          pattern: firmware-debian-${{ steps.version.outputs.deb }}~UNRELEASED-src
+          pattern: firmware-debian-${{ needs.version.outputs.deb }}~UNRELEASED-src
           merge-multiple: true
           path: ./output/debian-src
 
       - name: Download `native-tft` pio deps
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
-          pattern: platformio-deps-native-tft-${{ steps.version.outputs.long }}
+          pattern: platformio-deps-native-tft-${{ needs.version.outputs.long }}
           merge-multiple: true
           path: ./output/pio-deps-native-tft
 
       - name: Zip Linux sources
         working-directory: output
         run: |
-          zip -j -9 -r ./meshtasticd-${{ steps.version.outputs.deb }}-src.zip ./debian-src
-          zip -9 -r ./platformio-deps-native-tft-${{ steps.version.outputs.long }}.zip ./pio-deps-native-tft
+          zip -j -9 -r ./meshtasticd-${{ needs.version.outputs.deb }}-src.zip ./debian-src
+          zip -9 -r ./platformio-deps-native-tft-${{ needs.version.outputs.long }}.zip ./pio-deps-native-tft
 
       # For diagnostics
       - name: Display structure of downloaded files
@@ -360,8 +413,8 @@ jobs:
         # Only run when targeting master branch with workflow_dispatch
         if: ${{ github.ref_name == 'master' }}
         run: |
-          gh release upload v${{ steps.version.outputs.long }} ./output/meshtasticd-${{ steps.version.outputs.deb }}-src.zip
-          gh release upload v${{ steps.version.outputs.long }} ./output/platformio-deps-native-tft-${{ steps.version.outputs.long }}.zip
+          gh release upload v${{ needs.version.outputs.long }} ./output/meshtasticd-${{ needs.version.outputs.deb }}-src.zip
+          gh release upload v${{ needs.version.outputs.long }} ./output/platformio-deps-native-tft-${{ needs.version.outputs.long }}.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -369,26 +422,30 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch: [esp32, esp32s3, esp32c3, esp32c6, nrf52840, rp2040, stm32]
+        arch:
+          - esp32
+          - esp32s3
+          - esp32c3
+          - esp32c6
+          - nrf52840
+          - rp2040
+          - rp2350
+          - stm32
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'workflow_dispatch' }}
-    needs: [release-artifacts]
+    needs: [release-artifacts, version]
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
           python-version: 3.x
 
-      - name: Get release version string
-        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-        id: version
-
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
-          pattern: firmware-${{matrix.arch}}-${{ steps.version.outputs.long }}
+          pattern: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
           merge-multiple: true
           path: ./output
 
@@ -401,16 +458,16 @@ jobs:
           chmod +x ./output/device-update.sh
 
       - name: Zip firmware
-        run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip ./output
+        run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output
 
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
-          name: debug-elfs-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip
+          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
           merge-multiple: true
           path: ./elfs
 
       - name: Zip debug elfs
-        run: zip -j -9 -r ./debug-elfs-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip ./elfs
+        run: zip -j -9 -r ./debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./elfs
 
       # For diagnostics
       - name: Display structure of downloaded files
@@ -420,33 +477,30 @@ jobs:
         # Only run when targeting master branch with workflow_dispatch
         if: ${{ github.ref_name == 'master' }}
         run: |
-          gh release upload v${{ steps.version.outputs.long }} ./firmware-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip
-          gh release upload v${{ steps.version.outputs.long }} ./debug-elfs-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip
+          gh release upload v${{ needs.version.outputs.long }} ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
+          gh release upload v${{ needs.version.outputs.long }} ./debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   publish-firmware:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-24.04
     if: ${{ github.event_name == 'workflow_dispatch' }}
-    needs: [release-firmware]
+    needs: [release-firmware, version]
     env:
-      targets: esp32,esp32s3,esp32c3,esp32c6,nrf52840,rp2040,stm32
+      targets: |-
+        esp32,esp32s3,esp32c3,esp32c6,nrf52840,rp2040,rp2350,stm32
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
           python-version: 3.x
 
-      - name: Get release version string
-        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-        id: version
-
-      - uses: actions/download-artifact@v4
+      - uses: actions/download-artifact@v5
         with:
-          pattern: firmware-{${{ env.targets }}}-${{ steps.version.outputs.long }}
+          pattern: firmware-{${{ env.targets }}}-${{ needs.version.outputs.long }}
           merge-multiple: true
           path: ./publish
 
@@ -460,9 +514,9 @@ jobs:
           external_repository: meshtastic/meshtastic.github.io
           publish_branch: master
           publish_dir: ./publish
-          destination_dir: ${{ env.DEST_PREFIX }}firmware-${{ steps.version.outputs.long }}
+          destination_dir: ${{ env.DEST_PREFIX }}firmware-${{ needs.version.outputs.long }}
           keep_files: true
           user_name: github-actions[bot]
           user_email: github-actions[bot]@users.noreply.github.com
-          commit_message: ${{ steps.version.outputs.long }}
+          commit_message: ${{ needs.version.outputs.long }}
           enable_jekyll: true

.github/workflows/nightly.yml

@@ -8,12 +8,13 @@ permissions: read-all
 
 jobs:
   trunk_check:
+    if: github.repository == 'meshtastic/firmware'
     name: Trunk Check and Upload
     runs-on: ubuntu-24.04
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Trunk Check
         uses: trunk-io/trunk-action@v1
@@ -21,6 +22,7 @@ jobs:
           trunk-token: ${{ secrets.TRUNK_TOKEN }}
 
   trunk_upgrade:
+    if: github.repository == 'meshtastic/firmware'
     # See: https://github.com/trunk-io/trunk-action/blob/v1/readme.md#automatic-upgrades
     name: Trunk Upgrade (PR)
     runs-on: ubuntu-24.04
@@ -29,7 +31,7 @@ jobs:
       pull-requests: write # For trunk to create PRs
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Trunk Upgrade
         uses: trunk-io/trunk-action/upgrade@v1

.github/workflows/package_obs.yml

@@ -34,7 +34,7 @@ jobs:
     needs: build-debian-src
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
           path: meshtasticd
@@ -58,7 +58,7 @@ jobs:
         id: version
 
       - name: Download artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: firmware-debian-${{ steps.version.outputs.deb }}~${{ inputs.series }}-src
           merge-multiple: true

.github/workflows/package_pio_deps.yml

@@ -24,7 +24,7 @@ jobs:
     runs-on: ubuntu-24.04
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
           ref: ${{github.event.pull_request.head.ref}}

.github/workflows/package_ppa.yml

@@ -32,7 +32,7 @@ jobs:
     needs: build-debian-src
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: recursive
           path: meshtasticd
@@ -60,7 +60,7 @@ jobs:
         id: version
 
       - name: Download artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: firmware-debian-${{ steps.version.outputs.deb }}~${{ inputs.series }}-src
           merge-multiple: true

.github/workflows/pr_enforce_labels.yml

@@ -0,0 +1,24 @@
+name: Check PR Labels
+
+on:
+  pull_request:
+    types: [opened, edited, labeled, unlabeled, synchronize, reopened]
+
+permissions:
+  pull-requests: read
+  contents: read
+
+jobs:
+  check-label:
+    runs-on: ubuntu-24.04
+    steps:
+      - name: Check for PR labels
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const labels = context.payload.pull_request.labels.map(label => label.name);
+            const requiredLabels = ['bugfix', 'enhancement', 'hardware-support', 'dependencies', 'submodules', 'github_actions', 'trunk'];
+            const hasRequiredLabel = labels.some(label => requiredLabels.includes(label));
+            if (!hasRequiredLabel) {
+              core.setFailed(`PR must have at least one of the following labels before it can be merged: ${requiredLabels.join(', ')}.`);
+            }

.github/workflows/pr_tests.yml

@@ -0,0 +1,238 @@
+name: Tests
+
+# DISABLED: Changed from automatic PR triggers to manual only
+on:
+  workflow_dispatch:
+    inputs:
+      reason:
+        description: "Reason for manual test run"
+        required: false
+        default: "Manual test execution"
+
+concurrency:
+  group: tests-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
+permissions:
+  contents: read
+  actions: read
+  checks: write
+  pull-requests: write
+
+jobs:
+  native-tests:
+    name: "🧪 Native Tests"
+    if: github.repository == 'meshtastic/firmware'
+    uses: ./.github/workflows/test_native.yml
+    permissions:
+      contents: read
+      actions: read
+      checks: write
+
+  test-summary:
+    name: "📊 Test Results"
+    runs-on: ubuntu-latest
+    needs: [native-tests]
+    if: always()
+    permissions:
+      contents: read
+      actions: read
+      checks: write
+      pull-requests: write
+    steps:
+      - uses: actions/checkout@v5
+        with:
+          submodules: recursive
+
+      - name: Get release version string
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Download test artifacts
+        if: needs.native-tests.result != 'skipped'
+        uses: actions/download-artifact@v5
+        with:
+          name: platformio-test-report-${{ steps.version.outputs.long }}.zip
+          merge-multiple: true
+
+      - name: Parse test results and create detailed summary
+        id: test-results
+        run: |
+          echo "## 🧪 Test Results Summary" >> $GITHUB_STEP_SUMMARY
+          echo "" >> $GITHUB_STEP_SUMMARY
+
+          # Check overall job status first
+          if [[ "${{ needs.native-tests.result }}" == "success" ]]; then
+            echo "✅ **Overall Status**: PASSED" >> $GITHUB_STEP_SUMMARY
+          elif [[ "${{ needs.native-tests.result }}" == "failure" ]]; then
+            echo "❌ **Overall Status**: FAILED" >> $GITHUB_STEP_SUMMARY
+          elif [[ "${{ needs.native-tests.result }}" == "cancelled" ]]; then
+            echo "⏸️ **Overall Status**: CANCELLED" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "Tests were cancelled before completion." >> $GITHUB_STEP_SUMMARY
+            exit 0
+          else
+            echo "⚠️ **Overall Status**: SKIPPED" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "Tests were skipped." >> $GITHUB_STEP_SUMMARY
+            exit 0
+          fi
+
+          echo "" >> $GITHUB_STEP_SUMMARY
+
+          # Parse detailed test results if available
+          if [ -f "testreport.xml" ]; then
+            echo "### 🔍 Individual Test Results" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            
+            python3 << 'EOF'
+          import xml.etree.ElementTree as ET
+          import os
+
+          try:
+              tree = ET.parse('testreport.xml')
+              root = tree.getroot()
+              
+              total_tests = 0
+              passed_tests = 0
+              failed_tests = 0
+              skipped_tests = 0
+              
+              # Parse testsuite elements
+              for testsuite in root.findall('.//testsuite'):
+                  suite_name = testsuite.get('name', 'Unknown')
+                  suite_tests = int(testsuite.get('tests', '0'))
+                  suite_failures = int(testsuite.get('failures', '0'))
+                  suite_errors = int(testsuite.get('errors', '0'))
+                  suite_skipped = int(testsuite.get('skipped', '0'))
+                  
+                  total_tests += suite_tests
+                  failed_tests += suite_failures + suite_errors
+                  skipped_tests += suite_skipped
+                  passed_tests += suite_tests - suite_failures - suite_errors - suite_skipped
+                  
+                  if suite_tests > 0:
+                      status = "✅" if (suite_failures + suite_errors) == 0 else "❌"
+                      print(f"**{status} Test Suite: {suite_name}**")
+                      print(f"- Total: {suite_tests}")
+                      print(f"- Passed: ✅ {suite_tests - suite_failures - suite_errors - suite_skipped}")
+                      print(f"- Failed: ❌ {suite_failures + suite_errors}")
+                      if suite_skipped > 0:
+                          print(f"- Skipped: ⏭️ {suite_skipped}")
+                      print("")
+                      
+                      # Show individual test results for failed suites
+                      if suite_failures + suite_errors > 0:
+                          print("**Failed Tests:**")
+                          for testcase in testsuite.findall('testcase'):
+                              test_name = testcase.get('name', 'Unknown')
+                              failure = testcase.find('failure')
+                              error = testcase.find('error')
+                              
+                              if failure is not None:
+                                  msg = failure.get('message', 'Unknown error')[:100]
+                                  print(f"- ❌ `{test_name}`: {msg}")
+                              elif error is not None:
+                                  msg = error.get('message', 'Unknown error')[:100]
+                                  print(f"- ❌ `{test_name}`: ERROR - {msg}")
+                          print("")
+                      else:
+                          # Show passed tests for successful suites
+                          passed_count = 0
+                          for testcase in testsuite.findall('testcase'):
+                              if testcase.find('failure') is None and testcase.find('error') is None:
+                                  if passed_count < 5:  # Limit to first 5 to avoid spam
+                                      test_name = testcase.get('name', 'Unknown')
+                                      print(f"- ✅ `{test_name}`: PASSED")
+                                  passed_count += 1
+                          if passed_count > 5:
+                              print(f"- ... and {passed_count - 5} more tests passed")
+                          print("")
+              
+              # Summary statistics
+              print("### 📊 Test Statistics")
+              print(f"- **Total Tests**: {total_tests}")
+              print(f"- **Passed**: ✅ {passed_tests}")
+              print(f"- **Failed**: ❌ {failed_tests}")
+              if skipped_tests > 0:
+                  print(f"- **Skipped**: ⏭️ {skipped_tests}")
+              
+              if failed_tests > 0:
+                  print(f"\n❌ **{failed_tests} tests failed out of {total_tests} total**")
+              else:
+                  print(f"\n✅ **All {total_tests} tests passed!**")
+                  
+          except Exception as e:
+              print(f"❌ Error parsing test results: {e}")
+          EOF
+          else
+            echo "⚠️ **No detailed test report available**" >> $GITHUB_STEP_SUMMARY
+            echo "" >> $GITHUB_STEP_SUMMARY
+            echo "Test artifacts may not have been generated properly." >> $GITHUB_STEP_SUMMARY
+          fi
+
+          echo "" >> $GITHUB_STEP_SUMMARY
+          echo "---" >> $GITHUB_STEP_SUMMARY
+          echo "View detailed logs in the [Actions tab](${{ github.server_url }}/${{ github.repository }}/actions/runs/${{ github.run_id }})" >> $GITHUB_STEP_SUMMARY
+
+      - name: Comment test results on PR
+        if: github.event_name == 'pull_request' && needs.native-tests.result != 'skipped'
+        uses: actions/github-script@v7
+        with:
+          script: |
+            const fs = require('fs');
+
+            // Read the step summary to use as PR comment
+            let testSummary = "## 🧪 Test Results Summary\n\n";
+
+            if ("${{ needs.native-tests.result }}" === "success") {
+              testSummary += "✅ **All tests passed!**\n\n";
+            } else if ("${{ needs.native-tests.result }}" === "failure") {
+              testSummary += "❌ **Some tests failed.**\n\n";
+            } else {
+              testSummary += "⚠️ **Tests did not complete normally.**\n\n";
+            }
+
+            testSummary += `View detailed results: [Actions Run](${context.payload.repository.html_url}/actions/runs/${context.runId})\n\n`;
+            testSummary += "---\n";
+            testSummary += "*This comment will be automatically updated when new commits are pushed.*";
+
+            // Find existing comment
+            const comments = await github.rest.issues.listComments({
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              issue_number: context.issue.number
+            });
+
+            const botComment = comments.data.find(comment => 
+              comment.user.type === 'Bot' && 
+              comment.body.includes('🧪 Test Results Summary')
+            );
+
+            if (botComment) {
+              // Update existing comment
+              await github.rest.issues.updateComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                comment_id: botComment.id,
+                body: testSummary
+              });
+            } else {
+              // Create new comment
+              await github.rest.issues.createComment({
+                owner: context.repo.owner,
+                repo: context.repo.repo,
+                issue_number: context.issue.number,
+                body: testSummary
+              });
+            }
+
+      - name: Set overall status
+        run: |
+          if [[ "${{ needs.native-tests.result }}" == "success" ]]; then
+            echo "All tests passed! ✅"
+            exit 0
+          else
+            echo "Some tests failed! ❌"
+            exit 1
+          fi

.github/workflows/release_channels.yml

@@ -20,7 +20,11 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        series: [plucky, oracular, noble, jammy]
+        series:
+          - jammy # 22.04
+          - noble # 24.04
+          - plucky # 25.04
+          # - questing # 25.10
     uses: ./.github/workflows/package_ppa.yml
     with:
       ppa_repo: |-
@@ -56,7 +60,7 @@ jobs:
         shell: bash
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Setup Python
         uses: actions/setup-python@v5
@@ -98,8 +102,10 @@ jobs:
         uses: peter-evans/create-pull-request@v7
         with:
           base: ${{ github.event.repository.default_branch }}
+          branch: create-pull-request/bump-version
+          labels: github_actions
           title: Bump release version
-          commit-message: automated bumps
+          commit-message: Automated version bumps
           add-paths: |
             version.properties
             debian/changelog

.github/workflows/sec_sast_semgrep_cron.yml

@@ -13,6 +13,7 @@ permissions:
 
 jobs:
   semgrep-full:
+    if: github.repository == 'meshtastic/firmware'
     runs-on: ubuntu-24.04
     container:
       image: semgrep/semgrep
@@ -20,7 +21,7 @@ jobs:
     steps:
       # step 1
       - name: clone application source code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       # step 2
       - name: full scan

.github/workflows/sec_sast_semgrep_pull.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
       # step 1
       - name: clone application source code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           fetch-depth: 0
 

.github/workflows/stale_bot.yml

@@ -11,6 +11,7 @@ permissions:
 
 jobs:
   stale_issues:
+    if: github.repository == 'meshtastic/firmware'
     name: Close Stale Issues
     runs-on: ubuntu-latest
 

.github/workflows/test_native.yml

@@ -14,7 +14,7 @@ jobs:
     name: Native Simulator Tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
@@ -70,7 +70,7 @@ jobs:
     name: Native PlatformIO Tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
@@ -127,7 +127,7 @@ jobs:
       - platformio-tests
     if: always()
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
         with:
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
@@ -137,20 +137,20 @@ jobs:
         id: version
 
       - name: Download test artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           name: platformio-test-report-${{ steps.version.outputs.long }}.zip
           merge-multiple: true
 
       - name: Test Report
-        uses: dorny/test-reporter@v2.1.0
+        uses: dorny/test-reporter@v2.1.1
         with:
           name: PlatformIO Tests
           path: testreport.xml
           reporter: java-junit
 
       - name: Download coverage artifacts
-        uses: actions/download-artifact@v4
+        uses: actions/download-artifact@v5
         with:
           pattern: lcov-coverage-info-native-*-${{ steps.version.outputs.long }}.zip
           path: code-coverage-report

.github/workflows/tests.yml

@@ -12,13 +12,15 @@ permissions:
 
 jobs:
   native-tests:
+    if: github.repository == 'meshtastic/firmware'
     uses: ./.github/workflows/test_native.yml
 
   hardware-tests:
+    if: github.repository == 'meshtastic/firmware'
     runs-on: test-runner
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       # - uses: actions/setup-python@v5
       #   with:

.github/workflows/trunk_annotate_pr.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Trunk Check
         uses: trunk-io/trunk-action@v1

.github/workflows/trunk_check.yml

@@ -16,7 +16,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
 
       - name: Trunk Check
         uses: trunk-io/trunk-action@v1

.github/workflows/trunk_format_pr.yml

@@ -15,7 +15,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}

.github/workflows/update_protobufs.yml

@@ -11,7 +11,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Checkout code
-        uses: actions/checkout@v4
+        uses: actions/checkout@v5
         with:
           submodules: true
 
@@ -33,7 +33,10 @@ jobs:
       - name: Create pull request
         uses: peter-evans/create-pull-request@v7
         with:
+          branch: create-pull-request/update-protobufs
+          labels: submodules
           title: Update protobufs and classes
+          commit-message: Update protobufs
           add-paths: |
             protobufs
             src/mesh

.gitignore

@@ -37,4 +37,7 @@ release/
 .vscode/extensions.json
 /compile_commands.json
 src/mesh/raspihttp/certificate.pem
-src/mesh/raspihttp/private_key.pem
+src/mesh/raspihttp/private_key.pem
+
+# Ignore logo (set at build time with platformio-custom.py)
+data/boot/logo.*

.trunk/trunk.yaml

@@ -1,34 +1,34 @@
 version: 0.1
 cli:
-  version: 1.24.0
+  version: 1.25.0
 plugins:
   sources:
     - id: trunk
-      ref: v1.7.0
+      ref: v1.7.2
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - checkov@3.2.435
-    - renovate@40.34.4
-    - prettier@3.5.3
-    - trufflehog@3.88.34
+    - checkov@3.2.465
+    - renovate@41.82.10
+    - prettier@3.6.2
+    - trufflehog@3.90.5
     - yamllint@1.37.1
-    - bandit@1.8.3
-    - trivy@0.62.1
-    - taplo@0.9.3
-    - ruff@0.11.11
+    - bandit@1.8.6
+    - trivy@0.65.0
+    - taplo@0.10.0
+    - ruff@0.12.10
     - isort@6.0.1
     - markdownlint@0.45.0
     - oxipng@9.1.5
-    - svgo@3.3.2
+    - svgo@4.0.0
     - actionlint@1.7.7
-    - flake8@7.2.0
+    - flake8@7.3.0
     - hadolint@2.12.1-beta
     - shfmt@3.6.0
-    - shellcheck@0.10.0
+    - shellcheck@0.11.0
     - black@25.1.0
     - git-diff-check
-    - gitleaks@8.26.0
+    - gitleaks@8.28.0
     - clang-format@16.0.3
   ignore:
     - linters: [ALL]

Dockerfile

@@ -3,7 +3,7 @@
 # trunk-ignore-all(hadolint/DL3008): Do not pin apt package versions
 # trunk-ignore-all(hadolint/DL3013): Do not pin pip package versions
 
-FROM python:3.13-bookworm AS builder
+FROM python:3.13-slim-trixie AS builder
 ARG PIO_ENV=native
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Etc/UTC
@@ -36,7 +36,7 @@ RUN curl -L "https://github.com/meshtastic/web/releases/download/v$(cat /tmp/fir
 
 ##### PRODUCTION BUILD #############
 
-FROM debian:bookworm-slim
+FROM debian:trixie-slim
 LABEL org.opencontainers.image.title="Meshtastic" \
       org.opencontainers.image.description="Debian Meshtastic daemon and web interface" \
       org.opencontainers.image.url="https://meshtastic.org" \
@@ -51,8 +51,8 @@ ENV TZ=Etc/UTC
 USER root
 
 RUN apt-get update && apt-get --no-install-recommends -y install \
-        libc-bin libc6 libgpiod2 libyaml-cpp0.7 libi2c0 libuv1 libusb-1.0-0-dev \
-        liborcania2.3 libulfius2.7 libssl3 \
+        libc-bin libc6 libgpiod3 libyaml-cpp0.8 libi2c0 libuv1t64 libusb-1.0-0-dev \
+        liborcania2.3 libulfius2.7t64 libssl3t64 \
         libx11-6 libinput10 libxkbcommon-x11-0 \
     && apt-get clean && rm -rf /var/lib/apt/lists/* \
     && mkdir -p /var/lib/meshtasticd \
@@ -61,7 +61,7 @@ RUN apt-get update && apt-get --no-install-recommends -y install \
 
 # Fetch compiled binary from the builder
 COPY --from=builder /tmp/firmware/release/meshtasticd /usr/bin/
-COPY --from=builder /tmp/web /usr/share/meshtasticd/
+COPY --from=builder /tmp/web /usr/share/meshtasticd/web/
 # Copy config templates
 COPY ./bin/config.d /etc/meshtasticd/available.d
 

README.md

@@ -37,3 +37,4 @@ Join our community and help improve Meshtastic! 🚀
 ## Stats
 
 ![Alt](https://repobeats.axiom.co/api/embed/8025e56c482ec63541593cc5bd322c19d5c0bdcf.svg "Repobeats analytics image")
+

alpine.Dockerfile

@@ -3,7 +3,7 @@
 # trunk-ignore-all(hadolint/DL3018): Do not pin apk package versions
 # trunk-ignore-all(hadolint/DL3013): Do not pin pip package versions
 
-FROM python:3.13-alpine3.21 AS builder
+FROM python:3.13-alpine3.22 AS builder
 ARG PIO_ENV=native
 ENV PIP_ROOT_USER_ACTION=ignore
 
@@ -27,7 +27,7 @@ RUN bash ./bin/build-native.sh "$PIO_ENV" && \
 
 # ##### PRODUCTION BUILD #############
 
-FROM alpine:3.21
+FROM alpine:3.22
 LABEL org.opencontainers.image.title="Meshtastic" \
       org.opencontainers.image.description="Alpine Meshtastic daemon" \
       org.opencontainers.image.url="https://meshtastic.org" \

arch/esp32/esp32.ini

@@ -4,7 +4,7 @@ extends = arduino_base
 custom_esp32_kind = esp32
 platform =
   # renovate: datasource=custom.pio depName=platformio/espressif32 packageName=platformio/platform/espressif32
-  platformio/espressif32@6.10.0
+  platformio/espressif32@6.11.0
 
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>
@@ -49,13 +49,13 @@ lib_deps =
   ${environmental_extra.lib_deps}
   ${radiolib_base.lib_deps}
   # renovate: datasource=git-refs depName=meshtastic-esp32_https_server packageName=https://github.com/meshtastic/esp32_https_server gitBranch=master
-  https://github.com/meshtastic/esp32_https_server/archive/896f1771ceb5979987a0b41028bf1b4e7aad419b.zip
+  https://github.com/meshtastic/esp32_https_server/archive/3223704846752e6d545139204837bdb2a55459ca.zip
   # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
   h2zero/NimBLE-Arduino@^1.4.3
   # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
   https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
-  # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
-  lewisxhe/XPowersLib@^0.2.7
+  # renovate: datasource=github-tags depName=XPowersLib packageName=lewisxhe/XPowersLib
+  https://github.com/lewisxhe/XPowersLib/archive/v0.3.0.zip
   # 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

arch/esp32/esp32c6.ini

@@ -28,7 +28,7 @@ lib_deps =
   ${environmental_extra.lib_deps}
   ${radiolib_base.lib_deps}
   # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
-  lewisxhe/XPowersLib@^0.2.7
+  lewisxhe/XPowersLib@0.3.0
   # 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

arch/nrf52/nrf52.ini

@@ -23,7 +23,7 @@ build_flags =
   -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
 
 build_src_filter = 
-  ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>
+  ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp> -<serialization/>
 
 lib_deps=
   ${arduino_base.lib_deps}

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/622341c6de8a239704318b10c3dbb00c21a3eab3.zip
+  https://github.com/meshtastic/platform-native/archive/37d986499ce24511952d7146db72d667c6bdaff7.zip
 framework = arduino
 
 build_src_filter = 
@@ -17,7 +17,6 @@ build_src_filter =
   +<mesh/raspihttp/>
   -<mesh/eth/>
   -<modules/esp32>
-  +<../variants/portduino>
 
 lib_deps =
   ${env.lib_deps}
@@ -30,14 +29,17 @@ lib_deps =
   lovyan03/LovyanGFX@^1.2.0
   # renovate: datasource=git-refs depName=libch341-spi-userspace packageName=https://github.com/pine64/libch341-spi-userspace gitBranch=main
   https://github.com/pine64/libch341-spi-userspace/archive/af9bc27c9c30fa90772279925b7c5913dff789b4.zip
+  # renovate: datasource=custom.pio depName=adafruit/Adafruit seesaw Library packageName=adafruit/library/Adafruit seesaw Library
+	adafruit/Adafruit seesaw Library@1.7.9
 
 build_flags =
   ${arduino_base.build_flags}
+  -D ARCH_PORTDUINO
   -fPIC
   -Isrc/platform/portduino
   -DRADIOLIB_EEPROM_UNSUPPORTED
   -DPORTDUINO_LINUX_HARDWARE
-  -DHAS_UDP_MULTICAST
+  -DHAS_UDP_MULTICAST=1
   -lpthread
   -lstdc++fs
   -lbluetooth
@@ -48,4 +50,7 @@ build_flags =
   -std=gnu17
   -std=c++17
 
-lib_ignore = Adafruit NeoPixel
+lib_ignore =
+  Adafruit NeoPixel
+  Adafruit ST7735 and ST7789 Library
+  SD

arch/stm32/stm32.ini

@@ -2,7 +2,7 @@
 extends = arduino_base
 platform =
   # renovate: datasource=custom.pio depName=platformio/ststm32 packageName=platformio/platform/ststm32
-  platformio/ststm32@19.1.0
+  platformio/ststm32@19.3.0
 platform_packages =
   # TODO renovate
   platformio/framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/2.10.1.zip
@@ -16,18 +16,27 @@ build_flags =
   ${arduino_base.build_flags}
   -flto
   -Isrc/platform/stm32wl -g
-  -DMESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
-  -DMESHTASTIC_EXCLUDE_INPUTBROKER
-  -DMESHTASTIC_EXCLUDE_I2C
-  -DMESHTASTIC_EXCLUDE_POWERMON
-  -DMESHTASTIC_EXCLUDE_SCREEN
-  -DMESHTASTIC_EXCLUDE_MQTT
-  -DMESHTASTIC_EXCLUDE_BLUETOOTH
-  -DMESHTASTIC_EXCLUDE_GPS
-  ;-DDEBUG_MUTE
+  -DMESHTASTIC_EXCLUDE_AUDIO=1
+  -DMESHTASTIC_EXCLUDE_ATAK=1 ; ATAK is quite big, disable it for big flash savings.
+  -DMESHTASTIC_EXCLUDE_INPUTBROKER=1
+  -DMESHTASTIC_EXCLUDE_POWERMON=1
+  -DMESHTASTIC_EXCLUDE_SCREEN=1
+  -DMESHTASTIC_EXCLUDE_MQTT=1
+  -DMESHTASTIC_EXCLUDE_BLUETOOTH=1
+  -DMESHTASTIC_EXCLUDE_WIFI=1
+  -DMESHTASTIC_EXCLUDE_TZ=1 ; Exclude TZ to save some flash space.
+  -DSERIAL_RX_BUFFER_SIZE=256 ; For GPS - the default of 64 is too small.
+  -DHAS_SCREEN=0 ; Always disable screen for STM32, it is not supported.
+  -DPIO_FRAMEWORK_ARDUINO_NANOLIB_FLOAT_PRINTF ; This is REQUIRED for at least traceroute debug prints - without it the length ends up uninitialized.
+  -DDEBUG_MUTE ; You can #undef DEBUG_MUTE in certain source files if you need the logs.
   -fmerge-all-constants
   -ffunction-sections
   -fdata-sections
+  -DRADIOLIB_EXCLUDE_SX128X=1
+  -DRADIOLIB_EXCLUDE_SX127X=1
+  -DRADIOLIB_EXCLUDE_LR11X0=1
+  -DHAL_DAC_MODULE_ONLY
+  -DHAL_RNG_MODULE_ENABLED
 
 build_src_filter =
   ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/api/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mesh/eth/> -<input> -<buzz> -<modules/RemoteHardwareModule.cpp> -<platform/nrf52> -<platform/portduino> -<platform/rp2xx0> -<mesh/raspihttp>
@@ -39,9 +48,9 @@ debug_tool = stlink
 lib_deps =
   ${env.lib_deps}
   ${radiolib_base.lib_deps}
+
   # renovate: datasource=git-refs depName=caveman99-stm32-Crypto packageName=https://github.com/caveman99/Crypto gitBranch=main
   https://github.com/caveman99/Crypto/archive/eae9c768054118a9399690f8af202853d1ae8516.zip
 
 lib_ignore =
-  mathertel/OneButton@2.6.1
-  Wire
+  OneButton

bin/build-esp32.sh

@@ -11,7 +11,7 @@ rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
 
 # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
-platformio pkg update -e $1
+platformio pkg install -e $1
 
 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
 rm -f .pio/build/$1/firmware.*
@@ -34,11 +34,12 @@ SRCBIN=.pio/build/$1/firmware.bin
 cp $SRCBIN $OUTDIR/$basename-update.bin
 
 echo "Building Filesystem for ESP32 targets"
-pio run --environment $1 -t buildfs
-cp .pio/build/$1/littlefs.bin $OUTDIR/littlefswebui-$1-$VERSION.bin
-# Remove webserver files from the filesystem and rebuild
-ls -l data/static # Diagnostic list of files
-rm -rf data/static
+# If you want to build the webui, uncomment the following lines
+# pio run --environment $1 -t buildfs
+# cp .pio/build/$1/littlefs.bin $OUTDIR/littlefswebui-$1-$VERSION.bin
+# # Remove webserver files from the filesystem and rebuild
+# ls -l data/static # Diagnostic list of files
+# rm -rf data/static
 pio run --environment $1 -t buildfs
 cp .pio/build/$1/littlefs.bin $OUTDIR/littlefs-$1-$VERSION.bin
 cp bin/device-install.* $OUTDIR

bin/build-firmware.sh

@@ -11,7 +11,7 @@ elif (echo $2 | grep -q "nrf52"); then
 elif (echo $2 | grep -q "stm32"); then
   bin/build-stm32.sh $1
 elif (echo $2 | grep -q "rpi2040"); then
-  bin/build-rpi2040.sh $1
+  bin/build-rp2xx0.sh $1
 else
   echo "Unknown target $2"
   exit 1

bin/build-native.sh

@@ -25,7 +25,7 @@ mkdir -p $OUTDIR/
 rm -r $OUTDIR/* || true
 
 # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
-pio pkg update --environment "$PIO_ENV" || platformioFailed
+pio pkg install --environment "$PIO_ENV" || platformioFailed
 pio run --environment "$PIO_ENV" || platformioFailed
 cp ".pio/build/$PIO_ENV/program" "$OUTDIR/meshtasticd_linux_$(uname -m)"
 cp bin/native-install.* $OUTDIR

bin/build-nrf52.sh

@@ -11,7 +11,7 @@ rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
 
 # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
-platformio pkg update -e $1
+platformio pkg install -e $1
 
 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
 rm -f .pio/build/$1/firmware.*

bin/build-rp2xx0.sh

@@ -11,7 +11,7 @@ rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
 
 # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
-platformio pkg update -e $1
+platformio pkg install -e $1
 
 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
 rm -f .pio/build/$1/firmware.*

bin/build-stm32wl.sh

@@ -11,7 +11,7 @@ rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
 
 # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
-platformio pkg update -e $1
+platformio pkg install -e $1
 
 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
 rm -f .pio/build/$1/firmware.*

bin/check-all.sh

@@ -23,4 +23,4 @@ for BOARD in $BOARDS; do
 	CHECK="${CHECK} -e ${BOARD}"
 done
 
-pio check --flags "-DAPP_VERSION=${APP_VERSION} --suppressions-list=suppressions.txt" $CHECK --skip-packages --pattern="src/" --fail-on-defect=medium --fail-on-defect=high
+pio check --flags "-DAPP_VERSION=${APP_VERSION} --suppressions-list=suppressions.txt --inline-suppr" $CHECK --skip-packages --pattern="src/" --fail-on-defect=medium --fail-on-defect=high

bin/config-dist.yaml

@@ -96,9 +96,9 @@ Lora:
 ### Some devices, like the pinedio, may require spidev0.1 as a workaround.
 #  spidev: spidev0.0
 
-### Define GPIO buttons here:
+### Deprecated location for User Button:
 
-GPIO:
+#GPIO:
 #  User: 6
 
 ### Define GPS
@@ -115,17 +115,6 @@ I2C:
 
 Display:
 
-### Waveshare 1.44inch LCD HAT
-#  Panel: ST7735S
-#  CS: 8         #Chip Select
-#  DC: 25        # Data/Command pin
-#  Backlight: 24
-#  Width: 128
-#  Height: 128
-#  Reset: 27
-#  OffsetX: 0
-#  OffsetY: 0
-
 ### Adafruit PiTFT 2.8 TFT+Touchscreen
 #  Panel: ILI9341
 #  CS: 8
@@ -180,6 +169,16 @@ Input:
 
 #  KeyboardDevice: /dev/input/by-id/usb-_Raspberry_Pi_Internal_Keyboard-event-kbd
 
+### Standard User Button Config
+#  UserButton: 6
+
+### Trackball/Joystick input
+#  TrackballUp: 6
+#  TrackballDown: 19
+#  TrackballLeft: 5
+#  TrackballRight: 26
+#  TrackballPress: 13
+
 ###
 
 Logging:
@@ -200,6 +199,10 @@ HostMetrics:
 #  UserStringCommand: cat /sys/firmware/devicetree/base/serial-number # Command to execute, to send the results as the userString
 
 
+Config:
+#  DisplayMode: TWOCOLOR # uncomment to force BaseUI
+#  DisplayMode: COLOR # uncomment to force MUI
+
 General:
   MaxNodes: 200
   MaxMessageQueue: 100

bin/config.d/display-waveshare-1-44.yaml

@@ -0,0 +1,26 @@
+### Waveshare 1.44inch LCD HAT
+Display:
+  Panel: ST7735S
+  spidev: spidev0.0  # Specify either the spidev here, or the CS below
+#  CS: 8         #Chip Select # Optional, as this is the default pin for spidev0.0
+  DC: 25        # Data/Command pin
+  Backlight: 24
+  Width: 128
+  Height: 128
+  Reset: 27
+  OffsetX: 2
+  OffsetY: 1
+
+
+#  OffsetY: 31  # These two options are used to properly flip the screen 180 degrees
+#  OffsetRotate: 3
+
+
+Input:
+  TrackballUp: 6
+  TrackballDown: 19
+  TrackballLeft: 5
+  TrackballRight: 26
+  TrackballPress: 13
+  TrackballDirection: FALLING
+#  User: 21

bin/config.d/lora-MeshAdv-Mini-900M22S.yaml

@@ -6,6 +6,6 @@ Lora:
   IRQ: 16
   Busy: 20
   Reset: 24
-  TXen: 13
+  RXen: 12
   DIO2_AS_RF_SWITCH: true
   DIO3_TCXO_VOLTAGE: true

bin/config.d/lora-RAK6421-13300-slot1.yaml

@@ -0,0 +1,12 @@
+Lora:
+
+  ### RAK13300in Slot 1
+  Module: sx1262
+  IRQ: 22 #IO6
+  Reset: 16 # IO4
+  Busy: 24 # IO5
+  # Ant_sw: 13 # IO3 
+  DIO3_TCXO_VOLTAGE: true
+  DIO2_AS_RF_SWITCH: true
+  spidev: spidev0.0
+  # CS: 8

bin/config.d/lora-RAK6421-13300-slot2.yaml

@@ -0,0 +1,8 @@
+Lora:
+  ### RAK13300in Slot 2 pins
+  IRQ: 18 #IO6
+  Reset: 24 # IO4
+  Busy: 19 # IO5
+  # Ant_sw: 23 # IO3 
+  spidev: spidev0.1
+  # CS: 7

bin/config.d/lora-lyra-picocalc-wio-sx1262.yaml

@@ -0,0 +1,18 @@
+Lora:
+  Module: sx1262
+  DIO2_AS_RF_SWITCH: true
+  DIO3_TCXO_VOLTAGE: true
+  gpiochip: 0
+  MOSI: 12
+  MISO: 13
+  IRQ: 1
+  Busy: 23
+  Reset: 22
+  RXen: 0
+  gpiochip: 1
+  CS: 9
+  SCK: 11
+#  TXen: bridge to DIO2 on E22 module
+  SX126X_MAX_POWER: 22
+  spidev: spidev1.0
+  spiSpeed: 2000000

bin/config.d/lora-ws-raspberry-pico-to-orangepi-03.yaml

@@ -0,0 +1,52 @@
+# https://www.waveshare.com/pico-lora-sx1262-868m.htm
+# http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Zero-3.html
+#
+# See Orange Pi Zero3 manual, chapter 3.16, page 124 for 26-pin header pinout
+#
+# Pin Connection
+# Waveshare       Orange Pi Zero3
+#   36    3.3V        17
+#   15    MOSI        19
+#   16    MISO        21  
+#   14    CLK         23
+#   38    GND         25
+#   4     BUSY        18
+#   20    RESET       22
+#   5     CS          24
+#   26    DIO1/IRQ    26
+
+Lora:
+  Module: sx1262  # Waveshare Raspberry Pico Lora module
+  DIO2_AS_RF_SWITCH: true
+  DIO3_TCXO_VOLTAGE: true
+  # Specify either the spidev1_1 or the CS below, not both!
+  # On DietPi Linux, when using the user overlay dietpi-spi1_1.dtbo, CS will be configured with spidev1.1
+  spidev: spidev1.1 # See Orange Pi Zero3 manual, chapter 3.18.3, page 130
+#  CS:             # CS     PIN_24 -> chip 1, line 233
+#    pin: 24
+#    gpiochip: 1
+#    line: 233
+  SCK:            # SCK     PIN_23 -> chip 1, line 230
+    pin: 23
+    gpiochip: 1
+    line: 230
+  Busy:           # BUSY    PIN_18 -> chip 1, line 78
+    pin: 18
+    gpiochip: 1
+    line: 78
+  MOSI:           # MOSI    PIN_19 -> chip 1, line 231
+    pin: 19
+    gpiochip: 1
+    line: 231
+  MISO:           # MISO    PIN_21 -> chip 1, line 232
+    pin: 21
+    gpiochip: 1
+    line: 232
+  Reset:          # NRST    PIN_22 -> chip 1, line 71
+    pin: 22
+    gpiochip: 1
+    line: 71
+  IRQ:            # DIO1    PIN_26 -> chip 1, line 74
+    pin: 26
+    gpiochip: 1
+    line: 74

bin/device-install.bat

@@ -5,13 +5,13 @@ TITLE Meshtastic device-install
 SET "SCRIPT_NAME=%~nx0"
 SET "DEBUG=0"
 SET "PYTHON="
-SET "WEB_APP=0"
 SET "TFT_BUILD=0"
 SET "BIGDB8=0"
 SET "BIGDB16=0"
 SET "ESPTOOL_BAUD=115200"
 SET "ESPTOOL_CMD="
 SET "LOGCOUNTER=0"
+SET "BPS_RESET=0"
 
 @REM FIXME: Determine mcu from PlatformIO variant, this is unmaintainable.
 SET "S3=s3 v3 t-deck wireless-paper wireless-tracker station-g2 unphone"
@@ -24,7 +24,7 @@ GOTO getopts
 :help
 ECHO Flash image file to device, but first erasing and writing system information.
 ECHO.
-ECHO Usage: %SCRIPT_NAME% -f filename [-p PORT] [-P python] (--web)
+ECHO Usage: %SCRIPT_NAME% -f filename [-p PORT] [-P python] [--1200bps-reset]
 ECHO.
 ECHO Options:
 ECHO     -f filename      The firmware .bin file to flash.  Custom to your device type and region. (required)
@@ -34,14 +34,16 @@ ECHO                      If not set, ESPTOOL iterates all ports (Dangerous).
 ECHO     -P python        Specify alternate python interpreter to use to invoke esptool. (default: python)
 ECHO                      If supplied the script will use python.
 ECHO                      If not supplied the script will try to find esptool in Path.
-ECHO     --web            Enable WebUI. (default: false)
+ECHO     --1200bps-reset  Attempt to place the device in correct mode. (1200bps Reset)
+ECHO                      Some hardware requires this twice.
 ECHO.
+ECHO Example: %SCRIPT_NAME% -p COM17 --1200bps-reset
 ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4.bin -p COM11
-ECHO Example: %SCRIPT_NAME% -f firmware-unphone-2.6.0.0b106d4.bin -p COM11 --web
+ECHO Example: %SCRIPT_NAME% -f firmware-unphone-2.6.0.0b106d4.bin -p COM11
 GOTO eof
 
 :version
-ECHO %SCRIPT_NAME% [Version 2.6.1]
+ECHO %SCRIPT_NAME% [Version 2.6.2]
 ECHO Meshtastic
 GOTO eof
 
@@ -57,11 +59,13 @@ IF /I "%~1"=="-f" SET "FILENAME=%~2" & SHIFT
 IF "%~1"=="-p" SET "ESPTOOL_PORT=%~2" & SHIFT
 IF /I "%~1"=="--port" SET "ESPTOOL_PORT=%~2" & SHIFT
 IF "%~1"=="-P" SET "PYTHON=%~2" & SHIFT
-IF /I "%~1"=="--web" SET "WEB_APP=1"
+IF /I "%~1"=="--1200bps-reset" SET "BPS_RESET=1"
 SHIFT
 GOTO getopts
 :endopts
 
+IF %BPS_RESET% EQU 1 GOTO skip-filename
+
 CALL :LOG_MESSAGE DEBUG "Checking FILENAME parameter..."
 IF "__!FILENAME!__"=="____" (
     CALL :LOG_MESSAGE DEBUG "Missing -f filename input."
@@ -95,6 +99,9 @@ IF NOT "!FILENAME:update=!"=="!FILENAME!" (
     CALL :LOG_MESSAGE DEBUG "We are NOT working with a *update* file. !FILENAME!"
 )
 
+:skip-filename
+SET "ESPTOOL_BAUD=1200"
+
 CALL :LOG_MESSAGE DEBUG "Determine the correct esptool command to use..."
 IF NOT "__%PYTHON%__"=="____" (
     SET "ESPTOOL_CMD=!PYTHON! -m esptool"
@@ -133,13 +140,16 @@ IF "__!ESPTOOL_PORT!__" == "____" (
 )
 CALL :LOG_MESSAGE INFO "Using esptool baud: !ESPTOOL_BAUD!."
 
+IF %BPS_RESET% EQU 1 (
+    @REM Attempt to change mode via 1200bps Reset.
+    CALL :RUN_ESPTOOL !ESPTOOL_BAUD! --after no_reset read_flash_status
+    GOTO eof
+)
+
 @REM Check if FILENAME contains "-tft-" and set target partitionScheme accordingly.
 @REM https://github.com/meshtastic/web-flasher/blob/main/types/resources.ts#L3
 IF NOT "!FILENAME:-tft-=!"=="!FILENAME!" (
     CALL :LOG_MESSAGE DEBUG "We are working with a *-tft-* file. !FILENAME!"
-    IF %WEB_APP% EQU 1 (
-        CALL :LOG_MESSAGE ERROR "Cannot enable WebUI (--web) and MUI." & GOTO eof
-    )
     SET "TFT_BUILD=1"
 ) ELSE (
     CALL :LOG_MESSAGE DEBUG "We are NOT working with a *-tft-* file. !FILENAME!"
@@ -193,13 +203,8 @@ SET "OTA_FILENAME=bleota.bin"
 :end_loop_c3
 CALL :LOG_MESSAGE DEBUG "Set OTA_FILENAME to: !OTA_FILENAME!"
 
-@REM Check if (--web) is enabled and prefix BASENAME with "littlefswebui-" else "littlefs-".
-IF %WEB_APP% EQU 1 (
-    CALL :LOG_MESSAGE INFO "WebUI selected."
-    SET "SPIFFS_FILENAME=littlefswebui-%BASENAME%"
-) ELSE (
-    SET "SPIFFS_FILENAME=littlefs-%BASENAME%"
-)
+@REM Set SPIFFS filename with "littlefs-" prefix.
+SET "SPIFFS_FILENAME=littlefs-%BASENAME%"
 CALL :LOG_MESSAGE DEBUG "Set SPIFFS_FILENAME to: !SPIFFS_FILENAME!"
 
 @REM Default offsets.
@@ -254,6 +259,7 @@ EXIT /B %ERRORLEVEL%
 IF %DEBUG% EQU 1 CALL :LOG_MESSAGE DEBUG "About to run command: !ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4"
 CALL :RESET_ERROR
 !ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4
+IF %BPS_RESET% EQU 1 GOTO :eof
 IF %ERRORLEVEL% NEQ 0 (
     CALL :LOG_MESSAGE ERROR "Error running command: !ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4"
     EXIT /B %ERRORLEVEL%

bin/device-install.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 
 PYTHON=${PYTHON:-$(which python3 python | head -n 1)}
-WEB_APP=false
+BPS_RESET=false
 TFT_BUILD=false
 MCU=""
 
@@ -32,185 +32,185 @@ BIGDB_16MB=(
 	"ESP32-S3-Pico"
 	"m5stack-cores3"
 	"station-g2"
-	"t-eth-elite"
-	"t-watch-s3"
+    "t-eth-elite"
+    "t-watch-s3"
+    "elecrow-adv-35-tft"
+    "elecrow-adv-24-28-tft"
+    "elecrow-adv1-43-50-70-tft"
 )
 S3_VARIANTS=(
-	"s3"
-	"-v3"
-	"t-deck"
-	"wireless-paper"
-	"wireless-tracker"
-	"station-g2"
-	"unphone"
-	"t-eth-elite"
- 	"mesh-tab"
-	"dreamcatcher"
-	"ESP32-S3-Pico"
-	"seeed-sensecap-indicator"
-	"heltec_capsule_sensor_v3"
-	"vision-master"
-	"icarus"
-	"tracksenger"
-	"elecrow-adv"
+    "s3"
+    "-v3"
+    "t-deck"
+    "wireless-paper"
+    "wireless-tracker"
+    "station-g2"
+    "unphone"
+    "t-eth-elite"
+    "mesh-tab"
+    "dreamcatcher"
+    "ESP32-S3-Pico"
+    "seeed-sensecap-indicator"
+    "heltec_capsule_sensor_v3"
+    "vision-master"
+    "icarus"
+    "tracksenger"
+    "elecrow-adv"
 )
 
 # Determine the correct esptool command to use
 if "$PYTHON" -m esptool version >/dev/null 2>&1; then
-	ESPTOOL_CMD="$PYTHON -m esptool"
+    ESPTOOL_CMD="$PYTHON -m esptool"
 elif command -v esptool >/dev/null 2>&1; then
-	ESPTOOL_CMD="esptool"
+    ESPTOOL_CMD="esptool"
 elif command -v esptool.py >/dev/null 2>&1; then
-	ESPTOOL_CMD="esptool.py"
+    ESPTOOL_CMD="esptool.py"
 else
-	echo "Error: esptool not found"
-	exit 1
+    echo "Error: esptool not found"
+    exit 1
 fi
 
 set -e
 
 # Usage info
 show_help() {
-	cat <<EOF
-Usage: $(basename $0) [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME] [--web]
+    cat <<EOF
+Usage: $(basename "$0") [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME] [--1200bps-reset]
 Flash image file to device, but first erasing and writing system information.
 
     -h               Display this help and exit.
     -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerous).
     -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: "$PYTHON")
     -f FILENAME      The firmware .bin file to flash.  Custom to your device type and region.
-    --web            Enable WebUI. (Default: false)
+    --1200bps-reset  Attempt to place the device in correct mode. Some hardware requires this twice. (1200bps Reset)
 
 EOF
 }
 # Parse arguments using a single while loop
 while [ $# -gt 0 ]; do
-	case "$1" in
-	-h | --help)
-		show_help
-		exit 0
-		;;
-	-p)
-		ESPTOOL_CMD="$ESPTOOL_CMD --port $2"
-		shift
-		;;
-	-P)
-		PYTHON="$2"
-		shift
-		;;
-	-f)
-		FILENAME="$2"
-		shift
-		;;
-	--web)
-		WEB_APP=true
-		;;
-	--) # Stop parsing options
-		shift
-		break
-		;;
-	*)
-		echo "Unknown argument: $1" >&2
-		exit 1
-		;;
-	esac
-	shift # Move to the next argument
+    case "$1" in
+    -h | --help)
+        show_help
+        exit 0
+        ;;
+    -p)
+        ESPTOOL_CMD="$ESPTOOL_CMD --port $2"
+        shift
+        ;;
+    -P)
+        PYTHON="$2"
+        shift
+        ;;
+    -f)
+        FILENAME="$2"
+        shift
+        ;;
+    --1200bps-reset)
+		    BPS_RESET=true
+		    ;;
+    --) # Stop parsing options
+        shift
+        break
+        ;;
+    *)
+        echo "Unknown argument: $1" >&2
+        exit 1
+        ;;
+    esac
+    shift # Move to the next argument
 done
 
-[ -z "$FILENAME" -a -n "$1" ] && {
-	FILENAME=$1
-	shift
+if [[ $BPS_RESET == true ]]; then
+	$ESPTOOL_CMD --baud 1200 --after no_reset read_flash_status
+	exit 0
+fi
+
+[ -z "$FILENAME" ] && [ -n "$1" ] && {
+    FILENAME="$1"
+    shift
 }
 
-if [[ $FILENAME != firmware-* ]]; then
+if [[ "$FILENAME" != firmware-* ]]; then
   echo "Filename must be a firmware-* file."
   exit 1
 fi
 
-# Check if FILENAME contains "-tft-" and prevent web/mui comingling.
-if [[ ${FILENAME//-tft-/} != "$FILENAME" ]]; then
-	TFT_BUILD=true
-	if [[ $WEB_APP == true ]] && [[ $TFT_BUILD == true ]]; then
-		echo "Cannot enable WebUI (--web) and MUI."
-		exit 1
-	fi
+# Check if FILENAME contains "-tft-" and set target partitionScheme accordingly.
+if [[ "${FILENAME//-tft-/}" != "$FILENAME" ]]; then
+    TFT_BUILD=true
 fi
 
 # Extract BASENAME from %FILENAME% for later use.
 BASENAME="${FILENAME/firmware-/}"
 
 if [ -f "${FILENAME}" ] && [ -n "${FILENAME##*"update"*}" ]; then
-	# Default littlefs* offset (--web).
-	OFFSET=0x300000
+    # Default littlefs* offset.
+    OFFSET=0x300000
 
-	# Default OTA Offset
-	OTA_OFFSET=0x260000
+    # Default OTA Offset
+    OTA_OFFSET=0x260000
 
-	# littlefs* offset for BigDB 8mb and OTA OFFSET.
-	for variant in "${BIGDB_8MB[@]}"; do
-		if [ -z "${FILENAME##*"$variant"*}" ]; then
-			OFFSET=0x670000
-			OTA_OFFSET=0x340000
-		fi
-	done
+    # littlefs* offset for BigDB 8mb and OTA OFFSET.
+    for variant in "${BIGDB_8MB[@]}"; do
+        if [ -z "${FILENAME##*"$variant"*}" ]; then
+            OFFSET=0x670000
+            OTA_OFFSET=0x340000
+        fi
+    done
 
-	# littlefs* offset for BigDB 16mb and OTA OFFSET.
-	for variant in "${BIGDB_16MB[@]}"; do
-		if [ -z "${FILENAME##*"$variant"*}" ]; then
-			OFFSET=0xc90000
-			OTA_OFFSET=0x650000
-		fi
-	done
+    # littlefs* offset for BigDB 16mb and OTA OFFSET.
+    for variant in "${BIGDB_16MB[@]}"; do
+        if [ -z "${FILENAME##*"$variant"*}" ]; then
+            OFFSET=0xc90000
+            OTA_OFFSET=0x650000
+        fi
+    done
 
-	# Account for S3 board's different OTA partition
-	# FIXME: Use PlatformIO info to determine MCU type, this is unmaintainable
-	for variant in "${S3_VARIANTS[@]}"; do
-		if [ -z "${FILENAME##*"$variant"*}" ]; then
-			MCU="esp32s3"
-		fi
-	done
+    # Account for S3 board's different OTA partition
+    # FIXME: Use PlatformIO info to determine MCU type, this is unmaintainable
+    for variant in "${S3_VARIANTS[@]}"; do
+        if [ -z "${FILENAME##*"$variant"*}" ]; then
+            MCU="esp32s3"
+        fi
+    done
 
-	if [ "$MCU" != "esp32s3" ]; then
-		if [ -n "${FILENAME##*"esp32c3"*}" ]; then
-			OTAFILE=bleota.bin
-		else
-			OTAFILE=bleota-c3.bin
-		fi
-	else
-		OTAFILE=bleota-s3.bin
-	fi
+    if [ "$MCU" != "esp32s3" ]; then
+        if [ -n "${FILENAME##*"esp32c3"*}" ]; then
+            OTAFILE=bleota.bin
+        else
+            OTAFILE=bleota-c3.bin
+        fi
+    else
+        OTAFILE=bleota-s3.bin
+    fi
 
-	# Check if WEB_APP (--web) is enabled and add "littlefswebui-" to BASENAME else "littlefs-".
-	if [ "$WEB_APP" = true ]; then
-		SPIFFSFILE=littlefswebui-${BASENAME}
-	else
-		SPIFFSFILE=littlefs-${BASENAME}
-	fi
+    # Set SPIFFS filename with "littlefs-" prefix.
+    SPIFFSFILE=littlefs-${BASENAME}
 
-	if [[ ! -f $FILENAME ]]; then
-		echo "Error: file ${FILENAME} wasn't found. Terminating."
-		exit 1
-	fi
-	if [[ ! -f $OTAFILE ]]; then
-		echo "Error: file ${OTAFILE} wasn't found. Terminating."
-		exit 1
-	fi
-	if [[ ! -f $SPIFFSFILE ]]; then
-		echo "Error: file ${SPIFFSFILE} wasn't found. Terminating."
-		exit 1
-	fi
+    if [[ ! -f "$FILENAME" ]]; then
+        echo "Error: file ${FILENAME} wasn't found. Terminating."
+        exit 1
+    fi
+    if [[ ! -f "$OTAFILE" ]]; then
+        echo "Error: file ${OTAFILE} wasn't found. Terminating."
+        exit 1
+    fi
+    if [[ ! -f "$SPIFFSFILE" ]]; then
+        echo "Error: file ${SPIFFSFILE} wasn't found. Terminating."
+        exit 1
+    fi
 
-	echo "Trying to flash ${FILENAME}, but first erasing and writing system information"
-	$ESPTOOL_CMD erase_flash
-	$ESPTOOL_CMD write_flash 0x00 "${FILENAME}"
-	echo "Trying to flash ${OTAFILE} at offset ${OTA_OFFSET}"
-	$ESPTOOL_CMD write_flash $OTA_OFFSET "${OTAFILE}"
-	echo "Trying to flash ${SPIFFSFILE}, at offset ${OFFSET}"
-	$ESPTOOL_CMD write_flash $OFFSET "${SPIFFSFILE}"
+    echo "Trying to flash ${FILENAME}, but first erasing and writing system information"
+    $ESPTOOL_CMD erase_flash
+    $ESPTOOL_CMD write_flash 0x00 "${FILENAME}"
+    echo "Trying to flash ${OTAFILE} at offset ${OTA_OFFSET}"
+    $ESPTOOL_CMD write_flash $OTA_OFFSET "${OTAFILE}"
+    echo "Trying to flash ${SPIFFSFILE}, at offset ${OFFSET}"
+    $ESPTOOL_CMD write_flash $OFFSET "${SPIFFSFILE}"
 
 else
-	show_help
-	echo "Invalid file: ${FILENAME}"
+    show_help
+    echo "Invalid file: ${FILENAME}"
 fi
 
 exit 0

bin/device-update.bat

@@ -8,12 +8,13 @@ SET "PYTHON="
 SET "ESPTOOL_BAUD=115200"
 SET "ESPTOOL_CMD="
 SET "LOGCOUNTER=0"
+SET "CHANGE_MODE=0"
 
 GOTO getopts
 :help
 ECHO Flash image file to device, but leave existing system intact.
 ECHO.
-ECHO Usage: %SCRIPT_NAME% -f filename [-p PORT] [-P python]
+ECHO Usage: %SCRIPT_NAME% -f filename [-p PORT] [-P python] [--change-mode]
 ECHO.
 ECHO Options:
 ECHO     -f filename      The update .bin file to flash.  Custom to your device type and region. (required)
@@ -23,12 +24,15 @@ ECHO                      If not set, ESPTOOL iterates all ports (Dangerous).
 ECHO     -P python        Specify alternate python interpreter to use to invoke esptool. (default: python)
 ECHO                      If supplied the script will use python.
 ECHO                      If not supplied the script will try to find esptool in Path.
+ECHO     --change-mode    Attempt to place the device in correct mode. (1200bps Reset)
+ECHO                      Some hardware requires this twice.
 ECHO.
+ECHO Example: %SCRIPT_NAME% -p COM17 --change-mode
 ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4-update.bin -p COM11
 GOTO eof
 
 :version
-ECHO %SCRIPT_NAME% [Version 2.6.1]
+ECHO %SCRIPT_NAME% [Version 2.6.2]
 ECHO Meshtastic
 GOTO eof
 
@@ -44,10 +48,13 @@ IF /I "%~1"=="-f" SET "FILENAME=%~2" & SHIFT
 IF "%~1"=="-p" SET "ESPTOOL_PORT=%~2" & SHIFT
 IF /I "%~1"=="--port" SET "ESPTOOL_PORT=%~2" & SHIFT
 IF "%~1"=="-P" SET "PYTHON=%~2" & SHIFT
+IF /I "%~1"=="--change-mode" SET "CHANGE_MODE=1"
 SHIFT
 GOTO getopts
 :endopts
 
+IF %CHANGE_MODE% EQU 1 GOTO skip-filename
+
 CALL :LOG_MESSAGE DEBUG "Checking FILENAME parameter..."
 IF "__!FILENAME!__"=="____" (
     CALL :LOG_MESSAGE DEBUG "Missing -f filename input."
@@ -77,6 +84,9 @@ IF "!FILENAME:update=!"=="!FILENAME!" (
     CALL :LOG_MESSAGE DEBUG "We are working with a *update* file. !FILENAME!"
 )
 
+:skip-filename
+SET "ESPTOOL_BAUD=1200"
+
 CALL :LOG_MESSAGE DEBUG "Determine the correct esptool command to use..."
 IF NOT "__%PYTHON%__"=="____" (
     SET "ESPTOOL_CMD=!PYTHON! -m esptool"
@@ -115,6 +125,12 @@ IF "__!ESPTOOL_PORT!__" == "____" (
 )
 CALL :LOG_MESSAGE INFO "Using esptool baud: !ESPTOOL_BAUD!."
 
+IF %CHANGE_MODE% EQU 1 (
+    @REM Attempt to change mode via 1200bps Reset.
+    CALL :RUN_ESPTOOL !ESPTOOL_BAUD! --after no_reset read_flash_status
+    GOTO eof
+)
+
 @REM Flashing operations.
 CALL :LOG_MESSAGE INFO "Trying to flash update "!FILENAME!" at OFFSET 0x10000..."
 CALL :RUN_ESPTOOL !ESPTOOL_BAUD! write_flash 0x10000 "!FILENAME!" || GOTO eof
@@ -135,6 +151,7 @@ EXIT /B %ERRORLEVEL%
 IF %DEBUG% EQU 1 CALL :LOG_MESSAGE DEBUG "About to run command: !ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4"
 CALL :RESET_ERROR
 !ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4
+IF %CHANGE_MODE% EQU 1 GOTO :eof
 IF %ERRORLEVEL% NEQ 0 (
     CALL :LOG_MESSAGE ERROR "Error running command: !ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4"
     EXIT /B %ERRORLEVEL%

bin/device-update.sh

@@ -1,6 +1,7 @@
-#!/bin/sh
+#!/bin/bash
 
 PYTHON=${PYTHON:-$(which python3 python|head -n 1)}
+CHANGE_MODE=false
 
 # Determine the correct esptool command to use
 if "$PYTHON" -m esptool version >/dev/null 2>&1; then
@@ -17,17 +18,29 @@ fi
 # Usage info
 show_help() {
 cat << EOF
-Usage: $(basename $0) [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME|FILENAME]
+Usage: $(basename "$0") [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME|FILENAME] [--change-mode]
 Flash image file to device, leave existing system intact."
 
     -h               Display this help and exit
     -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerous).
     -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: "$PYTHON")
     -f FILENAME      The *update.bin file to flash.  Custom to your device type.
-    
+    --change-mode    Attempt to place the device in correct mode. Some hardware requires this twice. (1200bps Reset)
+
 EOF
 }
 
+# Check for --change-mode and remove it from arguments
+NEW_ARGS=()
+for arg in "$@"; do
+    if [ "$arg" = "--change-mode" ]; then
+        CHANGE_MODE=true
+    else
+        NEW_ARGS+=("$arg")
+    fi
+done
+
+set -- "${NEW_ARGS[@]}"
 
 while getopts ":hp:P:f:" opt; do
     case "${opt}" in
@@ -36,13 +49,13 @@ while getopts ":hp:P:f:" opt; do
             exit 0
             ;;
         p)  ESPTOOL_CMD="$ESPTOOL_CMD --port ${OPTARG}"
-	        ;;
+            ;;
         P)  PYTHON=${OPTARG}
             ;;
         f)  FILENAME=${OPTARG}
             ;;
         *)
- 	        echo "Invalid flag."
+            echo "Invalid flag."
             show_help >&2
             exit 1
             ;;
@@ -50,17 +63,22 @@ while getopts ":hp:P:f:" opt; do
 done
 shift "$((OPTIND-1))"
 
-[ -z "$FILENAME" -a -n "$1" ] && {
-    FILENAME=$1
+if [ "$CHANGE_MODE" = true ]; then
+	$ESPTOOL_CMD --baud 1200 --after no_reset read_flash_status
+    exit 0
+fi
+
+[ -z "$FILENAME" ]  && [ -n "$1" ] && {
+    FILENAME="$1"
     shift
 }
 
 if [ -f "${FILENAME}" ] && [ -z "${FILENAME##*"update"*}" ]; then
-	printf "Trying to flash update ${FILENAME}"
-	$ESPTOOL_CMD --baud 115200 write_flash 0x10000 ${FILENAME}
+    echo "Trying to flash update ${FILENAME}"
+    $ESPTOOL_CMD --baud 115200 write_flash 0x10000 "${FILENAME}"
 else
-	show_help
-	echo "Invalid file: ${FILENAME}"
+    show_help
+    echo "Invalid file: ${FILENAME}"
 fi
 
 exit 0

bin/generate_ci_matrix.py

@@ -2,50 +2,71 @@
 
 """Generate the CI matrix."""
 
-import configparser
 import json
-import os
 import sys
 import random
-
-rootdir = "variants/"
+import re
+from platformio.project.config import ProjectConfig
 
 options = sys.argv[1:]
 
 outlist = []
 
 if len(options) < 1:
-    print(json.dumps(outlist))
-    exit()
+  print(json.dumps(outlist))
+  exit(1)
 
-for subdir, dirs, files in os.walk(rootdir):
-    for file in files:
-        if file == "platformio.ini":
-            config = configparser.ConfigParser()
-            config.read(subdir + "/" + file)
-            for c in config.sections():
-                if c.startswith("env:"):
-                    section = config[c].name[4:]
-                    if "extends" in config[config[c].name]:
-                        if config[config[c].name]["extends"] == options[0] + "_base":
-                            if "board_level" in config[config[c].name]:
-                                if (
-                                    config[config[c].name]["board_level"] == "extra"
-                                ) & ("extra" in options):
-                                    outlist.append(section)
-                            else:
-                                outlist.append(section)
-                        # Add the TFT variants if the base variant is selected
-                        elif section.replace("-tft", "") in outlist and config[config[c].name].get("board_level") != "extra":
-                            outlist.append(section)
-                        elif section.replace("-inkhud", "") in outlist and config[config[c].name].get("board_level") != "extra":
-                            outlist.append(section)
-                    if "board_check" in config[config[c].name]:
-                        if (config[config[c].name]["board_check"] == "true") & (
-                            "check" in options
-                        ):
-                            outlist.append(section)
-if ("quick" in options) & (len(outlist) > 3):
-    print(json.dumps(random.sample(outlist, 3)))
+cfg = ProjectConfig.get_instance()
+pio_envs = cfg.envs()
+
+# Gather all PlatformIO environments for filtering later
+all_envs = []
+for pio_env in pio_envs:
+  env_build_flags = cfg.get(f"env:{pio_env}", 'build_flags')
+  env_platform = None
+  for flag in env_build_flags:
+    # Extract the platform from the build flags
+    # Example flag: -I variants/esp32s3/heltec-v3
+    match = re.search(r"-I\s?variants/([^/]+)", flag)
+    if match:
+      env_platform = match.group(1)
+      break
+  # Intentionally fail if platform cannot be determined
+  if not env_platform:
+    print(f"Error: Could not determine platform for environment '{pio_env}'")
+    exit(1)
+  # Store env details as a dictionary, and add to 'all_envs' list
+  env = {
+    'name': pio_env,
+    'platform': env_platform,
+    'board_level': cfg.get(f"env:{pio_env}", 'board_level', default=None),
+    'board_check': bool(cfg.get(f"env:{pio_env}", 'board_check', default=False))
+  }
+  all_envs.append(env)
+
+# Filter outputs based on options
+# Check is mutually exclusive with other options (except 'pr')
+if "check" in options:
+  for env in all_envs:
+    if env['board_check']:
+      if "pr" in options:
+        if env['board_level'] == 'pr':
+          outlist.append(env['name'])
+      else:
+        outlist.append(env['name'])
+# Filter (non-check) builds by platform
 else:
-    print(json.dumps(outlist))
+  for env in all_envs:
+    if options[0] == env['platform']:
+      # Always include board_level = 'pr'
+      if env['board_level'] == 'pr':
+        outlist.append(env['name'])
+      # Include board_level = 'extra' when requested
+      elif "extra" in options and env['board_level'] == "extra":
+        outlist.append(env['name'])
+      # If no board level is specified, include in release builds (not PR)
+      elif "pr" not in options and not env['board_level']:
+        outlist.append(env['name'])
+
+# Return as a JSON list
+print(json.dumps(outlist))

bin/org.meshtastic.meshtasticd.metainfo.xml

@@ -87,6 +87,36 @@
   </screenshots>
 
   <releases>
+    <release version="2.7.6" date="2025-08-12">
+      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.6</url>
+    </release>
+    <release version="2.7.5" date="2025-08-09">
+      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.5</url>
+    </release>
+    <release version="2.7.4" date="2025-07-19">
+      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.4</url>
+    </release>
+    <release version="2.7.3" date="2025-07-10">
+      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.3</url>
+    </release>
+    <release version="2.7.2" date="2025-07-04">
+      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.2</url>
+    </release>
+    <release version="2.7.1" date="2025-06-27">
+      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.1</url>
+    </release>
+    <release version="2.7.0" date="2025-06-20">
+      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.0</url>
+    </release>
+    <release version="2.6.13" date="2025-06-16">
+      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.13</url>
+    </release>
+    <release version="2.6.12" date="2025-06-15">
+      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.12</url>
+    </release>
+    <release version="2.6.11" date="2025-06-02">
+      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.11</url>
+    </release>
     <release version="2.6.10" date="2025-05-25">
       <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.10</url>
     </release>

bin/platformio-custom.py

@@ -3,6 +3,7 @@
 # trunk-ignore-all(flake8/F821): For SConstruct imports
 import sys
 from os.path import join
+import subprocess
 import json
 import re
 
@@ -92,6 +93,17 @@ prefsLoc = projenv["PROJECT_DIR"] + "/version.properties"
 verObj = readProps(prefsLoc)
 print("Using meshtastic platformio-custom.py, firmware version " + verObj["long"] + " on " + env.get("PIOENV"))
 
+# get repository owner if git is installed
+try:
+    r_owner = (
+        subprocess.check_output(["git", "config", "--get", "remote.origin.url"])
+        .decode("utf-8")
+        .strip().split("/")
+    )
+    repo_owner = r_owner[-2] + "/" + r_owner[-1].replace(".git", "")
+except subprocess.CalledProcessError:
+    repo_owner = "unknown"
+
 jsonLoc = env["PROJECT_DIR"] + "/userPrefs.jsonc"
 with open(jsonLoc) as f:
     jsonStr = re.sub("//.*","", f.read(), flags=re.MULTILINE)
@@ -117,6 +129,7 @@ flags = [
         "-DAPP_VERSION=" + verObj["long"],
         "-DAPP_VERSION_SHORT=" + verObj["short"],
         "-DAPP_ENV=" + env.get("PIOENV"),
+        "-DAPP_REPO=" + repo_owner,
     ] + pref_flags
 
 print ("Using flags:")
@@ -131,3 +144,33 @@ for lb in env.GetLibBuilders():
     if lb.name == "meshtastic-device-ui":
         lb.env.Append(CPPDEFINES=[("APP_VERSION", verObj["long"])])
         break
+
+# Get the display resolution from macros
+def get_display_resolution(build_flags):
+    # Check "DISPLAY_SIZE" to determine the screen resolution
+    for flag in build_flags:
+        if isinstance(flag, tuple) and flag[0] == "DISPLAY_SIZE":
+            screen_width, screen_height = map(int, flag[1].split("x"))
+            return screen_width, screen_height
+    print("No screen resolution defined in build_flags. Please define DISPLAY_SIZE.")
+    exit(1)
+
+def load_boot_logo(source, target, env):
+    build_flags = env.get("CPPDEFINES", [])
+    logo_w, logo_h = get_display_resolution(build_flags)
+    print(f"TFT build with {logo_w}x{logo_h} resolution detected")
+
+    # Load the boot logo from `branding/logo_<width>x<height>.png` if it exists
+    source_path = join(env["PROJECT_DIR"], "branding", f"logo_{logo_w}x{logo_h}.png")
+    dest_dir = join(env["PROJECT_DIR"], "data", "boot")
+    dest_path = join(dest_dir, "logo.png")
+    if env.File(source_path).exists():
+        print(f"Loading boot logo from {source_path}")
+        # Prepare the destination
+        env.Execute(f"mkdir -p {dest_dir} && rm -f {dest_path}")
+        # Copy the logo to the `data/boot` directory
+        env.Execute(f"cp {source_path} {dest_path}")
+
+# Load the boot logo on TFT builds
+if ("HAS_TFT", 1) in env.get("CPPDEFINES", []):
+    env.AddPreAction('$BUILD_DIR/littlefs.bin', load_boot_logo)

bin/web.version

@@ -1 +1 @@
-2.5.3
+2.6.4

boards/ThinkNode-M1.json

@@ -48,6 +48,6 @@
     "require_upload_port": true,
     "wait_for_upload_port": true
   },
-  "url": "FIXME",
+  "url": "https://www.elecrow.com/thinknode-m1-meshtastic-lora-signal-transceiver-powered-by-nrf52840-with-154-screen-support-gps.html",
   "vendor": "ELECROW"
 }

boards/gat562_mesh_trial_tracker.json

@@ -0,0 +1,52 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "nrf52840_s140_v6.ld"
+    },
+    "core": "nRF5",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
+    "f_cpu": "64000000L",
+    "hwids": [
+      ["0x239A", "0x8029"],
+      ["0x239A", "0x0029"],
+      ["0x239A", "0x002A"],
+      ["0x239A", "0x802A"]
+    ],
+    "usb_product": "GAT562 Mesh Trial Tracker",
+    "mcu": "nrf52840",
+    "variant": "gat562_mesh_trial_tracker",
+    "bsp": {
+      "name": "adafruit"
+    },
+    "softdevice": {
+      "sd_flags": "-DS140",
+      "sd_name": "s140",
+      "sd_version": "6.1.1",
+      "sd_fwid": "0x00B6"
+    },
+    "bootloader": {
+      "settings_addr": "0xFF000"
+    }
+  },
+  "connectivity": ["bluetooth"],
+  "debug": {
+    "jlink_device": "nRF52840_xxAA",
+    "svd_path": "nrf52840.svd",
+    "openocd_target": "nrf52840-mdk-rs"
+  },
+  "frameworks": ["arduino", "freertos"],
+  "name": "GAT562 Mesh Trial Tracker",
+  "upload": {
+    "maximum_ram_size": 248832,
+    "maximum_size": 815104,
+    "speed": 115200,
+    "protocol": "nrfutil",
+    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
+    "use_1200bps_touch": true,
+    "require_upload_port": true,
+    "wait_for_upload_port": true
+  },
+  "url": "http://www.gat-iot.com/",
+  "vendor": "GAT-IOT"
+}

boards/heltec_mesh_node_t114.json

@@ -10,7 +10,8 @@
     "hwids": [
       ["0x239A", "0x4405"],
       ["0x239A", "0x0029"],
-      ["0x239A", "0x002A"]
+      ["0x239A", "0x002A"],
+      ["0x2886", "0x1667"]
     ],
     "usb_product": "HT-n5262",
     "mcu": "nrf52840",
@@ -48,6 +49,6 @@
     "require_upload_port": true,
     "wait_for_upload_port": true
   },
-  "url": "FIXME",
+  "url": "https://heltec.org/project/mesh-node-t114/",
   "vendor": "Heltec"
 }

boards/heltec_mesh_solar.json

@@ -0,0 +1,54 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "nrf52840_s140_v6.ld"
+    },
+    "core": "nRF5",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DNRF52840_XXAA",
+    "f_cpu": "64000000L",
+    "hwids": [
+      ["0x239A", "0x4405"],
+      ["0x239A", "0x0029"],
+      ["0x239A", "0x002A"],
+      ["0x239A", "0x0071"]
+    ],
+    "usb_product": "HT-n5262",
+    "mcu": "nrf52840",
+    "variant": "heltec_mesh_solar",
+    "variants_dir": "variants",
+    "bsp": {
+      "name": "adafruit"
+    },
+    "softdevice": {
+      "sd_flags": "-DS140",
+      "sd_name": "s140",
+      "sd_version": "6.1.1",
+      "sd_fwid": "0x00B6"
+    },
+    "bootloader": {
+      "settings_addr": "0xFF000"
+    }
+  },
+  "connectivity": ["bluetooth"],
+  "debug": {
+    "jlink_device": "nRF52840_xxAA",
+    "onboard_tools": ["jlink"],
+    "svd_path": "nrf52840.svd",
+    "openocd_target": "nrf52840-mdk-rs"
+  },
+  "frameworks": ["arduino"],
+  "name": "Heltec nrf (Adafruit BSP)",
+  "upload": {
+    "maximum_ram_size": 248832,
+    "maximum_size": 815104,
+    "speed": 115200,
+    "protocol": "nrfutil",
+    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
+    "use_1200bps_touch": true,
+    "require_upload_port": true,
+    "wait_for_upload_port": true
+  },
+  "url": "https://heltec.org/project/meshsolar/",
+  "vendor": "Heltec"
+}

boards/meshtiny.json

@@ -0,0 +1,52 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "nrf52840_s140_v6.ld"
+    },
+    "core": "nRF5",
+    "cpu": "cortex-m4",
+    "extra_flags": "-DARDUINO_NRF52840_FEATHER -DNRF52840_XXAA",
+    "f_cpu": "64000000L",
+    "hwids": [
+      ["0x239A", "0x8029"],
+      ["0x239A", "0x0029"],
+      ["0x239A", "0x002A"],
+      ["0x239A", "0x802A"]
+    ],
+    "usb_product": "MeshTiny",
+    "mcu": "nrf52840",
+    "variant": "meshtiny",
+    "bsp": {
+      "name": "adafruit"
+    },
+    "softdevice": {
+      "sd_flags": "-DS140",
+      "sd_name": "s140",
+      "sd_version": "6.1.1",
+      "sd_fwid": "0x00B6"
+    },
+    "bootloader": {
+      "settings_addr": "0xFF000"
+    }
+  },
+  "connectivity": ["bluetooth"],
+  "debug": {
+    "jlink_device": "nRF52840_xxAA",
+    "svd_path": "nrf52840.svd",
+    "openocd_target": "nrf52840-mdk-rs"
+  },
+  "frameworks": ["arduino", "freertos"],
+  "name": "MeshTiny",
+  "upload": {
+    "maximum_ram_size": 248832,
+    "maximum_size": 815104,
+    "speed": 115200,
+    "protocol": "nrfutil",
+    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
+    "use_1200bps_touch": true,
+    "require_upload_port": true,
+    "wait_for_upload_port": true
+  },
+  "url": "https://github.com/meshtastic/firmware",
+  "vendor": "MTools Tec"
+}

boards/seeed_wio_tracker_L1.json

@@ -7,7 +7,10 @@
     "cpu": "cortex-m4",
     "extra_flags": "-DARDUINO_MDBT50Q_RX -DNRF52840_XXAA",
     "f_cpu": "64000000L",
-    "hwids": [["0x2886", "0x1668"]],
+    "hwids": [
+      ["0x2886", "0x1668"],
+      ["0x2886", "0x1667"]
+    ],
     "usb_product": "TRACKER L1",
     "mcu": "nrf52840",
     "variant": "seeed_wio_tracker_L1",

boards/seeed_xiao_nrf52840_kit.json

@@ -7,9 +7,7 @@
     "cpu": "cortex-m4",
     "extra_flags": "-DARDUINO_MDBT50Q_RX -DNRF52840_XXAA",
     "f_cpu": "64000000L",
-    "hwids": [
-      ["0x2886", "0x0166"]
-    ],
+    "hwids": [["0x2886", "0x0166"]],
     "usb_product": "XIAO-BOOT",
     "mcu": "nrf52840",
     "variant": "seeed_xiao_nrf52840_kit",

boards/t-deck-pro.json

@@ -0,0 +1,43 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "memory_type": "qio_qspi",
+      "partitions": "default_16MB.csv"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DBOARD_HAS_PSRAM",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "qio",
+    "hwids": [["0x303A", "0x1001"]],
+    "mcu": "esp32s3",
+    "variant": "esp32s3"
+  },
+  "connectivity": ["wifi", "bluetooth", "lora"],
+  "debug": {
+    "default_tool": "esp-builtin",
+    "onboard_tools": ["esp-builtin"],
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": ["arduino", "espidf"],
+  "name": "LilyGo T-Deck Pro S3 (16M Flash 8M QSPI PSRAM )",
+  "upload": {
+    "flash_size": "16MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 16777216,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "monitor": {
+    "speed": 115200
+  },
+  "url": "https://lilygo.cc/products/t-deck-pro",
+  "vendor": "LilyGo"
+}

boards/tracker-t1000-e.json

@@ -11,7 +11,8 @@
       ["0x239A", "0x8029"],
       ["0x239A", "0x0029"],
       ["0x239A", "0x002A"],
-      ["0x239A", "0x802A"]
+      ["0x239A", "0x802A"],
+      ["0x2886", "0x0057"]
     ],
     "usb_product": "T1000-E-BOOT",
     "mcu": "nrf52840",

boards/wiscore_rak3312.json

@@ -0,0 +1,41 @@
+{
+  "build": {
+    "arduino": {
+      "ldscript": "esp32s3_out.ld",
+      "memory_type": "qio_opi",
+      "partitions": "default_16MB.csv"
+    },
+    "core": "esp32",
+    "extra_flags": [
+      "-DRAK3312",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_RUNNING_CORE=1",
+      "-DARDUINO_EVENT_RUNNING_CORE=1",
+      "-DBOARD_HAS_PSRAM"
+    ],
+    "f_cpu": "240000000L",
+    "f_flash": "80000000L",
+    "flash_mode": "dio",
+    "hwids": [["0x303A", "0x1001"]],
+    "mcu": "esp32s3",
+    "variant": "rak3312"
+  },
+  "connectivity": ["wifi", "bluetooth"],
+  "debug": {
+    "openocd_target": "esp32s3.cfg"
+  },
+  "frameworks": ["arduino", "espidf"],
+  "name": "WisCore RAK3312 Board",
+  "upload": {
+    "flash_size": "16MB",
+    "maximum_ram_size": 327680,
+    "maximum_size": 16777216,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": true,
+    "require_upload_port": true,
+    "speed": 921600
+  },
+  "url": "https://www.rakwireless.com/en-us",
+  "vendor": "rakwireless"
+}

branding/README.md

@@ -0,0 +1,17 @@
+# Meshtastic Branding / Whitelabeling
+
+This directory is consumed during the creation of **event** firmware.
+
+`bin/platformio-custom.py` determines the display resolution, and locates the corresponding `logo_<width>x<height>.png`.
+
+Ex:
+
+- `logo_800x480.png`
+- `logo_480x480.png`
+- `logo_480x320.png`
+- `logo_320x480.png`
+- `logo_320x240.png`
+
+This file is copied to `data/boot/logo.png` before filesytem image compilation.
+
+For additional examples see the [`event/defcon33` branch](https://github.com/meshtastic/firmware/tree/event/defcon33).

debian/changelog

@@ -1,4 +1,4 @@
-meshtasticd (2.6.10.0) UNRELEASED; urgency=medium
+meshtasticd (2.7.6.0) UNRELEASED; urgency=medium
 
   [ Austin Lane ]
   * Initial packaging
@@ -16,4 +16,28 @@ meshtasticd (2.6.10.0) UNRELEASED; urgency=medium
   [  ]
   * GitHub Actions Automatic version bump
 
- --  <github-actions[bot]@users.noreply.github.com>  Sun, 25 May 2025 20:46:49 +0000
+  [  ]
+  * GitHub Actions Automatic version bump
+
+  [  ]
+  * GitHub Actions Automatic version bump
+
+  [  ]
+  * GitHub Actions Automatic version bump
+
+  [  ]
+  * GitHub Actions Automatic version bump
+
+  [ Ubuntu ]
+  * GitHub Actions Automatic version bump
+
+  [  ]
+  * GitHub Actions Automatic version bump
+
+  [  ]
+  * GitHub Actions Automatic version bump
+
+  [  ]
+  * GitHub Actions Automatic version bump
+
+ --  <github-actions[bot]@users.noreply.github.com>  Tue, 12 Aug 2025 23:48:48 +0000

debian/meshtasticd.postinst

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # postinst script for meshtasticd
 #
 # see: dh_installdeb(1)

debian/meshtasticd.postrm

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # postrm script for meshtasticd
 #
 # see: dh_installdeb(1)

platformio.ini

@@ -6,7 +6,8 @@ default_envs = tbeam
 
 extra_configs =
 	arch/*/*.ini
-	variants/*/platformio.ini
+	variants/*/*/platformio.ini
+	variants/*/diy/*/platformio.ini
 	src/graphics/niche/InkHUD/PlatformioConfig.ini
 
 description = Meshtastic
@@ -47,20 +48,22 @@ build_flags = -Wno-missing-field-initializers
 	-DRADIOLIB_EXCLUDE_APRS=1
 	-DRADIOLIB_EXCLUDE_LORAWAN=1
 	-DMESHTASTIC_EXCLUDE_DROPZONE=1
+	-DMESHTASTIC_EXCLUDE_ZPS=1
 	-DMESHTASTIC_EXCLUDE_REMOTEHARDWARE=1
 	-DMESHTASTIC_EXCLUDE_HEALTH_TELEMETRY=1
-  	-DMESHTASTIC_EXCLUDE_POWERSTRESS=1 ; exclude power stress test module from main firmware
+	-DMESHTASTIC_EXCLUDE_POWERSTRESS=1 ; exclude power stress test module from main firmware
 	-DMESHTASTIC_EXCLUDE_GENERIC_THREAD_MODULE=1
-        #-DBUILD_EPOCH=$UNIX_TIME
-        #-D OLED_PL=1
+	-D MAX_THREADS=40 ; As we've split modules, we have more threads to manage
+	#-DBUILD_EPOCH=$UNIX_TIME
+	#-D OLED_PL=1
 
 monitor_speed = 115200
 monitor_filters = direct
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic-esp8266-oled-ssd1306 packageName=https://github.com/meshtastic/esp8266-oled-ssd1306 gitBranch=master
-	https://github.com/meshtastic/esp8266-oled-ssd1306/archive/0119501e9983bd894830b02f545c377ee08d66fe.zip
-	# renovate: datasource=custom.pio depName=OneButton packageName=mathertel/library/OneButton
-	mathertel/OneButton@2.6.1
+	https://github.com/meshtastic/esp8266-oled-ssd1306/archive/9573abb64dc9c94f3051348f2bf4fc5cedf03c22.zip
+	# renovate: datasource=git-refs depName=meshtastic-OneButton packageName=https://github.com/meshtastic/OneButton gitBranch=master
+	https://github.com/meshtastic/OneButton/archive/fa352d668c53f290cfa480a5f79ad422cd828c70.zip
 	# renovate: datasource=git-refs depName=meshtastic-arduino-fsm packageName=https://github.com/meshtastic/arduino-fsm gitBranch=master
 	https://github.com/meshtastic/arduino-fsm/archive/7db3702bf0cfe97b783d6c72595e3f38e0b19159.zip
 	# renovate: datasource=git-refs depName=meshtastic-TinyGPSPlus packageName=https://github.com/meshtastic/TinyGPSPlus gitBranch=master
@@ -100,21 +103,29 @@ lib_deps =
 	# renovate: datasource=custom.pio depName=Syslog packageName=arcao/library/Syslog
 	arcao/Syslog@2.0.0
 
+; Minimal networking libs for nrf52 (excludes Syslog to save flash)
+[nrf52_networking_base]
+lib_deps =
+	# renovate: datasource=custom.pio depName=TBPubSubClient packageName=thingsboard/library/TBPubSubClient
+	thingsboard/TBPubSubClient@2.12.1
+	# renovate: datasource=custom.pio depName=NTPClient packageName=arduino-libraries/library/NTPClient
+	arduino-libraries/NTPClient@3.2.1
+
 [radiolib_base]
 lib_deps =
 	# renovate: datasource=custom.pio depName=RadioLib packageName=jgromes/library/RadioLib
-	jgromes/RadioLib@7.1.2
+	jgromes/RadioLib@7.2.1
 
 [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/37e2fb84a8d1b7d8cc1e2ed00d34cfb1f284bd59.zip
+	https://github.com/meshtastic/device-ui/archive/a3e0e1be372d069f47b4c19d718f5267251744d7.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]
 lib_deps =
 	# renovate: datasource=custom.pio depName=Adafruit BusIO packageName=adafruit/library/Adafruit BusIO
-	adafruit/Adafruit BusIO@1.17.1
+	adafruit/Adafruit BusIO@1.17.2
 	# renovate: datasource=custom.pio depName=Adafruit Unified Sensor packageName=adafruit/library/Adafruit Unified Sensor
 	adafruit/Adafruit Unified Sensor@1.1.15
 	# renovate: datasource=custom.pio depName=Adafruit BMP280 packageName=adafruit/library/Adafruit BMP280 Library
@@ -128,7 +139,7 @@ lib_deps =
 	# renovate: datasource=custom.pio depName=Adafruit MCP9808 packageName=adafruit/library/Adafruit MCP9808 Library
 	adafruit/Adafruit MCP9808 Library@2.0.2
 	# renovate: datasource=custom.pio depName=Adafruit INA260 packageName=adafruit/library/Adafruit INA260 Library
-	adafruit/Adafruit INA260 Library@1.5.2
+	adafruit/Adafruit INA260 Library@1.5.3
 	# renovate: datasource=custom.pio depName=Adafruit INA219 packageName=adafruit/library/Adafruit INA219
 	adafruit/Adafruit INA219@1.2.3
 	# renovate: datasource=custom.pio depName=Adafruit PM25 AQI Sensor packageName=adafruit/library/Adafruit PM25 AQI Sensor
@@ -165,8 +176,10 @@ lib_deps =
 	adafruit/Adafruit LTR390 Library@1.1.2
 	# renovate: datasource=custom.pio depName=Adafruit PCT2075 packageName=adafruit/library/Adafruit PCT2075
 	adafruit/Adafruit PCT2075@1.0.5
-  
-  ; (not included in native / portduino)
+	# renovate: datasource=custom.pio depName=DFRobot_BMM150 packageName=dfrobot/library/DFRobot_BMM150
+	dfrobot/DFRobot_BMM150@1.0.0
+
+; (not included in native / portduino)
 [environmental_extra]
 lib_deps =
 	# renovate: datasource=custom.pio depName=Adafruit BMP3XX packageName=adafruit/library/Adafruit BMP3XX Library
@@ -174,7 +187,7 @@ lib_deps =
 	# renovate: datasource=custom.pio depName=Adafruit MAX1704X packageName=adafruit/library/Adafruit MAX1704X
 	adafruit/Adafruit MAX1704X@1.0.3
 	# renovate: datasource=custom.pio depName=Adafruit SHTC3 packageName=adafruit/library/Adafruit SHTC3 Library
-	adafruit/Adafruit SHTC3 Library@1.0.1
+	adafruit/Adafruit SHTC3 Library@1.0.2
 	# renovate: datasource=custom.pio depName=Adafruit LPS2X packageName=adafruit/library/Adafruit LPS2X
 	adafruit/Adafruit LPS2X@2.0.6
 	# renovate: datasource=custom.pio depName=Adafruit SHT31 packageName=adafruit/library/Adafruit SHT31 Library
@@ -192,4 +205,8 @@ lib_deps =
 	# renovate: datasource=custom.pio depName=Bosch BME68x packageName=boschsensortec/library/BME68x Sensor Library
 	boschsensortec/BME68x Sensor Library@1.3.40408
 	# 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
+	https://github.com/meshtastic/DFRobot_LarkWeatherStation/archive/4de3a9cadef0f6a5220a8a906cf9775b02b0040d.zip
+	# renovate: datasource=custom.pio depName=Sensirion Core packageName=sensirion/library/Sensirion Core
+	sensirion/Sensirion Core@0.7.1
+	# renovate: datasource=custom.pio depName=Sensirion I2C SCD4x packageName=sensirion/library/Sensirion I2C SCD4x
+	sensirion/Sensirion I2C SCD4x@1.1.0

src/AmbientLightingThread.h

@@ -59,82 +59,82 @@ class AmbientLightingThread : public concurrency::OSThread
             return;
         }
         LOG_DEBUG("AmbientLighting init");
-#if defined(HAS_NCP5623) || defined(HAS_LP5562)
+#ifdef HAS_NCP5623
         if (_type == ScanI2C::NCP5623) {
             rgb.begin();
 #endif
 #ifdef HAS_LP5562
-        } else if (_type == ScanI2C::LP5562) {
-            rgbw.begin();
+            if (_type == ScanI2C::LP5562) {
+                rgbw.begin();
 #endif
 #ifdef RGBLED_RED
-            pinMode(RGBLED_RED, OUTPUT);
-            pinMode(RGBLED_GREEN, OUTPUT);
-            pinMode(RGBLED_BLUE, OUTPUT);
+                pinMode(RGBLED_RED, OUTPUT);
+                pinMode(RGBLED_GREEN, OUTPUT);
+                pinMode(RGBLED_BLUE, OUTPUT);
 #endif
 #ifdef HAS_NEOPIXEL
-            pixels.begin(); // Initialise the pixel(s)
-            pixels.clear(); // Set all pixel colors to 'off'
-            pixels.setBrightness(moduleConfig.ambient_lighting.current);
+                pixels.begin(); // Initialise the pixel(s)
+                pixels.clear(); // Set all pixel colors to 'off'
+                pixels.setBrightness(moduleConfig.ambient_lighting.current);
 #endif
-            setLighting();
+                setLighting();
 #endif
 #if defined(HAS_NCP5623) || defined(HAS_LP5562)
-        }
+            }
 #endif
-    }
+        }
 
-  protected:
-    int32_t runOnce() override
-    {
+      protected:
+        int32_t runOnce() override
+        {
 #ifdef HAS_RGB_LED
 #if defined(HAS_NCP5623) || defined(HAS_LP5562)
-        if ((_type == ScanI2C::NCP5623 || _type == ScanI2C::LP5562) && moduleConfig.ambient_lighting.led_state) {
+            if ((_type == ScanI2C::NCP5623 || _type == ScanI2C::LP5562) && moduleConfig.ambient_lighting.led_state) {
 #endif
-            setLighting();
-            return 30000; // 30 seconds to reset from any animations that may have been running from Ext. Notification
+                setLighting();
+                return 30000; // 30 seconds to reset from any animations that may have been running from Ext. Notification
 #if defined(HAS_NCP5623) || defined(HAS_LP5562)
+            }
+#endif
+#endif
+            return disable();
         }
-#endif
-#endif
-        return disable();
-    }
 
-    // When shutdown() is issued, setLightingOff will be called.
-    CallbackObserver<AmbientLightingThread, void *> notifyDeepSleepObserver =
-        CallbackObserver<AmbientLightingThread, void *>(this, &AmbientLightingThread::setLightingOff);
+        // When shutdown() is issued, setLightingOff will be called.
+        CallbackObserver<AmbientLightingThread, void *> notifyDeepSleepObserver =
+            CallbackObserver<AmbientLightingThread, void *>(this, &AmbientLightingThread::setLightingOff);
 
-  private:
-    ScanI2C::DeviceType _type = ScanI2C::DeviceType::NONE;
+      private:
+        ScanI2C::DeviceType _type = ScanI2C::DeviceType::NONE;
 
-    // Turn RGB lighting off, is used in junction to shutdown()
-    int setLightingOff(void *unused)
-    {
+        // Turn RGB lighting off, is used in junction to shutdown()
+        int setLightingOff(void *unused)
+        {
 #ifdef HAS_NCP5623
-        rgb.setCurrent(0);
-        rgb.setRed(0);
-        rgb.setGreen(0);
-        rgb.setBlue(0);
-        LOG_INFO("OFF: NCP5623 Ambient lighting");
+            rgb.setCurrent(0);
+            rgb.setRed(0);
+            rgb.setGreen(0);
+            rgb.setBlue(0);
+            LOG_INFO("OFF: NCP5623 Ambient lighting");
 #endif
 #ifdef HAS_LP5562
-        rgbw.setCurrent(0);
-        rgbw.setRed(0);
-        rgbw.setGreen(0);
-        rgbw.setBlue(0);
-        rgbw.setWhite(0);
-        LOG_INFO("OFF: LP5562 Ambient lighting");
+            rgbw.setCurrent(0);
+            rgbw.setRed(0);
+            rgbw.setGreen(0);
+            rgbw.setBlue(0);
+            rgbw.setWhite(0);
+            LOG_INFO("OFF: LP5562 Ambient lighting");
 #endif
 #ifdef HAS_NEOPIXEL
-        pixels.clear();
-        pixels.show();
-        LOG_INFO("OFF: NeoPixel Ambient lighting");
+            pixels.clear();
+            pixels.show();
+            LOG_INFO("OFF: NeoPixel Ambient lighting");
 #endif
 #ifdef RGBLED_CA
-        analogWrite(RGBLED_RED, 255 - 0);
-        analogWrite(RGBLED_GREEN, 255 - 0);
-        analogWrite(RGBLED_BLUE, 255 - 0);
-        LOG_INFO("OFF: Ambient light RGB Common Anode");
+            analogWrite(RGBLED_RED, 255 - 0);
+            analogWrite(RGBLED_GREEN, 255 - 0);
+            analogWrite(RGBLED_BLUE, 255 - 0);
+            LOG_INFO("OFF: Ambient light RGB Common Anode");
 #elif defined(RGBLED_RED)
         analogWrite(RGBLED_RED, 0);
         analogWrite(RGBLED_GREEN, 0);
@@ -142,56 +142,57 @@ class AmbientLightingThread : public concurrency::OSThread
         LOG_INFO("OFF: Ambient light RGB Common Cathode");
 #endif
 #ifdef UNPHONE
-        unphone.rgb(0, 0, 0);
-        LOG_INFO("OFF: unPhone Ambient lighting");
+            unphone.rgb(0, 0, 0);
+            LOG_INFO("OFF: unPhone Ambient lighting");
 #endif
-        return 0;
-    }
+            return 0;
+        }
 
-    void setLighting()
-    {
+        void setLighting()
+        {
 #ifdef HAS_NCP5623
-        rgb.setCurrent(moduleConfig.ambient_lighting.current);
-        rgb.setRed(moduleConfig.ambient_lighting.red);
-        rgb.setGreen(moduleConfig.ambient_lighting.green);
-        rgb.setBlue(moduleConfig.ambient_lighting.blue);
-        LOG_DEBUG("Init NCP5623 Ambient light w/ current=%d, red=%d, green=%d, blue=%d", moduleConfig.ambient_lighting.current,
-                  moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
+            rgb.setCurrent(moduleConfig.ambient_lighting.current);
+            rgb.setRed(moduleConfig.ambient_lighting.red);
+            rgb.setGreen(moduleConfig.ambient_lighting.green);
+            rgb.setBlue(moduleConfig.ambient_lighting.blue);
+            LOG_DEBUG("Init NCP5623 Ambient light w/ current=%d, red=%d, green=%d, blue=%d",
+                      moduleConfig.ambient_lighting.current, moduleConfig.ambient_lighting.red,
+                      moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
 #endif
 #ifdef HAS_LP5562
-        rgbw.setCurrent(moduleConfig.ambient_lighting.current);
-        rgbw.setRed(moduleConfig.ambient_lighting.red);
-        rgbw.setGreen(moduleConfig.ambient_lighting.green);
-        rgbw.setBlue(moduleConfig.ambient_lighting.blue);
-        LOG_DEBUG("Init LP5562 Ambient light w/ current=%d, red=%d, green=%d, blue=%d", moduleConfig.ambient_lighting.current,
-                  moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
+            rgbw.setCurrent(moduleConfig.ambient_lighting.current);
+            rgbw.setRed(moduleConfig.ambient_lighting.red);
+            rgbw.setGreen(moduleConfig.ambient_lighting.green);
+            rgbw.setBlue(moduleConfig.ambient_lighting.blue);
+            LOG_DEBUG("Init LP5562 Ambient light w/ current=%d, red=%d, green=%d, blue=%d", moduleConfig.ambient_lighting.current,
+                      moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
 #endif
 #ifdef HAS_NEOPIXEL
-        pixels.fill(pixels.Color(moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green,
-                                 moduleConfig.ambient_lighting.blue),
-                    0, NEOPIXEL_COUNT);
+            pixels.fill(pixels.Color(moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green,
+                                     moduleConfig.ambient_lighting.blue),
+                        0, NEOPIXEL_COUNT);
 
 // RadioMaster Bandit has addressable LED at the two buttons
 // this allow us to set different lighting for them in variant.h file.
 #ifdef RADIOMASTER_900_BANDIT
 #if defined(BUTTON1_COLOR) && defined(BUTTON1_COLOR_INDEX)
-        pixels.fill(BUTTON1_COLOR, BUTTON1_COLOR_INDEX, 1);
+            pixels.fill(BUTTON1_COLOR, BUTTON1_COLOR_INDEX, 1);
 #endif
 #if defined(BUTTON2_COLOR) && defined(BUTTON2_COLOR_INDEX)
-        pixels.fill(BUTTON2_COLOR, BUTTON2_COLOR_INDEX, 1);
+            pixels.fill(BUTTON2_COLOR, BUTTON2_COLOR_INDEX, 1);
 #endif
 #endif
-        pixels.show();
-        LOG_DEBUG("Init NeoPixel Ambient light w/ brightness(current)=%d, red=%d, green=%d, blue=%d",
-                  moduleConfig.ambient_lighting.current, moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green,
-                  moduleConfig.ambient_lighting.blue);
+            pixels.show();
+            LOG_DEBUG("Init NeoPixel Ambient light w/ brightness(current)=%d, red=%d, green=%d, blue=%d",
+                      moduleConfig.ambient_lighting.current, moduleConfig.ambient_lighting.red,
+                      moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
 #endif
 #ifdef RGBLED_CA
-        analogWrite(RGBLED_RED, 255 - moduleConfig.ambient_lighting.red);
-        analogWrite(RGBLED_GREEN, 255 - moduleConfig.ambient_lighting.green);
-        analogWrite(RGBLED_BLUE, 255 - moduleConfig.ambient_lighting.blue);
-        LOG_DEBUG("Init Ambient light RGB Common Anode w/ red=%d, green=%d, blue=%d", moduleConfig.ambient_lighting.red,
-                  moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
+            analogWrite(RGBLED_RED, 255 - moduleConfig.ambient_lighting.red);
+            analogWrite(RGBLED_GREEN, 255 - moduleConfig.ambient_lighting.green);
+            analogWrite(RGBLED_BLUE, 255 - moduleConfig.ambient_lighting.blue);
+            LOG_DEBUG("Init Ambient light RGB Common Anode w/ red=%d, green=%d, blue=%d", moduleConfig.ambient_lighting.red,
+                      moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
 #elif defined(RGBLED_RED)
         analogWrite(RGBLED_RED, moduleConfig.ambient_lighting.red);
         analogWrite(RGBLED_GREEN, moduleConfig.ambient_lighting.green);
@@ -200,11 +201,12 @@ class AmbientLightingThread : public concurrency::OSThread
                   moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
 #endif
 #ifdef UNPHONE
-        unphone.rgb(moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
-        LOG_DEBUG("Init unPhone Ambient light w/ red=%d, green=%d, blue=%d", moduleConfig.ambient_lighting.red,
-                  moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
+            unphone.rgb(moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green,
+                        moduleConfig.ambient_lighting.blue);
+            LOG_DEBUG("Init unPhone Ambient light w/ red=%d, green=%d, blue=%d", moduleConfig.ambient_lighting.red,
+                      moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
 #endif
-    }
-};
+        }
+    };
 
 } // namespace concurrency

src/AudioThread.h

@@ -47,6 +47,20 @@ class AudioThread : public concurrency::OSThread
         setCPUFast(false);
     }
 
+    void readAloud(const char *text)
+    {
+        if (i2sRtttl != nullptr) {
+            i2sRtttl->stop();
+            delete i2sRtttl;
+            i2sRtttl = nullptr;
+        }
+
+        ESP8266SAM *sam = new ESP8266SAM;
+        sam->Say(audioOut, text);
+        delete sam;
+        setCPUFast(false);
+    }
+
   protected:
     int32_t runOnce() override
     {

src/BluetoothStatus.h

@@ -88,10 +88,24 @@ class BluetoothStatus : public Status
                 break;
             case ConnectionState::CONNECTED:
                 LOG_DEBUG("BluetoothStatus CONNECTED");
+#ifdef BLE_LED
+#ifdef BLE_LED_INVERTED
+                digitalWrite(BLE_LED, LOW);
+#else
+                digitalWrite(BLE_LED, HIGH);
+#endif
+#endif
                 break;
 
             case ConnectionState::DISCONNECTED:
                 LOG_DEBUG("BluetoothStatus DISCONNECTED");
+#ifdef BLE_LED
+#ifdef BLE_LED_INVERTED
+                digitalWrite(BLE_LED, HIGH);
+#else
+                digitalWrite(BLE_LED, LOW);
+#endif
+#endif
                 break;
             }
         }
@@ -102,4 +116,4 @@ class BluetoothStatus : public Status
 
 } // namespace meshtastic
 
-extern meshtastic::BluetoothStatus *bluetoothStatus;
+extern meshtastic::BluetoothStatus *bluetoothStatus;

src/ButtonThread.cpp

@@ -1,467 +0,0 @@
-#include "ButtonThread.h"
-
-#include "configuration.h"
-#if !MESHTASTIC_EXCLUDE_GPS
-#include "GPS.h"
-#endif
-#include "MeshService.h"
-#include "PowerFSM.h"
-#include "RadioLibInterface.h"
-#include "buzz.h"
-#include "main.h"
-#include "modules/ExternalNotificationModule.h"
-#include "power.h"
-#include "sleep.h"
-#ifdef ARCH_PORTDUINO
-#include "platform/portduino/PortduinoGlue.h"
-#endif
-
-#define DEBUG_BUTTONS 0
-#if DEBUG_BUTTONS
-#define LOG_BUTTON(...) LOG_DEBUG(__VA_ARGS__)
-#else
-#define LOG_BUTTON(...)
-#endif
-
-using namespace concurrency;
-
-ButtonThread *buttonThread; // Declared extern in header
-volatile ButtonThread::ButtonEventType ButtonThread::btnEvent = ButtonThread::BUTTON_EVENT_NONE;
-
-#if defined(BUTTON_PIN) || defined(ARCH_PORTDUINO) || defined(USERPREFS_BUTTON_PIN)
-OneButton ButtonThread::userButton; // Get reference to static member
-#endif
-ButtonThread::ButtonThread() : OSThread("Button")
-{
-#if defined(BUTTON_PIN) || defined(ARCH_PORTDUINO) || defined(USERPREFS_BUTTON_PIN)
-
-#if defined(ARCH_PORTDUINO)
-    if (settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC) {
-        this->userButton = OneButton(settingsMap[user], true, true);
-        LOG_DEBUG("Use GPIO%02d for button", settingsMap[user]);
-    }
-#elif defined(BUTTON_PIN)
-#if !defined(USERPREFS_BUTTON_PIN)
-    int pin = config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN;           // Resolved button pin
-#endif
-#ifdef USERPREFS_BUTTON_PIN
-    int pin = config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN; // Resolved button pin
-#endif
-#if defined(HELTEC_CAPSULE_SENSOR_V3) || defined(HELTEC_SENSOR_HUB)
-    this->userButton = OneButton(pin, false, false);
-#elif defined(BUTTON_ACTIVE_LOW)
-    this->userButton = OneButton(pin, BUTTON_ACTIVE_LOW, BUTTON_ACTIVE_PULLUP);
-#else
-    this->userButton = OneButton(pin, true, true);
-#endif
-    LOG_DEBUG("Use GPIO%02d for button", pin);
-#endif
-
-#ifdef INPUT_PULLUP_SENSE
-    // Some platforms (nrf52) have a SENSE variant which allows wake from sleep - override what OneButton did
-#ifdef BUTTON_SENSE_TYPE
-    pinMode(pin, BUTTON_SENSE_TYPE);
-#else
-    pinMode(pin, INPUT_PULLUP_SENSE);
-#endif
-#endif
-
-#if defined(BUTTON_PIN) || defined(ARCH_PORTDUINO) || defined(USERPREFS_BUTTON_PIN)
-    userButton.attachClick(userButtonPressed);
-    userButton.setClickMs(BUTTON_CLICK_MS);
-    userButton.setPressMs(BUTTON_LONGPRESS_MS);
-    userButton.setDebounceMs(1);
-    userButton.attachDoubleClick(userButtonDoublePressed);
-    userButton.attachMultiClick(userButtonMultiPressed, this); // Reference to instance: get click count from non-static OneButton
-#if !defined(T_DECK) &&                                                                                                          \
-    !defined(                                                                                                                    \
-        ELECROW_ThinkNode_M2) // T-Deck immediately wakes up after shutdown, Thinknode M2 has this on the smaller ALT button
-    userButton.attachLongPressStart(userButtonPressedLongStart);
-    userButton.attachLongPressStop(userButtonPressedLongStop);
-#endif
-#endif
-
-#ifdef BUTTON_PIN_ALT
-#if defined(ELECROW_ThinkNode_M2)
-    this->userButtonAlt = OneButton(BUTTON_PIN_ALT, false, false);
-#else
-    this->userButtonAlt = OneButton(BUTTON_PIN_ALT, true, true);
-#endif
-#ifdef INPUT_PULLUP_SENSE
-    // Some platforms (nrf52) have a SENSE variant which allows wake from sleep - override what OneButton did
-    pinMode(BUTTON_PIN_ALT, INPUT_PULLUP_SENSE);
-#endif
-    userButtonAlt.attachClick(userButtonPressedScreen);
-    userButtonAlt.setClickMs(BUTTON_CLICK_MS);
-    userButtonAlt.setPressMs(BUTTON_LONGPRESS_MS);
-    userButtonAlt.setDebounceMs(1);
-    userButtonAlt.attachLongPressStart(userButtonPressedLongStart);
-    userButtonAlt.attachLongPressStop(userButtonPressedLongStop);
-#endif
-
-#ifdef BUTTON_PIN_TOUCH
-    userButtonTouch = OneButton(BUTTON_PIN_TOUCH, true, true);
-    userButtonTouch.setPressMs(BUTTON_TOUCH_MS);
-    userButtonTouch.attachLongPressStart(touchPressedLongStart); // Better handling with longpress than click?
-#endif
-
-#ifdef ARCH_ESP32
-    // Register callbacks for before and after lightsleep
-    // Used to detach and reattach interrupts
-    lsObserver.observe(&notifyLightSleep);
-    lsEndObserver.observe(&notifyLightSleepEnd);
-#endif
-
-    attachButtonInterrupts();
-#endif
-}
-
-void ButtonThread::switchPage()
-{
-#ifdef BUTTON_PIN
-#if !defined(USERPREFS_BUTTON_PIN)
-    if (((config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN) !=
-         moduleConfig.canned_message.inputbroker_pin_press) ||
-        !(moduleConfig.canned_message.updown1_enabled || moduleConfig.canned_message.rotary1_enabled) ||
-        !moduleConfig.canned_message.enabled) {
-        powerFSM.trigger(EVENT_PRESS);
-    }
-#endif
-#if defined(USERPREFS_BUTTON_PIN)
-    if (((config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN) !=
-         moduleConfig.canned_message.inputbroker_pin_press) ||
-        !(moduleConfig.canned_message.updown1_enabled || moduleConfig.canned_message.rotary1_enabled) ||
-        !moduleConfig.canned_message.enabled) {
-        powerFSM.trigger(EVENT_PRESS);
-    }
-#endif
-
-#endif
-#if defined(ARCH_PORTDUINO)
-    if ((settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC) &&
-            (settingsMap[user] != moduleConfig.canned_message.inputbroker_pin_press) ||
-        !moduleConfig.canned_message.enabled) {
-        powerFSM.trigger(EVENT_PRESS);
-    }
-#endif
-}
-
-void ButtonThread::sendAdHocPosition()
-{
-    service->refreshLocalMeshNode();
-    auto sentPosition = service->trySendPosition(NODENUM_BROADCAST, true);
-    if (screen) {
-        if (sentPosition)
-            screen->print("Sent ad-hoc position\n");
-        else
-            screen->print("Sent ad-hoc nodeinfo\n");
-        screen->forceDisplay(true); // Force a new UI frame, then force an EInk update
-    }
-}
-
-int32_t ButtonThread::runOnce()
-{
-    // If the button is pressed we suppress CPU sleep until release
-    canSleep = true; // Assume we should not keep the board awake
-
-#if defined(BUTTON_PIN) || defined(USERPREFS_BUTTON_PIN)
-    userButton.tick();
-    canSleep &= userButton.isIdle();
-#elif defined(ARCH_PORTDUINO)
-    if (settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC) {
-        userButton.tick();
-        canSleep &= userButton.isIdle();
-    }
-#endif
-#ifdef BUTTON_PIN_ALT
-    userButtonAlt.tick();
-    canSleep &= userButtonAlt.isIdle();
-#endif
-#ifdef BUTTON_PIN_TOUCH
-    userButtonTouch.tick();
-    canSleep &= userButtonTouch.isIdle();
-#endif
-
-    if (btnEvent != BUTTON_EVENT_NONE) {
-        switch (btnEvent) {
-        case BUTTON_EVENT_PRESSED: {
-            LOG_BUTTON("press!");
-            // If a nag notification is running, stop it and prevent other actions
-            if (moduleConfig.external_notification.enabled && (externalNotificationModule->nagCycleCutoff != UINT32_MAX)) {
-                externalNotificationModule->stopNow();
-                break;
-            }
-#ifdef ELECROW_ThinkNode_M1
-            sendAdHocPosition();
-            break;
-#endif
-            switchPage();
-            break;
-        }
-
-        case BUTTON_EVENT_PRESSED_SCREEN: {
-            LOG_BUTTON("AltPress!");
-#ifdef ELECROW_ThinkNode_M1
-            // If a nag notification is running, stop it and prevent other actions
-            if (moduleConfig.external_notification.enabled && (externalNotificationModule->nagCycleCutoff != UINT32_MAX)) {
-                externalNotificationModule->stopNow();
-                break;
-            }
-            switchPage();
-            break;
-#endif
-            // turn screen on or off
-            screen_flag = !screen_flag;
-            if (screen)
-                screen->setOn(screen_flag);
-            break;
-        }
-
-        case BUTTON_EVENT_DOUBLE_PRESSED: {
-            LOG_BUTTON("Double press!");
-#ifdef ELECROW_ThinkNode_M1
-            digitalWrite(PIN_EINK_EN, digitalRead(PIN_EINK_EN) == LOW);
-            break;
-#endif
-            sendAdHocPosition();
-            break;
-        }
-
-        case BUTTON_EVENT_MULTI_PRESSED: {
-            LOG_BUTTON("Mulitipress! %hux", multipressClickCount);
-            switch (multipressClickCount) {
-#if HAS_GPS && !defined(ELECROW_ThinkNode_M1)
-            // 3 clicks: toggle GPS
-            case 3:
-                if (!config.device.disable_triple_click && (gps != nullptr)) {
-                    gps->toggleGpsMode();
-                    if (screen)
-                        screen->forceDisplay(true); // Force a new UI frame, then force an EInk update
-                }
-                break;
-#elif defined(ELECROW_ThinkNode_M1) || defined(ELECROW_ThinkNode_M2)
-            case 3:
-                LOG_INFO("3 clicks: toggle buzzer");
-                buzzer_flag = !buzzer_flag;
-                if (!buzzer_flag)
-                    noTone(PIN_BUZZER);
-                break;
-
-#endif
-
-#if defined(USE_EINK) && defined(PIN_EINK_EN) && !defined(ELECROW_ThinkNode_M1) // i.e. T-Echo
-            // 4 clicks: toggle backlight
-            case 4:
-                digitalWrite(PIN_EINK_EN, digitalRead(PIN_EINK_EN) == LOW);
-                break;
-#endif
-#if !MESHTASTIC_EXCLUDE_SCREEN && HAS_SCREEN
-            // 5 clicks: start accelerometer/magenetometer calibration for 30 seconds
-            case 5:
-                if (accelerometerThread) {
-                    accelerometerThread->calibrate(30);
-                }
-                break;
-            // 6 clicks: start accelerometer/magenetometer calibration for 60 seconds
-            case 6:
-                if (accelerometerThread) {
-                    accelerometerThread->calibrate(60);
-                }
-                break;
-#endif
-            // No valid multipress action
-            default:
-                break;
-            } // end switch: click count
-
-            break;
-        } // end multipress event
-
-        case BUTTON_EVENT_LONG_PRESSED: {
-            LOG_BUTTON("Long press!");
-            powerFSM.trigger(EVENT_PRESS);
-            if (screen) {
-                screen->startAlert("Shutting down...");
-            }
-            playBeep();
-            break;
-        }
-
-        // Do actual shutdown when button released, otherwise the button release
-        // may wake the board immediatedly.
-        case BUTTON_EVENT_LONG_RELEASED: {
-            LOG_INFO("Shutdown from long press");
-            playShutdownMelody();
-            delay(3000);
-            power->shutdown();
-            break;
-        }
-
-#ifdef BUTTON_PIN_TOUCH
-        case BUTTON_EVENT_TOUCH_LONG_PRESSED: {
-            LOG_BUTTON("Touch press!");
-            // Ignore if: no screen
-            if (!screen)
-                break;
-
-#ifdef TTGO_T_ECHO
-            // Ignore if: TX in progress
-            // Uncommon T-Echo hardware bug, LoRa TX triggers touch button
-            if (!RadioLibInterface::instance || RadioLibInterface::instance->isSending())
-                break;
-#endif
-
-            // Wake if asleep
-            if (powerFSM.getState() == &stateDARK)
-                powerFSM.trigger(EVENT_PRESS);
-
-            // Update display (legacy behaviour)
-            screen->forceDisplay();
-            break;
-        }
-#endif // BUTTON_PIN_TOUCH
-
-        default:
-            break;
-        }
-        btnEvent = BUTTON_EVENT_NONE;
-    }
-
-    return 50;
-}
-
-/*
- * Attach (or re-attach) hardware interrupts for buttons
- * Public method. Used outside class when waking from MCU sleep
- */
-void ButtonThread::attachButtonInterrupts()
-{
-#if defined(ARCH_PORTDUINO)
-    if (settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC)
-        wakeOnIrq(settingsMap[user], FALLING);
-#elif defined(BUTTON_PIN)
-    // Interrupt for user button, during normal use. Improves responsiveness.
-    attachInterrupt(
-#if !defined(USERPREFS_BUTTON_PIN)
-        config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN,
-#endif
-#if defined(USERPREFS_BUTTON_PIN)
-        config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN,
-#endif
-        []() {
-            ButtonThread::userButton.tick();
-            runASAP = true;
-            BaseType_t higherWake = 0;
-            mainDelay.interruptFromISR(&higherWake);
-        },
-        CHANGE);
-#endif
-
-#ifdef BUTTON_PIN_ALT
-#ifdef ELECROW_ThinkNode_M2
-    wakeOnIrq(BUTTON_PIN_ALT, RISING);
-#else
-    wakeOnIrq(BUTTON_PIN_ALT, FALLING);
-#endif
-#endif
-
-#ifdef BUTTON_PIN_TOUCH
-    wakeOnIrq(BUTTON_PIN_TOUCH, FALLING);
-#endif
-}
-
-/*
- * Detach the "normal" button interrupts.
- * Public method. Used before attaching a "wake-on-button" interrupt for MCU sleep
- */
-void ButtonThread::detachButtonInterrupts()
-{
-#if defined(ARCH_PORTDUINO)
-    if (settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC)
-        detachInterrupt(settingsMap[user]);
-#elif defined(BUTTON_PIN)
-#if !defined(USERPREFS_BUTTON_PIN)
-    detachInterrupt(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN);
-#endif
-#if defined(USERPREFS_BUTTON_PIN)
-    detachInterrupt(config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN);
-#endif
-#endif
-
-#ifdef BUTTON_PIN_ALT
-    detachInterrupt(BUTTON_PIN_ALT);
-#endif
-
-#ifdef BUTTON_PIN_TOUCH
-    detachInterrupt(BUTTON_PIN_TOUCH);
-#endif
-}
-
-#ifdef ARCH_ESP32
-
-// Detach our class' interrupts before lightsleep
-// Allows sleep.cpp to configure its own interrupts, which wake the device on user-button press
-int ButtonThread::beforeLightSleep(void *unused)
-{
-    detachButtonInterrupts();
-    return 0; // Indicates success
-}
-
-// Reconfigure our interrupts
-// Our class' interrupts were disconnected during sleep, to allow the user button to wake the device from sleep
-int ButtonThread::afterLightSleep(esp_sleep_wakeup_cause_t cause)
-{
-    attachButtonInterrupts();
-    return 0; // Indicates success
-}
-
-#endif
-
-/**
- * Watch a GPIO and if we get an IRQ, wake the main thread.
- * Use to add wake on button press
- */
-void ButtonThread::wakeOnIrq(int irq, int mode)
-{
-    attachInterrupt(
-        irq,
-        [] {
-            BaseType_t higherWake = 0;
-            mainDelay.interruptFromISR(&higherWake);
-            runASAP = true;
-        },
-        FALLING);
-}
-
-// Static callback
-void ButtonThread::userButtonMultiPressed(void *callerThread)
-{
-    // Grab click count from non-static button, while the info is still valid
-    ButtonThread *thread = (ButtonThread *)callerThread;
-    thread->storeClickCount();
-
-    // Then handle later, in the usual way
-    btnEvent = BUTTON_EVENT_MULTI_PRESSED;
-}
-
-// Non-static method, runs during callback. Grabs info while still valid
-void ButtonThread::storeClickCount()
-{
-#if defined(BUTTON_PIN) || defined(USERPREFS_BUTTON_PIN)
-    multipressClickCount = userButton.getNumberClicks();
-#endif
-}
-
-void ButtonThread::userButtonPressedLongStart()
-{
-    if (millis() > c_holdOffTime) {
-        btnEvent = BUTTON_EVENT_LONG_PRESSED;
-    }
-}
-
-void ButtonThread::userButtonPressedLongStop()
-{
-    if (millis() > c_holdOffTime) {
-        btnEvent = BUTTON_EVENT_LONG_RELEASED;
-    }
-}

src/ButtonThread.h

@@ -1,91 +0,0 @@
-#pragma once
-
-#include "OneButton.h"
-#include "concurrency/OSThread.h"
-#include "configuration.h"
-
-#ifndef BUTTON_CLICK_MS
-#define BUTTON_CLICK_MS 250
-#endif
-
-#ifndef BUTTON_LONGPRESS_MS
-#define BUTTON_LONGPRESS_MS 5000
-#endif
-
-#ifndef BUTTON_TOUCH_MS
-#define BUTTON_TOUCH_MS 400
-#endif
-
-class ButtonThread : public concurrency::OSThread
-{
-  public:
-    static const uint32_t c_holdOffTime = 30000; // hold off 30s after boot
-
-    enum ButtonEventType {
-        BUTTON_EVENT_NONE,
-        BUTTON_EVENT_PRESSED,
-        BUTTON_EVENT_PRESSED_SCREEN,
-        BUTTON_EVENT_DOUBLE_PRESSED,
-        BUTTON_EVENT_MULTI_PRESSED,
-        BUTTON_EVENT_LONG_PRESSED,
-        BUTTON_EVENT_LONG_RELEASED,
-        BUTTON_EVENT_TOUCH_LONG_PRESSED,
-    };
-
-    ButtonThread();
-    int32_t runOnce() override;
-    void attachButtonInterrupts();
-    void detachButtonInterrupts();
-    void storeClickCount();
-    bool isBuzzing() { return buzzer_flag; }
-    void setScreenFlag(bool flag) { screen_flag = flag; }
-    bool getScreenFlag() { return screen_flag; }
-
-    // Disconnect and reconnect interrupts for light sleep
-#ifdef ARCH_ESP32
-    int beforeLightSleep(void *unused);
-    int afterLightSleep(esp_sleep_wakeup_cause_t cause);
-#endif
-  private:
-#if defined(BUTTON_PIN) || defined(ARCH_PORTDUINO) || defined(USERPREFS_BUTTON_PIN)
-    static OneButton userButton; // Static - accessed from an interrupt
-#endif
-#ifdef BUTTON_PIN_ALT
-    OneButton userButtonAlt;
-#endif
-#ifdef BUTTON_PIN_TOUCH
-    OneButton userButtonTouch;
-#endif
-
-#ifdef ARCH_ESP32
-    // Get notified when lightsleep begins and ends
-    CallbackObserver<ButtonThread, void *> lsObserver =
-        CallbackObserver<ButtonThread, void *>(this, &ButtonThread::beforeLightSleep);
-    CallbackObserver<ButtonThread, esp_sleep_wakeup_cause_t> lsEndObserver =
-        CallbackObserver<ButtonThread, esp_sleep_wakeup_cause_t>(this, &ButtonThread::afterLightSleep);
-#endif
-
-    // set during IRQ
-    static volatile ButtonEventType btnEvent;
-    bool buzzer_flag = false;
-    bool screen_flag = true;
-
-    // Store click count during callback, for later use
-    volatile int multipressClickCount = 0;
-
-    static void wakeOnIrq(int irq, int mode);
-
-    static void sendAdHocPosition();
-    static void switchPage();
-
-    // IRQ callbacks
-    static void userButtonPressed() { btnEvent = BUTTON_EVENT_PRESSED; }
-    static void userButtonPressedScreen() { btnEvent = BUTTON_EVENT_PRESSED_SCREEN; }
-    static void userButtonDoublePressed() { btnEvent = BUTTON_EVENT_DOUBLE_PRESSED; }
-    static void userButtonMultiPressed(void *callerThread); // Retrieve click count from non-static Onebutton while still valid
-    static void userButtonPressedLongStart();
-    static void userButtonPressedLongStop();
-    static void touchPressedLongStart() { btnEvent = BUTTON_EVENT_TOUCH_LONG_PRESSED; }
-};
-
-extern ButtonThread *buttonThread;

src/Power.cpp

@@ -20,6 +20,11 @@
 #include "meshUtils.h"
 #include "sleep.h"
 
+#if defined(ARCH_PORTDUINO)
+#include "api/WiFiServerAPI.h"
+#include "input/LinuxInputImpl.h"
+#endif
+
 // Working USB detection for powered/charging states on the RAK platform
 #ifdef NRF_APM
 #include "nrfx_power.h"
@@ -103,7 +108,7 @@ NullSensor ina3221Sensor;
 
 #endif
 
-#if !MESHTASTIC_EXCLUDE_I2C && !defined(ARCH_STM32WL)
+#if !MESHTASTIC_EXCLUDE_I2C
 #include "modules/Telemetry/Sensor/MAX17048Sensor.h"
 #include <utility>
 extern std::pair<uint8_t, TwoWire *> nodeTelemetrySensorsMap[_meshtastic_TelemetrySensorType_MAX + 1];
@@ -120,6 +125,15 @@ NullSensor max17048Sensor;
 RAK9154Sensor rak9154Sensor;
 #endif
 
+#ifdef HAS_PPM
+// note: XPOWERS_CHIP_XXX must be defined in variant.h
+#include <XPowersLib.h>
+#endif
+
+#ifdef HAS_BQ27220
+#include "bq27220.h"
+#endif
+
 #ifdef HAS_PMU
 XPowersLibInterface *PMU = NULL;
 #else
@@ -278,7 +292,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
         }
 #endif
 
-#if HAS_TELEMETRY && !defined(ARCH_STM32WL) && !defined(HAS_PMU) && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
+#if HAS_TELEMETRY && !defined(HAS_PMU) && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
         if (hasINA()) {
             return getINAVoltage();
         }
@@ -456,8 +470,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
 #ifdef EXT_CHRG_DETECT
         return digitalRead(EXT_CHRG_DETECT) == ext_chrg_detect_value;
 #else
-#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && !defined(ARCH_STM32WL) &&                                       \
-    !defined(DISABLE_INA_CHARGING_DETECTION)
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && !defined(DISABLE_INA_CHARGING_DETECTION)
         if (hasINA()) {
             // get current flow from INA sensor - negative value means power flowing into the battery
             // default assuming  BATTERY+  <--> INA_VIN+ <--> SHUNT RESISTOR <--> INA_VIN- <--> LOAD
@@ -503,7 +516,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
     }
 #endif
 
-#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && !defined(ARCH_STM32WL)
+#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
     uint16_t getINAVoltage()
     {
         if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_INA219].first == config.power.device_battery_ina_address) {
@@ -661,12 +674,18 @@ bool Power::analogInit()
  */
 bool Power::setup()
 {
-    // initialise one power sensor (only)
-    bool found = axpChipInit();
-    if (!found)
-        found = lipoInit();
-    if (!found)
-        found = analogInit();
+    bool found = false;
+    if (axpChipInit()) {
+        found = true;
+    } else if (lipoInit()) {
+        found = true;
+    } else if (lipoChargerInit()) {
+        found = true;
+    }  else if (meshSolarInit()) {
+        found = true;
+    } else if (analogInit()) {
+        found = true;
+    }
 
 #ifdef NRF_APM
     found = true;
@@ -678,9 +697,61 @@ bool Power::setup()
     return found;
 }
 
+void Power::powerCommandsCheck()
+{
+    if (rebootAtMsec && millis() > rebootAtMsec) {
+        LOG_INFO("Rebooting");
+        reboot();
+    }
+
+    if (shutdownAtMsec && millis() > shutdownAtMsec) {
+        shutdownAtMsec = 0;
+        shutdown();
+    }
+}
+
+void Power::reboot()
+{
+    notifyReboot.notifyObservers(NULL);
+#if defined(ARCH_ESP32)
+    ESP.restart();
+#elif defined(ARCH_NRF52)
+    NVIC_SystemReset();
+#elif defined(ARCH_RP2040)
+    rp2040.reboot();
+#elif defined(ARCH_PORTDUINO)
+    deInitApiServer();
+    if (aLinuxInputImpl)
+        aLinuxInputImpl->deInit();
+    SPI.end();
+    Wire.end();
+    Serial1.end();
+    if (screen) {
+        delete screen;
+        screen = nullptr;
+    }
+    LOG_DEBUG("final reboot!");
+    ::reboot();
+#elif defined(ARCH_STM32WL)
+    HAL_NVIC_SystemReset();
+#else
+    rebootAtMsec = -1;
+    LOG_WARN("FIXME implement reboot for this platform. Note that some settings require a restart to be applied");
+#endif
+}
+
 void Power::shutdown()
 {
-    LOG_INFO("Shutting down");
+
+#if HAS_SCREEN
+    if (screen) {
+        screen->showSimpleBanner("Shutting Down...", 0); // stays on screen
+    }
+#endif
+#if !defined(ARCH_STM32WL)
+    playShutdownMelody();
+#endif
+    nodeDB->saveToDisk();
 
 #if defined(ARCH_NRF52) || defined(ARCH_ESP32) || defined(ARCH_RP2040)
 #ifdef PIN_LED1
@@ -692,7 +763,11 @@ void Power::shutdown()
 #ifdef PIN_LED3
     ledOff(PIN_LED3);
 #endif
-    doDeepSleep(DELAY_FOREVER, false, false);
+    doDeepSleep(DELAY_FOREVER, false, true);
+#elif defined(ARCH_PORTDUINO)
+    exit(EXIT_SUCCESS);
+#else
+    LOG_WARN("FIXME implement shutdown for this platform");
 #endif
 }
 
@@ -853,7 +928,8 @@ int32_t Power::runOnce()
 #ifndef T_WATCH_S3 // FIXME - why is this triggering on the T-Watch S3?
         if (PMU->isPekeyLongPressIrq()) {
             LOG_DEBUG("PEK long button press");
-            screen->setOn(false);
+            if (screen)
+                screen->setOn(false);
         }
 #endif
 
@@ -1158,7 +1234,7 @@ bool Power::axpChipInit()
 #endif
 }
 
-#if !MESHTASTIC_EXCLUDE_I2C && !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL)
+#if !MESHTASTIC_EXCLUDE_I2C && __has_include(<Adafruit_MAX1704X.h>)
 
 /**
  * Wrapper class for an I2C MAX17048 Lipo battery sensor.
@@ -1235,3 +1311,216 @@ bool Power::lipoInit()
     return false;
 }
 #endif
+
+#if defined(HAS_PPM) && HAS_PPM
+
+/**
+ * Adapter class for BQ25896/BQ27220 Lipo battery charger.
+ */
+class LipoCharger : public HasBatteryLevel
+{
+  private:
+    XPowersPPM *ppm = nullptr;
+    BQ27220 *bq = nullptr;
+
+  public:
+    /**
+     * Init the I2C BQ25896 Lipo battery charger
+     */
+    bool runOnce()
+    {
+        if (ppm == nullptr) {
+            ppm = new XPowersPPM;
+            bool result = ppm->init(Wire, I2C_SDA, I2C_SCL, BQ25896_ADDR);
+            if (result) {
+                LOG_INFO("PPM BQ25896 init succeeded");
+                // Set the minimum operating voltage. Below this voltage, the PPM will protect
+                // ppm->setSysPowerDownVoltage(3100);
+
+                // Set input current limit, default is 500mA
+                // ppm->setInputCurrentLimit(800);
+
+                // Disable current limit pin
+                // ppm->disableCurrentLimitPin();
+
+                // Set the charging target voltage, Range:3840 ~ 4608mV ,step:16 mV
+                ppm->setChargeTargetVoltage(4288);
+
+                // Set the precharge current , Range: 64mA ~ 1024mA ,step:64mA
+                // ppm->setPrechargeCurr(64);
+
+                // The premise is that limit pin is disabled, or it will
+                // only follow the maximum charging current set by limit pin.
+                // Set the charging current , Range:0~5056mA ,step:64mA
+                ppm->setChargerConstantCurr(1024);
+
+                // To obtain voltage data, the ADC must be enabled first
+                ppm->enableMeasure();
+
+                // Turn on charging function
+                // If there is no battery connected, do not turn on the charging function
+                ppm->enableCharge();
+            } else {
+                LOG_WARN("PPM BQ25896 init failed");
+                delete ppm;
+                ppm = nullptr;
+                return false;
+            }
+        }
+        if (bq == nullptr) {
+            bq = new BQ27220;
+            bq->setDefaultCapacity(BQ27220_DESIGN_CAPACITY);
+
+            bool result = bq->init();
+            if (result) {
+                LOG_DEBUG("BQ27220 design capacity: %d", bq->getDesignCapacity());
+                LOG_DEBUG("BQ27220 fullCharge capacity: %d", bq->getFullChargeCapacity());
+                LOG_DEBUG("BQ27220 remaining capacity: %d", bq->getRemainingCapacity());
+                return true;
+            } else {
+                LOG_WARN("BQ27220 init failed");
+                delete bq;
+                bq = nullptr;
+                return false;
+            }
+        }
+        return false;
+    }
+
+    /**
+     * Battery state of charge, from 0 to 100 or -1 for unknown
+     */
+    virtual int getBatteryPercent() override
+    {
+        return -1;
+        // return bq->getChargePercent(); // don't use BQ27220 for battery percent, it is not calibrated
+    }
+
+    /**
+     * The raw voltage of the battery in millivolts, or NAN if unknown
+     */
+    virtual uint16_t getBattVoltage() override { return bq->getVoltage(); }
+
+    /**
+     * return true if there is a battery installed in this unit
+     */
+    virtual bool isBatteryConnect() override { return ppm->getBattVoltage() > 0; }
+
+    /**
+     * return true if there is an external power source detected
+     */
+    virtual bool isVbusIn() override { return ppm->getVbusVoltage() > 0; }
+
+    /**
+     * return true if the battery is currently charging
+     */
+    virtual bool isCharging() override
+    {
+        bool isCharging = ppm->isCharging();
+        if (isCharging) {
+            LOG_DEBUG("BQ27220 time to full charge: %d min", bq->getTimeToFull());
+        } else {
+            if (!ppm->isVbusIn()) {
+                LOG_DEBUG("BQ27220 time to empty: %d min (%d mAh)", bq->getTimeToEmpty(), bq->getRemainingCapacity());
+            }
+        }
+        return isCharging;
+    }
+};
+
+LipoCharger lipoCharger;
+
+/**
+ * Init the Lipo battery charger
+ */
+bool Power::lipoChargerInit()
+{
+    bool result = lipoCharger.runOnce();
+    LOG_DEBUG("Power::lipoChargerInit lipo sensor is %s", result ? "ready" : "not ready yet");
+    if (!result)
+        return false;
+    batteryLevel = &lipoCharger;
+    return true;
+}
+
+#else
+/**
+ * The Lipo battery level sensor is unavailable - default to AnalogBatteryLevel
+ */
+bool Power::lipoChargerInit()
+{
+    return false;
+}
+#endif
+
+
+
+#ifdef HELTEC_MESH_SOLAR
+#include "meshSolarApp.h"
+
+/**
+ * meshSolar class for an SMBUS battery sensor.
+ */
+class meshSolarBatteryLevel : public HasBatteryLevel
+{
+
+  public:
+    /**
+     * Init the I2C meshSolar battery level sensor
+     */
+    bool runOnce()
+    {
+        meshSolarStart();
+        return true;
+    }
+
+    /**
+     * Battery state of charge, from 0 to 100 or -1 for unknown
+     */
+    virtual int getBatteryPercent() override { return meshSolarGetBatteryPercent(); }
+
+    /**
+     * The raw voltage of the battery in millivolts, or NAN if unknown
+     */
+    virtual uint16_t getBattVoltage() override { return meshSolarGetBattVoltage(); }
+
+    /**
+     * return true if there is a battery installed in this unit
+     */
+    virtual bool isBatteryConnect() override { return meshSolarIsBatteryConnect(); }
+
+    /**
+     * return true if there is an external power source detected
+     */
+    virtual bool isVbusIn() override { return meshSolarIsVbusIn();}
+
+    /**
+     * return true if the battery is currently charging
+     */
+    virtual bool isCharging() override { return meshSolarIsCharging(); }
+};
+
+meshSolarBatteryLevel meshSolarLevel;
+
+/**
+ * Init the meshSolar battery level sensor
+ */
+bool Power::meshSolarInit()
+{
+    bool result = meshSolarLevel.runOnce();
+    LOG_DEBUG("Power::meshSolarInit mesh solar sensor is %s", result ? "ready" : "not ready yet");
+    if (!result)
+        return false;
+    batteryLevel = &meshSolarLevel;
+    return true;
+}
+
+#else
+/**
+ * The meshSolar battery level sensor is unavailable - default to AnalogBatteryLevel
+ */
+bool Power::meshSolarInit()
+{
+    return false;
+}
+#endif

src/PowerFSM.cpp

@@ -26,7 +26,7 @@
 #ifndef SLEEP_TIME
 #define SLEEP_TIME 30
 #endif
-#if EXCLUDE_POWER_FSM
+#if MESHTASTIC_EXCLUDE_POWER_FSM
 FakeFsm powerFSM;
 void PowerFSM_setup(){};
 #else
@@ -72,7 +72,7 @@ extern Power *power;
 static void shutdownEnter()
 {
     LOG_DEBUG("State: SHUTDOWN");
-    power->shutdown();
+    shutdownAtMsec = millis();
 }
 
 #include "error.h"
@@ -82,7 +82,8 @@ static uint32_t secsSlept;
 static void lsEnter()
 {
     LOG_INFO("lsEnter begin, ls_secs=%u", config.power.ls_secs);
-    screen->setOn(false);
+    if (screen)
+        screen->setOn(false);
     secsSlept = 0; // How long have we been sleeping this time
 
     // LOG_INFO("lsEnter end");
@@ -160,7 +161,8 @@ static void lsExit()
 static void nbEnter()
 {
     LOG_DEBUG("State: NB");
-    screen->setOn(false);
+    if (screen)
+        screen->setOn(false);
 #ifdef ARCH_ESP32
     // Only ESP32 should turn off bluetooth
     setBluetoothEnable(false);
@@ -172,22 +174,23 @@ static void nbEnter()
 static void darkEnter()
 {
     setBluetoothEnable(true);
-    screen->setOn(false);
+    if (screen)
+        screen->setOn(false);
 }
 
 static void serialEnter()
 {
     LOG_DEBUG("State: SERIAL");
     setBluetoothEnable(false);
-    screen->setOn(true);
-    screen->print("Serial connected\n");
+    if (screen) {
+        screen->setOn(true);
+    }
 }
 
 static void serialExit()
 {
     // Turn bluetooth back on when we leave serial stream API
     setBluetoothEnable(true);
-    screen->print("Serial disconnected\n");
 }
 
 static void powerEnter()
@@ -198,15 +201,10 @@ static void powerEnter()
         LOG_INFO("Loss of power in Powered");
         powerFSM.trigger(EVENT_POWER_DISCONNECTED);
     } else {
-        screen->setOn(true);
+        if (screen)
+            screen->setOn(true);
         setBluetoothEnable(true);
         // within enter() the function getState() returns the state we came from
-
-        // Mothballed: print change of power-state to device screen
-        /* if (strcmp(powerFSM.getState()->name, "BOOT") != 0 && strcmp(powerFSM.getState()->name, "POWER") != 0 &&
-            strcmp(powerFSM.getState()->name, "DARK") != 0) {
-            screen->print("Powered...\n");
-        }*/
     }
 }
 
@@ -221,18 +219,16 @@ static void powerIdle()
 
 static void powerExit()
 {
-    screen->setOn(true);
+    if (screen)
+        screen->setOn(true);
     setBluetoothEnable(true);
-
-    // Mothballed: print change of power-state to device screen
-    /*if (!isPowered())
-        screen->print("Unpowered...\n");*/
 }
 
 static void onEnter()
 {
     LOG_DEBUG("State: ON");
-    screen->setOn(true);
+    if (screen)
+        screen->setOn(true);
     setBluetoothEnable(true);
 }
 
@@ -244,11 +240,6 @@ static void onIdle()
     }
 }
 
-static void screenPress()
-{
-    screen->onPress();
-}
-
 static void bootEnter()
 {
     LOG_DEBUG("State: BOOT");
@@ -292,9 +283,9 @@ void PowerFSM_setup()
     powerFSM.add_transition(&stateLS, &stateON, EVENT_PRESS, NULL, "Press");
     powerFSM.add_transition(&stateNB, &stateON, EVENT_PRESS, NULL, "Press");
     powerFSM.add_transition(&stateDARK, isPowered() ? &statePOWER : &stateON, EVENT_PRESS, NULL, "Press");
-    powerFSM.add_transition(&statePOWER, &statePOWER, EVENT_PRESS, screenPress, "Press");
-    powerFSM.add_transition(&stateON, &stateON, EVENT_PRESS, screenPress, "Press"); // reenter On to restart our timers
-    powerFSM.add_transition(&stateSERIAL, &stateSERIAL, EVENT_PRESS, screenPress,
+    powerFSM.add_transition(&statePOWER, &statePOWER, EVENT_PRESS, NULL, "Press");
+    powerFSM.add_transition(&stateON, &stateON, EVENT_PRESS, NULL, "Press"); // reenter On to restart our timers
+    powerFSM.add_transition(&stateSERIAL, &stateSERIAL, EVENT_PRESS, NULL,
                             "Press"); // Allow button to work while in serial API
 
     // Handle critically low power battery by forcing deep sleep
@@ -328,10 +319,10 @@ void PowerFSM_setup()
         // if any packet destined for phone arrives, turn on bluetooth at least
         powerFSM.add_transition(&stateNB, &stateDARK, EVENT_PACKET_FOR_PHONE, NULL, "Packet for phone");
 
-        // show the latest node when we get a new node db update
-        powerFSM.add_transition(&stateNB, &stateON, EVENT_NODEDB_UPDATED, NULL, "NodeDB update");
-        powerFSM.add_transition(&stateDARK, &stateON, EVENT_NODEDB_UPDATED, NULL, "NodeDB update");
-        powerFSM.add_transition(&stateON, &stateON, EVENT_NODEDB_UPDATED, NULL, "NodeDB update");
+        // Removed 2.7: we don't show the nodes individually for every node on the screen anymore
+        // powerFSM.add_transition(&stateNB, &stateON, EVENT_NODEDB_UPDATED, NULL, "NodeDB update");
+        // powerFSM.add_transition(&stateDARK, &stateON, EVENT_NODEDB_UPDATED, NULL, "NodeDB update");
+        // powerFSM.add_transition(&stateON, &stateON, EVENT_NODEDB_UPDATED, NULL, "NodeDB update");
 
         // Show the received text message
         powerFSM.add_transition(&stateLS, &stateON, EVENT_RECEIVED_MSG, NULL, "Received text");

src/PowerFSM.h

@@ -11,7 +11,7 @@
 #define EVENT_RECEIVED_MSG 5
 // #define EVENT_BOOT 6 // now done with a timed transition
 #define EVENT_BLUETOOTH_PAIR 7
-#define EVENT_NODEDB_UPDATED 8     // NodeDB has a big enough change that we think you should turn on the screen
+// #define EVENT_NODEDB_UPDATED 8     // Now defunct: NodeDB has a big enough change that we think you should turn on the screen
 #define EVENT_CONTACT_FROM_PHONE 9 // the phone just talked to us over bluetooth
 #define EVENT_LOW_BATTERY 10       // Battery is critically low, go to sleep
 #define EVENT_SERIAL_CONNECTED 11
@@ -22,7 +22,7 @@
 #define EVENT_SHUTDOWN 16        // force a full shutdown now (not just sleep)
 #define EVENT_INPUT 17           // input broker wants something, we need to wake up and enable screen
 
-#if EXCLUDE_POWER_FSM
+#if MESHTASTIC_EXCLUDE_POWER_FSM
 class FakeFsm
 {
   public:

src/PowerFSMThread.h

@@ -18,7 +18,7 @@ class PowerFSMThread : public OSThread
   protected:
     int32_t runOnce() override
     {
-#if !EXCLUDE_POWER_FSM
+#if !MESHTASTIC_EXCLUDE_POWER_FSM
         powerFSM.run_machine();
 
         /// If we are in power state we force the CPU to wake every 10ms to check for serial characters (we don't yet wake

src/RedirectablePrint.cpp

@@ -352,8 +352,8 @@ void RedirectablePrint::hexDump(const char *logLevel, unsigned char *buf, uint16
     for (uint16_t i = 0; i < len; i += 16) {
         if (i % 128 == 0)
             log(logLevel, "    +------------------------------------------------+ +----------------+");
-        char s[] = "|                                                | |                |\n";
-        uint8_t ix = 1, iy = 52;
+        char s[] = "     |                                                | |                |\n";
+        uint8_t ix = 5, iy = 56;
         for (uint8_t j = 0; j < 16; j++) {
             if (i + j < len) {
                 uint8_t c = buf[i + j];
@@ -367,10 +367,8 @@ void RedirectablePrint::hexDump(const char *logLevel, unsigned char *buf, uint16
             }
         }
         uint8_t index = i / 16;
-        if (i < 256)
-            log(logLevel, " ");
-        log(logLevel, "%02x", index);
-        log(logLevel, ".");
+        sprintf(s, "%03x", index);
+        s[3] = '.';
         log(logLevel, s);
     }
     log(logLevel, "    +------------------------------------------------+ +----------------+");
@@ -393,4 +391,4 @@ std::string RedirectablePrint::mt_sprintf(const std::string fmt_str, ...)
             break;
     }
     return std::string(formatted.get());
-}
+}

src/SerialConsole.cpp

@@ -64,6 +64,14 @@ SerialConsole::SerialConsole() : StreamAPI(&Port), RedirectablePrint(&Port), con
 
 int32_t SerialConsole::runOnce()
 {
+#ifdef HELTEC_MESH_SOLAR
+    //After enabling the mesh solar serial port module configuration, command processing is handled by the serial port module.
+    if(moduleConfig.serial.enabled && moduleConfig.serial.override_console_serial_port
+        && moduleConfig.serial.mode==meshtastic_ModuleConfig_SerialConfig_Serial_Mode_MS_CONFIG)
+    {
+        return 250;
+    }
+#endif
     return runOncePart();
 }
 

src/buzz/BuzzerFeedbackThread.cpp

@@ -0,0 +1,72 @@
+#include "BuzzerFeedbackThread.h"
+#include "NodeDB.h"
+#include "buzz.h"
+#include "configuration.h"
+
+BuzzerFeedbackThread *buzzerFeedbackThread;
+
+BuzzerFeedbackThread::BuzzerFeedbackThread() : OSThread("BuzzerFeedback")
+{
+    if (inputBroker)
+        inputObserver.observe(inputBroker);
+}
+
+int BuzzerFeedbackThread::handleInputEvent(const InputEvent *event)
+{
+    // Only provide feedback if buzzer is enabled for notifications
+    if (config.device.buzzer_mode == meshtastic_Config_DeviceConfig_BuzzerMode_DISABLED ||
+        config.device.buzzer_mode == meshtastic_Config_DeviceConfig_BuzzerMode_NOTIFICATIONS_ONLY) {
+        return 0; // Let other handlers process the event
+    }
+
+    // Track last event time for potential future use
+    lastEventTime = millis();
+    needsUpdate = true;
+
+    // Handle different input events with appropriate buzzer feedback
+    switch (event->inputEvent) {
+    case INPUT_BROKER_USER_PRESS:
+    case INPUT_BROKER_ALT_PRESS:
+    case INPUT_BROKER_SELECT:
+        playBeep(); // Confirmation feedback
+        break;
+
+    case INPUT_BROKER_UP:
+    case INPUT_BROKER_DOWN:
+    case INPUT_BROKER_LEFT:
+    case INPUT_BROKER_RIGHT:
+        playChirp(); // Navigation feedback
+        break;
+
+    case INPUT_BROKER_CANCEL:
+    case INPUT_BROKER_BACK:
+        playBoop(); // Cancel/back feedback
+        break;
+
+    case INPUT_BROKER_SEND_PING:
+        playComboTune(); // Ping sent feedback
+        break;
+
+    default:
+        // For other events, check if it's a printable character
+        if (event->kbchar >= 32 && event->kbchar <= 126) {
+            // Typing feedback - very short boop
+            // Removing this for now, too chatty
+            // playChirp();
+        }
+        break;
+    }
+
+    return 0; // Allow other handlers to process the event
+}
+
+int32_t BuzzerFeedbackThread::runOnce()
+{
+    // This thread is primarily event-driven, but we can use runOnce
+    // for any periodic tasks if needed in the future
+
+    needsUpdate = false;
+
+    // Run every 100ms when active, less frequently when idle
+    return needsUpdate ? 100 : 1000;
+}

src/buzz/BuzzerFeedbackThread.h

@@ -0,0 +1,24 @@
+#pragma once
+
+#include "Observer.h"
+#include "concurrency/OSThread.h"
+#include "input/InputBroker.h"
+
+class BuzzerFeedbackThread : public concurrency::OSThread
+{
+    CallbackObserver<BuzzerFeedbackThread, const InputEvent *> inputObserver =
+        CallbackObserver<BuzzerFeedbackThread, const InputEvent *>(this, &BuzzerFeedbackThread::handleInputEvent);
+
+  public:
+    BuzzerFeedbackThread();
+    int handleInputEvent(const InputEvent *event);
+
+  protected:
+    virtual int32_t runOnce() override;
+
+  private:
+    uint32_t lastEventTime = 0;
+    bool needsUpdate = false;
+};
+
+extern BuzzerFeedbackThread *buzzerFeedbackThread;

src/buzz/buzz.cpp

@@ -38,6 +38,11 @@ const int DURATION_1_1 = 1000; // 1/1 note
 
 void playTones(const ToneDuration *tone_durations, int size)
 {
+    if (config.device.buzzer_mode == meshtastic_Config_DeviceConfig_BuzzerMode_DISABLED ||
+        config.device.buzzer_mode == meshtastic_Config_DeviceConfig_BuzzerMode_NOTIFICATIONS_ONLY) {
+        // Buzzer is disabled or not set to system tones
+        return;
+    }
 #ifdef PIN_BUZZER
     if (!config.device.buzzer_gpio)
         config.device.buzzer_gpio = PIN_BUZZER;
@@ -54,7 +59,7 @@ void playTones(const ToneDuration *tone_durations, int size)
 
 void playBeep()
 {
-    ToneDuration melody[] = {{NOTE_B3, DURATION_1_4}};
+    ToneDuration melody[] = {{NOTE_B3, DURATION_1_8}};
     playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }
 
@@ -87,3 +92,76 @@ void playShutdownMelody()
     ToneDuration melody[] = {{NOTE_CS4, DURATION_1_8}, {NOTE_AS3, DURATION_1_8}, {NOTE_FS3, DURATION_1_4}};
     playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }
+
+void playChirp()
+{
+    // A short, friendly "chirp" sound for key presses
+    ToneDuration melody[] = {{NOTE_AS3, 20}}; // Very short AS3 note
+    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
+}
+
+void playBoop()
+{
+    // A short, friendly "boop" sound for button presses
+    ToneDuration melody[] = {{NOTE_A3, 50}}; // Very short A3 note
+    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
+}
+
+void playLongPressLeadUp()
+{
+    // An ascending lead-up sequence for long press - builds anticipation
+    ToneDuration melody[] = {
+        {NOTE_C3, 100}, // Start low
+        {NOTE_E3, 100}, // Step up
+        {NOTE_G3, 100}, // Keep climbing
+        {NOTE_B3, 150}  // Peak with longer note for emphasis
+    };
+    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
+}
+
+// Static state for progressive lead-up notes
+static int leadUpNoteIndex = 0;
+static const ToneDuration leadUpNotes[] = {
+    {NOTE_C3, 100}, // Start low
+    {NOTE_E3, 100}, // Step up
+    {NOTE_G3, 100}, // Keep climbing
+    {NOTE_B3, 150}  // Peak with longer note for emphasis
+};
+static const int leadUpNotesCount = sizeof(leadUpNotes) / sizeof(ToneDuration);
+
+bool playNextLeadUpNote()
+{
+    if (leadUpNoteIndex >= leadUpNotesCount) {
+        return false; // All notes have been played
+    }
+
+    // Use playTones to handle buzzer logic consistently
+    const auto &note = leadUpNotes[leadUpNoteIndex];
+    playTones(&note, 1); // Play single note using existing playTones function
+
+    leadUpNoteIndex++;
+
+    if (leadUpNoteIndex >= leadUpNotesCount) {
+        return false; // this was the final note
+    }
+    return true; // Note was played (playTones handles buzzer availability internally)
+}
+
+void resetLeadUpSequence()
+{
+    leadUpNoteIndex = 0;
+}
+
+void playComboTune()
+{
+    // Quick high-pitched notes with trills
+    ToneDuration melody[] = {
+        {NOTE_G3, 80},  // Quick chirp
+        {NOTE_B3, 60},  // Higher chirp
+        {NOTE_CS4, 80}, // Even higher
+        {NOTE_G3, 60},  // Quick trill down
+        {NOTE_CS4, 60}, // Quick trill up
+        {NOTE_B3, 120}  // Ending chirp
+    };
+    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
+}

src/buzz/buzz.h

@@ -5,4 +5,10 @@ void playLongBeep();
 void playStartMelody();
 void playShutdownMelody();
 void playGPSEnableBeep();
-void playGPSDisableBeep();
+void playGPSDisableBeep();
+void playComboTune();
+void playBoop();
+void playChirp();
+void playLongPressLeadUp();
+bool playNextLeadUpNote();  // Play the next note in the lead-up sequence
+void resetLeadUpSequence(); // Reset the lead-up sequence to start from beginning

src/commands.h

@@ -12,7 +12,7 @@ enum class Cmd {
     STOP_ALERT_FRAME,
     START_FIRMWARE_UPDATE_SCREEN,
     STOP_BOOT_SCREEN,
-    PRINT,
     SHOW_PREV_FRAME,
-    SHOW_NEXT_FRAME
+    SHOW_NEXT_FRAME,
+    NOOP
 };

src/concurrency/Lock.cpp

@@ -9,17 +9,23 @@ namespace concurrency
 Lock::Lock() : handle(xSemaphoreCreateBinary())
 {
     assert(handle);
-    assert(xSemaphoreGive(handle));
+    if (xSemaphoreGive(handle) == false) {
+        abort();
+    }
 }
 
 void Lock::lock()
 {
-    assert(xSemaphoreTake(handle, portMAX_DELAY));
+    if (xSemaphoreTake(handle, portMAX_DELAY) == false) {
+        abort();
+    }
 }
 
 void Lock::unlock()
 {
-    assert(xSemaphoreGive(handle));
+    if (xSemaphoreGive(handle) == false) {
+        abort();
+    }
 }
 #else
 Lock::Lock() {}

src/configuration.h

@@ -81,7 +81,43 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // #define REGULATORY_LORA_REGIONCODE meshtastic_Config_LoRaConfig_RegionCode_SG_923
 
 // Total system gain in dBm to subtract from Tx power to remain within regulatory and Tx PA limits
-// This value should be set in variant.h and is PA gain + antenna gain (if variant has a non-removable antenna)
+// The value consists of PA gain + antenna gain (if variant has a non-removable antenna)
+// TX_GAIN_LORA should be set with definitions below for common modules, or in variant.h.
+
+// Gain for common modules with transmit PAs
+#ifdef EBYTE_E22_900M30S
+// 10dB PA gain and 30dB rated output; based on measurements from
+// https://github.com/S5NC/EBYTE_ESP32-S3/blob/main/E22-900M30S%20power%20output%20testing.txt
+#define TX_GAIN_LORA 7
+#define SX126X_MAX_POWER 22
+#endif
+
+#ifdef EBYTE_E22_900M33S
+// 25dB PA gain and 33dB rated output; based on TX Power Curve from E22-900M33S_UserManual_EN_v1.0.pdf
+#define TX_GAIN_LORA 25
+#define SX126X_MAX_POWER 8
+#endif
+
+#ifdef NICERF_MINIF27
+// Note that datasheet power level of 9 corresponds with SX1262 at 22dBm
+// Maximum output power of 29dBm with VCC_PA = 5V
+#define TX_GAIN_LORA 7
+#define SX126X_MAX_POWER 22
+#endif
+
+#ifdef NICERF_F30_HF
+// Maximum output power of 29.6dBm with VCC = 5V and SX1262 at 22dBm
+#define TX_GAIN_LORA 8
+#define SX126X_MAX_POWER 22
+#endif
+
+#ifdef NICERF_F30_LF
+// Maximum output power of 32.0dBm with VCC = 5V and SX1262 at 22dBm
+#define TX_GAIN_LORA 10
+#define SX126X_MAX_POWER 22
+#endif
+
+// Default system gain to 0 if not defined
 #ifndef TX_GAIN_LORA
 #define TX_GAIN_LORA 0
 #endif
@@ -99,7 +135,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // -----------------------------------------------------------------------------
 // OLED & Input
 // -----------------------------------------------------------------------------
-#if defined(SEEED_WIO_TRACKER_L1)
+#if defined(SEEED_WIO_TRACKER_L1) && !defined(SEEED_WIO_TRACKER_L1_EINK)
 #define SSD1306_ADDRESS 0x3D
 #define USE_SH1106
 #else
@@ -114,11 +150,12 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Define if screen should be mirrored left to right
 // #define SCREEN_MIRROR
 
-// I2C Keyboards (M5Stack, RAK14004, T-Deck)
+// I2C Keyboards (M5Stack, RAK14004, T-Deck, T-Deck Pro, T-Lora Pager, CardKB, BBQ10, MPR121, TCA8418)
 #define CARDKB_ADDR 0x5F
 #define TDECK_KB_ADDR 0x55
 #define BBQ10_KB_ADDR 0x1F
 #define MPR121_KB_ADDR 0x5A
+#define TCA8418_KB_ADDR 0x34
 
 // -----------------------------------------------------------------------------
 // SENSOR
@@ -153,11 +190,15 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define DFROBOT_RAIN_ADDR 0x1d
 #define NAU7802_ADDR 0x2A
 #define MAX30102_ADDR 0x57
+#define SCD4X_ADDR 0x62
 #define MLX90614_ADDR_DEF 0x5A
 #define CGRADSENS_ADDR 0x66
 #define LTR390UV_ADDR 0x53
-#define XPOWERS_AXP192_AXP2101_ADDRESS 0x34 // same adress as TCA8418
+#define XPOWERS_AXP192_AXP2101_ADDRESS 0x34 // same adress as TCA8418_KB
 #define PCT2075_ADDR 0x37
+#define BQ27220_ADDR 0x55 // same address as TDECK_KB
+#define BQ25896_ADDR 0x6B
+#define LTR553ALS_ADDR 0x23
 
 // -----------------------------------------------------------------------------
 // ACCELEROMETER
@@ -171,6 +212,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BMX160_ADDR 0x69
 #define ICM20948_ADDR 0x69
 #define ICM20948_ADDR_ALT 0x68
+#define BHI260AP_ADDR 0x28
+#define BMM150_ADDR 0x13
 
 // -----------------------------------------------------------------------------
 // LED
@@ -192,6 +235,16 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Touchscreen
 // -----------------------------------------------------------------------------
 #define FT6336U_ADDR 0x48
+#define CST328_ADDR 0x1A
+
+// -----------------------------------------------------------------------------
+// RAK12035VB Soil Monitor (using RAK12023 up to 3 RAK12035 monitors can be connected)
+// - the default i2c address for this sensor is 0x20, and users are instructed to
+// set 0x21 and 0x22 for the second and third sensor if present.
+// -----------------------------------------------------------------------------
+#define RAK120351_ADDR 0x20
+#define RAK120352_ADDR 0x21
+#define RAK120353_ADDR 0x22
 
 // -----------------------------------------------------------------------------
 // BIAS-T Generator
@@ -302,11 +355,41 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #error HW_VENDOR must be defined
 #endif
 
+#ifndef TB_DOWN
+#define TB_DOWN 255
+#endif
+#ifndef TB_UP
+#define TB_UP 255
+#endif
+#ifndef TB_LEFT
+#define TB_LEFT 255
+#endif
+#ifndef TB_RIGHT
+#define TB_RIGHT 255
+#endif
+#ifndef TB_PRESS
+#define TB_PRESS 255
+#endif
+
 // Support multiple RGB LED configuration
 #if defined(HAS_NCP5623) || defined(HAS_LP5562) || defined(RGBLED_RED) || defined(HAS_NEOPIXEL) || defined(UNPHONE)
 #define HAS_RGB_LED
 #endif
 
+// default mapping of pins
+#if defined(PIN_BUTTON2) && !defined(CANCEL_BUTTON_PIN)
+#define ALT_BUTTON_PIN PIN_BUTTON2
+#endif
+#if defined ALT_BUTTON_PIN
+
+#ifndef ALT_BUTTON_ACTIVE_LOW
+#define ALT_BUTTON_ACTIVE_LOW true
+#endif
+#ifndef ALT_BUTTON_ACTIVE_PULLUP
+#define ALT_BUTTON_ACTIVE_PULLUP true
+#endif
+#endif
+
 // -----------------------------------------------------------------------------
 // Global switches to turn off features for a minimized build
 // -----------------------------------------------------------------------------