Use const references and local context

Implement batched NodeInfo encoding for more efficient large NodeDB transfer
2026-10-05 11:48:32 +10:00 · 2026-04-03 06:18:24 -05:00 · 2026-04-02 14:19:50 -05:00
136 changed files with 639 additions and 4881 deletions
@@ -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,8 @@ 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' }}
+        timeout-minutes: 15 # dput is terrible, sometimes runs 'forever'
        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.513
+    - renovate@43.100.0
    - 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,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
@@ -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,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
@@ -102,7 +102,7 @@ build_unflags =
 	-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]
@@ -126,122 +126,112 @@ lib_deps =
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/1897dd17fceb1f101bb1a3245680aa3439edcfdd.zip
+	https://github.com/meshtastic/device-ui/archive/7b1485b86c8d55a40e5226749097767e8b87f396.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
@@ -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
@@ -231,7 +231,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 +244,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
@@ -31,6 +31,9 @@ class ScanI2C
        INA3221,
        MAX17048,
        MCP9808,
+        SHT31,
+        SHT4X,
+        SHTC3,
        LPS22HB,
        QMC6310U,
        QMC6310N,
@@ -91,8 +94,7 @@ class ScanI2C
        SFA30,
        CW2015,
        SCD30,
-        ADS1115,
-        SHTXX
+        ADS1115
    } DeviceType;

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

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

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

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

                break;

-                SCAN_SIMPLE_CASE(SHTC3_ADDR, SHTXX, "SHTXX", (uint8_t)addr.address)
+                SCAN_SIMPLE_CASE(SHTC3_ADDR, SHTC3, "SHTC3", (uint8_t)addr.address)
            case RCWL9620_ADDR:
                // get MAX30102 PARTID
                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0xFF), 1);
@@ -719,7 +675,6 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                    logFoundDevice("BMX160", (uint8_t)addr.address);
                    break;
                } else {
-#if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR
                    String prod = "";
                    prod = readSEN5xProductName(i2cBus, addr.address);
                    if (prod.startsWith("SEN55")) {
@@ -735,7 +690,6 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                        logFoundDevice("Sensirion SEN50", addr.address);
                        break;
                    }
-#endif
                    if (addr.address == BMX160_ADDR) {
                        type = BMX160;
                        logFoundDevice("BMX160", (uint8_t)addr.address);
@@ -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);
@@ -163,11 +163,9 @@ void menuHandler::LoraRegionPicker(uint32_t duration)

            // 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");
+                LOG_WARN("Radio hardware does not support 2.4 GHz; ignoring LORA_24 selection");
                return;
            }

@@ -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);
    }
@@ -32,8 +32,8 @@
 #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
+#define default_traffic_mgmt_position_precision_bits 24         // ~10m grid cells
+#define default_traffic_mgmt_position_min_interval_secs ONE_DAY // 1 day between identical positions

 #ifdef USERPREFS_RINGTONE_NAG_SECS
 #define default_ringtone_nag_secs USERPREFS_RINGTONE_NAG_SECS
@@ -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,6 +184,11 @@ 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);

@@ -161,18 +161,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)
@@ -18,10 +18,7 @@
 #include "concurrency/LockGuard.h"
 #include "main.h"
 #include "xmodem.h"
-
-#if FromRadio_size > MAX_TO_FROM_RADIO_SIZE
-#error FromRadio is too big
-#endif
+#include <pb_encode.h>

 #if ToRadio_size > MAX_TO_FROM_RADIO_SIZE
 #error ToRadio is too big
@@ -61,13 +58,14 @@ void PhoneAPI::handleStartConfig()
    onConfigStart();

    // even if we were already connected - restart our state machine
-    if (config_nonce == SPECIAL_NONCE_ONLY_NODES) {
+    if (config_nonce == SPECIAL_NONCE_ONLY_NODES || config_nonce == SPECIAL_NONCE_BATCH_ONLY_NODES) {
        // If client only wants node info, jump directly to sending nodes
        state = STATE_SEND_OWN_NODEINFO;
        LOG_INFO("Client only wants node info, skipping other config");
    } else {
        state = STATE_SEND_MY_INFO;
    }
+    batchNodeInfo = (config_nonce == SPECIAL_NONCE_BATCH || config_nonce == SPECIAL_NONCE_BATCH_ONLY_NODES);
    pauseBluetoothLogging = true;
    spiLock->lock();
    filesManifest = getFiles("/", 10);
@@ -223,6 +221,48 @@ bool PhoneAPI::handleToRadio(const uint8_t *buf, size_t bufLength)
    STATE_SEND_PACKETS // send packets or debug strings
 */

+/// Context passed to the nanopb encoding callback for batched NodeInfo
+struct NodeInfoBatchEncodeContext {
+    std::deque<meshtastic_NodeInfo> *items;
+    size_t itemCount; // How many items from the front of the deque to encode
+};
+
+/// Nanopb encoding callback for repeated NodeInfo items in a NodeInfoBatch.
+/// Called by pb_encode during both sizing and actual encoding passes.
+static bool nodeInfoBatchEncodeCallback(pb_ostream_t *stream, const pb_field_iter_t *field, void *const *arg)
+{
+    auto *ctx = static_cast<NodeInfoBatchEncodeContext *>(*arg);
+    for (size_t i = 0; i < ctx->itemCount && i < ctx->items->size(); i++) {
+        if (!pb_encode_tag_for_field(stream, field))
+            return false;
+        if (!pb_encode_submessage(stream, meshtastic_NodeInfo_fields, &(*ctx->items)[i]))
+            return false;
+    }
+    return true;
+}
+
+/// Calculate how many NodeInfos from the front of the deque fit within maxPayloadBytes.
+/// maxPayloadBytes is the budget for the inner NodeInfoBatch content (repeated field entries).
+static size_t calculateBatchCount(std::deque<meshtastic_NodeInfo> &items, size_t maxPayloadBytes)
+{
+    size_t totalSize = 0;
+    size_t count = 0;
+    for (const auto &info : items) {
+        pb_ostream_t sizestream = PB_OSTREAM_SIZING;
+        if (!pb_encode(&sizestream, meshtastic_NodeInfo_fields, &info))
+            break;
+        size_t itemSize = sizestream.bytes_written;
+        // Per-item overhead: 1 byte tag (field 1, wire type 2) + varint length prefix
+        size_t overhead = 1 + (itemSize < 128 ? 1 : 2);
+        if (totalSize + overhead + itemSize > maxPayloadBytes)
+            break;
+        totalSize += overhead + itemSize;
+        count++;
+    }
+    // Always include at least 1 item if available (even if it slightly exceeds budget)
+    return count > 0 ? count : (items.empty() ? 0 : 1);
+}
+
 size_t PhoneAPI::getFromRadio(uint8_t *buf)
 {
    // Respond to heartbeat by sending queue status
@@ -231,7 +271,7 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
        fromRadioScratch.which_payload_variant = meshtastic_FromRadio_queueStatus_tag;
        fromRadioScratch.queueStatus = router->getQueueStatus();
        heartbeatReceived = false;
-        size_t numbytes = pb_encode_to_bytes(buf, meshtastic_FromRadio_size, &meshtastic_FromRadio_msg, &fromRadioScratch);
+        size_t numbytes = pb_encode_to_bytes(buf, MAX_TO_FROM_RADIO_SIZE, &meshtastic_FromRadio_msg, &fromRadioScratch);
        LOG_DEBUG("FromRadio=STATE_SEND_QUEUE_STATUS, numbytes=%u", numbytes);
        return numbytes;
    }
@@ -286,7 +326,7 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
                nodeInfoForPhone.num = 0;
            }
        }
-        if (config_nonce == SPECIAL_NONCE_ONLY_NODES) {
+        if (config_nonce == SPECIAL_NONCE_ONLY_NODES || config_nonce == SPECIAL_NONCE_BATCH_ONLY_NODES) {
            // If client only wants node info, jump directly to sending nodes
            state = STATE_SEND_OTHER_NODEINFOS;
            onNowHasData(0);
@@ -479,6 +519,81 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
            LOG_INFO("Start sending nodeinfos millis=%u", millis());
        }

+        if (batchNodeInfo) {
+            // Batched path: pack multiple NodeInfos into a single FromRadio packet.
+            // Consolidate any pending nodeInfoForPhone into the queue, then top it up.
+            {
+                concurrency::LockGuard guard(&nodeInfoMutex);
+                if (nodeInfoForPhone.num != 0) {
+                    nodeInfoQueue.push_front(nodeInfoForPhone);
+                    nodeInfoForPhone = {};
+                }
+            }
+            prefetchNodeInfos();
+
+            bool queueEmpty;
+            {
+                concurrency::LockGuard guard(&nodeInfoMutex);
+                queueEmpty = nodeInfoQueue.empty();
+            }
+
+            if (queueEmpty) {
+                LOG_DEBUG("Done sending %d of %d nodeinfos (batched) millis=%u", readIndex, nodeDB->getNumMeshNodes(), millis());
+                concurrency::LockGuard guard(&nodeInfoMutex);
+                nodeInfoQueue.clear();
+                state = STATE_SEND_FILEMANIFEST;
+                return getFromRadio(buf);
+            }
+
+            // Fix up user IDs and log progress
+            {
+                concurrency::LockGuard guard(&nodeInfoMutex);
+                for (auto &info : nodeInfoQueue) {
+                    sprintf(info.user.id, "!%08x", info.num);
+                }
+            }
+
+            // Estimate overhead: FromRadio id (~2B) + oneof tag 18 (~2B) + NodeInfoBatch length varint (~2B) = ~6 bytes
+            constexpr size_t kFromRadioOverhead = 10; // conservative
+            size_t batchCount;
+            {
+                concurrency::LockGuard guard(&nodeInfoMutex);
+                batchCount = calculateBatchCount(nodeInfoQueue, MAX_TO_FROM_RADIO_SIZE - kFromRadioOverhead);
+            }
+
+            if (readIndex == 2 || readIndex % 20 == 0) {
+                concurrency::LockGuard guard(&nodeInfoMutex);
+                LOG_DEBUG("nodeinfo batch: %d items, %d/%d total", batchCount, readIndex, nodeDB->getNumMeshNodes());
+            }
+
+            // Use a local FromRadio so the callback context pointer doesn't outlive its scope.
+            meshtastic_FromRadio batchRadio = {};
+            NodeInfoBatchEncodeContext ctx;
+            {
+                concurrency::LockGuard guard(&nodeInfoMutex);
+                ctx.items = &nodeInfoQueue;
+                ctx.itemCount = batchCount;
+            }
+
+            batchRadio.which_payload_variant = meshtastic_FromRadio_node_info_batch_tag;
+            batchRadio.node_info_batch.items.funcs.encode = nodeInfoBatchEncodeCallback;
+            batchRadio.node_info_batch.items.arg = &ctx;
+
+            size_t numbytes = pb_encode_to_bytes(buf, MAX_TO_FROM_RADIO_SIZE, &meshtastic_FromRadio_msg, &batchRadio);
+
+            // Remove consumed items from the queue
+            {
+                concurrency::LockGuard guard(&nodeInfoMutex);
+                for (size_t i = 0; i < batchCount && !nodeInfoQueue.empty(); i++) {
+                    nodeInfoQueue.pop_front();
+                }
+            }
+
+            prefetchNodeInfos();
+            return numbytes;
+        }
+
+        // Non-batched path: send one NodeInfo per FromRadio packet (legacy behavior)
        meshtastic_NodeInfo infoToSend = {};
        {
            concurrency::LockGuard guard(&nodeInfoMutex);
@@ -496,11 +611,6 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
            // Just in case we stored a different user.id in the past, but should never happen going forward
            sprintf(infoToSend.user.id, "!%08x", infoToSend.num);

-            // Logging this really slows down sending nodes on initial connection because the serial console is so slow, so only
-            // uncomment if you really need to:
-            // LOG_INFO("nodeinfo: num=0x%x, lastseen=%u, id=%s, name=%s", nodeInfoForPhone.num, nodeInfoForPhone.last_heard,
-            // nodeInfoForPhone.user.id, nodeInfoForPhone.user.long_name);
-
            // Occasional progress logging. (readIndex==2 will be true for the first non-us node)
            if (readIndex == 2 || readIndex % 20 == 0) {
                LOG_DEBUG("nodeinfo: %d/%d", readIndex, nodeDB->getNumMeshNodes());
@@ -523,8 +633,8 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
    case STATE_SEND_FILEMANIFEST: {
        LOG_DEBUG("FromRadio=STATE_SEND_FILEMANIFEST");
        // last element
-        if (config_state == filesManifest.size() ||
-            config_nonce == SPECIAL_NONCE_ONLY_NODES) { // also handles an empty filesManifest
+        if (config_state == filesManifest.size() || config_nonce == SPECIAL_NONCE_ONLY_NODES ||
+            config_nonce == SPECIAL_NONCE_BATCH_ONLY_NODES) { // also handles an empty filesManifest
            config_state = 0;
            filesManifest.clear();
            // Skip to complete packet
@@ -579,7 +689,7 @@ size_t PhoneAPI::getFromRadio(uint8_t *buf)
    // Do we have a message from the mesh?
    if (fromRadioScratch.which_payload_variant != 0) {
        // Encapsulate as a FromRadio packet
-        size_t numbytes = pb_encode_to_bytes(buf, meshtastic_FromRadio_size, &meshtastic_FromRadio_msg, &fromRadioScratch);
+        size_t numbytes = pb_encode_to_bytes(buf, MAX_TO_FROM_RADIO_SIZE, &meshtastic_FromRadio_msg, &fromRadioScratch);

        // VERY IMPORTANT to not print debug messages while writing to fromRadioScratch - because we use that same buffer
        // for logging (when we are encapsulating with protobufs)
@@ -13,15 +13,14 @@
 // Make sure that we never let our packets grow too large for one BLE packet
 #define MAX_TO_FROM_RADIO_SIZE 512

-#if meshtastic_FromRadio_size > MAX_TO_FROM_RADIO_SIZE
-#error "meshtastic_FromRadio_size is too large for our BLE packets"
-#endif
 #if meshtastic_ToRadio_size > MAX_TO_FROM_RADIO_SIZE
 #error "meshtastic_ToRadio_size is too large for our BLE packets"
 #endif

 #define SPECIAL_NONCE_ONLY_CONFIG 69420
 #define SPECIAL_NONCE_ONLY_NODES 69421 // ( ͡° ͜ʖ ͡°)
+#define SPECIAL_NONCE_BATCH 69422
+#define SPECIAL_NONCE_BATCH_ONLY_NODES 69423

 /**
 * Provides our protobuf based API which phone/PC clients can use to talk to our device
@@ -88,6 +87,9 @@ class PhoneAPI
    // Protect nodeInfoForPhone + nodeInfoQueue because NimBLE callbacks run in a separate FreeRTOS task.
    concurrency::Lock nodeInfoMutex;

+    // When true, bundle multiple NodeInfos per FromRadio packet (opt-in via batch nonce)
+    bool batchNodeInfo = false;
+
    meshtastic_ToRadio toRadioScratch = {
        0}; // this is a static scratch object, any data must be copied elsewhere before returning

@@ -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);
@@ -152,10 +152,8 @@ const RegionInfo regions[] = {

    /*
       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, 16, false, false, PROFILE_STD),

    /*
        433,05-434,7 Mhz 10 mW
@@ -626,9 +624,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;

@@ -963,7 +961,7 @@ void RadioInterface::applyModemConfig()
            cr = loraConfig.coding_rate;
            LOG_INFO("Using custom Coding Rate %u", cr);
        } else {
-            cr = newcr;
+            cr = loraConfig.coding_rate;
        }

    } else { // if not using preset, then just use the custom settings
@@ -1038,13 +1036,6 @@ void RadioInterface::applyModemConfig()
    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);

@@ -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;
@@ -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 */
@@ -19,7 +19,6 @@
 #endif
 #include "Default.h"
 #if ARCH_PORTDUINO
-#include "modules/Native/StoreForwardPlusPlus.h"
 #include "Throttle.h"
 #include "platform/portduino/PortduinoGlue.h"
 #endif
@@ -384,12 +383,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 +782,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);
    }
@@ -245,10 +245,8 @@ 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)
@@ -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)
@@ -190,7 +190,7 @@ void StreamAPI::emitRebooted()
    fromRadioScratch.rebooted = true;

    // LOG_DEBUG("Emitting reboot packet for serial shell");
-    emitTxBuffer(pb_encode_to_bytes(txBuf + HEADER_LEN, meshtastic_FromRadio_size, &meshtastic_FromRadio_msg, &fromRadioScratch));
+    emitTxBuffer(pb_encode_to_bytes(txBuf + HEADER_LEN, MAX_TO_FROM_RADIO_SIZE, &meshtastic_FromRadio_msg, &fromRadioScratch));
 }

 void StreamAPI::emitLogRecord(meshtastic_LogRecord_Level level, const char *src, const char *format, va_list arg)
@@ -209,7 +209,7 @@ void StreamAPI::emitLogRecord(meshtastic_LogRecord_Level level, const char *src,
    if (num_printed > 0 && fromRadioScratch.log_record.message[num_printed - 1] ==
                               '\n') // Strip any ending newline, because we have records for framing instead.
        fromRadioScratch.log_record.message[num_printed - 1] = '\0';
-    emitTxBuffer(pb_encode_to_bytes(txBuf + HEADER_LEN, meshtastic_FromRadio_size, &meshtastic_FromRadio_msg, &fromRadioScratch));
+    emitTxBuffer(pb_encode_to_bytes(txBuf + HEADER_LEN, MAX_TO_FROM_RADIO_SIZE, &meshtastic_FromRadio_msg, &fromRadioScratch));
 }

 /// Hookable to find out when connection changes
@@ -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
@@ -42,6 +42,9 @@ PB_BIND(meshtastic_MeshPacket, meshtastic_MeshPacket, 2)
 PB_BIND(meshtastic_NodeInfo, meshtastic_NodeInfo, 2)


+PB_BIND(meshtastic_NodeInfoBatch, meshtastic_NodeInfoBatch, AUTO)
+
+
 PB_BIND(meshtastic_MyNodeInfo, meshtastic_MyNodeInfo, AUTO)


@@ -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.
 ------------------------------------------------------------------------------------------------------------------------------------------ */
@@ -1039,6 +1037,12 @@ typedef struct _meshtastic_NodeInfo {
    bool is_muted;
 } meshtastic_NodeInfo;

+/* Batched NodeInfo wrapper for efficient bulk transfer during want_config flow.
+ Allows multiple NodeInfo messages to be packed into a single FromRadio packet. */
+typedef struct _meshtastic_NodeInfoBatch {
+    pb_callback_t items;
+} meshtastic_NodeInfoBatch;
+
 typedef PB_BYTES_ARRAY_T(16) meshtastic_MyNodeInfo_device_id_t;
 /* Unique local debugging info for this node
 Note: we don't include position or the user info, because that will come in the
@@ -1264,6 +1268,9 @@ typedef struct _meshtastic_FromRadio {
        meshtastic_ClientNotification clientNotification;
        /* Persistent data for device-ui */
        meshtastic_DeviceUIConfig deviceuiConfig;
+        /* Batched NodeInfo messages for efficient bulk transfer.
+     Used when client opts in via special nonce value. */
+        meshtastic_NodeInfoBatch node_info_batch;
    };
 } meshtastic_FromRadio;

@@ -1423,6 +1430,7 @@ extern "C" {
 #define meshtastic_MeshPacket_transport_mechanism_ENUMTYPE meshtastic_MeshPacket_TransportMechanism


+
 #define meshtastic_MyNodeInfo_firmware_edition_ENUMTYPE meshtastic_FirmwareEdition

 #define meshtastic_LogRecord_level_ENUMTYPE meshtastic_LogRecord_Level
@@ -1464,6 +1472,7 @@ extern "C" {
 #define meshtastic_MqttClientProxyMessage_init_default {"", 0, {{0, {0}}}, 0}
 #define meshtastic_MeshPacket_init_default       {0, 0, 0, 0, {meshtastic_Data_init_default}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0, 0, 0, 0, _meshtastic_MeshPacket_TransportMechanism_MIN}
 #define meshtastic_NodeInfo_init_default         {0, false, meshtastic_User_init_default, false, meshtastic_Position_init_default, 0, 0, false, meshtastic_DeviceMetrics_init_default, 0, 0, false, 0, 0, 0, 0, 0}
+#define meshtastic_NodeInfoBatch_init_default    {{{NULL}, NULL}}
 #define meshtastic_MyNodeInfo_init_default       {0, 0, 0, {0, {0}}, "", _meshtastic_FirmwareEdition_MIN, 0}
 #define meshtastic_LogRecord_init_default        {"", 0, "", _meshtastic_LogRecord_Level_MIN}
 #define meshtastic_QueueStatus_init_default      {0, 0, 0, 0}
@@ -1497,6 +1506,7 @@ extern "C" {
 #define meshtastic_MqttClientProxyMessage_init_zero {"", 0, {{0, {0}}}, 0}
 #define meshtastic_MeshPacket_init_zero          {0, 0, 0, 0, {meshtastic_Data_init_zero}, 0, 0, 0, 0, 0, _meshtastic_MeshPacket_Priority_MIN, 0, _meshtastic_MeshPacket_Delayed_MIN, 0, 0, {0, {0}}, 0, 0, 0, 0, _meshtastic_MeshPacket_TransportMechanism_MIN}
 #define meshtastic_NodeInfo_init_zero            {0, false, meshtastic_User_init_zero, false, meshtastic_Position_init_zero, 0, 0, false, meshtastic_DeviceMetrics_init_zero, 0, 0, false, 0, 0, 0, 0, 0}
+#define meshtastic_NodeInfoBatch_init_zero       {{{NULL}, NULL}}
 #define meshtastic_MyNodeInfo_init_zero          {0, 0, 0, {0, {0}}, "", _meshtastic_FirmwareEdition_MIN, 0}
 #define meshtastic_LogRecord_init_zero           {"", 0, "", _meshtastic_LogRecord_Level_MIN}
 #define meshtastic_QueueStatus_init_zero         {0, 0, 0, 0}
@@ -1628,6 +1638,7 @@ extern "C" {
 #define meshtastic_NodeInfo_is_ignored_tag       11
 #define meshtastic_NodeInfo_is_key_manually_verified_tag 12
 #define meshtastic_NodeInfo_is_muted_tag         13
+#define meshtastic_NodeInfoBatch_items_tag       1
 #define meshtastic_MyNodeInfo_my_node_num_tag    1
 #define meshtastic_MyNodeInfo_reboot_count_tag   8
 #define meshtastic_MyNodeInfo_min_app_version_tag 11
@@ -1702,6 +1713,7 @@ extern "C" {
 #define meshtastic_FromRadio_fileInfo_tag        15
 #define meshtastic_FromRadio_clientNotification_tag 16
 #define meshtastic_FromRadio_deviceuiConfig_tag  17
+#define meshtastic_FromRadio_node_info_batch_tag 18
 #define meshtastic_Heartbeat_nonce_tag           1
 #define meshtastic_ToRadio_packet_tag            1
 #define meshtastic_ToRadio_want_config_id_tag    3
@@ -1884,6 +1896,12 @@ X(a, STATIC,   SINGULAR, BOOL,     is_muted,         13)
 #define meshtastic_NodeInfo_position_MSGTYPE meshtastic_Position
 #define meshtastic_NodeInfo_device_metrics_MSGTYPE meshtastic_DeviceMetrics

+#define meshtastic_NodeInfoBatch_FIELDLIST(X, a) \
+X(a, CALLBACK, REPEATED, MESSAGE,  items,             1)
+#define meshtastic_NodeInfoBatch_CALLBACK pb_default_field_callback
+#define meshtastic_NodeInfoBatch_DEFAULT NULL
+#define meshtastic_NodeInfoBatch_items_MSGTYPE meshtastic_NodeInfo
+
 #define meshtastic_MyNodeInfo_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   my_node_num,       1) \
 X(a, STATIC,   SINGULAR, UINT32,   reboot_count,      8) \
@@ -1928,7 +1946,8 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,metadata,metadata),  13) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,mqttClientProxyMessage,mqttClientProxyMessage),  14) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,fileInfo,fileInfo),  15) \
 X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,clientNotification,clientNotification),  16) \
-X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,deviceuiConfig,deviceuiConfig),  17)
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,deviceuiConfig,deviceuiConfig),  17) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,node_info_batch,node_info_batch),  18)
 #define meshtastic_FromRadio_CALLBACK NULL
 #define meshtastic_FromRadio_DEFAULT NULL
 #define meshtastic_FromRadio_payload_variant_packet_MSGTYPE meshtastic_MeshPacket
@@ -1945,6 +1964,7 @@ X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,deviceuiConfig,deviceuiConfi
 #define meshtastic_FromRadio_payload_variant_fileInfo_MSGTYPE meshtastic_FileInfo
 #define meshtastic_FromRadio_payload_variant_clientNotification_MSGTYPE meshtastic_ClientNotification
 #define meshtastic_FromRadio_payload_variant_deviceuiConfig_MSGTYPE meshtastic_DeviceUIConfig
+#define meshtastic_FromRadio_payload_variant_node_info_batch_MSGTYPE meshtastic_NodeInfoBatch

 #define meshtastic_ClientNotification_FIELDLIST(X, a) \
 X(a, STATIC,   OPTIONAL, UINT32,   reply_id,          1) \
@@ -2100,6 +2120,7 @@ extern const pb_msgdesc_t meshtastic_StatusMessage_msg;
 extern const pb_msgdesc_t meshtastic_MqttClientProxyMessage_msg;
 extern const pb_msgdesc_t meshtastic_MeshPacket_msg;
 extern const pb_msgdesc_t meshtastic_NodeInfo_msg;
+extern const pb_msgdesc_t meshtastic_NodeInfoBatch_msg;
 extern const pb_msgdesc_t meshtastic_MyNodeInfo_msg;
 extern const pb_msgdesc_t meshtastic_LogRecord_msg;
 extern const pb_msgdesc_t meshtastic_QueueStatus_msg;
@@ -2135,6 +2156,7 @@ extern const pb_msgdesc_t meshtastic_ChunkedPayloadResponse_msg;
 #define meshtastic_MqttClientProxyMessage_fields &meshtastic_MqttClientProxyMessage_msg
 #define meshtastic_MeshPacket_fields &meshtastic_MeshPacket_msg
 #define meshtastic_NodeInfo_fields &meshtastic_NodeInfo_msg
+#define meshtastic_NodeInfoBatch_fields &meshtastic_NodeInfoBatch_msg
 #define meshtastic_MyNodeInfo_fields &meshtastic_MyNodeInfo_msg
 #define meshtastic_LogRecord_fields &meshtastic_LogRecord_msg
 #define meshtastic_QueueStatus_fields &meshtastic_QueueStatus_msg
@@ -2158,9 +2180,11 @@ extern const pb_msgdesc_t meshtastic_ChunkedPayloadResponse_msg;
 #define meshtastic_ChunkedPayloadResponse_fields &meshtastic_ChunkedPayloadResponse_msg

 /* Maximum encoded size of messages (where known) */
+/* meshtastic_NodeInfoBatch_size depends on runtime parameters */
+/* meshtastic_FromRadio_size depends on runtime parameters */
 /* meshtastic_resend_chunks_size depends on runtime parameters */
 /* meshtastic_ChunkedPayloadResponse_size depends on runtime parameters */
-#define MESHTASTIC_MESHTASTIC_MESH_PB_H_MAX_SIZE meshtastic_FromRadio_size
+#define MESHTASTIC_MESHTASTIC_MESH_PB_H_MAX_SIZE meshtastic_ToRadio_size
 #define meshtastic_ChunkedPayload_size           245
 #define meshtastic_ClientNotification_size       482
 #define meshtastic_Compressed_size               239
@@ -2168,7 +2192,6 @@ extern const pb_msgdesc_t meshtastic_ChunkedPayloadResponse_msg;
 #define meshtastic_DeviceMetadata_size           54
 #define meshtastic_DuplicatedPublicKey_size      0
 #define meshtastic_FileInfo_size                 236
-#define meshtastic_FromRadio_size                510
 #define meshtastic_Heartbeat_size                6
 #define meshtastic_KeyVerificationFinal_size     65
 #define meshtastic_KeyVerificationNumberInform_size 58
@@ -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. */
@@ -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;
    }

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

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

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

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

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

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

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

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

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

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

    if (!(moduleConfig.telemetry.environment_measurement_enabled || moduleConfig.telemetry.environment_screen_enabled ||
          ENVIRONMENTAL_TELEMETRY_MODULE_ENABLE)) {
@@ -0,0 +1,31 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_SHT31.h>)
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "SHT31Sensor.h"
+#include "TelemetrySensor.h"
+#include <Adafruit_SHT31.h>
+
+SHT31Sensor::SHT31Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SHT31, "SHT31") {}
+
+bool SHT31Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
+{
+    LOG_INFO("Init sensor: %s", sensorName);
+    sht31 = Adafruit_SHT31(bus);
+    status = sht31.begin(dev->address.address);
+    initI2CSensor();
+    return status;
+}
+
+bool SHT31Sensor::getMetrics(meshtastic_Telemetry *measurement)
+{
+    measurement->variant.environment_metrics.has_temperature = true;
+    measurement->variant.environment_metrics.has_relative_humidity = true;
+    measurement->variant.environment_metrics.temperature = sht31.readTemperature();
+    measurement->variant.environment_metrics.relative_humidity = sht31.readHumidity();
+
+    return true;
+}
+
+#endif
@@ -0,0 +1,20 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_SHT31.h>)
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include <Adafruit_SHT31.h>
+
+class SHT31Sensor : public TelemetrySensor
+{
+  private:
+    Adafruit_SHT31 sht31;
+
+  public:
+    SHT31Sensor();
+    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
+    virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
+};
+
+#endif
@@ -0,0 +1,48 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_SHT4x.h>)
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "SHT4XSensor.h"
+#include "TelemetrySensor.h"
+#include <Adafruit_SHT4x.h>
+
+SHT4XSensor::SHT4XSensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SHT4X, "SHT4X") {}
+
+bool SHT4XSensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
+{
+    LOG_INFO("Init sensor: %s", sensorName);
+
+    uint32_t serialNumber = 0;
+
+    status = sht4x.begin(bus);
+    if (!status) {
+        return status;
+    }
+
+    serialNumber = sht4x.readSerial();
+    if (serialNumber != 0) {
+        LOG_DEBUG("serialNumber : %x", serialNumber);
+        status = 1;
+    } else {
+        LOG_DEBUG("Error trying to execute readSerial(): ");
+        status = 0;
+    }
+
+    initI2CSensor();
+    return status;
+}
+
+bool SHT4XSensor::getMetrics(meshtastic_Telemetry *measurement)
+{
+    measurement->variant.environment_metrics.has_temperature = true;
+    measurement->variant.environment_metrics.has_relative_humidity = true;
+
+    sensors_event_t humidity, temp;
+    sht4x.getEvent(&humidity, &temp);
+    measurement->variant.environment_metrics.temperature = temp.temperature;
+    measurement->variant.environment_metrics.relative_humidity = humidity.relative_humidity;
+    return true;
+}
+
+#endif
@@ -0,0 +1,20 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_SHT4x.h>)
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include <Adafruit_SHT4x.h>
+
+class SHT4XSensor : public TelemetrySensor
+{
+  private:
+    Adafruit_SHT4x sht4x = Adafruit_SHT4x();
+
+  public:
+    SHT4XSensor();
+    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
+    virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
+};
+
+#endif
@@ -0,0 +1,35 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_SHTC3.h>)
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "SHTC3Sensor.h"
+#include "TelemetrySensor.h"
+#include <Adafruit_SHTC3.h>
+
+SHTC3Sensor::SHTC3Sensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SHTC3, "SHTC3") {}
+
+bool SHTC3Sensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
+{
+    LOG_INFO("Init sensor: %s", sensorName);
+    status = shtc3.begin(bus);
+
+    initI2CSensor();
+    return status;
+}
+
+bool SHTC3Sensor::getMetrics(meshtastic_Telemetry *measurement)
+{
+    measurement->variant.environment_metrics.has_temperature = true;
+    measurement->variant.environment_metrics.has_relative_humidity = true;
+
+    sensors_event_t humidity, temp;
+    shtc3.getEvent(&humidity, &temp);
+
+    measurement->variant.environment_metrics.temperature = temp.temperature;
+    measurement->variant.environment_metrics.relative_humidity = humidity.relative_humidity;
+
+    return true;
+}
+
+#endif
@@ -0,0 +1,20 @@
+#include "configuration.h"
+
+#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<Adafruit_SHTC3.h>)
+
+#include "../mesh/generated/meshtastic/telemetry.pb.h"
+#include "TelemetrySensor.h"
+#include <Adafruit_SHTC3.h>
+
+class SHTC3Sensor : public TelemetrySensor
+{
+  private:
+    Adafruit_SHTC3 shtc3 = Adafruit_SHTC3();
+
+  public:
+    SHTC3Sensor();
+    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
+    virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
+};
+
+#endif
@@ -1,145 +0,0 @@
-#include "configuration.h"
-
-#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<SHTSensor.h>)
-
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "SHTXXSensor.h"
-#include "TelemetrySensor.h"
-#include <SHTSensor.h>
-
-SHTXXSensor::SHTXXSensor() : TelemetrySensor(meshtastic_TelemetrySensorType_SHTXX, "SHTXX") {}
-
-void SHTXXSensor::getSensorVariant(SHTSensor::SHTSensorType sensorType)
-{
-    switch (sensorType) {
-    case SHTSensor::SHTSensorType::SHT2X:
-        sensorVariant = "SHT2x";
-        break;
-
-    case SHTSensor::SHTSensorType::SHT3X:
-    case SHTSensor::SHTSensorType::SHT85:
-        sensorVariant = "SHT3x/SHT85";
-        break;
-
-    case SHTSensor::SHTSensorType::SHT3X_ALT:
-        sensorVariant = "SHT3x";
-        break;
-
-    case SHTSensor::SHTSensorType::SHTW1:
-    case SHTSensor::SHTSensorType::SHTW2:
-    case SHTSensor::SHTSensorType::SHTC1:
-    case SHTSensor::SHTSensorType::SHTC3:
-        sensorVariant = "SHTC1/SHTC3/SHTW1/SHTW2";
-        break;
-
-    case SHTSensor::SHTSensorType::SHT4X:
-        sensorVariant = "SHT4x";
-        break;
-
-    default:
-        sensorVariant = "Unknown";
-        break;
-    }
-}
-
-bool SHTXXSensor::initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev)
-{
-    LOG_INFO("Init sensor: %s", sensorName);
-
-    _bus = bus;
-    _address = dev->address.address;
-
-    if (sht.init(*_bus)) {
-        LOG_INFO("%s: init(): success", sensorName);
-        getSensorVariant(sht.mSensorType);
-        LOG_INFO("%s Sensor detected: %s on 0x%x", sensorName, sensorVariant, _address);
-        status = 1;
-    } else {
-        LOG_ERROR("%s: init(): failed", sensorName);
-    }
-
-    initI2CSensor();
-    return status;
-}
-
-/**
- * Accuracy setting of measurement.
- * Not all sensors support changing the sampling accuracy (only SHT3X and SHT4X)
- * SHTAccuracy:
- * - SHT_ACCURACY_HIGH: Highest repeatability at the cost of slower measurement
- * - SHT_ACCURACY_MEDIUM: Balanced repeatability and speed of measurement
- * - SHT_ACCURACY_LOW: Fastest measurement but lowest repeatability
- */
-bool SHTXXSensor::setAccuracy(SHTSensor::SHTAccuracy newAccuracy)
-{
-    // Only SHT3X-family (including alternates) and SHT4X support changing accuracy
-    if (sht.mSensorType != SHTSensor::SHTSensorType::SHT3X && sht.mSensorType != SHTSensor::SHTSensorType::SHT3X_ALT &&
-        sht.mSensorType != SHTSensor::SHTSensorType::SHT85 && sht.mSensorType != SHTSensor::SHTSensorType::SHT4X) {
-        LOG_WARN("%s doesn't support accuracy setting", sensorVariant);
-        return false;
-    }
-    LOG_INFO("%s: setting new accuracy setting", sensorVariant);
-    accuracy = newAccuracy;
-    return sht.setAccuracy(accuracy);
-}
-
-bool SHTXXSensor::getMetrics(meshtastic_Telemetry *measurement)
-{
-    if (sht.readSample()) {
-        measurement->variant.environment_metrics.has_temperature = true;
-        measurement->variant.environment_metrics.has_relative_humidity = true;
-        measurement->variant.environment_metrics.temperature = sht.getTemperature();
-        measurement->variant.environment_metrics.relative_humidity = sht.getHumidity();
-
-        LOG_INFO("%s (%s): Got: temp:%fdegC, hum:%f%%rh", sensorName, sensorVariant,
-                 measurement->variant.environment_metrics.temperature,
-                 measurement->variant.environment_metrics.relative_humidity);
-
-        return true;
-    } else {
-        LOG_ERROR("%s (%s): read sample failed", sensorName, sensorVariant);
-        return false;
-    }
-}
-
-AdminMessageHandleResult SHTXXSensor::handleAdminMessage(const meshtastic_MeshPacket &mp, meshtastic_AdminMessage *request,
-                                                         meshtastic_AdminMessage *response)
-{
-    AdminMessageHandleResult result;
-    result = AdminMessageHandleResult::NOT_HANDLED;
-
-    switch (request->which_payload_variant) {
-    case meshtastic_AdminMessage_sensor_config_tag:
-        if (!request->sensor_config.has_shtxx_config) {
-            result = AdminMessageHandleResult::NOT_HANDLED;
-            break;
-        }
-
-        // Check for sensor accuracy setting
-        if (request->sensor_config.shtxx_config.has_set_accuracy) {
-            SHTSensor::SHTAccuracy newAccuracy;
-            if (request->sensor_config.shtxx_config.set_accuracy == 0) {
-                newAccuracy = SHTSensor::SHT_ACCURACY_LOW;
-            } else if (request->sensor_config.shtxx_config.set_accuracy == 1) {
-                newAccuracy = SHTSensor::SHT_ACCURACY_MEDIUM;
-            } else if (request->sensor_config.shtxx_config.set_accuracy == 2) {
-                newAccuracy = SHTSensor::SHT_ACCURACY_HIGH;
-            } else {
-                LOG_ERROR("%s: incorrect accuracy setting", sensorName);
-                result = AdminMessageHandleResult::HANDLED;
-                break;
-            }
-            this->setAccuracy(newAccuracy);
-        }
-
-        result = AdminMessageHandleResult::HANDLED;
-        break;
-
-    default:
-        result = AdminMessageHandleResult::NOT_HANDLED;
-    }
-
-    return result;
-}
-
-#endif
@@ -1,29 +0,0 @@
-#include "configuration.h"
-
-#if !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && __has_include(<SHTSensor.h>)
-
-#include "../mesh/generated/meshtastic/telemetry.pb.h"
-#include "TelemetrySensor.h"
-#include <SHTSensor.h>
-
-class SHTXXSensor : public TelemetrySensor
-{
-  private:
-    SHTSensor sht;
-    TwoWire *_bus{};
-    uint8_t _address{};
-    SHTSensor::SHTAccuracy accuracy{};
-    bool setAccuracy(SHTSensor::SHTAccuracy newAccuracy);
-
-  public:
-    SHTXXSensor();
-    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
-    virtual bool initDevice(TwoWire *bus, ScanI2C::FoundDevice *dev) override;
-    void getSensorVariant(SHTSensor::SHTSensorType);
-    const char *sensorVariant{};
-
-    AdminMessageHandleResult handleAdminMessage(const meshtastic_MeshPacket &mp, meshtastic_AdminMessage *request,
-                                                meshtastic_AdminMessage *response) override;
-};
-
-#endif
@@ -7,7 +7,6 @@
 #include "NodeDB.h"
 #include "Router.h"
 #include "TypeConversions.h"
-#include "airtime.h"
 #include "concurrency/LockGuard.h"
 #include "configuration.h"
 #include "mesh-pb-constants.h"
@@ -1002,11 +1001,7 @@ void TrafficManagementModule::alterReceived(meshtastic_MeshPacket &mp)
    const auto &cfg = moduleConfig.traffic_management;
    const bool isTelemetry = mp.decoded.portnum == meshtastic_PortNum_TELEMETRY_APP;
    const bool isPosition = mp.decoded.portnum == meshtastic_PortNum_POSITION_APP;
-    // Only exhaust telemetry hops when channel is actually congested, mirroring the same
-    // airtime checks that gate self-generated telemetry in the telemetry modules.
-    const bool channelBusy = airTime && (!airTime->isTxAllowedChannelUtil(true) || !airTime->isTxAllowedAirUtil());
-    const bool shouldExhaust =
-        ((channelBusy && isTelemetry && cfg.exhaust_hop_telemetry) || (isPosition && cfg.exhaust_hop_position));
+    const bool shouldExhaust = (isTelemetry && cfg.exhaust_hop_telemetry) || (isPosition && cfg.exhaust_hop_position);

    if (!shouldExhaust || !isBroadcast(mp.to))
        return;
@@ -322,8 +322,8 @@ bool connectPubSub(const PubSubConfig &config, PubSubClient &pubSub, Client &cli
    pubSub.setClient(client);
    pubSub.setServer(config.serverAddr.c_str(), config.serverPort);

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

    // Generate node ID from nodenum for client identification
    std::string nodeId = nodeDB->getNodeId();
@@ -145,7 +145,7 @@ class BluetoothPhoneAPI : public PhoneAPI, public concurrency::OSThread
    std::mutex toPhoneMutex;
    std::atomic<size_t> toPhoneQueueSize{0};
    // We use array here (and pay the cost of memcpy) to avoid dynamic memory allocations and frees across FreeRTOS tasks.
-    std::array<std::array<uint8_t, meshtastic_FromRadio_size>, NIMBLE_BLUETOOTH_TO_PHONE_QUEUE_SIZE> toPhoneQueue{};
+    std::array<std::array<uint8_t, MAX_TO_FROM_RADIO_SIZE>, NIMBLE_BLUETOOTH_TO_PHONE_QUEUE_SIZE> toPhoneQueue{};
    std::array<size_t, NIMBLE_BLUETOOTH_TO_PHONE_QUEUE_SIZE> toPhoneQueueByteSizes{};
    // The onReadCallbackIsWaitingForData flag provides synchronization between the NimBLE task's onRead callback and our main
    // task's runOnce. It's only set by onRead, and only cleared by runOnce.
@@ -245,7 +245,7 @@ class BluetoothPhoneAPI : public PhoneAPI, public concurrency::OSThread
    void runOnceHandleToPhoneQueue()
    {
        // Stack buffer for getFromRadio packet
-        uint8_t fromRadioBytes[meshtastic_FromRadio_size] = {0};
+        uint8_t fromRadioBytes[MAX_TO_FROM_RADIO_SIZE] = {0};
        size_t numBytes = 0;

        if (onReadCallbackIsWaitingForData || runOnceToPhoneCanPreloadNextPacket()) {
@@ -524,7 +524,7 @@ class NimbleBluetoothFromRadioCallback : public NimBLECharacteristicCallbacks
        }

        // Pop from toPhoneQueue, protected by toPhoneMutex. Hold the mutex as briefly as possible.
-        uint8_t fromRadioBytes[meshtastic_FromRadio_size] = {0}; // Stack buffer for getFromRadio packet
+        uint8_t fromRadioBytes[MAX_TO_FROM_RADIO_SIZE] = {0}; // Stack buffer for getFromRadio packet
        size_t numBytes = 0;
        { // scope for toPhoneMutex mutex
            std::lock_guard<std::mutex> guard(bluetoothPhoneAPI->toPhoneMutex);
@@ -231,9 +231,7 @@ void cpuDeepSleep(uint32_t msecToWake)
 #if SOC_RTCIO_HOLD_SUPPORTED && SOC_PM_SUPPORT_EXT_WAKEUP
    uint64_t gpioMask = (1ULL << (config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN));
 #endif
-#ifdef ALT_BUTTON_WAKE
-    gpioMask |= (1ULL << BUTTON_PIN_ALT);
-#endif
+
 #ifdef BUTTON_NEED_PULLUP
    gpio_pullup_en((gpio_num_t)BUTTON_PIN);
 #endif
@@ -23,6 +23,5 @@ void lateInitVariant()
    cfg.i2s.bits = BIT_LENGTH_16BITS;
    cfg.i2s.rate = RATE_44K;
    board.begin(cfg);
-    board.setVolume(75); // 75% volume
 }
 #endif
@@ -25,7 +25,7 @@ static BLEDfuSecure bledfusecure;                                             //
 // This scratch buffer is used for various bluetooth reads/writes - but it is safe because only one bt operation can be in
 // process at once
 // static uint8_t trBytes[_max(_max(_max(_max(ToRadio_size, RadioConfig_size), User_size), MyNodeInfo_size), FromRadio_size)];
-static uint8_t fromRadioBytes[meshtastic_FromRadio_size];
+static uint8_t fromRadioBytes[MAX_TO_FROM_RADIO_SIZE];
 static uint8_t toRadioBytes[meshtastic_ToRadio_size];

 // Last ToRadio value received from the phone
@@ -17,7 +17,6 @@
 #include <nrfx_wdt.h>
 #include <stdio.h>
 // #include <Adafruit_USBD_Device.h>
-#include "HardwareRNG.h"
 #include "NodeDB.h"
 #include "PowerMon.h"
 #include "error.h"
@@ -399,14 +398,15 @@ void nrf52Setup()
 #endif

    // Init random seed
-    uint32_t seed = 0;
-    if (!HardwareRNG::seed(seed)) {
-        LOG_WARN("Hardware RNG seed unavailable, using PRNG fallback");
-        // Use a hardware timer value as a fallback seed for better entropy
-        seed = micros();
-    }
-    LOG_DEBUG("Set random seed %u", seed);
-    randomSeed(seed);
+    union seedParts {
+        uint32_t seed32;
+        uint8_t seed8[4];
+    } seed;
+    nRFCrypto.begin();
+    nRFCrypto.Random.generate(seed.seed8, sizeof(seed.seed8));
+    LOG_DEBUG("Set random seed %u", seed.seed32);
+    randomSeed(seed.seed32);
+    nRFCrypto.end();

    // Set up nrfx watchdog. Do not enable the watchdog yet (we do that
    // the first time through the main loop), so that other threads can
@@ -1,5 +1,4 @@
 #include "CryptoEngine.h"
-#include "HardwareRNG.h"
 #include "PortduinoGPIO.h"
 #include "SPIChip.h"
 #include "mesh/RF95Interface.h"
@@ -184,7 +183,6 @@ void portduinoSetup()

    if (portduino_config.force_simradio == true) {
        portduino_config.lora_module = use_simradio;
-        portduino_config.sfpp_enabled = false;
    } else if (configPath != nullptr) {
        if (loadConfig(configPath)) {
            if (!yamlOnly)
@@ -235,9 +233,7 @@ void portduinoSetup()
        std::cout << "Running in simulated mode." << std::endl;
        portduino_config.MaxNodes = 200; // Default to 200 nodes
        // Set the random seed equal to TCPPort to have a different seed per instance
-        uint32_t seed = TCPPort;
-        HardwareRNG::seed(seed);
-        randomSeed(seed);
+        randomSeed(TCPPort);
        return;
    }

@@ -516,9 +512,7 @@ void portduinoSetup()
 #endif
    printf("MAC ADDRESS: %02X:%02X:%02X:%02X:%02X:%02X\n", dmac[0], dmac[1], dmac[2], dmac[3], dmac[4], dmac[5]);
    // Rather important to set this, if not running simulated.
-    uint32_t seed = static_cast<uint32_t>(time(NULL));
-    HardwareRNG::seed(seed);
-    randomSeed(seed);
+    randomSeed(time(NULL));

    std::string defaultGpioChipName = gpioChipName + std::to_string(portduino_config.lora_default_gpiochip);

@@ -989,28 +983,6 @@ bool loadConfig(const char *configPath)
            }
        }

-        if (yamlConfig["StoreAndForward"]) {
-            portduino_config.sfpp_stratum0 = (yamlConfig["StoreAndForward"]["Stratum0"]).as<bool>(false);
-            portduino_config.sfpp_enabled = (yamlConfig["StoreAndForward"]["Enabled"]).as<bool>(true);
-            portduino_config.sfpp_db_path = (yamlConfig["StoreAndForward"]["DBPath"]).as<std::string>("/var/lib/meshtasticd/");
-            portduino_config.sfpp_initial_sync = (yamlConfig["StoreAndForward"]["InitialSync"]).as<int>(10);
-            portduino_config.sfpp_hops = (yamlConfig["StoreAndForward"]["Hops"]).as<int>(3);
-            portduino_config.sfpp_announce_interval = (yamlConfig["StoreAndForward"]["AnnounceInterval"]).as<int>(5);
-            portduino_config.sfpp_max_chain = (yamlConfig["StoreAndForward"]["MaxChainLength"]).as<uint32_t>(1000);
-            portduino_config.sfpp_backlog_limit = (yamlConfig["StoreAndForward"]["BacklogLimit"]).as<uint32_t>(100);
-            portduino_config.sfpp_steal_port = (yamlConfig["StoreAndForward"]["StealPort"]).as<bool>(false);
-        }
-        if (yamlConfig["Routing"]) {
-            if (yamlConfig["Routing"]["WhitelistPorts"]) {
-                portduino_config.whitelist_ports = (yamlConfig["Routing"]["WhitelistPorts"]).as<std::vector<int>>();
-                if (portduino_config.whitelist_ports.size() > 0) {
-                    portduino_config.whitelist_enabled = true;
-                }
-            }
-            if (yamlConfig["Routing"]["NoHopPorts"]) {
-                portduino_config.nohop_ports = (yamlConfig["Routing"]["NoHopPorts"]).as<std::vector<int>>();
-            }
-        }
        if (yamlConfig["General"]) {
            portduino_config.MaxNodes = (yamlConfig["General"]["MaxNodes"]).as<int>(200);
            portduino_config.maxtophone = (yamlConfig["General"]["MaxMessageQueue"]).as<int>(100);
@@ -187,26 +187,6 @@ extern struct portduino_config_struct {
    bool has_statusMessage = false;
    bool enable_UDP = false;

-    // Store and Forward++
-    std::string sfpp_db_path = "/var/lib/meshtasticd/";
-    bool sfpp_stratum0 = false;
-    bool sfpp_enabled = true;
-    bool sfpp_steal_port = false;
-    int sfpp_initial_sync = 10;
-    int sfpp_hops = 3;
-    int sfpp_announce_interval = 5; // minutes
-    uint32_t sfpp_max_chain = 1000;
-    uint32_t sfpp_backlog_limit = 100;
-    // allowed root hashes
-    // upstream node
-    // Are we allowing unknown channel hashes? Does this even make sense?
-    // Allow DMs
-
-    // Routing
-    bool whitelist_enabled = false;
-    std::vector<int> whitelist_ports = {};
-    std::vector<int> nohop_ports = {};
-
    // General
    std::string mac_address = "";
    bool mac_address_explicit = false;
@@ -572,29 +552,6 @@ extern struct portduino_config_struct {
            out << YAML::EndMap; // Config
        }

-        // StoreAndForward
-        if (sfpp_enabled) {
-            out << YAML::Key << "StoreAndForward" << YAML::Value << YAML::BeginMap;
-            out << YAML::Key << "Enabled" << YAML::Value << sfpp_enabled;
-            out << YAML::Key << "DBPath" << YAML::Value << sfpp_db_path;
-            out << YAML::Key << "Stratum0" << YAML::Value << sfpp_stratum0;
-            out << YAML::Key << "InitialSync" << YAML::Value << sfpp_initial_sync;
-            out << YAML::Key << "Hops" << YAML::Value << sfpp_hops;
-            out << YAML::Key << "AnnounceInterval" << YAML::Value << sfpp_announce_interval;
-            out << YAML::Key << "BacklogLimit" << YAML::Value << sfpp_backlog_limit;
-            out << YAML::Key << "MaxChainLength" << YAML::Value << sfpp_max_chain;
-            out << YAML::Key << "StealPort" << YAML::Value << sfpp_steal_port;
-            out << YAML::EndMap; // StoreAndForward
-        }
-
-        // Routing
-        if (whitelist_enabled || nohop_ports.size() > 0) {
-            out << YAML::Key << "Routing" << YAML::Value << YAML::BeginMap;
-            out << YAML::Key << "WhitelistPorts" << YAML::Value << whitelist_ports;
-            out << YAML::Key << "NoHopPorts" << YAML::Value << nohop_ports;
-            out << YAML::EndMap; // Routing
-        }
-
        // General
        out << YAML::Key << "General" << YAML::Value << YAML::BeginMap;
        if (config_directory != "")
@@ -1,4 +1,3 @@
-#include "HardwareRNG.h"
 #include "configuration.h"
 #include "hardware/xosc.h"
 #include <hardware/clocks.h>
@@ -99,12 +98,10 @@ void getMacAddr(uint8_t *dmac)

 void rp2040Setup()
 {
-    /* Sets a random seed to make sure we get different random numbers on each boot. */
-    uint32_t seed = 0;
-    if (!HardwareRNG::seed(seed)) {
-        seed = rp2040.hwrand32();
-    }
-    randomSeed(seed);
+    /* Sets a random seed to make sure we get different random numbers on each boot.
+       Taken from CPU cycle counter and ROSC oscillator, so should be pretty random.
+    */
+    randomSeed(rp2040.hwrand32());

 #ifdef RP2040_SLOW_CLOCK
    uint f_pll_sys = frequency_count_khz(CLOCKS_FC0_SRC_VALUE_PLL_SYS_CLKSRC_PRIMARY);
@@ -1,11 +0,0 @@
-.globl HardFault_Handler
-.syntax unified
-.thumb
-
-.type HardFault_Handler, %function
-HardFault_Handler:
-tst lr, #4
-ite eq
-mrseq r0, msp
-mrsne r0, psp
-b HardFault_Handler_C
@@ -1,6 +1,5 @@
 #include "RTC.h"
 #include "configuration.h"
-#include <stdarg.h>
 #include <stm32wle5xx.h>
 #include <stm32wlxx_hal.h>

@@ -54,99 +53,4 @@ extern "C" void __wrap__tzset_unlocked_r(struct _reent *reent_ptr)
 {
    return;
 }
-#endif
-
-// Taken from https://interrupt.memfault.com/blog/cortex-m-hardfault-debug
-typedef struct __attribute__((packed)) ContextStateFrame {
-    uint32_t r0;
-    uint32_t r1;
-    uint32_t r2;
-    uint32_t r3;
-    uint32_t r12;
-    uint32_t lr;
-    uint32_t return_address;
-    uint32_t xpsr;
-} sContextStateFrame;
-
-// NOTE: If you are using CMSIS, the registers can also be
-// accessed through CoreDebug->DHCSR & CoreDebug_DHCSR_C_DEBUGEN_Msk
-#define HALT_IF_DEBUGGING()                                                                                                      \
-    do {                                                                                                                         \
-        if ((*(volatile uint32_t *)0xE000EDF0) & (1 << 0)) {                                                                     \
-            __asm("bkpt 1");                                                                                                     \
-        }                                                                                                                        \
-    } while (0)
-
-static char hardfault_message_buffer[256];
-
-// printf directly using srcwrapper's debug UART function.
-static void debug_printf(const char *format, ...)
-{
-    va_list args;
-    va_start(args, format);
-    int length = vsnprintf(hardfault_message_buffer, sizeof(hardfault_message_buffer), format, args);
-    va_end(args);
-
-    if (length < 0)
-        return;
-    uart_debug_write((uint8_t *)hardfault_message_buffer, min((unsigned int)length, sizeof(hardfault_message_buffer) - 1));
-}
-
-// N picked by guessing
-#define DOT_TIME 1200000
-static void dot()
-{
-    digitalWrite(LED_POWER, LED_STATE_ON);
-    for (volatile int i = 0; i < DOT_TIME; i++) { /* busy wait */
-    }
-    digitalWrite(LED_POWER, LED_STATE_OFF);
-    for (volatile int i = 0; i < DOT_TIME; i++) { /* busy wait */
-    }
-}
-
-static void dash()
-{
-    digitalWrite(LED_POWER, LED_STATE_ON);
-    for (volatile int i = 0; i < (DOT_TIME * 3); i++) { /* busy wait */
-    }
-    digitalWrite(LED_POWER, LED_STATE_OFF);
-    for (volatile int i = 0; i < DOT_TIME; i++) { /* busy wait */
-    }
-}
-
-static void space()
-{
-    for (volatile int i = 0; i < (DOT_TIME * 3); i++) { /* busy wait */
-    }
-}
-
-// Disable optimizations for this function so "frame" argument
-// does not get optimized away
-extern "C" __attribute__((optimize("O0"))) void HardFault_Handler_C(sContextStateFrame *frame)
-{
-    debug_printf("HardFault!\r\n");
-    debug_printf("r0: %08x\r\n", frame->r0);
-    debug_printf("r1: %08x\r\n", frame->r1);
-    debug_printf("r2: %08x\r\n", frame->r2);
-    debug_printf("r3: %08x\r\n", frame->r3);
-    debug_printf("r12: %08x\r\n", frame->r12);
-    debug_printf("lr: %08x\r\n", frame->lr);
-    debug_printf("pc[return address]: %08x\r\n", frame->return_address);
-    debug_printf("xpsr: %08x\r\n", frame->xpsr);
-
-    HALT_IF_DEBUGGING();
-
-    // blink SOS forever
-    while (1) {
-        dot();
-        dot();
-        dot();
-        dash();
-        dash();
-        dash();
-        dot();
-        dot();
-        dot();
-        space();
-    }
-}
+#endif
@@ -14,23 +14,6 @@ class MockMeshService : public MeshService

 static MockMeshService *mockMeshService;

-// Test shim to expose protected radio parameters set by applyModemConfig()
-class TestableRadioInterface : public RadioInterface
-{
-  public:
-    TestableRadioInterface() : RadioInterface() {}
-    uint8_t getCr() const { return cr; }
-    uint8_t getSf() const { return sf; }
-    float getBw() const { return bw; }
-
-    // Override reconfigure to call the base which invokes applyModemConfig()
-    bool reconfigure() override { return RadioInterface::reconfigure(); }
-
-    // Stubs for pure virtual methods required by RadioInterface
-    uint32_t getPacketTime(uint32_t, bool) override { return 0; }
-    ErrorCode send(meshtastic_MeshPacket *p) override { return ERRNO_OK; }
-};
-
 static void test_bwCodeToKHz_specialMappings()
 {
    TEST_ASSERT_FLOAT_WITHIN(0.0001f, 31.25f, bwCodeToKHz(31));
@@ -117,87 +100,13 @@ static void test_clampConfigLora_validPresetUnchanged()
    TEST_ASSERT_EQUAL(meshtastic_Config_LoRaConfig_ModemPreset_MEDIUM_FAST, cfg.modem_preset);
 }

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

@@ -13,3 +13,7 @@ board_build.f_cpu = 240000000L
 upload_protocol = esptool
 ;upload_port = /dev/ttyUSB0
 upload_speed = 460800
+lib_deps =
+  ${esp32_base.lib_deps}
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
+  adafruit/Adafruit NeoPixel@1.15.4
@@ -39,6 +39,7 @@ build_flags =
  -Wall
  -Wextra
  -Isrc/platform/esp32
+  -include mbedtls/error.h
  -std=gnu++17
  -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG
  -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
@@ -67,7 +68,7 @@ lib_deps =
  ${environmental_extra.lib_deps}
  ${radiolib_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-esp32_https_server packageName=https://github.com/meshtastic/esp32_https_server gitBranch=master
-  https://github.com/meshtastic/esp32_https_server/archive/0c71f380390ad483ff134ad938e07f6cf1226c5b.zip
+  https://github.com/meshtastic/esp32_https_server/archive/b78f12c86ea65c3ca08968840ff554ff7ed69b60.zip
  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
  h2zero/NimBLE-Arduino@1.4.3
  # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
@@ -5,3 +5,6 @@ build_flags =
  ${esp32c3_base.build_flags}
  -D HELTEC_HRU_3601
  -I variants/esp32c3/heltec_hru_3601
+lib_deps = ${esp32c3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
+  adafruit/Adafruit NeoPixel@1.15.4
@@ -23,6 +23,8 @@ build_unflags =
  -D HAS_WIFI
 lib_deps =
  ${esp32c6_base.lib_deps}
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
+  adafruit/Adafruit NeoPixel@1.15.4
  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
  h2zero/NimBLE-Arduino@2.3.7
 build_flags = 
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ben Meadors	d4b3e0616b	Use const references and local context	2026-04-03 06:18:24 -05:00
Ben Meadors	d4b627a60c	Implement batched NodeInfo encoding for more efficient large NodeDB transfer	2026-04-02 14:19:50 -05:00