Merge branch 'master' into crowpanelV2

2026-10-04 19:38:11 +10:00 · 2026-03-28 07:54:33 +01:00 · 2026-03-06 16:05:24 -06:00 · 2026-03-06 05:55:46 -06:00 · 2026-03-04 08:25:49 -06:00 · 2026-03-03 20:00:10 +01:00
177 changed files with 875 additions and 9834 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:
@@ -5,7 +5,7 @@ on:
  workflow_dispatch:
  push:
    branches:
-      - develop # Default branch, same as 'cron' above
+      - master
    paths:
      - debian/**
      - "*.rpkg"
@@ -56,25 +56,6 @@ 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
@@ -82,6 +63,17 @@ 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
@@ -103,6 +95,3 @@ 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
@@ -309,7 +309,7 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

      - name: Create release
-        uses: softprops/action-gh-release@v3
+        uses: softprops/action-gh-release@v2
        id: create_release
        with:
          draft: true
@@ -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@v9
+        uses: actions/github-script@v8
        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@v9
+        uses: actions/github-script@v8
        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@v9
+        uses: actions/github-script@v8
        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@v9
+        uses: actions/github-script@v8
        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@v9
+        uses: actions/github-script@v8
        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@v9
+        uses: actions/github-script@v8
        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@v9
+        uses: actions/github-script@v8
        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@v9
+        uses: actions/github-script@v8
        env:
          TYPE_LABEL: ${{ steps.classify.outputs.response }}
        with:
@@ -5,8 +5,6 @@ on:
    secrets:
      PPA_GPG_PRIVATE_KEY:
        required: true
-      PPA_SFTP_PRIVATE_KEY:
-        required: true
    inputs:
      ppa_repo:
        description: Meshtastic PPA to target
@@ -29,7 +27,6 @@ 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:
@@ -43,7 +40,7 @@ jobs:
        shell: bash
        run: |
          sudo apt-get update -y --fix-missing
-          sudo apt-get install -y dput openssh-client
+          sudo apt-get install -y dput

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

-      - name: Trust Launchpad's SSH key
+      - name: Publish with dput
+        if: ${{ github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
        run: |
-          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
+          dput ${{ inputs.ppa_repo }} meshtasticd_${{ steps.version.outputs.deb }}~${{ inputs.series }}_source.changes
@@ -13,7 +13,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check for PR labels
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
        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@v9
+        uses: actions/github-script@v8
        with:
          script: |
            const fs = require('fs');
@@ -52,7 +52,7 @@ jobs:
          node-version: 24

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

@@ -8,20 +8,20 @@ plugins:
      uri: https://github.com/trunk-io/plugins
 lint:
  enabled:
-    - checkov@3.2.517
-    - renovate@43.110.9
+    - checkov@3.2.511
+    - renovate@43.92.1
    - prettier@3.8.1
-    - trufflehog@3.94.3
+    - trufflehog@3.94.1
    - yamllint@1.38.0
    - bandit@1.9.4
    - trivy@0.69.3
    - taplo@0.10.0
-    - ruff@0.15.9
+    - ruff@0.15.8
    - isort@8.0.1
    - markdownlint@0.48.0
    - oxipng@10.1.0
    - svgo@4.0.1
-    - actionlint@1.7.12
+    - actionlint@1.7.11
    - flake8@7.3.0
    - hadolint@2.14.0
    - shfmt@3.6.0
@@ -204,16 +204,6 @@ HostMetrics:
 #  UserStringCommand: cat /sys/firmware/devicetree/base/serial-number # Command to execute, to send the results as the userString


-StoreAndForward:
-#  Enabled: true # Enable Store and Forward++, true by default
-#  DBPath: /var/lib/meshtasticd/ # Path to the S&F++ Sqlite DB
-#  Stratum0: false # Specify if this node is a Stratum 0 node, the controller node.
-#  InitialSync: 10 # Number of messages to 
-#  Hops: 3 # Number of hops to use for SF++ messages
-#  AnnounceInterval: 5 # Interval in minutes between announcing tip of chain hash
-#  MaxChainLength: 1000 # Maximum number of messages to store in a chain
-
-
 Config:
 #  DisplayMode: TWOCOLOR # uncomment to force BaseUI
 #  DisplayMode: COLOR # uncomment to force MUI
@@ -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
@@ -1,39 +0,0 @@
-# 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
@@ -1,33 +0,0 @@
-# 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
@@ -1,38 +0,0 @@
-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
@@ -1,36 +0,0 @@
-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
@@ -1,39 +0,0 @@
-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]
@@ -1,37 +0,0 @@
-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]
@@ -1,30 +0,0 @@
-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
@@ -1,39 +0,0 @@
-# MeshAdv-Pi E22-900M30S
-# https://github.com/chrismyers2000/MeshAdv-Pi-Hat
-Meta:
-  name: MeshAdv-Pi E22-900M30S
-  support: community
-  compatible:
-    - luckfox-lyra-zero-w # Armbian
-
-Lora:
-  Module: sx1262
-  CS: # GPIO0_C2 (physical 40)
-    pin: 18
-    gpiochip: 0
-    line: 18
-  IRQ: # GPIO1_D1 (physical 36)
-    pin: 57
-    gpiochip: 1
-    line: 25
-  Busy: # GPIO0_C1 (physical 38)
-    pin: 17
-    gpiochip: 0
-    line: 17
-  Reset: # GPIO0_B6 (physical 12)
-    pin: 14
-    gpiochip: 0
-    line: 14
-  TXen: # GPIO1_C2 (physical 33)
-    pin: 50
-    gpiochip: 1
-    line: 18
-  RXen: # GPIO1_D2 (physical 32)
-    pin: 58
-    gpiochip: 1
-    line: 26
-  DIO3_TCXO_VOLTAGE: true
-  # Only for E22-900M33S:
-  # Limit the output power to 8 dBm
-  # SX126X_MAX_POWER: 8
-  spidev: spidev0.0
@@ -1,33 +0,0 @@
-# MeshAdv Mini E22-900M22S
-# https://github.com/chrismyers2000/MeshAdv-Mini
-Meta:
-  name: MeshAdv Mini E22-900M22S
-  support: community
-  compatible:
-    - luckfox-lyra-zero-w # Armbian
-
-Lora:
-  Module: sx1262 # Ebyte E22-900M22S
-  CS: # GPIO0_B2_d (phys 24, RPi CE0)
-    pin: 10
-    gpiochip: 0
-    line: 10
-  IRQ: # GPIO1_D1_d (phys 36, RPi GPIO16)
-    pin: 57
-    gpiochip: 1
-    line: 25
-  Busy: # GPIO0_C1_d (phys 38, RPi GPIO20)
-    pin: 17
-    gpiochip: 0
-    line: 17
-  Reset: # GPIO0_B4_d (phys 18, RPi GPIO24)
-    pin: 12
-    gpiochip: 0
-    line: 12
-  RXen: # GPIO1_D2_d (phys 32, RPi GPIO12)
-    pin: 58
-    gpiochip: 1
-    line: 26
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  spidev: spidev0.0
@@ -1,38 +0,0 @@
-Meta:
-  name: RAK6421 + RAK13300 Slot 1
-  support: community # Promote when tested
-  compatible:
-    - luckfox-lyra-zero-w # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO0_A5 (IO6)
-    pin: 5
-    gpiochip: 0
-    line: 5
-  Reset: # GPIO1_D1 (IO4)
-    pin: 57
-    gpiochip: 1
-    line: 25
-  Busy: # GPIO0_B4 (IO5)
-    pin: 12
-    gpiochip: 0
-    line: 12
-  # Ant_sw: # GPIO1_C2 (IO3)
-  #   pin: 50
-  #   gpiochip: 1
-  #   line: 18
-  Enable_Pins:
-    - pin: 58 # GPIO1_D2
-      gpiochip: 1
-      line: 26
-    - pin: 50 # GPIO1_C2
-      gpiochip: 1
-      line: 18
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
-  spidev: spidev0.0
-  # CS: # GPIO0_B2
-  #   pin: 10
-  #   gpiochip: 0
-  #   line: 10
@@ -1,36 +0,0 @@
-Meta:
-  name: RAK6421 + RAK13300 Slot 2
-  support: community # Promote when tested
-  compatible:
-    - luckfox-lyra-zero-w # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO0_B6 (IO6)
-    pin: 14
-    gpiochip: 0
-    line: 14
-  Reset: # GPIO0_B4 (IO4)
-    pin: 12
-    gpiochip: 0
-    line: 12
-  Busy: # GPIO1_C0 (IO5)
-    pin: 48
-    gpiochip: 1
-    line: 16
-  # Ant_sw: # GPIO0_B5 (IO3)
-  #   pin: 13
-  #   gpiochip: 0
-  #   line: 13
-  Enable_Pins:
-    - pin: 51 # GPIO1_C3
-      gpiochip: 1
-      line: 19
-    - pin: 13 # GPIO0_B5
-      gpiochip: 0
-      line: 13
-  spidev: spidev0.1
-  # CS: # GPIO0_B1
-  #   pin: 9
-  #   gpiochip: 0
-  #   line: 9
@@ -1,39 +0,0 @@
-Meta:
-  name: RAK6421 + RAK13300 Slot 1
-  support: community # Promote when tested
-  compatible:
-    - luckfox-lyra-zero-w # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO0_A5 (IO6)
-    pin: 5
-    gpiochip: 0
-    line: 5
-  Reset: # GPIO1_D1 (IO4)
-    pin: 57
-    gpiochip: 1
-    line: 25
-  Busy: # GPIO0_B4 (IO5)
-    pin: 12
-    gpiochip: 0
-    line: 12
-  # Ant_sw: # GPIO1_C2 (IO3)
-  #   pin: 50
-  #   gpiochip: 1
-  #   line: 18
-  Enable_Pins:
-    - pin: 58 # GPIO1_D2
-      gpiochip: 1
-      line: 26
-    - pin: 50 # GPIO1_C2
-      gpiochip: 1
-      line: 18
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
-  spidev: spidev0.0
-  # CS: # GPIO0_B2
-  #   pin: 10
-  #   gpiochip: 0
-  #   line: 10
-  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]
@@ -1,37 +0,0 @@
-Meta:
-  name: RAK6421 + RAK13300 Slot 2
-  support: community # Promote when tested
-  compatible:
-    - luckfox-lyra-zero-w # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO0_B6 (IO6)
-    pin: 14
-    gpiochip: 0
-    line: 14
-  Reset: # GPIO0_B4 (IO4)
-    pin: 12
-    gpiochip: 0
-    line: 12
-  Busy: # GPIO1_C0 (IO5)
-    pin: 48
-    gpiochip: 1
-    line: 16
-  # Ant_sw: # GPIO0_B5 (IO3)
-  #   pin: 13
-  #   gpiochip: 0
-  #   line: 13
-  Enable_Pins:
-    - pin: 51 # GPIO1_C3
-      gpiochip: 1
-      line: 19
-    - pin: 13 # GPIO0_B5
-      gpiochip: 0
-      line: 13
-  spidev: spidev0.1
-  # CS: # GPIO0_B1
-  #   pin: 9
-  #   gpiochip: 0
-  #   line: 9
-  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]
@@ -1,30 +0,0 @@
-Meta:
-  name: Waveshare SX1262
-  support: deprecated
-  compatible:
-    - luckfox-lyra-zero-w # Armbian
-
-Lora:
-  Module: sx1262  # Waveshare SX126X XXXM
-  DIO2_AS_RF_SWITCH: true
-  CS: # GPIO0_C2 (physical 40)
-    pin: 18
-    gpiochip: 0
-    line: 18
-  IRQ: # GPIO1_D1 (physical 36)
-    pin: 57
-    gpiochip: 1
-    line: 25
-  Busy: # GPIO0_C1 (physical 38)
-    pin: 17
-    gpiochip: 0
-    line: 17
-  Reset: # GPIO0_B6 (physical 12)
-    pin: 14
-    gpiochip: 0
-    line: 14
-  SX126X_ANT_SW: # GPIO1_B3 (physical 31)
-    pin: 43
-    gpiochip: 1
-    line: 11
-  spidev: spidev0.0
@@ -1,41 +0,0 @@
-# !! 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
@@ -1,35 +0,0 @@
-# !! 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
@@ -1,40 +0,0 @@
-# !! 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
@@ -1,38 +0,0 @@
-# !! 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
@@ -1,41 +0,0 @@
-# !! 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]
@@ -1,39 +0,0 @@
-# !! 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]
@@ -1,32 +0,0 @@
-# !! 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
@@ -43,7 +43,7 @@ for pio_env in pio_envs:
  env = {
    "ci": {"board": pio_env, "platform": env_platform},
    "board_level": cfg.get(f"env:{pio_env}", "board_level", default=None),
-    "board_check": cfg.get(f"env:{pio_env}", "board_check", default="false").strip().lower() == "true",
+    "board_check": bool(cfg.get(f"env:{pio_env}", "board_check", default=False)),
  }
  all_envs.append(env)

@@ -87,9 +87,6 @@
  </screenshots>

  <releases>
-    <release version="2.7.22" date="2026-04-06">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.22</url>
-    </release>
    <release version="2.7.21" date="2026-03-11">
      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.21</url>
    </release>
@@ -1,29 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "esp32_out.ld"
-    },
-    "core": "esp32",
-    "extra_flags": "-DARDUINO_T_Beam",
-    "f_cpu": "240000000L",
-    "f_flash": "40000000L",
-    "flash_mode": "dio",
-    "mcu": "esp32",
-    "variant": "tbeam"
-  },
-  "connectivity": ["wifi", "bluetooth", "can", "ethernet"],
-  "debug": {
-    "openocd_board": "esp-wroom-32.cfg"
-  },
-  "frameworks": ["arduino", "espidf"],
-  "name": "TTGO T-Beam (PSRAM Disabled)",
-  "upload": {
-    "flash_size": "4MB",
-    "maximum_ram_size": 1310720,
-    "maximum_size": 4194304,
-    "require_upload_port": true,
-    "speed": 460800
-  },
-  "url": "https://github.com/LilyGO/TTGO-T-Beam",
-  "vendor": "TTGO"
-}
@@ -1,9 +1,3 @@
-meshtasticd (2.7.22.0) unstable; urgency=medium
-
-  * Version 2.7.22
-
- -- GitHub Actions <github-actions[bot]@users.noreply.github.com>  Mon, 06 Apr 2026 11:34:12 +0000
-
 meshtasticd (2.7.21.0) unstable; urgency=medium

  * Version 2.7.21
@@ -77,10 +77,10 @@ lib_deps =
 	https://github.com/meshtastic/TinyGPSPlus/archive/71a82db35f3b973440044c476d4bcdc673b104f4.zip
 	# renovate: datasource=git-refs depName=meshtastic-ArduinoThread packageName=https://github.com/meshtastic/ArduinoThread gitBranch=master
 	https://github.com/meshtastic/ArduinoThread/archive/b841b0415721f1341ea41cccfb4adccfaf951567.zip
-	# renovate: datasource=github-tags depName=Nanopb packageName=nanopb/nanopb
-	https://github.com/nanopb/nanopb/archive/refs/tags/nanopb-0.4.9.1.zip
-	# renovate: datasource=github-tags depName=ErriezCRC32 packageName=Erriez/ErriezCRC32
-	https://github.com/Erriez/ErriezCRC32/archive/refs/tags/1.0.1.zip
+	# renovate: datasource=custom.pio depName=Nanopb packageName=nanopb/library/Nanopb
+	nanopb/Nanopb@0.4.91
+	# renovate: datasource=custom.pio depName=ErriezCRC32 packageName=erriez/library/ErriezCRC32
+	erriez/ErriezCRC32@1.0.1

 ; Used for the code analysis in PIO Home / Inspect
 check_tool = cppcheck
@@ -95,153 +95,143 @@ check_flags =
 framework = arduino
 lib_deps =
 	${env.lib_deps}
-	# renovate: datasource=github-tags depName=NonBlockingRTTTL packageName=end2endzone/NonBlockingRTTTL
-	https://github.com/end2endzone/NonBlockingRTTTL/archive/refs/tags/1.4.0.zip
+	# renovate: datasource=custom.pio depName=NonBlockingRTTTL packageName=end2endzone/library/NonBlockingRTTTL
+	end2endzone/NonBlockingRTTTL@1.4.0
 build_unflags =
 	-std=c++11
 	-std=gnu++11
 build_flags = ${env.build_flags} -Os
 	-std=gnu++17
-build_src_filter = ${env.build_src_filter} -<platform/portduino/> -<graphics/niche/> -<modules/Native/>
+build_src_filter = ${env.build_src_filter} -<platform/portduino/> -<graphics/niche/>

 ; Common libs for communicating over TCP/IP networks such as MQTT
 [networking_base]
 lib_deps =
-	# renovate: datasource=github-tags depName=TBPubSubClient packageName=thingsboard/pubsubclient
-	https://github.com/thingsboard/pubsubclient/archive/refs/tags/v2.12.1.zip
-	# renovate: datasource=github-tags depName=NTPClient packageName=arduino-libraries/NTPClient
-	https://github.com/arduino-libraries/NTPClient/archive/refs/tags/3.2.1.zip
+	# renovate: datasource=custom.pio depName=TBPubSubClient packageName=thingsboard/library/TBPubSubClient
+	thingsboard/TBPubSubClient@2.12.1
+	# renovate: datasource=custom.pio depName=NTPClient packageName=arduino-libraries/library/NTPClient
+	arduino-libraries/NTPClient@3.2.1

 ; Extra TCP/IP networking libs for supported devices
 [networking_extra]
 lib_deps =
-	# renovate: datasource=github-tags depName=Syslog packageName=arcao/Syslog
-	https://github.com/arcao/Syslog/archive/refs/tags/v2.0.zip
+	# renovate: datasource=custom.pio depName=Syslog packageName=arcao/library/Syslog
+	arcao/Syslog@2.0.0

 [radiolib_base]
 lib_deps =
-	# renovate: datasource=github-tags depName=RadioLib packageName=jgromes/RadioLib
-	https://github.com/jgromes/RadioLib/archive/refs/tags/7.6.0.zip
+	# renovate: datasource=custom.pio depName=RadioLib packageName=jgromes/library/RadioLib
+	jgromes/RadioLib@7.6.0

 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/1897dd17fceb1f101bb1a3245680aa3439edcfdd.zip
+	https://github.com/meshtastic/device-ui/archive/499f3a806d729e49ea5148a1633e9b64ae8c2d2e.zip

 ; Common libs for environmental measurements in telemetry module
 [environmental_base]
 lib_deps =
-	# 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=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=git-refs depName=INA3221 packageName=https://github.com/sgtwilko/INA3221 gitBranch=FixOverflow
 	https://github.com/sgtwilko/INA3221/archive/bb03d7e9bfcc74fc798838a54f4f99738f29fc6a.zip
-	# 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=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=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=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
+	# 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

 ; Common environmental sensor libraries (not included in native / portduino)
 [environmental_extra_common]
 lib_deps =
-	# 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=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 SHTC3 packageName=adafruit/library/Adafruit SHTC3 Library
+	adafruit/Adafruit SHTC3 Library@1.0.2
+	# renovate: datasource=custom.pio depName=Adafruit LPS2X packageName=adafruit/library/Adafruit LPS2X
+	adafruit/Adafruit LPS2X@2.0.6
+	# renovate: datasource=custom.pio depName=Adafruit SHT31 packageName=adafruit/library/Adafruit SHT31 Library
+	adafruit/Adafruit SHT31 Library@2.2.2
+	# 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=Adafruit SHT4x packageName=adafruit/library/Adafruit SHT4x Library
+	adafruit/Adafruit SHT4x Library@1.0.5
+	# renovate: datasource=custom.pio depName=SparkFun Qwiic Scale NAU7802 packageName=sparkfun/library/SparkFun Qwiic Scale NAU7802 Arduino Library
+	sparkfun/SparkFun Qwiic Scale NAU7802 Arduino Library@1.0.6
 	# renovate: datasource=custom.pio depName=ClosedCube OPT3001 packageName=closedcube/library/ClosedCube OPT3001
 	closedcube/ClosedCube OPT3001@1.1.2
 	# 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=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
-	# renovate: datasource=github-tags depName=arduino-sht packageName=sensirion/arduino-sht
-	https://github.com/Sensirion/arduino-sht/archive/refs/tags/v1.2.6.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

 ; Environmental sensors with BSEC2 (Bosch proprietary IAQ)
 [environmental_extra]
 lib_deps =
 	${environmental_extra_common.lib_deps}
-	# 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
+	# 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

 ; 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=github-tags depName=Adafruit_BME680 packageName=adafruit/Adafruit_BME680
-	https://github.com/adafruit/Adafruit_BME680/archive/refs/tags/2.0.6.zip
+	# renovate: datasource=custom.pio depName=Adafruit_BME680 packageName=adafruit/library/Adafruit BME680 Library
+	adafruit/Adafruit BME680 Library@2.0.6
@@ -4,8 +4,6 @@
    ":dependencyDashboard",
    ":semanticCommitTypeAll(chore)",
    ":ignoreModulesAndTests",
-    ":noUnscheduledUpdates",
-    "schedule:daily",
    "group:recommended",
    "replacements:all",
    "workarounds:all"
@@ -98,6 +98,7 @@ Syslog &Syslog::logMask(uint8_t priMask)

 void Syslog::enable()
 {
+    this->_client->begin(this->_port);
    this->_enabled = true;
 }

@@ -165,21 +166,14 @@ inline bool Syslog::_sendLog(uint16_t pri, const char *appName, const char *mess
    if ((pri & LOG_FACMASK) == 0)
        pri = LOG_MAKEPRI(LOG_FAC(this->_priDefault), pri);

-    // W5100S: acquire UDP socket on-demand to avoid permanent socket consumption
-    if (!this->_client->begin(this->_port)) {
-        return false;
-    }
-
    if (this->_server != NULL) {
        result = this->_client->beginPacket(this->_server, this->_port);
    } else {
        result = this->_client->beginPacket(this->_ip, this->_port);
    }

-    if (result != 1) {
-        this->_client->stop();
+    if (result != 1)
        return false;
-    }

    this->_client->print('<');
    this->_client->print(pri);
@@ -199,8 +193,6 @@ inline bool Syslog::_sendLog(uint16_t pri, const char *appName, const char *mess
    this->_client->print(message);
    this->_client->endPacket();

-    this->_client->stop(); // W5100S: release UDP socket for other services
-
    return true;
 }

@@ -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";
    }
@@ -35,11 +35,6 @@
 #include "nrfx_power.h"
 #endif

-#if defined(ARCH_NRF52)
-#include "Nrf52SaadcLock.h"
-#include "concurrency/LockGuard.h"
-#endif
-
 #if defined(DEBUG_HEAP_MQTT) && !MESHTASTIC_EXCLUDE_MQTT
 #include "mqtt/MQTT.h"
 #include "target_specific.h"
@@ -333,9 +328,6 @@ class AnalogBatteryLevel : public HasBatteryLevel
            scaled = esp_adc_cal_raw_to_voltage(raw, adc_characs);
            scaled *= operativeAdcMultiplier;
 #else // block for all other platforms
-#ifdef ARCH_NRF52
-            concurrency::LockGuard saadcGuard(concurrency::nrf52SaadcLock);
-#endif
            for (uint32_t i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
                raw += analogRead(BATTERY_PIN);
            }
@@ -137,7 +137,7 @@ void RedirectablePrint::log_to_serial(const char *logLevel, const char *format,
        if (color) {
            ::printf("\u001b[0m");
        }
-        ::printf("| %02d:%02d:%02d %u.%03u ", hour, min, sec, millis() / 1000, millis() % 1000);
+        ::printf("| %02d:%02d:%02d %u ", hour, min, sec, millis() / 1000);
 #else
        printf("%s ", logLevel);
        if (color) {
@@ -151,7 +151,7 @@ void RedirectablePrint::log_to_serial(const char *logLevel, const char *format,
        if (color) {
            ::printf("\u001b[0m");
        }
-        ::printf("| ??:??:?? %u.%03u ", millis() / 1000, millis() % 1000);
+        ::printf("| ??:??:?? %u ", millis() / 1000);
 #else
        printf("%s ", logLevel);
        if (color) {
@@ -1,85 +1,10 @@
 #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() {}

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

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

 } // namespace concurrency

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

 #include "../freertosinc.h"

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

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

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

  public:
    BinarySemaphorePosix();
@@ -36,4 +27,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
@@ -306,6 +301,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TCA9535_ADDR 0x20
 #define TCA9555_ADDR 0x26

+// used for display brightness control
+#define STC8H1K28_ADDR 0x30
+
 // -----------------------------------------------------------------------------
 // Touchscreen
 // -----------------------------------------------------------------------------
@@ -515,7 +513,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,
@@ -60,6 +63,7 @@ class ScanI2C
        NAU7802,
        FT6336U,
        STK8BAXX,
+        STC8H1K28,
        ICM20948,
        SCD4X,
        MAX30102,
@@ -91,8 +95,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:                                                                                                                   \
@@ -346,6 +304,8 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
 #endif
 #ifdef HAS_LP5562
                SCAN_SIMPLE_CASE(LP5562_ADDR, LP5562, "LP5562", (uint8_t)addr.address);
+#else
+                SCAN_SIMPLE_CASE(STC8H1K28_ADDR, LP5562, "STC8H1K28", (uint8_t)addr.address);
 #endif
            case XPOWERS_AXP192_AXP2101_ADDRESS:
                // Do we have the axp2101/192 or the TCA8418
@@ -413,7 +373,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 +389,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 +450,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 +677,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 +692,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();
-    const uint8_t *prev = epaper->previousBuffer(); // may be NULL on first init
+    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,22 +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.
-            // TODO: change this to either use the validateLoraConfig() logic or at least check the region for wideLora
-            // rather than a hardcoded check for LORA_24.
-            if (selectedRegion == meshtastic_Config_LoRaConfig_RegionCode_LORA_24 &&
-                !(RadioLibInterface::instance && RadioLibInterface::instance->wideLora())) {
-                LOG_WARN("Radio hardware does not support 2.4 GHz; ignoring region 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;
@@ -192,6 +199,7 @@ void menuHandler::LoraRegionPicker(uint32_t duration)
            }

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

    bannerOptions.durationMs = duration;
@@ -257,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;
@@ -310,6 +307,7 @@ void menuHandler::FrequencySlotPicker()

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

    screen->showOverlayBanner(bannerOptions);
@@ -348,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);
@@ -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

@@ -299,7 +299,6 @@ void InputBroker::Init()
    // Buttons. Moved here cause we need NodeDB to be initialized
    // If your variant.h has a BUTTON_PIN defined, go ahead and define BUTTON_ACTIVE_LOW and BUTTON_ACTIVE_PULLUP
    UserButtonThread = new ButtonThread("UserButton");
-#if !MESHTASTIC_EXCLUDE_SCREEN
    if (screen) {
        ButtonConfig userConfig;
        userConfig.pinNumber = (uint8_t)_pinNum;
@@ -318,9 +317,7 @@ void InputBroker::Init()
        userConfig.longPressTime = 500;
        userConfig.longLongPress = INPUT_BROKER_SHUTDOWN;
        UserButtonThread->initButton(userConfig);
-    } else
-#endif
-    {
+    } else {
        ButtonConfig userConfigNoScreen;
        userConfigNoScreen.pinNumber = (uint8_t)_pinNum;
        userConfigNoScreen.activeLow = BUTTON_ACTIVE_LOW;
@@ -382,13 +379,11 @@ void InputBroker::Init()
    }
 #endif // HAS_BUTTON
 #if ARCH_PORTDUINO
-    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
-        if (portduino_config.i2cdev != "") {
-            seesawRotary = new SeesawRotary("SeesawRotary");
-            if (!seesawRotary->init()) {
-                delete seesawRotary;
-                seesawRotary = nullptr;
-            }
+    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR && portduino_config.i2cdev != "") {
+        seesawRotary = new SeesawRotary("SeesawRotary");
+        if (!seesawRotary->init()) {
+            delete seesawRotary;
+            seesawRotary = nullptr;
        }
        aLinuxInputImpl = new LinuxInputImpl();
        aLinuxInputImpl->init();
@@ -4,7 +4,6 @@
 #include <memory>

 #if !(MESHTASTIC_EXCLUDE_PKI)
-#include "HardwareRNG.h"
 #include "NodeDB.h"
 #include "aes-ccm.h"
 #include "meshUtils.h"
@@ -27,15 +26,6 @@ void CryptoEngine::generateKeyPair(uint8_t *pubKey, uint8_t *privKey)
 {
    // Mix in any randomness we can, to make key generation stronger.
    CryptRNG.begin(optstr(APP_VERSION));
-
-    uint8_t hardwareEntropy[64] = {0};
-    if (HardwareRNG::fill(hardwareEntropy, sizeof(hardwareEntropy), true)) {
-        CryptRNG.stir(hardwareEntropy, sizeof(hardwareEntropy));
-    } else {
-        LOG_WARN("Hardware entropy unavailable, falling back to software RNG");
-    }
-    memset(hardwareEntropy, 0, sizeof(hardwareEntropy));
-
    if (myNodeInfo.device_id.size == 16) {
        CryptRNG.stir(myNodeInfo.device_id.bytes, myNodeInfo.device_id.size);
    }
@@ -71,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 / 2) // 12 hours between identical positions
-
 #ifdef USERPREFS_RINGTONE_NAG_SECS
 #define default_ringtone_nag_secs USERPREFS_RINGTONE_NAG_SECS
 #else
@@ -1,159 +0,0 @@
-#include "HardwareRNG.h"
-
-#include <algorithm>
-#include <cstring>
-#include <random>
-
-#include "configuration.h"
-
-#if HAS_RADIO
-#include "RadioLibInterface.h"
-#endif
-
-#if defined(ARCH_NRF52)
-#include <Adafruit_nRFCrypto.h>
-extern Adafruit_nRFCrypto nRFCrypto;
-#elif defined(ARCH_ESP32)
-#include <esp_system.h>
-#elif defined(ARCH_RP2040)
-#include <Arduino.h>
-#elif defined(ARCH_PORTDUINO)
-#include <random>
-#include <sys/random.h>
-#include <unistd.h>
-#endif
-
-namespace HardwareRNG
-{
-
-namespace
-{
-void fillWithRandomDevice(uint8_t *buffer, size_t length)
-{
-    std::random_device rd;
-    size_t offset = 0;
-    while (offset < length) {
-        uint32_t value = rd();
-        size_t toCopy = std::min(length - offset, sizeof(value));
-        memcpy(buffer + offset, &value, toCopy);
-        offset += toCopy;
-    }
-}
-
-#if HAS_RADIO
-bool mixWithLoRaEntropy(uint8_t *buffer, size_t length)
-{
-    // Only attempt to pull entropy from the modem if it is initialized and exposes the helper.
-    // When the radio stack is disabled or has not yet been configured, we simply skip this step
-    // and return false so callers know no extra mixing occurred.
-    RadioLibInterface *radio = RadioLibInterface::instance;
-    if (!radio) {
-        LOG_ERROR("No radio instance available to provide entropy");
-        return false;
-    }
-
-    constexpr size_t chunkSize = 16;
-    uint8_t scratch[chunkSize];
-    size_t offset = 0;
-    bool mixed = false;
-
-    while (offset < length) {
-        size_t toCopy = std::min(length - offset, chunkSize);
-
-        // randomBytes() returns false if the modem does not support it or is not ready
-        // (for instance, when the radio is powered down). We break immediately to avoid
-        // blocking or returning partially-filled entropy and simply report failure.
-        if (!radio->randomBytes(scratch, toCopy)) {
-            break;
-        }
-
-        for (size_t i = 0; i < toCopy; ++i) {
-            buffer[offset + i] ^= scratch[i];
-        }
-
-        mixed = true;
-        offset += toCopy;
-    }
-
-    // Avoid leaving the modem-sourced bytes sitting on the stack longer than needed.
-    if (mixed) {
-        memset(scratch, 0, sizeof(scratch));
-    }
-
-    return mixed;
-}
-#endif
-} // namespace
-
-bool fill(uint8_t *buffer, size_t length, bool useRadioEntropy)
-{
-    if (!buffer || length == 0) {
-        return false;
-    }
-
-    bool filled = false;
-
-#if defined(ARCH_NRF52)
-    // The Nordic SDK RNG provides cryptographic-quality randomness backed by hardware.
-    nRFCrypto.begin();
-    auto result = nRFCrypto.Random.generate(buffer, length);
-    nRFCrypto.end();
-    filled = result;
-#elif defined(ARCH_ESP32)
-    // ESP32 exposes a true RNG via esp_fill_random().
-    esp_fill_random(buffer, length);
-    filled = true;
-#elif defined(ARCH_RP2040)
-    // RP2040 has a hardware random number generator accessible through the Arduino core.
-    size_t offset = 0;
-    while (offset < length) {
-        uint32_t value = rp2040.hwrand32();
-        size_t toCopy = std::min(length - offset, sizeof(value));
-        memcpy(buffer + offset, &value, toCopy);
-        offset += toCopy;
-    }
-    filled = true;
-#elif defined(ARCH_PORTDUINO)
-    // Prefer the host OS RNG first when running under Portduino.
-    ssize_t generated = ::getrandom(buffer, length, 0);
-    if (generated == static_cast<ssize_t>(length)) {
-        filled = true;
-    }
-
-    if (!filled) {
-        fillWithRandomDevice(buffer, length);
-        filled = true;
-    }
-#endif
-
-    if (!filled) {
-        // As a last resort, fall back to std::random_device. This should only be reached
-        // if a platform-specific source was unavailable.
-        fillWithRandomDevice(buffer, length);
-        filled = true;
-    }
-
-#if HAS_RADIO
-    if (useRadioEntropy) {
-        // Best-effort: if the radio is active and can provide modem entropy, XOR it over the
-        // buffer to improve overall quality. We consider the filling a success if either a
-        // good platform RNG or the modem RNG provided data, so we return true as long as at
-        // least one of those steps succeeded.
-        filled = mixWithLoRaEntropy(buffer, length) || filled;
-    }
-#endif
-
-    return filled;
-}
-
-bool seed(uint32_t &seedOut)
-{
-    uint32_t candidate = 0;
-    if (!fill(reinterpret_cast<uint8_t *>(&candidate), sizeof(candidate), true)) {
-        return false;
-    }
-    seedOut = candidate;
-    return true;
-}
-
-} // namespace HardwareRNG
@@ -1,28 +0,0 @@
-#pragma once
-
-#include <cstddef>
-#include <cstdint>
-
-namespace HardwareRNG
-{
-
-/**
- * Fill the provided buffer with random bytes sourced from the most
- * appropriate hardware-backed RNG available on the current platform.
- *
- * @param buffer Destination buffer for random bytes
- * @param length Number of bytes to write
- * @param useRadioEntropy If true, attempt to mix radio entropy into the output as well.
- * @return true if the buffer was fully populated with entropy, false on failure
- */
-bool fill(uint8_t *buffer, size_t length, bool useRadioEntropy = false);
-
-/**
- * Populate a 32-bit seed value with hardware-backed randomness where possible.
- *
- * @param seedOut Destination for the generated seed value
- * @return true if a seed was produced from a reliable entropy source
- */
-bool seed(uint32_t &seedOut);
-
-} // namespace HardwareRNG
@@ -71,10 +71,12 @@ template <typename T> bool LR11x0Interface<T>::init()

    RadioLibInterface::init();

-    if (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_LORA_24) { // clamp if wide freq range
-        limitPower(LR1120_MAX_POWER);
-    } else {
-        limitPower(LR1110_MAX_POWER); // default clamp for non-wide freq range
+    limitPower(LR1110_MAX_POWER);
+
+    if ((power > LR1120_MAX_POWER) &&
+        (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) { // clamp again if wide freq range
+        power = LR1120_MAX_POWER;
+        preambleLength = 12; // 12 is the default for operation above 2GHz
    }

 #ifdef LR11X0_RF_SWITCH_SUBGHZ
@@ -175,12 +177,6 @@ template <typename T> bool LR11x0Interface<T>::reconfigure()
    err = lora.setSyncWord(syncWord);
    assert(err == RADIOLIB_ERR_NONE);

-    if (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_LORA_24) { // clamp if wide freq range
-        limitPower(LR1120_MAX_POWER);
-    } else {
-        limitPower(LR1110_MAX_POWER); // default clamp for non-wide freq range
-    }
-
    err = lora.setPreambleLength(preambleLength);
    assert(err == RADIOLIB_ERR_NONE);

@@ -188,14 +184,14 @@ template <typename T> bool LR11x0Interface<T>::reconfigure()
    if (err != RADIOLIB_ERR_NONE)
        RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);

+    if (power > LR1110_MAX_POWER) // This chip has lower power limits than some
+        power = LR1110_MAX_POWER;
+    if ((power > LR1120_MAX_POWER) && (config.lora.region == meshtastic_Config_LoRaConfig_RegionCode_LORA_24)) // 2.4G power limit
+        power = LR1120_MAX_POWER;
+
    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");
@@ -161,18 +145,6 @@ bool NextHopRouter::perhapsRebroadcast(const meshtastic_MeshPacket *p)
                        tosend->hop_start -= (tosend->hop_limit - 2);
                        tosend->hop_limit = 2;
                    }
-#elif ARCH_PORTDUINO
-                    if (tosend->which_payload_variant == meshtastic_MeshPacket_decoded_tag &&
-                        portduino_config.nohop_ports.size()) {
-                        for (const auto &port : portduino_config.nohop_ports) {
-                            if (port == tosend->decoded.portnum) {
-                                LOG_DEBUG("0-hopping portnum %u", tosend->decoded.portnum);
-                                tosend->hop_start -= tosend->hop_limit;
-                                tosend->hop_limit = 0;
-                                break;
-                            }
-                        }
-                    }
 #endif

                    if (p->next_hop == NO_NEXT_HOP_PREFERENCE) {
@@ -819,7 +819,7 @@ void NodeDB::installDefaultModuleConfig()
    moduleConfig.has_store_forward = true;
    moduleConfig.has_telemetry = true;
    moduleConfig.has_external_notification = true;
-#if defined(PIN_BUZZER) || defined(PIN_VIBRATION) || defined(LED_NOTIFICATION) || defined(PCA_LED_NOTIFICATION)
+#if defined(PIN_BUZZER) || defined(PIN_VIBRATION) || defined(LED_NOTIFICATION)
    moduleConfig.external_notification.enabled = true;
 #endif
 #if defined(PIN_BUZZER)
@@ -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);
        }
@@ -17,4 +17,14 @@ template <class T> class PointerQueue : public TypedQueue<T *>

        return this->dequeue(&p, maxWait) ? p : nullptr;
    }
+
+#ifdef HAS_FREE_RTOS
+    // returns a ptr or null if the queue was empty
+    T *dequeuePtrFromISR(BaseType_t *higherPriWoken)
+    {
+        T *p;
+
+        return this->dequeueFromISR(&p, higherPriWoken) ? p : nullptr;
+    }
+#endif
 };
@@ -240,7 +240,8 @@ bool RF95Interface::reconfigure()
    if (err != RADIOLIB_ERR_NONE)
        RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);

-    limitPower(RF95_MAX_POWER);
+    if (power > RF95_MAX_POWER) // This chip has lower power limits than some
+        power = RF95_MAX_POWER;

 #ifdef USE_RF95_RFO
    err = lora->setOutputPower(power, true);
@@ -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,42 @@ 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, 100, 0, 16, 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 +159,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 +176,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 +185,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 +501,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;
@@ -626,9 +635,9 @@ uint32_t RadioInterface::getTxDelayMsecWeighted(meshtastic_MeshPacket *p)
 void printPacket(const char *prefix, const meshtastic_MeshPacket *p)
 {
 #if defined(DEBUG_PORT) && !defined(DEBUG_MUTE)
-    std::string out = DEBUG_PORT.mt_sprintf(
-        "%s (id=0x%08x fr=0x%08x to=0x%08x, transport = %u, WantAck=%d, HopLim=%d HopStart=%d Ch=0x%x", prefix, p->id, p->from,
-        p->to, p->transport_mechanism, p->want_ack, p->hop_limit, p->hop_start, p->channel);
+    std::string out =
+        DEBUG_PORT.mt_sprintf("%s (id=0x%08x fr=0x%08x to=0x%08x, transport = %u, WantAck=%d, HopLim=%d Ch=0x%x", prefix, p->id,
+                              p->from, p->to, p->transport_mechanism, p->want_ack, p->hop_limit, p->channel);
    if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
        auto &s = p->decoded;

@@ -740,7 +749,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,304 +772,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());
-
-    if (newRegion->wideLora) {                          // clamp if wide freq range
-        preambleLength = wideLoraPreambleLengthDefault; // 12 is the default for operation above 2GHz
-    } else {
-        preambleLength =
-            preambleLengthDefault; // 8 is default, but we use longer to increase the amount of sleep time when receiving
-    }

    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;
@@ -1174,4 +992,4 @@ size_t RadioInterface::beginSending(meshtastic_MeshPacket *p)

    sendingPacket = p;
    return p->encrypted.size + sizeof(PacketHeader);
-}
+}
@@ -92,20 +92,15 @@ class RadioInterface
    uint8_t sf = 9;
    uint8_t cr = 5;

-    static constexpr uint8_t NUM_SYM_CAD =
-        2; // Number of symbols used for CAD, 2 is the default since RadioLib 6.3.0 as per AN1200.48
-    static constexpr uint8_t NUM_SYM_CAD_24GHZ =
-        4; // Number of symbols used for CAD in 2.4 GHz, 4 is recommended in AN1200.22 of SX1280
+    const uint8_t NUM_SYM_CAD = 2;       // Number of symbols used for CAD, 2 is the default since RadioLib 6.3.0 as per AN1200.48
+    const uint8_t NUM_SYM_CAD_24GHZ = 4; // Number of symbols used for CAD in 2.4 GHz, 4 is recommended in AN1200.22 of SX1280
    uint32_t slotTimeMsec = computeSlotTimeMsec();
-    uint16_t preambleLength = 16; // 8 is default, but we use longer to increase the amount of sleep time when receiving
-    static constexpr uint16_t preambleLengthDefault =
-        16; // 8 is default, but we use longer to increase the amount of sleep time when receiving
-    static constexpr uint16_t wideLoraPreambleLengthDefault = 12; // 12 is default for wide Lora
-    uint32_t preambleTimeMsec = 165;                              // calculated on startup, this is the default for LongFast
-    static constexpr uint32_t PROCESSING_TIME_MSEC =
-        4500;                           // time to construct, process and construct a packet again (empirically determined)
-    static constexpr uint8_t CWmin = 3; // minimum CWsize
-    static constexpr uint8_t CWmax = 8; // maximum CWsize
+    uint16_t preambleLength = 16;    // 8 is default, but we use longer to increase the amount of sleep time when receiving
+    uint32_t preambleTimeMsec = 165; // calculated on startup, this is the default for LongFast
+    const uint32_t PROCESSING_TIME_MSEC =
+        4500;                // time to construct, process and construct a packet again (empirically determined)
+    const uint8_t CWmin = 3; // minimum CWsize
+    const uint8_t CWmax = 8; // maximum CWsize

    meshtastic_MeshPacket *sendingPacket = NULL; // The packet we are currently sending
    uint32_t lastTxStart = 0L;
@@ -132,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)
@@ -239,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()

@@ -246,24 +246,6 @@ bool RadioLibInterface::findInTxQueue(NodeNum from, PacketId id)
    return txQueue.find(from, id);
 }

-bool RadioLibInterface::randomBytes(uint8_t *buffer, size_t length)
-{
-    if (!buffer || length == 0 || !iface) {
-        return false;
-    }
-
-    // Older RadioLib versions only expose random(min, max), so fill the buffer byte-by-byte.
-    for (size_t i = 0; i < length; ++i) {
-        int32_t value = iface->random(0, 255);
-        if (value < 0) {
-            return false;
-        }
-        buffer[i] = static_cast<uint8_t>(value & 0xFF);
-    }
-
-    return true;
-}
-
 /** radio helper thread callback.
 We never immediately transmit after any operation (either Rx or Tx). Instead we should wait a random multiple of
 'slotTimes' (see definition in RadioInterface.h) taken from a contention window (CW) to lower the chance of collision.
@@ -605,4 +587,4 @@ bool RadioLibInterface::startSend(meshtastic_MeshPacket *txp)

        return res == RADIOLIB_ERR_NONE;
    }
-}
+}
@@ -172,12 +172,6 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified
    /** Attempt to find a packet in the TxQueue. Returns true if the packet was found. */
    virtual bool findInTxQueue(NodeNum from, PacketId id) override;

-    /**
-     * Request randomness sourced from the LoRa modem, if supported by the active RadioLib interface.
-     * @return true if len bytes were produced, false otherwise.
-     */
-    bool randomBytes(uint8_t *buffer, size_t length);
-
  private:
    /** if we have something waiting to send, start a short (random) timer so we can come check for collision before actually
     * doing the transmit */
@@ -11,15 +11,11 @@
 #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
 #include "Default.h"
 #if ARCH_PORTDUINO
-#include "modules/Native/StoreForwardPlusPlus.h"
 #include "Throttle.h"
 #include "platform/portduino/PortduinoGlue.h"
 #endif
@@ -99,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)
@@ -384,12 +366,6 @@ ErrorCode Router::send(meshtastic_MeshPacket *p)
            abortSendAndNak(encodeResult, p);
            return encodeResult; // FIXME - this isn't a valid ErrorCode
        }
-#if ARCH_PORTDUINO
-        if (p_decoded->decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_APP &&
-            (p->from == 0 || p->from == nodeDB->getNodeNum()) && storeForwardPlusPlusModule && portduino_config.sfpp_enabled) {
-            storeForwardPlusPlusModule->handleEncrypted(p_decoded, p);
-        }
-#endif
 #if !MESHTASTIC_EXCLUDE_MQTT
        // Only publish to MQTT if we're the original transmitter of the packet
        if (moduleConfig.mqtt.enabled && isFromUs(p) && mqtt) {
@@ -789,22 +765,6 @@ void Router::handleReceived(meshtastic_MeshPacket *p, RxSource src)
            cancelSending(p->from, p->id);
            skipHandle = true;
        }
-#if ARCH_PORTDUINO
-        if (portduino_config.whitelist_enabled) {
-            bool allowed = false;
-            for (const auto &port : portduino_config.whitelist_ports) {
-                if (port == p->decoded.portnum) {
-                    allowed = true;
-                    break;
-                }
-            }
-            if (!allowed) {
-                LOG_DEBUG("Dropping packet not on Portduino Whitelist");
-                cancelSending(p->from, p->id);
-                skipHandle = true;
-            }
-        }
-#endif
    } else {
        printPacket("packet decoding failed or skipped (no PSK?)", p);
    }
@@ -898,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);
@@ -245,21 +245,14 @@ template <typename T> bool SX126xInterface<T>::reconfigure()
    if (err != RADIOLIB_ERR_NONE)
        RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);

-    limitPower(SX126X_MAX_POWER);
-    // Make sure we reach the minimum power supported to turn the chip on (-9dBm)
-    if (power < -9)
-        power = -9;
+    if (power > SX126X_MAX_POWER) // This chip has lower power limits than some
+        power = SX126X_MAX_POWER;

    err = lora.setOutputPower(power);
    if (err != RADIOLIB_ERR_NONE)
        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;
@@ -144,7 +144,8 @@ template <typename T> bool SX128xInterface<T>::reconfigure()
    if (err != RADIOLIB_ERR_NONE)
        RECORD_CRITICALERROR(meshtastic_CriticalErrorCode_INVALID_RADIO_SETTING);

-    limitPower(SX128X_MAX_POWER);
+    if (power > SX128X_MAX_POWER) // This chip has lower power limits than some
+        power = SX128X_MAX_POWER;

    err = lora.setOutputPower(power);
    if (err != RADIOLIB_ERR_NONE)
@@ -102,6 +102,7 @@ static int32_t reconnectETH()

 #ifndef DISABLE_NTP
            LOG_INFO("Start NTP time client");
+            timeClient.begin();
            timeClient.setUpdateInterval(60 * 60); // Update once an hour
 #endif

@@ -158,7 +159,6 @@ static int32_t reconnectETH()
            LOG_ERROR("NTP Update failed");
            ntp_renew = millis() + 300 * 1000; // failure, retry every 5 minutes
        }
-        timeClient.end(); // W5100S: release UDP socket for other services
    }
 #endif

@@ -24,18 +24,6 @@ PB_BIND(meshtastic_Contact, meshtastic_Contact, AUTO)
 PB_BIND(meshtastic_PLI, meshtastic_PLI, AUTO)


-PB_BIND(meshtastic_AircraftTrack, meshtastic_AircraftTrack, AUTO)
-
-
-PB_BIND(meshtastic_TAKPacketV2, meshtastic_TAKPacketV2, 2)
-
-
-
-
-
-
-
-



@@ -65,197 +65,6 @@ typedef enum _meshtastic_MemberRole {
    meshtastic_MemberRole_K9 = 8
 } meshtastic_MemberRole;

-/* CoT how field values.
- Represents how the coordinates were generated. */
-typedef enum _meshtastic_CotHow {
-    /* Unspecified */
-    meshtastic_CotHow_CotHow_Unspecified = 0,
-    /* Human entered */
-    meshtastic_CotHow_CotHow_h_e = 1,
-    /* Machine generated */
-    meshtastic_CotHow_CotHow_m_g = 2,
-    /* Human GPS/INS derived */
-    meshtastic_CotHow_CotHow_h_g_i_g_o = 3,
-    /* Machine relayed (imported from another system/gateway) */
-    meshtastic_CotHow_CotHow_m_r = 4,
-    /* Machine fused (corroborated from multiple sources) */
-    meshtastic_CotHow_CotHow_m_f = 5,
-    /* Machine predicted */
-    meshtastic_CotHow_CotHow_m_p = 6,
-    /* Machine simulated */
-    meshtastic_CotHow_CotHow_m_s = 7
-} meshtastic_CotHow;
-
-/* Well-known CoT event types.
- When the type is known, use the enum value for efficient encoding.
- For unknown types, set cot_type_id to CotType_Other and populate cot_type_str. */
-typedef enum _meshtastic_CotType {
-    /* Unknown or unmapped type, use cot_type_str */
-    meshtastic_CotType_CotType_Other = 0,
-    /* a-f-G-U-C: Friendly ground unit combat */
-    meshtastic_CotType_CotType_a_f_G_U_C = 1,
-    /* a-f-G-U-C-I: Friendly ground unit combat infantry */
-    meshtastic_CotType_CotType_a_f_G_U_C_I = 2,
-    /* a-n-A-C-F: Neutral aircraft civilian fixed-wing */
-    meshtastic_CotType_CotType_a_n_A_C_F = 3,
-    /* a-n-A-C-H: Neutral aircraft civilian helicopter */
-    meshtastic_CotType_CotType_a_n_A_C_H = 4,
-    /* a-n-A-C: Neutral aircraft civilian */
-    meshtastic_CotType_CotType_a_n_A_C = 5,
-    /* a-f-A-M-H: Friendly aircraft military helicopter */
-    meshtastic_CotType_CotType_a_f_A_M_H = 6,
-    /* a-f-A-M: Friendly aircraft military */
-    meshtastic_CotType_CotType_a_f_A_M = 7,
-    /* a-f-A-M-F-F: Friendly aircraft military fixed-wing fighter */
-    meshtastic_CotType_CotType_a_f_A_M_F_F = 8,
-    /* a-f-A-M-H-A: Friendly aircraft military helicopter attack */
-    meshtastic_CotType_CotType_a_f_A_M_H_A = 9,
-    /* a-f-A-M-H-U-M: Friendly aircraft military helicopter utility medium */
-    meshtastic_CotType_CotType_a_f_A_M_H_U_M = 10,
-    /* a-h-A-M-F-F: Hostile aircraft military fixed-wing fighter */
-    meshtastic_CotType_CotType_a_h_A_M_F_F = 11,
-    /* a-h-A-M-H-A: Hostile aircraft military helicopter attack */
-    meshtastic_CotType_CotType_a_h_A_M_H_A = 12,
-    /* a-u-A-C: Unknown aircraft civilian */
-    meshtastic_CotType_CotType_a_u_A_C = 13,
-    /* t-x-d-d: Tasking delete/disconnect */
-    meshtastic_CotType_CotType_t_x_d_d = 14,
-    /* a-f-G-E-S-E: Friendly ground equipment sensor */
-    meshtastic_CotType_CotType_a_f_G_E_S_E = 15,
-    /* a-f-G-E-V-C: Friendly ground equipment vehicle */
-    meshtastic_CotType_CotType_a_f_G_E_V_C = 16,
-    /* a-f-S: Friendly sea */
-    meshtastic_CotType_CotType_a_f_S = 17,
-    /* a-f-A-M-F: Friendly aircraft military fixed-wing */
-    meshtastic_CotType_CotType_a_f_A_M_F = 18,
-    /* a-f-A-M-F-C-H: Friendly aircraft military fixed-wing cargo heavy */
-    meshtastic_CotType_CotType_a_f_A_M_F_C_H = 19,
-    /* a-f-A-M-F-U-L: Friendly aircraft military fixed-wing utility light */
-    meshtastic_CotType_CotType_a_f_A_M_F_U_L = 20,
-    /* a-f-A-M-F-L: Friendly aircraft military fixed-wing liaison */
-    meshtastic_CotType_CotType_a_f_A_M_F_L = 21,
-    /* a-f-A-M-F-P: Friendly aircraft military fixed-wing patrol */
-    meshtastic_CotType_CotType_a_f_A_M_F_P = 22,
-    /* a-f-A-C-H: Friendly aircraft civilian helicopter */
-    meshtastic_CotType_CotType_a_f_A_C_H = 23,
-    /* a-n-A-M-F-Q: Neutral aircraft military fixed-wing drone */
-    meshtastic_CotType_CotType_a_n_A_M_F_Q = 24,
-    /* b-t-f: GeoChat message */
-    meshtastic_CotType_CotType_b_t_f = 25,
-    /* b-r-f-h-c: CASEVAC/MEDEVAC report */
-    meshtastic_CotType_CotType_b_r_f_h_c = 26,
-    /* b-a-o-pan: Ring the bell / alert all */
-    meshtastic_CotType_CotType_b_a_o_pan = 27,
-    /* b-a-o-opn: Troops in contact */
-    meshtastic_CotType_CotType_b_a_o_opn = 28,
-    /* b-a-o-can: Cancel alert */
-    meshtastic_CotType_CotType_b_a_o_can = 29,
-    /* b-a-o-tbl: 911 alert */
-    meshtastic_CotType_CotType_b_a_o_tbl = 30,
-    /* b-a-g: Geofence breach alert */
-    meshtastic_CotType_CotType_b_a_g = 31,
-    /* a-f-G: Friendly ground (generic) */
-    meshtastic_CotType_CotType_a_f_G = 32,
-    /* a-f-G-U: Friendly ground unit (generic) */
-    meshtastic_CotType_CotType_a_f_G_U = 33,
-    /* a-h-G: Hostile ground (generic) */
-    meshtastic_CotType_CotType_a_h_G = 34,
-    /* a-u-G: Unknown ground (generic) */
-    meshtastic_CotType_CotType_a_u_G = 35,
-    /* a-n-G: Neutral ground (generic) */
-    meshtastic_CotType_CotType_a_n_G = 36,
-    /* b-m-r: Route */
-    meshtastic_CotType_CotType_b_m_r = 37,
-    /* b-m-p-w: Route waypoint */
-    meshtastic_CotType_CotType_b_m_p_w = 38,
-    /* b-m-p-s-p-i: Self-position marker */
-    meshtastic_CotType_CotType_b_m_p_s_p_i = 39,
-    /* u-d-f: Freeform shape (line/polygon) */
-    meshtastic_CotType_CotType_u_d_f = 40,
-    /* u-d-r: Rectangle */
-    meshtastic_CotType_CotType_u_d_r = 41,
-    /* u-d-c-c: Circle */
-    meshtastic_CotType_CotType_u_d_c_c = 42,
-    /* u-rb-a: Range/bearing line */
-    meshtastic_CotType_CotType_u_rb_a = 43,
-    /* a-h-A: Hostile aircraft (generic) */
-    meshtastic_CotType_CotType_a_h_A = 44,
-    /* a-u-A: Unknown aircraft (generic) */
-    meshtastic_CotType_CotType_a_u_A = 45,
-    /* a-f-A-M-H-Q: Friendly aircraft military helicopter observation */
-    meshtastic_CotType_CotType_a_f_A_M_H_Q = 46,
-    /* a-f-A-C-F: Friendly aircraft civilian fixed-wing */
-    meshtastic_CotType_CotType_a_f_A_C_F = 47,
-    /* a-f-A-C: Friendly aircraft civilian (generic) */
-    meshtastic_CotType_CotType_a_f_A_C = 48,
-    /* a-f-A-C-L: Friendly aircraft civilian lighter-than-air */
-    meshtastic_CotType_CotType_a_f_A_C_L = 49,
-    /* a-f-A: Friendly aircraft (generic) */
-    meshtastic_CotType_CotType_a_f_A = 50,
-    /* a-f-A-M-H-C: Friendly aircraft military helicopter cargo */
-    meshtastic_CotType_CotType_a_f_A_M_H_C = 51,
-    /* a-n-A-M-F-F: Neutral aircraft military fixed-wing fighter */
-    meshtastic_CotType_CotType_a_n_A_M_F_F = 52,
-    /* a-u-A-C-F: Unknown aircraft civilian fixed-wing */
-    meshtastic_CotType_CotType_a_u_A_C_F = 53,
-    /* a-f-G-U-C-F-T-A: Friendly ground unit combat forces theater aviation */
-    meshtastic_CotType_CotType_a_f_G_U_C_F_T_A = 54,
-    /* a-f-G-U-C-V-S: Friendly ground unit combat vehicle support */
-    meshtastic_CotType_CotType_a_f_G_U_C_V_S = 55,
-    /* a-f-G-U-C-R-X: Friendly ground unit combat reconnaissance exploitation */
-    meshtastic_CotType_CotType_a_f_G_U_C_R_X = 56,
-    /* a-f-G-U-C-I-Z: Friendly ground unit combat infantry mechanized */
-    meshtastic_CotType_CotType_a_f_G_U_C_I_Z = 57,
-    /* a-f-G-U-C-E-C-W: Friendly ground unit combat engineer construction wheeled */
-    meshtastic_CotType_CotType_a_f_G_U_C_E_C_W = 58,
-    /* a-f-G-U-C-I-L: Friendly ground unit combat infantry light */
-    meshtastic_CotType_CotType_a_f_G_U_C_I_L = 59,
-    /* a-f-G-U-C-R-O: Friendly ground unit combat reconnaissance other */
-    meshtastic_CotType_CotType_a_f_G_U_C_R_O = 60,
-    /* a-f-G-U-C-R-V: Friendly ground unit combat reconnaissance cavalry */
-    meshtastic_CotType_CotType_a_f_G_U_C_R_V = 61,
-    /* a-f-G-U-H: Friendly ground unit headquarters */
-    meshtastic_CotType_CotType_a_f_G_U_H = 62,
-    /* a-f-G-U-U-M-S-E: Friendly ground unit support medical surgical evacuation */
-    meshtastic_CotType_CotType_a_f_G_U_U_M_S_E = 63,
-    /* a-f-G-U-S-M-C: Friendly ground unit support maintenance collection */
-    meshtastic_CotType_CotType_a_f_G_U_S_M_C = 64,
-    /* a-f-G-E-S: Friendly ground equipment sensor (generic) */
-    meshtastic_CotType_CotType_a_f_G_E_S = 65,
-    /* a-f-G-E: Friendly ground equipment (generic) */
-    meshtastic_CotType_CotType_a_f_G_E = 66,
-    /* a-f-G-E-V-C-U: Friendly ground equipment vehicle utility */
-    meshtastic_CotType_CotType_a_f_G_E_V_C_U = 67,
-    /* a-f-G-E-V-C-ps: Friendly ground equipment vehicle public safety */
-    meshtastic_CotType_CotType_a_f_G_E_V_C_ps = 68,
-    /* a-u-G-E-V: Unknown ground equipment vehicle */
-    meshtastic_CotType_CotType_a_u_G_E_V = 69,
-    /* a-f-S-N-N-R: Friendly sea surface non-naval rescue */
-    meshtastic_CotType_CotType_a_f_S_N_N_R = 70,
-    /* a-f-F-B: Friendly force boundary */
-    meshtastic_CotType_CotType_a_f_F_B = 71,
-    /* b-m-p-s-p-loc: Self-position location marker */
-    meshtastic_CotType_CotType_b_m_p_s_p_loc = 72,
-    /* b-i-v: Imagery/video */
-    meshtastic_CotType_CotType_b_i_v = 73,
-    /* b-f-t-r: File transfer request */
-    meshtastic_CotType_CotType_b_f_t_r = 74,
-    /* b-f-t-a: File transfer acknowledgment */
-    meshtastic_CotType_CotType_b_f_t_a = 75
-} meshtastic_CotType;
-
-/* Geopoint and altitude source */
-typedef enum _meshtastic_GeoPointSource {
-    /* Unspecified */
-    meshtastic_GeoPointSource_GeoPointSource_Unspecified = 0,
-    /* GPS derived */
-    meshtastic_GeoPointSource_GeoPointSource_GPS = 1,
-    /* User entered */
-    meshtastic_GeoPointSource_GeoPointSource_USER = 2,
-    /* Network/external */
-    meshtastic_GeoPointSource_GeoPointSource_NETWORK = 3
-} meshtastic_GeoPointSource;
-
 /* Struct definitions */
 /* ATAK GeoChat message */
 typedef struct _meshtastic_GeoChat {
@@ -337,95 +146,6 @@ typedef struct _meshtastic_TAKPacket {
    } payload_variant;
 } meshtastic_TAKPacket;

-/* Aircraft track information from ADS-B or military air tracking.
- Covers the majority of observed real-world CoT traffic. */
-typedef struct _meshtastic_AircraftTrack {
-    /* ICAO hex identifier (e.g. "AD237C") */
-    char icao[8];
-    /* Aircraft registration (e.g. "N946AK") */
-    char registration[16];
-    /* Flight number/callsign (e.g. "ASA864") */
-    char flight[16];
-    /* ICAO aircraft type designator (e.g. "B39M") */
-    char aircraft_type[8];
-    /* Transponder squawk code (0-7777 octal) */
-    uint16_t squawk;
-    /* ADS-B emitter category (e.g. "A3") */
-    char category[4];
-    /* Received signal strength * 10 (e.g. -194 for -19.4 dBm) */
-    int32_t rssi_x10;
-    /* Whether receiver has GPS fix */
-    bool gps;
-    /* CoT host ID for source attribution */
-    char cot_host_id[64];
-} meshtastic_AircraftTrack;
-
-typedef PB_BYTES_ARRAY_T(220) meshtastic_TAKPacketV2_raw_detail_t;
-/* ATAK v2 packet with expanded CoT field support and zstd dictionary compression.
- Sent on ATAK_PLUGIN_V2 port. The wire payload is:
-   [1 byte flags][zstd-compressed TAKPacketV2 protobuf]
- Flags byte: bits 0-5 = dictionary ID, bits 6-7 = reserved. */
-typedef struct _meshtastic_TAKPacketV2 {
-    /* Well-known CoT event type enum.
- Use CotType_Other with cot_type_str for unknown types. */
-    meshtastic_CotType cot_type_id;
-    /* How the coordinates were generated */
-    meshtastic_CotHow how;
-    /* Callsign */
-    char callsign[120];
-    /* Team color assignment */
-    meshtastic_Team team;
-    /* Role of the group member */
-    meshtastic_MemberRole role;
-    /* Latitude, multiply by 1e-7 to get degrees in floating point */
-    int32_t latitude_i;
-    /* Longitude, multiply by 1e-7 to get degrees in floating point */
-    int32_t longitude_i;
-    /* Altitude in meters (HAE) */
-    int32_t altitude;
-    /* Speed in cm/s */
-    uint32_t speed;
-    /* Course in degrees * 100 (0-36000) */
-    uint16_t course;
-    /* Battery level 0-100 */
-    uint8_t battery;
-    /* Geopoint source */
-    meshtastic_GeoPointSource geo_src;
-    /* Altitude source */
-    meshtastic_GeoPointSource alt_src;
-    /* Device UID (UUID string or device ID like "ANDROID-xxxx") */
-    char uid[48];
-    /* Device callsign */
-    char device_callsign[120];
-    /* Stale time as seconds offset from event time */
-    uint16_t stale_seconds;
-    /* TAK client version string */
-    char tak_version[64];
-    /* TAK device model */
-    char tak_device[32];
-    /* TAK platform (ATAK-CIV, WebTAK, etc.) */
-    char tak_platform[32];
-    /* TAK OS version */
-    char tak_os[16];
-    /* Connection endpoint */
-    char endpoint[32];
-    /* Phone number */
-    char phone[20];
-    /* CoT event type string, only populated when cot_type_id is CotType_Other */
-    char cot_type_str[32];
-    pb_size_t which_payload_variant;
-    union {
-        /* Position report (true = PLI, no extra fields beyond the common ones above) */
-        bool pli;
-        /* ATAK GeoChat message */
-        meshtastic_GeoChat chat;
-        /* Aircraft track data (ADS-B, military air) */
-        meshtastic_AircraftTrack aircraft;
-        /* Generic CoT detail XML for unmapped types */
-        meshtastic_TAKPacketV2_raw_detail_t raw_detail;
-    } payload_variant;
-} meshtastic_TAKPacketV2;
-

 #ifdef __cplusplus
 extern "C" {
@@ -440,18 +160,6 @@ extern "C" {
 #define _meshtastic_MemberRole_MAX meshtastic_MemberRole_K9
 #define _meshtastic_MemberRole_ARRAYSIZE ((meshtastic_MemberRole)(meshtastic_MemberRole_K9+1))

-#define _meshtastic_CotHow_MIN meshtastic_CotHow_CotHow_Unspecified
-#define _meshtastic_CotHow_MAX meshtastic_CotHow_CotHow_m_s
-#define _meshtastic_CotHow_ARRAYSIZE ((meshtastic_CotHow)(meshtastic_CotHow_CotHow_m_s+1))
-
-#define _meshtastic_CotType_MIN meshtastic_CotType_CotType_Other
-#define _meshtastic_CotType_MAX meshtastic_CotType_CotType_b_f_t_a
-#define _meshtastic_CotType_ARRAYSIZE ((meshtastic_CotType)(meshtastic_CotType_CotType_b_f_t_a+1))
-
-#define _meshtastic_GeoPointSource_MIN meshtastic_GeoPointSource_GeoPointSource_Unspecified
-#define _meshtastic_GeoPointSource_MAX meshtastic_GeoPointSource_GeoPointSource_NETWORK
-#define _meshtastic_GeoPointSource_ARRAYSIZE ((meshtastic_GeoPointSource)(meshtastic_GeoPointSource_GeoPointSource_NETWORK+1))
-


 #define meshtastic_Group_role_ENUMTYPE meshtastic_MemberRole
@@ -461,14 +169,6 @@ extern "C" {



-#define meshtastic_TAKPacketV2_cot_type_id_ENUMTYPE meshtastic_CotType
-#define meshtastic_TAKPacketV2_how_ENUMTYPE meshtastic_CotHow
-#define meshtastic_TAKPacketV2_team_ENUMTYPE meshtastic_Team
-#define meshtastic_TAKPacketV2_role_ENUMTYPE meshtastic_MemberRole
-#define meshtastic_TAKPacketV2_geo_src_ENUMTYPE meshtastic_GeoPointSource
-#define meshtastic_TAKPacketV2_alt_src_ENUMTYPE meshtastic_GeoPointSource
-
-
 /* Initializer values for message structs */
 #define meshtastic_TAKPacket_init_default        {0, false, meshtastic_Contact_init_default, false, meshtastic_Group_init_default, false, meshtastic_Status_init_default, 0, {meshtastic_PLI_init_default}}
 #define meshtastic_GeoChat_init_default          {"", false, "", false, ""}
@@ -476,16 +176,12 @@ extern "C" {
 #define meshtastic_Status_init_default           {0}
 #define meshtastic_Contact_init_default          {"", ""}
 #define meshtastic_PLI_init_default              {0, 0, 0, 0, 0}
-#define meshtastic_AircraftTrack_init_default    {"", "", "", "", 0, "", 0, 0, ""}
-#define meshtastic_TAKPacketV2_init_default      {_meshtastic_CotType_MIN, _meshtastic_CotHow_MIN, "", _meshtastic_Team_MIN, _meshtastic_MemberRole_MIN, 0, 0, 0, 0, 0, 0, _meshtastic_GeoPointSource_MIN, _meshtastic_GeoPointSource_MIN, "", "", 0, "", "", "", "", "", "", "", 0, {0}}
 #define meshtastic_TAKPacket_init_zero           {0, false, meshtastic_Contact_init_zero, false, meshtastic_Group_init_zero, false, meshtastic_Status_init_zero, 0, {meshtastic_PLI_init_zero}}
 #define meshtastic_GeoChat_init_zero             {"", false, "", false, ""}
 #define meshtastic_Group_init_zero               {_meshtastic_MemberRole_MIN, _meshtastic_Team_MIN}
 #define meshtastic_Status_init_zero              {0}
 #define meshtastic_Contact_init_zero             {"", ""}
 #define meshtastic_PLI_init_zero                 {0, 0, 0, 0, 0}
-#define meshtastic_AircraftTrack_init_zero       {"", "", "", "", 0, "", 0, 0, ""}
-#define meshtastic_TAKPacketV2_init_zero         {_meshtastic_CotType_MIN, _meshtastic_CotHow_MIN, "", _meshtastic_Team_MIN, _meshtastic_MemberRole_MIN, 0, 0, 0, 0, 0, 0, _meshtastic_GeoPointSource_MIN, _meshtastic_GeoPointSource_MIN, "", "", 0, "", "", "", "", "", "", "", 0, {0}}

 /* Field tags (for use in manual encoding/decoding) */
 #define meshtastic_GeoChat_message_tag           1
@@ -508,42 +204,6 @@ extern "C" {
 #define meshtastic_TAKPacket_pli_tag             5
 #define meshtastic_TAKPacket_chat_tag            6
 #define meshtastic_TAKPacket_detail_tag          7
-#define meshtastic_AircraftTrack_icao_tag        1
-#define meshtastic_AircraftTrack_registration_tag 2
-#define meshtastic_AircraftTrack_flight_tag      3
-#define meshtastic_AircraftTrack_aircraft_type_tag 4
-#define meshtastic_AircraftTrack_squawk_tag      5
-#define meshtastic_AircraftTrack_category_tag    6
-#define meshtastic_AircraftTrack_rssi_x10_tag    7
-#define meshtastic_AircraftTrack_gps_tag         8
-#define meshtastic_AircraftTrack_cot_host_id_tag 9
-#define meshtastic_TAKPacketV2_cot_type_id_tag   1
-#define meshtastic_TAKPacketV2_how_tag           2
-#define meshtastic_TAKPacketV2_callsign_tag      3
-#define meshtastic_TAKPacketV2_team_tag          4
-#define meshtastic_TAKPacketV2_role_tag          5
-#define meshtastic_TAKPacketV2_latitude_i_tag    6
-#define meshtastic_TAKPacketV2_longitude_i_tag   7
-#define meshtastic_TAKPacketV2_altitude_tag      8
-#define meshtastic_TAKPacketV2_speed_tag         9
-#define meshtastic_TAKPacketV2_course_tag        10
-#define meshtastic_TAKPacketV2_battery_tag       11
-#define meshtastic_TAKPacketV2_geo_src_tag       12
-#define meshtastic_TAKPacketV2_alt_src_tag       13
-#define meshtastic_TAKPacketV2_uid_tag           14
-#define meshtastic_TAKPacketV2_device_callsign_tag 15
-#define meshtastic_TAKPacketV2_stale_seconds_tag 16
-#define meshtastic_TAKPacketV2_tak_version_tag   17
-#define meshtastic_TAKPacketV2_tak_device_tag    18
-#define meshtastic_TAKPacketV2_tak_platform_tag  19
-#define meshtastic_TAKPacketV2_tak_os_tag        20
-#define meshtastic_TAKPacketV2_endpoint_tag      21
-#define meshtastic_TAKPacketV2_phone_tag         22
-#define meshtastic_TAKPacketV2_cot_type_str_tag  23
-#define meshtastic_TAKPacketV2_pli_tag           30
-#define meshtastic_TAKPacketV2_chat_tag          31
-#define meshtastic_TAKPacketV2_aircraft_tag      32
-#define meshtastic_TAKPacketV2_raw_detail_tag    33

 /* Struct field encoding specification for nanopb */
 #define meshtastic_TAKPacket_FIELDLIST(X, a) \
@@ -595,60 +255,12 @@ X(a, STATIC,   SINGULAR, UINT32,   course,            5)
 #define meshtastic_PLI_CALLBACK NULL
 #define meshtastic_PLI_DEFAULT NULL

-#define meshtastic_AircraftTrack_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, STRING,   icao,              1) \
-X(a, STATIC,   SINGULAR, STRING,   registration,      2) \
-X(a, STATIC,   SINGULAR, STRING,   flight,            3) \
-X(a, STATIC,   SINGULAR, STRING,   aircraft_type,     4) \
-X(a, STATIC,   SINGULAR, UINT32,   squawk,            5) \
-X(a, STATIC,   SINGULAR, STRING,   category,          6) \
-X(a, STATIC,   SINGULAR, SINT32,   rssi_x10,          7) \
-X(a, STATIC,   SINGULAR, BOOL,     gps,               8) \
-X(a, STATIC,   SINGULAR, STRING,   cot_host_id,       9)
-#define meshtastic_AircraftTrack_CALLBACK NULL
-#define meshtastic_AircraftTrack_DEFAULT NULL
-
-#define meshtastic_TAKPacketV2_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, UENUM,    cot_type_id,       1) \
-X(a, STATIC,   SINGULAR, UENUM,    how,               2) \
-X(a, STATIC,   SINGULAR, STRING,   callsign,          3) \
-X(a, STATIC,   SINGULAR, UENUM,    team,              4) \
-X(a, STATIC,   SINGULAR, UENUM,    role,              5) \
-X(a, STATIC,   SINGULAR, SFIXED32, latitude_i,        6) \
-X(a, STATIC,   SINGULAR, SFIXED32, longitude_i,       7) \
-X(a, STATIC,   SINGULAR, SINT32,   altitude,          8) \
-X(a, STATIC,   SINGULAR, UINT32,   speed,             9) \
-X(a, STATIC,   SINGULAR, UINT32,   course,           10) \
-X(a, STATIC,   SINGULAR, UINT32,   battery,          11) \
-X(a, STATIC,   SINGULAR, UENUM,    geo_src,          12) \
-X(a, STATIC,   SINGULAR, UENUM,    alt_src,          13) \
-X(a, STATIC,   SINGULAR, STRING,   uid,              14) \
-X(a, STATIC,   SINGULAR, STRING,   device_callsign,  15) \
-X(a, STATIC,   SINGULAR, UINT32,   stale_seconds,    16) \
-X(a, STATIC,   SINGULAR, STRING,   tak_version,      17) \
-X(a, STATIC,   SINGULAR, STRING,   tak_device,       18) \
-X(a, STATIC,   SINGULAR, STRING,   tak_platform,     19) \
-X(a, STATIC,   SINGULAR, STRING,   tak_os,           20) \
-X(a, STATIC,   SINGULAR, STRING,   endpoint,         21) \
-X(a, STATIC,   SINGULAR, STRING,   phone,            22) \
-X(a, STATIC,   SINGULAR, STRING,   cot_type_str,     23) \
-X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,pli,payload_variant.pli),  30) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,chat,payload_variant.chat),  31) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,aircraft,payload_variant.aircraft),  32) \
-X(a, STATIC,   ONEOF,    BYTES,    (payload_variant,raw_detail,payload_variant.raw_detail),  33)
-#define meshtastic_TAKPacketV2_CALLBACK NULL
-#define meshtastic_TAKPacketV2_DEFAULT NULL
-#define meshtastic_TAKPacketV2_payload_variant_chat_MSGTYPE meshtastic_GeoChat
-#define meshtastic_TAKPacketV2_payload_variant_aircraft_MSGTYPE meshtastic_AircraftTrack
-
 extern const pb_msgdesc_t meshtastic_TAKPacket_msg;
 extern const pb_msgdesc_t meshtastic_GeoChat_msg;
 extern const pb_msgdesc_t meshtastic_Group_msg;
 extern const pb_msgdesc_t meshtastic_Status_msg;
 extern const pb_msgdesc_t meshtastic_Contact_msg;
 extern const pb_msgdesc_t meshtastic_PLI_msg;
-extern const pb_msgdesc_t meshtastic_AircraftTrack_msg;
-extern const pb_msgdesc_t meshtastic_TAKPacketV2_msg;

 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define meshtastic_TAKPacket_fields &meshtastic_TAKPacket_msg
@@ -657,18 +269,14 @@ extern const pb_msgdesc_t meshtastic_TAKPacketV2_msg;
 #define meshtastic_Status_fields &meshtastic_Status_msg
 #define meshtastic_Contact_fields &meshtastic_Contact_msg
 #define meshtastic_PLI_fields &meshtastic_PLI_msg
-#define meshtastic_AircraftTrack_fields &meshtastic_AircraftTrack_msg
-#define meshtastic_TAKPacketV2_fields &meshtastic_TAKPacketV2_msg

 /* Maximum encoded size of messages (where known) */
-#define MESHTASTIC_MESHTASTIC_ATAK_PB_H_MAX_SIZE meshtastic_TAKPacketV2_size
-#define meshtastic_AircraftTrack_size            134
+#define MESHTASTIC_MESHTASTIC_ATAK_PB_H_MAX_SIZE meshtastic_TAKPacket_size
 #define meshtastic_Contact_size                  242
 #define meshtastic_GeoChat_size                  444
 #define meshtastic_Group_size                    4
 #define meshtastic_PLI_size                      31
 #define meshtastic_Status_size                   3
-#define meshtastic_TAKPacketV2_size              1027
 #define meshtastic_TAKPacket_size                705

 #ifdef __cplusplus
@@ -308,8 +308,6 @@ typedef enum _meshtastic_HardwareModel {
    meshtastic_HardwareModel_TDISPLAY_S3_PRO = 126,
    /* Heltec Mesh Node T096 board features an nRF52840 CPU and a TFT screen. */
    meshtastic_HardwareModel_HELTEC_MESH_NODE_T096 = 127,
-    /* Seeed studio T1000-E Pro tracker card. NRF52840 w/ LR2021 radio, GPS, button, buzzer, and sensors. */
-    meshtastic_HardwareModel_TRACKER_T1000_E_PRO = 128,
    /* ------------------------------------------------------------------------------------------------------------------------------------------
 Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
 ------------------------------------------------------------------------------------------------------------------------------------------ */
@@ -150,10 +150,6 @@ typedef enum _meshtastic_PortNum {
 arbitrary telemetry over meshtastic that is not covered by telemetry.proto
 ENCODING: CayenneLLP */
    meshtastic_PortNum_CAYENNE_APP = 77,
-    /* ATAK Plugin V2
- Portnum for payloads from the official Meshtastic ATAK plugin using
- TAKPacketV2 with zstd dictionary compression. */
-    meshtastic_PortNum_ATAK_PLUGIN_V2 = 78,
    /* GroupAlarm integration
 Used for transporting GroupAlarm-related messages between Meshtastic nodes
 and companion applications/services. */
@@ -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);
@@ -203,10 +203,6 @@ void ExternalNotificationModule::setExternalState(uint8_t index, bool on)
    default:
        if (output > 0)
            digitalWrite(output, (moduleConfig.external_notification.active ? on : !on));
-#ifdef PCA_LED_NOTIFICATION
-        io.digitalWrite(PCA_LED_NOTIFICATION, on);
-
-#endif
        break;
    }

@@ -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"
@@ -49,9 +46,6 @@
 #include "modules/WaypointModule.h"
 #endif
 #if ARCH_PORTDUINO
-#include "input/LinuxInputImpl.h"
-#include "input/SeesawRotary.h"
-#include "modules/Native/StoreForwardPlusPlus.h"
 #include "modules/Telemetry/HostMetrics.h"
 #if !MESHTASTIC_EXCLUDE_STOREFORWARD
 #include "modules/StoreForwardModule.h"
@@ -126,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
@@ -198,11 +184,6 @@ void setupModules()
 #endif
 #if ARCH_PORTDUINO
    new HostMetricsModule();
-#if SFPP_ENABLED
-    if (portduino_config.sfpp_enabled) {
-        storeForwardPlusPlusModule = new StoreForwardPlusPlusModule();
-    }
-#endif
 #endif
 #if HAS_TELEMETRY
    new DeviceTelemetryModule();
@@ -1,310 +0,0 @@
-#pragma once
-#if __has_include("sqlite3.h")
-#define SFPP_ENABLED 1
-#include "Channels.h"
-#include "ProtobufModule.h"
-#include "Router.h"
-#include "SinglePortModule.h"
-#include "sqlite3.h"
-
-#define SFPP_HASH_SIZE 16
-#define SFPP_SHORT_HASH_SIZE 8
-
-/**
- * Store and forward ++ module
- * There's an obvious need for a store-and-forward mechanism in Meshtastic.
- * This module takes heavy inspiration from Git, building a chain of messages that can be synced between nodes.
- * Each message is hashed, and the chain is built by hashing the previous commit hash and the current message hash.
- * Nodes can request missing messages by requesting the next message after a given commit hash.
- *
- * The current focus is text messages, limited to the primary channel.
- *
- * Each chain is identified by a root hash, which is derived from the channelHash, the local nodenum, and the timestamp when
- * created.
- *
- * Each message is also given a message hash, derived from the encrypted payload, the to, from, id.
- * Notably not the timestamp, as we want these to match across nodes, even if the timestamps differ.
- *
- * The authoritative node for the chain will generate a commit hash for each message when adding it to the chain.
- * The first message's commit hash is derived from the root hash and the message hash.
- * Subsequent messages' commit hashes are derived from the previous commit hash and the current message hash.
- * This allows a node to see only the last commit hash, and confirm it hasn't missed any messages.
- *
- * Nodes can request the next message in the chain by sending a LINK_REQUEST message with the root hash and the last known commit
- * hash. Any node that has the next message can respond with a LINK_PROVIDE message containing the next message.
- *
- * When a satellite node sees a new text message, it stores it in a scratch database.
- * These messages are periodically offered to the authoritative node for inclusion in the chain.
- *
- * The LINK_PROVIDE message does double-duty, sending both on-chain and off-chain messages.
- * The differentiator is whether the commit hash is set or left empty.
- *
- * When a satellite node receives a canonical link message, it checks if it has the message in scratch.
- * And evicts it when adding it to the canonical chain.
- *
- * This approach allows a node to know whether it has seen a given message before, or if it is new coming via SFPP.
- * If new, and the timestamp is within the rebroadcast timeout, it will process that message as if it were just received from the
- * mesh, allowing it to be decrypted, shown to the user, and rebroadcast.
- */
-class StoreForwardPlusPlusModule : public ProtobufModule<meshtastic_StoreForwardPlusPlus>, private concurrency::OSThread
-{
-    struct link_object {
-        uint32_t to;
-        uint32_t from;
-        uint32_t id;
-        uint32_t rx_time = 0;
-        ChannelHash channel_hash;
-        uint8_t encrypted_bytes[256] = {0};
-        size_t encrypted_len;
-        uint8_t message_hash[SFPP_HASH_SIZE] = {0};
-        size_t message_hash_len = 0;
-        uint8_t root_hash[SFPP_HASH_SIZE] = {0};
-        size_t root_hash_len = 0;
-        uint8_t commit_hash[SFPP_HASH_SIZE] = {0};
-        size_t commit_hash_len = 0;
-        uint32_t counter = 0;
-        std::string payload;
-        bool validObject = true; // set this false when a chain calulation fails, etc.
-    };
-
-  public:
-    /** Constructor
-     *
-     */
-    StoreForwardPlusPlusModule();
-
-    /*
-      -Override the wantPacket method.
-    */
-    virtual bool wantPacket(const meshtastic_MeshPacket *p) override
-    {
-        if (p->decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_APP ||
-            p->decoded.portnum == (portduino_config.sfpp_steal_port ? meshtastic_PortNum_TEXT_MESSAGE_COMPRESSED_APP
-                                                                    : meshtastic_PortNum_STORE_FORWARD_PLUSPLUS_APP)) {
-            return true;
-        } else {
-            return false;
-        }
-    }
-
-    void handleEncrypted(const meshtastic_MeshPacket *, const meshtastic_MeshPacket *);
-
-  protected:
-    /** Called to handle a particular incoming message
-    @return ProcessMessage::STOP if you've guaranteed you've handled this message and no other handlers should be considered for
-    it
-    */
-    virtual ProcessMessage handleReceived(const meshtastic_MeshPacket &mp) override;
-    virtual bool handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_StoreForwardPlusPlus *t) override;
-
-    virtual int32_t runOnce() override;
-
-  private:
-    sqlite3 *ppDb;
-    sqlite3_stmt *chain_insert_stmt;
-    sqlite3_stmt *scratch_insert_stmt;
-    sqlite3_stmt *checkDupMessageHash;
-    sqlite3_stmt *checkDupCommitHash;
-    sqlite3_stmt *checkScratch;
-    sqlite3_stmt *removeScratch;
-    sqlite3_stmt *updatePayloadStmt;
-    sqlite3_stmt *getPayloadFromScratchStmt;
-    sqlite3_stmt *fromScratchStmt;
-    sqlite3_stmt *fromScratchByHashStmt;
-    sqlite3_stmt *getNextHashStmt;
-    sqlite3_stmt *getChainEndStmt;
-    sqlite3_stmt *getLinkStmt;
-    sqlite3_stmt *getLinkFromMessageHashStmt;
-    sqlite3_stmt *getHashFromRootStmt;
-    sqlite3_stmt *addRootToMappingsStmt;
-    sqlite3_stmt *getRootFromChannelHashStmt;
-    sqlite3_stmt *getFullRootHashStmt;
-    sqlite3_stmt *setChainCountStmt;
-    sqlite3_stmt *getChainCountStmt;
-    sqlite3_stmt *getScratchCountStmt;
-    sqlite3_stmt *getRootCanonScratchCountStmt;
-    sqlite3_stmt *pruneScratchQueueStmt;
-    sqlite3_stmt *trimOldestLinkStmt;
-    sqlite3_stmt *maybeAddPeerStmt;
-    sqlite3_stmt *getPeerStmt;
-    sqlite3_stmt *updatePeerStmt;
-    sqlite3_stmt *clearChainStmt;
-    sqlite3_stmt *canon_scratch_insert_stmt;
-    sqlite3_stmt *getCanonScratchCountStmt;
-    sqlite3_stmt *getCanonScratchStmt;
-    sqlite3_stmt *removeCanonScratch;
-    sqlite3_stmt *clearCanonScratchStmt;
-
-    // For a given Meshtastic ChannelHash, fills the root_hash buffer with a 32-byte root hash
-    // returns true if the root hash was found
-    bool getRootFromChannelHash(ChannelHash, uint8_t *);
-
-    // For a given root hash, returns the ChannelHash
-    // can handle partial root hashes
-    ChannelHash getChannelHashFromRoot(uint8_t *_root_hash, size_t);
-
-    // given a root hash and commit hash, returns the next commit hash in the chain
-    // can handle partial root and commit hashes, always fills the buffer with 32 bytes
-    // returns true if a next hash was found
-    bool getNextHash(uint8_t *, size_t, uint8_t *, size_t, uint8_t *);
-
-    // For a given Meshtastic ChannelHash, fills the root_hash buffer with a 32-byte root hash
-    // but this function will add the root hash if it is not already present
-    // returns hash size or 0 if not found/added
-    size_t getOrAddRootFromChannelHash(ChannelHash, uint8_t *);
-
-    // adds the ChannelHash and root_hash to the mappings table
-    void addRootToMappings(ChannelHash, uint8_t *);
-
-    // requests the next message in the chain from the mesh network
-    // Sends a LINK_REQUEST message
-    void requestNextMessage(uint8_t *, size_t, uint8_t *, size_t);
-
-    // request the message X entries from the end.
-    // used to bootstrap a chain, without downloading all of the history
-    void requestMessageCount(uint8_t *, size_t, uint32_t);
-
-    // sends a LINK_PROVIDE message broadcasting the given link object
-    void broadcastLink(uint8_t *, size_t);
-
-    // sends a LINK_PROVIDE message broadcasting the given link object
-    void broadcastLink(link_object &, bool, bool = false);
-
-    // sends a LINK_PROVIDE message broadcasting the given link object from scratch message store
-    bool sendFromScratch(uint8_t *);
-
-    // Adds the given link object to the canonical chain database
-    bool addToChain(link_object &);
-
-    // Adds an incoming text message to the scratch database
-    bool addToScratch(link_object &);
-
-    // sends a CANON_ANNOUNCE message, specifying the given root and commit hashes
-    void canonAnnounce(link_object &);
-
-    // checks if the message hash is present in the canonical chain database
-    bool isInDB(uint8_t *, size_t);
-
-    // checks if the commit hash is present in the canonical chain database
-    bool isCommitInDB(uint8_t *, size_t);
-
-    // checks if the message hash is present in the scratch database
-    bool isInScratch(uint8_t *, size_t);
-
-    // retrieves a link object from the scratch database
-    link_object getFromScratch(uint8_t *, size_t);
-
-    // removes a link object from the scratch database
-    void removeFromScratch(uint8_t *, size_t);
-
-    // iterate through our scratch database, and see if we can speculate a chain up to the given commit hash
-    bool speculateScratchChain(uint8_t *, size_t, uint8_t *, uint8_t *);
-
-    // retrieves the next link object from scratch given a root hash
-    link_object getNextScratchObject(uint8_t *);
-
-    // fills the payload section with the decrypted data for the given message hash
-    // probably not needed for production, but useful for testing
-    void updatePayload(uint8_t *, size_t, std::string);
-
-    // Takes the decrypted MeshPacket and the encrypted packet copy, and builds a link_object
-    // Generates a message hash, but does not set the commit hash
-    link_object ingestTextPacket(const meshtastic_MeshPacket &, const meshtastic_MeshPacket *);
-
-    // ingests a LINK_PROVIDE message and builds a link_object
-    // confirms the root hash and commit hash
-    link_object ingestLinkMessage(meshtastic_StoreForwardPlusPlus *);
-
-    // retrieves a link object from the canonical chain database given a commit hash
-    link_object getLink(uint8_t *, size_t);
-
-    // retrieves a link object from the canonical chain database given a message hash
-    link_object getLinkFromMessageHash(uint8_t *, size_t);
-
-    // puts the encrypted payload back into the queue as if it were just received
-    void rebroadcastLinkObject(link_object &);
-
-    // Check if an incoming link object's commit hash matches the calculated commit hash
-    bool checkCommitHash(link_object &lo, uint8_t *commit_hash_bytes, size_t hash_len);
-
-    // given a partial root hash, looks up the full 32-byte root hash
-    // returns true if found
-    bool lookUpFullRootHash(uint8_t *partial_root_hash, size_t partial_root_hash_len, uint8_t *full_root_hash);
-
-    // update the mappings table to set the chain count for the given root hash
-    void setChainCount(uint8_t *, size_t, uint32_t);
-
-    // get the chain count for the given root hash
-    uint32_t getChainCount(uint8_t *, size_t);
-
-    // get the scratch count for the given root hash
-    uint32_t getScratchCount(uint8_t *, size_t);
-
-    // get the canon scratch count for the given root hash
-    uint32_t getCanonScratchCount(uint8_t *, size_t);
-
-    link_object getLinkFromPositionFromTip(uint32_t, uint8_t *, size_t);
-
-    void pruneScratchQueue();
-
-    void trimOldestLink(uint8_t *, size_t);
-
-    void clearChain(uint8_t *, size_t);
-
-    void recalculateMessageHash(link_object &);
-
-    // given a link object with a payload and other fields, recalculates the message hash
-    // returns true if a match
-    bool recalculateHash(link_object &, uint8_t *, size_t, uint8_t *, size_t);
-
-    void updatePeers(const meshtastic_MeshPacket &, meshtastic_StoreForwardPlusPlus_SFPP_message_type);
-
-    void maybeMoveFromCanonScratch(uint8_t *, size_t);
-
-    void addToCanonScratch(link_object &);
-
-    link_object getfromCanonScratch(uint8_t *, size_t);
-    void removeFromCanonScratch(uint8_t *, size_t);
-
-    void clearCanonScratch(uint8_t *, size_t, uint32_t);
-
-    bool isInCanonScratch(uint8_t *, size_t);
-
-    void logLinkObject(link_object &);
-
-    // Track if we have a scheduled runOnce pending
-    // useful to not accudentally delay a scheduled runOnce
-    bool pendingRun = false;
-
-    // Once we have multiple chain types, we can extend this
-    enum chain_types {
-        channel_chain = 0,
-    };
-
-    uint32_t rebroadcastTimeout = 3600; // Messages older than this (in seconds) will not be rebroadcast
-    bool doing_split_send = false;
-    link_object split_link_out;
-
-    bool doing_split_receive = false;
-    link_object split_link_in;
-
-    bool did_announce_last = false;
-
-    uint32_t texts_rebroadcast = 0;
-    uint32_t links_speculated = 0;
-    uint32_t canon_announces = 0;
-    uint32_t links_requested = 0;
-    uint32_t links_provided = 0;
-    uint32_t links_added = 0;
-    uint32_t links_from_canon_scratch = 0;
-    uint32_t links_from_scratch = 0;
-    uint32_t split_links_sent = 0;
-    uint32_t split_links_received = 0;
-    uint32_t links_pruned = 0;
-    uint32_t scratch_timed_out = 0;
-    uint32_t sent_from_scratch = 0;
-    uint32_t received_from_scratch = 0;
-};
-
-extern StoreForwardPlusPlusModule *storeForwardPlusPlusModule;
-#endif
@@ -20,11 +20,10 @@ bool RoutingModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, mesh
        if ((nodeDB->getMeshNode(mp.from) == NULL || !nodeDB->getMeshNode(mp.from)->has_user) &&
            (nodeDB->getMeshNode(mp.to) == NULL || !nodeDB->getMeshNode(mp.to)->has_user))
            return false;
-    } else if (owner.is_licensed && ((nodeDB->getLicenseStatus(mp.from) == UserLicenseStatus::NotLicensed) ||
-                                     (nodeDB->getLicenseStatus(mp.to) == UserLicenseStatus::NotLicensed))) {
-        // Don't let licensed users to rebroadcast packets to or from unlicensed users
+    } else if (owner.is_licensed && nodeDB->getLicenseStatus(mp.from) == UserLicenseStatus::NotLicensed) {
+        // Don't let licensed users to rebroadcast packets from unlicensed users
        // If we know they are in-fact unlicensed
-        LOG_DEBUG("Packet to or from unlicensed user, ignoring packet");
+        LOG_DEBUG("Packet from unlicensed user, ignoring packet");
        return false;
    }

@@ -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
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Manuel	9785369da9	Merge branch 'master' into crowpanelV2	2026-03-28 07:54:33 +01:00
Ben Meadors	8390b65d24	Merge branch 'master' into crowpanelV2	2026-03-06 16:05:24 -06:00
Ben Meadors	e87215b1ed	Merge branch 'master' into crowpanelV2	2026-03-06 05:55:46 -06:00
Ben Meadors	ab54e5ffc1	Merge branch 'master' into crowpanelV2	2026-03-04 08:25:49 -06:00
Manuel	31794dc7bd	Merge branch 'master' into crowpanelV2	2026-03-03 20:00:10 +01:00
Manuel	4570163190	Merge branch 'master' into crowpanelV2	2026-02-02 13:01:04 +01:00
Manuel	86fa917362	Merge branch 'master' into crowpanelV2	2026-01-13 12:36:34 +01:00
Manuel	3575c48e36	Merge branch 'master' into crowpanelV2	2025-12-31 13:35:53 +01:00
Manuel	469abe8dec	Merge branch 'master' into crowpanelV2	2025-12-10 13:38:41 +01:00
Manuel	fefce15b1a	Merge branch 'master' into crowpanelV2	2025-12-05 10:59:34 +01:00
Manuel	50ea7ace98	Merge branch 'master' into crowpanelV2	2025-10-11 23:32:09 +02:00
Manuel	96f371eafd	Merge branch 'master' into crowpanelV2	2025-10-07 14:22:46 +02:00
Manuel	dbc52c7576	update device-ui commit	2025-10-07 14:21:55 +02:00
Manuel	232e0412ff	cosmetic print when STC8H1K28 is found	2025-10-07 14:19:45 +02:00
Manuel	b94659ff6a	Update device-ui commit reference	2025-10-05 22:32:08 +02:00
Manuel	059e17b3e2	Update device-ui commit reference	2025-10-05 11:12:25 +02:00
Manuel	b09f6db9e2	Merge branch 'master' into crowpanelV2	2025-10-05 11:00:02 +02:00
Manuel	64706153e0	Merge branch 'master' into crowpanelV2	2025-10-02 16:35:36 +02:00
Manuel	f94043e4f2	Merge branch 'master' into crowpanelV2	2025-10-01 18:06:45 +02:00
Manuel	bc82cd803c	Merge branch 'master' into crowpanelV2	2025-09-29 10:49:38 +02:00
Manuel	c15b6de138	Merge branch 'master' into crowpanelV2	2025-09-28 00:30:03 +02:00
Manuel	fbf32b93b6	fix lora radio detection	2025-09-22 22:23:03 +02:00
Manuel	b7289f7f2d	Merge branch 'master' into crowpanelV2	2025-09-22 10:40:10 +02:00
Manuel	d3d932ccee	Merge branch 'master' into crowpanelV2	2025-09-21 14:11:29 +02:00
Manuel	3a267b440d	Merge branch 'master' into crowpanelV2	2025-09-21 09:39:49 +02:00
Manuel	b1821bfd4f	CrowPanel Advanced V2 support	2025-09-18 16:00:49 +02:00