Merge branch 'develop' into esp32-h2

2025-12-20 09:43:03 +00:00 · 2025-12-10 11:11:57 -06:00 · 2025-12-09 20:57:47 -06:00 · 2025-12-08 16:52:00 -06:00 · 2025-12-08 16:49:01 -06:00 · 2025-12-06 12:42:05 -06:00
72 changed files with 413 additions and 644 deletions
--- a/.github/actions/build-variant/action.yml
+++ b/.github/actions/build-variant/action.yml
@@ -76,7 +76,7 @@ runs:
        done

    - name: PlatformIO ${{ inputs.arch }} download cache
-      uses: actions/cache@v5
+      uses: actions/cache@v4
      with:
        path: ~/.platformio/.cache
        key: pio-cache-${{ inputs.arch }}-${{ hashFiles('.github/actions/**', '**.ini') }}
@@ -100,7 +100,7 @@ runs:
      id: version

    - name: Store binaries as an artifact
-      uses: actions/upload-artifact@v6
+      uses: actions/upload-artifact@v5
      with:
        name: firmware-${{ inputs.arch }}-${{ inputs.board }}-${{ steps.version.outputs.long }}
        overwrite: true
--- a/.github/workflows/build_debian_src.yml
+++ b/.github/workflows/build_debian_src.yml
@@ -64,7 +64,7 @@ jobs:
          PKG_VERSION: ${{ steps.version.outputs.deb }}

      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: firmware-debian-${{ steps.version.outputs.deb }}~${{ inputs.series }}-src
          overwrite: true
--- a/.github/workflows/build_firmware.yml
+++ b/.github/workflows/build_firmware.yml
@@ -68,7 +68,7 @@ jobs:
          echo '```' >> $GITHUB_STEP_SUMMARY

      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        id: upload
        with:
          name: firmware-${{ inputs.platform }}-${{ inputs.pio_env }}-${{ inputs.version }}
--- a/.github/workflows/build_one_target.yml
+++ b/.github/workflows/build_one_target.yml
@@ -98,7 +98,7 @@ jobs:
          ref: ${{github.event.pull_request.head.ref}}
          repository: ${{github.event.pull_request.head.repo.full_name}}

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          path: ./
          pattern: firmware-*-*
@@ -111,7 +111,7 @@ jobs:
        run: mv -b -t ./ ./bin/device-*.sh ./bin/device-*.bat

      - name: Repackage in single firmware zip
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: firmware-${{inputs.target}}-${{ needs.version.outputs.long }}
          overwrite: true
@@ -127,7 +127,7 @@ jobs:
            ./Meshtastic_nRF52_factory_erase*.uf2
          retention-days: 30

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          pattern: firmware-*-${{ needs.version.outputs.long }}
          merge-multiple: true
@@ -146,7 +146,7 @@ jobs:
        run: zip -j -9 -r ./firmware-${{inputs.target}}-${{ needs.version.outputs.long }}.zip ./output

      - name: Repackage in single elfs zip
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: debug-elfs-${{inputs.target}}-${{ needs.version.outputs.long }}.zip
          overwrite: true
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -77,21 +77,16 @@ jobs:
      fail-fast: false
      matrix:
        check: ${{ fromJson(needs.setup.outputs.check) }}
-    # Use 'arctastic' self-hosted runner pool when checking in the main repo
-    runs-on: ${{ github.repository_owner == 'meshtastic' && 'arctastic' || 'ubuntu-latest' }}
+
+    runs-on: ubuntu-latest
    if: ${{ github.event_name != 'workflow_dispatch' && github.repository == 'meshtastic/firmware' }}
    steps:
      - uses: actions/checkout@v6
-        with:
-          submodules: recursive
-          ref: ${{github.event.pull_request.head.ref}}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
+      - name: Build base
+        id: base
+        uses: ./.github/actions/setup-base
      - name: Check ${{ matrix.check.board }}
-        uses: meshtastic/gh-action-firmware@main
-        with:
-          pio_platform: ${{ matrix.check.platform }}
-          pio_env: ${{ matrix.check.board }}
-          pio_target: check
+        run: bin/check-all.sh ${{ matrix.check.board }}

  build:
    needs: [setup, version]
@@ -173,7 +168,7 @@ jobs:
          ref: ${{github.event.pull_request.head.ref}}
          repository: ${{github.event.pull_request.head.repo.full_name}}

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          path: ./
          pattern: firmware-${{matrix.arch}}-*
@@ -183,7 +178,7 @@ jobs:
        run: ls -R

      - name: Repackage in single firmware zip
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
          overwrite: true
@@ -200,7 +195,7 @@ jobs:
            ./Meshtastic_nRF52_factory_erase*.uf2
          retention-days: 30

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
          merge-multiple: true
@@ -219,7 +214,7 @@ jobs:
        run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output

      - name: Repackage in single elfs zip
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
          overwrite: true
@@ -260,14 +255,14 @@ jobs:
            Autogenerated by github action, developer should edit as required before publishing...

      - name: Download source deb
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          pattern: firmware-debian-${{ needs.version.outputs.deb }}~UNRELEASED-src
          merge-multiple: true
          path: ./output/debian-src

      - name: Download `native-tft` pio deps
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          pattern: platformio-deps-native-tft-${{ needs.version.outputs.long }}
          merge-multiple: true
@@ -291,7 +286,7 @@ jobs:
          }' > firmware-${{ needs.version.outputs.long }}.json

      - name: Save Release manifest artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: manifest-${{ needs.version.outputs.long }}
          overwrite: true
@@ -332,7 +327,7 @@ jobs:
        with:
          python-version: 3.x

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          pattern: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
          merge-multiple: true
@@ -349,7 +344,7 @@ jobs:
      - name: Zip firmware
        run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
          merge-multiple: true
@@ -388,14 +383,14 @@ jobs:
          python-version: 3.x

      - name: Get firmware artifacts
-        uses: actions/download-artifact@v7
+        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@v7
+        uses: actions/download-artifact@v6
        with:
          pattern: manifest-${{ needs.version.outputs.long }}
          path: ./publish
--- a/.github/workflows/merge_queue.yml
+++ b/.github/workflows/merge_queue.yml
@@ -147,7 +147,7 @@ jobs:
          ref: ${{github.event.pull_request.head.ref}}
          repository: ${{github.event.pull_request.head.repo.full_name}}

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          path: ./
          pattern: firmware-${{matrix.arch}}-*
@@ -160,7 +160,7 @@ jobs:
        run: mv -b -t ./ ./bin/device-*.sh ./bin/device-*.bat

      - name: Repackage in single firmware zip
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
          overwrite: true
@@ -176,7 +176,7 @@ jobs:
            ./Meshtastic_nRF52_factory_erase*.uf2
          retention-days: 30

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
          merge-multiple: true
@@ -195,7 +195,7 @@ jobs:
        run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output

      - name: Repackage in single elfs zip
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
          overwrite: true
@@ -235,14 +235,14 @@ jobs:
            Autogenerated by github action, developer should edit as required before publishing...

      - name: Download source deb
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          pattern: firmware-debian-${{ needs.version.outputs.deb }}~UNRELEASED-src
          merge-multiple: true
          path: ./output/debian-src

      - name: Download `native-tft` pio deps
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          pattern: platformio-deps-native-tft-${{ needs.version.outputs.long }}
          merge-multiple: true
@@ -292,7 +292,7 @@ jobs:
        with:
          python-version: 3.x

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          pattern: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
          merge-multiple: true
@@ -309,7 +309,7 @@ jobs:
      - name: Zip firmware
        run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
          merge-multiple: true
@@ -347,7 +347,7 @@ jobs:
        with:
          python-version: 3.x

-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
        with:
          pattern: firmware-{${{ env.targets }}}-${{ needs.version.outputs.long }}
          merge-multiple: true
--- a/.github/workflows/package_obs.yml
+++ b/.github/workflows/package_obs.yml
@@ -58,7 +58,7 @@ jobs:
        id: version

      - name: Download artifacts
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: firmware-debian-${{ steps.version.outputs.deb }}~${{ inputs.series }}-src
          merge-multiple: true
--- a/.github/workflows/package_pio_deps.yml
+++ b/.github/workflows/package_pio_deps.yml
@@ -56,7 +56,7 @@ jobs:
          PLATFORMIO_CORE_DIR: pio/core

      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: platformio-deps-${{ inputs.pio_env }}-${{ steps.version.outputs.long }}
          overwrite: true
--- a/.github/workflows/package_ppa.yml
+++ b/.github/workflows/package_ppa.yml
@@ -60,7 +60,7 @@ jobs:
        id: version

      - name: Download artifacts
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: firmware-debian-${{ steps.version.outputs.deb }}~${{ inputs.series }}-src
          merge-multiple: true
--- a/.github/workflows/pr_tests.yml
+++ b/.github/workflows/pr_tests.yml
@@ -50,7 +50,7 @@ jobs:

      - name: Download test artifacts
        if: needs.native-tests.result != 'skipped'
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: platformio-test-report-${{ steps.version.outputs.long }}
          merge-multiple: true
--- a/.github/workflows/release_channels.yml
+++ b/.github/workflows/release_channels.yml
@@ -102,7 +102,7 @@ jobs:
          PIP_DISABLE_PIP_VERSION_CHECK: 1

      - name: Create Bumps pull request
-        uses: peter-evans/create-pull-request@v8
+        uses: peter-evans/create-pull-request@v7
        with:
          base: ${{ github.event.repository.default_branch }}
          branch: create-pull-request/bump-version
--- a/.github/workflows/sec_sast_semgrep_cron.yml
+++ b/.github/workflows/sec_sast_semgrep_cron.yml
@@ -33,7 +33,7 @@ jobs:

      # step 3
      - name: save report as pipeline artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: report.sarif
          overwrite: true
--- a/.github/workflows/test_native.yml
+++ b/.github/workflows/test_native.yml
@@ -59,7 +59,7 @@ jobs:
        id: version

      - name: Save coverage information
-        uses: actions/upload-artifact@v6
+        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 }}
@@ -94,7 +94,7 @@ jobs:

      - name: Save test results
        if: always() # run this step even if previous step failed
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: platformio-test-report-${{ steps.version.outputs.long }}
          overwrite: true
@@ -108,7 +108,7 @@ jobs:
          sed -i -e "s#${PWD}#.#" coverage_tests.info # Make paths relative.

      - name: Save coverage information
-        uses: actions/upload-artifact@v6
+        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 }}
@@ -137,7 +137,7 @@ jobs:
        id: version

      - name: Download test artifacts
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          name: platformio-test-report-${{ steps.version.outputs.long }}
          merge-multiple: true
@@ -150,7 +150,7 @@ jobs:
          reporter: java-junit

      - name: Download coverage artifacts
-        uses: actions/download-artifact@v7
+        uses: actions/download-artifact@v6
        with:
          pattern: lcov-coverage-info-native-*-${{ steps.version.outputs.long }}
          path: code-coverage-report
@@ -163,7 +163,7 @@ jobs:
          genhtml --quiet --legend --prefix "${PWD}" code-coverage-report/coverage_src.info --output-directory code-coverage-report

      - name: Save Code Coverage Report
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
        with:
          name: code-coverage-report-${{ steps.version.outputs.long }}
          path: code-coverage-report
--- a/.github/workflows/update_protobufs.yml
+++ b/.github/workflows/update_protobufs.yml
@@ -31,7 +31,7 @@ jobs:
          ./bin/regen-protos.sh

      - name: Create pull request
-        uses: peter-evans/create-pull-request@v8
+        uses: peter-evans/create-pull-request@v7
        with:
          branch: create-pull-request/update-protobufs
          labels: submodules
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -9,24 +9,24 @@ plugins:
 lint:
  enabled:
    - checkov@3.2.495
-    - renovate@42.58.4
+    - renovate@42.30.4
    - prettier@3.7.4
-    - trufflehog@3.92.3
+    - trufflehog@3.91.2
    - yamllint@1.37.1
    - bandit@1.9.2
-    - trivy@0.68.2
+    - trivy@0.67.2
    - taplo@0.10.0
-    - ruff@0.14.9
+    - ruff@0.14.7
    - isort@7.0.0
-    - markdownlint@0.47.0
-    - oxipng@10.0.0
+    - markdownlint@0.46.0
+    - oxipng@9.1.5
    - svgo@4.0.0
    - actionlint@1.7.9
    - flake8@7.3.0
    - hadolint@2.14.0
    - shfmt@3.6.0
    - shellcheck@0.11.0
-    - black@25.12.0
+    - black@25.11.0
    - git-diff-check
    - gitleaks@8.30.0
    - clang-format@16.0.3
--- a/bin/build-esp32.sh
+++ b/bin/build-esp32.sh
@@ -22,7 +22,7 @@ export APP_VERSION=$VERSION

 basename=firmware-$1-$VERSION

-pio run --environment $1 -t mtjson # -v
+pio run --environment $1 # -v

 cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf

@@ -32,10 +32,20 @@ cp $BUILDDIR/$basename.factory.bin $OUTDIR/$basename.factory.bin
 echo "Copying ESP32 update bin file"
 cp $BUILDDIR/$basename.bin $OUTDIR/$basename.bin

-echo "Copying Filesystem for ESP32 targets"
+echo "Building Filesystem for ESP32 targets"
+# If you want to build the webui, uncomment the following lines
+# pio run --environment $1 -t buildfs
+# cp .pio/build/$1/littlefs.bin $OUTDIR/littlefswebui-$1-$VERSION.bin
+# # Remove webserver files from the filesystem and rebuild
+# ls -l data/static # Diagnostic list of files
+# rm -rf data/static
+pio run --environment $1 -t buildfs --disable-auto-clean
 cp $BUILDDIR/littlefs-$1-$VERSION.bin $OUTDIR/littlefs-$1-$VERSION.bin
 cp bin/device-install.* $OUTDIR/
 cp bin/device-update.* $OUTDIR/

-echo "Copying manifest"
+# 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-nrf52.sh
+++ b/bin/build-nrf52.sh
@@ -22,7 +22,7 @@ export APP_VERSION=$VERSION

 basename=firmware-$1-$VERSION

-pio run --environment $1 -t mtjson # -v
+pio run --environment $1 # -v

 cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf

@@ -47,5 +47,8 @@ if (echo $1 | grep -q "rak4631"); then
 	cp $SRCHEX $OUTDIR/
 fi

-echo "Copying manifest"
+# 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
@@ -22,12 +22,15 @@ export APP_VERSION=$VERSION

 basename=firmware-$1-$VERSION

-pio run --environment $1 -t mtjson # -v
+pio run --environment $1 # -v

 cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf

 echo "Copying uf2 file"
 cp $BUILDDIR/$basename.uf2 $OUTDIR/$basename.uf2

-echo "Copying manifest"
+# 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
@@ -22,12 +22,15 @@ export APP_VERSION=$VERSION

 basename=firmware-$1-$VERSION

-pio run --environment $1 -t mtjson # -v
+pio run --environment $1 # -v

 cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf

 echo "Copying STM32 bin file"
 cp $BUILDDIR/$basename.bin $OUTDIR/$basename.bin

-echo "Copying manifest"
+# 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/config-dist.yaml
+++ b/bin/config-dist.yaml
@@ -184,8 +184,6 @@ Input:
 Logging:
  LogLevel: info # debug, info, warn, error
 #  TraceFile: /var/log/meshtasticd.json
-#  JSONFile: /packets.json # File location for JSON output of decoded packets
-#  JSONFilter: position # filter for packets to save to JSON file
 #  AsciiLogs: true     # default if not specified is !isatty() on stdout

 Webserver:
--- a/bin/config.d/lora-hat-rak-6421-pi-hat.yaml
+++ b/bin/config.d/lora-hat-rak-6421-pi-hat.yaml
@@ -1,11 +0,0 @@
-Lora:
-
-  ### RAK13300in Slot 1
-  Module: sx1262
-  IRQ: 22 #IO6
-  Reset: 16 # IO4
-  Busy: 24 # IO5
-  # Ant_sw: 13 # IO3 
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
-  spidev: spidev0.0
--- a/bin/platformio-custom.py
+++ b/bin/platformio-custom.py
@@ -159,22 +159,20 @@ def load_boot_logo(source, target, env):

 # Load the boot logo on TFT builds
 if ("HAS_TFT", 1) in env.get("CPPDEFINES", []):
-    env.AddPreAction(f"$BUILD_DIR/{lfsbin}", load_boot_logo)
+    env.AddPreAction('$BUILD_DIR/littlefs.bin', load_boot_logo)

-mtjson_deps = ["buildprog"]
-if platform.name == "espressif32":
-    # Build littlefs image as part of mtjson target
-    # Equivalent to `pio run -t buildfs`
-    target_lfs = env.DataToBin(
-        join("$BUILD_DIR", "${ESP32_FS_IMAGE_NAME}"), "$PROJECT_DATA_DIR"
-    )
-    mtjson_deps.append(target_lfs)
+# 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=mtjson_deps,
+    dependencies=None,
    actions=[manifest_gather],
    title="Meshtastic Manifest",
    description="Generating Meshtastic manifest JSON + Checksums",
-    always_build=False,
+    always_build=True,
 )
--- a/bin/platformio-pre.py
+++ b/bin/platformio-pre.py
@@ -11,9 +11,6 @@ else:
    prefsLoc = env["PROJECT_DIR"] + "/version.properties"
    verObj = readProps(prefsLoc)
    env.Replace(PROGNAME=f"firmware-{env.get('PIOENV')}-{verObj['long']}")
-    env.Replace(ESP32_FS_IMAGE_NAME=f"littlefs-{env.get('PIOENV')}-{verObj['long']}")

 # Print the new program name for verification
 print(f"PROGNAME: {env.get('PROGNAME')}")
-if platform.name == "espressif32":
-    print(f"ESP32_FS_IMAGE_NAME: {env.get('ESP32_FS_IMAGE_NAME')}")
--- a/extra_scripts/esp32_extra.py
+++ b/extra_scripts/esp32_extra.py
@@ -10,12 +10,6 @@ Import("env")
 platform = env.PioPlatform()

 sys.path.append(join(platform.get_package_dir("tool-esptoolpy")))
-# IntelHex workaround, remove after fixed upstream
-# https://github.com/platformio/platform-espressif32/issues/1632
-try:
-    import intelhex
-except ImportError:
-    env.Execute("$PYTHONEXE -m pip install intelhex")
 import esptool


--- a/platformio.ini
+++ b/platformio.ini
@@ -123,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/862ed040c4ab44f0dfbbe492691f144886102588.zip
+	https://github.com/meshtastic/device-ui/archive/4fb5f24787caa841b58dbf623a52c4c5861d6722.zip

 ; Common libs for environmental measurements in telemetry module
 [environmental_base]
--- a/2
+++ b/2
--- a/src/DisplayFormatters.cpp
+++ b/src/DisplayFormatters.cpp
@@ -31,9 +31,6 @@ const char *DisplayFormatters::getModemPresetDisplayName(meshtastic_Config_LoRaC
    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST:
        return useShortName ? "LongF" : "LongFast";
        break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO:
-        return useShortName ? "LongT" : "LongTurbo";
-        break;
    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE:
        return useShortName ? "LongM" : "LongMod";
        break;
--- a/src/graphics/draw/DebugRenderer.cpp
+++ b/src/graphics/draw/DebugRenderer.cpp
@@ -532,10 +532,8 @@ void drawSystemScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x
    const int labelX = x;
    int barsOffset = (isHighResolution) ? 24 : 0;
 #ifdef USE_EINK
-#ifndef T_DECK_PRO
    barsOffset -= 12;
 #endif
-#endif
 #if defined(M5STACK_UNITC6L)
    const int barX = x + 45 + barsOffset;
 #else
@@ -576,7 +574,7 @@ void drawSystemScreen(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x
 #endif
        // Value string
        display->setTextAlignment(TEXT_ALIGN_RIGHT);
-        display->drawString(SCREEN_WIDTH, getTextPositions(display)[line], combinedStr);
+        display->drawString(SCREEN_WIDTH - 2, getTextPositions(display)[line], combinedStr);
    };

    // === Memory values ===
--- a/src/graphics/draw/MenuHandler.cpp
+++ b/src/graphics/draw/MenuHandler.cpp
@@ -20,41 +20,12 @@
 #include "modules/KeyVerificationModule.h"

 #include "modules/TraceRouteModule.h"
-#include <algorithm>
-#include <array>
 #include <functional>
-#include <utility>

 extern uint16_t TFT_MESH;

 namespace graphics
 {
-
-namespace
-{
-
-// Caller must ensure the provided options array outlives the banner callback.
-template <typename T, size_t N, typename Callback>
-BannerOverlayOptions createStaticBannerOptions(const char *message, const MenuOption<T> (&options)[N],
-                                               std::array<const char *, N> &labels, Callback &&onSelection)
-{
-    for (size_t i = 0; i < N; ++i) {
-        labels[i] = options[i].label;
-    }
-
-    const MenuOption<T> *optionsPtr = options;
-    auto callback = std::function<void(const MenuOption<T> &, int)>(std::forward<Callback>(onSelection));
-
-    BannerOverlayOptions bannerOptions;
-    bannerOptions.message = message;
-    bannerOptions.optionsArrayPtr = labels.data();
-    bannerOptions.optionsCount = static_cast<uint8_t>(N);
-    bannerOptions.bannerCallback = [optionsPtr, callback](int selected) -> void { callback(optionsPtr[selected], selected); };
-    return bannerOptions;
-}
-
-} // namespace
-
 menuHandler::screenMenus menuHandler::menuQueue = menu_none;
 bool test_enabled = false;
 uint8_t test_count = 0;
@@ -226,38 +197,48 @@ void menuHandler::DeviceRolePicker()

 void menuHandler::RadioPresetPicker()
 {
-    static const RadioPresetOption presetOptions[] = {
-        {"Back", OptionsAction::Back},
-        {"LongTurbo", OptionsAction::Select, meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO},
-        {"LongModerate", OptionsAction::Select, meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE},
-        {"LongFast", OptionsAction::Select, meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST},
-        {"MediumSlow", OptionsAction::Select, meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW},
-        {"MediumFast", OptionsAction::Select, meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST},
-        {"ShortSlow", OptionsAction::Select, meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW},
-        {"ShortFast", OptionsAction::Select, meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST},
-        {"ShortTurbo", OptionsAction::Select, meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO},
+    static const char *optionsArray[] = {"Back",       "LongSlow",  "LongModerate", "LongFast",  "MediumSlow",
+                                         "MediumFast", "ShortSlow", "ShortFast",    "ShortTurbo"};
+    enum optionsNumbers {
+        Back = 0,
+        radiopreset_LongSlow = 1,
+        radiopreset_LongModerate = 2,
+        radiopreset_LongFast = 3,
+        radiopreset_MediumSlow = 4,
+        radiopreset_MediumFast = 5,
+        radiopreset_ShortSlow = 6,
+        radiopreset_ShortFast = 7,
+        radiopreset_ShortTurbo = 8
+    };
+    BannerOverlayOptions bannerOptions;
+    bannerOptions.message = "Radio Preset";
+    bannerOptions.optionsArrayPtr = optionsArray;
+    bannerOptions.optionsCount = 9;
+    bannerOptions.bannerCallback = [](int selected) -> void {
+        if (selected == Back) {
+            menuHandler::menuQueue = menuHandler::lora_Menu;
+            screen->runNow();
+            return;
+        } else if (selected == radiopreset_LongSlow) {
+            config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW;
+        } else if (selected == radiopreset_LongModerate) {
+            config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE;
+        } else if (selected == radiopreset_LongFast) {
+            config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
+        } else if (selected == radiopreset_MediumSlow) {
+            config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW;
+        } else if (selected == radiopreset_MediumFast) {
+            config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST;
+        } else if (selected == radiopreset_ShortSlow) {
+            config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW;
+        } else if (selected == radiopreset_ShortFast) {
+            config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST;
+        } else if (selected == radiopreset_ShortTurbo) {
+            config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO;
+        }
+        service->reloadConfig(SEGMENT_CONFIG);
+        rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
    };
-
-    constexpr size_t presetCount = sizeof(presetOptions) / sizeof(presetOptions[0]);
-    static std::array<const char *, presetCount> presetLabels{};
-
-    auto bannerOptions =
-        createStaticBannerOptions("Radio Preset", presetOptions, presetLabels, [](const RadioPresetOption &option, int) -> void {
-            if (option.action == OptionsAction::Back) {
-                menuHandler::menuQueue = menuHandler::lora_Menu;
-                screen->runNow();
-                return;
-            }
-
-            if (!option.hasValue) {
-                return;
-            }
-
-            config.lora.modem_preset = option.value;
-            service->reloadConfig(SEGMENT_CONFIG);
-            rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
-        });
-
    screen->showOverlayBanner(bannerOptions);
 }

--- a/src/graphics/draw/MenuHandler.h
+++ b/src/graphics/draw/MenuHandler.h
@@ -99,24 +99,5 @@ class menuHandler
    static void BluetoothToggleMenu();
 };

-/* Generic Menu Options designations  */
-enum class OptionsAction { Back, Select };
-
-template <typename T> struct MenuOption {
-    const char *label;
-    OptionsAction action;
-    bool hasValue;
-    T value;
-
-    MenuOption(const char *labelIn, OptionsAction actionIn, T valueIn)
-        : label(labelIn), action(actionIn), hasValue(true), value(valueIn)
-    {
-    }
-
-    MenuOption(const char *labelIn, OptionsAction actionIn) : label(labelIn), action(actionIn), hasValue(false), value() {}
-};
-
-using RadioPresetOption = MenuOption<meshtastic_Config_LoRaConfig_ModemPreset>;
-
 } // namespace graphics
 #endif
--- a/src/input/InputBroker.h
+++ b/src/input/InputBroker.h
@@ -53,7 +53,6 @@ typedef struct _InputEvent {
 class InputPollable
 {
  public:
-    virtual ~InputPollable() = default;
    virtual void pollOnce() = 0;
 };

--- a/src/input/RotaryEncoderImpl.cpp
+++ b/src/input/RotaryEncoderImpl.cpp
@@ -3,9 +3,6 @@
 #include "RotaryEncoderImpl.h"
 #include "InputBroker.h"
 #include "RotaryEncoder.h"
-#ifdef ARCH_ESP32
-#include "sleep.h"
-#endif

 #define ORIGIN_NAME "RotaryEncoder"

@@ -14,20 +11,6 @@ RotaryEncoderImpl *rotaryEncoderImpl;
 RotaryEncoderImpl::RotaryEncoderImpl()
 {
    rotary = nullptr;
-#ifdef ARCH_ESP32
-    isFirstInit = true;
-#endif
-}
-
-RotaryEncoderImpl::~RotaryEncoderImpl()
-{
-    LOG_DEBUG("RotaryEncoderImpl destructor");
-    detachRotaryEncoderInterrupts();
-
-    if (rotary != nullptr) {
-        delete rotary;
-        rotary = nullptr;
-    }
 }

 bool RotaryEncoderImpl::init()
@@ -42,22 +25,15 @@ bool RotaryEncoderImpl::init()
    eventCcw = static_cast<input_broker_event>(moduleConfig.canned_message.inputbroker_event_ccw);
    eventPressed = static_cast<input_broker_event>(moduleConfig.canned_message.inputbroker_event_press);

-    if (rotary == nullptr) {
-        rotary = new RotaryEncoder(moduleConfig.canned_message.inputbroker_pin_a, moduleConfig.canned_message.inputbroker_pin_b,
-                                   moduleConfig.canned_message.inputbroker_pin_press);
-    }
+    rotary = new RotaryEncoder(moduleConfig.canned_message.inputbroker_pin_a, moduleConfig.canned_message.inputbroker_pin_b,
+                               moduleConfig.canned_message.inputbroker_pin_press);
+    rotary->resetButton();

-    attachRotaryEncoderInterrupts();
-
-#ifdef ARCH_ESP32
-    // Register callbacks for before and after lightsleep
-    // Used to detach and reattach interrupts
-    if (isFirstInit) {
-        lsObserver.observe(&notifyLightSleep);
-        lsEndObserver.observe(&notifyLightSleepEnd);
-        isFirstInit = false;
-    }
-#endif
+    interruptInstance = this;
+    auto interruptHandler = []() { inputBroker->requestPollSoon(interruptInstance); };
+    attachInterrupt(moduleConfig.canned_message.inputbroker_pin_a, interruptHandler, CHANGE);
+    attachInterrupt(moduleConfig.canned_message.inputbroker_pin_b, interruptHandler, CHANGE);
+    attachInterrupt(moduleConfig.canned_message.inputbroker_pin_press, interruptHandler, CHANGE);

    LOG_INFO("RotaryEncoder initialized pins(%d, %d, %d), events(%d, %d, %d)", moduleConfig.canned_message.inputbroker_pin_a,
             moduleConfig.canned_message.inputbroker_pin_b, moduleConfig.canned_message.inputbroker_pin_press, eventCw, eventCcw,
@@ -95,50 +71,6 @@ void RotaryEncoderImpl::pollOnce()
    }
 }

-void RotaryEncoderImpl::detachRotaryEncoderInterrupts()
-{
-    LOG_DEBUG("RotaryEncoderImpl detach button interrupts");
-    if (interruptInstance == this) {
-        detachInterrupt(moduleConfig.canned_message.inputbroker_pin_a);
-        detachInterrupt(moduleConfig.canned_message.inputbroker_pin_b);
-        detachInterrupt(moduleConfig.canned_message.inputbroker_pin_press);
-        interruptInstance = nullptr;
-    } else {
-        LOG_WARN("RotaryEncoderImpl: interrupts already detached");
-    }
-}
-
-void RotaryEncoderImpl::attachRotaryEncoderInterrupts()
-{
-    LOG_DEBUG("RotaryEncoderImpl attach button interrupts");
-    if (rotary != nullptr && interruptInstance == nullptr) {
-        rotary->resetButton();
-
-        interruptInstance = this;
-        auto interruptHandler = []() { inputBroker->requestPollSoon(interruptInstance); };
-        attachInterrupt(moduleConfig.canned_message.inputbroker_pin_a, interruptHandler, CHANGE);
-        attachInterrupt(moduleConfig.canned_message.inputbroker_pin_b, interruptHandler, CHANGE);
-        attachInterrupt(moduleConfig.canned_message.inputbroker_pin_press, interruptHandler, CHANGE);
-    } else {
-        LOG_WARN("RotaryEncoderImpl: interrupts already attached");
-    }
-}
-
-#ifdef ARCH_ESP32
-
-int RotaryEncoderImpl::beforeLightSleep(void *unused)
-{
-    detachRotaryEncoderInterrupts();
-    return 0; // Indicates success;
-}
-
-int RotaryEncoderImpl::afterLightSleep(esp_sleep_wakeup_cause_t cause)
-{
-    attachRotaryEncoderInterrupts();
-    return 0; // Indicates success;
-}
-#endif
-
 RotaryEncoderImpl *RotaryEncoderImpl::interruptInstance;

 #endif
--- a/src/input/RotaryEncoderImpl.h
+++ b/src/input/RotaryEncoderImpl.h
@@ -8,18 +8,12 @@

 class RotaryEncoder;

-class RotaryEncoderImpl final : public InputPollable
+class RotaryEncoderImpl : public InputPollable
 {
  public:
    RotaryEncoderImpl();
-    ~RotaryEncoderImpl() override;
-    bool init();
+    bool init(void);
    virtual void pollOnce() override;
-    // Disconnect and reconnect interrupts for light sleep
-#ifdef ARCH_ESP32
-    int beforeLightSleep(void *unused);
-    int afterLightSleep(esp_sleep_wakeup_cause_t cause);
-#endif

  protected:
    static RotaryEncoderImpl *interruptInstance;
@@ -29,21 +23,6 @@ class RotaryEncoderImpl final : public InputPollable
    input_broker_event eventPressed = INPUT_BROKER_NONE;

    RotaryEncoder *rotary;
-
-  private:
-#ifdef ARCH_ESP32
-    bool isFirstInit;
-#endif
-    void detachRotaryEncoderInterrupts();
-    void attachRotaryEncoderInterrupts();
-
-#ifdef ARCH_ESP32
-    // Get notified when lightsleep begins and ends
-    CallbackObserver<RotaryEncoderImpl, void *> lsObserver =
-        CallbackObserver<RotaryEncoderImpl, void *>(this, &RotaryEncoderImpl::beforeLightSleep);
-    CallbackObserver<RotaryEncoderImpl, esp_sleep_wakeup_cause_t> lsEndObserver =
-        CallbackObserver<RotaryEncoderImpl, esp_sleep_wakeup_cause_t>(this, &RotaryEncoderImpl::afterLightSleep);
-#endif
 };

 extern RotaryEncoderImpl *rotaryEncoderImpl;
--- a/src/mesh/MeshModule.h
+++ b/src/mesh/MeshModule.h
@@ -225,4 +225,4 @@ class MeshModule
 /** set the destination and packet parameters of packet p intended as a reply to a particular "to" packet
 * This ensures that if the request packet was sent reliably, the reply is sent that way as well.
 */
-void setReplyTo(meshtastic_MeshPacket *p, const meshtastic_MeshPacket &to);
+void setReplyTo(meshtastic_MeshPacket *p, const meshtastic_MeshPacket &to);
--- a/src/mesh/NodeDB.cpp
+++ b/src/mesh/NodeDB.cpp
@@ -805,15 +805,11 @@ void NodeDB::installDefaultModuleConfig()
    moduleConfig.external_notification.output_ms = 500;
    moduleConfig.external_notification.nag_timeout = 2;
 #endif
-#if defined(RAK4630) || defined(RAK11310) || defined(RAK3312) || defined(MUZI_BASE) || defined(ELECROW_ThinkNode_M3)
-    // Default to PIN_LED2 for external notification output (LED color depends on device variant)
+#if defined(RAK4630) || defined(RAK11310) || defined(RAK3312)
+    // Default to RAK led pin 2 (blue)
    moduleConfig.external_notification.enabled = true;
    moduleConfig.external_notification.output = PIN_LED2;
-#if defined(MUZI_BASE) || defined(ELECROW_ThinkNode_M3)
-    moduleConfig.external_notification.active = false;
-#else
    moduleConfig.external_notification.active = true;
-#endif
    moduleConfig.external_notification.alert_message = true;
    moduleConfig.external_notification.output_ms = 1000;
    moduleConfig.external_notification.nag_timeout = default_ringtone_nag_secs;
--- a/src/mesh/RadioInterface.cpp
+++ b/src/mesh/RadioInterface.cpp
@@ -503,11 +503,6 @@ void RadioInterface::applyModemConfig()
                cr = 5;
                sf = 10;
                break;
-            case meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO:
-                bw = (myRegion->wideLora) ? 1625.0 : 500;
-                cr = 8;
-                sf = 11;
-                break;
            default: // Config_LoRaConfig_ModemPreset_LONG_FAST is default. Gracefully use this is preset is something illegal.
                bw = (myRegion->wideLora) ? 812.5 : 250;
                cr = 5;
@@ -544,26 +539,13 @@ void RadioInterface::applyModemConfig()
        }

        if ((myRegion->freqEnd - myRegion->freqStart) < bw / 1000) {
-            const float regionSpanKHz = (myRegion->freqEnd - myRegion->freqStart) * 1000.0f;
-            const float requestedBwKHz = bw;
-            const bool isWideRequest = requestedBwKHz >= 499.5f; // treat as 500 kHz preset
-            const char *presetName =
-                DisplayFormatters::getModemPresetDisplayName(loraConfig.modem_preset, false, loraConfig.use_preset);
-
-            char err_string[160];
-            if (isWideRequest) {
-                snprintf(err_string, sizeof(err_string), "%s region too narrow for 500kHz preset (%s). Falling back to LongFast.",
-                         myRegion->name, presetName);
-            } else {
-                snprintf(err_string, sizeof(err_string), "%s region span %.0fkHz < requested %.0fkHz. Falling back to LongFast.",
-                         myRegion->name, regionSpanKHz, requestedBwKHz);
-            }
-            LOG_ERROR("%s", err_string);
+            static const char *err_string = "Regional frequency range is smaller than bandwidth. Fall back to default preset";
+            LOG_ERROR(err_string);
            RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);

            meshtastic_ClientNotification *cn = clientNotificationPool.allocZeroed();
            cn->level = meshtastic_LogRecord_Level_ERROR;
-            snprintf(cn->message, sizeof(cn->message), "%s", err_string);
+            sprintf(cn->message, err_string);
            service->sendClientNotification(cn);

            // Set to default modem preset
--- a/src/mesh/ReliableRouter.cpp
+++ b/src/mesh/ReliableRouter.cpp
@@ -150,9 +150,7 @@ void ReliableRouter::sniffReceived(const meshtastic_MeshPacket *p, const meshtas
        PacketId nakId = (c && c->error_reason != meshtastic_Routing_Error_NONE) ? p->decoded.request_id : 0;

        // We intentionally don't check wasSeenRecently, because it is harmless to delete non existent retransmission records
-        if ((ackId || nakId) &&
-            // Implicit ACKs from MQTT should not stop retransmissions
-            !(isFromUs(p) && p->transport_mechanism == meshtastic_MeshPacket_TransportMechanism_TRANSPORT_MQTT)) {
+        if (ackId || nakId) {
            LOG_DEBUG("Received a %s for 0x%x, stopping retransmissions", ackId ? "ACK" : "NAK", ackId);
            if (ackId) {
                stopRetransmission(p->to, ackId);
--- a/src/mesh/Router.cpp
+++ b/src/mesh/Router.cpp
@@ -526,10 +526,6 @@ DecodeState perhapsDecode(meshtastic_MeshPacket *p)
 #elif ARCH_PORTDUINO
        if (portduino_config.traceFilename != "" || portduino_config.logoutputlevel == level_trace) {
            LOG_TRACE("%s", MeshPacketSerializer::JsonSerialize(p, false).c_str());
-        } else if (portduino_config.JSONFilename != "") {
-            if (portduino_config.JSONFilter == (_meshtastic_PortNum)0 || portduino_config.JSONFilter == p->decoded.portnum) {
-                JSONFile << MeshPacketSerializer::JsonSerialize(p, false) << std::endl;
-            }
        }
 #endif
        return DecodeState::DECODE_SUCCESS;
--- a/src/mesh/generated/meshtastic/config.pb.h
+++ b/src/mesh/generated/meshtastic/config.pb.h
@@ -293,8 +293,7 @@ typedef enum _meshtastic_Config_LoRaConfig_RegionCode {
 typedef enum _meshtastic_Config_LoRaConfig_ModemPreset {
    /* Long Range - Fast */
    meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST = 0,
-    /* Long Range - Slow
- Deprecated in 2.7: Unpopular slow preset. */
+    /* Long Range - Slow */
    meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW = 1,
    /* Very Long Range - Slow
 Deprecated in 2.5: Works only with txco and is unusably slow */
@@ -312,10 +311,7 @@ typedef enum _meshtastic_Config_LoRaConfig_ModemPreset {
    /* Short Range - Turbo
 This is the fastest preset and the only one with 500kHz bandwidth.
 It is not legal to use in all regions due to this wider bandwidth. */
-    meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO = 8,
-    /* Long Range - Turbo
- This preset performs similarly to LongFast, but with 500Khz bandwidth. */
-    meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO = 9
+    meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO = 8
 } meshtastic_Config_LoRaConfig_ModemPreset;

 typedef enum _meshtastic_Config_BluetoothConfig_PairingMode {
@@ -693,8 +689,8 @@ extern "C" {
 #define _meshtastic_Config_LoRaConfig_RegionCode_ARRAYSIZE ((meshtastic_Config_LoRaConfig_RegionCode)(meshtastic_Config_LoRaConfig_RegionCode_BR_902+1))

 #define _meshtastic_Config_LoRaConfig_ModemPreset_MIN meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST
-#define _meshtastic_Config_LoRaConfig_ModemPreset_MAX meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO
-#define _meshtastic_Config_LoRaConfig_ModemPreset_ARRAYSIZE ((meshtastic_Config_LoRaConfig_ModemPreset)(meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO+1))
+#define _meshtastic_Config_LoRaConfig_ModemPreset_MAX meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO
+#define _meshtastic_Config_LoRaConfig_ModemPreset_ARRAYSIZE ((meshtastic_Config_LoRaConfig_ModemPreset)(meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO+1))

 #define _meshtastic_Config_BluetoothConfig_PairingMode_MIN meshtastic_Config_BluetoothConfig_PairingMode_RANDOM_PIN
 #define _meshtastic_Config_BluetoothConfig_PairingMode_MAX meshtastic_Config_BluetoothConfig_PairingMode_NO_PIN
--- a/src/modules/ExternalNotificationModule.h
+++ b/src/modules/ExternalNotificationModule.h
@@ -5,7 +5,8 @@
 #include "configuration.h"
 #include "input/InputBroker.h"

-#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !defined(CONFIG_IDF_TARGET_ESP32C6)
+#if !defined(ARCH_PORTDUINO) && !defined(ARCH_STM32WL) && !defined(CONFIG_IDF_TARGET_ESP32C6) &&                                 \
+    !defined(CONFIG_IDF_TARGET_ESP32H2)
 #include <NonBlockingRtttl.h>
 #else
 // Noop class for portduino.
--- a/src/modules/Modules.cpp
+++ b/src/modules/Modules.cpp
@@ -217,7 +217,7 @@ void setupModules()
    }
 #endif // HAS_BUTTON
 #if ARCH_PORTDUINO
-    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR && portduino_config.i2cdev != "") {
+    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
        seesawRotary = new SeesawRotary("SeesawRotary");
        if (!seesawRotary->init()) {
            delete seesawRotary;
--- a/src/modules/PositionModule.cpp
+++ b/src/modules/PositionModule.cpp
@@ -45,12 +45,8 @@ bool PositionModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, mes
 {
    auto p = *pptr;

-    const auto transport = mp.transport_mechanism;
-    if (isFromUs(&mp) && !IS_ONE_OF(transport, meshtastic_MeshPacket_TransportMechanism_TRANSPORT_INTERNAL,
-                                    meshtastic_MeshPacket_TransportMechanism_TRANSPORT_API)) {
-        LOG_WARN("Ignoring packet supposedly from us over external transport");
-        return true;
-    }
+    // If inbound message is a replay (or spoof!) of our own messages, we shouldn't process
+    // (why use second-hand sources for our own data?)

    // FIXME this can in fact happen with packets sent from EUD (src=RX_SRC_USER)
    // to set fixed location, EUD-GPS location or just the time (see also issue #900)
@@ -476,53 +472,19 @@ void PositionModule::sendLostAndFoundText()
    delete[] message;
 }

-// Helper: return imprecise (truncated + centered) lat/lon as int32 using current precision
-static inline void computeImpreciseLatLon(int32_t inLat, int32_t inLon, uint8_t precisionBits, int32_t &outLat, int32_t &outLon)
-{
-    if (precisionBits > 0 && precisionBits < 32) {
-        // Build mask for top 'precisionBits' bits of a 32-bit unsigned field
-        const uint32_t mask = (precisionBits == 32) ? UINT32_MAX : (UINT32_MAX << (32 - precisionBits));
-        // Note: latitude_i/longitude_i are stored as signed 32-bit in meshtastic code but
-        // the bitmask logic used previously operated as unsigned—preserve that behavior by
-        // casting to uint32_t for masking, then back to int32_t.
-        uint32_t lat_u = static_cast<uint32_t>(inLat) & mask;
-        uint32_t lon_u = static_cast<uint32_t>(inLon) & mask;
-
-        // Add the "center of cell" offset used elsewhere:
-        // The code previously added (1 << (31 - precision)) to produce the middle of the possible location.
-        uint32_t center_offset = (1u << (31 - precisionBits));
-        lat_u += center_offset;
-        lon_u += center_offset;
-
-        outLat = static_cast<int32_t>(lat_u);
-        outLon = static_cast<int32_t>(lon_u);
-    } else {
-        // full precision: return input unchanged
-        outLat = inLat;
-        outLon = inLon;
-    }
-}
-
 struct SmartPosition PositionModule::getDistanceTraveledSinceLastSend(meshtastic_PositionLite currentPosition)
 {
+    // The minimum distance to travel before we are able to send a new position packet.
    const uint32_t distanceTravelThreshold =
        Default::getConfiguredOrDefault(config.position.broadcast_smart_minimum_distance, 100);

-    int32_t lastLatImprecise, lastLonImprecise;
-    int32_t currentLatImprecise, currentLonImprecise;
+    // Determine the distance in meters between two points on the globe
+    float distanceTraveledSinceLastSend = GeoCoord::latLongToMeter(
+        lastGpsLatitude * 1e-7, lastGpsLongitude * 1e-7, currentPosition.latitude_i * 1e-7, currentPosition.longitude_i * 1e-7);

-    computeImpreciseLatLon(lastGpsLatitude, lastGpsLongitude, precision, lastLatImprecise, lastLonImprecise);
-    computeImpreciseLatLon(currentPosition.latitude_i, currentPosition.longitude_i, precision, currentLatImprecise,
-                           currentLonImprecise);
-
-    float distMeters = GeoCoord::latLongToMeter(lastLatImprecise * 1e-7, lastLonImprecise * 1e-7, currentLatImprecise * 1e-7,
-                                                currentLonImprecise * 1e-7);
-
-    float distanceTraveled = fabsf(distMeters);
-
-    return SmartPosition{.distanceTraveled = distanceTraveled,
+    return SmartPosition{.distanceTraveled = abs(distanceTraveledSinceLastSend),
                         .distanceThreshold = distanceTravelThreshold,
-                         .hasTraveledOverThreshold = distanceTraveled >= distanceTravelThreshold};
+                         .hasTraveledOverThreshold = abs(distanceTraveledSinceLastSend) >= distanceTravelThreshold};
 }

 void PositionModule::handleNewPosition()
--- a/src/modules/RoutingModule.cpp
+++ b/src/modules/RoutingModule.cpp
@@ -75,12 +75,6 @@ uint8_t RoutingModule::getHopLimitForResponse(uint8_t hopStart, uint8_t hopLimit
    return Default::getConfiguredOrDefaultHopLimit(config.lora.hop_limit); // Use the default hop limit
 }

-meshtastic_MeshPacket *RoutingModule::allocAckNak(meshtastic_Routing_Error err, NodeNum to, PacketId idFrom, ChannelIndex chIndex,
-                                                  uint8_t hopLimit)
-{
-    return MeshModule::allocAckNak(err, to, idFrom, chIndex, hopLimit);
-}
-
 RoutingModule::RoutingModule() : ProtobufModule("routing", meshtastic_PortNum_ROUTING_APP, &meshtastic_Routing_msg)
 {
    isPromiscuous = true;
--- a/src/modules/RoutingModule.h
+++ b/src/modules/RoutingModule.h
@@ -16,9 +16,6 @@ class RoutingModule : public ProtobufModule<meshtastic_Routing>
    virtual void sendAckNak(meshtastic_Routing_Error err, NodeNum to, PacketId idFrom, ChannelIndex chIndex, uint8_t hopLimit = 0,
                            bool ackWantsAck = false);

-    meshtastic_MeshPacket *allocAckNak(meshtastic_Routing_Error err, NodeNum to, PacketId idFrom, ChannelIndex chIndex,
-                                       uint8_t hopLimit = 0);
-
    // Given the hopStart and hopLimit upon reception of a request, return the hop limit to use for the response
    uint8_t getHopLimitForResponse(uint8_t hopStart, uint8_t hopLimit);

--- a/src/modules/SerialModule.cpp
+++ b/src/modules/SerialModule.cpp
@@ -71,7 +71,7 @@ SerialModule::SerialModule() : StreamAPI(&Serial), concurrency::OSThread("Serial
    api_type = TYPE_SERIAL;
 }
 static Print *serialPrint = &Serial;
-#elif defined(CONFIG_IDF_TARGET_ESP32C6) || defined(RAK3172) || defined(EBYTE_E77_MBL)
+#elif defined(CONFIG_IDF_TARGET_ESP32C6) || defined(RAK3172) || defined(EBYTE_E77_MBL) || defined(CONFIG_IDF_TARGET_ESP32H2)
 SerialModule::SerialModule() : StreamAPI(&Serial1), concurrency::OSThread("Serial")
 {
    api_type = TYPE_SERIAL;
@@ -175,7 +175,7 @@ int32_t SerialModule::runOnce()
                // Give it a chance to flush out 💩
                delay(10);
            }
-#if defined(CONFIG_IDF_TARGET_ESP32C6)
+#if defined(CONFIG_IDF_TARGET_ESP32C6) || defined(CONFIG_IDF_TARGET_ESP32H2)
            if (moduleConfig.serial.rxd && moduleConfig.serial.txd) {
                Serial1.setRxBufferSize(RX_BUFFER);
                Serial1.begin(baud, SERIAL_8N1, moduleConfig.serial.rxd, moduleConfig.serial.txd);
@@ -277,7 +277,7 @@ int32_t SerialModule::runOnce()
            }
 #endif
            else {
-#if defined(CONFIG_IDF_TARGET_ESP32C6)
+#if defined(CONFIG_IDF_TARGET_ESP32C6) || defined(CONFIG_IDF_TARGET_ESP32H2)
                while (Serial1.available()) {
                    serialPayloadSize = Serial1.readBytes(serialBytes, meshtastic_Constants_DATA_PAYLOAD_LEN);
 #else
@@ -538,7 +538,7 @@ void SerialModule::processWXSerial()
 {
 #if !defined(TTGO_T_ECHO) && !defined(T_ECHO_LITE) && !defined(CANARYONE) && !defined(CONFIG_IDF_TARGET_ESP32C6) &&              \
    !defined(MESHLINK) && !defined(ELECROW_ThinkNode_M1) && !defined(ELECROW_ThinkNode_M3) && !defined(ELECROW_ThinkNode_M5) &&  \
-    !defined(ARCH_STM32WL) && !defined(MUZI_BASE)
+    !defined(ARCH_STM32WL) && !defined(MUZI_BASE) && !defined(CONFIG_IDF_TARGET_ESP32H2)
    static unsigned int lastAveraged = 0;
    static unsigned int averageIntervalMillis = 300000; // 5 minutes hard coded.
    static double dir_sum_sin = 0;
--- a/src/modules/StatusLEDModule.cpp
+++ b/src/modules/StatusLEDModule.cpp
@@ -26,11 +26,7 @@ int StatusLEDModule::handleStatusUpdate(const meshtastic::Status *arg)
                power_state = charged;
            }
        } else {
-            if (powerStatus->getBatteryChargePercent() > 5) {
-                power_state = discharging;
-            } else {
-                power_state = critical;
-            }
+            power_state = discharging;
        }
        break;
    }
@@ -62,33 +58,16 @@ int StatusLEDModule::handleStatusUpdate(const meshtastic::Status *arg)

 int32_t StatusLEDModule::runOnce()
 {
-    my_interval = 1000;

    if (power_state == charging) {
        CHARGE_LED_state = !CHARGE_LED_state;
    } else if (power_state == charged) {
        CHARGE_LED_state = LED_STATE_ON;
-    } else if (power_state == critical) {
-        if (POWER_LED_starttime + 30000 < millis() && !doing_fast_blink) {
-            doing_fast_blink = true;
-            POWER_LED_starttime = millis();
-        }
-        if (doing_fast_blink) {
-            PAIRING_LED_state = LED_STATE_OFF;
-            CHARGE_LED_state = !CHARGE_LED_state;
-            my_interval = 250;
-            if (POWER_LED_starttime + 2000 < millis()) {
-                doing_fast_blink = false;
-            }
-        } else {
-            CHARGE_LED_state = LED_STATE_OFF;
-        }
-
    } else {
        CHARGE_LED_state = LED_STATE_OFF;
    }

-    if (!config.bluetooth.enabled || PAIRING_LED_starttime + 30 * 1000 < millis() || doing_fast_blink) {
+    if (!config.bluetooth.enabled || PAIRING_LED_starttime + 30 * 1000 < millis()) {
        PAIRING_LED_state = LED_STATE_OFF;
    } else if (ble_state == unpaired) {
        if (slowTrack) {
--- a/src/modules/StatusLEDModule.h
+++ b/src/modules/StatusLEDModule.h
@@ -31,10 +31,8 @@ class StatusLEDModule : private concurrency::OSThread
    bool PAIRING_LED_state = LED_STATE_OFF;

    uint32_t PAIRING_LED_starttime = 0;
-    uint32_t POWER_LED_starttime = 0;
-    bool doing_fast_blink = false;

-    enum PowerState { discharging, charging, charged, critical };
+    enum PowerState { discharging, charging, charged };

    PowerState power_state = discharging;

--- a/src/mqtt/MQTT.cpp
+++ b/src/mqtt/MQTT.cpp
@@ -87,13 +87,10 @@ inline void onReceiveProto(char *topic, byte *payload, size_t length)
        // Generate an implicit ACK towards ourselves (handled and processed only locally!) for this message.
        // We do this because packets are not rebroadcasted back into MQTT anymore and we assume that at least one node
        // receives it when we get our own packet back. Then we'll stop our retransmissions.
-        if (isFromUs(e.packet)) {
-            auto pAck = routingModule->allocAckNak(meshtastic_Routing_Error_NONE, getFrom(e.packet), e.packet->id, ch.index);
-            pAck->transport_mechanism = meshtastic_MeshPacket_TransportMechanism_TRANSPORT_MQTT;
-            router->sendLocal(pAck);
-        } else {
+        if (isFromUs(e.packet))
+            routingModule->sendAckNak(meshtastic_Routing_Error_NONE, getFrom(e.packet), e.packet->id, ch.index);
+        else
            LOG_INFO("Ignore downlink message we originally sent");
-        }
        return;
    }
    if (isFromUs(e.packet)) {
--- a/src/nimble/NimbleBluetooth.cpp
+++ b/src/nimble/NimbleBluetooth.cpp
@@ -14,11 +14,11 @@
 #include <atomic>
 #include <mutex>

+#ifdef NIMBLE_TWO
 #include "NimBLEAdvertising.h"
-#ifdef CONFIG_BT_NIMBLE_EXT_ADV
 #include "NimBLEExtAdvertising.h"
-#endif
 #include "PowerStatus.h"
+#endif

 #if defined(CONFIG_NIMBLE_CPP_IDF)
 #include "host/ble_gap.h"
@@ -26,12 +26,15 @@
 #include "nimble/nimble/host/include/host/ble_gap.h"
 #endif

+#if defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32C6)
+
 namespace
 {
 constexpr uint16_t kPreferredBleMtu = 517;
 constexpr uint16_t kPreferredBleTxOctets = 251;
 constexpr uint16_t kPreferredBleTxTimeUs = (kPreferredBleTxOctets + 14) * 8;
 } // namespace
+#endif

 // Debugging options: careful, they slow things down quite a bit!
 // #define DEBUG_NIMBLE_ON_READ_TIMING  // uncomment to time onRead duration
@@ -310,9 +313,11 @@ class BluetoothPhoneAPI : public PhoneAPI, public concurrency::OSThread
    {
        PhoneAPI::onNowHasData(fromRadioNum);

-#ifdef DEBUG_NIMBLE_NOTIFY
        int currentNotifyCount = notifyCount.fetch_add(1);
+
        uint8_t cc = bleServer->getConnectedCount();
+
+#ifdef DEBUG_NIMBLE_NOTIFY
        // This logging slows things down when there are lots of packets going to the phone, like initial connection:
        LOG_DEBUG("BLE notify(%d) fromNum: %d connections: %d", currentNotifyCount, fromRadioNum, cc);
 #endif
@@ -321,7 +326,13 @@ class BluetoothPhoneAPI : public PhoneAPI, public concurrency::OSThread
        put_le32(val, fromRadioNum);

        fromNumCharacteristic->setValue(val, sizeof(val));
+#ifdef NIMBLE_TWO
+        // NOTE: I don't have any NIMBLE_TWO devices, but this line makes me suspicious, and I suspect it needs to just be
+        // notify().
        fromNumCharacteristic->notify(val, sizeof(val), BLE_HS_CONN_HANDLE_NONE);
+#else
+        fromNumCharacteristic->notify();
+#endif
    }

    /// Check the current underlying physical link to see if the client is currently connected
@@ -386,7 +397,12 @@ static uint8_t lastToRadio[MAX_TO_FROM_RADIO_SIZE];

 class NimbleBluetoothToRadioCallback : public NimBLECharacteristicCallbacks
 {
-    void onWrite(NimBLECharacteristic *pCharacteristic, NimBLEConnInfo &) override
+#ifdef NIMBLE_TWO
+    virtual void onWrite(NimBLECharacteristic *pCharacteristic, NimBLEConnInfo &connInfo)
+#else
+    virtual void onWrite(NimBLECharacteristic *pCharacteristic)
+
+#endif
    {
        // CAUTION: This callback runs in the NimBLE task!!! Don't do anything except communicate with the main task's runOnce.
        // Assumption: onWrite is serialized by NimBLE, so we don't need to lock here against multiple concurrent onWrite calls.
@@ -433,7 +449,11 @@ class NimbleBluetoothToRadioCallback : public NimBLECharacteristicCallbacks

 class NimbleBluetoothFromRadioCallback : public NimBLECharacteristicCallbacks
 {
-    void onRead(NimBLECharacteristic *pCharacteristic, NimBLEConnInfo &) override
+#ifdef NIMBLE_TWO
+    virtual void onRead(NimBLECharacteristic *pCharacteristic, NimBLEConnInfo &connInfo)
+#else
+    virtual void onRead(NimBLECharacteristic *pCharacteristic)
+#endif
    {
        // CAUTION: This callback runs in the NimBLE task!!! Don't do anything except communicate with the main task's runOnce.

@@ -541,27 +561,32 @@ class NimbleBluetoothFromRadioCallback : public NimBLECharacteristicCallbacks

 class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
 {
+#ifdef NIMBLE_TWO
  public:
-    explicit NimbleBluetoothServerCallback(NimbleBluetooth *ble) : ble(ble) {}
+    NimbleBluetoothServerCallback(NimbleBluetooth *ble) { this->ble = ble; }

  private:
    NimbleBluetooth *ble;

-    uint32_t onPassKeyDisplay() override
+    virtual uint32_t onPassKeyDisplay()
+#else
+    virtual uint32_t onPassKeyRequest()
+#endif
    {
        uint32_t passkey = config.bluetooth.fixed_pin;

        if (config.bluetooth.mode == meshtastic_Config_BluetoothConfig_PairingMode_RANDOM_PIN) {
            LOG_INFO("Use random passkey");
+            // This is the passkey to be entered on peer - we pick a number >100,000 to ensure 6 digits
            passkey = random(100000, 999999);
        }
-        LOG_INFO("*** Enter passkey %06u on the peer side ***", passkey);
+        LOG_INFO("*** Enter passkey %d on the peer side ***", passkey);

        powerFSM.trigger(EVENT_BLUETOOTH_PAIR);
        meshtastic::BluetoothStatus newStatus(std::to_string(passkey));
        bluetoothStatus->updateStatus(&newStatus);

-#if HAS_SCREEN
+#if HAS_SCREEN // Todo: migrate this display code back into Screen class, and observe bluetoothStatus
        if (screen) {
            screen->startAlert([passkey](OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) -> void {
                char btPIN[16] = "888888";
@@ -590,29 +615,39 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
            });
        }
 #endif
-
        passkeyShowing = true;
+
        return passkey;
    }

-    void onAuthenticationComplete(NimBLEConnInfo &connInfo) override
+#ifdef NIMBLE_TWO
+    virtual void onAuthenticationComplete(NimBLEConnInfo &connInfo)
+#else
+    virtual void onAuthenticationComplete(ble_gap_conn_desc *desc)
+#endif
    {
        LOG_INFO("BLE authentication complete");

        meshtastic::BluetoothStatus newStatus(meshtastic::BluetoothStatus::ConnectionState::CONNECTED);
        bluetoothStatus->updateStatus(&newStatus);

+        // Todo: migrate this display code back into Screen class, and observe bluetoothStatus
        if (passkeyShowing) {
            passkeyShowing = false;
-            if (screen) {
+            if (screen)
                screen->endAlert();
-            }
        }

+        // Store the connection handle for future use
+#ifdef NIMBLE_TWO
        nimbleBluetoothConnHandle = connInfo.getConnHandle();
+#else
+        nimbleBluetoothConnHandle = desc->conn_handle;
+#endif
    }

-    void onConnect(NimBLEServer *pServer, NimBLEConnInfo &connInfo) override
+#ifdef NIMBLE_TWO
+    virtual void onConnect(NimBLEServer *pServer, NimBLEConnInfo &connInfo)
    {
        LOG_INFO("BLE incoming connection %s", connInfo.getAddress().toString().c_str());

@@ -637,12 +672,21 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
        LOG_INFO("BLE conn %u initial MTU %u (target %u)", connHandle, connInfo.getMTU(), kPreferredBleMtu);
        pServer->updateConnParams(connHandle, 6, 12, 0, 200);
    }
+#endif

-    void onDisconnect(NimBLEServer *pServer, NimBLEConnInfo &connInfo, int reason) override
+#ifdef NIMBLE_TWO
+    virtual void onDisconnect(NimBLEServer *pServer, NimBLEConnInfo &connInfo, int reason)
    {
        LOG_INFO("BLE disconnect reason: %d", reason);
+#else
+    virtual void onDisconnect(NimBLEServer *pServer, ble_gap_conn_desc *desc)
+    {
+        LOG_INFO("BLE disconnect");
+#endif
+#ifdef NIMBLE_TWO
        if (ble->isDeInit)
            return;
+#endif

        meshtastic::BluetoothStatus newStatus(meshtastic::BluetoothStatus::ConnectionState::DISCONNECTED);
        bluetoothStatus->updateStatus(&newStatus);
@@ -666,69 +710,35 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
            bluetoothPhoneAPI->writeCount = 0;
        }

+        // Clear the last ToRadio packet buffer to avoid rejecting first packet from new connection
        memset(lastToRadio, 0, sizeof(lastToRadio));

-        nimbleBluetoothConnHandle = BLE_HS_CONN_HANDLE_NONE;
+        nimbleBluetoothConnHandle = BLE_HS_CONN_HANDLE_NONE; // BLE_HS_CONN_HANDLE_NONE means "no connection"

+#ifdef NIMBLE_TWO
+        // Restart Advertising
        ble->startAdvertising();
+#else
+        NimBLEAdvertising *pAdvertising = NimBLEDevice::getAdvertising();
+        if (!pAdvertising->start(0)) {
+            if (pAdvertising->isAdvertising()) {
+                LOG_DEBUG("BLE advertising already running");
+            } else {
+                LOG_ERROR("BLE failed to restart advertising");
+            }
+        }
+#endif
    }
 };

 static NimbleBluetoothToRadioCallback *toRadioCallbacks;
 static NimbleBluetoothFromRadioCallback *fromRadioCallbacks;

-void NimbleBluetooth::startAdvertising()
-{
-#if defined(CONFIG_BT_NIMBLE_EXT_ADV)
-    NimBLEExtAdvertising *pAdvertising = NimBLEDevice::getAdvertising();
-    NimBLEExtAdvertisement legacyAdvertising;
-
-    legacyAdvertising.setLegacyAdvertising(true);
-    legacyAdvertising.setScannable(true);
-    legacyAdvertising.setConnectable(true);
-    legacyAdvertising.setFlags(BLE_HS_ADV_F_DISC_GEN);
-    if (powerStatus->getHasBattery() == 1) {
-        legacyAdvertising.setCompleteServices(NimBLEUUID((uint16_t)0x180f));
-    }
-    legacyAdvertising.setCompleteServices(NimBLEUUID(MESH_SERVICE_UUID));
-    legacyAdvertising.setMinInterval(500);
-    legacyAdvertising.setMaxInterval(1000);
-
-    NimBLEExtAdvertisement legacyScanResponse;
-    legacyScanResponse.setLegacyAdvertising(true);
-    legacyScanResponse.setConnectable(true);
-    legacyScanResponse.setName(getDeviceName());
-
-    if (!pAdvertising->setInstanceData(0, legacyAdvertising)) {
-        LOG_ERROR("BLE failed to set legacyAdvertising");
-    } else if (!pAdvertising->setScanResponseData(0, legacyScanResponse)) {
-        LOG_ERROR("BLE failed to set legacyScanResponse");
-    } else if (!pAdvertising->start(0, 0, 0)) {
-        LOG_ERROR("BLE failed to start legacyAdvertising");
-    }
-#else
-    NimBLEAdvertising *pAdvertising = NimBLEDevice::getAdvertising();
-    pAdvertising->reset();
-    pAdvertising->addServiceUUID(MESH_SERVICE_UUID);
-    if (powerStatus->getHasBattery() == 1) {
-        pAdvertising->addServiceUUID(NimBLEUUID((uint16_t)0x180f));
-    }
-
-    NimBLEAdvertisementData scan;
-    scan.setName(getDeviceName());
-    pAdvertising->setScanResponseData(scan);
-    pAdvertising->enableScanResponse(true);
-
-    if (!pAdvertising->start(0)) {
-        LOG_ERROR("BLE failed to start advertising");
-    }
-#endif
-    LOG_DEBUG("BLE Advertising started");
-}
-
 void NimbleBluetooth::shutdown()
 {
+    // No measurable power saving for ESP32 during light-sleep(?)
 #ifndef ARCH_ESP32
+    // Shutdown bluetooth for minimum power draw
    LOG_INFO("Disable bluetooth");
    NimBLEAdvertising *pAdvertising = NimBLEDevice::getAdvertising();
    pAdvertising->reset();
@@ -736,6 +746,7 @@ void NimbleBluetooth::shutdown()
 #endif
 }

+// Proper shutdown for ESP32. Needs reboot to reverse.
 void NimbleBluetooth::deinit()
 {
 #ifdef ARCH_ESP32
@@ -749,17 +760,21 @@ void NimbleBluetooth::deinit()
    digitalWrite(BLE_LED, LOW);
 #endif
 #endif
+#ifndef NIMBLE_TWO
+    NimBLEDevice::deinit();
+#endif
 #endif
 }

+// Has initial setup been completed
 bool NimbleBluetooth::isActive()
 {
-    return bleServer != nullptr;
+    return bleServer;
 }

 bool NimbleBluetooth::isConnected()
 {
-    return bleServer && bleServer->getConnectedCount() > 0;
+    return bleServer->getConnectedCount() > 0;
 }

 int NimbleBluetooth::getRssi()
@@ -803,7 +818,7 @@ void NimbleBluetooth::setup()
    LOG_INFO("Init the NimBLE bluetooth module");

    NimBLEDevice::init(getDeviceName());
-    NimBLEDevice::setPower(9);
+    NimBLEDevice::setPower(ESP_PWR_LVL_P9);

 #if NIMBLE_ENABLE_2M_PHY && (defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32C6))
    int mtuResult = NimBLEDevice::setMTU(kPreferredBleMtu);
@@ -836,7 +851,11 @@ void NimbleBluetooth::setup()
        NimBLEDevice::setSecurityIOCap(BLE_HS_IO_DISPLAY_ONLY);
    }
    bleServer = NimBLEDevice::createServer();
-    auto *serverCallbacks = new NimbleBluetoothServerCallback(this);
+#ifdef NIMBLE_TWO
+    NimbleBluetoothServerCallback *serverCallbacks = new NimbleBluetoothServerCallback(this);
+#else
+    NimbleBluetoothServerCallback *serverCallbacks = new NimbleBluetoothServerCallback();
+#endif
    bleServer->setCallbacks(serverCallbacks, true);
    setupService();
    startAdvertising();
@@ -881,7 +900,11 @@ void NimbleBluetooth::setupService()
    NimBLEService *batteryService = bleServer->createService(NimBLEUUID((uint16_t)0x180f)); // 0x180F is the Battery Service
    BatteryCharacteristic = batteryService->createCharacteristic( // 0x2A19 is the Battery Level characteristic)
        (uint16_t)0x2a19, NIMBLE_PROPERTY::READ | NIMBLE_PROPERTY::NOTIFY, 1);
+#ifdef NIMBLE_TWO
    NimBLE2904 *batteryLevelDescriptor = BatteryCharacteristic->create2904();
+#else
+    NimBLE2904 *batteryLevelDescriptor = (NimBLE2904 *)BatteryCharacteristic->createDescriptor((uint16_t)0x2904);
+#endif
    batteryLevelDescriptor->setFormat(NimBLE2904::FORMAT_UINT8);
    batteryLevelDescriptor->setNamespace(1);
    batteryLevelDescriptor->setUnit(0x27ad);
@@ -889,12 +912,54 @@ void NimbleBluetooth::setupService()
    batteryService->start();
 }

+void NimbleBluetooth::startAdvertising()
+{
+#ifdef NIMBLE_TWO
+    NimBLEExtAdvertising *pAdvertising = NimBLEDevice::getAdvertising();
+    NimBLEExtAdvertisement legacyAdvertising;
+
+    legacyAdvertising.setLegacyAdvertising(true);
+    legacyAdvertising.setScannable(true);
+    legacyAdvertising.setConnectable(true);
+    legacyAdvertising.setFlags(BLE_HS_ADV_F_DISC_GEN);
+    if (powerStatus->getHasBattery() == 1) {
+        legacyAdvertising.setCompleteServices(NimBLEUUID((uint16_t)0x180f));
+    }
+    legacyAdvertising.setCompleteServices(NimBLEUUID(MESH_SERVICE_UUID));
+    legacyAdvertising.setMinInterval(500);
+    legacyAdvertising.setMaxInterval(1000);
+
+    NimBLEExtAdvertisement legacyScanResponse;
+    legacyScanResponse.setLegacyAdvertising(true);
+    legacyScanResponse.setConnectable(true);
+    legacyScanResponse.setName(getDeviceName());
+
+    if (!pAdvertising->setInstanceData(0, legacyAdvertising)) {
+        LOG_ERROR("BLE failed to set legacyAdvertising");
+    } else if (!pAdvertising->setScanResponseData(0, legacyScanResponse)) {
+        LOG_ERROR("BLE failed to set legacyScanResponse");
+    } else if (!pAdvertising->start(0, 0, 0)) {
+        LOG_ERROR("BLE failed to start legacyAdvertising");
+    }
+#else
+    NimBLEAdvertising *pAdvertising = NimBLEDevice::getAdvertising();
+    pAdvertising->reset();
+    pAdvertising->addServiceUUID(MESH_SERVICE_UUID);
+    pAdvertising->addServiceUUID(NimBLEUUID((uint16_t)0x180f)); // 0x180F is the Battery Service
+    pAdvertising->start(0);
+#endif
+}
+
 /// Given a level between 0-100, update the BLE attribute
 void updateBatteryLevel(uint8_t level)
 {
    if ((config.bluetooth.enabled == true) && bleServer && nimbleBluetooth->isConnected()) {
        BatteryCharacteristic->setValue(&level, 1);
+#ifdef NIMBLE_TWO
        BatteryCharacteristic->notify(&level, 1, BLE_HS_CONN_HANDLE_NONE);
+#else
+        BatteryCharacteristic->notify();
+#endif
    }
 }

@@ -909,7 +974,11 @@ void NimbleBluetooth::sendLog(const uint8_t *logMessage, size_t length)
    if (!bleServer || !isConnected() || length > 512) {
        return;
    }
+#ifdef NIMBLE_TWO
    logRadioCharacteristic->notify(logMessage, length, BLE_HS_CONN_HANDLE_NONE);
+#else
+    logRadioCharacteristic->notify(logMessage, length, true);
+#endif
 }

 void clearNVS()
--- a/src/nimble/NimbleBluetooth.h
+++ b/src/nimble/NimbleBluetooth.h
@@ -12,11 +12,16 @@ class NimbleBluetooth : BluetoothApi
    bool isConnected();
    int getRssi();
    void sendLog(const uint8_t *logMessage, size_t length);
+#if defined(NIMBLE_TWO)
    void startAdvertising();
+#endif
    bool isDeInit = false;

  private:
    void setupService();
+#if !defined(NIMBLE_TWO)
+    void startAdvertising();
+#endif
 };

 void setBluetoothEnable(bool enable);
--- a/src/platform/esp32/main-esp32.cpp
+++ b/src/platform/esp32/main-esp32.cpp
@@ -169,6 +169,8 @@ void esp32Setup()
 // #define APP_WATCHDOG_SECS 45
 #define APP_WATCHDOG_SECS 90

+// esp_task_wdt_init returns an unknown error, so skip it on ESP32H2
+#ifndef CONFIG_IDF_TARGET_ESP32H2
 #ifdef CONFIG_IDF_TARGET_ESP32C6
    esp_task_wdt_config_t *wdt_config = (esp_task_wdt_config_t *)malloc(sizeof(esp_task_wdt_config_t));
    wdt_config->timeout_ms = APP_WATCHDOG_SECS * 1000;
@@ -181,7 +183,7 @@ void esp32Setup()
 #endif
    res = esp_task_wdt_add(NULL);
    assert(res == ESP_OK);
-
+#endif
 #if HAS_32768HZ
    enableSlowCLK();
 #endif
@@ -223,9 +225,10 @@ void cpuDeepSleep(uint32_t msecToWake)
        13,
 #endif
        34, 35, 37};
-
+#ifndef CONFIG_IDF_TARGET_ESP32H2
    for (int i = 0; i < sizeof(rtcGpios); i++)
        rtc_gpio_isolate((gpio_num_t)rtcGpios[i]);
+#endif
 #endif

        // FIXME, disable internal rtc pullups/pulldowns on the non isolated pins. for inputs that we aren't using
@@ -258,10 +261,10 @@ void cpuDeepSleep(uint32_t msecToWake)

 #endif // #end ESP32S3_WAKE_TYPE
 #endif
-
+#ifdef ESP_PD_DOMAIN_RTC_PERIPH
    // We want RTC peripherals to stay on
    esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
-
+#endif
    esp_sleep_enable_timer_wakeup(msecToWake * 1000ULL); // call expects usecs
    esp_deep_sleep_start();                              // TBD mA sleep current (battery)
 }
--- a/src/platform/nrf52/main-nrf52.cpp
+++ b/src/platform/nrf52/main-nrf52.cpp
@@ -337,7 +337,7 @@ void cpuDeepSleep(uint32_t msecToWake)
 #endif

 #ifdef TTGO_T_ECHO
-    // To power off the T-Echo, the display must be set
+    // 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);
--- a/src/platform/portduino/PortduinoGlue.cpp
+++ b/src/platform/portduino/PortduinoGlue.cpp
@@ -6,7 +6,6 @@
 #include "target_specific.h"

 #include "PortduinoGlue.h"
-#include "SHA256.h"
 #include "api/ServerAPI.h"
 #include "linux/gpio/LinuxGPIOPin.h"
 #include "meshUtils.h"
@@ -30,7 +29,6 @@

 portduino_config_struct portduino_config;
 std::ofstream traceFile;
-std::ofstream JSONFile;
 Ch341Hal *ch341Hal = nullptr;
 char *configPath = nullptr;
 char *optionMac = nullptr;
@@ -271,37 +269,7 @@ void portduinoSetup()
                }
                std::cout << "autoconf: Found Pi HAT+ " << hat_vendor << " " << autoconf_product << " at /proc/device-tree/hat"
                          << std::endl;
-
-                std::ifstream hatUUID("/proc/device-tree/hat/uuid");
-                char uuid[37] = {0};
-                if (hatUUID.is_open()) {
-                    hatUUID.read(uuid, 37);
-                    hatUUID.close();
-                    std::cout << "autoconf: UUID " << uuid << std::endl;
-                    SHA256 uuid_hash;
-                    uint8_t uuid_hash_bytes[32] = {0};
-
-                    uuid_hash.reset();
-                    uuid_hash.update(uuid, 37);
-                    uuid_hash.finalize(uuid_hash_bytes, 32);
-
-                    for (int j = 0; j < 16; j++) {
-                        portduino_config.device_id[j] = uuid_hash_bytes[j];
-                    }
-                    portduino_config.has_device_id = true;
-                    uint8_t dmac[6] = {0};
-                    dmac[0] = (uuid_hash_bytes[17] << 4) | 2;
-                    dmac[1] = uuid_hash_bytes[18];
-                    dmac[2] = uuid_hash_bytes[19];
-                    dmac[3] = uuid_hash_bytes[20];
-                    dmac[4] = uuid_hash_bytes[21];
-                    dmac[5] = uuid_hash_bytes[22];
-                    char macBuf[13] = {0};
-                    sprintf(macBuf, "%02X%02X%02X%02X%02X%02X", dmac[0], dmac[1], dmac[2], dmac[3], dmac[4], dmac[5]);
-                    portduino_config.mac_address = macBuf;
-                    found_hat = true;
-                }
-
+                found_hat = true;
            } else {
                std::cout << "autoconf: Could not locate Pi HAT+ at /proc/device-tree/hat" << std::endl;
            }
@@ -495,7 +463,6 @@ void portduinoSetup()
    if (portduino_config.lora_spi_dev != "" && portduino_config.lora_spi_dev != "ch341") {
        SPI.begin(portduino_config.lora_spi_dev.c_str());
    }
-
    if (portduino_config.traceFilename != "") {
        try {
            traceFile.open(portduino_config.traceFilename, std::ios::out | std::ios::app);
@@ -503,21 +470,6 @@ void portduinoSetup()
            std::cout << "*** traceFile Exception " << e.what() << std::endl;
            exit(EXIT_FAILURE);
        }
-        if (!traceFile.is_open()) {
-            std::cout << "*** traceFile open failure" << std::endl;
-            exit(EXIT_FAILURE);
-        }
-    } else if (portduino_config.JSONFilename != "") {
-        try {
-            JSONFile.open(portduino_config.JSONFilename, std::ios::out | std::ios::app);
-        } catch (std::ofstream::failure &e) {
-            std::cout << "*** JSONFile Exception " << e.what() << std::endl;
-            exit(EXIT_FAILURE);
-        }
-        if (!JSONFile.is_open()) {
-            std::cout << "*** JSONFile open failure" << std::endl;
-            exit(EXIT_FAILURE);
-        }
    }
    if (verboseEnabled && portduino_config.logoutputlevel != level_trace) {
        portduino_config.logoutputlevel = level_debug;
@@ -565,29 +517,6 @@ bool loadConfig(const char *configPath)
                portduino_config.logoutputlevel = level_error;
            }
            portduino_config.traceFilename = yamlConfig["Logging"]["TraceFile"].as<std::string>("");
-            portduino_config.JSONFilename = yamlConfig["Logging"]["JSONFile"].as<std::string>("");
-            portduino_config.JSONFilter = (_meshtastic_PortNum)yamlConfig["Logging"]["JSONFilter"].as<int>(0);
-            if (yamlConfig["Logging"]["JSONFilter"].as<std::string>("") == "textmessage")
-                portduino_config.JSONFilter = meshtastic_PortNum_TEXT_MESSAGE_APP;
-            else if (yamlConfig["Logging"]["JSONFilter"].as<std::string>("") == "telemetry")
-                portduino_config.JSONFilter = meshtastic_PortNum_TELEMETRY_APP;
-            else if (yamlConfig["Logging"]["JSONFilter"].as<std::string>("") == "nodeinfo")
-                portduino_config.JSONFilter = meshtastic_PortNum_NODEINFO_APP;
-            else if (yamlConfig["Logging"]["JSONFilter"].as<std::string>("") == "position")
-                portduino_config.JSONFilter = meshtastic_PortNum_POSITION_APP;
-            else if (yamlConfig["Logging"]["JSONFilter"].as<std::string>("") == "waypoint")
-                portduino_config.JSONFilter = meshtastic_PortNum_WAYPOINT_APP;
-            else if (yamlConfig["Logging"]["JSONFilter"].as<std::string>("") == "neighborinfo")
-                portduino_config.JSONFilter = meshtastic_PortNum_NEIGHBORINFO_APP;
-            else if (yamlConfig["Logging"]["JSONFilter"].as<std::string>("") == "traceroute")
-                portduino_config.JSONFilter = meshtastic_PortNum_TRACEROUTE_APP;
-            else if (yamlConfig["Logging"]["JSONFilter"].as<std::string>("") == "detection")
-                portduino_config.JSONFilter = meshtastic_PortNum_DETECTION_SENSOR_APP;
-            else if (yamlConfig["Logging"]["JSONFilter"].as<std::string>("") == "paxcounter")
-                portduino_config.JSONFilter = meshtastic_PortNum_PAXCOUNTER_APP;
-            else if (yamlConfig["Logging"]["JSONFilter"].as<std::string>("") == "remotehardware")
-                portduino_config.JSONFilter = meshtastic_PortNum_REMOTE_HARDWARE_APP;
-
            if (yamlConfig["Logging"]["AsciiLogs"]) {
                // Default is !isatty(1) but can be set explicitly in config.yaml
                portduino_config.ascii_logs = yamlConfig["Logging"]["AsciiLogs"].as<bool>();
--- a/src/platform/portduino/PortduinoGlue.h
+++ b/src/platform/portduino/PortduinoGlue.h
@@ -5,7 +5,6 @@

 #include "LR11x0Interface.h"
 #include "Module.h"
-#include "mesh/generated/meshtastic/mesh.pb.h"
 #include "platform/portduino/USBHal.h"
 #include "yaml-cpp/yaml.h"

@@ -47,8 +46,6 @@ struct pinMapping {
 };

 extern std::ofstream traceFile;
-extern std::ofstream JSONFile;
-
 extern Ch341Hal *ch341Hal;
 int initGPIOPin(int pinNum, std::string gpioChipname, int line);
 bool loadConfig(const char *configPath);
@@ -151,9 +148,6 @@ extern struct portduino_config_struct {
    bool ascii_logs = !isatty(1);
    bool ascii_logs_explicit = false;

-    std::string JSONFilename;
-    meshtastic_PortNum JSONFilter = (_meshtastic_PortNum)0;
-
    // Webserver
    std::string webserver_root_path = "";
    std::string webserver_ssl_key_path = "/etc/meshtasticd/ssl/private_key.pem";
@@ -419,29 +413,6 @@ extern struct portduino_config_struct {
        }
        if (traceFilename != "")
            out << YAML::Key << "TraceFile" << YAML::Value << traceFilename;
-        if (JSONFilename != "") {
-            out << YAML::Key << "JSONFile" << YAML::Value << JSONFilename;
-            if (JSONFilter == meshtastic_PortNum_TEXT_MESSAGE_APP)
-                out << YAML::Key << "JSONFilter" << YAML::Value << "textmessage";
-            else if (JSONFilter == meshtastic_PortNum_TELEMETRY_APP)
-                out << YAML::Key << "JSONFilter" << YAML::Value << "telemetry";
-            else if (JSONFilter == meshtastic_PortNum_NODEINFO_APP)
-                out << YAML::Key << "JSONFilter" << YAML::Value << "nodeinfo";
-            else if (JSONFilter == meshtastic_PortNum_POSITION_APP)
-                out << YAML::Key << "JSONFilter" << YAML::Value << "position";
-            else if (JSONFilter == meshtastic_PortNum_WAYPOINT_APP)
-                out << YAML::Key << "JSONFilter" << YAML::Value << "waypoint";
-            else if (JSONFilter == meshtastic_PortNum_NEIGHBORINFO_APP)
-                out << YAML::Key << "JSONFilter" << YAML::Value << "neighborinfo";
-            else if (JSONFilter == meshtastic_PortNum_TRACEROUTE_APP)
-                out << YAML::Key << "JSONFilter" << YAML::Value << "traceroute";
-            else if (JSONFilter == meshtastic_PortNum_DETECTION_SENSOR_APP)
-                out << YAML::Key << "JSONFilter" << YAML::Value << "detection";
-            else if (JSONFilter == meshtastic_PortNum_PAXCOUNTER_APP)
-                out << YAML::Key << "JSONFilter" << YAML::Value << "paxcounter";
-            else if (JSONFilter == meshtastic_PortNum_REMOTE_HARDWARE_APP)
-                out << YAML::Key << "JSONFilter" << YAML::Value << "remotehardware";
-        }
        if (ascii_logs_explicit) {
            out << YAML::Key << "AsciiLogs" << YAML::Value << ascii_logs;
        }
--- a/src/sleep.cpp
+++ b/src/sleep.cpp
@@ -388,10 +388,10 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t sleepMsec) // FIXME, use a more r
    uint64_t sleepUsec = sleepMsec * 1000LL;

    // NOTE! ESP docs say we must disable bluetooth and wifi before light sleep
-
+#ifdef ESP_PD_DOMAIN_RTC_PERIPH
    // We want RTC peripherals to stay on
    esp_sleep_pd_config(ESP_PD_DOMAIN_RTC_PERIPH, ESP_PD_OPTION_ON);
-
+#endif
 #if defined(BUTTON_PIN) && defined(BUTTON_NEED_PULLUP)
    gpio_pullup_en((gpio_num_t)BUTTON_PIN);
 #endif
@@ -523,6 +523,8 @@ void enableModemSleep()
    esp32_config.max_freq_mhz = CONFIG_ESP32S2_DEFAULT_CPU_FREQ_MHZ;
 #elif CONFIG_IDF_TARGET_ESP32C6
    esp32_config.max_freq_mhz = CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ;
+#elif CONFIG_IDF_TARGET_ESP32H2
+    esp32_config.max_freq_mhz = CONFIG_ESP_DEFAULT_CPU_FREQ_MHZ;
 #elif CONFIG_IDF_TARGET_ESP32C3
    esp32_config.max_freq_mhz = CONFIG_ESP32C3_DEFAULT_CPU_FREQ_MHZ;
 #else
--- a/test/test_mqtt/MQTT.cpp
+++ b/test/test_mqtt/MQTT.cpp
@@ -605,13 +605,12 @@ void test_receiveAcksOwnSentMessages(void)

    unitTest->publish(&p, nodeDB->getNodeId().c_str());

-    // FIXME: Better assertion for this test
-    // TEST_ASSERT_TRUE(mockRouter->packets_.empty());
-    // TEST_ASSERT_EQUAL(1, mockRoutingModule->ackNacks_.size());
-    // const auto &[err, to, idFrom, chIndex, hopLimit] = mockRoutingModule->ackNacks_.front();
-    // TEST_ASSERT_EQUAL(meshtastic_Routing_Error_NONE, err);
-    // TEST_ASSERT_EQUAL(myNodeInfo.my_node_num, to);
-    // TEST_ASSERT_EQUAL(p.id, idFrom);
+    TEST_ASSERT_TRUE(mockRouter->packets_.empty());
+    TEST_ASSERT_EQUAL(1, mockRoutingModule->ackNacks_.size());
+    const auto &[err, to, idFrom, chIndex, hopLimit] = mockRoutingModule->ackNacks_.front();
+    TEST_ASSERT_EQUAL(meshtastic_Routing_Error_NONE, err);
+    TEST_ASSERT_EQUAL(myNodeInfo.my_node_num, to);
+    TEST_ASSERT_EQUAL(p.id, idFrom);
 }

 // Should ignore our own messages from MQTT that were heard by other nodes.
--- a/variants/esp32/diy/dr-dev/platformio.ini
+++ b/variants/esp32/diy/dr-dev/platformio.ini
@@ -2,7 +2,6 @@
 [env:meshtastic-dr-dev]
 extends = esp32_base
 board = esp32doit-devkit-v1
-board_level = extra
 board_upload.maximum_size = 4194304
 board_upload.maximum_ram_size = 532480
 build_flags =
--- a/variants/esp32/esp32.ini
+++ b/variants/esp32/esp32.ini
@@ -5,7 +5,7 @@ custom_esp32_kind = esp32
 custom_mtjson_part =
 platform =
  # renovate: datasource=custom.pio depName=platformio/espressif32 packageName=platformio/platform/espressif32
-  platformio/espressif32@6.12.0
+  platformio/espressif32@6.11.0

 extra_scripts =
  ${env.extra_scripts}
@@ -38,7 +38,6 @@ build_flags =
  -DAXP_DEBUG_PORT=Serial
  -DCONFIG_BT_NIMBLE_ENABLED
  -DCONFIG_BT_NIMBLE_MAX_BONDS=6 # default is 3
-  -DCONFIG_BT_NIMBLE_ROLE_CENTRAL_DISABLED
  -DCONFIG_NIMBLE_CPP_LOG_LEVEL=2
  -DCONFIG_BT_NIMBLE_MAX_CCCDS=20
  -DCONFIG_BT_NIMBLE_HOST_TASK_STACK_SIZE=8192
@@ -60,7 +59,7 @@ lib_deps =
  # renovate: datasource=git-refs depName=meshtastic-esp32_https_server packageName=https://github.com/meshtastic/esp32_https_server gitBranch=master
  https://github.com/meshtastic/esp32_https_server/archive/3223704846752e6d545139204837bdb2a55459ca.zip
  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
-  h2zero/NimBLE-Arduino@^2.3.7
+  h2zero/NimBLE-Arduino@^1.4.3
  # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
  https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
  # renovate: datasource=github-tags depName=XPowersLib packageName=lewisxhe/XPowersLib
--- a/variants/esp32/tbeam/platformio.ini
+++ b/variants/esp32/tbeam/platformio.ini
@@ -2,7 +2,7 @@
 [env:tbeam]
 extends = esp32_base
 board = ttgo-t-beam
-board_level = extra
+board_level = pr
 board_check = true
 lib_deps = ${esp32_base.lib_deps}
 build_flags = ${esp32_base.build_flags}
--- a/variants/esp32c3/esp32c3.ini
+++ b/variants/esp32c3/esp32c3.ini
@@ -4,8 +4,3 @@ custom_esp32_kind = esp32c3

 monitor_speed = 115200
 monitor_filters = esp32_c3_exception_decoder
-
-build_flags =
-	${esp32_base.build_flags}
-	-DCONFIG_BT_NIMBLE_EXT_ADV=1
-	-DCONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES=2
--- a/variants/esp32c6/m5stack_unitc6l/platformio.ini
+++ b/variants/esp32c6/m5stack_unitc6l/platformio.ini
@@ -13,7 +13,7 @@ build_unflags =
 lib_deps =
  ${esp32c6_base.lib_deps}
  adafruit/Adafruit NeoPixel@^1.12.3
-  h2zero/NimBLE-Arduino@^2.3.7
+  h2zero/NimBLE-Arduino@^2.3.6
 build_flags = 
  ${esp32c6_base.build_flags}
  -D M5STACK_UNITC6L
@@ -24,6 +24,7 @@ build_flags =
  -D HAS_BLUETOOTH=1
 	-DCONFIG_BT_NIMBLE_EXT_ADV=1
 	-DCONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES=2
+  -D NIMBLE_TWO
 monitor_speed=115200
 lib_ignore =
  NonBlockingRTTTL
--- a/variants/esp32h2/esp32h2.ini
+++ b/variants/esp32h2/esp32h2.ini
@@ -0,0 +1,47 @@
+[esp32h2_base]
+extends = esp32_base
+platform =
+  # Do not renovate until we have switched to pioarduino tagged builds
+  https://github.com/Jason2866/platform-espressif32/archive/39475a7213fa3a52b0c2048d1a31c215fc85fcf8.zip
+build_flags =
+  ${arduino_base.build_flags}
+  -Wall
+  -Wextra
+  -Isrc/platform/esp32
+  -std=c++11
+  -DESP_OPENSSL_SUPPRESS_LEGACY_WARNING
+  -DSERIAL_BUFFER_SIZE=4096
+  -DLIBPAX_ARDUINO
+  -DLIBPAX_WIFI
+  -DLIBPAX_BLE
+  -DMESHTASTIC_EXCLUDE_WEBSERVER
+  ;-DDEBUG_HEAP
+  ; TEMP
+  -DHAS_BLUETOOTH=0
+  -DMESHTASTIC_EXCLUDE_PAXCOUNTER
+  -DMESHTASTIC_EXCLUDE_BLUETOOTH
+
+lib_deps =
+  ${arduino_base.lib_deps}
+  ${networking_base.lib_deps}
+  ${environmental_base.lib_deps}
+  ${environmental_extra.lib_deps}
+  ${radiolib_base.lib_deps}
+  # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
+  lewisxhe/XPowersLib@0.3.1
+  # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
+  https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
+  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
+  rweather/Crypto@0.4.0
+
+build_src_filter = 
+ ${esp32_base.build_src_filter} -<mesh/http> 
+
+monitor_speed = 460800
+monitor_filters = esp32_h2_exception_decoder
+
+lib_ignore =
+  NonBlockingRTTTL
+  NimBLE-Arduino
+  libpax
+  
--- a/variants/esp32h2/waveshare-esp32-h2/platformio.ini
+++ b/variants/esp32h2/waveshare-esp32-h2/platformio.ini
@@ -0,0 +1,11 @@
+[env:waveshare-esp32h2]
+extends = esp32h2_base
+board = esp32-h2-devkitm-1
+board_build.f_flash = 16000000L
+board_level = pr
+build_flags = 
+  ${esp32h2_base.build_flags}
+  -I variants/esp32h2/waveshare-esp32-h2
+  -DARDUINO_USB_CDC_ON_BOOT=1
+  -DARDUINO_USB_MODE=1
+  -DHAS_WIFI=0
--- a/variants/esp32h2/waveshare-esp32-h2/variant.h
+++ b/variants/esp32h2/waveshare-esp32-h2/variant.h
@@ -0,0 +1,8 @@
+
+#define HAS_SCREEN 0
+#define HAS_WIFI 0
+
+#define LORA_SCK 4
+#define LORA_MISO 3
+#define LORA_MOSI 2
+#define LORA_CS 1
--- a/variants/esp32s3/esp32s3.ini
+++ b/variants/esp32s3/esp32s3.ini
@@ -3,8 +3,3 @@ extends = esp32_base
 custom_esp32_kind = esp32s3

 monitor_speed = 115200
-
-build_flags =
-	${esp32_base.build_flags}
-	-DCONFIG_BT_NIMBLE_EXT_ADV=1
-	-DCONFIG_BT_NIMBLE_MAX_EXT_ADV_INSTANCES=2
--- a/variants/esp32s3/link32_s3_v1/platformio.ini
+++ b/variants/esp32s3/link32_s3_v1/platformio.ini
@@ -1,7 +1,6 @@
 [env:link32-s3-v1]
 extends = esp32s3_base
 board = esp32-s3-devkitc-1
-board_level = extra
 build_flags = 
  ${esp32_base.build_flags}
  -D LINK_32
--- a/variants/nrf52840/ELECROW-ThinkNode-M3/variant.cpp
+++ b/variants/nrf52840/ELECROW-ThinkNode-M3/variant.cpp
@@ -63,20 +63,9 @@ void initVariant()
 // called from main-nrf52.cpp during the cpuDeepSleep() function
 void variant_shutdown()
 {
-    digitalWrite(red_LED_PIN, HIGH);
-    digitalWrite(green_LED_PIN, HIGH);
-    digitalWrite(LED_BLUE, HIGH);
-
-    digitalWrite(PIN_EN1, LOW);
-    digitalWrite(PIN_EN2, LOW);
    digitalWrite(EEPROM_POWER, LOW);
    digitalWrite(KEY_POWER, LOW);
-    digitalWrite(DHT_POWER, LOW);
-    digitalWrite(ACC_POWER, LOW);
-    digitalWrite(Battery_POWER, LOW);
-    digitalWrite(GPS_POWER, LOW);

-    // This sets the pin to OUTPUT and LOW for the pins *not* in the if block.
    for (int pin = 0; pin < 48; pin++) {
        if (pin == PIN_POWER_USB || pin == BUTTON_PIN || pin == PIN_EN1 || pin == PIN_EN2 || pin == DHT_POWER ||
            pin == ACC_POWER || pin == Battery_POWER || pin == GPS_POWER || pin == LR1110_SPI_MISO_PIN ||
--- a/variants/nrf52840/ELECROW-ThinkNode-M3/variant.h
+++ b/variants/nrf52840/ELECROW-ThinkNode-M3/variant.h
@@ -54,7 +54,6 @@ extern "C" {
 #define LED_POWER red_LED_PIN
 #define LED_CHARGE LED_POWER // Signals the Status LED Module to handle this LED
 #define green_LED_PIN 35
-#define PIN_LED2 green_LED_PIN
 #define LED_BLUE 37
 #define LED_PAIRING LED_BLUE // Signals the Status LED Module to handle this LED

--- a/variants/nrf52840/nrf52.ini
+++ b/variants/nrf52840/nrf52.ini
@@ -19,6 +19,7 @@ build_type = release
 build_flags =
  -include variants/nrf52840/cpp_overrides/lfs_util.h
  ${arduino_base.build_flags}
+  -DSERIAL_BUFFER_SIZE=1024
  -Wno-unused-variable
  -Isrc/platform/nrf52
  -DLFS_NO_ASSERT                      ; Disable LFS assertions , see https://github.com/meshtastic/firmware/pull/3818
--- a/variants/nrf52840/nrf52832.ini
+++ b/variants/nrf52840/nrf52832.ini
@@ -1,9 +1,7 @@
 [nrf52832_base]
 extends = nrf52_base

-build_flags =
-  ${nrf52_base.build_flags}
-  -DSERIAL_BUFFER_SIZE=1024
+build_flags = ${nrf52_base.build_flags} 

 lib_deps =
  ${nrf52_base.lib_deps}
--- a/variants/nrf52840/nrf52840.ini
+++ b/variants/nrf52840/nrf52840.ini
@@ -1,9 +1,7 @@
 [nrf52840_base]
 extends = nrf52_base

-build_flags =
-   ${nrf52_base.build_flags}
-  -DSERIAL_BUFFER_SIZE=4096
+build_flags = ${nrf52_base.build_flags} 

 lib_deps =
  ${nrf52_base.lib_deps}
--- a/variants/rp2040/feather_rp2040_rfm95/platformio.ini
+++ b/variants/rp2040/feather_rp2040_rfm95/platformio.ini
@@ -1,7 +1,6 @@
 [env:feather_rp2040_rfm95]
 extends = rp2040_base
 board = adafruit_feather
-board_level = extra
 upload_protocol = picotool
 # add our variants files to the include and src paths
 build_flags =
Author	SHA1	Message	Date
Jonathan Bennett	0f0e704f29	Merge branch 'develop' into esp32-h2	2025-12-10 11:11:57 -06:00
Jonathan Bennett	23aaee737a	Merge branch 'develop' into esp32-h2	2025-12-09 20:57:47 -06:00
Jonathan Bennett	42c46cad41	Merge branch 'develop' into esp32-h2	2025-12-08 16:52:00 -06:00
Jonathan Bennett	f0b72a4b4b	Move the esp32-h2 .ini	2025-12-08 16:49:01 -06:00
Jonathan Bennett	24ca4602b1	roughed in support for esp32-h2 via Waveshare dev board	2025-12-06 12:42:05 -06:00