Merge branch 'master' into portexpander-keyboard

# Conflicts:
#	src/input/cardKbI2cImpl.cpp

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

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

.github/workflows/build_debian_src.yml

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

.github/workflows/build_esp32.yml

@@ -0,0 +1,40 @@
+name: Build ESP32
+
+on:
+  workflow_call:
+    inputs:
+      board:
+        required: true
+        type: string
+
+permissions: read-all
+
+jobs:
+  build-esp32:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Get release version string
+        shell: bash
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Build ESP32
+        id: build
+        uses: meshtastic/gh-action-firmware@main
+        with:
+          pio_platform: esp32
+          pio_env: ${{ inputs.board }}
+          pio_target: build
+          ota_firmware_source: firmware.bin
+          ota_firmware_target: release/bleota.bin
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-esp32-${{ inputs.board }}-${{ steps.version.outputs.long }}.zip
+          overwrite: true
+          path: |
+            release/*.bin
+            release/*.elf

.github/workflows/build_esp32_c3.yml

@@ -0,0 +1,40 @@
+name: Build ESP32-C3
+
+on:
+  workflow_call:
+    inputs:
+      board:
+        required: true
+        type: string
+
+permissions: read-all
+
+jobs:
+  build-esp32-c3:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Get release version string
+        shell: bash
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Build ESP32-C3
+        id: build
+        uses: meshtastic/gh-action-firmware@main
+        with:
+          pio_platform: esp32
+          pio_env: ${{ inputs.board }}
+          pio_target: build
+          ota_firmware_source: firmware-c3.bin
+          ota_firmware_target: release/bleota-c3.bin
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-esp32c3-${{ inputs.board }}-${{ steps.version.outputs.long }}.zip
+          overwrite: true
+          path: |
+            release/*.bin
+            release/*.elf

.github/workflows/build_esp32_c6.yml

@@ -0,0 +1,40 @@
+name: Build ESP32-C6
+
+on:
+  workflow_call:
+    inputs:
+      board:
+        required: true
+        type: string
+
+permissions: read-all
+
+jobs:
+  build-esp32-c6:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Get release version string
+        shell: bash
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Build ESP32-C6
+        id: build
+        uses: meshtastic/gh-action-firmware@main
+        with:
+          pio_platform: esp32
+          pio_env: ${{ inputs.board }}
+          pio_target: build
+          ota_firmware_source: firmware-c3.bin
+          ota_firmware_target: release/bleota-c3.bin
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-esp32c6-${{ inputs.board }}-${{ steps.version.outputs.long }}.zip
+          overwrite: true
+          path: |
+            release/*.bin
+            release/*.elf

.github/workflows/build_esp32_s3.yml

@@ -0,0 +1,40 @@
+name: Build ESP32-S3
+
+on:
+  workflow_call:
+    inputs:
+      board:
+        required: true
+        type: string
+
+permissions: read-all
+
+jobs:
+  build-esp32-s3:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Get release version string
+        shell: bash
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Build ESP32-S3
+        id: build
+        uses: meshtastic/gh-action-firmware@main
+        with:
+          pio_platform: esp32
+          pio_env: ${{ inputs.board }}
+          pio_target: build
+          ota_firmware_source: firmware-s3.bin
+          ota_firmware_target: release/bleota-s3.bin
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-esp32s3-${{ inputs.board }}-${{ steps.version.outputs.long }}.zip
+          overwrite: true
+          path: |
+            release/*.bin
+            release/*.elf

.github/workflows/build_firmware.yml

@@ -1,66 +0,0 @@
-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

@@ -0,0 +1,40 @@
+name: Build NRF52
+
+on:
+  workflow_call:
+    inputs:
+      board:
+        required: true
+        type: string
+
+permissions: read-all
+
+jobs:
+  build-nrf52:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Get release version string
+        shell: bash
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Build NRF52
+        id: build
+        uses: meshtastic/gh-action-firmware@main
+        with:
+          pio_platform: nrf52
+          pio_env: ${{ inputs.board }}
+          pio_target: build
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-nrf52840-${{ inputs.board }}-${{ steps.version.outputs.long }}.zip
+          overwrite: true
+          path: |
+            release/*.uf2
+            release/*.elf
+            release/*.hex
+            release/*-ota.zip

.github/workflows/build_rpi2040.yml

@@ -0,0 +1,38 @@
+name: Build RPI2040
+
+on:
+  workflow_call:
+    inputs:
+      board:
+        required: true
+        type: string
+
+permissions: read-all
+
+jobs:
+  build-rpi2040:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Get release version string
+        shell: bash
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Build Raspberry Pi 2040
+        id: build
+        uses: meshtastic/gh-action-firmware@main
+        with:
+          pio_platform: rp2xx0
+          pio_env: ${{ inputs.board }}
+          pio_target: build
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-rp2040-${{ inputs.board }}-${{ steps.version.outputs.long }}.zip
+          overwrite: true
+          path: |
+            release/*.uf2
+            release/*.elf

.github/workflows/build_stm32.yml

@@ -0,0 +1,39 @@
+name: Build STM32
+
+on:
+  workflow_call:
+    inputs:
+      board:
+        required: true
+        type: string
+
+permissions: read-all
+
+jobs:
+  build-stm32:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Get release version string
+        shell: bash
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Build STM32WL
+        id: build
+        uses: meshtastic/gh-action-firmware@main
+        with:
+          pio_platform: stm32wl
+          pio_env: ${{ inputs.board }}
+          pio_target: build
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-stm32-${{ inputs.board }}-${{ steps.version.outputs.long }}.zip
+          overwrite: true
+          path: |
+            release/*.hex
+            release/*.bin
+            release/*.elf

.github/workflows/daily_packaging.yml

@@ -30,11 +30,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        series:
+        series: [plucky, noble, jammy]
-          - 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@v5
+        uses: actions/checkout@v4
         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@v5
+        uses: actions/checkout@v4
         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@v5
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           ref: ${{ github.ref }}

.github/workflows/main_matrix.yml

@@ -30,31 +30,18 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch:
+        arch: [esp32, esp32s3, esp32c3, esp32c6, nrf52840, rp2040, stm32, check]
-          - esp32
+    runs-on: ubuntu-latest
-          - esp32s3
-          - esp32c3
-          - esp32c6
-          - nrf52840
-          - rp2040
-          - rp2350
-          - stm32
-          - check
-    runs-on: ubuntu-24.04
     steps:
-      - uses: actions/checkout@v5
+      - id: checkout
-      - uses: actions/setup-python@v5
+        uses: actions/checkout@v4
-        with:
+        name: Checkout base
-          python-version: 3.x
+      - id: jsonStep
-          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}} pr)
+            TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}} quick)
           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
@@ -65,25 +52,9 @@ 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:
@@ -93,7 +64,7 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event_name != 'workflow_dispatch' }}
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
       - name: Build base
         id: base
         uses: ./.github/actions/setup-base
@@ -101,92 +72,67 @@ jobs:
         run: bin/check-all.sh ${{ matrix.board }}
 
   build-esp32:
-    needs: [setup, version]
+    needs: setup
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.setup.outputs.esp32) }}
-    uses: ./.github/workflows/build_firmware.yml
+    uses: ./.github/workflows/build_esp32.yml
     with:
-      version: ${{ needs.version.outputs.long }}
+      board: ${{ matrix.board }}
-      pio_env: ${{ matrix.board }}
-      platform: esp32
 
-  build-esp32s3:
+  build-esp32-s3:
-    needs: [setup, version]
+    needs: setup
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.setup.outputs.esp32s3) }}
-    uses: ./.github/workflows/build_firmware.yml
+    uses: ./.github/workflows/build_esp32_s3.yml
     with:
-      version: ${{ needs.version.outputs.long }}
+      board: ${{ matrix.board }}
-      pio_env: ${{ matrix.board }}
-      platform: esp32s3
 
-  build-esp32c3:
+  build-esp32-c3:
-    needs: [setup, version]
+    needs: setup
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.setup.outputs.esp32c3) }}
-    uses: ./.github/workflows/build_firmware.yml
+    uses: ./.github/workflows/build_esp32_c3.yml
     with:
-      version: ${{ needs.version.outputs.long }}
+      board: ${{ matrix.board }}
-      pio_env: ${{ matrix.board }}
-      platform: esp32c3
 
-  build-esp32c6:
+  build-esp32-c6:
-    needs: [setup, version]
+    needs: setup
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.setup.outputs.esp32c6) }}
-    uses: ./.github/workflows/build_firmware.yml
+    uses: ./.github/workflows/build_esp32_c6.yml
     with:
-      version: ${{ needs.version.outputs.long }}
+      board: ${{ matrix.board }}
-      pio_env: ${{ matrix.board }}
-      platform: esp32c6
 
-  build-nrf52840:
+  build-nrf52:
-    needs: [setup, version]
+    needs: setup
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.setup.outputs.nrf52840) }}
-    uses: ./.github/workflows/build_firmware.yml
+    uses: ./.github/workflows/build_nrf52.yml
     with:
-      version: ${{ needs.version.outputs.long }}
+      board: ${{ matrix.board }}
-      pio_env: ${{ matrix.board }}
-      platform: nrf52840
 
-  build-rp2040:
+  build-rpi2040:
-    needs: [setup, version]
+    needs: setup
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.setup.outputs.rp2040) }}
-    uses: ./.github/workflows/build_firmware.yml
+    uses: ./.github/workflows/build_rpi2040.yml
     with:
-      version: ${{ needs.version.outputs.long }}
+      board: ${{ matrix.board }}
-      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, version]
+    needs: setup
     strategy:
       fail-fast: false
       matrix: ${{ fromJson(needs.setup.outputs.stm32) }}
-    uses: ./.github/workflows/build_firmware.yml
+    uses: ./.github/workflows/build_stm32.yml
     with:
-      version: ${{ needs.version.outputs.long }}
+      board: ${{ matrix.board }}
-      pio_env: ${{ matrix.board }}
-      platform: stm32
 
   build-debian-src:
     if: github.repository == 'meshtastic/firmware'
@@ -264,36 +210,26 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch:
+        arch: [esp32, esp32s3, esp32c3, esp32c6, nrf52840, rp2040, stm32]
-          - esp32
-          - esp32s3
-          - esp32c3
-          - esp32c6
-          - nrf52840
-          - rp2040
-          - rp2350
-          - stm32
     runs-on: ubuntu-latest
     needs:
       [
-        version,
         build-esp32,
-        build-esp32s3,
+        build-esp32-s3,
-        build-esp32c3,
+        build-esp32-c3,
-        build-esp32c6,
+        build-esp32-c6,
-        build-nrf52840,
+        build-nrf52,
-        build-rp2040,
+        build-rpi2040,
-        build-rp2350,
         build-stm32,
       ]
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
         with:
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
 
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@v4
         with:
           path: ./
           pattern: firmware-${{matrix.arch}}-*
@@ -302,13 +238,17 @@ 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}}-${{ needs.version.outputs.long }}
+          name: firmware-${{matrix.arch}}-${{ steps.version.outputs.long }}
           overwrite: true
           path: |
             ./firmware-*.bin
@@ -322,9 +262,9 @@ jobs:
             ./Meshtastic_nRF52_factory_erase*.uf2
           retention-days: 30
 
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@v4
         with:
-          name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          name: firmware-${{matrix.arch}}-${{ steps.version.outputs.long }}
           merge-multiple: true
           path: ./output
 
@@ -338,12 +278,12 @@ jobs:
           chmod +x ./output/device-update.sh
 
       - name: Zip firmware
-        run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output
+        run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip ./output
 
       - name: Repackage in single elfs zip
         uses: actions/upload-artifact@v4
         with:
-          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
+          name: debug-elfs-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip
           overwrite: true
           path: ./*.elf
           retention-days: 30
@@ -351,8 +291,8 @@ jobs:
       - uses: scruplelesswizard/comment-artifact@main
         if: ${{ github.event_name == 'pull_request' }}
         with:
-          name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          name: firmware-${{matrix.arch}}-${{ steps.version.outputs.long }}
-          description: "Download firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip. This artifact will be available for 90 days from creation"
+          description: "Download firmware-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip. This artifact will be available for 90 days from creation"
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
   release-artifacts:
@@ -361,49 +301,56 @@ 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@v5
+        uses: actions/checkout@v4
 
       - 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 ${{ needs.version.outputs.long }} Alpha
+          name: Meshtastic Firmware ${{ steps.version.outputs.long }} Alpha
-          tag_name: v${{ needs.version.outputs.long }}
+          tag_name: v${{ steps.version.outputs.long }}
           body: |
             Autogenerated by github action, developer should edit as required before publishing...
 
       - name: Download source deb
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
-          pattern: firmware-debian-${{ needs.version.outputs.deb }}~UNRELEASED-src
+          pattern: firmware-debian-${{ steps.version.outputs.deb }}~UNRELEASED-src
           merge-multiple: true
           path: ./output/debian-src
 
       - name: Download `native-tft` pio deps
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
-          pattern: platformio-deps-native-tft-${{ needs.version.outputs.long }}
+          pattern: platformio-deps-native-tft-${{ steps.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-${{ needs.version.outputs.deb }}-src.zip ./debian-src
+          zip -j -9 -r ./meshtasticd-${{ steps.version.outputs.deb }}-src.zip ./debian-src
-          zip -9 -r ./platformio-deps-native-tft-${{ needs.version.outputs.long }}.zip ./pio-deps-native-tft
+          zip -9 -r ./platformio-deps-native-tft-${{ steps.version.outputs.long }}.zip ./pio-deps-native-tft
 
       # For diagnostics
       - name: Display structure of downloaded files
@@ -413,8 +360,8 @@ jobs:
         # Only run when targeting master branch with workflow_dispatch
         if: ${{ github.ref_name == 'master' }}
         run: |
-          gh release upload v${{ needs.version.outputs.long }} ./output/meshtasticd-${{ needs.version.outputs.deb }}-src.zip
+          gh release upload v${{ steps.version.outputs.long }} ./output/meshtasticd-${{ steps.version.outputs.deb }}-src.zip
-          gh release upload v${{ needs.version.outputs.long }} ./output/platformio-deps-native-tft-${{ needs.version.outputs.long }}.zip
+          gh release upload v${{ steps.version.outputs.long }} ./output/platformio-deps-native-tft-${{ steps.version.outputs.long }}.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
@@ -422,30 +369,26 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        arch:
+        arch: [esp32, esp32s3, esp32c3, esp32c6, nrf52840, rp2040, stm32]
-          - esp32
-          - esp32s3
-          - esp32c3
-          - esp32c6
-          - nrf52840
-          - rp2040
-          - rp2350
-          - stm32
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'workflow_dispatch' }}
-    needs: [release-artifacts, version]
+    needs: [release-artifacts]
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
 
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
           python-version: 3.x
 
-      - uses: actions/download-artifact@v5
+      - name: Get release version string
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - uses: actions/download-artifact@v4
         with:
-          pattern: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          pattern: firmware-${{matrix.arch}}-${{ steps.version.outputs.long }}
           merge-multiple: true
           path: ./output
 
@@ -458,16 +401,16 @@ jobs:
           chmod +x ./output/device-update.sh
 
       - name: Zip firmware
-        run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output
+        run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip ./output
 
-      - uses: actions/download-artifact@v5
+      - uses: actions/download-artifact@v4
         with:
-          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
+          name: debug-elfs-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip
           merge-multiple: true
           path: ./elfs
 
       - name: Zip debug elfs
-        run: zip -j -9 -r ./debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./elfs
+        run: zip -j -9 -r ./debug-elfs-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip ./elfs
 
       # For diagnostics
       - name: Display structure of downloaded files
@@ -477,30 +420,33 @@ jobs:
         # Only run when targeting master branch with workflow_dispatch
         if: ${{ github.ref_name == 'master' }}
         run: |
-          gh release upload v${{ needs.version.outputs.long }} ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
+          gh release upload v${{ steps.version.outputs.long }} ./firmware-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip
-          gh release upload v${{ needs.version.outputs.long }} ./debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
+          gh release upload v${{ steps.version.outputs.long }} ./debug-elfs-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   publish-firmware:
     runs-on: ubuntu-24.04
     if: ${{ github.event_name == 'workflow_dispatch' }}
-    needs: [release-firmware, version]
+    needs: [release-firmware]
     env:
-      targets: |-
+      targets: esp32,esp32s3,esp32c3,esp32c6,nrf52840,rp2040,stm32
-        esp32,esp32s3,esp32c3,esp32c6,nrf52840,rp2040,rp2350,stm32
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
 
       - name: Setup Python
         uses: actions/setup-python@v5
         with:
           python-version: 3.x
 
-      - uses: actions/download-artifact@v5
+      - name: Get release version string
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - uses: actions/download-artifact@v4
         with:
-          pattern: firmware-{${{ env.targets }}}-${{ needs.version.outputs.long }}
+          pattern: firmware-{${{ env.targets }}}-${{ steps.version.outputs.long }}
           merge-multiple: true
           path: ./publish
 
@@ -514,9 +460,9 @@ jobs:
           external_repository: meshtastic/meshtastic.github.io
           publish_branch: master
           publish_dir: ./publish
-          destination_dir: ${{ env.DEST_PREFIX }}firmware-${{ needs.version.outputs.long }}
+          destination_dir: ${{ env.DEST_PREFIX }}firmware-${{ steps.version.outputs.long }}
           keep_files: true
           user_name: github-actions[bot]
           user_email: github-actions[bot]@users.noreply.github.com
-          commit_message: ${{ needs.version.outputs.long }}
+          commit_message: ${{ steps.version.outputs.long }}
           enable_jekyll: true

.github/workflows/nightly.yml

@@ -14,7 +14,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
 
       - name: Trunk Check
         uses: trunk-io/trunk-action@v1
@@ -31,7 +31,7 @@ jobs:
       pull-requests: write # For trunk to create PRs
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
 
       - 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@v5
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           path: meshtasticd
@@ -58,7 +58,7 @@ jobs:
         id: version
 
       - name: Download artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         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@v5
+        uses: actions/checkout@v4
         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@v5
+        uses: actions/checkout@v4
         with:
           submodules: recursive
           path: meshtasticd
@@ -60,7 +60,7 @@ jobs:
         id: version
 
       - name: Download artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           name: firmware-debian-${{ steps.version.outputs.deb }}~${{ inputs.series }}-src
           merge-multiple: true

.github/workflows/pr_enforce_labels.yml

@@ -1,24 +0,0 @@
-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

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

.github/workflows/sec_sast_semgrep_cron.yml

@@ -21,7 +21,7 @@ jobs:
     steps:
       # step 1
       - name: clone application source code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
 
       # 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@v5
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 

.github/workflows/test_native.yml

@@ -14,7 +14,7 @@ jobs:
     name: Native Simulator Tests
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v5
+      - uses: actions/checkout@v4
         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@v5
+      - uses: actions/checkout@v4
         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@v5
+      - uses: actions/checkout@v4
         with:
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
@@ -137,7 +137,7 @@ jobs:
         id: version
 
       - name: Download test artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           name: platformio-test-report-${{ steps.version.outputs.long }}.zip
           merge-multiple: true
@@ -150,7 +150,7 @@ jobs:
           reporter: java-junit
 
       - name: Download coverage artifacts
-        uses: actions/download-artifact@v5
+        uses: actions/download-artifact@v4
         with:
           pattern: lcov-coverage-info-native-*-${{ steps.version.outputs.long }}.zip
           path: code-coverage-report

.github/workflows/tests.yml

@@ -20,7 +20,7 @@ jobs:
     runs-on: test-runner
     steps:
       - name: Checkout code
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
 
       # - uses: actions/setup-python@v5
       #   with:

.github/workflows/trunk_annotate_pr.yml

@@ -18,7 +18,7 @@ jobs:
 
     steps:
       - name: Checkout
-        uses: actions/checkout@v5
+        uses: actions/checkout@v4
 
       - 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@v5
+        uses: actions/checkout@v4
 
       - 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@v5
+        uses: actions/checkout@v4
         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@v5
+        uses: actions/checkout@v4
         with:
           submodules: true
 
@@ -34,9 +34,7 @@ jobs:
         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

.trunk/trunk.yaml

@@ -1,6 +1,6 @@
 version: 0.1
 cli:
-  version: 1.25.0
+  version: 1.24.0
 plugins:
   sources:
     - id: trunk
@@ -8,15 +8,15 @@ plugins:
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - checkov@3.2.461
+    - checkov@3.2.450
-    - renovate@41.74.0
+    - renovate@41.29.1
     - prettier@3.6.2
-    - trufflehog@3.90.5
+    - trufflehog@3.89.2
     - yamllint@1.37.1
     - bandit@1.8.6
     - trivy@0.64.1
     - taplo@0.9.3
-    - ruff@0.12.7
+    - ruff@0.12.2
     - isort@6.0.1
     - markdownlint@0.45.0
     - oxipng@9.1.5
@@ -28,7 +28,7 @@ lint:
     - shellcheck@0.10.0
     - black@25.1.0
     - git-diff-check
-    - gitleaks@8.28.0
+    - gitleaks@8.27.2
     - 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-slim-trixie AS builder
+FROM python:3.13-bookworm 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:trixie-slim
+FROM debian:bookworm-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 libgpiod3 libyaml-cpp0.8 libi2c0 libuv1t64 libusb-1.0-0-dev \
+        libc-bin libc6 libgpiod2 libyaml-cpp0.7 libi2c0 libuv1 libusb-1.0-0-dev \
-        liborcania2.3 libulfius2.7t64 libssl3t64 \
+        liborcania2.3 libulfius2.7 libssl3 \
         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/web/
+COPY --from=builder /tmp/web /usr/share/meshtasticd/
 # Copy config templates
 COPY ./bin/config.d /etc/meshtasticd/available.d
 

arch/esp32/esp32.ini

@@ -54,8 +54,8 @@ lib_deps =
   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=github-tags depName=XPowersLib packageName=lewisxhe/XPowersLib
+  # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
-  https://github.com/lewisxhe/XPowersLib/archive/v0.3.0.zip
+  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> -<serialization/>
+  ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>
 
 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/37d986499ce24511952d7146db72d667c6bdaff7.zip
+  https://github.com/meshtastic/platform-native/archive/6cb7a455b440dd0738e8ed74a18136ed5cf7ea63.zip
 framework = arduino
 
 build_src_filter = 
@@ -17,6 +17,7 @@ build_src_filter =
   +<mesh/raspihttp/>
   -<mesh/eth/>
   -<modules/esp32>
+  +<../variants/portduino>
 
 lib_deps =
   ${env.lib_deps}
@@ -34,12 +35,11 @@ lib_deps =
 
 build_flags =
   ${arduino_base.build_flags}
-  -D ARCH_PORTDUINO
   -fPIC
   -Isrc/platform/portduino
   -DRADIOLIB_EEPROM_UNSUPPORTED
   -DPORTDUINO_LINUX_HARDWARE
-  -DHAS_UDP_MULTICAST=1
+  -DHAS_UDP_MULTICAST
   -lpthread
   -lstdc++fs
   -lbluetooth

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.3.0
+  platformio/ststm32@19.2.0
 platform_packages =
   # TODO renovate
   platformio/framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/2.10.1.zip
@@ -23,23 +23,16 @@ build_flags =
   -DMESHTASTIC_EXCLUDE_SCREEN=1
   -DMESHTASTIC_EXCLUDE_MQTT=1
   -DMESHTASTIC_EXCLUDE_BLUETOOTH=1
+  -DMESHTASTIC_EXCLUDE_GPS=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.
+  ;-DDEBUG_MUTE
   -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>
+  ${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> -<.pio/*/*/I2CKeyPad/*>
 
 board_upload.offset_address = 0x08000000
 upload_protocol = stlink
@@ -53,4 +46,5 @@ lib_deps =
   https://github.com/caveman99/Crypto/archive/eae9c768054118a9399690f8af202853d1ae8516.zip
 
 lib_ignore =
+  I2CKeyPad
   OneButton

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-rp2xx0.sh $1
+  bin/build-rpi2040.sh $1
 else
   echo "Unknown target $2"
   exit 1

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

@@ -1,8 +0,0 @@
-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-RAK6421.yaml

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

bin/device-update.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 PYTHON=${PYTHON:-$(which python3 python|head -n 1)}
 CHANGE_MODE=false

bin/generate_ci_matrix.py

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

bin/platformio-custom.py

@@ -3,7 +3,6 @@
 # trunk-ignore-all(flake8/F821): For SConstruct imports
 import sys
 from os.path import join
-import subprocess
 import json
 import re
 
@@ -93,17 +92,6 @@ 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)
@@ -129,7 +117,6 @@ flags = [
         "-DAPP_VERSION=" + verObj["long"],
         "-DAPP_VERSION_SHORT=" + verObj["short"],
         "-DAPP_ENV=" + env.get("PIOENV"),
-        "-DAPP_REPO=" + repo_owner,
     ] + pref_flags
 
 print ("Using flags:")

boards/meshtiny.json

@@ -1,52 +0,0 @@
-{
-  "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/t-deck-pro.json

@@ -1,43 +0,0 @@
-{
-  "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"
-}

debian/changelog

@@ -1,4 +1,4 @@
-meshtasticd (2.7.6.0) UNRELEASED; urgency=medium
+meshtasticd (2.7.3.0) UNRELEASED; urgency=medium
 
   [ Austin Lane ]
   * Initial packaging
@@ -31,13 +31,4 @@ meshtasticd (2.7.6.0) UNRELEASED; urgency=medium
   [ Ubuntu ]
   * GitHub Actions Automatic version bump
 
-  [  ]
+ -- Ubuntu <github-actions[bot]@users.noreply.github.com>  Thu, 10 Jul 2025 16:29:27 +0000
-  * 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/bash
+#!/bin/sh
 # postinst script for meshtasticd
 #
 # see: dh_installdeb(1)

debian/meshtasticd.postrm

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

platformio.ini

@@ -6,8 +6,7 @@ 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
@@ -60,9 +59,9 @@ 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/9573abb64dc9c94f3051348f2bf4fc5cedf03c22.zip
+	https://github.com/meshtastic/esp8266-oled-ssd1306/archive/0119501e9983bd894830b02f545c377ee08d66fe.zip
-	# renovate: datasource=git-refs depName=meshtastic-OneButton packageName=https://github.com/meshtastic/OneButton gitBranch=master
+	# renovate: datasource=custom.pio depName=OneButton packageName=mathertel/library/OneButton
-	https://github.com/meshtastic/OneButton/archive/fa352d668c53f290cfa480a5f79ad422cd828c70.zip
+	mathertel/OneButton@2.6.1
 	# 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
@@ -73,6 +72,7 @@ lib_deps =
 	nanopb/Nanopb@0.4.91
 	# renovate: datasource=custom.pio depName=ErriezCRC32 packageName=erriez/library/ErriezCRC32
 	erriez/ErriezCRC32@1.0.1
+  robtillaart/I2CKeyPad@0.5.0
 
 ; Used for the code analysis in PIO Home / Inspect
 check_tool = cppcheck
@@ -102,14 +102,6 @@ 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
@@ -118,7 +110,7 @@ lib_deps =
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/8f5094b248c15ea2f9acf19cedfef6d2248fc1ff.zip
+	https://github.com/meshtastic/device-ui/archive/86a09a7360f92d10053fbbf8d74f67f85b0ceb09.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]
@@ -186,7 +178,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.2
+	adafruit/Adafruit SHTC3 Library@1.0.1
 	# 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

src/BluetoothStatus.h

@@ -89,22 +89,14 @@ class BluetoothStatus : public Status
             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;
             }

src/Power.cpp

@@ -20,11 +20,6 @@
 #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"
@@ -125,15 +120,6 @@ 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
@@ -679,8 +665,6 @@ bool Power::setup()
         found = true;
     } else if (lipoInit()) {
         found = true;
-    } else if (lipoChargerInit()) {
-        found = true;
     } else if (analogInit()) {
         found = true;
     }
@@ -695,61 +679,9 @@ 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
@@ -761,11 +693,7 @@ void Power::shutdown()
 #ifdef PIN_LED3
     ledOff(PIN_LED3);
 #endif
-    doDeepSleep(DELAY_FOREVER, false, true);
+    doDeepSleep(DELAY_FOREVER, false, false);
-#elif defined(ARCH_PORTDUINO)
-    exit(EXIT_SUCCESS);
-#else
-    LOG_WARN("FIXME implement shutdown for this platform");
 #endif
 }
 
@@ -1309,144 +1237,3 @@ 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

src/PowerFSM.cpp

@@ -72,7 +72,7 @@ extern Power *power;
 static void shutdownEnter()
 {
     LOG_DEBUG("State: SHUTDOWN");
-    shutdownAtMsec = millis();
+    power->shutdown();
 }
 
 #include "error.h"

src/buzz/BuzzerFeedbackThread.cpp

@@ -47,6 +47,10 @@ int BuzzerFeedbackThread::handleInputEvent(const InputEvent *event)
         playComboTune(); // Ping sent feedback
         break;
 
+    case INPUT_BROKER_SHUTDOWN:
+        playShutdownMelody(); // Shutdown feedback
+        break;
+
     default:
         // For other events, check if it's a printable character
         if (event->kbchar >= 32 && event->kbchar <= 126) {
@@ -65,7 +69,10 @@ 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;
+    if (needsUpdate) {
+        needsUpdate = false;
+        // Could add any periodic processing here
+    }
 
     // Run every 100ms when active, less frequently when idle
     return needsUpdate ? 100 : 1000;

src/buzz/buzz.cpp

@@ -140,10 +140,6 @@ bool playNextLeadUpNote()
     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)
 }
 

src/configuration.h

@@ -150,12 +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, T-Deck Pro, T-Lora Pager, CardKB, BBQ10, MPR121, TCA8418)
+// I2C Keyboards (M5Stack, RAK14004, T-Deck, PCF8574A passive)
 #define CARDKB_ADDR 0x5F
 #define TDECK_KB_ADDR 0x55
 #define BBQ10_KB_ADDR 0x1F
 #define MPR121_KB_ADDR 0x5A
-#define TCA8418_KB_ADDR 0x34
+#define PCF8574A_ADDRESS 0x20
 
 // -----------------------------------------------------------------------------
 // SENSOR
@@ -194,11 +194,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MLX90614_ADDR_DEF 0x5A
 #define CGRADSENS_ADDR 0x66
 #define LTR390UV_ADDR 0x53
-#define XPOWERS_AXP192_AXP2101_ADDRESS 0x34 // same adress as TCA8418_KB
+#define XPOWERS_AXP192_AXP2101_ADDRESS 0x34 // same adress as TCA8418
 #define PCT2075_ADDR 0x37
-#define BQ27220_ADDR 0x55 // same address as TDECK_KB
-#define BQ25896_ADDR 0x6B
-#define LTR553ALS_ADDR 0x23
 
 // -----------------------------------------------------------------------------
 // ACCELEROMETER
@@ -212,7 +209,6 @@ 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
 
 // -----------------------------------------------------------------------------
@@ -235,7 +231,6 @@ 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)

src/detect/ScanI2C.cpp

@@ -31,8 +31,8 @@ ScanI2C::FoundDevice ScanI2C::firstRTC() const
 
 ScanI2C::FoundDevice ScanI2C::firstKeyboard() const
 {
-    ScanI2C::DeviceType types[] = {CARDKB, TDECKKB, BBQ10KB, RAK14004, MPR121KB, TCA8418KB};
+    ScanI2C::DeviceType types[] = {CARDKB, TDECKKB, BBQ10KB, RAK14004, PCF8574A, MPR121KB, TCA8418KB};
-    return firstOfOrNONE(6, types);
+    return firstOfOrNONE(7, types);
 }
 
 ScanI2C::FoundDevice ScanI2C::firstAccelerometer() const

src/detect/ScanI2C.h

@@ -18,6 +18,7 @@ class ScanI2C
         TDECKKB,
         BBQ10KB,
         RAK14004,
+        PCF8574A,
         PMU_AXP192_AXP2101, // has the same adress as the TCA8418KB
         BME_680,
         BME_280,
@@ -74,12 +75,7 @@ class ScanI2C
         RAK12035,
         TCA8418KB,
         PCT2075,
-        CST328,
+        BMM150,
-        BQ25896,
-        BQ27220,
-        LTR553ALS,
-        BHI260AP,
-        BMM150
     } DeviceType;
 
     // typedef uint8_t DeviceAddress;

src/detect/ScanI2CTwoWire.cpp

@@ -184,13 +184,8 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                 type = RTC_RV3028;
                 logFoundDevice("RV3028", (uint8_t)addr.address);
                 rtc.initI2C(*i2cBus);
-                // Update RTC EEPROM settings, if necessary
+                rtc.writeToRegister(0x35, 0x07); // no Clkout
-                if (rtc.readEEPROMRegister(0x35) != 0x07) {
+                rtc.writeToRegister(0x37, 0xB4);
-                    rtc.writeEEPROMRegister(0x35, 0x07); // no Clkout
-                }
-                if (rtc.readEEPROMRegister(0x37) != 0xB4) {
-                    rtc.writeEEPROMRegister(0x37, 0xB4);
-                }
                 break;
 #endif
 
@@ -211,20 +206,13 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                 }
                 break;
 
-            case TDECK_KB_ADDR:
+                SCAN_SIMPLE_CASE(TDECK_KB_ADDR, TDECKKB, "T-Deck keyboard", (uint8_t)addr.address);
-                // Do we have the T-Deck keyboard or the T-Deck Pro battery sensor?
-                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x04), 1);
-                if (registerValue != 0) {
-                    logFoundDevice("BQ27220", (uint8_t)addr.address);
-                    type = BQ27220;
-                } else {
-                    logFoundDevice("TDECKKB", (uint8_t)addr.address);
-                    type = TDECKKB;
-                }
-                break;
                 SCAN_SIMPLE_CASE(BBQ10_KB_ADDR, BBQ10KB, "BB Q10", (uint8_t)addr.address);
 
                 SCAN_SIMPLE_CASE(ST7567_ADDRESS, SCREEN_ST7567, "ST7567", (uint8_t)addr.address);
+#ifndef HAS_TCA9535
+                SCAN_SIMPLE_CASE(PCF8574A_ADDRESS, PCF8574A, "PCF8574A", (uint8_t)addr.address);
+#endif
 #ifdef HAS_NCP5623
                 SCAN_SIMPLE_CASE(NCP5623_ADDR, NCP5623, "NCP5623", (uint8_t)addr.address);
 #endif
@@ -411,12 +399,6 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                     logFoundDevice("BQ24295", (uint8_t)addr.address);
                     break;
                 }
-                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x14), 1); // get ID
-                if ((registerValue & 0b00000011) == 0b00000010) {
-                    type = BQ25896;
-                    logFoundDevice("BQ25896", (uint8_t)addr.address);
-                    break;
-                }
                 registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x0F), 1); // get ID
                 if (registerValue == 0x6A) {
                     type = LSM6DS3;
@@ -468,9 +450,6 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                 SCAN_SIMPLE_CASE(DFROBOT_RAIN_ADDR, DFROBOT_RAIN, "DFRobot Rain Gauge", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(LTR390UV_ADDR, LTR390UV, "LTR390UV", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(PCT2075_ADDR, PCT2075, "PCT2075", (uint8_t)addr.address);
-                SCAN_SIMPLE_CASE(CST328_ADDR, CST328, "CST328", (uint8_t)addr.address);
-                SCAN_SIMPLE_CASE(LTR553ALS_ADDR, LTR553ALS, "LTR553ALS", (uint8_t)addr.address);
-                SCAN_SIMPLE_CASE(BHI260AP_ADDR, BHI260AP, "BHI260AP", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(SCD4X_ADDR, SCD4X, "SCD4X", (uint8_t)addr.address);
                 SCAN_SIMPLE_CASE(BMM150_ADDR, BMM150, "BMM150", (uint8_t)addr.address);
 #ifdef HAS_TPS65233

src/gps/GPS.cpp

@@ -39,9 +39,9 @@ template <typename T, std::size_t N> std::size_t array_count(const T (&)[N])
     return N;
 }
 
-#if defined(NRF52840_XXAA) || defined(NRF52833_XXAA) || defined(ARCH_ESP32) || defined(ARCH_PORTDUINO) || defined(ARCH_STM32WL)
+#if defined(NRF52840_XXAA) || defined(NRF52833_XXAA) || defined(ARCH_ESP32) || defined(ARCH_PORTDUINO)
-#if defined(GPS_SERIAL_PORT)
+#if defined(RAK2560)
-HardwareSerial *GPS::_serial_gps = &GPS_SERIAL_PORT;
+HardwareSerial *GPS::_serial_gps = &Serial2;
 #else
 HardwareSerial *GPS::_serial_gps = &Serial1;
 #endif
@@ -643,16 +643,8 @@ bool GPS::setup()
             delay(250);
         } else if (IS_ONE_OF(gnssModel, GNSS_MODEL_AG3335, GNSS_MODEL_AG3352)) {
 
-            if (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_IN ||
+            _serial_gps->write("$PAIR066,1,0,1,0,0,1*3B\r\n"); // Enable GPS+GALILEO+NAVIC
-                config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_NP_865) {
+
-                _serial_gps->write("$PAIR066,1,0,1,0,0,1*3B\r\n"); // Enable GPS+GALILEO+NAVIC
-                // GPS GLONASS GALILEO BDS QZSS NAVIC
-                //  1    0       1      0   0    1
-            } else {
-                _serial_gps->write("$PAIR066,1,1,1,1,0,0*3A\r\n"); // Enable GPS+GLONASS+GALILEO+BDS
-                // GPS GLONASS GALILEO BDS QZSS NAVIC
-                //  1    1       1      1   0    0
-            }
             // Configure NMEA (sentences will output once per fix)
             _serial_gps->write("$PAIR062,0,1*3F\r\n"); // GGA ON
             _serial_gps->write("$PAIR062,1,0*3F\r\n"); // GLL OFF
@@ -1511,7 +1503,7 @@ bool GPS::lookForTime()
 
 #ifdef GNSS_AIROHA
     uint8_t fix = reader.fixQuality();
-    if (fix >= 1 && fix <= 5) {
+    if (fix > 0) {
         if (lastFixStartMsec > 0) {
             if (Throttle::isWithinTimespanMs(lastFixStartMsec, GPS_FIX_HOLD_TIME)) {
                 return false;
@@ -1566,7 +1558,7 @@ bool GPS::lookForLocation()
 #ifdef GNSS_AIROHA
     if ((config.position.gps_update_interval * 1000) >= (GPS_FIX_HOLD_TIME * 2)) {
         uint8_t fix = reader.fixQuality();
-        if (fix >= 1 && fix <= 5) {
+        if (fix > 0) {
             if (lastFixStartMsec > 0) {
                 if (Throttle::isWithinTimespanMs(lastFixStartMsec, GPS_FIX_HOLD_TIME)) {
                     return false;

src/gps/RTC.cpp

@@ -226,14 +226,7 @@ RTCSetResult perhapsSetRTC(RTCQuality q, struct tm &t)
     time_t res = gm_mktime(&t);
     struct timeval tv;
     tv.tv_sec = res;
-    tv.tv_usec = 0;                      // time.centisecond() * (10 / 1000);
+    tv.tv_usec = 0; // time.centisecond() * (10 / 1000);
-    uint32_t printableEpoch = tv.tv_sec; // Print lib only supports 32 bit but time_t can be 64 bit on some platforms
-#ifdef BUILD_EPOCH
-    if (tv.tv_sec < BUILD_EPOCH) {
-        LOG_WARN("Ignore time (%ld) before build epoch (%ld)!", printableEpoch, BUILD_EPOCH);
-        return RTCSetResultInvalidTime;
-    }
-#endif
 
     // LOG_DEBUG("Got time from GPS month=%d, year=%d, unixtime=%ld", t.tm_mon, t.tm_year, tv.tv_sec);
     if (t.tm_year < 0 || t.tm_year >= 300) {

src/graphics/EInkDisplay2.cpp

@@ -140,32 +140,17 @@ bool EInkDisplay::connect()
 #endif
 #endif
 
-#if defined(TTGO_T_ECHO) || defined(ELECROW_ThinkNode_M1) || defined(T_ECHO_LITE)
+#if defined(TTGO_T_ECHO) || defined(ELECROW_ThinkNode_M1)
     {
         auto lowLevel = new EINK_DISPLAY_MODEL(PIN_EINK_CS, PIN_EINK_DC, PIN_EINK_RES, PIN_EINK_BUSY, SPI1);
 
         adafruitDisplay = new GxEPD2_BW<EINK_DISPLAY_MODEL, EINK_DISPLAY_MODEL::HEIGHT>(*lowLevel);
         adafruitDisplay->init();
-#if defined(ELECROW_ThinkNode_M1) || defined(T_ECHO_LITE)
+#ifdef ELECROW_ThinkNode_M1
         adafruitDisplay->setRotation(4);
 #else
         adafruitDisplay->setRotation(3);
 #endif
-        adafruitDisplay->setPartialWindow(0, 0, displayWidth, displayHeight);
-    }
-#elif defined(ELECROW_ThinkNode_M5)
-    {
-        // Start HSPI
-        hspi = new SPIClass(HSPI);
-        hspi->begin(PIN_EINK_SCLK, -1, PIN_EINK_MOSI, PIN_EINK_CS); // SCLK, MISO, MOSI, SS
-
-        auto lowLevel = new EINK_DISPLAY_MODEL(PIN_EINK_CS, PIN_EINK_DC, PIN_EINK_RES, PIN_EINK_BUSY, *hspi);
-
-        adafruitDisplay = new GxEPD2_BW<EINK_DISPLAY_MODEL, EINK_DISPLAY_MODEL::HEIGHT>(*lowLevel);
-        adafruitDisplay->init();
-
-        adafruitDisplay->setRotation(4);
-
         adafruitDisplay->setPartialWindow(0, 0, displayWidth, displayHeight);
     }
 #elif defined(MESHLINK)
@@ -221,7 +206,7 @@ bool EInkDisplay::connect()
         adafruitDisplay->setRotation(0);
         adafruitDisplay->setPartialWindow(0, 0, EINK_WIDTH, EINK_HEIGHT);
     }
-#elif defined(M5_COREINK) || defined(T_DECK_PRO)
+#elif defined(M5_COREINK)
     auto lowLevel = new EINK_DISPLAY_MODEL(PIN_EINK_CS, PIN_EINK_DC, PIN_EINK_RES, PIN_EINK_BUSY);
     adafruitDisplay = new GxEPD2_BW<EINK_DISPLAY_MODEL, EINK_DISPLAY_MODEL::HEIGHT>(*lowLevel);
     adafruitDisplay->init(115200, true, 40, false, SPI, SPISettings(4000000, MSBFIRST, SPI_MODE0));

src/graphics/EInkDisplay2.h

@@ -80,7 +80,7 @@ class EInkDisplay : public OLEDDisplay
     // If display uses HSPI
 #if defined(HELTEC_WIRELESS_PAPER) || defined(HELTEC_WIRELESS_PAPER_V1_0) || defined(HELTEC_VISION_MASTER_E213) ||               \
     defined(HELTEC_VISION_MASTER_E290) || defined(TLORA_T3S3_EPAPER) || defined(CROWPANEL_ESP32S3_5_EPAPER) ||                   \
-    defined(CROWPANEL_ESP32S3_4_EPAPER) || defined(CROWPANEL_ESP32S3_2_EPAPER) || defined(ELECROW_ThinkNode_M5)
+    defined(CROWPANEL_ESP32S3_4_EPAPER) || defined(CROWPANEL_ESP32S3_2_EPAPER)
     SPIClass *hspi = NULL;
 #endif
 

src/graphics/Screen.cpp

@@ -365,6 +365,9 @@ void Screen::doDeepSleep()
 {
 #ifdef USE_EINK
     setOn(false, graphics::UIRenderer::drawDeepSleepFrame);
+#ifdef PIN_EINK_EN
+    digitalWrite(PIN_EINK_EN, LOW); // power off backlight
+#endif
 #else
     // Without E-Ink display:
     setOn(false);
@@ -383,19 +386,13 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
 #ifdef T_WATCH_S3
             PMU->enablePowerOutput(XPOWERS_ALDO2);
 #endif
-
+#ifdef HELTEC_TRACKER_V1_X
+            uint8_t tft_vext_enabled = digitalRead(VEXT_ENABLE);
+#endif
 #if !ARCH_PORTDUINO
             dispdev->displayOn();
 #endif
 
-#ifdef PIN_EINK_EN
-            if (uiconfig.screen_brightness == 1)
-                digitalWrite(PIN_EINK_EN, HIGH);
-#elif defined(PCA_PIN_EINK_EN)
-            if (uiconfig.screen_brightness == 1)
-                io.digitalWrite(PCA_PIN_EINK_EN, HIGH);
-#endif
-
 #if defined(ST7789_CS) &&                                                                                                        \
     !defined(M5STACK) // set display brightness when turning on screens. Just moved function from TFTDisplay to here.
             static_cast<TFTDisplay *>(dispdev)->setDisplayBrightness(brightness);
@@ -403,7 +400,10 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
 
             dispdev->displayOn();
 #ifdef HELTEC_TRACKER_V1_X
-            ui->init();
+            // If the TFT VEXT power is not enabled, initialize the UI.
+            if (!tft_vext_enabled) {
+                ui->init();
+            }
 #endif
 #ifdef USE_ST7789
             pinMode(VTFT_CTRL, OUTPUT);
@@ -425,13 +425,11 @@ void Screen::handleSetOn(bool on, FrameCallback einkScreensaver)
             // eInkScreensaver parameter is usually NULL (default argument), default frame used instead
             setScreensaverFrames(einkScreensaver);
 #endif
-
+#ifdef ELECROW_ThinkNode_M1
-#ifdef PIN_EINK_EN
+            if (digitalRead(PIN_EINK_EN) == HIGH) {
-            digitalWrite(PIN_EINK_EN, LOW);
+                digitalWrite(PIN_EINK_EN, LOW);
-#elif defined(PCA_PIN_EINK_EN)
+            }
-            io.digitalWrite(PCA_PIN_EINK_EN, LOW);
 #endif
-
             dispdev->displayOff();
 #ifdef USE_ST7789
             SPI1.end();
@@ -586,7 +584,7 @@ void Screen::setup()
             touchScreenImpl1->init();
         }
     }
-#elif HAS_TOUCHSCREEN && !defined(USE_EINK)
+#elif HAS_TOUCHSCREEN
     touchScreenImpl1 =
         new TouchScreenImpl1(dispdev->getWidth(), dispdev->getHeight(), static_cast<TFTDisplay *>(dispdev)->getTouch);
     touchScreenImpl1->init();
@@ -692,7 +690,7 @@ int32_t Screen::runOnce()
 
 #ifndef DISABLE_WELCOME_UNSET
     if (!NotificationRenderer::isOverlayBannerShowing() && config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
-        menuHandler::OnboardMessage();
+        menuHandler::LoraRegionPicker(0);
     }
 #endif
     if (!NotificationRenderer::isOverlayBannerShowing() && rebootAtMsec != 0) {
@@ -871,8 +869,6 @@ void Screen::setFrames(FrameFocus focus)
     uint8_t previousFrameCount = framesetInfo.frameCount;
     FramesetInfo fsi; // Location of specific frames, for applying focus parameter
 
-    graphics::UIRenderer::rebuildFavoritedNodes();
-
     LOG_DEBUG("Show standard frames");
     showingNormalScreen = true;
 
@@ -1008,7 +1004,7 @@ void Screen::setFrames(FrameFocus focus)
     // Insert favorite frames *after* collecting them all
     if (!favoriteFrames.empty()) {
         fsi.positions.firstFavorite = numframes;
-        for (const auto &f : favoriteFrames) {
+        for (auto &f : favoriteFrames) {
             normalFrames[numframes++] = f;
             indicatorIcons.push_back(icon_node);
         }
@@ -1271,39 +1267,40 @@ int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
             if (shouldWakeOnReceivedMessage()) {
                 setOn(true);    // Wake up the screen first
                 forceDisplay(); // Forces screen redraw
-            }
-            // === Prepare banner content ===
-            const meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(packet->from);
-            const char *longName = (node && node->has_user) ? node->user.long_name : nullptr;
 
-            const char *msgRaw = reinterpret_cast<const char *>(packet->decoded.payload.bytes);
+                // === Prepare banner content ===
+                const meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(packet->from);
+                const char *longName = (node && node->has_user) ? node->user.long_name : nullptr;
 
-            char banner[256];
+                const char *msgRaw = reinterpret_cast<const char *>(packet->decoded.payload.bytes);
 
-            // Check for bell character in message to determine alert type
+                char banner[256];
-            bool isAlert = false;
+
-            for (size_t i = 0; i < packet->decoded.payload.size && i < 100; i++) {
+                // Check for bell character in message to determine alert type
-                if (msgRaw[i] == '\x07') {
+                bool isAlert = false;
-                    isAlert = true;
+                for (size_t i = 0; i < packet->decoded.payload.size && i < 100; i++) {
-                    break;
+                    if (msgRaw[i] == '\x07') {
+                        isAlert = true;
+                        break;
+                    }
                 }
-            }
 
-            if (isAlert) {
+                if (isAlert) {
-                if (longName && longName[0]) {
+                    if (longName && longName[0]) {
-                    snprintf(banner, sizeof(banner), "Alert Received from\n%s", longName);
+                        snprintf(banner, sizeof(banner), "Alert Received from\n%s", longName);
+                    } else {
+                        strcpy(banner, "Alert Received");
+                    }
                 } else {
-                    strcpy(banner, "Alert Received");
+                    if (longName && longName[0]) {
+                        snprintf(banner, sizeof(banner), "New Message from\n%s", longName);
+                    } else {
+                        strcpy(banner, "New Message");
+                    }
                 }
-            } else {
-                if (longName && longName[0]) {
-                    snprintf(banner, sizeof(banner), "New Message from\n%s", longName);
-                } else {
-                    strcpy(banner, "New Message");
-                }
-            }
 
-            screen->showSimpleBanner(banner, 3000);
+                screen->showSimpleBanner(banner, 3000);
+            }
         }
     }
 
@@ -1382,12 +1379,9 @@ int Screen::handleInputEvent(const InputEvent *event)
                     menuHandler::clockMenu();
                 } else if (this->ui->getUiState()->currentFrame == framesetInfo.positions.lora) {
                     menuHandler::LoraRegionPicker();
-                } else if (this->ui->getUiState()->currentFrame == framesetInfo.positions.textMessage) {
+                } else if (this->ui->getUiState()->currentFrame == framesetInfo.positions.textMessage &&
-                    if (devicestate.rx_text_message.from) {
+                           devicestate.rx_text_message.from) {
-                        menuHandler::messageResponseMenu();
+                    menuHandler::messageResponseMenu();
-                    } else {
-                        menuHandler::textMessageBaseMenu();
-                    }
                 } else if (framesetInfo.positions.firstFavorite != 255 &&
                            this->ui->getUiState()->currentFrame >= framesetInfo.positions.firstFavorite &&
                            this->ui->getUiState()->currentFrame <= framesetInfo.positions.lastFavorite) {

src/graphics/ScreenFonts.h

@@ -16,7 +16,7 @@
 #include "graphics/fonts/OLEDDisplayFontsCS.h"
 #endif
 
-#if defined(CROWPANEL_ESP32S3_5_EPAPER) && defined(USE_EINK)
+#ifdef CROWPANEL_ESP32S3_5_EPAPER
 #include "graphics/fonts/EinkDisplayFonts.h"
 #endif
 
@@ -40,9 +40,6 @@
 #ifdef OLED_PL
 #define FONT_MEDIUM_LOCAL ArialMT_Plain_16_PL // Height: 19
 #else
-#ifdef OLED_RU
-#define FONT_MEDIUM_LOCAL ArialMT_Plain_16_RU // Height: 19
-#else
 #ifdef OLED_UA
 #define FONT_MEDIUM_LOCAL ArialMT_Plain_16_UA // Height: 19
 #else
@@ -53,13 +50,9 @@
 #endif
 #endif
 #endif
-#endif
 #ifdef OLED_PL
 #define FONT_LARGE_LOCAL ArialMT_Plain_24_PL // Height: 28
 #else
-#ifdef OLED_RU
-#define FONT_LARGE_LOCAL ArialMT_Plain_24_RU // Height: 28
-#else
 #ifdef OLED_UA
 #define FONT_LARGE_LOCAL ArialMT_Plain_24_UA // Height: 28
 #else
@@ -70,7 +63,6 @@
 #endif
 #endif
 #endif
-#endif
 
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
      defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || defined(ILI9488_CS)) &&                                  \
@@ -85,7 +77,7 @@
 #define FONT_LARGE FONT_LARGE_LOCAL   // Height: 28
 #endif
 
-#if defined(CROWPANEL_ESP32S3_5_EPAPER) && defined(USE_EINK)
+#if defined(CROWPANEL_ESP32S3_5_EPAPER)
 #undef FONT_SMALL
 #undef FONT_MEDIUM
 #undef FONT_LARGE

src/graphics/SharedUIDisplay.cpp

@@ -206,7 +206,7 @@ void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y, const char *ti
         timeX = screenW - xOffset - timeStrWidth + 3;
 
         // === Show Mail or Mute Icon to the Left of Time ===
-        int iconRightEdge = timeX - 2;
+        int iconRightEdge = timeX - 1;
 
         bool showMail = false;
 

src/graphics/TFTDisplay.cpp

@@ -849,29 +849,9 @@ static LGFX *tft = nullptr;
 #include <lgfx/v1/platforms/esp32s3/Bus_RGB.hpp>
 #include <lgfx/v1/platforms/esp32s3/Panel_RGB.hpp>
 
-class PanelInit_ST7701 : public lgfx::Panel_ST7701
-{
-  public:
-    const uint8_t *getInitCommands(uint8_t listno) const override
-    {
-        // 180 degree hw rotation: vertical flip, horizontal flip
-        static constexpr const uint8_t list1[] = {0x36, 1,   0x10,                         // MADCTL for vertical flip
-                                                  0xFF, 5,   0x77, 0x01, 0x00, 0x00, 0x10, // Command2 BK0 SEL
-                                                  0xC7, 1,   0x04, // SDIR: X-direction Control (Horizontal Flip)
-                                                  0xFF, 5,   0x77, 0x01, 0x00, 0x00, 0x00, // Command2 BK0 DIS
-                                                  0xFF, 0xFF};
-        switch (listno) {
-        case 1:
-            return list1;
-        default:
-            return lgfx::Panel_ST7701::getInitCommands(listno);
-        }
-    }
-};
-
 class LGFX : public lgfx::LGFX_Device
 {
-    PanelInit_ST7701 _panel_instance;
+    lgfx::Panel_ST7701 _panel_instance;
     lgfx::Bus_RGB _bus_instance;
     lgfx::Light_PWM _light_instance;
     lgfx::Touch_FT5x06 _touch_instance;
@@ -1204,9 +1184,9 @@ bool TFTDisplay::connect()
     attachInterrupt(digitalPinToInterrupt(SCREEN_TOUCH_INT), rak14014_tpIntHandle, FALLING);
 #elif defined(T_DECK) || defined(PICOMPUTER_S3) || defined(CHATTER_2)
     tft->setRotation(1); // T-Deck has the TFT in landscape
-#elif defined(T_WATCH_S3)
+#elif defined(T_WATCH_S3) || defined(SENSECAP_INDICATOR)
     tft->setRotation(2); // T-Watch S3 left-handed orientation
-#elif ARCH_PORTDUINO || defined(SENSECAP_INDICATOR)
+#elif ARCH_PORTDUINO
     tft->setRotation(0); // use config.yaml to set rotation
 #else
     tft->setRotation(3); // Orient horizontal and wide underneath the silkscreen name label

src/graphics/draw/ClockRenderer.cpp

@@ -186,7 +186,7 @@ void drawDigitalClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int1
 {
     display->clear();
     display->setTextAlignment(TEXT_ALIGN_LEFT);
-
+    int line = 1;
     // === Set Title, Blank for Clock
     const char *titleStr = "";
     // === Header ===
@@ -218,6 +218,7 @@ void drawDigitalClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int1
         hour %= 12;
         if (hour == 0)
             hour = 12;
+        bool isPM = hour >= 12;
         snprintf(timeString, sizeof(timeString), "%d:%02d", hour, minute);
     } else {
         snprintf(timeString, sizeof(timeString), "%02d:%02d", hour, minute);
@@ -229,8 +230,6 @@ void drawDigitalClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int1
 
 #ifdef T_WATCH_S3
     float scale = 1.5;
-#elif defined(CHATTER_2)
-    float scale = 1.1;
 #else
     float scale = 0.75;
     if (isHighResolution) {
@@ -286,9 +285,6 @@ void drawDigitalClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int1
     int yOffset = (isHighResolution) ? 3 : 1;
 #ifdef SENSECAP_INDICATOR
     yOffset -= 3;
-#endif
-#ifdef T_DECK
-    yOffset -= 5;
 #endif
     if (config.display.use_12h_clock) {
         display->drawString(startingHourMinuteTextX + xOffset, (display->getHeight() - hourMinuteTextY) - yOffset - 2,
@@ -366,7 +362,7 @@ void drawAnalogClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     // hour hand radius and y coordinate
     int16_t hourHandRadius = radius * 0.35;
     if (isHighResolution) {
-        hourHandRadius = radius * 0.55;
+        int16_t hourHandRadius = radius * 0.55;
     }
     int16_t hourHandNoonY = centerY - hourHandRadius;
 
@@ -385,7 +381,7 @@ void drawAnalogClockFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
 
         bool isPM = hour >= 12;
         if (config.display.use_12h_clock) {
-            isPM = hour >= 12;
+            bool isPM = hour >= 12;
             display->setFont(FONT_SMALL);
             int yOffset = isHighResolution ? 1 : 0;
 #ifdef USE_EINK

src/graphics/draw/DebugRenderer.cpp

@@ -412,9 +412,9 @@ void drawLoRaFocused(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
     float freq = RadioLibInterface::instance->getFreq();
     snprintf(freqStr, sizeof(freqStr), "%.3f", freq);
     if (config.lora.channel_num == 0) {
-        snprintf(frequencyslot, sizeof(frequencyslot), "Freq: %sMHz", freqStr);
+        snprintf(frequencyslot, sizeof(frequencyslot), "Freq: %smhz", freqStr);
     } else {
-        snprintf(frequencyslot, sizeof(frequencyslot), "Freq/Ch: %sMHz (%d)", freqStr, config.lora.channel_num);
+        snprintf(frequencyslot, sizeof(frequencyslot), "Freq/Ch: %smhz (%d)", freqStr, config.lora.channel_num);
     }
     size_t len = strlen(frequencyslot);
     if (len >= 4 && strcmp(frequencyslot + len - 4, " (0)") == 0) {
@@ -483,7 +483,7 @@ void drawLoRaFocused(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
 }
 
 // ****************************
-// *      System Screen       *
+// *      Memory Screen       *
 // ****************************
 void drawMemoryUsage(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
@@ -593,19 +593,7 @@ void drawMemoryUsage(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
     }
     line += 1;
     char appversionstr[35];
-    snprintf(appversionstr, sizeof(appversionstr), "Ver: %s", optstr(APP_VERSION));
+    snprintf(appversionstr, sizeof(appversionstr), "Ver.: %s", optstr(APP_VERSION));
-    char appversionstr_formatted[40];
-    char *lastDot = strrchr(appversionstr, '.');
-    if (lastDot) {
-        size_t prefixLen = lastDot - appversionstr;
-        strncpy(appversionstr_formatted, appversionstr, prefixLen);
-        appversionstr_formatted[prefixLen] = '\0';
-        strncat(appversionstr_formatted, " (", sizeof(appversionstr_formatted) - strlen(appversionstr_formatted) - 1);
-        strncat(appversionstr_formatted, lastDot + 1, sizeof(appversionstr_formatted) - strlen(appversionstr_formatted) - 1);
-        strncat(appversionstr_formatted, ")", sizeof(appversionstr_formatted) - strlen(appversionstr_formatted) - 1);
-        strncpy(appversionstr, appversionstr_formatted, sizeof(appversionstr) - 1);
-        appversionstr[sizeof(appversionstr) - 1] = '\0';
-    }
     int textWidth = display->getStringWidth(appversionstr);
     int nameX = (SCREEN_WIDTH - textWidth) / 2;
     display->drawString(nameX, getTextPositions(display)[line], appversionstr);

src/graphics/draw/MenuHandler.cpp

@@ -15,9 +15,6 @@
 #include "modules/CannedMessageModule.h"
 #include "modules/KeyVerificationModule.h"
 
-#include "modules/TraceRouteModule.h"
-#include <functional>
-
 extern uint16_t TFT_MESH;
 
 namespace graphics
@@ -26,27 +23,6 @@ menuHandler::screenMenus menuHandler::menuQueue = menu_none;
 bool test_enabled = false;
 uint8_t test_count = 0;
 
-void menuHandler::OnboardMessage()
-{
-    static const char *optionsArray[] = {"OK", "Got it!"};
-    enum optionsNumbers { OK, got };
-    BannerOverlayOptions bannerOptions;
-#if HAS_TFT
-    bannerOptions.message = "Welcome to Meshtastic!\nSwipe to navigate and\nlong press to select\nor open a menu.";
-#elif defined(BUTTON_PIN)
-    bannerOptions.message = "Welcome to Meshtastic!\nClick to navigate and\nlong press to select\nor open a menu.";
-#else
-    bannerOptions.message = "Welcome to Meshtastic!\nUse the Select button\nto open menus\nand make selections.";
-#endif
-    bannerOptions.optionsArrayPtr = optionsArray;
-    bannerOptions.optionsCount = 2;
-    bannerOptions.bannerCallback = [](int selected) -> void {
-        menuHandler::menuQueue = menuHandler::no_timeout_lora_picker;
-        screen->runNow();
-    };
-    screen->showOverlayBanner(bannerOptions);
-}
-
 void menuHandler::LoraRegionPicker(uint32_t duration)
 {
     static const char *optionsArray[] = {"Back",
@@ -75,14 +51,12 @@ void menuHandler::LoraRegionPicker(uint32_t duration)
                                          "PH_915",
                                          "ANZ_433",
                                          "KZ_433",
-                                         "KZ_863",
+                                         "KZ_863"};
-                                         "NP_865",
-                                         "BR_902"};
     BannerOverlayOptions bannerOptions;
     bannerOptions.message = "Set the LoRa region";
     bannerOptions.durationMs = duration;
     bannerOptions.optionsArrayPtr = optionsArray;
-    bannerOptions.optionsCount = 27;
+    bannerOptions.optionsCount = 25;
     bannerOptions.InitialSelected = 0;
     bannerOptions.bannerCallback = [](int selected) -> void {
         if (selected != 0 && config.lora.region != _meshtastic_Config_LoRaConfig_RegionCode(selected)) {
@@ -141,22 +115,6 @@ void menuHandler::TwelveHourPicker()
     screen->showOverlayBanner(bannerOptions);
 }
 
-// Reusable confirmation prompt function
-void menuHandler::showConfirmationBanner(const char *message, std::function<void()> onConfirm)
-{
-    static const char *confirmOptions[] = {"No", "Yes"};
-    BannerOverlayOptions confirmBanner;
-    confirmBanner.message = message;
-    confirmBanner.optionsArrayPtr = confirmOptions;
-    confirmBanner.optionsCount = 2;
-    confirmBanner.bannerCallback = [onConfirm](int confirmSelected) -> void {
-        if (confirmSelected == 1) {
-            onConfirm();
-        }
-    };
-    screen->showOverlayBanner(confirmBanner);
-}
-
 void menuHandler::ClockFacePicker()
 {
     static const char *optionsArray[] = {"Back", "Digital", "Analog"};
@@ -193,7 +151,6 @@ void menuHandler::TZPicker()
                                          "US/Mountain",
                                          "US/Central",
                                          "US/Eastern",
-                                         "BR/Brasilia",
                                          "UTC",
                                          "EU/Western",
                                          "EU/"
@@ -208,7 +165,7 @@ void menuHandler::TZPicker()
     BannerOverlayOptions bannerOptions;
     bannerOptions.message = "Pick Timezone";
     bannerOptions.optionsArrayPtr = optionsArray;
-    bannerOptions.optionsCount = 19;
+    bannerOptions.optionsCount = 17;
     bannerOptions.bannerCallback = [](int selected) -> void {
         if (selected == 0) {
             menuHandler::menuQueue = menuHandler::clock_menu;
@@ -227,27 +184,25 @@ void menuHandler::TZPicker()
             strncpy(config.device.tzdef, "CST6CDT,M3.2.0,M11.1.0", sizeof(config.device.tzdef));
         } else if (selected == 7) { // Eastern
             strncpy(config.device.tzdef, "EST5EDT,M3.2.0,M11.1.0", sizeof(config.device.tzdef));
-        } else if (selected == 8) { // Brazil
+        } else if (selected == 8) { // UTC
-            strncpy(config.device.tzdef, "BRT3", sizeof(config.device.tzdef));
+            strncpy(config.device.tzdef, "UTC", sizeof(config.device.tzdef));
-        } else if (selected == 9) { // UTC
+        } else if (selected == 9) { // EU/Western
-            strncpy(config.device.tzdef, "UTC0", sizeof(config.device.tzdef));
-        } else if (selected == 10) { // EU/Western
             strncpy(config.device.tzdef, "GMT0BST,M3.5.0/1,M10.5.0", sizeof(config.device.tzdef));
-        } else if (selected == 11) { // EU/Central
+        } else if (selected == 10) { // EU/Central
             strncpy(config.device.tzdef, "CET-1CEST,M3.5.0,M10.5.0/3", sizeof(config.device.tzdef));
-        } else if (selected == 12) { // EU/Eastern
+        } else if (selected == 11) { // EU/Eastern
             strncpy(config.device.tzdef, "EET-2EEST,M3.5.0/3,M10.5.0/4", sizeof(config.device.tzdef));
-        } else if (selected == 13) { // Asia/Kolkata
+        } else if (selected == 12) { // Asia/Kolkata
             strncpy(config.device.tzdef, "IST-5:30", sizeof(config.device.tzdef));
-        } else if (selected == 14) { // China
+        } else if (selected == 13) { // China
             strncpy(config.device.tzdef, "HKT-8", sizeof(config.device.tzdef));
-        } else if (selected == 15) { // AU/AWST
+        } else if (selected == 14) { // AU/AWST
             strncpy(config.device.tzdef, "AWST-8", sizeof(config.device.tzdef));
-        } else if (selected == 16) { // AU/ACST
+        } else if (selected == 15) { // AU/ACST
             strncpy(config.device.tzdef, "ACST-9:30ACDT,M10.1.0,M4.1.0/3", sizeof(config.device.tzdef));
-        } else if (selected == 17) { // AU/AEST
+        } else if (selected == 16) { // AU/AEST
             strncpy(config.device.tzdef, "AEST-10AEDT,M10.1.0,M4.1.0/3", sizeof(config.device.tzdef));
-        } else if (selected == 18) { // NZ
+        } else if (selected == 17) { // NZ
             strncpy(config.device.tzdef, "NZST-12NZDT,M9.5.0,M4.1.0/3", sizeof(config.device.tzdef));
         }
         if (selected != 0) {
@@ -333,13 +288,13 @@ void menuHandler::messageResponseMenu()
 
 void menuHandler::homeBaseMenu()
 {
-    enum optionsNumbers { Back, Backlight, Position, Preset, Freetext, Sleep, enumEnd };
+    enum optionsNumbers { Back, Backlight, Position, Preset, Freetext, Bluetooth, Sleep, enumEnd };
 
     static const char *optionsArray[enumEnd] = {"Back"};
     static int optionsEnumArray[enumEnd] = {Back};
     int options = 1;
 
-#if defined(PIN_EINK_EN) || defined(PCA_PIN_EINK_EN)
+#ifdef PIN_EINK_EN
     optionsArray[options] = "Toggle Backlight";
     optionsEnumArray[options++] = Backlight;
 #else
@@ -355,6 +310,8 @@ void menuHandler::homeBaseMenu()
         optionsArray[options] = "New Freetext Msg";
         optionsEnumArray[options++] = Freetext;
     }
+    optionsArray[options] = "Bluetooth Toggle";
+    optionsEnumArray[options++] = Bluetooth;
 
     BannerOverlayOptions bannerOptions;
     bannerOptions.message = "Home Action";
@@ -363,24 +320,12 @@ void menuHandler::homeBaseMenu()
     bannerOptions.optionsCount = options;
     bannerOptions.bannerCallback = [](int selected) -> void {
         if (selected == Backlight) {
-#if defined(PIN_EINK_EN)
+#ifdef PIN_EINK_EN
-            if (uiconfig.screen_brightness == 1) {
+            if (digitalRead(PIN_EINK_EN) == HIGH) {
-                uiconfig.screen_brightness = 0;
                 digitalWrite(PIN_EINK_EN, LOW);
             } else {
-                uiconfig.screen_brightness = 1;
                 digitalWrite(PIN_EINK_EN, HIGH);
             }
-            saveUIConfig();
-#elif defined(PCA_PIN_EINK_EN)
-            if (uiconfig.screen_brightness == 1) {
-                uiconfig.screen_brightness = 0;
-                io.digitalWrite(PCA_PIN_EINK_EN, LOW);
-            } else {
-                uiconfig.screen_brightness = 1;
-                io.digitalWrite(PCA_PIN_EINK_EN, HIGH);
-            }
-            saveUIConfig();
 #endif
         } else if (selected == Sleep) {
             screen->setOn(false);
@@ -391,35 +336,9 @@ void menuHandler::homeBaseMenu()
             cannedMessageModule->LaunchWithDestination(NODENUM_BROADCAST);
         } else if (selected == Freetext) {
             cannedMessageModule->LaunchFreetextWithDestination(NODENUM_BROADCAST);
-        }
+        } else if (selected == Bluetooth) {
-    };
+            menuQueue = bluetooth_toggle_menu;
-    screen->showOverlayBanner(bannerOptions);
+            screen->runNow();
-}
-
-void menuHandler::textMessageBaseMenu()
-{
-    enum optionsNumbers { Back, Preset, Freetext, enumEnd };
-
-    static const char *optionsArray[enumEnd] = {"Back"};
-    static int optionsEnumArray[enumEnd] = {Back};
-    int options = 1;
-    optionsArray[options] = "New Preset Msg";
-    optionsEnumArray[options++] = Preset;
-    if (kb_found) {
-        optionsArray[options] = "New Freetext Msg";
-        optionsEnumArray[options++] = Freetext;
-    }
-
-    BannerOverlayOptions bannerOptions;
-    bannerOptions.message = "Message Action";
-    bannerOptions.optionsArrayPtr = optionsArray;
-    bannerOptions.optionsEnumPtr = optionsEnumArray;
-    bannerOptions.optionsCount = options;
-    bannerOptions.bannerCallback = [](int selected) -> void {
-        if (selected == Preset) {
-            cannedMessageModule->LaunchWithDestination(NODENUM_BROADCAST);
-        } else if (selected == Freetext) {
-            cannedMessageModule->LaunchFreetextWithDestination(NODENUM_BROADCAST);
         }
     };
     screen->showOverlayBanner(bannerOptions);
@@ -427,7 +346,13 @@ void menuHandler::textMessageBaseMenu()
 
 void menuHandler::systemBaseMenu()
 {
-    enum optionsNumbers { Back, Notifications, ScreenOptions, Bluetooth, PowerMenu, Test, enumEnd };
+    // Check if brightness is supported
+    bool hasSupportBrightness = false;
+#if defined(ST7789_CS) || defined(USE_OLED) || defined(USE_SSD1306) || defined(USE_SH1106) || defined(USE_SH1107) || HAS_TFT
+    hasSupportBrightness = true;
+#endif
+
+    enum optionsNumbers { Back, Notifications, ScreenOptions, PowerMenu, Test, enumEnd };
     static const char *optionsArray[enumEnd] = {"Back"};
     static int optionsEnumArray[enumEnd] = {Back};
     int options = 1;
@@ -440,9 +365,6 @@ void menuHandler::systemBaseMenu()
     optionsEnumArray[options++] = ScreenOptions;
 #endif
 
-    optionsArray[options] = "Bluetooth Toggle";
-    optionsEnumArray[options++] = Bluetooth;
-
     optionsArray[options] = "Reboot/Shutdown";
     optionsEnumArray[options++] = PowerMenu;
 
@@ -469,9 +391,6 @@ void menuHandler::systemBaseMenu()
         } else if (selected == Test) {
             menuHandler::menuQueue = menuHandler::test_menu;
             screen->runNow();
-        } else if (selected == Bluetooth) {
-            menuQueue = bluetooth_toggle_menu;
-            screen->runNow();
         } else if (selected == Back && !test_enabled) {
             test_count++;
             if (test_count > 4) {
@@ -484,7 +403,7 @@ void menuHandler::systemBaseMenu()
 
 void menuHandler::favoriteBaseMenu()
 {
-    enum optionsNumbers { Back, Preset, Freetext, Remove, TraceRoute, enumEnd };
+    enum optionsNumbers { Back, Preset, Freetext, Remove, enumEnd };
     static const char *optionsArray[enumEnd] = {"Back", "New Preset Msg"};
     static int optionsEnumArray[enumEnd] = {Back, Preset};
     int options = 2;
@@ -493,8 +412,6 @@ void menuHandler::favoriteBaseMenu()
         optionsArray[options] = "New Freetext Msg";
         optionsEnumArray[options++] = Freetext;
     }
-    optionsArray[options] = "Trace Route";
-    optionsEnumArray[options++] = TraceRoute;
     optionsArray[options] = "Remove Favorite";
     optionsEnumArray[options++] = Remove;
 
@@ -504,17 +421,13 @@ void menuHandler::favoriteBaseMenu()
     bannerOptions.optionsEnumPtr = optionsEnumArray;
     bannerOptions.optionsCount = options;
     bannerOptions.bannerCallback = [](int selected) -> void {
-        if (selected == Preset) {
+        if (selected == 1) {
             cannedMessageModule->LaunchWithDestination(graphics::UIRenderer::currentFavoriteNodeNum);
-        } else if (selected == Freetext) {
+        } else if (selected == 2 && kb_found) {
             cannedMessageModule->LaunchFreetextWithDestination(graphics::UIRenderer::currentFavoriteNodeNum);
-        } else if (selected == Remove) {
+        } else if ((!kb_found && selected == 2) || (selected == 3 && kb_found)) {
             menuHandler::menuQueue = menuHandler::remove_favorite;
             screen->runNow();
-        } else if (selected == TraceRoute) {
-            if (traceRouteModule) {
-                traceRouteModule->launch(graphics::UIRenderer::currentFavoriteNodeNum);
-            }
         }
     };
     screen->showOverlayBanner(bannerOptions);
@@ -553,12 +466,12 @@ void menuHandler::positionBaseMenu()
 
 void menuHandler::nodeListMenu()
 {
-    enum optionsNumbers { Back, Favorite, TraceRoute, Verify, Reset, enumEnd };
+    enum optionsNumbers { Back, Favorite, Verify, Reset };
-    static const char *optionsArray[] = {"Back", "Add Favorite", "Trace Route", "Key Verification", "Reset NodeDB"};
+    static const char *optionsArray[] = {"Back", "Add Favorite", "Key Verification", "Reset NodeDB"};
     BannerOverlayOptions bannerOptions;
     bannerOptions.message = "Node Action";
     bannerOptions.optionsArrayPtr = optionsArray;
-    bannerOptions.optionsCount = 5;
+    bannerOptions.optionsCount = 4;
     bannerOptions.bannerCallback = [](int selected) -> void {
         if (selected == Favorite) {
             menuQueue = add_favorite;
@@ -569,9 +482,6 @@ void menuHandler::nodeListMenu()
         } else if (selected == Reset) {
             menuQueue = reset_node_db_menu;
             screen->runNow();
-        } else if (selected == TraceRoute) {
-            menuQueue = trace_route_menu;
-            screen->runNow();
         }
     };
     screen->showOverlayBanner(bannerOptions);
@@ -768,7 +678,6 @@ void menuHandler::TFTColorPickerMenu(OLEDDisplay *display)
     bannerOptions.optionsArrayPtr = optionsArray;
     bannerOptions.optionsCount = 10;
     bannerOptions.bannerCallback = [display](int selected) -> void {
-#if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190) || defined(T_DECK) || HAS_TFT
         uint8_t TFT_MESH_r = 0;
         uint8_t TFT_MESH_g = 0;
         uint8_t TFT_MESH_b = 0;
@@ -820,6 +729,7 @@ void menuHandler::TFTColorPickerMenu(OLEDDisplay *display)
             screen->runNow();
         }
 
+#if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190) || HAS_TFT
         if (selected != 0) {
             display->setColor(BLACK);
             display->fillRect(0, 0, SCREEN_WIDTH, SCREEN_HEIGHT);
@@ -882,8 +792,9 @@ void menuHandler::shutdownMenu()
     bannerOptions.optionsCount = 2;
     bannerOptions.bannerCallback = [](int selected) -> void {
         if (selected == 1) {
-            InputEvent event = {.inputEvent = (input_broker_event)INPUT_BROKER_SHUTDOWN, .kbchar = 0, .touchX = 0, .touchY = 0};
+            IF_SCREEN(screen->showSimpleBanner("Shutting Down...", 0));
-            inputBroker->injectInputEvent(&event);
+            nodeDB->saveToDisk();
+            power->shutdown();
         } else {
             menuQueue = power_menu;
             screen->runNow();
@@ -916,24 +827,13 @@ void menuHandler::removeFavoriteMenu()
     bannerOptions.optionsCount = 2;
     bannerOptions.bannerCallback = [](int selected) -> void {
         if (selected == 1) {
-            LOG_INFO("Removing %x as favorite node", graphics::UIRenderer::currentFavoriteNodeNum);
             nodeDB->set_favorite(false, graphics::UIRenderer::currentFavoriteNodeNum);
-            screen->setFrames(graphics::Screen::FOCUS_DEFAULT);
+            screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
         }
     };
     screen->showOverlayBanner(bannerOptions);
 }
 
-void menuHandler::traceRouteMenu()
-{
-    screen->showNodePicker("Node to Trace", 30000, [](uint32_t nodenum) -> void {
-        LOG_INFO("Menu: Node picker selected node 0x%08x, traceRouteModule=%p", nodenum, traceRouteModule);
-        if (traceRouteModule) {
-            traceRouteModule->startTraceRoute(nodenum);
-        }
-    });
-}
-
 void menuHandler::testMenu()
 {
 
@@ -1024,28 +924,23 @@ void menuHandler::screenOptionsMenu()
 {
     // Check if brightness is supported
     bool hasSupportBrightness = false;
-#if defined(ST7789_CS) || defined(USE_OLED) || defined(USE_SSD1306) || defined(USE_SH1106) || defined(USE_SH1107)
+#if defined(ST7789_CS) || defined(USE_OLED) || defined(USE_SSD1306) || defined(USE_SH1106) || defined(USE_SH1107) || HAS_TFT
     hasSupportBrightness = true;
 #endif
 
-#if defined(T_DECK)
-    // TDeck Doesn't seem to support brightness at all, at least not reliably
-    hasSupportBrightness = false;
-#endif
-
     enum optionsNumbers { Back, Brightness, ScreenColor };
     static const char *optionsArray[4] = {"Back"};
     static int optionsEnumArray[4] = {Back};
     int options = 1;
 
     // Only show brightness for B&W displays
-    if (hasSupportBrightness) {
+    if (hasSupportBrightness && !HAS_TFT) {
         optionsArray[options] = "Brightness";
         optionsEnumArray[options++] = Brightness;
     }
 
     // Only show screen color for TFT displays
-#if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190) || defined(T_DECK) || HAS_TFT
+#if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190) || HAS_TFT
     optionsArray[options] = "Screen Color";
     optionsEnumArray[options++] = ScreenColor;
 #endif
@@ -1153,9 +1048,6 @@ void menuHandler::handleMenuSwitch(OLEDDisplay *display)
     case lora_picker:
         LoraRegionPicker();
         break;
-    case no_timeout_lora_picker:
-        LoraRegionPicker(0);
-        break;
     case TZ_picker:
         TZPicker();
         break;
@@ -1209,9 +1101,6 @@ void menuHandler::handleMenuSwitch(OLEDDisplay *display)
     case remove_favorite:
         removeFavoriteMenu();
         break;
-    case trace_route_menu:
-        traceRouteMenu();
-        break;
     case test_menu:
         testMenu();
         break;

src/graphics/draw/MenuHandler.h

@@ -10,7 +10,6 @@ class menuHandler
     enum screenMenus {
         menu_none,
         lora_picker,
-        no_timeout_lora_picker,
         TZ_picker,
         twelve_hour_picker,
         clock_face_picker,
@@ -37,22 +36,18 @@ class menuHandler
         system_base_menu,
         key_verification_init,
         key_verification_final_prompt,
-        trace_route_menu,
+        throttle_message
-        throttle_message,
     };
     static screenMenus menuQueue;
 
-    static void OnboardMessage();
     static void LoraRegionPicker(uint32_t duration = 30000);
     static void handleMenuSwitch(OLEDDisplay *display);
-    static void showConfirmationBanner(const char *message, std::function<void()> onConfirm);
     static void clockMenu();
     static void TZPicker();
     static void TwelveHourPicker();
     static void ClockFacePicker();
     static void messageResponseMenu();
     static void homeBaseMenu();
-    static void textMessageBaseMenu();
     static void systemBaseMenu();
     static void favoriteBaseMenu();
     static void positionBaseMenu();
@@ -68,7 +63,6 @@ class menuHandler
     static void shutdownMenu();
     static void addFavoriteMenu();
     static void removeFavoriteMenu();
-    static void traceRouteMenu();
     static void testMenu();
     static void numberTest();
     static void wifiBaseMenu();

src/graphics/draw/MessageRenderer.cpp

@@ -137,11 +137,7 @@ void drawStringWithEmotes(OLEDDisplay *display, int x, int y, const std::string
                 display->drawString(cursorX + 1, fontY, textChunk.c_str());
             }
             display->drawString(cursorX, fontY, textChunk.c_str());
-#if defined(OLED_UA) || defined(OLED_RU)
-            cursorX += display->getStringWidth(textChunk.c_str(), textChunk.length(), true);
-#else
             cursorX += display->getStringWidth(textChunk.c_str());
-#endif
             i = nextControl;
             continue;
         }
@@ -159,12 +155,7 @@ void drawStringWithEmotes(OLEDDisplay *display, int x, int y, const std::string
                 display->drawString(cursorX + 1, fontY, remaining.c_str());
             }
             display->drawString(cursorX, fontY, remaining.c_str());
-#if defined(OLED_UA) || defined(OLED_RU)
-            cursorX += display->getStringWidth(remaining.c_str(), remaining.length(), true);
-#else
             cursorX += display->getStringWidth(remaining.c_str());
-#endif
-
             break;
         }
     }
@@ -282,7 +273,7 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
     currentKey ^= ((size_t)mp.id << 24);
 
     if (cachedKey != currentKey) {
-        LOG_INFO("Onscreen message scroll cache key needs updating: cachedKey=0x%0x, currentKey=0x%x", cachedKey, currentKey);
+        LOG_INFO("Message cache key is misssed cachedKey=0x%0x, currentKey=0x%x", cachedKey, currentKey);
 
         // Cache miss - regenerate lines and heights
         cachedLines = generateLines(display, headerStr, messageBuf, textWidth);
@@ -383,16 +374,10 @@ std::vector<std::string> generateLines(OLEDDisplay *display, const char *headerS
         } else {
             word += ch;
             std::string test = line + word;
-// Keep these lines for diagnostics
+            // Keep these lines for diagnostics
-// LOG_INFO("Char: '%c' (0x%02X)", ch, (unsigned char)ch);
+            // LOG_INFO("Char: '%c' (0x%02X)", ch, (unsigned char)ch);
-// LOG_INFO("Current String: %s", test.c_str());
+            // LOG_INFO("Current String: %s", test.c_str());
-// Note: there are boolean comparison uint16 (getStringWidth) with int (textWidth), hope textWidth is always positive :)
+            if (display->getStringWidth(test.c_str()) > textWidth) {
-#if defined(OLED_UA) || defined(OLED_RU)
-            uint16_t strWidth = display->getStringWidth(test.c_str(), test.length(), true);
-#else
-            uint16_t strWidth = display->getStringWidth(test.c_str());
-#endif
-            if (strWidth > textWidth) {
                 if (!line.empty())
                     lines.push_back(line);
                 line = word;

src/graphics/draw/NotificationRenderer.cpp

@@ -156,7 +156,7 @@ void NotificationRenderer::drawNumberPicker(OLEDDisplay *display, OLEDDisplayUiS
         resetBanner();
         return;
     }
-    if (curSelected == static_cast<int8_t>(numDigits)) {
+    if (curSelected == numDigits) {
         alertBannerCallback(currentNumber);
         resetBanner();
         return;
@@ -383,9 +383,7 @@ void NotificationRenderer::drawAlertBannerOverlay(OLEDDisplay *display, OLEDDisp
 
     uint8_t firstOptionToShow = 0;
     if (alertBannerOptions > 0) {
-        if (visibleTotalLines - lineCount == 1) {
+        if (curSelected > 1 && alertBannerOptions > visibleTotalLines - lineCount) {
-            firstOptionToShow = curSelected;
-        } else if (curSelected > 1 && alertBannerOptions > visibleTotalLines - lineCount) {
             if (curSelected > alertBannerOptions - visibleTotalLines + lineCount)
                 firstOptionToShow = alertBannerOptions - visibleTotalLines + lineCount;
             else
@@ -394,9 +392,6 @@ void NotificationRenderer::drawAlertBannerOverlay(OLEDDisplay *display, OLEDDisp
             firstOptionToShow = 0;
         }
     }
-    // Useful log line for troubleshooting:
-    /* LOG_WARN("alertBannerOptions: %u, curSelected: %u, visibleTotalLines: %u, lineCount: %u, firstOptionToShow: %u",
-             alertBannerOptions, curSelected, visibleTotalLines, lineCount, firstOptionToShow); */
 
     for (int i = firstOptionToShow; i < alertBannerOptions && linesShown < visibleTotalLines; i++, linesShown++) {
         if (i == curSelected) {

src/graphics/draw/UIRenderer.cpp

@@ -24,23 +24,6 @@ extern graphics::Screen *screen;
 namespace graphics
 {
 NodeNum UIRenderer::currentFavoriteNodeNum = 0;
-std::vector<meshtastic_NodeInfoLite *> graphics::UIRenderer::favoritedNodes;
-
-void graphics::UIRenderer::rebuildFavoritedNodes()
-{
-    favoritedNodes.clear();
-    size_t total = nodeDB->getNumMeshNodes();
-    for (size_t i = 0; i < total; i++) {
-        meshtastic_NodeInfoLite *n = nodeDB->getMeshNodeByIndex(i);
-        if (!n || n->num == nodeDB->getNodeNum())
-            continue;
-        if (n->is_favorite)
-            favoritedNodes.push_back(n);
-    }
-
-    std::sort(favoritedNodes.begin(), favoritedNodes.end(),
-              [](const meshtastic_NodeInfoLite *a, const meshtastic_NodeInfoLite *b) { return a->num < b->num; });
-}
 
 #if !MESHTASTIC_EXCLUDE_GPS
 // GeoCoord object for coordinate conversions
@@ -218,7 +201,27 @@ void UIRenderer::drawNodes(OLEDDisplay *display, int16_t x, int16_t y, const mes
 // **********************
 void UIRenderer::drawNodeInfo(OLEDDisplay *display, const OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
+    // --- Cache favorite nodes for the current frame only, to save computation ---
+    static std::vector<meshtastic_NodeInfoLite *> favoritedNodes;
+    static int prevFrame = -1;
 
+    // --- Only rebuild favorites list if we're on a new frame ---
+    if (state->currentFrame != prevFrame) {
+        prevFrame = state->currentFrame;
+        favoritedNodes.clear();
+        size_t total = nodeDB->getNumMeshNodes();
+        for (size_t i = 0; i < total; i++) {
+            meshtastic_NodeInfoLite *n = nodeDB->getMeshNodeByIndex(i);
+            // Skip nulls and ourself
+            if (!n || n->num == nodeDB->getNodeNum())
+                continue;
+            if (n->is_favorite)
+                favoritedNodes.push_back(n);
+        }
+        // Keep a stable, consistent display order
+        std::sort(favoritedNodes.begin(), favoritedNodes.end(),
+                  [](const meshtastic_NodeInfoLite *a, const meshtastic_NodeInfoLite *b) { return a->num < b->num; });
+    }
     if (favoritedNodes.empty())
         return;
 
@@ -654,7 +657,7 @@ void UIRenderer::drawDeviceFocused(OLEDDisplay *display, OLEDDisplayUiState *sta
 
     char combinedName[50];
     snprintf(combinedName, sizeof(combinedName), "%s (%s)", longNameStr.empty() ? "" : longNameStr.c_str(), shortnameble);
-    if (SCREEN_WIDTH - (display->getStringWidth(combinedName)) > 10) {
+    if (SCREEN_WIDTH - (display->getStringWidth(longName) + display->getStringWidth(shortnameble)) > 10) {
         size_t len = strlen(combinedName);
         if (len >= 3 && strcmp(combinedName + len - 3, " ()") == 0) {
             combinedName[len - 3] = '\0'; // Remove the last three characters
@@ -665,7 +668,7 @@ void UIRenderer::drawDeviceFocused(OLEDDisplay *display, OLEDDisplayUiState *sta
             nameX, ((rows == 4) ? getTextPositions(display)[line++] : getTextPositions(display)[line++]) + yOffset, combinedName);
     } else {
         // === LongName Centered ===
-        textWidth = display->getStringWidth(longNameStr.c_str());
+        textWidth = display->getStringWidth(longName);
         nameX = (SCREEN_WIDTH - textWidth) / 2;
         display->drawString(nameX, getTextPositions(display)[line++], longNameStr.c_str());
 

src/graphics/draw/UIRenderer.h

@@ -61,8 +61,6 @@ class UIRenderer
     static void drawCompassAndLocationScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
 
     static NodeNum currentFavoriteNodeNum;
-    static std::vector<meshtastic_NodeInfoLite *> favoritedNodes;
-    static void rebuildFavoritedNodes();
 
 // OEM screens
 #ifdef USERPREFS_OEM_TEXT

src/graphics/fonts/EinkDisplayFonts.cpp

@@ -1,5 +1,3 @@
-#ifdef USE_EINK
-
 #include "EinkDisplayFonts.h"
 
 // Created by https://oleddisplay.squix.ch/ Consider a donation
@@ -1184,5 +1182,3 @@ const uint8_t Monospaced_plain_30[] PROGMEM = {
     0xF0, 0xFF, 0x01, 0x00, 0x00, 0xC0, 0x7F, 0x00, 0x00, 0x00, 0xF0, 0x0F, 0x00, 0xE0, 0x00, 0xFE, 0x03, 0x00, 0xE0, 0x80, 0x7F,
     0x00, 0x00, 0xE0, 0xE0, 0x1F, 0x00, 0x00, 0x00, 0xF0, 0x03, 0x00, 0x00, 0x00, 0xF0, 0x00, 0x00, 0x00, 0x00, 0x10 // 255
 };
-
-#endif // USE_EINK

src/graphics/fonts/EinkDisplayFonts.h

@@ -1,8 +1,6 @@
 #ifndef EINKDISPLAYFONTS_h
 #define EINKDISPLAYFONTS_h
 
-#ifdef USE_EINK
-
 #ifdef ARDUINO
 #include <Arduino.h>
 #elif __MBED__
@@ -13,7 +11,4 @@
  * Monospaced Plain 30
  */
 extern const uint8_t Monospaced_plain_30[] PROGMEM;
-
-#endif // USE_EINK
-
 #endif

src/graphics/fonts/OLEDDisplayFontsCS.cpp

@@ -1,5 +1,3 @@
-#ifdef OLED_CS
-
 #include "OLEDDisplayFontsCS.h"
 
 // Font generated or edited with the glyphEditor
@@ -1862,6 +1860,4 @@ const uint8_t ArialMT_Plain_24_CS[] PROGMEM = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x06, 0xC0, 0xF0, 0x01, 0x06, 0xC0, 0x80, 0x0F, 0x07, 0x00,
     0x00, 0xFE, 0x03, 0x00, 0x00, 0xFC, 0x00, 0xC0, 0xC0, 0x1F, 0x00, 0xC0, 0xF8, 0x03, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00,
     0x06, // 255
-};
+};
-
-#endif // OLED_CS

src/graphics/fonts/OLEDDisplayFontsPL.cpp

@@ -1,5 +1,4 @@
 // trunk-ignore-all(clang-format): Preserve long lines
-#ifdef OLED_PL
 #include "OLEDDisplayFontsPL.h"
 
 const uint8_t ArialMT_Plain_10_PL[] PROGMEM = {
@@ -1311,6 +1310,4 @@ const uint8_t ArialMT_Plain_24_PL[] PROGMEM = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x06, 0x00, 0xF0, 0x01, 0x06, 0x00, 0x80, 0x0F, 0x07, 0x80, 0x00, 0xFE, 0x03, 0xE0, 0x00, 0xFC, 0x00, 0x60, 0xC0, 0x1F, 0x00, 0x20, 0xF8, 0x03, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x06, // 253
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xFF, 0xFF, 0x07, 0xE0, 0xFF, 0xFF, 0x07, 0x00, 0x1C, 0x18, 0x00, 0x00, 0x06, 0x30, 0x00, 0x00, 0x06, 0x30, 0x00, 0x00, 0x06, 0x30, 0x00, 0x00, 0x0E, 0x38, 0x00, 0x00, 0x1C, 0x1C, 0x00, 0x00, 0xF8, 0x0F, 0x00, 0x00, 0xF0, 0x03, // 254
     0x00, 0x00, 0x00, 0x00, 0x00, 0x0E, 0x00, 0x00, 0x00, 0x7E, 0x00, 0x06, 0xC0, 0xF0, 0x01, 0x06, 0xC0, 0x80, 0x0F, 0x07, 0x00, 0x00, 0xFE, 0x03, 0x00, 0x00, 0xFC, 0x00, 0xC0, 0xC0, 0x1F, 0x00, 0xC0, 0xF8, 0x03, 0x00, 0x00, 0x3E, 0x00, 0x00, 0x00, 0x06, // 255
-};
+};
-
-#endif // OLED_PL

src/graphics/fonts/OLEDDisplayFontsRU.h

@@ -8,6 +8,4 @@
 #endif
 
 extern const uint8_t ArialMT_Plain_10_RU[] PROGMEM;
-extern const uint8_t ArialMT_Plain_16_RU[] PROGMEM;
-extern const uint8_t ArialMT_Plain_24_RU[] PROGMEM;
 #endif

src/graphics/fonts/OLEDDisplayFontsUA.cpp

@@ -1,5 +1,3 @@
-#ifdef OLED_UA
-
 #include "OLEDDisplayFontsUA.h"
 
 // Font generated or edited with the glyphEditor
@@ -1922,6 +1920,4 @@ const uint8_t ArialMT_Plain_24_UA[] PROGMEM = {
     0x00, 0x00, 0x00, 0x00, 0x00, 0xE0, 0xC1, 0x00, 0x00, 0xF0, 0xE3, 0x00, 0x00, 0x38, 0x7B, 0x00, 0x00, 0x18, 0x1A, 0x00, 0x00,
     0x18, 0x0E, 0x00, 0x00, 0x18, 0x06, 0x00, 0x00, 0x18, 0x06, 0x00, 0x00, 0x18, 0x06, 0x00, 0x00, 0xF8, 0xFF, 0x00, 0x00, 0xF8,
     0xFF, // 1103
-};
+};
-
-#endif // OLED_UA

src/graphics/niche/InkHUD/Applets/System/Menu/MenuApplet.cpp

@@ -223,7 +223,7 @@ void InkHUD::MenuApplet::execute(MenuItem item)
 
     case SHUTDOWN:
         LOG_INFO("Shutting down from menu");
-        shutdownAtMsec = millis();
+        power->shutdown();
         // Menu is then sent to background via onShutdown
         break;
 

src/graphics/niche/InkHUD/PlatformioConfig.ini

@@ -1,6 +1,7 @@
 [inkhud]
 build_src_filter = 
   +<graphics/niche/>; Include the nicheGraphics directory
+  +<../variants/$PIOENV>; Include nicheGraphics.h from our variant folder
 build_flags = 
   -D MESHTASTIC_INCLUDE_NICHE_GRAPHICS ; Use NicheGraphics
   -D MESHTASTIC_INCLUDE_INKHUD ; Use InkHUD (a NicheGraphics UI)

src/input/ButtonThread.cpp

@@ -53,21 +53,23 @@ bool ButtonThread::initButton(const ButtonConfig &config)
         },
         this);
 
-    _longPress = config.longPress;
+    if (config.longPress != INPUT_BROKER_NONE) {
-    userButton.attachLongPressStart(
+        _longPress = config.longPress;
-        [](void *callerThread) -> void {
+        userButton.attachLongPressStart(
-            ButtonThread *thread = (ButtonThread *)callerThread;
+            [](void *callerThread) -> void {
-            // if (millis() > 30000) // hold off 30s after boot
+                ButtonThread *thread = (ButtonThread *)callerThread;
-            thread->btnEvent = BUTTON_EVENT_LONG_PRESSED;
+                // if (millis() > 30000) // hold off 30s after boot
-        },
+                thread->btnEvent = BUTTON_EVENT_LONG_PRESSED;
-        this);
+            },
-    userButton.attachLongPressStop(
+            this);
-        [](void *callerThread) -> void {
+        userButton.attachLongPressStop(
-            ButtonThread *thread = (ButtonThread *)callerThread;
+            [](void *callerThread) -> void {
-            // if (millis() > 30000) // hold off 30s after boot
+                ButtonThread *thread = (ButtonThread *)callerThread;
-            thread->btnEvent = BUTTON_EVENT_LONG_RELEASED;
+                // if (millis() > 30000) // hold off 30s after boot
-        },
+                thread->btnEvent = BUTTON_EVENT_LONG_RELEASED;
-        this);
+            },
+            this);
+    }
 
     if (config.doublePress != INPUT_BROKER_NONE) {
         _doublePress = config.doublePress;
@@ -92,11 +94,8 @@ bool ButtonThread::initButton(const ButtonConfig &config)
     if (config.shortLong != INPUT_BROKER_NONE) {
         _shortLong = config.shortLong;
     }
-#ifdef USE_EINK
+
-    userButton.setDebounceMs(0);
-#else
     userButton.setDebounceMs(1);
-#endif
     userButton.setPressMs(_longPressTime);
 
     if (screen) {
@@ -140,7 +139,8 @@ int32_t ButtonThread::runOnce()
     }
 
     // Progressive lead-up sound system
-    if (buttonCurrentlyPressed && (millis() - buttonPressStartTime) >= BUTTON_LEADUP_MS) {
+    if (buttonCurrentlyPressed && (millis() - buttonPressStartTime) >= BUTTON_LEADUP_MS &&
+        (millis() - buttonPressStartTime) < _longLongPressTime) {
 
         // Start the progressive sequence if not already active
         if (!leadUpSequenceActive) {
@@ -152,14 +152,13 @@ int32_t ButtonThread::runOnce()
         else if ((millis() - lastLeadUpNoteTime) >= 400) { // 400ms interval between notes
             if (playNextLeadUpNote()) {
                 lastLeadUpNoteTime = millis();
-            } else {
-                leadUpPlayed = true;
             }
         }
     }
 
     // Reset when button is released
     if (!buttonCurrentlyPressed && buttonWasPressed) {
+        leadUpPlayed = false;
         leadUpSequenceActive = false;
         resetLeadUpSequence();
     }
@@ -203,11 +202,11 @@ int32_t ButtonThread::runOnce()
 
                 break;
             }
-            if (_longPress != INPUT_BROKER_NONE) {
+
-                // Forward long press to InputBroker (but NOT as DOWN/SELECT, just forward a "button long press" event)
+            // Forward long press to InputBroker (but NOT as DOWN/SELECT, just forward a "button long press" event)
-                evt.inputEvent = _longPress;
+            evt.inputEvent = _longPress;
-                this->notifyObservers(&evt);
+            this->notifyObservers(&evt);
-            }
+
             // Reset combination tracking
             waitingForLongPress = false;
 
@@ -254,15 +253,14 @@ int32_t ButtonThread::runOnce()
         // may wake the board immediatedly.
         case BUTTON_EVENT_LONG_RELEASED: {
 
-            LOG_INFO("LONG PRESS RELEASE AFTER %u MILLIS", millis() - buttonPressStartTime);
+            LOG_INFO("LONG PRESS RELEASE");
             if (millis() > 30000 && _longLongPress != INPUT_BROKER_NONE &&
-                (millis() - buttonPressStartTime) >= _longLongPressTime && leadUpPlayed) {
+                (millis() - buttonPressStartTime) >= _longLongPressTime) {
                 evt.inputEvent = _longLongPress;
                 this->notifyObservers(&evt);
             }
             // Reset combination tracking
             waitingForLongPress = false;
-            leadUpPlayed = false;
 
             break;
         }

src/input/ButtonThread.h

@@ -18,13 +18,13 @@ struct ButtonConfig {
     uint16_t longPressTime = 500;
     input_broker_event doublePress = INPUT_BROKER_NONE;
     input_broker_event longLongPress = INPUT_BROKER_NONE;
-    uint16_t longLongPressTime = 3900;
+    uint16_t longLongPressTime = 5000;
     input_broker_event triplePress = INPUT_BROKER_NONE;
     input_broker_event shortLong = INPUT_BROKER_NONE;
     bool touchQuirk = false;
 
     // Constructor to set required parameter
-    explicit ButtonConfig(uint8_t pin = 0) : pinNumber(pin) {}
+    ButtonConfig(uint8_t pin = 0) : pinNumber(pin) {}
 };
 
 #ifndef BUTTON_CLICK_MS
@@ -62,7 +62,7 @@ class ButtonThread : public Observable<const InputEvent *>, public concurrency::
         BUTTON_EVENT_COMBO_SHORT_LONG,
     };
 
-    explicit ButtonThread(const char *name);
+    ButtonThread(const char *name);
     int32_t runOnce() override;
     OneButton userButton;
     void attachButtonInterrupts();
@@ -92,7 +92,7 @@ class ButtonThread : public Observable<const InputEvent *>, public concurrency::
 
     voidFuncPtr _intRoutine = nullptr;
     uint16_t _longPressTime = 500;
-    uint16_t _longLongPressTime = 3900;
+    uint16_t _longLongPressTime = 5000;
     int _pinNum = 0;
     bool _activeLow = true;
     bool _touchQuirk = false;

src/input/ExpressLRSFiveWay.cpp

@@ -199,7 +199,7 @@ void ExpressLRSFiveWay::sendKey(input_broker_event key)
 void ExpressLRSFiveWay::toggleGPS()
 {
 #if HAS_GPS && !MESHTASTIC_EXCLUDE_GPS
-    if (gps != nullptr) {
+    if (!config.device.disable_triple_click && (gps != nullptr)) {
         gps->toggleGpsMode();
         screen->startAlert("GPS Toggled");
         alerting = true;
@@ -233,7 +233,14 @@ void ExpressLRSFiveWay::sendAdhocPing()
 // Contained as one method for easier remapping of buttons by user
 void ExpressLRSFiveWay::shutdown()
 {
-    sendKey(INPUT_BROKER_SHUTDOWN);
+    LOG_INFO("Shutdown from long press");
+    powerFSM.trigger(EVENT_PRESS);
+    screen->startAlert("Shutting Down...");
+    // Don't set alerting = true. We don't want to auto-dismiss this alert.
+
+    playShutdownMelody(); // In case user adds a buzzer
+
+    shutdownAtMsec = millis() + 3000;
 }
 
 void ExpressLRSFiveWay::click()

src/input/TCA8418Keyboard.cpp

@@ -1,18 +1,116 @@
+// Based on the MPR121 Keyboard and Adafruit TCA8418 library
+
 #include "TCA8418Keyboard.h"
+#include "configuration.h"
+
+#include <Arduino.h>
+
+// REGISTERS
+// #define _TCA8418_REG_RESERVED 0x00
+#define _TCA8418_REG_CFG 0x01             // Configuration register
+#define _TCA8418_REG_INT_STAT 0x02        // Interrupt status
+#define _TCA8418_REG_KEY_LCK_EC 0x03      // Key lock and event counter
+#define _TCA8418_REG_KEY_EVENT_A 0x04     // Key event register A
+#define _TCA8418_REG_KEY_EVENT_B 0x05     // Key event register B
+#define _TCA8418_REG_KEY_EVENT_C 0x06     // Key event register C
+#define _TCA8418_REG_KEY_EVENT_D 0x07     // Key event register D
+#define _TCA8418_REG_KEY_EVENT_E 0x08     // Key event register E
+#define _TCA8418_REG_KEY_EVENT_F 0x09     // Key event register F
+#define _TCA8418_REG_KEY_EVENT_G 0x0A     // Key event register G
+#define _TCA8418_REG_KEY_EVENT_H 0x0B     // Key event register H
+#define _TCA8418_REG_KEY_EVENT_I 0x0C     // Key event register I
+#define _TCA8418_REG_KEY_EVENT_J 0x0D     // Key event register J
+#define _TCA8418_REG_KP_LCK_TIMER 0x0E    // Keypad lock1 to lock2 timer
+#define _TCA8418_REG_UNLOCK_1 0x0F        // Unlock register 1
+#define _TCA8418_REG_UNLOCK_2 0x10        // Unlock register 2
+#define _TCA8418_REG_GPIO_INT_STAT_1 0x11 // GPIO interrupt status 1
+#define _TCA8418_REG_GPIO_INT_STAT_2 0x12 // GPIO interrupt status 2
+#define _TCA8418_REG_GPIO_INT_STAT_3 0x13 // GPIO interrupt status 3
+#define _TCA8418_REG_GPIO_DAT_STAT_1 0x14 // GPIO data status 1
+#define _TCA8418_REG_GPIO_DAT_STAT_2 0x15 // GPIO data status 2
+#define _TCA8418_REG_GPIO_DAT_STAT_3 0x16 // GPIO data status 3
+#define _TCA8418_REG_GPIO_DAT_OUT_1 0x17  // GPIO data out 1
+#define _TCA8418_REG_GPIO_DAT_OUT_2 0x18  // GPIO data out 2
+#define _TCA8418_REG_GPIO_DAT_OUT_3 0x19  // GPIO data out 3
+#define _TCA8418_REG_GPIO_INT_EN_1 0x1A   // GPIO interrupt enable 1
+#define _TCA8418_REG_GPIO_INT_EN_2 0x1B   // GPIO interrupt enable 2
+#define _TCA8418_REG_GPIO_INT_EN_3 0x1C   // GPIO interrupt enable 3
+#define _TCA8418_REG_KP_GPIO_1 0x1D       // Keypad/GPIO select 1
+#define _TCA8418_REG_KP_GPIO_2 0x1E       // Keypad/GPIO select 2
+#define _TCA8418_REG_KP_GPIO_3 0x1F       // Keypad/GPIO select 3
+#define _TCA8418_REG_GPI_EM_1 0x20        // GPI event mode 1
+#define _TCA8418_REG_GPI_EM_2 0x21        // GPI event mode 2
+#define _TCA8418_REG_GPI_EM_3 0x22        // GPI event mode 3
+#define _TCA8418_REG_GPIO_DIR_1 0x23      // GPIO data direction 1
+#define _TCA8418_REG_GPIO_DIR_2 0x24      // GPIO data direction 2
+#define _TCA8418_REG_GPIO_DIR_3 0x25      // GPIO data direction 3
+#define _TCA8418_REG_GPIO_INT_LVL_1 0x26  // GPIO edge/level detect 1
+#define _TCA8418_REG_GPIO_INT_LVL_2 0x27  // GPIO edge/level detect 2
+#define _TCA8418_REG_GPIO_INT_LVL_3 0x28  // GPIO edge/level detect 3
+#define _TCA8418_REG_DEBOUNCE_DIS_1 0x29  // Debounce disable 1
+#define _TCA8418_REG_DEBOUNCE_DIS_2 0x2A  // Debounce disable 2
+#define _TCA8418_REG_DEBOUNCE_DIS_3 0x2B  // Debounce disable 3
+#define _TCA8418_REG_GPIO_PULL_1 0x2C     // GPIO pull-up disable 1
+#define _TCA8418_REG_GPIO_PULL_2 0x2D     // GPIO pull-up disable 2
+#define _TCA8418_REG_GPIO_PULL_3 0x2E     // GPIO pull-up disable 3
+// #define _TCA8418_REG_RESERVED 0x2F
+
+// FIELDS CONFIG REGISTER  1
+#define _TCA8418_REG_CFG_AI 0x80           // Auto-increment for read/write
+#define _TCA8418_REG_CFG_GPI_E_CGF 0x40    // Event mode config
+#define _TCA8418_REG_CFG_OVR_FLOW_M 0x20   // Overflow mode enable
+#define _TCA8418_REG_CFG_INT_CFG 0x10      // Interrupt config
+#define _TCA8418_REG_CFG_OVR_FLOW_IEN 0x08 // Overflow interrupt enable
+#define _TCA8418_REG_CFG_K_LCK_IEN 0x04    // Keypad lock interrupt enable
+#define _TCA8418_REG_CFG_GPI_IEN 0x02      // GPI interrupt enable
+#define _TCA8418_REG_CFG_KE_IEN 0x01       // Key events interrupt enable
+
+// FIELDS INT_STAT REGISTER  2
+#define _TCA8418_REG_STAT_CAD_INT 0x10      // Ctrl-alt-del seq status
+#define _TCA8418_REG_STAT_OVR_FLOW_INT 0x08 // Overflow interrupt status
+#define _TCA8418_REG_STAT_K_LCK_INT 0x04    // Key lock interrupt status
+#define _TCA8418_REG_STAT_GPI_INT 0x02      // GPI interrupt status
+#define _TCA8418_REG_STAT_K_INT 0x01        // Key events interrupt status
+
+// FIELDS  KEY_LCK_EC REGISTER 3
+#define _TCA8418_REG_LCK_EC_K_LCK_EN 0x40 // Key lock enable
+#define _TCA8418_REG_LCK_EC_LCK_2 0x20    // Keypad lock status 2
+#define _TCA8418_REG_LCK_EC_LCK_1 0x10    // Keypad lock status 1
+#define _TCA8418_REG_LCK_EC_KLEC_3 0x08   // Key event count bit 3
+#define _TCA8418_REG_LCK_EC_KLEC_2 0x04   // Key event count bit 2
+#define _TCA8418_REG_LCK_EC_KLEC_1 0x02   // Key event count bit 1
+#define _TCA8418_REG_LCK_EC_KLEC_0 0x01   // Key event count bit 0
+
+// Pin IDs for matrix rows/columns
+enum {
+    _TCA8418_ROW0, // Pin ID for row 0
+    _TCA8418_ROW1, // Pin ID for row 1
+    _TCA8418_ROW2, // Pin ID for row 2
+    _TCA8418_ROW3, // Pin ID for row 3
+    _TCA8418_ROW4, // Pin ID for row 4
+    _TCA8418_ROW5, // Pin ID for row 5
+    _TCA8418_ROW6, // Pin ID for row 6
+    _TCA8418_ROW7, // Pin ID for row 7
+    _TCA8418_COL0, // Pin ID for column 0
+    _TCA8418_COL1, // Pin ID for column 1
+    _TCA8418_COL2, // Pin ID for column 2
+    _TCA8418_COL3, // Pin ID for column 3
+    _TCA8418_COL4, // Pin ID for column 4
+    _TCA8418_COL5, // Pin ID for column 5
+    _TCA8418_COL6, // Pin ID for column 6
+    _TCA8418_COL7, // Pin ID for column 7
+    _TCA8418_COL8, // Pin ID for column 8
+    _TCA8418_COL9  // Pin ID for column 9
+};
 
 #define _TCA8418_COLS 3
 #define _TCA8418_ROWS 4
 #define _TCA8418_NUM_KEYS 12
 
-#define _TCA8418_LONG_PRESS_THRESHOLD 2000
+uint8_t TCA8418TapMod[_TCA8418_NUM_KEYS] = {13, 7, 7, 7, 7, 7,
-#define _TCA8418_MULTI_TAP_THRESHOLD 750
+                                            9,  7, 9, 2, 2, 2}; // Num chars per key, Modulus for rotating through characters
 
-using Key = TCA8418KeyboardBase::TCA8418Key;
+unsigned char TCA8418TapMap[_TCA8418_NUM_KEYS][13] = {
-
-// Num chars per key, Modulus for rotating through characters
-static uint8_t TCA8418TapMod[_TCA8418_NUM_KEYS] = {13, 7, 7, 7, 7, 7, 9, 7, 9, 2, 2, 2};
-
-static unsigned char TCA8418TapMap[_TCA8418_NUM_KEYS][13] = {
     {'1', '.', ',', '?', '!', ':', ';', '-', '_', '\\', '/', '(', ')'}, // 1
     {'2', 'a', 'b', 'c', 'A', 'B', 'C'},                                // 2
     {'3', 'd', 'e', 'f', 'D', 'E', 'F'},                                // 3
@@ -27,35 +125,176 @@ static unsigned char TCA8418TapMap[_TCA8418_NUM_KEYS][13] = {
     {'#', '@'},                                                         // #
 };
 
-static unsigned char TCA8418LongPressMap[_TCA8418_NUM_KEYS] = {
+unsigned char TCA8418LongPressMap[_TCA8418_NUM_KEYS] = {
-    Key::ESC,   // 1
+    _TCA8418_ESC,   // 1
-    Key::UP,    // 2
+    _TCA8418_UP,    // 2
-    Key::NONE,  // 3
+    _TCA8418_NONE,  // 3
-    Key::LEFT,  // 4
+    _TCA8418_LEFT,  // 4
-    Key::NONE,  // 5
+    _TCA8418_NONE,  // 5
-    Key::RIGHT, // 6
+    _TCA8418_RIGHT, // 6
-    Key::NONE,  // 7
+    _TCA8418_NONE,  // 7
-    Key::DOWN,  // 8
+    _TCA8418_DOWN,  // 8
-    Key::NONE,  // 9
+    _TCA8418_NONE,  // 9
-    Key::BSP,   // *
+    _TCA8418_BSP,   // *
-    Key::NONE,  // 0
+    _TCA8418_NONE,  // 0
-    Key::NONE,  // #
+    _TCA8418_NONE,  // #
 };
 
-TCA8418Keyboard::TCA8418Keyboard()
+#define _TCA8418_LONG_PRESS_THRESHOLD 2000
-    : TCA8418KeyboardBase(_TCA8418_ROWS, _TCA8418_COLS), last_key(-1), next_key(-1), last_tap(0L), char_idx(0), tap_interval(0),
+#define _TCA8418_MULTI_TAP_THRESHOLD 750
-      should_backspace(false)
+
+TCA8418Keyboard::TCA8418Keyboard() : m_wire(nullptr), m_addr(0), readCallback(nullptr), writeCallback(nullptr)
 {
+    state = Init;
+    last_key = -1;
+    should_backspace = false;
+    last_tap = 0L;
+    char_idx = 0;
+    tap_interval = 0;
+    backlight_on = true;
+    queue = "";
+}
+
+void TCA8418Keyboard::begin(uint8_t addr, TwoWire *wire)
+{
+    m_addr = addr;
+    m_wire = wire;
+
+    m_wire->begin();
+
+    reset();
+}
+
+void TCA8418Keyboard::begin(i2c_com_fptr_t r, i2c_com_fptr_t w, uint8_t addr)
+{
+    m_addr = addr;
+    m_wire = nullptr;
+    writeCallback = w;
+    readCallback = r;
+    reset();
 }
 
 void TCA8418Keyboard::reset()
 {
-    TCA8418KeyboardBase::reset();
+    LOG_DEBUG("TCA8418 Reset");
-
+    //  GPIO
+    //  set default all GIO pins to INPUT
+    writeRegister(_TCA8418_REG_GPIO_DIR_1, 0x00);
+    writeRegister(_TCA8418_REG_GPIO_DIR_2, 0x00);
     // Set COL9 as GPIO output
-    writeRegister(TCA8418_REG_GPIO_DIR_3, 0x02);
+    writeRegister(_TCA8418_REG_GPIO_DIR_3, 0x02);
     // Switch off keyboard backlight (COL9 = LOW)
-    writeRegister(TCA8418_REG_GPIO_DAT_OUT_3, 0x00);
+    writeRegister(_TCA8418_REG_GPIO_DAT_OUT_3, 0x00);
+
+    //  add all pins to key events
+    writeRegister(_TCA8418_REG_GPI_EM_1, 0xFF);
+    writeRegister(_TCA8418_REG_GPI_EM_2, 0xFF);
+    writeRegister(_TCA8418_REG_GPI_EM_3, 0xFF);
+
+    //  set all pins to FALLING interrupts
+    writeRegister(_TCA8418_REG_GPIO_INT_LVL_1, 0x00);
+    writeRegister(_TCA8418_REG_GPIO_INT_LVL_2, 0x00);
+    writeRegister(_TCA8418_REG_GPIO_INT_LVL_3, 0x00);
+
+    //  add all pins to interrupts
+    writeRegister(_TCA8418_REG_GPIO_INT_EN_1, 0xFF);
+    writeRegister(_TCA8418_REG_GPIO_INT_EN_2, 0xFF);
+    writeRegister(_TCA8418_REG_GPIO_INT_EN_3, 0xFF);
+
+    // Set keyboard matrix size
+    matrix(_TCA8418_ROWS, _TCA8418_COLS);
+    enableDebounce();
+    flush();
+    state = Idle;
+}
+
+bool TCA8418Keyboard::matrix(uint8_t rows, uint8_t columns)
+{
+    if ((rows > 8) || (columns > 10))
+        return false;
+
+    //  Skip zero size matrix
+    if ((rows != 0) && (columns != 0)) {
+        // Setup the keypad matrix.
+        uint8_t mask = 0x00;
+        for (int r = 0; r < rows; r++) {
+            mask <<= 1;
+            mask |= 1;
+        }
+        writeRegister(_TCA8418_REG_KP_GPIO_1, mask);
+
+        mask = 0x00;
+        for (int c = 0; c < columns && c < 8; c++) {
+            mask <<= 1;
+            mask |= 1;
+        }
+        writeRegister(_TCA8418_REG_KP_GPIO_2, mask);
+
+        if (columns > 8) {
+            if (columns == 9)
+                mask = 0x01;
+            else
+                mask = 0x03;
+            writeRegister(_TCA8418_REG_KP_GPIO_3, mask);
+        }
+    }
+
+    return true;
+}
+
+uint8_t TCA8418Keyboard::keyCount() const
+{
+    uint8_t eventCount = readRegister(_TCA8418_REG_KEY_LCK_EC);
+    eventCount &= 0x0F; //  lower 4 bits only
+    return eventCount;
+}
+
+bool TCA8418Keyboard::hasEvent()
+{
+    return queue.length() > 0;
+}
+
+void TCA8418Keyboard::queueEvent(char next)
+{
+    if (next == _TCA8418_NONE) {
+        return;
+    }
+    queue.concat(next);
+}
+
+char TCA8418Keyboard::dequeueEvent()
+{
+    if (queue.length() < 1) {
+        return _TCA8418_NONE;
+    }
+    char next = queue.charAt(0);
+    queue.remove(0, 1);
+    return next;
+}
+
+void TCA8418Keyboard::trigger()
+{
+    if (keyCount() == 0) {
+        return;
+    }
+    if (state != Init) {
+        // Read the key register
+        uint8_t k = readRegister(_TCA8418_REG_KEY_EVENT_A);
+        uint8_t key = k & 0x7F;
+        if (k & 0x80) {
+            if (state == Idle)
+                pressed(key);
+            return;
+        } else {
+            if (state == Held) {
+                released();
+            }
+            state = Idle;
+            return;
+        }
+    } else {
+        reset();
+    }
 }
 
 void TCA8418Keyboard::pressed(uint8_t key)
@@ -115,7 +354,7 @@ void TCA8418Keyboard::released()
     int32_t held_interval = now - last_tap;
     last_tap = now;
     if (tap_interval < _TCA8418_MULTI_TAP_THRESHOLD && should_backspace) {
-        queueEvent(BSP);
+        queueEvent(_TCA8418_BSP);
     }
     if (held_interval > _TCA8418_LONG_PRESS_THRESHOLD) {
         queueEvent(TCA8418LongPressMap[last_key]);
@@ -127,11 +366,195 @@ void TCA8418Keyboard::released()
     }
 }
 
+uint8_t TCA8418Keyboard::flush()
+{
+    // Flush key events
+    uint8_t count = 0;
+    while (readRegister(_TCA8418_REG_KEY_EVENT_A) != 0)
+        count++;
+    // Flush gpio events
+    readRegister(_TCA8418_REG_GPIO_INT_STAT_1);
+    readRegister(_TCA8418_REG_GPIO_INT_STAT_2);
+    readRegister(_TCA8418_REG_GPIO_INT_STAT_3);
+    // Clear INT_STAT register
+    writeRegister(_TCA8418_REG_INT_STAT, 3);
+    return count;
+}
+
+uint8_t TCA8418Keyboard::digitalRead(uint8_t pinnum) const
+{
+    if (pinnum > _TCA8418_COL9)
+        return 0xFF;
+
+    uint8_t reg = _TCA8418_REG_GPIO_DAT_STAT_1 + pinnum / 8;
+    uint8_t mask = (1 << (pinnum % 8));
+
+    // Level  0 = low  other = high
+    uint8_t value = readRegister(reg);
+    if (value & mask)
+        return HIGH;
+    return LOW;
+}
+
+bool TCA8418Keyboard::digitalWrite(uint8_t pinnum, uint8_t level)
+{
+    if (pinnum > _TCA8418_COL9)
+        return false;
+
+    uint8_t reg = _TCA8418_REG_GPIO_DAT_OUT_1 + pinnum / 8;
+    uint8_t mask = (1 << (pinnum % 8));
+
+    // Level  0 = low  other = high
+    uint8_t value = readRegister(reg);
+    if (level == LOW)
+        value &= ~mask;
+    else
+        value |= mask;
+    writeRegister(reg, value);
+    return true;
+}
+
+bool TCA8418Keyboard::pinMode(uint8_t pinnum, uint8_t mode)
+{
+    if (pinnum > _TCA8418_COL9)
+        return false;
+
+    uint8_t idx = pinnum / 8;
+    uint8_t reg = _TCA8418_REG_GPIO_DIR_1 + idx;
+    uint8_t mask = (1 << (pinnum % 8));
+
+    // Mode  0 = input   1 = output
+    uint8_t value = readRegister(reg);
+    if (mode == OUTPUT)
+        value |= mask;
+    else
+        value &= ~mask;
+    writeRegister(reg, value);
+
+    // Pullup  0 = enabled   1 = disabled
+    reg = _TCA8418_REG_GPIO_PULL_1 + idx;
+    value = readRegister(reg);
+    if (mode == INPUT_PULLUP)
+        value &= ~mask;
+    else
+        value |= mask;
+    writeRegister(reg, value);
+
+    return true;
+}
+
+bool TCA8418Keyboard::pinIRQMode(uint8_t pinnum, uint8_t mode)
+{
+    if (pinnum > _TCA8418_COL9)
+        return false;
+    if ((mode != RISING) && (mode != FALLING))
+        return false;
+
+    //  Mode  0 = falling   1 = rising
+    uint8_t idx = pinnum / 8;
+    uint8_t reg = _TCA8418_REG_GPIO_INT_LVL_1 + idx;
+    uint8_t mask = (1 << (pinnum % 8));
+
+    uint8_t value = readRegister(reg);
+    if (mode == RISING)
+        value |= mask;
+    else
+        value &= ~mask;
+    writeRegister(reg, value);
+
+    // Enable interrupt
+    reg = _TCA8418_REG_GPIO_INT_EN_1 + idx;
+    value = readRegister(reg);
+    value |= mask;
+    writeRegister(reg, value);
+
+    return true;
+}
+
+void TCA8418Keyboard::enableInterrupts()
+{
+    uint8_t value = readRegister(_TCA8418_REG_CFG);
+    value |= (_TCA8418_REG_CFG_GPI_IEN | _TCA8418_REG_CFG_KE_IEN);
+    writeRegister(_TCA8418_REG_CFG, value);
+};
+
+void TCA8418Keyboard::disableInterrupts()
+{
+    uint8_t value = readRegister(_TCA8418_REG_CFG);
+    value &= ~(_TCA8418_REG_CFG_GPI_IEN | _TCA8418_REG_CFG_KE_IEN);
+    writeRegister(_TCA8418_REG_CFG, value);
+};
+
+void TCA8418Keyboard::enableMatrixOverflow()
+{
+    uint8_t value = readRegister(_TCA8418_REG_CFG);
+    value |= _TCA8418_REG_CFG_OVR_FLOW_M;
+    writeRegister(_TCA8418_REG_CFG, value);
+};
+
+void TCA8418Keyboard::disableMatrixOverflow()
+{
+    uint8_t value = readRegister(_TCA8418_REG_CFG);
+    value &= ~_TCA8418_REG_CFG_OVR_FLOW_M;
+    writeRegister(_TCA8418_REG_CFG, value);
+};
+
+void TCA8418Keyboard::enableDebounce()
+{
+    writeRegister(_TCA8418_REG_DEBOUNCE_DIS_1, 0x00);
+    writeRegister(_TCA8418_REG_DEBOUNCE_DIS_2, 0x00);
+    writeRegister(_TCA8418_REG_DEBOUNCE_DIS_3, 0x00);
+}
+
+void TCA8418Keyboard::disableDebounce()
+{
+    writeRegister(_TCA8418_REG_DEBOUNCE_DIS_1, 0xFF);
+    writeRegister(_TCA8418_REG_DEBOUNCE_DIS_2, 0xFF);
+    writeRegister(_TCA8418_REG_DEBOUNCE_DIS_3, 0xFF);
+}
+
 void TCA8418Keyboard::setBacklight(bool on)
 {
     if (on) {
-        digitalWrite(TCA8418_COL9, HIGH);
+        digitalWrite(_TCA8418_COL9, HIGH);
     } else {
-        digitalWrite(TCA8418_COL9, LOW);
+        digitalWrite(_TCA8418_COL9, LOW);
     }
 }
+
+uint8_t TCA8418Keyboard::readRegister(uint8_t reg) const
+{
+    if (m_wire) {
+        m_wire->beginTransmission(m_addr);
+        m_wire->write(reg);
+        m_wire->endTransmission();
+
+        m_wire->requestFrom(m_addr, (uint8_t)1);
+        if (m_wire->available() < 1)
+            return 0;
+
+        return m_wire->read();
+    }
+    if (readCallback) {
+        uint8_t data;
+        readCallback(m_addr, reg, &data, 1);
+        return data;
+    }
+    return 0;
+}
+
+void TCA8418Keyboard::writeRegister(uint8_t reg, uint8_t value)
+{
+    uint8_t data[2];
+    data[0] = reg;
+    data[1] = value;
+
+    if (m_wire) {
+        m_wire->beginTransmission(m_addr);
+        m_wire->write(data, sizeof(uint8_t) * 2);
+        m_wire->endTransmission();
+    }
+    if (writeCallback) {
+        writeCallback(m_addr, data[0], &(data[1]), 1);
+    }
+}

src/input/TCA8418Keyboard.h

@@ -1,23 +1,82 @@
-#include "TCA8418KeyboardBase.h"
+// Based on the MPR121 Keyboard and Adafruit TCA8418 library
+#include "configuration.h"
+#include <Wire.h>
 
-/**
+#define _TCA8418_NONE 0x00
- * @brief 3x4 keypad with 3 columns and 4 rows
+#define _TCA8418_REBOOT 0x90
- */
+#define _TCA8418_LEFT 0xb4
-class TCA8418Keyboard : public TCA8418KeyboardBase
+#define _TCA8418_UP 0xb5
+#define _TCA8418_DOWN 0xb6
+#define _TCA8418_RIGHT 0xb7
+#define _TCA8418_ESC 0x1b
+#define _TCA8418_BSP 0x08
+#define _TCA8418_SELECT 0x0d
+
+class TCA8418Keyboard
 {
   public:
-    TCA8418Keyboard();
+    typedef uint8_t (*i2c_com_fptr_t)(uint8_t dev_addr, uint8_t reg_addr, uint8_t *data, uint8_t len);
-    void reset(void) override;
-    void setBacklight(bool on) override;
 
-  protected:
+    enum KeyState { Init = 0, Idle, Held, Busy };
-    void pressed(uint8_t key) override;
-    void released(void) override;
 
+    KeyState state;
     int8_t last_key;
-    int8_t next_key;
+    bool should_backspace;
     uint32_t last_tap;
     uint8_t char_idx;
     int32_t tap_interval;
-    bool should_backspace;
+    bool backlight_on;
+
+    String queue;
+
+    TCA8418Keyboard();
+
+    void begin(uint8_t addr = XPOWERS_AXP192_AXP2101_ADDRESS, TwoWire *wire = &Wire);
+    void begin(i2c_com_fptr_t r, i2c_com_fptr_t w, uint8_t addr = XPOWERS_AXP192_AXP2101_ADDRESS);
+
+    void reset(void);
+    // Configure the size of the keypad.
+    // All other rows and columns are set as inputs.
+    bool matrix(uint8_t rows, uint8_t columns);
+
+    // Flush all events in the FIFO buffer + GPIO events.
+    uint8_t flush(void);
+
+    // Key events available in the internal FIFO buffer.
+    uint8_t keyCount(void) const;
+
+    void trigger(void);
+    void pressed(uint8_t key);
+    void released(void);
+    bool hasEvent(void);
+    char dequeueEvent(void);
+    void queueEvent(char);
+
+    uint8_t digitalRead(uint8_t pinnum) const;
+    bool digitalWrite(uint8_t pinnum, uint8_t level);
+    bool pinMode(uint8_t pinnum, uint8_t mode);
+    bool pinIRQMode(uint8_t pinnum, uint8_t mode); // MODE  FALLING or RISING
+
+    // enable / disable interrupts for matrix and GPI pins
+    void enableInterrupts();
+    void disableInterrupts();
+
+    // ignore key events when FIFO buffer is full or not.
+    void enableMatrixOverflow();
+    void disableMatrixOverflow();
+
+    // debounce keys.
+    void enableDebounce();
+    void disableDebounce();
+
+    void setBacklight(bool on);
+
+    uint8_t readRegister(uint8_t reg) const;
+    void writeRegister(uint8_t reg, uint8_t value);
+
+  private:
+    TwoWire *m_wire;
+    uint8_t m_addr;
+    i2c_com_fptr_t readCallback;
+    i2c_com_fptr_t writeCallback;
 };

src/input/TCA8418KeyboardBase.cpp

@@ -1,372 +0,0 @@
-// Based on the MPR121 Keyboard and Adafruit TCA8418 library
-
-#include "TCA8418KeyboardBase.h"
-#include "configuration.h"
-
-#include <Arduino.h>
-
-// FIELDS CONFIG REGISTER  1
-#define _TCA8418_REG_CFG_AI 0x80           // Auto-increment for read/write
-#define _TCA8418_REG_CFG_GPI_E_CGF 0x40    // Event mode config
-#define _TCA8418_REG_CFG_OVR_FLOW_M 0x20   // Overflow mode enable
-#define _TCA8418_REG_CFG_INT_CFG 0x10      // Interrupt config
-#define _TCA8418_REG_CFG_OVR_FLOW_IEN 0x08 // Overflow interrupt enable
-#define _TCA8418_REG_CFG_K_LCK_IEN 0x04    // Keypad lock interrupt enable
-#define _TCA8418_REG_CFG_GPI_IEN 0x02      // GPI interrupt enable
-#define _TCA8418_REG_CFG_KE_IEN 0x01       // Key events interrupt enable
-
-// FIELDS INT_STAT REGISTER  2
-#define _TCA8418_REG_STAT_CAD_INT 0x10      // Ctrl-alt-del seq status
-#define _TCA8418_REG_STAT_OVR_FLOW_INT 0x08 // Overflow interrupt status
-#define _TCA8418_REG_STAT_K_LCK_INT 0x04    // Key lock interrupt status
-#define _TCA8418_REG_STAT_GPI_INT 0x02      // GPI interrupt status
-#define _TCA8418_REG_STAT_K_INT 0x01        // Key events interrupt status
-
-// FIELDS  KEY_LCK_EC REGISTER 3
-#define _TCA8418_REG_LCK_EC_K_LCK_EN 0x40 // Key lock enable
-#define _TCA8418_REG_LCK_EC_LCK_2 0x20    // Keypad lock status 2
-#define _TCA8418_REG_LCK_EC_LCK_1 0x10    // Keypad lock status 1
-#define _TCA8418_REG_LCK_EC_KLEC_3 0x08   // Key event count bit 3
-#define _TCA8418_REG_LCK_EC_KLEC_2 0x04   // Key event count bit 2
-#define _TCA8418_REG_LCK_EC_KLEC_1 0x02   // Key event count bit 1
-#define _TCA8418_REG_LCK_EC_KLEC_0 0x01   // Key event count bit 0
-
-TCA8418KeyboardBase::TCA8418KeyboardBase(uint8_t rows, uint8_t columns)
-    : rows(rows), columns(columns), state(Init), queue(""), m_wire(nullptr), m_addr(0), readCallback(nullptr),
-      writeCallback(nullptr)
-{
-}
-
-void TCA8418KeyboardBase::begin(uint8_t addr, TwoWire *wire)
-{
-    m_addr = addr;
-    m_wire = wire;
-    m_wire->begin();
-    reset();
-}
-
-void TCA8418KeyboardBase::begin(i2c_com_fptr_t r, i2c_com_fptr_t w, uint8_t addr)
-{
-    m_addr = addr;
-    m_wire = nullptr;
-    writeCallback = w;
-    readCallback = r;
-    reset();
-}
-
-void TCA8418KeyboardBase::reset()
-{
-    LOG_DEBUG("TCA8418 Reset");
-    //  GPIO
-    //  set default all GIO pins to INPUT
-    writeRegister(TCA8418_REG_GPIO_DIR_1, 0x00);
-    writeRegister(TCA8418_REG_GPIO_DIR_2, 0x00);
-    writeRegister(TCA8418_REG_GPIO_DIR_3, 0x00);
-
-    //  add all pins to key events
-    writeRegister(TCA8418_REG_GPI_EM_1, 0xFF);
-    writeRegister(TCA8418_REG_GPI_EM_2, 0xFF);
-    writeRegister(TCA8418_REG_GPI_EM_3, 0xFF);
-
-    //  set all pins to FALLING interrupts
-    writeRegister(TCA8418_REG_GPIO_INT_LVL_1, 0x00);
-    writeRegister(TCA8418_REG_GPIO_INT_LVL_2, 0x00);
-    writeRegister(TCA8418_REG_GPIO_INT_LVL_3, 0x00);
-
-    //  add all pins to interrupts
-    writeRegister(TCA8418_REG_GPIO_INT_EN_1, 0xFF);
-    writeRegister(TCA8418_REG_GPIO_INT_EN_2, 0xFF);
-    writeRegister(TCA8418_REG_GPIO_INT_EN_3, 0xFF);
-
-    // Set keyboard matrix size
-    matrix(rows, columns);
-    enableDebounce();
-    flush();
-    state = Idle;
-}
-
-bool TCA8418KeyboardBase::matrix(uint8_t rows, uint8_t columns)
-{
-    if (rows < 1 || rows > 8 || columns < 1 || columns > 10)
-        return false;
-
-    // Setup the keypad matrix.
-    uint8_t mask = 0x00;
-    for (int r = 0; r < rows; r++) {
-        mask <<= 1;
-        mask |= 1;
-    }
-    writeRegister(TCA8418_REG_KP_GPIO_1, mask);
-
-    mask = 0x00;
-    for (int c = 0; c < columns && c < 8; c++) {
-        mask <<= 1;
-        mask |= 1;
-    }
-    writeRegister(TCA8418_REG_KP_GPIO_2, mask);
-
-    if (columns > 8) {
-        if (columns == 9)
-            mask = 0x01;
-        else
-            mask = 0x03;
-        writeRegister(TCA8418_REG_KP_GPIO_3, mask);
-    }
-
-    return true;
-}
-
-uint8_t TCA8418KeyboardBase::keyCount() const
-{
-    uint8_t eventCount = readRegister(TCA8418_REG_KEY_LCK_EC);
-    eventCount &= 0x0F; //  lower 4 bits only
-    return eventCount;
-}
-
-bool TCA8418KeyboardBase::hasEvent() const
-{
-    return queue.length() > 0;
-}
-
-void TCA8418KeyboardBase::queueEvent(char next)
-{
-    if (next == NONE) {
-        return;
-    }
-    queue.concat(next);
-}
-
-char TCA8418KeyboardBase::dequeueEvent()
-{
-    if (queue.length() < 1) {
-        return NONE;
-    }
-    char next = queue.charAt(0);
-    queue.remove(0, 1);
-    return next;
-}
-
-void TCA8418KeyboardBase::trigger()
-{
-    if (keyCount() == 0) {
-        return;
-    }
-    if (state != Init) {
-        // Read the key register
-        uint8_t k = readRegister(TCA8418_REG_KEY_EVENT_A);
-        uint8_t key = k & 0x7F;
-        if (k & 0x80) {
-            if (state == Idle)
-                pressed(key);
-            return;
-        } else {
-            if (state == Held) {
-                released();
-            }
-            state = Idle;
-            return;
-        }
-    } else {
-        reset();
-    }
-}
-
-void TCA8418KeyboardBase::pressed(uint8_t key)
-{
-    // must be defined in derived class
-    LOG_ERROR("pressed() not implemented in derived class");
-}
-
-void TCA8418KeyboardBase::released()
-{
-    // must be defined in derived class
-    LOG_ERROR("released() not implemented in derived class");
-}
-
-uint8_t TCA8418KeyboardBase::flush()
-{
-    // Flush key events
-    uint8_t count = 0;
-    while (readRegister(TCA8418_REG_KEY_EVENT_A) != 0)
-        count++;
-
-    // Flush gpio events
-    readRegister(TCA8418_REG_GPIO_INT_STAT_1);
-    readRegister(TCA8418_REG_GPIO_INT_STAT_2);
-    readRegister(TCA8418_REG_GPIO_INT_STAT_3);
-
-    // Clear INT_STAT register
-    writeRegister(TCA8418_REG_INT_STAT, 3);
-    return count;
-}
-
-uint8_t TCA8418KeyboardBase::digitalRead(uint8_t pinnum) const
-{
-    if (pinnum > TCA8418_COL9)
-        return 0xFF;
-
-    uint8_t reg = TCA8418_REG_GPIO_DAT_STAT_1 + pinnum / 8;
-    uint8_t mask = (1 << (pinnum % 8));
-
-    // Level  0 = low  other = high
-    uint8_t value = readRegister(reg);
-    if (value & mask)
-        return HIGH;
-    return LOW;
-}
-
-bool TCA8418KeyboardBase::digitalWrite(uint8_t pinnum, uint8_t level)
-{
-    if (pinnum > TCA8418_COL9)
-        return false;
-
-    uint8_t reg = TCA8418_REG_GPIO_DAT_OUT_1 + pinnum / 8;
-    uint8_t mask = (1 << (pinnum % 8));
-
-    // Level  0 = low  other = high
-    uint8_t value = readRegister(reg);
-    if (level == LOW)
-        value &= ~mask;
-    else
-        value |= mask;
-    writeRegister(reg, value);
-    return true;
-}
-
-bool TCA8418KeyboardBase::pinMode(uint8_t pinnum, uint8_t mode)
-{
-    if (pinnum > TCA8418_COL9)
-        return false;
-
-    uint8_t idx = pinnum / 8;
-    uint8_t reg = TCA8418_REG_GPIO_DIR_1 + idx;
-    uint8_t mask = (1 << (pinnum % 8));
-
-    // Mode  0 = input   1 = output
-    uint8_t value = readRegister(reg);
-    if (mode == OUTPUT)
-        value |= mask;
-    else
-        value &= ~mask;
-    writeRegister(reg, value);
-
-    // Pullup  0 = enabled   1 = disabled
-    reg = TCA8418_REG_GPIO_PULL_1 + idx;
-    value = readRegister(reg);
-    if (mode == INPUT_PULLUP)
-        value &= ~mask;
-    else
-        value |= mask;
-    writeRegister(reg, value);
-
-    return true;
-}
-
-bool TCA8418KeyboardBase::pinIRQMode(uint8_t pinnum, uint8_t mode)
-{
-    if (pinnum > TCA8418_COL9)
-        return false;
-    if ((mode != RISING) && (mode != FALLING))
-        return false;
-
-    //  Mode  0 = falling   1 = rising
-    uint8_t idx = pinnum / 8;
-    uint8_t reg = TCA8418_REG_GPIO_INT_LVL_1 + idx;
-    uint8_t mask = (1 << (pinnum % 8));
-
-    uint8_t value = readRegister(reg);
-    if (mode == RISING)
-        value |= mask;
-    else
-        value &= ~mask;
-    writeRegister(reg, value);
-
-    // Enable interrupt
-    reg = TCA8418_REG_GPIO_INT_EN_1 + idx;
-    value = readRegister(reg);
-    value |= mask;
-    writeRegister(reg, value);
-
-    return true;
-}
-
-void TCA8418KeyboardBase::enableInterrupts()
-{
-    uint8_t value = readRegister(TCA8418_REG_CFG);
-    value |= (_TCA8418_REG_CFG_GPI_IEN | _TCA8418_REG_CFG_KE_IEN);
-    writeRegister(TCA8418_REG_CFG, value);
-};
-
-void TCA8418KeyboardBase::disableInterrupts()
-{
-    uint8_t value = readRegister(TCA8418_REG_CFG);
-    value &= ~(_TCA8418_REG_CFG_GPI_IEN | _TCA8418_REG_CFG_KE_IEN);
-    writeRegister(TCA8418_REG_CFG, value);
-};
-
-void TCA8418KeyboardBase::enableMatrixOverflow()
-{
-    uint8_t value = readRegister(TCA8418_REG_CFG);
-    value |= _TCA8418_REG_CFG_OVR_FLOW_M;
-    writeRegister(TCA8418_REG_CFG, value);
-};
-
-void TCA8418KeyboardBase::disableMatrixOverflow()
-{
-    uint8_t value = readRegister(TCA8418_REG_CFG);
-    value &= ~_TCA8418_REG_CFG_OVR_FLOW_M;
-    writeRegister(TCA8418_REG_CFG, value);
-};
-
-void TCA8418KeyboardBase::enableDebounce()
-{
-    writeRegister(TCA8418_REG_DEBOUNCE_DIS_1, 0x00);
-    writeRegister(TCA8418_REG_DEBOUNCE_DIS_2, 0x00);
-    writeRegister(TCA8418_REG_DEBOUNCE_DIS_3, 0x00);
-}
-
-void TCA8418KeyboardBase::disableDebounce()
-{
-    writeRegister(TCA8418_REG_DEBOUNCE_DIS_1, 0xFF);
-    writeRegister(TCA8418_REG_DEBOUNCE_DIS_2, 0xFF);
-    writeRegister(TCA8418_REG_DEBOUNCE_DIS_3, 0xFF);
-}
-
-void TCA8418KeyboardBase::setBacklight(bool on) {}
-
-uint8_t TCA8418KeyboardBase::readRegister(uint8_t reg) const
-{
-    if (m_wire) {
-        m_wire->beginTransmission(m_addr);
-        m_wire->write(reg);
-        m_wire->endTransmission();
-
-        m_wire->requestFrom(m_addr, (uint8_t)1);
-        if (m_wire->available() < 1)
-            return 0;
-
-        return m_wire->read();
-    }
-    if (readCallback) {
-        uint8_t data;
-        readCallback(m_addr, reg, &data, 1);
-        return data;
-    }
-    return 0;
-}
-
-void TCA8418KeyboardBase::writeRegister(uint8_t reg, uint8_t value)
-{
-    uint8_t data[2];
-    data[0] = reg;
-    data[1] = value;
-
-    if (m_wire) {
-        m_wire->beginTransmission(m_addr);
-        m_wire->write(data, sizeof(uint8_t) * 2);
-        m_wire->endTransmission();
-    }
-    if (writeCallback) {
-        writeCallback(m_addr, data[0], &(data[1]), 1);
-    }
-}

src/input/TCA8418KeyboardBase.h

@@ -1,170 +0,0 @@
-// Based on the MPR121 Keyboard and Adafruit TCA8418 library
-#include "configuration.h"
-#include <Wire.h>
-
-/**
- * @brief TCA8418KeyboardBase is the base class for TCA8418 keyboard handling.
- * It provides basic functionality for reading key events, managing the keyboard matrix,
- * and handling key states. It is designed to be extended for specific keyboard implementations.
- * It supports both I2C communication and function pointers for custom I2C operations.
- */
-class TCA8418KeyboardBase
-{
-  public:
-    enum TCA8418Key : uint8_t {
-        NONE = 0x00,
-        BSP = 0x08,
-        TAB = 0x09,
-        SELECT = 0x0d,
-        ESC = 0x1b,
-        REBOOT = 0x90,
-        LEFT = 0xb4,
-        UP = 0xb5,
-        DOWN = 0xb6,
-        RIGHT = 0xb7,
-        BT_TOGGLE = 0xAA,
-        GPS_TOGGLE = 0x9E,
-        MUTE_TOGGLE = 0xAC,
-        SEND_PING = 0xAF,
-        BL_TOGGLE = 0xAB
-    };
-
-    typedef uint8_t (*i2c_com_fptr_t)(uint8_t dev_addr, uint8_t reg_addr, uint8_t *data, uint8_t len);
-
-    TCA8418KeyboardBase(uint8_t rows, uint8_t columns);
-
-    virtual void begin(uint8_t addr = TCA8418_KB_ADDR, TwoWire *wire = &Wire);
-    virtual void begin(i2c_com_fptr_t r, i2c_com_fptr_t w, uint8_t addr = TCA8418_KB_ADDR);
-
-    virtual void reset(void);
-    virtual void trigger(void);
-
-    virtual void setBacklight(bool on);
-
-    // Key events available
-    virtual bool hasEvent(void) const;
-    virtual char dequeueEvent(void);
-
-  protected:
-    enum KeyState { Init, Idle, Held, Busy };
-
-    enum TCA8418Register : uint8_t {
-        TCA8418_REG_RESERVED = 0x00,
-        TCA8418_REG_CFG = 0x01,
-        TCA8418_REG_INT_STAT = 0x02,
-        TCA8418_REG_KEY_LCK_EC = 0x03,
-        TCA8418_REG_KEY_EVENT_A = 0x04,
-        TCA8418_REG_KEY_EVENT_B = 0x05,
-        TCA8418_REG_KEY_EVENT_C = 0x06,
-        TCA8418_REG_KEY_EVENT_D = 0x07,
-        TCA8418_REG_KEY_EVENT_E = 0x08,
-        TCA8418_REG_KEY_EVENT_F = 0x09,
-        TCA8418_REG_KEY_EVENT_G = 0x0A,
-        TCA8418_REG_KEY_EVENT_H = 0x0B,
-        TCA8418_REG_KEY_EVENT_I = 0x0C,
-        TCA8418_REG_KEY_EVENT_J = 0x0D,
-        TCA8418_REG_KP_LCK_TIMER = 0x0E,
-        TCA8418_REG_UNLOCK_1 = 0x0F,
-        TCA8418_REG_UNLOCK_2 = 0x10,
-        TCA8418_REG_GPIO_INT_STAT_1 = 0x11,
-        TCA8418_REG_GPIO_INT_STAT_2 = 0x12,
-        TCA8418_REG_GPIO_INT_STAT_3 = 0x13,
-        TCA8418_REG_GPIO_DAT_STAT_1 = 0x14,
-        TCA8418_REG_GPIO_DAT_STAT_2 = 0x15,
-        TCA8418_REG_GPIO_DAT_STAT_3 = 0x16,
-        TCA8418_REG_GPIO_DAT_OUT_1 = 0x17,
-        TCA8418_REG_GPIO_DAT_OUT_2 = 0x18,
-        TCA8418_REG_GPIO_DAT_OUT_3 = 0x19,
-        TCA8418_REG_GPIO_INT_EN_1 = 0x1A,
-        TCA8418_REG_GPIO_INT_EN_2 = 0x1B,
-        TCA8418_REG_GPIO_INT_EN_3 = 0x1C,
-        TCA8418_REG_KP_GPIO_1 = 0x1D,
-        TCA8418_REG_KP_GPIO_2 = 0x1E,
-        TCA8418_REG_KP_GPIO_3 = 0x1F,
-        TCA8418_REG_GPI_EM_1 = 0x20,
-        TCA8418_REG_GPI_EM_2 = 0x21,
-        TCA8418_REG_GPI_EM_3 = 0x22,
-        TCA8418_REG_GPIO_DIR_1 = 0x23,
-        TCA8418_REG_GPIO_DIR_2 = 0x24,
-        TCA8418_REG_GPIO_DIR_3 = 0x25,
-        TCA8418_REG_GPIO_INT_LVL_1 = 0x26,
-        TCA8418_REG_GPIO_INT_LVL_2 = 0x27,
-        TCA8418_REG_GPIO_INT_LVL_3 = 0x28,
-        TCA8418_REG_DEBOUNCE_DIS_1 = 0x29,
-        TCA8418_REG_DEBOUNCE_DIS_2 = 0x2A,
-        TCA8418_REG_DEBOUNCE_DIS_3 = 0x2B,
-        TCA8418_REG_GPIO_PULL_1 = 0x2C,
-        TCA8418_REG_GPIO_PULL_2 = 0x2D,
-        TCA8418_REG_GPIO_PULL_3 = 0x2E
-    };
-
-    // Pin IDs for matrix rows/columns
-    enum TCA8418PinId : uint8_t {
-        TCA8418_ROW0, // Pin ID for row 0
-        TCA8418_ROW1, // Pin ID for row 1
-        TCA8418_ROW2, // Pin ID for row 2
-        TCA8418_ROW3, // Pin ID for row 3
-        TCA8418_ROW4, // Pin ID for row 4
-        TCA8418_ROW5, // Pin ID for row 5
-        TCA8418_ROW6, // Pin ID for row 6
-        TCA8418_ROW7, // Pin ID for row 7
-        TCA8418_COL0, // Pin ID for column 0
-        TCA8418_COL1, // Pin ID for column 1
-        TCA8418_COL2, // Pin ID for column 2
-        TCA8418_COL3, // Pin ID for column 3
-        TCA8418_COL4, // Pin ID for column 4
-        TCA8418_COL5, // Pin ID for column 5
-        TCA8418_COL6, // Pin ID for column 6
-        TCA8418_COL7, // Pin ID for column 7
-        TCA8418_COL8, // Pin ID for column 8
-        TCA8418_COL9  // Pin ID for column 9
-    };
-
-    virtual void pressed(uint8_t key);
-    virtual void released(void);
-
-    virtual void queueEvent(char);
-
-    virtual ~TCA8418KeyboardBase() {}
-
-  protected:
-    // Set the size of the keypad matrix
-    // All other rows and columns are set as inputs.
-    bool matrix(uint8_t rows, uint8_t columns);
-
-    uint8_t keyCount(void) const;
-
-    // Flush all events in the FIFO buffer + GPIO events.
-    uint8_t flush(void);
-
-    // debounce keys.
-    void enableDebounce();
-    void disableDebounce();
-
-    // enable / disable interrupts for matrix and GPI pins
-    void enableInterrupts();
-    void disableInterrupts();
-
-    // ignore key events when FIFO buffer is full or not.
-    void enableMatrixOverflow();
-    void disableMatrixOverflow();
-
-    uint8_t digitalRead(uint8_t pinnum) const;
-    bool digitalWrite(uint8_t pinnum, uint8_t level);
-    bool pinMode(uint8_t pinnum, uint8_t mode);
-    bool pinIRQMode(uint8_t pinnum, uint8_t mode); // MODE  FALLING or RISING
-    uint8_t readRegister(uint8_t reg) const;
-    void writeRegister(uint8_t reg, uint8_t value);
-
-  protected:
-    uint8_t rows;
-    uint8_t columns;
-    KeyState state;
-    String queue;
-
-  private:
-    TwoWire *m_wire;
-    uint8_t m_addr;
-    i2c_com_fptr_t readCallback;
-    i2c_com_fptr_t writeCallback;
-};

src/input/TDeckProKeyboard.cpp

@@ -1,196 +0,0 @@
-#if defined(T_DECK_PRO)
-
-#include "TDeckProKeyboard.h"
-
-#define _TCA8418_COLS 10
-#define _TCA8418_ROWS 4
-#define _TCA8418_NUM_KEYS 35
-
-#define _TCA8418_MULTI_TAP_THRESHOLD 1500
-
-using Key = TCA8418KeyboardBase::TCA8418Key;
-
-constexpr uint8_t modifierRightShiftKey = 31 - 1; // keynum -1
-constexpr uint8_t modifierRightShift = 0b0001;
-constexpr uint8_t modifierLeftShiftKey = 35 - 1;
-constexpr uint8_t modifierLeftShift = 0b0001;
-constexpr uint8_t modifierSymKey = 32 - 1;
-constexpr uint8_t modifierSym = 0b0010;
-constexpr uint8_t modifierAltKey = 30 - 1;
-constexpr uint8_t modifierAlt = 0b0100;
-
-// Num chars per key, Modulus for rotating through characters
-static uint8_t TDeckProTapMod[_TCA8418_NUM_KEYS] = {5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5,
-                                                    5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5, 5};
-
-static unsigned char TDeckProTapMap[_TCA8418_NUM_KEYS][5] = {
-    {'p', 'P', '@', 0x00, Key::SEND_PING},
-    {'o', 'O', '+'},
-    {'i', 'I', '-'},
-    {'u', 'U', '_'},
-    {'y', 'Y', ')'},
-    {'t', 'T', '(', 0x00, Key::TAB},
-    {'r', 'R', '3'},
-    {'e', 'E', '2', 0x00, Key::UP},
-    {'w', 'W', '1'},
-    {'q', 'Q', '#', 0x00, Key::ESC}, // p, o, i, u, y, t, r, e, w, q
-    {Key::BSP, 0x00, 0x00},
-    {'l', 'L', '"'},
-    {'k', 'K', '\''},
-    {'j', 'J', ';'},
-    {'h', 'H', ':'},
-    {'g', 'G', '/', 0x00, Key::GPS_TOGGLE},
-    {'f', 'F', '6', 0x00, Key::RIGHT},
-    {'d', 'D', '5'},
-    {'s', 'S', '4', 0x00, Key::LEFT},
-    {'a', 'A', '*'}, // bsp, l, k, j, h, g, f, d, s, a
-    {0x0d, 0x00, 0x00},
-    {'$', 0x00, 0x00},
-    {'m', 'M', '.', 0x00, Key::MUTE_TOGGLE},
-    {'n', 'N', ','},
-    {'b', 'B', '!', 0x00, Key::BL_TOGGLE},
-    {'v', 'V', '?'},
-    {'c', 'C', '9'},
-    {'x', 'X', '8', 0x00, Key::DOWN},
-    {'z', 'Z', '7'},
-    {0x00, 0x00, 0x00}, // Ent, $, m, n, b, v, c, x, z, alt
-    {0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00},
-    {0x20, 0x00, 0x00},
-    {0x00, 0x00, 0x00},
-    {0x00, 0x00, 0x00} // R_Shift, sym, space, mic, L_Shift
-};
-
-TDeckProKeyboard::TDeckProKeyboard()
-    : TCA8418KeyboardBase(_TCA8418_ROWS, _TCA8418_COLS), modifierFlag(0), last_modifier_time(0), last_key(-1), next_key(-1),
-      last_tap(0L), char_idx(0), tap_interval(0)
-{
-}
-
-void TDeckProKeyboard::reset()
-{
-    TCA8418KeyboardBase::reset();
-    pinMode(KB_BL_PIN, OUTPUT);
-    setBacklight(false);
-}
-
-// handle multi-key presses (shift and alt)
-void TDeckProKeyboard::trigger()
-{
-    uint8_t count = keyCount();
-    if (count == 0)
-        return;
-    for (uint8_t i = 0; i < count; ++i) {
-        uint8_t k = readRegister(TCA8418_REG_KEY_EVENT_A + i);
-        uint8_t key = k & 0x7F;
-        if (k & 0x80) {
-            pressed(key);
-        } else {
-            released();
-            state = Idle;
-        }
-    }
-}
-
-void TDeckProKeyboard::pressed(uint8_t key)
-{
-    if (state == Init || state == Busy) {
-        return;
-    }
-    if (modifierFlag && (millis() - last_modifier_time > _TCA8418_MULTI_TAP_THRESHOLD)) {
-        modifierFlag = 0;
-    }
-
-    uint8_t next_key = 0;
-    int row = (key - 1) / 10;
-    int col = (key - 1) % 10;
-
-    if (row >= _TCA8418_ROWS || col >= _TCA8418_COLS) {
-        return; // Invalid key
-    }
-
-    next_key = row * _TCA8418_COLS + col;
-    state = Held;
-
-    uint32_t now = millis();
-    tap_interval = now - last_tap;
-
-    updateModifierFlag(next_key);
-    if (isModifierKey(next_key)) {
-        last_modifier_time = now;
-    }
-
-    if (tap_interval < 0) {
-        last_tap = 0;
-        state = Busy;
-        return;
-    }
-
-    if (next_key != last_key || tap_interval > _TCA8418_MULTI_TAP_THRESHOLD) {
-        char_idx = 0;
-    } else {
-        char_idx += 1;
-    }
-
-    last_key = next_key;
-    last_tap = now;
-}
-
-void TDeckProKeyboard::released()
-{
-    if (state != Held) {
-        return;
-    }
-
-    if (last_key < 0 || last_key >= _TCA8418_NUM_KEYS) {
-        last_key = -1;
-        state = Idle;
-        return;
-    }
-
-    uint32_t now = millis();
-    last_tap = now;
-
-    if (TDeckProTapMap[last_key][modifierFlag % TDeckProTapMod[last_key]] == Key::BL_TOGGLE) {
-        toggleBacklight();
-        return;
-    }
-
-    queueEvent(TDeckProTapMap[last_key][modifierFlag % TDeckProTapMod[last_key]]);
-    if (isModifierKey(last_key) == false)
-        modifierFlag = 0;
-}
-
-void TDeckProKeyboard::setBacklight(bool on)
-{
-    if (on) {
-        digitalWrite(KB_BL_PIN, HIGH);
-    } else {
-        digitalWrite(KB_BL_PIN, LOW);
-    }
-}
-
-void TDeckProKeyboard::toggleBacklight(void)
-{
-    digitalWrite(KB_BL_PIN, !digitalRead(KB_BL_PIN));
-}
-
-void TDeckProKeyboard::updateModifierFlag(uint8_t key)
-{
-    if (key == modifierRightShiftKey) {
-        modifierFlag ^= modifierRightShift;
-    } else if (key == modifierLeftShiftKey) {
-        modifierFlag ^= modifierLeftShift;
-    } else if (key == modifierSymKey) {
-        modifierFlag ^= modifierSym;
-    } else if (key == modifierAltKey) {
-        modifierFlag ^= modifierAlt;
-    }
-}
-
-bool TDeckProKeyboard::isModifierKey(uint8_t key)
-{
-    return (key == modifierRightShiftKey || key == modifierLeftShiftKey || key == modifierAltKey || key == modifierSymKey);
-}
-
-#endif // T_DECK_PRO

src/input/TDeckProKeyboard.h

@@ -1,27 +0,0 @@
-#include "TCA8418KeyboardBase.h"
-
-class TDeckProKeyboard : public TCA8418KeyboardBase
-{
-  public:
-    TDeckProKeyboard();
-    void reset(void) override;
-    void trigger(void) override;
-    void setBacklight(bool on) override;
-
-  protected:
-    void pressed(uint8_t key) override;
-    void released(void) override;
-
-    void updateModifierFlag(uint8_t key);
-    bool isModifierKey(uint8_t key);
-    void toggleBacklight(void);
-
-  private:
-    uint8_t modifierFlag;        // Flag to indicate if a modifier key is pressed
-    uint32_t last_modifier_time; // Timestamp of the last modifier key press
-    int8_t last_key;
-    int8_t next_key;
-    uint32_t last_tap;
-    uint8_t char_idx;
-    int32_t tap_interval;
-};

src/input/TLoraPagerKeyboard.h

@@ -1,12 +0,0 @@
-#include "TCA8418KeyboardBase.h"
-
-class TLoraPagerKeyboard : public TCA8418KeyboardBase
-{
-  public:
-    TLoraPagerKeyboard();
-    void setBacklight(bool on) override{};
-
-  protected:
-    void pressed(uint8_t key) override{};
-    void released(void) override{};
-};

src/input/cardKbI2cImpl.cpp

@@ -9,6 +9,10 @@ CardKbI2cImpl::CardKbI2cImpl() : KbI2cBase("cardKB") {}
 
 void CardKbI2cImpl::init()
 {
+    if (kb_model == 0x12) {
+        disable();
+        return;
+    }
 #if !MESHTASTIC_EXCLUDE_I2C && !defined(ARCH_PORTDUINO) && !defined(I2C_NO_RESCAN)
     if (cardkb_found.address == 0x00) {
         LOG_DEBUG("Rescan for I2C keyboard");
@@ -67,5 +71,4 @@ void CardKbI2cImpl::init()
     }
 #endif
     inputBroker->registerSource(this);
-    kb_found = true;
 }

src/input/kbI2cBase.cpp

@@ -3,26 +3,10 @@
 #include "detect/ScanI2C.h"
 #include "detect/ScanI2CTwoWire.h"
 
-#if defined(T_DECK_PRO)
-#include "TDeckProKeyboard.h"
-#elif defined(T_LORA_PAGER)
-#include "TLoraPagerKeyboard.h"
-#else
-#include "TCA8418Keyboard.h"
-#endif
-
 extern ScanI2C::DeviceAddress cardkb_found;
 extern uint8_t kb_model;
 
-KbI2cBase::KbI2cBase(const char *name)
+KbI2cBase::KbI2cBase(const char *name) : concurrency::OSThread(name)
-    : concurrency::OSThread(name),
-#if defined(T_DECK_PRO)
-      TCAKeyboard(*(new TDeckProKeyboard()))
-#elif defined(T_LORA_PAGER)
-      TCAKeyboard(*(new TLoraPagerKeyboard()))
-#else
-      TCAKeyboard(*(new TCA8418Keyboard()))
-#endif
 {
     this->_originName = name;
 }
@@ -59,8 +43,8 @@ int32_t KbI2cBase::runOnce()
             if (cardkb_found.address == MPR121_KB_ADDR) {
                 MPRkeyboard.begin(MPR121_KB_ADDR, &Wire1);
             }
-            if (cardkb_found.address == TCA8418_KB_ADDR) {
+            if (cardkb_found.address == XPOWERS_AXP192_AXP2101_ADDRESS) {
-                TCAKeyboard.begin(TCA8418_KB_ADDR, &Wire1);
+                TCAKeyboard.begin(XPOWERS_AXP192_AXP2101_ADDRESS, &Wire1);
             }
             break;
 #endif
@@ -74,8 +58,8 @@ int32_t KbI2cBase::runOnce()
             if (cardkb_found.address == MPR121_KB_ADDR) {
                 MPRkeyboard.begin(MPR121_KB_ADDR, &Wire);
             }
-            if (cardkb_found.address == TCA8418_KB_ADDR) {
+            if (cardkb_found.address == XPOWERS_AXP192_AXP2101_ADDRESS) {
-                TCAKeyboard.begin(TCA8418_KB_ADDR, &Wire);
+                TCAKeyboard.begin(XPOWERS_AXP192_AXP2101_ADDRESS, &Wire);
             }
             break;
         case ScanI2C::NO_I2C:
@@ -257,65 +241,41 @@ int32_t KbI2cBase::runOnce()
             e.kbchar = 0x00;
             e.source = this->_originName;
             switch (nextEvent) {
-            case TCA8418KeyboardBase::NONE:
+            case _TCA8418_NONE:
                 e.inputEvent = INPUT_BROKER_NONE;
                 e.kbchar = 0x00;
                 break;
-            case TCA8418KeyboardBase::REBOOT:
+            case _TCA8418_REBOOT:
                 e.inputEvent = INPUT_BROKER_ANYKEY;
                 e.kbchar = INPUT_BROKER_MSG_REBOOT;
                 break;
-            case TCA8418KeyboardBase::LEFT:
+            case _TCA8418_LEFT:
                 e.inputEvent = INPUT_BROKER_LEFT;
                 e.kbchar = 0x00;
                 break;
-            case TCA8418KeyboardBase::UP:
+            case _TCA8418_UP:
                 e.inputEvent = INPUT_BROKER_UP;
                 e.kbchar = 0x00;
                 break;
-            case TCA8418KeyboardBase::DOWN:
+            case _TCA8418_DOWN:
                 e.inputEvent = INPUT_BROKER_DOWN;
                 e.kbchar = 0x00;
                 break;
-            case TCA8418KeyboardBase::RIGHT:
+            case _TCA8418_RIGHT:
                 e.inputEvent = INPUT_BROKER_RIGHT;
                 e.kbchar = 0x00;
                 break;
-            case TCA8418KeyboardBase::BSP:
+            case _TCA8418_BSP:
                 e.inputEvent = INPUT_BROKER_BACK;
                 e.kbchar = 0x08;
                 break;
-            case TCA8418KeyboardBase::SELECT:
+            case _TCA8418_SELECT:
                 e.inputEvent = INPUT_BROKER_SELECT;
                 e.kbchar = 0x00;
                 break;
-            case TCA8418KeyboardBase::ESC:
+            case _TCA8418_ESC:
                 e.inputEvent = INPUT_BROKER_CANCEL;
-                e.kbchar = 0x00;
+                e.kbchar = 0;
-                break;
-            case TCA8418KeyboardBase::GPS_TOGGLE:
-                e.inputEvent = INPUT_BROKER_ANYKEY;
-                e.kbchar = INPUT_BROKER_GPS_TOGGLE;
-                break;
-            case TCA8418KeyboardBase::SEND_PING:
-                e.inputEvent = INPUT_BROKER_ANYKEY;
-                e.kbchar = INPUT_BROKER_SEND_PING;
-                break;
-            case TCA8418KeyboardBase::MUTE_TOGGLE:
-                e.inputEvent = INPUT_BROKER_ANYKEY;
-                e.kbchar = INPUT_BROKER_MSG_MUTE_TOGGLE;
-                break;
-            case TCA8418KeyboardBase::BT_TOGGLE:
-                e.inputEvent = INPUT_BROKER_ANYKEY;
-                e.kbchar = INPUT_BROKER_MSG_BLUETOOTH_TOGGLE;
-                break;
-            case TCA8418KeyboardBase::BL_TOGGLE:
-                e.inputEvent = INPUT_BROKER_ANYKEY;
-                e.kbchar = INPUT_BROKER_MSG_BLUETOOTH_TOGGLE;
-                break;
-            case TCA8418KeyboardBase::TAB:
-                e.inputEvent = INPUT_BROKER_ANYKEY;
-                e.kbchar = INPUT_BROKER_MSG_TAB;
                 break;
             default:
                 if (nextEvent > 127) {
@@ -331,7 +291,6 @@ int32_t KbI2cBase::runOnce()
                 LOG_DEBUG("TCA8418 Notifying: %i Char: %c", e.inputEvent, e.kbchar);
                 this->notifyObservers(&e);
             }
-            TCAKeyboard.trigger();
         }
         break;
     }

src/input/kbI2cBase.h

@@ -3,11 +3,10 @@
 #include "BBQ10Keyboard.h"
 #include "InputBroker.h"
 #include "MPR121Keyboard.h"
+#include "TCA8418Keyboard.h"
 #include "Wire.h"
 #include "concurrency/OSThread.h"
 
-class TCA8418KeyboardBase;
-
 class KbI2cBase : public Observable<const InputEvent *>, public concurrency::OSThread
 {
   public:
@@ -23,6 +22,6 @@ class KbI2cBase : public Observable<const InputEvent *>, public concurrency::OST
 
     BBQ10Keyboard Q10keyboard;
     MPR121Keyboard MPRkeyboard;
-    TCA8418KeyboardBase &TCAKeyboard;
+    TCA8418Keyboard TCAKeyboard;
     bool is_sym = false;
 };

src/input/peMatrixBase.cpp

@@ -0,0 +1,88 @@
+#include "peMatrixBase.h"
+
+#include "configuration.h"
+#include "detect/ScanI2C.h"
+
+extern ScanI2C::DeviceAddress cardkb_found;
+extern uint8_t kb_model;
+
+#if WIRE_INTERFACES_COUNT == 2 // defined in architecture.h
+I2CKeyPad keyPad(cardkb_found.address, cardkb_found.port == ScanI2C::WIRE1 ? &Wire1 : &Wire);
+#else
+I2CKeyPad keyPad(cardkb_found.address, &Wire);
+#endif
+
+PeMatrixBase::PeMatrixBase(const char *name) : concurrency::OSThread(name)
+{
+    this->_originName = name;
+}
+
+int32_t PeMatrixBase::runOnce()
+{
+    if (kb_model != 0x12) {
+        // Input device is not detected.
+        return disable();
+    }
+
+    if (firstTime) {
+        // This is the first time the OSThread library has called this function, so do port setup
+        firstTime = 0;
+        if (!keyPad.begin()) {
+            LOG_ERROR("Failed to initialize I2C keypad");
+            return disable();
+        }
+        keyPad.loadKeyMap(keymap);
+    } else {
+        if (keyPad.isPressed()) {
+            key = keyPad.getChar();
+            // debounce
+            if (key != prevkey) {
+                if (key != 0) {
+                    LOG_DEBUG("Key 0x%x pressed\n", key);
+                    // reset shift now that we have a keypress
+                    InputEvent e;
+                    e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+                    e.source = this->_originName;
+                    switch (key) {
+                    case 0x1b: // ESC
+                        e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_CANCEL;
+                        break;
+                    case 0x08: // Back
+                        e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_BACK;
+                        e.kbchar = key;
+                        break;
+                    case 0xb5: // Up
+                        e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_UP;
+                        break;
+                    case 0xb6: // Down
+                        e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_DOWN;
+                        break;
+                    case 0xb4: // Left
+                        e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_LEFT;
+                        e.kbchar = key;
+                        break;
+                    case 0xb7: // Right
+                        e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_RIGHT;
+                        e.kbchar = key;
+                        break;
+                    case 0x0d: // Enter
+                        e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_SELECT;
+                        break;
+                    case 0x00: // nopress
+                        e.inputEvent = meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE;
+                        break;
+                    default: // all other keys
+                        e.inputEvent = ANYKEY;
+                        e.kbchar = key;
+                        break;
+                    }
+                    if (e.inputEvent != meshtastic_ModuleConfig_CannedMessageConfig_InputEventChar_NONE) {
+                        this->notifyObservers(&e);
+                    }
+                }
+                prevkey = key;
+            }
+        }
+    }
+    return 100; // Keyscan every 100msec to avoid key bounce
+}

src/input/peMatrixBase.h

@@ -0,0 +1,22 @@
+#pragma once
+
+#include "InputBroker.h"
+#include "concurrency/OSThread.h"
+#include <I2CKeyPad.h>
+
+class PeMatrixBase : public Observable<const InputEvent *>, public concurrency::OSThread
+{
+  public:
+    explicit PeMatrixBase(const char *name);
+
+  protected:
+    virtual int32_t runOnce() override;
+
+  private:
+    const char *_originName;
+    bool firstTime = 1;
+    // char keymap[19] = "123A456B789C*0#DNF";  // N = NoKey, F = Fail
+    char keymap[19] = {0x1b, 0xb5, '3', 'A', 0xb4, 0x0d, 0xb7, 'B', '7', 0xb6, '9', 'C', 0x09, '0', 0x08, 'D', 'N', 'F'};
+    char key = 0;
+    char prevkey = 0;
+};

src/input/peMatrixImpl.cpp

@@ -0,0 +1,16 @@
+#include "peMatrixImpl.h"
+#include "InputBroker.h"
+
+PeMatrixImpl *peMatrixImpl;
+
+PeMatrixImpl::PeMatrixImpl() : PeMatrixBase("matrixPE") {}
+
+void PeMatrixImpl::init()
+{
+    if (kb_model != 0x12) {
+        disable();
+        return;
+    }
+
+    inputBroker->registerSource(this);
+}