clean up merge

Merge branch 'develop' into refactor-nodedb
Create new screen colors for BaseUI (#8921 )
2026-02-05 16:41:52 +00:00 · 2025-12-10 15:27:09 -06:00 · 2025-12-10 11:15:18 -06:00 · 2025-12-10 11:09:37 -06:00 · 2025-12-10 06:23:23 -06:00 · 2025-12-09 16:40:37 -06:00
72 changed files with 1562 additions and 790 deletions
--- a/.clusterfuzzlite/build.sh
+++ b/.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.
--- a/.github/actionlint.yaml
+++ b/.github/actionlint.yaml
@@ -2,4 +2,5 @@
 self-hosted-runner:
  # Labels of self-hosted runner in array of strings.
  labels:
+    - arctastic
    - test-runner
--- a/.github/actions/build-variant/action.yml
+++ b/.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 }}
--- a/.github/workflows/build_firmware.yml
+++ b/.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
--- a/.github/workflows/build_one_target.yml
+++ b/.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-update.sh
+          chmod +x ./output/device-install.sh || true
+          chmod +x ./output/device-update.sh || true

      - name: Zip firmware
        run: zip -j -9 -r ./firmware-${{inputs.target}}-${{ needs.version.outputs.long }}.zip ./output
--- a/.github/workflows/main_matrix.yml
+++ b/.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-update.sh
+          chmod +x ./output/device-install.sh || true
+          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-update.sh
+          chmod +x ./output/device-install.sh || true
+          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:
--- a/.github/workflows/merge_queue.yml
+++ b/.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-update.sh
+          chmod +x ./output/device-install.sh || true
+          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-update.sh
+          chmod +x ./output/device-install.sh || true
+          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

--- a/.github/workflows/pr_enforce_labels.yml
+++ b/.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(', ')}.`);
--- a/.github/workflows/pr_tests.yml
+++ b/.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
--- a/.github/workflows/stale_bot.yml
+++ b/.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.
--- a/.github/workflows/test_native.yml
+++ b/.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
--- a/.github/workflows/tests.yml
+++ b/.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'

--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -9,9 +9,9 @@ plugins:
 lint:
  enabled:
    - checkov@3.2.495
-    - renovate@42.27.1
-    - prettier@3.7.3
-    - trufflehog@3.91.1
+    - renovate@42.30.4
+    - prettier@3.7.4
+    - trufflehog@3.91.2
    - yamllint@1.37.1
    - bandit@1.9.2
    - trivy@0.67.2
--- a/alpine.Dockerfile
+++ b/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" \
--- a/bin/build-esp32.sh
+++ b/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 $SRCBIN $OUTDIR/$basename.bin
+cp $BUILDDIR/$basename.factory.bin $OUTDIR/$basename.factory.bin

 echo "Copying ESP32 update bin file"
-SRCBIN=.pio/build/$1/firmware.bin
-cp $SRCBIN $OUTDIR/$basename-update.bin
+cp $BUILDDIR/$basename.bin $OUTDIR/$basename.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
-cp .pio/build/$1/littlefs.bin $OUTDIR/littlefs-$1-$VERSION.bin
-cp bin/device-install.* $OUTDIR
-cp bin/device-update.* $OUTDIR
+pio run --environment $1 -t buildfs --disable-auto-clean
+cp $BUILDDIR/littlefs-$1-$VERSION.bin $OUTDIR/littlefs-$1-$VERSION.bin
+cp bin/device-install.* $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
--- a/bin/build-native.sh
+++ b/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/
--- a/bin/build-nrf52.sh
+++ b/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"
-DFUPKG=.pio/build/$1/firmware.zip
-cp $DFUPKG $OUTDIR/$basename-ota.zip
+cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf

-echo "Generating NRF52 uf2 file"
-SRCHEX=.pio/build/$1/firmware.hex
+echo "Copying NRF52 dfu (OTA) file"
+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"
-	bin/mergehex -m bin/s140_nrf52_7.3.0_softdevice.hex $SRCHEX -o .pio/build/$1/$basename.hex
-	SRCHEX=.pio/build/$1/$basename.hex
-	bin/uf2conv.py $SRCHEX -c -o $OUTDIR/$basename.uf2 -f 0xADA52840
-	cp $SRCHEX $OUTDIR
-	cp bin/*.uf2 $OUTDIR
-else
-	bin/uf2conv.py $SRCHEX -c -o $OUTDIR/$basename.uf2 -f 0xADA52840
-	cp bin/device-install.* $OUTDIR
-	cp bin/device-update.* $OUTDIR
-	cp bin/*.uf2 $OUTDIR
+	echo "Copying .merged.hex file"
+	SRCHEX=$BUILDDIR/$basename.merged.hex
+	cp $SRCHEX $OUTDIR/
 fi

 if (echo $1 | grep -q "rak4631"); then
-	echo "Copying hex file"
-	cp .pio/build/$1/firmware.hex $OUTDIR/$basename.hex
-fi
+	echo "Copying .hex file"
+	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
--- a/bin/build-rp2xx0.sh
+++ b/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 $SRCBIN $OUTDIR/$basename.uf2
+cp $BUILDDIR/$basename.uf2 $OUTDIR/$basename.uf2

-cp bin/device-install.* $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
--- a/bin/build-stm32wl.sh
+++ b/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 $SRCBIN $OUTDIR/$basename.bin
+cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf
+
+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
--- a/bin/device-install.bat
+++ b/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 FIXME: Determine mcu from PlatformIO variant, this is unmaintainable.
-SET "S3=s3 v3 t-deck wireless-paper wireless-tracker station-g2 unphone t-eth-elite tlora-pager mesh-tab dreamcatcher ESP32-S3-Pico seeed-sensecap-indicator heltec_capsule_sensor_v3 vision-master icarus tracksenger elecrow-adv heltec-v4"
-SET "C3=esp32c3"
-@REM FIXME: Determine flash size from PlatformIO variant, this is unmaintainable.
-SET "BIGDB_8MB=crowpanel-esp32s3 heltec_capsule_sensor_v3 heltec-v3 heltec-vision-master-e213 heltec-vision-master-e290 heltec-vision-master-t190 heltec-wireless-paper heltec-wireless-tracker heltec-wsl-v3 icarus seeed-xiao-s3 tbeam-s3-core tracksenger"
-SET "MUIDB_8MB=picomputer-s3 unphone seeed-sensecap-indicator"
-SET "BIGDB_16MB=t-deck mesh-tab t-energy-s3 dreamcatcher ESP32-S3-Pico m5stack-cores3 station-g2 t-eth-elite tlora-pager t-watch-s3 elecrow-adv heltec-v4"
+@REM Default offsets.
+@REM https://github.com/meshtastic/web-flasher/blob/main/stores/firmwareStore.ts#L202
+SET "OTA_OFFSET=0x260000"
+SET "SPIFFS_OFFSET=0x300000"

 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-unphone-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.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!__" (
-        CALL :LOG_MESSAGE ERROR "Filename must be a firmware-* file."
+    IF NOT "__!FILENAME:.factory.bin=!__"=="__!FILENAME!__" (
+        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 "We are working with a *update* file. !FILENAME!"
-    CALL :LOG_MESSAGE INFO "Use script device-update.bat to flash update !FILENAME!."
-    GOTO eof
+CALL :LOG_MESSAGE DEBUG "Checking for metadata..."
+@REM Derive metadata filename from firmware filename.
+SET "METAFILE=!FILENAME:.factory.bin=!.mt.json"
+IF EXIST !METAFILE! (
+    @REM Print parsed json with powershell
+    CALL :LOG_MESSAGE INFO "Firmware metadata: !METAFILE!"
+    powershell -NoProfile -Command "(Get-Content '!METAFILE!' | ConvertFrom-Json | Out-String).Trim()"
+
+    @REM Save metadata values to variables for later use.
+    FOR /f "usebackq" %%A IN (`powershell -NoProfile -Command ^
+        "(Get-Content '!METAFILE!' | ConvertFrom-Json).mcu"`) DO SET "MCU=%%A"
+    FOR /f "usebackq" %%A IN (`powershell -NoProfile -Command ^
+        "(Get-Content '!METAFILE!' | ConvertFrom-Json).part | Where-Object { $_.subtype -eq 'ota_1' } | Select-Object -ExpandProperty offset"`
+    ) DO SET "OTA_OFFSET=%%A"
+    FOR /f "usebackq" %%A IN (`powershell -NoProfile -Command ^
+        "(Get-Content '!METAFILE!' | ConvertFrom-Json).part | Where-Object { $_.subtype -eq 'spiffs' } | Select-Object -ExpandProperty offset"`
+    ) DO SET "SPIFFS_OFFSET=%%A"
 ) ELSE (
-    CALL :LOG_MESSAGE 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 https://github.com/meshtastic/web-flasher/blob/main/types/resources.ts#L3
-IF NOT "!FILENAME:-tft-=!"=="!FILENAME!" (
-    CALL :LOG_MESSAGE DEBUG "We are working with a *-tft-* file. !FILENAME!"
-    SET "TFT_BUILD=1"
+@REM Extract PROGNAME from %FILENAME% for later use.
+SET "PROGNAME=!FILENAME:.factory.bin=!"
+CALL :LOG_MESSAGE DEBUG "Computed PROGNAME: !PROGNAME!"
+
+IF "__!MCU!__" == "__esp32s3__" (
+    @REM We are working with ESP32-S3
+    SET "OTA_FILENAME=bleota-s3.bin"
+) ELSE IF "__!MCU!__" == "__esp32c3__" (
+    @REM We are working with ESP32-C3
+    SET "OTA_FILENAME=bleota-c3.bin"
 ) 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!"

--- a/bin/device-install.sh
+++ b/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
-
-# Variant groups
-BIGDB_8MB=(
-    "crowpanel-esp32s3"
-    "heltec_capsule_sensor_v3"
-    "heltec-v3"
-    "heltec-vision-master-e213"
-    "heltec-vision-master-e290"
-    "heltec-vision-master-t190"
-    "heltec-wireless-paper"
-    "heltec-wireless-tracker"
-    "heltec-wsl-v3"
-    "icarus"
-    "seeed-xiao-s3"
-    "tbeam-s3-core"
-    "tracksenger"
-)
-MUIDB_8MB=(
-    "picomputer-s3"
-    "unphone"
-    "seeed-sensecap-indicator"
-)
-BIGDB_16MB=(
-    "dreamcatcher"
-    "elecrow-adv"
-    "ESP32-S3-Pico"
-    "heltec-v4"
-    "m5stack-cores3"
-    "mesh-tab"
-    "station-g2"
-    "t-deck"
-    "t-energy-s3"
-    "t-eth-elite"
-    "t-watch-s3"
-    "tlora-pager"
-)
-S3_VARIANTS=(
-    "s3"
-    "-v3"
-    "-v4"
-    "t-deck"
-    "wireless-paper"
-    "wireless-tracker"
-    "station-g2"
-    "unphone"
-    "t-eth-elite"
-    "tlora-pager"
-    "mesh-tab"
-    "dreamcatcher"
-    "ESP32-S3-Pico"
-    "seeed-sensecap-indicator"
-    "heltec_capsule_sensor_v3"
-    "vision-master"
-    "icarus"
-    "tracksenger"
-    "elecrow-adv"
-)
+# Default littlefs* offset.
+OFFSET=0x300000
+# Default OTA Offset
+OTA_OFFSET=0x260000

 # 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
-  echo "Filename must be a firmware-* file."
+if [[ $(basename "$FILENAME") != firmware-*.factory.bin ]]; then
+  echo "Filename must be a firmware-*.factory.bin file."
  exit 1
 fi

-# Check if FILENAME contains "-tft-" and set target partitionScheme accordingly.
-if [[ "${FILENAME//-tft-/}" != "$FILENAME" ]]; then
-    TFT_BUILD=true
-fi
+# Extract PROGNAME from %FILENAME% for later use.
+PROGNAME="${FILENAME/.factory.bin/}"
+# Derive metadata filename from %PROGNAME%.
+METAFILE="${PROGNAME}.mt.json"

-# Extract BASENAME from %FILENAME% for later use.
-BASENAME="${FILENAME/firmware-/}"
-
-if [ -f "${FILENAME}" ] && [ -n "${FILENAME##*"update"*}" ]; then
-    # Default littlefs* offset.
-    OFFSET=0x300000
-
-    # Default OTA Offset
-    OTA_OFFSET=0x260000
-
-    # littlefs* offset for BigDB 8mb and OTA OFFSET.
-    for variant in "${BIGDB_8MB[@]}"; do
-        if [ -z "${FILENAME##*"$variant"*}" ]; then
-            OFFSET=0x670000
-            OTA_OFFSET=0x340000
-        fi
-    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
+if [[ -f "$FILENAME" && "$FILENAME" == *.factory.bin ]]; then
+    # Display metadata if it exists
+    if [[ -f "$METAFILE" ]]; then
+        echo "Firmware metadata: ${METAFILE}"
+        jq . "$METAFILE"
+        # Extract relevant fields from metadata
+        if [[ $(jq -r '.part' "$METAFILE") != "null" ]]; then
+            OTA_OFFSET=$(jq -r '.part[] | select(.subtype == "ota_1") | .offset' "$METAFILE")
+            SPIFFS_OFFSET=$(jq -r '.part[] | select(.subtype == "spiffs") | .offset' "$METAFILE")
        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."
--- a/bin/device-update.bat
+++ b/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!" (
-    CALL :LOG_MESSAGE DEBUG "We are NOT working with a *update* file. !FILENAME!"
+IF NOT "__!FILENAME:.factory.bin=!__"=="__!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
--- a/bin/device-update.sh
+++ b/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
--- a/bin/exception_decoder.py
+++ b/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":
--- a/bin/native-gdbserver.sh
+++ b/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 "$@"
--- a/bin/native-run.sh
+++ b/bin/native-run.sh
@@ -2,4 +2,4 @@

 set -e
 pio run --environment native
-.pio/build/native/program "$@"
+.pio/build/native/meshtasticd "$@"
--- a/bin/platformio-custom.py
+++ b/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 esp32_create_combined_bin(source, target, env):
-    # this sub is borrowed from ESPEasy build toolchain. It's licensed under GPL V3
-    # https://github.com/letscontrolit/ESPEasy/blob/mega/tools/pio/post_esp32.py
-    print("Generating combined binary for serial flashing")
-
-    app_offset = 0x10000
-
-    new_file_name = env.subst("$BUILD_DIR/${PROGNAME}.factory.bin")
-    sections = env.subst(env.get("FLASH_EXTRA_IMAGES"))
-    firmware_name = env.subst("$BUILD_DIR/${PROGNAME}.bin")
-    chip = env.get("BOARD_MCU")
-    flash_size = env.BoardConfig().get("upload.flash_size")
-    flash_freq = env.BoardConfig().get("build.f_flash", "40m")
-    flash_freq = flash_freq.replace("000000L", "m")
-    flash_mode = env.BoardConfig().get("build.flash_mode", "dio")
-    memory_type = env.BoardConfig().get("build.arduino.memory_type", "qio_qspi")
-    if flash_mode == "qio" or flash_mode == "qout":
-        flash_mode = "dio"
-    if memory_type == "opi_opi" or memory_type == "opi_qspi":
-        flash_mode = "dout"
-    cmd = [
-        "--chip",
-        chip,
-        "merge_bin",
-        "-o",
-        new_file_name,
-        "--flash_mode",
-        flash_mode,
-        "--flash_freq",
-        flash_freq,
-        "--flash_size",
-        flash_size,
+def manifest_gather(source, target, env):
+    out = []
+    check_paths = [
+        progname,
+        f"{progname}.elf",
+        f"{progname}.bin",
+        f"{progname}.factory.bin",
+        f"{progname}.hex",
+        f"{progname}.merged.hex",
+        f"{progname}.uf2",
+        f"{progname}.factory.uf2",
+        f"{progname}.zip",
+        lfsbin
    ]
+    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")
-    for section in sections:
-        sect_adr, sect_file = section.split(" ", 1)
-        print(f" -  {sect_adr} | {sect_file}")
-        cmd += [sect_adr, sect_file]
+def manifest_write(files, env):
+    manifest = {
+        "version": verObj["long"],
+        "build_epoch": build_epoch,
+        "board": env.get("PIOENV"),
+        "mcu": env.get("BOARD_MCU"),
+        "repo": repo_owner,
+        "files": files,
+        "part": None,
+        "has_mui": False,
+        "has_inkhud": False,
+    }
+    # Get partition table (generated in esp32_pre.py) if it exists
+    if env.get("custom_mtjson_part"):
+        # custom_mtjson_part is a JSON string, convert it back to a dict
+        pj = json.loads(env.get("custom_mtjson_part"))
+        manifest["part"] = pj
+    # Enable has_mui for TFT builds
+    if ("HAS_TFT", 1) in env.get("CPPDEFINES", []):
+        manifest["has_mui"] = True
+    if "MESHTASTIC_INCLUDE_INKHUD" in env.get("CPPDEFINES", []):
+        manifest["has_inkhud"] = True

-    print(f" - {hex(app_offset)} | {firmware_name}")
-    cmd += [hex(app_offset), firmware_name]
-
-    print("Using esptool.py arguments: %s" % " ".join(cmd))
-
-    esptool.main(cmd)
-
-
-if platform.name == "espressif32":
-    sys.path.append(join(platform.get_package_dir("tool-esptoolpy")))
-    import esptool
-
-    env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin)
-
-    esp32_kind = env.GetProjectOption("custom_esp32_kind")
-    if esp32_kind == "esp32":
-        # Free up some IRAM by removing auxiliary SPI flash chip drivers.
-        # Wrapped stub symbols are defined in src/platform/esp32/iram-quirk.c.
-        env.Append(
-            LINKFLAGS=[
-                "-Wl,--wrap=esp_flash_chip_gd",
-                "-Wl,--wrap=esp_flash_chip_issi",
-                "-Wl,--wrap=esp_flash_chip_winbond",
-            ]
-        )
-    else:
-        # For newer ESP32 targets, using newlib nano works better.
-        env.Append(LINKFLAGS=["--specs=nano.specs", "-u", "_printf_float"])
-
-if platform.name == "nordicnrf52":
-    env.AddPostAction("$BUILD_DIR/${PROGNAME}.hex",
-                      env.VerboseAction(f"\"{sys.executable}\" ./bin/uf2conv.py \"$BUILD_DIR/firmware.hex\" -c -f 0xADA52840 -o \"$BUILD_DIR/firmware.uf2\"",
-                                        "Generating UF2 file"))
+    # Write the manifest to the build directory
+    with open(env.subst("$BUILD_DIR/${PROGNAME}.mt.json"), "w") as f:
+        json.dump(manifest, f, indent=2)

 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,10 +118,10 @@ flags = [
        "-DBUILD_EPOCH=" + str(build_epoch),
    ] + pref_flags

-print ("Using flags:")
+print("Using flags:")
 for flag in flags:
    print(flag)
-    
+
 projenv.Append(
    CCFLAGS=flags,
 )
@@ -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,
+)
--- a/bin/platformio-pre.py
+++ b/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')}")
--- a/bin/test-simulator.sh
+++ b/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..."
--- a/debian/rules
+++ b/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
--- a/extra_scripts/disable_adafruit_usb.py
+++ b/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"))
--- a/extra_scripts/esp32_extra.py
+++ b/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"])
--- a/extra_scripts/esp32_pre.py
+++ b/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)
--- a/extra_scripts/nrf52_extra.py
+++ b/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)
--- a/extra_scripts/stm32_extra.py
+++ b/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",
--- a/meshtasticd.spec.rpkg
+++ b/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
--- a/platformio.ini
+++ b/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
-	wollewald/BH1750_WE@^1.1.10
+	# renovate: datasource=custom.pio depName=BH1750_WE packageName=wollewald/library/BH1750_WE
+	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
--- a/2
+++ b/2
--- a/src/FSCommon.cpp
+++ b/src/FSCommon.cpp
@@ -10,7 +10,10 @@
 */
 #include "FSCommon.h"
 #include "SPILock.h"
+#include "SafeFile.h"
 #include "configuration.h"
+#include <pb_decode.h>
+#include <pb_encode.h>

 // Software SPI is used by MUI so disable SD card here until it's also implemented
 #if defined(HAS_SDCARD) && !defined(SDCARD_USE_SOFT_SPI)
@@ -335,4 +338,63 @@ void setupSDCard()
    LOG_DEBUG("Total space: %lu MB", (uint32_t)(SD.totalBytes() / (1024 * 1024)));
    LOG_DEBUG("Used space: %lu MB", (uint32_t)(SD.usedBytes() / (1024 * 1024)));
 #endif
+}
+
+/** Load a protobuf from a file, return LoadFileResult */
+LoadFileResult loadProto(const char *filename, size_t protoSize, size_t objSize, const pb_msgdesc_t *fields, void *dest_struct)
+{
+    LoadFileResult state = LoadFileResult::OTHER_FAILURE;
+#ifdef FSCom
+    concurrency::LockGuard g(spiLock);
+
+    auto f = FSCom.open(filename, FILE_O_READ);
+
+    if (f) {
+        LOG_INFO("Load %s", filename);
+        pb_istream_t stream = {&readcb, &f, protoSize};
+        if (fields != &meshtastic_NodeDatabase_msg) // contains a vector object
+            memset(dest_struct, 0, objSize);
+        if (!pb_decode(&stream, fields, dest_struct)) {
+            LOG_ERROR("Error: can't decode protobuf %s", PB_GET_ERROR(&stream));
+            state = LoadFileResult::DECODE_FAILED;
+        } else {
+            LOG_INFO("Loaded %s successfully", filename);
+            state = LoadFileResult::LOAD_SUCCESS;
+        }
+        f.close();
+    } else {
+        LOG_ERROR("Could not open / read %s", filename);
+    }
+#else
+    LOG_ERROR("ERROR: Filesystem not implemented");
+    state = LoadFileResult::NO_FILESYSTEM;
+#endif
+    return state;
+}
+
+/** Save a protobuf from a file, return true for success */
+bool saveProto(const char *filename, size_t protoSize, const pb_msgdesc_t *fields, const void *dest_struct, bool fullAtomic)
+{
+    bool okay = false;
+#ifdef FSCom
+    auto f = SafeFile(filename, fullAtomic);
+
+    LOG_INFO("Save %s", filename);
+    pb_ostream_t stream = {&writecb, static_cast<Print *>(&f), protoSize};
+
+    if (!pb_encode(&stream, fields, dest_struct)) {
+        LOG_ERROR("Error: can't encode protobuf %s", PB_GET_ERROR(&stream));
+    } else {
+        okay = true;
+    }
+
+    bool writeSucceeded = f.close();
+
+    if (!okay || !writeSucceeded) {
+        LOG_ERROR("Can't write prefs!");
+    }
+#else
+    LOG_ERROR("ERROR: Filesystem not implemented");
+#endif
+    return okay;
 }
--- a/src/FSCommon.h
+++ b/src/FSCommon.h
@@ -3,6 +3,19 @@
 #include "configuration.h"
 #include <vector>

+enum LoadFileResult {
+    // Successfully opened the file
+    LOAD_SUCCESS = 1,
+    // File does not exist
+    NOT_FOUND = 2,
+    // Device does not have a filesystem
+    NO_FILESYSTEM = 3,
+    // File exists, but could not decode protobufs
+    DECODE_FAILED = 4,
+    // File exists, but open failed for some reason
+    OTHER_FAILURE = 5
+};
+
 // Cross platform filesystem API

 #if defined(ARCH_PORTDUINO)
@@ -55,4 +68,8 @@ bool renameFile(const char *pathFrom, const char *pathTo);
 std::vector<meshtastic_FileInfo> getFiles(const char *dirname, uint8_t levels);
 void listDir(const char *dirname, uint8_t levels, bool del = false);
 void rmDir(const char *dirname);
-void setupSDCard();
+void setupSDCard();
+LoadFileResult loadProto(const char *filename, size_t protoSize, size_t objSize, const pb_msgdesc_t *fields, void *dest_struct);
+
+bool saveProto(const char *filename, size_t protoSize, const pb_msgdesc_t *fields, const void *dest_struct,
+               bool fullAtomic = true);
--- a/src/buzz/buzz.cpp
+++ b/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));
 }

--- a/src/graphics/Screen.cpp
+++ b/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) {
-        delete NotificationRenderer::virtualKeyboard;
-        NotificationRenderer::virtualKeyboard = nullptr;
-    }
-
-    NotificationRenderer::textInputCallback = nullptr;
-
-    NotificationRenderer::virtualKeyboard = new VirtualKeyboard();
-    if (header) {
-        NotificationRenderer::virtualKeyboard->setHeader(header);
-    }
-    if (initialText) {
-        NotificationRenderer::virtualKeyboard->setInputText(initialText);
-    }
-
-    // Set up callback with safer cleanup mechanism
+    // Start OnScreenKeyboardModule session (non-touch variant)
+    OnScreenKeyboardModule::instance().start(header, initialText, durationMs, textCallback);
    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 (longName && longName[0]) {
-                    snprintf(banner, sizeof(banner), "Alert Received from\n%s", longName);
-                } else {
-                    strcpy(banner, "Alert Received");
+            // If on-screen keyboard is active, show a transient popup over keyboard instead of interrupting it
+            if (NotificationRenderer::current_notification_type == notificationTypeEnum::text_input) {
+                // Wake and force redraw so popup is visible immediately
+                if (shouldWakeOnReceivedMessage()) {
+                    setOn(true);
+                    forceDisplay();
                }
-                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();
--- a/src/graphics/draw/MenuHandler.cpp
+++ b/src/graphics/draw/MenuHandler.cpp
@@ -1,6 +1,7 @@
 #include "configuration.h"
 #if HAS_SCREEN
 #include "ClockRenderer.h"
+#include "FSCommon.h"
 #include "GPS.h"
 #include "MenuHandler.h"
 #include "MeshRadio.h"
@@ -13,6 +14,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 +1042,13 @@ void menuHandler::switchToMUIMenu()

 void menuHandler::TFTColorPickerMenu(OLEDDisplay *display)
 {
-    static const char *optionsArray[] = {"Back", "Default", "Meshtastic Green", "Yellow", "Red", "Orange", "Purple", "Teal",
-                                         "Pink", "White"};
+    static const char *optionsArray[] = {
+        "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 +1084,40 @@ void menuHandler::TFTColorPickerMenu(OLEDDisplay *display)
            TFT_MESH_g = 153;
            TFT_MESH_b = 255;
        } else if (selected == 7) {
-            LOG_INFO("Setting color to Teal");
-            TFT_MESH_r = 64;
-            TFT_MESH_g = 224;
-            TFT_MESH_b = 208;
+            LOG_INFO("Setting color to Blue");
+            TFT_MESH_r = 0;
+            TFT_MESH_g = 0;
+            TFT_MESH_b = 255;
        } else if (selected == 8) {
+            LOG_INFO("Setting color to Teal");
+            TFT_MESH_r = 16;
+            TFT_MESH_g = 102;
+            TFT_MESH_b = 102;
+        } else if (selected == 9) {
+            LOG_INFO("Setting color to Cyan");
+            TFT_MESH_r = 0;
+            TFT_MESH_g = 255;
+            TFT_MESH_b = 255;
+        } else if (selected == 10) {
+            LOG_INFO("Setting color to Ice");
+            TFT_MESH_r = 173;
+            TFT_MESH_g = 216;
+            TFT_MESH_b = 230;
+        } else if (selected == 11) {
            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();
@@ -1767,7 +1790,7 @@ void menuHandler::handleMenuSwitch(OLEDDisplay *display)

 void menuHandler::saveUIConfig()
 {
-    nodeDB->saveProto("/prefs/uiconfig.proto", meshtastic_DeviceUIConfig_size, &meshtastic_DeviceUIConfig_msg, &uiconfig);
+    saveProto("/prefs/uiconfig.proto", meshtastic_DeviceUIConfig_size, &meshtastic_DeviceUIConfig_msg, &uiconfig);
 }

 } // namespace graphics
--- a/src/graphics/draw/NotificationRenderer.cpp
+++ b/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) {
-                // high frequency for move cursor left/right than up/down with encoders
-                extern ::RotaryEncoderInterruptImpl1 *rotaryEncoderInterruptImpl1;
-                extern ::UpDownInterruptImpl1 *upDownInterruptImpl1;
-                if (::rotaryEncoderInterruptImpl1 || ::upDownInterruptImpl1) {
-                    virtualKeyboard->moveCursorLeft();
-                } else {
-                    virtualKeyboard->moveCursorUp();
-                }
-            } else if (inEvent.inputEvent == INPUT_BROKER_DOWN) {
-                extern ::RotaryEncoderInterruptImpl1 *rotaryEncoderInterruptImpl1;
-                extern ::UpDownInterruptImpl1 *upDownInterruptImpl1;
-                if (::rotaryEncoderInterruptImpl1 || ::upDownInterruptImpl1) {
-                    virtualKeyboard->moveCursorRight();
-                } else {
-                    virtualKeyboard->moveCursorDown();
-                }
-            } else if (inEvent.inputEvent == INPUT_BROKER_LEFT) {
-                virtualKeyboard->moveCursorLeft();
-            } else if (inEvent.inputEvent == INPUT_BROKER_RIGHT) {
-                virtualKeyboard->moveCursorRight();
-            } else if (inEvent.inputEvent == INPUT_BROKER_UP_LONG) {
-                virtualKeyboard->moveCursorUp();
-            } else if (inEvent.inputEvent == INPUT_BROKER_DOWN_LONG) {
-                virtualKeyboard->moveCursorDown();
-            } else if (inEvent.inputEvent == INPUT_BROKER_ALT_PRESS) {
-                virtualKeyboard->moveCursorLeft();
-            } else if (inEvent.inputEvent == INPUT_BROKER_USER_PRESS) {
-                virtualKeyboard->moveCursorRight();
-            } else if (inEvent.inputEvent == INPUT_BROKER_SELECT) {
-                virtualKeyboard->handlePress();
-            } else if (inEvent.inputEvent == INPUT_BROKER_SELECT_LONG) {
-                virtualKeyboard->handleLongPress();
-            } else if (inEvent.inputEvent == INPUT_BROKER_CANCEL) {
+            bool handled = OnScreenKeyboardModule::processVirtualKeyboardInput(inEvent, virtualKeyboard);
+            if (!handled && 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
--- a/src/graphics/draw/NotificationRenderer.h
+++ b/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);
--- a/src/graphics/niche/InkHUD/Applets/User/Heard/HeardApplet.cpp
+++ b/src/graphics/niche/InkHUD/Applets/User/Heard/HeardApplet.cpp
@@ -62,22 +62,12 @@ void InkHUD::HeardApplet::populateFromNodeDB()
 {
    // Fill a collection with pointers to each node in db
    std::vector<meshtastic_NodeInfoLite *> ordered;
-    for (auto mn = nodeDB->meshNodes->begin(); mn != nodeDB->meshNodes->end(); ++mn) {
-        // Only copy if valid, and not our own node
+    for (int i = 1; i < maxCards(); i++) {
+        auto mn = nodeDB->getMeshNodeByIndex(i);
        if (mn->num != 0 && mn->num != nodeDB->getNodeNum())
            ordered.push_back(&*mn);
    }

-    // Sort the collection by age
-    std::sort(ordered.begin(), ordered.end(), [](meshtastic_NodeInfoLite *top, meshtastic_NodeInfoLite *bottom) -> bool {
-        return (top->last_heard > bottom->last_heard);
-    });
-
-    // Keep the most recent entries only
-    // Just enough to fill the screen
-    if (ordered.size() > maxCards())
-        ordered.resize(maxCards());
-
    // Create card info for these (stale) node observations
    meshtastic_NodeInfoLite *ourNode = nodeDB->getMeshNode(nodeDB->getNodeNum());
    for (meshtastic_NodeInfoLite *node : ordered) {
--- a/src/graphics/niche/Utils/CannedMessageStore.cpp
+++ b/src/graphics/niche/Utils/CannedMessageStore.cpp
@@ -53,9 +53,9 @@ void CannedMessageStore::load()

    // Attempt to load the bulk canned message data from flash
    meshtastic_CannedMessageModuleConfig cannedMessageModuleConfig;
-    LoadFileResult result = nodeDB->loadProto("/prefs/cannedConf.proto", meshtastic_CannedMessageModuleConfig_size,
-                                              sizeof(meshtastic_CannedMessageModuleConfig),
-                                              &meshtastic_CannedMessageModuleConfig_msg, &cannedMessageModuleConfig);
+    LoadFileResult result = loadProto("/prefs/cannedConf.proto", meshtastic_CannedMessageModuleConfig_size,
+                                      sizeof(meshtastic_CannedMessageModuleConfig), &meshtastic_CannedMessageModuleConfig_msg,
+                                      &cannedMessageModuleConfig);

    // Abort if nothing to load
    if (result != LoadFileResult::LOAD_SUCCESS || strlen(cannedMessageModuleConfig.messages) == 0)
@@ -129,8 +129,8 @@ void CannedMessageStore::handleSet(const meshtastic_AdminMessage *request)
 #endif

    // Write to flash
-    nodeDB->saveProto(cannedMessagesConfigFile, meshtastic_CannedMessageModuleConfig_size,
-                      &meshtastic_CannedMessageModuleConfig_msg, &cannedMessageModuleConfig);
+    saveProto(cannedMessagesConfigFile, meshtastic_CannedMessageModuleConfig_size, &meshtastic_CannedMessageModuleConfig_msg,
+              &cannedMessageModuleConfig);

    // Reload from flash, to update the canned messages in RAM
    // (This is a lazy way to handle it)
--- a/src/input/TrackballInterruptBase.cpp
+++ b/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)) {
-        // LOG_DEBUG("Trackball event UP");
+    } else if (this->action == TB_ACTION_UP && !digitalRead(_pinUp) && !directionDetected) {
+        directionDetected = true;
+        directionStartTime = millis();
        e.inputEvent = this->_eventUp;
-    } else if (this->action == TB_ACTION_DOWN && !digitalRead(_pinDown)) {
-        // LOG_DEBUG("Trackball event DOWN");
+        // send event first,will automatically trigger every 50ms * 3 after 500ms
+    } else if (this->action == TB_ACTION_DOWN && !digitalRead(_pinDown) && !directionDetected) {
+        directionDetected = true;
+        directionStartTime = millis();
        e.inputEvent = this->_eventDown;
-    } else if (this->action == TB_ACTION_LEFT && !digitalRead(_pinLeft)) {
-        // LOG_DEBUG("Trackball event LEFT");
+    } else if (this->action == TB_ACTION_LEFT && !digitalRead(_pinLeft) && !directionDetected) {
+        directionDetected = true;
+        directionStartTime = millis();
        e.inputEvent = this->_eventLeft;
-    } else if (this->action == TB_ACTION_RIGHT && !digitalRead(_pinRight)) {
-        // LOG_DEBUG("Trackball event RIGHT");
+    } else if (this->action == TB_ACTION_RIGHT && !digitalRead(_pinRight) && !directionDetected) {
+        directionDetected = true;
+        directionStartTime = millis();
        e.inputEvent = this->_eventRight;
    }
 #endif
--- a/src/input/TrackballInterruptBase.h
+++ b/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;
--- a/src/input/UpDownInterruptBase.h
+++ b/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_REPEAT_INTERVAL = 300;
+    static const uint32_t LONG_PRESS_DURATION = UPDOWN_LONG_PRESS_DURATION;
+    static const uint32_t LONG_PRESS_REPEAT_INTERVAL = UPDOWN_LONG_PRESS_REPEAT_INTERVAL;

  private:
    uint8_t _pinDown = 0;
--- a/src/main.cpp
+++ b/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));
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -15,7 +15,6 @@
 #include "RTC.h"
 #include "Router.h"
 #include "SPILock.h"
-#include "SafeFile.h"
 #include "TypeConversions.h"
 #include "error.h"
 #include "main.h"
@@ -314,7 +313,7 @@ NodeDB::NodeDB()
    LOG_DEBUG("Number of Device Reboots: %d", myNodeInfo.reboot_count);
 #endif

-    resetRadioConfig(); // If bogus settings got saved, then fix them
+    _resetRadioConfig(); // If bogus settings got saved, then fix them
    // nodeDB->LOG_DEBUG("region=%d, NODENUM=0x%x, dbsize=%d", config.lora.region, myNodeInfo.my_node_num, numMeshNodes);

    // Uncomment below to always enable UDP broadcasts
@@ -425,13 +424,13 @@ NodeDB::NodeDB()
        config.has_position = true;
        info->has_position = true;
        info->position = TypeConversions::ConvertToPositionLite(fixedGPS);
-        nodeDB->setLocalPosition(fixedGPS);
+        nodeDB->_setLocalPosition(fixedGPS);
        config.position.fixed_position = true;
 #endif
    }
 #endif
    sortMeshDB();
-    saveToDisk(saveWhat);
+    _saveToDisk(saveWhat);
 }

 /**
@@ -460,7 +459,7 @@ bool isBroadcast(uint32_t dest)
    return dest == NODENUM_BROADCAST || dest == NODENUM_BROADCAST_NO_LORA;
 }

-void NodeDB::resetRadioConfig(bool is_fresh_install)
+void NodeDB::_resetRadioConfig(bool is_fresh_install)
 {
    if (is_fresh_install) {
        radioGeneration++;
@@ -480,6 +479,7 @@ void NodeDB::resetRadioConfig(bool is_fresh_install)

 bool NodeDB::factoryReset(bool eraseBleBonds)
 {
+    FUNCTION_START("factoryReset");
    LOG_INFO("Perform factory reset!");
    // first, remove the "/prefs" (this removes most prefs)
    spiLock->lock();
@@ -498,7 +498,7 @@ bool NodeDB::factoryReset(bool eraseBleBonds)
    installDefaultModuleConfig();
    installDefaultChannels();
    // third, write everything to disk
-    saveToDisk();
+    _saveToDisk();
    if (eraseBleBonds) {
        LOG_INFO("Erase BLE bonds");
 #ifdef ARCH_ESP32
@@ -513,6 +513,7 @@ bool NodeDB::factoryReset(bool eraseBleBonds)
        Bluefruit.Central.clearBonds();
 #endif
    }
+    FUNCTION_END;
    return true;
 }

@@ -649,7 +650,7 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
        config.device.node_info_broadcast_secs = default_node_info_broadcast_secs;
    config.security.serial_enabled = true;
    config.security.admin_channel_enabled = false;
-    resetRadioConfig(true); // This also triggers NodeInfo/Position requests since we're fresh
+    _resetRadioConfig(true); // This also triggers NodeInfo/Position requests since we're fresh
    strncpy(config.network.ntp_server, "meshtastic.pool.ntp.org", 32);

 #if (defined(T_DECK) || defined(T_WATCH_S3) || defined(UNPHONE) || defined(PICOMPUTER_S3) || defined(SENSECAP_INDICATOR) ||      \
@@ -746,7 +747,7 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)

 #ifdef USERPREFS_CONFIG_DEVICE_ROLE
    // Apply role-specific defaults when role is set via user preferences
-    installRoleDefaults(config.device.role);
+    _installRoleDefaults(config.device.role);
 #endif

    initConfigIntervals();
@@ -904,7 +905,7 @@ void NodeDB::installDefaultModuleConfig()
    initModuleConfigIntervals();
 }

-void NodeDB::installRoleDefaults(meshtastic_Config_DeviceConfig_Role role)
+void NodeDB::_installRoleDefaults(meshtastic_Config_DeviceConfig_Role role)
 {
    if (role == meshtastic_Config_DeviceConfig_Role_ROUTER) {
        initConfigIntervals();
@@ -990,6 +991,7 @@ void NodeDB::installDefaultChannels()

 void NodeDB::resetNodes(bool keepFavorites)
 {
+    FUNCTION_START("resetNodes");
    if (!config.position.fixed_position)
        clearLocalPosition();
    numMeshNodes = 1;
@@ -1013,10 +1015,12 @@ void NodeDB::resetNodes(bool keepFavorites)
    saveDeviceStateToDisk();
    if (neighborInfoModule && moduleConfig.neighbor_info.enabled)
        neighborInfoModule->resetNeighbors();
+    FUNCTION_END;
 }

 void NodeDB::removeNodeByNum(NodeNum nodeNum)
 {
+    FUNCTION_START("removeNodeByNum");
    int newPos = 0, removed = 0;
    for (int i = 0; i < numMeshNodes; i++) {
        if (meshNodes->at(i).num != nodeNum)
@@ -1029,16 +1033,17 @@ void NodeDB::removeNodeByNum(NodeNum nodeNum)
              meshtastic_NodeInfoLite());
    LOG_DEBUG("NodeDB::removeNodeByNum purged %d entries. Save changes", removed);
    saveNodeDatabaseToDisk();
+    FUNCTION_END;
 }

-void NodeDB::clearLocalPosition()
+void NodeDB::_clearLocalPosition()
 {
-    meshtastic_NodeInfoLite *node = getMeshNode(nodeDB->getNodeNum());
+    meshtastic_NodeInfoLite *node = _getMeshNode(nodeDB->getNodeNum());
    node->position.latitude_i = 0;
    node->position.longitude_i = 0;
    node->position.altitude = 0;
    node->position.time = 0;
-    setLocalPosition(meshtastic_Position_init_default);
+    _setLocalPosition(meshtastic_Position_init_default);
 }

 void NodeDB::cleanupMeshDB()
@@ -1114,7 +1119,7 @@ void NodeDB::pickNewNodeNum()
    }

    meshtastic_NodeInfoLite *found;
-    while (((found = getMeshNode(nodeNum)) && memcmp(found->user.macaddr, ourMacAddr, sizeof(ourMacAddr)) != 0) ||
+    while (((found = _getMeshNode(nodeNum)) && memcmp(found->user.macaddr, ourMacAddr, sizeof(ourMacAddr)) != 0) ||
           (nodeNum == NODENUM_BROADCAST || nodeNum < NUM_RESERVED)) {
        NodeNum candidate = random(NUM_RESERVED, LONG_MAX); // try a new random choice
        if (found)
@@ -1128,39 +1133,6 @@ void NodeDB::pickNewNodeNum()
    myNodeInfo.my_node_num = nodeNum;
 }

-/** Load a protobuf from a file, return LoadFileResult */
-LoadFileResult NodeDB::loadProto(const char *filename, size_t protoSize, size_t objSize, const pb_msgdesc_t *fields,
-                                 void *dest_struct)
-{
-    LoadFileResult state = LoadFileResult::OTHER_FAILURE;
-#ifdef FSCom
-    concurrency::LockGuard g(spiLock);
-
-    auto f = FSCom.open(filename, FILE_O_READ);
-
-    if (f) {
-        LOG_INFO("Load %s", filename);
-        pb_istream_t stream = {&readcb, &f, protoSize};
-        if (fields != &meshtastic_NodeDatabase_msg) // contains a vector object
-            memset(dest_struct, 0, objSize);
-        if (!pb_decode(&stream, fields, dest_struct)) {
-            LOG_ERROR("Error: can't decode protobuf %s", PB_GET_ERROR(&stream));
-            state = LoadFileResult::DECODE_FAILED;
-        } else {
-            LOG_INFO("Loaded %s successfully", filename);
-            state = LoadFileResult::LOAD_SUCCESS;
-        }
-        f.close();
-    } else {
-        LOG_ERROR("Could not open / read %s", filename);
-    }
-#else
-    LOG_ERROR("ERROR: Filesystem not implemented");
-    state = LoadFileResult::NO_FILESYSTEM;
-#endif
-    return state;
-}
-
 void NodeDB::loadFromDisk()
 {
    // Mark the current device state as completely unusable, so that if we fail reading the entire file from
@@ -1260,7 +1232,7 @@ void NodeDB::loadFromDisk()
    if (backupSecurity.private_key.size > 0) {
        LOG_DEBUG("Restoring backup of security config");
        config.security = backupSecurity;
-        saveToDisk(SEGMENT_CONFIG);
+        _saveToDisk(SEGMENT_CONFIG);
    }

    // Make sure we load hard coded admin keys even when the configuration file has none.
@@ -1311,7 +1283,7 @@ void NodeDB::loadFromDisk()
    if (numAdminKeys > 0) {
        LOG_INFO("Saving %d hard coded admin keys.", numAdminKeys);
        config.security.admin_key_count = numAdminKeys;
-        saveToDisk(SEGMENT_CONFIG);
+        _saveToDisk(SEGMENT_CONFIG);
    }

    state = loadProto(moduleConfigFileName, meshtastic_LocalModuleConfig_size, sizeof(meshtastic_LocalModuleConfig),
@@ -1363,7 +1335,7 @@ void NodeDB::loadFromDisk()
        if (moduleConfig.paxcounter.paxcounter_update_interval == 900)
            moduleConfig.paxcounter.paxcounter_update_interval = 0;

-        saveToDisk(SEGMENT_MODULECONFIG);
+        _saveToDisk(SEGMENT_MODULECONFIG);
    }
 #if ARCH_PORTDUINO
    // set any config overrides
@@ -1374,34 +1346,6 @@ void NodeDB::loadFromDisk()
 #endif
 }

-/** Save a protobuf from a file, return true for success */
-bool NodeDB::saveProto(const char *filename, size_t protoSize, const pb_msgdesc_t *fields, const void *dest_struct,
-                       bool fullAtomic)
-{
-    bool okay = false;
-#ifdef FSCom
-    auto f = SafeFile(filename, fullAtomic);
-
-    LOG_INFO("Save %s", filename);
-    pb_ostream_t stream = {&writecb, static_cast<Print *>(&f), protoSize};
-
-    if (!pb_encode(&stream, fields, dest_struct)) {
-        LOG_ERROR("Error: can't encode protobuf %s", PB_GET_ERROR(&stream));
-    } else {
-        okay = true;
-    }
-
-    bool writeSucceeded = f.close();
-
-    if (!okay || !writeSucceeded) {
-        LOG_ERROR("Can't write prefs!");
-    }
-#else
-    LOG_ERROR("ERROR: Filesystem not implemented");
-#endif
-    return okay;
-}
-
 bool NodeDB::saveChannelsToDisk()
 {
 #ifdef FSCom
@@ -1490,7 +1434,7 @@ bool NodeDB::saveToDiskNoRetry(int saveWhat)
    return success;
 }

-bool NodeDB::saveToDisk(int saveWhat)
+bool NodeDB::_saveToDisk(int saveWhat)
 {
    LOG_DEBUG("Save to disk %d", saveWhat);
    bool success = saveToDiskNoRetry(saveWhat);
@@ -1514,10 +1458,12 @@ bool NodeDB::saveToDisk(int saveWhat)

 const meshtastic_NodeInfoLite *NodeDB::readNextMeshNode(uint32_t &readIndex)
 {
+    FUNCTION_START("readNextMeshNode");
+    meshtastic_NodeInfoLite *retVal = nullptr;
    if (readIndex < numMeshNodes)
-        return &meshNodes->at(readIndex++);
-    else
-        return NULL;
+        retVal = &meshNodes->at(readIndex++);
+    FUNCTION_END;
+    return retVal;
 }

 /// Given a node, return how many seconds in the past (vs now) that we last heard from it
@@ -1545,7 +1491,7 @@ uint32_t sinceReceived(const meshtastic_MeshPacket *p)

 #define NUM_ONLINE_SECS (60 * 60 * 2) // 2 hrs to consider someone offline

-size_t NodeDB::getNumOnlineMeshNodes(bool localOnly)
+size_t NodeDB::_getNumOnlineMeshNodes(bool localOnly)
 {
    size_t numseen = 0;

@@ -1567,8 +1513,10 @@ size_t NodeDB::getNumOnlineMeshNodes(bool localOnly)
 */
 void NodeDB::updatePosition(uint32_t nodeId, const meshtastic_Position &p, RxSource src)
 {
+    FUNCTION_START("updatePosition");
    meshtastic_NodeInfoLite *info = getOrCreateMeshNode(nodeId);
    if (!info) {
+        FUNCTION_END;
        return;
    }

@@ -1577,7 +1525,7 @@ void NodeDB::updatePosition(uint32_t nodeId, const meshtastic_Position &p, RxSou
        LOG_INFO("updatePosition LOCAL pos@%x time=%u lat=%d lon=%d alt=%d", p.timestamp, p.time, p.latitude_i, p.longitude_i,
                 p.altitude);

-        setLocalPosition(p);
+        _setLocalPosition(p);
        info->position = TypeConversions::ConvertToPositionLite(p);
    } else if ((p.time > 0) && !p.latitude_i && !p.longitude_i && !p.timestamp && !p.location_source) {
        // FIXME SPECIAL TIME SETTING PACKET FROM EUD TO RADIO
@@ -1604,7 +1552,8 @@ void NodeDB::updatePosition(uint32_t nodeId, const meshtastic_Position &p, RxSou
    }
    info->has_position = true;
    updateGUIforNode = info;
-    notifyObservers(true); // Force an update whether or not our node counts have changed
+    _notifyObservers(true); // Force an update whether or not our node counts have changed
+    FUNCTION_END;
 }

 /** Update telemetry info for this node based on received metrics
@@ -1612,9 +1561,11 @@ void NodeDB::updatePosition(uint32_t nodeId, const meshtastic_Position &p, RxSou
 */
 void NodeDB::updateTelemetry(uint32_t nodeId, const meshtastic_Telemetry &t, RxSource src)
 {
+    FUNCTION_START("updatePosition");
    meshtastic_NodeInfoLite *info = getOrCreateMeshNode(nodeId);
    // Environment metrics should never go to NodeDb but we'll safegaurd anyway
    if (!info || t.which_variant != meshtastic_Telemetry_device_metrics_tag) {
+        FUNCTION_END;
        return;
    }

@@ -1627,7 +1578,8 @@ void NodeDB::updateTelemetry(uint32_t nodeId, const meshtastic_Telemetry &t, RxS
    info->device_metrics = t.variant.device_metrics;
    info->has_device_metrics = true;
    updateGUIforNode = info;
-    notifyObservers(true); // Force an update whether or not our node counts have changed
+    _notifyObservers(true); // Force an update whether or not our node counts have changed
+    FUNCTION_END;
 }

 /**
@@ -1635,8 +1587,10 @@ void NodeDB::updateTelemetry(uint32_t nodeId, const meshtastic_Telemetry &t, RxS
 */
 void NodeDB::addFromContact(meshtastic_SharedContact contact)
 {
+    FUNCTION_START("addFromContact");
    meshtastic_NodeInfoLite *info = getOrCreateMeshNode(contact.node_num);
    if (!info || !contact.has_user) {
+        FUNCTION_END;
        return;
    }
    // If the local node has this node marked as manually verified
@@ -1645,6 +1599,7 @@ void NodeDB::addFromContact(meshtastic_SharedContact contact)
    if ((info->bitfield & NODEINFO_BITFIELD_IS_KEY_MANUALLY_VERIFIED_MASK) && !contact.manually_verified) {
        if (contact.user.public_key.size != info->user.public_key.size ||
            memcmp(contact.user.public_key.bytes, info->user.public_key.bytes, info->user.public_key.size) != 0) {
+            FUNCTION_END;
            return;
        }
    }
@@ -1688,22 +1643,26 @@ void NodeDB::addFromContact(meshtastic_SharedContact contact)
        // Mark the node's key as manually verified to indicate trustworthiness.
        updateGUIforNode = info;
        sortMeshDB();
-        notifyObservers(true); // Force an update whether or not our node counts have changed
+        _notifyObservers(true); // Force an update whether or not our node counts have changed
    }
    saveNodeDatabaseToDisk();
+    FUNCTION_END;
 }

 /** Update user info and channel for this node based on received user data
 */
 bool NodeDB::updateUser(uint32_t nodeId, meshtastic_User &p, uint8_t channelIndex)
 {
+    FUNCTION_START("updateUser");
+
    meshtastic_NodeInfoLite *info = getOrCreateMeshNode(nodeId);
    if (!info) {
+        FUNCTION_END;
        return false;
    }

 #if !(MESHTASTIC_EXCLUDE_PKI)
-    if (p.public_key.size == 32 && nodeId != nodeDB->getNodeNum()) {
+    if (p.public_key.size == 32 && nodeId != getNodeNum()) {
        printBytes("Incoming Pubkey: ", p.public_key.bytes, 32);

        // Alert the user if a remote node is advertising public key that matches our own
@@ -1720,6 +1679,7 @@ bool NodeDB::updateUser(uint32_t nodeId, meshtastic_User &p, uint8_t channelInde
                sprintf(cn->message, warning, p.long_name);
                service->sendClientNotification(cn);
            }
+            FUNCTION_END;
            return false;
        }
    }
@@ -1727,6 +1687,7 @@ bool NodeDB::updateUser(uint32_t nodeId, meshtastic_User &p, uint8_t channelInde
        // if the key doesn't match, don't update nodeDB at all.
        if (p.public_key.size != 32 || (memcmp(p.public_key.bytes, info->user.public_key.bytes, 32) != 0)) {
            LOG_WARN("Public Key mismatch, dropping NodeInfo");
+            FUNCTION_END;
            return false;
        }
        LOG_INFO("Public Key set for node, not updating!");
@@ -1754,19 +1715,19 @@ bool NodeDB::updateUser(uint32_t nodeId, meshtastic_User &p, uint8_t channelInde

    if (changed) {
        updateGUIforNode = info;
-        notifyObservers(true); // Force an update whether or not our node counts have changed
+        _notifyObservers(true); // Force an update whether or not our node counts have changed

        // We just changed something about a User,
        // store our DB unless we just did so less than a minute ago

        if (!Throttle::isWithinTimespanMs(lastNodeDbSave, ONE_MINUTE_MS)) {
-            saveToDisk(SEGMENT_NODEDATABASE);
+            _saveToDisk(SEGMENT_NODEDATABASE);
            lastNodeDbSave = millis();
        } else {
            LOG_DEBUG("Defer NodeDB saveToDisk for now");
        }
    }
-
+    FUNCTION_END;
    return changed;
 }

@@ -1774,107 +1735,121 @@ bool NodeDB::updateUser(uint32_t nodeId, meshtastic_User &p, uint8_t channelInde
 /// we updateGUI and updateGUIforNode if we think our this change is big enough for a redraw
 void NodeDB::updateFrom(const meshtastic_MeshPacket &mp)
 {
+    FUNCTION_START("updateFrom");
    if (mp.from == getNodeNum()) {
        LOG_DEBUG("Ignore update from self");
-        return;
-    }
-    if (mp.which_payload_variant == meshtastic_MeshPacket_decoded_tag && mp.from) {
+    } else if (mp.which_payload_variant == meshtastic_MeshPacket_decoded_tag && mp.from) {
        LOG_DEBUG("Update DB node 0x%x, rx_time=%u", mp.from, mp.rx_time);

        meshtastic_NodeInfoLite *info = getOrCreateMeshNode(getFrom(&mp));
-        if (!info) {
-            return;
+        if (info) {
+            if (mp.rx_time) // if the packet has a valid timestamp use it to update our last_heard
+                info->last_heard = mp.rx_time;
+
+            if (mp.rx_snr)
+                info->snr = mp.rx_snr; // keep the most recent SNR we received for this node.
+
+            info->via_mqtt = mp.via_mqtt; // Store if we received this packet via MQTT
+
+            // If hopStart was set and there wasn't someone messing with the limit in the middle, add hopsAway
+            if (mp.hop_start != 0 && mp.hop_limit <= mp.hop_start) {
+                info->has_hops_away = true;
+                info->hops_away = mp.hop_start - mp.hop_limit;
+            }
+            sortMeshDB();
        }
-
-        if (mp.rx_time) // if the packet has a valid timestamp use it to update our last_heard
-            info->last_heard = mp.rx_time;
-
-        if (mp.rx_snr)
-            info->snr = mp.rx_snr; // keep the most recent SNR we received for this node.
-
-        info->via_mqtt = mp.via_mqtt; // Store if we received this packet via MQTT
-
-        // If hopStart was set and there wasn't someone messing with the limit in the middle, add hopsAway
-        if (mp.hop_start != 0 && mp.hop_limit <= mp.hop_start) {
-            info->has_hops_away = true;
-            info->hops_away = mp.hop_start - mp.hop_limit;
-        }
-        sortMeshDB();
    }
+    FUNCTION_END;
 }

 void NodeDB::set_favorite(bool is_favorite, uint32_t nodeId)
 {
-    meshtastic_NodeInfoLite *lite = getMeshNode(nodeId);
+    FUNCTION_START("set_favorite");
+    meshtastic_NodeInfoLite *lite = _getMeshNode(nodeId);
    if (lite && lite->is_favorite != is_favorite) {
        lite->is_favorite = is_favorite;
        sortMeshDB();
        saveNodeDatabaseToDisk();
    }
+    FUNCTION_END;
 }

+// returns true if nodeId is_favorite; false if not or not found
 bool NodeDB::isFavorite(uint32_t nodeId)
 {
-    // returns true if nodeId is_favorite; false if not or not found
-
+    FUNCTION_START("set_favorite");
    // NODENUM_BROADCAST will never be in the DB
-    if (nodeId == NODENUM_BROADCAST)
+    if (nodeId == NODENUM_BROADCAST) {
+        FUNCTION_END;
        return false;
+    }

-    meshtastic_NodeInfoLite *lite = getMeshNode(nodeId);
+    meshtastic_NodeInfoLite *lite = _getMeshNode(nodeId);

    if (lite) {
+        FUNCTION_END;
        return lite->is_favorite;
    }
+    FUNCTION_END;
    return false;
 }

 bool NodeDB::isFromOrToFavoritedNode(const meshtastic_MeshPacket &p)
 {
+    FUNCTION_START("isFromOrToFavoritedNode");
    // This method is logically equivalent to:
    //   return isFavorite(p.from) || isFavorite(p.to);
    // but is more efficient by:
    //   1. doing only one pass through the database, instead of two
    //   2. exiting early when a favorite is found, or if both from and to have been seen

-    if (p.to == NODENUM_BROADCAST)
-        return isFavorite(p.from); // we never store NODENUM_BROADCAST in the DB, so we only need to check p.from
-
    meshtastic_NodeInfoLite *lite = NULL;

    bool seenFrom = false;
    bool seenTo = false;

+    if (p.to == NODENUM_BROADCAST)
+        seenTo = true;
+
    for (int i = 0; i < numMeshNodes; i++) {
        lite = &meshNodes->at(i);

-        if (lite->num == p.from) {
-            if (lite->is_favorite)
+        if (!seenFrom && lite->num == p.from) {
+            if (lite->is_favorite) {
+                FUNCTION_END;
                return true;
+            }

            seenFrom = true;
        }

-        if (lite->num == p.to) {
-            if (lite->is_favorite)
+        if (!seenTo && lite->num == p.to) {
+            if (lite->is_favorite) {
+                FUNCTION_END;
                return true;
+            }

            seenTo = true;
        }

-        if (seenFrom && seenTo)
+        if (seenFrom && seenTo) {
+            FUNCTION_END;
            return false; // we've seen both, and neither is a favorite, so we can stop searching early
+        }

        // Note: if we knew that sortMeshDB was always called after any change to is_favorite, we could exit early after searching
        // all favorited nodes first.
    }
-
+    FUNCTION_END;
    return false;
 }

 void NodeDB::pause_sort(bool paused)
 {
+    // Including the mutex macro for completeness, but it's possible it isn't appropriate here
+    FUNCTION_START("pause_sort");
    sortingIsPaused = paused;
+    FUNCTION_END;
 }

 void NodeDB::sortMeshDB()
@@ -1909,10 +1884,13 @@ void NodeDB::sortMeshDB()

 uint8_t NodeDB::getMeshNodeChannel(NodeNum n)
 {
-    const meshtastic_NodeInfoLite *info = getMeshNode(n);
+    FUNCTION_START("getMeshNodeChannel");
+    const meshtastic_NodeInfoLite *info = _getMeshNode(n);
    if (!info) {
+        FUNCTION_END;
        return 0; // defaults to PRIMARY
    }
+    FUNCTION_END;
    return info->channel;
 }

@@ -1925,7 +1903,7 @@ std::string NodeDB::getNodeId() const

 /// Find a node in our DB, return null for missing
 /// NOTE: This function might be called from an ISR
-meshtastic_NodeInfoLite *NodeDB::getMeshNode(NodeNum n)
+meshtastic_NodeInfoLite *NodeDB::_getMeshNode(NodeNum n)
 {
    for (int i = 0; i < numMeshNodes; i++)
        if (meshNodes->at(i).num == n)
@@ -1935,7 +1913,7 @@ meshtastic_NodeInfoLite *NodeDB::getMeshNode(NodeNum n)
 }

 // returns true if the maximum number of nodes is reached or we are running low on memory
-bool NodeDB::isFull()
+bool NodeDB::_isFull()
 {
    return (numMeshNodes >= MAX_NUM_NODES) || (memGet.getFreeHeap() < MINIMUM_SAFE_FREE_HEAP);
 }
@@ -1943,7 +1921,7 @@ bool NodeDB::isFull()
 /// Find a node in our DB, create an empty NodeInfo if missing
 meshtastic_NodeInfoLite *NodeDB::getOrCreateMeshNode(NodeNum n)
 {
-    meshtastic_NodeInfoLite *lite = getMeshNode(n);
+    meshtastic_NodeInfoLite *lite = _getMeshNode(n);

    if (!lite) {
        if (isFull()) {
@@ -1998,18 +1976,25 @@ meshtastic_NodeInfoLite *NodeDB::getOrCreateMeshNode(NodeNum n)
 /// valid lat/lon
 bool NodeDB::hasValidPosition(const meshtastic_NodeInfoLite *n)
 {
-    return n->has_position && (n->position.latitude_i != 0 || n->position.longitude_i != 0);
+    FUNCTION_START("hasValidPosition");
+    auto retVal = n->has_position && (n->position.latitude_i != 0 || n->position.longitude_i != 0);
+    FUNCTION_END;
+    return retVal;
 }

 /// If we have a node / user and they report is_licensed = true
 /// we consider them licensed
 UserLicenseStatus NodeDB::getLicenseStatus(uint32_t nodeNum)
 {
-    meshtastic_NodeInfoLite *info = getMeshNode(nodeNum);
+    FUNCTION_START("getLicenseStatus");
+    meshtastic_NodeInfoLite *info = _getMeshNode(nodeNum);
    if (!info || !info->has_user) {
+        FUNCTION_END;
        return UserLicenseStatus::NotKnown;
    }
-    return info->user.is_licensed ? UserLicenseStatus::Licensed : UserLicenseStatus::NotLicensed;
+    auto retVal = info->user.is_licensed ? UserLicenseStatus::Licensed : UserLicenseStatus::NotLicensed;
+    FUNCTION_END;
+    return retVal;
 }

 #if !defined(MESHTASTIC_EXCLUDE_PKI)
@@ -2031,6 +2016,7 @@ bool NodeDB::checkLowEntropyPublicKey(const meshtastic_Config_SecurityConfig_pub

 bool NodeDB::backupPreferences(meshtastic_AdminMessage_BackupLocation location)
 {
+    FUNCTION_START("backupPreferences");
    bool success = false;
    lastBackupAttempt = millis();
 #ifdef FSCom
@@ -2064,11 +2050,13 @@ bool NodeDB::backupPreferences(meshtastic_AdminMessage_BackupLocation location)
        // TODO: After more mainline SD card support
    }
 #endif
+    FUNCTION_END;
    return success;
 }

 bool NodeDB::restorePreferences(meshtastic_AdminMessage_BackupLocation location, int restoreWhat)
 {
+    FUNCTION_START("backupPreferences");
    bool success = false;
 #ifdef FSCom
    if (location == meshtastic_AdminMessage_BackupLocation_FLASH) {
@@ -2076,6 +2064,7 @@ bool NodeDB::restorePreferences(meshtastic_AdminMessage_BackupLocation location,
        if (!FSCom.exists(backupFileName)) {
            spiLock->unlock();
            LOG_WARN("Could not restore. No backup file found");
+            FUNCTION_END;
            return false;
        } else {
            spiLock->unlock();
@@ -2101,7 +2090,7 @@ bool NodeDB::restorePreferences(meshtastic_AdminMessage_BackupLocation location,
                LOG_DEBUG("Restored channels");
            }

-            success = saveToDisk(restoreWhat);
+            success = _saveToDisk(restoreWhat);
            if (success) {
                LOG_INFO("Restored preferences from backup");
            } else {
@@ -2113,6 +2102,7 @@ bool NodeDB::restorePreferences(meshtastic_AdminMessage_BackupLocation location,
    } else if (location == meshtastic_AdminMessage_BackupLocation_SD) {
        // TODO: After more mainline SD card support
    }
+    FUNCTION_END;
    return success;
 #endif
 }
--- a/src/mesh/NodeDB.h
+++ b/src/mesh/NodeDB.h
@@ -18,6 +18,13 @@
 #include "PortduinoGlue.h"
 #endif

+#define FUNCTION_START(FUNCTION_NAME)                                                                                            \
+    if (fakeMutex)                                                                                                               \
+        LOG_ERROR("Concurrency violation in " FUNCTION_NAME);                                                                    \
+    fakeMutex = true;
+
+#define FUNCTION_END fakeMutex = false;
+
 #if !defined(MESHTASTIC_EXCLUDE_PKI)
 // E3B0C442 is the blank hash
 static const uint8_t LOW_ENTROPY_HASHES[][32] = {
@@ -110,19 +117,6 @@ uint32_t sinceLastSeen(const meshtastic_NodeInfoLite *n);
 /// Given a packet, return how many seconds in the past (vs now) it was received
 uint32_t sinceReceived(const meshtastic_MeshPacket *p);

-enum LoadFileResult {
-    // Successfully opened the file
-    LOAD_SUCCESS = 1,
-    // File does not exist
-    NOT_FOUND = 2,
-    // Device does not have a filesystem
-    NO_FILESYSTEM = 3,
-    // File exists, but could not decode protobufs
-    DECODE_FAILED = 4,
-    // File exists, but open failed for some reason
-    OTHER_FAILURE = 5
-};
-
 enum UserLicenseStatus { NotKnown, NotLicensed, Licensed };

 class NodeDB
@@ -135,7 +129,6 @@ class NodeDB
    // Note: these two references just point into our static array we serialize to/from disk

  public:
-    std::vector<meshtastic_NodeInfoLite> *meshNodes;
    bool updateGUI = false; // we think the gui should definitely be redrawn, screen will clear this once handled
    meshtastic_NodeInfoLite *updateGUIforNode = NULL; // if currently showing this node, we think you should update the GUI
    Observable<const meshtastic::NodeStatus *> newStatus;
@@ -151,17 +144,26 @@ class NodeDB
    /// write to flash
    /// @return true if the save was successful
    bool saveToDisk(int saveWhat = SEGMENT_CONFIG | SEGMENT_MODULECONFIG | SEGMENT_DEVICESTATE | SEGMENT_CHANNELS |
-                                   SEGMENT_NODEDATABASE);
+                                   SEGMENT_NODEDATABASE)
+    {
+        FUNCTION_START("saveToDisk");
+        auto retVal = _saveToDisk(saveWhat);
+        FUNCTION_END;
+        return retVal;
+    }

    /** Reinit radio config if needed, because either:
     * a) sometimes a buggy android app might send us bogus settings or
     * b) the client set factory_reset
     *
-     * @param factory_reset if true, reset all settings to factory defaults
     * @param is_fresh_install set to true after a fresh install, to trigger NodeInfo/Position requests
-     * @return true if the config was completely reset, in that case, we should send it back to the client
     */
-    void resetRadioConfig(bool is_fresh_install = false);
+    void resetRadioConfig(bool is_fresh_install = false)
+    {
+        FUNCTION_START("resetRadioConfig");
+        _resetRadioConfig(is_fresh_install);
+        FUNCTION_END;
+    }

    /// given a subpacket sniffed from the network, update our DB state
    /// we updateGUI and updateGUIforNode if we think our this change is big enough for a redraw
@@ -208,7 +210,13 @@ class NodeDB
    std::string getNodeId() const;

    // @return last byte of a NodeNum, 0xFF if it ended at 0x00
-    uint8_t getLastByteOfNodeNum(NodeNum num) { return (uint8_t)((num & 0xFF) ? (num & 0xFF) : 0xFF); }
+    uint8_t getLastByteOfNodeNum(NodeNum num)
+    {
+        FUNCTION_START("getLastByteOfNodeNum");
+        auto retVal = (uint8_t)((num & 0xFF) ? (num & 0xFF) : 0xFF);
+        FUNCTION_END;
+        return retVal;
+    }

    /// if returns false, that means our node should send a DenyNodeNum response.  If true, we think the number is okay for use
    // bool handleWantNodeNum(NodeNum n);
@@ -227,79 +235,104 @@ class NodeDB
    /* Return the number of nodes we've heard from recently (within the last 2 hrs?)
     * @param localOnly if true, ignore nodes heard via MQTT
     */
-    size_t getNumOnlineMeshNodes(bool localOnly = false);
+    size_t getNumOnlineMeshNodes(bool localOnly = false)
+    {
+        FUNCTION_START("getNumOnlineMeshNodes");
+        auto retVal = _getNumOnlineMeshNodes(localOnly);
+        FUNCTION_END;
+        return retVal;
+    }

-    void initConfigIntervals(), initModuleConfigIntervals(), resetNodes(bool keepFavorites = false),
-        removeNodeByNum(NodeNum nodeNum);
+    void resetNodes(bool keepFavorites = false), removeNodeByNum(NodeNum nodeNum);

    bool factoryReset(bool eraseBleBonds = false);

-    LoadFileResult loadProto(const char *filename, size_t protoSize, size_t objSize, const pb_msgdesc_t *fields,
-                             void *dest_struct);
-    bool saveProto(const char *filename, size_t protoSize, const pb_msgdesc_t *fields, const void *dest_struct,
-                   bool fullAtomic = true);
-
-    void installRoleDefaults(meshtastic_Config_DeviceConfig_Role role);
+    void installRoleDefaults(meshtastic_Config_DeviceConfig_Role role)
+    {
+        FUNCTION_START("installRoleDefaults");
+        _installRoleDefaults(role);
+        FUNCTION_END;
+    }

    const meshtastic_NodeInfoLite *readNextMeshNode(uint32_t &readIndex);

    meshtastic_NodeInfoLite *getMeshNodeByIndex(size_t x)
    {
-        assert(x < numMeshNodes);
-        return &meshNodes->at(x);
+        FUNCTION_START("getMeshNodeByIndex");
+        meshtastic_NodeInfoLite *retValue = nullptr;
+        if (x < numMeshNodes)
+            retValue = &meshNodes->at(x);
+        FUNCTION_END;
+        return retValue;
    }

-    virtual meshtastic_NodeInfoLite *getMeshNode(NodeNum n);
-    size_t getNumMeshNodes() { return numMeshNodes; }
+    virtual meshtastic_NodeInfoLite *getMeshNode(NodeNum n)
+    {
+        FUNCTION_START("getMeshNode");
+        auto retVal = _getMeshNode(n);
+        FUNCTION_END;
+        return retVal;
+    }
+
+    size_t getNumMeshNodes()
+    {
+        FUNCTION_START("getNumMeshNodes");
+        auto retVal = numMeshNodes;
+        FUNCTION_END;
+        return retVal;
+    }

    UserLicenseStatus getLicenseStatus(uint32_t nodeNum);

-    size_t getMaxNodesAllocatedSize()
+    // returns true if the maximum number of nodes is reached or we are running low on memory
+    bool isFull()
    {
-        meshtastic_NodeDatabase emptyNodeDatabase;
-        emptyNodeDatabase.version = DEVICESTATE_CUR_VER;
-        size_t nodeDatabaseSize;
-        pb_get_encoded_size(&nodeDatabaseSize, meshtastic_NodeDatabase_fields, &emptyNodeDatabase);
-        return nodeDatabaseSize + (MAX_NUM_NODES * meshtastic_NodeInfoLite_size);
+        FUNCTION_START("isFull");
+        auto retVal = _isFull();
+        FUNCTION_END;
+        return retVal;
    }

-    // returns true if the maximum number of nodes is reached or we are running low on memory
-    bool isFull();
-
-    void clearLocalPosition();
+    void clearLocalPosition()
+    {
+        FUNCTION_START("clearLocalPosition");
+        _clearLocalPosition();
+        FUNCTION_END;
+    }

    void setLocalPosition(meshtastic_Position position, bool timeOnly = false)
    {
-        if (timeOnly) {
-            LOG_DEBUG("Set local position time only: time=%u timestamp=%u", position.time, position.timestamp);
-            localPosition.time = position.time;
-            localPosition.timestamp = position.timestamp > 0 ? position.timestamp : position.time;
-            return;
-        }
-        LOG_DEBUG("Set local position: lat=%i lon=%i time=%u timestamp=%u", position.latitude_i, position.longitude_i,
-                  position.time, position.timestamp);
-        localPosition = position;
+        FUNCTION_START("setLocalPosition");
+        _setLocalPosition(position, timeOnly);
+        FUNCTION_END;
    }

    bool hasValidPosition(const meshtastic_NodeInfoLite *n);

-#if !defined(MESHTASTIC_EXCLUDE_PKI)
-    bool checkLowEntropyPublicKey(const meshtastic_Config_SecurityConfig_public_key_t &keyToTest);
-#endif
-
    bool backupPreferences(meshtastic_AdminMessage_BackupLocation location);
    bool restorePreferences(meshtastic_AdminMessage_BackupLocation location,
                            int restoreWhat = SEGMENT_CONFIG | SEGMENT_MODULECONFIG | SEGMENT_DEVICESTATE | SEGMENT_CHANNELS);

-    /// Notify observers of changes to the DB
    void notifyObservers(bool forceUpdate = false)
    {
-        // Notify observers of the current node state
-        const meshtastic::NodeStatus status = meshtastic::NodeStatus(getNumOnlineMeshNodes(), getNumMeshNodes(), forceUpdate);
-        newStatus.notifyObservers(&status);
+        FUNCTION_START("notifyObservers");
+        _notifyObservers(forceUpdate);
+        FUNCTION_END;
    }

  private:
+    bool fakeMutex = false;
+
+    /// Notify observers of changes to the DB
+    void _notifyObservers(bool forceUpdate = false)
+    {
+        // Notify observers of the current node state
+        const meshtastic::NodeStatus status = meshtastic::NodeStatus(_getNumOnlineMeshNodes(), numMeshNodes, forceUpdate);
+        newStatus.notifyObservers(&status);
+    }
+
+    std::vector<meshtastic_NodeInfoLite> *meshNodes;
+
    bool duplicateWarned = false;
    uint32_t lastNodeDbSave = 0;    // when we last saved our db to flash
    uint32_t lastBackupAttempt = 0; // when we last tried a backup automatically or manually
@@ -333,6 +366,51 @@ class NodeDB
    bool saveDeviceStateToDisk();
    bool saveNodeDatabaseToDisk();
    void sortMeshDB();
+
+    void initConfigIntervals(), initModuleConfigIntervals();
+
+    size_t getMaxNodesAllocatedSize()
+    {
+        meshtastic_NodeDatabase emptyNodeDatabase;
+        emptyNodeDatabase.version = DEVICESTATE_CUR_VER;
+        size_t nodeDatabaseSize;
+        pb_get_encoded_size(&nodeDatabaseSize, meshtastic_NodeDatabase_fields, &emptyNodeDatabase);
+        return nodeDatabaseSize + (MAX_NUM_NODES * meshtastic_NodeInfoLite_size);
+    }
+
+    bool checkLowEntropyPublicKey(const meshtastic_Config_SecurityConfig_public_key_t &keyToTest);
+
+    // wrapped private functions:
+
+    bool _saveToDisk(int saveWhat = SEGMENT_CONFIG | SEGMENT_MODULECONFIG | SEGMENT_DEVICESTATE | SEGMENT_CHANNELS |
+                                    SEGMENT_NODEDATABASE);
+    void _resetRadioConfig(bool is_fresh_install = false);
+
+    /* Return the number of nodes we've heard from recently (within the last 2 hrs?)
+     * @param localOnly if true, ignore nodes heard via MQTT
+     */
+    size_t _getNumOnlineMeshNodes(bool localOnly = false);
+
+    void _installRoleDefaults(meshtastic_Config_DeviceConfig_Role role);
+
+    meshtastic_NodeInfoLite *_getMeshNode(NodeNum n);
+
+    bool _isFull();
+
+    void _clearLocalPosition();
+
+    void _setLocalPosition(meshtastic_Position position, bool timeOnly = false)
+    {
+        if (timeOnly) {
+            LOG_DEBUG("Set local position time only: time=%u timestamp=%u", position.time, position.timestamp);
+            localPosition.time = position.time;
+            localPosition.timestamp = position.timestamp > 0 ? position.timestamp : position.time;
+            return;
+        }
+        LOG_DEBUG("Set local position: lat=%i lon=%i time=%u timestamp=%u", position.latitude_i, position.longitude_i,
+                  position.time, position.timestamp);
+        localPosition = position;
+    }
 };

 extern NodeDB *nodeDB;
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -37,8 +37,8 @@

 static MemoryDynamic<meshtastic_MeshPacket> dynamicPool;
 Allocator<meshtastic_MeshPacket> &packetPool = dynamicPool;
-#elif defined(ARCH_STM32WL)
-// On STM32 there isn't enough heap left over for the rest of the firmware if we allocate this statically.
+#elif defined(ARCH_STM32WL) || defined(BOARD_HAS_PSRAM)
+// On STM32 and boards with PSRAM, there isn't enough heap left over for the rest of the firmware if we allocate this statically.
 // For now, make it dynamic again.
 #define MAX_PACKETS                                                                                                              \
    (MAX_RX_TOPHONE + MAX_RX_FROMRADIO + 2 * MAX_TX_QUEUE +                                                                      \
--- a/src/mesh/generated/meshtastic/mesh.pb.h
+++ b/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 */
-    meshtastic_HardwareModel_RESERVED_FRIED_CHICKEN = 93,
+    /* Muzi Works Muzi-Base device */
+    meshtastic_HardwareModel_MUZI_BASE = 93,
    /* Heltec Magnetic Power Bank with Meshtastic compatible */
    meshtastic_HardwareModel_HELTEC_MESH_POCKET = 94,
    /* Seeed Solar Node */
--- a/src/modules/AdminModule.cpp
+++ b/src/modules/AdminModule.cpp
@@ -1322,7 +1322,7 @@ void AdminModule::saveChanges(int saveWhat, bool shouldReboot)

 void AdminModule::handleStoreDeviceUIConfig(const meshtastic_DeviceUIConfig &uicfg)
 {
-    nodeDB->saveProto("/prefs/uiconfig.proto", meshtastic_DeviceUIConfig_size, &meshtastic_DeviceUIConfig_msg, &uicfg);
+    saveProto("/prefs/uiconfig.proto", meshtastic_DeviceUIConfig_size, &meshtastic_DeviceUIConfig_msg, &uicfg);
 }

 void AdminModule::handleSetHamMode(const meshtastic_HamParameters &p)
--- a/src/modules/CannedMessageModule.cpp
+++ b/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::NotificationRenderer::virtualKeyboard = nullptr;
+            graphics::OnScreenKeyboardModule::instance().stop(false);
        }

        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::NotificationRenderer::virtualKeyboard = nullptr;
-                graphics::NotificationRenderer::textInputCallback = nullptr;
+                graphics::OnScreenKeyboardModule::instance().stop(false);
                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::NotificationRenderer::virtualKeyboard = nullptr;
-            graphics::NotificationRenderer::textInputCallback = nullptr;
+            graphics::OnScreenKeyboardModule::instance().stop(false);
            graphics::NotificationRenderer::resetBanner();
        }

@@ -2278,9 +2273,9 @@ ProcessMessage CannedMessageModule::handleReceived(const meshtastic_MeshPacket &

 void CannedMessageModule::loadProtoForModule()
 {
-    if (nodeDB->loadProto(cannedMessagesConfigFile, meshtastic_CannedMessageModuleConfig_size,
-                          sizeof(meshtastic_CannedMessageModuleConfig), &meshtastic_CannedMessageModuleConfig_msg,
-                          &cannedMessageModuleConfig) != LoadFileResult::LOAD_SUCCESS) {
+    if (loadProto(cannedMessagesConfigFile, meshtastic_CannedMessageModuleConfig_size,
+                  sizeof(meshtastic_CannedMessageModuleConfig), &meshtastic_CannedMessageModuleConfig_msg,
+                  &cannedMessageModuleConfig) != LoadFileResult::LOAD_SUCCESS) {
        installDefaultCannedMessageModuleConfig();
    }
 }
@@ -2300,8 +2295,8 @@ bool CannedMessageModule::saveProtoForModule()
    spiLock->unlock();
 #endif

-    okay &= nodeDB->saveProto(cannedMessagesConfigFile, meshtastic_CannedMessageModuleConfig_size,
-                              &meshtastic_CannedMessageModuleConfig_msg, &cannedMessageModuleConfig);
+    okay &= saveProto(cannedMessagesConfigFile, meshtastic_CannedMessageModuleConfig_size,
+                      &meshtastic_CannedMessageModuleConfig_msg, &cannedMessageModuleConfig);

    return okay;
 }
--- a/src/modules/ExternalNotificationModule.cpp
+++ b/src/modules/ExternalNotificationModule.cpp
@@ -14,6 +14,7 @@
 * @date [Insert Date]
 */
 #include "ExternalNotificationModule.h"
+#include "FSCommon.h"
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "RTC.h"
@@ -168,7 +169,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 +284,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 +320,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

@@ -370,8 +371,8 @@ ExternalNotificationModule::ExternalNotificationModule()
        if (inputBroker) // put our callback in the inputObserver list
            inputObserver.observe(inputBroker);
 #endif
-        if (nodeDB->loadProto(rtttlConfigFile, meshtastic_RTTTLConfig_size, sizeof(meshtastic_RTTTLConfig),
-                              &meshtastic_RTTTLConfig_msg, &rtttlConfig) != LoadFileResult::LOAD_SUCCESS) {
+        if (loadProto(rtttlConfigFile, meshtastic_RTTTLConfig_size, sizeof(meshtastic_RTTTLConfig), &meshtastic_RTTTLConfig_msg,
+                      &rtttlConfig) != LoadFileResult::LOAD_SUCCESS) {
            memset(rtttlConfig.ringtone, 0, sizeof(rtttlConfig.ringtone));
            // The default ringtone is always loaded from userPrefs.jsonc
            strncpy(rtttlConfig.ringtone, USERPREFS_RINGTONE_RTTTL, sizeof(rtttlConfig.ringtone));
@@ -541,6 +542,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 {
@@ -627,7 +641,7 @@ void ExternalNotificationModule::handleSetRingtone(const char *from_msg)
    }

    if (changed) {
-        nodeDB->saveProto(rtttlConfigFile, meshtastic_RTTTLConfig_size, &meshtastic_RTTTLConfig_msg, &rtttlConfig);
+        saveProto(rtttlConfigFile, meshtastic_RTTTLConfig_size, &meshtastic_RTTTLConfig_msg, &rtttlConfig);
    }
 }

--- a/src/modules/Modules.cpp
+++ b/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
-        rotaryEncoderInterruptImpl1 = new RotaryEncoderInterruptImpl1();
-        if (!rotaryEncoderInterruptImpl1->init()) {
-            delete rotaryEncoderInterruptImpl1;
-            rotaryEncoderInterruptImpl1 = nullptr;
-        }
-#elif defined(T_LORA_PAGER)
+#if 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();
--- a/src/modules/OnScreenKeyboardModule.cpp
+++ b/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
--- a/src/modules/OnScreenKeyboardModule.h
+++ b/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
--- a/src/platform/nrf52/architecture.h
+++ b/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
--- a/src/platform/nrf52/main-nrf52.cpp
+++ b/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
--- a/variants/esp32/esp32.ini
+++ b/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>

--- a/variants/esp32s3/tlora_t3s3_epaper/platformio.ini
+++ b/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}
--- a/variants/native/portduino/platformio.ini
+++ b/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
--- a/variants/nrf52840/ELECROW-ThinkNode-M1/variant.h
+++ b/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
@@ -203,4 +197,4 @@ External serial flash WP25R1635FZUIL0
 }
 #endif

-#endif
+#endif
--- a/variants/nrf52840/meshtiny/variant.h
+++ b/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

--- a/variants/nrf52840/nrf52.ini
+++ b/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
--- a/variants/nrf52840/t-echo/variant.h
+++ b/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 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 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_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

--- a/variants/nrf52840/wio-sdk-wm1110/platformio.ini
+++ b/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
--- a/variants/stm32/stm32.ini
+++ b/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
Author	SHA1	Message	Date
Jonathan Bennett	90e2083d2c	clean up merge	2025-12-10 15:27:09 -06:00
Jonathan Bennett	af1d4e08ff	Merge branch 'develop' into refactor-nodedb	2025-12-10 11:15:18 -06:00
Jason P	2032ff1c32	Create new screen colors for BaseUI (#8921 ) * Create new colors for BaseUI * Update Ice color	2025-12-10 11:09:37 -06:00
Alex Samorukov	5910cc2e26	Use PSRAM to reduce heap usage percentage on ESP32 with PSRAM (#8891 ) * Use PSRAM for malloc > 256bytes to get more heap memory * Use dynamic allocator on boards with PSRAM to free more heap * Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Move heap_caps_malloc_extmem_enable() to the top of the init * Update src/main.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --------- Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-12-10 06:23:23 -06:00
Austin	aa72e397f2	PIO: Fix closedcube lib reference (#8920 ) Fixes ClosedCube reinstalling on every build	2025-12-09 16:40:37 -06:00
Austin	c55bea8460	ARCtastic (#8904 ) -- Do It Live! Actions Runner Controller Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>	2025-12-09 15:11:07 -06:00
Austin	aa605fc4a2	Actions: Fix release manifest formating (#8918 )	2025-12-09 14:27:13 -06:00
Igor Danilov	d75680a2dd	Fix #8915 [Bug]: Exception Decoder does not recognize the backtrace (#8917 )	2025-12-09 12:24:41 -06:00
Ben Meadors	decd58cd5c	Merge pull request #8913 from meshtastic/revert-8858-nrf52-power-saving-1 Revert "Cut NRF52 bluetooth power usage by 300% - testers needed!"	2025-12-09 08:02:29 -06:00
Ben Meadors	e691bd9732	Revert "Cut NRF52 bluetooth power usage by 300% - testers needed! (#8858 )" This reverts commit `ae8d3fbb3d`.	2025-12-09 08:02:04 -06:00
Ben Meadors	6bad81f8dd	Merge pull request #8911 from vidplace7/fix-chmod Fix apply device-install permissions	2025-12-09 06:50:19 -06:00
Austin Lane	69b9977fc1	Fix apply device-install permissions device-install.sh doesn't exist for non-esp32 targets	2025-12-09 07:48:30 -05:00
Ben Meadors	8e63dcf59a	Merge branch 'master' into develop	2025-12-09 05:59:15 -06:00
Lewis He	042543eb25	Fixed the issue where T-Echo did not completely shut down peripherals upon power-off. (#8524 ) Co-authored-by: Ben Meadors <benmmeadors@gmail.com>	2025-12-09 05:39:27 -06:00
phaseloop	ae8d3fbb3d	Cut NRF52 bluetooth power usage by 300% - testers needed! (#8858 ) * Improve NRF52 bluetooth power efficiency * test T114 bad LFXO * T1000 test * force BLE param negotiation --------- Co-authored-by: Ben Meadors <benmmeadors@gmail.com>	2025-12-08 19:59:14 -06:00
Austin	928739e0fb	Renovate: fix malformed comment for wollewald/BH1750_WE (#8767 )	2025-12-08 19:31:28 -06:00
Ben Meadors	8be7915fc7	Fix wm111111110	2025-12-08 19:19:10 -06:00
Ben Meadors	c052963395	Guard 2M PHY mode for NimBLE (#8890 ) * Guard 2M PHY mode for NimBLE * Update src/nimble/NimbleBluetooth.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Apply suggestion from @Copilot Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Another #endif snuck in there * Move endif --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-12-08 18:48:28 -06:00
Jonathan Bennett	65c418d4e1	Update protobuf name of FRIED_CHICKEN (#8903 )	2025-12-09 11:13:59 +11:00
Jonathan Bennett	c3a69a2742	Fix backwards buttons on Thinknode-M1 (#8901 )	2025-12-08 17:58:23 -06:00
Austin	66ff1536f3	Meshtastic build manifest (#8248 )	2025-12-08 17:21:23 -06:00
simon-muzi	5671e9d96f	Improved R1 Neo & muzi-base buzzer beeps for GPS on/off (#8870 ) Matched the resonant frequency of the hardware buzzer to maximize volume for the turn on beep. Further distinguished ON beep from OFF beep, making it easier for users to understand the state change.	2025-12-08 13:50:05 -06:00
Manuel	bd4bcb94f0	tryfix eink parameters (#8898 )	2025-12-08 13:14:24 -06:00
Igor Danilov	4b2f241478	Disable vibration if needed (#8895 )	2025-12-08 06:03:20 -06:00
Wilson	eb087849c0	OnScreenKeyboard Improvement with Joystick and UpDown Encoder (#8379 ) * Add mesh/Default.h include. * Reflacter OnScreenKeyBoard Module, do not interrupt keyboard when new message comes. * feat: Add long press scrolling for Joystick and upDown Encoder on baseUI frames and menus. * refactor: Clean up code formatting and improve readability in Screen and OnScreenKeyboardModule * Fix navigation on UpDownEncoder, default was RotaryEncoder while bringing the T_LORA_PAGER * Update src/graphics/draw/MenuHandler.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/modules/OnScreenKeyboardModule.h Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/graphics/draw/NotificationRenderer.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Optimize the detection logic for repeated events of the arrow keys. * Fixed parameter names in the OnScreenKeyboardModule::start * Trunk fix * Reflator OnScreenKeyboard Input checking, make it simple * Simplify long press logic in OnScreenKeyboardModule. --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-12-08 05:40:30 -06:00
Igor Danilov	94aedff6ae	Resolve #8887 (T-LoRaPager Vibration on New Message Delivery) (#8888 ) * Resolve #8887 * Update src/modules/ExternalNotificationModule.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * Update src/modules/ExternalNotificationModule.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> * use canBuzz method * trunk fmt --------- Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2025-12-07 20:29:18 -06:00
github-actions[bot]	eeaafda62a	Update protobufs (#8871 ) Co-authored-by: thebentern <9000580+thebentern@users.noreply.github.com>	2025-12-05 10:41:48 -06:00
renovate[bot]	6e9fd189b4	Update meshtastic/device-ui digest to 4fb5f24 (#8862 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-12-04 15:33:19 -06:00
renovate[bot]	3f40916223	Update alpine Docker tag to v3.23 (#8853 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-12-03 15:30:09 -06:00
github-actions[bot]	1b4925bd07	Upgrade trunk (#8849 ) Co-authored-by: vidplace7 <1779290+vidplace7@users.noreply.github.com>	2025-12-03 07:50:50 -06:00
renovate[bot]	0828c445fb	Update actions/stale action to v10.1.1 (#8848 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2025-12-03 05:39:31 -06:00
github-actions[bot]	90584359e4	Upgrade trunk (#8836 ) Co-authored-by: vidplace7 <1779290+vidplace7@users.noreply.github.com>	2025-12-02 05:48:36 -06:00
Jonathan Bennett	8a43741589	Add 'cleanup' to required PR labels (#8835 )	2025-12-02 05:48:19 -06:00
Jonathan Bennett	d772cd4431	Retain getMeshNode virtual marker for tests	2025-10-17 12:16:59 -05:00
Jonathan Bennett	b7b8071056	Merge branch 'develop' into refactor-nodedb	2025-10-17 12:15:36 -05:00
Jonathan Bennett	4a3d28f06b	Add FUNCTION_START and FUNCTION_END to public NodeDB functions	2025-10-17 00:36:58 -05:00
Jonathan Bennett	0f4210d2e8	Merge branch 'develop' into refactor-nodedb	2025-10-16 14:40:23 -05:00
Jonathan Bennett	dc6e109329	Finish adding NodeDB wrapper classes	2025-10-16 14:37:33 -05:00
Jonathan Bennett	10141b2562	InkHUD: don't try to access meshNodes directly	2025-10-16 12:08:00 -05:00
Jonathan Bennett	770085ddf7	Begin refactoring nodedb.cpp with public wrappers	2025-10-16 09:44:35 -05:00
Jonathan Bennett	833f950edc	Move loadProto and saveProto into FSCommon	2025-10-16 09:36:54 -05:00