Merge branch 'develop' into esp32-h2

* Create new colors for BaseUI

* Update Ice color

.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/program"
+	program="$PLATFORMIO_WORKSPACE_DIR/build/$PIO_ENV/meshtasticd"
 	cp "$program" "$OUT/$fuzzer"
 
 	# Copy shared libraries used by the fuzzer.

.github/actionlint.yaml

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

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

@@ -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 }}.zip
+        name: firmware-${{ inputs.arch }}-${{ inputs.board }}-${{ steps.version.outputs.long }}
         overwrite: true
         path: |
           ${{ inputs.artifact-paths }}

.github/workflows/build_firmware.yml

@@ -18,7 +18,8 @@ permissions: read-all
 jobs:
   pio-build:
     name: build-${{ inputs.platform }}
-    runs-on: ubuntu-24.04
+    # Use 'arctastic' self-hosted runner pool when building in the main repo
+    runs-on: ${{ github.repository_owner == 'meshtastic' && 'arctastic' || 'ubuntu-latest' }}
     outputs:
       artifact-id: ${{ steps.upload.outputs.artifact-id }}
     steps:
@@ -55,15 +56,29 @@ 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 }}.zip
+          name: firmware-${{ inputs.platform }}-${{ inputs.pio_env }}-${{ inputs.version }}
           overwrite: true
           path: |
+            release/*.mt.json
             release/*.bin
             release/*.elf
             release/*.uf2
             release/*.hex
-            release/*-ota.zip
+            release/*.zip
+            release/device-*.sh
+            release/device-*.bat

.github/workflows/build_one_target.yml

@@ -119,7 +119,7 @@ jobs:
             ./firmware-*.bin
             ./firmware-*.uf2
             ./firmware-*.hex
-            ./firmware-*-ota.zip
+            ./firmware-*.zip
             ./device-*.sh
             ./device-*.bat
             ./littlefs-*.bin
@@ -139,8 +139,8 @@ jobs:
 
       - name: Device scripts permissions
         run: |
-          chmod +x ./output/device-install.sh
+          chmod +x ./output/device-install.sh || true
-          chmod +x ./output/device-update.sh
+          chmod +x ./output/device-update.sh || true
 
       - name: Zip firmware
         run: zip -j -9 -r ./firmware-${{inputs.target}}-${{ needs.version.outputs.long }}.zip ./output

.github/workflows/main_matrix.yml

@@ -177,19 +177,17 @@ 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-*-ota.zip
+            ./firmware-*.zip
             ./device-*.sh
             ./device-*.bat
             ./littlefs-*.bin
@@ -209,8 +207,8 @@ jobs:
 
       - name: Device scripts permissions
         run: |
-          chmod +x ./output/device-install.sh
+          chmod +x ./output/device-install.sh || true
-          chmod +x ./output/device-update.sh
+          chmod +x ./output/device-update.sh || true
 
       - name: Zip firmware
         run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output
@@ -218,7 +216,7 @@ jobs:
       - name: Repackage in single elfs zip
         uses: actions/upload-artifact@v5
         with:
-          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
+          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
           overwrite: true
           path: ./*.elf
           retention-days: 30
@@ -236,6 +234,7 @@ jobs:
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
     needs:
+      - setup
       - version
       - gather-artifacts
       - build-debian-src
@@ -244,11 +243,6 @@ 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
@@ -284,10 +278,25 @@ jobs:
       - name: Display structure of downloaded files
         run: ls -lR
 
-      - name: Add Linux sources to GtiHub Release
+      - 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
         # 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:
@@ -329,15 +338,15 @@ jobs:
 
       - name: Device scripts permissions
         run: |
-          chmod +x ./output/device-install.sh
+          chmod +x ./output/device-install.sh || true
-          chmod +x ./output/device-update.sh
+          chmod +x ./output/device-update.sh || true
 
       - 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 }}.zip
+          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
           merge-multiple: true
           path: ./elfs
 
@@ -373,12 +382,19 @@ jobs:
         with:
           python-version: 3.x
 
-      - uses: actions/download-artifact@v6
+      - name: Get firmware artifacts
+        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-*-ota.zip
+            ./firmware-*.zip
             ./device-*.sh
             ./device-*.bat
             ./littlefs-*.bin
@@ -188,8 +188,8 @@ jobs:
 
       - name: Device scripts permissions
         run: |
-          chmod +x ./output/device-install.sh
+          chmod +x ./output/device-install.sh || true
-          chmod +x ./output/device-update.sh
+          chmod +x ./output/device-update.sh || true
 
       - 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 }}.zip
+          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
           overwrite: true
           path: ./*.elf
           retention-days: 30
@@ -223,11 +223,6 @@ 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
@@ -308,15 +303,15 @@ jobs:
 
       - name: Device scripts permissions
         run: |
-          chmod +x ./output/device-install.sh
+          chmod +x ./output/device-install.sh || true
-          chmod +x ./output/device-update.sh
+          chmod +x ./output/device-update.sh || true
 
       - 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 }}.zip
+          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
           merge-multiple: true
           path: ./elfs
 

.github/workflows/pr_enforce_labels.yml

@@ -17,7 +17,7 @@ jobs:
         with:
           script: |
             const labels = context.payload.pull_request.labels.map(label => label.name);
-            const requiredLabels = ['bugfix', 'enhancement', 'hardware-support', 'dependencies', 'submodules', 'github_actions', 'trunk'];
+            const requiredLabels = ['bugfix', 'enhancement', 'hardware-support', 'dependencies', 'submodules', 'github_actions', 'trunk', 'cleanup'];
             const hasRequiredLabel = labels.some(label => requiredLabels.includes(label));
             if (!hasRequiredLabel) {
               core.setFailed(`PR must have at least one of the following labels before it can be merged: ${requiredLabels.join(', ')}.`);

.github/workflows/pr_tests.yml

@@ -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 }}.zip
+          name: platformio-test-report-${{ steps.version.outputs.long }}
           merge-multiple: true
 
       - name: Parse test results and create detailed summary

.github/workflows/stale_bot.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Stale PR+Issues
-        uses: actions/stale@v10.1.0
+        uses: actions/stale@v10.1.1
         with:
           days-before-stale: 45
           stale-issue-message: This issue has not had any comment or update in the last month. If it is still relevant, please post update comments. If no comments are made, this issue will be closed automagically in 7 days.

.github/workflows/test_native.yml

@@ -40,7 +40,7 @@ jobs:
 
       - name: Integration test
         run: |
-          .pio/build/coverage/program -s &
+          .pio/build/coverage/meshtasticd -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 }}.zip
+          name: lcov-coverage-info-native-simulator-test-${{ steps.version.outputs.long }}
           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 }}.zip
+          name: platformio-test-report-${{ steps.version.outputs.long }}
           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 }}.zip
+          name: lcov-coverage-info-native-platformio-tests-${{ steps.version.outputs.long }}
           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 }}.zip
+          name: platformio-test-report-${{ steps.version.outputs.long }}
           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 }}.zip
+          pattern: lcov-coverage-info-native-*-${{ steps.version.outputs.long }}
           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 }}.zip
+          name: code-coverage-report-${{ steps.version.outputs.long }}
           path: code-coverage-report

.github/workflows/tests.yml

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

.trunk/trunk.yaml

@@ -9,9 +9,9 @@ plugins:
 lint:
   enabled:
     - checkov@3.2.495
-    - renovate@42.27.1
+    - renovate@42.30.4
-    - prettier@3.7.3
+    - prettier@3.7.4
-    - trufflehog@3.91.1
+    - trufflehog@3.91.2
     - yamllint@1.37.1
     - bandit@1.9.2
     - trivy@0.67.2

alpine.Dockerfile

@@ -28,7 +28,7 @@ RUN bash ./bin/build-native.sh "$PIO_ENV" && \
 
 # ##### PRODUCTION BUILD #############
 
-FROM alpine:3.22
+FROM alpine:3.23
 LABEL org.opencontainers.image.title="Meshtastic" \
       org.opencontainers.image.description="Alpine Meshtastic daemon" \
       org.opencontainers.image.url="https://meshtastic.org" \

bin/build-esp32.sh

@@ -5,7 +5,8 @@ set -e
 VERSION=`bin/buildinfo.py long`
 SHORT_VERSION=`bin/buildinfo.py short`
 
-OUTDIR=release/
+BUILDDIR=.pio/build/$1
+OUTDIR=release
 
 rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
@@ -14,7 +15,7 @@ rm -r $OUTDIR/* || true
 platformio pkg install -e $1
 
 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
-rm -f .pio/build/$1/firmware.*
+rm -f $BUILDDIR/firmware*
 
 # The shell vars the build tool expects to find
 export APP_VERSION=$VERSION
@@ -22,16 +23,14 @@ export APP_VERSION=$VERSION
 basename=firmware-$1-$VERSION
 
 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 ESP32 bin file"
-SRCBIN=.pio/build/$1/firmware.factory.bin
+cp $BUILDDIR/$basename.factory.bin $OUTDIR/$basename.factory.bin
-cp $SRCBIN $OUTDIR/$basename.bin
 
 echo "Copying ESP32 update bin file"
-SRCBIN=.pio/build/$1/firmware.bin
+cp $BUILDDIR/$basename.bin $OUTDIR/$basename.bin
-cp $SRCBIN $OUTDIR/$basename-update.bin
 
 echo "Building Filesystem for ESP32 targets"
 # If you want to build the webui, uncomment the following lines
@@ -40,7 +39,13 @@ echo "Building Filesystem for ESP32 targets"
 # # 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
+pio run --environment $1 -t buildfs --disable-auto-clean
-cp .pio/build/$1/littlefs.bin $OUTDIR/littlefs-$1-$VERSION.bin
+cp $BUILDDIR/littlefs-$1-$VERSION.bin $OUTDIR/littlefs-$1-$VERSION.bin
-cp bin/device-install.* $OUTDIR
+cp bin/device-install.* $OUTDIR/
-cp bin/device-update.* $OUTDIR
+cp bin/device-update.* $OUTDIR/
+
+# Generate the manifest file
+echo "Generating Meshtastic manifest"
+TIMEFORMAT="Generated manifest in %E seconds"
+time pio run --environment $1 -t mtjson --silent --disable-auto-clean
+cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json

bin/build-native.sh

@@ -17,15 +17,19 @@ VERSION=$(bin/buildinfo.py long)
 SHORT_VERSION=$(bin/buildinfo.py short)
 PIO_ENV=${1:-native}
 
-OUTDIR=release/
+BUILDDIR=.pio/build/$PIO_ENV
+OUTDIR=release
 
-rm -f $OUTDIR/firmware*
+rm -f $OUTDIR/meshtasticd*
 
 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 ".pio/build/$PIO_ENV/program" "$OUTDIR/meshtasticd_linux_$(uname -m)"
+
-cp bin/native-install.* $OUTDIR
+cp "$BUILDDIR/meshtasticd" "$OUTDIR/meshtasticd_linux_$(uname -m)"
+cp bin/native-install.* $OUTDIR/

bin/build-nrf52.sh

@@ -5,7 +5,8 @@ set -e
 VERSION=$(bin/buildinfo.py long)
 SHORT_VERSION=$(bin/buildinfo.py short)
 
-OUTDIR=release/
+BUILDDIR=.pio/build/$1
+OUTDIR=release
 
 rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
@@ -14,7 +15,7 @@ rm -r $OUTDIR/* || true
 platformio pkg install -e $1
 
 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
-rm -f .pio/build/$1/firmware.*
+rm -f $BUILDDIR/firmware*
 
 # The shell vars the build tool expects to find
 export APP_VERSION=$VERSION
@@ -22,32 +23,32 @@ export APP_VERSION=$VERSION
 basename=firmware-$1-$VERSION
 
 pio run --environment $1 # -v
-SRCELF=.pio/build/$1/firmware.elf
-cp $SRCELF $OUTDIR/$basename.elf
 
-echo "Generating NRF52 dfu file"
+cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf
-DFUPKG=.pio/build/$1/firmware.zip
-cp $DFUPKG $OUTDIR/$basename-ota.zip
 
-echo "Generating NRF52 uf2 file"
+echo "Copying NRF52 dfu (OTA) file"
-SRCHEX=.pio/build/$1/firmware.hex
+cp $BUILDDIR/$basename.zip $OUTDIR/$basename.zip
 
-# if WM1110 target, merge hex with softdevice 7.3.0
+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 (echo $1 | grep -q "wio-sdk-wm1110"); then
-	echo "Merging with softdevice"
+	echo "Copying .merged.hex file"
-	bin/mergehex -m bin/s140_nrf52_7.3.0_softdevice.hex $SRCHEX -o .pio/build/$1/$basename.hex
+	SRCHEX=$BUILDDIR/$basename.merged.hex
-	SRCHEX=.pio/build/$1/$basename.hex
+	cp $SRCHEX $OUTDIR/
-	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"
+	echo "Copying .hex file"
-	cp .pio/build/$1/firmware.hex $OUTDIR/$basename.hex
+	cp $SRCHEX $OUTDIR/
 fi
+
+# Generate the manifest file
+echo "Generating Meshtastic manifest"
+TIMEFORMAT="Generated manifest in %E seconds"
+time pio run --environment $1 -t mtjson --silent --disable-auto-clean
+cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json

bin/build-rp2xx0.sh

@@ -5,7 +5,8 @@ set -e
 VERSION=`bin/buildinfo.py long`
 SHORT_VERSION=`bin/buildinfo.py short`
 
-OUTDIR=release/
+BUILDDIR=.pio/build/$1
+OUTDIR=release
 
 rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
@@ -14,7 +15,7 @@ rm -r $OUTDIR/* || true
 platformio pkg install -e $1
 
 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
-rm -f .pio/build/$1/firmware.*
+rm -f $BUILDDIR/firmware*
 
 # The shell vars the build tool expects to find
 export APP_VERSION=$VERSION
@@ -22,12 +23,14 @@ export APP_VERSION=$VERSION
 basename=firmware-$1-$VERSION
 
 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 uf2 file"
-SRCBIN=.pio/build/$1/firmware.uf2
+cp $BUILDDIR/$basename.uf2 $OUTDIR/$basename.uf2
-cp $SRCBIN $OUTDIR/$basename.uf2
 
-cp bin/device-install.* $OUTDIR
+# Generate the manifest file
-cp bin/device-update.* $OUTDIR
+echo "Generating Meshtastic manifest"
+TIMEFORMAT="Generated manifest in %E seconds"
+time pio run --environment $1 -t mtjson --silent --disable-auto-clean
+cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json

bin/build-stm32wl.sh

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

bin/device-install.bat

@@ -5,22 +5,14 @@ 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 FIXME: Determine mcu from PlatformIO variant, this is unmaintainable.
+@REM https://github.com/meshtastic/web-flasher/blob/main/stores/firmwareStore.ts#L202
-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 "OTA_OFFSET=0x260000"
-SET "C3=esp32c3"
+SET "SPIFFS_OFFSET=0x300000"
-@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
@@ -29,7 +21,7 @@ ECHO.
 ECHO Usage: %SCRIPT_NAME% -f filename [-p PORT] [-P python] [--1200bps-reset]
 ECHO.
 ECHO Options:
-ECHO     -f filename      The firmware .bin file to flash.  Custom to your device type and region. (required)
+ECHO     -f filename      The firmware .factory.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).
@@ -40,12 +32,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.bin -p COM11
+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.bin -p COM11
+ECHO Example: %SCRIPT_NAME% -f firmware-unphone-2.6.0.0b106d4.factory.bin -p COM11
 GOTO eof
 
 :version
-ECHO %SCRIPT_NAME% [Version 2.6.2]
+ECHO %SCRIPT_NAME% [Version 2.7.0]
 ECHO Meshtastic
 GOTO eof
 
@@ -78,8 +70,8 @@ IF "__!FILENAME!__"=="____" (
         CALL :LOG_MESSAGE ERROR "Filename containing spaces are not supported."
         GOTO help
     )
-    IF "__!FILENAME:firmware-=!__"=="__!FILENAME!__" (
+    IF NOT "__!FILENAME:.factory.bin=!__"=="__!FILENAME!__" (
-        CALL :LOG_MESSAGE ERROR "Filename must be a firmware-* file."
+        CALL :LOG_MESSAGE ERROR "Filename must be a firmware-*.factory.bin file."
         GOTO help
     )
     @REM Remove ".\" or "./" file prefix if present.
@@ -93,12 +85,26 @@ IF NOT EXIST !FILENAME! (
     GOTO eof
 )
 
-IF NOT "!FILENAME:update=!"=="!FILENAME!" (
+CALL :LOG_MESSAGE DEBUG "Checking for metadata..."
-    CALL :LOG_MESSAGE DEBUG "We are working with a *update* file. !FILENAME!"
+@REM Derive metadata filename from firmware filename.
-    CALL :LOG_MESSAGE INFO "Use script device-update.bat to flash update !FILENAME!."
+SET "METAFILE=!FILENAME:.factory.bin=!.mt.json"
-    GOTO eof
+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 DEBUG "We are NOT working with a *update* file. !FILENAME!"
+    CALL :LOG_MESSAGE ERROR "No metadata file found: !METAFILE!"
+    GOTO eof
 )
 
 :skip-filename
@@ -108,7 +114,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.
@@ -146,100 +152,26 @@ IF %BPS_RESET% EQU 1 (
     GOTO eof
 )
 
-@REM Check if FILENAME contains "-tft-" and set target partitionScheme accordingly.
+@REM Extract PROGNAME from %FILENAME% for later use.
-@REM https://github.com/meshtastic/web-flasher/blob/main/types/resources.ts#L3
+SET "PROGNAME=!FILENAME:.factory.bin=!"
-IF NOT "!FILENAME:-tft-=!"=="!FILENAME!" (
+CALL :LOG_MESSAGE DEBUG "Computed PROGNAME: !PROGNAME!"
-    CALL :LOG_MESSAGE DEBUG "We are working with a *-tft-* file. !FILENAME!"
+
-    SET "TFT_BUILD=1"
+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"
 ) ELSE (
-    CALL :LOG_MESSAGE DEBUG "We are NOT working with a *-tft-* file. !FILENAME!"
+    @REM Everything else
+    SET "OTA_FILENAME=bleota.bin"
 )
-
-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-%BASENAME%"
+SET "SPIFFS_FILENAME=littlefs-!PROGNAME:firmware-=!.bin"
 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,69 +2,15 @@
 
 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.
-# Variant groups
+OFFSET=0x300000
-BIGDB_8MB=(
+# Default OTA Offset
-    "crowpanel-esp32s3"
+OTA_OFFSET=0x260000
-    "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
@@ -78,6 +24,14 @@ 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
@@ -89,7 +43,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 .bin file to flash.  Custom to your device type and region.
+    -f FILENAME      The firmware *.factory.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
@@ -138,69 +92,43 @@ fi
     shift
 }
 
-if [[ "$FILENAME" != firmware-* ]]; then
+if [[ $(basename "$FILENAME") != firmware-*.factory.bin ]]; then
-  echo "Filename must be a firmware-* file."
+  echo "Filename must be a firmware-*.factory.bin file."
   exit 1
 fi
 
-# Check if FILENAME contains "-tft-" and set target partitionScheme accordingly.
+# Extract PROGNAME from %FILENAME% for later use.
-if [[ "${FILENAME//-tft-/}" != "$FILENAME" ]]; then
+PROGNAME="${FILENAME/.factory.bin/}"
-    TFT_BUILD=true
+# Derive metadata filename from %PROGNAME%.
-fi
+METAFILE="${PROGNAME}.mt.json"
 
-# Extract BASENAME from %FILENAME% for later use.
+if [[ -f "$FILENAME" && "$FILENAME" == *.factory.bin ]]; then
-BASENAME="${FILENAME/firmware-/}"
+    # Display metadata if it exists
-
+    if [[ -f "$METAFILE" ]]; then
-if [ -f "${FILENAME}" ] && [ -n "${FILENAME##*"update"*}" ]; then
+        echo "Firmware metadata: ${METAFILE}"
-    # Default littlefs* offset.
+        jq . "$METAFILE"
-    OFFSET=0x300000
+        # Extract relevant fields from metadata
-
+        if [[ $(jq -r '.part' "$METAFILE") != "null" ]]; then
-    # Default OTA Offset
+            OTA_OFFSET=$(jq -r '.part[] | select(.subtype == "ota_1") | .offset' "$METAFILE")
-    OTA_OFFSET=0x260000
+            SPIFFS_OFFSET=$(jq -r '.part[] | select(.subtype == "spiffs") | .offset' "$METAFILE")
-
-    # littlefs* offset for BigDB 8mb and OTA OFFSET.
-    for variant in "${BIGDB_8MB[@]}"; do
-        if [ -z "${FILENAME##*"$variant"*}" ]; then
-            OFFSET=0x670000
-            OTA_OFFSET=0x340000
-        fi
-    done
-
-    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
+        MCU=$(jq -r '.mcu' "$METAFILE")
     else
+        echo "ERROR: No metadata file found at ${METAFILE}"
+        exit 1
+    fi
+
+    # Determine OTA filename based on MCU type
+    if [ "$MCU" == "esp32s3" ]; then
         OTAFILE=bleota-s3.bin
+    elif [ "$MCU" == "esp32c3" ]; then
+        OTAFILE=bleota-c3.bin
+    else
+        OTAFILE=bleota.bin
     fi
 
     # Set SPIFFS filename with "littlefs-" prefix.
-    SPIFFSFILE=littlefs-${BASENAME}
+    SPIFFSFILE="littlefs-${PROGNAME/firmware-/}.bin"
 
     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-update.bin -p COM11
+ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4.bin -p COM11
 GOTO eof
 
 :version
-ECHO %SCRIPT_NAME% [Version 2.6.2]
+ECHO %SCRIPT_NAME% [Version 2.7.0]
 ECHO Meshtastic
 GOTO eof
 
@@ -78,12 +78,12 @@ IF NOT EXIST !FILENAME! (
     GOTO eof
 )
 
-IF "!FILENAME:update=!"=="!FILENAME!" (
+IF NOT "__!FILENAME:.factory.bin=!__"=="__!FILENAME!__" (
-    CALL :LOG_MESSAGE DEBUG "We are NOT working with a *update* file. !FILENAME!"
+    CALL :LOG_MESSAGE DEBUG "We are working with a *.factory.bin* file. !FILENAME!"
     CALL :LOG_MESSAGE INFO "Use script device-install.bat to flash !FILENAME!."
     GOTO eof
 ) ELSE (
-    CALL :LOG_MESSAGE DEBUG "We are working with a *update* file. !FILENAME!"
+    CALL :LOG_MESSAGE DEBUG "We are not working with a *.factory.bin* 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 *update.bin file to flash.  Custom to your device type.
+    -f FILENAME      The *.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}" ] && [ -z "${FILENAME##*"update"*}" ]; then
+if [[ -f "$FILENAME" && "$FILENAME" != *.factory.bin ]]; 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"(?:\s+(0x40[0-2](?:\d|[a-f]|[A-F]){5}):0x(?:\d|[a-f]|[A-F]){8})\b"
+    r"\b(0x4[0-9a-fA-F]{7,8}):0x[0-9a-fA-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(
-    "^(?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.*)?$"
+    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.*)?$"
 )
 
 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/program "$@"
+gdbserver --once localhost:2345 .pio/build/native/meshtasticd "$@"

bin/native-run.sh

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

bin/platformio-custom.py

@@ -2,98 +2,77 @@
 # trunk-ignore-all(ruff/F821)
 # trunk-ignore-all(flake8/F821): For SConstruct imports
 import sys
-from os.path import join
+from os.path import join, basename, isfile
 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):
-def esp32_create_combined_bin(source, target, env):
+    out = []
-    # this sub is borrowed from ESPEasy build toolchain. It's licensed under GPL V3
+    check_paths = [
-    # https://github.com/letscontrolit/ESPEasy/blob/mega/tools/pio/post_esp32.py
+        progname,
-    print("Generating combined binary for serial flashing")
+        f"{progname}.elf",
-
+        f"{progname}.bin",
-    app_offset = 0x10000
+        f"{progname}.factory.bin",
-
+        f"{progname}.hex",
-    new_file_name = env.subst("$BUILD_DIR/${PROGNAME}.factory.bin")
+        f"{progname}.merged.hex",
-    sections = env.subst(env.get("FLASH_EXTRA_IMAGES"))
+        f"{progname}.uf2",
-    firmware_name = env.subst("$BUILD_DIR/${PROGNAME}.bin")
+        f"{progname}.factory.uf2",
-    chip = env.get("BOARD_MCU")
+        f"{progname}.zip",
-    flash_size = env.BoardConfig().get("upload.flash_size")
+        lfsbin
-    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)
 
-    print("    Offset | File")
+def manifest_write(files, env):
-    for section in sections:
+    manifest = {
-        sect_adr, sect_file = section.split(" ", 1)
+        "version": verObj["long"],
-        print(f" -  {sect_adr} | {sect_file}")
+        "build_epoch": build_epoch,
-        cmd += [sect_adr, sect_file]
+        "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(f" - {hex(app_offset)} | {firmware_name}")
+    # Write the manifest to the build directory
-    cmd += [hex(app_offset), firmware_name]
+    with open(env.subst("$BUILD_DIR/${PROGNAME}.mt.json"), "w") as f:
-
+        json.dump(manifest, f, indent=2)
-    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("Using meshtastic platformio-custom.py, firmware version " + verObj["long"] + " on " + env.get("PIOENV"))
+print(f"Using meshtastic platformio-custom.py, firmware version {verObj['long']} on {env.get('PIOENV')}")
 
 # get repository owner if git is installed
 try:
@@ -139,7 +118,7 @@ flags = [
         "-DBUILD_EPOCH=" + str(build_epoch),
     ] + pref_flags
 
-print ("Using flags:")
+print("Using flags:")
 for flag in flags:
     print(flag)
 
@@ -181,3 +160,19 @@ def load_boot_logo(source, target, env):
 # Load the boot logo on TFT builds
 if ("HAS_TFT", 1) in env.get("CPPDEFINES", []):
     env.AddPreAction('$BUILD_DIR/littlefs.bin', load_boot_logo)
+
+# Rename (mv) littlefs.bin to include the PROGNAME
+# This ensures the littlefs.bin is named consistently with the firmware
+env.AddPostAction('$BUILD_DIR/littlefs.bin', env.VerboseAction(
+    f'mv $BUILD_DIR/littlefs.bin $BUILD_DIR/{lfsbin}',
+    f'Renaming littlefs.bin to {lfsbin}'
+))
+
+env.AddCustomTarget(
+    name="mtjson",
+    dependencies=None,
+    actions=[manifest_gather],
+    title="Meshtastic Manifest",
+    description="Generating Meshtastic manifest JSON + Checksums",
+    always_build=True,
+)

bin/platformio-pre.py

@@ -0,0 +1,16 @@
+#!/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']}")
+
+# Print the new program name for verification
+print(f"PROGNAME: {env.get('PROGNAME')}")

bin/test-simulator.sh

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

debian/rules

@@ -28,5 +28,4 @@ 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,10 +1,9 @@
+#!/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

@@ -0,0 +1,80 @@
+#!/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")))
+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

@@ -0,0 +1,73 @@
+#!/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/nrf52_extra.py

@@ -0,0 +1,50 @@
+#!/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)

extra_scripts/stm32_extra.py

@@ -1,7 +1,9 @@
+#!/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",

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/program %{buildroot}%{_bindir}/meshtasticd
+install -m 0755 .pio/build/native-tft/meshtasticd %{buildroot}%{_bindir}/meshtasticd
 
 # Install portduino VFS dir
 install -p -d -m 0770 %{buildroot}%{_localstatedir}/lib/meshtasticd

platformio.ini

@@ -14,7 +14,9 @@ description = Meshtastic
 
 [env]
 test_build_src = true
-extra_scripts = bin/platformio-custom.py
+extra_scripts =
+	pre:bin/platformio-pre.py
+	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!
@@ -121,7 +123,7 @@ lib_deps =
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/3bf332240416c5cb8c919fac2a0ec7260eb3be75.zip
+	https://github.com/meshtastic/device-ui/archive/4fb5f24787caa841b58dbf623a52c4c5861d6722.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]
@@ -182,8 +184,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/BH1750_WE@^1.1.10
+	# renovate: datasource=custom.pio depName=BH1750_WE packageName=wollewald/library/BH1750_WE
-	wollewald/BH1750_WE@^1.1.10
+	wollewald/BH1750_WE@1.1.10
 
 ; (not included in native / portduino)
 [environmental_extra]
@@ -205,7 +207,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 OPT3001@1.1.2
+	closedcube/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/buzz/buzz.cpp

@@ -16,6 +16,7 @@ struct ToneDuration {
 };
 
 // Some common frequencies.
+#define NOTE_SILENT 1
 #define NOTE_C3 131
 #define NOTE_CS3 139
 #define NOTE_D3 147
@@ -29,11 +30,16 @@ 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;  // 1/4 note
+const int DURATION_3_4 = 750;  // 3/4 note
 const int DURATION_1_1 = 1000; // 1/1 note
 
 void playTones(const ToneDuration *tone_durations, int size)
@@ -71,13 +77,24 @@ 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/graphics/Screen.cpp

@@ -230,24 +230,9 @@ void Screen::showTextInput(const char *header, const char *initialText, uint32_t
 {
     LOG_INFO("showTextInput called with header='%s', durationMs=%d", header ? header : "NULL", durationMs);
 
-    if (NotificationRenderer::virtualKeyboard) {
+    // Start OnScreenKeyboardModule session (non-touch variant)
-        delete NotificationRenderer::virtualKeyboard;
+    OnScreenKeyboardModule::instance().start(header, initialText, durationMs, textCallback);
-        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);
@@ -1513,14 +1498,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
+            setFrames(FOCUS_PRESERVE);              // Refresh frame list without switching view (no-op during text_input)
 
             // Only wake/force display if the configuration allows it
             if (shouldWakeOnReceivedMessage()) {
                 setOn(true);    // Wake up the screen first
                 forceDisplay(); // Forces screen redraw
             }
-            // === Prepare banner content ===
+            // === Prepare banner/popup content ===
             const meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(packet->from);
             const meshtastic_Channel channel =
                 channels.getByIndex(packet->channel ? packet->channel : channels.getPrimaryIndex());
@@ -1544,38 +1529,84 @@ 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 (isAlert) {
+            // If on-screen keyboard is active, show a transient popup over keyboard instead of interrupting it
-                if (longName && longName[0]) {
+            if (NotificationRenderer::current_notification_type == notificationTypeEnum::text_input) {
-                    snprintf(banner, sizeof(banner), "Alert Received from\n%s", longName);
+                // Wake and force redraw so popup is visible immediately
-                } else {
+                if (shouldWakeOnReceivedMessage()) {
-                    strcpy(banner, "Alert Received");
+                    setOn(true);
+                    forceDisplay();
                 }
-                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
 
+                // Build popup: title = message source name, content = message text (sanitized)
+                // Title
+                char titleBuf[64] = {0};
+                if (longName && longName[0]) {
+                    // Sanitize sender name
+                    std::string t = sanitizeString(longName);
+                    strncpy(titleBuf, t.c_str(), sizeof(titleBuf) - 1);
                 } else {
-                    strcpy(banner, "New Message");
+                    strncpy(titleBuf, "Message", sizeof(titleBuf) - 1);
                 }
+
+                // 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
 #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
+            } 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);
+#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
+                }
             }
         }
     }
@@ -1658,6 +1689,12 @@ 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/draw/MenuHandler.cpp

@@ -13,6 +13,7 @@
 #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"
@@ -1040,12 +1041,13 @@ void menuHandler::switchToMUIMenu()
 
 void menuHandler::TFTColorPickerMenu(OLEDDisplay *display)
 {
-    static const char *optionsArray[] = {"Back", "Default", "Meshtastic Green", "Yellow", "Red", "Orange", "Purple", "Teal",
+    static const char *optionsArray[] = {
-                                         "Pink", "White"};
+        "Back",  "Default", "Meshtastic Green", "Yellow", "Red", "Orange", "Purple", "Blue", "Teal", "Cyan", "Ice", "Pink",
+        "White", "Gray"};
     BannerOverlayOptions bannerOptions;
     bannerOptions.message = "Select Screen Color";
     bannerOptions.optionsArrayPtr = optionsArray;
-    bannerOptions.optionsCount = 10;
+    bannerOptions.optionsCount = 14;
     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)
@@ -1081,20 +1083,40 @@ void menuHandler::TFTColorPickerMenu(OLEDDisplay *display)
             TFT_MESH_g = 153;
             TFT_MESH_b = 255;
         } else if (selected == 7) {
-            LOG_INFO("Setting color to Teal");
+            LOG_INFO("Setting color to Blue");
-            TFT_MESH_r = 64;
+            TFT_MESH_r = 0;
-            TFT_MESH_g = 224;
+            TFT_MESH_g = 0;
-            TFT_MESH_b = 208;
+            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) {
             LOG_INFO("Setting color to Pink");
             TFT_MESH_r = 255;
             TFT_MESH_g = 105;
             TFT_MESH_b = 180;
-        } else if (selected == 9) {
+        } else if (selected == 12) {
             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();

src/graphics/draw/NotificationRenderer.cpp

@@ -85,9 +85,13 @@ 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;
@@ -100,6 +104,13 @@ 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)
@@ -163,13 +174,15 @@ 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) {
+    if (inEvent.inputEvent == INPUT_BROKER_UP || inEvent.inputEvent == INPUT_BROKER_ALT_PRESS ||
+        inEvent.inputEvent == INPUT_BROKER_UP_LONG) {
         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) {
+    } else if (inEvent.inputEvent == INPUT_BROKER_DOWN || inEvent.inputEvent == INPUT_BROKER_USER_PRESS ||
+               inEvent.inputEvent == INPUT_BROKER_DOWN_LONG) {
         if (this_digit == 0) {
             currentNumber += 9 * (pow_of_10(numDigits - curSelected - 1));
         } else {
@@ -251,10 +264,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_ALT_PRESS || inEvent.inputEvent == INPUT_BROKER_UP_LONG) {
         curSelected--;
     } else if (inEvent.inputEvent == INPUT_BROKER_DOWN || inEvent.inputEvent == INPUT_BROKER_RIGHT ||
-               inEvent.inputEvent == INPUT_BROKER_USER_PRESS) {
+               inEvent.inputEvent == INPUT_BROKER_USER_PRESS || inEvent.inputEvent == INPUT_BROKER_DOWN_LONG) {
         curSelected++;
     } else if (inEvent.inputEvent == INPUT_BROKER_SELECT) {
         alertBannerCallback(selectedNodenum);
@@ -368,10 +381,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_ALT_PRESS || inEvent.inputEvent == INPUT_BROKER_UP_LONG) {
             curSelected--;
         } else if (inEvent.inputEvent == INPUT_BROKER_DOWN || inEvent.inputEvent == INPUT_BROKER_RIGHT ||
-                   inEvent.inputEvent == INPUT_BROKER_USER_PRESS) {
+                   inEvent.inputEvent == INPUT_BROKER_USER_PRESS || inEvent.inputEvent == INPUT_BROKER_DOWN_LONG) {
             curSelected++;
         } else if (inEvent.inputEvent == INPUT_BROKER_SELECT) {
             if (optionsEnumPtr != nullptr) {
@@ -769,40 +782,8 @@ void NotificationRenderer::drawTextInput(OLEDDisplay *display, OLEDDisplayUiStat
         }
 
         if (inEvent.inputEvent != INPUT_BROKER_NONE) {
-            if (inEvent.inputEvent == INPUT_BROKER_UP) {
+            bool handled = OnScreenKeyboardModule::processVirtualKeyboardInput(inEvent, virtualKeyboard);
-                // high frequency for move cursor left/right than up/down with encoders
+            if (!handled && inEvent.inputEvent == INPUT_BROKER_CANCEL) {
-                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;
@@ -821,12 +802,28 @@ 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");
@@ -839,5 +836,12 @@ 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,6 +4,7 @@
 #include "OLEDDisplayUi.h"
 #include "graphics/Screen.h"
 #include "graphics/VirtualKeyboard.h"
+#include "modules/OnScreenKeyboardModule.h"
 #include <functional>
 #include <string>
 #define MAX_LINES 5
@@ -31,6 +32,7 @@ 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/input/TrackballInterruptBase.cpp

@@ -88,6 +88,50 @@ 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
@@ -113,17 +157,22 @@ 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)) {
+    } else if (this->action == TB_ACTION_UP && !digitalRead(_pinUp) && !directionDetected) {
-        // LOG_DEBUG("Trackball event UP");
+        directionDetected = true;
+        directionStartTime = millis();
         e.inputEvent = this->_eventUp;
-    } else if (this->action == TB_ACTION_DOWN && !digitalRead(_pinDown)) {
+        // send event first,will automatically trigger every 50ms * 3 after 500ms
-        // LOG_DEBUG("Trackball event DOWN");
+    } else if (this->action == TB_ACTION_DOWN && !digitalRead(_pinDown) && !directionDetected) {
+        directionDetected = true;
+        directionStartTime = millis();
         e.inputEvent = this->_eventDown;
-    } else if (this->action == TB_ACTION_LEFT && !digitalRead(_pinLeft)) {
+    } else if (this->action == TB_ACTION_LEFT && !digitalRead(_pinLeft) && !directionDetected) {
-        // LOG_DEBUG("Trackball event LEFT");
+        directionDetected = true;
+        directionStartTime = millis();
         e.inputEvent = this->_eventLeft;
-    } else if (this->action == TB_ACTION_RIGHT && !digitalRead(_pinRight)) {
+    } else if (this->action == TB_ACTION_RIGHT && !digitalRead(_pinRight) && !directionDetected) {
-        // LOG_DEBUG("Trackball event RIGHT");
+        directionDetected = true;
+        directionStartTime = millis();
         e.inputEvent = this->_eventRight;
     }
 #endif

src/input/TrackballInterruptBase.h

@@ -49,10 +49,14 @@ 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 = 500; // ms - interval between repeated long press events
+    static const uint32_t LONG_PRESS_REPEAT_INTERVAL = 300; // ms - interval between repeated long press events
 
   private:
     input_broker_event _eventDown = INPUT_BROKER_NONE;

src/input/UpDownInterruptBase.h

@@ -3,6 +3,14 @@
 #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:
@@ -40,8 +48,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 = 300;
+    static const uint32_t LONG_PRESS_DURATION = UPDOWN_LONG_PRESS_DURATION;
-    static const uint32_t LONG_PRESS_REPEAT_INTERVAL = 300;
+    static const uint32_t LONG_PRESS_REPEAT_INTERVAL = UPDOWN_LONG_PRESS_REPEAT_INTERVAL;
 
   private:
     uint8_t _pinDown = 0;

src/main.cpp

@@ -439,6 +439,11 @@ 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));

src/mesh/Router.cpp

@@ -37,8 +37,8 @@
 
 static MemoryDynamic<meshtastic_MeshPacket> dynamicPool;
 Allocator<meshtastic_MeshPacket> &packetPool = dynamicPool;
-#elif defined(ARCH_STM32WL)
+#elif defined(ARCH_STM32WL) || defined(BOARD_HAS_PSRAM)
-// On STM32 there isn't enough heap left over for the rest of the firmware if we allocate this statically.
+// On STM32 and boards with PSRAM, 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/mesh/generated/meshtastic/mesh.pb.h

@@ -237,8 +237,8 @@ typedef enum _meshtastic_HardwareModel {
     meshtastic_HardwareModel_T_ETH_ELITE = 91,
     /* Heltec HRI-3621 industrial probe */
     meshtastic_HardwareModel_HELTEC_SENSOR_HUB = 92,
-    /* Reserved Fried Chicken ID for future use */
+    /* Muzi Works Muzi-Base device */
-    meshtastic_HardwareModel_RESERVED_FRIED_CHICKEN = 93,
+    meshtastic_HardwareModel_MUZI_BASE = 93,
     /* Heltec Magnetic Power Bank with Meshtastic compatible */
     meshtastic_HardwareModel_HELTEC_MESH_POCKET = 94,
     /* Seeed Solar Node */

src/modules/CannedMessageModule.cpp

@@ -1018,8 +1018,7 @@ 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");
-            delete graphics::NotificationRenderer::virtualKeyboard;
+            graphics::OnScreenKeyboardModule::instance().stop(false);
-            graphics::NotificationRenderer::virtualKeyboard = nullptr;
         }
 
         temporaryMessage = "";
@@ -1036,9 +1035,7 @@ int32_t CannedMessageModule::runOnce()
             // Clean up virtual keyboard after sending
             if (graphics::NotificationRenderer::virtualKeyboard) {
                 LOG_INFO("Cleaning up virtual keyboard after message send");
-                delete graphics::NotificationRenderer::virtualKeyboard;
+                graphics::OnScreenKeyboardModule::instance().stop(false);
-                graphics::NotificationRenderer::virtualKeyboard = nullptr;
-                graphics::NotificationRenderer::textInputCallback = nullptr;
                 graphics::NotificationRenderer::resetBanner();
             }
 
@@ -1096,9 +1093,7 @@ 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");
-            delete graphics::NotificationRenderer::virtualKeyboard;
+            graphics::OnScreenKeyboardModule::instance().stop(false);
-            graphics::NotificationRenderer::virtualKeyboard = nullptr;
-            graphics::NotificationRenderer::textInputCallback = nullptr;
             graphics::NotificationRenderer::resetBanner();
         }
 

src/modules/ExternalNotificationModule.cpp

@@ -168,7 +168,7 @@ int32_t ExternalNotificationModule::runOnce()
             delay = EXT_NOTIFICATION_FAST_THREAD_MS;
 #endif
 
-#ifdef T_WATCH_S3
+#if defined(T_WATCH_S3) || defined(T_LORA_PAGER)
             drv.go();
 #endif
         }
@@ -283,7 +283,7 @@ void ExternalNotificationModule::setExternalState(uint8_t index, bool on)
 #ifdef UNPHONE
     unphone.rgb(red, green, blue);
 #endif
-#ifdef T_WATCH_S3
+#if defined(T_WATCH_S3) || defined(T_LORA_PAGER)
     if (on) {
         drv.go();
     } else {
@@ -319,7 +319,7 @@ void ExternalNotificationModule::stopNow()
         externalTurnedOn[i] = 0;
     }
     setIntervalFromNow(0);
-#ifdef T_WATCH_S3
+#if defined(T_WATCH_S3) || defined(T_LORA_PAGER)
     drv.stop();
 #endif
 
@@ -541,6 +541,19 @@ 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/ExternalNotificationModule.h

@@ -5,7 +5,8 @@
 #include "configuration.h"
 #include "input/InputBroker.h"
 
-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !defined(CONFIG_IDF_TARGET_ESP32C6)
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !defined(CONFIG_IDF_TARGET_ESP32C6) &&                                 \
+    !defined(CONFIG_IDF_TARGET_ESP32H2)
 #include <NonBlockingRtttl.h>
 #else
 // Noop class for portduino.

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) {
-#ifndef T_LORA_PAGER
+#if defined(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;
         }
-#else
+#elif defined(INPUTDRIVER_ENCODER_TYPE) && (INPUTDRIVER_ENCODER_TYPE == 2)
         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();

src/modules/OnScreenKeyboardModule.cpp

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

@@ -0,0 +1,55 @@
+#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/SerialModule.cpp

@@ -71,7 +71,7 @@ SerialModule::SerialModule() : StreamAPI(&Serial), concurrency::OSThread("Serial
     api_type = TYPE_SERIAL;
 }
 static Print *serialPrint = &Serial;
-#elif defined(CONFIG_IDF_TARGET_ESP32C6) || defined(RAK3172) || defined(EBYTE_E77_MBL)
+#elif defined(CONFIG_IDF_TARGET_ESP32C6) || defined(RAK3172) || defined(EBYTE_E77_MBL) || defined(CONFIG_IDF_TARGET_ESP32H2)
 SerialModule::SerialModule() : StreamAPI(&Serial1), concurrency::OSThread("Serial")
 {
     api_type = TYPE_SERIAL;
@@ -175,7 +175,7 @@ int32_t SerialModule::runOnce()
                 // Give it a chance to flush out 💩
                 delay(10);
             }
-#if defined(CONFIG_IDF_TARGET_ESP32C6)
+#if defined(CONFIG_IDF_TARGET_ESP32C6) || defined(CONFIG_IDF_TARGET_ESP32H2)
             if (moduleConfig.serial.rxd && moduleConfig.serial.txd) {
                 Serial1.setRxBufferSize(RX_BUFFER);
                 Serial1.begin(baud, SERIAL_8N1, moduleConfig.serial.rxd, moduleConfig.serial.txd);
@@ -277,7 +277,7 @@ int32_t SerialModule::runOnce()
             }
 #endif
             else {
-#if defined(CONFIG_IDF_TARGET_ESP32C6)
+#if defined(CONFIG_IDF_TARGET_ESP32C6) || defined(CONFIG_IDF_TARGET_ESP32H2)
                 while (Serial1.available()) {
                     serialPayloadSize = Serial1.readBytes(serialBytes, meshtastic_Constants_DATA_PAYLOAD_LEN);
 #else
@@ -538,7 +538,7 @@ void SerialModule::processWXSerial()
 {
 #if !defined(TTGO_T_ECHO) && !defined(T_ECHO_LITE) && !defined(CANARYONE) && !defined(CONFIG_IDF_TARGET_ESP32C6) &&              \
     !defined(MESHLINK) && !defined(ELECROW_ThinkNode_M1) && !defined(ELECROW_ThinkNode_M3) && !defined(ELECROW_ThinkNode_M5) &&  \
-    !defined(ARCH_STM32WL) && !defined(MUZI_BASE)
+    !defined(ARCH_STM32WL) && !defined(MUZI_BASE) && !defined(CONFIG_IDF_TARGET_ESP32H2)
     static unsigned int lastAveraged = 0;
     static unsigned int averageIntervalMillis = 300000; // 5 minutes hard coded.
     static double dir_sum_sin = 0;

src/nimble/NimbleBluetooth.cpp

@@ -651,8 +651,8 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
     {
         LOG_INFO("BLE incoming connection %s", connInfo.getAddress().toString().c_str());
 
-#if defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32C6)
         const uint16_t connHandle = connInfo.getConnHandle();
+#if NIMBLE_ENABLE_2M_PHY && (defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32C6))
         int phyResult =
             ble_gap_set_prefered_le_phy(connHandle, BLE_GAP_LE_PHY_2M_MASK, BLE_GAP_LE_PHY_2M_MASK, BLE_GAP_LE_PHY_CODED_ANY);
         if (phyResult == 0) {
@@ -660,6 +660,7 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
         } else {
             LOG_WARN("Failed to prefer 2M PHY for conn %u, rc=%d", connHandle, phyResult);
         }
+#endif
 
         int dataLenResult = ble_gap_set_data_len(connHandle, kPreferredBleTxOctets, kPreferredBleTxTimeUs);
         if (dataLenResult == 0) {
@@ -670,9 +671,10 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
 
         LOG_INFO("BLE conn %u initial MTU %u (target %u)", connHandle, connInfo.getMTU(), kPreferredBleMtu);
         pServer->updateConnParams(connHandle, 6, 12, 0, 200);
-#endif
     }
+#endif
 
+#ifdef NIMBLE_TWO
     virtual void onDisconnect(NimBLEServer *pServer, NimBLEConnInfo &connInfo, int reason)
     {
         LOG_INFO("BLE disconnect reason: %d", reason);
@@ -818,7 +820,7 @@ void NimbleBluetooth::setup()
     NimBLEDevice::init(getDeviceName());
     NimBLEDevice::setPower(ESP_PWR_LVL_P9);
 
-#if defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32C6)
+#if NIMBLE_ENABLE_2M_PHY && (defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32C6))
     int mtuResult = NimBLEDevice::setMTU(kPreferredBleMtu);
     if (mtuResult == 0) {
         LOG_INFO("BLE MTU request set to %u", kPreferredBleMtu);

src/platform/esp32/main-esp32.cpp

@@ -169,6 +169,8 @@ void esp32Setup()
 // #define APP_WATCHDOG_SECS 45
 #define APP_WATCHDOG_SECS 90
 
+// esp_task_wdt_init returns an unknown error, so skip it on ESP32H2
+#ifndef CONFIG_IDF_TARGET_ESP32H2
 #ifdef CONFIG_IDF_TARGET_ESP32C6
     esp_task_wdt_config_t *wdt_config = (esp_task_wdt_config_t *)malloc(sizeof(esp_task_wdt_config_t));
     wdt_config->timeout_ms = APP_WATCHDOG_SECS * 1000;
@@ -181,7 +183,7 @@ void esp32Setup()
 #endif
     res = esp_task_wdt_add(NULL);
     assert(res == ESP_OK);
-
+#endif
 #if HAS_32768HZ
     enableSlowCLK();
 #endif
@@ -223,9 +225,10 @@ void cpuDeepSleep(uint32_t msecToWake)
         13,
 #endif
         34, 35, 37};
-
+#ifndef CONFIG_IDF_TARGET_ESP32H2
     for (int i = 0; i < sizeof(rtcGpios); i++)
         rtc_gpio_isolate((gpio_num_t)rtcGpios[i]);
+#endif
 #endif
 
         // FIXME, disable internal rtc pullups/pulldowns on the non isolated pins. for inputs that we aren't using
@@ -258,10 +261,10 @@ void cpuDeepSleep(uint32_t msecToWake)
 
 #endif // #end ESP32S3_WAKE_TYPE
 #endif
-
+#ifdef ESP_PD_DOMAIN_RTC_PERIPH
     // We want RTC peripherals to stay on
     esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
-
+#endif
     esp_sleep_enable_timer_wakeup(msecToWake * 1000ULL); // call expects usecs
     esp_deep_sleep_start();                              // TBD mA sleep current (battery)
 }

src/platform/nrf52/architecture.h

@@ -109,7 +109,7 @@
 #elif defined(HELTEC_MESH_SOLAR)
 #define HW_VENDOR meshtastic_HardwareModel_HELTEC_MESH_SOLAR
 #elif defined(MUZI_BASE)
-#define HW_VENDOR meshtastic_HardwareModel_RESERVED_FRIED_CHICKEN
+#define HW_VENDOR meshtastic_HardwareModel_MUZI_BASE
 #else
 #define HW_VENDOR meshtastic_HardwareModel_NRF52_UNKNOWN
 #endif

src/platform/nrf52/main-nrf52.cpp

@@ -335,6 +335,16 @@ void cpuDeepSleep(uint32_t msecToWake)
     if (Serial1) // A straightforward solution to the wake from deepsleep problem
         Serial1.end();
 #endif
+
+#ifdef TTGO_T_ECHO
+    // To power off the T-Echo, the display must be set 
+    // as an input pin; otherwise, there will be leakage current.
+    pinMode(PIN_EINK_CS, INPUT);
+    pinMode(PIN_EINK_DC, INPUT);
+    pinMode(PIN_EINK_RES, INPUT);
+    pinMode(PIN_EINK_BUSY, INPUT);
+#endif
+
     setBluetoothEnable(false);
 
 #ifdef RAK4630

src/sleep.cpp

@@ -388,10 +388,10 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t sleepMsec) // FIXME, use a more r
     uint64_t sleepUsec = sleepMsec * 1000LL;
 
     // NOTE! ESP docs say we must disable bluetooth and wifi before light sleep
-
+#ifdef ESP_PD_DOMAIN_RTC_PERIPH
     // We want RTC peripherals to stay on
     esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
-
+#endif
 #if defined(BUTTON_PIN) && defined(BUTTON_NEED_PULLUP)
     gpio_pullup_en((gpio_num_t)BUTTON_PIN);
 #endif
@@ -523,6 +523,8 @@ void enableModemSleep()
     esp32_config.max_freq_mhz = CONFIG_ESP32S2_DEFAULT_CPU_FREQ_MHZ;
 #elif CONFIG_IDF_TARGET_ESP32C6
     esp32_config.max_freq_mhz = CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ;
+#elif CONFIG_IDF_TARGET_ESP32H2
+    esp32_config.max_freq_mhz = CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ;
 #elif CONFIG_IDF_TARGET_ESP32C3
     esp32_config.max_freq_mhz = CONFIG_ESP32C3_DEFAULT_CPU_FREQ_MHZ;
 #else

variants/esp32/esp32.ini

@@ -2,10 +2,16 @@
 [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.11.0
 
+extra_scripts =
+  ${env.extra_scripts}
+  pre:extra_scripts/esp32_pre.py
+  extra_scripts/esp32_extra.py
+
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>
 

variants/esp32h2/esp32h2.ini

@@ -0,0 +1,47 @@
+[esp32h2_base]
+extends = esp32_base
+platform =
+  # Do not renovate until we have switched to pioarduino tagged builds
+  https://github.com/Jason2866/platform-espressif32/archive/39475a7213fa3a52b0c2048d1a31c215fc85fcf8.zip
+build_flags =
+  ${arduino_base.build_flags}
+  -Wall
+  -Wextra
+  -Isrc/platform/esp32
+  -std=c++11
+  -DESP_OPENSSL_SUPPRESS_LEGACY_WARNING
+  -DSERIAL_BUFFER_SIZE=4096
+  -DLIBPAX_ARDUINO
+  -DLIBPAX_WIFI
+  -DLIBPAX_BLE
+  -DMESHTASTIC_EXCLUDE_WEBSERVER
+  ;-DDEBUG_HEAP
+  ; TEMP
+  -DHAS_BLUETOOTH=0
+  -DMESHTASTIC_EXCLUDE_PAXCOUNTER
+  -DMESHTASTIC_EXCLUDE_BLUETOOTH
+
+lib_deps =
+  ${arduino_base.lib_deps}
+  ${networking_base.lib_deps}
+  ${environmental_base.lib_deps}
+  ${environmental_extra.lib_deps}
+  ${radiolib_base.lib_deps}
+  # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
+  lewisxhe/XPowersLib@0.3.1
+  # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
+  https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
+  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
+  rweather/Crypto@0.4.0
+
+build_src_filter = 
+ ${esp32_base.build_src_filter} -<mesh/http> 
+
+monitor_speed = 460800
+monitor_filters = esp32_h2_exception_decoder
+
+lib_ignore =
+  NonBlockingRTTTL
+  NimBLE-Arduino
+  libpax
+  

variants/esp32h2/waveshare-esp32-h2/platformio.ini

@@ -0,0 +1,11 @@
+[env:waveshare-esp32h2]
+extends = esp32h2_base
+board = esp32-h2-devkitm-1
+board_build.f_flash = 16000000L
+board_level = pr
+build_flags = 
+  ${esp32h2_base.build_flags}
+  -I variants/esp32h2/waveshare-esp32-h2
+  -DARDUINO_USB_CDC_ON_BOOT=1
+  -DARDUINO_USB_MODE=1
+  -DHAS_WIFI=0

variants/esp32h2/waveshare-esp32-h2/variant.h

@@ -0,0 +1,8 @@
+
+#define HAS_SCREEN 0
+#define HAS_WIFI 0
+
+#define LORA_SCK 4
+#define LORA_MISO 3
+#define LORA_MOSI 2
+#define LORA_CS 1

variants/esp32s3/tlora_t3s3_epaper/platformio.ini

@@ -13,7 +13,10 @@ build_flags =
   -DEINK_WIDTH=250
   -DEINK_HEIGHT=122
   -DUSE_EINK_DYNAMICDISPLAY            ; Enable Dynamic EInk
-  -DEINK_LIMIT_FASTREFRESH=10          ; How many consecutive fast-refreshes are permitted
+  -DEINK_LIMIT_FASTREFRESH=20          ; How many consecutive fast-refreshes are permitted    //20
+  -DEINK_LIMIT_RATE_BACKGROUND_SEC=30  ; Minimum interval between BACKGROUND updates          //30
+  -DEINK_LIMIT_RATE_RESPONSIVE_SEC=1   ; Minimum interval between RESPONSIVE updates
+  -DEINK_BACKGROUND_USES_FAST          ; (Optional) Use FAST refresh for both BACKGROUND and RESPONSIVE, until a limit is reached.
 
 lib_deps =
   ${esp32s3_base.lib_deps}

variants/native/portduino/platformio.ini

@@ -114,5 +114,5 @@ extends = env:native
 build_flags = -lgcov --coverage -fprofile-abs-path -fsanitize=address ${env:native.build_flags}
 ; https://docs.platformio.org/en/latest/projectconf/sections/env/options/test/test_testing_command.html
 test_testing_command =
-  ${platformio.build_dir}/${this.__env__}/program
+  ${platformio.build_dir}/${this.__env__}/meshtasticd
   -s

variants/nrf52840/ELECROW-ThinkNode-M1/variant.h

@@ -62,17 +62,11 @@ extern "C" {
 /*
  * Buttons
  */
-#define PIN_BUTTON2 (32 + 10)
+#define PIN_BUTTON1 (32 + 10)
+#define PIN_BUTTON2 (32 + 7)
 #define ALT_BUTTON_PIN PIN_BUTTON2
 #define ALT_BUTTON_ACTIVE_LOW true
 #define ALT_BUTTON_ACTIVE_PULLUP true
-#define PIN_BUTTON1 (32 + 7)
-
-// #define PIN_BUTTON1 (0 + 11)
-// #define PIN_BUTTON1 (32 + 7)
-
-// #define BUTTON_CLICK_MS 400
-// #define BUTTON_TOUCH_MS 200
 
 /*
  * Analog pins

variants/nrf52840/meshtiny/variant.h

@@ -64,6 +64,7 @@ extern "C" {
 #define INPUTDRIVER_ENCODER_UP 26
 #define INPUTDRIVER_ENCODER_DOWN 4
 #define INPUTDRIVER_ENCODER_BTN 28
+#define UPDOWN_LONG_PRESS_REPEAT_INTERVAL 150
 
 #define CANNED_MESSAGE_MODULE_ENABLE 1
 

variants/nrf52840/nrf52.ini

@@ -11,6 +11,10 @@ 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_flags =
   -include variants/nrf52840/cpp_overrides/lfs_util.h

variants/nrf52840/t-echo/variant.h

@@ -181,9 +181,9 @@ External serial flash WP25R1635FZUIL0
 
 #define PIN_GPS_STANDBY (32 + 2) // An output to wake GPS, low means allow sleep, high means force wake
 // Seems to be missing on this new board
-// #define PIN_GPS_PPS (32 + 4)  // Pulse per second input from the GPS
+#define PIN_GPS_PPS (32 + 4) // Pulse per second input from the GPS
-#define GPS_TX_PIN (32 + 8) // This is for bits going TOWARDS the CPU
+#define GPS_TX_PIN (32 + 8)  // This is for bits going TOWARDS the CPU
-#define GPS_RX_PIN (32 + 9) // This is for bits going TOWARDS the GPS
+#define GPS_RX_PIN (32 + 9)  // This is for bits going TOWARDS the GPS
 
 #define GPS_THREAD_INTERVAL 50
 
@@ -203,8 +203,6 @@ External serial flash WP25R1635FZUIL0
 #define PIN_SPI_MOSI (0 + 22)
 #define PIN_SPI_SCK (0 + 19)
 
-#define PIN_PWR_EN (0 + 6)
-
 // To debug via the segger JLINK console rather than the CDC-ACM serial device
 // #define USE_SEGGER
 

variants/nrf52840/wio-sdk-wm1110/platformio.ini

@@ -4,11 +4,22 @@ extends = nrf52840_base
 board = wio-sdk-wm1110
 
 extra_scripts =
-  ${env.extra_scripts}
+  ${nrf52840_base.extra_scripts}
   extra_scripts/disable_adafruit_usb.py
 
 # Remove adafruit USB serial from the build (it is incompatible with using the ch340 serial chip on this board)
-build_unflags = ${nrf52840_base:build_unflags} -DUSBCON -DUSE_TINYUSB
+build_unflags =
+  -Ofast
+  -Og
+  -ggdb3
+  -ggdb2
+  -g3
+  -g2
+  -g
+  -g1
+  -g0
+  -DUSBCON
+  -DUSE_TINYUSB
 build_flags = ${nrf52840_base.build_flags}
   -Ivariants/nrf52840/wio-sdk-wm1110
   -Isrc/platform/nrf52/softdevice

variants/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}
-  post:extra_scripts/extra_stm32.py
+  extra_scripts/stm32_extra.py
 
 build_type = release