Update src/graphics/draw/MessageRenderer.cpp

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
Refine message history limits for resource-constrained builds and cap cached lines to prevent heap overflow
2026-10-09 05:22:18 +10:00 · 2026-04-13 11:31:19 -05:00 · 2026-04-13 11:06:30 -05:00 · 2026-04-13 09:14:56 -05:00 · 2026-04-13 09:14:22 -05:00 · 2026-04-13 09:13:02 -05:00
105 changed files with 3458 additions and 5516 deletions
@@ -4,14 +4,9 @@ on:
  workflow_dispatch:
    inputs:
      # trunk-ignore(checkov/CKV_GHA_7)
-      target:
-        type: string
-        required: false
-        description: Choose the target board, e.g. nrf52_promicro_diy_tcxo. If blank, will find available targets.
      arch:
        type: choice
        options:
-          - all
          - esp32
          - esp32s3
          - esp32c3
@@ -20,18 +15,32 @@ on:
          - rp2040
          - rp2350
          - stm32
-        description: Choose an arch to limit the search, or 'all' to search all architectures.
-        default: all
+      target:
+        type: string
+        required: false
+        description: Choose the target board, e.g. nrf52_promicro_diy_tcxo. If blank, will find available targets.
+      # find-target:
+      #   type: boolean
+      #   default: true
+      #   description: 'Find the available targets'

 permissions: read-all

 jobs:
  find-targets:
+    if: ${{ inputs.target == '' }}
    strategy:
      fail-fast: false
      matrix:
        arch:
-          - all
+          - esp32
+          - esp32s3
+          - esp32c3
+          - esp32c6
+          - nrf52840
+          - rp2040
+          - rp2350
+          - stm32
    runs-on: ubuntu-24.04
    steps:
      - uses: actions/checkout@v6
@@ -42,37 +51,14 @@ jobs:
      - run: pip install -U platformio
      - name: Generate matrix
        id: jsonStep
-        env:
-          BUILDTARGET: ${{ inputs.target }}
-          MATRIXARCH: ${{ inputs.arch }}
        run: |
          TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}} --level extra)
-          if [ "$BUILDTARGET" = "" ]; then
-            echo "Name: $GITHUB_REF_NAME" >> $GITHUB_STEP_SUMMARY
-            echo "Base: $GITHUB_BASE_REF" >> $GITHUB_STEP_SUMMARY
-            echo "Arch: $MATRIXARCH" >> $GITHUB_STEP_SUMMARY
-            echo "Ref: $GITHUB_REF" >> $GITHUB_STEP_SUMMARY
-            echo "## 🎯 The following target boards are available to build:" >> $GITHUB_STEP_SUMMARY
-            echo "| Platform | Board |" >> $GITHUB_STEP_SUMMARY
-            echo "| -------- | ----- |" >> $GITHUB_STEP_SUMMARY
-            echo $TARGETS | jq -r 'sort_by(.board) | sort_by(.platform) |.[] | "| " + .platform + " | " + .board + " |" ' >> $GITHUB_STEP_SUMMARY
-          else
-            echo "We build this one:" >> $GITHUB_STEP_SUMMARY
-            ARCH=$(echo "$TARGETS" | jq --arg BUILDTARGET "$BUILDTARGET" -r '.[] | select(.board==$BUILDTARGET) | .platform')
-            echo "| Platform | Board |" >> $GITHUB_STEP_SUMMARY
-            echo "| -------- | ----- |" >> $GITHUB_STEP_SUMMARY
-            echo "| $ARCH | "$BUILDTARGET" |" >> $GITHUB_STEP_SUMMARY
-            echo "" >> $GITHUB_STEP_SUMMARY
-            if [[ "$ARCH" == "" ]]; then
-              echo "## ❌ Error: Target "$BUILDTARGET" not found!" >> $GITHUB_STEP_SUMMARY
-            else
-              echo "## ✅ Target "$BUILDTARGET" found, proceeding to build." >> $GITHUB_STEP_SUMMARY
-            fi
-            echo "You may need to refresh this page to make the built firmware appear below." >> $GITHUB_STEP_SUMMARY
-            echo "arch=$ARCH" >> $GITHUB_OUTPUT
-          fi
-    outputs:
-      arch: ${{ steps.jsonStep.outputs.arch }}
+          echo "Name: $GITHUB_REF_NAME" >> $GITHUB_STEP_SUMMARY
+          echo "Base: $GITHUB_BASE_REF" >> $GITHUB_STEP_SUMMARY
+          echo "Arch: ${{matrix.arch}}" >> $GITHUB_STEP_SUMMARY
+          echo "Ref: $GITHUB_REF" >> $GITHUB_STEP_SUMMARY
+          echo "Targets:" >> $GITHUB_STEP_SUMMARY
+          echo $TARGETS | jq -r 'sort_by(.board) |.[] | "- " + .board' >> $GITHUB_STEP_SUMMARY

  version:
    if: ${{ inputs.target != '' }}
@@ -92,12 +78,12 @@ jobs:

  build:
    if: ${{ inputs.target != '' && inputs.arch != 'native' }}
-    needs: [version, find-targets]
+    needs: [version]
    uses: ./.github/workflows/build_firmware.yml
    with:
      version: ${{ needs.version.outputs.long }}
      pio_env: ${{ inputs.target }}
-      platform: ${{ needs.find-targets.outputs.arch }}
+      platform: ${{ inputs.arch }}

  gather-artifacts:
    permissions:
@@ -56,6 +56,25 @@ jobs:
          echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
        id: version

+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v4
+        with:
+          cache-image: true
+
+      - name: Docker setup
+        uses: docker/setup-buildx-action@v4
+        with:
+          # Add Google/Amazon DockerHub mirrors to buildkit config
+          # https://docs.docker.com/build/ci/github-actions/configure-builder/#registry-mirror
+          buildkitd-config-inline: |
+            [registry."docker.io"]
+              mirrors = ["mirror.gcr.io", "public.ecr.aws"]
+
+      - name: Sanitize platform string
+        id: sanitize_platform
+        # Replace slashes with underscores
+        run: echo "cleaned_platform=${{ inputs.platform }}" | sed 's/\//_/g' >> $GITHUB_OUTPUT
+
      - name: Docker login
        if: ${{ inputs.push }}
        uses: docker/login-action@v4
@@ -63,17 +82,6 @@ jobs:
          username: meshtastic
          password: ${{ secrets.DOCKER_FIRMWARE_TOKEN }}

-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4
-
-      - name: Docker setup
-        uses: docker/setup-buildx-action@v4
-
-      - name: Sanitize platform string
-        id: sanitize_platform
-        # Replace slashes with underscores
-        run: echo "cleaned_platform=${{ inputs.platform }}" | sed 's/\//_/g' >> $GITHUB_OUTPUT
-
      - name: Docker tag
        id: meta
        uses: docker/metadata-action@v6
@@ -95,3 +103,6 @@ jobs:
          platforms: ${{ inputs.platform }}
          build-args: |
            PIO_ENV=${{ inputs.pio_env }}
+          # Cache image layers in GitHub Actions cache to speed up subsequent builds.
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
@@ -301,15 +301,17 @@ jobs:
        id: release_notes
        run: |
          chmod +x ./bin/generate_release_notes.py
-          NOTES=$(./bin/generate_release_notes.py ${{ needs.version.outputs.long }})
+          NOTES=$(./bin/generate_release_notes.py ${{ needs.version.outputs.long }} --compare-ref HEAD 2>release_notes.log)
          echo "notes<<EOF" >> $GITHUB_OUTPUT
          echo "$NOTES" >> $GITHUB_OUTPUT
          echo "EOF" >> $GITHUB_OUTPUT
+          echo "### Release note range" >> $GITHUB_STEP_SUMMARY
+          cat release_notes.log >> $GITHUB_STEP_SUMMARY
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

      - name: Create release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
        id: create_release
        with:
          draft: true
@@ -466,7 +468,7 @@ jobs:
      - name: Generate release notes
        run: |
          chmod +x ./bin/generate_release_notes.py
-          ./bin/generate_release_notes.py ${{ needs.version.outputs.long }} > ./publish/release_notes.md
+          ./bin/generate_release_notes.py ${{ needs.version.outputs.long }} --compare-ref HEAD > ./publish/release_notes.md
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

@@ -38,7 +38,7 @@ jobs:

      - name: Apply quality label if needed
        if: steps.quality.outputs.response != '' && steps.quality.outputs.response != 'ok'
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
        env:
          QUALITY_LABEL: ${{ steps.quality.outputs.response }}
        with:
@@ -80,7 +80,7 @@ jobs:
      # ─────────────────────────────────────────────────────────────────────────
      - name: Determine if completeness check should be skipped
        if: steps.quality.outputs.response == 'ok' || steps.quality.outputs.response == ''
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
        id: check-skip
        with:
          script: |
@@ -134,7 +134,7 @@ jobs:

      - name: Process analysis result
        if: (steps.quality.outputs.response == 'ok' || steps.quality.outputs.response == '') && steps.check-skip.outputs.should_skip != 'true' && steps.analysis.outputs.response != ''
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
        id: process
        env:
          AI_RESPONSE: ${{ steps.analysis.outputs.response }}
@@ -174,7 +174,7 @@ jobs:

      - name: Apply triage label
        if: steps.process.outputs.label != '' && steps.process.outputs.label != 'none'
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
        env:
          LABEL_NAME: ${{ steps.process.outputs.label }}
        with:
@@ -200,7 +200,7 @@ jobs:

      - name: Comment on issue
        if: steps.process.outputs.should_comment == 'true'
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
        env:
          COMMENT_BODY: ${{ steps.process.outputs.comment_body }}
        with:
@@ -22,7 +22,7 @@ jobs:
      # Step 1: Check if PR already has automation/type labels (skip if so)
      # ─────────────────────────────────────────────────────────────────────────
      - name: Check existing labels
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
        id: check-labels
        with:
          script: |
@@ -58,7 +58,7 @@ jobs:

      - name: Apply quality label if needed
        if: steps.check-labels.outputs.skip_all != 'true' && steps.quality.outputs.response != '' && steps.quality.outputs.response != 'ok'
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
        id: quality-label
        env:
          QUALITY_LABEL: ${{ steps.quality.outputs.response }}
@@ -113,7 +113,7 @@ jobs:

      - name: Apply type label
        if: steps.check-labels.outputs.skip_all != 'true' && steps.check-labels.outputs.has_type_label != 'true' && steps.classify.outputs.response != ''
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
        env:
          TYPE_LABEL: ${{ steps.classify.outputs.response }}
        with:
@@ -5,6 +5,8 @@ on:
    secrets:
      PPA_GPG_PRIVATE_KEY:
        required: true
+      PPA_SFTP_PRIVATE_KEY:
+        required: true
    inputs:
      ppa_repo:
        description: Meshtastic PPA to target
@@ -27,6 +29,7 @@ jobs:
      build_location: ppa

  package-ppa:
+    if: ${{ github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
    runs-on: ubuntu-24.04
    needs: build-debian-src
    steps:
@@ -40,7 +43,7 @@ jobs:
        shell: bash
        run: |
          sudo apt-get update -y --fix-missing
-          sudo apt-get install -y dput
+          sudo apt-get install -y dput openssh-client

      - name: Import GPG key
        uses: crazy-max/ghaction-import-gpg@v7
@@ -65,8 +68,42 @@ jobs:
      - name: Display structure of downloaded files
        run: ls -lah

-      - name: Publish with dput
-        if: ${{ github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
-        timeout-minutes: 15 # dput is terrible, sometimes runs 'forever'
+      - name: Trust Launchpad's SSH key
        run: |
-          dput ${{ inputs.ppa_repo }} meshtasticd_${{ steps.version.outputs.deb }}~${{ inputs.series }}_source.changes
+          mkdir -p ~/.ssh
+          ssh-keyscan -H ppa.launchpad.net >> ~/.ssh/known_hosts
+
+      - name: Setup dput config
+        env:
+          ppa_login: meshtasticorg
+        run: |
+          sudo tee /etc/meshtastic-dput.cf >/dev/null <<EOF
+          [ppa]
+          fqdn                    = ppa.launchpad.net
+          method                  = ftp
+          incoming                = ~%(ppa)s
+          login                   = anonymous
+
+          [ssh-ppa]
+          fqdn                    = ppa.launchpad.net
+          method                  = sftp
+          incoming                = ~%(ssh-ppa)s
+          login                   = ${ppa_login}
+          EOF
+
+      - name: Import SSH key
+        uses: webfactory/ssh-agent@v0.10.0
+        with:
+          ssh-private-key: ${{ secrets.PPA_SFTP_PRIVATE_KEY }}
+        id: ssh
+
+      - name: Publish with dput (sftp)
+        timeout-minutes: 30 # dput is terrible, sometimes runs 'forever'
+        env:
+          up_ppa_repo: ${{ inputs.ppa_repo }}
+          up_series: ${{ inputs.series }}
+          up_version: ${{ steps.version.outputs.deb }}
+        run: >
+          dput -c /etc/meshtastic-dput.cf
+          ssh-${up_ppa_repo}
+          meshtasticd_${up_version}~${up_series}_source.changes
@@ -13,7 +13,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check for PR labels
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
        with:
          script: |
            const labels = context.payload.pull_request.labels.map(label => label.name);
@@ -177,7 +177,7 @@ jobs:

      - name: Comment test results on PR
        if: github.event_name == 'pull_request' && needs.native-tests.result != 'skipped'
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
        with:
          script: |
            const fs = require('fs');
@@ -52,7 +52,7 @@ jobs:
          node-version: 24

      - name: Setup pnpm
-        uses: pnpm/action-setup@v5
+        uses: pnpm/action-setup@v6
        with:
          version: latest

@@ -8,10 +8,10 @@ plugins:
      uri: https://github.com/trunk-io/plugins
 lint:
  enabled:
-    - checkov@3.2.513
-    - renovate@43.104.6
+    - checkov@3.2.517
+    - renovate@43.110.9
    - prettier@3.8.1
-    - trufflehog@3.94.2
+    - trufflehog@3.94.3
    - yamllint@1.38.0
    - bandit@1.9.4
    - trivy@0.69.3
@@ -1,30 +0,0 @@
---
-Lora:
-## Ebyte E80-900M22S
-## This is a bit experimental
-## 
-##
-  Module: lr1121
-  gpiochip: 1 # subtract 32 from the gpio numbers
-  DIO3_TCXO_VOLTAGE: 1.8
-  CS: 16 #pin6 / GPIO48 1C0
-  IRQ: 23  #pin17 / GPIO55 1C7
-  Busy: 22 #pin16 / GPIO54 1C6
-  Reset: 25 #pin13 / GPIO57 1D1
-
-
-  spidev: spidev0.0 #pins are (CS=16, CLK=17, MOSI=18, MISO=19)
-  spiSpeed: 2000000
-  
-rfswitch_table:
-  pins: [DIO5, DIO6, DIO7]
-  MODE_STBY: [LOW, LOW, LOW]
-  MODE_RX: [LOW, HIGH, LOW]
-  MODE_TX: [HIGH, HIGH, LOW]
-  MODE_TX_HP: [HIGH, LOW, LOW]
-  MODE_TX_HF: [LOW, LOW, LOW]
-  MODE_GNSS: [LOW, LOW, HIGH]
-  MODE_WIFI: [LOW, LOW, LOW]
-
-General:
-  MACAddressSource: eth0
@@ -1,46 +0,0 @@
---
-Lora:
-## Ebyte E80-900M22S
-## This is a bit experimental
-## 
-##
-  Module: lr1121
-  gpiochip: 1 # subtract 32 from the gpio numbers
-  DIO3_TCXO_VOLTAGE: 1.8
-  CS: 16 #pin6 / GPIO48 1C0
-  IRQ: 23  #pin17 / GPIO55 1C7
-  Busy: 22 #pin16 / GPIO54 1C6
-  Reset: 25 #pin13 / GPIO57 1D1
-
-
-  spidev: spidev0.0 #pins are (CS=16, CLK=17, MOSI=18, MISO=19)
-  spiSpeed: 2000000
-  
-rfswitch_table:
-  pins:
-    - DIO5
-    - DIO6
-  MODE_STBY:
-    - LOW
-    - LOW
-  MODE_RX:
-    - HIGH
-    - LOW
-  MODE_TX:
-    - HIGH
-    - HIGH
-  MODE_TX_HP:
-    - LOW
-    - HIGH
-  MODE_TX_HF:
-    - LOW
-    - LOW
-  MODE_GNSS:
-    - LOW
-    - LOW
-  MODE_WIFI:
-    - LOW
-    - LOW
-
-General:
-  MACAddressSource: eth0
@@ -1,30 +0,0 @@
---
-Lora:
-## Ebyte E80-900M22S
-## This is a bit experimental
-## 
-##
-  Module: lr1121
-  gpiochip: 1 # subtract 32 from the gpio numbers
-  DIO3_TCXO_VOLTAGE: 1.8
-  CS: 16 #pin6 / GPIO48 1C0
-  IRQ: 23  #pin17 / GPIO55 1C7
-  Busy: 22 #pin16 / GPIO54 1C6
-  Reset: 25 #pin13 / GPIO57 1D1
-
-
-  spidev: spidev0.0 #pins are (CS=16, CLK=17, MOSI=18, MISO=19)
-  spiSpeed: 2000000
-  
-rfswitch_table:
-  pins: [DIO5, DIO6, DIO7]
-  MODE_STBY: [LOW, LOW, LOW]
-  MODE_RX: [LOW, LOW, LOW]
-  MODE_TX: [LOW, HIGH, LOW]
-  MODE_TX_HP: [HIGH, LOW, LOW]
-  # MODE_TX_HF: []
-  # MODE_GNSS: []
-  MODE_WIFI: [LOW, LOW, LOW]
-
-General:
-  MACAddressSource: eth0
@@ -0,0 +1,39 @@
+# MeshAdv-Pi E22-900M30S
+# https://github.com/chrismyers2000/MeshAdv-Pi-Hat
+Meta:
+  name: MeshAdv-Pi E22-900M30S
+  support: community
+  compatible:
+    - ebyte-ecb41-pge # Armbian
+
+Lora:
+  Module: sx1262
+  CS: # GPIO0_A1 (physical 40)
+    pin: 1
+    gpiochip: 0
+    line: 1
+  IRQ: # GPIO0_A3 (physical 36)
+    pin: 3
+    gpiochip: 0
+    line: 3
+  Busy: # GPIO0_A0 (physical 38)
+    pin: 0
+    gpiochip: 0
+    line: 0
+  Reset: # GPIO0_B4 (physical 12)
+    pin: 12
+    gpiochip: 0
+    line: 12
+  TXen: # GPIO1_D1 (physical 33)
+    pin: 57
+    gpiochip: 1
+    line: 25
+  RXen: # GPIO1_B3 (physical 32)
+    pin: 43
+    gpiochip: 1
+    line: 11
+  DIO3_TCXO_VOLTAGE: true
+  # Only for E22-900M33S:
+  # Limit the output power to 8 dBm
+  # SX126X_MAX_POWER: 8
+  spidev: spidev0.0
@@ -0,0 +1,33 @@
+# MeshAdv Mini E22-900M22S
+# https://github.com/chrismyers2000/MeshAdv-Mini
+Meta:
+  name: MeshAdv Mini E22-900M22S
+  support: community
+  compatible:
+    - ebyte-ecb41-pge # Armbian
+
+Lora:
+  Module: sx1262 # Ebyte E22-900M22S
+  CS: # GPIO0_B6 (physical 24, SPI1_CSN0)
+    pin: 14
+    gpiochip: 0
+    line: 14
+  IRQ: # GPIO0_A3 (physical 36)
+    pin: 3
+    gpiochip: 0
+    line: 3
+  Busy: # GPIO0_A0 (physical 38)
+    pin: 0
+    gpiochip: 0
+    line: 0
+  Reset: # GPIO1_C3 (physical 18)
+    pin: 51
+    gpiochip: 1
+    line: 19
+  RXen: # GPIO1_B3 (physical 32)
+    pin: 43
+    gpiochip: 1
+    line: 11
+  DIO2_AS_RF_SWITCH: true
+  DIO3_TCXO_VOLTAGE: true
+  spidev: spidev0.0
@@ -0,0 +1,38 @@
+Meta:
+  name: RAK6421 + RAK13300 Slot 1
+  support: community # Promote when tested
+  compatible:
+    - ebyte-ecb41-pge # Armbian
+
+Lora:
+  Module: sx1262
+  IRQ: # GPIO0_A5 (IO6, physical 15)
+    pin: 5
+    gpiochip: 0
+    line: 5
+  Reset: # GPIO0_A3 (IO4, physical 36)
+    pin: 3
+    gpiochip: 0
+    line: 3
+  Busy: # GPIO1_C3 (IO5, physical 18)
+    pin: 51
+    gpiochip: 1
+    line: 19
+  # Ant_sw: # GPIO1_C2 (IO3, physical 16)
+  #   pin: 50
+  #   gpiochip: 1
+  #   line: 18
+  Enable_Pins:
+    - pin: 43 # GPIO1_B3 (physical 32)
+      gpiochip: 1
+      line: 11
+    - pin: 57 # GPIO1_D1 (physical 33)
+      gpiochip: 1
+      line: 25
+  DIO3_TCXO_VOLTAGE: true
+  DIO2_AS_RF_SWITCH: true
+  spidev: spidev0.0
+  # CS: # GPIO0_B6 (SPI1_CSN0, physical 24)
+  #   pin: 14
+  #   gpiochip: 0
+  #   line: 14
@@ -0,0 +1,36 @@
+Meta:
+  name: RAK6421 + RAK13300 Slot 2
+  support: community # Promote when tested
+  compatible:
+    - ebyte-ecb41-pge # Armbian
+
+Lora:
+  Module: sx1262
+  IRQ: # GPIO0_B4 (IO6, physical 12)
+    pin: 12
+    gpiochip: 0
+    line: 12
+  Reset: # GPIO1_C3 (IO4, physical 18)
+    pin: 51
+    gpiochip: 1
+    line: 19
+  Busy: # GPIO0_B3 (IO5, physical 35)
+    pin: 11
+    gpiochip: 0
+    line: 11
+  # Ant_sw: # GPIO1_C2 (IO3, physical 16)
+  #   pin: 50
+  #   gpiochip: 1
+  #   line: 18
+  Enable_Pins:
+    - pin: 2 # GPIO0_A2 (physical 37)
+      gpiochip: 0
+      line: 2
+    - pin: 50 # GPIO1_C2 (physical 16)
+      gpiochip: 1
+      line: 18
+  spidev: spidev0.1
+  # CS: # GPIO0_A7 (SPI1_CSN1, physical 26)
+  #   pin: 7
+  #   gpiochip: 0
+  #   line: 7
@@ -0,0 +1,39 @@
+Meta:
+  name: RAK6421 + RAK13302 Slot 1
+  support: community # Promote when tested
+  compatible:
+    - ebyte-ecb41-pge # Armbian
+
+Lora:
+  Module: sx1262
+  IRQ: # GPIO0_A5 (IO6, physical 15)
+    pin: 5
+    gpiochip: 0
+    line: 5
+  Reset: # GPIO0_A3 (IO4, physical 36)
+    pin: 3
+    gpiochip: 0
+    line: 3
+  Busy: # GPIO1_C3 (IO5, physical 18)
+    pin: 51
+    gpiochip: 1
+    line: 19
+  # Ant_sw: # GPIO1_C2 (IO3, physical 16)
+  #   pin: 50
+  #   gpiochip: 1
+  #   line: 18
+  Enable_Pins:
+    - pin: 43 # GPIO1_B3 (physical 32)
+      gpiochip: 1
+      line: 11
+    - pin: 57 # GPIO1_D1 (physical 33)
+      gpiochip: 1
+      line: 25
+  DIO3_TCXO_VOLTAGE: true
+  DIO2_AS_RF_SWITCH: true
+  spidev: spidev0.0
+  # CS: # GPIO0_B6 (SPI1_CSN0, physical 24)
+  #   pin: 14
+  #   gpiochip: 0
+  #   line: 14
+  TX_GAIN_LORA: [9, 9, 10, 11, 9, 8, 9, 10, 10, 10, 11, 12, 12, 12, 12, 12, 12, 12, 12, 10, 9, 8]
@@ -0,0 +1,37 @@
+Meta:
+  name: RAK6421 + RAK13302 Slot 2
+  support: community # Promote when tested
+  compatible:
+    - ebyte-ecb41-pge # Armbian
+
+Lora:
+  Module: sx1262
+  IRQ: # GPIO0_B4 (IO6, physical 12)
+    pin: 12
+    gpiochip: 0
+    line: 12
+  Reset: # GPIO1_C3 (IO4, physical 18)
+    pin: 51
+    gpiochip: 1
+    line: 19
+  Busy: # GPIO0_B3 (IO5, physical 35)
+    pin: 11
+    gpiochip: 0
+    line: 11
+  # Ant_sw: # GPIO1_C2 (IO3, physical 16)
+  #   pin: 50
+  #   gpiochip: 1
+  #   line: 18
+  Enable_Pins:
+    - pin: 2 # GPIO0_A2 (physical 37)
+      gpiochip: 0
+      line: 2
+    - pin: 50 # GPIO1_C2 (physical 16)
+      gpiochip: 1
+      line: 18
+  spidev: spidev0.1
+  # CS: # GPIO0_A7 (SPI1_CSN1, physical 26)
+  #   pin: 7
+  #   gpiochip: 0
+  #   line: 7
+  TX_GAIN_LORA: [9, 9, 10, 11, 9, 8, 9, 10, 10, 10, 11, 12, 12, 12, 12, 12, 12, 12, 12, 10, 9, 8]
@@ -0,0 +1,30 @@
+Meta:
+  name: Waveshare SX1262
+  support: deprecated
+  compatible:
+    - ebyte-ecb41-pge # Armbian
+
+Lora:
+  Module: sx1262  # Waveshare SX126X XXXM
+  DIO2_AS_RF_SWITCH: true
+  CS: # GPIO0_A1 (physical 40)
+    pin: 1
+    gpiochip: 0
+    line: 1
+  IRQ: # GPIO0_A3 (physical 36)
+    pin: 3
+    gpiochip: 0
+    line: 3
+  Busy: # GPIO0_A0 (physical 38)
+    pin: 0
+    gpiochip: 0
+    line: 0
+  Reset: # GPIO0_B4 (physical 12)
+    pin: 12
+    gpiochip: 0
+    line: 12
+  SX126X_ANT_SW: # GPIO1_B2 (physical 31)
+    pin: 42
+    gpiochip: 1
+    line: 10
+  spidev: spidev0.0
@@ -0,0 +1,41 @@
+# !! WARNING: Hats on the OK3506 board are installed "backwards" (facing outwards)
+
+# MeshAdv-Pi E22-900M30S
+# https://github.com/chrismyers2000/MeshAdv-Pi-Hat
+Meta:
+  name: MeshAdv-Pi E22-900M30S
+  support: community
+  compatible:
+    - forlinx-ok3506-s12 # Armbian
+
+Lora:
+  Module: sx1262
+  CS: # GPIO0_B0 (physical 40)
+    pin: 8
+    gpiochip: 0
+    line: 8
+  IRQ: # GPIO3_B0 (physical 36)
+    pin: 104
+    gpiochip: 3
+    line: 8
+  Busy: # GPIO0_B1 (physical 38)
+    pin: 9
+    gpiochip: 0
+    line: 9
+  Reset: # GPIO0_B6 (physical 12)
+    pin: 14
+    gpiochip: 0
+    line: 14
+  TXen: # GPIO0_A3 (physical 33)
+    pin: 3
+    gpiochip: 0
+    line: 3
+  RXen: # GPIO0_A2 (physical 32)
+    pin: 2
+    gpiochip: 0
+    line: 2
+  DIO3_TCXO_VOLTAGE: true
+  # Only for E22-900M33S:
+  # Limit the output power to 8 dBm
+  # SX126X_MAX_POWER: 8
+  spidev: spidev0.0
@@ -0,0 +1,35 @@
+# !! WARNING: Hats on the OK3506 board are installed "backwards" (facing outwards)
+
+# MeshAdv Mini E22-900M22S
+# https://github.com/chrismyers2000/MeshAdv-Mini
+Meta:
+  name: MeshAdv Mini E22-900M22S
+  support: community
+  compatible:
+    - forlinx-ok3506-s12 # Armbian
+
+Lora:
+  Module: sx1262 # Ebyte E22-900M22S
+  CS: # GPIO0_C3 (physical 24, SPI0_CSN0)
+    pin: 19
+    gpiochip: 0
+    line: 19
+  IRQ: # GPIO3_B0 (physical 36)
+    pin: 104
+    gpiochip: 3
+    line: 8
+  Busy: # GPIO0_B1 (physical 38)
+    pin: 9
+    gpiochip: 0
+    line: 9
+  Reset: # GPIO3_A6 (physical 18)
+    pin: 102
+    gpiochip: 3
+    line: 6
+  RXen: # GPIO0_A2 (physical 32)
+    pin: 2
+    gpiochip: 0
+    line: 2
+  DIO2_AS_RF_SWITCH: true
+  DIO3_TCXO_VOLTAGE: true
+  spidev: spidev0.0
@@ -0,0 +1,40 @@
+# !! WARNING: Hats on the OK3506 board are installed "backwards" (facing outwards)
+
+Meta:
+  name: RAK6421 + RAK13300 Slot 1
+  support: community # Promote when tested
+  compatible:
+    - forlinx-ok3506-s12 # Armbian
+
+Lora:
+  Module: sx1262
+  IRQ: # GPIO3_B5 (IO6, physical 15)
+    pin: 109
+    gpiochip: 3
+    line: 13
+  Reset: # GPIO3_B0 (IO4, physical 36)
+    pin: 104
+    gpiochip: 3
+    line: 8
+  Busy: # GPIO3_A6 (IO5, physical 18)
+    pin: 102
+    gpiochip: 3
+    line: 6
+  # Ant_sw: # GPIO0_A3 (IO3, physical 33)
+  #   pin: 3
+  #   gpiochip: 0
+  #   line: 3
+  Enable_Pins:
+    - pin: 2 # GPIO0_A2 (physical 32)
+      gpiochip: 0
+      line: 2
+    - pin: 3 # GPIO0_A3 (physical 33)
+      gpiochip: 0
+      line: 3
+  DIO3_TCXO_VOLTAGE: true
+  DIO2_AS_RF_SWITCH: true
+  spidev: spidev0.0
+  # CS: # GPIO0_C3 (SPI0_CSN0, physical 24)
+  #   pin: 19
+  #   gpiochip: 0
+  #   line: 19
@@ -0,0 +1,38 @@
+# !! WARNING: Hats on the OK3506 board are installed "backwards" (facing outwards)
+
+Meta:
+  name: RAK6421 + RAK13300 Slot 2
+  support: community # Promote when tested
+  compatible:
+    - forlinx-ok3506-s12 # Armbian
+
+Lora:
+  Module: sx1262
+  IRQ: # GPIO0_B6 (IO6, physical 12)
+    pin: 14
+    gpiochip: 0
+    line: 14
+  Reset: # GPIO3_A6 (IO4, physical 18)
+    pin: 102
+    gpiochip: 3
+    line: 6
+  Busy: # GPIO0_B2 (IO5, physical 35)
+    pin: 10
+    gpiochip: 0
+    line: 10
+  # Ant_sw: # GPIO3_A7 (IO3, physical 16)
+  #   pin: 103
+  #   gpiochip: 3
+  #   line: 7
+  Enable_Pins:
+    - pin: 106 # GPIO3_B2 (physical 37)
+      gpiochip: 3
+      line: 10
+    - pin: 103 # GPIO3_A7 (physical 16)
+      gpiochip: 3
+      line: 7
+  spidev: spidev0.1
+  # CS: # GPIO0_B7 (SPI0_CSN1, physical 26)
+  #   pin: 15
+  #   gpiochip: 0
+  #   line: 15
@@ -0,0 +1,41 @@
+# !! WARNING: Hats on the OK3506 board are installed "backwards" (facing outwards)
+
+Meta:
+  name: RAK6421 + RAK13302 Slot 1
+  support: community # Promote when tested
+  compatible:
+    - forlinx-ok3506-s12 # Armbian
+
+Lora:
+  Module: sx1262
+  IRQ: # GPIO3_B5 (IO6, physical 15)
+    pin: 109
+    gpiochip: 3
+    line: 13
+  Reset: # GPIO3_B0 (IO4, physical 36)
+    pin: 104
+    gpiochip: 3
+    line: 8
+  Busy: # GPIO3_A6 (IO5, physical 18)
+    pin: 102
+    gpiochip: 3
+    line: 6
+  # Ant_sw: # GPIO0_A3 (IO3, physical 33)
+  #   pin: 3
+  #   gpiochip: 0
+  #   line: 3
+  Enable_Pins:
+    - pin: 2 # GPIO0_A2 (physical 32)
+      gpiochip: 0
+      line: 2
+    - pin: 3 # GPIO0_A3 (physical 33)
+      gpiochip: 0
+      line: 3
+  DIO3_TCXO_VOLTAGE: true
+  DIO2_AS_RF_SWITCH: true
+  spidev: spidev0.0
+  # CS: # GPIO0_C3 (SPI0_CSN0, physical 24)
+  #   pin: 19
+  #   gpiochip: 0
+  #   line: 19
+  TX_GAIN_LORA: [9, 9, 10, 11, 9, 8, 9, 10, 10, 10, 11, 12, 12, 12, 12, 12, 12, 12, 12, 10, 9, 8]
@@ -0,0 +1,39 @@
+# !! WARNING: Hats on the OK3506 board are installed "backwards" (facing outwards)
+
+Meta:
+  name: RAK6421 + RAK13302 Slot 2
+  support: community # Promote when tested
+  compatible:
+    - forlinx-ok3506-s12 # Armbian
+
+Lora:
+  Module: sx1262
+  IRQ: # GPIO0_B6 (IO6, physical 12)
+    pin: 14
+    gpiochip: 0
+    line: 14
+  Reset: # GPIO3_A6 (IO4, physical 18)
+    pin: 102
+    gpiochip: 3
+    line: 6
+  Busy: # GPIO0_B2 (IO5, physical 35)
+    pin: 10
+    gpiochip: 0
+    line: 10
+  # Ant_sw: # GPIO3_A7 (IO3, physical 16)
+  #   pin: 103
+  #   gpiochip: 3
+  #   line: 7
+  Enable_Pins:
+    - pin: 106 # GPIO3_B2 (physical 37)
+      gpiochip: 3
+      line: 10
+    - pin: 103 # GPIO3_A7 (physical 16)
+      gpiochip: 3
+      line: 7
+  spidev: spidev0.1
+  # CS: # GPIO0_B7 (SPI0_CSN1, physical 26)
+  #   pin: 15
+  #   gpiochip: 0
+  #   line: 15
+  TX_GAIN_LORA: [9, 9, 10, 11, 9, 8, 9, 10, 10, 10, 11, 12, 12, 12, 12, 12, 12, 12, 12, 10, 9, 8]
@@ -0,0 +1,32 @@
+# !! WARNING: Hats on the OK3506 board are installed "backwards" (facing outwards)
+
+Meta:
+  name: Waveshare SX1262
+  support: deprecated
+  compatible:
+    - forlinx-ok3506-s12 # Armbian
+
+Lora:
+  Module: sx1262  # Waveshare SX126X XXXM
+  DIO2_AS_RF_SWITCH: true
+  CS: # GPIO0_B0 (physical 40)
+    pin: 8
+    gpiochip: 0
+    line: 8
+  IRQ: # GPIO3_B0 (physical 36)
+    pin: 104
+    gpiochip: 3
+    line: 8
+  Busy: # GPIO0_B1 (physical 38)
+    pin: 9
+    gpiochip: 0
+    line: 9
+  Reset: # GPIO0_B6 (physical 12)
+    pin: 14
+    gpiochip: 0
+    line: 14
+  SX126X_ANT_SW: # GPIO3_B3 (physical 31)
+    pin: 107
+    gpiochip: 3
+    line: 11
+  spidev: spidev0.0
@@ -1,25 +1,31 @@
 #!/usr/bin/env python3
-"""
-Generate release notes from merged PRs on develop and master branches.
-Categorizes PRs into Enhancements and Bug Fixes/Maintenance sections.
-"""
+"""Generate release notes from the actual release commit range."""

-import subprocess
-import re
+import argparse
 import json
+import re
+import subprocess
 import sys
-from datetime import datetime


-def get_last_release_tag():
-    """Get the most recent release tag."""
+def get_last_release_tag(compare_ref, exclude_tag=None):
+    """Get the most recent version tag merged into compare_ref."""
    result = subprocess.run(
-        ["git", "describe", "--tags", "--abbrev=0"],
+        ["git", "tag", "--merged", compare_ref, "--sort=-version:refname", "v*"],
        capture_output=True,
        text=True,
        check=True,
    )
-    return result.stdout.strip()
+
+    for line in result.stdout.splitlines():
+        candidate = line.strip()
+        if not candidate:
+            continue
+        if exclude_tag and candidate == exclude_tag:
+            continue
+        return candidate
+
+    raise subprocess.CalledProcessError(result.returncode, result.args, output=result.stdout, stderr=result.stderr)


 def get_tag_date(tag):
@@ -33,18 +39,18 @@ def get_tag_date(tag):
    return result.stdout.strip()


-def get_merged_prs_since_tag(tag, branch):
-    """Get all merged PRs since the given tag on the specified branch."""
-    # Get commits since tag on the branch - look for PR numbers in parentheses
+def get_merged_prs_in_range(tag, compare_ref):
+    """Get all merged PRs in the git range between tag and compare_ref."""
    result = subprocess.run(
        [
            "git",
            "log",
-            f"{tag}..origin/{branch}",
+            f"{tag}..{compare_ref}",
            "--oneline",
        ],
        capture_output=True,
        text=True,
+        check=True,
    )

    prs = []
@@ -65,6 +71,25 @@ def get_merged_prs_since_tag(tag, branch):
    return prs


+def parse_args():
+    """Parse CLI arguments."""
+    parser = argparse.ArgumentParser(
+        description="Generate release notes from the actual release commit range."
+    )
+    parser.add_argument("new_version", help="Version that will be tagged for this release")
+    parser.add_argument(
+        "--base-tag",
+        dest="base_tag",
+        help="Existing version tag to diff from. Defaults to the latest version tag merged into the compare ref.",
+    )
+    parser.add_argument(
+        "--compare-ref",
+        default="HEAD",
+        help="Git ref to diff to. Defaults to HEAD.",
+    )
+    return parser.parse_args()
+
+
 def get_pr_details(pr_number):
    """Get PR details from GitHub API via gh CLI."""
    try:
@@ -268,28 +293,28 @@ def get_new_contributors(pr_details_list, tag, repo="meshtastic/firmware"):


 def main():
-    if len(sys.argv) < 2:
-        print("Usage: generate_release_notes.py <new_version>", file=sys.stderr)
-        sys.exit(1)
-
-    new_version = sys.argv[1]
+    args = parse_args()
+    new_version = args.new_version
+    compare_ref = args.compare_ref
+    current_tag = f"v{new_version}"

    # Get last release tag
    try:
-        last_tag = get_last_release_tag()
+        last_tag = args.base_tag or get_last_release_tag(compare_ref, exclude_tag=current_tag)
    except subprocess.CalledProcessError:
        print("Error: Could not find last release tag", file=sys.stderr)
        sys.exit(1)

-    # Collect PRs from both branches
-    all_pr_numbers = set()
+    print(
+        f"Resolved release note range: {last_tag}..{compare_ref}",
+        file=sys.stderr,
+    )

-    for branch in ["develop", "master"]:
-        try:
-            prs = get_merged_prs_since_tag(last_tag, branch)
-            all_pr_numbers.update(prs)
-        except Exception as e:
-            print(f"Warning: Could not get PRs from {branch}: {e}", file=sys.stderr)
+    try:
+        all_pr_numbers = set(get_merged_prs_in_range(last_tag, compare_ref))
+    except subprocess.CalledProcessError as e:
+        print(f"Error: Could not get PRs for range {last_tag}..{compare_ref}: {e}", file=sys.stderr)
+        sys.exit(1)

    # Get details for all PRs
    enhancements = []
@@ -131,103 +131,115 @@ lib_deps =
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]
 lib_deps =
-	# renovate: datasource=custom.pio depName=Adafruit BusIO packageName=adafruit/library/Adafruit BusIO
-	adafruit/Adafruit BusIO@1.17.4
-	# renovate: datasource=custom.pio depName=Adafruit Unified Sensor packageName=adafruit/library/Adafruit Unified Sensor
-	adafruit/Adafruit Unified Sensor@1.1.15
-	# renovate: datasource=custom.pio depName=Adafruit BMP280 packageName=adafruit/library/Adafruit BMP280 Library
-	adafruit/Adafruit BMP280 Library@3.0.0
-	# renovate: datasource=custom.pio depName=Adafruit BMP085 packageName=adafruit/library/Adafruit BMP085 Library
-	adafruit/Adafruit BMP085 Library@1.2.4
-	# renovate: datasource=custom.pio depName=Adafruit BME280 packageName=adafruit/library/Adafruit BME280 Library
-	adafruit/Adafruit BME280 Library@2.3.0
-	# renovate: datasource=custom.pio depName=Adafruit DPS310 packageName=adafruit/library/Adafruit DPS310
-	adafruit/Adafruit DPS310@1.1.6
-	# renovate: datasource=custom.pio depName=Adafruit MCP9808 packageName=adafruit/library/Adafruit MCP9808 Library
-	adafruit/Adafruit MCP9808 Library@2.0.2
-	# renovate: datasource=custom.pio depName=Adafruit INA260 packageName=adafruit/library/Adafruit INA260 Library
-	adafruit/Adafruit INA260 Library@1.5.3
-	# renovate: datasource=custom.pio depName=Adafruit INA219 packageName=adafruit/library/Adafruit INA219
-	adafruit/Adafruit INA219@1.2.3
-	# renovate: datasource=custom.pio depName=Adafruit MPU6050 packageName=adafruit/library/Adafruit MPU6050
-	adafruit/Adafruit MPU6050@2.2.9
-	# renovate: datasource=custom.pio depName=Adafruit LIS3DH packageName=adafruit/library/Adafruit LIS3DH
-	adafruit/Adafruit LIS3DH@1.3.0
-	# renovate: datasource=custom.pio depName=Adafruit AHTX0 packageName=adafruit/library/Adafruit AHTX0
-	adafruit/Adafruit AHTX0@2.0.6
-	# renovate: datasource=custom.pio depName=Adafruit LSM6DS packageName=adafruit/library/Adafruit LSM6DS
-	adafruit/Adafruit LSM6DS@4.7.4
-	# renovate: datasource=custom.pio depName=Adafruit TSL2591 packageName=adafruit/library/Adafruit TSL2591 Library
-	adafruit/Adafruit TSL2591 Library@1.4.5
-	# renovate: datasource=custom.pio depName=EmotiBit MLX90632 packageName=emotibit/library/EmotiBit MLX90632
-	emotibit/EmotiBit MLX90632@1.0.8
-	# renovate: datasource=custom.pio depName=Adafruit MLX90614 packageName=adafruit/library/Adafruit MLX90614 Library
-	adafruit/Adafruit MLX90614 Library@2.1.6
+	# renovate: datasource=github-tags depName=Adafruit BusIO packageName=adafruit/Adafruit_BusIO
+	https://github.com/adafruit/Adafruit_BusIO/archive/refs/tags/1.17.4.zip
+	# renovate: datasource=github-tags depName=Adafruit Unified Sensor packageName=adafruit/Adafruit_Sensor
+	https://github.com/adafruit/Adafruit_Sensor/archive/refs/tags/1.1.15.zip
+	# renovate: datasource=github-tags depName=Adafruit GFX packageName=adafruit/Adafruit-GFX-Library
+	https://github.com/adafruit/Adafruit-GFX-Library/archive/refs/tags/1.12.6.zip
+	# renovate: datasource=github-tags depName=NeoPixel packageName=adafruit/Adafruit_NeoPixel
+	https://github.com/adafruit/Adafruit_NeoPixel/archive/refs/tags/1.15.4.zip
+	# renovate: datasource=github-tags depName=Adafruit SSD1306 packageName=adafruit/Adafruit_SSD1306
+	https://github.com/adafruit/Adafruit_SSD1306/archive/refs/tags/2.5.16.zip
+	# renovate: datasource=github-tags depName=Adafruit BMP280 packageName=adafruit/Adafruit_BMP280_Library
+	https://github.com/adafruit/Adafruit_BMP280_Library/archive/refs/tags/3.0.0.zip
+	# renovate: datasource=github-tags depName=Adafruit BMP085 packageName=adafruit/Adafruit-BMP085-Library
+	https://github.com/adafruit/Adafruit-BMP085-Library/archive/refs/tags/1.2.4.zip
+	# renovate: datasource=github-tags depName=Adafruit BME280 packageName=adafruit/Adafruit_BME280_Library
+	https://github.com/adafruit/Adafruit_BME280_Library/archive/refs/tags/2.3.0.zip
+	# renovate: datasource=github-tags depName=Adafruit DPS310 packageName=adafruit/Adafruit_DPS310
+	https://github.com/adafruit/Adafruit_DPS310/archive/refs/tags/1.1.6.zip
+	# renovate: datasource=github-tags depName=Adafruit SH110x packageName=adafruit/Adafruit_SH110x
+	https://github.com/adafruit/Adafruit_SH110x/archive/refs/tags/2.1.14.zip
+	# renovate: datasource=github-tags depName=Adafruit MCP9808 packageName=adafruit/Adafruit_MCP9808_Library
+	https://github.com/adafruit/Adafruit_MCP9808_Library/archive/refs/tags/2.0.2.zip
+	# renovate: datasource=github-tags depName=Adafruit INA260 packageName=adafruit/Adafruit_INA260
+	https://github.com/adafruit/Adafruit_INA260/archive/refs/tags/1.5.3.zip
+	# renovate: datasource=github-tags depName=Adafruit INA219 packageName=adafruit/Adafruit_INA219
+	https://github.com/adafruit/Adafruit_INA219/archive/refs/tags/1.2.3.zip
+	# renovate: datasource=github-tags depName=Adafruit MPU6050 packageName=adafruit/Adafruit_MPU6050
+	https://github.com/adafruit/Adafruit_MPU6050/archive/refs/tags/2.2.9.zip
+	# renovate: datasource=github-tags depName=Adafruit LIS3DH packageName=adafruit/Adafruit_LIS3DH
+	https://github.com/adafruit/Adafruit_LIS3DH/archive/refs/tags/1.3.0.zip
+	# renovate: datasource=github-tags depName=Adafruit AHTX0 packageName=adafruit/Adafruit_AHTX0
+	https://github.com/adafruit/Adafruit_AHTX0/archive/refs/tags/2.0.6.zip
+	# renovate: datasource=github-tags depName=Adafruit LSM6DS packageName=adafruit/Adafruit_LSM6DS
+	https://github.com/adafruit/Adafruit_LSM6DS/archive/refs/tags/4.7.4.zip
+	# renovate: datasource=github-tags depName=Adafruit TSL2591 packageName=adafruit/Adafruit_TSL2591_Library
+	https://github.com/adafruit/Adafruit_TSL2591_Library/archive/refs/tags/1.4.5.zip
+	# renovate: datasource=github-tags depName=EmotiBit MLX90632 packageName=emotibit/EmotiBit_MLX90632
+	https://github.com/EmotiBit/EmotiBit_MLX90632/archive/refs/tags/v1.0.8.zip
+	# renovate: datasource=github-tags depName=Adafruit MLX90614 packageName=adafruit/Adafruit_MLX90614
+	https://github.com/adafruit/Adafruit-MLX90614-Library/archive/refs/tags/2.1.6.zip
 	# renovate: datasource=git-refs depName=INA3221 packageName=https://github.com/sgtwilko/INA3221 gitBranch=FixOverflow
 	https://github.com/sgtwilko/INA3221/archive/bb03d7e9bfcc74fc798838a54f4f99738f29fc6a.zip
-	# renovate: datasource=custom.pio depName=QMC5883L Compass packageName=mprograms/library/QMC5883LCompass
-	mprograms/QMC5883LCompass@1.2.3
-	# renovate: datasource=custom.pio depName=DFRobot_RTU packageName=dfrobot/library/DFRobot_RTU
-	dfrobot/DFRobot_RTU@1.0.6
+	# renovate: datasource=github-tags depName=QMC5883L Compass packageName=mprograms/QMC5883LCompass
+	https://github.com/mprograms/QMC5883LCompass/archive/refs/tags/v1.2.3.zip
+	# renovate: datasource=github-tags depName=DFRobot_RTU packageName=dfrobot/DFRobot_RTU
+	https://github.com/DFRobot/DFRobot_RTU/archive/refs/tags/V1.0.6.zip
 	# renovate: datasource=git-refs depName=DFRobot_RainfallSensor packageName=https://github.com/DFRobot/DFRobot_RainfallSensor gitBranch=master
 	https://github.com/DFRobot/DFRobot_RainfallSensor/archive/38fea5e02b40a5430be6dab39a99a6f6347d667e.zip
-	# renovate: datasource=custom.pio depName=INA226 packageName=robtillaart/library/INA226
-	robtillaart/INA226@0.6.6
-	# renovate: datasource=custom.pio depName=SparkFun MAX3010x packageName=sparkfun/library/SparkFun MAX3010x Pulse and Proximity Sensor Library
-	sparkfun/SparkFun MAX3010x Pulse and Proximity Sensor Library@1.1.2
-	# renovate: datasource=custom.pio depName=SparkFun 9DoF IMU Breakout ICM 20948 packageName=sparkfun/library/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library
-	sparkfun/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library@1.3.2
-	# renovate: datasource=custom.pio depName=Adafruit LTR390 Library packageName=adafruit/library/Adafruit LTR390 Library
-	adafruit/Adafruit LTR390 Library@1.1.2
-	# renovate: datasource=custom.pio depName=Adafruit PCT2075 packageName=adafruit/library/Adafruit PCT2075
-	adafruit/Adafruit PCT2075@1.0.6
-	# renovate: datasource=custom.pio depName=DFRobot_BMM150 packageName=dfrobot/library/DFRobot_BMM150
-	dfrobot/DFRobot_BMM150@1.0.0
-	# renovate: datasource=custom.pio depName=Adafruit_TSL2561 packageName=adafruit/library/Adafruit TSL2561
-	adafruit/Adafruit TSL2561@1.1.3
-	# renovate: datasource=custom.pio depName=BH1750_WE packageName=wollewald/library/BH1750_WE
-	wollewald/BH1750_WE@1.1.10
+	# renovate: datasource=github-tags depName=INA226 packageName=robtillaart/INA226
+	https://github.com/RobTillaart/INA226/archive/refs/tags/0.6.6.zip
+	# renovate: datasource=github-tags depName=SparkFun MAX3010x packageName=sparkfun/SparkFun_MAX3010x_Sensor_Library
+	https://github.com/sparkfun/SparkFun_MAX3010x_Sensor_Library/archive/refs/tags/v1.1.2.zip
+	# renovate: datasource=github-tags depName=SparkFun 9DoF IMU Breakout ICM 20948 packageName=sparkfun/SparkFun_ICM-20948_ArduinoLibrary
+	https://github.com/sparkfun/SparkFun_ICM-20948_ArduinoLibrary/archive/refs/tags/v1.3.2.zip
+	# renovate: datasource=github-tags depName=Adafruit LTR390 Library packageName=adafruit/Adafruit_LTR390
+	https://github.com/adafruit/Adafruit_LTR390/archive/refs/tags/1.1.2.zip
+	# renovate: datasource=github-tags depName=Adafruit PCT2075 packageName=adafruit/Adafruit_PCT2075
+	https://github.com/adafruit/Adafruit_PCT2075/archive/refs/tags/1.0.6.zip
+	# renovate: datasource=github-tags depName=DFRobot_BMM150 packageName=dfrobot/DFRobot_BMM150
+	https://github.com/DFRobot/DFRobot_BMM150/archive/refs/tags/V1.0.0.zip
+	# renovate: datasource=github-tags depName=Adafruit_TSL2561 packageName=adafruit/Adafruit_TSL2561
+	https://github.com/adafruit/Adafruit_TSL2561/archive/refs/tags/1.1.3.zip
+	# renovate: datasource=github-tags depName=BH1750_WE packageName=wollewald/BH1750_WE
+	https://github.com/wollewald/BH1750_WE/archive/refs/tags/1.1.10.zip

 ; Common environmental sensor libraries (not included in native / portduino)
 [environmental_extra_common]
 lib_deps =
-	# renovate: datasource=custom.pio depName=Adafruit BMP3XX packageName=adafruit/library/Adafruit BMP3XX Library
-	adafruit/Adafruit BMP3XX Library@2.1.6
-	# renovate: datasource=custom.pio depName=Adafruit MAX1704X packageName=adafruit/library/Adafruit MAX1704X
-	adafruit/Adafruit MAX1704X@1.0.3
-	# renovate: datasource=custom.pio depName=Adafruit LPS2X packageName=adafruit/library/Adafruit LPS2X
-	adafruit/Adafruit LPS2X@2.0.6
-	# renovate: datasource=custom.pio depName=Adafruit VEML7700 packageName=adafruit/library/Adafruit VEML7700 Library
-	adafruit/Adafruit VEML7700 Library@2.1.6
-	# renovate: datasource=custom.pio depName=SparkFun Qwiic Scale NAU7802 packageName=sparkfun/library/SparkFun Qwiic Scale NAU7802 Arduino Library
-	sparkfun/SparkFun Qwiic Scale NAU7802 Arduino Library@1.0.6
+	# renovate: datasource=github-tags depName=Adafruit BMP3XX packageName=adafruit/Adafruit_BMP3XX
+	https://github.com/adafruit/Adafruit_BMP3XX/archive/refs/tags/2.1.6.zip
+	# renovate: datasource=github-tags depName=Adafruit MAX1704X packageName=adafruit/Adafruit_MAX1704X
+	https://github.com/adafruit/Adafruit_MAX1704X/archive/refs/tags/1.0.3.zip
+	# renovate: datasource=github-tags depName=Adafruit SHTC3 packageName=adafruit/Adafruit_SHTC3
+	https://github.com/adafruit/Adafruit_SHTC3/archive/refs/tags/1.0.2.zip
+	# renovate: datasource=github-tags depName=Adafruit LPS2X packageName=adafruit/Adafruit_LPS2X
+	https://github.com/adafruit/Adafruit_LPS2X/archive/refs/tags/2.0.6.zip
+	# renovate: datasource=github-tags depName=Adafruit SHT31 packageName=adafruit/Adafruit_SHT31
+	https://github.com/adafruit/Adafruit_SHT31/archive/refs/tags/2.2.2.zip
+	# renovate: datasource=github-tags depName=Adafruit VEML7700 packageName=adafruit/Adafruit_VEML7700
+	https://github.com/adafruit/Adafruit_VEML7700/archive/refs/tags/2.1.6.zip
+	# renovate: datasource=github-tags depName=Adafruit SHT4x packageName=adafruit/Adafruit_SHT4X
+	https://github.com/adafruit/Adafruit_SHT4X/archive/refs/tags/1.0.5.zip
+	# renovate: datasource=github-tags depName=SparkFun Qwiic Scale NAU7802 packageName=sparkfun/SparkFun_Qwiic_Scale_NAU7802_Arduino_Library
+	https://github.com/sparkfun/SparkFun_Qwiic_Scale_NAU7802_Arduino_Library/archive/refs/tags/v1.0.6.zip
 	# renovate: datasource=custom.pio depName=ClosedCube OPT3001 packageName=closedcube/library/ClosedCube OPT3001
 	closedcube/ClosedCube OPT3001@1.1.2
 	# renovate: datasource=git-refs depName=meshtastic-DFRobot_LarkWeatherStation packageName=https://github.com/meshtastic/DFRobot_LarkWeatherStation gitBranch=master
 	https://github.com/meshtastic/DFRobot_LarkWeatherStation/archive/4de3a9cadef0f6a5220a8a906cf9775b02b0040d.zip
-	# renovate: datasource=custom.pio depName=Sensirion Core packageName=sensirion/library/Sensirion Core
-	sensirion/Sensirion Core@0.7.3
-	# renovate: datasource=custom.pio depName=Sensirion I2C SCD4x packageName=sensirion/library/Sensirion I2C SCD4x
-	sensirion/Sensirion I2C SCD4x@1.1.0
-	# renovate: datasource=custom.pio depName=Sensirion I2C SFA3x packageName=sensirion/library/Sensirion I2C SFA3x
-	sensirion/Sensirion I2C SFA3x@1.0.0
-	# renovate: datasource=custom.pio depName=Sensirion I2C SCD30 packageName=sensirion/library/Sensirion I2C SCD30
-	sensirion/Sensirion I2C SCD30@1.0.0
-	# renovate: datasource=custom.pio depName=arduino-sht packageName=sensirion/library/arduino-sht
-	sensirion/arduino-sht@1.2.6
+	# renovate: datasource=github-tags depName=Sensirion Core packageName=sensirion/arduino-core
+	https://github.com/Sensirion/arduino-core/archive/refs/tags/0.7.3.zip
+	# renovate: datasource=github-tags depName=Sensirion I2C SCD4x packageName=sensirion/arduino-i2c-scd4x
+	https://github.com/Sensirion/arduino-i2c-scd4x/archive/refs/tags/1.1.0.zip
+	# renovate: datasource=github-tags depName=Sensirion I2C SFA3x packageName=sensirion/arduino-i2c-sfa3x
+	https://github.com/Sensirion/arduino-i2c-sfa3x/archive/refs/tags/1.0.0.zip
+	# renovate: datasource=github-tags depName=Sensirion I2C SCD30 packageName=sensirion/arduino-i2c-scd30
+	https://github.com/Sensirion/arduino-i2c-scd30/archive/refs/tags/1.0.0.zip

 ; Environmental sensors with BSEC2 (Bosch proprietary IAQ)
 [environmental_extra]
 lib_deps =
 	${environmental_extra_common.lib_deps}
-	# renovate: datasource=custom.pio depName=Bosch BSEC2 packageName=boschsensortec/library/bsec2
-	boschsensortec/bsec2@1.10.2610
-	# renovate: datasource=custom.pio depName=Bosch BME68x packageName=boschsensortec/library/BME68x Sensor Library
-	boschsensortec/BME68x Sensor Library@1.3.40408
+	# renovate: datasource=github-tags depName=Bosch BSEC2 packageName=boschsensortec/Bosch-BSEC2-Library
+	https://github.com/boschsensortec/Bosch-BSEC2-Library/archive/refs/tags/1.10.2610.zip
+	# renovate: datasource=github-tags depName=Bosch BME68x packageName=boschsensortec/Bosch-BME68x-Library
+	https://github.com/boschsensortec/Bosch-BME68x-Library/archive/refs/tags/v1.3.40408.zip

 ; Environmental sensors without BSEC (saves ~3.5KB DRAM for original ESP32 targets)
 [environmental_extra_no_bsec]
 lib_deps =
 	${environmental_extra_common.lib_deps}
-	# renovate: datasource=custom.pio depName=Adafruit_BME680 packageName=adafruit/library/Adafruit BME680 Library
-	adafruit/Adafruit BME680 Library@2.0.6
+	# renovate: datasource=github-tags depName=Adafruit_BME680 packageName=adafruit/Adafruit_BME680
+	https://github.com/adafruit/Adafruit_BME680/archive/refs/tags/2.0.6.zip
@@ -4,8 +4,7 @@ const char *DisplayFormatters::getModemPresetDisplayName(meshtastic_Config_LoRaC
                                                         bool usePreset)
 {

-    // If use_preset is false, always return "Custom" — callers such as RadioInterface and Channels
-    // rely on this being a stable literal for channel-name hashing and default-channel detection.
+    // If use_preset is false, always return "Custom"
    if (!usePreset) {
        return "Custom";
    }
@@ -21,8 +21,15 @@
 // How many messages are stored (RAM + flash).
 // Define -DMESSAGE_HISTORY_LIMIT=N in build_flags to control memory usage.
 #ifndef MESSAGE_HISTORY_LIMIT
+#if defined(ARCH_ESP32) &&                                                                                                       \
+    !(defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32S2))
+// Baseline ESP32 (non-PSRAM variants) has limited heap; reduce message history on resource-constrained builds.
+// Override with -DMESSAGE_HISTORY_LIMIT=N if needed.
+#define MESSAGE_HISTORY_LIMIT 10
+#else
 #define MESSAGE_HISTORY_LIMIT 20
 #endif
+#endif

 // Internal alias used everywhere in code – do NOT redefine elsewhere.
 #define MAX_MESSAGES_SAVED MESSAGE_HISTORY_LIMIT
@@ -1,10 +1,85 @@
 #include "concurrency/BinarySemaphorePosix.h"
 #include "configuration.h"

+#include <errno.h>
+#include <sys/time.h>
+
 #ifndef HAS_FREE_RTOS

 namespace concurrency
 {
+#ifdef ARCH_PORTDUINO
+
+BinarySemaphorePosix::BinarySemaphorePosix()
+{
+    if (pthread_mutex_init(&mutex, NULL) != 0) {
+        throw std::runtime_error("pthread_mutex_init failed");
+    }
+    if (pthread_cond_init(&cond, NULL) != 0) {
+        pthread_mutex_destroy(&mutex);
+        throw std::runtime_error("pthread_cond_init failed");
+    }
+    signaled = false;
+}
+
+BinarySemaphorePosix::~BinarySemaphorePosix()
+{
+    pthread_cond_destroy(&cond);
+    pthread_mutex_destroy(&mutex);
+}
+
+/**
+ * Returns false if we timed out
+ */
+bool BinarySemaphorePosix::take(uint32_t msec)
+{
+    pthread_mutex_lock(&mutex);
+
+    if (!signaled) {
+        struct timespec ts;
+        clock_gettime(CLOCK_REALTIME, &ts);
+
+        ts.tv_sec += msec / 1000;
+        ts.tv_nsec += (msec % 1000) * 1000000L;
+        if (ts.tv_nsec >= 1000000000L) {
+            ts.tv_sec += 1;
+            ts.tv_nsec -= 1000000000L;
+        }
+
+        while (!signaled) {
+            int rc = pthread_cond_timedwait(&cond, &mutex, &ts);
+            if (rc == ETIMEDOUT)
+                break;
+            if (rc != 0) {
+                // Some other error occurred
+                pthread_mutex_unlock(&mutex);
+                throw std::runtime_error("pthread_cond_timedwait failed: " + std::to_string(rc));
+            }
+        }
+    }
+
+    bool wasSignaled = signaled;
+    signaled = false; // consume the signal (binary semaphore)
+
+    pthread_mutex_unlock(&mutex);
+    return wasSignaled;
+}
+
+void BinarySemaphorePosix::give()
+{
+    pthread_mutex_lock(&mutex);
+    signaled = true;
+    pthread_cond_signal(&cond);
+    pthread_mutex_unlock(&mutex);
+}
+
+IRAM_ATTR void BinarySemaphorePosix::giveFromISR(BaseType_t *pxHigherPriorityTaskWoken)
+{
+    give();
+    if (pxHigherPriorityTaskWoken)
+        *pxHigherPriorityTaskWoken = true;
+}
+#else

 BinarySemaphorePosix::BinarySemaphorePosix() {}

@@ -22,7 +97,8 @@ bool BinarySemaphorePosix::take(uint32_t msec)
 void BinarySemaphorePosix::give() {}

 IRAM_ATTR void BinarySemaphorePosix::giveFromISR(BaseType_t *pxHigherPriorityTaskWoken) {}
+#endif

 } // namespace concurrency

-#endif
+#endif
@@ -2,6 +2,10 @@

 #include "../freertosinc.h"

+#ifdef ARCH_PORTDUINO
+#include <pthread.h>
+#endif
+
 namespace concurrency
 {

@@ -9,7 +13,12 @@ namespace concurrency

 class BinarySemaphorePosix
 {
-    // SemaphoreHandle_t semaphore;
+
+#ifdef ARCH_PORTDUINO
+    pthread_mutex_t mutex;
+    pthread_cond_t cond;
+    bool signaled;
+#endif

  public:
    BinarySemaphorePosix();
@@ -27,4 +36,4 @@ class BinarySemaphorePosix

 #endif

-} // namespace concurrency
+} // namespace concurrency
@@ -78,11 +78,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // Configuration
 // -----------------------------------------------------------------------------

-// Pre-hop drop handling (compile-time flag).
-#ifndef MESHTASTIC_PREHOP_DROP
-#define MESHTASTIC_PREHOP_DROP 0
-#endif
-
 /// Convert a preprocessor name into a quoted string
 #define xstr(s) ystr(s)
 #define ystr(s) #s
@@ -231,7 +226,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define BME_ADDR 0x76
 #define BME_ADDR_ALTERNATE 0x77
 #define MCP9808_ADDR 0x18
-#define INA_ADDR 0x40 // same as SHT2X
+#define INA_ADDR 0x40
 #define INA_ADDR_ALTERNATE 0x41
 #define INA_ADDR_WAVESHARE_UPS 0x43
 #define INA3221_ADDR 0x42
@@ -244,8 +239,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LPS22HB_ADDR 0x5C
 #define LPS22HB_ADDR_ALT 0x5D
 #define SFA30_ADDR 0x5D
-#define SHTXX_ADDR 0x44
-#define SHTXX_ADDR_ALT 0x45
+#define SHT31_4x_ADDR 0x44
+#define SHT31_4x_ADDR_ALT 0x45
 #define PMSA003I_ADDR 0x12
 #define QMA6100P_ADDR 0x12
 #define AHT10_ADDR 0x38
@@ -515,7 +510,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MESHTASTIC_EXCLUDE_REMOTEHARDWARE 1
 #define MESHTASTIC_EXCLUDE_STOREFORWARD 1
 #define MESHTASTIC_EXCLUDE_TEXTMESSAGE 1
-#define MESHTASTIC_EXCLUDE_TRAFFIC_MANAGEMENT 1
 #define MESHTASTIC_EXCLUDE_ATAK 1
 #define MESHTASTIC_EXCLUDE_CANNEDMESSAGES 1
 #define MESHTASTIC_EXCLUDE_NEIGHBORINFO 1
@@ -31,6 +31,9 @@ class ScanI2C
        INA3221,
        MAX17048,
        MCP9808,
+        SHT31,
+        SHT4X,
+        SHTC3,
        LPS22HB,
        QMC6310U,
        QMC6310N,
@@ -91,8 +94,7 @@ class ScanI2C
        SFA30,
        CW2015,
        SCD30,
-        ADS1115,
-        SHTXX
+        ADS1115
    } DeviceType;

    // typedef uint8_t DeviceAddress;
@@ -136,9 +136,7 @@ bool ScanI2CTwoWire::i2cCommandResponseLength(ScanI2C::DeviceAddress addr, uint1
    return match;
 }

-#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR
-// FIXME Move to a separate file for detection of sensors that require more complex interactions?
-// For SEN5X detection
+/// for SEN5X detection
 // Note, this code needs to be called before setting the I2C bus speed
 // for the screen at high speed. The speed needs to be at 100kHz, otherwise
 // detection will not work
@@ -176,46 +174,6 @@ String readSEN5xProductName(TwoWire *i2cBus, uint8_t address)

    return String(productName);
 }
-#endif
-
-#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
-bool detectSHT21SerialNumber(TwoWire *i2cBus, uint8_t address)
-{
-
-    i2cBus->beginTransmission(address);
-    i2cBus->write(0xFA);
-    i2cBus->write(0x0F);
-
-    if (i2cBus->endTransmission() != 0)
-        return false;
-
-    if (i2cBus->requestFrom(address, (uint8_t)8) != 8)
-        return false;
-
-    // Just flush the data
-    while (i2cBus->available() < 8) {
-        i2cBus->read();
-    }
-
-    i2cBus->beginTransmission(address);
-    i2cBus->write(0xFC);
-    i2cBus->write(0xC9);
-
-    if (i2cBus->endTransmission() != 0)
-        return false;
-
-    if (i2cBus->requestFrom(address, (uint8_t)6) != 6)
-        return false;
-
-    // Just flush the data
-    while (i2cBus->available() < 6) {
-        i2cBus->read();
-    }
-
-    // Assume we detect the SHT21 if something came back from the request
-    return true;
-}
-#endif

 #define SCAN_SIMPLE_CASE(ADDR, T, ...)                                                                                           \
    case ADDR:                                                                                                                   \
@@ -413,7 +371,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                break;
 #endif
 #if !defined(M5STACK_UNITC6L)
-            case INA_ADDR: // Same as SHT2X
+            case INA_ADDR:
            case INA_ADDR_ALTERNATE:
            case INA_ADDR_WAVESHARE_UPS:
                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0xFE), 2);
@@ -429,12 +387,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                        logFoundDevice("INA260", (uint8_t)addr.address);
                        type = INA260;
                    }
-#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
-                } else if (detectSHT21SerialNumber(i2cBus, (uint8_t)addr.address)) {
-                    logFoundDevice("SHTXX (SHT2X)", (uint8_t)addr.address);
-                    type = SHTXX;
-#endif
-                } else { // Assume INA219 if none of the above ones are found
+                } else { // Assume INA219 if INA260 ID is not found
                    logFoundDevice("INA219", (uint8_t)addr.address);
                    type = INA219;
                }
@@ -495,19 +448,22 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                    }
                    break;
                }
-            case SHTXX_ADDR:     // same as OPT3001_ADDR_ALT
-            case SHTXX_ADDR_ALT: // same as OPT3001_ADDR
+            case SHT31_4x_ADDR:     // same as OPT3001_ADDR_ALT
+            case SHT31_4x_ADDR_ALT: // same as OPT3001_ADDR
                if (getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x7E), 2) == 0x5449) {
                    type = OPT3001;
                    logFoundDevice("OPT3001", (uint8_t)addr.address);
-                } else { // SHTXX
-                    type = SHTXX;
-                    logFoundDevice("SHTXX", (uint8_t)addr.address);
+                } else if (i2cCommandResponseLength(addr, 0x89, 6)) { // SHT4x serial number (6 bytes inc. CRC)
+                    type = SHT4X;
+                    logFoundDevice("SHT4X", (uint8_t)addr.address);
+                } else {
+                    type = SHT31;
+                    logFoundDevice("SHT31", (uint8_t)addr.address);
                }

                break;

-                SCAN_SIMPLE_CASE(SHTC3_ADDR, SHTXX, "SHTXX", (uint8_t)addr.address)
+                SCAN_SIMPLE_CASE(SHTC3_ADDR, SHTC3, "SHTC3", (uint8_t)addr.address)
            case RCWL9620_ADDR:
                // get MAX30102 PARTID
                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0xFF), 1);
@@ -719,7 +675,6 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                    logFoundDevice("BMX160", (uint8_t)addr.address);
                    break;
                } else {
-#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR
                    String prod = "";
                    prod = readSEN5xProductName(i2cBus, addr.address);
                    if (prod.startsWith("SEN55")) {
@@ -735,7 +690,6 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                        logFoundDevice("Sensirion SEN50", addr.address);
                        break;
                    }
-#endif
                    if (addr.address == BMX160_ADDR) {
                        type = BMX160;
                        logFoundDevice("BMX160", (uint8_t)addr.address);
@@ -103,14 +103,6 @@ static int32_t gpsSwitch()
    if (gps) {
        int currentState = digitalRead(PIN_GPS_SWITCH);

-        // Respect explicit NOT_PRESENT mode and do not let the hardware switch re-enable GPS.
-        if (config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_NOT_PRESENT) {
-            gps->disable();
-            lastState = currentState;
-            firstrun = false;
-            return 1000;
-        }
-
        // if the switch is set to zero, disable the GPS Thread
        if (firstrun)
            if (currentState == LOW)
@@ -202,7 +202,7 @@ void EInkParallelDisplay::display(void)

    // Get pointers to internal buffers
    uint8_t *cur = epaper->currentBuffer();
-    uint8_t *prev = epaper->previousBuffer(); // may be NULL on first init
+    const uint8_t *prev = epaper->previousBuffer(); // may be NULL on first init

    // Track changed row range while converting
    int newTop = h;     // min changed row (initialized to out-of-range)
@@ -1254,14 +1254,14 @@ void TFTDisplay::display(bool fromBlank)

        // Did we find a pixel that needs updating on this row?
        if (x_FirstPixelUpdate < displayWidth) {
-            // Align the first pixel for update to an even number so the total alignment of
-            // the data will be at 32-bit boundary, which is required by GDMA SPI transfers.
-            x_FirstPixelUpdate &= ~1;

-            // Step 3a: copy rest of the pixels in this row into the pixel line buffer,
-            // while also recording the last pixel in the row that needs updating.
-            // Since the first changed pixel will be looked up, the x_LastPixelUpdate will be set.
-            for (x = x_FirstPixelUpdate; x < displayWidth; x++) {
+            // Quickly write out the first changed pixel (saves another array lookup)
+            linePixelBuffer[x_FirstPixelUpdate] = isset ? colorTftMesh : colorTftBlack;
+            x_LastPixelUpdate = x_FirstPixelUpdate;
+
+            // Step 3: copy all remaining pixels in this row into the pixel line buffer,
+            // while also recording the last pixel in the row that needs updating
+            for (x = x_FirstPixelUpdate + 1; x < displayWidth; x++) {
                isset = buffer[x + y_byteIndex] & y_byteMask;
                linePixelBuffer[x] = isset ? colorTftMesh : colorTftBlack;

@@ -1274,14 +1274,6 @@ void TFTDisplay::display(bool fromBlank)
                    x_LastPixelUpdate = x;
                }
            }
-            // Step 3b: Round up the last pixel to odd number to maintain 32-bit alignment for SPIs.
-            // Most displays will have even number of pixels in a row -- this will be in bounds
-            // of the displayWidth. (Hopefully odd displays will just ignore that extra pixel.)
-            x_LastPixelUpdate |= 1;
-            // Ensure the last pixel index does not exceed the display width.
-            if (x_LastPixelUpdate >= displayWidth) {
-                x_LastPixelUpdate = displayWidth - 1;
-            }
 #if defined(HACKADAY_COMMUNICATOR)
            tft->draw16bitBeRGBBitmap(x_FirstPixelUpdate, y, &linePixelBuffer[x_FirstPixelUpdate],
                                      (x_LastPixelUpdate - x_FirstPixelUpdate + 1), 1);
@@ -408,16 +408,7 @@ void drawLoRaFocused(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
    display->drawString(nameX, getTextPositions(display)[line++], device_role);

    // === Third Row: Radio Preset ===
-    // For custom modem settings show the actual parameters; for presets use the preset name.
-    char modeStr[16];
-    if (!config.lora.use_preset) {
-        snprintf(modeStr, sizeof(modeStr), "BW%u-SF%u-CR%u", static_cast<unsigned>(config.lora.bandwidth),
-                 static_cast<unsigned>(config.lora.spread_factor), static_cast<unsigned>(config.lora.coding_rate));
-    } else {
-        strncpy(modeStr, DisplayFormatters::getModemPresetDisplayName(config.lora.modem_preset, false, true),
-                sizeof(modeStr) - 1);
-        modeStr[sizeof(modeStr) - 1] = '\0';
-    }
+    auto mode = DisplayFormatters::getModemPresetDisplayName(config.lora.modem_preset, false, config.lora.use_preset);

    char regionradiopreset[25];
    const char *region = myRegion ? myRegion->name : NULL;
@@ -425,7 +416,7 @@ void drawLoRaFocused(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x,
        if (currentResolution == ScreenResolution::UltraLow) {
            snprintf(regionradiopreset, sizeof(regionradiopreset), "%s", region);
        } else {
-            snprintf(regionradiopreset, sizeof(regionradiopreset), "%s/%s", region, modeStr);
+            snprintf(regionradiopreset, sizeof(regionradiopreset), "%s/%s", region, mode);
        }
    }
    textWidth = display->getStringWidth(regionradiopreset);
@@ -18,7 +18,6 @@
 #include "main.h"
 #include "mesh/Default.h"
 #include "mesh/MeshTypes.h"
-#include "mesh/RadioLibInterface.h"
 #include "modules/AdminModule.h"
 #include "modules/CannedMessageModule.h"
 #include "modules/ExternalNotificationModule.h"
@@ -26,7 +25,6 @@
 #include "modules/TraceRouteModule.h"
 #include <algorithm>
 #include <array>
-#include <cmath>
 #include <functional>
 #include <utility>

@@ -161,20 +159,31 @@ void menuHandler::LoraRegionPicker(uint32_t duration)
                return;
            }

-            // Guard: without a reboot, reconfigure() applies the region directly.
-            // Reject LORA_24 on sub-GHz-only hardware — getRadio() used to catch this post-reboot.
-            if (selectedRegion == meshtastic_Config_LoRaConfig_RegionCode_LORA_24 &&
-                !(RadioLibInterface::instance && RadioLibInterface::instance->wideLora())) {
-                LOG_WARN("Radio hardware does not support 2.4 GHz; ignoring LORA_24 selection");
-                return;
-            }
-
            config.lora.region = selectedRegion;
            auto changes = SEGMENT_CONFIG;

+        // FIXME: This should be a method consolidated with the same logic in the admin message as well
+        // This is needed as we wait til picking the LoRa region to generate keys for the first time.
 #if !(MESHTASTIC_EXCLUDE_PKI_KEYGEN || MESHTASTIC_EXCLUDE_PKI)
-            if (crypto) {
-                crypto->ensurePkiKeys(config.security, owner);
+            if (!owner.is_licensed) {
+                bool keygenSuccess = false;
+                if (config.security.private_key.size == 32) {
+                    // public key is derived from private, so this will always have the same result.
+                    if (crypto->regeneratePublicKey(config.security.public_key.bytes, config.security.private_key.bytes)) {
+                        keygenSuccess = true;
+                    }
+
+                } else {
+                    LOG_INFO("Generate new PKI keys");
+                    crypto->generateKeyPair(config.security.public_key.bytes, config.security.private_key.bytes);
+                    keygenSuccess = true;
+                }
+                if (keygenSuccess) {
+                    config.security.public_key.size = 32;
+                    config.security.private_key.size = 32;
+                    owner.public_key.size = 32;
+                    memcpy(owner.public_key.bytes, config.security.public_key.bytes, 32);
+                }
            }
 #endif
            config.lora.tx_enabled = true;
@@ -190,6 +199,7 @@ void menuHandler::LoraRegionPicker(uint32_t duration)
            }

            service->reloadConfig(changes);
+            rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
        });

    bannerOptions.durationMs = duration;
@@ -255,24 +265,13 @@ void menuHandler::FrequencySlotPicker()
    optionsEnumArray[options++] = 0;

    // Calculate number of channels (copied from RadioInterface::applyModemConfig())
-
    meshtastic_Config_LoRaConfig &loraConfig = config.lora;
    double bw = loraConfig.use_preset ? modemPresetToBwKHz(loraConfig.modem_preset, myRegion->wideLora)
                                      : bwCodeToKHz(loraConfig.bandwidth);

    uint32_t numChannels = 0;
    if (myRegion) {
-        // Match RadioInterface::applyModemConfig(): include padding, add spacing in numerator, and use round()
-        const double spacing = myRegion->profile->spacing;
-        const double padding = myRegion->profile->padding;
-        const double channelBandwidthMHz = bw / 1000.0;
-        const double numerator = (myRegion->freqEnd - myRegion->freqStart) + spacing;
-        const double denominator = spacing + (padding * 2) + channelBandwidthMHz;
-        if (denominator > 0.0) {
-            numChannels = static_cast<uint32_t>(round(numerator / denominator));
-        } else {
-            LOG_WARN("Invalid region configuration: non-positive channel spacing/width");
-        }
+        numChannels = (uint32_t)floor((myRegion->freqEnd - myRegion->freqStart) / (myRegion->spacing + (bw / 1000.0)));
    } else {
        LOG_WARN("Region not set, cannot calculate number of channels");
        return;
@@ -308,6 +307,7 @@ void menuHandler::FrequencySlotPicker()

        config.lora.channel_num = selected;
        service->reloadConfig(SEGMENT_CONFIG);
+        rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
    };

    screen->showOverlayBanner(bannerOptions);
@@ -346,6 +346,7 @@ void menuHandler::radioPresetPicker()
            config.lora.channel_num = 0;        // Reset to default channel for the preset
            config.lora.override_frequency = 0; // Clear any custom frequency
            service->reloadConfig(SEGMENT_CONFIG);
+            rebootAtMsec = (millis() + DEFAULT_REBOOT_SECONDS * 1000);
        });

    screen->showOverlayBanner(bannerOptions);
@@ -422,6 +422,17 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
    std::vector<bool> isMine;   // track alignment
    std::vector<bool> isHeader; // track header lines
    std::vector<AckStatus> ackForLine;
+    // Hard limit on total cached lines to prevent unbounded growth from a single long message.
+    // Reserve to the actual cache cap up front, because a single message can expand to many more
+    // wrapped display lines than a small per-message estimate would predict. For a display
+    // rendering only ~5-30 lines at a time, caching more than this limit wastes heap. Stop
+    // appending once we reach MAX_CACHED_LINES to prevent a single message from blowing out the
+    // heap.
+    constexpr size_t MAX_CACHED_LINES = 100U; // ~5-6KB for std::string overhead on 32-bit (if each ~50-60 bytes avg)
+    allLines.reserve(MAX_CACHED_LINES);
+    isMine.reserve(MAX_CACHED_LINES);
+    isHeader.reserve(MAX_CACHED_LINES);
+    ackForLine.reserve(MAX_CACHED_LINES);

    for (auto it = filtered.rbegin(); it != filtered.rend(); ++it) {
        const auto &m = *it;
@@ -565,16 +576,23 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16

        int wrapWidth = mine ? rightTextWidth : leftTextWidth;
        std::vector<std::string> wrapped = generateLines(display, "", msgText, wrapWidth);
+        // Per-message wrap-line limit: even if wrapping produces many lines, cap them to prevent
+        // a single long message from consuming most or all of the cache.
+        constexpr size_t MAX_WRAPPED_LINES_PER_MSG = 20U;
+        size_t wrappedCount = 0;
        for (auto &ln : wrapped) {
-            allLines.push_back(ln);
+            if (allLines.size() >= MAX_CACHED_LINES || wrappedCount >= MAX_WRAPPED_LINES_PER_MSG)
+                break; // Cache limit or per-message limit reached; stop adding lines from this message
+            allLines.emplace_back(std::move(ln));
            isMine.push_back(mine);
            isHeader.push_back(false);
            ackForLine.push_back(AckStatus::NONE);
+            ++wrappedCount;
        }
    }

    // Cache lines and heights
-    cachedLines = allLines;
+    cachedLines.swap(allLines);
    cachedHeights = calculateLineHeights(cachedLines, emotes, isHeader);

    std::vector<MessageBlock> blocks = buildMessageBlocks(isHeader, isMine);
@@ -177,8 +177,24 @@ static void applyLoRaRegion(meshtastic_Config_LoRaConfig_RegionCode region)
    auto changes = SEGMENT_CONFIG;

 #if !(MESHTASTIC_EXCLUDE_PKI_KEYGEN || MESHTASTIC_EXCLUDE_PKI)
-    if (crypto) {
-        crypto->ensurePkiKeys(config.security, owner);
+    if (!owner.is_licensed) {
+        bool keygenSuccess = false;
+
+        if (config.security.private_key.size == 32) {
+            if (crypto->regeneratePublicKey(config.security.public_key.bytes, config.security.private_key.bytes)) {
+                keygenSuccess = true;
+            }
+        } else {
+            crypto->generateKeyPair(config.security.public_key.bytes, config.security.private_key.bytes);
+            keygenSuccess = true;
+        }
+
+        if (keygenSuccess) {
+            config.security.public_key.size = 32;
+            config.security.private_key.size = 32;
+            owner.public_key.size = 32;
+            memcpy(owner.public_key.bytes, config.security.public_key.bytes, 32);
+        }
    }
 #endif

@@ -121,7 +121,6 @@ void CardputerKeyboard::pressed(uint8_t key)
        modifierFlag = 0;
    }

-    uint8_t next_key = 0;
    int row = (key - 1) / 10;
    int col = (key - 1) % 10;

@@ -61,33 +61,6 @@ bool CryptoEngine::regeneratePublicKey(uint8_t *pubKey, uint8_t *privKey)
    }
    return true;
 }
-
-bool CryptoEngine::ensurePkiKeys(meshtastic_Config_SecurityConfig &security, meshtastic_User &user)
-{
-    if (user.is_licensed) {
-        return false;
-    }
-
-    bool keygenSuccess = false;
-    if (security.private_key.size == 32) {
-        if (regeneratePublicKey(security.public_key.bytes, security.private_key.bytes)) {
-            keygenSuccess = true;
-        }
-    } else {
-        LOG_INFO("Generate new PKI keys");
-        generateKeyPair(security.public_key.bytes, security.private_key.bytes);
-        keygenSuccess = true;
-    }
-
-    if (keygenSuccess) {
-        security.public_key.size = 32;
-        security.private_key.size = 32;
-        user.public_key.size = 32;
-        memcpy(user.public_key.bytes, security.public_key.bytes, 32);
-    }
-
-    return keygenSuccess;
-}
 #endif

 /**
@@ -36,7 +36,6 @@ class CryptoEngine
 #if !(MESHTASTIC_EXCLUDE_PKI_KEYGEN)
    virtual void generateKeyPair(uint8_t *pubKey, uint8_t *privKey);
    virtual bool regeneratePublicKey(uint8_t *pubKey, uint8_t *privKey);
-    virtual bool ensurePkiKeys(meshtastic_Config_SecurityConfig &security, meshtastic_User &user);

 #endif
    void setDHPrivateKey(uint8_t *_private_key);
@@ -30,11 +30,6 @@
 #define min_node_info_broadcast_secs 60 * 60 // No regular broadcasts of more than once an hour
 #define min_neighbor_info_broadcast_secs 4 * 60 * 60
 #define default_map_publish_interval_secs 60 * 60
-
-// Traffic management defaults
-#define default_traffic_mgmt_position_precision_bits 24         // ~10m grid cells
-#define default_traffic_mgmt_position_min_interval_secs ONE_DAY // 1 day between identical positions
-
 #ifdef USERPREFS_RINGTONE_NAG_SECS
 #define default_ringtone_nag_secs USERPREFS_RINGTONE_NAG_SECS
 #else
@@ -192,11 +192,6 @@ template <typename T> bool LR11x0Interface<T>::reconfigure()
    err = lora.setOutputPower(power);
    assert(err == RADIOLIB_ERR_NONE);

-    // Apply RX gain mode — valid in STDBY, matches resetAGC() pattern
-    err = lora.setRxBoostedGainMode(config.lora.sx126x_rx_boosted_gain);
-    if (err != RADIOLIB_ERR_NONE)
-        LOG_WARN("LR11x0 setRxBoostedGainMode %s%d", radioLibErr, err);
-
    startReceive(); // restart receiving

    return RADIOLIB_ERR_NONE;
@@ -5,52 +5,18 @@
 #include "PointerQueue.h"
 #include "configuration.h"

-// Sentinel marking the end of a modem preset array
-static constexpr meshtastic_Config_LoRaConfig_ModemPreset MODEM_PRESET_END =
-    static_cast<meshtastic_Config_LoRaConfig_ModemPreset>(0xFF);
-
-// Region profile: bundles the preset list with regulatory parameters shared across regions
-struct RegionProfile {
-    const meshtastic_Config_LoRaConfig_ModemPreset *presets; // sentinel-terminated; first entry is the default
-    float spacing;                                           // gaps between radio channels
-    float padding;                                           // padding at each side of the "operating channel"
-    bool audioPermitted;
-    bool licensedOnly;        // a region profile for licensed operators only
-    int8_t textThrottle;      // throttle for text - future expansion
-    int8_t positionThrottle;  // throttle for location data - future expansion
-    int8_t telemetryThrottle; // throttle for telemetry - future expansion
-    uint8_t overrideSlot;     // a per-region override slot for if we need to fix it in place
-};
-
-extern const RegionProfile PROFILE_STD;
-extern const RegionProfile PROFILE_EU868;
-extern const RegionProfile PROFILE_UNDEF;
-// extern const RegionProfile  PROFILE_LITE;
-// extern const RegionProfile  PROFILE_NARROW;
-// extern const RegionProfile  PROFILE_HAM;
-
 // Map from old region names to new region enums
 struct RegionInfo {
    meshtastic_Config_LoRaConfig_RegionCode code;
    float freqStart;
    float freqEnd;
-    float dutyCycle;    // modified by getEffectiveDutyCycle
+    float dutyCycle;
+    float spacing;
    uint8_t powerLimit; // Or zero for not set
+    bool audioPermitted;
    bool freqSwitching;
    bool wideLora;
-    const RegionProfile *profile;
    const char *name; // EU433 etc
-
-    // Preset accessors (delegate through profile)
-    meshtastic_Config_LoRaConfig_ModemPreset getDefaultPreset() const { return profile->presets[0]; }
-    const meshtastic_Config_LoRaConfig_ModemPreset *getAvailablePresets() const { return profile->presets; }
-    size_t getNumPresets() const
-    {
-        size_t n = 0;
-        while (profile->presets[n] != MODEM_PRESET_END)
-            n++;
-        return n;
-    }
 };

 extern const RegionInfo regions[];
@@ -4,9 +4,6 @@
 #if !MESHTASTIC_EXCLUDE_TRACEROUTE
 #include "modules/TraceRouteModule.h"
 #endif
-#if HAS_TRAFFIC_MANAGEMENT
-#include "modules/TrafficManagementModule.h"
-#endif
 #include "NodeDB.h"

 NextHopRouter::NextHopRouter() {}
@@ -129,28 +126,15 @@ void NextHopRouter::sniffReceived(const meshtastic_MeshPacket *p, const meshtast
 /* Check if we should be rebroadcasting this packet if so, do so. */
 bool NextHopRouter::perhapsRebroadcast(const meshtastic_MeshPacket *p)
 {
-    // Check if traffic management wants to exhaust this packet's hops
-    bool exhaustHops = false;
-#if HAS_TRAFFIC_MANAGEMENT
-    if (trafficManagementModule && trafficManagementModule->shouldExhaustHops(*p)) {
-        exhaustHops = true;
-    }
-#endif
-
-    // Allow rebroadcast if hop_limit > 0 OR if we're exhausting hops (which sets hop_limit = 0 but still needs one relay)
-    if (!isToUs(p) && !isFromUs(p) && (p->hop_limit > 0 || exhaustHops)) {
+    if (!isToUs(p) && !isFromUs(p) && p->hop_limit > 0) {
        if (p->id != 0) {
            if (isRebroadcaster()) {
                if (p->next_hop == NO_NEXT_HOP_PREFERENCE || p->next_hop == nodeDB->getLastByteOfNodeNum(getNodeNum())) {
                    meshtastic_MeshPacket *tosend = packetPool.allocCopy(*p); // keep a copy because we will be sending it
                    LOG_INFO("Rebroadcast received message coming from %x", p->relay_node);

-                    // If exhausting hops, force hop_limit = 0 regardless of other logic
-                    if (exhaustHops) {
-                        tosend->hop_limit = 0;
-                        LOG_INFO("Traffic management: exhausting hops for 0x%08x, setting hop_limit=0", getFrom(p));
-                    } else if (shouldDecrementHopLimit(p)) {
-                        // Use shared logic to determine if hop_limit should be decremented
+                    // Use shared logic to determine if hop_limit should be decremented
+                    if (shouldDecrementHopLimit(p)) {
                        tosend->hop_limit--; // bump down the hop count
                    } else {
                        LOG_INFO("favorite-ROUTER/CLIENT_BASE-to-ROUTER/CLIENT_BASE rebroadcast: preserving hop_limit");
@@ -1299,7 +1299,7 @@ void NodeDB::loadFromDisk()
    // Coerce LoRa config fields derived from presets while bootstrapping.
    // Some clients/UI components display bandwidth/spread_factor directly from config even in preset mode.
    if (config.has_lora && config.lora.use_preset) {
-        RadioInterface::clampConfigLora(config.lora);
+        RadioInterface::bootstrapLoRaConfigFromPreset(config.lora);
    }

 #if defined(USERPREFS_LORA_TX_DISABLED) && USERPREFS_LORA_TX_DISABLED
@@ -1650,25 +1650,6 @@ uint32_t sinceReceived(const meshtastic_MeshPacket *p)
    return delta;
 }

-HopStartStatus classifyHopStart(const meshtastic_MeshPacket &p)
-{
-    // Guard against invalid values.
-    if (p.hop_start < p.hop_limit)
-        return HopStartStatus::INVALID;
-
-    if (p.hop_start == 0) {
-        // Firmware prior to 2.3.0 (585805c) lacked a hop_start field. Firmware version 2.5.0 (bf34329) introduced a
-        // bitfield that is always present. Use the presence of the bitfield to determine if the origin's firmware
-        // version is guaranteed to have hop_start populated. Note that this can only be done for decoded packets as
-        // the bitfield is encrypted under the channel encryption key.
-        if (p.which_payload_variant == meshtastic_MeshPacket_decoded_tag && p.decoded.has_bitfield)
-            return HopStartStatus::VALID;
-        return HopStartStatus::MISSING_OR_UNKNOWN;
-    }
-
-    return HopStartStatus::VALID;
-}
-
 int8_t getHopsAway(const meshtastic_MeshPacket &p, int8_t defaultIfUnknown)
 {
    // Firmware prior to 2.3.0 (585805c) lacked a hop_start field. Firmware version 2.5.0 (bf34329) introduced a
@@ -1706,22 +1687,6 @@ size_t NodeDB::getNumOnlineMeshNodes(bool localOnly)
 #include "MeshModule.h"
 #include "Throttle.h"

-static constexpr uint32_t HOPSTART_DROP_LOG_INTERVAL_MS = 15000;
-
-void logHopStartDrop(const meshtastic_MeshPacket &p, const char *context)
-{
-    static uint32_t lastLogMs = 0;
-    if (Throttle::isWithinTimespanMs(lastLogMs, HOPSTART_DROP_LOG_INTERVAL_MS)) {
-        return;
-    }
-    lastLogMs = millis();
-    const bool decoded = (p.which_payload_variant == meshtastic_MeshPacket_decoded_tag);
-    const bool hasBitfield = decoded && p.decoded.has_bitfield;
-    LOG_DEBUG(
-        "Drop packet (%s): hop_start invalid/missing (from=0x%x id=%u hop_start=%u hop_limit=%u decoded=%d has_bitfield=%d)",
-        context ? context : "unknown", p.from, p.id, p.hop_start, p.hop_limit, decoded, hasBitfield);
-}
-
 /** Update position info for this node based on received position data
 */
 void NodeDB::updatePosition(uint32_t nodeId, const meshtastic_Position &p, RxSource src)
@@ -114,27 +114,6 @@ uint32_t sinceReceived(const meshtastic_MeshPacket *p);
 /// Returns defaultIfUnknown if the number of hops couldn't be determined.
 int8_t getHopsAway(const meshtastic_MeshPacket &p, int8_t defaultIfUnknown = -1);

-enum class HopStartStatus : uint8_t { VALID = 0, MISSING_OR_UNKNOWN, INVALID };
-
-/// Classify hop_start validity for forwarding decisions.
-HopStartStatus classifyHopStart(const meshtastic_MeshPacket &p);
-
-inline bool shouldDropPacketForPreHop(const meshtastic_MeshPacket &p)
-{
-#if !MESHTASTIC_PREHOP_DROP
-    (void)p;
-    return false;
-#else
-    if (isFromUs(&p)) {
-        return false; // local-originated packets should never be dropped by pre-hop drop policy
-    }
-    return classifyHopStart(p) != HopStartStatus::VALID;
-#endif
-}
-
-/// Rate-limited debug log when hop_start is invalid/missing and packet is dropped.
-void logHopStartDrop(const meshtastic_MeshPacket &p, const char *context);
-
 enum LoadFileResult {
    // Successfully opened the file
    LOAD_SUCCESS = 1,
@@ -449,11 +449,6 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
            fromRadioScratch.moduleConfig.which_payload_variant = meshtastic_ModuleConfig_paxcounter_tag;
            fromRadioScratch.moduleConfig.payload_variant.paxcounter = moduleConfig.paxcounter;
            break;
-        case meshtastic_ModuleConfig_traffic_management_tag:
-            LOG_DEBUG("Send module config: traffic management");
-            fromRadioScratch.moduleConfig.which_payload_variant = meshtastic_ModuleConfig_traffic_management_tag;
-            fromRadioScratch.moduleConfig.payload_variant.traffic_management = moduleConfig.traffic_management;
-            break;
        default:
            LOG_ERROR("Unknown module config type %d", config_state);
        }
@@ -21,7 +21,6 @@
 #include <assert.h>
 #include <pb_decode.h>
 #include <pb_encode.h>
-#include <string.h>

 #ifdef ARCH_PORTDUINO
 #include "platform/portduino/PortduinoGlue.h"
@@ -33,32 +32,10 @@
 #include "STM32WLE5JCInterface.h"
 #endif

-static const meshtastic_Config_LoRaConfig_ModemPreset PRESETS_STD[] = {
-    meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST,     meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW,
-    meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW,   meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST,
-    meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW,    meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST,
-    meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE, meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO,
-    meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO,    MODEM_PRESET_END};
-
-static const meshtastic_Config_LoRaConfig_ModemPreset PRESETS_EU_868[] = {
-    meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST,     meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW,
-    meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW,   meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST,
-    meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW,    meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST,
-    meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE, MODEM_PRESET_END};
-
-static const meshtastic_Config_LoRaConfig_ModemPreset PRESETS_UNDEF[] = {meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST,
-                                                                         MODEM_PRESET_END};
-
-// Region profiles: bundle preset list + regulatory parameters shared across regions
-// presets, spacing, padding, audio, licensed, text throttle, position throttle, telemetry throttle, override slot
-const RegionProfile PROFILE_STD = {PRESETS_STD, 0, 0, true, false, 0, 0, 0, 0};
-const RegionProfile PROFILE_EU868 = {PRESETS_EU_868, 0, 0, false, false, 0, 0, 0, 0};
-const RegionProfile PROFILE_UNDEF = {PRESETS_UNDEF, 0, 0, true, false, 0, 0, 0, 0};
-
-#define RDEF(name, freq_start, freq_end, duty_cycle, power_limit, frequency_switching, wide_lora, profile_ptr)                   \
+#define RDEF(name, freq_start, freq_end, duty_cycle, spacing, power_limit, audio_permitted, frequency_switching, wide_lora)      \
    {                                                                                                                            \
-        meshtastic_Config_LoRaConfig_RegionCode_##name, freq_start, freq_end, duty_cycle, power_limit, frequency_switching,      \
-            wide_lora, &profile_ptr, #name                                                                                       \
+        meshtastic_Config_LoRaConfig_RegionCode_##name, freq_start, freq_end, duty_cycle, spacing, power_limit, audio_permitted, \
+            frequency_switching, wide_lora, #name                                                                                \
    }

 const RegionInfo regions[] = {
@@ -66,7 +43,7 @@ const RegionInfo regions[] = {
        https://link.springer.com/content/pdf/bbm%3A978-1-4842-4357-2%2F1.pdf
        https://www.thethingsnetwork.org/docs/lorawan/regional-parameters/
    */
-    RDEF(US, 902.0f, 928.0f, 100, 30, false, false, PROFILE_STD),
+    RDEF(US, 902.0f, 928.0f, 100, 0, 30, true, false, false),

    /*
        EN300220 ETSI V3.2.1 [Table B.1, Item H, p. 21]
@@ -74,7 +51,8 @@ const RegionInfo regions[] = {
        https://www.etsi.org/deliver/etsi_en/300200_300299/30022002/03.02.01_60/en_30022002v030201p.pdf
        FIXME: https://github.com/meshtastic/firmware/issues/3371
     */
-    RDEF(EU_433, 433.0f, 434.0f, 10, 10, false, false, PROFILE_STD),
+    RDEF(EU_433, 433.0f, 434.0f, 10, 0, 10, true, false, false),
+
    /*
       https://www.thethingsnetwork.org/docs/lorawan/duty-cycle/
       https://www.thethingsnetwork.org/docs/lorawan/regional-parameters/
@@ -89,33 +67,33 @@ const RegionInfo regions[] = {
       AFA) to avoid a duty cycle. (Please refer to line P page 22 of this document.)
       https://www.etsi.org/deliver/etsi_en/300200_300299/30022002/03.01.01_60/en_30022002v030101p.pdf
     */
-    RDEF(EU_868, 869.4f, 869.65f, 10, 27, false, false, PROFILE_EU868),
+    RDEF(EU_868, 869.4f, 869.65f, 10, 0, 27, false, false, false),

    /*
        https://lora-alliance.org/wp-content/uploads/2020/11/lorawan_regional_parameters_v1.0.3reva_0.pdf
     */
-    RDEF(CN, 470.0f, 510.0f, 100, 19, false, false, PROFILE_STD),
+    RDEF(CN, 470.0f, 510.0f, 100, 0, 19, true, false, false),

    /*
        https://lora-alliance.org/wp-content/uploads/2020/11/lorawan_regional_parameters_v1.0.3reva_0.pdf
        https://www.arib.or.jp/english/html/overview/doc/5-STD-T108v1_5-E1.pdf
        https://qiita.com/ammo0613/items/d952154f1195b64dc29f
     */
-    RDEF(JP, 920.5f, 923.5f, 100, 13, false, false, PROFILE_STD),
+    RDEF(JP, 920.5f, 923.5f, 100, 0, 13, true, false, false),

    /*
        https://www.iot.org.au/wp/wp-content/uploads/2016/12/IoTSpectrumFactSheet.pdf
        https://iotalliance.org.nz/wp-content/uploads/sites/4/2019/05/IoT-Spectrum-in-NZ-Briefing-Paper.pdf
        Also used in Brazil.
     */
-    RDEF(ANZ, 915.0f, 928.0f, 100, 30, false, false, PROFILE_STD),
+    RDEF(ANZ, 915.0f, 928.0f, 100, 0, 30, true, false, false),

    /*
        433.05 - 434.79 MHz, 25mW EIRP max, No duty cycle restrictions
        AU Low Interference Potential https://www.acma.gov.au/licences/low-interference-potential-devices-lipd-class-licence
        NZ General User Radio Licence for Short Range Devices https://gazette.govt.nz/notice/id/2022-go3100
     */
-    RDEF(ANZ_433, 433.05f, 434.79f, 100, 14, false, false, PROFILE_STD),
+    RDEF(ANZ_433, 433.05f, 434.79f, 100, 0, 14, true, false, false),

    /*
        https://digital.gov.ru/uploaded/files/prilozhenie-12-k-reshenyu-gkrch-18-46-03-1.pdf
@@ -123,13 +101,13 @@ const RegionInfo regions[] = {
        Note:
            - We do LBT, so 100% is allowed.
     */
-    RDEF(RU, 868.7f, 869.2f, 100, 20, false, false, PROFILE_STD),
+    RDEF(RU, 868.7f, 869.2f, 100, 0, 20, true, false, false),

    /*
        https://www.law.go.kr/LSW/admRulLsInfoP.do?admRulId=53943&efYd=0
        https://resources.lora-alliance.org/technical-specifications/rp002-1-0-4-regional-parameters
     */
-    RDEF(KR, 920.0f, 923.0f, 100, 23, false, false, PROFILE_STD),
+    RDEF(KR, 920.0f, 923.0f, 100, 0, 23, true, false, false),

    /*
        Taiwan, 920-925Mhz, limited to 0.5W indoor or coastal, 1.0W outdoor.
@@ -137,40 +115,44 @@ const RegionInfo regions[] = {
        https://www.ncc.gov.tw/english/files/23070/102_5190_230703_1_doc_C.PDF
        https://gazette.nat.gov.tw/egFront/e_detail.do?metaid=147283
     */
-    RDEF(TW, 920.0f, 925.0f, 100, 27, false, false, PROFILE_STD),
+    RDEF(TW, 920.0f, 925.0f, 100, 0, 27, true, false, false),

    /*
        https://lora-alliance.org/wp-content/uploads/2020/11/lorawan_regional_parameters_v1.0.3reva_0.pdf
     */
-    RDEF(IN, 865.0f, 867.0f, 100, 30, false, false, PROFILE_STD),
+    RDEF(IN, 865.0f, 867.0f, 100, 0, 30, true, false, false),

    /*
         https://rrf.rsm.govt.nz/smart-web/smart/page/-smart/domain/licence/LicenceSummary.wdk?id=219752
         https://iotalliance.org.nz/wp-content/uploads/sites/4/2019/05/IoT-Spectrum-in-NZ-Briefing-Paper.pdf
      */
-    RDEF(NZ_865, 864.0f, 868.0f, 100, 36, false, false, PROFILE_STD),
+    RDEF(NZ_865, 864.0f, 868.0f, 100, 0, 36, true, false, false),

    /*
       https://lora-alliance.org/wp-content/uploads/2020/11/lorawan_regional_parameters_v1.0.3reva_0.pdf
       https://standard.nbtc.go.th/getattachment/Standards/%E0%B8%A1%E0%B8%B2%E0%B8%95%E0%B8%A3%E0%B8%90%E0%B8%B2%E0%B8%99%E0%B8%97%E0%B8%B2%E0%B8%87%E0%B9%80%E0%B8%97%E0%B8%84%E0%B8%99%E0%B8%B4%E0%B8%84%E0%B8%82%E0%B8%AD%E0%B8%87%E0%B9%80%E0%B8%84%E0%B8%A3%E0%B8%B7%E0%B9%88%E0%B8%AD%E0%B8%87%E0%B9%82%E0%B8%97%E0%B8%A3%E0%B8%84%E0%B8%A1%E0%B8%99%E0%B8%B2%E0%B8%84%E0%B8%A1/1033-2565.pdf.aspx?lang=th-TH
       Thailand 920–925 MHz set max TX power to 27 dBm and enforce 10% duty cycle, aligned with NBTC regulations.
    */
-    RDEF(TH, 920.0f, 925.0f, 10, 27, false, false, PROFILE_STD),
+    RDEF(TH, 920.0f, 925.0f, 10, 0, 27, true, false, false),

    /*
        433,05-434,7 Mhz 10 mW
+        https://nkrzi.gov.ua/images/upload/256/5810/PDF_UUZ_19_01_2016.pdf
+    */
+    RDEF(UA_433, 433.0f, 434.7f, 10, 0, 10, true, false, false),
+
+    /*
        868,0-868,6 Mhz 25 mW
        https://nkrzi.gov.ua/images/upload/256/5810/PDF_UUZ_19_01_2016.pdf
    */
-    RDEF(UA_433, 433.0f, 434.7f, 10, 10, false, false, PROFILE_STD),
-    RDEF(UA_868, 868.0f, 868.6f, 1, 14, false, false, PROFILE_STD),
+    RDEF(UA_868, 868.0f, 868.6f, 1, 0, 14, true, false, false),

    /*
        Malaysia
        433 - 435 MHz at 100mW, no restrictions.
        https://www.mcmc.gov.my/skmmgovmy/media/General/pdf/Short-Range-Devices-Specification.pdf
    */
-    RDEF(MY_433, 433.0f, 435.0f, 100, 20, false, false, PROFILE_STD),
+    RDEF(MY_433, 433.0f, 435.0f, 100, 0, 20, true, false, false),

    /*
        Malaysia
@@ -179,14 +161,14 @@ const RegionInfo regions[] = {
        Frequency hopping is used for 919 - 923 MHz.
        https://www.mcmc.gov.my/skmmgovmy/media/General/pdf/Short-Range-Devices-Specification.pdf
    */
-    RDEF(MY_919, 919.0f, 924.0f, 100, 27, true, false, PROFILE_STD),
+    RDEF(MY_919, 919.0f, 924.0f, 100, 0, 27, true, true, false),

    /*
        Singapore
        SG_923 Band 30d: 917 - 925 MHz at 100mW, no restrictions.
        https://www.imda.gov.sg/-/media/imda/files/regulation-licensing-and-consultations/ict-standards/telecommunication-standards/radio-comms/imdatssrd.pdf
    */
-    RDEF(SG_923, 917.0f, 925.0f, 100, 20, false, false, PROFILE_STD),
+    RDEF(SG_923, 917.0f, 925.0f, 100, 0, 20, true, false, false),

    /*
        Philippines
@@ -196,9 +178,8 @@ const RegionInfo regions[] = {
                https://github.com/meshtastic/firmware/issues/4948#issuecomment-2394926135
    */

-    RDEF(PH_433, 433.0f, 434.7f, 100, 10, false, false, PROFILE_STD),
-    RDEF(PH_868, 868.0f, 869.4f, 100, 14, false, false, PROFILE_STD),
-    RDEF(PH_915, 915.0f, 918.0f, 100, 24, false, false, PROFILE_STD),
+    RDEF(PH_433, 433.0f, 434.7f, 100, 0, 10, true, false, false), RDEF(PH_868, 868.0f, 869.4f, 100, 0, 14, true, false, false),
+    RDEF(PH_915, 915.0f, 918.0f, 100, 0, 24, true, false, false),

    /*
        Kazakhstan
@@ -206,38 +187,37 @@ const RegionInfo regions[] = {
                863 - 868 MHz <25 mW EIRP, 500kHz channels allowed, must not be used at airfields
                                https://github.com/meshtastic/firmware/issues/7204
    */
-    RDEF(KZ_433, 433.075f, 434.775f, 100, 10, false, false, PROFILE_STD),
-    RDEF(KZ_863, 863.0f, 868.0f, 100, 30, false, false, PROFILE_STD),
+    RDEF(KZ_433, 433.075f, 434.775f, 100, 0, 10, true, false, false),
+    RDEF(KZ_863, 863.0f, 868.0f, 100, 0, 30, true, false, false),

    /*
        Nepal
        865 MHz to 868 MHz frequency band for IoT (Internet of Things), M2M (Machine-to-Machine), and smart metering use,
       specifically in non-cellular mode. https://www.nta.gov.np/uploads/contents/Radio-Frequency-Policy-2080-English.pdf
    */
-    RDEF(NP_865, 865.0f, 868.0f, 100, 30, false, false, PROFILE_STD),
+    RDEF(NP_865, 865.0f, 868.0f, 100, 0, 30, true, false, false),

    /*
        Brazil
        902 - 907.5 MHz , 1W power limit, no duty cycle restrictions
        https://github.com/meshtastic/firmware/issues/3741
    */
-    RDEF(BR_902, 902.0f, 907.5f, 100, 30, false, false, PROFILE_STD),
+    RDEF(BR_902, 902.0f, 907.5f, 100, 0, 30, true, false, false),

    /*
       2.4 GHZ WLAN Band equivalent. Only for SX128x chips.
    */
-    RDEF(LORA_24, 2400.0f, 2483.5f, 100, 10, false, true, PROFILE_STD),
+    RDEF(LORA_24, 2400.0f, 2483.5f, 100, 0, 10, true, false, true),

    /*
        This needs to be last. Same as US.
    */
-    RDEF(UNSET, 902.0f, 928.0f, 100, 30, false, false, PROFILE_UNDEF)
+    RDEF(UNSET, 902.0f, 928.0f, 100, 0, 30, true, false, false)

 };

 const RegionInfo *myRegion;
 bool RadioInterface::uses_default_frequency_slot = true;
-bool RadioInterface::uses_custom_channel_name = false;

 static uint8_t bytes[MAX_LORA_PAYLOAD_LEN + 1];

@@ -523,14 +503,45 @@ void initRegion()
    myRegion = r;
 }

-const RegionInfo *getRegion(meshtastic_Config_LoRaConfig_RegionCode code)
+void RadioInterface::bootstrapLoRaConfigFromPreset(meshtastic_Config_LoRaConfig &loraConfig)
 {
+    if (!loraConfig.use_preset) {
+        return;
+    }
+
+    // Find region info to determine whether "wide" LoRa is permitted (2.4 GHz uses wider bandwidth codes).
    const RegionInfo *r = regions;
-    for (; r->code != meshtastic_Config_LoRaConfig_RegionCode_UNSET && r->code != code; r++)
+    for (; r->code != meshtastic_Config_LoRaConfig_RegionCode_UNSET && r->code != loraConfig.region; r++)
        ;
-    return r;
+
+    const bool regionWideLora = r->wideLora;
+
+    float bwKHz = 0;
+    uint8_t sf = 0;
+    uint8_t cr = 0;
+    modemPresetToParams(loraConfig.modem_preset, regionWideLora, bwKHz, sf, cr);
+
+    // If selected preset requests a bandwidth larger than the region span, fall back to LONG_FAST.
+    if (r->code != meshtastic_Config_LoRaConfig_RegionCode_UNSET && (r->freqEnd - r->freqStart) < (bwKHz / 1000.0f)) {
+        loraConfig.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
+        modemPresetToParams(loraConfig.modem_preset, regionWideLora, bwKHz, sf, cr);
+    }
+
+    loraConfig.bandwidth = bwKHzToCode(bwKHz);
+    loraConfig.spread_factor = sf;
 }

+/**
+ * ## LoRaWAN for North America
+
+LoRaWAN defines 64, 125 kHz channels from 902.3 to 914.9 MHz increments.
+
+The maximum output power for North America is +30 dBM.
+
+The band is from 902 to 928 MHz. It mentions channel number and its respective channel frequency. All the 13 channels are
+separated by 2.16 MHz with respect to the adjacent channels. Channel zero starts at 903.08 MHz center frequency.
+*/
+
 uint32_t RadioInterface::getPacketTime(const meshtastic_MeshPacket *p, bool received)
 {
    uint32_t pl = 0;
@@ -740,7 +751,7 @@ void RadioInterface::saveFreq(float freq)
 }

 /**
- * Save our frequency slot (aka channel) for later reuse.
+ * Save our channel for later reuse.
 */
 void RadioInterface::saveChannelNum(uint32_t channel_num)
 {
@@ -763,297 +774,113 @@ uint32_t RadioInterface::getChannelNum()
    return savedChannelNum;
 }

-/**
- * Send an error-level client notification. Safe to call when service is null (e.g. in tests).
- */
-static void sendErrorNotification(const char *msg)
-{
-    if (!service)
-        return;
-    meshtastic_ClientNotification *cn = clientNotificationPool.allocZeroed();
-    if (!cn)
-        return;
-    cn->level = meshtastic_LogRecord_Level_ERROR;
-    snprintf(cn->message, sizeof(cn->message), "%s", msg);
-    service->sendClientNotification(cn);
-}
-
-/**
- * Checks if a region is valid for the current settings.
- * Returns false if not compatible.
- */
-bool RadioInterface::validateConfigRegion(const meshtastic_Config_LoRaConfig &loraConfig)
-{
-    const RegionInfo *newRegion = getRegion(loraConfig.region);
-
-    // If you are not licensed, you can't use ham regions.
-    if (newRegion->profile->licensedOnly && !devicestate.owner.is_licensed) {
-        char err_string[160];
-        snprintf(err_string, sizeof(err_string), "Region %s requires licensed mode", newRegion->name);
-        LOG_ERROR("%s", err_string);
-        RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);
-        sendErrorNotification(err_string);
-        return false;
-    }
-
-    return true;
-}
-
-/**
- * Internal helper: validate or clamp a LoRa config against its region.
- * When clamp==false, returns false on first error (pure validation).
- * When clamp==true, fixes invalid settings in-place and returns true.
- */
-bool RadioInterface::checkOrClampConfigLora(meshtastic_Config_LoRaConfig &loraConfig, bool clamp)
-{
-    char err_string[160];
-    float check_bw;
-
-    const RegionInfo *newRegion = getRegion(loraConfig.region);
-
-    const char *presetName = DisplayFormatters::getModemPresetDisplayName(loraConfig.modem_preset, false, loraConfig.use_preset);
-
-    // Check preset validity (only when use_preset is true)
-    if (loraConfig.use_preset) {
-        check_bw = modemPresetToBwKHz(loraConfig.modem_preset, newRegion->wideLora);
-
-        bool preset_valid = false;
-        for (size_t i = 0; i < newRegion->getNumPresets(); i++) {
-            if (loraConfig.modem_preset == newRegion->getAvailablePresets()[i]) {
-                preset_valid = true;
-                break;
-            }
-        }
-        if (!preset_valid) {
-            const char *defaultName = DisplayFormatters::getModemPresetDisplayName(newRegion->getDefaultPreset(), false, true);
-            if (clamp) {
-                snprintf(err_string, sizeof(err_string), "Preset %s invalid for %s, using %s", presetName, newRegion->name,
-                         defaultName);
-            } else {
-                snprintf(err_string, sizeof(err_string), "Preset %s invalid for %s", presetName, newRegion->name);
-            }
-            LOG_ERROR("%s", err_string);
-            RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);
-            sendErrorNotification(err_string);
-
-            if (clamp) {
-                loraConfig.modem_preset = newRegion->getDefaultPreset();
-                check_bw = modemPresetToBwKHz(loraConfig.modem_preset, newRegion->wideLora);
-            } else {
-                return false;
-            }
-        }
-    } else {
-        check_bw = bwCodeToKHz(loraConfig.bandwidth);
-    }
-
-    // Calculate width of slots (aka channels) based on bandwidth and any spacing or padding required by the region:
-    // spacing = gap between slots (0 for continuous spectrum) and at the beginning of the band
-    // padding = gap at the beginning and end of the slots (0 for no padding)
-    float freqSlotWidth = newRegion->profile->spacing + (newRegion->profile->padding * 2) + (check_bw / 1000); // in MHz
-    uint32_t numFreqSlots = round((newRegion->freqEnd - newRegion->freqStart + newRegion->profile->spacing) / freqSlotWidth);
-
-    // Check if the region supports the requested bandwidth
-    if ((newRegion->freqEnd - newRegion->freqStart) < freqSlotWidth) {
-        const float regionSpanKHz = (newRegion->freqEnd - newRegion->freqStart) * 1000.0f;
-        snprintf(err_string, sizeof(err_string), "%s span %.0fkHz < requested %.0fkHz", newRegion->name, regionSpanKHz, check_bw);
-        LOG_ERROR("%s", err_string);
-        RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);
-        sendErrorNotification(err_string);
-
-        if (clamp) {
-            loraConfig.bandwidth = bwKHzToCode(modemPresetToBwKHz(newRegion->getDefaultPreset(), newRegion->wideLora));
-            check_bw = bwCodeToKHz(loraConfig.bandwidth);
-
-            // Recompute slot width and number of slots based on the new bandwidth
-            freqSlotWidth = newRegion->profile->spacing + (newRegion->profile->padding * 2) + (check_bw / 1000); // in MHz
-            numFreqSlots = round((newRegion->freqEnd - newRegion->freqStart + newRegion->profile->spacing) / freqSlotWidth);
-        } else {
-            return false;
-        }
-    }
-
-    const char *channelName = channels.getName(channels.getPrimaryIndex());
-    const char *presetNameDisplay =
-        DisplayFormatters::getModemPresetDisplayName(loraConfig.modem_preset, false, loraConfig.use_preset);
-    uint32_t channelNameHashSlot = hash(channelName) % numFreqSlots;
-    uint32_t presetNameHashSlot = hash(presetNameDisplay) % numFreqSlots;
-
-    if (loraConfig.override_frequency == 0) {
-
-        // Check if we use the default frequency slot
-        uses_default_frequency_slot =
-            (loraConfig.channel_num == 0) || // user choice unset, no frequency override, so use default
-            (newRegion->profile->overrideSlot != 0 &&
-             loraConfig.channel_num == newRegion->profile->overrideSlot) || // user setting matches override
-            ((newRegion->profile->overrideSlot == 0) &&
-             ((uint32_t)(loraConfig.channel_num - 1) == presetNameHashSlot)); // user setting matches preset hash, no override
-
-        // check if user setting different to preset name
-        uses_custom_channel_name = (strcmp(channelName, presetNameDisplay) != 0);
-
-        if (loraConfig.channel_num > numFreqSlots) {
-            snprintf(err_string, sizeof(err_string), "Channel number %u invalid for %s, max is %u", loraConfig.channel_num,
-                     newRegion->name, numFreqSlots);
-            LOG_ERROR("%s", err_string);
-            RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);
-            sendErrorNotification(err_string);
-
-            if (clamp) {
-                if (uses_custom_channel_name) { // clamp to channel name hash
-                    loraConfig.channel_num =
-                        channelNameHashSlot + 1; // channel_num is 1-based, but hash slot is 0-based, so add 1
-                } else if ((loraConfig.use_preset) && (newRegion->profile->overrideSlot != 0)) { // clamp to preset override slot
-                    loraConfig.channel_num =
-                        newRegion->profile->overrideSlot; // use the override slot specified by the region profile
-                    uses_default_frequency_slot = true;
-                } else if (loraConfig.use_preset) {                  // clamp to preset slot
-                    loraConfig.channel_num = presetNameHashSlot + 1; // channel_num is 1-based, but hash slot is 0-based, so add 1
-                    uses_default_frequency_slot = true;
-                } else { // if not using preset, and no custom channel name, just clamp to default anyway
-                    uses_default_frequency_slot = true;
-                };
-            } else {
-                return false;
-            }
-        } // end of channel number check
-    } else {
-        // if we have a frequency override, we ignore the channel number and just use the override frequency
-        snprintf(err_string, sizeof(err_string), "Frequency override in place, using %.3f", loraConfig.override_frequency);
-    }
-    return true;
-}
-
-bool RadioInterface::validateConfigLora(const meshtastic_Config_LoRaConfig &loraConfig)
-{
-    auto copy = loraConfig;
-    return checkOrClampConfigLora(copy, false);
-}
-
-void RadioInterface::clampConfigLora(meshtastic_Config_LoRaConfig &loraConfig)
-{
-    checkOrClampConfigLora(loraConfig, true);
-}
-
 /**
 * Pull our channel settings etc... from protobufs to the dumb interface settings
- * Note: this must be given only settings which have been validated or clamped!
 */
 void RadioInterface::applyModemConfig()
 {
    // Set up default configuration
    // No Sync Words in LORA mode
    meshtastic_Config_LoRaConfig &loraConfig = config.lora;
-    const RegionInfo *newRegion = getRegion(loraConfig.region);
-    myRegion = newRegion;
-
-    if (loraConfig.use_preset) {
-        if (!validateConfigLora(loraConfig)) {
-            loraConfig.modem_preset = newRegion->getDefaultPreset();
-        }
-        uint8_t newcr;
-        modemPresetToParams(loraConfig.modem_preset, newRegion->wideLora, bw, sf, newcr);
-        // If custom CR is being used already, check if the new preset is higher
-        if (loraConfig.coding_rate >= 5 && loraConfig.coding_rate <= 8 && loraConfig.coding_rate < newcr) {
-            cr = newcr;
-            LOG_INFO("Default Coding Rate is higher than custom setting, using %u", cr);
-        }
-        // If the custom CR is higher than the preset, use it
-        else if (loraConfig.coding_rate >= 5 && loraConfig.coding_rate <= 8 && loraConfig.coding_rate > newcr) {
+    bool validConfig = false; // We need to check for a valid configuration
+    while (!validConfig) {
+        if (loraConfig.use_preset) {
+            modemPresetToParams(loraConfig.modem_preset, myRegion->wideLora, bw, sf, cr);
+            if (loraConfig.coding_rate >= 5 && loraConfig.coding_rate <= 8 && loraConfig.coding_rate != cr) {
+                cr = loraConfig.coding_rate;
+                LOG_INFO("Using custom Coding Rate %u", cr);
+            }
+        } else {
+            sf = loraConfig.spread_factor;
            cr = loraConfig.coding_rate;
-            LOG_INFO("Using custom Coding Rate %u", cr);
-        } else {
-            cr = newcr;
+            bw = bwCodeToKHz(loraConfig.bandwidth);
        }

-    } else { // if not using preset, then just use the custom settings
-        if (validateConfigLora(loraConfig)) {
+        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);
+            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);
+            service->sendClientNotification(cn);
+
+            // Set to default modem preset
+            loraConfig.use_preset = true;
+            loraConfig.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
        } else {
-            LOG_WARN("Invalid LoRa config settings, cannot apply requested modem config - falling back to %s defaults",
-                     newRegion->name);
-            clampConfigLora(loraConfig);
+            validConfig = true;
        }
-        bw = bwCodeToKHz(loraConfig.bandwidth);
-        sf = loraConfig.spread_factor;
-        cr = loraConfig.coding_rate;
    }

    power = loraConfig.tx_power;

-    if ((power == 0) || ((power > newRegion->powerLimit) && !devicestate.owner.is_licensed))
-        power = newRegion->powerLimit;
+    if ((power == 0) || ((power > myRegion->powerLimit) && !devicestate.owner.is_licensed))
+        power = myRegion->powerLimit;

    if (power == 0)
-        power = 17; // Default to this power level if we don't have a valid regional power limit (powerLimit of newRegion defaults
+        power = 17; // Default to this power level if we don't have a valid regional power limit (powerLimit of myRegion defaults
                    // to 0, currently no region has an actual power limit of 0 [dBm] so we can assume regions which have this
                    // variable set to 0 don't have a valid power limit)

    // Set final tx_power back onto config
    loraConfig.tx_power = (int8_t)power; // cppcheck-suppress assignmentAddressToInteger

-    uint32_t channel_num;
-    float freq;
+    // Calculate the number of channels
+    uint32_t numChannels = floor((myRegion->freqEnd - myRegion->freqStart) / (myRegion->spacing + (bw / 1000)));

-    // Calculate number of frequency slots (aka Channels):
-    // spacing = gap between channels (0 for continuous spectrum) and at the beginning of the band
-    // padding = gap at the beginning and end of the channel (0 for no padding)
-    float freqSlotWidth = newRegion->profile->spacing + (newRegion->profile->padding * 2) + (bw / 1000); // in MHz
-    uint32_t numFreqSlots = round((newRegion->freqEnd - newRegion->freqStart + newRegion->profile->spacing) / freqSlotWidth);
+    // If user has manually specified a channel num, then use that, otherwise generate one by hashing the name
+    const char *channelName = channels.getName(channels.getPrimaryIndex());
+    // channel_num is actually (channel_num - 1), since modulus (%) returns values from 0 to (numChannels - 1)
+    uint32_t channel_num = (loraConfig.channel_num ? loraConfig.channel_num - 1 : hash(channelName)) % numChannels;

-    // Calculate hash of channel name and preset name to pick a default frequency slot if user has not specified one.
-    // Note that channel_num is actually (channel_num - 1), i.e. zero-based, since modulus (%) returns values from 0 to
-    // (numFreqSlots - 1).
-    uint32_t presetNameHashSlot =
-        hash(DisplayFormatters::getModemPresetDisplayName(loraConfig.modem_preset, false, loraConfig.use_preset)) % numFreqSlots;
+    // Check if we use the default frequency slot
+    RadioInterface::uses_default_frequency_slot =
+        channel_num ==
+        hash(DisplayFormatters::getModemPresetDisplayName(config.lora.modem_preset, false, config.lora.use_preset)) % numChannels;
+
+    // Old frequency selection formula
+    // float freq = myRegion->freqStart + ((((myRegion->freqEnd - myRegion->freqStart) / numChannels) / 2) * channel_num);
+
+    // New frequency selection formula
+    float freq = myRegion->freqStart + (bw / 2000) + (channel_num * (bw / 1000));

    // override if we have a verbatim frequency
    if (loraConfig.override_frequency) {
        freq = loraConfig.override_frequency;
        channel_num = -1;
-        uses_default_frequency_slot = false;
-    } else {
-
-        // If user has not manually specified a frequency slot, or has not specified one that is different than the default or the
-        // override for the new region, then use the default or override. If the user has not specified one, but has specified a
-        // custom channel name, then use the hash of that channel name to pick a frequency slot. Note that channel_num is actually
-        // (channel_num - 1), i.e. zero-based, since modulus (%) returns values from 0 to (numFreqSlots - 1).
-        // NB: channel_num is also know as frequency slot but it's too late to fix now.
-        if (uses_default_frequency_slot) {
-            // if there's an override slot, use that
-            if (newRegion->profile->overrideSlot != 0) {
-                channel_num = newRegion->profile->overrideSlot - 1;
-            } else {
-                channel_num = presetNameHashSlot;
-            }
-        } else { // use the manually defined one
-            channel_num = loraConfig.channel_num - 1;
-        }
-
-        // Calculate frequency: freqStart is band edge, add half bandwidth (plus optional padding) to get middle of first channel
-        // subsequent channels are spaced by freqSlotWidth
-        freq = newRegion->freqStart + (bw / 2000) + newRegion->profile->padding + (channel_num * freqSlotWidth); // in MHz
    }

    saveChannelNum(channel_num);
    saveFreq(freq + loraConfig.frequency_offset);
-    const char *channelName = channels.getName(channels.getPrimaryIndex());

    slotTimeMsec = computeSlotTimeMsec();
    preambleTimeMsec = preambleLength * (pow_of_2(sf) / bw);

    LOG_INFO("Radio freq=%.3f, config.lora.frequency_offset=%.3f", freq, loraConfig.frequency_offset);
-    LOG_INFO("Set radio: region=%s, name=%s, config=%u, ch=%d, power=%d", newRegion->name, channelName, loraConfig.modem_preset,
+    LOG_INFO("Set radio: region=%s, name=%s, config=%u, ch=%d, power=%d", myRegion->name, channelName, loraConfig.modem_preset,
             channel_num, power);
-    LOG_INFO("newRegion->freqStart -> newRegion->freqEnd: %f -> %f (%f MHz)", newRegion->freqStart, newRegion->freqEnd,
-             newRegion->freqEnd - newRegion->freqStart);
-    LOG_INFO("numFreqSlots: %d x %.3fkHz", numFreqSlots, bw);
-    if (newRegion->profile->overrideSlot != 0) {
-        LOG_INFO("Using region override slot: %d", newRegion->profile->overrideSlot);
-    }
+    LOG_INFO("myRegion->freqStart -> myRegion->freqEnd: %f -> %f (%f MHz)", myRegion->freqStart, myRegion->freqEnd,
+             myRegion->freqEnd - myRegion->freqStart);
+    LOG_INFO("numChannels: %d x %.3fkHz", numChannels, bw);
    LOG_INFO("channel_num: %d", channel_num + 1);
    LOG_INFO("frequency: %f", getFreq());
    LOG_INFO("Slot time: %u msec, preamble time: %u msec", slotTimeMsec, preambleTimeMsec);
-} // end of applyModemConfig
+}

 /** Slottime is the time to detect a transmission has started, consisting of:
  - CAD duration;
@@ -1167,4 +994,4 @@ size_t RadioInterface::beginSending(meshtastic_MeshPacket *p)

    sendingPacket = p;
    return p->encrypted.size + sizeof(PacketHeader);
-}
+}
@@ -127,7 +127,7 @@ class RadioInterface
     * Coerce LoRa config fields (bandwidth/spread_factor) derived from presets.
     * This is used during early bootstrapping so UIs that display these fields directly remain consistent.
     */
-    // static void bootstrapLoRaConfigFromPreset(meshtastic_Config_LoRaConfig &loraConfig); // maybe superseded?
+    static void bootstrapLoRaConfigFromPreset(meshtastic_Config_LoRaConfig &loraConfig);

    /**
     * Return true if we think the board can go to sleep (i.e. our tx queue is empty, we are not sending or receiving)
@@ -234,20 +234,6 @@ class RadioInterface
    // Whether we use the default frequency slot given our LoRa config (region and modem preset)
    static bool uses_default_frequency_slot;

-    // Whether we have a custom channel name
-    static bool uses_custom_channel_name;
-
-    static bool checkOrClampConfigLora(meshtastic_Config_LoRaConfig &loraConfig, bool clamp);
-
-    // Check if a candidate region is compatible and valid.
-    static bool validateConfigRegion(const meshtastic_Config_LoRaConfig &loraConfig);
-
-    // Check if a candidate radio configuration is valid.
-    static bool validateConfigLora(const meshtastic_Config_LoRaConfig &loraConfig);
-
-    // Make a candidate radio configuration valid, even if it isn't.
-    static void clampConfigLora(meshtastic_Config_LoRaConfig &loraConfig);
-
  protected:
    int8_t power = 17; // Set by applyModemConfig()

@@ -11,9 +11,6 @@
 #include "mesh-pb-constants.h"
 #include "meshUtils.h"
 #include "modules/RoutingModule.h"
-#if HAS_TRAFFIC_MANAGEMENT
-#include "modules/TrafficManagementModule.h"
-#endif
 #if !MESHTASTIC_EXCLUDE_MQTT
 #include "mqtt/MQTT.h"
 #endif
@@ -98,20 +95,6 @@ bool Router::shouldDecrementHopLimit(const meshtastic_MeshPacket *p)
        return true;
    }

-#if HAS_TRAFFIC_MANAGEMENT
-    // When router_preserve_hops is enabled, preserve hops for decoded packets that are not
-    // position or telemetry (those have their own exhaust_hop controls).
-    if (moduleConfig.has_traffic_management && moduleConfig.traffic_management.enabled &&
-        moduleConfig.traffic_management.router_preserve_hops && p->which_payload_variant == meshtastic_MeshPacket_decoded_tag &&
-        p->decoded.portnum != meshtastic_PortNum_POSITION_APP && p->decoded.portnum != meshtastic_PortNum_TELEMETRY_APP) {
-        LOG_DEBUG("Router hop preserved: port=%d from=0x%08x (traffic_management)", p->decoded.portnum, getFrom(p));
-        if (trafficManagementModule) {
-            trafficManagementModule->recordRouterHopPreserved();
-        }
-        return false;
-    }
-#endif
-
    // For subsequent hops, check if previous relay is a favorite router
    // Optimized search for favorite routers with matching last byte
    // Check ordering optimized for IoT devices (cheapest checks first)
@@ -875,12 +858,6 @@ void Router::perhapsHandleReceived(meshtastic_MeshPacket *p)
        return;
    }

-    if (shouldDropPacketForPreHop(*p)) {
-        logHopStartDrop(*p, "pre-hop drop");
-        packetPool.release(p);
-        return;
-    }
-
    if (shouldFilterReceived(p)) {
        LOG_DEBUG("Incoming msg was filtered from 0x%x", p->from);
        packetPool.release(p);
@@ -253,11 +253,6 @@ template <typename T> bool SX126xInterface<T>::reconfigure()
        LOG_ERROR("SX126X setOutputPower %s%d", radioLibErr, err);
    assert(err == RADIOLIB_ERR_NONE);

-    // Apply RX gain mode — valid in STDBY (datasheet §9.6), matches resetAGC() pattern
-    err = lora.setRxBoostedGainMode(config.lora.sx126x_rx_boosted_gain);
-    if (err != RADIOLIB_ERR_NONE)
-        LOG_WARN("SX126X setRxBoostedGainMode %s%d", radioLibErr, err);
-
    startReceive(); // restart receiving

    return RADIOLIB_ERR_NONE;
@@ -0,0 +1,347 @@
+/*
+ * Copyright (C) 2020 Siara Logics (cc)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * @author Arundale Ramanathan
+ *
+ * Port for Particle (particle.io) / Aruino - Jonathan Greenblatt
+ *
+ * This file describes each function of the Unishox2 API \n
+ * For finding out how this API can be used in your program, \n
+ * please see test_unishox2.c.
+ */
+
+#ifndef unishox2
+#define unishox2
+
+#define UNISHOX_VERSION "2.0" ///< Unicode spec version
+
+/**
+ * Macro switch to enable/disable output buffer length parameter in low level api \n
+ * Disabled by default \n
+ * When this macro is defined, the all the API functions \n
+ * except the simple API functions accept an additional parameter olen \n
+ * that enables the developer to pass the size of the output buffer provided \n
+ * so that the api function may not write beyond that length. \n
+ * This can be disabled if the developer knows that the buffer provided is sufficient enough \n
+ * so no additional parameter is passed and the program is faster since additional check \n
+ * for output length is not performed at each step \n
+ * The simple api, i.e. unishox2_(de)compress_simple will always omit the buffer length
+ */
+#ifndef UNISHOX_API_WITH_OUTPUT_LEN
+#define UNISHOX_API_WITH_OUTPUT_LEN 1
+#endif
+
+/// Upto 8 bits of initial magic bit sequence can be included. Bit count can be specified with UNISHOX_MAGIC_BIT_LEN
+#ifndef UNISHOX_MAGIC_BITS
+#define UNISHOX_MAGIC_BITS 0xFF
+#endif
+
+/// Desired length of Magic bits defined by UNISHOX_MAGIC_BITS
+#ifdef UNISHOX_MAGIC_BIT_LEN
+#if UNISHOX_MAGIC_BIT_LEN < 0 || 9 <= UNISHOX_MAGIC_BIT_LEN
+#error "UNISHOX_MAGIC_BIT_LEN need between [0, 8)"
+#endif
+#else
+#define UNISHOX_MAGIC_BIT_LEN 1
+#endif
+
+// enum {USX_ALPHA = 0, USX_SYM, USX_NUM, USX_DICT, USX_DELTA};
+
+/// Default Horizontal codes. When composition of text is know beforehand, the other hcodes in this section can be used to achieve
+/// more compression.
+#define USX_HCODES_DFLT                                                                                                          \
+    (const unsigned char[])                                                                                                      \
+    {                                                                                                                            \
+        0x00, 0x40, 0x80, 0xC0, 0xE0                                                                                             \
+    }
+/// Length of each default hcode
+#define USX_HCODE_LENS_DFLT                                                                                                      \
+    (const unsigned char[])                                                                                                      \
+    {                                                                                                                            \
+        2, 2, 2, 3, 3                                                                                                            \
+    }
+
+/// Horizontal codes preset for English Alphabet content only
+#define USX_HCODES_ALPHA_ONLY                                                                                                    \
+    (const unsigned char[])                                                                                                      \
+    {                                                                                                                            \
+        0x00, 0x00, 0x00, 0x00, 0x00                                                                                             \
+    }
+/// Length of each Alpha only hcode
+#define USX_HCODE_LENS_ALPHA_ONLY                                                                                                \
+    (const unsigned char[])                                                                                                      \
+    {                                                                                                                            \
+        0, 0, 0, 0, 0                                                                                                            \
+    }
+
+/// Horizontal codes preset for Alpha Numeric content only
+#define USX_HCODES_ALPHA_NUM_ONLY                                                                                                \
+    (const unsigned char[])                                                                                                      \
+    {                                                                                                                            \
+        0x00, 0x00, 0x80, 0x00, 0x00                                                                                             \
+    }
+/// Length of each Alpha numeric hcode
+#define USX_HCODE_LENS_ALPHA_NUM_ONLY                                                                                            \
+    (const unsigned char[])                                                                                                      \
+    {                                                                                                                            \
+        1, 0, 1, 0, 0                                                                                                            \
+    }
+
+/// Horizontal codes preset for Alpha Numeric and Symbol content only
+#define USX_HCODES_ALPHA_NUM_SYM_ONLY                                                                                            \
+    (const unsigned char[])                                                                                                      \
+    {                                                                                                                            \
+        0x00, 0x80, 0xC0, 0x00, 0x00                                                                                             \
+    }
+/// Length of each Alpha numeric and symbol hcodes
+#define USX_HCODE_LENS_ALPHA_NUM_SYM_ONLY                                                                                        \
+    (const unsigned char[])                                                                                                      \
+    {                                                                                                                            \
+        1, 2, 2, 0, 0                                                                                                            \
+    }
+
+/// Horizontal codes preset favouring Alphabet content
+#define USX_HCODES_FAVOR_ALPHA                                                                                                   \
+    (const unsigned char[])                                                                                                      \
+    {                                                                                                                            \
+        0x00, 0x80, 0xA0, 0xC0, 0xE0                                                                                             \
+    }
+/// Length of each hcode favouring Alpha content
+#define USX_HCODE_LENS_FAVOR_ALPHA                                                                                               \
+    (const unsigned char[])                                                                                                      \
+    {                                                                                                                            \
+        1, 3, 3, 3, 3                                                                                                            \
+    }
+
+/// Horizontal codes preset favouring repeating sequences
+#define USX_HCODES_FAVOR_DICT                                                                                                    \
+    (const unsigned char[])                                                                                                      \
+    {                                                                                                                            \
+        0x00, 0x40, 0xC0, 0x80, 0xE0                                                                                             \
+    }
+/// Length of each hcode favouring repeating sequences
+#define USX_HCODE_LENS_FAVOR_DICT                                                                                                \
+    (const unsigned char[])                                                                                                      \
+    {                                                                                                                            \
+        2, 2, 3, 2, 3                                                                                                            \
+    }
+
+/// Horizontal codes preset favouring symbols
+#define USX_HCODES_FAVOR_SYM                                                                                                     \
+    (const unsigned char[])                                                                                                      \
+    {                                                                                                                            \
+        0x80, 0x00, 0xA0, 0xC0, 0xE0                                                                                             \
+    }
+/// Length of each hcode favouring symbols
+#define USX_HCODE_LENS_FAVOR_SYM                                                                                                 \
+    (const unsigned char[])                                                                                                      \
+    {                                                                                                                            \
+        3, 1, 3, 3, 3                                                                                                            \
+    }
+
+// #define USX_HCODES_FAVOR_UMLAUT {0x00, 0x40, 0xE0, 0xC0, 0x80}
+// #define USX_HCODE_LENS_FAVOR_UMLAUT {2, 2, 3, 3, 2}
+
+/// Horizontal codes preset favouring umlaut letters
+#define USX_HCODES_FAVOR_UMLAUT                                                                                                  \
+    (const unsigned char[])                                                                                                      \
+    {                                                                                                                            \
+        0x80, 0xA0, 0xC0, 0xE0, 0x00                                                                                             \
+    }
+/// Length of each hcode favouring umlaut letters
+#define USX_HCODE_LENS_FAVOR_UMLAUT                                                                                              \
+    (const unsigned char[])                                                                                                      \
+    {                                                                                                                            \
+        3, 3, 3, 3, 1                                                                                                            \
+    }
+
+/// Horizontal codes preset for no repeating sequences
+#define USX_HCODES_NO_DICT                                                                                                       \
+    (const unsigned char[])                                                                                                      \
+    {                                                                                                                            \
+        0x00, 0x40, 0x80, 0x00, 0xC0                                                                                             \
+    }
+/// Length of each hcode for no repeating sequences
+#define USX_HCODE_LENS_NO_DICT                                                                                                   \
+    (const unsigned char[])                                                                                                      \
+    {                                                                                                                            \
+        2, 2, 2, 0, 2                                                                                                            \
+    }
+
+/// Horizontal codes preset for no Unicode characters
+#define USX_HCODES_NO_UNI                                                                                                        \
+    (const unsigned char[])                                                                                                      \
+    {                                                                                                                            \
+        0x00, 0x40, 0x80, 0xC0, 0x00                                                                                             \
+    }
+/// Length of each hcode for no Unicode characters
+#define USX_HCODE_LENS_NO_UNI                                                                                                    \
+    (const unsigned char[])                                                                                                      \
+    {                                                                                                                            \
+        2, 2, 2, 2, 0                                                                                                            \
+    }
+
+extern const char *USX_FREQ_SEQ_DFLT[];
+extern const char *USX_FREQ_SEQ_TXT[];
+extern const char *USX_FREQ_SEQ_URL[];
+extern const char *USX_FREQ_SEQ_JSON[];
+extern const char *USX_FREQ_SEQ_HTML[];
+extern const char *USX_FREQ_SEQ_XML[];
+extern const char *USX_TEMPLATES[];
+
+/// Default preset parameter set. When composition of text is know beforehand, the other parameter sets in this section can be
+/// used to achieve more compression.
+#define USX_PSET_DFLT USX_HCODES_DFLT, USX_HCODE_LENS_DFLT, USX_FREQ_SEQ_DFLT, USX_TEMPLATES
+/// Preset parameter set for English Alphabet only content
+#define USX_PSET_ALPHA_ONLY USX_HCODES_ALPHA_ONLY, USX_HCODE_LENS_ALPHA_ONLY, USX_FREQ_SEQ_TXT, USX_TEMPLATES
+/// Preset parameter set for Alpha numeric content
+#define USX_PSET_ALPHA_NUM_ONLY USX_HCODES_ALPHA_NUM_ONLY, USX_HCODE_LENS_ALPHA_NUM_ONLY, USX_FREQ_SEQ_TXT, USX_TEMPLATES
+/// Preset parameter set for Alpha numeric and symbol content
+#define USX_PSET_ALPHA_NUM_SYM_ONLY                                                                                              \
+    USX_HCODES_ALPHA_NUM_SYM_ONLY, USX_HCODE_LENS_ALPHA_NUM_SYM_ONLY, USX_FREQ_SEQ_DFLT, USX_TEMPLATES
+/// Preset parameter set for Alpha numeric symbol content having predominantly text
+#define USX_PSET_ALPHA_NUM_SYM_ONLY_TXT                                                                                          \
+    USX_HCODES_ALPHA_NUM_SYM_ONLY, USX_HCODE_LENS_ALPHA_NUM_SYM_ONLY, USX_FREQ_SEQ_DFLT, USX_TEMPLATES
+/// Preset parameter set favouring Alphabet content
+#define USX_PSET_FAVOR_ALPHA USX_HCODES_FAVOR_ALPHA, USX_HCODE_LENS_FAVOR_ALPHA, USX_FREQ_SEQ_TXT, USX_TEMPLATES
+/// Preset parameter set favouring repeating sequences
+#define USX_PSET_FAVOR_DICT USX_HCODES_FAVOR_DICT, USX_HCODE_LENS_FAVOR_DICT, USX_FREQ_SEQ_DFLT, USX_TEMPLATES
+/// Preset parameter set favouring symbols
+#define USX_PSET_FAVOR_SYM USX_HCODES_FAVOR_SYM, USX_HCODE_LENS_FAVOR_SYM, USX_FREQ_SEQ_DFLT, USX_TEMPLATES
+/// Preset parameter set favouring unlaut letters
+#define USX_PSET_FAVOR_UMLAUT USX_HCODES_FAVOR_UMLAUT, USX_HCODE_LENS_FAVOR_UMLAUT, USX_FREQ_SEQ_DFLT, USX_TEMPLATES
+/// Preset parameter set for when there are no repeating sequences
+#define USX_PSET_NO_DICT USX_HCODES_NO_DICT, USX_HCODE_LENS_NO_DICT, USX_FREQ_SEQ_DFLT, USX_TEMPLATES
+/// Preset parameter set for when there are no unicode symbols
+#define USX_PSET_NO_UNI USX_HCODES_NO_UNI, USX_HCODE_LENS_NO_UNI, USX_FREQ_SEQ_DFLT, USX_TEMPLATES
+/// Preset parameter set for when there are no unicode symbols favouring text
+#define USX_PSET_NO_UNI_FAVOR_TEXT USX_HCODES_NO_UNI, USX_HCODE_LENS_NO_UNI, USX_FREQ_SEQ_TXT, USX_TEMPLATES
+/// Preset parameter set favouring URL content
+#define USX_PSET_URL USX_HCODES_DFLT, USX_HCODE_LENS_DFLT, USX_FREQ_SEQ_URL, USX_TEMPLATES
+/// Preset parameter set favouring JSON content
+#define USX_PSET_JSON USX_HCODES_DFLT, USX_HCODE_LENS_DFLT, USX_FREQ_SEQ_JSON, USX_TEMPLATES
+/// Preset parameter set favouring JSON content having no Unicode symbols
+#define USX_PSET_JSON_NO_UNI USX_HCODES_NO_UNI, USX_HCODE_LENS_NO_UNI, USX_FREQ_SEQ_JSON, USX_TEMPLATES
+/// Preset parameter set favouring XML content
+#define USX_PSET_XML USX_HCODES_DFLT, USX_HCODE_LENS_DFLT, USX_FREQ_SEQ_XML, USX_TEMPLATES
+/// Preset parameter set favouring HTML content
+#define USX_PSET_HTML USX_HCODES_DFLT, USX_HCODE_LENS_DFLT, USX_FREQ_SEQ_HTML, USX_TEMPLATES
+
+/**
+ * This structure is used when a string array needs to be compressed.
+ * This is passed as a parameter to the unishox2_decompress_lines() function
+ */
+struct us_lnk_lst {
+    char *data;
+    struct us_lnk_lst *previous;
+};
+
+/**
+ * This macro is for internal use, but builds upon the macro UNISHOX_API_WITH_OUTPUT_LEN
+ * When the macro UNISHOX_API_WITH_OUTPUT_LEN is defined, the all the API functions
+ * except the simple API functions accept an additional parameter olen
+ * that enables the developer to pass the size of the output buffer provided
+ * so that the api function may not write beyond that length.
+ * This can be disabled if the developer knows that the buffer provided is sufficient enough
+ * so no additional parameter is passed and the program is faster since additional check
+ * for output length is not performed at each step
+ */
+#if defined(UNISHOX_API_WITH_OUTPUT_LEN) && UNISHOX_API_WITH_OUTPUT_LEN != 0
+#define UNISHOX_API_OUT_AND_LEN(out, olen) out, olen
+#else
+#define UNISHOX_API_OUT_AND_LEN(out, olen) out
+#endif
+
+/**
+ * Simple API for compressing a string
+ * @param[in] in    Input ASCII / UTF-8 string
+ * @param[in] len   length in bytes
+ * @param[out] out  output buffer - should be large enough to hold compressed output
+ */
+extern int unishox2_compress_simple(const char *in, int len, char *out);
+/**
+ * Simple API for decompressing a string
+ * @param[in] in    Input compressed bytes (output of unishox2_compress functions)
+ * @param[in] len   length of 'in' in bytes
+ * @param[out] out  output buffer for ASCII / UTF-8 string - should be large enough
+ */
+extern int unishox2_decompress_simple(const char *in, int len, char *out);
+/**
+ * Comprehensive API for compressing a string
+ *
+ * Presets are available for the last four parameters so they can be passed as single parameter. \n
+ * See USX_PSET_* macros. Example call: \n
+ *    unishox2_compress(in, len, out, olen, USX_PSET_ALPHA_ONLY);
+ *
+ * @param[in] in             Input ASCII / UTF-8 string
+ * @param[in] len            length in bytes
+ * @param[out] out           output buffer - should be large enough to hold compressed output
+ * @param[in] olen           length of 'out' buffer in bytes. Can be omitted if sufficient buffer is provided
+ * @param[in] usx_hcodes     Horizontal codes (array of bytes). See macro section for samples.
+ * @param[in] usx_hcode_lens Length of each element in usx_hcodes array
+ * @param[in] usx_freq_seq   Frequently occurring sequences. See USX_FREQ_SEQ_* macros for samples
+ * @param[in] usx_templates  Templates of frequently occurring patterns. See USX_TEMPLATES macro.
+ */
+extern int unishox2_compress(const char *in, int len, UNISHOX_API_OUT_AND_LEN(char *out, int olen),
+                             const unsigned char usx_hcodes[], const unsigned char usx_hcode_lens[], const char *usx_freq_seq[],
+                             const char *usx_templates[]);
+/**
+ * Comprehensive API for de-compressing a string
+ *
+ * Presets are available for the last four parameters so they can be passed as single parameter. \n
+ * See USX_PSET_* macros. Example call: \n
+ *    unishox2_decompress(in, len, out, olen, USX_PSET_ALPHA_ONLY);
+ *
+ * @param[in] in             Input compressed bytes (output of unishox2_compress functions)
+ * @param[in] len            length of 'in' in bytes
+ * @param[out] out           output buffer - should be large enough to hold de-compressed output
+ * @param[in] olen           length of 'out' buffer in bytes. Can be omitted if sufficient buffer is provided
+ * @param[in] usx_hcodes     Horizontal codes (array of bytes). See macro section for samples.
+ * @param[in] usx_hcode_lens Length of each element in usx_hcodes array
+ * @param[in] usx_freq_seq   Frequently occurring sequences. See USX_FREQ_SEQ_* macros for samples
+ * @param[in] usx_templates  Templates of frequently occurring patterns. See USX_TEMPLATES macro.
+ */
+extern int unishox2_decompress(const char *in, int len, UNISHOX_API_OUT_AND_LEN(char *out, int olen),
+                               const unsigned char usx_hcodes[], const unsigned char usx_hcode_lens[], const char *usx_freq_seq[],
+                               const char *usx_templates[]);
+/**
+ * More Comprehensive API for compressing array of strings
+ *
+ * See unishox2_compress() function for parameter definitions. \n
+ * This function takes an additional parameter, i.e. 'prev_lines' - the usx_lnk_lst structure \n
+ * See -g parameter in test_unishox2.c to find out how this can be used. \n
+ * This function is used when an array of strings need to be compressed \n
+ * and stored in a compressed array of bytes for use as a constant in other programs \n
+ * where each element of the array can be decompressed and used at runtime.
+ */
+extern int unishox2_compress_lines(const char *in, int len, UNISHOX_API_OUT_AND_LEN(char *out, int olen),
+                                   const unsigned char usx_hcodes[], const unsigned char usx_hcode_lens[],
+                                   const char *usx_freq_seq[], const char *usx_templates[], struct us_lnk_lst *prev_lines);
+/**
+ * More Comprehensive API for de-compressing array of strings \n
+ * This function is not be used in conjuction with unishox2_compress_lines()
+ *
+ * See unishox2_decompress() function for parameter definitions. \n
+ * Typically an array is compressed using unishox2_compress_lines() and \n
+ * a header (.h) file is generated using the resultant compressed array. \n
+ * This header file can be used in another program with another decompress \n
+ * routine which takes this compressed array as parameter and index to be \n
+ * decompressed.
+ */
+extern int unishox2_decompress_lines(const char *in, int len, UNISHOX_API_OUT_AND_LEN(char *out, int olen),
+                                     const unsigned char usx_hcodes[], const unsigned char usx_hcode_lens[],
+                                     const char *usx_freq_seq[], const char *usx_templates[], struct us_lnk_lst *prev_lines);
+
+#endif
@@ -69,22 +69,6 @@ static inline int get_max_num_nodes()
 /// Max number of channels allowed
 #define MAX_NUM_CHANNELS (member_size(meshtastic_ChannelFile, channels) / member_size(meshtastic_ChannelFile, channels[0]))

-// Traffic Management module configuration
-// Enable per-variant by defining HAS_TRAFFIC_MANAGEMENT=1 in variant.h
-#ifndef HAS_TRAFFIC_MANAGEMENT
-#define HAS_TRAFFIC_MANAGEMENT 0
-#endif
-
-// Cache size for traffic management (number of nodes to track)
-// Can be overridden per-variant based on available memory
-#ifndef TRAFFIC_MANAGEMENT_CACHE_SIZE
-#if HAS_TRAFFIC_MANAGEMENT
-#define TRAFFIC_MANAGEMENT_CACHE_SIZE 1000
-#else
-#define TRAFFIC_MANAGEMENT_CACHE_SIZE 0
-#endif
-#endif
-
 /// helper function for encoding a record as a protobuf, any failures to encode are fatal and we will panic
 /// returns the encoded packet size
 size_t pb_encode_to_bytes(uint8_t *destbuf, size_t destbufsize, const pb_msgdesc_t *fields, const void *src_struct);
@@ -106,4 +90,4 @@ bool writecb(pb_ostream_t *stream, const uint8_t *buf, size_t count);
 */
 bool is_in_helper(uint32_t n, const uint32_t *array, pb_size_t count);

-#define is_in_repeated(name, n) is_in_helper(n, name, name##_count)
+#define is_in_repeated(name, n) is_in_helper(n, name, name##_count)
@@ -24,9 +24,7 @@

 #include "Default.h"
 #include "MeshRadio.h"
-#include "RadioInterface.h"
 #include "TypeConversions.h"
-#include "mesh/RadioLibInterface.h"

 #if !MESHTASTIC_EXCLUDE_MQTT
 #include "mqtt/MQTT.h"
@@ -199,35 +197,10 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
        handleSetOwner(r->set_owner);
        break;

-    case meshtastic_AdminMessage_set_config_tag: {
+    case meshtastic_AdminMessage_set_config_tag:
        LOG_DEBUG("Client set config");
-
-        // Non-LoRa configs need no further validation.
-        if (r->set_config.which_payload_variant != meshtastic_Config_lora_tag) {
-            LOG_DEBUG("Non-LoRa config, applying directly");
-            handleSetConfig(r->set_config, fromOthers);
-            break;
-        }
-
-        // Only LORA_24 requires hardware capability validation.
-        if (r->set_config.payload_variant.lora.region != meshtastic_Config_LoRaConfig_RegionCode_LORA_24) {
-            LOG_DEBUG("LoRa config, region is not LORA_24, applying directly");
-            handleSetConfig(r->set_config, fromOthers);
-            break;
-        }
-
-        // Hardware supports 2.4 GHz — apply the config.
-        // Fail closed: null instance is treated as incapable.
-        if (RadioLibInterface::instance && RadioLibInterface::instance->wideLora()) {
-            LOG_DEBUG("LORA_24 requested, radio hardware supports 2.4 GHz, applying");
-            handleSetConfig(r->set_config, fromOthers);
-            break;
-        }
-
-        LOG_WARN("Radio hardware does not support 2.4 GHz; rejecting LORA_24 region");
-        myReply = allocErrorResponse(meshtastic_Routing_Error_BAD_REQUEST, &mp);
+        handleSetConfig(r->set_config);
        break;
-    }

    case meshtastic_AdminMessage_set_module_config_tag:
        LOG_DEBUG("Client set module config");
@@ -653,7 +626,7 @@ void AdminModule::handleSetOwner(const meshtastic_User &o)
    }
 }

-void AdminModule::handleSetConfig(const meshtastic_Config &c, bool fromOthers)
+void AdminModule::handleSetConfig(const meshtastic_Config &c)
 {
    auto changes = SEGMENT_CONFIG;
    auto existingRole = config.device.role;
@@ -797,57 +770,18 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c, bool fromOthers)
            validatedLora.spread_factor = LORA_SF_DEFAULT;
        }

-        // If we're setting a new region, check the region is valid and then init the region or discard the change
-        if (validatedLora.region != myRegion->code) {
-            //  Region has changed so check whether it is valid for e.g. licensing conditions and if the lora config is valid
-            if (RadioInterface::validateConfigRegion(validatedLora) && RadioInterface::validateConfigLora(validatedLora)) {
-                // If we're setting region for the first time, init the region and regenerate the keys
-                if (isRegionUnset && validatedLora.region > meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
-#if !(MESHTASTIC_EXCLUDE_PKI_KEYGEN || MESHTASTIC_EXCLUDE_PKI)
-                    if (crypto) {
-                        crypto->ensurePkiKeys(config.security, owner);
-                    }
-#endif
-                    // new region is valid and we're coming from an unset region, so enable tx
-                    validatedLora.tx_enabled = true;
-                }
-                // If we're unsetting the region for some reason, disable tx
-                if (!isRegionUnset && validatedLora.region == meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
-                    validatedLora.tx_enabled = false;
-                }
-                // Ensure initRegion() uses the newly validated region
-                config.lora.region = validatedLora.region;
-                initRegion();
-                if (myRegion->dutyCycle < 100) {
-                    validatedLora.ignore_mqtt = true; // Ignore MQTT by default if region has a duty cycle limit
-                }
-                if (strncmp(moduleConfig.mqtt.root, default_mqtt_root, strlen(default_mqtt_root)) == 0) {
-                    //  Default root is in use, so subscribe to the appropriate MQTT topic for this region
-                    sprintf(moduleConfig.mqtt.root, "%s/%s", default_mqtt_root, myRegion->name);
-                }
-                changes = SEGMENT_CONFIG | SEGMENT_MODULECONFIG;
-            } else {
-                //  Region validation has failed, so just copy all of the old config over the new config
-                validatedLora = oldLoraConfig;
-            }
-        } // end of new region handling
-
-        if (!RadioInterface::validateConfigLora(validatedLora)) {
-            if (fromOthers) {
-                LOG_WARN("Invalid LoRa config received from another node, rejecting changes");
-                //  modem_preset set to use the old setting if the check fails
-                validatedLora.modem_preset = oldLoraConfig.modem_preset;
-            } else {
-                LOG_WARN("Invalid LoRa config received from client, using corrected values");
-                RadioInterface::clampConfigLora(validatedLora);
-            }
-            //  use_preset and bandwidth are coerced into valid values by the check.
+        // If no lora radio parameters change, don't need to reboot
+        if (oldLoraConfig.use_preset == validatedLora.use_preset && oldLoraConfig.region == validatedLora.region &&
+            oldLoraConfig.modem_preset == validatedLora.modem_preset && oldLoraConfig.bandwidth == validatedLora.bandwidth &&
+            oldLoraConfig.spread_factor == validatedLora.spread_factor &&
+            oldLoraConfig.coding_rate == validatedLora.coding_rate && oldLoraConfig.tx_power == validatedLora.tx_power &&
+            oldLoraConfig.frequency_offset == validatedLora.frequency_offset &&
+            oldLoraConfig.override_frequency == validatedLora.override_frequency &&
+            oldLoraConfig.channel_num == validatedLora.channel_num &&
+            oldLoraConfig.sx126x_rx_boosted_gain == validatedLora.sx126x_rx_boosted_gain) {
+            requiresReboot = false;
        }

-        // All LoRa radio changes apply live via configChanged observer → reconfigure().
-        // reconfigure() puts the radio in standby, reprograms all modem parameters, and restarts receive.
-        requiresReboot = false;
-
 #if defined(ARCH_PORTDUINO)
        // If running on portduino and using SimRadio, do not require reboot
        if (SimRadio::instance) {
@@ -863,21 +797,63 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c, bool fromOthers)
            digitalWrite(RF95_FAN_EN, HIGH ^ 0);
        }
 #endif
+        config.lora = validatedLora;

 #if HAS_LORA_FEM
        // Apply FEM LNA mode from config (only meaningful on hardware that supports it)
-        // Note that a rejected lora config will revert this as well.
        if (loraFEMInterface.isLnaCanControl()) {
-            loraFEMInterface.setLNAEnable(validatedLora.fem_lna_mode != meshtastic_Config_LoRaConfig_FEM_LNA_Mode_DISABLED);
-        } else if (validatedLora.fem_lna_mode != meshtastic_Config_LoRaConfig_FEM_LNA_Mode_NOT_PRESENT) {
+            loraFEMInterface.setLNAEnable(config.lora.fem_lna_mode != meshtastic_Config_LoRaConfig_FEM_LNA_Mode_DISABLED);
+        } else if (config.lora.fem_lna_mode != meshtastic_Config_LoRaConfig_FEM_LNA_Mode_NOT_PRESENT) {
            // Hardware FEM does not support LNA control; normalize stored config to match actual capability
            LOG_WARN("FEM LNA mode configured but current FEM does not support LNA control; normalizing to NOT_PRESENT");
-            validatedLora.fem_lna_mode = meshtastic_Config_LoRaConfig_FEM_LNA_Mode_NOT_PRESENT;
+            config.lora.fem_lna_mode = meshtastic_Config_LoRaConfig_FEM_LNA_Mode_NOT_PRESENT;
        }
 #endif
+        // If we're setting region for the first time, init the region and regenerate the keys
+        if (isRegionUnset && config.lora.region > meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
+#if !(MESHTASTIC_EXCLUDE_PKI_KEYGEN || MESHTASTIC_EXCLUDE_PKI)
+            if (!owner.is_licensed) {
+                bool keygenSuccess = false;
+                if (config.security.private_key.size == 32) {
+                    if (crypto->regeneratePublicKey(config.security.public_key.bytes, config.security.private_key.bytes)) {
+                        keygenSuccess = true;
+                    }
+                } else {
+                    LOG_INFO("Generate new PKI keys");
+                    crypto->generateKeyPair(config.security.public_key.bytes, config.security.private_key.bytes);
+                    keygenSuccess = true;
+                }
+                if (keygenSuccess) {
+                    config.security.public_key.size = 32;
+                    config.security.private_key.size = 32;
+                    owner.public_key.size = 32;
+                    memcpy(owner.public_key.bytes, config.security.public_key.bytes, 32);
+                }
+            }
+#endif
+            config.lora.tx_enabled = true;
+            initRegion();
+            if (myRegion->dutyCycle < 100) {
+                config.lora.ignore_mqtt = true; // Ignore MQTT by default if region has a duty cycle limit
+            }
+            //  Compare the entire string, we are sure of the length as a topic has never been set
+            if (strcmp(moduleConfig.mqtt.root, default_mqtt_root) == 0) {
+                sprintf(moduleConfig.mqtt.root, "%s/%s", default_mqtt_root, myRegion->name);
+                changes = SEGMENT_CONFIG | SEGMENT_MODULECONFIG;
+            }
+        }
+        if (config.lora.region != myRegion->code) {
+            //  Region has changed so check whether there is a regulatory one we should be using instead.
+            //  Additionally as a side-effect, assume a new value under myRegion
+            initRegion();

-        config.lora = validatedLora; // Finally, return the validated config back to the main config
+            if (strncmp(moduleConfig.mqtt.root, default_mqtt_root, strlen(default_mqtt_root)) == 0) {
+                //  Default root is in use, so subscribe to the appropriate MQTT topic for this region
+                sprintf(moduleConfig.mqtt.root, "%s/%s", default_mqtt_root, myRegion->name);
+            }

+            changes = SEGMENT_CONFIG | SEGMENT_MODULECONFIG;
+        }
        break;
    }
    case meshtastic_Config_bluetooth_tag:
@@ -925,10 +901,10 @@ void AdminModule::handleSetConfig(const meshtastic_Config &c, bool fromOthers)
    }
    if (requiresReboot && !hasOpenEditTransaction) {
        disableBluetooth();
-    } // end of switch case which_payload_variant
+    }

    saveChanges(changes, requiresReboot);
-} // end of handleSetConfig
+}

 bool AdminModule::handleSetModuleConfig(const meshtastic_ModuleConfig &c)
 {
@@ -1034,11 +1010,6 @@ bool AdminModule::handleSetModuleConfig(const meshtastic_ModuleConfig &c)
        moduleConfig.statusmessage = c.payload_variant.statusmessage;
        shouldReboot = false;
        break;
-    case meshtastic_ModuleConfig_traffic_management_tag:
-        LOG_INFO("Set module config: Traffic Management");
-        moduleConfig.has_traffic_management = true;
-        moduleConfig.traffic_management = c.payload_variant.traffic_management;
-        break;
    }
    saveChanges(SEGMENT_MODULECONFIG, shouldReboot);
    return true;
@@ -1153,85 +1124,78 @@ void AdminModule::handleGetModuleConfig(const meshtastic_MeshPacket &req, const
    meshtastic_AdminMessage res = meshtastic_AdminMessage_init_default;

    if (req.decoded.want_response) {
-        const char *configName = "?";
        switch (configType) {
        case meshtastic_AdminMessage_ModuleConfigType_MQTT_CONFIG:
-            configName = "MQTT";
+            LOG_INFO("Get module config: MQTT");
            res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_mqtt_tag;
            res.get_module_config_response.payload_variant.mqtt = moduleConfig.mqtt;
            break;
        case meshtastic_AdminMessage_ModuleConfigType_SERIAL_CONFIG:
-            configName = "Serial";
+            LOG_INFO("Get module config: Serial");
            res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_serial_tag;
            res.get_module_config_response.payload_variant.serial = moduleConfig.serial;
            break;
        case meshtastic_AdminMessage_ModuleConfigType_EXTNOTIF_CONFIG:
-            configName = "External Notification";
+            LOG_INFO("Get module config: External Notification");
            res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_external_notification_tag;
            res.get_module_config_response.payload_variant.external_notification = moduleConfig.external_notification;
            break;
        case meshtastic_AdminMessage_ModuleConfigType_STOREFORWARD_CONFIG:
-            configName = "Store & Forward";
+            LOG_INFO("Get module config: Store & Forward");
            res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_store_forward_tag;
            res.get_module_config_response.payload_variant.store_forward = moduleConfig.store_forward;
            break;
        case meshtastic_AdminMessage_ModuleConfigType_RANGETEST_CONFIG:
-            configName = "Range Test";
+            LOG_INFO("Get module config: Range Test");
            res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_range_test_tag;
            res.get_module_config_response.payload_variant.range_test = moduleConfig.range_test;
            break;
        case meshtastic_AdminMessage_ModuleConfigType_TELEMETRY_CONFIG:
-            configName = "Telemetry";
+            LOG_INFO("Get module config: Telemetry");
            res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_telemetry_tag;
            res.get_module_config_response.payload_variant.telemetry = moduleConfig.telemetry;
            break;
        case meshtastic_AdminMessage_ModuleConfigType_CANNEDMSG_CONFIG:
-            configName = "Canned Message";
+            LOG_INFO("Get module config: Canned Message");
            res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_canned_message_tag;
            res.get_module_config_response.payload_variant.canned_message = moduleConfig.canned_message;
            break;
        case meshtastic_AdminMessage_ModuleConfigType_AUDIO_CONFIG:
-            configName = "Audio";
+            LOG_INFO("Get module config: Audio");
            res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_audio_tag;
            res.get_module_config_response.payload_variant.audio = moduleConfig.audio;
            break;
        case meshtastic_AdminMessage_ModuleConfigType_REMOTEHARDWARE_CONFIG:
-            configName = "Remote Hardware";
+            LOG_INFO("Get module config: Remote Hardware");
            res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_remote_hardware_tag;
            res.get_module_config_response.payload_variant.remote_hardware = moduleConfig.remote_hardware;
            break;
        case meshtastic_AdminMessage_ModuleConfigType_NEIGHBORINFO_CONFIG:
-            configName = "Neighbor Info";
+            LOG_INFO("Get module config: Neighbor Info");
            res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_neighbor_info_tag;
            res.get_module_config_response.payload_variant.neighbor_info = moduleConfig.neighbor_info;
            break;
        case meshtastic_AdminMessage_ModuleConfigType_DETECTIONSENSOR_CONFIG:
-            configName = "Detection Sensor";
+            LOG_INFO("Get module config: Detection Sensor");
            res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_detection_sensor_tag;
            res.get_module_config_response.payload_variant.detection_sensor = moduleConfig.detection_sensor;
            break;
        case meshtastic_AdminMessage_ModuleConfigType_AMBIENTLIGHTING_CONFIG:
-            configName = "Ambient Lighting";
+            LOG_INFO("Get module config: Ambient Lighting");
            res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_ambient_lighting_tag;
            res.get_module_config_response.payload_variant.ambient_lighting = moduleConfig.ambient_lighting;
            break;
        case meshtastic_AdminMessage_ModuleConfigType_PAXCOUNTER_CONFIG:
-            configName = "Paxcounter";
+            LOG_INFO("Get module config: Paxcounter");
            res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_paxcounter_tag;
            res.get_module_config_response.payload_variant.paxcounter = moduleConfig.paxcounter;
            break;
        case meshtastic_AdminMessage_ModuleConfigType_STATUSMESSAGE_CONFIG:
-            configName = "StatusMessage";
+            LOG_INFO("Get module config: StatusMessage");
            res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_statusmessage_tag;
            res.get_module_config_response.payload_variant.statusmessage = moduleConfig.statusmessage;
            break;
-        case meshtastic_AdminMessage_ModuleConfigType_TRAFFICMANAGEMENT_CONFIG:
-            configName = "Traffic Management";
-            res.get_module_config_response.which_payload_variant = meshtastic_ModuleConfig_traffic_management_tag;
-            res.get_module_config_response.payload_variant.traffic_management = moduleConfig.traffic_management;
-            break;
        }
-        LOG_INFO("Get module config: %s", configName);

        // NOTE: The phone app needs to know the ls_secsvalue so it can properly expect sleep behavior.
        // So even if we internally use 0 to represent 'use default' we still need to send the value we are
@@ -1414,17 +1378,23 @@ void AdminModule::handleStoreDeviceUIConfig(const meshtastic_DeviceUIConfig &uic
 void AdminModule::handleSetHamMode(const meshtastic_HamParameters &p)
 {
    // Validate ham parameters before setting since this would bypass validation in the owner struct
-    const char *fieldsToCheck[] = {p.call_sign, p.short_name};
-    const char *fieldNames[] = {"call_sign", "short_name"};
-    for (int i = 0; i < 2; i++) {
-        if (*fieldsToCheck[i]) {
-            const char *start = fieldsToCheck[i];
-            while (*start && isspace((unsigned char)*start))
-                start++;
-            if (*start == '\0') {
-                LOG_WARN("Rejected ham %s: must contain at least 1 non-whitespace character", fieldNames[i]);
-                return;
-            }
+    if (*p.call_sign) {
+        const char *start = p.call_sign;
+        // Skip all whitespace
+        while (*start && isspace((unsigned char)*start))
+            start++;
+        if (*start == '\0') {
+            LOG_WARN("Rejected ham call_sign: must contain at least 1 non-whitespace character");
+            return;
+        }
+    }
+    if (*p.short_name) {
+        const char *start = p.short_name;
+        while (*start && isspace((unsigned char)*start))
+            start++;
+        if (*start == '\0') {
+            LOG_WARN("Rejected ham short_name: must contain at least 1 non-whitespace character");
+            return;
        }
    }

@@ -60,11 +60,7 @@ class AdminModule : public ProtobufModule<meshtastic_AdminMessage>, public Obser
     */
    void handleSetOwner(const meshtastic_User &o);
    void handleSetChannel(const meshtastic_Channel &cc);
-
-  protected:
-    void handleSetConfig(const meshtastic_Config &c, bool fromOthers);
-
-  private:
+    void handleSetConfig(const meshtastic_Config &c);
    bool handleSetModuleConfig(const meshtastic_ModuleConfig &c);
    void handleSetChannel();
    void handleSetHamMode(const meshtastic_HamParameters &req);
@@ -1,14 +1,207 @@
 #include "AtakPluginModule.h"
+#include "Default.h"
+#include "MeshService.h"
+#include "NodeDB.h"
+#include "PowerFSM.h"
+#include "configuration.h"
+#include "main.h"
+#include "mesh/compression/unishox2.h"
+#include "meshUtils.h"
+#include "meshtastic/atak.pb.h"

 AtakPluginModule *atakPluginModule;

 AtakPluginModule::AtakPluginModule()
-    : SinglePortModule("atak", meshtastic_PortNum_ATAK_PLUGIN_V2)
+    : ProtobufModule("atak", meshtastic_PortNum_ATAK_PLUGIN, &meshtastic_TAKPacket_msg), concurrency::OSThread("AtakPlugin")
 {
+    ourPortNum = meshtastic_PortNum_ATAK_PLUGIN;
 }

-ProcessMessage AtakPluginModule::handleReceived(const meshtastic_MeshPacket &mp)
+/*
+Encompasses the full construction and sending packet to mesh
+Will be used for broadcast.
+*/
+int32_t AtakPluginModule::runOnce()
 {
-    (void)mp; // Passthrough — no processing needed, apps handle compression/decompression
-    return ProcessMessage::CONTINUE;
+    return default_broadcast_interval_secs;
 }
+
+bool AtakPluginModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_TAKPacket *r)
+{
+    return false;
+}
+
+meshtastic_TAKPacket AtakPluginModule::cloneTAKPacketData(meshtastic_TAKPacket *t)
+{
+    meshtastic_TAKPacket clone = meshtastic_TAKPacket_init_zero;
+    if (t->has_group) {
+        clone.has_group = true;
+        clone.group = t->group;
+    }
+    if (t->has_status) {
+        clone.has_status = true;
+        clone.status = t->status;
+    }
+    if (t->has_contact) {
+        clone.has_contact = true;
+        clone.contact = {0};
+    }
+
+    if (t->which_payload_variant == meshtastic_TAKPacket_pli_tag) {
+        clone.which_payload_variant = meshtastic_TAKPacket_pli_tag;
+        clone.payload_variant.pli = t->payload_variant.pli;
+    } else if (t->which_payload_variant == meshtastic_TAKPacket_chat_tag) {
+        clone.which_payload_variant = meshtastic_TAKPacket_chat_tag;
+        clone.payload_variant.chat = {0};
+    } else if (t->which_payload_variant == meshtastic_TAKPacket_detail_tag) {
+        clone.which_payload_variant = meshtastic_TAKPacket_detail_tag;
+        clone.payload_variant.detail.size = t->payload_variant.detail.size;
+        memcpy(clone.payload_variant.detail.bytes, t->payload_variant.detail.bytes, t->payload_variant.detail.size);
+    }
+
+    return clone;
+}
+
+void AtakPluginModule::alterReceivedProtobuf(meshtastic_MeshPacket &mp, meshtastic_TAKPacket *t)
+{
+    // From Phone (EUD)
+    if (mp.from == 0) {
+        LOG_DEBUG("Received uncompressed TAK payload from phone: %d bytes", mp.decoded.payload.size);
+        // Compress for LoRA transport
+        auto compressed = cloneTAKPacketData(t);
+        compressed.is_compressed = true;
+        if (t->has_contact) {
+            auto length = unishox2_compress_lines(
+                t->contact.callsign, pb_string_length(t->contact.callsign, sizeof(t->contact.callsign)),
+                compressed.contact.callsign, sizeof(compressed.contact.callsign) - 1, USX_PSET_DFLT, NULL);
+            if (length < 0) {
+                LOG_WARN("Compress overflow contact.callsign. Revert to uncompressed packet");
+                return;
+            }
+            LOG_DEBUG("Compressed callsign: %d bytes", length);
+            length = unishox2_compress_lines(
+                t->contact.device_callsign, pb_string_length(t->contact.device_callsign, sizeof(t->contact.device_callsign)),
+                compressed.contact.device_callsign, sizeof(compressed.contact.device_callsign) - 1, USX_PSET_DFLT, NULL);
+            if (length < 0) {
+                LOG_WARN("Compress overflow contact.device_callsign. Revert to uncompressed packet");
+                return;
+            }
+            LOG_DEBUG("Compressed device_callsign: %d bytes", length);
+        }
+        if (t->which_payload_variant == meshtastic_TAKPacket_chat_tag) {
+            auto length = unishox2_compress_lines(
+                t->payload_variant.chat.message,
+                pb_string_length(t->payload_variant.chat.message, sizeof(t->payload_variant.chat.message)),
+                compressed.payload_variant.chat.message, sizeof(compressed.payload_variant.chat.message) - 1, USX_PSET_DFLT,
+                NULL);
+            if (length < 0) {
+                LOG_WARN("Compress overflow chat.message. Revert to uncompressed packet");
+                return;
+            }
+            LOG_DEBUG("Compressed chat message: %d bytes", length);
+
+            if (t->payload_variant.chat.has_to) {
+                compressed.payload_variant.chat.has_to = true;
+                length = unishox2_compress_lines(
+                    t->payload_variant.chat.to, pb_string_length(t->payload_variant.chat.to, sizeof(t->payload_variant.chat.to)),
+                    compressed.payload_variant.chat.to, sizeof(compressed.payload_variant.chat.to) - 1, USX_PSET_DFLT, NULL);
+                if (length < 0) {
+                    LOG_WARN("Compress overflow chat.to. Revert to uncompressed packet");
+                    return;
+                }
+                LOG_DEBUG("Compressed chat to: %d bytes", length);
+            }
+
+            if (t->payload_variant.chat.has_to_callsign) {
+                compressed.payload_variant.chat.has_to_callsign = true;
+                length = unishox2_compress_lines(
+                    t->payload_variant.chat.to_callsign,
+                    pb_string_length(t->payload_variant.chat.to_callsign, sizeof(t->payload_variant.chat.to_callsign)),
+                    compressed.payload_variant.chat.to_callsign, sizeof(compressed.payload_variant.chat.to_callsign) - 1,
+                    USX_PSET_DFLT, NULL);
+                if (length < 0) {
+                    LOG_WARN("Compress overflow chat.to_callsign. Revert to uncompressed packet");
+                    return;
+                }
+                LOG_DEBUG("Compressed chat to_callsign: %d bytes", length);
+            }
+        }
+        mp.decoded.payload.size = pb_encode_to_bytes(mp.decoded.payload.bytes, sizeof(mp.decoded.payload.bytes),
+                                                     meshtastic_TAKPacket_fields, &compressed);
+        LOG_DEBUG("Final payload: %d bytes", mp.decoded.payload.size);
+    } else {
+        if (!t->is_compressed) {
+            // Not compressed. Something is wrong
+            LOG_WARN("Received uncompressed TAKPacket over radio! Skip");
+            return;
+        }
+
+        // Decompress for Phone (EUD)
+        auto uncompressed = cloneTAKPacketData(t);
+        uncompressed.is_compressed = false;
+        if (t->has_contact) {
+            auto length = unishox2_decompress_lines(
+                t->contact.callsign, pb_string_length(t->contact.callsign, sizeof(t->contact.callsign)),
+                uncompressed.contact.callsign, sizeof(uncompressed.contact.callsign) - 1, USX_PSET_DFLT, NULL);
+            if (length < 0) {
+                LOG_WARN("Decompress overflow contact.callsign. Bailing out");
+                return;
+            }
+            LOG_DEBUG("Decompressed callsign: %d bytes", length);
+
+            length = unishox2_decompress_lines(
+                t->contact.device_callsign, pb_string_length(t->contact.device_callsign, sizeof(t->contact.device_callsign)),
+                uncompressed.contact.device_callsign, sizeof(uncompressed.contact.device_callsign) - 1, USX_PSET_DFLT, NULL);
+            if (length < 0) {
+                LOG_WARN("Decompress overflow contact.device_callsign. Bailing out");
+                return;
+            }
+            LOG_DEBUG("Decompressed device_callsign: %d bytes", length);
+        }
+        if (uncompressed.which_payload_variant == meshtastic_TAKPacket_chat_tag) {
+            auto length = unishox2_decompress_lines(
+                t->payload_variant.chat.message,
+                pb_string_length(t->payload_variant.chat.message, sizeof(t->payload_variant.chat.message)),
+                uncompressed.payload_variant.chat.message, sizeof(uncompressed.payload_variant.chat.message) - 1, USX_PSET_DFLT,
+                NULL);
+            if (length < 0) {
+                LOG_WARN("Decompress overflow chat.message. Bailing out");
+                return;
+            }
+            LOG_DEBUG("Decompressed chat message: %d bytes", length);
+
+            if (t->payload_variant.chat.has_to) {
+                uncompressed.payload_variant.chat.has_to = true;
+                length = unishox2_decompress_lines(
+                    t->payload_variant.chat.to, pb_string_length(t->payload_variant.chat.to, sizeof(t->payload_variant.chat.to)),
+                    uncompressed.payload_variant.chat.to, sizeof(uncompressed.payload_variant.chat.to) - 1, USX_PSET_DFLT, NULL);
+                if (length < 0) {
+                    LOG_WARN("Decompress overflow chat.to. Bailing out");
+                    return;
+                }
+                LOG_DEBUG("Decompressed chat to: %d bytes", length);
+            }
+
+            if (t->payload_variant.chat.has_to_callsign) {
+                uncompressed.payload_variant.chat.has_to_callsign = true;
+                length = unishox2_decompress_lines(
+                    t->payload_variant.chat.to_callsign,
+                    pb_string_length(t->payload_variant.chat.to_callsign, sizeof(t->payload_variant.chat.to_callsign)),
+                    uncompressed.payload_variant.chat.to_callsign, sizeof(uncompressed.payload_variant.chat.to_callsign) - 1,
+                    USX_PSET_DFLT, NULL);
+                if (length < 0) {
+                    LOG_WARN("Decompress overflow chat.to_callsign. Bailing out");
+                    return;
+                }
+                LOG_DEBUG("Decompressed chat to_callsign: %d bytes", length);
+            }
+        }
+        auto decompressedCopy = packetPool.allocCopy(mp);
+        decompressedCopy->decoded.payload.size =
+            pb_encode_to_bytes(decompressedCopy->decoded.payload.bytes, sizeof(decompressedCopy->decoded.payload),
+                               meshtastic_TAKPacket_fields, &uncompressed);
+
+        service->sendToPhone(decompressedCopy);
+    }
+    return;
+}
@@ -1,15 +1,11 @@
 #pragma once
-#include "SinglePortModule.h"
+#include "ProtobufModule.h"
+#include "meshtastic/atak.pb.h"

 /**
- * ATAK Plugin V2 module - passthrough for ATAK_PLUGIN_V2 payloads.
- * The wire format includes a leading flags byte followed by opaque payload bytes.
- * Depending on the flags, the payload may be zstd dictionary-compressed or raw/uncompressed protobuf.
- * Compression/decompression and payload interpretation are handled by the apps
- * (Android, iOS, ATAK plugin); firmware forwards the bytes unchanged on the
- * ATAK_PLUGIN_V2 port.
+ * Waypoint message handling for meshtastic
 */
-class AtakPluginModule : public SinglePortModule
+class AtakPluginModule : public ProtobufModule<meshtastic_TAKPacket>, private concurrency::OSThread
 {
  public:
    /** Constructor
@@ -18,7 +14,13 @@ class AtakPluginModule : public SinglePortModule
    AtakPluginModule();

  protected:
-    virtual ProcessMessage handleReceived(const meshtastic_MeshPacket &mp) override;
+    virtual bool handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_TAKPacket *t) override;
+    virtual void alterReceivedProtobuf(meshtastic_MeshPacket &mp, meshtastic_TAKPacket *t) override;
+    /* Does our periodic broadcast */
+    int32_t runOnce() override;
+
+  private:
+    meshtastic_TAKPacket cloneTAKPacketData(meshtastic_TAKPacket *t);
 };

-extern AtakPluginModule *atakPluginModule;
+extern AtakPluginModule *atakPluginModule;
@@ -38,9 +38,6 @@
 #include "modules/PowerStressModule.h"
 #endif
 #include "modules/RoutingModule.h"
-#if HAS_TRAFFIC_MANAGEMENT && !MESHTASTIC_EXCLUDE_TRAFFIC_MANAGEMENT
-#include "modules/TrafficManagementModule.h"
-#endif
 #include "modules/TextMessageModule.h"
 #if !MESHTASTIC_EXCLUDE_TRACEROUTE
 #include "modules/TraceRouteModule.h"
@@ -123,14 +120,6 @@ void setupModules()
 #if !MESHTASTIC_EXCLUDE_REPLYBOT
    new ReplyBotModule();
 #endif
-
-#if HAS_TRAFFIC_MANAGEMENT && !MESHTASTIC_EXCLUDE_TRAFFIC_MANAGEMENT
-    // Instantiate only when enabled to avoid extra memory use and background work.
-    if (moduleConfig.has_traffic_management && moduleConfig.traffic_management.enabled) {
-        trafficManagementModule = new TrafficManagementModule();
-    }
-#endif
-
 #if !MESHTASTIC_EXCLUDE_ADMIN
    adminModule = new AdminModule();
 #endif
@@ -12,6 +12,7 @@
 #include "configuration.h"
 #include "gps/GeoCoord.h"
 #include "main.h"
+#include "mesh/compression/unishox2.h"
 #include "meshUtils.h"
 #include "meshtastic/atak.pb.h"
 #include "sleep.h"
@@ -306,77 +307,37 @@ meshtastic_MeshPacket *PositionModule::allocReply()

 meshtastic_MeshPacket *PositionModule::allocAtakPli()
 {
-    LOG_INFO("Send TAK V2 PLI packet");
+    LOG_INFO("Send TAK PLI packet");
    meshtastic_MeshPacket *mp = allocDataPacket();
-    mp->decoded.portnum = meshtastic_PortNum_ATAK_PLUGIN_V2;
+    mp->decoded.portnum = meshtastic_PortNum_ATAK_PLUGIN;

-    meshtastic_TAKPacketV2 takPacket = meshtastic_TAKPacketV2_init_zero;
-    takPacket.cot_type_id = meshtastic_CotType_CotType_a_f_G_U_C;
+    meshtastic_TAKPacket takPacket = {.is_compressed = true,
+                                      .has_contact = true,
+                                      .contact = meshtastic_Contact_init_default,
+                                      .has_group = true,
+                                      .group = {meshtastic_MemberRole_TeamMember, meshtastic_Team_Cyan},
+                                      .has_status = true,
+                                      .status =
+                                          {
+                                              .battery = powerStatus->getBatteryChargePercent(),
+                                          },
+                                      .which_payload_variant = meshtastic_TAKPacket_pli_tag,
+                                      .payload_variant = {.pli = {
+                                                              .latitude_i = localPosition.latitude_i,
+                                                              .longitude_i = localPosition.longitude_i,
+                                                              .altitude = localPosition.altitude_hae,
+                                                              .speed = localPosition.ground_speed,
+                                                              .course = static_cast<uint16_t>(localPosition.ground_track),
+                                                          }}};

-    // Use TAK config for team/role if configured, otherwise use defaults (Cyan/TeamMember)
-    if (moduleConfig.has_tak && moduleConfig.tak.team != meshtastic_Team_Unspecifed_Color) {
-        takPacket.team = moduleConfig.tak.team;
-    } else {
-        takPacket.team = meshtastic_Team_Cyan;
-    }
-
-    if (moduleConfig.has_tak && moduleConfig.tak.role != meshtastic_MemberRole_Unspecifed) {
-        takPacket.role = moduleConfig.tak.role;
-    } else {
-        takPacket.role = meshtastic_MemberRole_TeamMember;
-    }
-    takPacket.latitude_i = localPosition.latitude_i;
-    takPacket.longitude_i = localPosition.longitude_i;
-    takPacket.altitude = localPosition.altitude_hae;
-    takPacket.speed = localPosition.ground_speed;
-    // ground_track is stored as degrees * 1e5, course field expects degrees * 100
-    int32_t course = localPosition.ground_track / 1000;
-    if (course < 0)
-        course = 0;
-    else if (course > 36000)
-        course = 36000;
-    takPacket.course = static_cast<uint16_t>(course);
-    takPacket.battery = powerStatus->getBatteryChargePercent();
-
-    // Map position source to CoT how/geo_src/alt_src
-    if (config.position.fixed_position || localPosition.location_source == meshtastic_Position_LocSource_LOC_MANUAL) {
-        takPacket.how = meshtastic_CotHow_CotHow_h_e;
-        takPacket.geo_src = meshtastic_GeoPointSource_GeoPointSource_USER;
-        takPacket.alt_src = meshtastic_GeoPointSource_GeoPointSource_USER;
-    } else {
-        takPacket.how = meshtastic_CotHow_CotHow_m_g;
-        takPacket.geo_src = meshtastic_GeoPointSource_GeoPointSource_GPS;
-        takPacket.alt_src = meshtastic_GeoPointSource_GeoPointSource_GPS;
-    }
-    takPacket.which_payload_variant = meshtastic_TAKPacketV2_pli_tag;
-    takPacket.payload_variant.pli = true;
-
-    // Callsign - stored as plain string (no compression, apps handle that)
-    strncpy(takPacket.callsign, owner.long_name, sizeof(takPacket.callsign) - 1);
-    takPacket.callsign[sizeof(takPacket.callsign) - 1] = '\0';
-    strncpy(takPacket.device_callsign, owner.long_name, sizeof(takPacket.device_callsign) - 1);
-    takPacket.device_callsign[sizeof(takPacket.device_callsign) - 1] = '\0';
-
-    // Encode TAKPacketV2 protobuf, leaving room for flags byte prefix
-    uint8_t protobuf_bytes[sizeof(mp->decoded.payload.bytes) - 1];
-    size_t proto_size = pb_encode_to_bytes(protobuf_bytes, sizeof(protobuf_bytes), &meshtastic_TAKPacketV2_msg, &takPacket);
-
-    if (proto_size == 0) {
-        LOG_ERROR("Failed to encode TAK V2 PLI packet");
-        packetPool.release(mp);
-        return nullptr;
-    }
-
-    // Wire format: [flags byte][protobuf bytes]
-    // Flags byte 0xFF is a reserved sentinel meaning the remainder is an
-    // uncompressed raw protobuf payload (that is, no zstd dictionary ID is
-    // encoded in the flags byte). Decoders must check for this sentinel before
-    // applying any dictionary-ID masking/interpretation.
-    mp->decoded.payload.bytes[0] = 0xFF;
-    memcpy(mp->decoded.payload.bytes + 1, protobuf_bytes, proto_size);
-    mp->decoded.payload.size = proto_size + 1;
-
-    LOG_DEBUG("TAK V2 PLI payload: %zu bytes (1 flags + %zu protobuf)", mp->decoded.payload.size, proto_size);
+    auto length = unishox2_compress_lines(owner.long_name, strlen(owner.long_name), takPacket.contact.device_callsign,
+                                          sizeof(takPacket.contact.device_callsign) - 1, USX_PSET_DFLT, NULL);
+    LOG_DEBUG("Uncompressed device_callsign '%s' - %d bytes", owner.long_name, strlen(owner.long_name));
+    LOG_DEBUG("Compressed device_callsign '%s' - %d bytes", takPacket.contact.device_callsign, length);
+    length = unishox2_compress_lines(owner.long_name, strlen(owner.long_name), takPacket.contact.callsign,
+                                     sizeof(takPacket.contact.callsign) - 1, USX_PSET_DFLT, NULL);
+    mp->decoded.payload.size =
+        pb_encode_to_bytes(mp->decoded.payload.bytes, sizeof(mp->decoded.payload.bytes), &meshtastic_TAKPacket_msg, &takPacket);
    return mp;
 }

@@ -651,7 +651,7 @@ void SerialModule::processWXSerial()
        LOG_INFO("WS8X : %i %.1fg%.1f %.1fv %.1fv %.1fC rain: %.1f, %i sum", atoi(windDir), strtof(windVel, nullptr),
                 strtof(windGust, nullptr), batVoltageF, capVoltageF, temperatureF, rain, rainSum);
    }
-    if (gotwind && !Throttle::isWithinTimespanMs(lastAveraged, averageIntervalMillis) && velCount > 0 && dirCount > 0) {
+    if (gotwind && !Throttle::isWithinTimespanMs(lastAveraged, averageIntervalMillis)) {
        // calculate averages and send to the mesh
        float velAvg = 1.0 * velSum / velCount;

@@ -66,10 +66,18 @@ extern void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y, const c
 #include "Sensor/MCP9808Sensor.h"
 #endif

+#if __has_include(<Adafruit_SHT31.h>)
+#include "Sensor/SHT31Sensor.h"
+#endif
+
 #if __has_include(<Adafruit_LPS2X.h>)
 #include "Sensor/LPS22HBSensor.h"
 #endif

+#if __has_include(<Adafruit_SHTC3.h>)
+#include "Sensor/SHTC3Sensor.h"
+#endif
+
 #if __has_include("RAK12035_SoilMoisture.h") && defined(RAK_4631) && RAK_4631 == 1
 #include "Sensor/RAK12035Sensor.h"
 #endif
@@ -86,8 +94,8 @@ extern void drawCommonHeader(OLEDDisplay *display, int16_t x, int16_t y, const c
 #include "Sensor/OPT3001Sensor.h"
 #endif

-#if __has_include(<SHTSensor.h>)
-#include "Sensor/SHTXXSensor.h"
+#if __has_include(<Adafruit_SHT4x.h>)
+#include "Sensor/SHT4XSensor.h"
 #endif

 #if __has_include(<SparkFun_MLX90632_Arduino_Library.h>)
@@ -147,15 +155,6 @@ void EnvironmentTelemetryModule::i2cScanFinished(ScanI2C *i2cScanner)
    }
    LOG_INFO("Environment Telemetry adding I2C devices...");

-    /*
-        Uncomment the preferences below if you want to use the module
-        without having to configure it from the PythonAPI or WebUI.
-    */
-
-    // moduleConfig.telemetry.environment_measurement_enabled = 1;
-    // moduleConfig.telemetry.environment_screen_enabled = 1;
-    // moduleConfig.telemetry.environment_update_interval = 15;
-
    // order by priority of metrics/values (low top, high bottom)

 #if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
@@ -203,9 +202,15 @@ void EnvironmentTelemetryModule::i2cScanFinished(ScanI2C *i2cScanner)
 #if __has_include(<Adafruit_MCP9808.h>)
    addSensor<MCP9808Sensor>(i2cScanner, ScanI2C::DeviceType::MCP9808);
 #endif
+#if __has_include(<Adafruit_SHT31.h>)
+    addSensor<SHT31Sensor>(i2cScanner, ScanI2C::DeviceType::SHT31);
+#endif
 #if __has_include(<Adafruit_LPS2X.h>)
    addSensor<LPS22HBSensor>(i2cScanner, ScanI2C::DeviceType::LPS22HB);
 #endif
+#if __has_include(<Adafruit_SHTC3.h>)
+    addSensor<SHTC3Sensor>(i2cScanner, ScanI2C::DeviceType::SHTC3);
+#endif
 #if __has_include("RAK12035_SoilMoisture.h") && defined(RAK_4631) && RAK_4631 == 1
    addSensor<RAK12035Sensor>(i2cScanner, ScanI2C::DeviceType::RAK12035);
 #endif
@@ -218,9 +223,13 @@ void EnvironmentTelemetryModule::i2cScanFinished(ScanI2C *i2cScanner)
 #if __has_include(<ClosedCube_OPT3001.h>)
    addSensor<OPT3001Sensor>(i2cScanner, ScanI2C::DeviceType::OPT3001);
 #endif
+#if __has_include(<Adafruit_SHT4x.h>)
+    addSensor<SHT4XSensor>(i2cScanner, ScanI2C::DeviceType::SHT4X);
+#endif
 #if __has_include(<SparkFun_MLX90632_Arduino_Library.h>)
    addSensor<MLX90632Sensor>(i2cScanner, ScanI2C::DeviceType::MLX90632);
 #endif
+
 #if __has_include(<Adafruit_BMP3XX.h>)
    addSensor<BMP3XXSensor>(i2cScanner, ScanI2C::DeviceType::BMP_3XX);
 #endif
@@ -236,10 +245,7 @@ void EnvironmentTelemetryModule::i2cScanFinished(ScanI2C *i2cScanner)
 #if __has_include(<BH1750_WE.h>)
    addSensor<BH1750Sensor>(i2cScanner, ScanI2C::DeviceType::BH1750);
 #endif
-#if __has_include(<SHTSensor.h>)
-    // TODO Can we scan for multiple sensors connected on the same bus?
-    addSensor<SHTXXSensor>(i2cScanner, ScanI2C::DeviceType::SHTXX);
-#endif
+
 #endif
 }

@@ -254,6 +260,14 @@ int32_t EnvironmentTelemetryModule::runOnce()
    }

    uint32_t result = UINT32_MAX;
+    /*
+        Uncomment the preferences below if you want to use the module
+        without having to configure it from the PythonAPI or WebUI.
+    */
+
+    // moduleConfig.telemetry.environment_measurement_enabled = 1;
+    // moduleConfig.telemetry.environment_screen_enabled = 1;
+    // moduleConfig.telemetry.environment_update_interval = 15;

    if (!(moduleConfig.telemetry.environment_measurement_enabled || moduleConfig.telemetry.environment_screen_enabled ||
          ENVIRONMENTAL_TELEMETRY_MODULE_ENABLE)) {
@@ -0,0 +1,31 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_SHT31.h>)
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "SHT31Sensor.h"
+#include "TelemetrySensor.h"
+#include <Adafruit_SHT31.h>
+
+SHT31Sensor::SHT31Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SHT31, "SHT31") {}
+
+bool SHT31Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
+{
+    LOG_INFO("Init sensor: %s", sensorName);
+    sht31 = Adafruit_SHT31(bus);
+    status = sht31.begin(dev->address.address);
+    initI2CSensor();
+    return status;
+}
+
+bool SHT31Sensor::getMetrics(meshtastic_Telemetry *measurement)
+{
+    measurement->variant.environment_metrics.has_temperature = true;
+    measurement->variant.environment_metrics.has_relative_humidity = true;
+    measurement->variant.environment_metrics.temperature = sht31.readTemperature();
+    measurement->variant.environment_metrics.relative_humidity = sht31.readHumidity();
+
+    return true;
+}
+
+#endif
@@ -0,0 +1,20 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_SHT31.h>)
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include <Adafruit_SHT31.h>
+
+class SHT31Sensor : public TelemetrySensor
+{
+  private:
+    Adafruit_SHT31 sht31;
+
+  public:
+    SHT31Sensor();
+    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
+    virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
+};
+
+#endif
@@ -0,0 +1,48 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_SHT4x.h>)
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "SHT4XSensor.h"
+#include "TelemetrySensor.h"
+#include <Adafruit_SHT4x.h>
+
+SHT4XSensor::SHT4XSensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SHT4X, "SHT4X") {}
+
+bool SHT4XSensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
+{
+    LOG_INFO("Init sensor: %s", sensorName);
+
+    uint32_t serialNumber = 0;
+
+    status = sht4x.begin(bus);
+    if (!status) {
+        return status;
+    }
+
+    serialNumber = sht4x.readSerial();
+    if (serialNumber != 0) {
+        LOG_DEBUG("serialNumber : %x", serialNumber);
+        status = 1;
+    } else {
+        LOG_DEBUG("Error trying to execute readSerial(): ");
+        status = 0;
+    }
+
+    initI2CSensor();
+    return status;
+}
+
+bool SHT4XSensor::getMetrics(meshtastic_Telemetry *measurement)
+{
+    measurement->variant.environment_metrics.has_temperature = true;
+    measurement->variant.environment_metrics.has_relative_humidity = true;
+
+    sensors_event_t humidity, temp;
+    sht4x.getEvent(&humidity, &temp);
+    measurement->variant.environment_metrics.temperature = temp.temperature;
+    measurement->variant.environment_metrics.relative_humidity = humidity.relative_humidity;
+    return true;
+}
+
+#endif
@@ -0,0 +1,20 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_SHT4x.h>)
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include <Adafruit_SHT4x.h>
+
+class SHT4XSensor : public TelemetrySensor
+{
+  private:
+    Adafruit_SHT4x sht4x = Adafruit_SHT4x();
+
+  public:
+    SHT4XSensor();
+    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
+    virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
+};
+
+#endif
@@ -0,0 +1,35 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_SHTC3.h>)
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "SHTC3Sensor.h"
+#include "TelemetrySensor.h"
+#include <Adafruit_SHTC3.h>
+
+SHTC3Sensor::SHTC3Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SHTC3, "SHTC3") {}
+
+bool SHTC3Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
+{
+    LOG_INFO("Init sensor: %s", sensorName);
+    status = shtc3.begin(bus);
+
+    initI2CSensor();
+    return status;
+}
+
+bool SHTC3Sensor::getMetrics(meshtastic_Telemetry *measurement)
+{
+    measurement->variant.environment_metrics.has_temperature = true;
+    measurement->variant.environment_metrics.has_relative_humidity = true;
+
+    sensors_event_t humidity, temp;
+    shtc3.getEvent(&humidity, &temp);
+
+    measurement->variant.environment_metrics.temperature = temp.temperature;
+    measurement->variant.environment_metrics.relative_humidity = humidity.relative_humidity;
+
+    return true;
+}
+
+#endif
@@ -0,0 +1,20 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_SHTC3.h>)
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include <Adafruit_SHTC3.h>
+
+class SHTC3Sensor : public TelemetrySensor
+{
+  private:
+    Adafruit_SHTC3 shtc3 = Adafruit_SHTC3();
+
+  public:
+    SHTC3Sensor();
+    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
+    virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
+};
+
+#endif
@@ -1,145 +0,0 @@
-#include "configuration.h"
-
-#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<SHTSensor.h>)
-
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "SHTXXSensor.h"
-#include "TelemetrySensor.h"
-#include <SHTSensor.h>
-
-SHTXXSensor::SHTXXSensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SHTXX, "SHTXX") {}
-
-void SHTXXSensor::getSensorVariant(SHTSensor::SHTSensorType sensorType)
-{
-    switch (sensorType) {
-    case SHTSensor::SHTSensorType::SHT2X:
-        sensorVariant = "SHT2x";
-        break;
-
-    case SHTSensor::SHTSensorType::SHT3X:
-    case SHTSensor::SHTSensorType::SHT85:
-        sensorVariant = "SHT3x/SHT85";
-        break;
-
-    case SHTSensor::SHTSensorType::SHT3X_ALT:
-        sensorVariant = "SHT3x";
-        break;
-
-    case SHTSensor::SHTSensorType::SHTW1:
-    case SHTSensor::SHTSensorType::SHTW2:
-    case SHTSensor::SHTSensorType::SHTC1:
-    case SHTSensor::SHTSensorType::SHTC3:
-        sensorVariant = "SHTC1/SHTC3/SHTW1/SHTW2";
-        break;
-
-    case SHTSensor::SHTSensorType::SHT4X:
-        sensorVariant = "SHT4x";
-        break;
-
-    default:
-        sensorVariant = "Unknown";
-        break;
-    }
-}
-
-bool SHTXXSensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
-{
-    LOG_INFO("Init sensor: %s", sensorName);
-
-    _bus = bus;
-    _address = dev->address.address;
-
-    if (sht.init(*_bus)) {
-        LOG_INFO("%s: init(): success", sensorName);
-        getSensorVariant(sht.mSensorType);
-        LOG_INFO("%s Sensor detected: %s on 0x%x", sensorName, sensorVariant, _address);
-        status = 1;
-    } else {
-        LOG_ERROR("%s: init(): failed", sensorName);
-    }
-
-    initI2CSensor();
-    return status;
-}
-
-/**
- * Accuracy setting of measurement.
- * Not all sensors support changing the sampling accuracy (only SHT3X and SHT4X)
- * SHTAccuracy:
- * - SHT_ACCURACY_HIGH: Highest repeatability at the cost of slower measurement
- * - SHT_ACCURACY_MEDIUM: Balanced repeatability and speed of measurement
- * - SHT_ACCURACY_LOW: Fastest measurement but lowest repeatability
- */
-bool SHTXXSensor::setAccuracy(SHTSensor::SHTAccuracy newAccuracy)
-{
-    // Only SHT3X-family (including alternates) and SHT4X support changing accuracy
-    if (sht.mSensorType != SHTSensor::SHTSensorType::SHT3X && sht.mSensorType != SHTSensor::SHTSensorType::SHT3X_ALT &&
-        sht.mSensorType != SHTSensor::SHTSensorType::SHT85 && sht.mSensorType != SHTSensor::SHTSensorType::SHT4X) {
-        LOG_WARN("%s doesn't support accuracy setting", sensorVariant);
-        return false;
-    }
-    LOG_INFO("%s: setting new accuracy setting", sensorVariant);
-    accuracy = newAccuracy;
-    return sht.setAccuracy(accuracy);
-}
-
-bool SHTXXSensor::getMetrics(meshtastic_Telemetry *measurement)
-{
-    if (sht.readSample()) {
-        measurement->variant.environment_metrics.has_temperature = true;
-        measurement->variant.environment_metrics.has_relative_humidity = true;
-        measurement->variant.environment_metrics.temperature = sht.getTemperature();
-        measurement->variant.environment_metrics.relative_humidity = sht.getHumidity();
-
-        LOG_INFO("%s (%s): Got: temp:%fdegC, hum:%f%%rh", sensorName, sensorVariant,
-                 measurement->variant.environment_metrics.temperature,
-                 measurement->variant.environment_metrics.relative_humidity);
-
-        return true;
-    } else {
-        LOG_ERROR("%s (%s): read sample failed", sensorName, sensorVariant);
-        return false;
-    }
-}
-
-AdminMessageHandleResult SHTXXSensor::handleAdminMessage(const meshtastic_MeshPacket &mp, meshtastic_AdminMessage *request,
-                                                         meshtastic_AdminMessage *response)
-{
-    AdminMessageHandleResult result;
-    result = AdminMessageHandleResult::NOT_HANDLED;
-
-    switch (request->which_payload_variant) {
-    case meshtastic_AdminMessage_sensor_config_tag:
-        if (!request->sensor_config.has_shtxx_config) {
-            result = AdminMessageHandleResult::NOT_HANDLED;
-            break;
-        }
-
-        // Check for sensor accuracy setting
-        if (request->sensor_config.shtxx_config.has_set_accuracy) {
-            SHTSensor::SHTAccuracy newAccuracy;
-            if (request->sensor_config.shtxx_config.set_accuracy == 0) {
-                newAccuracy = SHTSensor::SHT_ACCURACY_LOW;
-            } else if (request->sensor_config.shtxx_config.set_accuracy == 1) {
-                newAccuracy = SHTSensor::SHT_ACCURACY_MEDIUM;
-            } else if (request->sensor_config.shtxx_config.set_accuracy == 2) {
-                newAccuracy = SHTSensor::SHT_ACCURACY_HIGH;
-            } else {
-                LOG_ERROR("%s: incorrect accuracy setting", sensorName);
-                result = AdminMessageHandleResult::HANDLED;
-                break;
-            }
-            this->setAccuracy(newAccuracy);
-        }
-
-        result = AdminMessageHandleResult::HANDLED;
-        break;
-
-    default:
-        result = AdminMessageHandleResult::NOT_HANDLED;
-    }
-
-    return result;
-}
-
-#endif
@@ -1,29 +0,0 @@
-#include "configuration.h"
-
-#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<SHTSensor.h>)
-
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "TelemetrySensor.h"
-#include <SHTSensor.h>
-
-class SHTXXSensor : public TelemetrySensor
-{
-  private:
-    SHTSensor sht;
-    TwoWire *_bus{};
-    uint8_t _address{};
-    SHTSensor::SHTAccuracy accuracy{};
-    bool setAccuracy(SHTSensor::SHTAccuracy newAccuracy);
-
-  public:
-    SHTXXSensor();
-    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
-    virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
-    void getSensorVariant(SHTSensor::SHTSensorType);
-    const char *sensorVariant{};
-
-    AdminMessageHandleResult handleAdminMessage(const meshtastic_MeshPacket &mp, meshtastic_AdminMessage *request,
-                                                meshtastic_AdminMessage *response) override;
-};
-
-#endif
@@ -1,434 +0,0 @@
-#pragma once
-
-#include "MeshModule.h"
-#include "concurrency/Lock.h"
-#include "concurrency/OSThread.h"
-#include "mesh/generated/meshtastic/mesh.pb.h"
-#include "mesh/generated/meshtastic/telemetry.pb.h"
-
-#if HAS_TRAFFIC_MANAGEMENT
-
-/**
- * TrafficManagementModule - Packet inspection and traffic shaping for mesh networks.
- *
- * This module provides:
- * - Position deduplication (drop redundant position broadcasts)
- * - Per-node rate limiting (throttle chatty nodes)
- * - Unknown packet filtering (drop undecoded packets from repeat offenders)
- * - NodeInfo direct response (answer queries from cache to reduce mesh chatter)
- * - Local-only telemetry/position (exhaust hop_limit for local broadcasts)
- * - Router hop preservation (maintain hop_limit for router-to-router traffic)
- *
- * Memory Optimization:
- * Uses a unified cache with cuckoo hashing for O(1) lookups and 56% memory reduction
- * compared to separate per-feature caches. Timestamps are stored as 8-bit relative
- * offsets from a rolling epoch to further reduce memory footprint.
- */
-class TrafficManagementModule : public MeshModule, private concurrency::OSThread
-{
-  public:
-    TrafficManagementModule();
-    ~TrafficManagementModule();
-
-    // Singleton — no copying or moving
-    TrafficManagementModule(const TrafficManagementModule &) = delete;
-    TrafficManagementModule &operator=(const TrafficManagementModule &) = delete;
-
-    meshtastic_TrafficManagementStats getStats() const;
-    void resetStats();
-    void recordRouterHopPreserved();
-
-    /**
-     * Check if this packet should have its hops exhausted.
-     * Called from perhapsRebroadcast() to force hop_limit = 0 regardless of
-     * router_preserve_hops or favorite node logic.
-     */
-    bool shouldExhaustHops(const meshtastic_MeshPacket &mp) const
-    {
-        return exhaustRequested && exhaustRequestedFrom == getFrom(&mp) && exhaustRequestedId == mp.id;
-    }
-
-  protected:
-    ProcessMessage handleReceived(const meshtastic_MeshPacket &mp) override;
-    bool wantPacket(const meshtastic_MeshPacket *p) override { return true; }
-    void alterReceived(meshtastic_MeshPacket &mp) override;
-    int32_t runOnce() override;
-    // Protected so test shims can force epoch rollover behavior.
-    void resetEpoch(uint32_t nowMs);
-
-  private:
-    // =========================================================================
-    // Unified Cache Entry (10 bytes) - Same for ALL platforms
-    // =========================================================================
-    //
-    // A single compact structure used across ESP32, NRF52, and all other platforms.
-    // Memory: 10 bytes × 2048 entries = 20KB
-    //
-    // Position Fingerprinting:
-    //   Instead of storing full coordinates (8 bytes) or a computed hash,
-    //   we store an 8-bit fingerprint derived deterministically from the
-    //   truncated lat/lon. This extracts the lower 4 significant bits from
-    //   each coordinate: fingerprint = (lat_low4 << 4) | lon_low4
-    //
-    //   Benefits over hash:
-    //   - Adjacent grid cells have sequential fingerprints (no collision)
-    //   - Two positions only collide if 16+ grid cells apart in BOTH dimensions
-    //   - Deterministic: same input always produces same output
-    //
-    // Adaptive Timestamp Resolution:
-    //   All timestamps use 8-bit values with adaptive resolution calculated
-    //   from config at startup. Resolution = max(60, min(339, interval/2)).
-    //   - Min 60 seconds ensures reasonable precision
-    //   - Max 339 seconds allows ~24 hour range (255 * 339 = 86445 sec)
-    //   - interval/2 ensures at least 2 ticks per configured interval
-    //
-    // Layout:
-    //   [0-3]   node            - NodeNum (4 bytes)
-    //   [4]     pos_fingerprint - 4 bits lat + 4 bits lon (1 byte)
-    //   [5]     rate_count      - Packets in current window (1 byte)
-    //   [6]     unknown_count   - Unknown packets count (1 byte)
-    //   [7]     pos_time        - Position timestamp (1 byte, adaptive resolution)
-    //   [8]     rate_time       - Rate window start (1 byte, adaptive resolution)
-    //   [9]     unknown_time    - Unknown tracking start (1 byte, adaptive resolution)
-    //
-    struct __attribute__((packed)) UnifiedCacheEntry {
-        NodeNum node;            // 4 bytes - Node identifier (0 = empty slot)
-        uint8_t pos_fingerprint; // 1 byte  - Lower 4 bits of lat + lon
-        uint8_t rate_count;      // 1 byte  - Packet count (saturates at 255)
-        uint8_t unknown_count;   // 1 byte  - Unknown packet count (saturates at 255)
-        uint8_t pos_time;        // 1 byte  - Position timestamp (adaptive resolution)
-        uint8_t rate_time;       // 1 byte  - Rate window start (adaptive resolution)
-        uint8_t unknown_time;    // 1 byte  - Unknown tracking start (adaptive resolution)
-    };
-    static_assert(sizeof(UnifiedCacheEntry) == 10, "UnifiedCacheEntry should be 10 bytes");
-
-    // =========================================================================
-    // Cuckoo Hash Table Implementation
-    // =========================================================================
-    //
-    // Cuckoo hashing provides O(1) worst-case lookup time using two hash functions.
-    // Each key can be in one of two possible locations (h1 or h2). On collision,
-    // the existing entry is "kicked" to its alternate location.
-    //
-    // Benefits over linear scan:
-    // - O(1) lookup vs O(n) - critical at packet processing rates
-    // - O(1) insertion (amortized) with simple eviction on cycles
-    // - ~95% load factor achievable
-    //
-    // Cache size rounds to power-of-2 for fast modulo via bitmask.
-    // TRAFFIC_MANAGEMENT_CACHE_SIZE=2000 → cacheSize()=2048
-    //
-    static constexpr uint16_t cacheSize();
-    static constexpr uint16_t cacheMask();
-
-    // Hash functions for cuckoo hashing
-    inline uint16_t cuckooHash1(NodeNum node) const { return node & cacheMask(); }
-    inline uint16_t cuckooHash2(NodeNum node) const { return ((node * 2654435769u) >> (32 - cuckooHashBits())) & cacheMask(); }
-    static constexpr uint8_t cuckooHashBits();
-
-    // NodeInfo cache configuration (PSRAM path):
-    // - Payload lives in PSRAM
-    // - DRAM keeps packed 12-bit tags with 4-way bucketed cuckoo hashing
-    //   (Fan et al., CoNEXT 2014). Tag value 0 is reserved as "empty".
-    static constexpr uint16_t kNodeInfoIndexMetadataBudgetBytes = 3072; // 3KB DRAM tag store
-    static constexpr uint8_t kNodeInfoTargetOccupancyPercent = 95;
-    static constexpr uint8_t kNodeInfoBucketSize = 4;
-    static constexpr uint8_t kNodeInfoTagBits = 12;
-    static constexpr uint16_t kNodeInfoTagMask = static_cast<uint16_t>((1u << kNodeInfoTagBits) - 1u);
-    static constexpr uint16_t kNodeInfoIndexSlotsRaw =
-        static_cast<uint16_t>((kNodeInfoIndexMetadataBudgetBytes * 8u) / kNodeInfoTagBits);
-    static constexpr uint16_t kNodeInfoIndexSlots =
-        static_cast<uint16_t>(kNodeInfoIndexSlotsRaw - (kNodeInfoIndexSlotsRaw % kNodeInfoBucketSize));
-    static constexpr uint16_t kNodeInfoTargetEntries =
-        static_cast<uint16_t>((kNodeInfoIndexSlots * kNodeInfoTargetOccupancyPercent) / 100u);
-    static_assert((kNodeInfoIndexSlots % kNodeInfoBucketSize) == 0, "NodeInfo slot count must align to bucket size");
-    static_assert(kNodeInfoTargetEntries < (1u << kNodeInfoTagBits), "NodeInfo tag bits must encode payload index");
-
-    static constexpr uint16_t nodeInfoTargetEntries();
-    static constexpr uint16_t nodeInfoIndexMetadataBudgetBytes();
-    static constexpr uint8_t nodeInfoTargetOccupancyPercent();
-    static constexpr uint8_t nodeInfoBucketSize();
-    static constexpr uint8_t nodeInfoTagBits();
-    static constexpr uint16_t nodeInfoTagMask();
-    static constexpr uint16_t nodeInfoIndexSlots();
-    static constexpr uint16_t nodeInfoBucketCount();
-    static constexpr uint16_t nodeInfoBucketMask();
-    static constexpr uint8_t nodeInfoBucketHashBits();
-    inline uint16_t nodeInfoHash1(NodeNum node) const { return node & nodeInfoBucketMask(); }
-    inline uint16_t nodeInfoHash2(NodeNum node) const
-    {
-        return ((node * 2246822519u) >> (32 - nodeInfoBucketHashBits())) & nodeInfoBucketMask();
-    }
-
-    // =========================================================================
-    // Adaptive Timestamp Resolution
-    // =========================================================================
-    //
-    // All timestamps use 8-bit values with adaptive resolution calculated from
-    // config at startup. This allows ~24 hour range while maintaining precision.
-    //
-    // Resolution formula: max(60, min(339, interval/2))
-    //   - 60 sec minimum ensures reasonable precision
-    //   - 339 sec maximum allows 24 hour range (255 * 339 ≈ 86400 sec)
-    //   - interval/2 ensures at least 2 ticks per configured interval
-    //
-    // Since config changes require reboot, resolution is calculated once.
-    //
-    uint32_t cacheEpochMs = 0;
-    uint16_t posTimeResolution = 60;     // Seconds per tick for position
-    uint16_t rateTimeResolution = 60;    // Seconds per tick for rate limiting
-    uint16_t unknownTimeResolution = 60; // Seconds per tick for unknown tracking
-
-    // Calculate resolution from configured interval (called once at startup)
-    static uint16_t calcTimeResolution(uint32_t intervalSecs)
-    {
-        // Resolution = interval/2 to ensure at least 2 ticks per interval
-        // Clamped to [60, 339] for min precision and max 24h range
-        uint32_t res = (intervalSecs > 0) ? (intervalSecs / 2) : 60;
-        if (res < 60)
-            res = 60;
-        if (res > 339)
-            res = 339;
-        return static_cast<uint16_t>(res);
-    }
-
-    // Convert to/from 8-bit relative timestamps with given resolution
-    uint8_t toRelativeTime(uint32_t nowMs, uint16_t resolutionSecs) const
-    {
-        uint32_t ticks = (nowMs - cacheEpochMs) / (resolutionSecs * 1000UL);
-        return (ticks > UINT8_MAX) ? UINT8_MAX : static_cast<uint8_t>(ticks);
-    }
-    uint32_t fromRelativeTime(uint8_t ticks, uint16_t resolutionSecs) const
-    {
-        return cacheEpochMs + (static_cast<uint32_t>(ticks) * resolutionSecs * 1000UL);
-    }
-
-    // Convenience wrappers for each timestamp type
-    uint8_t toRelativePosTime(uint32_t nowMs) const { return toRelativeTime(nowMs, posTimeResolution); }
-    uint32_t fromRelativePosTime(uint8_t t) const { return fromRelativeTime(t, posTimeResolution); }
-
-    uint8_t toRelativeRateTime(uint32_t nowMs) const { return toRelativeTime(nowMs, rateTimeResolution); }
-    uint32_t fromRelativeRateTime(uint8_t t) const { return fromRelativeTime(t, rateTimeResolution); }
-
-    uint8_t toRelativeUnknownTime(uint32_t nowMs) const { return toRelativeTime(nowMs, unknownTimeResolution); }
-    uint32_t fromRelativeUnknownTime(uint8_t t) const { return fromRelativeTime(t, unknownTimeResolution); }
-
-    // Epoch reset when any timestamp approaches overflow
-    // With max resolution of 339 sec, 200 ticks = ~19 hours (safe margin for 24h max)
-    bool needsEpochReset(uint32_t nowMs) const
-    {
-        uint16_t maxRes = posTimeResolution;
-        if (rateTimeResolution > maxRes)
-            maxRes = rateTimeResolution;
-        if (unknownTimeResolution > maxRes)
-            maxRes = unknownTimeResolution;
-        return (nowMs - cacheEpochMs) > (200UL * maxRes * 1000UL);
-    }
-    // =========================================================================
-    // Position Fingerprint
-    // =========================================================================
-    //
-    // Computes 8-bit fingerprint from truncated lat/lon coordinates.
-    // Extracts lower 4 significant bits from each coordinate.
-    //
-    // fingerprint = (lat_low4 << 4) | lon_low4
-    //
-    // Unlike a hash, adjacent grid cells have sequential fingerprints,
-    // so nearby positions never collide. Collisions only occur for
-    // positions 16+ grid cells apart in both dimensions.
-    //
-    // Guards: If precision < 4 bits, uses min(precision, 4) bits.
-    //
-    static uint8_t computePositionFingerprint(int32_t lat_truncated, int32_t lon_truncated, uint8_t precision);
-
-    // =========================================================================
-    // Cache Storage
-    // =========================================================================
-
-    mutable concurrency::Lock cacheLock; // Protects all cache access
-    UnifiedCacheEntry *cache = nullptr;  // Cuckoo hash table (unified for all platforms)
-    bool cacheFromPsram = false;         // Tracks allocator for correct deallocation
-
-    struct NodeInfoPayloadEntry {
-        // Node identifier associated with this payload slot.
-        // 0 means the slot is currently unused.
-        NodeNum node;
-
-        // Cached NODEINFO_APP payload body. This is separate from NodeDB and is only
-        // used by the PSRAM-backed direct-response path in this module.
-        meshtastic_User user;
-
-        // Extra response metadata captured from the latest observed NODEINFO_APP
-        // packet for this node. shouldRespondToNodeInfo() uses this metadata when
-        // building spoofed replies for requesting clients.
-
-        // Last local uptime tick (millis) when this entry was refreshed.
-        uint32_t lastObservedMs;
-
-        // Last RTC/packet timestamp (seconds) observed for this NodeInfo frame.
-        // If unavailable in packet, remains 0.
-        uint32_t lastObservedRxTime;
-
-        // Channel where we most recently heard this node's NodeInfo.
-        uint8_t sourceChannel;
-
-        // Cached decoded bitfield metadata from the source packet.
-        // We preserve non-OK_TO_MQTT bits in direct replies when available.
-        bool hasDecodedBitfield;
-        uint8_t decodedBitfield;
-    };
-
-    NodeInfoPayloadEntry *nodeInfoPayload = nullptr; // NodeInfo payloads in PSRAM
-    bool nodeInfoPayloadFromPsram = false;           // Tracks allocator for correct deallocation
-    uint8_t *nodeInfoIndex = nullptr;                // Packed 12-bit NodeInfo tags in DRAM
-    uint16_t nodeInfoAllocHint = 0;
-    uint16_t nodeInfoEvictCursor = 0;
-
-    meshtastic_TrafficManagementStats stats;
-
-    // Flag set during alterReceived() when packet should be exhausted.
-    // Checked by perhapsRebroadcast() to force hop_limit = 0 only for the
-    // matching packet key (from + id). Reset at start of handleReceived().
-    bool exhaustRequested = false;
-    NodeNum exhaustRequestedFrom = 0;
-    PacketId exhaustRequestedId = 0;
-
-    // =========================================================================
-    // Cache Operations
-    // =========================================================================
-
-    // Find or create entry for node using cuckoo hashing
-    // Returns nullptr if cache is full and eviction fails
-    UnifiedCacheEntry *findOrCreateEntry(NodeNum node, bool *isNew);
-
-    // Find existing entry (no creation)
-    UnifiedCacheEntry *findEntry(NodeNum node);
-
-    // NodeInfo cache operations (bucketed cuckoo index + PSRAM payloads)
-    const NodeInfoPayloadEntry *findNodeInfoEntry(NodeNum node) const;
-    NodeInfoPayloadEntry *findOrCreateNodeInfoEntry(NodeNum node, bool *usedEmptySlot);
-    uint16_t findNodeInfoPayloadIndex(NodeNum node) const;
-    bool removeNodeInfoIndexEntry(NodeNum node, uint16_t payloadIndex);
-    uint16_t allocateNodeInfoPayloadSlot();
-    uint16_t evictNodeInfoPayloadSlot();
-    bool tryInsertNodeInfoEntryInBucket(uint16_t bucket, uint16_t tag);
-    uint16_t encodeNodeInfoTag(uint16_t payloadIndex) const;
-    uint16_t decodeNodeInfoPayloadIndex(uint16_t tag) const;
-    uint16_t getNodeInfoTag(uint16_t slot) const;
-    void setNodeInfoTag(uint16_t slot, uint16_t tag);
-    uint16_t countNodeInfoEntriesLocked() const;
-    void cacheNodeInfoPacket(const meshtastic_MeshPacket &mp);
-
-    // =========================================================================
-    // Traffic Management Logic
-    // =========================================================================
-
-    bool shouldDropPosition(const meshtastic_MeshPacket *p, const meshtastic_Position *pos, uint32_t nowMs);
-    bool shouldRespondToNodeInfo(const meshtastic_MeshPacket *p, bool sendResponse);
-    bool isMinHopsFromRequestor(const meshtastic_MeshPacket *p) const;
-    bool isRateLimited(NodeNum from, uint32_t nowMs);
-    bool shouldDropUnknown(const meshtastic_MeshPacket *p, uint32_t nowMs);
-
-    void logAction(const char *action, const meshtastic_MeshPacket *p, const char *reason) const;
-    void incrementStat(uint32_t *field);
-};
-
-// =========================================================================
-// Compile-time Cache Size Calculations
-// =========================================================================
-//
-// Round TRAFFIC_MANAGEMENT_CACHE_SIZE up to next power of 2 for efficient
-// cuckoo hash indexing (allows bitmask instead of modulo).
-//
-// These use C++11-compatible constexpr (single return statement).
-//
-
-namespace detail
-{
-// Helper: round up to next power of 2 using bit manipulation
-constexpr uint16_t nextPow2(uint16_t n)
-{
-    return n == 0 ? 0 : (((n - 1) | ((n - 1) >> 1) | ((n - 1) >> 2) | ((n - 1) >> 4) | ((n - 1) >> 8)) + 1);
-}
-
-// Helper: floor(log2(n)) for n >= 0, C++11-compatible constexpr.
-constexpr uint8_t log2Floor(uint16_t n)
-{
-    return n <= 1 ? 0 : static_cast<uint8_t>(1 + log2Floor(static_cast<uint16_t>(n >> 1)));
-}
-
-// Helper: ceil(log2(n)) for n >= 1, C++11-compatible constexpr.
-constexpr uint8_t log2Ceil(uint16_t n)
-{
-    return n <= 1 ? 0 : static_cast<uint8_t>(1 + log2Floor(static_cast<uint16_t>(n - 1)));
-}
-} // namespace detail
-
-constexpr uint16_t TrafficManagementModule::cacheSize()
-{
-    return detail::nextPow2(TRAFFIC_MANAGEMENT_CACHE_SIZE);
-}
-
-constexpr uint16_t TrafficManagementModule::cacheMask()
-{
-    return cacheSize() > 0 ? cacheSize() - 1 : 0;
-}
-
-constexpr uint8_t TrafficManagementModule::cuckooHashBits()
-{
-    return detail::log2Floor(cacheSize());
-}
-
-constexpr uint16_t TrafficManagementModule::nodeInfoTargetEntries()
-{
-    return kNodeInfoTargetEntries;
-}
-
-constexpr uint16_t TrafficManagementModule::nodeInfoIndexMetadataBudgetBytes()
-{
-    return kNodeInfoIndexMetadataBudgetBytes;
-}
-
-constexpr uint8_t TrafficManagementModule::nodeInfoTargetOccupancyPercent()
-{
-    return kNodeInfoTargetOccupancyPercent;
-}
-
-constexpr uint8_t TrafficManagementModule::nodeInfoBucketSize()
-{
-    return kNodeInfoBucketSize;
-}
-
-constexpr uint8_t TrafficManagementModule::nodeInfoTagBits()
-{
-    return kNodeInfoTagBits;
-}
-
-constexpr uint16_t TrafficManagementModule::nodeInfoTagMask()
-{
-    return kNodeInfoTagMask;
-}
-
-constexpr uint16_t TrafficManagementModule::nodeInfoIndexSlots()
-{
-    return kNodeInfoIndexSlots;
-}
-
-constexpr uint16_t TrafficManagementModule::nodeInfoBucketCount()
-{
-    return static_cast<uint16_t>(nodeInfoIndexSlots() / nodeInfoBucketSize());
-}
-
-constexpr uint16_t TrafficManagementModule::nodeInfoBucketMask()
-{
-    return nodeInfoBucketCount() > 0 ? nodeInfoBucketCount() - 1 : 0;
-}
-
-constexpr uint8_t TrafficManagementModule::nodeInfoBucketHashBits()
-{
-    return detail::log2Floor(nodeInfoBucketCount());
-}
-
-extern TrafficManagementModule *trafficManagementModule;
-
-#endif
@@ -100,7 +100,7 @@ AudioModule::AudioModule() : SinglePortModule("Audio", meshtastic_PortNum_AUDIO_
    // moduleConfig.audio.i2s_sck = 14;
    // moduleConfig.audio.ptt_pin = 39;

-    if ((moduleConfig.audio.codec2_enabled) && (myRegion->profile->audioPermitted)) {
+    if ((moduleConfig.audio.codec2_enabled) && (myRegion->audioPermitted)) {
        LOG_INFO("Set up codec2 in mode %u", (moduleConfig.audio.bitrate ? moduleConfig.audio.bitrate : AUDIO_MODULE_MODE) - 1);
        codec2 = codec2_create((moduleConfig.audio.bitrate ? moduleConfig.audio.bitrate : AUDIO_MODULE_MODE) - 1);
        memcpy(tx_header.magic, c2_magic, sizeof(c2_magic));
@@ -143,7 +143,7 @@ void AudioModule::drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int

 int32_t AudioModule::runOnce()
 {
-    if ((moduleConfig.audio.codec2_enabled) && (myRegion->profile->audioPermitted)) {
+    if ((moduleConfig.audio.codec2_enabled) && (myRegion->audioPermitted)) {
        esp_err_t res;
        if (firstTime) {
            // Set up I2S Processor configuration. This will produce 16bit samples at 8 kHz instead of 12 from the ADC
@@ -270,7 +270,7 @@ void AudioModule::sendPayload(NodeNum dest, bool wantReplies)

 ProcessMessage AudioModule::handleReceived(const meshtastic_MeshPacket &mp)
 {
-    if ((moduleConfig.audio.codec2_enabled) && (myRegion->profile->audioPermitted)) {
+    if ((moduleConfig.audio.codec2_enabled) && (myRegion->audioPermitted)) {
        auto &p = mp.decoded;
        if (!isFromUs(&mp)) {
            memcpy(rx_encode_frame, p.payload.bytes, p.payload.size);
@@ -322,8 +322,8 @@ bool connectPubSub(const PubSubConfig &config, PubSubClient &pubSub, Client &cli
    pubSub.setClient(client);
    pubSub.setServer(config.serverAddr.c_str(), config.serverPort);

-    LOG_INFO("Connecting directly to MQTT server %s, port: %d, username: %s, password: ***", config.serverAddr.c_str(),
-             config.serverPort, config.mqttUsername);
+    LOG_INFO("Connecting directly to MQTT server %s, port: %d, username: %s, password: %s", config.serverAddr.c_str(),
+             config.serverPort, config.mqttUsername, config.mqttPassword);

    // Generate node ID from nodenum for client identification
    std::string nodeId = nodeDB->getNodeId();
@@ -1,11 +0,0 @@
-.globl HardFault_Handler
-.syntax unified
-.thumb
-
-.type HardFault_Handler, %function
-HardFault_Handler:
-tst lr, #4
-ite eq
-mrseq r0, msp
-mrsne r0, psp
-b HardFault_Handler_C
@@ -1,6 +1,5 @@
 #include "RTC.h"
 #include "configuration.h"
-#include <stdarg.h>
 #include <stm32wle5xx.h>
 #include <stm32wlxx_hal.h>

@@ -54,99 +53,4 @@ extern "C" void __wrap__tzset_unlocked_r(struct _reent *reent_ptr)
 {
    return;
 }
-#endif
-
-// Taken from https://interrupt.memfault.com/blog/cortex-m-hardfault-debug
-typedef struct __attribute__((packed)) ContextStateFrame {
-    uint32_t r0;
-    uint32_t r1;
-    uint32_t r2;
-    uint32_t r3;
-    uint32_t r12;
-    uint32_t lr;
-    uint32_t return_address;
-    uint32_t xpsr;
-} sContextStateFrame;
-
-// NOTE: If you are using CMSIS, the registers can also be
-// accessed through CoreDebug->DHCSR & CoreDebug_DHCSR_C_DEBUGEN_Msk
-#define HALT_IF_DEBUGGING()                                                                                                      \
-    do {                                                                                                                         \
-        if ((*(volatile uint32_t *)0xE000EDF0) & (1 << 0)) {                                                                     \
-            __asm("bkpt 1");                                                                                                     \
-        }                                                                                                                        \
-    } while (0)
-
-static char hardfault_message_buffer[256];
-
-// printf directly using srcwrapper's debug UART function.
-static void debug_printf(const char *format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    int length = vsnprintf(hardfault_message_buffer, sizeof(hardfault_message_buffer), format, args);
-    va_end(args);
-
-    if (length < 0)
-        return;
-    uart_debug_write((uint8_t *)hardfault_message_buffer, min((unsigned int)length, sizeof(hardfault_message_buffer) - 1));
-}
-
-// N picked by guessing
-#define DOT_TIME 1200000
-static void dot()
-{
-    digitalWrite(LED_POWER, LED_STATE_ON);
-    for (volatile int i = 0; i < DOT_TIME; i++) { /* busy wait */
-    }
-    digitalWrite(LED_POWER, LED_STATE_OFF);
-    for (volatile int i = 0; i < DOT_TIME; i++) { /* busy wait */
-    }
-}
-
-static void dash()
-{
-    digitalWrite(LED_POWER, LED_STATE_ON);
-    for (volatile int i = 0; i < (DOT_TIME * 3); i++) { /* busy wait */
-    }
-    digitalWrite(LED_POWER, LED_STATE_OFF);
-    for (volatile int i = 0; i < DOT_TIME; i++) { /* busy wait */
-    }
-}
-
-static void space()
-{
-    for (volatile int i = 0; i < (DOT_TIME * 3); i++) { /* busy wait */
-    }
-}
-
-// Disable optimizations for this function so "frame" argument
-// does not get optimized away
-extern "C" __attribute__((optimize("O0"))) void HardFault_Handler_C(sContextStateFrame *frame)
-{
-    debug_printf("HardFault!\r\n");
-    debug_printf("r0: %08x\r\n", frame->r0);
-    debug_printf("r1: %08x\r\n", frame->r1);
-    debug_printf("r2: %08x\r\n", frame->r2);
-    debug_printf("r3: %08x\r\n", frame->r3);
-    debug_printf("r12: %08x\r\n", frame->r12);
-    debug_printf("lr: %08x\r\n", frame->lr);
-    debug_printf("pc[return address]: %08x\r\n", frame->return_address);
-    debug_printf("xpsr: %08x\r\n", frame->xpsr);
-
-    HALT_IF_DEBUGGING();
-
-    // blink SOS forever
-    while (1) {
-        dot();
-        dot();
-        dot();
-        dash();
-        dash();
-        dash();
-        dot();
-        dot();
-        dot();
-        space();
-    }
-}
+#endif
@@ -1,814 +0,0 @@
-/**
- * Tests for the radio configuration validation and clamping functions
- * introduced in the radio_interface_cherrypick branch.
- *
- * Targets:
- *  1. getRegion()
- *  2. RadioInterface::validateConfigRegion()
- *  3. RadioInterface::validateConfigLora()
- *  4. RadioInterface::clampConfigLora()
- *  5. RegionInfo preset lists (PRESETS_STD, PRESETS_EU_868, PRESETS_UNDEF)
- *  6. Channel spacing calculation (placeholder for future protobuf changes)
- */
-
-#include "MeshRadio.h"
-#include "MeshService.h"
-#include "NodeDB.h"
-#include "RadioInterface.h"
-#include "TestUtil.h"
-#include "modules/AdminModule.h"
-#include <unity.h>
-
-#include "meshtastic/config.pb.h"
-
-class MockMeshService : public MeshService
-{
-  public:
-    void sendClientNotification(meshtastic_ClientNotification *n) override { releaseClientNotificationToPool(n); }
-};
-
-static MockMeshService *mockMeshService;
-
-// -----------------------------------------------------------------------
-// getRegion() tests
-// -----------------------------------------------------------------------
-extern const RegionInfo *getRegion(meshtastic_Config_LoRaConfig_RegionCode code);
-
-static void test_getRegion_returnsCorrectRegion_US()
-{
-    const RegionInfo *r = getRegion(meshtastic_Config_LoRaConfig_RegionCode_US);
-    TEST_ASSERT_NOT_NULL(r);
-    TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_RegionCode_US, r->code);
-    TEST_ASSERT_EQUAL_STRING("US", r->name);
-}
-
-static void test_getRegion_returnsCorrectRegion_EU868()
-{
-    const RegionInfo *r = getRegion(meshtastic_Config_LoRaConfig_RegionCode_EU_868);
-    TEST_ASSERT_NOT_NULL(r);
-    TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_RegionCode_EU_868, r->code);
-    TEST_ASSERT_EQUAL_STRING("EU_868", r->name);
-}
-
-static void test_getRegion_returnsCorrectRegion_LORA24()
-{
-    const RegionInfo *r = getRegion(meshtastic_Config_LoRaConfig_RegionCode_LORA_24);
-    TEST_ASSERT_NOT_NULL(r);
-    TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_RegionCode_LORA_24, r->code);
-    TEST_ASSERT_TRUE(r->wideLora);
-}
-
-static void test_getRegion_unsetCodeReturnsUnsetEntry()
-{
-    const RegionInfo *r = getRegion(meshtastic_Config_LoRaConfig_RegionCode_UNSET);
-    TEST_ASSERT_NOT_NULL(r);
-    TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_RegionCode_UNSET, r->code);
-    TEST_ASSERT_EQUAL_STRING("UNSET", r->name);
-}
-
-static void test_getRegion_unknownCodeFallsToUnset()
-{
-    // A code not in the table should iterate to the UNSET sentinel
-    const RegionInfo *r = getRegion((meshtastic_Config_LoRaConfig_RegionCode)255);
-    TEST_ASSERT_NOT_NULL(r);
-    TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_RegionCode_UNSET, r->code);
-}
-
-// -----------------------------------------------------------------------
-// validateConfigRegion() tests
-// -----------------------------------------------------------------------
-
-static void test_validateConfigRegion_validRegionReturnsTrue()
-{
-    meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
-    cfg.region = meshtastic_Config_LoRaConfig_RegionCode_US;
-
-    // Ensure owner is not licensed (should not matter for non-licensed-only regions)
-    devicestate.owner.is_licensed = false;
-
-    TEST_ASSERT_TRUE(RadioInterface::validateConfigRegion(cfg));
-}
-
-static void test_validateConfigRegion_unsetRegionReturnsTrue()
-{
-    meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
-    cfg.region = meshtastic_Config_LoRaConfig_RegionCode_UNSET;
-
-    devicestate.owner.is_licensed = false;
-
-    // UNSET region has licensedOnly=false, so should pass
-    TEST_ASSERT_TRUE(RadioInterface::validateConfigRegion(cfg));
-}
-
-// -----------------------------------------------------------------------
-// Shadow tables for testing (preset lists → profiles → regions → lookup)
-// -----------------------------------------------------------------------
-
-// A minimal preset list with only one entry
-static const meshtastic_Config_LoRaConfig_ModemPreset TEST_PRESETS_SINGLE[] = {
-    meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST,
-    MODEM_PRESET_END,
-};
-
-// A preset list that includes all turbo variants only
-static const meshtastic_Config_LoRaConfig_ModemPreset TEST_PRESETS_TURBO_ONLY[] = {
-    meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO,
-    meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO,
-    MODEM_PRESET_END,
-};
-
-// A restricted list simulating a hypothetical tight-regulation region
-static const meshtastic_Config_LoRaConfig_ModemPreset TEST_PRESETS_RESTRICTED[] = {
-    meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW,
-    meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE,
-    MODEM_PRESET_END,
-};
-
-// Mirrors PROFILE_STD but with non-zero spacing/padding for testing
-static const RegionProfile TEST_PROFILE_SPACED = {
-    TEST_PRESETS_SINGLE,
-    /* spacing */ 0.025f,
-    /* padding */ 0.010f,
-    /* audioPermitted */ true,
-    /* licensedOnly */ false,
-    /* textThrottle */ 0,
-    /* positionThrottle */ 0,
-    /* telemetryThrottle */ 0,
-    /* overrideSlot */ 0,
-};
-
-// A licensed-only profile for testing access control
-static const RegionProfile TEST_PROFILE_LICENSED = {
-    TEST_PRESETS_RESTRICTED,
-    /* spacing */ 0.0f,
-    /* padding */ 0.0f,
-    /* audioPermitted */ false,
-    /* licensedOnly */ true,
-    /* textThrottle */ 5,
-    /* positionThrottle */ 10,
-    /* telemetryThrottle */ 10,
-    /* overrideSlot */ 3,
-};
-
-// Turbo-only profile
-static const RegionProfile TEST_PROFILE_TURBO = {
-    TEST_PRESETS_TURBO_ONLY,
-    /* spacing */ 0.0f,
-    /* padding */ 0.0f,
-    /* audioPermitted */ true,
-    /* licensedOnly */ false,
-    /* textThrottle */ 0,
-    /* positionThrottle */ 0,
-    /* telemetryThrottle */ 0,
-    /* overrideSlot */ 0,
-};
-
-static const RegionInfo testRegions[] = {
-    // A wide US-like region with spacing + padding
-    {meshtastic_Config_LoRaConfig_RegionCode_US, 902.0f, 928.0f, 100, 30, false, false, &TEST_PROFILE_SPACED, "TEST_US_SPACED"},
-
-    // A narrow band simulating tight EU regulation
-    {meshtastic_Config_LoRaConfig_RegionCode_EU_868, 869.4f, 869.65f, 10, 14, false, false, &TEST_PROFILE_LICENSED,
-     "TEST_EU_LICENSED"},
-
-    // A wide-LoRa region with turbo-only presets
-    {meshtastic_Config_LoRaConfig_RegionCode_LORA_24, 2400.0f, 2483.5f, 100, 10, false, true, &TEST_PROFILE_TURBO,
-     "TEST_LORA24_TURBO"},
-
-    // Sentinel — must be last
-    {meshtastic_Config_LoRaConfig_RegionCode_UNSET, 902.0f, 928.0f, 100, 30, false, false, &TEST_PROFILE_SPACED, "TEST_UNSET"},
-};
-
-static const RegionInfo *getTestRegion(meshtastic_Config_LoRaConfig_RegionCode code)
-{
-    const RegionInfo *r = testRegions;
-    while (r->code != meshtastic_Config_LoRaConfig_RegionCode_UNSET) {
-        if (r->code == code)
-            return r;
-        r++;
-    }
-    return r; // Returns the UNSET sentinel
-}
-
-// -----------------------------------------------------------------------
-// Shadow table tests
-// -----------------------------------------------------------------------
-
-static void test_shadowTable_spacedProfileHasNonZeroSpacing()
-{
-    const RegionInfo *r = getTestRegion(meshtastic_Config_LoRaConfig_RegionCode_US);
-    TEST_ASSERT_EQUAL_STRING("TEST_US_SPACED", r->name);
-    TEST_ASSERT_FLOAT_WITHIN(0.001f, 0.025f, r->profile->spacing);
-    TEST_ASSERT_FLOAT_WITHIN(0.001f, 0.010f, r->profile->padding);
-}
-
-static void test_shadowTable_licensedProfileFlagsCorrect()
-{
-    const RegionInfo *r = getTestRegion(meshtastic_Config_LoRaConfig_RegionCode_EU_868);
-    TEST_ASSERT_TRUE(r->profile->licensedOnly);
-    TEST_ASSERT_FALSE(r->profile->audioPermitted);
-    TEST_ASSERT_EQUAL(3, r->profile->overrideSlot);
-}
-
-static void test_shadowTable_presetCountMatchesExpected()
-{
-    const RegionInfo *spaced = getTestRegion(meshtastic_Config_LoRaConfig_RegionCode_US);
-    TEST_ASSERT_EQUAL(1, spaced->getNumPresets());
-
-    const RegionInfo *licensed = getTestRegion(meshtastic_Config_LoRaConfig_RegionCode_EU_868);
-    TEST_ASSERT_EQUAL(2, licensed->getNumPresets());
-
-    const RegionInfo *turbo = getTestRegion(meshtastic_Config_LoRaConfig_RegionCode_LORA_24);
-    TEST_ASSERT_EQUAL(2, turbo->getNumPresets());
-}
-
-static void test_shadowTable_defaultPresetIsFirstInList()
-{
-    const RegionInfo *spaced = getTestRegion(meshtastic_Config_LoRaConfig_RegionCode_US);
-    TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST, spaced->getDefaultPreset());
-
-    const RegionInfo *licensed = getTestRegion(meshtastic_Config_LoRaConfig_RegionCode_EU_868);
-    TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW, licensed->getDefaultPreset());
-
-    const RegionInfo *turbo = getTestRegion(meshtastic_Config_LoRaConfig_RegionCode_LORA_24);
-    TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO, turbo->getDefaultPreset());
-}
-
-static void test_shadowTable_channelSpacingWithPadding()
-{
-    // Verify channel count when spacing + padding are non-zero
-    const RegionInfo *r = getTestRegion(meshtastic_Config_LoRaConfig_RegionCode_US);
-    float bw = modemPresetToBwKHz(r->getDefaultPreset(), r->wideLora);
-    float channelSpacing = r->profile->spacing + (r->profile->padding * 2) + (bw / 1000.0f);
-
-    // spacing=0.025, padding=0.010*2=0.020, bw=250kHz=0.250
-    // channelSpacing = 0.025 + 0.020 + 0.250 = 0.295 MHz
-    TEST_ASSERT_FLOAT_WITHIN(0.001f, 0.295f, channelSpacing);
-
-    uint32_t numChannels = (uint32_t)(((r->freqEnd - r->freqStart + r->profile->spacing) / channelSpacing) + 0.5f);
-    // (928 - 902 + 0.025) / 0.295 = 88.2 → 88
-    TEST_ASSERT_EQUAL_UINT32(88, numChannels);
-}
-
-static void test_shadowTable_turboOnlyOnWideLora()
-{
-    const RegionInfo *r = getTestRegion(meshtastic_Config_LoRaConfig_RegionCode_LORA_24);
-    TEST_ASSERT_TRUE(r->wideLora);
-    TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO, r->getDefaultPreset());
-
-    // Verify wide-LoRa bandwidth for SHORT_TURBO
-    float bw = modemPresetToBwKHz(r->getDefaultPreset(), r->wideLora);
-    TEST_ASSERT_FLOAT_WITHIN(0.1f, 1625.0f, bw); // 1625 kHz in wide mode
-}
-
-static void test_shadowTable_unknownCodeFallsToSentinel()
-{
-    const RegionInfo *r = getTestRegion((meshtastic_Config_LoRaConfig_RegionCode)200);
-    TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_RegionCode_UNSET, r->code);
-    TEST_ASSERT_EQUAL_STRING("TEST_UNSET", r->name);
-}
-
-// -----------------------------------------------------------------------
-// validateConfigLora() tests
-// -----------------------------------------------------------------------
-
-static void test_validateConfigLora_validPresetForUS()
-{
-    meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
-    cfg.region = meshtastic_Config_LoRaConfig_RegionCode_US;
-    cfg.use_preset = true;
-    cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
-
-    TEST_ASSERT_TRUE(RadioInterface::validateConfigLora(cfg));
-}
-
-static void test_validateConfigLora_allStdPresetsValidForUS()
-{
-    meshtastic_Config_LoRaConfig_ModemPreset stdPresets[] = {
-        meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST,     meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW,
-        meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW,   meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST,
-        meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW,    meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST,
-        meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE, meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO,
-        meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO,
-    };
-
-    for (size_t i = 0; i < sizeof(stdPresets) / sizeof(stdPresets[0]); i++) {
-        meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
-        cfg.region = meshtastic_Config_LoRaConfig_RegionCode_US;
-        cfg.use_preset = true;
-        cfg.modem_preset = stdPresets[i];
-        TEST_ASSERT_TRUE_MESSAGE(RadioInterface::validateConfigLora(cfg), "Expected valid preset for US");
-    }
-}
-
-static void test_validateConfigLora_turboPresetsInvalidForEU868()
-{
-    // EU_868 has PRESETS_EU_868 which excludes SHORT_TURBO and LONG_TURBO
-    meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
-    cfg.region = meshtastic_Config_LoRaConfig_RegionCode_EU_868;
-    cfg.use_preset = true;
-
-    cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO;
-    TEST_ASSERT_FALSE_MESSAGE(RadioInterface::validateConfigLora(cfg), "SHORT_TURBO should be invalid for EU_868");
-
-    cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO;
-    TEST_ASSERT_FALSE_MESSAGE(RadioInterface::validateConfigLora(cfg), "LONG_TURBO should be invalid for EU_868");
-}
-
-static void test_validateConfigLora_validPresetsForEU868()
-{
-    meshtastic_Config_LoRaConfig_ModemPreset eu868Presets[] = {
-        meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST,     meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW,
-        meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW,   meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST,
-        meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW,    meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST,
-        meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE,
-    };
-
-    for (size_t i = 0; i < sizeof(eu868Presets) / sizeof(eu868Presets[0]); i++) {
-        meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
-        cfg.region = meshtastic_Config_LoRaConfig_RegionCode_EU_868;
-        cfg.use_preset = true;
-        cfg.modem_preset = eu868Presets[i];
-        TEST_ASSERT_TRUE_MESSAGE(RadioInterface::validateConfigLora(cfg), "Expected valid preset for EU_868");
-    }
-}
-
-static void test_validateConfigLora_customBandwidthTooWideForEU868()
-{
-    // EU_868 spans 869.4 - 869.65 = 0.25 MHz = 250 kHz
-    // A 500 kHz custom BW should be rejected
-    meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
-    cfg.region = meshtastic_Config_LoRaConfig_RegionCode_EU_868;
-    cfg.use_preset = false;
-    cfg.bandwidth = 500;
-    cfg.spread_factor = 11;
-    cfg.coding_rate = 5;
-
-    TEST_ASSERT_FALSE(RadioInterface::validateConfigLora(cfg));
-}
-
-static void test_validateConfigLora_customBandwidthFitsUS()
-{
-    // US spans 902 - 928 = 26 MHz, so 250 kHz BW fits easily
-    meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
-    cfg.region = meshtastic_Config_LoRaConfig_RegionCode_US;
-    cfg.use_preset = false;
-    cfg.bandwidth = 250;
-    cfg.spread_factor = 11;
-    cfg.coding_rate = 5;
-
-    TEST_ASSERT_TRUE(RadioInterface::validateConfigLora(cfg));
-}
-
-static void test_validateConfigLora_customBandwidthFitsEU868()
-{
-    // EU_868 spans 250 kHz, 125 kHz BW should fit
-    meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
-    cfg.region = meshtastic_Config_LoRaConfig_RegionCode_EU_868;
-    cfg.use_preset = false;
-    cfg.bandwidth = 125;
-    cfg.spread_factor = 12;
-    cfg.coding_rate = 8;
-
-    TEST_ASSERT_TRUE(RadioInterface::validateConfigLora(cfg));
-}
-
-static void test_validateConfigLora_bogusPresetRejected()
-{
-    // A fabricated preset value not in any list should be rejected
-    meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
-    cfg.region = meshtastic_Config_LoRaConfig_RegionCode_US;
-    cfg.use_preset = true;
-    cfg.modem_preset = (meshtastic_Config_LoRaConfig_ModemPreset)99;
-
-    TEST_ASSERT_FALSE(RadioInterface::validateConfigLora(cfg));
-}
-
-static void test_validateConfigLora_unsetRegionOnlyAcceptsLongFast()
-{
-    // UNSET uses PROFILE_UNDEF which has only LONG_FAST
-    meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
-    cfg.region = meshtastic_Config_LoRaConfig_RegionCode_UNSET;
-    cfg.use_preset = true;
-
-    cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
-    TEST_ASSERT_TRUE_MESSAGE(RadioInterface::validateConfigLora(cfg), "LONG_FAST should be valid for UNSET");
-
-    cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST;
-    TEST_ASSERT_FALSE_MESSAGE(RadioInterface::validateConfigLora(cfg), "MEDIUM_FAST should be invalid for UNSET");
-
-    cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO;
-    TEST_ASSERT_FALSE_MESSAGE(RadioInterface::validateConfigLora(cfg), "SHORT_TURBO should be invalid for UNSET");
-}
-
-static void test_validateConfigLora_allPresetsValidForLORA24()
-{
-    // LORA_24 uses PROFILE_STD (9 presets) with wideLora=true
-    meshtastic_Config_LoRaConfig_ModemPreset stdPresets[] = {
-        meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST,     meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW,
-        meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_SLOW,   meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST,
-        meshtastic_Config_LoRaConfig_ModemPreset_SHORT_SLOW,    meshtastic_Config_LoRaConfig_ModemPreset_SHORT_FAST,
-        meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE, meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO,
-        meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO,
-    };
-
-    for (size_t i = 0; i < sizeof(stdPresets) / sizeof(stdPresets[0]); i++) {
-        meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
-        cfg.region = meshtastic_Config_LoRaConfig_RegionCode_LORA_24;
-        cfg.use_preset = true;
-        cfg.modem_preset = stdPresets[i];
-        TEST_ASSERT_TRUE_MESSAGE(RadioInterface::validateConfigLora(cfg), "Expected valid preset for LORA_24");
-    }
-}
-
-// -----------------------------------------------------------------------
-// clampConfigLora() tests
-// -----------------------------------------------------------------------
-
-static void test_clampConfigLora_invalidPresetClampedToDefault()
-{
-    meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
-    cfg.region = meshtastic_Config_LoRaConfig_RegionCode_EU_868;
-    cfg.use_preset = true;
-    cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO; // not in EU_868 preset list
-
-    RadioInterface::clampConfigLora(cfg);
-
-    const RegionInfo *eu868 = getRegion(meshtastic_Config_LoRaConfig_RegionCode_EU_868);
-    TEST_ASSERT_EQUAL(eu868->getDefaultPreset(), cfg.modem_preset);
-}
-
-static void test_clampConfigLora_validPresetUnchanged()
-{
-    meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
-    cfg.region = meshtastic_Config_LoRaConfig_RegionCode_US;
-    cfg.use_preset = true;
-    cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST;
-
-    RadioInterface::clampConfigLora(cfg);
-
-    TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST, cfg.modem_preset);
-}
-
-static void test_clampConfigLora_customBwTooWideClampedToDefaultBw()
-{
-    // EU_868 span is 250kHz. A 500kHz custom BW should be clamped to default preset BW.
-    meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
-    cfg.region = meshtastic_Config_LoRaConfig_RegionCode_EU_868;
-    cfg.use_preset = false;
-    cfg.bandwidth = 500;
-    cfg.spread_factor = 11;
-    cfg.coding_rate = 5;
-
-    RadioInterface::clampConfigLora(cfg);
-
-    const RegionInfo *eu868 = getRegion(meshtastic_Config_LoRaConfig_RegionCode_EU_868);
-    float expectedBw = modemPresetToBwKHz(eu868->getDefaultPreset(), eu868->wideLora);
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, expectedBw, (float)cfg.bandwidth);
-}
-
-static void test_clampConfigLora_customBwValidLeftUnchanged()
-{
-    meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
-    cfg.region = meshtastic_Config_LoRaConfig_RegionCode_US;
-    cfg.use_preset = false;
-    cfg.bandwidth = 125;
-    cfg.spread_factor = 12;
-    cfg.coding_rate = 8;
-
-    RadioInterface::clampConfigLora(cfg);
-
-    TEST_ASSERT_EQUAL_UINT16(125, cfg.bandwidth);
-}
-
-static void test_clampConfigLora_bogusPresetOnUnsetClampedToLongFast()
-{
-    // UNSET uses PROFILE_UNDEF with only LONG_FAST; any other preset should clamp to it
-    meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
-    cfg.region = meshtastic_Config_LoRaConfig_RegionCode_UNSET;
-    cfg.use_preset = true;
-    cfg.modem_preset = (meshtastic_Config_LoRaConfig_ModemPreset)99;
-
-    RadioInterface::clampConfigLora(cfg);
-
-    TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST, cfg.modem_preset);
-}
-
-static void test_clampConfigLora_invalidPresetOnLORA24ClampedToDefault()
-{
-    // LORA_24 uses PROFILE_STD; a bogus preset should clamp to LONG_FAST (first in PRESETS_STD)
-    meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
-    cfg.region = meshtastic_Config_LoRaConfig_RegionCode_LORA_24;
-    cfg.use_preset = true;
-    cfg.modem_preset = (meshtastic_Config_LoRaConfig_ModemPreset)99;
-
-    RadioInterface::clampConfigLora(cfg);
-
-    const RegionInfo *lora24 = getRegion(meshtastic_Config_LoRaConfig_RegionCode_LORA_24);
-    TEST_ASSERT_EQUAL(lora24->getDefaultPreset(), cfg.modem_preset);
-}
-
-// -----------------------------------------------------------------------
-// RegionInfo preset list integrity tests
-// -----------------------------------------------------------------------
-
-static void test_presetsStd_hasNineEntries()
-{
-    // PROFILE_STD should have exactly 9 presets
-    const RegionInfo *us = getRegion(meshtastic_Config_LoRaConfig_RegionCode_US);
-    TEST_ASSERT_EQUAL(9, us->getNumPresets());
-    TEST_ASSERT_EQUAL_PTR(PROFILE_STD.presets, us->getAvailablePresets());
-}
-
-static void test_presetsEU868_hasSevenEntries()
-{
-    const RegionInfo *eu = getRegion(meshtastic_Config_LoRaConfig_RegionCode_EU_868);
-    TEST_ASSERT_EQUAL(7, eu->getNumPresets());
-    TEST_ASSERT_EQUAL_PTR(PROFILE_EU868.presets, eu->getAvailablePresets());
-}
-
-static void test_presetsUndef_hasOneEntry()
-{
-    const RegionInfo *unset = getRegion(meshtastic_Config_LoRaConfig_RegionCode_UNSET);
-    TEST_ASSERT_EQUAL(1, unset->getNumPresets());
-    TEST_ASSERT_EQUAL_PTR(PROFILE_UNDEF.presets, unset->getAvailablePresets());
-}
-
-static void test_defaultPresetIsInAvailablePresets()
-{
-    // For every region, the defaultPreset must appear in its own availablePresets list
-    const RegionInfo *r = regions;
-    while (true) {
-        bool found = false;
-        for (size_t i = 0; i < r->getNumPresets(); i++) {
-            if (r->getAvailablePresets()[i] == r->getDefaultPreset()) {
-                found = true;
-                break;
-            }
-        }
-        char msg[80];
-        snprintf(msg, sizeof(msg), "Region %s defaultPreset not in availablePresets", r->name);
-        TEST_ASSERT_TRUE_MESSAGE(found, msg);
-
-        if (r->code == meshtastic_Config_LoRaConfig_RegionCode_UNSET)
-            break; // UNSET is the sentinel, stop after it
-        r++;
-    }
-}
-
-static void test_regionFieldsAreSane()
-{
-    // Basic sanity check: all regions have freqEnd > freqStart and a non-null name
-    const RegionInfo *r = regions;
-    while (true) {
-        char msg[80];
-        snprintf(msg, sizeof(msg), "Region %s: freqEnd must be > freqStart", r->name);
-        TEST_ASSERT_TRUE_MESSAGE(r->freqEnd > r->freqStart, msg);
-        TEST_ASSERT_NOT_NULL(r->name);
-        TEST_ASSERT_TRUE_MESSAGE(r->getNumPresets() > 0, "numPresets must be > 0");
-        TEST_ASSERT_NOT_NULL(r->getAvailablePresets());
-
-        if (r->code == meshtastic_Config_LoRaConfig_RegionCode_UNSET)
-            break;
-        r++;
-    }
-}
-
-static void test_onlyLORA24HasWideLora()
-{
-    // Verify that LORA_24 is the only region with wideLora=true
-    const RegionInfo *r = regions;
-    while (true) {
-        char msg[80];
-        if (r->code == meshtastic_Config_LoRaConfig_RegionCode_LORA_24) {
-            snprintf(msg, sizeof(msg), "Region %s should have wideLora=true", r->name);
-            TEST_ASSERT_TRUE_MESSAGE(r->wideLora, msg);
-        } else {
-            snprintf(msg, sizeof(msg), "Region %s should have wideLora=false", r->name);
-            TEST_ASSERT_FALSE_MESSAGE(r->wideLora, msg);
-        }
-
-        if (r->code == meshtastic_Config_LoRaConfig_RegionCode_UNSET)
-            break;
-        r++;
-    }
-}
-
-// -----------------------------------------------------------------------
-// Channel spacing calculation (placeholder for future protobuf updates)
-// -----------------------------------------------------------------------
-
-static void test_channelSpacingCalculation_US_LONG_FAST()
-{
-    // Current formula: channelSpacing = spacing + (padding * 2) + (bw / 1000)
-    // US: spacing=0, padding=0
-    // LONG_FAST on non-wide region: bw=250 kHz
-    // channelSpacing = 0 + 0 + 0.250 = 0.250 MHz
-    // numChannels = round((928 - 902 + 0) / 0.250) = round(104) = 104
-    const RegionInfo *us = getRegion(meshtastic_Config_LoRaConfig_RegionCode_US);
-    float bw = modemPresetToBwKHz(meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST, us->wideLora);
-    float channelSpacing = us->profile->spacing + (us->profile->padding * 2) + (bw / 1000.0f);
-    uint32_t numChannels = (uint32_t)(((us->freqEnd - us->freqStart + us->profile->spacing) / channelSpacing) + 0.5f);
-
-    TEST_ASSERT_FLOAT_WITHIN(0.001f, 0.250f, channelSpacing);
-    TEST_ASSERT_EQUAL_UINT32(104, numChannels);
-}
-
-static void test_channelSpacingCalculation_EU868_LONG_FAST()
-{
-    // EU_868: freqStart=869.4, freqEnd=869.65, spacing=0, padding=0
-    // LONG_FAST: bw=250 kHz => channelSpacing = 0.250 MHz
-    // numChannels = round((0.25 + 0) / 0.250) = 1
-    const RegionInfo *eu = getRegion(meshtastic_Config_LoRaConfig_RegionCode_EU_868);
-    float bw = modemPresetToBwKHz(meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST, eu->wideLora);
-    float channelSpacing = eu->profile->spacing + (eu->profile->padding * 2) + (bw / 1000.0f);
-    uint32_t numChannels = (uint32_t)(((eu->freqEnd - eu->freqStart + eu->profile->spacing) / channelSpacing) + 0.5f);
-
-    TEST_ASSERT_FLOAT_WITHIN(0.001f, 0.250f, channelSpacing);
-    TEST_ASSERT_EQUAL_UINT32(1, numChannels);
-}
-
-// Placeholder: when protobuf region definitions include non-zero padding/spacing,
-// add tests here to verify the channel count and frequency calculations.
-static void test_channelSpacingCalculation_placeholder()
-{
-    // TODO: Once protobuf RegionInfo entries have non-zero padding or spacing values,
-    // verify:
-    //  - Channel count matches expected value for each (region, preset) pair
-    //  - First channel frequency = freqStart + (bw/2000) + padding
-    //  - Nth channel frequency = first + (n * channelSpacing)
-    //  - overrideSlot, when non-zero, forces the channel_num
-    TEST_PASS_MESSAGE("Placeholder for future channel spacing tests with updated protobuf region fields");
-}
-
-// -----------------------------------------------------------------------
-// handleSetConfig fromOthers dispatch tests
-// -----------------------------------------------------------------------
-
-class AdminModuleTestShim : public AdminModule
-{
-  public:
-    using AdminModule::handleSetConfig;
-};
-
-static AdminModuleTestShim *testAdmin;
-
-static meshtastic_Config makeLoraSetConfig(meshtastic_Config_LoRaConfig_RegionCode region, bool usePreset,
-                                           meshtastic_Config_LoRaConfig_ModemPreset preset)
-{
-    meshtastic_Config c = meshtastic_Config_init_zero;
-    c.which_payload_variant = meshtastic_Config_lora_tag;
-    c.payload_variant.lora.region = region;
-    c.payload_variant.lora.use_preset = usePreset;
-    c.payload_variant.lora.modem_preset = preset;
-    return c;
-}
-
-static void test_handleSetConfig_fromOthers_invalidPresetRejected()
-{
-    // Set up a known-good baseline in the global config
-    config.lora = meshtastic_Config_LoRaConfig_init_zero;
-    config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_EU_868;
-    config.lora.use_preset = true;
-    config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
-    initRegion();
-
-    // Build an admin set_config with an invalid preset for EU_868
-    meshtastic_Config c = makeLoraSetConfig(meshtastic_Config_LoRaConfig_RegionCode_EU_868, true,
-                                            meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO);
-
-    testAdmin->handleSetConfig(c, true); // fromOthers = true
-
-    // fromOthers=true: invalid preset should be rejected, old preset preserved
-    TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST, config.lora.modem_preset);
-}
-
-static void test_handleSetConfig_fromLocal_invalidPresetClamped()
-{
-    // Set up a known-good baseline
-    config.lora = meshtastic_Config_LoRaConfig_init_zero;
-    config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_EU_868;
-    config.lora.use_preset = true;
-    config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
-    initRegion();
-
-    // Build an admin set_config with an invalid preset for EU_868
-    meshtastic_Config c = makeLoraSetConfig(meshtastic_Config_LoRaConfig_RegionCode_EU_868, true,
-                                            meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO);
-
-    testAdmin->handleSetConfig(c, false); // fromOthers = false (local client)
-
-    // fromOthers=false: invalid preset should be clamped to the region's default
-    const RegionInfo *eu868 = getRegion(meshtastic_Config_LoRaConfig_RegionCode_EU_868);
-    TEST_ASSERT_EQUAL(eu868->getDefaultPreset(), config.lora.modem_preset);
-}
-
-static void test_handleSetConfig_fromOthers_validPresetAccepted()
-{
-    // Set up baseline
-    config.lora = meshtastic_Config_LoRaConfig_init_zero;
-    config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_EU_868;
-    config.lora.use_preset = true;
-    config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
-    initRegion();
-
-    // Build an admin set_config with a valid preset for EU_868
-    meshtastic_Config c = makeLoraSetConfig(meshtastic_Config_LoRaConfig_RegionCode_EU_868, true,
-                                            meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST);
-
-    testAdmin->handleSetConfig(c, true); // fromOthers = true
-
-    // Valid preset should be accepted regardless of fromOthers
-    TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST, config.lora.modem_preset);
-}
-
-// -----------------------------------------------------------------------
-// Test runner
-// -----------------------------------------------------------------------
-
-void setUp(void)
-{
-    mockMeshService = new MockMeshService();
-    service = mockMeshService;
-    testAdmin = new AdminModuleTestShim();
-}
-void tearDown(void)
-{
-    service = nullptr;
-    delete mockMeshService;
-    mockMeshService = nullptr;
-    delete testAdmin;
-    testAdmin = nullptr;
-}
-
-void setup()
-{
-    delay(10);
-    delay(2000);
-
-    initializeTestEnvironment();
-
-    UNITY_BEGIN();
-
-    // getRegion()
-    RUN_TEST(test_getRegion_returnsCorrectRegion_US);
-    RUN_TEST(test_getRegion_returnsCorrectRegion_EU868);
-    RUN_TEST(test_getRegion_returnsCorrectRegion_LORA24);
-    RUN_TEST(test_getRegion_unsetCodeReturnsUnsetEntry);
-    RUN_TEST(test_getRegion_unknownCodeFallsToUnset);
-
-    // validateConfigRegion()
-    RUN_TEST(test_validateConfigRegion_validRegionReturnsTrue);
-    RUN_TEST(test_validateConfigRegion_unsetRegionReturnsTrue);
-
-    // Shadow table tests
-    RUN_TEST(test_shadowTable_spacedProfileHasNonZeroSpacing);
-    RUN_TEST(test_shadowTable_licensedProfileFlagsCorrect);
-    RUN_TEST(test_shadowTable_presetCountMatchesExpected);
-    RUN_TEST(test_shadowTable_defaultPresetIsFirstInList);
-    RUN_TEST(test_shadowTable_channelSpacingWithPadding);
-    RUN_TEST(test_shadowTable_turboOnlyOnWideLora);
-    RUN_TEST(test_shadowTable_unknownCodeFallsToSentinel);
-
-    // validateConfigLora()
-    RUN_TEST(test_validateConfigLora_validPresetForUS);
-    RUN_TEST(test_validateConfigLora_allStdPresetsValidForUS);
-    RUN_TEST(test_validateConfigLora_turboPresetsInvalidForEU868);
-    RUN_TEST(test_validateConfigLora_validPresetsForEU868);
-    RUN_TEST(test_validateConfigLora_customBandwidthTooWideForEU868);
-    RUN_TEST(test_validateConfigLora_customBandwidthFitsUS);
-    RUN_TEST(test_validateConfigLora_customBandwidthFitsEU868);
-    RUN_TEST(test_validateConfigLora_bogusPresetRejected);
-    RUN_TEST(test_validateConfigLora_unsetRegionOnlyAcceptsLongFast);
-    RUN_TEST(test_validateConfigLora_allPresetsValidForLORA24);
-
-    // clampConfigLora()
-    RUN_TEST(test_clampConfigLora_invalidPresetClampedToDefault);
-    RUN_TEST(test_clampConfigLora_validPresetUnchanged);
-    RUN_TEST(test_clampConfigLora_customBwTooWideClampedToDefaultBw);
-    RUN_TEST(test_clampConfigLora_customBwValidLeftUnchanged);
-    RUN_TEST(test_clampConfigLora_bogusPresetOnUnsetClampedToLongFast);
-    RUN_TEST(test_clampConfigLora_invalidPresetOnLORA24ClampedToDefault);
-
-    // RegionInfo preset list integrity
-    RUN_TEST(test_presetsStd_hasNineEntries);
-    RUN_TEST(test_presetsEU868_hasSevenEntries);
-    RUN_TEST(test_presetsUndef_hasOneEntry);
-    RUN_TEST(test_defaultPresetIsInAvailablePresets);
-    RUN_TEST(test_regionFieldsAreSane);
-    RUN_TEST(test_onlyLORA24HasWideLora);
-
-    // Channel spacing (current + placeholder)
-    RUN_TEST(test_channelSpacingCalculation_US_LONG_FAST);
-    RUN_TEST(test_channelSpacingCalculation_EU868_LONG_FAST);
-    RUN_TEST(test_channelSpacingCalculation_placeholder);
-
-    // handleSetConfig fromOthers dispatch
-    RUN_TEST(test_handleSetConfig_fromOthers_invalidPresetRejected);
-    RUN_TEST(test_handleSetConfig_fromLocal_invalidPresetClamped);
-    RUN_TEST(test_handleSetConfig_fromOthers_validPresetAccepted);
-
-    exit(UNITY_END());
-}
-
-void loop() {}
@@ -1,36 +1,10 @@
 #include "MeshRadio.h"
-#include "MeshService.h"
 #include "RadioInterface.h"
 #include "TestUtil.h"
 #include <unity.h>

 #include "meshtastic/config.pb.h"

-class MockMeshService : public MeshService
-{
-  public:
-    void sendClientNotification(meshtastic_ClientNotification *n) override { releaseClientNotificationToPool(n); }
-};
-
-static MockMeshService *mockMeshService;
-
-// Test shim to expose protected radio parameters set by applyModemConfig()
-class TestableRadioInterface : public RadioInterface
-{
-  public:
-    TestableRadioInterface() : RadioInterface() {}
-    uint8_t getCr() const { return cr; }
-    uint8_t getSf() const { return sf; }
-    float getBw() const { return bw; }
-
-    // Override reconfigure to call the base which invokes applyModemConfig()
-    bool reconfigure() override { return RadioInterface::reconfigure(); }
-
-    // Stubs for pure virtual methods required by RadioInterface
-    uint32_t getPacketTime(uint32_t, bool) override { return 0; }
-    ErrorCode send(meshtastic_MeshPacket *p) override { return ERRNO_OK; }
-};
-
 static void test_bwCodeToKHz_specialMappings()
 {
    TEST_ASSERT_FLOAT_WITHIN(0.0001f, 31.25f, bwCodeToKHz(31));
@@ -47,7 +21,7 @@ static void test_bwCodeToKHz_passthrough()
    TEST_ASSERT_FLOAT_WITHIN(0.0001f, 250.0f, bwCodeToKHz(250));
 }

-static void test_validateConfigLora_noopWhenUsePresetFalse()
+static void test_bootstrapLoRaConfigFromPreset_noopWhenUsePresetFalse()
 {
    meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
    cfg.use_preset = false;
@@ -56,152 +30,55 @@ static void test_validateConfigLora_noopWhenUsePresetFalse()
    cfg.bandwidth = 123;
    cfg.spread_factor = 8;

-    RadioInterface::validateConfigLora(cfg);
+    RadioInterface::bootstrapLoRaConfigFromPreset(cfg);

    TEST_ASSERT_EQUAL_UINT16(123, cfg.bandwidth);
    TEST_ASSERT_EQUAL_UINT32(8, cfg.spread_factor);
    TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST, cfg.modem_preset);
 }

-static void test_validateConfigLora_validPreset_nonWideRegion()
+static void test_bootstrapLoRaConfigFromPreset_setsDerivedFields_nonWideRegion()
 {
    meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
    cfg.use_preset = true;
    cfg.region = meshtastic_Config_LoRaConfig_RegionCode_US;
    cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST;

-    TEST_ASSERT_TRUE(RadioInterface::validateConfigLora(cfg));
+    RadioInterface::bootstrapLoRaConfigFromPreset(cfg);
+
+    TEST_ASSERT_EQUAL_UINT16(250, cfg.bandwidth);
+    TEST_ASSERT_EQUAL_UINT32(9, cfg.spread_factor);
 }

-static void test_validateConfigLora_validPreset_wideRegion()
+static void test_bootstrapLoRaConfigFromPreset_setsDerivedFields_wideRegion()
 {
    meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
    cfg.use_preset = true;
    cfg.region = meshtastic_Config_LoRaConfig_RegionCode_LORA_24;
    cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST;

-    TEST_ASSERT_TRUE(RadioInterface::validateConfigLora(cfg));
+    RadioInterface::bootstrapLoRaConfigFromPreset(cfg);
+
+    TEST_ASSERT_EQUAL_UINT16(800, cfg.bandwidth);
+    TEST_ASSERT_EQUAL_UINT32(9, cfg.spread_factor);
 }

-static void test_validateConfigLora_rejectsInvalidPresetForRegion()
+static void test_bootstrapLoRaConfigFromPreset_fallsBackIfBandwidthExceedsRegionSpan()
 {
    meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
    cfg.use_preset = true;
    cfg.region = meshtastic_Config_LoRaConfig_RegionCode_EU_868;
    cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO;

-    TEST_ASSERT_FALSE(RadioInterface::validateConfigLora(cfg));
-}
-
-static void test_clampConfigLora_invalidPresetClampedToDefault()
-{
-    meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
-    cfg.use_preset = true;
-    cfg.region = meshtastic_Config_LoRaConfig_RegionCode_EU_868;
-    cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO;
-
-    RadioInterface::clampConfigLora(cfg);
+    RadioInterface::bootstrapLoRaConfigFromPreset(cfg);

    TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST, cfg.modem_preset);
+    TEST_ASSERT_EQUAL_UINT16(250, cfg.bandwidth);
+    TEST_ASSERT_EQUAL_UINT32(11, cfg.spread_factor);
 }

-static void test_clampConfigLora_validPresetUnchanged()
-{
-    meshtastic_Config_LoRaConfig cfg = meshtastic_Config_LoRaConfig_init_zero;
-    cfg.use_preset = true;
-    cfg.region = meshtastic_Config_LoRaConfig_RegionCode_US;
-    cfg.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST;
-
-    RadioInterface::clampConfigLora(cfg);
-
-    TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST, cfg.modem_preset);
-}
-
-// -----------------------------------------------------------------------
-// applyModemConfig() coding rate tests (via reconfigure)
-// -----------------------------------------------------------------------
-
-static TestableRadioInterface *testRadio;
-
-// After fresh flash: coding_rate=0, use_preset=true, modem_preset=LONG_FAST
-// CR should come from the preset (5 for LONG_FAST), not from the zero default.
-static void test_applyModemConfig_freshFlashCodingRateNotZero()
-{
-    config.lora = meshtastic_Config_LoRaConfig_init_zero;
-    config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_US;
-    config.lora.use_preset = true;
-    config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
-    // coding_rate is 0 (default after init_zero, same as fresh flash)
-
-    testRadio->reconfigure();
-
-    // LONG_FAST preset has cr=5; must never be 0
-    TEST_ASSERT_EQUAL_UINT8(5, testRadio->getCr());
-    TEST_ASSERT_EQUAL_UINT8(11, testRadio->getSf());
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 250.0f, testRadio->getBw());
-}
-
-// When coding_rate matches the preset exactly, should still use the preset value
-static void test_applyModemConfig_codingRateMatchesPreset()
-{
-    config.lora = meshtastic_Config_LoRaConfig_init_zero;
-    config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_US;
-    config.lora.use_preset = true;
-    config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW;
-    config.lora.coding_rate = 8; // LONG_SLOW default is cr=8
-
-    testRadio->reconfigure();
-
-    TEST_ASSERT_EQUAL_UINT8(8, testRadio->getCr());
-}
-
-// Custom CR higher than preset should be used
-static void test_applyModemConfig_customCodingRateHigherThanPreset()
-{
-    config.lora = meshtastic_Config_LoRaConfig_init_zero;
-    config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_US;
-    config.lora.use_preset = true;
-    config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST;
-    config.lora.coding_rate = 7; // LONG_FAST preset has cr=5, 7 > 5
-
-    testRadio->reconfigure();
-
-    TEST_ASSERT_EQUAL_UINT8(7, testRadio->getCr());
-}
-
-// Custom CR lower than preset: preset wins (higher is more robust)
-static void test_applyModemConfig_customCodingRateLowerThanPreset()
-{
-    config.lora = meshtastic_Config_LoRaConfig_init_zero;
-    config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_US;
-    config.lora.use_preset = true;
-    config.lora.modem_preset = meshtastic_Config_LoRaConfig_ModemPreset_LONG_SLOW;
-    config.lora.coding_rate = 5; // LONG_SLOW preset has cr=8, 5 < 8
-
-    testRadio->reconfigure();
-
-    TEST_ASSERT_EQUAL_UINT8(8, testRadio->getCr());
-}
-
-void setUp(void)
-{
-    mockMeshService = new MockMeshService();
-    service = mockMeshService;
-
-    // RadioInterface computes slotTimeMsec during construction and expects myRegion to be valid.
-    config.lora.region = meshtastic_Config_LoRaConfig_RegionCode_US;
-    initRegion();
-
-    testRadio = new TestableRadioInterface();
-}
-void tearDown(void)
-{
-    delete testRadio;
-    testRadio = nullptr;
-    service = nullptr;
-    delete mockMeshService;
-    mockMeshService = nullptr;
-}
+void setUp(void) {}
+void tearDown(void) {}

 void setup()
 {
@@ -213,16 +90,10 @@ void setup()
    UNITY_BEGIN();
    RUN_TEST(test_bwCodeToKHz_specialMappings);
    RUN_TEST(test_bwCodeToKHz_passthrough);
-    RUN_TEST(test_validateConfigLora_noopWhenUsePresetFalse);
-    RUN_TEST(test_validateConfigLora_validPreset_nonWideRegion);
-    RUN_TEST(test_validateConfigLora_validPreset_wideRegion);
-    RUN_TEST(test_validateConfigLora_rejectsInvalidPresetForRegion);
-    RUN_TEST(test_clampConfigLora_invalidPresetClampedToDefault);
-    RUN_TEST(test_clampConfigLora_validPresetUnchanged);
-    RUN_TEST(test_applyModemConfig_freshFlashCodingRateNotZero);
-    RUN_TEST(test_applyModemConfig_codingRateMatchesPreset);
-    RUN_TEST(test_applyModemConfig_customCodingRateHigherThanPreset);
-    RUN_TEST(test_applyModemConfig_customCodingRateLowerThanPreset);
+    RUN_TEST(test_bootstrapLoRaConfigFromPreset_noopWhenUsePresetFalse);
+    RUN_TEST(test_bootstrapLoRaConfigFromPreset_setsDerivedFields_nonWideRegion);
+    RUN_TEST(test_bootstrapLoRaConfigFromPreset_setsDerivedFields_wideRegion);
+    RUN_TEST(test_bootstrapLoRaConfigFromPreset_fallsBackIfBandwidthExceedsRegionSpan);
    exit(UNITY_END());
 }

@@ -13,7 +13,3 @@ board_build.f_cpu = 240000000L
 upload_protocol = esptool
 ;upload_port = /dev/ttyUSB0
 upload_speed = 460800
-lib_deps =
-  ${esp32_base.lib_deps}
-  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.4
@@ -68,7 +68,7 @@ lib_deps =
  ${environmental_extra.lib_deps}
  ${radiolib_base.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/b78f12c86ea65c3ca08968840ff554ff7ed69b60.zip
+  https://github.com/meshtastic/esp32_https_server/archive/0c71f380390ad483ff134ad938e07f6cf1226c5b.zip
  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
  h2zero/NimBLE-Arduino@1.4.3
  # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
@@ -5,6 +5,3 @@ build_flags =
  ${esp32c3_base.build_flags}
  -D HELTEC_HRU_3601
  -I variants/esp32c3/heltec_hru_3601
-lib_deps = ${esp32c3_base.lib_deps}
-  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.4
@@ -23,8 +23,6 @@ build_unflags =
  -D HAS_WIFI
 lib_deps =
  ${esp32c6_base.lib_deps}
-  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.4
  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
  h2zero/NimBLE-Arduino@2.3.7
 build_flags = 
@@ -12,8 +12,6 @@ lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
  zinggjm/GxEPD2@1.6.8
-  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.4
 build_unflags =
  ${esp32s3_base.build_unflags}
  -DARDUINO_USB_MODE=1
@@ -8,10 +8,6 @@ board_build.f_cpu = 240000000L
 upload_protocol = esptool
 ;upload_port = /dev/ttyACM0
 upload_speed = 921600
-lib_deps =
-  ${esp32s3_base.lib_deps}
-  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.4
 build_unflags =
  ${esp32s3_base.build_unflags}
  -DARDUINO_USB_MODE=1
@@ -24,5 +24,3 @@ build_flags = ${esp32s3_base.build_flags}
 lib_deps = ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
  zinggjm/GxEPD2@1.6.8
-  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.4
@@ -8,7 +8,3 @@ build_flags =
  -I variants/esp32s3/heltec_sensor_hub
  -D HELTEC_SENSOR_HUB
  -ULED_BUILTIN
-
-lib_deps = ${esp32s3_base.lib_deps}
-  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.4
@@ -29,14 +29,6 @@
 #define SX126X_DIO2_AS_RF_SWITCH
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8

-// Enable Traffic Management Module for Heltec V4
-#ifndef HAS_TRAFFIC_MANAGEMENT
-#define HAS_TRAFFIC_MANAGEMENT 1
-#endif
-#ifndef TRAFFIC_MANAGEMENT_CACHE_SIZE
-#define TRAFFIC_MANAGEMENT_CACHE_SIZE 2048
-#endif
-
 // ---- GC1109 RF FRONT END CONFIGURATION ----
 // The Heltec V4.2 uses a GC1109 FEM chip with integrated PA and LNA
 // RF path: SX1262 -> Pi attenuator -> GC1109 PA -> Antenna
@@ -97,4 +89,4 @@
 // Seems to be missing on this new board
 #define GPS_TX_PIN (38) // This is for bits going TOWARDS the CPU
 #define GPS_RX_PIN (39) // This is for bits going TOWARDS the GPS
-#define GPS_THREAD_INTERVAL 50
+#define GPS_THREAD_INTERVAL 50
@@ -20,5 +20,5 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-st7789 packageName=https://github.com/meshtastic/st7789 gitBranch=main
-  https://github.com/meshtastic/st7789/archive/9ee76d6b18b9a8f45a2c5cae06b1134a587691eb.zip
+  https://github.com/meshtastic/st7789/archive/a787beea5c6c8f864ba6787eb432bbefc575e6ad.zip
 upload_speed = 921600
@@ -16,12 +16,10 @@ build_src_filter =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-st7789 packageName=https://github.com/meshtastic/st7789 gitBranch=main
-  https://github.com/meshtastic/st7789/archive/9ee76d6b18b9a8f45a2c5cae06b1134a587691eb.zip
+  https://github.com/meshtastic/st7789/archive/a787beea5c6c8f864ba6787eb432bbefc575e6ad.zip
  # renovate: datasource=github-tags depName=pschatzmann_arduino-audio-driver packageName=pschatzmann/arduino-audio-driver
  https://github.com/pschatzmann/arduino-audio-driver/archive/v0.2.1.zip
  # renovate: datasource=git-refs depName=ESP8266Audio packageName=https://github.com/meshtastic/ESP8266Audio gitBranch=meshtastic-2.0.0-dacfix
  https://github.com/meshtastic/ESP8266Audio/archive/343024632ee78d6216907b2353fc943a62422d80.zip
  # renovate: datasource=custom.pio depName=ESP8266SAM packageName=earlephilhower/library/ESP8266SAM
  earlephilhower/ESP8266SAM@1.1.0
-  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.4
@@ -98,7 +98,7 @@ void setupNicheGraphics()
    buttons->setTwoWayRockerPressHandlers(
        [inkhud]() {
            bool systemHandlingInput = false;
-            for (InkHUD::SystemApplet *sa : inkhud->systemApplets) {
+            for (const InkHUD::SystemApplet *sa : inkhud->systemApplets) {
                if (sa->handleInput) {
                    systemHandlingInput = true;
                    break;
@@ -112,7 +112,7 @@ void setupNicheGraphics()
        },
        [inkhud]() {
            bool systemHandlingInput = false;
-            for (InkHUD::SystemApplet *sa : inkhud->systemApplets) {
+            for (const InkHUD::SystemApplet *sa : inkhud->systemApplets) {
                if (sa->handleInput) {
                    systemHandlingInput = true;
                    break;
@@ -40,14 +40,6 @@ Board Information: https://wiki.uniteng.com/en/meshtastic/station-g2
 #define SX126X_MAX_POWER 19
 #endif

-// Enable Traffic Management Module for Station G2
-#ifndef HAS_TRAFFIC_MANAGEMENT
-#define HAS_TRAFFIC_MANAGEMENT 1
-#endif
-#ifndef TRAFFIC_MANAGEMENT_CACHE_SIZE
-#define TRAFFIC_MANAGEMENT_CACHE_SIZE 2048
-#endif
-
 /*
 #define BATTERY_PIN 4 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
 #define ADC_CHANNEL ADC1_GPIO4_CHANNEL
@@ -40,8 +40,6 @@ lib_deps = ${esp32s3_base.lib_deps}
  lovyan03/LovyanGFX@1.2.19
  # TODO renovate https://gitlab.com/hamishcunningham/unphonelibrary#meshtastic@9.0.0
  https://gitlab.com/hamishcunningham/unphonelibrary/-/archive/meshtastic/unphonelibrary-meshtastic.zip
-  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
-  adafruit/Adafruit NeoPixel@1.15.4

 [env:unphone-tft]
 board_level = extra
@@ -34,8 +34,8 @@ lib_deps =
 	adafruit/Adafruit seesaw Library@1.7.9
  # renovate: datasource=git-refs depName=RAK12034-BMX160 packageName=https://github.com/RAKWireless/RAK12034-BMX160 gitBranch=main
  https://github.com/RAKWireless/RAK12034-BMX160/archive/dcead07ffa267d3c906e9ca4a1330ab989e957e2.zip
-  # renovate: datasource=custom.pio depName=Adafruit_BME680 packageName=adafruit/library/Adafruit BME680 Library
-  adafruit/Adafruit BME680 Library@2.0.6
+  # renovate: datasource=github-tags depName=Adafruit_BME680 packageName=adafruit/Adafruit_BME680
+  https://github.com/adafruit/Adafruit_BME680/archive/refs/tags/2.0.6.zip

 build_flags =
  ${arduino_base.build_flags}
@@ -59,4 +59,5 @@ build_flags =
 lib_ignore =
  Adafruit NeoPixel
  Adafruit ST7735 and ST7789 Library
+  Adafruit SSD1306
  SD
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ben MeadorsandCopilot	c7b7c3f90d	Update src/graphics/draw/MessageRenderer.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2026-04-13 11:31:19 -05:00
Ben Meadors	fc2316b292	Refine message history limits for resource-constrained builds and cap cached lines to prevent heap overflow	2026-04-13 11:06:30 -05:00
Ben Meadors	263ed1d0ce	Optimize message frame allocation to prevent excessive memory usage	2026-04-13 09:14:56 -05:00
Ben Meadors	7d10602f6a	Set MESSAGE_HISTORY_LIMIT to 10 for original ESP32 to optimize RAM usage	2026-04-13 09:14:22 -05:00
Ben MeadorsandCopilot	6f0e3c5b68	Update src/graphics/draw/MessageRenderer.cpp Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>	2026-04-13 09:13:02 -05:00
Ben Meadors	d05232b8b2	Fix heap blowout on TBeams	2026-04-13 08:49:33 -05:00
Thomas Göttgens	e42ff3590c	fix last cppcheck issue (#10154 )	2026-04-13 15:48:30 +02:00
Ben Meadors	7527233130	Enhance release notes generation with commit range comparison	2026-04-13 06:43:11 -05:00
Bob Iannucci Claude Opus 4.6 Ben Meadors Jonathan Bennett	197226365b	fix(native): implement BinarySemaphorePosix with proper pthread synchronization (#9895 ) * fix(native): implement BinarySemaphorePosix with proper pthread synchronization The BinarySemaphorePosix class (used on all Linux/portduino/native builds) had stub implementations: give() was a no-op and take() just called delay(msec) and returned false. This broke the cooperative thread scheduler on native platforms — threads could not wake the main loop, radio RX interrupts were missed, and telemetry never transmitted over the mesh. Replace the stubs with a proper binary semaphore using pthread_mutex_t + pthread_cond_t + bool signaled: - take(msec): pthread_cond_timedwait with CLOCK_REALTIME timeout, consumes signal atomically (binary semaphore semantics) - give(): sets signaled=true, signals condition variable - giveFromISR(): delegates to give(), sets pxHigherPriorityTaskWoken Tested on Raspberry Pi 3 Model B (ARM64, Debian Bookworm) with Adafruit LoRa Radio Bonnet (SX1276). Before fix: no radio TX/RX, no telemetry on mesh. After fix: bidirectional LoRa, MQTT gateway, telemetry all working. Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com> * ARCH_PORTDUINO * Refactor BinarySemaphorePosix header for ARCH_PORTDUINO * Change preprocessor directive from ifndef to ifdef * Gate new Semaphore code to Portduino and fix STM compilation * Binary Semaphore Posix better error handling --------- Co-authored-by: Claude Opus 4.6 <noreply@anthropic.com> Co-authored-by: Ben Meadors <benmmeadors@gmail.com> Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>	2026-04-13 06:31:38 -05:00
renovate[bot]	eeb95d6bff	Update meshtastic-st7789 digest to a787bee (#10147 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-04-13 06:26:22 -05:00
renovate[bot]	323830c7cc	Update pnpm/action-setup action to v6 (#10132 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-04-12 22:09:25 -04:00
renovate[bot]	a9acd506a8	Update softprops/action-gh-release action to v3 (#10150 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-04-12 21:49:14 -04:00
Austin	a1d6c6db62	Fix display method to use const qualifier for previousBuffer pointer (#10146 ) Addresses cppcheck `src/graphics/EInkParallelDisplay.cpp:205: [low:style] Variable 'prev' can be declared as pointer to const [constVariablePointer]`	2026-04-12 19:38:44 -05:00
Austin	0f2d224e74	Switch PlatformIO deps from PIO Registry to tagged GitHub zips (#10142 )	2026-04-12 17:06:57 -05:00
Austin	381cefa6b2	PPA: Use SFTP method for uploads (#10138 ) * Upload to PPA via SFTP * PPA-SFTP: Trust Launchpad's SSH Key * Move SSH key import next to GPG * Increase dput timeout... * Use env for inputs (address semgrep gripe)	2026-04-12 07:24:11 -05:00
Austin Lane	a50cbdc95b	Docker: Pull images from Google/AWS during build Use Google / Amazon mirrors, not DockerHub, when pulling images for Docker builds. Should prevent Docker ratelimiting during CI (Actions) builds.	2026-04-11 22:41:21 -04:00
renovate[bot]	e7c7af40ae	Update meshtastic-st7789 digest to 4d957e7 (#10134 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-04-11 20:09:08 -05:00
renovate[bot]	48ae4b6c7a	Update meshtastic-st7789 digest to 7228c49 (#10131 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-04-10 21:19:01 -05:00
Austin	ae5019bec6	meshtasticd: Add configs for forlinx-ok3506-s12 (mPWRD-OS) (#10087 ) These configs were generated programatically by Opus 4.6. See: https://github.com/vidplace7/meshtasticd-40pin Tested with MeshAdv-Pi, other pinmaps are untested but should work.	2026-04-10 16:49:36 -05:00
renovate[bot]	3cd3fd3386	Update actions/github-script action to v9 (#10122 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-04-10 11:21:51 -05:00
Austin	839cf554b7	meshtasticd: Add configs for ebyte-ecb41-pge (mPWRD-OS) (#10086 ) These configs were generated programatically by Opus 4.6. See: https://github.com/vidplace7/meshtasticd-40pin Tested with MeshAdv-Pi, other pinmaps are untested but should work.	2026-04-10 11:21:23 -05:00
renovate[bot]	216655f05f	Update meshtastic-st7789 digest to 222554e (#10121 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-04-09 19:37:00 -05:00
github-actions[bot]andvidplace7	2c633b6458	Upgrade trunk (#10096 ) Co-authored-by: vidplace7 <1779290+vidplace7@users.noreply.github.com>	2026-04-09 06:28:05 -05:00
renovate[bot]	7fdee353b5	Update meshtastic-esp32_https_server digest to 0c71f38 (#10081 ) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>	2026-04-08 21:16:56 -05:00