revert file

Removed redundant line continuation in preprocessor directives.

.clusterfuzzlite/build.sh

@@ -51,7 +51,7 @@ for f in .clusterfuzzlite/*_fuzzer.cpp; do
 	fuzzer=$(basename "$f" .cpp)
 	cp -f "$f" src/fuzzer.cpp
 	pio run -vvv --environment "$PIO_ENV"
-	program="$PLATFORMIO_WORKSPACE_DIR/build/$PIO_ENV/meshtasticd"
+	program="$PLATFORMIO_WORKSPACE_DIR/build/$PIO_ENV/program"
 	cp "$program" "$OUT/$fuzzer"
 
 	# Copy shared libraries used by the fuzzer.

.github/actionlint.yaml

@@ -2,5 +2,4 @@
 self-hosted-runner:
   # Labels of self-hosted runner in array of strings.
   labels:
-    - arctastic
     - test-runner

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

@@ -76,7 +76,7 @@ runs:
         done
 
     - name: PlatformIO ${{ inputs.arch }} download cache
-      uses: actions/cache@v5
+      uses: actions/cache@v4
       with:
         path: ~/.platformio/.cache
         key: pio-cache-${{ inputs.arch }}-${{ hashFiles('.github/actions/**', '**.ini') }}
@@ -102,7 +102,7 @@ runs:
     - name: Store binaries as an artifact
       uses: actions/upload-artifact@v5
       with:
-        name: firmware-${{ inputs.arch }}-${{ inputs.board }}-${{ steps.version.outputs.long }}
+        name: firmware-${{ inputs.arch }}-${{ inputs.board }}-${{ steps.version.outputs.long }}.zip
         overwrite: true
         path: |
           ${{ inputs.artifact-paths }}

.github/workflows/build_firmware.yml

@@ -18,8 +18,7 @@ permissions: read-all
 jobs:
   pio-build:
     name: build-${{ inputs.platform }}
-    # Use 'arctastic' self-hosted runner pool when building in the main repo
-    runs-on: ${{ github.repository_owner == 'meshtastic' && 'arctastic' || 'ubuntu-latest' }}
+    runs-on: ubuntu-24.04
     outputs:
       artifact-id: ${{ steps.upload.outputs.artifact-id }}
     steps:
@@ -56,29 +55,15 @@ jobs:
           ota_firmware_source: ${{ steps.ota_dir.outputs.src || '' }}
           ota_firmware_target: ${{ steps.ota_dir.outputs.tgt || '' }}
 
-      - name: Echo manifest from release/firmware-*.mt.json to job summary
-        if: ${{ always() }}
-        env:
-          PIO_ENV: ${{ inputs.pio_env }}
-        run: |
-          echo "## Manifest: \`$PIO_ENV\`" >> $GITHUB_STEP_SUMMARY
-          echo '```json' >> $GITHUB_STEP_SUMMARY
-          cat release/firmware-*.mt.json >> $GITHUB_STEP_SUMMARY
-          echo '' >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY
-
       - name: Store binaries as an artifact
         uses: actions/upload-artifact@v5
         id: upload
         with:
-          name: firmware-${{ inputs.platform }}-${{ inputs.pio_env }}-${{ inputs.version }}
+          name: firmware-${{ inputs.platform }}-${{ inputs.pio_env }}-${{ inputs.version }}.zip
           overwrite: true
           path: |
-            release/*.mt.json
             release/*.bin
             release/*.elf
             release/*.uf2
             release/*.hex
-            release/*.zip
-            release/device-*.sh
-            release/device-*.bat
+            release/*-ota.zip

.github/workflows/build_one_arch.yml

@@ -0,0 +1,176 @@
+name: Build One Arch
+
+on:
+  workflow_dispatch:
+    inputs:
+      # trunk-ignore(checkov/CKV_GHA_7)
+      arch:
+        type: choice
+        options:
+          - esp32
+          - esp32s3
+          - esp32c3
+          - esp32c6
+          - nrf52840
+          - rp2040
+          - rp2350
+          - stm32
+          - native
+
+permissions: read-all
+
+env:
+  INPUT_ARCH: ${{ github.event.inputs.arch }}
+
+jobs:
+  setup:
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
+        with:
+          python-version: 3.x
+          cache: pip
+      - run: pip install -U platformio
+      - name: Generate matrix
+        id: jsonStep
+        run: |
+          TARGETS=$(./bin/generate_ci_matrix.py $INPUT_ARCH --level extra)
+          echo "Name: $GITHUB_REF_NAME Base: $GITHUB_BASE_REF Ref: $GITHUB_REF"
+          echo "selected_arch=$TARGETS" >> $GITHUB_OUTPUT
+    outputs:
+      selected_arch: ${{ steps.jsonStep.outputs.selected_arch }}
+
+  version:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - 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 }}
+
+  build:
+    if: ${{ github.event_name != 'workflow_dispatch' }}
+    needs: [setup, version]
+    strategy:
+      fail-fast: false
+      matrix:
+        build: ${{ fromJson(needs.setup.outputs.selected_arch) }}
+    uses: ./.github/workflows/build_firmware.yml
+    with:
+      version: ${{ needs.version.outputs.long }}
+      pio_env: ${{ matrix.build.board }}
+      platform: ${{ matrix.build.arch }}
+
+  build-debian-src:
+    if: ${{ github.repository == 'meshtastic/firmware' && github.event_name != 'workflow_dispatch' || inputs.arch == 'native' }}
+    uses: ./.github/workflows/build_debian_src.yml
+    with:
+      series: UNRELEASED
+      build_location: local
+    secrets: inherit
+
+  package-pio-deps-native-tft:
+    if: ${{ inputs.arch == 'native' }}
+    uses: ./.github/workflows/package_pio_deps.yml
+    with:
+      pio_env: native-tft
+    secrets: inherit
+
+  test-native:
+    if: ${{ !contains(github.ref_name, 'event/') && github.event_name != 'workflow_dispatch' ||  !contains(github.ref_name, 'event/') && inputs.arch == 'native' }}
+    uses: ./.github/workflows/test_native.yml
+
+  gather-artifacts:
+    permissions:
+      contents: write
+      pull-requests: write
+    strategy:
+      fail-fast: false
+      matrix:
+        arch:
+          - esp32
+          - esp32s3
+          - esp32c3
+          - esp32c6
+          - nrf52840
+          - rp2040
+          - rp2350
+          - stm32
+    runs-on: ubuntu-latest
+    needs: [version, build]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+        with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - uses: actions/download-artifact@v6
+        with:
+          path: ./
+          pattern: firmware-${{inputs.arch}}-*
+          merge-multiple: true
+
+      - name: Display structure of downloaded files
+        run: ls -R
+
+      - name: Move files up
+        run: mv -b -t ./ ./bin/device-*.sh ./bin/device-*.bat
+
+      - name: Repackage in single firmware zip
+        uses: actions/upload-artifact@v5
+        with:
+          name: firmware-${{inputs.arch}}-${{ needs.version.outputs.long }}
+          overwrite: true
+          path: |
+            ./firmware-*.bin
+            ./firmware-*.uf2
+            ./firmware-*.hex
+            ./firmware-*-ota.zip
+            ./device-*.sh
+            ./device-*.bat
+            ./littlefs-*.bin
+            ./bleota*bin
+            ./Meshtastic_nRF52_factory_erase*.uf2
+          retention-days: 30
+
+      - uses: actions/download-artifact@v6
+        with:
+          name: firmware-${{inputs.arch}}-${{ needs.version.outputs.long }}
+          merge-multiple: true
+          path: ./output
+
+      # For diagnostics
+      - name: Show artifacts
+        run: ls -lR
+
+      - name: Device scripts permissions
+        run: |
+          chmod +x ./output/device-install.sh
+          chmod +x ./output/device-update.sh
+
+      - name: Zip firmware
+        run: zip -j -9 -r ./firmware-${{inputs.arch}}-${{ needs.version.outputs.long }}.zip ./output
+
+      - name: Repackage in single elfs zip
+        uses: actions/upload-artifact@v5
+        with:
+          name: debug-elfs-${{inputs.arch}}-${{ needs.version.outputs.long }}.zip
+          overwrite: true
+          path: ./*.elf
+          retention-days: 30
+
+      - uses: scruplelesswizard/comment-artifact@main
+        if: ${{ github.event_name == 'pull_request' }}
+        with:
+          name: firmware-${{inputs.arch}}-${{ needs.version.outputs.long }}
+          description: "Download firmware-${{inputs.arch}}-${{ needs.version.outputs.long }}.zip. This artifact will be available for 90 days from creation"
+          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build_one_target.yml

@@ -15,6 +15,7 @@ on:
           - rp2040
           - rp2350
           - stm32
+          - native
       target:
         type: string
         required: false
@@ -41,6 +42,7 @@ jobs:
           - rp2040
           - rp2350
           - stm32
+
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v6
@@ -58,7 +60,7 @@ jobs:
           echo "Arch: ${{matrix.arch}}" >> $GITHUB_STEP_SUMMARY
           echo "Ref: $GITHUB_REF" >> $GITHUB_STEP_SUMMARY
           echo "Targets:" >> $GITHUB_STEP_SUMMARY
-          echo $TARGETS | jq -r 'sort_by(.board) |.[] | "- " + .board' >> $GITHUB_STEP_SUMMARY
+          echo $TARGETS >> $GITHUB_STEP_SUMMARY
 
   version:
     if: ${{ inputs.target != '' }}
@@ -85,6 +87,25 @@ jobs:
       pio_env: ${{ inputs.target }}
       platform: ${{ inputs.arch }}
 
+  build-debian-src:
+    if: ${{ github.repository == 'meshtastic/firmware' && inputs.arch == 'native' }}
+    uses: ./.github/workflows/build_debian_src.yml
+    with:
+      series: UNRELEASED
+      build_location: local
+    secrets: inherit
+
+  package-pio-deps-native-tft:
+    if: ${{ inputs.arch == 'native' }}
+    uses: ./.github/workflows/package_pio_deps.yml
+    with:
+      pio_env: native-tft
+    secrets: inherit
+
+  test-native:
+    if: ${{ !contains(github.ref_name, 'event/') && github.event_name != 'workflow_dispatch' ||  !contains(github.ref_name, 'event/') && inputs.arch == 'native' && inputs.target != '' }}
+    uses: ./.github/workflows/test_native.yml
+
   gather-artifacts:
     permissions:
       contents: write
@@ -119,7 +140,7 @@ jobs:
             ./firmware-*.bin
             ./firmware-*.uf2
             ./firmware-*.hex
-            ./firmware-*.zip
+            ./firmware-*-ota.zip
             ./device-*.sh
             ./device-*.bat
             ./littlefs-*.bin
@@ -139,8 +160,8 @@ jobs:
 
       - name: Device scripts permissions
         run: |
-          chmod +x ./output/device-install.sh || true
-          chmod +x ./output/device-update.sh || true
+          chmod +x ./output/device-install.sh
+          chmod +x ./output/device-update.sh
 
       - name: Zip firmware
         run: zip -j -9 -r ./firmware-${{inputs.target}}-${{ needs.version.outputs.long }}.zip ./output

.github/workflows/main_matrix.yml

@@ -77,21 +77,16 @@ jobs:
       fail-fast: false
       matrix:
         check: ${{ fromJson(needs.setup.outputs.check) }}
-    # Use 'arctastic' self-hosted runner pool when checking in the main repo
-    runs-on: ${{ github.repository_owner == 'meshtastic' && 'arctastic' || 'ubuntu-latest' }}
+
+    runs-on: ubuntu-latest
     if: ${{ github.event_name != 'workflow_dispatch' && github.repository == 'meshtastic/firmware' }}
     steps:
       - uses: actions/checkout@v6
-        with:
-          submodules: recursive
-          ref: ${{github.event.pull_request.head.ref}}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
+      - name: Build base
+        id: base
+        uses: ./.github/actions/setup-base
       - name: Check ${{ matrix.check.board }}
-        uses: meshtastic/gh-action-firmware@main
-        with:
-          pio_platform: ${{ matrix.check.platform }}
-          pio_env: ${{ matrix.check.board }}
-          pio_target: check
+        run: bin/check-all.sh ${{ matrix.check.board }}
 
   build:
     needs: [setup, version]
@@ -182,17 +177,19 @@ jobs:
       - name: Display structure of downloaded files
         run: ls -R
 
+      - name: Move files up
+        run: mv -b -t ./ ./bin/device-*.sh ./bin/device-*.bat
+
       - name: Repackage in single firmware zip
         uses: actions/upload-artifact@v5
         with:
           name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
           overwrite: true
           path: |
-            ./firmware-*.mt.json
             ./firmware-*.bin
             ./firmware-*.uf2
             ./firmware-*.hex
-            ./firmware-*.zip
+            ./firmware-*-ota.zip
             ./device-*.sh
             ./device-*.bat
             ./littlefs-*.bin
@@ -212,8 +209,8 @@ jobs:
 
       - name: Device scripts permissions
         run: |
-          chmod +x ./output/device-install.sh || true
-          chmod +x ./output/device-update.sh || true
+          chmod +x ./output/device-install.sh
+          chmod +x ./output/device-update.sh
 
       - name: Zip firmware
         run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output
@@ -221,7 +218,7 @@ jobs:
       - name: Repackage in single elfs zip
         uses: actions/upload-artifact@v5
         with:
-          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
           overwrite: true
           path: ./*.elf
           retention-days: 30
@@ -239,7 +236,6 @@ jobs:
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
     needs:
-      - setup
       - version
       - gather-artifacts
       - build-debian-src
@@ -248,6 +244,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
+      - name: Setup Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: 3.x
+
       - name: Create release
         uses: softprops/action-gh-release@v2
         id: create_release
@@ -283,25 +284,10 @@ jobs:
       - name: Display structure of downloaded files
         run: ls -lR
 
-      - name: Generate Release manifest
-        run: |
-          jq -n --arg ver "${{ needs.version.outputs.long }}" --argjson targets ${{ toJson(needs.setup.outputs.all) }} '{
-            "version": $ver,
-            "targets": $targets
-          }' > firmware-${{ needs.version.outputs.long }}.json
-
-      - name: Save Release manifest artifact
-        uses: actions/upload-artifact@v5
-        with:
-          name: manifest-${{ needs.version.outputs.long }}
-          overwrite: true
-          path: firmware-${{ needs.version.outputs.long }}.json
-
-      - name: Add sources to GitHub Release
+      - name: Add Linux sources to GtiHub Release
         # Only run when targeting master branch with workflow_dispatch
         if: ${{ github.ref_name == 'master' }}
         run: |
-          gh release upload v${{ needs.version.outputs.long }} ./firmware-${{ needs.version.outputs.long }}.json
           gh release upload v${{ needs.version.outputs.long }} ./output/meshtasticd-${{ needs.version.outputs.deb }}-src.zip
           gh release upload v${{ needs.version.outputs.long }} ./output/platformio-deps-native-tft-${{ needs.version.outputs.long }}.zip
         env:
@@ -343,15 +329,15 @@ jobs:
 
       - name: Device scripts permissions
         run: |
-          chmod +x ./output/device-install.sh || true
-          chmod +x ./output/device-update.sh || true
+          chmod +x ./output/device-install.sh
+          chmod +x ./output/device-update.sh
 
       - name: Zip firmware
         run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output
 
       - uses: actions/download-artifact@v6
         with:
-          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
           merge-multiple: true
           path: ./elfs
 
@@ -387,19 +373,12 @@ jobs:
         with:
           python-version: 3.x
 
-      - name: Get firmware artifacts
-        uses: actions/download-artifact@v6
+      - uses: actions/download-artifact@v6
         with:
           pattern: firmware-{${{ env.targets }}}-${{ needs.version.outputs.long }}
           merge-multiple: true
           path: ./publish
 
-      - name: Get manifest artifact
-        uses: actions/download-artifact@v6
-        with:
-          pattern: manifest-${{ needs.version.outputs.long }}
-          path: ./publish
-
       - name: Publish firmware to meshtastic.github.io
         uses: peaceiris/actions-gh-pages@v4
         env:

.github/workflows/merge_queue.yml

@@ -168,7 +168,7 @@ jobs:
             ./firmware-*.bin
             ./firmware-*.uf2
             ./firmware-*.hex
-            ./firmware-*.zip
+            ./firmware-*-ota.zip
             ./device-*.sh
             ./device-*.bat
             ./littlefs-*.bin
@@ -188,8 +188,8 @@ jobs:
 
       - name: Device scripts permissions
         run: |
-          chmod +x ./output/device-install.sh || true
-          chmod +x ./output/device-update.sh || true
+          chmod +x ./output/device-install.sh
+          chmod +x ./output/device-update.sh
 
       - name: Zip firmware
         run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output
@@ -197,7 +197,7 @@ jobs:
       - name: Repackage in single elfs zip
         uses: actions/upload-artifact@v5
         with:
-          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
           overwrite: true
           path: ./*.elf
           retention-days: 30
@@ -223,6 +223,11 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v6
 
+      - name: Setup Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: 3.x
+
       - name: Create release
         uses: softprops/action-gh-release@v2
         id: create_release
@@ -303,15 +308,15 @@ jobs:
 
       - name: Device scripts permissions
         run: |
-          chmod +x ./output/device-install.sh || true
-          chmod +x ./output/device-update.sh || true
+          chmod +x ./output/device-install.sh
+          chmod +x ./output/device-update.sh
 
       - name: Zip firmware
         run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output
 
       - uses: actions/download-artifact@v6
         with:
-          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
           merge-multiple: true
           path: ./elfs
 

.github/workflows/pr_tests.yml

@@ -52,7 +52,7 @@ jobs:
         if: needs.native-tests.result != 'skipped'
         uses: actions/download-artifact@v6
         with:
-          name: platformio-test-report-${{ steps.version.outputs.long }}
+          name: platformio-test-report-${{ steps.version.outputs.long }}.zip
           merge-multiple: true
 
       - name: Parse test results and create detailed summary

.github/workflows/release_channels.yml

@@ -102,7 +102,7 @@ jobs:
           PIP_DISABLE_PIP_VERSION_CHECK: 1
 
       - name: Create Bumps pull request
-        uses: peter-evans/create-pull-request@v8
+        uses: peter-evans/create-pull-request@v7
         with:
           base: ${{ github.event.repository.default_branch }}
           branch: create-pull-request/bump-version

.github/workflows/test_native.yml

@@ -40,7 +40,7 @@ jobs:
 
       - name: Integration test
         run: |
-          .pio/build/coverage/meshtasticd -s &
+          .pio/build/coverage/program -s &
           PID=$!
           timeout 20 bash -c "until ls -al /proc/$PID/fd | grep socket; do sleep 1; done"
           echo "Simulator started, launching python test..."
@@ -62,7 +62,7 @@ jobs:
         uses: actions/upload-artifact@v5
         if: always() # run this step even if previous step failed
         with:
-          name: lcov-coverage-info-native-simulator-test-${{ steps.version.outputs.long }}
+          name: lcov-coverage-info-native-simulator-test-${{ steps.version.outputs.long }}.zip
           overwrite: true
           path: ./coverage_*.info
 
@@ -96,7 +96,7 @@ jobs:
         if: always() # run this step even if previous step failed
         uses: actions/upload-artifact@v5
         with:
-          name: platformio-test-report-${{ steps.version.outputs.long }}
+          name: platformio-test-report-${{ steps.version.outputs.long }}.zip
           overwrite: true
           path: ./testreport.xml
 
@@ -111,7 +111,7 @@ jobs:
         uses: actions/upload-artifact@v5
         if: always() # run this step even if previous step failed
         with:
-          name: lcov-coverage-info-native-platformio-tests-${{ steps.version.outputs.long }}
+          name: lcov-coverage-info-native-platformio-tests-${{ steps.version.outputs.long }}.zip
           overwrite: true
           path: ./coverage_*.info
 
@@ -139,7 +139,7 @@ jobs:
       - name: Download test artifacts
         uses: actions/download-artifact@v6
         with:
-          name: platformio-test-report-${{ steps.version.outputs.long }}
+          name: platformio-test-report-${{ steps.version.outputs.long }}.zip
           merge-multiple: true
 
       - name: Test Report
@@ -152,7 +152,7 @@ jobs:
       - name: Download coverage artifacts
         uses: actions/download-artifact@v6
         with:
-          pattern: lcov-coverage-info-native-*-${{ steps.version.outputs.long }}
+          pattern: lcov-coverage-info-native-*-${{ steps.version.outputs.long }}.zip
           path: code-coverage-report
           merge-multiple: true
 
@@ -165,5 +165,5 @@ jobs:
       - name: Save Code Coverage Report
         uses: actions/upload-artifact@v5
         with:
-          name: code-coverage-report-${{ steps.version.outputs.long }}
+          name: code-coverage-report-${{ steps.version.outputs.long }}.zip
           path: code-coverage-report

.github/workflows/tests.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v6
 
-      # - uses: actions/setup-python@v6
+      # - uses: actions/setup-python@v5
       #   with:
       #     python-version: '3.10'
 

.github/workflows/update_protobufs.yml

@@ -31,7 +31,7 @@ jobs:
           ./bin/regen-protos.sh
 
       - name: Create pull request
-        uses: peter-evans/create-pull-request@v8
+        uses: peter-evans/create-pull-request@v7
         with:
           branch: create-pull-request/update-protobufs
           labels: submodules

.trunk/trunk.yaml

@@ -9,24 +9,24 @@ plugins:
 lint:
   enabled:
     - checkov@3.2.495
-    - renovate@42.48.0
+    - renovate@42.30.4
     - prettier@3.7.4
-    - trufflehog@3.92.3
+    - trufflehog@3.91.2
     - yamllint@1.37.1
     - bandit@1.9.2
-    - trivy@0.68.1
+    - trivy@0.67.2
     - taplo@0.10.0
-    - ruff@0.14.9
+    - ruff@0.14.7
     - isort@7.0.0
-    - markdownlint@0.47.0
-    - oxipng@10.0.0
+    - markdownlint@0.46.0
+    - oxipng@9.1.5
     - svgo@4.0.0
     - actionlint@1.7.9
     - flake8@7.3.0
     - hadolint@2.14.0
     - shfmt@3.6.0
     - shellcheck@0.11.0
-    - black@25.12.0
+    - black@25.11.0
     - git-diff-check
     - gitleaks@8.30.0
     - clang-format@16.0.3

arch/esp32/esp32.ini

@@ -2,15 +2,9 @@
 [esp32_base]
 extends = arduino_base
 custom_esp32_kind = esp32
-custom_mtjson_part =
 platform =
   # renovate: datasource=custom.pio depName=platformio/espressif32 packageName=platformio/platform/espressif32
-  platformio/espressif32@6.12.0
-
-extra_scripts =
-  ${env.extra_scripts}
-  pre:extra_scripts/esp32_pre.py
-  extra_scripts/esp32_extra.py
+  platformio/espressif32@6.11.0
 
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>

arch/nrf52/nrf52.ini

@@ -11,13 +11,9 @@ platform_packages =
   ; Don't renovate toolchain-gccarmnoneeabi
   platformio/toolchain-gccarmnoneeabi@~1.90301.0
 
-extra_scripts =
-  ${env.extra_scripts}
-  extra_scripts/nrf52_extra.py
-
-build_type = release
+build_type = debug
 build_flags =
-  -include variants/nrf52840/cpp_overrides/lfs_util.h
+  -include arch/nrf52/cpp_overrides/lfs_util.h
   ${arduino_base.build_flags}
   -DSERIAL_BUFFER_SIZE=1024
   -Wno-unused-variable
@@ -25,17 +21,6 @@ build_flags =
   -DLFS_NO_ASSERT                      ; Disable LFS assertions , see https://github.com/meshtastic/firmware/pull/3818
   -DMESHTASTIC_EXCLUDE_AUDIO=1
   -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
-  -Os
-build_unflags =
-  -Ofast
-  -Og
-  -ggdb3
-  -ggdb2
-  -g3
-  -g2
-  -g
-  -g1
-  -g0
 
 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/>

arch/stm32/stm32.ini

@@ -8,7 +8,7 @@ platform_packages =
   platformio/framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/2.10.1.zip
 extra_scripts =
   ${env.extra_scripts}
-  extra_scripts/stm32_extra.py
+  post:extra_scripts/extra_stm32.py
 
 build_type = release
 

bin/build-esp32.sh

@@ -5,8 +5,7 @@ set -e
 VERSION=`bin/buildinfo.py long`
 SHORT_VERSION=`bin/buildinfo.py short`
 
-BUILDDIR=.pio/build/$1
-OUTDIR=release
+OUTDIR=release/
 
 rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
@@ -15,27 +14,33 @@ rm -r $OUTDIR/* || true
 platformio pkg install -e $1
 
 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
-rm -f $BUILDDIR/firmware*
+rm -f .pio/build/$1/firmware.*
 
 # The shell vars the build tool expects to find
 export APP_VERSION=$VERSION
 
 basename=firmware-$1-$VERSION
 
-pio run --environment $1 -t mtjson # -v
-
-cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf
+pio run --environment $1 # -v
+SRCELF=.pio/build/$1/firmware.elf
+cp $SRCELF $OUTDIR/$basename.elf
 
 echo "Copying ESP32 bin file"
-cp $BUILDDIR/$basename.factory.bin $OUTDIR/$basename.factory.bin
+SRCBIN=.pio/build/$1/firmware.factory.bin
+cp $SRCBIN $OUTDIR/$basename.bin
 
 echo "Copying ESP32 update bin file"
-cp $BUILDDIR/$basename.bin $OUTDIR/$basename.bin
+SRCBIN=.pio/build/$1/firmware.bin
+cp $SRCBIN $OUTDIR/$basename-update.bin
 
-echo "Copying Filesystem for ESP32 targets"
-cp $BUILDDIR/littlefs-$1-$VERSION.bin $OUTDIR/littlefs-$1-$VERSION.bin
-cp bin/device-install.* $OUTDIR/
-cp bin/device-update.* $OUTDIR/
-
-echo "Copying manifest"
-cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json
+echo "Building Filesystem for ESP32 targets"
+# If you want to build the webui, uncomment the following lines
+# pio run --environment $1 -t buildfs
+# cp .pio/build/$1/littlefs.bin $OUTDIR/littlefswebui-$1-$VERSION.bin
+# # Remove webserver files from the filesystem and rebuild
+# ls -l data/static # Diagnostic list of files
+# rm -rf data/static
+pio run --environment $1 -t buildfs
+cp .pio/build/$1/littlefs.bin $OUTDIR/littlefs-$1-$VERSION.bin
+cp bin/device-install.* $OUTDIR
+cp bin/device-update.* $OUTDIR

bin/build-native.sh

@@ -17,19 +17,15 @@ VERSION=$(bin/buildinfo.py long)
 SHORT_VERSION=$(bin/buildinfo.py short)
 PIO_ENV=${1:-native}
 
-BUILDDIR=.pio/build/$PIO_ENV
-OUTDIR=release
+OUTDIR=release/
 
-rm -f $OUTDIR/meshtasticd*
+rm -f $OUTDIR/firmware*
 
 mkdir -p $OUTDIR/
 rm -r $OUTDIR/* || true
 
-basename=meshtasticd-$1-$VERSION
-
 # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
 pio pkg install --environment "$PIO_ENV" || platformioFailed
 pio run --environment "$PIO_ENV" || platformioFailed
-
-cp "$BUILDDIR/meshtasticd" "$OUTDIR/meshtasticd_linux_$(uname -m)"
-cp bin/native-install.* $OUTDIR/
+cp ".pio/build/$PIO_ENV/program" "$OUTDIR/meshtasticd_linux_$(uname -m)"
+cp bin/native-install.* $OUTDIR

bin/build-nrf52.sh

@@ -5,8 +5,7 @@ set -e
 VERSION=$(bin/buildinfo.py long)
 SHORT_VERSION=$(bin/buildinfo.py short)
 
-BUILDDIR=.pio/build/$1
-OUTDIR=release
+OUTDIR=release/
 
 rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
@@ -15,37 +14,40 @@ rm -r $OUTDIR/* || true
 platformio pkg install -e $1
 
 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
-rm -f $BUILDDIR/firmware*
+rm -f .pio/build/$1/firmware.*
 
 # The shell vars the build tool expects to find
 export APP_VERSION=$VERSION
 
 basename=firmware-$1-$VERSION
 
-pio run --environment $1 -t mtjson # -v
+pio run --environment $1 # -v
+SRCELF=.pio/build/$1/firmware.elf
+cp $SRCELF $OUTDIR/$basename.elf
 
-cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf
+echo "Generating NRF52 dfu file"
+DFUPKG=.pio/build/$1/firmware.zip
+cp $DFUPKG $OUTDIR/$basename-ota.zip
 
-echo "Copying NRF52 dfu (OTA) file"
-cp $BUILDDIR/$basename.zip $OUTDIR/$basename.zip
+echo "Generating NRF52 uf2 file"
+SRCHEX=.pio/build/$1/firmware.hex
 
-echo "Copying NRF52 UF2 file"
-cp $BUILDDIR/$basename.uf2 $OUTDIR/$basename.uf2
-cp bin/*.uf2 $OUTDIR/
-
-SRCHEX=$BUILDDIR/$basename.hex
-
-# if WM1110 target, copy the merged.hex
+# if WM1110 target, merge hex with softdevice 7.3.0
 if (echo $1 | grep -q "wio-sdk-wm1110"); then
-	echo "Copying .merged.hex file"
-	SRCHEX=$BUILDDIR/$basename.merged.hex
-	cp $SRCHEX $OUTDIR/
+	echo "Merging with softdevice"
+	bin/mergehex -m bin/s140_nrf52_7.3.0_softdevice.hex $SRCHEX -o .pio/build/$1/$basename.hex
+	SRCHEX=.pio/build/$1/$basename.hex
+	bin/uf2conv.py $SRCHEX -c -o $OUTDIR/$basename.uf2 -f 0xADA52840
+	cp $SRCHEX $OUTDIR
+	cp bin/*.uf2 $OUTDIR
+else
+	bin/uf2conv.py $SRCHEX -c -o $OUTDIR/$basename.uf2 -f 0xADA52840
+	cp bin/device-install.* $OUTDIR
+	cp bin/device-update.* $OUTDIR
+	cp bin/*.uf2 $OUTDIR
 fi
 
 if (echo $1 | grep -q "rak4631"); then
-	echo "Copying .hex file"
-	cp $SRCHEX $OUTDIR/
-fi
-
-echo "Copying manifest"
-cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json
+	echo "Copying hex file"
+	cp .pio/build/$1/firmware.hex $OUTDIR/$basename.hex
+fi

bin/build-rp2xx0.sh

@@ -5,8 +5,7 @@ set -e
 VERSION=`bin/buildinfo.py long`
 SHORT_VERSION=`bin/buildinfo.py short`
 
-BUILDDIR=.pio/build/$1
-OUTDIR=release
+OUTDIR=release/
 
 rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
@@ -15,19 +14,20 @@ rm -r $OUTDIR/* || true
 platformio pkg install -e $1
 
 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
-rm -f $BUILDDIR/firmware*
+rm -f .pio/build/$1/firmware.*
 
 # The shell vars the build tool expects to find
 export APP_VERSION=$VERSION
 
 basename=firmware-$1-$VERSION
 
-pio run --environment $1 -t mtjson # -v
-
-cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf
+pio run --environment $1 # -v
+SRCELF=.pio/build/$1/firmware.elf
+cp $SRCELF $OUTDIR/$basename.elf
 
 echo "Copying uf2 file"
-cp $BUILDDIR/$basename.uf2 $OUTDIR/$basename.uf2
+SRCBIN=.pio/build/$1/firmware.uf2
+cp $SRCBIN $OUTDIR/$basename.uf2
 
-echo "Copying manifest"
-cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json
+cp bin/device-install.* $OUTDIR
+cp bin/device-update.* $OUTDIR

bin/build-stm32wl.sh

@@ -5,8 +5,7 @@ set -e
 VERSION=$(bin/buildinfo.py long)
 SHORT_VERSION=$(bin/buildinfo.py short)
 
-BUILDDIR=.pio/build/$1
-OUTDIR=release
+OUTDIR=release/
 
 rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
@@ -15,19 +14,16 @@ rm -r $OUTDIR/* || true
 platformio pkg install -e $1
 
 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
-rm -f $BUILDDIR/firmware*
+rm -f .pio/build/$1/firmware.*
 
 # The shell vars the build tool expects to find
 export APP_VERSION=$VERSION
 
 basename=firmware-$1-$VERSION
 
-pio run --environment $1 -t mtjson # -v
+pio run --environment $1 # -v
+SRCELF=.pio/build/$1/firmware.elf
+cp $SRCELF $OUTDIR/$basename.elf
 
-cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf
-
-echo "Copying STM32 bin file"
-cp $BUILDDIR/$basename.bin $OUTDIR/$basename.bin
-
-echo "Copying manifest"
-cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json
+SRCBIN=.pio/build/$1/firmware.bin
+cp $SRCBIN $OUTDIR/$basename.bin

bin/device-install.bat

@@ -5,14 +5,22 @@ TITLE Meshtastic device-install
 SET "SCRIPT_NAME=%~nx0"
 SET "DEBUG=0"
 SET "PYTHON="
+SET "TFT_BUILD=0"
+SET "BIGDB8=0"
+SET "MUIDB8=0"
+SET "BIGDB16=0"
 SET "ESPTOOL_BAUD=115200"
 SET "ESPTOOL_CMD="
 SET "LOGCOUNTER=0"
 SET "BPS_RESET=0"
-@REM Default offsets.
-@REM https://github.com/meshtastic/web-flasher/blob/main/stores/firmwareStore.ts#L202
-SET "OTA_OFFSET=0x260000"
-SET "SPIFFS_OFFSET=0x300000"
+
+@REM FIXME: Determine mcu from PlatformIO variant, this is unmaintainable.
+SET "S3=s3 v3 t-deck wireless-paper wireless-tracker station-g2 unphone t-eth-elite tlora-pager mesh-tab dreamcatcher ESP32-S3-Pico seeed-sensecap-indicator heltec_capsule_sensor_v3 vision-master icarus tracksenger elecrow-adv heltec-v4"
+SET "C3=esp32c3"
+@REM FIXME: Determine flash size from PlatformIO variant, this is unmaintainable.
+SET "BIGDB_8MB=crowpanel-esp32s3 heltec_capsule_sensor_v3 heltec-v3 heltec-vision-master-e213 heltec-vision-master-e290 heltec-vision-master-t190 heltec-wireless-paper heltec-wireless-tracker heltec-wsl-v3 icarus seeed-xiao-s3 tbeam-s3-core tracksenger"
+SET "MUIDB_8MB=picomputer-s3 unphone seeed-sensecap-indicator"
+SET "BIGDB_16MB=t-deck mesh-tab t-energy-s3 dreamcatcher ESP32-S3-Pico m5stack-cores3 station-g2 t-eth-elite tlora-pager t-watch-s3 elecrow-adv heltec-v4"
 
 GOTO getopts
 :help
@@ -21,7 +29,7 @@ ECHO.
 ECHO Usage: %SCRIPT_NAME% -f filename [-p PORT] [-P python] [--1200bps-reset]
 ECHO.
 ECHO Options:
-ECHO     -f filename      The firmware .factory.bin file to flash.  Custom to your device type and region. (required)
+ECHO     -f filename      The firmware .bin file to flash.  Custom to your device type and region. (required)
 ECHO                      The file must be located in this current directory.
 ECHO     -p PORT          Set the environment variable for ESPTOOL_PORT.
 ECHO                      If not set, ESPTOOL iterates all ports (Dangerous).
@@ -32,12 +40,12 @@ ECHO     --1200bps-reset  Attempt to place the device in correct mode. (1200bps
 ECHO                      Some hardware requires this twice.
 ECHO.
 ECHO Example: %SCRIPT_NAME% -p COM17 --1200bps-reset
-ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4.factory.bin -p COM11
-ECHO Example: %SCRIPT_NAME% -f firmware-unphone-2.6.0.0b106d4.factory.bin -p COM11
+ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4.bin -p COM11
+ECHO Example: %SCRIPT_NAME% -f firmware-unphone-2.6.0.0b106d4.bin -p COM11
 GOTO eof
 
 :version
-ECHO %SCRIPT_NAME% [Version 2.7.0]
+ECHO %SCRIPT_NAME% [Version 2.6.2]
 ECHO Meshtastic
 GOTO eof
 
@@ -70,8 +78,8 @@ IF "__!FILENAME!__"=="____" (
         CALL :LOG_MESSAGE ERROR "Filename containing spaces are not supported."
         GOTO help
     )
-    IF NOT "__!FILENAME:.factory.bin=!__"=="__!FILENAME!__" (
-        CALL :LOG_MESSAGE ERROR "Filename must be a firmware-*.factory.bin file."
+    IF "__!FILENAME:firmware-=!__"=="__!FILENAME!__" (
+        CALL :LOG_MESSAGE ERROR "Filename must be a firmware-* file."
         GOTO help
     )
     @REM Remove ".\" or "./" file prefix if present.
@@ -85,26 +93,12 @@ IF NOT EXIST !FILENAME! (
     GOTO eof
 )
 
-CALL :LOG_MESSAGE DEBUG "Checking for metadata..."
-@REM Derive metadata filename from firmware filename.
-SET "METAFILE=!FILENAME:.factory.bin=!.mt.json"
-IF EXIST !METAFILE! (
-    @REM Print parsed json with powershell
-    CALL :LOG_MESSAGE INFO "Firmware metadata: !METAFILE!"
-    powershell -NoProfile -Command "(Get-Content '!METAFILE!' | ConvertFrom-Json | Out-String).Trim()"
-
-    @REM Save metadata values to variables for later use.
-    FOR /f "usebackq" %%A IN (`powershell -NoProfile -Command ^
-        "(Get-Content '!METAFILE!' | ConvertFrom-Json).mcu"`) DO SET "MCU=%%A"
-    FOR /f "usebackq" %%A IN (`powershell -NoProfile -Command ^
-        "(Get-Content '!METAFILE!' | ConvertFrom-Json).part | Where-Object { $_.subtype -eq 'ota_1' } | Select-Object -ExpandProperty offset"`
-    ) DO SET "OTA_OFFSET=%%A"
-    FOR /f "usebackq" %%A IN (`powershell -NoProfile -Command ^
-        "(Get-Content '!METAFILE!' | ConvertFrom-Json).part | Where-Object { $_.subtype -eq 'spiffs' } | Select-Object -ExpandProperty offset"`
-    ) DO SET "SPIFFS_OFFSET=%%A"
-) ELSE (
-    CALL :LOG_MESSAGE ERROR "No metadata file found: !METAFILE!"
+IF NOT "!FILENAME:update=!"=="!FILENAME!" (
+    CALL :LOG_MESSAGE DEBUG "We are working with a *update* file. !FILENAME!"
+    CALL :LOG_MESSAGE INFO "Use script device-update.bat to flash update !FILENAME!."
     GOTO eof
+) ELSE (
+    CALL :LOG_MESSAGE DEBUG "We are NOT working with a *update* file. !FILENAME!"
 )
 
 :skip-filename
@@ -114,7 +108,7 @@ IF NOT "__%PYTHON%__"=="____" (
     SET "ESPTOOL_CMD=!PYTHON! -m esptool"
     CALL :LOG_MESSAGE DEBUG "Python interpreter supplied."
 ) ELSE (
-    CALL :LOG_MESSAGE DEBUG "Python interpreter NOT supplied. Looking for esptool..."
+    CALL :LOG_MESSAGE DEBUG "Python interpreter NOT supplied. Looking for esptool...
     WHERE esptool >nul 2>&1
     IF %ERRORLEVEL% EQU 0 (
         @REM WHERE exits with code 0 if esptool is found.
@@ -152,26 +146,100 @@ IF %BPS_RESET% EQU 1 (
     GOTO eof
 )
 
-@REM Extract PROGNAME from %FILENAME% for later use.
-SET "PROGNAME=!FILENAME:.factory.bin=!"
-CALL :LOG_MESSAGE DEBUG "Computed PROGNAME: !PROGNAME!"
-
-IF "__!MCU!__" == "__esp32s3__" (
-    @REM We are working with ESP32-S3
-    SET "OTA_FILENAME=bleota-s3.bin"
-) ELSE IF "__!MCU!__" == "__esp32c3__" (
-    @REM We are working with ESP32-C3
-    SET "OTA_FILENAME=bleota-c3.bin"
+@REM Check if FILENAME contains "-tft-" and set target partitionScheme accordingly.
+@REM https://github.com/meshtastic/web-flasher/blob/main/types/resources.ts#L3
+IF NOT "!FILENAME:-tft-=!"=="!FILENAME!" (
+    CALL :LOG_MESSAGE DEBUG "We are working with a *-tft-* file. !FILENAME!"
+    SET "TFT_BUILD=1"
 ) ELSE (
-    @REM Everything else
-    SET "OTA_FILENAME=bleota.bin"
+    CALL :LOG_MESSAGE DEBUG "We are NOT working with a *-tft-* file. !FILENAME!"
 )
+
+FOR %%a IN (%BIGDB_8MB%) DO (
+    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
+        @REM We are working with any of %BIGDB_8MB%.
+        SET "BIGDB8=1"
+        GOTO end_loop_bigdb_8mb
+    )
+)
+:end_loop_bigdb_8mb
+
+FOR %%a IN (%MUIDB_8MB%) DO (
+    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
+        @REM We are working with any of %MUIDB_8MB%.
+        SET "MUIDB8=1"
+        GOTO end_loop_muidb_8mb
+    )
+)
+:end_loop_muidb_8mb
+
+FOR %%a IN (%BIGDB_16MB%) DO (
+    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
+        @REM We are working with any of %BIGDB_16MB%.
+        SET "BIGDB16=1"
+        GOTO end_loop_bigdb_16mb
+    )
+)
+:end_loop_bigdb_16mb
+
+IF %BIGDB8% EQU 1 CALL :LOG_MESSAGE INFO "BigDB 8mb partition selected."
+IF %MUIDB8% EQU 1 CALL :LOG_MESSAGE INFO "MUIDB 8mb partition selected."
+IF %BIGDB16% EQU 1 CALL :LOG_MESSAGE INFO "BigDB 16mb partition selected."
+
+@REM Extract BASENAME from %FILENAME% for later use.
+SET "BASENAME=!FILENAME:firmware-=!"
+CALL :LOG_MESSAGE DEBUG "Computed firmware basename: !BASENAME!"
+
+@REM Account for S3 and C3 board's different OTA partition.
+FOR %%a IN (%S3%) DO (
+    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
+        @REM We are working with any of %S3%.
+        SET "OTA_FILENAME=bleota-s3.bin"
+        GOTO :end_loop_s3
+    )
+)
+
+FOR %%a IN (%C3%) DO (
+    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
+        @REM We are working with any of %C3%.
+        SET "OTA_FILENAME=bleota-c3.bin"
+        GOTO :end_loop_c3
+    )
+)
+
+@REM Everything else
+SET "OTA_FILENAME=bleota.bin"
+:end_loop_s3
+:end_loop_c3
 CALL :LOG_MESSAGE DEBUG "Set OTA_FILENAME to: !OTA_FILENAME!"
 
 @REM Set SPIFFS filename with "littlefs-" prefix.
-SET "SPIFFS_FILENAME=littlefs-!PROGNAME:firmware-=!.bin"
+SET "SPIFFS_FILENAME=littlefs-%BASENAME%"
 CALL :LOG_MESSAGE DEBUG "Set SPIFFS_FILENAME to: !SPIFFS_FILENAME!"
 
+@REM Default offsets.
+@REM https://github.com/meshtastic/web-flasher/blob/main/stores/firmwareStore.ts#L202
+SET "OTA_OFFSET=0x260000"
+SET "SPIFFS_OFFSET=0x300000"
+
+@REM Offsets for BigDB 8mb.
+IF %BIGDB8% EQU 1 (
+    SET "OTA_OFFSET=0x340000"
+    SET "SPIFFS_OFFSET=0x670000"
+)
+
+@REM Offsets for MUIDB 8mb.
+IF %MUIDB8% EQU 1 (
+    SET "OTA_OFFSET=0x5D0000"
+    SET "SPIFFS_OFFSET=0x670000"
+)
+
+@REM Offsets for BigDB 16mb.
+IF %BIGDB16% EQU 1 (
+    SET "OTA_OFFSET=0x650000"
+    SET "SPIFFS_OFFSET=0xc90000"
+)
+
 CALL :LOG_MESSAGE DEBUG "Set OTA_OFFSET to: !OTA_OFFSET!"
 CALL :LOG_MESSAGE DEBUG "Set SPIFFS_OFFSET to: !SPIFFS_OFFSET!"
 

bin/device-install.sh

@@ -2,15 +2,69 @@
 
 PYTHON=${PYTHON:-$(which python3 python | head -n 1)}
 BPS_RESET=false
+TFT_BUILD=false
 MCU=""
 
 # Constants
 RESET_BAUD=1200
 FIRMWARE_OFFSET=0x00
-# Default littlefs* offset.
-OFFSET=0x300000
-# Default OTA Offset
-OTA_OFFSET=0x260000
+
+# Variant groups
+BIGDB_8MB=(
+    "crowpanel-esp32s3"
+    "heltec_capsule_sensor_v3"
+    "heltec-v3"
+    "heltec-vision-master-e213"
+    "heltec-vision-master-e290"
+    "heltec-vision-master-t190"
+    "heltec-wireless-paper"
+    "heltec-wireless-tracker"
+    "heltec-wsl-v3"
+    "icarus"
+    "seeed-xiao-s3"
+    "tbeam-s3-core"
+    "tracksenger"
+)
+MUIDB_8MB=(
+    "picomputer-s3"
+    "unphone"
+    "seeed-sensecap-indicator"
+)
+BIGDB_16MB=(
+    "dreamcatcher"
+    "elecrow-adv"
+    "ESP32-S3-Pico"
+    "heltec-v4"
+    "m5stack-cores3"
+    "mesh-tab"
+    "station-g2"
+    "t-deck"
+    "t-energy-s3"
+    "t-eth-elite"
+    "t-watch-s3"
+    "tlora-pager"
+)
+S3_VARIANTS=(
+    "s3"
+    "-v3"
+    "-v4"
+    "t-deck"
+    "wireless-paper"
+    "wireless-tracker"
+    "station-g2"
+    "unphone"
+    "t-eth-elite"
+    "tlora-pager"
+    "mesh-tab"
+    "dreamcatcher"
+    "ESP32-S3-Pico"
+    "seeed-sensecap-indicator"
+    "heltec_capsule_sensor_v3"
+    "vision-master"
+    "icarus"
+    "tracksenger"
+    "elecrow-adv"
+)
 
 # Determine the correct esptool command to use
 if "$PYTHON" -m esptool version >/dev/null 2>&1; then
@@ -24,14 +78,6 @@ else
     exit 1
 fi
 
-# Check for jq
-if ! command -v jq >/dev/null 2>&1; then
-    echo "Error: jq not found" >&2
-    echo "Install jq with your package manager." >&2
-    echo "e.g. 'apt install jq', 'dnf install jq', 'brew install jq', etc." >&2
-    exit 1
-fi
-
 set -e
 
 # Usage info
@@ -43,7 +89,7 @@ Flash image file to device, but first erasing and writing system information.
     -h               Display this help and exit.
     -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerous).
     -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: "$PYTHON")
-    -f FILENAME      The firmware *.factory.bin file to flash.  Custom to your device type and region.
+    -f FILENAME      The firmware .bin file to flash.  Custom to your device type and region.
     --1200bps-reset  Attempt to place the device in correct mode. Some hardware requires this twice. (1200bps Reset)
 
 EOF
@@ -92,43 +138,69 @@ fi
     shift
 }
 
-if [[ $(basename "$FILENAME") != firmware-*.factory.bin ]]; then
-  echo "Filename must be a firmware-*.factory.bin file."
+if [[ "$FILENAME" != firmware-* ]]; then
+  echo "Filename must be a firmware-* file."
   exit 1
 fi
 
-# Extract PROGNAME from %FILENAME% for later use.
-PROGNAME="${FILENAME/.factory.bin/}"
-# Derive metadata filename from %PROGNAME%.
-METAFILE="${PROGNAME}.mt.json"
+# Check if FILENAME contains "-tft-" and set target partitionScheme accordingly.
+if [[ "${FILENAME//-tft-/}" != "$FILENAME" ]]; then
+    TFT_BUILD=true
+fi
 
-if [[ -f "$FILENAME" && "$FILENAME" == *.factory.bin ]]; then
-    # Display metadata if it exists
-    if [[ -f "$METAFILE" ]]; then
-        echo "Firmware metadata: ${METAFILE}"
-        jq . "$METAFILE"
-        # Extract relevant fields from metadata
-        if [[ $(jq -r '.part' "$METAFILE") != "null" ]]; then
-            OTA_OFFSET=$(jq -r '.part[] | select(.subtype == "ota_1") | .offset' "$METAFILE")
-            SPIFFS_OFFSET=$(jq -r '.part[] | select(.subtype == "spiffs") | .offset' "$METAFILE")
+# Extract BASENAME from %FILENAME% for later use.
+BASENAME="${FILENAME/firmware-/}"
+
+if [ -f "${FILENAME}" ] && [ -n "${FILENAME##*"update"*}" ]; then
+    # Default littlefs* offset.
+    OFFSET=0x300000
+
+    # Default OTA Offset
+    OTA_OFFSET=0x260000
+
+    # littlefs* offset for BigDB 8mb and OTA OFFSET.
+    for variant in "${BIGDB_8MB[@]}"; do
+        if [ -z "${FILENAME##*"$variant"*}" ]; then
+            OFFSET=0x670000
+            OTA_OFFSET=0x340000
         fi
-        MCU=$(jq -r '.mcu' "$METAFILE")
-    else
-        echo "ERROR: No metadata file found at ${METAFILE}"
-        exit 1
-    fi
+    done
 
-    # Determine OTA filename based on MCU type
-    if [ "$MCU" == "esp32s3" ]; then
-        OTAFILE=bleota-s3.bin
-    elif [ "$MCU" == "esp32c3" ]; then
-        OTAFILE=bleota-c3.bin
+    for variant in "${MUIDB_8MB[@]}"; do
+        if [ -z "${FILENAME##*"$variant"*}" ]; then
+            OFFSET=0x670000
+            OTA_OFFSET=0x5D0000
+        fi
+    done
+
+    # littlefs* offset for BigDB 16mb and OTA OFFSET.
+    for variant in "${BIGDB_16MB[@]}"; do
+        if [ -z "${FILENAME##*"$variant"*}" ]; then
+            OFFSET=0xc90000
+            OTA_OFFSET=0x650000
+        fi
+    done
+
+    # Account for S3 board's different OTA partition
+    # FIXME: Use PlatformIO info to determine MCU type, this is unmaintainable
+    for variant in "${S3_VARIANTS[@]}"; do
+        if [ -z "${FILENAME##*"$variant"*}" ]; then
+            MCU="esp32s3"
+        fi
+    done
+
+    if [ "$MCU" != "esp32s3" ]; then
+        if [ -n "${FILENAME##*"esp32c3"*}" ]; then
+            OTAFILE=bleota.bin
+        else
+            OTAFILE=bleota-c3.bin
+        fi
     else
-        OTAFILE=bleota.bin
+        OTAFILE=bleota-s3.bin
     fi
 
     # Set SPIFFS filename with "littlefs-" prefix.
-    SPIFFSFILE="littlefs-${PROGNAME/firmware-/}.bin"
+    SPIFFSFILE=littlefs-${BASENAME}
 
     if [[ ! -f "$FILENAME" ]]; then
         echo "Error: file ${FILENAME} wasn't found. Terminating."

bin/device-update.bat

@@ -30,11 +30,11 @@ ECHO     --change-mode    Attempt to place the device in correct mode. (1200bps
 ECHO                      Some hardware requires this twice.
 ECHO.
 ECHO Example: %SCRIPT_NAME% -p COM17 --change-mode
-ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4.bin -p COM11
+ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4-update.bin -p COM11
 GOTO eof
 
 :version
-ECHO %SCRIPT_NAME% [Version 2.7.0]
+ECHO %SCRIPT_NAME% [Version 2.6.2]
 ECHO Meshtastic
 GOTO eof
 
@@ -78,12 +78,12 @@ IF NOT EXIST !FILENAME! (
     GOTO eof
 )
 
-IF NOT "__!FILENAME:.factory.bin=!__"=="__!FILENAME!__" (
-    CALL :LOG_MESSAGE DEBUG "We are working with a *.factory.bin* file. !FILENAME!"
+IF "!FILENAME:update=!"=="!FILENAME!" (
+    CALL :LOG_MESSAGE DEBUG "We are NOT working with a *update* file. !FILENAME!"
     CALL :LOG_MESSAGE INFO "Use script device-install.bat to flash !FILENAME!."
     GOTO eof
 ) ELSE (
-    CALL :LOG_MESSAGE DEBUG "We are not working with a *.factory.bin* file. !FILENAME!"
+    CALL :LOG_MESSAGE DEBUG "We are working with a *update* file. !FILENAME!"
 )
 
 :skip-filename

bin/device-update.sh

@@ -29,7 +29,7 @@ Flash image file to device, leave existing system intact."
     -h               Display this help and exit
     -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerous).
     -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: "$PYTHON")
-    -f FILENAME      The *.bin file to flash.  Custom to your device type.
+    -f FILENAME      The *update.bin file to flash.  Custom to your device type.
     --change-mode    Attempt to place the device in correct mode. Some hardware requires this twice. (1200bps Reset)
 
 EOF
@@ -78,7 +78,7 @@ fi
     shift
 }
 
-if [[ -f "$FILENAME" && "$FILENAME" != *.factory.bin ]]; then
+if [ -f "${FILENAME}" ] && [ -z "${FILENAME##*"update"*}" ]; then
     echo "Trying to flash update ${FILENAME}"
     $ESPTOOL_CMD --baud $FLASH_BAUD write-flash $UPDATE_OFFSET "${FILENAME}"
 else

bin/exception_decoder.py

@@ -75,7 +75,7 @@ TOOLS = {
 }
 
 BACKTRACE_REGEX = re.compile(
-    r"\b(0x4[0-9a-fA-F]{7,8}):0x[0-9a-fA-F]{8}\b"
+    r"(?:\s+(0x40[0-2](?:\d|[a-f]|[A-F]){5}):0x(?:\d|[a-f]|[A-F]){8})\b"
 )
 EXCEPTION_REGEX = re.compile("^Exception \\((?P<exc>[0-9]*)\\):$")
 COUNTER_REGEX = re.compile(
@@ -89,7 +89,7 @@ POINTER_REGEX = re.compile(
 STACK_BEGIN = ">>>stack>>>"
 STACK_END = "<<<stack<<<"
 STACK_REGEX = re.compile(
-    r"^(?P<off>[0-9a-f]+):\W+(?P<c1>[0-9a-f]+) (?P<c2>[0-9a-f]+) (?P<c3>[0-9a-f]+) (?P<c4>[0-9a-f]+)(\W.*)?$"
+    "^(?P<off>[0-9a-f]+):\W+(?P<c1>[0-9a-f]+) (?P<c2>[0-9a-f]+) (?P<c3>[0-9a-f]+) (?P<c4>[0-9a-f]+)(\W.*)?$"
 )
 
 StackLine = namedtuple("StackLine", ["offset", "content"])
@@ -223,7 +223,7 @@ class AddressResolver(object):
             if match is None:
                 if last is not None and line.startswith("(inlined by)"):
                     line = line[12:].strip()
-                    self._address_map[last] += "\n  \\-> inlined by: " + line
+                    self._address_map[last] += "\n  \-> inlined by: " + line
                 continue
 
             if match.group("result") == "?? ??:0":

bin/native-gdbserver.sh

@@ -2,4 +2,4 @@
 
 set -e
 pio run --environment native
-gdbserver --once localhost:2345 .pio/build/native/meshtasticd "$@"
+gdbserver --once localhost:2345 .pio/build/native/program "$@"

bin/native-run.sh

@@ -2,4 +2,4 @@
 
 set -e
 pio run --environment native
-.pio/build/native/meshtasticd "$@"
+.pio/build/native/program "$@"

bin/org.meshtastic.meshtasticd.metainfo.xml

@@ -87,9 +87,6 @@
   </screenshots>
 
   <releases>
-    <release version="2.7.17" date="2025-11-28">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.17</url>
-    </release>
     <release version="2.7.16" date="2025-11-19">
       <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.16</url>
     </release>

bin/platformio-custom.py

@@ -2,77 +2,98 @@
 # trunk-ignore-all(ruff/F821)
 # trunk-ignore-all(flake8/F821): For SConstruct imports
 import sys
-from os.path import join, basename, isfile
+from os.path import join
 import subprocess
 import json
 import re
+import time
 from datetime import datetime
 
 from readprops import readProps
 
 Import("env")
 platform = env.PioPlatform()
-progname = env.get("PROGNAME")
-lfsbin = f"{progname.replace('firmware-', 'littlefs-')}.bin"
 
-def manifest_gather(source, target, env):
-    out = []
-    check_paths = [
-        progname,
-        f"{progname}.elf",
-        f"{progname}.bin",
-        f"{progname}.factory.bin",
-        f"{progname}.hex",
-        f"{progname}.merged.hex",
-        f"{progname}.uf2",
-        f"{progname}.factory.uf2",
-        f"{progname}.zip",
-        lfsbin
+
+def esp32_create_combined_bin(source, target, env):
+    # this sub is borrowed from ESPEasy build toolchain. It's licensed under GPL V3
+    # https://github.com/letscontrolit/ESPEasy/blob/mega/tools/pio/post_esp32.py
+    print("Generating combined binary for serial flashing")
+
+    app_offset = 0x10000
+
+    new_file_name = env.subst("$BUILD_DIR/${PROGNAME}.factory.bin")
+    sections = env.subst(env.get("FLASH_EXTRA_IMAGES"))
+    firmware_name = env.subst("$BUILD_DIR/${PROGNAME}.bin")
+    chip = env.get("BOARD_MCU")
+    flash_size = env.BoardConfig().get("upload.flash_size")
+    flash_freq = env.BoardConfig().get("build.f_flash", "40m")
+    flash_freq = flash_freq.replace("000000L", "m")
+    flash_mode = env.BoardConfig().get("build.flash_mode", "dio")
+    memory_type = env.BoardConfig().get("build.arduino.memory_type", "qio_qspi")
+    if flash_mode == "qio" or flash_mode == "qout":
+        flash_mode = "dio"
+    if memory_type == "opi_opi" or memory_type == "opi_qspi":
+        flash_mode = "dout"
+    cmd = [
+        "--chip",
+        chip,
+        "merge_bin",
+        "-o",
+        new_file_name,
+        "--flash_mode",
+        flash_mode,
+        "--flash_freq",
+        flash_freq,
+        "--flash_size",
+        flash_size,
     ]
-    for p in check_paths:
-        f = env.File(env.subst(f"$BUILD_DIR/{p}"))
-        if f.exists():
-            d = {
-                "name": p,
-                "md5": f.get_content_hash(), # Returns MD5 hash
-                "bytes": f.get_size() # Returns file size in bytes
-            }
-            out.append(d)
-            print(d)
-    manifest_write(out, env)
 
-def manifest_write(files, env):
-    manifest = {
-        "version": verObj["long"],
-        "build_epoch": build_epoch,
-        "board": env.get("PIOENV"),
-        "mcu": env.get("BOARD_MCU"),
-        "repo": repo_owner,
-        "files": files,
-        "part": None,
-        "has_mui": False,
-        "has_inkhud": False,
-    }
-    # Get partition table (generated in esp32_pre.py) if it exists
-    if env.get("custom_mtjson_part"):
-        # custom_mtjson_part is a JSON string, convert it back to a dict
-        pj = json.loads(env.get("custom_mtjson_part"))
-        manifest["part"] = pj
-    # Enable has_mui for TFT builds
-    if ("HAS_TFT", 1) in env.get("CPPDEFINES", []):
-        manifest["has_mui"] = True
-    if "MESHTASTIC_INCLUDE_INKHUD" in env.get("CPPDEFINES", []):
-        manifest["has_inkhud"] = True
+    print("    Offset | File")
+    for section in sections:
+        sect_adr, sect_file = section.split(" ", 1)
+        print(f" -  {sect_adr} | {sect_file}")
+        cmd += [sect_adr, sect_file]
 
-    # Write the manifest to the build directory
-    with open(env.subst("$BUILD_DIR/${PROGNAME}.mt.json"), "w") as f:
-        json.dump(manifest, f, indent=2)
+    print(f" - {hex(app_offset)} | {firmware_name}")
+    cmd += [hex(app_offset), firmware_name]
+
+    print("Using esptool.py arguments: %s" % " ".join(cmd))
+
+    esptool.main(cmd)
+
+
+if platform.name == "espressif32":
+    sys.path.append(join(platform.get_package_dir("tool-esptoolpy")))
+    import esptool
+
+    env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin)
+
+    esp32_kind = env.GetProjectOption("custom_esp32_kind")
+    if esp32_kind == "esp32":
+        # Free up some IRAM by removing auxiliary SPI flash chip drivers.
+        # Wrapped stub symbols are defined in src/platform/esp32/iram-quirk.c.
+        env.Append(
+            LINKFLAGS=[
+                "-Wl,--wrap=esp_flash_chip_gd",
+                "-Wl,--wrap=esp_flash_chip_issi",
+                "-Wl,--wrap=esp_flash_chip_winbond",
+            ]
+        )
+    else:
+        # For newer ESP32 targets, using newlib nano works better.
+        env.Append(LINKFLAGS=["--specs=nano.specs", "-u", "_printf_float"])
+
+if platform.name == "nordicnrf52":
+    env.AddPostAction("$BUILD_DIR/${PROGNAME}.hex",
+                      env.VerboseAction(f"\"{sys.executable}\" ./bin/uf2conv.py \"$BUILD_DIR/firmware.hex\" -c -f 0xADA52840 -o \"$BUILD_DIR/firmware.uf2\"",
+                                        "Generating UF2 file"))
 
 Import("projenv")
 
 prefsLoc = projenv["PROJECT_DIR"] + "/version.properties"
 verObj = readProps(prefsLoc)
-print(f"Using meshtastic platformio-custom.py, firmware version {verObj['long']} on {env.get('PIOENV')}")
+print("Using meshtastic platformio-custom.py, firmware version " + verObj["long"] + " on " + env.get("PIOENV"))
 
 # get repository owner if git is installed
 try:
@@ -118,10 +139,10 @@ flags = [
         "-DBUILD_EPOCH=" + str(build_epoch),
     ] + pref_flags
 
-print("Using flags:")
+print ("Using flags:")
 for flag in flags:
     print(flag)
-
+    
 projenv.Append(
     CCFLAGS=flags,
 )
@@ -159,22 +180,4 @@ def load_boot_logo(source, target, env):
 
 # Load the boot logo on TFT builds
 if ("HAS_TFT", 1) in env.get("CPPDEFINES", []):
-    env.AddPreAction(f"$BUILD_DIR/{lfsbin}", load_boot_logo)
-
-mtjson_deps = ["buildprog"]
-if platform.name == "espressif32":
-    # Build littlefs image as part of mtjson target
-    # Equivalent to `pio run -t buildfs`
-    target_lfs = env.DataToBin(
-        join("$BUILD_DIR", "${ESP32_FS_IMAGE_NAME}"), "$PROJECT_DATA_DIR"
-    )
-    mtjson_deps.append(target_lfs)
-
-env.AddCustomTarget(
-    name="mtjson",
-    dependencies=mtjson_deps,
-    actions=[manifest_gather],
-    title="Meshtastic Manifest",
-    description="Generating Meshtastic manifest JSON + Checksums",
-    always_build=False,
-)
+    env.AddPreAction('$BUILD_DIR/littlefs.bin', load_boot_logo)

bin/platformio-pre.py

@@ -1,19 +0,0 @@
-#!/usr/bin/env python3
-# trunk-ignore-all(ruff/F821)
-# trunk-ignore-all(flake8/F821): For SConstruct imports
-Import("env")
-platform = env.PioPlatform()
-
-if platform.name == "native":
-    env.Replace(PROGNAME="meshtasticd")
-else:
-    from readprops import readProps
-    prefsLoc = env["PROJECT_DIR"] + "/version.properties"
-    verObj = readProps(prefsLoc)
-    env.Replace(PROGNAME=f"firmware-{env.get('PIOENV')}-{verObj['long']}")
-    env.Replace(ESP32_FS_IMAGE_NAME=f"littlefs-{env.get('PIOENV')}-{verObj['long']}")
-
-# Print the new program name for verification
-print(f"PROGNAME: {env.get('PROGNAME')}")
-if platform.name == "espressif32":
-    print(f"ESP32_FS_IMAGE_NAME: {env.get('ESP32_FS_IMAGE_NAME')}")

bin/test-simulator.sh

@@ -3,7 +3,7 @@
 set -e
 
 echo "Starting simulator"
-.pio/build/native/meshtasticd -s &
+.pio/build/native/program &
 sleep 20 # 5 seconds was not enough
 
 echo "Simulator started, launching python test..."

boards/heltec_v4.json

@@ -9,7 +9,7 @@
     "extra_flags": [
       "-DBOARD_HAS_PSRAM",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_USB_MODE=0",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],

boards/t5-epaper-s3.json

@@ -2,40 +2,37 @@
   "build": {
     "arduino": {
       "ldscript": "esp32s3_out.ld",
-      "memory_type": "qio_opi"
+      "memory_type": "qio_opi",
+      "partitions": "default_16MB.csv"
     },
     "core": "esp32",
     "extra_flags": [
       "-DBOARD_HAS_PSRAM",
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
       "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1"
+      "-DARDUINO_EVENT_RUNNING_CORE=0",
+      "-DARDUINO_USB_CDC_ON_BOOT=1",
+      "-DARDUINO_USB_MODE=1"
     ],
     "f_cpu": "240000000L",
     "f_flash": "80000000L",
     "flash_mode": "qio",
     "hwids": [["0x303A", "0x1001"]],
     "mcu": "esp32s3",
-    "variant": "hackaday-communicator"
+    "variant": "esp32s3"
   },
   "connectivity": ["wifi", "bluetooth", "lora"],
   "debug": {
-    "default_tool": "esp-builtin",
-    "onboard_tools": ["esp-builtin"],
     "openocd_target": "esp32s3.cfg"
   },
   "frameworks": ["arduino", "espidf"],
-  "name": "hackaday-communicator (16 MB FLASH, 8 MB PSRAM)",
+  "name": "LilyGo T5-ePaper-S3",
   "upload": {
     "flash_size": "16MB",
     "maximum_ram_size": 327680,
     "maximum_size": 16777216,
-    "use_1200bps_touch": true,
-    "wait_for_upload_port": true,
     "require_upload_port": true,
-    "speed": 1500000
+    "speed": 921600
   },
-  "url": "hackaday.com",
-  "vendor": "hackaday"
+  "url": "https://lilygo.cc/products/t5-e-paper-s3-pro",
+  "vendor": "LILYGO"
 }

debian/changelog

@@ -1,9 +1,3 @@
-meshtasticd (2.7.17.0) unstable; urgency=medium
-
-  * Version 2.7.17
-
- -- GitHub Actions <github-actions[bot]@users.noreply.github.com>  Fri, 28 Nov 2025 15:11:34 +0000
-
 meshtasticd (2.7.16.0) unstable; urgency=medium
 
   * Version 2.7.16

debian/rules

@@ -28,4 +28,5 @@ override_dh_auto_build:
 	# Build with platformio
 	$(PIO_ENV) platformio run -e native-tft
 	# Move the binary and default config to the correct name
+	mv .pio/build/native-tft/program .pio/build/native-tft/meshtasticd
 	cp bin/config-dist.yaml bin/config.yaml

extra_scripts/disable_adafruit_usb.py

@@ -1,9 +1,10 @@
-#!/usr/bin/env python3
 # trunk-ignore-all(flake8/F821)
 # trunk-ignore-all(ruff/F821)
 
 Import("env")
 
+# NOTE: This is not currently used, but can serve as an example on how to write extra_scripts
+
 # print("Current CLI targets", COMMAND_LINE_TARGETS)
 # print("Current Build targets", BUILD_TARGETS)
 # print("CPP defs", env.get("CPPDEFINES"))

extra_scripts/esp32_extra.py

@@ -1,86 +0,0 @@
-#!/usr/bin/env python3
-# trunk-ignore-all(ruff/F821)
-# trunk-ignore-all(flake8/F821): For SConstruct imports
-# trunk-ignore-all(ruff/E402): Hacky esptool import
-# trunk-ignore-all(flake8/E402): Hacky esptool import
-import sys
-from os.path import join
-
-Import("env")
-platform = env.PioPlatform()
-
-sys.path.append(join(platform.get_package_dir("tool-esptoolpy")))
-# IntelHex workaround, remove after fixed upstream
-# https://github.com/platformio/platform-espressif32/issues/1632
-try:
-    import intelhex
-except ImportError:
-    env.Execute("$PYTHONEXE -m pip install intelhex")
-import esptool
-
-
-def esp32_create_combined_bin(source, target, env):
-    # this sub is borrowed from ESPEasy build toolchain. It's licensed under GPL V3
-    # https://github.com/letscontrolit/ESPEasy/blob/mega/tools/pio/post_esp32.py
-    print("Generating combined binary for serial flashing")
-
-    app_offset = 0x10000
-
-    new_file_name = env.subst("$BUILD_DIR/${PROGNAME}.factory.bin")
-    sections = env.subst(env.get("FLASH_EXTRA_IMAGES"))
-    firmware_name = env.subst("$BUILD_DIR/${PROGNAME}.bin")
-    chip = env.get("BOARD_MCU")
-    board = env.BoardConfig()
-    flash_size = board.get("upload.flash_size")
-    flash_freq = board.get("build.f_flash", "40m")
-    flash_freq = flash_freq.replace("000000L", "m")
-    flash_mode = board.get("build.flash_mode", "dio")
-    memory_type = board.get("build.arduino.memory_type", "qio_qspi")
-    if flash_mode == "qio" or flash_mode == "qout":
-        flash_mode = "dio"
-    if memory_type == "opi_opi" or memory_type == "opi_qspi":
-        flash_mode = "dout"
-    cmd = [
-        "--chip",
-        chip,
-        "merge_bin",
-        "-o",
-        new_file_name,
-        "--flash_mode",
-        flash_mode,
-        "--flash_freq",
-        flash_freq,
-        "--flash_size",
-        flash_size,
-    ]
-
-    print("    Offset | File")
-    for section in sections:
-        sect_adr, sect_file = section.split(" ", 1)
-        print(f" -  {sect_adr} | {sect_file}")
-        cmd += [sect_adr, sect_file]
-
-    print(f" - {hex(app_offset)} | {firmware_name}")
-    cmd += [hex(app_offset), firmware_name]
-
-    print("Using esptool.py arguments: %s" % " ".join(cmd))
-
-    esptool.main(cmd)
-
-
-env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin)
-
-esp32_kind = env.GetProjectOption("custom_esp32_kind")
-if esp32_kind == "esp32":
-    # Free up some IRAM by removing auxiliary SPI flash chip drivers.
-    # Wrapped stub symbols are defined in src/platform/esp32/iram-quirk.c.
-    env.Append(
-        LINKFLAGS=[
-            "-Wl,--wrap=esp_flash_chip_gd",
-            "-Wl,--wrap=esp_flash_chip_issi",
-            "-Wl,--wrap=esp_flash_chip_winbond",
-        ]
-    )
-else:
-    # For newer ESP32 targets, using newlib nano works better.
-    env.Append(LINKFLAGS=["--specs=nano.specs", "-u", "_printf_float"])

extra_scripts/esp32_pre.py

@@ -1,73 +0,0 @@
-#!/usr/bin/env python3
-# trunk-ignore-all(ruff/F821)
-# trunk-ignore-all(flake8/F821): For SConstruct imports
-import json
-import sys
-from os.path import isfile
-
-Import("env")
-
-
-# From https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py
-def _parse_size(value):
-    if isinstance(value, int):
-        return value
-    elif value.isdigit():
-        return int(value)
-    elif value.startswith("0x"):
-        return int(value, 16)
-    elif value[-1].upper() in ("K", "M"):
-        base = 1024 if value[-1].upper() == "K" else 1024 * 1024
-        return int(value[:-1]) * base
-    return value
-
-
-def _parse_partitions(env):
-    partitions_csv = env.subst("$PARTITIONS_TABLE_CSV")
-    if not isfile(partitions_csv):
-        sys.stderr.write(
-            "Could not find the file %s with partitions " "table.\n" % partitions_csv
-        )
-        env.Exit(1)
-        return
-
-    result = []
-    # The first offset is 0x9000 because partition table is flashed to 0x8000 and
-    # occupies an entire flash sector, which size is 0x1000
-    next_offset = 0x9000
-    with open(partitions_csv) as fp:
-        for line in fp.readlines():
-            line = line.strip()
-            if not line or line.startswith("#"):
-                continue
-            tokens = [t.strip() for t in line.split(",")]
-            if len(tokens) < 5:
-                continue
-
-            bound = 0x10000 if tokens[1] in ("0", "app") else 4
-            calculated_offset = (next_offset + bound - 1) & ~(bound - 1)
-            partition = {
-                "name": tokens[0],
-                "type": tokens[1],
-                "subtype": tokens[2],
-                "offset": tokens[3] or calculated_offset,
-                "size": tokens[4],
-                "flags": tokens[5] if len(tokens) > 5 else None,
-            }
-            result.append(partition)
-            next_offset = _parse_size(partition["offset"]) + _parse_size(
-                partition["size"]
-            )
-
-    return result
-
-
-def mtjson_esp32_part(target, source, env):
-    part = _parse_partitions(env)
-    pj = json.dumps(part)
-    # print(f"JSON_PARTITIONS: {pj}")
-    # Dump json string to 'custom_mtjson_part' variable to use later when writing the manifest
-    env.Replace(custom_mtjson_part=pj)
-
-
-env.AddPreAction("mtjson", mtjson_esp32_part)

extra_scripts/extra_stm32.py

@@ -1,9 +1,7 @@
-#!/usr/bin/env python3
 # trunk-ignore-all(ruff/F821)
 # trunk-ignore-all(flake8/F821): For SConstruct imports
 
 Import("env")
-
 # Custom HEX from ELF
 env.AddPostAction(
     "$BUILD_DIR/${PROGNAME}.elf",

extra_scripts/nrf52_extra.py

@@ -1,50 +0,0 @@
-#!/usr/bin/env python3
-# trunk-ignore-all(ruff/F821)
-# trunk-ignore-all(flake8/F821): For SConstruct imports
-
-import sys
-from os.path import basename
-
-Import("env")
-
-
-# Custom HEX from ELF
-# Convert hex to uf2 for nrf52
-def nrf52_hex_to_uf2(source, target, env):
-    hex_path = target[0].get_abspath()
-    # When using merged hex, drop 'merged' from uf2 filename
-    uf2_path = hex_path.replace(".merged.", ".")
-    uf2_path = uf2_path.replace(".hex", ".uf2")
-    env.Execute(
-        env.VerboseAction(
-            f'"{sys.executable}" ./bin/uf2conv.py "{hex_path}" -c -f 0xADA52840 -o "{uf2_path}"',
-            f"Generating UF2 file from {basename(hex_path)}",
-        )
-    )
-
-
-def nrf52_mergehex(source, target, env):
-    hex_path = target[0].get_abspath()
-    merged_hex_path = hex_path.replace(".hex", ".merged.hex")
-    merge_with = None
-    if "wio-sdk-wm1110" == str(env.get("PIOENV")):
-        merge_with = env.subst("$PROJECT_DIR/bin/s140_nrf52_7.3.0_softdevice.hex")
-    else:
-        print("merge_with not defined for this target")
-
-    if merge_with is not None:
-        env.Execute(
-            env.VerboseAction(
-                f'"$PROJECT_DIR/bin/mergehex" -m "{hex_path}" "{merge_with}" -o "{merged_hex_path}"',
-                "Merging HEX with SoftDevice",
-            )
-        )
-        print(f'Merged file saved at "{basename(merged_hex_path)}"')
-        nrf52_hex_to_uf2([hex_path, merge_with], [env.File(merged_hex_path)], env)
-
-
-# if WM1110 target, merge hex with softdevice 7.3.0
-if "wio-sdk-wm1110" == env.get("PIOENV"):
-    env.AddPostAction("$BUILD_DIR/${PROGNAME}.hex", nrf52_mergehex)
-else:
-    env.AddPostAction("$BUILD_DIR/${PROGNAME}.hex", nrf52_hex_to_uf2)

meshtasticd.spec.rpkg

@@ -76,7 +76,7 @@ platformio run -e native-tft
 %install
 # Install meshtasticd binary
 mkdir -p %{buildroot}%{_bindir}
-install -m 0755 .pio/build/native-tft/meshtasticd %{buildroot}%{_bindir}/meshtasticd
+install -m 0755 .pio/build/native-tft/program %{buildroot}%{_bindir}/meshtasticd
 
 # Install portduino VFS dir
 install -p -d -m 0770 %{buildroot}%{_localstatedir}/lib/meshtasticd

platformio.ini

@@ -5,7 +5,7 @@
 default_envs = tbeam
 
 extra_configs =
-	variants/*/*.ini
+	arch/*/*.ini
 	variants/*/*/platformio.ini
 	variants/*/diy/*/platformio.ini
 	src/graphics/niche/InkHUD/PlatformioConfig.ini
@@ -14,9 +14,7 @@ description = Meshtastic
 
 [env]
 test_build_src = true
-extra_scripts =
-	pre:bin/platformio-pre.py
-	bin/platformio-custom.py
+extra_scripts = bin/platformio-custom.py
 ; note: we add src to our include search path so that lmic_project_config can override
 ; note: TINYGPS_OPTION_NO_CUSTOM_FIELDS is VERY important.  We don't use custom fields and somewhere in that pile
 ; of code is a heap corruption bug!
@@ -123,7 +121,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/2746a1ce3804998460a2cb319b8ea8a238dfd8c9.zip
+	https://github.com/meshtastic/device-ui/archive/4fb5f24787caa841b58dbf623a52c4c5861d6722.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]
@@ -184,8 +182,8 @@ lib_deps =
 	dfrobot/DFRobot_BMM150@1.0.0
 	# renovate: datasource=custom.pio depName=Adafruit_TSL2561 packageName=adafruit/library/Adafruit TSL2561
 	adafruit/Adafruit TSL2561@1.1.2
-	# renovate: datasource=custom.pio depName=BH1750_WE packageName=wollewald/library/BH1750_WE
-	wollewald/BH1750_WE@1.1.10
+	# renovate: datasource=custom.pio depName=BH1750_WE packageName=wollewald/BH1750_WE@^1.1.10
+	wollewald/BH1750_WE@^1.1.10
 
 ; (not included in native / portduino)
 [environmental_extra]
@@ -207,7 +205,7 @@ lib_deps =
 	# renovate: datasource=custom.pio depName=SparkFun Qwiic Scale NAU7802 packageName=sparkfun/library/SparkFun Qwiic Scale NAU7802 Arduino Library
 	sparkfun/SparkFun Qwiic Scale NAU7802 Arduino Library@1.0.6
 	# renovate: datasource=custom.pio depName=ClosedCube OPT3001 packageName=closedcube/library/ClosedCube OPT3001
-	closedcube/ClosedCube OPT3001@1.1.2
+	ClosedCube OPT3001@1.1.2
 	# renovate: datasource=custom.pio depName=Bosch BSEC2 packageName=boschsensortec/library/bsec2
 	boschsensortec/bsec2@1.10.2610
 	# renovate: datasource=custom.pio depName=Bosch BME68x packageName=boschsensortec/library/BME68x Sensor Library

src/AudioThread.h

@@ -50,11 +50,8 @@ class AudioThread : public concurrency::OSThread
             delete i2sRtttl;
             i2sRtttl = nullptr;
         }
-
-        if (rtttlFile != nullptr) {
-            delete rtttlFile;
-            rtttlFile = nullptr;
-        }
+        delete rtttlFile;
+        rtttlFile = nullptr;
 
         setCPUFast(false);
 #ifdef T_LORA_PAGER
@@ -102,9 +99,9 @@ class AudioThread : public concurrency::OSThread
     };
 
     AudioGeneratorRTTTL *i2sRtttl = nullptr;
-    AudioOutputI2S *audioOut = nullptr;
+    AudioOutputI2S *audioOut;
 
-    AudioFileSourcePROGMEM *rtttlFile = nullptr;
+    AudioFileSourcePROGMEM *rtttlFile;
 };
 
 #endif

src/Power.cpp

@@ -1453,7 +1453,7 @@ class LipoCharger : public HasBatteryLevel
     /**
      * return true if there is an external power source detected
      */
-    virtual bool isVbusIn() override { return PPM->isVbusIn(); }
+    virtual bool isVbusIn() override { return PPM->getVbusVoltage() > 0; }
 
     /**
      * return true if the battery is currently charging

src/PowerFSM.cpp

@@ -57,21 +57,21 @@ static bool isPowered()
 
 static void sdsEnter()
 {
-    LOG_POWERFSM("State: SDS");
+    LOG_DEBUG("State: SDS");
     // FIXME - make sure GPS and LORA radio are off first - because we want close to zero current draw
     doDeepSleep(Default::getConfiguredOrDefaultMs(config.power.sds_secs), false, false);
 }
 
 static void lowBattSDSEnter()
 {
-    LOG_POWERFSM("State: Lower batt SDS");
+    LOG_DEBUG("State: Lower batt SDS");
     doDeepSleep(Default::getConfiguredOrDefaultMs(config.power.sds_secs), false, true);
 }
 extern Power *power;
 
 static void shutdownEnter()
 {
-    LOG_POWERFSM("State: SHUTDOWN");
+    LOG_DEBUG("State: SHUTDOWN");
     shutdownAtMsec = millis();
 }
 
@@ -81,7 +81,7 @@ static uint32_t secsSlept;
 
 static void lsEnter()
 {
-    LOG_POWERFSM("lsEnter begin, ls_secs=%u", config.power.ls_secs);
+    LOG_INFO("lsEnter begin, ls_secs=%u", config.power.ls_secs);
     if (screen)
         screen->setOn(false);
     secsSlept = 0; // How long have we been sleeping this time
@@ -155,12 +155,12 @@ static void lsIdle()
 
 static void lsExit()
 {
-    LOG_POWERFSM("State: lsExit");
+    LOG_INFO("Exit state: LS");
 }
 
 static void nbEnter()
 {
-    LOG_POWERFSM("State: nbEnter");
+    LOG_DEBUG("State: NB");
     if (screen)
         screen->setOn(false);
 #ifdef ARCH_ESP32
@@ -173,7 +173,6 @@ static void nbEnter()
 
 static void darkEnter()
 {
-    LOG_POWERFSM("State: darkEnter");
     setBluetoothEnable(true);
     if (screen)
         screen->setOn(false);
@@ -181,7 +180,7 @@ static void darkEnter()
 
 static void serialEnter()
 {
-    LOG_POWERFSM("State: serialEnter");
+    LOG_DEBUG("State: SERIAL");
     setBluetoothEnable(false);
     if (screen) {
         screen->setOn(true);
@@ -190,14 +189,13 @@ static void serialEnter()
 
 static void serialExit()
 {
-    LOG_POWERFSM("State: serialExit");
     // Turn bluetooth back on when we leave serial stream API
     setBluetoothEnable(true);
 }
 
 static void powerEnter()
 {
-    LOG_POWERFSM("State: powerEnter");
+    // LOG_DEBUG("State: POWER");
     if (!isPowered()) {
         // If we got here, we are in the wrong state - we should be in powered, let that state handle things
         LOG_INFO("Loss of power in Powered");
@@ -212,7 +210,6 @@ static void powerEnter()
 
 static void powerIdle()
 {
-    // LOG_POWERFSM("State: powerIdle"); // very chatty
     if (!isPowered()) {
         // If we got here, we are in the wrong state
         LOG_INFO("Loss of power in Powered");
@@ -222,13 +219,14 @@ static void powerIdle()
 
 static void powerExit()
 {
-    LOG_POWERFSM("State: powerExit");
+    if (screen)
+        screen->setOn(true);
     setBluetoothEnable(true);
 }
 
 static void onEnter()
 {
-    LOG_POWERFSM("State: onEnter");
+    LOG_DEBUG("State: ON");
     if (screen)
         screen->setOn(true);
     setBluetoothEnable(true);
@@ -236,7 +234,6 @@ static void onEnter()
 
 static void onIdle()
 {
-    LOG_POWERFSM("State: onIdle");
     if (isPowered()) {
         // If we got here, we are in the wrong state - we should be in powered, let that state handle things
         powerFSM.trigger(EVENT_POWER_CONNECTED);
@@ -245,7 +242,7 @@ static void onIdle()
 
 static void bootEnter()
 {
-    LOG_POWERFSM("State: bootEnter");
+    LOG_DEBUG("State: BOOT");
 }
 
 State stateSHUTDOWN(shutdownEnter, NULL, NULL, "SHUTDOWN");
@@ -322,6 +319,11 @@ void PowerFSM_setup()
         // if any packet destined for phone arrives, turn on bluetooth at least
         powerFSM.add_transition(&stateNB, &stateDARK, EVENT_PACKET_FOR_PHONE, NULL, "Packet for phone");
 
+        // Removed 2.7: we don't show the nodes individually for every node on the screen anymore
+        // powerFSM.add_transition(&stateNB, &stateON, EVENT_NODEDB_UPDATED, NULL, "NodeDB update");
+        // powerFSM.add_transition(&stateDARK, &stateON, EVENT_NODEDB_UPDATED, NULL, "NodeDB update");
+        // powerFSM.add_transition(&stateON, &stateON, EVENT_NODEDB_UPDATED, NULL, "NodeDB update");
+
         // Show the received text message
         powerFSM.add_transition(&stateLS, &stateON, EVENT_RECEIVED_MSG, NULL, "Received text");
         powerFSM.add_transition(&stateNB, &stateON, EVENT_RECEIVED_MSG, NULL, "Received text");
@@ -370,7 +372,7 @@ void PowerFSM_setup()
     // Don't add power saving transitions if we are a power saving tracker or sensor or have Wifi enabled. Sleep will be initiated
     // through the modules
 
-#if HAS_WIFI && !defined(MESHTASTIC_EXCLUDE_WIFI)
+#if HAS_WIFI || !defined(MESHTASTIC_EXCLUDE_WIFI)
     bool isTrackerOrSensor = config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER ||
                              config.device.role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER ||
                              config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR;

src/PowerFSM.h

@@ -2,12 +2,6 @@
 
 #include "configuration.h"
 
-#ifdef PowerFSMDebug
-#define LOG_POWERFSM(...) LOG_DEBUG(__VA_ARGS__)
-#else
-#define LOG_POWERFSM(...)
-#endif
-
 // See sw-design.md for documentation
 
 #define EVENT_PRESS 1

src/buzz/buzz.cpp

@@ -16,7 +16,6 @@ struct ToneDuration {
 };
 
 // Some common frequencies.
-#define NOTE_SILENT 1
 #define NOTE_C3 131
 #define NOTE_CS3 139
 #define NOTE_D3 147
@@ -30,16 +29,11 @@ struct ToneDuration {
 #define NOTE_AS3 233
 #define NOTE_B3 247
 #define NOTE_CS4 277
-#define NOTE_B4 494
-#define NOTE_F5 698
-#define NOTE_G6 1568
-#define NOTE_E7 2637
 
-const int DURATION_1_16 = 62;  // 1/16 note
 const int DURATION_1_8 = 125;  // 1/8 note
 const int DURATION_1_4 = 250;  // 1/4 note
 const int DURATION_1_2 = 500;  // 1/2 note
-const int DURATION_3_4 = 750;  // 3/4 note
+const int DURATION_3_4 = 750;  // 1/4 note
 const int DURATION_1_1 = 1000; // 1/1 note
 
 void playTones(const ToneDuration *tone_durations, int size)
@@ -77,24 +71,13 @@ void playLongBeep()
 
 void playGPSEnableBeep()
 {
-#if defined(R1_NEO) || defined(MUZI_BASE)
-    ToneDuration melody[] = {
-        {NOTE_F5, DURATION_1_2}, {NOTE_G6, DURATION_1_8}, {NOTE_E7, DURATION_1_4}, {NOTE_SILENT, DURATION_1_2}};
-#else
     ToneDuration melody[] = {{NOTE_C3, DURATION_1_8}, {NOTE_FS3, DURATION_1_4}, {NOTE_CS4, DURATION_1_4}};
-#endif
     playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }
 
 void playGPSDisableBeep()
 {
-#if defined(R1_NEO) || defined(MUZI_BASE)
-    ToneDuration melody[] = {{NOTE_B4, DURATION_1_16}, {NOTE_B4, DURATION_1_16},   {NOTE_SILENT, DURATION_1_8},
-                             {NOTE_F3, DURATION_1_16}, {NOTE_F3, DURATION_1_16},   {NOTE_SILENT, DURATION_1_8},
-                             {NOTE_C3, DURATION_1_1},  {NOTE_SILENT, DURATION_1_1}};
-#else
     ToneDuration melody[] = {{NOTE_CS4, DURATION_1_8}, {NOTE_FS3, DURATION_1_4}, {NOTE_C3, DURATION_1_4}};
-#endif
     playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }
 

src/configuration.h

@@ -36,29 +36,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 /* Offer chance for variant-specific defines */
 #include "variant.h"
 
-// -----------------------------------------------------------------------------
-// Display feature overrides
-// -----------------------------------------------------------------------------
-
-// Allow build environments to opt-in explicitly to the E-Ink UI stack while
-// keeping headless targets slim by default. Existing variants that already
-// define USE_EINK continue to work without additional flags.
-#ifndef MESHTASTIC_USE_EINK_UI
-#ifdef USE_EINK
-#define MESHTASTIC_USE_EINK_UI 1
-#else
-#define MESHTASTIC_USE_EINK_UI 0
-#endif
-#endif
-
-#if MESHTASTIC_USE_EINK_UI
-#ifndef USE_EINK
-#define USE_EINK
-#endif
-#else
-#undef USE_EINK
-#endif
-
 // -----------------------------------------------------------------------------
 // Version
 // -----------------------------------------------------------------------------
@@ -394,9 +371,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef HAS_BLUETOOTH
 #define HAS_BLUETOOTH 0
 #endif
-#ifndef USE_TFTDISPLAY
-#define USE_TFTDISPLAY 0
-#endif
 
 #ifndef HW_VENDOR
 #error HW_VENDOR must be defined

src/gps/GPS.cpp

@@ -38,16 +38,14 @@ template <typename T, std::size_t N> std::size_t array_count(const T (&)[N])
     return N;
 }
 
-#ifndef GPS_SERIAL_PORT
-#define GPS_SERIAL_PORT Serial1
-#endif
-
-#if defined(ARCH_NRF52)
-Uart *GPS::_serial_gps = &GPS_SERIAL_PORT;
-#elif defined(ARCH_ESP32) || defined(ARCH_PORTDUINO) || defined(ARCH_STM32WL)
+#if defined(NRF52840_XXAA) || defined(NRF52833_XXAA) || defined(ARCH_ESP32) || defined(ARCH_PORTDUINO) || defined(ARCH_STM32WL)
+#if defined(GPS_SERIAL_PORT)
 HardwareSerial *GPS::_serial_gps = &GPS_SERIAL_PORT;
+#else
+HardwareSerial *GPS::_serial_gps = &Serial1;
+#endif
 #elif defined(ARCH_RP2040)
-SerialUART *GPS::_serial_gps = &GPS_SERIAL_PORT;
+SerialUART *GPS::_serial_gps = &Serial1;
 #else
 HardwareSerial *GPS::_serial_gps = nullptr;
 #endif
@@ -1527,7 +1525,10 @@ GPS *GPS::createGps()
     int8_t _rx_gpio = config.position.rx_gpio;
     int8_t _tx_gpio = config.position.tx_gpio;
     int8_t _en_gpio = config.position.gps_en_gpio;
-
+#if HAS_GPS && !defined(ARCH_ESP32)
+    _rx_gpio = 1; // We only specify GPS serial ports on ESP32. Otherwise, these are just flags.
+    _tx_gpio = 1;
+#endif
 #if defined(GPS_RX_PIN)
     if (!_rx_gpio)
         _rx_gpio = GPS_RX_PIN;
@@ -1601,28 +1602,16 @@ GPS *GPS::createGps()
         _serial_gps->setRxBufferSize(SERIAL_BUFFER_SIZE); // the default is 256
 #endif
 
-        LOG_DEBUG("Use GPIO%d for GPS RX", new_gps->rx_gpio);
-        LOG_DEBUG("Use GPIO%d for GPS TX", new_gps->tx_gpio);
-
 //  ESP32 has a special set of parameters vs other arduino ports
 #if defined(ARCH_ESP32)
+        LOG_DEBUG("Use GPIO%d for GPS RX", new_gps->rx_gpio);
+        LOG_DEBUG("Use GPIO%d for GPS TX", new_gps->tx_gpio);
         _serial_gps->begin(GPS_BAUDRATE, SERIAL_8N1, new_gps->rx_gpio, new_gps->tx_gpio);
 #elif defined(ARCH_RP2040)
-        _serial_gps->setPinout(new_gps->tx_gpio, new_gps->rx_gpio);
         _serial_gps->setFIFOSize(256);
         _serial_gps->begin(GPS_BAUDRATE);
-#elif defined(ARCH_NRF52)
-        _serial_gps->setPins(new_gps->rx_gpio, new_gps->tx_gpio);
-        _serial_gps->begin(GPS_BAUDRATE);
-#elif defined(ARCH_STM32WL)
-        _serial_gps->setTx(new_gps->tx_gpio);
-        _serial_gps->setRx(new_gps->rx_gpio);
-        _serial_gps->begin(GPS_BAUDRATE);
-#elif defined(ARCH_PORTDUINO)
-        // Portduino can't set the GPS pins directly.
-        _serial_gps->begin(GPS_BAUDRATE);
 #else
-#error Unsupported architecture!
+        _serial_gps->begin(GPS_BAUDRATE);
 #endif
     }
     return new_gps;

src/gps/GPS.h

@@ -194,8 +194,6 @@ class GPS : private concurrency::OSThread
     /** If !NULL we will use this serial port to construct our GPS */
 #if defined(ARCH_RP2040)
     static SerialUART *_serial_gps;
-#elif defined(ARCH_NRF52)
-    static Uart *_serial_gps;
 #else
     static HardwareSerial *_serial_gps;
 #endif

src/graphics/EInkDisplay2.cpp

@@ -1,6 +1,6 @@
 #include "configuration.h"
 
-#ifdef USE_EINK
+#if defined(USE_EINK) && !defined(USE_EINK_PARALLELDISPLAY)
 #include "EInkDisplay2.h"
 #include "SPILock.h"
 #include "main.h"

src/graphics/EInkDisplay2.h

@@ -1,6 +1,6 @@
 #pragma once
 
-#ifdef USE_EINK
+#if defined(USE_EINK) && !defined(USE_EINK_PARALLELDISPLAY)
 
 #include "GxEPD2_BW.h"
 #include <OLEDDisplay.h>

src/graphics/EInkParallelDisplay.cpp

@@ -0,0 +1,424 @@
+#include "EInkParallelDisplay.h"
+
+#ifdef USE_EINK_PARALLELDISPLAY
+
+#include "Wire.h"
+#include "variant.h"
+#include <Arduino.h>
+#include <atomic>
+#include <stdlib.h>
+#include <string.h>
+
+#include "FastEPD.h"
+
+// Thresholds for choosing partial vs full update
+#ifndef EPD_PARTIAL_THRESHOLD_ROWS
+#define EPD_PARTIAL_THRESHOLD_ROWS 128 // if changed region <= this many rows, prefer partial
+#endif
+#ifndef EPD_FULLSLOW_PERIOD
+#define EPD_FULLSLOW_PERIOD 100 // every N full updates do a slow (CLEAR_SLOW) full refresh
+#endif
+#ifndef EPD_RESPONSIVE_MIN_MS
+#define EPD_RESPONSIVE_MIN_MS 1000 // simple rate-limit (ms) for responsive updates
+#endif
+
+EInkParallelDisplay::EInkParallelDisplay(uint16_t width, uint16_t height, EpdRotation rot) : epaper(nullptr), rotation(rot)
+{
+    LOG_INFO("init EInkParallelDisplay");
+    // Set dimensions in OLEDDisplay base class
+    this->geometry = GEOMETRY_RAWMODE;
+    this->displayWidth = width;
+    this->displayHeight = height;
+
+    // Round shortest side up to nearest byte, to prevent truncation causing an undersized buffer
+    uint16_t shortSide = min(width, height);
+    uint16_t longSide = max(width, height);
+    if (shortSide % 8 != 0)
+        shortSide = (shortSide | 7) + 1;
+
+    this->displayBufferSize = longSide * (shortSide / 8);
+
+#ifdef EINK_LIMIT_GHOSTING_PX
+    // allocate dirty pixel buffer same size as epaper buffers (rowBytes * height)
+    size_t rowBytes = (this->displayWidth + 7) / 8;
+    dirtyPixelsSize = rowBytes * this->displayHeight;
+    dirtyPixels = (uint8_t *)calloc(dirtyPixelsSize, 1);
+    ghostPixelCount = 0;
+#endif
+}
+
+EInkParallelDisplay::~EInkParallelDisplay()
+{
+#ifdef EINK_LIMIT_GHOSTING_PX
+    if (dirtyPixels) {
+        free(dirtyPixels);
+        dirtyPixels = nullptr;
+    }
+#endif
+    // If an async full update is running, wait for it to finish
+    if (asyncFullRunning.load()) {
+        // wait a short while for task to finish
+        for (int i = 0; i < 50 && asyncFullRunning.load(); ++i) {
+            delay(50);
+        }
+        if (asyncTaskHandle) {
+            // Let it finish or delete it
+            vTaskDelete(asyncTaskHandle);
+            asyncTaskHandle = nullptr;
+        }
+    }
+
+    delete epaper;
+}
+
+/*
+ * Called by the OLEDDisplay::init() path.
+ */
+bool EInkParallelDisplay::connect()
+{
+    LOG_INFO("Do EPD init");
+    if (!epaper) {
+        epaper = new FASTEPD;
+#if defined(T5_S3_EPAPER_PRO_V1)
+        epaper->initPanel(BB_PANEL_LILYGO_T5PRO, 28000000);
+#elif defined(T5_S3_EPAPER_PRO_V2)
+        epaper->initPanel(BB_PANEL_LILYGO_T5PRO_V2, 28000000);
+        epaper->ioPinMode(0, OUTPUT);
+        epaper->ioWrite(0, HIGH);
+#else
+#error "unsupported EPD device!"
+#endif
+    }
+
+    // epaper->setRotation(rotation); // does not work, messes up width/height
+    epaper->setMode(BB_MODE_1BPP);
+    epaper->clearWhite();
+    epaper->fullUpdate(true);
+
+#ifdef EINK_LIMIT_GHOSTING_PX
+    // After a full/clear the dirty tracking should be reset
+    resetGhostPixelTracking();
+#endif
+
+    return true;
+}
+
+/*
+ * sendCommand - simple passthrough (not required for epd_driver-based path)
+ */
+void EInkParallelDisplay::sendCommand(uint8_t com)
+{
+    LOG_DEBUG("EInkParallelDisplay::sendCommand %d", (int)com);
+}
+
+/*
+ * Start a background task that will perform a blocking fullUpdate(). This lets
+ * display() return quickly while the heavy refresh runs in the background.
+ */
+void EInkParallelDisplay::startAsyncFullUpdate(int clearMode)
+{
+    if (asyncFullRunning.load())
+        return; // already running
+
+    asyncFullRunning.store(true);
+    // pass 'this' as parameter
+    BaseType_t rc = xTaskCreatePinnedToCore(EInkParallelDisplay::asyncFullUpdateTask, "epd_full", 4096 / sizeof(StackType_t),
+                                            this, 2, &asyncTaskHandle,
+#if CONFIG_FREERTOS_UNICORE
+                                            0
+#else
+                                            1
+#endif
+    );
+    if (rc != pdPASS) {
+        LOG_WARN("Failed to create async full-update task, falling back to blocking update");
+        epaper->fullUpdate(clearMode, false);
+        epaper->backupPlane();
+        asyncFullRunning.store(false);
+        asyncTaskHandle = nullptr;
+    }
+}
+
+/*
+ * FreeRTOS task entry: runs the full update and then backs up plane.
+ */
+void EInkParallelDisplay::asyncFullUpdateTask(void *pvParameters)
+{
+    EInkParallelDisplay *self = static_cast<EInkParallelDisplay *>(pvParameters);
+    if (!self) {
+        vTaskDelete(nullptr);
+        return;
+    }
+
+    // choose CLEAR_SLOW occasionally
+    int clearMode = CLEAR_FAST;
+    if (self->fastRefreshCount >= EPD_FULLSLOW_PERIOD) {
+        clearMode = CLEAR_SLOW;
+        self->fastRefreshCount = 0;
+    } else {
+        // when running async full, treat it as a full so reset fast count
+        self->fastRefreshCount = 0;
+    }
+
+    self->epaper->fullUpdate(clearMode, false);
+    self->epaper->backupPlane();
+
+#ifdef EINK_LIMIT_GHOSTING_PX
+    // A full refresh clears ghosting state
+    self->resetGhostPixelTracking();
+#endif
+
+    self->asyncFullRunning.store(false);
+    self->asyncTaskHandle = nullptr;
+
+    // delete this task
+    vTaskDelete(nullptr);
+}
+
+/*
+ * Convert the OLEDDisplay buffer (vertical byte layout) into the 1bpp horizontal-bytes
+ * buffer used by the FASTEPD library. For performance we write directly into FASTEPD's
+ * currentBuffer() while comparing against previousBuffer() to detect changed rows.
+ * After conversion we call FASTEPD::partialUpdate() or FASTEPD::fullUpdate() according
+ * to a heuristic so only the minimal region is refreshed.
+ */
+void EInkParallelDisplay::display(void)
+{
+    const uint16_t w = this->displayWidth;
+    const uint16_t h = this->displayHeight;
+
+    // Simple rate limiting: avoid very-frequent responsive updates
+    uint32_t nowMs = millis();
+    if (lastUpdateMs != 0 && (nowMs - lastUpdateMs) < EPD_RESPONSIVE_MIN_MS) {
+        LOG_DEBUG("rate-limited, skipping update");
+        return;
+    }
+
+    // bytes per row in epd format (one byte = 8 horizontal pixels)
+    const uint32_t rowBytes = (w + 7) / 8;
+
+    // Get pointers to internal buffers
+    uint8_t *cur = epaper->currentBuffer();
+    uint8_t *prev = epaper->previousBuffer(); // may be NULL on first init
+
+    // Track changed row range while converting
+    int newTop = h;     // min changed row (initialized to out-of-range)
+    int newBottom = -1; // max changed row
+
+#ifdef FAST_EPD_PARTIAL_UPDATE_BUG
+    // Track changed byte column range (for clipped fullUpdate fallback)
+    int newLeftByte = (int)rowBytes;
+    int newRightByte = -1;
+#endif
+
+    // Compute a quick hash of the incoming OLED buffer (so we can skip identical frames)
+    uint32_t imageHash = 0;
+    uint32_t bufBytes = (w / 8) * h; // vertical-byte layout size
+    for (uint32_t bi = 0; bi < bufBytes; ++bi) {
+        imageHash ^= ((uint32_t)buffer[bi]) << (bi & 31);
+    }
+    if (imageHash == previousImageHash) {
+        // LOG_DEBUG("image identical to previous, skipping update");
+        return;
+    }
+
+#ifdef EINK_LIMIT_GHOSTING_PX
+    // reset ghost count for this conversion pass; we'll mark bits that change
+    ghostPixelCount = 0;
+#endif
+
+    // Convert: OLED buffer layout -> FASTEPD 1bpp horizontal-bytes layout into cur,
+    // comparing against prev when available to detect changes.
+    for (uint32_t y = 0; y < h; ++y) {
+        const uint32_t base = (y >> 3) * w;               // (y/8) * width
+        const uint8_t bitMask = (uint8_t)(1u << (y & 7)); // mask for this row in vertical-byte layout
+        const uint32_t rowBase = y * rowBytes;
+
+        // process full 8-pixel bytes
+        for (uint32_t xb = 0; xb < rowBytes; ++xb) {
+            uint32_t x0 = xb * 8;
+            // read up to 8 source bytes (vertical-byte per column)
+            uint8_t b0 = (x0 + 0 < w) ? buffer[base + x0 + 0] : 0;
+            uint8_t b1 = (x0 + 1 < w) ? buffer[base + x0 + 1] : 0;
+            uint8_t b2 = (x0 + 2 < w) ? buffer[base + x0 + 2] : 0;
+            uint8_t b3 = (x0 + 3 < w) ? buffer[base + x0 + 3] : 0;
+            uint8_t b4 = (x0 + 4 < w) ? buffer[base + x0 + 4] : 0;
+            uint8_t b5 = (x0 + 5 < w) ? buffer[base + x0 + 5] : 0;
+            uint8_t b6 = (x0 + 6 < w) ? buffer[base + x0 + 6] : 0;
+            uint8_t b7 = (x0 + 7 < w) ? buffer[base + x0 + 7] : 0;
+
+            // build output byte: MSB = leftmost pixel
+            uint8_t out = 0;
+            out |= (uint8_t)((b0 & bitMask) ? 0x80 : 0x00);
+            out |= (uint8_t)((b1 & bitMask) ? 0x40 : 0x00);
+            out |= (uint8_t)((b2 & bitMask) ? 0x20 : 0x00);
+            out |= (uint8_t)((b3 & bitMask) ? 0x10 : 0x00);
+            out |= (uint8_t)((b4 & bitMask) ? 0x08 : 0x00);
+            out |= (uint8_t)((b5 & bitMask) ? 0x04 : 0x00);
+            out |= (uint8_t)((b6 & bitMask) ? 0x02 : 0x00);
+            out |= (uint8_t)((b7 & bitMask) ? 0x01 : 0x00);
+
+            // handle partial byte at end of row by masking off invalid bits
+            uint8_t mask = 0xFF;
+            uint32_t bitsRemain = (w > x0) ? (w - x0) : 0;
+            if (bitsRemain > 0 && bitsRemain < 8) {
+                mask = (uint8_t)(0xFF << (8 - bitsRemain));
+                out &= mask;
+            }
+
+            // invert to FASTEPD polarity
+            out = (~out) & mask;
+
+            uint32_t pos = rowBase + xb;
+            uint8_t prevVal = prev ? (prev[pos] & mask) : 0x00;
+            // Consider this byte changed if previous buffer differs (or prev is null)
+            bool changed = (prev == nullptr) || (prevVal != out);
+
+#ifdef EINK_LIMIT_GHOSTING_PX
+            if (changed && prev)
+                markDirtyBits(prev, pos, mask, out);
+#endif
+
+            // mark row changed only if the previous buffer differs
+            if (changed) {
+                if (y < (uint32_t)newTop)
+                    newTop = y;
+                if ((int)y > newBottom)
+                    newBottom = y;
+#ifdef FAST_EPD_PARTIAL_UPDATE_BUG
+                // record changed column bytes
+                if ((int)xb < newLeftByte)
+                    newLeftByte = (int)xb;
+                if ((int)xb > newRightByte)
+                    newRightByte = (int)xb;
+#endif
+            }
+
+            // Always write the computed value into the current buffer (avoid leaving stale bytes)
+            cur[pos] = (cur[pos] & ~mask) | out;
+        }
+    }
+
+    // If nothing changed, avoid any panel update
+    if (newBottom < 0) {
+        LOG_DEBUG("no pixel changes detected, skipping update (conv)");
+        previousImageHash = imageHash; // still remember that frame
+        return;
+    }
+
+    // Choose partial vs full update using heuristic
+    // Decide if we should force a full update after many fast updates
+    bool forceFull = (fastRefreshCount >= EPD_FULLSLOW_PERIOD);
+
+#ifdef EINK_LIMIT_GHOSTING_PX
+    // If ghost pixels exceed limit, force a full update to clear ghosting
+    if (ghostPixelCount > ghostPixelLimit) {
+        LOG_WARN("ghost pixels %u > limit %u, forcing full refresh", ghostPixelCount, ghostPixelLimit);
+        forceFull = true;
+    }
+#endif
+
+    // Compute pixel bounds from newTop/newBottom
+    int startRow = (newTop / 8) * 8;
+    int endRow = (newBottom / 8) * 8 + 7;
+
+    LOG_DEBUG("EPD update rows=%d..%d alignedRows=%d..%d rowBytes=%u", newTop, newBottom, startRow, endRow, rowBytes);
+
+    if (epaper->getMode() == BB_MODE_1BPP && !forceFull && (newBottom - newTop) <= EPD_PARTIAL_THRESHOLD_ROWS) {
+        // Prefer partial update path if driver is reliable; otherwise use clipped fullUpdate fallback.
+#ifdef FAST_EPD_PARTIAL_UPDATE_BUG
+        // Workaround for FastEPD partial update bug: use clipped fullUpdate instead
+        // Build a pixel rectangle for a clipped fullUpdate using the changed columns
+        int startCol = (newLeftByte <= newRightByte) ? (newLeftByte * 8) : 0;
+        int endCol = (newLeftByte <= newRightByte) ? ((newRightByte + 1) * 8 - 1) : (w - 1);
+
+        BB_RECT rect{startCol, startRow, endCol - startCol + 1, endRow - startRow + 1};
+        // LOG_DEBUG("Using clipped fullUpdate rect x=%d y=%d w=%d h=%d", rect.x, rect.y, rect.w, rect.h);
+        epaper->fullUpdate(CLEAR_FAST, false, &rect);
+#else
+        // Use rows for partial update
+        LOG_DEBUG("calling partialUpdate startRow=%d endRow=%d", startRow, endRow);
+        epaper->partialUpdate(true, startRow, endRow);
+#endif
+        epaper->backupPlane();
+        fastRefreshCount++;
+    } else {
+        // Full update: run async if possible (startAsyncFullUpdate will fall back to blocking)
+        startAsyncFullUpdate(forceFull ? CLEAR_SLOW : CLEAR_FAST);
+    }
+
+    lastUpdateMs = millis();
+    previousImageHash = imageHash;
+
+    // Keep same behavior as before
+    lastDrawMsec = millis();
+}
+
+#ifdef EINK_LIMIT_GHOSTING_PX
+// markDirtyBits: mark per-bit dirty flags and update ghostPixelCount
+void EInkParallelDisplay::markDirtyBits(const uint8_t *prevBuf, uint32_t pos, uint8_t mask, uint8_t out)
+{
+    // defensive: need dirtyPixels allocated and prevBuf valid
+    if (!dirtyPixels || !prevBuf)
+        return;
+
+    // 'out' is in FASTEPD polarity (1 = black, 0 = white)
+    uint8_t newBlack = out & mask;    // bits that will be black now
+    uint8_t newWhite = (~out) & mask; // bits that will be white now
+
+    // previously recorded dirty bits for this byte
+    uint8_t before = dirtyPixels[pos];
+
+    // Ghost bits: bits that were previously marked dirty and are now being driven white
+    uint8_t ghostBits = before & newWhite;
+    if (ghostBits) {
+        ghostPixelCount += __builtin_popcount((unsigned)ghostBits);
+    }
+
+    // Only mark bits dirty when they turn black now (accumulate until a full refresh)
+    uint8_t newlyDirty = newBlack & (~before);
+    if (newlyDirty) {
+        dirtyPixels[pos] |= newlyDirty;
+    }
+}
+
+// reset ghost tracking (call after a full refresh)
+void EInkParallelDisplay::resetGhostPixelTracking()
+{
+    if (!dirtyPixels)
+        return;
+    memset(dirtyPixels, 0, dirtyPixelsSize);
+    ghostPixelCount = 0;
+}
+#endif
+
+/*
+ * forceDisplay: use lastDrawMsec
+ */
+bool EInkParallelDisplay::forceDisplay(uint32_t msecLimit)
+{
+    uint32_t now = millis();
+    if (lastDrawMsec == 0 || (now - lastDrawMsec) > msecLimit) {
+        display();
+        return true;
+    }
+    return false;
+}
+
+void EInkParallelDisplay::endUpdate()
+{
+    {
+        // ensure any async full update is started/completed
+        if (asyncFullRunning.load()) {
+            // nothing to do; background task will run and call backupPlane when done
+        } else {
+            epaper->fullUpdate(CLEAR_FAST, false);
+            epaper->backupPlane();
+#ifdef EINK_LIMIT_GHOSTING_PX
+            resetGhostPixelTracking();
+#endif
+        }
+    }
+}
+
+#endif

src/graphics/EInkParallelDisplay.h

@@ -0,0 +1,69 @@
+#pragma once
+
+#include "configuration.h"
+
+#ifdef USE_EINK_PARALLELDISPLAY
+#include <OLEDDisplay.h>
+
+#include <atomic>
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+
+class FASTEPD;
+
+/**
+ * Adapter for E-Ink 8-bit parallel displays (EPD), specifically devices supported by FastEPD library
+ */
+class EInkParallelDisplay : public OLEDDisplay
+{
+  public:
+    enum EpdRotation {
+        EPD_ROT_LANDSCAPE = 0,
+        EPD_ROT_PORTRAIT = 90,
+        EPD_ROT_INVERTED_LANDSCAPE = 180,
+        EPD_ROT_INVERTED_PORTRAIT = 270,
+    };
+
+    EInkParallelDisplay(uint16_t width, uint16_t height, EpdRotation rotation);
+    virtual ~EInkParallelDisplay();
+
+    // OLEDDisplay virtuals
+    bool connect() override;
+    void sendCommand(uint8_t com) override;
+    int getBufferOffset(void) override { return 0; }
+
+    void display(void) override;
+    bool forceDisplay(uint32_t msecLimit = 1000);
+    void endUpdate();
+
+  protected:
+    uint32_t lastDrawMsec = 0;
+    FASTEPD *epaper;
+
+  private:
+    // Async full-refresh support
+    std::atomic<bool> asyncFullRunning{false};
+    TaskHandle_t asyncTaskHandle = nullptr;
+    void startAsyncFullUpdate(int clearMode);
+    static void asyncFullUpdateTask(void *pvParameters);
+
+#ifdef EINK_LIMIT_GHOSTING_PX
+    // helpers
+    void resetGhostPixelTracking();
+    void markDirtyBits(const uint8_t *prevBuf, uint32_t pos, uint8_t mask, uint8_t out);
+    void countGhostPixelsAndMaybePromote(int &newTop, int &newBottom, bool &forceFull);
+
+    // per-bit dirty buffer (same format as epaper buffers): one bit == one pixel
+    uint8_t *dirtyPixels = nullptr;
+    size_t dirtyPixelsSize = 0;
+    uint32_t ghostPixelCount = 0;
+    uint32_t ghostPixelLimit = EINK_LIMIT_GHOSTING_PX;
+#endif
+
+    EpdRotation rotation;
+    uint32_t previousImageHash = 0;
+    uint32_t lastUpdateMs = 0;
+    int fastRefreshCount = 0;
+};
+
+#endif

src/graphics/Screen.cpp

@@ -27,6 +27,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "configuration.h"
 #include "meshUtils.h"
 #if HAS_SCREEN
+#include "EInkParallelDisplay.h"
 #include <OLEDDisplay.h>
 
 #include "DisplayFormatters.h"
@@ -69,11 +70,7 @@ using graphics::Emote;
 using graphics::emotes;
 using graphics::numEmotes;
 
-#if USE_TFTDISPLAY
 extern uint16_t TFT_MESH;
-#else
-uint16_t TFT_MESH = COLOR565(0x67, 0xEA, 0x94);
-#endif
 
 #if HAS_WIFI && !defined(ARCH_PORTDUINO)
 #include "mesh/wifi/WiFiAPClient.h"
@@ -230,9 +227,24 @@ void Screen::showTextInput(const char *header, const char *initialText, uint32_t
 {
     LOG_INFO("showTextInput called with header='%s', durationMs=%d", header ? header : "NULL", durationMs);
 
-    // Start OnScreenKeyboardModule session (non-touch variant)
-    OnScreenKeyboardModule::instance().start(header, initialText, durationMs, textCallback);
+    if (NotificationRenderer::virtualKeyboard) {
+        delete NotificationRenderer::virtualKeyboard;
+        NotificationRenderer::virtualKeyboard = nullptr;
+    }
+
+    NotificationRenderer::textInputCallback = nullptr;
+
+    NotificationRenderer::virtualKeyboard = new VirtualKeyboard();
+    if (header) {
+        NotificationRenderer::virtualKeyboard->setHeader(header);
+    }
+    if (initialText) {
+        NotificationRenderer::virtualKeyboard->setInputText(initialText);
+    }
+
+    // Set up callback with safer cleanup mechanism
     NotificationRenderer::textInputCallback = textCallback;
+    NotificationRenderer::virtualKeyboard->setCallback([textCallback](const std::string &text) { textCallback(text); });
 
     // Store the message and set the expiration timestamp (use same pattern as other notifications)
     strncpy(NotificationRenderer::alertBannerMessage, header ? header : "Text Input", 255);
@@ -352,6 +364,11 @@ Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_O
 #else
     dispdev = new ST7796Spi(&SPI1, ST7796_RESET, ST7796_RS, ST7796_NSS, GEOMETRY_RAWMODE, TFT_WIDTH, TFT_HEIGHT);
 #endif
+#if defined(USE_ST7789)
+    static_cast<ST7789Spi *>(dispdev)->setRGB(TFT_MESH);
+#elif defined(USE_ST7796)
+    static_cast<ST7796Spi *>(dispdev)->setRGB(TFT_MESH);
+#endif
 #elif defined(USE_SSD1306)
     dispdev = new SSD1306Wire(address.address, -1, -1, geometry,
                               (address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE);
@@ -364,15 +381,17 @@ Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_O
         LOG_INFO("SSD1306 init success");
     }
 #elif defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7789_CS) ||    \
-    defined(RAK14014) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST7796_CS) || defined(HACKADAY_COMMUNICATOR)
+    defined(RAK14014) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST7796_CS)
     dispdev = new TFTDisplay(address.address, -1, -1, geometry,
                              (address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE);
-#elif defined(USE_EINK) && !defined(USE_EINK_DYNAMICDISPLAY)
+#elif defined(USE_EINK) && !defined(USE_EINK_DYNAMICDISPLAY) && !defined(USE_EINK_PARALLELDISPLAY)
     dispdev = new EInkDisplay(address.address, -1, -1, geometry,
                               (address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE);
 #elif defined(USE_EINK) && defined(USE_EINK_DYNAMICDISPLAY)
     dispdev = new EInkDynamicDisplay(address.address, -1, -1, geometry,
                                      (address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE);
+#elif defined(USE_EINK_PARALLELDISPLAY)
+    dispdev = new EInkParallelDisplay(EPD_WIDTH, EPD_HEIGHT, EInkParallelDisplay::EPD_ROT_PORTRAIT);
 #elif defined(USE_ST7567)
     dispdev = new ST7567Wire(address.address, -1, -1, geometry,
                              (address.port == ScanI2C::I2CPort::WIRE1) ? HW_I2C::I2C_TWO : HW_I2C::I2C_ONE);
@@ -394,12 +413,6 @@ Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_O
     isAUTOOled = true;
 #endif
 
-#if defined(USE_ST7789)
-    static_cast<ST7789Spi *>(dispdev)->setRGB(TFT_MESH);
-#elif defined(USE_ST7796)
-    static_cast<ST7796Spi *>(dispdev)->setRGB(TFT_MESH);
-#endif
-
     ui = new OLEDDisplayUi(dispdev);
     cmdQueue.setReader(this);
 }
@@ -645,7 +658,7 @@ void Screen::setup()
 #else
     if (!config.display.flip_screen) {
 #if defined(ST7701_CS) || defined(ST7735_CS) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7789_CS) ||      \
-    defined(RAK14014) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST7796_CS) || defined(HACKADAY_COMMUNICATOR)
+    defined(RAK14014) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST7796_CS)
         static_cast<TFTDisplay *>(dispdev)->flipScreenVertically();
 #elif defined(USE_ST7789)
         static_cast<ST7789Spi *>(dispdev)->flipScreenVertically();
@@ -751,7 +764,11 @@ void Screen::forceDisplay(bool forceUiUpdate)
     }
 
     // Tell EInk class to update the display
+#if defined(USE_EINK_PARALLELDISPLAY)
+    static_cast<EInkParallelDisplay *>(dispdev)->forceDisplay();
+#elif defined(USE_EINK)
     static_cast<EInkDisplay *>(dispdev)->forceDisplay();
+#endif
 #else
     // No delay between UI frame rendering
     if (forceUiUpdate) {
@@ -968,8 +985,10 @@ void Screen::setScreensaverFrames(FrameCallback einkScreensaver)
         ui->update();
     } while (ui->getUiState()->lastUpdate < startUpdate);
 
+#if defined(USE_EINK_PARALLELDISPLAY)
+    static_cast<EInkParallelDisplay *>(dispdev)->forceDisplay(0);
+#elif defined(USE_EINK) && !defined(USE_EINK_DYNAMICDISPLAY)
     // Old EInkDisplay class
-#if !defined(USE_EINK_DYNAMICDISPLAY)
     static_cast<EInkDisplay *>(dispdev)->forceDisplay(0); // Screen::forceDisplay(), but override rate-limit
 #endif
 
@@ -981,7 +1000,7 @@ void Screen::setScreensaverFrames(FrameCallback einkScreensaver)
 #ifdef EINK_HASQUIRK_GHOSTING
     EINK_ADD_FRAMEFLAG(dispdev, COSMETIC); // Really ugly to see ghosting from "screen paused"
 #else
-    EINK_ADD_FRAMEFLAG(dispdev, RESPONSIVE); // Really nice to wake screen with a fast-refresh
+    EINK_ADD_FRAMEFLAG(dispdev, RESPONSIVE);              // Really nice to wake screen with a fast-refresh
 #endif
 }
 #endif
@@ -1498,14 +1517,14 @@ int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
             // Incoming message
             devicestate.has_rx_text_message = true; // Needed to include the message frame
             hasUnreadMessage = true;                // Enables mail icon in the header
-            setFrames(FOCUS_PRESERVE);              // Refresh frame list without switching view (no-op during text_input)
+            setFrames(FOCUS_PRESERVE);              // Refresh frame list without switching view
 
             // Only wake/force display if the configuration allows it
             if (shouldWakeOnReceivedMessage()) {
                 setOn(true);    // Wake up the screen first
                 forceDisplay(); // Forces screen redraw
             }
-            // === Prepare banner/popup content ===
+            // === Prepare banner content ===
             const meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(packet->from);
             const meshtastic_Channel channel =
                 channels.getByIndex(packet->channel ? packet->channel : channels.getPrimaryIndex());
@@ -1529,84 +1548,38 @@ int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
 
             // Unlike generic messages, alerts (when enabled via the ext notif module) ignore any
             // 'mute' preferences set to any specific node or channel.
-            // If on-screen keyboard is active, show a transient popup over keyboard instead of interrupting it
-            if (NotificationRenderer::current_notification_type == notificationTypeEnum::text_input) {
-                // Wake and force redraw so popup is visible immediately
-                if (shouldWakeOnReceivedMessage()) {
-                    setOn(true);
-                    forceDisplay();
-                }
-
-                // Build popup: title = message source name, content = message text (sanitized)
-                // Title
-                char titleBuf[64] = {0};
+            if (isAlert) {
                 if (longName && longName[0]) {
-                    // Sanitize sender name
-                    std::string t = sanitizeString(longName);
-                    strncpy(titleBuf, t.c_str(), sizeof(titleBuf) - 1);
+                    snprintf(banner, sizeof(banner), "Alert Received from\n%s", longName);
                 } else {
-                    strncpy(titleBuf, "Message", sizeof(titleBuf) - 1);
+                    strcpy(banner, "Alert Received");
                 }
-
-                // Content: payload bytes may not be null-terminated, remove ASCII_BELL and sanitize
-                char content[256] = {0};
-                {
-                    std::string raw;
-                    raw.reserve(packet->decoded.payload.size);
-                    for (size_t i = 0; i < packet->decoded.payload.size; ++i) {
-                        char c = msgRaw[i];
-                        if (c == ASCII_BELL)
-                            continue; // strip bell
-                        raw.push_back(c);
-                    }
-                    std::string sanitized = sanitizeString(raw);
-                    strncpy(content, sanitized.c_str(), sizeof(content) - 1);
-                }
-
-                NotificationRenderer::showKeyboardMessagePopupWithTitle(titleBuf, content, 3000);
-
-// Maintain existing buzzer behavior on M5 if applicable
+                screen->showSimpleBanner(banner, 3000);
+            } else if (!channel.settings.has_module_settings || !channel.settings.module_settings.is_muted) {
+                if (longName && longName[0]) {
 #if defined(M5STACK_UNITC6L)
+                    strcpy(banner, "New Message");
+#else
+                    snprintf(banner, sizeof(banner), "New Message from\n%s", longName);
+#endif
+
+                } else {
+                    strcpy(banner, "New Message");
+                }
+#if defined(M5STACK_UNITC6L)
+                screen->setOn(true);
+                screen->showSimpleBanner(banner, 1500);
                 if (config.device.buzzer_mode != meshtastic_Config_DeviceConfig_BuzzerMode_DIRECT_MSG_ONLY ||
                     (isAlert && moduleConfig.external_notification.alert_bell_buzzer) ||
                     (!isBroadcast(packet->to) && isToUs(packet))) {
+                    // Beep if not in DIRECT_MSG_ONLY mode or if in DIRECT_MSG_ONLY mode and either
+                    // - packet contains an alert and alert bell buzzer is enabled
+                    // - packet is a non-broadcast that is addressed to this node
                     playLongBeep();
                 }
-#endif
-            } else {
-                // No keyboard active: use regular banner flow, respecting mute settings
-                if (isAlert) {
-                    if (longName && longName[0]) {
-                        snprintf(banner, sizeof(banner), "Alert Received from\n%s", longName);
-                    } else {
-                        strcpy(banner, "Alert Received");
-                    }
-                    screen->showSimpleBanner(banner, 3000);
-                } else if (!channel.settings.has_module_settings || !channel.settings.module_settings.is_muted) {
-                    if (longName && longName[0]) {
-#if defined(M5STACK_UNITC6L)
-                        strcpy(banner, "New Message");
 #else
-                        snprintf(banner, sizeof(banner), "New Message from\n%s", longName);
+                screen->showSimpleBanner(banner, 3000);
 #endif
-                    } else {
-                        strcpy(banner, "New Message");
-                    }
-#if defined(M5STACK_UNITC6L)
-                    screen->setOn(true);
-                    screen->showSimpleBanner(banner, 1500);
-                    if (config.device.buzzer_mode != meshtastic_Config_DeviceConfig_BuzzerMode_DIRECT_MSG_ONLY ||
-                        (isAlert && moduleConfig.external_notification.alert_bell_buzzer) ||
-                        (!isBroadcast(packet->to) && isToUs(packet))) {
-                        // Beep if not in DIRECT_MSG_ONLY mode or if in DIRECT_MSG_ONLY mode and either
-                        // - packet contains an alert and alert bell buzzer is enabled
-                        // - packet is a non-broadcast that is addressed to this node
-                        playLongBeep();
-                    }
-#else
-                    screen->showSimpleBanner(banner, 3000);
-#endif
-                }
             }
         }
     }
@@ -1641,7 +1614,6 @@ int Screen::handleUIFrameEvent(const UIFrameEvent *event)
 
 int Screen::handleInputEvent(const InputEvent *event)
 {
-    LOG_INPUT("Screen Input event %u! kb %u", event->inputEvent, event->kbchar);
     if (!screenOn)
         return 0;
 
@@ -1689,12 +1661,6 @@ int Screen::handleInputEvent(const InputEvent *event)
                 showPrevFrame();
             } else if (event->inputEvent == INPUT_BROKER_RIGHT || event->inputEvent == INPUT_BROKER_USER_PRESS) {
                 showNextFrame();
-            } else if (event->inputEvent == INPUT_BROKER_UP_LONG) {
-                // Long press up button for fast frame switching
-                showPrevFrame();
-            } else if (event->inputEvent == INPUT_BROKER_DOWN_LONG) {
-                // Long press down button for fast frame switching
-                showNextFrame();
             } else if (event->inputEvent == INPUT_BROKER_SELECT) {
                 if (this->ui->getUiState()->currentFrame == framesetInfo.positions.home) {
                     menuHandler::homeBaseMenu();

src/graphics/ScreenFonts.h

@@ -16,7 +16,7 @@
 #include "graphics/fonts/OLEDDisplayFontsCS.h"
 #endif
 
-#if defined(CROWPANEL_ESP32S3_5_EPAPER) && defined(USE_EINK)
+#if defined(CROWPANEL_ESP32S3_5_EPAPER) || defined(T5_S3_EPAPER_PRO)
 #include "graphics/fonts/EinkDisplayFonts.h"
 #endif
 
@@ -74,7 +74,7 @@
 
 #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) || defined(ST7796_CS) ||             \
-     defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796)) &&                                                                   \
+     defined(USE_ST7796)) &&                                                                                                     \
     !defined(DISPLAY_FORCE_SMALL_FONTS)
 // The screen is bigger so use bigger fonts
 #define FONT_SMALL FONT_MEDIUM_LOCAL // Height: 19
@@ -90,7 +90,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) || defined(T5_S3_EPAPER_PRO)
 #undef FONT_SMALL
 #undef FONT_MEDIUM
 #undef FONT_LARGE

src/graphics/SharedUIDisplay.cpp

@@ -17,12 +17,6 @@ namespace graphics
 
 void determineResolution(int16_t screenheight, int16_t screenwidth)
 {
-
-#ifdef FORCE_LOW_RES
-    isHighResolution = false;
-    return;
-#endif
-
     if (screenwidth > 128) {
         isHighResolution = true;
     }
@@ -30,6 +24,11 @@ void determineResolution(int16_t screenheight, int16_t screenwidth)
     if (screenwidth > 128 && screenheight <= 64) {
         isHighResolution = false;
     }
+
+    // Special case for Heltec Wireless Tracker v1.1
+    if (screenwidth == 160 && screenheight == 80) {
+        isHighResolution = false;
+    }
 }
 
 // === Shared External State ===

src/graphics/TFTDisplay.cpp

@@ -1,6 +1,5 @@
 #include "configuration.h"
 #include "main.h"
-#if USE_TFTDISPLAY
 
 #if ARCH_PORTDUINO
 #include "platform/portduino/PortduinoGlue.h"
@@ -124,11 +123,6 @@ static void rak14014_tpIntHandle(void)
     _rak14014_touch_int = true;
 }
 
-#elif defined(HACKADAY_COMMUNICATOR)
-#include <Arduino_GFX_Library.h>
-Arduino_DataBus *bus = nullptr;
-Arduino_GFX *tft = nullptr;
-
 #elif defined(ST72xx_DE)
 #include <LovyanGFX.hpp>
 #include <TCA9534.h>
@@ -1139,6 +1133,9 @@ static LGFX *tft = nullptr;
 
 #endif
 
+#if defined(ST7701_CS) || defined(ST7735_CS) || defined(ST7789_CS) || defined(ST7796_CS) || defined(ILI9341_DRIVER) ||           \
+    defined(ILI9342_DRIVER) || defined(RAK14014) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(ST72xx_DE) ||           \
+    (ARCH_PORTDUINO && HAS_SCREEN != 0)
 #include "SPILock.h"
 #include "TFTDisplay.h"
 #include <SPI.h>
@@ -1274,15 +1271,12 @@ void TFTDisplay::display(bool fromBlank)
                     x_LastPixelUpdate = x;
                 }
             }
-#if defined(HACKADAY_COMMUNICATOR)
-            tft->draw16bitBeRGBBitmap(x_FirstPixelUpdate, y, &linePixelBuffer[x_FirstPixelUpdate],
-                                      (x_LastPixelUpdate - x_FirstPixelUpdate + 1), 1);
-#else
+
             // Step 4: Send the changed pixels on this line to the screen as a single block transfer.
             // This function accepts pixel data MSB first so it can dump the memory straight out the SPI port.
             tft->pushRect(x_FirstPixelUpdate, y, (x_LastPixelUpdate - x_FirstPixelUpdate + 1), 1,
                           &linePixelBuffer[x_FirstPixelUpdate]);
-#endif
+
             somethingChanged = true;
         }
         y++;
@@ -1346,8 +1340,6 @@ void TFTDisplay::sendCommand(uint8_t com)
         display(true);
         if (portduino_config.displayBacklight.pin > 0)
             digitalWrite(portduino_config.displayBacklight.pin, TFT_BACKLIGHT_ON);
-#elif defined(HACKADAY_COMMUNICATOR)
-        tft->displayOn();
 #elif !defined(RAK14014) && !defined(M5STACK) && !defined(UNPHONE)
         tft->wakeup();
         tft->powerSaveOff();
@@ -1360,8 +1352,7 @@ void TFTDisplay::sendCommand(uint8_t com)
         unphone.backlight(true); // using unPhone library
 #endif
 #ifdef RAK14014
-#elif !defined(M5STACK) && !defined(ST7789_CS) &&                                                                                \
-    !defined(HACKADAY_COMMUNICATOR) // T-Deck gets brightness set in Screen.cpp in the handleSetOn function
+#elif !defined(M5STACK) && !defined(ST7789_CS) // T-Deck gets brightness set in Screen.cpp in the handleSetOn function
         tft->setBrightness(172);
 #endif
         break;
@@ -1373,8 +1364,6 @@ void TFTDisplay::sendCommand(uint8_t com)
         tft->clear();
         if (portduino_config.displayBacklight.pin > 0)
             digitalWrite(portduino_config.displayBacklight.pin, !TFT_BACKLIGHT_ON);
-#elif defined(HACKADAY_COMMUNICATOR)
-        tft->displayOff();
 #elif !defined(RAK14014) && !defined(M5STACK) && !defined(UNPHONE)
         tft->sleep();
         tft->powerSaveOn();
@@ -1387,7 +1376,7 @@ void TFTDisplay::sendCommand(uint8_t com)
         unphone.backlight(false); // using unPhone library
 #endif
 #ifdef RAK14014
-#elif !defined(M5STACK) && !defined(HACKADAY_COMMUNICATOR)
+#elif !defined(M5STACK)
         tft->setBrightness(0);
 #endif
         break;
@@ -1403,7 +1392,7 @@ void TFTDisplay::setDisplayBrightness(uint8_t _brightness)
 {
 #ifdef RAK14014
     // todo
-#elif !defined(HACKADAY_COMMUNICATOR)
+#else
     tft->setBrightness(_brightness);
     LOG_DEBUG("Brightness is set to value: %i ", _brightness);
 #endif
@@ -1421,7 +1410,7 @@ bool TFTDisplay::hasTouch(void)
 {
 #ifdef RAK14014
     return true;
-#elif !defined(M5STACK) && !defined(HACKADAY_COMMUNICATOR)
+#elif !defined(M5STACK)
     return tft->touch() != nullptr;
 #else
     return false;
@@ -1440,7 +1429,7 @@ bool TFTDisplay::getTouch(int16_t *x, int16_t *y)
     } else {
         return false;
     }
-#elif !defined(M5STACK) && !defined(HACKADAY_COMMUNICATOR)
+#elif !defined(M5STACK)
     return tft->getTouch(x, y);
 #else
     return false;
@@ -1459,12 +1448,6 @@ bool TFTDisplay::connect()
     LOG_INFO("Do TFT init");
 #ifdef RAK14014
     tft = new TFT_eSPI;
-#elif defined(HACKADAY_COMMUNICATOR)
-    bus = new Arduino_ESP32SPI(TFT_DC, TFT_CS, 38 /* SCK */, 21 /* MOSI */, GFX_NOT_DEFINED /* MISO */, HSPI /* spi_num */);
-    tft = new Arduino_NV3007(bus, 40, 0 /* rotation */, false /* IPS */, 142 /* width */, 428 /* height */, 12 /* col offset 1 */,
-                             0 /* row offset 1 */, 14 /* col offset 2 */, 0 /* row offset 2 */, nv3007_279_init_operations,
-                             sizeof(nv3007_279_init_operations));
-
 #else
     tft = new LGFX;
 #endif
@@ -1475,15 +1458,8 @@ bool TFTDisplay::connect()
 #ifdef UNPHONE
     unphone.backlight(true); // using unPhone library
 #endif
-#ifdef HACKADAY_COMMUNICATOR
-    bool beginStatus = tft->begin();
-    if (beginStatus)
-        LOG_DEBUG("TFT Success!");
-    else
-        LOG_ERROR("TFT Fail!");
-#else
+
     tft->init();
-#endif
 
 #if defined(M5STACK)
     tft->setRotation(0);
@@ -1516,4 +1492,4 @@ bool TFTDisplay::connect()
     return true;
 }
 
-#endif // USE_TFTDISPLAY
+#endif

src/graphics/draw/DebugRenderer.cpp

@@ -97,7 +97,8 @@ void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16
                                           (storeForwardModule->heartbeatInterval * 1200))) { // no heartbeat, overlap a bit
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
      defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS) || defined(ST7796_CS) ||             \
-     defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796) || ARCH_PORTDUINO) &&                                                 \
+     defined(USE_ST7796) ||            \
+     ARCH_PORTDUINO) &&                                                                                                                                                                                                    \
     !defined(DISPLAY_FORCE_SMALL_FONTS)
             display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(screen->ourId), y + 3 + FONT_HEIGHT_SMALL, 12,
                                    8, imgQuestionL1);
@@ -109,8 +110,7 @@ void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16
 #endif
         } else {
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
-     defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS) || defined(ST7796_CS) ||             \
-     defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796)) &&                                                                   \
+     defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS) || defined(ST7796_CS) || defined(USE_ST7796)) &&            \
     !defined(DISPLAY_FORCE_SMALL_FONTS)
             display->drawFastImage(x + SCREEN_WIDTH - 18 - display->getStringWidth(screen->ourId), y + 3 + FONT_HEIGHT_SMALL, 16,
                                    8, imgSFL1);
@@ -126,7 +126,8 @@ void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16
         // TODO: Raspberry Pi supports more than just the one screen size
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
      defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS) || defined(ST7796_CS) ||             \
-     defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796) || ARCH_PORTDUINO) &&                                                 \
+     defined(USE_ST7796) ||            \
+     ARCH_PORTDUINO) &&                                                                                                                                                                                                    \
     !defined(DISPLAY_FORCE_SMALL_FONTS)
         display->drawFastImage(x + SCREEN_WIDTH - 14 - display->getStringWidth(screen->ourId), y + 3 + FONT_HEIGHT_SMALL, 12, 8,
                                imgInfoL1);
@@ -532,10 +533,8 @@ void drawSystemScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x
     const int labelX = x;
     int barsOffset = (isHighResolution) ? 24 : 0;
 #ifdef USE_EINK
-#ifndef T_DECK_PRO
     barsOffset -= 12;
 #endif
-#endif
 #if defined(M5STACK_UNITC6L)
     const int barX = x + 45 + barsOffset;
 #else
@@ -576,7 +575,7 @@ void drawSystemScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x
 #endif
         // Value string
         display->setTextAlignment(TEXT_ALIGN_RIGHT);
-        display->drawString(SCREEN_WIDTH, getTextPositions(display)[line], combinedStr);
+        display->drawString(SCREEN_WIDTH - 2, getTextPositions(display)[line], combinedStr);
     };
 
     // === Memory values ===

src/graphics/draw/MenuHandler.cpp

@@ -13,7 +13,6 @@
 #include "input/RotaryEncoderInterruptImpl1.h"
 #include "input/UpDownInterruptImpl1.h"
 #include "main.h"
-#include "mesh/Default.h"
 #include "mesh/MeshTypes.h"
 #include "modules/AdminModule.h"
 #include "modules/CannedMessageModule.h"
@@ -577,7 +576,7 @@ void menuHandler::textMessageBaseMenu()
 
 void menuHandler::systemBaseMenu()
 {
-    enum optionsNumbers { Back, Notifications, ScreenOptions, Bluetooth, WiFiToggle, PowerMenu, Test, enumEnd };
+    enum optionsNumbers { Back, Notifications, ScreenOptions, Bluetooth, PowerMenu, Test, enumEnd };
     static const char *optionsArray[enumEnd] = {"Back"};
     static int optionsEnumArray[enumEnd] = {Back};
     int options = 1;
@@ -593,10 +592,6 @@ void menuHandler::systemBaseMenu()
     optionsArray[options] = "Bluetooth Toggle";
 #endif
     optionsEnumArray[options++] = Bluetooth;
-#if HAS_WIFI && !defined(ARCH_PORTDUINO)
-    optionsArray[options] = "WiFi Toggle";
-    optionsEnumArray[options++] = WiFiToggle;
-#endif
 #if defined(M5STACK_UNITC6L)
     optionsArray[options] = "Power";
 #else
@@ -634,11 +629,6 @@ void menuHandler::systemBaseMenu()
         } else if (selected == Bluetooth) {
             menuQueue = bluetooth_toggle_menu;
             screen->runNow();
-#if HAS_WIFI && !defined(ARCH_PORTDUINO)
-        } else if (selected == WiFiToggle) {
-            menuQueue = wifi_toggle_menu;
-            screen->runNow();
-#endif
         } else if (selected == Back && !test_enabled) {
             test_count++;
             if (test_count > 4) {
@@ -1041,16 +1031,14 @@ void menuHandler::switchToMUIMenu()
 
 void menuHandler::TFTColorPickerMenu(OLEDDisplay *display)
 {
-    static const char *optionsArray[] = {
-        "Back",  "Default", "Meshtastic Green", "Yellow", "Red", "Orange", "Purple", "Blue", "Teal", "Cyan", "Ice", "Pink",
-        "White", "Gray"};
+    static const char *optionsArray[] = {"Back", "Default", "Meshtastic Green", "Yellow", "Red", "Orange", "Purple", "Teal",
+                                         "Pink", "White"};
     BannerOverlayOptions bannerOptions;
     bannerOptions.message = "Select Screen Color";
     bannerOptions.optionsArrayPtr = optionsArray;
-    bannerOptions.optionsCount = 14;
+    bannerOptions.optionsCount = 10;
     bannerOptions.bannerCallback = [display](int selected) -> void {
-#if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190) || defined(T_DECK) || defined(T_LORA_PAGER) ||          \
-    HAS_TFT || defined(HACKADAY_COMMUNICATOR)
+#if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190) || defined(T_DECK) || defined(T_LORA_PAGER) || HAS_TFT
         uint8_t TFT_MESH_r = 0;
         uint8_t TFT_MESH_g = 0;
         uint8_t TFT_MESH_b = 0;
@@ -1083,40 +1071,20 @@ void menuHandler::TFTColorPickerMenu(OLEDDisplay *display)
             TFT_MESH_g = 153;
             TFT_MESH_b = 255;
         } else if (selected == 7) {
-            LOG_INFO("Setting color to Blue");
-            TFT_MESH_r = 0;
-            TFT_MESH_g = 0;
-            TFT_MESH_b = 255;
-        } else if (selected == 8) {
             LOG_INFO("Setting color to Teal");
-            TFT_MESH_r = 16;
-            TFT_MESH_g = 102;
-            TFT_MESH_b = 102;
-        } else if (selected == 9) {
-            LOG_INFO("Setting color to Cyan");
-            TFT_MESH_r = 0;
-            TFT_MESH_g = 255;
-            TFT_MESH_b = 255;
-        } else if (selected == 10) {
-            LOG_INFO("Setting color to Ice");
-            TFT_MESH_r = 173;
-            TFT_MESH_g = 216;
-            TFT_MESH_b = 230;
-        } else if (selected == 11) {
+            TFT_MESH_r = 64;
+            TFT_MESH_g = 224;
+            TFT_MESH_b = 208;
+        } else if (selected == 8) {
             LOG_INFO("Setting color to Pink");
             TFT_MESH_r = 255;
             TFT_MESH_g = 105;
             TFT_MESH_b = 180;
-        } else if (selected == 12) {
+        } else if (selected == 9) {
             LOG_INFO("Setting color to White");
             TFT_MESH_r = 255;
             TFT_MESH_g = 255;
             TFT_MESH_b = 255;
-        } else if (selected == 13) {
-            LOG_INFO("Setting color to Gray");
-            TFT_MESH_r = 128;
-            TFT_MESH_g = 128;
-            TFT_MESH_b = 128;
         } else {
             menuQueue = system_base_menu;
             screen->runNow();
@@ -1310,28 +1278,19 @@ void menuHandler::wifiBaseMenu()
 
 void menuHandler::wifiToggleMenu()
 {
-    enum optionsNumbers { Back, Wifi_disable, Wifi_enable };
+    enum optionsNumbers { Back, Wifi_toggle };
 
-    static const char *optionsArray[] = {"Back", "WiFi Disabled", "WiFi Enabled"};
+    static const char *optionsArray[] = {"Back", "Disable"};
     BannerOverlayOptions bannerOptions;
-    bannerOptions.message = "WiFi Actions";
+    bannerOptions.message = "Disable Wifi and\nEnable Bluetooth?";
     bannerOptions.optionsArrayPtr = optionsArray;
-    bannerOptions.optionsCount = 3;
-    if (config.network.wifi_enabled == true)
-        bannerOptions.InitialSelected = 2;
-    else
-        bannerOptions.InitialSelected = 1;
+    bannerOptions.optionsCount = 2;
     bannerOptions.bannerCallback = [](int selected) -> void {
-        if (selected == Wifi_disable) {
+        if (selected == Wifi_toggle) {
             config.network.wifi_enabled = false;
             config.bluetooth.enabled = true;
             service->reloadConfig(SEGMENT_CONFIG);
             rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
-        } else if (selected == Wifi_enable) {
-            config.network.wifi_enabled = true;
-            config.bluetooth.enabled = false;
-            service->reloadConfig(SEGMENT_CONFIG);
-            rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
         }
     };
     screen->showOverlayBanner(bannerOptions);
@@ -1379,7 +1338,7 @@ void menuHandler::screenOptionsMenu()
     static int optionsEnumArray[5] = {Back};
     int options = 1;
 
-#if defined(T_DECK) || defined(T_LORA_PAGER) || defined(HACKADAY_COMMUNICATOR)
+#if defined(T_DECK) || defined(T_LORA_PAGER)
     optionsArray[options] = "Show Long/Short Name";
     optionsEnumArray[options++] = NodeNameLength;
 #endif
@@ -1391,8 +1350,7 @@ void menuHandler::screenOptionsMenu()
     }
 
     // Only show screen color for TFT displays
-#if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190) || defined(T_DECK) || defined(T_LORA_PAGER) ||          \
-    HAS_TFT || defined(HACKADAY_COMMUNICATOR)
+#if defined(HELTEC_MESH_NODE_T114) || defined(HELTEC_VISION_MASTER_T190) || defined(T_DECK) || defined(T_LORA_PAGER) || HAS_TFT
     optionsArray[options] = "Screen Color";
     optionsEnumArray[options++] = ScreenColor;
 #endif

src/graphics/draw/NotificationRenderer.cpp

@@ -85,13 +85,9 @@ void NotificationRenderer::drawSSLScreen(OLEDDisplay *display, OLEDDisplayUiStat
 
 void NotificationRenderer::resetBanner()
 {
-    notificationTypeEnum previousType = current_notification_type;
-
     alertBannerMessage[0] = '\0';
     current_notification_type = notificationTypeEnum::none;
 
-    OnScreenKeyboardModule::instance().clearPopup();
-
     inEvent.inputEvent = INPUT_BROKER_NONE;
     inEvent.kbchar = 0;
     curSelected = 0;
@@ -104,13 +100,6 @@ void NotificationRenderer::resetBanner()
     currentNumber = 0;
 
     nodeDB->pause_sort(false);
-
-    // If we're exiting from text_input (virtual keyboard), stop module and trigger frame update
-    // to ensure any messages received during keyboard use are now displayed
-    if (previousType == notificationTypeEnum::text_input && screen) {
-        OnScreenKeyboardModule::instance().stop(false);
-        screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
-    }
 }
 
 void NotificationRenderer::drawBannercallback(OLEDDisplay *display, OLEDDisplayUiState *state)
@@ -174,15 +163,13 @@ void NotificationRenderer::drawNumberPicker(OLEDDisplay *display, OLEDDisplayUiS
     // modulo to extract
     uint8_t this_digit = (currentNumber % (pow_of_10(numDigits - curSelected))) / (pow_of_10(numDigits - curSelected - 1));
     // Handle input
-    if (inEvent.inputEvent == INPUT_BROKER_UP || inEvent.inputEvent == INPUT_BROKER_ALT_PRESS ||
-        inEvent.inputEvent == INPUT_BROKER_UP_LONG) {
+    if (inEvent.inputEvent == INPUT_BROKER_UP || inEvent.inputEvent == INPUT_BROKER_ALT_PRESS) {
         if (this_digit == 9) {
             currentNumber -= 9 * (pow_of_10(numDigits - curSelected - 1));
         } else {
             currentNumber += (pow_of_10(numDigits - curSelected - 1));
         }
-    } else if (inEvent.inputEvent == INPUT_BROKER_DOWN || inEvent.inputEvent == INPUT_BROKER_USER_PRESS ||
-               inEvent.inputEvent == INPUT_BROKER_DOWN_LONG) {
+    } else if (inEvent.inputEvent == INPUT_BROKER_DOWN || inEvent.inputEvent == INPUT_BROKER_USER_PRESS) {
         if (this_digit == 0) {
             currentNumber += 9 * (pow_of_10(numDigits - curSelected - 1));
         } else {
@@ -264,10 +251,10 @@ void NotificationRenderer::drawNodePicker(OLEDDisplay *display, OLEDDisplayUiSta
 
     // Handle input
     if (inEvent.inputEvent == INPUT_BROKER_UP || inEvent.inputEvent == INPUT_BROKER_LEFT ||
-        inEvent.inputEvent == INPUT_BROKER_ALT_PRESS || inEvent.inputEvent == INPUT_BROKER_UP_LONG) {
+        inEvent.inputEvent == INPUT_BROKER_ALT_PRESS) {
         curSelected--;
     } else if (inEvent.inputEvent == INPUT_BROKER_DOWN || inEvent.inputEvent == INPUT_BROKER_RIGHT ||
-               inEvent.inputEvent == INPUT_BROKER_USER_PRESS || inEvent.inputEvent == INPUT_BROKER_DOWN_LONG) {
+               inEvent.inputEvent == INPUT_BROKER_USER_PRESS) {
         curSelected++;
     } else if (inEvent.inputEvent == INPUT_BROKER_SELECT) {
         alertBannerCallback(selectedNodenum);
@@ -381,10 +368,10 @@ void NotificationRenderer::drawAlertBannerOverlay(OLEDDisplay *display, OLEDDisp
     // Handle input
     if (alertBannerOptions > 0) {
         if (inEvent.inputEvent == INPUT_BROKER_UP || inEvent.inputEvent == INPUT_BROKER_LEFT ||
-            inEvent.inputEvent == INPUT_BROKER_ALT_PRESS || inEvent.inputEvent == INPUT_BROKER_UP_LONG) {
+            inEvent.inputEvent == INPUT_BROKER_ALT_PRESS) {
             curSelected--;
         } else if (inEvent.inputEvent == INPUT_BROKER_DOWN || inEvent.inputEvent == INPUT_BROKER_RIGHT ||
-                   inEvent.inputEvent == INPUT_BROKER_USER_PRESS || inEvent.inputEvent == INPUT_BROKER_DOWN_LONG) {
+                   inEvent.inputEvent == INPUT_BROKER_USER_PRESS) {
             curSelected++;
         } else if (inEvent.inputEvent == INPUT_BROKER_SELECT) {
             if (optionsEnumPtr != nullptr) {
@@ -782,8 +769,40 @@ void NotificationRenderer::drawTextInput(OLEDDisplay *display, OLEDDisplayUiStat
         }
 
         if (inEvent.inputEvent != INPUT_BROKER_NONE) {
-            bool handled = OnScreenKeyboardModule::processVirtualKeyboardInput(inEvent, virtualKeyboard);
-            if (!handled && inEvent.inputEvent == INPUT_BROKER_CANCEL) {
+            if (inEvent.inputEvent == INPUT_BROKER_UP) {
+                // high frequency for move cursor left/right than up/down with encoders
+                extern ::RotaryEncoderInterruptImpl1 *rotaryEncoderInterruptImpl1;
+                extern ::UpDownInterruptImpl1 *upDownInterruptImpl1;
+                if (::rotaryEncoderInterruptImpl1 || ::upDownInterruptImpl1) {
+                    virtualKeyboard->moveCursorLeft();
+                } else {
+                    virtualKeyboard->moveCursorUp();
+                }
+            } else if (inEvent.inputEvent == INPUT_BROKER_DOWN) {
+                extern ::RotaryEncoderInterruptImpl1 *rotaryEncoderInterruptImpl1;
+                extern ::UpDownInterruptImpl1 *upDownInterruptImpl1;
+                if (::rotaryEncoderInterruptImpl1 || ::upDownInterruptImpl1) {
+                    virtualKeyboard->moveCursorRight();
+                } else {
+                    virtualKeyboard->moveCursorDown();
+                }
+            } else if (inEvent.inputEvent == INPUT_BROKER_LEFT) {
+                virtualKeyboard->moveCursorLeft();
+            } else if (inEvent.inputEvent == INPUT_BROKER_RIGHT) {
+                virtualKeyboard->moveCursorRight();
+            } else if (inEvent.inputEvent == INPUT_BROKER_UP_LONG) {
+                virtualKeyboard->moveCursorUp();
+            } else if (inEvent.inputEvent == INPUT_BROKER_DOWN_LONG) {
+                virtualKeyboard->moveCursorDown();
+            } else if (inEvent.inputEvent == INPUT_BROKER_ALT_PRESS) {
+                virtualKeyboard->moveCursorLeft();
+            } else if (inEvent.inputEvent == INPUT_BROKER_USER_PRESS) {
+                virtualKeyboard->moveCursorRight();
+            } else if (inEvent.inputEvent == INPUT_BROKER_SELECT) {
+                virtualKeyboard->handlePress();
+            } else if (inEvent.inputEvent == INPUT_BROKER_SELECT_LONG) {
+                virtualKeyboard->handleLongPress();
+            } else if (inEvent.inputEvent == INPUT_BROKER_CANCEL) {
                 auto callback = textInputCallback;
                 delete virtualKeyboard;
                 virtualKeyboard = nullptr;
@@ -802,28 +821,12 @@ void NotificationRenderer::drawTextInput(OLEDDisplay *display, OLEDDisplayUiStat
             inEvent.inputEvent = INPUT_BROKER_NONE;
         }
 
-        // Re-check pointer before drawing to avoid use-after-free and crashes
-        if (!virtualKeyboard) {
-            // Ensure we exit text_input state and restore frames
-            if (current_notification_type == notificationTypeEnum::text_input) {
-                resetBanner();
-            }
-            if (screen) {
-                screen->setFrames(graphics::Screen::FOCUS_PRESERVE);
-            }
-            // If screen is null, do nothing (safe fallback)
-            return;
-        }
-
         // Clear the screen to avoid overlapping with underlying frames or overlays
         display->setColor(BLACK);
         display->fillRect(0, 0, display->getWidth(), display->getHeight());
         display->setColor(WHITE);
         // Draw the virtual keyboard
         virtualKeyboard->draw(display, 0, 0);
-
-        // Draw transient popup overlay (if any) managed by OnScreenKeyboardModule
-        OnScreenKeyboardModule::instance().drawPopupOverlay(display);
     } else {
         // If virtualKeyboard is null, reset the banner to avoid getting stuck
         LOG_INFO("Virtual keyboard is null - resetting banner");
@@ -836,12 +839,5 @@ bool NotificationRenderer::isOverlayBannerShowing()
     return strlen(alertBannerMessage) > 0 && (alertBannerUntil == 0 || millis() <= alertBannerUntil);
 }
 
-void NotificationRenderer::showKeyboardMessagePopupWithTitle(const char *title, const char *content, uint32_t durationMs)
-{
-    if (!title || !content || current_notification_type != notificationTypeEnum::text_input)
-        return;
-    OnScreenKeyboardModule::instance().showPopup(title, content, durationMs);
-}
-
 } // namespace graphics
 #endif

src/graphics/draw/NotificationRenderer.h

@@ -4,7 +4,6 @@
 #include "OLEDDisplayUi.h"
 #include "graphics/Screen.h"
 #include "graphics/VirtualKeyboard.h"
-#include "modules/OnScreenKeyboardModule.h"
 #include <functional>
 #include <string>
 #define MAX_LINES 5
@@ -32,7 +31,6 @@ class NotificationRenderer
     static bool pauseBanner;
 
     static void resetBanner();
-    static void showKeyboardMessagePopupWithTitle(const char *title, const char *content, uint32_t durationMs);
     static void drawBannercallback(OLEDDisplay *display, OLEDDisplayUiState *state);
     static void drawAlertBannerOverlay(OLEDDisplay *display, OLEDDisplayUiState *state);
     static void drawNumberPicker(OLEDDisplay *display, OLEDDisplayUiState *state);

src/graphics/draw/UIRenderer.cpp

@@ -257,8 +257,7 @@ void UIRenderer::drawNodes(OLEDDisplay *display, int16_t x, int16_t y, const mes
     }
 
 #if (defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7701_CS) || defined(ST7735_CS) ||      \
-     defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS) || defined(ST7796_CS) ||             \
-     defined(HACKADAY_COMMUNICATOR) || defined(USE_ST7796)) &&                                                                   \
+     defined(ST7789_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(HX8357_CS) || defined(ST7796_CS) || defined(USE_ST7796)) &&            \
     !defined(DISPLAY_FORCE_SMALL_FONTS)
 
     if (isHighResolution) {

src/graphics/images.h

@@ -27,8 +27,7 @@ const uint8_t bluetoothConnectedIcon[36] PROGMEM = {0xfe, 0x01, 0xff, 0x03, 0x03
                                                     0xfe, 0x31, 0x00, 0x30, 0x30, 0x30, 0x30, 0x30, 0xf0, 0x3f, 0xe0, 0x1f};
 
 #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) || defined(ST7796_CS) ||             \
-     defined(USE_ST7796) || defined(HACKADAY_COMMUNICATOR) || ARCH_PORTDUINO) &&                                                 \
+     defined(ST7789_CS) || defined(USE_ST7789) || defined(HX8357_CS) || defined(ILI9488_CS) || defined(USE_ST7796) || defined(ST7796_CS) || ARCH_PORTDUINO) &&                \
     !defined(DISPLAY_FORCE_SMALL_FONTS)
 const uint8_t imgQuestionL1[] PROGMEM = {0xff, 0x01, 0x01, 0x32, 0x7b, 0x49, 0x49, 0x6f, 0x26, 0x01, 0x01, 0xff};
 const uint8_t imgQuestionL2[] PROGMEM = {0x0f, 0x08, 0x08, 0x08, 0x06, 0x0f, 0x0f, 0x06, 0x08, 0x08, 0x08, 0x0f};

src/graphics/niche/InkHUD/Applet.h

@@ -15,6 +15,7 @@
 
 #include <GFX.h> // GFXRoot drawing lib
 
+#include "mesh/MeshModule.h"
 #include "mesh/MeshTypes.h"
 
 #include "./AppletFont.h"

src/input/HackadayCommunicatorKeyboard.cpp

@@ -1,217 +0,0 @@
-#if defined(HACKADAY_COMMUNICATOR)
-
-#include "HackadayCommunicatorKeyboard.h"
-#include "main.h"
-
-#define _TCA8418_COLS 10
-#define _TCA8418_ROWS 8
-#define _TCA8418_NUM_KEYS 80
-
-#define _TCA8418_MULTI_TAP_THRESHOLD 1500
-
-using Key = TCA8418KeyboardBase::TCA8418Key;
-
-constexpr uint8_t modifierRightShiftKey = 30;
-constexpr uint8_t modifierRightShift = 0b0001;
-constexpr uint8_t modifierLeftShiftKey = 76; // keynum -1
-constexpr uint8_t modifierLeftShift = 0b0001;
-// constexpr uint8_t modifierSymKey = 42;
-// constexpr uint8_t modifierSym = 0b0010;
-
-// Num chars per key, Modulus for rotating through characters
-static uint8_t HackadayCommunicatorTapMod[_TCA8418_NUM_KEYS] = {
-    0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 2, 2, 2, 0, 2, 2, 2, 2, 2, 2, 2, 2, 2,
-    0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 0, 0, 1, 2, 2, 2, 2, 2, 2, 0, 0, 0, 1, 2, 2, 2, 1, 2, 2, 0, 0, 0, 2, 1, 2, 2, 0, 1, 1, 0,
-};
-
-static unsigned char HackadayCommunicatorTapMap[_TCA8418_NUM_KEYS][2] = {{},
-                                                                         {},
-                                                                         {'+'},
-                                                                         {'9'},
-                                                                         {'8'},
-                                                                         {'7'},
-                                                                         {'2'},
-                                                                         {'3'},
-                                                                         {'4'},
-                                                                         {'5'},
-                                                                         {Key::ESC},
-                                                                         {'q', 'Q'},
-                                                                         {'w', 'W'},
-                                                                         {'e', 'E'},
-                                                                         {'r', 'R'},
-                                                                         {'t', 'T'},
-                                                                         {'y', 'Y'},
-                                                                         {'u', 'U'},
-                                                                         {'i', 'I'},
-                                                                         {'o', 'O'},
-                                                                         {Key::TAB},
-                                                                         {'a', 'A'},
-                                                                         {'s', 'S'},
-                                                                         {'d', 'D'},
-                                                                         {'f', 'F'},
-                                                                         {'g', 'G'},
-                                                                         {'h', 'H'},
-                                                                         {'j', 'J'},
-                                                                         {'k', 'K'},
-                                                                         {'l', 'L'},
-                                                                         {},
-                                                                         {'z', 'Z'},
-                                                                         {'x', 'X'},
-                                                                         {'c', 'C'},
-                                                                         {'v', 'V'},
-                                                                         {'b', 'B'},
-                                                                         {'n', 'N'},
-                                                                         {'m', 'M'},
-                                                                         {',', '<'},
-                                                                         {'.', '>'},
-                                                                         {},
-                                                                         {},
-                                                                         {},
-                                                                         {'\\'},
-                                                                         {' '},
-                                                                         {},
-                                                                         {Key::RIGHT},
-                                                                         {Key::DOWN},
-                                                                         {Key::LEFT},
-                                                                         {},
-                                                                         {},
-                                                                         {},
-                                                                         {'-'},
-                                                                         {'6', '^'},
-                                                                         {'5', '%'},
-                                                                         {'4', '$'},
-                                                                         {'[', '{'},
-                                                                         {']', '}'},
-                                                                         {'p', 'P'},
-                                                                         {},
-                                                                         {},
-                                                                         {},
-                                                                         {'*'},
-                                                                         {'3', '#'},
-                                                                         {'2', '@'},
-                                                                         {'1', '!'},
-                                                                         {Key::SELECT},
-                                                                         {'\'', '"'},
-                                                                         {';', ':'},
-                                                                         {},
-                                                                         {},
-                                                                         {},
-                                                                         {'/', '?'},
-                                                                         {'='},
-                                                                         {'.', '>'},
-                                                                         {'0', ')'},
-                                                                         {},
-                                                                         {Key::UP},
-                                                                         {Key::BSP},
-                                                                         {}};
-
-HackadayCommunicatorKeyboard::HackadayCommunicatorKeyboard()
-    : 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)
-{
-    reset();
-}
-
-void HackadayCommunicatorKeyboard::reset(void)
-{
-    TCA8418KeyboardBase::reset();
-    enableInterrupts();
-}
-
-// handle multi-key presses (shift and alt)
-void HackadayCommunicatorKeyboard::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 HackadayCommunicatorKeyboard::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 HackadayCommunicatorKeyboard::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 (HackadayCommunicatorTapMod[last_key])
-        queueEvent(HackadayCommunicatorTapMap[last_key][modifierFlag % HackadayCommunicatorTapMod[last_key]]);
-    if (isModifierKey(last_key) == false)
-        modifierFlag = 0;
-}
-
-void HackadayCommunicatorKeyboard::updateModifierFlag(uint8_t key)
-{
-    if (key == modifierRightShiftKey) {
-        modifierFlag ^= modifierRightShift;
-    } else if (key == modifierLeftShiftKey) {
-        modifierFlag ^= modifierLeftShift;
-    }
-}
-
-bool HackadayCommunicatorKeyboard::isModifierKey(uint8_t key)
-{
-    return (key == modifierRightShiftKey || key == modifierLeftShiftKey);
-}
-
-#endif

src/input/HackadayCommunicatorKeyboard.h

@@ -1,26 +0,0 @@
-#include "TCA8418KeyboardBase.h"
-
-class HackadayCommunicatorKeyboard : public TCA8418KeyboardBase
-{
-  public:
-    HackadayCommunicatorKeyboard();
-    void reset(void);
-    void trigger(void) override;
-    virtual ~HackadayCommunicatorKeyboard() {}
-
-  protected:
-    void pressed(uint8_t key) override;
-    void released(void) override;
-
-    void updateModifierFlag(uint8_t key);
-    bool isModifierKey(uint8_t key);
-
-  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/InputBroker.h

@@ -3,12 +3,6 @@
 #include "Observer.h"
 #include "freertosinc.h"
 
-#ifdef InputBrokerDebug
-#define LOG_INPUT(...) LOG_DEBUG(__VA_ARGS__)
-#else
-#define LOG_INPUT(...)
-#endif
-
 enum input_broker_event {
     INPUT_BROKER_NONE = 0,
     INPUT_BROKER_SELECT = 10,
@@ -53,7 +47,6 @@ typedef struct _InputEvent {
 class InputPollable
 {
   public:
-    virtual ~InputPollable() = default;
     virtual void pollOnce() = 0;
 };
 

src/input/RotaryEncoderImpl.cpp

@@ -3,9 +3,6 @@
 #include "RotaryEncoderImpl.h"
 #include "InputBroker.h"
 #include "RotaryEncoder.h"
-#ifdef ARCH_ESP32
-#include "sleep.h"
-#endif
 
 #define ORIGIN_NAME "RotaryEncoder"
 
@@ -14,20 +11,6 @@ RotaryEncoderImpl *rotaryEncoderImpl;
 RotaryEncoderImpl::RotaryEncoderImpl()
 {
     rotary = nullptr;
-#ifdef ARCH_ESP32
-    isFirstInit = true;
-#endif
-}
-
-RotaryEncoderImpl::~RotaryEncoderImpl()
-{
-    LOG_DEBUG("RotaryEncoderImpl destructor");
-    detachRotaryEncoderInterrupts();
-
-    if (rotary != nullptr) {
-        delete rotary;
-        rotary = nullptr;
-    }
 }
 
 bool RotaryEncoderImpl::init()
@@ -42,22 +25,15 @@ bool RotaryEncoderImpl::init()
     eventCcw = static_cast<input_broker_event>(moduleConfig.canned_message.inputbroker_event_ccw);
     eventPressed = static_cast<input_broker_event>(moduleConfig.canned_message.inputbroker_event_press);
 
-    if (rotary == nullptr) {
-        rotary = new RotaryEncoder(moduleConfig.canned_message.inputbroker_pin_a, moduleConfig.canned_message.inputbroker_pin_b,
-                                   moduleConfig.canned_message.inputbroker_pin_press);
-    }
+    rotary = new RotaryEncoder(moduleConfig.canned_message.inputbroker_pin_a, moduleConfig.canned_message.inputbroker_pin_b,
+                               moduleConfig.canned_message.inputbroker_pin_press);
+    rotary->resetButton();
 
-    attachRotaryEncoderInterrupts();
-
-#ifdef ARCH_ESP32
-    // Register callbacks for before and after lightsleep
-    // Used to detach and reattach interrupts
-    if (isFirstInit) {
-        lsObserver.observe(&notifyLightSleep);
-        lsEndObserver.observe(&notifyLightSleepEnd);
-        isFirstInit = false;
-    }
-#endif
+    interruptInstance = this;
+    auto interruptHandler = []() { inputBroker->requestPollSoon(interruptInstance); };
+    attachInterrupt(moduleConfig.canned_message.inputbroker_pin_a, interruptHandler, CHANGE);
+    attachInterrupt(moduleConfig.canned_message.inputbroker_pin_b, interruptHandler, CHANGE);
+    attachInterrupt(moduleConfig.canned_message.inputbroker_pin_press, interruptHandler, CHANGE);
 
     LOG_INFO("RotaryEncoder initialized pins(%d, %d, %d), events(%d, %d, %d)", moduleConfig.canned_message.inputbroker_pin_a,
              moduleConfig.canned_message.inputbroker_pin_b, moduleConfig.canned_message.inputbroker_pin_press, eventCw, eventCcw,
@@ -95,50 +71,6 @@ void RotaryEncoderImpl::pollOnce()
     }
 }
 
-void RotaryEncoderImpl::detachRotaryEncoderInterrupts()
-{
-    LOG_DEBUG("RotaryEncoderImpl detach button interrupts");
-    if (interruptInstance == this) {
-        detachInterrupt(moduleConfig.canned_message.inputbroker_pin_a);
-        detachInterrupt(moduleConfig.canned_message.inputbroker_pin_b);
-        detachInterrupt(moduleConfig.canned_message.inputbroker_pin_press);
-        interruptInstance = nullptr;
-    } else {
-        LOG_WARN("RotaryEncoderImpl: interrupts already detached");
-    }
-}
-
-void RotaryEncoderImpl::attachRotaryEncoderInterrupts()
-{
-    LOG_DEBUG("RotaryEncoderImpl attach button interrupts");
-    if (rotary != nullptr && interruptInstance == nullptr) {
-        rotary->resetButton();
-
-        interruptInstance = this;
-        auto interruptHandler = []() { inputBroker->requestPollSoon(interruptInstance); };
-        attachInterrupt(moduleConfig.canned_message.inputbroker_pin_a, interruptHandler, CHANGE);
-        attachInterrupt(moduleConfig.canned_message.inputbroker_pin_b, interruptHandler, CHANGE);
-        attachInterrupt(moduleConfig.canned_message.inputbroker_pin_press, interruptHandler, CHANGE);
-    } else {
-        LOG_WARN("RotaryEncoderImpl: interrupts already attached");
-    }
-}
-
-#ifdef ARCH_ESP32
-
-int RotaryEncoderImpl::beforeLightSleep(void *unused)
-{
-    detachRotaryEncoderInterrupts();
-    return 0; // Indicates success;
-}
-
-int RotaryEncoderImpl::afterLightSleep(esp_sleep_wakeup_cause_t cause)
-{
-    attachRotaryEncoderInterrupts();
-    return 0; // Indicates success;
-}
-#endif
-
 RotaryEncoderImpl *RotaryEncoderImpl::interruptInstance;
 
 #endif

src/input/RotaryEncoderImpl.h

@@ -8,18 +8,12 @@
 
 class RotaryEncoder;
 
-class RotaryEncoderImpl final : public InputPollable
+class RotaryEncoderImpl : public InputPollable
 {
   public:
     RotaryEncoderImpl();
-    ~RotaryEncoderImpl() override;
-    bool init();
+    bool init(void);
     virtual void pollOnce() override;
-    // Disconnect and reconnect interrupts for light sleep
-#ifdef ARCH_ESP32
-    int beforeLightSleep(void *unused);
-    int afterLightSleep(esp_sleep_wakeup_cause_t cause);
-#endif
 
   protected:
     static RotaryEncoderImpl *interruptInstance;
@@ -29,21 +23,6 @@ class RotaryEncoderImpl final : public InputPollable
     input_broker_event eventPressed = INPUT_BROKER_NONE;
 
     RotaryEncoder *rotary;
-
-  private:
-#ifdef ARCH_ESP32
-    bool isFirstInit;
-#endif
-    void detachRotaryEncoderInterrupts();
-    void attachRotaryEncoderInterrupts();
-
-#ifdef ARCH_ESP32
-    // Get notified when lightsleep begins and ends
-    CallbackObserver<RotaryEncoderImpl, void *> lsObserver =
-        CallbackObserver<RotaryEncoderImpl, void *>(this, &RotaryEncoderImpl::beforeLightSleep);
-    CallbackObserver<RotaryEncoderImpl, esp_sleep_wakeup_cause_t> lsEndObserver =
-        CallbackObserver<RotaryEncoderImpl, esp_sleep_wakeup_cause_t>(this, &RotaryEncoderImpl::afterLightSleep);
-#endif
 };
 
 extern RotaryEncoderImpl *rotaryEncoderImpl;

src/input/SerialKeyboard.cpp

@@ -2,8 +2,6 @@
 #include "configuration.h"
 #include <Throttle.h>
 
-SerialKeyboard *globalSerialKeyboard = nullptr;
-
 #ifdef INPUTBROKER_SERIAL_TYPE
 #define CANNED_MESSAGE_MODULE_ENABLE 1 // in case it's not set in the variant file
 
@@ -27,8 +25,6 @@ unsigned char KeyMap[3][4][10] = {{{'.', 'a', 'd', 'g', 'j', 'm', 'p', 't', 'w',
 SerialKeyboard::SerialKeyboard(const char *name) : concurrency::OSThread(name)
 {
     this->_originName = name;
-
-    globalSerialKeyboard = this;
 }
 
 void SerialKeyboard::erase()
@@ -89,21 +85,9 @@ int32_t SerialKeyboard::runOnce()
             e.source = this->_originName;
             // SELECT OR SEND OR CANCEL EVENT
             if (!(shiftRegister2 & (1 << 3))) {
-                if (shift > 0) {
-                    e.inputEvent = INPUT_BROKER_ANYKEY; // REQUIRED
-                    e.kbchar = 0x09;                    // TAB
-                    shift = 0;                          // reset shift after TAB
-                } else {
-                    e.inputEvent = INPUT_BROKER_LEFT;
-                }
+                e.inputEvent = INPUT_BROKER_UP;
             } else if (!(shiftRegister2 & (1 << 2))) {
-                if (shift > 0) {
-                    e.inputEvent = INPUT_BROKER_ANYKEY; // REQUIRED
-                    e.kbchar = 0x09;                    // TAB
-                    shift = 0;                          // reset shift after TAB
-                } else {
-                    e.inputEvent = INPUT_BROKER_RIGHT;
-                }
+                e.inputEvent = INPUT_BROKER_RIGHT;
                 e.kbchar = 0;
             } else if (!(shiftRegister2 & (1 << 1))) {
                 e.inputEvent = INPUT_BROKER_SELECT;

src/input/SerialKeyboard.h

@@ -8,8 +8,6 @@ class SerialKeyboard : public Observable<const InputEvent *>, public concurrency
   public:
     explicit SerialKeyboard(const char *name);
 
-    uint8_t getShift() const { return shift; }
-
   protected:
     virtual int32_t runOnce() override;
     void erase();
@@ -24,6 +22,4 @@ class SerialKeyboard : public Observable<const InputEvent *>, public concurrency
     int lastKeyPressed = 13;
     int quickPress = 0;
     unsigned long lastPressTime = 0;
-};
-
-extern SerialKeyboard *globalSerialKeyboard;
+};

src/input/TrackballInterruptBase.cpp

@@ -88,50 +88,6 @@ int32_t TrackballInterruptBase::runOnce()
         }
     }
 
-    if (directionDetected && directionStartTime > 0) {
-        uint32_t directionDuration = millis() - directionStartTime;
-        uint8_t directionPressedNow = 0;
-        directionInterval++;
-
-        if (!digitalRead(_pinUp)) {
-            directionPressedNow = TB_ACTION_UP;
-        } else if (!digitalRead(_pinDown)) {
-            directionPressedNow = TB_ACTION_DOWN;
-        } else if (!digitalRead(_pinLeft)) {
-            directionPressedNow = TB_ACTION_LEFT;
-        } else if (!digitalRead(_pinRight)) {
-            directionPressedNow = TB_ACTION_RIGHT;
-        }
-
-        const uint8_t DIRECTION_REPEAT_THRESHOLD = 3;
-
-        if (directionPressedNow == TB_ACTION_NONE) {
-            // Reset state
-            directionDetected = false;
-            directionStartTime = 0;
-            directionInterval = 0;
-            this->action = TB_ACTION_NONE;
-        } else if (directionDuration >= LONG_PRESS_DURATION && directionInterval >= DIRECTION_REPEAT_THRESHOLD) {
-            // repeat event when long press these direction.
-            switch (directionPressedNow) {
-            case TB_ACTION_UP:
-                e.inputEvent = this->_eventUp;
-                break;
-            case TB_ACTION_DOWN:
-                e.inputEvent = this->_eventDown;
-                break;
-            case TB_ACTION_LEFT:
-                e.inputEvent = this->_eventLeft;
-                break;
-            case TB_ACTION_RIGHT:
-                e.inputEvent = this->_eventRight;
-                break;
-            }
-
-            directionInterval = 0;
-        }
-    }
-
 #if defined(T_DECK) // T-deck gets a super-simple debounce on trackball
     if (this->action == TB_ACTION_PRESSED && !pressDetected) {
         // Start long press detection
@@ -157,22 +113,17 @@ int32_t TrackballInterruptBase::runOnce()
         pressDetected = true;
         pressStartTime = millis();
         // Don't send event yet, wait to see if it's a long press
-    } else if (this->action == TB_ACTION_UP && !digitalRead(_pinUp) && !directionDetected) {
-        directionDetected = true;
-        directionStartTime = millis();
+    } else if (this->action == TB_ACTION_UP && !digitalRead(_pinUp)) {
+        // LOG_DEBUG("Trackball event UP");
         e.inputEvent = this->_eventUp;
-        // send event first,will automatically trigger every 50ms * 3 after 500ms
-    } else if (this->action == TB_ACTION_DOWN && !digitalRead(_pinDown) && !directionDetected) {
-        directionDetected = true;
-        directionStartTime = millis();
+    } else if (this->action == TB_ACTION_DOWN && !digitalRead(_pinDown)) {
+        // LOG_DEBUG("Trackball event DOWN");
         e.inputEvent = this->_eventDown;
-    } else if (this->action == TB_ACTION_LEFT && !digitalRead(_pinLeft) && !directionDetected) {
-        directionDetected = true;
-        directionStartTime = millis();
+    } else if (this->action == TB_ACTION_LEFT && !digitalRead(_pinLeft)) {
+        // LOG_DEBUG("Trackball event LEFT");
         e.inputEvent = this->_eventLeft;
-    } else if (this->action == TB_ACTION_RIGHT && !digitalRead(_pinRight) && !directionDetected) {
-        directionDetected = true;
-        directionStartTime = millis();
+    } else if (this->action == TB_ACTION_RIGHT && !digitalRead(_pinRight)) {
+        // LOG_DEBUG("Trackball event RIGHT");
         e.inputEvent = this->_eventRight;
     }
 #endif

src/input/TrackballInterruptBase.h

@@ -49,14 +49,10 @@ class TrackballInterruptBase : public Observable<const InputEvent *>, public con
 
     // Long press detection for press button
     uint32_t pressStartTime = 0;
-    uint32_t directionStartTime = 0;
-    uint8_t directionInterval = 0;
     bool pressDetected = false;
-    bool directionDetected = false;
     uint32_t lastLongPressEventTime = 0;
-    uint32_t lastDirectionPressEventTime = 0;
     static const uint32_t LONG_PRESS_DURATION = 500;        // ms
-    static const uint32_t LONG_PRESS_REPEAT_INTERVAL = 300; // ms - interval between repeated long press events
+    static const uint32_t LONG_PRESS_REPEAT_INTERVAL = 500; // ms - interval between repeated long press events
 
   private:
     input_broker_event _eventDown = INPUT_BROKER_NONE;

src/input/UpDownInterruptBase.h

@@ -3,14 +3,6 @@
 #include "InputBroker.h"
 #include "mesh/NodeDB.h"
 
-#ifndef UPDOWN_LONG_PRESS_DURATION
-#define UPDOWN_LONG_PRESS_DURATION 300
-#endif
-
-#ifndef UPDOWN_LONG_PRESS_REPEAT_INTERVAL
-#define UPDOWN_LONG_PRESS_REPEAT_INTERVAL 300
-#endif
-
 class UpDownInterruptBase : public Observable<const InputEvent *>, public concurrency::OSThread
 {
   public:
@@ -48,8 +40,8 @@ class UpDownInterruptBase : public Observable<const InputEvent *>, public concur
     uint32_t lastPressLongEventTime = 0;
     uint32_t lastUpLongEventTime = 0;
     uint32_t lastDownLongEventTime = 0;
-    static const uint32_t LONG_PRESS_DURATION = UPDOWN_LONG_PRESS_DURATION;
-    static const uint32_t LONG_PRESS_REPEAT_INTERVAL = UPDOWN_LONG_PRESS_REPEAT_INTERVAL;
+    static const uint32_t LONG_PRESS_DURATION = 300;
+    static const uint32_t LONG_PRESS_REPEAT_INTERVAL = 300;
 
   private:
     uint8_t _pinDown = 0;

src/input/kbI2cBase.cpp

@@ -7,8 +7,6 @@
 #include "TDeckProKeyboard.h"
 #elif defined(T_LORA_PAGER)
 #include "TLoraPagerKeyboard.h"
-#elif defined(HACKADAY_COMMUNICATOR)
-#include "HackadayCommunicatorKeyboard.h"
 #else
 #include "TCA8418Keyboard.h"
 #endif
@@ -22,8 +20,6 @@ KbI2cBase::KbI2cBase(const char *name)
       TCAKeyboard(*(new TDeckProKeyboard()))
 #elif defined(T_LORA_PAGER)
       TCAKeyboard(*(new TLoraPagerKeyboard()))
-#elif defined(HACKADAY_COMMUNICATOR)
-      TCAKeyboard(*(new HackadayCommunicatorKeyboard()))
 #else
       TCAKeyboard(*(new TCA8418Keyboard()))
 #endif
@@ -332,7 +328,7 @@ int32_t KbI2cBase::runOnce()
                 break;
             }
             if (e.inputEvent != INPUT_BROKER_NONE) {
-                // LOG_DEBUG("TCA8418 Notifying: %i Char: %c", e.inputEvent, e.kbchar);
+                LOG_DEBUG("TCA8418 Notifying: %i Char: %c", e.inputEvent, e.kbchar);
                 this->notifyObservers(&e);
             }
             TCAKeyboard.trigger();

src/main.cpp

@@ -394,10 +394,13 @@ void setup()
     io.pinMode(EXPANDS_GPIO_EN, OUTPUT);
     io.digitalWrite(EXPANDS_GPIO_EN, HIGH);
     io.pinMode(EXPANDS_SD_PULLEN, INPUT);
-#elif defined(HACKADAY_COMMUNICATOR)
-    pinMode(KB_INT, INPUT);
+#elif defined(T5_S3_EPAPER_PRO)
+    pinMode(LORA_CS, OUTPUT);
+    digitalWrite(LORA_CS, HIGH);
+    pinMode(SDCARD_CS, OUTPUT);
+    digitalWrite(SDCARD_CS, HIGH);
+    pinMode(BOARD_BL_EN, OUTPUT);
 #endif
-
     concurrency::hasBeenSetup = true;
 #if ARCH_PORTDUINO
     SPISettings spiSettings(portduino_config.spiSpeed, MSBFIRST, SPI_MODE0);
@@ -439,11 +442,6 @@ void setup()
 
     LOG_INFO("\n\n//\\ E S H T /\\ S T / C\n");
 
-#if defined(ARCH_ESP32) && defined(BOARD_HAS_PSRAM)
-    // use PSRAM for malloc calls > 256 bytes
-    heap_caps_malloc_extmem_enable(256);
-#endif
-
 #if defined(DEBUG_MUTE) && defined(DEBUG_PORT)
     DEBUG_PORT.printf("\r\n\r\n//\\ E S H T /\\ S T / C\r\n");
     DEBUG_PORT.printf("Version %s for %s from %s\r\n", optstr(APP_VERSION), optstr(APP_ENV), optstr(APP_REPO));
@@ -886,7 +884,7 @@ void setup()
 
 #if defined(ST7701_CS) || defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) ||       \
     defined(ST7789_CS) || defined(HX8357_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(ST7796_CS) ||              \
-    defined(USE_SPISSD1306) || defined(USE_ST7796) || defined(HACKADAY_COMMUNICATOR)
+    defined(USE_ST7796) || defined(USE_SPISSD1306)
         screen = new graphics::Screen(screen_found, screen_model, screen_geometry);
 #elif defined(ARCH_PORTDUINO)
         if ((screen_found.port != ScanI2C::I2CPort::NO_I2C || portduino_config.displayPanel) &&
@@ -1163,7 +1161,7 @@ void setup()
 // the current region name)
 #if defined(ST7701_CS) || defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) ||       \
     defined(ST7789_CS) || defined(HX8357_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(ST7796_CS) ||              \
-    defined(USE_ST7796) || defined(USE_SPISSD1306) || defined(HACKADAY_COMMUNICATOR)
+    defined(USE_ST7796) || defined(USE_SPISSD1306)
     if (screen)
         screen->setup();
 #elif defined(ARCH_PORTDUINO)

src/mesh/Default.h

@@ -57,7 +57,14 @@ class Default
     // Note: Kept as uint32_t to match the public API parameter type
     static float congestionScalingCoefficient(uint32_t numOnlineNodes)
     {
-        if (numOnlineNodes <= 40) {
+        // Increase frequency of broadcasts for small networks regardless of preset
+        if (numOnlineNodes <= 10) {
+            return 0.6;
+        } else if (numOnlineNodes <= 20) {
+            return 0.7;
+        } else if (numOnlineNodes <= 30) {
+            return 0.8;
+        } else if (numOnlineNodes <= 40) {
             return 1.0;
         } else {
             float throttlingFactor = 0.075;

src/mesh/MeshModule.h

@@ -225,4 +225,4 @@ class MeshModule
 /** set the destination and packet parameters of packet p intended as a reply to a particular "to" packet
  * This ensures that if the request packet was sent reliably, the reply is sent that way as well.
  */
-void setReplyTo(meshtastic_MeshPacket *p, const meshtastic_MeshPacket &to);
+void setReplyTo(meshtastic_MeshPacket *p, const meshtastic_MeshPacket &to);

src/mesh/NodeDB.cpp

@@ -664,8 +664,7 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
     config.bluetooth.fixed_pin = defaultBLEPin;
 
 #if defined(ST7735_CS) || defined(USE_EINK) || defined(ILI9341_DRIVER) || defined(ILI9342_DRIVER) || defined(ST7789_CS) ||       \
-    defined(HX8357_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(ST7796_CS) || defined(USE_SPISSD1306) ||         \
-    defined(USE_ST7796) || defined(HACKADAY_COMMUNICATOR)
+    defined(HX8357_CS) || defined(USE_ST7789) || defined(ILI9488_CS) || defined(ST7796_CS) || defined(USE_SPISSD1306) || defined(USE_ST7796)
     bool hasScreen = true;
 #ifdef HELTEC_MESH_NODE_T114
     uint32_t st7789_id = get_st7789_id(ST7789_NSS, ST7789_SCK, ST7789_SDA, ST7789_RS, ST7789_RESET);
@@ -805,15 +804,11 @@ void NodeDB::installDefaultModuleConfig()
     moduleConfig.external_notification.output_ms = 500;
     moduleConfig.external_notification.nag_timeout = 2;
 #endif
-#if defined(RAK4630) || defined(RAK11310) || defined(RAK3312) || defined(MUZI_BASE) || defined(ELECROW_ThinkNode_M3)
-    // Default to PIN_LED2 for external notification output (LED color depends on device variant)
+#if defined(RAK4630) || defined(RAK11310) || defined(RAK3312)
+    // Default to RAK led pin 2 (blue)
     moduleConfig.external_notification.enabled = true;
     moduleConfig.external_notification.output = PIN_LED2;
-#if defined(MUZI_BASE) || defined(ELECROW_ThinkNode_M3)
-    moduleConfig.external_notification.active = false;
-#else
     moduleConfig.external_notification.active = true;
-#endif
     moduleConfig.external_notification.alert_message = true;
     moduleConfig.external_notification.output_ms = 1000;
     moduleConfig.external_notification.nag_timeout = default_ringtone_nag_secs;

src/mesh/ReliableRouter.cpp

@@ -150,9 +150,7 @@ void ReliableRouter::sniffReceived(const meshtastic_MeshPacket *p, const meshtas
         PacketId nakId = (c && c->error_reason != meshtastic_Routing_Error_NONE) ? p->decoded.request_id : 0;
 
         // We intentionally don't check wasSeenRecently, because it is harmless to delete non existent retransmission records
-        if ((ackId || nakId) &&
-            // Implicit ACKs from MQTT should not stop retransmissions
-            !(isFromUs(p) && p->transport_mechanism == meshtastic_MeshPacket_TransportMechanism_TRANSPORT_MQTT)) {
+        if (ackId || nakId) {
             LOG_DEBUG("Received a %s for 0x%x, stopping retransmissions", ackId ? "ACK" : "NAK", ackId);
             if (ackId) {
                 stopRetransmission(p->to, ackId);

src/mesh/Router.cpp

@@ -37,8 +37,8 @@
 
 static MemoryDynamic<meshtastic_MeshPacket> dynamicPool;
 Allocator<meshtastic_MeshPacket> &packetPool = dynamicPool;
-#elif defined(ARCH_STM32WL) || defined(BOARD_HAS_PSRAM)
-// On STM32 and boards with PSRAM, there isn't enough heap left over for the rest of the firmware if we allocate this statically.
+#elif defined(ARCH_STM32WL)
+// On STM32 there isn't enough heap left over for the rest of the firmware if we allocate this statically.
 // For now, make it dynamic again.
 #define MAX_PACKETS                                                                                                              \
     (MAX_RX_TOPHONE + MAX_RX_FROMRADIO + 2 * MAX_TX_QUEUE +                                                                      \

src/modules/CannedMessageModule.cpp

@@ -16,7 +16,6 @@
 #include "graphics/draw/NotificationRenderer.h"
 #include "graphics/emotes.h"
 #include "graphics/images.h"
-#include "input/SerialKeyboard.h"
 #include "main.h" // for cardkb_found
 #include "mesh/generated/meshtastic/cannedmessages.pb.h"
 #include "modules/AdminModule.h"
@@ -1018,7 +1017,8 @@ int32_t CannedMessageModule::runOnce()
         // Clean up virtual keyboard if needed when going inactive
         if (graphics::NotificationRenderer::virtualKeyboard && graphics::NotificationRenderer::textInputCallback == nullptr) {
             LOG_INFO("Performing delayed virtual keyboard cleanup");
-            graphics::OnScreenKeyboardModule::instance().stop(false);
+            delete graphics::NotificationRenderer::virtualKeyboard;
+            graphics::NotificationRenderer::virtualKeyboard = nullptr;
         }
 
         temporaryMessage = "";
@@ -1035,7 +1035,9 @@ int32_t CannedMessageModule::runOnce()
             // Clean up virtual keyboard after sending
             if (graphics::NotificationRenderer::virtualKeyboard) {
                 LOG_INFO("Cleaning up virtual keyboard after message send");
-                graphics::OnScreenKeyboardModule::instance().stop(false);
+                delete graphics::NotificationRenderer::virtualKeyboard;
+                graphics::NotificationRenderer::virtualKeyboard = nullptr;
+                graphics::NotificationRenderer::textInputCallback = nullptr;
                 graphics::NotificationRenderer::resetBanner();
             }
 
@@ -1093,7 +1095,9 @@ int32_t CannedMessageModule::runOnce()
         // Clean up virtual keyboard if it exists during timeout
         if (graphics::NotificationRenderer::virtualKeyboard) {
             LOG_INFO("Cleaning up virtual keyboard due to module timeout");
-            graphics::OnScreenKeyboardModule::instance().stop(false);
+            delete graphics::NotificationRenderer::virtualKeyboard;
+            graphics::NotificationRenderer::virtualKeyboard = nullptr;
+            graphics::NotificationRenderer::textInputCallback = nullptr;
             graphics::NotificationRenderer::resetBanner();
         }
 
@@ -1844,88 +1848,7 @@ void CannedMessageModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *st
             display->drawString(x + display->getWidth() - display->getStringWidth(buffer), y + 0, buffer);
         }
 
-#if INPUTBROKER_SERIAL_TYPE == 1
-        // Chatter Modifier key mode label (right side)
-        {
-            uint8_t mode = globalSerialKeyboard ? globalSerialKeyboard->getShift() : 0;
-            const char *label = (mode == 0) ? "a" : (mode == 1) ? "A" : "#";
-
-            display->setFont(FONT_SMALL);
-            display->setTextAlignment(TEXT_ALIGN_LEFT);
-
-            const int16_t th = FONT_HEIGHT_SMALL;
-            const int16_t tw = display->getStringWidth(label);
-            const int16_t padX = 3;
-            const int16_t padY = 2;
-            const int16_t r = 3;
-
-            const int16_t bw = tw + padX * 2;
-            const int16_t bh = th + padY * 2;
-
-            const int16_t bx = x + display->getWidth() - bw - 2;
-            const int16_t by = y + display->getHeight() - bh - 2;
-
-            display->setColor(WHITE);
-            display->fillRect(bx + r, by, bw - r * 2, bh);
-            display->fillRect(bx, by + r, r, bh - r * 2);
-            display->fillRect(bx + bw - r, by + r, r, bh - r * 2);
-            display->fillCircle(bx + r, by + r, r);
-            display->fillCircle(bx + bw - r - 1, by + r, r);
-            display->fillCircle(bx + r, by + bh - r - 1, r);
-            display->fillCircle(bx + bw - r - 1, by + bh - r - 1, r);
-
-            display->setColor(BLACK);
-            display->drawString(bx + padX, by + padY, label);
-        }
-
-        // LEFT-SIDE DESTINATION-HINT BOX (“Dest: Shift + ◄”)
-        {
-            display->setFont(FONT_SMALL);
-            display->setTextAlignment(TEXT_ALIGN_LEFT);
-
-            const char *label = "Dest: Shift + ";
-            int16_t labelW = display->getStringWidth(label);
-
-            // triangle size visually matches glyph height, not full line height
-            const int triH = FONT_HEIGHT_SMALL - 3;
-            const int triW = triH * 0.7;
-
-            const int16_t padX = 3;
-            const int16_t padY = 2;
-            const int16_t r = 3;
-
-            const int16_t bw = labelW + triW + padX * 2 + 2;
-            const int16_t bh = FONT_HEIGHT_SMALL + padY * 2;
-
-            const int16_t bx = x + 2;
-            const int16_t by = y + display->getHeight() - bh - 2;
-
-            // Rounded white box
-            display->setColor(WHITE);
-            display->fillRect(bx + r, by, bw - (r * 2), bh);
-            display->fillRect(bx, by + r, r, bh - (r * 2));
-            display->fillRect(bx + bw - r, by + r, r, bh - (r * 2));
-            display->fillCircle(bx + r, by + r, r);
-            display->fillCircle(bx + bw - r - 1, by + r, r);
-            display->fillCircle(bx + r, by + bh - r - 1, r);
-            display->fillCircle(bx + bw - r - 1, by + bh - r - 1, r);
-
-            // Draw text
-            display->setColor(BLACK);
-            display->drawString(bx + padX, by + padY, label);
-
-            // Perfectly center triangle on text baseline
-            int16_t tx = bx + padX + labelW;
-            int16_t ty = by + padY + (FONT_HEIGHT_SMALL / 2) - (triH / 2) - 1; // -1 for optical centering
-
-            // ◄ Left-pointing triangle
-            display->fillTriangle(tx + triW, ty,       // top-right
-                                  tx, ty + triH / 2,   // left center
-                                  tx + triW, ty + triH // bottom-right
-            );
-        }
-#endif
-        // Draw Free Text input with multi-emote support and proper line wrapping
+        // --- Draw Free Text input with multi-emote support and proper line wrapping ---
         display->setColor(WHITE);
         {
             int inputY = 0 + y + FONT_HEIGHT_SMALL;

src/modules/ExternalNotificationModule.cpp

@@ -168,7 +168,7 @@ int32_t ExternalNotificationModule::runOnce()
             delay = EXT_NOTIFICATION_FAST_THREAD_MS;
 #endif
 
-#if defined(T_WATCH_S3) || defined(T_LORA_PAGER)
+#ifdef T_WATCH_S3
             drv.go();
 #endif
         }
@@ -283,7 +283,7 @@ void ExternalNotificationModule::setExternalState(uint8_t index, bool on)
 #ifdef UNPHONE
     unphone.rgb(red, green, blue);
 #endif
-#if defined(T_WATCH_S3) || defined(T_LORA_PAGER)
+#ifdef T_WATCH_S3
     if (on) {
         drv.go();
     } else {
@@ -310,7 +310,8 @@ void ExternalNotificationModule::stopNow()
     rtttl::stop();
 #ifdef HAS_I2S
     LOG_INFO("Stop audioThread playback");
-    audioThread->stop();
+    if (audioThread->isPlaying())
+        audioThread->stop();
 #endif
     // Turn off all outputs
     LOG_INFO("Turning off setExternalStates");
@@ -319,7 +320,7 @@ void ExternalNotificationModule::stopNow()
         externalTurnedOn[i] = 0;
     }
     setIntervalFromNow(0);
-#if defined(T_WATCH_S3) || defined(T_LORA_PAGER)
+#ifdef T_WATCH_S3
     drv.stop();
 #endif
 
@@ -541,19 +542,6 @@ ProcessMessage ExternalNotificationModule::handleReceived(const meshtastic_MeshP
                     (!isBroadcast(mp.to) && isToUs(&mp))) {
                     // Buzz if buzzer mode is not in DIRECT_MSG_ONLY or is DM to us
                     isNagging = true;
-#ifdef T_LORA_PAGER
-                    if (canBuzz()) {
-                        drv.setWaveform(0, 16); // Long buzzer 100%
-                        drv.setWaveform(1, 0);  // Pause
-                        drv.setWaveform(2, 16);
-                        drv.setWaveform(3, 0);
-                        drv.setWaveform(4, 16);
-                        drv.setWaveform(5, 0);
-                        drv.setWaveform(6, 16);
-                        drv.setWaveform(7, 0);
-                        drv.go();
-                    }
-#endif
                     if (!moduleConfig.external_notification.use_pwm && !moduleConfig.external_notification.use_i2s_as_buzzer) {
                         setExternalState(2, true);
                     } else {

src/modules/Modules.cpp

@@ -181,25 +181,25 @@ void setupModules()
     // new ReplyModule();
 #if (HAS_BUTTON || ARCH_PORTDUINO) && !MESHTASTIC_EXCLUDE_INPUTBROKER
     if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
-#if defined(T_LORA_PAGER)
+#ifndef T_LORA_PAGER
+        rotaryEncoderInterruptImpl1 = new RotaryEncoderInterruptImpl1();
+        if (!rotaryEncoderInterruptImpl1->init()) {
+            delete rotaryEncoderInterruptImpl1;
+            rotaryEncoderInterruptImpl1 = nullptr;
+        }
+#elif defined(T_LORA_PAGER)
         // use a special FSM based rotary encoder version for T-LoRa Pager
         rotaryEncoderImpl = new RotaryEncoderImpl();
         if (!rotaryEncoderImpl->init()) {
             delete rotaryEncoderImpl;
             rotaryEncoderImpl = nullptr;
         }
-#elif defined(INPUTDRIVER_ENCODER_TYPE) && (INPUTDRIVER_ENCODER_TYPE == 2)
+#else
         upDownInterruptImpl1 = new UpDownInterruptImpl1();
         if (!upDownInterruptImpl1->init()) {
             delete upDownInterruptImpl1;
             upDownInterruptImpl1 = nullptr;
         }
-#else
-        rotaryEncoderInterruptImpl1 = new RotaryEncoderInterruptImpl1();
-        if (!rotaryEncoderInterruptImpl1->init()) {
-            delete rotaryEncoderInterruptImpl1;
-            rotaryEncoderInterruptImpl1 = nullptr;
-        }
 #endif
         cardKbI2cImpl = new CardKbI2cImpl();
         cardKbI2cImpl->init();
@@ -217,7 +217,7 @@ void setupModules()
     }
 #endif // HAS_BUTTON
 #if ARCH_PORTDUINO
-    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR && portduino_config.i2cdev != "") {
+    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
         seesawRotary = new SeesawRotary("SeesawRotary");
         if (!seesawRotary->init()) {
             delete seesawRotary;

src/modules/OnScreenKeyboardModule.cpp

@@ -1,272 +0,0 @@
-#include "configuration.h"
-#if HAS_SCREEN
-
-#include "graphics/SharedUIDisplay.h"
-#include "graphics/draw/NotificationRenderer.h"
-#include "input/RotaryEncoderInterruptImpl1.h"
-#include "input/UpDownInterruptImpl1.h"
-#include "modules/OnScreenKeyboardModule.h"
-#include <Arduino.h>
-#include <algorithm>
-
-namespace graphics
-{
-
-OnScreenKeyboardModule &OnScreenKeyboardModule::instance()
-{
-    static OnScreenKeyboardModule inst;
-    return inst;
-}
-
-OnScreenKeyboardModule::~OnScreenKeyboardModule()
-{
-    if (keyboard) {
-        delete keyboard;
-        keyboard = nullptr;
-    }
-}
-
-void OnScreenKeyboardModule::start(const char *header, const char *initialText, uint32_t durationMs,
-                                   std::function<void(const std::string &)> cb)
-{
-    if (keyboard) {
-        delete keyboard;
-        keyboard = nullptr;
-    }
-    keyboard = new VirtualKeyboard();
-    callback = cb;
-    if (header)
-        keyboard->setHeader(header);
-    if (initialText)
-        keyboard->setInputText(initialText);
-
-    // Route VK submission/cancel events back into the module
-    keyboard->setCallback([this](const std::string &text) {
-        if (text.empty()) {
-            this->onCancel();
-        } else {
-            this->onSubmit(text);
-        }
-    });
-
-    // Maintain legacy compatibility hooks
-    NotificationRenderer::virtualKeyboard = keyboard;
-    NotificationRenderer::textInputCallback = callback;
-}
-
-void OnScreenKeyboardModule::stop(bool callEmptyCallback)
-{
-    auto cb = callback;
-    callback = nullptr;
-    if (keyboard) {
-        delete keyboard;
-        keyboard = nullptr;
-    }
-    // Keep NotificationRenderer legacy pointers in sync
-    NotificationRenderer::virtualKeyboard = nullptr;
-    NotificationRenderer::textInputCallback = nullptr;
-    clearPopup();
-    if (callEmptyCallback && cb)
-        cb("");
-}
-
-void OnScreenKeyboardModule::handleInput(const InputEvent &event)
-{
-    if (!keyboard)
-        return;
-
-    if (processVirtualKeyboardInput(event, keyboard))
-        return;
-
-    if (event.inputEvent == INPUT_BROKER_CANCEL)
-        onCancel();
-}
-
-bool OnScreenKeyboardModule::processVirtualKeyboardInput(const InputEvent &event, VirtualKeyboard *targetKeyboard)
-{
-    if (!targetKeyboard)
-        return false;
-
-    switch (event.inputEvent) {
-    case INPUT_BROKER_UP:
-    case INPUT_BROKER_UP_LONG:
-        targetKeyboard->moveCursorUp();
-        return true;
-    case INPUT_BROKER_DOWN:
-    case INPUT_BROKER_DOWN_LONG:
-        targetKeyboard->moveCursorDown();
-        return true;
-    case INPUT_BROKER_LEFT:
-    case INPUT_BROKER_ALT_PRESS:
-        targetKeyboard->moveCursorLeft();
-        return true;
-    case INPUT_BROKER_RIGHT:
-    case INPUT_BROKER_USER_PRESS:
-        targetKeyboard->moveCursorRight();
-        return true;
-    case INPUT_BROKER_SELECT:
-        targetKeyboard->handlePress();
-        return true;
-    case INPUT_BROKER_SELECT_LONG:
-        targetKeyboard->handleLongPress();
-        return true;
-    default:
-        return false;
-    }
-}
-
-bool OnScreenKeyboardModule::draw(OLEDDisplay *display)
-{
-    if (!keyboard)
-        return false;
-
-    // Timeout
-    if (keyboard->isTimedOut()) {
-        onCancel();
-        return false;
-    }
-
-    // Clear full screen behind keyboard
-    display->setColor(BLACK);
-    display->fillRect(0, 0, display->getWidth(), display->getHeight());
-    display->setColor(WHITE);
-    keyboard->draw(display, 0, 0);
-
-    // Draw popup overlay if needed
-    drawPopup(display);
-    return true;
-}
-
-void OnScreenKeyboardModule::onSubmit(const std::string &text)
-{
-    auto cb = callback;
-    stop(false);
-    if (cb)
-        cb(text);
-}
-
-void OnScreenKeyboardModule::onCancel()
-{
-    stop(true);
-}
-
-void OnScreenKeyboardModule::showPopup(const char *title, const char *content, uint32_t durationMs)
-{
-    if (!title || !content)
-        return;
-    strncpy(popupTitle, title, sizeof(popupTitle) - 1);
-    popupTitle[sizeof(popupTitle) - 1] = '\0';
-    strncpy(popupMessage, content, sizeof(popupMessage) - 1);
-    popupMessage[sizeof(popupMessage) - 1] = '\0';
-    popupUntil = millis() + durationMs;
-    popupVisible = true;
-}
-
-void OnScreenKeyboardModule::clearPopup()
-{
-    popupTitle[0] = '\0';
-    popupMessage[0] = '\0';
-    popupUntil = 0;
-    popupVisible = false;
-}
-
-void OnScreenKeyboardModule::drawPopupOverlay(OLEDDisplay *display)
-{
-    // Only render the popup overlay (without drawing the keyboard)
-    drawPopup(display);
-}
-
-void OnScreenKeyboardModule::drawPopup(OLEDDisplay *display)
-{
-    if (!popupVisible)
-        return;
-    if (millis() > popupUntil || popupMessage[0] == '\0') {
-        popupVisible = false;
-        return;
-    }
-
-    // Build lines and leverage NotificationRenderer inverted box drawing for consistent style
-    constexpr uint16_t maxContentLines = 3;
-    const bool hasTitle = popupTitle[0] != '\0';
-
-    display->setFont(FONT_SMALL);
-    display->setTextAlignment(TEXT_ALIGN_LEFT);
-    const uint16_t maxWrapWidth = display->width() - 40;
-
-    auto wrapText = [&](const char *text, uint16_t availableWidth) -> std::vector<std::string> {
-        std::vector<std::string> wrapped;
-        std::string current;
-        std::string word;
-        const char *p = text;
-        while (*p && wrapped.size() < maxContentLines) {
-            while (*p && (*p == ' ' || *p == '\t' || *p == '\n' || *p == '\r')) {
-                if (*p == '\n') {
-                    if (!current.empty()) {
-                        wrapped.push_back(current);
-                        current.clear();
-                        if (wrapped.size() >= maxContentLines)
-                            break;
-                    }
-                }
-                ++p;
-            }
-            if (!*p || wrapped.size() >= maxContentLines)
-                break;
-            word.clear();
-            while (*p && *p != ' ' && *p != '\t' && *p != '\n' && *p != '\r')
-                word += *p++;
-            if (word.empty())
-                continue;
-            std::string test = current.empty() ? word : (current + " " + word);
-            uint16_t w = display->getStringWidth(test.c_str(), test.length(), true);
-            if (w <= availableWidth)
-                current = test;
-            else {
-                if (!current.empty()) {
-                    wrapped.push_back(current);
-                    current = word;
-                    if (wrapped.size() >= maxContentLines)
-                        break;
-                } else {
-                    current = word;
-                    while (current.size() > 1 &&
-                           display->getStringWidth(current.c_str(), current.length(), true) > availableWidth)
-                        current.pop_back();
-                }
-            }
-        }
-        if (!current.empty() && wrapped.size() < maxContentLines)
-            wrapped.push_back(current);
-        return wrapped;
-    };
-
-    std::vector<std::string> allLines;
-    if (hasTitle)
-        allLines.emplace_back(popupTitle);
-
-    char buf[sizeof(popupMessage)];
-    strncpy(buf, popupMessage, sizeof(buf) - 1);
-    buf[sizeof(buf) - 1] = '\0';
-    char *paragraph = strtok(buf, "\n");
-    while (paragraph && allLines.size() < maxContentLines + (hasTitle ? 1 : 0)) {
-        auto wrapped = wrapText(paragraph, maxWrapWidth);
-        for (const auto &ln : wrapped) {
-            if (allLines.size() >= maxContentLines + (hasTitle ? 1 : 0))
-                break;
-            allLines.push_back(ln);
-        }
-        paragraph = strtok(nullptr, "\n");
-    }
-
-    std::vector<const char *> ptrs;
-    for (const auto &ln : allLines)
-        ptrs.push_back(ln.c_str());
-    ptrs.push_back(nullptr);
-
-    // Use the standard notification box drawing from NotificationRenderer
-    NotificationRenderer::drawNotificationBox(display, nullptr, ptrs.data(), allLines.size(), 0, 0);
-}
-
-} // namespace graphics
-
-#endif // HAS_SCREEN

src/modules/OnScreenKeyboardModule.h

@@ -1,55 +0,0 @@
-#pragma once
-
-#include "configuration.h"
-#if HAS_SCREEN
-
-#include "graphics/Screen.h" // InputEvent
-#include "graphics/VirtualKeyboard.h"
-#include <OLEDDisplay.h>
-#include <functional>
-#include <string>
-
-namespace graphics
-{
-class OnScreenKeyboardModule
-{
-  public:
-    static OnScreenKeyboardModule &instance();
-
-    void start(const char *header, const char *initialText, uint32_t durationMs,
-               std::function<void(const std::string &)> callback);
-
-    void stop(bool callEmptyCallback);
-
-    void handleInput(const InputEvent &event);
-    static bool processVirtualKeyboardInput(const InputEvent &event, VirtualKeyboard *keyboard);
-    bool draw(OLEDDisplay *display);
-
-    void showPopup(const char *title, const char *content, uint32_t durationMs);
-    void clearPopup();
-    // Draw only the popup overlay (used when legacy virtualKeyboard draws the keyboard)
-    void drawPopupOverlay(OLEDDisplay *display);
-
-  private:
-    OnScreenKeyboardModule() = default;
-    ~OnScreenKeyboardModule();
-    OnScreenKeyboardModule(const OnScreenKeyboardModule &) = delete;
-    OnScreenKeyboardModule &operator=(const OnScreenKeyboardModule &) = delete;
-
-    void onSubmit(const std::string &text);
-    void onCancel();
-
-    void drawPopup(OLEDDisplay *display);
-
-    VirtualKeyboard *keyboard = nullptr;
-    std::function<void(const std::string &)> callback;
-
-    char popupTitle[64] = {0};
-    char popupMessage[256] = {0};
-    uint32_t popupUntil = 0;
-    bool popupVisible = false;
-};
-
-} // namespace graphics
-
-#endif // HAS_SCREEN

src/modules/PositionModule.cpp

@@ -45,12 +45,8 @@ bool PositionModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, mes
 {
     auto p = *pptr;
 
-    const auto transport = mp.transport_mechanism;
-    if (isFromUs(&mp) && !IS_ONE_OF(transport, meshtastic_MeshPacket_TransportMechanism_TRANSPORT_INTERNAL,
-                                    meshtastic_MeshPacket_TransportMechanism_TRANSPORT_API)) {
-        LOG_WARN("Ignoring packet supposedly from us over external transport");
-        return true;
-    }
+    // If inbound message is a replay (or spoof!) of our own messages, we shouldn't process
+    // (why use second-hand sources for our own data?)
 
     // FIXME this can in fact happen with packets sent from EUD (src=RX_SRC_USER)
     // to set fixed location, EUD-GPS location or just the time (see also issue #900)
@@ -476,53 +472,19 @@ void PositionModule::sendLostAndFoundText()
     delete[] message;
 }
 
-// Helper: return imprecise (truncated + centered) lat/lon as int32 using current precision
-static inline void computeImpreciseLatLon(int32_t inLat, int32_t inLon, uint8_t precisionBits, int32_t &outLat, int32_t &outLon)
-{
-    if (precisionBits > 0 && precisionBits < 32) {
-        // Build mask for top 'precisionBits' bits of a 32-bit unsigned field
-        const uint32_t mask = (precisionBits == 32) ? UINT32_MAX : (UINT32_MAX << (32 - precisionBits));
-        // Note: latitude_i/longitude_i are stored as signed 32-bit in meshtastic code but
-        // the bitmask logic used previously operated as unsigned—preserve that behavior by
-        // casting to uint32_t for masking, then back to int32_t.
-        uint32_t lat_u = static_cast<uint32_t>(inLat) & mask;
-        uint32_t lon_u = static_cast<uint32_t>(inLon) & mask;
-
-        // Add the "center of cell" offset used elsewhere:
-        // The code previously added (1 << (31 - precision)) to produce the middle of the possible location.
-        uint32_t center_offset = (1u << (31 - precisionBits));
-        lat_u += center_offset;
-        lon_u += center_offset;
-
-        outLat = static_cast<int32_t>(lat_u);
-        outLon = static_cast<int32_t>(lon_u);
-    } else {
-        // full precision: return input unchanged
-        outLat = inLat;
-        outLon = inLon;
-    }
-}
-
 struct SmartPosition PositionModule::getDistanceTraveledSinceLastSend(meshtastic_PositionLite currentPosition)
 {
+    // The minimum distance to travel before we are able to send a new position packet.
     const uint32_t distanceTravelThreshold =
         Default::getConfiguredOrDefault(config.position.broadcast_smart_minimum_distance, 100);
 
-    int32_t lastLatImprecise, lastLonImprecise;
-    int32_t currentLatImprecise, currentLonImprecise;
+    // Determine the distance in meters between two points on the globe
+    float distanceTraveledSinceLastSend = GeoCoord::latLongToMeter(
+        lastGpsLatitude * 1e-7, lastGpsLongitude * 1e-7, currentPosition.latitude_i * 1e-7, currentPosition.longitude_i * 1e-7);
 
-    computeImpreciseLatLon(lastGpsLatitude, lastGpsLongitude, precision, lastLatImprecise, lastLonImprecise);
-    computeImpreciseLatLon(currentPosition.latitude_i, currentPosition.longitude_i, precision, currentLatImprecise,
-                           currentLonImprecise);
-
-    float distMeters = GeoCoord::latLongToMeter(lastLatImprecise * 1e-7, lastLonImprecise * 1e-7, currentLatImprecise * 1e-7,
-                                                currentLonImprecise * 1e-7);
-
-    float distanceTraveled = fabsf(distMeters);
-
-    return SmartPosition{.distanceTraveled = distanceTraveled,
+    return SmartPosition{.distanceTraveled = abs(distanceTraveledSinceLastSend),
                          .distanceThreshold = distanceTravelThreshold,
-                         .hasTraveledOverThreshold = distanceTraveled >= distanceTravelThreshold};
+                         .hasTraveledOverThreshold = abs(distanceTraveledSinceLastSend) >= distanceTravelThreshold};
 }
 
 void PositionModule::handleNewPosition()