Enhance congestion scaling coefficient for online nodes with power-law scaling

2026-10-13 07:01:18 +10:00 · 2026-01-28 06:34:47 -06:00
736 changed files with 5011 additions and 16405 deletions
@@ -20,7 +20,7 @@ ENV PIP_ROOT_USER_ACTION=ignore
 RUN apt-get update && apt-get install --no-install-recommends -y \
        cmake git zip libgpiod-dev libbluetooth-dev libi2c-dev \
        libunistring-dev libmicrohttpd-dev libgnutls28-dev libgcrypt20-dev \
-        libusb-1.0-0-dev libssl-dev pkg-config libsqlite3-dev libsdl2-dev && \
+        libusb-1.0-0-dev libssl-dev pkg-config libsqlite3-dev && \
    apt-get clean && rm -rf /var/lib/apt/lists/* && \
    pip install --no-cache-dir -U \
        platformio==6.1.16 \
@@ -1 +0,0 @@
-use nix
@@ -100,7 +100,7 @@ runs:
      id: version

    - name: Store binaries as an artifact
-      uses: actions/upload-artifact@v7
+      uses: actions/upload-artifact@v6
      with:
        name: firmware-${{ inputs.arch }}-${{ inputs.board }}-${{ steps.version.outputs.long }}
        overwrite: true
@@ -8,6 +8,8 @@ runs:
      uses: actions/checkout@v6
      with:
        submodules: recursive
+        ref: ${{github.event.pull_request.head.ref}}
+        repository: ${{github.event.pull_request.head.repo.full_name}}

    - name: Install dependencies
      shell: bash
@@ -4,16 +4,16 @@

 - Before starting on some new big chunk of code, it it is optional but highly recommended to open an issue first
  to say "Hey, I think this idea X should be implemented and I'm starting work on it. My general plan is Y, any feedback
-  is appreciated." This will allow other devs to potentially save you time by not accidentally duplicating work etc...
+  is appreciated." This will allow other devs to potentially save you time by not accidentially duplicating work etc...
 - Please do not check in files that don't have real changes
 - Please do not reformat lines that you didn't have to change the code on
- We recommend using the [Visual Studio Code](https://platformio.org/install/ide?install=vscode) editor along with the ['Trunk Check' extension](https://marketplace.visualstudio.com/items?itemName=trunk.io) (In beta for windows, WSL2 for the Linux version),
+- We recommend using the [Visual Studio Code](https://platformio.org/install/ide?install=vscode) editor along with the ['Trunk Check' extension](https://marketplace.visualstudio.com/items?itemName=trunk.io) (In beta for windows, WSL2 for the linux version),
  because it automatically follows our indentation rules and its auto reformatting will not cause spurious changes to lines.
 - If your PR fixes a bug, mention "fixes #bugnum" somewhere in your pull request description.
 - If your other co-developers have comments on your PR please tweak as needed.
 - Please also enable "Allow edits by maintainers".
 - Please do not submit untested code.
- If you do not have the affected hardware to test your code changes adequately against regressions, please indicate this, so that contributors and community members can help test your changes.
+- If you do not have the affected hardware to test your code changes adequately against regressions, please indicate this, so that contributors and commnunity members can help test your changes.
 - If your PR gets accepted you can request a "Contributor" role in the Meshtastic Discord

 ## 🤝 Attestations
@@ -16,7 +16,8 @@ on:
        type: string

 permissions:
-  contents: read
+  contents: write
+  packages: write

 jobs:
  build-debian-src:
@@ -27,6 +28,8 @@ jobs:
        with:
          submodules: recursive
          path: meshtasticd
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}

      - name: Install deps
        shell: bash
@@ -39,8 +42,7 @@ jobs:
          sudo mk-build-deps --install --remove --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control

      - name: Import GPG key
-        if: github.event_name != 'pull_request' && github.event_name != 'pull_request_target'
-        uses: crazy-max/ghaction-import-gpg@v7
+        uses: crazy-max/ghaction-import-gpg@v6
        with:
          gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }}
        id: gpg
@@ -58,11 +60,11 @@ jobs:
        run: debian/ci_pack_sdeb.sh
        env:
          SERIES: ${{ inputs.series }}
-          GPG_KEY_ID: ${{ steps.gpg.outputs.keyid || '' }}
+          GPG_KEY_ID: ${{ steps.gpg.outputs.keyid }}
          PKG_VERSION: ${{ steps.version.outputs.deb }}

      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        with:
          name: firmware-debian-${{ steps.version.outputs.deb }}~${{ inputs.series }}-src
          overwrite: true
@@ -26,6 +26,8 @@ jobs:
      - uses: actions/checkout@v6
        with:
          submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}

      - name: Build ${{ inputs.platform }}
        id: build
@@ -109,7 +111,7 @@ jobs:
          echo "</details>" >> $GITHUB_STEP_SUMMARY

      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        id: upload-firmware
        with:
          name: firmware-${{ inputs.platform }}-${{ inputs.pio_env }}-${{ inputs.version }}
@@ -125,7 +127,7 @@ jobs:
            release/device-*.bat

      - name: Store manifests as an artifact
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        id: upload-manifest
        with:
          name: manifest-${{ inputs.platform }}-${{ inputs.pio_env }}-${{ inputs.version }}
@@ -87,7 +87,7 @@ jobs:

  gather-artifacts:
    permissions:
-      contents: read
+      contents: write
      pull-requests: write
    runs-on: ubuntu-latest
    needs: [version, build]
@@ -98,7 +98,7 @@ jobs:
          ref: ${{github.event.pull_request.head.ref}}
          repository: ${{github.event.pull_request.head.repo.full_name}}

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

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

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

      - name: Repackage in single elfs zip
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        with:
          name: debug-elfs-${{inputs.target}}-${{ needs.version.outputs.long }}.zip
          overwrite: true
@@ -16,7 +16,7 @@ on:
      - .github/workflows/hook_copr.yml

 permissions:
-  contents: read
+  contents: write
  packages: write

 jobs:
@@ -35,8 +35,8 @@ jobs:
        series:
          - jammy # 22.04 LTS
          - noble # 24.04 LTS
+          - plucky # 25.04
          - questing # 25.10
-          - resolute # 26.04 LTS
    uses: ./.github/workflows/package_ppa.yml
    with:
      ppa_repo: ppa:meshtastic/daily
@@ -37,7 +37,7 @@ on:
        value: ${{ jobs.docker-build.outputs.digest }}

 permissions:
-  contents: read
+  contents: write
  packages: write

 jobs:
@@ -50,6 +50,8 @@ jobs:
        uses: actions/checkout@v6
        with:
          submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}

      - name: Get release version string
        run: |
@@ -58,16 +60,16 @@ jobs:

      - name: Docker login
        if: ${{ inputs.push }}
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
        with:
          username: meshtastic
          password: ${{ secrets.DOCKER_FIRMWARE_TOKEN }}

      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4
+        uses: docker/setup-qemu-action@v3

      - name: Docker setup
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3

      - name: Sanitize platform string
        id: sanitize_platform
@@ -76,7 +78,7 @@ jobs:

      - name: Docker tag
        id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
        with:
          images: meshtastic/meshtasticd
          tags: |
@@ -84,7 +86,7 @@ jobs:
          flavor: latest=false

      - name: Docker build and push
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
        id: docker_variant
        with:
          context: .
@@ -12,7 +12,7 @@ on:
        type: string

 permissions:
-  contents: read
+  contents: write
  packages: write

 jobs:
@@ -86,6 +86,8 @@ jobs:
        uses: actions/checkout@v6
        with:
          submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}

      - name: Get release version string
        run: |
@@ -137,14 +139,14 @@ jobs:
        id: tags

      - name: Docker login
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
        with:
          username: meshtastic
          password: ${{ secrets.DOCKER_FIRMWARE_TOKEN }}

      - name: Docker meta (Debian)
        id: meta_debian
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
        with:
          images: meshtastic/meshtasticd
          tags: |
@@ -165,7 +167,7 @@ jobs:

      - name: Docker meta (Alpine)
        id: meta_alpine
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
        with:
          images: meshtastic/meshtasticd
          tags: |
@@ -11,7 +11,8 @@ on:
        type: string

 permissions:
-  contents: read
+  contents: write
+  packages: write

 jobs:
  build-copr-hook:
@@ -21,6 +22,8 @@ jobs:
        uses: actions/checkout@v6
        with:
          submodules: recursive
+          ref: ${{ github.ref }}
+          repository: ${{ github.repository }}

      - name: Trigger COPR build
        uses: vidplace7/copr-build@main
@@ -15,7 +15,8 @@ on:
      - "**.md"
      - version.properties

-  pull_request:
+  # Note: This is different from "pull_request". Need to specify ref when doing checkouts.
+  pull_request_target:
    branches:
      - master
      - develop
@@ -28,8 +29,6 @@ on:

  workflow_dispatch:

-permissions: read-all
-
 jobs:
  setup:
    strategy:
@@ -89,6 +88,8 @@ jobs:
      - uses: actions/checkout@v6
        with:
          submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
      - name: Check ${{ matrix.check.board }}
        uses: meshtastic/gh-action-firmware@main
        with:
@@ -125,16 +126,9 @@ jobs:

  test-native:
    if: ${{ !contains(github.ref_name, 'event/') && github.repository == 'meshtastic/firmware' }}
-    permissions: # Needed for dorny/test-reporter.
-      contents: read
-      actions: read
-      checks: write
    uses: ./.github/workflows/test_native.yml

  docker:
-    permissions: # Needed for pushing to GHCR.
-      contents: read
-      packages: write
    strategy:
      fail-fast: false
      matrix:
@@ -159,6 +153,9 @@ jobs:
  gather-artifacts:
    # trunk-ignore(checkov/CKV2_GHA_1)
    if: github.repository == 'meshtastic/firmware'
+    permissions:
+      contents: write
+      pull-requests: write
    strategy:
      fail-fast: false
      matrix:
@@ -176,8 +173,11 @@ jobs:
    steps:
      - name: Checkout code
        uses: actions/checkout@v6
+        with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}

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

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

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

      - name: Repackage in single elfs zip
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        with:
          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
          overwrite: true
          path: ./*.elf
          retention-days: 30

+      - uses: scruplelesswizard/comment-artifact@main
+        if: ${{ github.event_name == 'pull_request' }}
+        with:
+          name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          description: "Download firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip. This artifact will be available for 90 days from creation"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
  shame:
    if: github.repository == 'meshtastic/firmware'
    continue-on-error: true
@@ -238,44 +245,42 @@ jobs:
    needs: [build]
    steps:
      - uses: actions/checkout@v6
-        if: github.event_name == 'pull_request'
+        if: github.event_name == 'pull_request_target'
        with:
          filter: blob:none # means we download all the git history but none of the commit (except ones with checkout like the head)
          fetch-depth: 0
      - name: Download the current manifests
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
        with:
          path: ./manifests-new/
          pattern: manifest-*
          merge-multiple: true
      - name: Upload combined manifests for later commit and global stats crunching.
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        id: upload-manifest
        with:
          name: manifests-${{ github.sha }}
          overwrite: true
          path: manifests-new/*.mt.json
      - name: Find the merge base
-        if: github.event_name == 'pull_request'
+        if: github.event_name == 'pull_request_target'
        run: echo "MERGE_BASE=$(git merge-base "origin/$base" "$head")" >> $GITHUB_ENV
        env:
          base: ${{ github.base_ref }}
          head: ${{ github.sha }}
      # Currently broken (for-loop through EVERY artifact -- rate limiting)
      # - name: Download the old manifests
-      #   if: github.event_name == 'pull_request'
+      #   if: github.event_name == 'pull_request_target'
      #   run: gh run download -R "$repo" --name "manifests-$merge_base" --dir manifest-old/
      #   env:
      #     GH_TOKEN: ${{ github.token }}
      #     merge_base: ${{ env.MERGE_BASE }}
      #     repo: ${{ github.repository }}
      # - name: Do scan and post comment
-      #   if: github.event_name == 'pull_request'
+      #   if: github.event_name == 'pull_request_target'
      #   run: python3 bin/shame.py ${{ github.event.pull_request.number }} manifests-old/ manifests-new/

  release-artifacts:
-    permissions: # Needed for 'gh release upload'.
-      contents: write
    runs-on: ubuntu-latest
    if: ${{ github.event_name == 'workflow_dispatch' && github.repository == 'meshtastic/firmware' }}
    outputs:
@@ -319,14 +324,14 @@ jobs:
          body: ${{ steps.release_notes.outputs.notes }}

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

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

      - name: Save Release manifest artifact
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        with:
          name: manifest-${{ needs.version.outputs.long }}
          overwrite: true
@@ -367,8 +372,6 @@ jobs:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

  release-firmware:
-    permissions: # Needed for 'gh release upload'.
-      contents: write
    strategy:
      fail-fast: false
      matrix:
@@ -393,7 +396,7 @@ jobs:
        with:
          python-version: 3.x

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

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

      - name: Get firmware artifacts
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
        with:
          pattern: firmware-{${{ env.targets }}}-${{ needs.version.outputs.long }}
          merge-multiple: true
          path: ./publish

      - name: Get manifest artifact
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
        with:
          pattern: manifest-${{ needs.version.outputs.long }}
          path: ./publish
@@ -0,0 +1,371 @@
+name: Merge Queue
+# Not sure how concurrency works in merge_queue, removing for now.
+# concurrency:
+#   group: merge-queue-${{ github.head_ref || github.run_id }}
+#   cancel-in-progress: true
+on:
+  # Merge group is a special trigger that is used to trigger the workflow when a merge group is created.
+  merge_group:
+
+jobs:
+  setup:
+    strategy:
+      fail-fast: true
+      matrix:
+        arch:
+          - all
+          - check
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
+        with:
+          python-version: 3.x
+          cache: pip
+      - run: pip install -U platformio
+      - name: Generate matrix
+        id: jsonStep
+        run: |
+          if [[ "$GITHUB_HEAD_REF" == "" ]]; then
+            TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}})
+          else  
+            TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}} --level pr)
+          fi
+          echo "Name: $GITHUB_REF_NAME Base: $GITHUB_BASE_REF Ref: $GITHUB_REF"
+          echo "${{matrix.arch}}=$TARGETS" >> $GITHUB_OUTPUT
+    outputs:
+      all: ${{ steps.jsonStep.outputs.all }}
+      check: ${{ steps.jsonStep.outputs.check }}
+
+  version:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - name: Get release version string
+        run: |
+          echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+          echo "deb=$(./bin/buildinfo.py deb)" >> $GITHUB_OUTPUT
+        id: version
+        env:
+          BUILD_LOCATION: local
+    outputs:
+      long: ${{ steps.version.outputs.long }}
+      deb: ${{ steps.version.outputs.deb }}
+
+  check:
+    needs: setup
+    strategy:
+      fail-fast: true
+      matrix:
+        check: ${{ fromJson(needs.setup.outputs.check) }}
+
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'workflow_dispatch' }}
+    steps:
+      - uses: actions/checkout@v6
+      - name: Build base
+        id: base
+        uses: ./.github/actions/setup-base
+      - name: Check ${{ matrix.check.board }}
+        run: bin/check-all.sh ${{ matrix.check.board }}
+
+  build:
+    needs: [setup, version]
+    strategy:
+      matrix:
+        build: ${{ fromJson(needs.setup.outputs.all) }}
+    uses: ./.github/workflows/build_firmware.yml
+    with:
+      version: ${{ needs.version.outputs.long }}
+      pio_env: ${{ matrix.build.board }}
+      platform: ${{ matrix.build.platform }}
+
+  build-debian-src:
+    if: github.repository == 'meshtastic/firmware'
+    uses: ./.github/workflows/build_debian_src.yml
+    with:
+      series: UNRELEASED
+      build_location: local
+    secrets: inherit
+
+  package-pio-deps-native-tft:
+    if: ${{ github.event_name == 'workflow_dispatch' }}
+    uses: ./.github/workflows/package_pio_deps.yml
+    with:
+      pio_env: native-tft
+    secrets: inherit
+
+  test-native:
+    if: ${{ !contains(github.ref_name, 'event/') }}
+    uses: ./.github/workflows/test_native.yml
+
+  docker:
+    strategy:
+      fail-fast: false
+      matrix:
+        distro: [debian, alpine]
+        platform: [linux/amd64, linux/arm64, linux/arm/v7]
+        pio_env: [native, native-tft]
+        exclude:
+          - distro: alpine
+            platform: linux/arm/v7
+          - pio_env: native-tft
+            platform: linux/arm64
+          - pio_env: native-tft
+            platform: linux/arm/v7
+    uses: ./.github/workflows/docker_build.yml
+    with:
+      distro: ${{ matrix.distro }}
+      platform: ${{ matrix.platform }}
+      runs-on: ${{ contains(matrix.platform, 'arm') && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
+      pio_env: ${{ matrix.pio_env }}
+      push: false
+
+  gather-artifacts:
+    # trunk-ignore(checkov/CKV2_GHA_1)
+    permissions:
+      contents: write
+      pull-requests: write
+    strategy:
+      fail-fast: false
+      matrix:
+        arch:
+          - esp32
+          - esp32s3
+          - esp32c3
+          - esp32c6
+          - nrf52840
+          - rp2040
+          - rp2350
+          - stm32
+    runs-on: ubuntu-latest
+    needs: [version, build]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+        with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - uses: actions/download-artifact@v7
+        with:
+          path: ./
+          pattern: firmware-${{matrix.arch}}-*
+          merge-multiple: true
+
+      - name: Display structure of downloaded files
+        run: ls -R
+
+      - name: Move files up
+        run: mv -b -t ./ ./bin/device-*.sh ./bin/device-*.bat
+
+      - name: Repackage in single firmware zip
+        uses: actions/upload-artifact@v6
+        with:
+          name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          overwrite: true
+          path: |
+            ./firmware-*.bin
+            ./firmware-*.uf2
+            ./firmware-*.hex
+            ./firmware-*.zip
+            ./device-*.sh
+            ./device-*.bat
+            ./littlefs-*.bin
+            ./bleota*bin
+            ./Meshtastic_nRF52_factory_erase*.uf2
+          retention-days: 30
+
+      - uses: actions/download-artifact@v7
+        with:
+          name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          merge-multiple: true
+          path: ./output
+
+      # For diagnostics
+      - name: Show artifacts
+        run: ls -lR
+
+      - name: Device scripts permissions
+        run: |
+          chmod +x ./output/device-install.sh || true
+          chmod +x ./output/device-update.sh || true
+
+      - name: Zip firmware
+        run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output
+
+      - name: Repackage in single elfs zip
+        uses: actions/upload-artifact@v6
+        with:
+          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          overwrite: true
+          path: ./*.elf
+          retention-days: 30
+
+      - uses: scruplelesswizard/comment-artifact@main
+        if: ${{ github.event_name == 'pull_request' }}
+        with:
+          name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          description: "Download firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip. This artifact will be available for 90 days from creation"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+  release-artifacts:
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'workflow_dispatch' }}
+    outputs:
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
+    needs:
+      - version
+      - gather-artifacts
+      - build-debian-src
+      - package-pio-deps-native-tft
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Create release
+        uses: softprops/action-gh-release@v2
+        id: create_release
+        with:
+          draft: true
+          prerelease: true
+          name: Meshtastic Firmware ${{ needs.version.outputs.long }} Alpha
+          tag_name: v${{ needs.version.outputs.long }}
+          body: |
+            Autogenerated by github action, developer should edit as required before publishing...
+
+      - name: Download source deb
+        uses: actions/download-artifact@v7
+        with:
+          pattern: firmware-debian-${{ needs.version.outputs.deb }}~UNRELEASED-src
+          merge-multiple: true
+          path: ./output/debian-src
+
+      - name: Download `native-tft` pio deps
+        uses: actions/download-artifact@v7
+        with:
+          pattern: platformio-deps-native-tft-${{ needs.version.outputs.long }}
+          merge-multiple: true
+          path: ./output/pio-deps-native-tft
+
+      - name: Zip Linux sources
+        working-directory: output
+        run: |
+          zip -j -9 -r ./meshtasticd-${{ needs.version.outputs.deb }}-src.zip ./debian-src
+          zip -9 -r ./platformio-deps-native-tft-${{ needs.version.outputs.long }}.zip ./pio-deps-native-tft
+
+      # For diagnostics
+      - name: Display structure of downloaded files
+        run: ls -lR
+
+      - name: Add Linux sources to GtiHub Release
+        # Only run when targeting master branch with workflow_dispatch
+        if: ${{ github.ref_name == 'master' }}
+        run: |
+          gh release upload v${{ needs.version.outputs.long }} ./output/meshtasticd-${{ needs.version.outputs.deb }}-src.zip
+          gh release upload v${{ needs.version.outputs.long }} ./output/platformio-deps-native-tft-${{ needs.version.outputs.long }}.zip
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  release-firmware:
+    strategy:
+      fail-fast: false
+      matrix:
+        arch:
+          - esp32
+          - esp32s3
+          - esp32c3
+          - esp32c6
+          - nrf52840
+          - rp2040
+          - rp2350
+          - stm32
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'workflow_dispatch' }}
+    needs: [release-artifacts, version]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Setup Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: 3.x
+
+      - uses: actions/download-artifact@v7
+        with:
+          pattern: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          merge-multiple: true
+          path: ./output
+
+      - name: Display structure of downloaded files
+        run: ls -lR
+
+      - name: Device scripts permissions
+        run: |
+          chmod +x ./output/device-install.sh || true
+          chmod +x ./output/device-update.sh || true
+
+      - name: Zip firmware
+        run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output
+
+      - uses: actions/download-artifact@v7
+        with:
+          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          merge-multiple: true
+          path: ./elfs
+
+      - name: Zip debug elfs
+        run: zip -j -9 -r ./debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./elfs
+
+      # For diagnostics
+      - name: Display structure of downloaded files
+        run: ls -lR
+
+      - name: Add bins and debug elfs to GitHub Release
+        # Only run when targeting master branch with workflow_dispatch
+        if: ${{ github.ref_name == 'master' }}
+        run: |
+          gh release upload v${{ needs.version.outputs.long }} ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
+          gh release upload v${{ needs.version.outputs.long }} ./debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  publish-firmware:
+    runs-on: ubuntu-24.04
+    if: ${{ github.event_name == 'workflow_dispatch' }}
+    needs: [release-firmware, version]
+    env:
+      targets: |-
+        esp32,esp32s3,esp32c3,esp32c6,nrf52840,rp2040,rp2350,stm32
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Setup Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: 3.x
+
+      - uses: actions/download-artifact@v7
+        with:
+          pattern: firmware-{${{ env.targets }}}-${{ needs.version.outputs.long }}
+          merge-multiple: true
+          path: ./publish
+
+      - name: Publish firmware to meshtastic.github.io
+        uses: peaceiris/actions-gh-pages@v4
+        env:
+          # On event/* branches, use the event name as the destination prefix
+          DEST_PREFIX: ${{ contains(github.ref_name, 'event/') && format('{0}/', github.ref_name) || '' }}
+        with:
+          deploy_key: ${{ secrets.DIST_PAGES_DEPLOY_KEY }}
+          external_repository: meshtastic/meshtastic.github.io
+          publish_branch: master
+          publish_dir: ./publish
+          destination_dir: ${{ env.DEST_PREFIX }}firmware-${{ needs.version.outputs.long }}
+          keep_files: true
+          user_name: github-actions[bot]
+          user_email: github-actions[bot]@users.noreply.github.com
+          commit_message: ${{ needs.version.outputs.long }}
+          enable_jekyll: true
@@ -1,213 +0,0 @@
-name: Issue Triage (Models)
-
-on:
-  issues:
-    types: [opened]
-
-permissions:
-  issues: write
-  models: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.issue.number }}
-  cancel-in-progress: true
-
-jobs:
-  triage:
-    if: ${{ github.repository == 'meshtastic/firmware' && github.event.issue.user.type != 'Bot' }}
-    runs-on: ubuntu-latest
-    steps:
-      # ─────────────────────────────────────────────────────────────────────────
-      # Step 1: Quality check (spam/AI-slop detection) - runs first, exits early if spam
-      # ─────────────────────────────────────────────────────────────────────────
-      - name: Detect spam or low-quality content
-        uses: actions/ai-inference@v2
-        id: quality
-        continue-on-error: true
-        with:
-          max-tokens: 20
-          prompt: |
-            Is this GitHub issue spam, AI-generated slop, or low quality?
-
-            Title: ${{ github.event.issue.title }}
-            Body: ${{ github.event.issue.body }}
-
-            Respond with exactly one of: spam, ai-generated, needs-review, ok
-          system-prompt: You detect spam and low-quality contributions. Be conservative - only flag obvious spam or AI slop.
-          model: openai/gpt-4o-mini
-
-      - name: Apply quality label if needed
-        if: steps.quality.outputs.response != '' && steps.quality.outputs.response != 'ok'
-        uses: actions/github-script@v8
-        env:
-          QUALITY_LABEL: ${{ steps.quality.outputs.response }}
-        with:
-          script: |
-            const label = (process.env.QUALITY_LABEL || '').trim().toLowerCase();
-            const labelMeta = {
-              'spam': { color: 'd73a4a', description: 'Possible spam' },
-              'ai-generated': { color: 'fbca04', description: 'Possible AI-generated low-quality content' },
-              'needs-review': { color: 'f9d0c4', description: 'Needs human review' },
-            };
-            const meta = labelMeta[label];
-            if (!meta) return;
-
-            // Ensure label exists
-            try {
-              await github.rest.issues.getLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label });
-            } catch (e) {
-              if (e.status !== 404) throw e;
-              await github.rest.issues.createLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label, color: meta.color, description: meta.description });
-            }
-
-            // Apply label
-            await github.rest.issues.addLabels({ owner: context.repo.owner, repo: context.repo.repo, issue_number: context.payload.issue.number, labels: [label] });
-
-            // Set output to skip remaining steps
-            core.setOutput('is_spam', 'true');
-
-      # ─────────────────────────────────────────────────────────────────────────
-      # Step 2: Duplicate detection - only if not spam
-      # ─────────────────────────────────────────────────────────────────────────
-      - name: Detect duplicate issues
-        if: steps.quality.outputs.response == 'ok' || steps.quality.outputs.response == ''
-        uses: pelikhan/action-genai-issue-dedup@bdb3b5d9451c1090ffcdf123d7447a5e7c7a2528 # v0.0.19
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-
-      # ─────────────────────────────────────────────────────────────────────────
-      # Step 3: Completeness check + auto-labeling (combined into one AI call)
-      # ─────────────────────────────────────────────────────────────────────────
-      - name: Determine if completeness check should be skipped
-        if: steps.quality.outputs.response == 'ok' || steps.quality.outputs.response == ''
-        uses: actions/github-script@v8
-        id: check-skip
-        with:
-          script: |
-            const title = (context.payload.issue.title || '').toLowerCase();
-            const labels = (context.payload.issue.labels || []).map(label => label.name);
-            const hasFeatureRequest = title.includes('feature request');
-            const hasEnhancement = labels.includes('enhancement');
-            const shouldSkip = hasFeatureRequest && hasEnhancement;
-            core.setOutput('should_skip', shouldSkip ? 'true' : 'false');
-
-      - name: Analyze issue completeness and determine labels
-        if: (steps.quality.outputs.response == 'ok' || steps.quality.outputs.response == '') && steps.check-skip.outputs.should_skip != 'true'
-        uses: actions/ai-inference@v2
-        id: analysis
-        continue-on-error: true
-        with:
-          prompt: |
-            Analyze this GitHub issue for completeness and determine if it needs labels.
-
-            IMPORTANT: Distinguish between:
-            - Device/firmware bugs (crashes, reboots, lockups, radio/GPS/display/power issues) - these need device logs
-            - Build/release/packaging issues (missing files, CI failures, download problems) - these do NOT need device logs
-            - Documentation or website issues - these do NOT need device logs
-
-            If this is a device/firmware bug, request device logs and explain how to get them:
-
-            Web Flasher logs:
-            - Go to https://flasher.meshtastic.org
-            - Connect the device via USB and click Connect
-            - Open the device console/log output, reproduce the problem, then copy/download and attach/paste the logs
-
-            Meshtastic CLI logs:
-            - Run: meshtastic --port <serial-port> --noproto
-            - Reproduce the problem, then copy/paste the terminal output
-
-            Also request key context if missing: device model/variant, firmware version, region, steps to reproduce, expected vs actual.
-
-            Respond ONLY with valid JSON (no markdown, no code fences):
-            {"complete": true, "comment": "", "label": "none"}
-            OR
-            {"complete": false, "comment": "Your helpful comment", "label": "needs-logs"}
-
-            Use "needs-logs" ONLY if this is a device/firmware bug AND no logs are attached.
-            Use "needs-info" if basic info like firmware version or steps to reproduce are missing.
-            Use "none" if the issue is complete, is a feature request, or is a build/CI/packaging issue.
-
-            Title: ${{ github.event.issue.title }}
-            Body: ${{ github.event.issue.body }}
-          system-prompt: You are a helpful assistant that triages GitHub issues. Be conservative with labels. Only request device logs for actual device/firmware bugs, not for build/release/CI issues.
-          model: openai/gpt-4o-mini
-
-      - name: Process analysis result
-        if: (steps.quality.outputs.response == 'ok' || steps.quality.outputs.response == '') && steps.check-skip.outputs.should_skip != 'true' && steps.analysis.outputs.response != ''
-        uses: actions/github-script@v8
-        id: process
-        env:
-          AI_RESPONSE: ${{ steps.analysis.outputs.response }}
-        with:
-          script: |
-            let raw = (process.env.AI_RESPONSE || '').trim();
-
-            // Strip markdown code fences if present
-            raw = raw.replace(/^```(?:json)?\s*/i, '').replace(/\s*```$/i, '').trim();
-
-            let complete = true;
-            let comment = '';
-            let label = 'none';
-
-            try {
-              const parsed = JSON.parse(raw);
-              complete = !!parsed.complete;
-              comment = (parsed.comment ?? '').toString().trim();
-              label = (parsed.label ?? 'none').toString().trim().toLowerCase();
-            } catch {
-              // If JSON parse fails, log warning and don't comment (avoid posting raw JSON)
-              console.log('Failed to parse AI response as JSON:', raw);
-              complete = true;
-              comment = '';
-              label = 'none';
-            }
-
-            // Validate label
-            const allowedLabels = new Set(['needs-logs', 'needs-info', 'none']);
-            if (!allowedLabels.has(label)) label = 'none';
-
-            // Only comment if we have a valid parsed comment (not raw JSON)
-            const shouldComment = !complete && comment.length > 0 && !comment.startsWith('{');
-            core.setOutput('should_comment', shouldComment ? 'true' : 'false');
-            core.setOutput('comment_body', comment);
-            core.setOutput('label', label);
-
-      - name: Apply triage label
-        if: steps.process.outputs.label != '' && steps.process.outputs.label != 'none'
-        uses: actions/github-script@v8
-        env:
-          LABEL_NAME: ${{ steps.process.outputs.label }}
-        with:
-          script: |
-            const label = process.env.LABEL_NAME;
-            const labelMeta = {
-              'needs-logs': { color: 'cfd3d7', description: 'Device logs requested for triage' },
-              'needs-info': { color: 'f9d0c4', description: 'More information requested for triage' },
-            };
-            const meta = labelMeta[label];
-            if (!meta) return;
-
-            // Ensure label exists
-            try {
-              await github.rest.issues.getLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label });
-            } catch (e) {
-              if (e.status !== 404) throw e;
-              await github.rest.issues.createLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label, color: meta.color, description: meta.description });
-            }
-
-            // Apply label
-            await github.rest.issues.addLabels({ owner: context.repo.owner, repo: context.repo.repo, issue_number: context.payload.issue.number, labels: [label] });
-
-      - name: Comment on issue
-        if: steps.process.outputs.should_comment == 'true'
-        uses: actions/github-script@v8
-        env:
-          COMMENT_BODY: ${{ steps.process.outputs.comment_body }}
-        with:
-          script: |
-            await github.rest.issues.createComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.payload.issue.number,
-              body: process.env.COMMENT_BODY
-            });
@@ -1,139 +0,0 @@
-name: PR Triage (Models)
-
-on:
-  pull_request_target:
-    types: [opened]
-
-permissions:
-  pull-requests: write
-  issues: write
-  models: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
-  cancel-in-progress: true
-
-jobs:
-  triage:
-    if: ${{ github.repository == 'meshtastic/firmware' && github.event.pull_request.user.type != 'Bot' }}
-    runs-on: ubuntu-latest
-    steps:
-      # ─────────────────────────────────────────────────────────────────────────
-      # Step 1: Check if PR already has automation/type labels (skip if so)
-      # ─────────────────────────────────────────────────────────────────────────
-      - name: Check existing labels
-        uses: actions/github-script@v8
-        id: check-labels
-        with:
-          script: |
-            const skipLabels = new Set(['automation']);
-            const typeLabels = new Set(['bugfix', 'hardware-support', 'enhancement', 'dependencies', 'submodules', 'github_actions', 'trunk', 'cleanup']);
-            const prLabels = context.payload.pull_request.labels.map(l => l.name);
-
-            const shouldSkipAll = prLabels.some(l => skipLabels.has(l));
-            const hasTypeLabel = prLabels.some(l => typeLabels.has(l));
-
-            core.setOutput('skip_all', shouldSkipAll ? 'true' : 'false');
-            core.setOutput('has_type_label', hasTypeLabel ? 'true' : 'false');
-
-      # ─────────────────────────────────────────────────────────────────────────
-      # Step 2: Quality check (spam/AI-slop detection)
-      # ─────────────────────────────────────────────────────────────────────────
-      - name: Detect spam or low-quality content
-        if: steps.check-labels.outputs.skip_all != 'true'
-        uses: actions/ai-inference@v2
-        id: quality
-        continue-on-error: true
-        with:
-          max-tokens: 20
-          prompt: |
-            Is this GitHub pull request spam, AI-generated slop, or low quality?
-
-            Title: ${{ github.event.pull_request.title }}
-            Body: ${{ github.event.pull_request.body }}
-
-            Respond with exactly one of: spam, ai-generated, needs-review, ok
-          system-prompt: You detect spam and low-quality contributions. Be conservative - only flag obvious spam or AI slop.
-          model: openai/gpt-4o-mini
-
-      - name: Apply quality label if needed
-        if: steps.check-labels.outputs.skip_all != 'true' && steps.quality.outputs.response != '' && steps.quality.outputs.response != 'ok'
-        uses: actions/github-script@v8
-        id: quality-label
-        env:
-          QUALITY_LABEL: ${{ steps.quality.outputs.response }}
-        with:
-          script: |
-            const label = (process.env.QUALITY_LABEL || '').trim().toLowerCase();
-            const labelMeta = {
-              'spam': { color: 'd73a4a', description: 'Possible spam' },
-              'ai-generated': { color: 'fbca04', description: 'Possible AI-generated low-quality content' },
-              'needs-review': { color: 'f9d0c4', description: 'Needs human review' },
-            };
-            const meta = labelMeta[label];
-            if (!meta) return;
-
-            // Ensure label exists
-            try {
-              await github.rest.issues.getLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label });
-            } catch (e) {
-              if (e.status !== 404) throw e;
-              await github.rest.issues.createLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label, color: meta.color, description: meta.description });
-            }
-
-            // Apply label
-            await github.rest.issues.addLabels({ owner: context.repo.owner, repo: context.repo.repo, issue_number: context.payload.pull_request.number, labels: [label] });
-
-            core.setOutput('is_spam', 'true');
-
-      # ─────────────────────────────────────────────────────────────────────────
-      # Step 3: Auto-label PR type (bugfix/hardware-support/enhancement)
-      # Only skip for spam/ai-generated; still classify needs-review PRs
-      # ─────────────────────────────────────────────────────────────────────────
-      - name: Classify PR for labeling
-        if: steps.check-labels.outputs.skip_all != 'true' && steps.check-labels.outputs.has_type_label != 'true' && steps.quality.outputs.response != 'spam' && steps.quality.outputs.response != 'ai-generated'
-        uses: actions/ai-inference@v2
-        id: classify
-        continue-on-error: true
-        with:
-          max-tokens: 30
-          prompt: |
-            Classify this pull request into exactly one category.
-
-            Return exactly one of: bugfix, hardware-support, enhancement
-
-            Use bugfix if it fixes a bug, crash, or incorrect behavior.
-            Use hardware-support if it adds or improves support for a specific hardware device/variant.
-            Use enhancement if it adds a new feature, improves performance, or refactors code.
-
-            Title: ${{ github.event.pull_request.title }}
-            Body: ${{ github.event.pull_request.body }}
-          system-prompt: You classify pull requests into categories. Be conservative and pick the most appropriate single label.
-          model: openai/gpt-4o-mini
-
-      - name: Apply type label
-        if: steps.check-labels.outputs.skip_all != 'true' && steps.check-labels.outputs.has_type_label != 'true' && steps.classify.outputs.response != ''
-        uses: actions/github-script@v8
-        env:
-          TYPE_LABEL: ${{ steps.classify.outputs.response }}
-        with:
-          script: |
-            const label = (process.env.TYPE_LABEL || '').trim().toLowerCase();
-            const labelMeta = {
-              'bugfix': { color: 'd73a4a', description: 'Bug fix' },
-              'hardware-support': { color: '0e8a16', description: 'Hardware support addition or improvement' },
-              'enhancement': { color: 'a2eeef', description: 'New feature or enhancement' },
-            };
-            const meta = labelMeta[label];
-            if (!meta) return;
-
-            // Ensure label exists
-            try {
-              await github.rest.issues.getLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label });
-            } catch (e) {
-              if (e.status !== 404) throw e;
-              await github.rest.issues.createLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label, color: meta.color, description: meta.description });
-            }
-
-            // Apply label
-            await github.rest.issues.addLabels({ owner: context.repo.owner, repo: context.repo.repo, issue_number: context.payload.pull_request.number, labels: [label] });
@@ -18,7 +18,8 @@ on:
        type: string

 permissions:
-  contents: read
+  contents: write
+  packages: write

 jobs:
  build-debian-src:
@@ -57,7 +58,7 @@ jobs:
        id: version

      - name: Download artifacts
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
        with:
          name: firmware-debian-${{ steps.version.outputs.deb }}~${{ inputs.series }}-src
          merge-multiple: true
@@ -16,7 +16,8 @@ on:
        type: string

 permissions:
-  contents: read
+  contents: write
+  packages: write

 jobs:
  pkg-pio-libdeps:
@@ -26,6 +27,8 @@ jobs:
        uses: actions/checkout@v6
        with:
          submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}

      - name: Setup Python
        uses: actions/setup-python@v6
@@ -51,19 +54,9 @@ jobs:
          PLATFORMIO_LIBDEPS_DIR: pio/libdeps
          PLATFORMIO_PACKAGES_DIR: pio/packages
          PLATFORMIO_CORE_DIR: pio/core
-          PLATFORMIO_SETTING_ENABLE_TELEMETRY: 0
-          PLATFORMIO_SETTING_CHECK_PLATFORMIO_INTERVAL: 3650
-          PLATFORMIO_SETTING_CHECK_PRUNE_SYSTEM_THRESHOLD: 10240
-
-      - name: Mangle platformio cache
-        # Add "1" to epoch-timestamps of all downloads in the cache.
-        # This is a hack to prevent internet access at build-time.
-        run: |
-          cp pio/core/.cache/downloads/usage.db pio/core/.cache/downloads/usage.db.bak
-          jq -c 'with_entries(.value |= (. | tostring + "1" | tonumber))' pio/core/.cache/downloads/usage.db.bak > pio/core/.cache/downloads/usage.db

      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        with:
          name: platformio-deps-${{ inputs.pio_env }}-${{ steps.version.outputs.long }}
          overwrite: true
@@ -16,7 +16,8 @@ on:
        type: string

 permissions:
-  contents: read
+  contents: write
+  packages: write

 jobs:
  build-debian-src:
@@ -35,6 +36,8 @@ jobs:
        with:
          submodules: recursive
          path: meshtasticd
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}

      - name: Install deps
        shell: bash
@@ -43,7 +46,7 @@ jobs:
          sudo apt-get install -y dput

      - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v7
+        uses: crazy-max/ghaction-import-gpg@v6
        with:
          gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }}
        id: gpg
@@ -57,7 +60,7 @@ jobs:
        id: version

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

      - name: Download test artifacts
        if: needs.native-tests.result != 'skipped'
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
        with:
          name: platformio-test-report-${{ steps.version.outputs.long }}
          merge-multiple: true
@@ -23,8 +23,8 @@ jobs:
        series:
          - jammy # 22.04 LTS
          - noble # 24.04 LTS
+          - plucky # 25.04
          - questing # 25.10
-          - resolute # 26.04 LTS
    uses: ./.github/workflows/package_ppa.yml
    with:
      ppa_repo: |-
@@ -33,7 +33,7 @@ jobs:

      # step 3
      - name: save report as pipeline artifact
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        with:
          name: report.sarif
          overwrite: true
@@ -17,7 +17,7 @@ jobs:

    steps:
      - name: Stale PR+Issues
-        uses: actions/stale@v10.2.0
+        uses: actions/stale@v10.1.1
        with:
          days-before-stale: 45
          stale-issue-message: This issue has not had any comment or update in the last month. If it is still relevant, please post update comments. If no comments are made, this issue will be closed automagically in 7 days.
@@ -16,6 +16,8 @@ jobs:
    steps:
      - uses: actions/checkout@v6
        with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
          submodules: recursive

      - name: Setup native build
@@ -57,7 +59,7 @@ jobs:
        id: version

      - name: Save coverage information
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        if: always() # run this step even if previous step failed
        with:
          name: lcov-coverage-info-native-simulator-test-${{ steps.version.outputs.long }}
@@ -70,6 +72,8 @@ jobs:
    steps:
      - uses: actions/checkout@v6
        with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
          submodules: recursive

      - name: Setup native build
@@ -90,7 +94,7 @@ jobs:

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

      - name: Save coverage information
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        if: always() # run this step even if previous step failed
        with:
          name: lcov-coverage-info-native-platformio-tests-${{ steps.version.outputs.long }}
@@ -124,26 +128,29 @@ jobs:
    if: always()
    steps:
      - uses: actions/checkout@v6
+        with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}

      - name: Get release version string
        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
        id: version

      - name: Download test artifacts
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v7
        with:
          name: platformio-test-report-${{ steps.version.outputs.long }}
          merge-multiple: true

      - name: Test Report
-        uses: dorny/test-reporter@v3.0.0
+        uses: dorny/test-reporter@v2.5.0
        with:
          name: PlatformIO Tests
          path: testreport.xml
          reporter: java-junit

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

      - name: Save Code Coverage Report
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v6
        with:
          name: code-coverage-report-${{ steps.version.outputs.long }}
          path: code-coverage-report
@@ -52,7 +52,7 @@ jobs:
          node-version: 24

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

@@ -6,7 +6,7 @@ permissions: read-all
 jobs:
  update-protobufs:
    runs-on: ubuntu-latest
-    permissions: # Needed for peter-evans/create-pull-request.
+    permissions:
      contents: write
      pull-requests: write
    steps:
@@ -33,7 +33,6 @@ __pycache__
 *~

 venv/
-.venv/
 release/
 .vscode/extensions.json
 /compile_commands.json
@@ -51,6 +50,3 @@ idf_component.yml
 CMakeLists.txt
 /sdkconfig.*
 .dummy/*
-
-# PYTHONPATH used by the Nix shell
-.python3
@@ -4,31 +4,31 @@ cli:
 plugins:
  sources:
    - id: trunk
-      ref: v1.7.6
+      ref: v1.7.4
      uri: https://github.com/trunk-io/plugins
 lint:
  enabled:
-    - checkov@3.2.511
-    - renovate@43.92.1
-    - prettier@3.8.1
-    - trufflehog@3.94.1
+    - checkov@3.2.497
+    - renovate@42.84.2
+    - prettier@3.8.0
+    - trufflehog@3.92.5
    - yamllint@1.38.0
-    - bandit@1.9.4
-    - trivy@0.69.3
+    - bandit@1.9.3
+    - trivy@0.68.2
    - taplo@0.10.0
-    - ruff@0.15.8
-    - isort@8.0.1
-    - markdownlint@0.48.0
-    - oxipng@10.1.0
-    - svgo@4.0.1
-    - actionlint@1.7.11
+    - ruff@0.14.13
+    - isort@7.0.0
+    - markdownlint@0.47.0
+    - oxipng@10.0.0
+    - svgo@4.0.0
+    - actionlint@1.7.10
    - flake8@7.3.0
    - hadolint@2.14.0
    - shfmt@3.6.0
    - shellcheck@0.11.0
-    - black@26.3.1
+    - black@26.1.0
    - git-diff-check
-    - gitleaks@8.30.1
+    - gitleaks@8.30.0
    - clang-format@16.0.3
  ignore:
    - linters: [ALL]
@@ -14,7 +14,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
        curl wget g++ zip git ca-certificates pkg-config \
        libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev libuv1-dev \
        libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev \
-        libx11-dev libinput-dev libxkbcommon-x11-dev libsqlite3-dev libsdl2-dev \
+        libx11-dev libinput-dev libxkbcommon-x11-dev libsqlite3-dev \
    && apt-get clean && rm -rf /var/lib/apt/lists/* \
    && pip install --no-cache-dir -U platformio \
    && mkdir /tmp/firmware
@@ -53,7 +53,7 @@ USER root
 RUN apt-get update && apt-get --no-install-recommends -y install \
        libc-bin libc6 libgpiod3 libyaml-cpp0.8 libi2c0 libuv1t64 libusb-1.0-0-dev \
        liborcania2.3 libulfius2.7t64 libssl3t64 \
-        libx11-6 libinput10 libxkbcommon-x11-0 libsdl2-2.0-0 \
+        libx11-6 libinput10 libxkbcommon-x11-0 \
    && apt-get clean && rm -rf /var/lib/apt/lists/* \
    && mkdir -p /var/lib/meshtasticd \
    && mkdir -p /etc/meshtasticd/config.d \
@@ -1,26 +0,0 @@
-# Lightweight container for running native PlatformIO tests on non-Linux hosts
-FROM python:3.14-slim-trixie
-
-ENV DEBIAN_FRONTEND=noninteractive
-ENV PIP_ROOT_USER_ACTION=ignore
-
-# hadolint ignore=DL3008
-RUN apt-get update && apt-get install --no-install-recommends -y \
-        g++ git ca-certificates pkg-config \
-        libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev libuv1-dev \
-        libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev \
-        libx11-dev libinput-dev libxkbcommon-x11-dev libsqlite3-dev libsdl2-dev \
-    && apt-get clean && rm -rf /var/lib/apt/lists/* \
-    && pip install --no-cache-dir platformio==6.1.19 \
-        && useradd --create-home --shell /usr/sbin/nologin meshtastic
-
-WORKDIR /firmware
-RUN chown -R meshtastic:meshtastic /firmware
-
-HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
-    CMD platformio --version || exit 1
-
-USER meshtastic
-
-# Run tests by default; override with docker run args for specific filters
-CMD ["platformio", "test", "-e", "coverage", "-v"]
@@ -11,7 +11,7 @@ RUN apk --no-cache add \
        bash g++ libstdc++-dev linux-headers zip git ca-certificates libbsd-dev \
        libgpiod-dev yaml-cpp-dev bluez-dev \
        libusb-dev i2c-tools-dev libuv-dev openssl-dev pkgconf argp-standalone \
-        libx11-dev libinput-dev libxkbcommon-dev sqlite-dev sdl2-dev \
+        libx11-dev libinput-dev libxkbcommon-dev sqlite-dev \
    && rm -rf /var/cache/apk/* \
    && pip install --no-cache-dir -U platformio \
    && mkdir /tmp/firmware
@@ -42,7 +42,7 @@ USER root

 RUN apk --no-cache add \
        shadow libstdc++ libbsd libgpiod yaml-cpp libusb \
-        i2c-tools libuv libx11 libinput libxkbcommon sdl2 \
+        i2c-tools libuv libx11 libinput libxkbcommon \
    && rm -rf /var/cache/apk/* \
    && mkdir -p /var/lib/meshtasticd \
    && mkdir -p /etc/meshtasticd/config.d \
@@ -23,4 +23,4 @@ for BOARD in $BOARDS; do
 	CHECK="${CHECK} -e ${BOARD}"
 done

-pio check --flags "-DAPP_VERSION=${APP_VERSION} --suppressions-list=suppressions.txt --inline-suppr" $CHECK --skip-packages --pattern="src/" --fail-on-defect=low --fail-on-defect=medium --fail-on-defect=high
+pio check --flags "-DAPP_VERSION=${APP_VERSION} --suppressions-list=suppressions.txt --inline-suppr" $CHECK --skip-packages --pattern="src/" --fail-on-defect=medium --fail-on-defect=high
@@ -187,7 +187,6 @@ Logging:
  LogLevel: info # debug, info, warn, error
 #  TraceFile: /var/log/meshtasticd.json
 #  JSONFile: /packets.json # File location for JSON output of decoded packets
-#  JSONFileRotate: 60 # Rotate JSON file every N minutes, or 0 for no rotation
 #  JSONFilter: position # filter for packets to save to JSON file
 #  AsciiLogs: true     # default if not specified is !isatty() on stdout

@@ -215,4 +214,3 @@ General:
  AvailableDirectory: /etc/meshtasticd/available.d/
 #  MACAddress: AA:BB:CC:DD:EE:FF
 #  MACAddressSource: eth0
-#  APIPort: 4403
@@ -1,9 +1,3 @@
-Meta:
-  name: BananaPi-BPI-R4-sx1262
-  support: community
-  compatible:
-    - bananapi_bpi-r4 # OpenWrt target
-
 Lora:
  Module: sx1262  # BananaPi-BPI-R4 SPI via 26p GPIO Header
 ##  CS: 28
@@ -1,10 +1,4 @@
 ##  https://www.mikroe.com/lr-iot-click
-Meta:
-  name: OpenWRT One mikroBUS LR-IOT-CLICK
-  support: community
-  compatible:
-    - openwrt_one # OpenWrt target
-
 Lora:
  Module: lr1110  # OpenWRT ONE mikroBUS with LR-IOT-CLICK
 #  CS: 25
@@ -1,9 +1,3 @@
-Meta:
-  name: OpenWRT One mikroBUS sx1262
-  support: community
-  compatible:
-    - openwrt_one # OpenWrt target
-
 Lora:
  Module: sx1262
  IRQ: 10
@@ -1,28 +0,0 @@
-# meshtasticd configuration files
-
-This directory contains YAML configuration files for meshtasticd. Each file describes a specific hardware configuration, including the LoRa module and pin assignments. These configurations are used by meshtasticd to correctly interface with the hardware.
-
-## Metadata structure
-
-Each configuration file includes a `Meta` section that provides information about the configuration.
-This configuration is consumed by configuration-selection tools.
-
-```yaml
-Meta:
-  name: MeshAdv-Pi E22-900M30S # A unique identifier for this configuration.
-  support: community # community, official, or deprecated; determined by Meshtastic Leads.
-  compatible: # A list of compatible products or platforms.
-    - raspberry-pi
-```
-`name`: A unique identifier for the configuration, typically reflecting the hardware it supports.
-
-`support`: Indicates the level of support for this configuration. It can be one of the following:
-
- `community`: Supported by the Meshtastic community. Meshtastic Members may not possess, or have not tested this configuration.
- `official`: Fully supported by Meshtastic. Meshtastic Members have tested and verified this configuration.
- `deprecated`: No longer recommended for deployment by Meshtastic.
-
-`compatible`: A list of compatible products or platforms that can use this configuration.
-This will vary depending on the intended use case / platform.
-Multiple compatible entries can be included. E.g. Armbian `BOARD` value or OpenWrt `TARGET` value.
-These tags can be consumed by different configuration-selection tools, filtering based upon their platform/etc.
@@ -1,9 +1,3 @@
-Meta:
-  name: Waveshare 1.44inch LCD HAT
-  support: community
-  compatible:
-    - raspberry-pi
-
 ### Waveshare 1.44inch LCD HAT
 Display:
  Panel: ST7735S
@@ -1,9 +1,3 @@
-Meta:
-  name: Waveshare 2.8inch LCD HAT
-  support: community
-  compatible:
-    - raspberry-pi
-
 Display:

 ### Waveshare 2.8inch RPi LCD
@@ -1,22 +1,20 @@
---
-Meta:
-  name: Femtofox Ebyte E80-900M22S with TCXO
-  support: community
-  compatible:
-    - luckfox-pico-mini # Armbian
-
-Lora:
-## Ebyte E80-900M22S
-## This is a bit experimental
-## 
-##
-  Module: lr1121
-  gpiochip: 1 # subtract 32 from the gpio numbers
-  DIO3_TCXO_VOLTAGE: 1.8
-  CS: 16 #pin6 / GPIO48 1C0
-  IRQ: 23  #pin17 / GPIO55 1C7
-  Busy: 22 #pin16 / GPIO54 1C6
-  Reset: 25 #pin13 / GPIO57 1D1
-
-  spidev: spidev0.0 #pins are (CS=16, CLK=17, MOSI=18, MISO=19)
-  spiSpeed: 2000000
+---
+Lora:
+## Ebyte E80-900M22S
+## This is a bit experimental
+## 
+##
+  Module: lr1121
+  gpiochip: 1 # subtract 32 from the gpio numbers
+  DIO3_TCXO_VOLTAGE: 1.8
+  CS: 16 #pin6 / GPIO48 1C0
+  IRQ: 23  #pin17 / GPIO55 1C7
+  Busy: 22 #pin16 / GPIO54 1C6
+  Reset: 25 #pin13 / GPIO57 1D1
+
+
+  spidev: spidev0.0 #pins are (CS=16, CLK=17, MOSI=18, MISO=19)
+  spiSpeed: 2000000
+  
+General:
+  MACAddressSource: eth0
@@ -1,24 +1,21 @@
---
-Meta:
-  name: Femtofox SX1262 TCXO
-  support: community
-  compatible:
-    - luckfox-pico-mini # Armbian
-
-Lora:
-## Ebyte E22-900M30S, E22-900M22S with or without external RF switching setup
-## HT-RA62 (Has internal switching, but whatever)
-## Seeed WIO SX1262 (already has TXEN-DIO2 link, but needs RXEN)
-## Will work with any module with or without RF switching, and with TCXO
-  Module: sx1262
-  gpiochip: 1 # subtract 32 from the gpio numbers
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  CS: 16 #pin6 / GPIO48 1C0
-  IRQ: 23  #pin17 / GPIO55 1C7
-  Busy: 22 #pin16 / GPIO54 1C6
-  Reset: 25 #pin13 / GPIO57 1D1
-  RXen: 24 #pin12 / GPIO56 1D0 # Not strictly needed for auto-switching, but why complicate things?
-#  TXen: bridge to DIO2 on E22 module
-  spidev: spidev0.0 #pins are (CS=16, CLK=17, MOSI=18, MISO=19)
-  spiSpeed: 2000000
+---
+Lora:
+## Ebyte E22-900M30S, E22-900M22S with or without external RF switching setup
+## HT-RA62 (Has internal switching, but whatever)
+## Seeed WIO SX1262 (already has TXEN-DIO2 link, but needs RXEN)
+## Will work with any module with or without RF switching, and with TCXO
+  Module: sx1262
+  gpiochip: 1 # subtract 32 from the gpio numbers
+  DIO2_AS_RF_SWITCH: true
+  DIO3_TCXO_VOLTAGE: true
+  CS: 16 #pin6 / GPIO48 1C0
+  IRQ: 23  #pin17 / GPIO55 1C7
+  Busy: 22 #pin16 / GPIO54 1C6
+  Reset: 25 #pin13 / GPIO57 1D1
+  RXen: 24 #pin12 / GPIO56 1D0 # Not strictly needed for auto-switching, but why complicate things?
+#  TXen: bridge to DIO2 on E22 module
+  spidev: spidev0.0 #pins are (CS=16, CLK=17, MOSI=18, MISO=19)
+  spiSpeed: 2000000
+  
+General:
+  MACAddressSource: eth0
@@ -1,24 +1,21 @@
---
-Meta:
-  name: Femtofox SX1262 XTAL
-  support: community
-  compatible:
-    - luckfox-pico-mini # Armbian
-
-Lora:
-## Ebyte E22-900MM22S with no external RF switching setup
-## Waveshare SX126X XXXM, AI Thinker RA-01SH
-## Will work with any module with or without RF switching and no TCXO
-
-  Module: sx1262  
-  gpiochip: 1 # subtract 32 from the gpio numbers
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: false
-  CS: 16 #pin6 / GPIO48 1C0
-  IRQ: 23  #pin17 / GPIO55 1C7
-  Busy: 22 #pin16 / GPIO54 1C6
-  Reset: 25 #pin13 / GPIO57 1D1 
-  RXen: 24 #pin12 / GPIO56 1D0 # Not strictly needed for auto-switching, but why complicate things?
-#  TXen: bridge to DIO2 on E22 module
-  spidev: spidev0.0 #pins are (CS=16, CLK=17, MOSI=18, MISO=19)
-  spiSpeed: 2000000
+---
+Lora:
+## Ebyte E22-900MM22S with no external RF switching setup
+## Waveshare SX126X XXXM, AI Thinker RA-01SH
+## Will work with any module with or without RF switching and no TCXO
+
+  Module: sx1262  
+  gpiochip: 1 # subtract 32 from the gpio numbers
+  DIO2_AS_RF_SWITCH: true
+  DIO3_TCXO_VOLTAGE: false
+  CS: 16 #pin6 / GPIO48 1C0
+  IRQ: 23  #pin17 / GPIO55 1C7
+  Busy: 22 #pin16 / GPIO54 1C6
+  Reset: 25 #pin13 / GPIO57 1D1 
+  RXen: 24 #pin12 / GPIO56 1D0 # Not strictly needed for auto-switching, but why complicate things?
+#  TXen: bridge to DIO2 on E22 module
+  spidev: spidev0.0 #pins are (CS=16, CLK=17, MOSI=18, MISO=19)
+  spiSpeed: 2000000
+
+General:
+  MACAddressSource: eth0
@@ -1,9 +1,3 @@
-Meta:
-  name: Adafruit RFM9x
-  support: deprecated
-  compatible:
-    - raspberry-pi
-
 Lora:
  Module: RF95  # Adafruit RFM9x
  Reset: 25
@@ -1,11 +1,5 @@
 # MeshAdv-Pi E22-900M30S
 # https://github.com/chrismyers2000/MeshAdv-Pi-Hat
-Meta:
-  name: MeshAdv-Pi E22-900M30S
-  support: community
-  compatible:
-    - raspberry-pi
-
 Lora:
  Module: sx1262
  CS: 21
@@ -1,11 +1,5 @@
 # MeshAdv Mini E22-900M22S
 # https://github.com/chrismyers2000/MeshAdv-Mini
-Meta:
-  name: MeshAdv Mini E22-900M22S
-  support: community
-  compatible:
-    - raspberry-pi
-
 Lora:
  Module: sx1262  # Ebyte E22-900M22S 
  CS: 8
@@ -1,20 +1,11 @@
-Meta:
-  name: RAK6421 + RAK13300 Slot 1
-  support: official
-  compatible:
-    - raspberry-pi
-
 Lora:

-  ### RAK13300 in Slot 1
+  ### RAK13300in Slot 1
  Module: sx1262
  IRQ: 22 #IO6
  Reset: 16 # IO4
  Busy: 24 # IO5
  # Ant_sw: 13 # IO3 
-  Enable_Pins:
-    - 12
-    - 13
  DIO3_TCXO_VOLTAGE: true
  DIO2_AS_RF_SWITCH: true
  spidev: spidev0.0
@@ -1,17 +1,8 @@
-Meta:
-  name: RAK6421 + RAK13300 Slot 2
-  support: official
-  compatible:
-    - raspberry-pi
-
 Lora:
-  ### RAK13300 in Slot 2 pins
+  ### RAK13300in Slot 2 pins
  IRQ: 18 #IO6
  Reset: 24 # IO4
  Busy: 19 # IO5
  # Ant_sw: 23 # IO3 
-  Enable_Pins:
-    - 26
-    - 23
  spidev: spidev0.1
  # CS: 7
@@ -1,22 +0,0 @@
-Meta:
-  name: RAK6421 + RAK13302 Slot 1
-  support: official
-  compatible:
-    - raspberry-pi
-
-Lora:
-
-  ### RAK13302 in Slot 1
-  Module: sx1262
-  IRQ: 22 #IO6
-  Reset: 16 # IO4
-  Busy: 24 # IO5
-  # Ant_sw: 13 # IO3 
-  Enable_Pins:
-    - 12
-    - 13
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
-  spidev: spidev0.0
-  # CS: 8
-  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,18 +0,0 @@
-Meta:
-  name: RAK6421 + RAK13302 Slot 2
-  support: official
-  compatible:
-    - raspberry-pi
-
-Lora:
-  ### RAK13302 in Slot 2 pins
-  IRQ: 18 #IO6
-  Reset: 24 # IO4
-  Busy: 19 # IO5
-  # Ant_sw: 23 # IO3 
-  Enable_Pins:
-    - 26
-    - 23
-  spidev: spidev0.1
-  # CS: 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,21 +1,11 @@
-Meta:
-  name: RAK6421 + RAK13300 Slot 1 (Autoconf default)
-  support: official
-  compatible:
-    - raspberry-pi
-
 Lora:

-  ### RAK13300 in Slot 1
+  ### RAK13300in Slot 1
  Module: sx1262
  IRQ: 22 #IO6
  Reset: 16 # IO4
  Busy: 24 # IO5
-  Enable_Pins:
-    - 12
-    - 13
+  # Ant_sw: 13 # IO3 
  DIO3_TCXO_VOLTAGE: true
  DIO2_AS_RF_SWITCH: true
  spidev: spidev0.0
-  # GPIO_DETECT_PA: 13
-  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,9 +1,3 @@
-Meta:
-  name: Luckfox Lyra PicoCalc Wio LoRa SX1262
-  support: official
-  compatible:
-    - luckfox-lyra-plus # Armbian
-
 Lora:
  Module: sx1262
  DIO2_AS_RF_SWITCH: true
@@ -1,23 +0,0 @@
-# For use with Armbian luckfox-lyra-ultra-w
-# Enable overlay 'luckfox-lyra-ultra-w-spi0-cs0-spidev' with armbian-config
-# https://github.com/wehooper4/Meshtastic-Hardware/tree/main/Luckfox%20Ultra%20Hat
-# 1 Watt Lyra Ultra hat
-Meta:
-  name: wehooper4 Luckfox Ultra 1W
-  support: community
-  compatible:
-    - luckfox-pico-ultra # Armbian
-    - luckfox-lyra-ultra # Armbian
-
-Lora:
-  Module: sx1262
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  CS: 10
-  IRQ: 5
-  Busy: 11
-  Reset: 9
-  RXen: 14
-
-  spidev: spidev0.0 #pins are (CS=10, CLK=8, MOSI=6, MISO=7)
-  spiSpeed: 2000000
@@ -1,24 +0,0 @@
-# For use with Armbian luckfox-lyra-ultra-w
-# Enable overlay 'luckfox-lyra-ultra-w-spi0-cs0-spidev' with armbian-config
-# https://github.com/wehooper4/Meshtastic-Hardware/tree/main/Luckfox%20Ultra%20Hat
-# 2 Watt Lyra Ultra hat
-Meta:
-  name: wehooper4 Luckfox Ultra 2W
-  support: community
-  compatible:
-    - luckfox-pico-ultra # Armbian
-    - luckfox-lyra-ultra # Armbian
-
-Lora:
-  Module: sx1262
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  SX126X_MAX_POWER: 8
-  CS: 10
-  IRQ: 5
-  Busy: 11
-  Reset: 9
-  RXen: 14
-
-  spidev: spidev0.0 #pins are (CS=10, CLK=8, MOSI=6, MISO=7)
-  spiSpeed: 2000000
@@ -1,31 +0,0 @@
-# For use with Armbian luckfox-lyra // luckfox-lyra-plus
-# Enable overlay 'luckfox-lyra-plus-spi0-cs0_rmio13-spidev' with armbian-config
-# Waveshare LoRa HAT for Raspberry Pi Pico
-# https://www.waveshare.com/wiki/Pico-LoRa-SX1262
-Meta:
-  name: Waveshare LoRa HAT for Raspberry Pi Pico
-  support: community
-  compatible:
-    - luckfox-lyra-plus # Armbian
-
-Lora:
-  Module: sx1262
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  spidev: spidev0.0
-  CS: # GPIO0_B5
-    pin: 13
-    gpiochip: 0
-    line: 13
-  IRQ: # GPIO1_C2
-    pin: 50
-    gpiochip: 1
-    line: 18
-  Busy: # GPIO0_B4
-    pin: 12
-    gpiochip: 0
-    line: 12
-  Reset: # GPIO0_A2
-    pin: 2
-    gpiochip: 0
-    line: 2
@@ -1,9 +1,3 @@
-Meta:
-  name: Lora Meshstick SX1262
-  support: official
-  compatible:
-    - usb
-
 Lora:
  Module: sx1262
  CS: 0
@@ -1,9 +1,3 @@
-Meta:
-  name: Lora Meshstick SX1262
-  support: community
-  compatible:
-    - usb
-
 Lora:
  Module: lr1121
  CS: 0
@@ -1,11 +1,5 @@
-Meta:
-  name: Pinedio USB SX1262
-  support: deprecated
-  compatible:
-    - usb
-
 Lora:
  Module: sx1262
  CS: 0 
  IRQ: 10
-  spidev: ch341
+  spidev: ch341
@@ -1,9 +1,3 @@
-Meta:
-  name: raxda-rock2f-starter-edition-hat
-  support: community
-  compatible:
-    - rock-2f # Armbian
-
 Lora:

 ### Raxda Rock 2F running Armbian Linux 6.1.99-vendor-rk35xx
@@ -1,11 +1,5 @@
 # https://www.waveshare.com/core1262-868m.htm
 # https://github.com/markbirss/lora-starter-edition-sx1262-i2c
-Meta:
-  name: lora-starter-edition-sx1262-i2c
-  support: community
-  compatible:
-    - raspberry-pi
-
 Lora:
  Module: sx1262  # Starter Edition SX1262 I2C Raspberry Pi HAT
  DIO2_AS_RF_SWITCH: true
@@ -1,9 +1,3 @@
-Meta:
-  name: meshstick-1262
-  support: official
-  compatible:
-    - usb
-
 Lora:
  Module: sx1262
  CS: 0
@@ -1,9 +1,3 @@
-Meta:
-  name: meshtoad-e22
-  support: official
-  compatible:
-    - usb
-
 Lora:
  Module: sx1262
  CS: 0
@@ -1,9 +1,3 @@
-Meta:
-  name: umesh-1262-30dbm
-  support: community
-  compatible:
-    - clockwork-uconsole
-
 Lora:
  Module: sx1262
  CS: 0
@@ -19,7 +13,8 @@ Lora:
 #  USB_Serialnum: 12345678
  SX126X_MAX_POWER: 22
 # Reduce output power to improve EMI
-  TX_GAIN_LORA: [12, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 10, 10, 9, 8, 8, 7]
+  NUM_PA_POINTS: 22
+  TX_GAIN_LORA: 12, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 10, 10, 9, 8, 8, 7
 # Note: This module integrates an additional PA to achieve higher output power.
 # The 'power' parameter here does not represent the actual RF output.
 # TX_GAIN_LORA defines the gain offset applied at each SX1262 input power step (1–22 dBm).
@@ -1,9 +1,3 @@
-Meta:
-  name: umesh-1268-30dbm
-  support: community
-  compatible:
-    - clockwork-uconsole
-
 Lora:
  Module: sx1268
  CS: 0
@@ -19,7 +13,8 @@ Lora:
 #  USB_Serialnum: 12345678
  SX126X_MAX_POWER: 22
 # Reduce output power to improve EMI
-  TX_GAIN_LORA: [12, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 10, 10, 9, 8, 8, 7]
+  NUM_PA_POINTS: 22
+  TX_GAIN_LORA: 12, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 10, 10, 9, 8, 8, 7
 # Note: This module integrates an additional PA to achieve higher output power.
 # The 'power' parameter here does not represent the actual RF output.
 # TX_GAIN_LORA defines the gain offset applied at each SX1262 input power step (1–22 dBm).
@@ -1,9 +1,3 @@
-Meta:
-  name: Waveshare SX1262
-  support: deprecated
-  compatible:
-    - raspberry-pi
-
 Lora:
  Module: sx1262  # Waveshare SX126X XXXM
  DIO2_AS_RF_SWITCH: true
@@ -1,12 +1,5 @@
 # https://www.waveshare.com/pico-lora-sx1262-868m.htm
 # https://github.com/markbirss/lora-ws-raspberry-pi-pico-to-rpi-adapter
-
-Meta:
-  name: ws-raspberry-pico-to-rpi-adapter
-  support: community
-  compatible:
-    - raspberry-pi
-
 Lora:
  Module: sx1262  # Waveshare Raspberry Pi Pico to Raspberry Pi HAT Adapter
  DIO2_AS_RF_SWITCH: true
@@ -15,12 +15,6 @@
 #   5     CS          24
 #   26    DIO1/IRQ    26

-Meta:
-  name: ws-raspberry-pico-to-orangepi-03
-  support: community
-  compatible:
-    - orange-pi-zero-3 # Armbian
-
 Lora:
  Module: sx1262  # Waveshare Raspberry Pico Lora module
  DIO2_AS_RF_SWITCH: true
@@ -156,8 +156,16 @@ IF %BPS_RESET% EQU 1 (
 SET "PROGNAME=!FILENAME:.factory.bin=!"
 CALL :LOG_MESSAGE DEBUG "Computed PROGNAME: !PROGNAME!"

-@REM Determine OTA filename based on MCU type (unified OTA format)
-SET "OTA_FILENAME=mt-!MCU!-ota.bin"
+IF "__!MCU!__" == "__esp32s3__" (
+    @REM We are working with ESP32-S3
+    SET "OTA_FILENAME=bleota-s3.bin"
+) ELSE IF "__!MCU!__" == "__esp32c3__" (
+    @REM We are working with ESP32-C3
+    SET "OTA_FILENAME=bleota-c3.bin"
+) ELSE (
+    @REM Everything else
+    SET "OTA_FILENAME=bleota.bin"
+)
 CALL :LOG_MESSAGE DEBUG "Set OTA_FILENAME to: !OTA_FILENAME!"

@REM Set SPIFFS filename with "littlefs-" prefix.
@@ -131,8 +131,14 @@ if [[ -f "$FILENAME" && "$FILENAME" == *.factory.bin ]]; then
        exit 1
    fi

-    # Determine OTA filename based on MCU type (unified OTA format)
-    OTAFILE="mt-${MCU}-ota.bin"
+    # Determine OTA filename based on MCU type
+    if [ "$MCU" == "esp32s3" ]; then
+        OTAFILE=bleota-s3.bin
+    elif [ "$MCU" == "esp32c3" ]; then
+        OTAFILE=bleota-c3.bin
+    else
+        OTAFILE=bleota.bin
+    fi

    # Set SPIFFS filename with "littlefs-" prefix.
    SPIFFSFILE="littlefs-${PROGNAME/firmware-/}.bin"
@@ -87,12 +87,6 @@
  </screenshots>

  <releases>
-    <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>
-    <release version="2.7.20" date="2026-02-11">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.20</url>
-    </release>
    <release version="2.7.19" date="2026-01-22">
      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.19</url>
    </release>
@@ -1,44 +0,0 @@
-#!/usr/bin/env bash
-# Run native PlatformIO tests inside Docker (for macOS / non-Linux hosts).
-#
-# Usage:
-#   ./bin/test-native-docker.sh                          # run all native tests
-#   ./bin/test-native-docker.sh -f test_transmit_history  # run specific test filter
-#   ./bin/test-native-docker.sh --rebuild                 # force rebuild the image
-#
-set -euo pipefail
-
-SCRIPT_DIR="$(cd "$(dirname "$0")" && pwd)"
-ROOT_DIR="$(cd "$SCRIPT_DIR/.." && pwd)"
-IMAGE_NAME="meshtastic-native-test"
-
-REBUILD=false
-EXTRA_ARGS=()
-
-for arg in "$@"; do
-    if [[ "$arg" == "--rebuild" ]]; then
-        REBUILD=true
-    else
-        EXTRA_ARGS+=("$arg")
-    fi
-done
-
-if $REBUILD || ! docker image inspect "$IMAGE_NAME" >/dev/null 2>&1; then
-    echo "Building test image (first run may take a few minutes)..."
-    docker build -t "$IMAGE_NAME" -f "$ROOT_DIR/Dockerfile.test" "$ROOT_DIR"
-fi
-
-# Disable BUILD_EPOCH to avoid full rebuilds between test runs (matches CI)
-sed_cmd='s/-DBUILD_EPOCH=$UNIX_TIME/#-DBUILD_EPOCH=$UNIX_TIME/'
-
-# Default: run all tests. Pass extra args (e.g. -f test_transmit_history) through.
-if [[ ${#EXTRA_ARGS[@]} -eq 0 ]]; then
-    CMD=("platformio" "test" "-e" "coverage" "-v")
-else
-    CMD=("platformio" "test" "-e" "coverage" "-v" "${EXTRA_ARGS[@]}")
-fi
-
-exec docker run --rm \
-    -v "$ROOT_DIR:/src:ro" \
-    "$IMAGE_NAME" \
-    bash -c "rm -rf /tmp/fw-test && cp -a /src /tmp/fw-test && cd /tmp/fw-test && sed -i '${sed_cmd}' platformio.ini && ${CMD[*]}"
@@ -1,54 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "nrf52840_s140_v6.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DNRF52840_XXAA",
-    "f_cpu": "64000000L",
-    "hwids": [
-      ["0x239A", "0x4405"],
-      ["0x239A", "0x0029"],
-      ["0x239A", "0x002A"],
-      ["0x2886", "0x1667"]
-    ],
-    "usb_product": "HT-n5262G",
-    "mcu": "nrf52840",
-    "variant": "heltec_mesh_node_t096",
-    "variants_dir": "variants",
-    "bsp": {
-      "name": "adafruit"
-    },
-    "softdevice": {
-      "sd_flags": "-DS140",
-      "sd_name": "s140",
-      "sd_version": "6.1.1",
-      "sd_fwid": "0x00B6"
-    },
-    "bootloader": {
-      "settings_addr": "0xFF000"
-    }
-  },
-  "connectivity": ["bluetooth"],
-  "debug": {
-    "jlink_device": "nRF52840_xxAA",
-    "onboard_tools": ["jlink"],
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
-  },
-  "frameworks": ["arduino"],
-  "name": "Heltec nrf (Adafruit BSP)",
-  "upload": {
-    "maximum_ram_size": 248832,
-    "maximum_size": 815104,
-    "speed": 115200,
-    "protocol": "nrfutil",
-    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
-    "use_1200bps_touch": true,
-    "require_upload_port": true,
-    "wait_for_upload_port": true
-  },
-  "url": "https://heltec.org/",
-  "vendor": "Heltec"
-}
@@ -32,8 +32,7 @@
  "connectivity": ["bluetooth"],
  "debug": {
    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
+    "svd_path": "nrf52840.svd"
  },
  "frameworks": ["arduino"],
  "name": "Minesemi ME25LS01",
@@ -33,8 +33,7 @@
  "connectivity": ["bluetooth"],
  "debug": {
    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
+    "svd_path": "nrf52840.svd"
  },
  "frameworks": ["arduino"],
  "name": "MeshLink",
@@ -1,40 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "esp32s3_out.ld",
-      "partitions": "default.csv"
-    },
-    "core": "esp32",
-    "extra_flags": [
-      "-DBOARD_HAS_PSRAM",
-      "-DARDUINO_ESP32S3_DEV",
-      "-DARDUINO_USB_MODE=1",
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1"
-    ],
-    "f_cpu": "240000000L",
-    "f_flash": "80000000L",
-    "flash_mode": "qio",
-    "hwids": [["0x303A", "0x1001"]],
-    "mcu": "esp32s3",
-    "variant": "esp32s3"
-  },
-  "connectivity": ["wifi"],
-  "debug": {
-    "default_tool": "esp-builtin",
-    "onboard_tools": ["esp-builtin"],
-    "openocd_target": "esp32s3.cfg"
-  },
-  "frameworks": ["arduino", "espidf"],
-  "name": "LilyGo Mini-Epaper-S3 (4 MB Flash, 2MB PSRAM)",
-  "upload": {
-    "flash_size": "4MB",
-    "maximum_ram_size": 327680,
-    "maximum_size": 4194304,
-    "require_upload_port": true,
-    "speed": 460800
-  },
-  "url": "https://www.lilygo.cc",
-  "vendor": "LilyGo"
-}
@@ -31,8 +31,7 @@
  "connectivity": ["bluetooth"],
  "debug": {
    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
+    "svd_path": "nrf52840.svd"
  },
  "frameworks": ["arduino"],
  "name": "Minimesh Lite",
@@ -32,8 +32,7 @@
  "connectivity": ["bluetooth"],
  "debug": {
    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
+    "svd_path": "nrf52840.svd"
  },
  "frameworks": ["arduino"],
  "name": "MINEWSEMI_MS24SF1_SX1262",
@@ -32,8 +32,7 @@
  "connectivity": ["bluetooth"],
  "debug": {
    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
+    "svd_path": "nrf52840.svd"
  },
  "frameworks": ["arduino"],
  "name": "BQ nRF52840",
@@ -33,8 +33,7 @@
  "connectivity": ["bluetooth"],
  "debug": {
    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
+    "svd_path": "nrf52840.svd"
  },
  "frameworks": ["arduino"],
  "name": "ProMicro compatible nRF52840",
@@ -8,7 +8,7 @@
    "extra_flags": [
      "-DBOARD_HAS_PSRAM",
      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_USB_MODE=0",
      "-DARDUINO_RUNNING_CORE=1",
      "-DARDUINO_EVENT_RUNNING_CORE=0"
    ],
@@ -1,38 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "esp32s3_out.ld",
-      "memory_type": "qio_opi",
-      "partitions": "default_16MB.csv"
-    },
-    "core": "esp32",
-    "extra_flags": [
-      "-DBOARD_HAS_PSRAM",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=0",
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=1"
-    ],
-    "f_cpu": "240000000L",
-    "f_flash": "80000000L",
-    "flash_mode": "qio",
-    "hwids": [["0x303A", "0x1001"]],
-    "mcu": "esp32s3",
-    "variant": "esp32s3"
-  },
-  "connectivity": ["wifi", "bluetooth", "lora"],
-  "debug": {
-    "openocd_target": "esp32s3.cfg"
-  },
-  "frameworks": ["arduino", "espidf"],
-  "name": "LilyGo T5-ePaper-S3",
-  "upload": {
-    "flash_size": "16MB",
-    "maximum_ram_size": 327680,
-    "maximum_size": 16777216,
-    "require_upload_port": true,
-    "speed": 921600
-  },
-  "url": "https://lilygo.cc/products/t5-e-paper-s3-pro",
-  "vendor": "LILYGO"
-}
@@ -33,8 +33,7 @@
  "connectivity": ["bluetooth"],
  "debug": {
    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
+    "svd_path": "nrf52840.svd"
  },
  "frameworks": ["arduino"],
  "name": "Seeed T1000-E",
@@ -25,8 +25,7 @@
  "connectivity": ["bluetooth"],
  "debug": {
    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
+    "svd_path": "nrf52840.svd"
  },
  "frameworks": ["arduino", "freertos"],
  "name": "Seeed WIO WM1110",
@@ -32,8 +32,7 @@
  "connectivity": ["bluetooth"],
  "debug": {
    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
+    "svd_path": "nrf52840.svd"
  },
  "frameworks": ["arduino"],
  "name": "Seeed WIO WM1110",
@@ -32,8 +32,7 @@
  "connectivity": ["bluetooth"],
  "debug": {
    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
+    "svd_path": "nrf52840.svd"
  },
  "frameworks": ["arduino"],
  "name": "Seeed WIO WM1110",
@@ -12,6 +12,6 @@ Ex:
 - `logo_320x480.png`
 - `logo_320x240.png`

-This file is copied to `data/boot/logo.png` before filesystem image compilation.
+This file is copied to `data/boot/logo.png` before filesytem image compilation.

 For additional examples see the [`event/defcon33` branch](https://github.com/meshtastic/firmware/tree/event/defcon33).
@@ -1,15 +1,3 @@
-meshtasticd (2.7.21.0) unstable; urgency=medium
-
-  * Version 2.7.21
-
- -- GitHub Actions <github-actions[bot]@users.noreply.github.com>  Wed, 11 Mar 2026 11:45:36 +0000
-
-meshtasticd (2.7.20.0) unstable; urgency=medium
-
-  * Version 2.7.20
-
- -- GitHub Actions <github-actions[bot]@users.noreply.github.com>  Wed, 11 Feb 2026 12:19:54 +0000
-
 meshtasticd (2.7.19.0) unstable; urgency=medium

  * Version 2.7.19
@@ -3,17 +3,10 @@ export DEBEMAIL="jbennett@incomsystems.biz"
 export PLATFORMIO_LIBDEPS_DIR=pio/libdeps
 export PLATFORMIO_PACKAGES_DIR=pio/packages
 export PLATFORMIO_CORE_DIR=pio/core
-export PLATFORMIO_SETTING_ENABLE_TELEMETRY=0
-export PLATFORMIO_SETTING_CHECK_PLATFORMIO_INTERVAL=3650
-export PLATFORMIO_SETTING_CHECK_PRUNE_SYSTEM_THRESHOLD=10240

 # Download libraries to `pio`
 platformio pkg install -e native-tft
 platformio pkg install -e native-tft -t platformio/tool-scons@4.40502.0
-# Mangle PlatformIO cache to prevent internet access at build-time
-# Simply adds 1 to all expiry (epoch) timestamps, adding ~500 years to expiry date
-cp pio/core/.cache/downloads/usage.db pio/core/.cache/downloads/usage.db.bak
-jq -c 'with_entries(.value |= (. | tostring + "1" | tonumber))' pio/core/.cache/downloads/usage.db.bak >pio/core/.cache/downloads/usage.db
 # Compress `pio` directory to prevent dh_clean from sanitizing it
 tar -cf pio.tar pio/
 rm -rf pio
@@ -27,10 +20,5 @@ rm -rf debian/changelog
 dch --create --distribution "$SERIES" --package "$package" --newversion "$PKG_VERSION~$SERIES" \
 	"GitHub Actions Automatic packaging for $PKG_VERSION~$SERIES"

-if [[ -n $GPG_KEY_ID ]]; then
-	# Build and sign the source deb
-	debuild -S -nc -k"$GPG_KEY_ID"
-else
-	# Build the source deb without signing (forks)
-	debuild -S -nc
-fi
+# Build the source deb
+debuild -S -nc -k"$GPG_KEY_ID"
@@ -26,8 +26,7 @@ Build-Depends: debhelper-compat (= 13),
               libx11-dev,
               libinput-dev,
               libxkbcommon-x11-dev,
-               libsqlite3-dev,
-               libsdl2-dev
+               libsqlite3-dev
 Standards-Version: 4.6.2
 Homepage: https://github.com/meshtastic/firmware
 Rules-Requires-Root: no
@@ -9,10 +9,7 @@
 PIO_ENV:=\
 	PLATFORMIO_CORE_DIR=pio/core \
 	PLATFORMIO_LIBDEPS_DIR=pio/libdeps \
-	PLATFORMIO_PACKAGES_DIR=pio/packages \
-	PLATFORMIO_SETTING_ENABLE_TELEMETRY=0 \
-	PLATFORMIO_SETTING_CHECK_PLATFORMIO_INTERVAL=3650 \
-	PLATFORMIO_SETTING_CHECK_PRUNE_SYSTEM_THRESHOLD=10240
+	PLATFORMIO_PACKAGES_DIR=pio/packages

 # Raspbian armhf builds should be compatible with armv6-hardfloat
 # https://www.valvers.com/open-software/raspberry-pi/bare-metal-programming-in-c-part-1/#rpi1-compiler-flags
@@ -1,44 +0,0 @@
-{
-  "nodes": {
-    "flake-compat": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1767039857,
-        "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
-        "owner": "NixOS",
-        "repo": "flake-compat",
-        "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "flake-compat",
-        "type": "github"
-      }
-    },
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1766314097,
-        "narHash": "sha256-laJftWbghBehazn/zxVJ8NdENVgjccsWAdAqKXhErrM=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "306ea70f9eb0fb4e040f8540e2deab32ed7e2055",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
@@ -1,66 +0,0 @@
-{
-  description = "Nix flake to compile Meshtastic firmware";
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-
-    # Shim to make flake.nix work with stable Nix.
-    flake-compat = {
-      url = "github:NixOS/flake-compat";
-      flake = false;
-    };
-  };
-
-  outputs =
-    inputs:
-    let
-      lib = inputs.nixpkgs.lib;
-
-      forAllSystems =
-        fn:
-        lib.genAttrs lib.systems.flakeExposed (
-          system:
-          fn {
-            pkgs = import inputs.nixpkgs {
-              inherit system;
-            };
-            inherit system;
-          }
-        );
-    in
-    {
-      devShells = forAllSystems (
-        { pkgs, ... }:
-        let
-          python3 = pkgs.python312.withPackages (
-            ps: with ps; [
-              google
-            ]
-          );
-        in
-        {
-          default = pkgs.mkShell {
-            buildInputs = with pkgs; [
-              python3
-              platformio
-            ];
-
-            shellHook = ''
-              # Set up PlatformIO to use a local core directory.
-              export PLATFORMIO_CORE_DIR=$PWD/.platformio
-              # Tell pip to put packages into $PIP_PREFIX instead of the usual
-              # location. This is especially necessary under NixOS to avoid having
-              # pip trying to write to the read-only Nix store. For more info,
-              # see https://wiki.nixos.org/wiki/Python
-              export PIP_PREFIX=$PWD/.python3
-              export PYTHONPATH="$PIP_PREFIX/${python3.sitePackages}"
-              export PATH="$PIP_PREFIX/bin:$PATH"
-              # Avoids reproducibility issues with some Python packages
-              # See https://nixos.org/manual/nixpkgs/stable/#python-setup.py-bdist_wheel-cannot-create-.whl
-              unset SOURCE_DATE_EPOCH
-            '';
-          };
-        }
-      );
-    };
-}
@@ -49,7 +49,6 @@ BuildRequires: pkgconfig(libulfius)
 BuildRequires: pkgconfig(x11)
 BuildRequires: pkgconfig(libinput)
 BuildRequires: pkgconfig(xkbcommon-x11)
-BuildRequires: pkgconfig(sdl2)

 # libbsd is needed on older Fedora/RHEL to provide 'strlcpy'
 %if 0%{?fedora} >= 39 || 0%{?rhel} >= 10
@@ -60,14 +59,8 @@ BuildRequires: pkgconfig(libbsd-overlay)

 Requires:      systemd-udev

-# Declare that this package provides the user/group it creates in %pre
-# Required for Fedora 43+ which tracks users/groups as RPM dependencies
-Provides:      user(%{meshtasticd_user})
-Provides:      group(%{meshtasticd_user})
-Provides:      group(spi)
-
 %description
-Meshtastic daemon. Meshtastic is an off-grid
+Meshtastic daemon for controlling Meshtastic devices. Meshtastic is an off-grid
 text communication platform that uses inexpensive LoRa radios.

 %prep
@@ -158,7 +151,6 @@ fi
 %license LICENSE
 %doc README.md
 %{_bindir}/meshtasticd
-%{_bindir}/meshtasticd-start.sh
 %dir %{_localstatedir}/lib/meshtasticd
 %{_udevrulesdir}/99-meshtasticd-udev.rules
 %dir %{_sysconfdir}/meshtasticd
@@ -50,15 +50,12 @@ build_flags = -Wno-missing-field-initializers
 	-DRADIOLIB_EXCLUDE_APRS=1
 	-DRADIOLIB_EXCLUDE_LORAWAN=1
 	-DMESHTASTIC_EXCLUDE_DROPZONE=1
-	-DMESHTASTIC_EXCLUDE_REPLYBOT=1
 	-DMESHTASTIC_EXCLUDE_REMOTEHARDWARE=1
 	-DMESHTASTIC_EXCLUDE_HEALTH_TELEMETRY=1
 	-DMESHTASTIC_EXCLUDE_POWERSTRESS=1 ; exclude power stress test module from main firmware
 	-DMESHTASTIC_EXCLUDE_GENERIC_THREAD_MODULE=1
 	-DMESHTASTIC_EXCLUDE_POWERMON=1
-	-DMESHTASTIC_EXCLUDE_STATUS=1
 	-D MAX_THREADS=40 ; As we've split modules, we have more threads to manage
-	-DLED_BUILTIN=-1
 	#-DBUILD_EPOCH=$UNIX_TIME ; set in platformio-custom.py now
 	#-D OLED_PL=1
 	#-D DEBUG_HEAP=1 ; uncomment to add free heap space / memory leak debugging logs
@@ -68,7 +65,7 @@ monitor_speed = 115200
 monitor_filters = direct
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic-esp8266-oled-ssd1306 packageName=https://github.com/meshtastic/esp8266-oled-ssd1306 gitBranch=master
-	https://github.com/meshtastic/esp8266-oled-ssd1306/archive/21e484f409cde18d44012caef84c244eb5ca28f3.zip
+	https://github.com/meshtastic/esp8266-oled-ssd1306/archive/b34c6817c25d6faabb3a8a162b5d14fb75395433.zip
 	# renovate: datasource=git-refs depName=meshtastic-OneButton packageName=https://github.com/meshtastic/OneButton gitBranch=master
 	https://github.com/meshtastic/OneButton/archive/fa352d668c53f290cfa480a5f79ad422cd828c70.zip
 	# renovate: datasource=git-refs depName=meshtastic-arduino-fsm packageName=https://github.com/meshtastic/arduino-fsm gitBranch=master
@@ -97,11 +94,7 @@ lib_deps =
 	${env.lib_deps}
 	# renovate: datasource=custom.pio depName=NonBlockingRTTTL packageName=end2endzone/library/NonBlockingRTTTL
 	end2endzone/NonBlockingRTTTL@1.4.0
-build_unflags =
-	-std=c++11
-	-std=gnu++11
 build_flags = ${env.build_flags} -Os
-	-std=gnu++17
 build_src_filter = ${env.build_src_filter} -<platform/portduino/> -<graphics/niche/>

 ; Common libs for communicating over TCP/IP networks such as MQTT
@@ -121,12 +114,12 @@ lib_deps =
 [radiolib_base]
 lib_deps =
 	# renovate: datasource=custom.pio depName=RadioLib packageName=jgromes/library/RadioLib
-	jgromes/RadioLib@7.6.0
+	jgromes/RadioLib@7.5.0

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

 ; Common libs for environmental measurements in telemetry module
 [environmental_base]
@@ -142,7 +135,7 @@ lib_deps =
 	# 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
+	adafruit/Adafruit DPS310@1.1.5
 	# 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
@@ -150,11 +143,11 @@ lib_deps =
 	# 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
+	adafruit/Adafruit MPU6050@2.2.6
 	# 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
+	adafruit/Adafruit AHTX0@2.0.5
 	# 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
@@ -162,7 +155,7 @@ lib_deps =
 	# 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
+	adafruit/Adafruit MLX90614 Library@2.1.5
 	# renovate: datasource=git-refs depName=INA3221 packageName=https://github.com/sgtwilko/INA3221 gitBranch=FixOverflow
 	https://github.com/sgtwilko/INA3221/archive/bb03d7e9bfcc74fc798838a54f4f99738f29fc6a.zip
 	# renovate: datasource=custom.pio depName=QMC5883L Compass packageName=mprograms/library/QMC5883LCompass
@@ -184,12 +177,43 @@ lib_deps =
 	# 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
+	adafruit/Adafruit TSL2561@1.1.2
 	# 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]
+; (not included in native / portduino)
+[environmental_extra]
+lib_deps =
+	# renovate: datasource=custom.pio depName=Adafruit BMP3XX packageName=adafruit/library/Adafruit BMP3XX Library
+	adafruit/Adafruit BMP3XX Library@2.1.6
+	# renovate: datasource=custom.pio depName=Adafruit MAX1704X packageName=adafruit/library/Adafruit MAX1704X
+	adafruit/Adafruit MAX1704X@1.0.3
+	# renovate: datasource=custom.pio depName=Adafruit 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=custom.pio depName=Bosch BSEC2 packageName=boschsensortec/library/bsec2
+	boschsensortec/bsec2@1.10.2610
+	# renovate: datasource=custom.pio depName=Bosch BME68x packageName=boschsensortec/library/BME68x Sensor Library
+	boschsensortec/BME68x Sensor Library@1.3.40408
+	# renovate: datasource=git-refs depName=meshtastic-DFRobot_LarkWeatherStation packageName=https://github.com/meshtastic/DFRobot_LarkWeatherStation gitBranch=master
+	https://github.com/meshtastic/DFRobot_LarkWeatherStation/archive/4de3a9cadef0f6a5220a8a906cf9775b02b0040d.zip
+	# renovate: datasource=custom.pio depName=Sensirion Core packageName=sensirion/library/Sensirion Core
+	sensirion/Sensirion Core@0.7.2
+	# renovate: datasource=custom.pio depName=Sensirion I2C SCD4x packageName=sensirion/library/Sensirion I2C SCD4x
+	sensirion/Sensirion I2C SCD4x@1.1.0
+; Same as environmental_extra but without BSEC (saves ~3.5KB DRAM for original ESP32 targets)
+[environmental_extra_no_bsec]
 lib_deps =
 	# renovate: datasource=custom.pio depName=Adafruit BMP3XX packageName=adafruit/library/Adafruit BMP3XX Library
 	adafruit/Adafruit BMP3XX Library@2.1.6
@@ -212,26 +236,6 @@ lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic-DFRobot_LarkWeatherStation packageName=https://github.com/meshtastic/DFRobot_LarkWeatherStation gitBranch=master
 	https://github.com/meshtastic/DFRobot_LarkWeatherStation/archive/4de3a9cadef0f6a5220a8a906cf9775b02b0040d.zip
 	# renovate: datasource=custom.pio depName=Sensirion Core packageName=sensirion/library/Sensirion Core
-	sensirion/Sensirion Core@0.7.3
+	sensirion/Sensirion Core@0.7.2
 	# 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=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=custom.pio depName=Adafruit_BME680 packageName=adafruit/library/Adafruit BME680 Library
-	adafruit/Adafruit BME680 Library@2.0.6
+	sensirion/Sensirion I2C SCD4x@1.1.0
@@ -1,12 +0,0 @@
-(import (
-  let
-    lock = builtins.fromJSON (builtins.readFile ./flake.lock);
-    nodeName = lock.nodes.root.inputs.flake-compat;
-  in
-  fetchTarball {
-    url =
-      lock.nodes.${nodeName}.locked.url
-        or "https://github.com/NixOS/flake-compat/archive/${lock.nodes.${nodeName}.locked.rev}.tar.gz";
-    sha256 = lock.nodes.${nodeName}.locked.narHash;
-  }
-) { src = ./.; }).shellNix
@@ -1,23 +1,19 @@
-#ifndef AMBIENTLIGHTINGTHREAD_H
-#define AMBIENTLIGHTINGTHREAD_H
-
 #include "Observer.h"
 #include "configuration.h"
-#include "detect/ScanI2C.h"
-#include "sleep.h"

 #ifdef HAS_NCP5623
-#include <Wire.h>
-
-#include <NCP5623.h>
+#include <graphics/RAKled.h>
+NCP5623 rgb;
 #endif

 #ifdef HAS_LP5562
 #include <graphics/NomadStarLED.h>
+LP5562 rgbw;
 #endif

 #ifdef HAS_NEOPIXEL
-#include <Adafruit_NeoPixel.h>
+#include <graphics/NeoPixel.h>
+Adafruit_NeoPixel pixels(NEOPIXEL_COUNT, NEOPIXEL_DATA, NEOPIXEL_TYPE);
 #endif

 #ifdef UNPHONE
@@ -25,24 +21,10 @@
 extern unPhone unphone;
 #endif

+namespace concurrency
+{
 class AmbientLightingThread : public concurrency::OSThread
 {
-    friend class StatusLEDModule; // Let the LEDStatusModule trigger the ambient lighting for notifications and battery status.
-    friend class ExternalNotificationModule; // Let the ExternalNotificationModule trigger the ambient lighting for notifications.
-
-  private:
-#ifdef HAS_NCP5623
-    NCP5623 rgb;
-#endif
-
-#ifdef HAS_LP5562
-    LP5562 rgbw;
-#endif
-
-#ifdef HAS_NEOPIXEL
-    Adafruit_NeoPixel pixels = Adafruit_NeoPixel(NEOPIXEL_COUNT, NEOPIXEL_DATA, NEOPIXEL_TYPE);
-#endif
-
  public:
    explicit AmbientLightingThread(ScanI2C::DeviceType type) : OSThread("AmbientLighting")
    {
@@ -54,15 +36,14 @@ class AmbientLightingThread : public concurrency::OSThread
        moduleConfig.ambient_lighting.led_state = true;
 #endif
 #endif
-#if AMBIENT_LIGHTING_TEST
-        // define to enable test
-        moduleConfig.ambient_lighting.led_state = true;
-        moduleConfig.ambient_lighting.current = 10;
+        // Uncomment to test module
+        // moduleConfig.ambient_lighting.led_state = true;
+        // moduleConfig.ambient_lighting.current = 10;
        // Default to a color based on our node number
-        moduleConfig.ambient_lighting.red = (myNodeInfo.my_node_num & 0xFF0000) >> 16;
-        moduleConfig.ambient_lighting.green = (myNodeInfo.my_node_num & 0x00FF00) >> 8;
-        moduleConfig.ambient_lighting.blue = myNodeInfo.my_node_num & 0x0000FF;
-#endif
+        // moduleConfig.ambient_lighting.red = (myNodeInfo.my_node_num & 0xFF0000) >> 16;
+        // moduleConfig.ambient_lighting.green = (myNodeInfo.my_node_num & 0x00FF00) >> 8;
+        // moduleConfig.ambient_lighting.blue = myNodeInfo.my_node_num & 0x0000FF;
+
 #if defined(HAS_NCP5623) || defined(HAS_LP5562)
        _type = type;
        if (_type == ScanI2C::DeviceType::NONE) {
@@ -72,6 +53,11 @@ class AmbientLightingThread : public concurrency::OSThread
        }
 #endif
 #ifdef HAS_RGB_LED
+        if (!moduleConfig.ambient_lighting.led_state) {
+            LOG_DEBUG("AmbientLighting Disable due to moduleConfig.ambient_lighting.led_state OFF");
+            disable();
+            return;
+        }
        LOG_DEBUG("AmbientLighting init");
 #ifdef HAS_NCP5623
        if (_type == ScanI2C::NCP5623) {
@@ -91,13 +77,7 @@ class AmbientLightingThread : public concurrency::OSThread
                pixels.clear(); // Set all pixel colors to 'off'
                pixels.setBrightness(moduleConfig.ambient_lighting.current);
 #endif
-                if (!moduleConfig.ambient_lighting.led_state) {
-                    LOG_DEBUG("AmbientLighting Disable due to moduleConfig.ambient_lighting.led_state OFF");
-                    disable();
-                    return;
-                }
-                setLighting(moduleConfig.ambient_lighting.current, moduleConfig.ambient_lighting.red,
-                            moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
+                setLighting();
 #endif
 #if defined(HAS_NCP5623) || defined(HAS_LP5562)
            }
@@ -111,8 +91,7 @@ class AmbientLightingThread : public concurrency::OSThread
 #if defined(HAS_NCP5623) || defined(HAS_LP5562)
            if ((_type == ScanI2C::NCP5623 || _type == ScanI2C::LP5562) && moduleConfig.ambient_lighting.led_state) {
 #endif
-                setLighting(moduleConfig.ambient_lighting.current, moduleConfig.ambient_lighting.red,
-                            moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
+                setLighting();
                return 30000; // 30 seconds to reset from any animations that may have been running from Ext. Notification
 #if defined(HAS_NCP5623) || defined(HAS_LP5562)
            }
@@ -169,53 +148,65 @@ class AmbientLightingThread : public concurrency::OSThread
            return 0;
        }

-      protected:
-        void setLighting(float current, uint8_t red, uint8_t green, uint8_t blue)
+        void setLighting()
        {
 #ifdef HAS_NCP5623
-            rgb.setCurrent(current);
-            rgb.setRed(red);
-            rgb.setGreen(green);
-            rgb.setBlue(blue);
-            LOG_DEBUG("Init NCP5623 Ambient light w/ current=%f, red=%d, green=%d, blue=%d", current, red, green, blue);
+            rgb.setCurrent(moduleConfig.ambient_lighting.current);
+            rgb.setRed(moduleConfig.ambient_lighting.red);
+            rgb.setGreen(moduleConfig.ambient_lighting.green);
+            rgb.setBlue(moduleConfig.ambient_lighting.blue);
+            LOG_DEBUG("Init NCP5623 Ambient light w/ current=%d, red=%d, green=%d, blue=%d",
+                      moduleConfig.ambient_lighting.current, moduleConfig.ambient_lighting.red,
+                      moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
 #endif
 #ifdef HAS_LP5562
-            rgbw.setCurrent(current);
-            rgbw.setRed(red);
-            rgbw.setGreen(green);
-            rgbw.setBlue(blue);
-            LOG_DEBUG("Init LP5562 Ambient light w/ current=%f, red=%d, green=%d, blue=%d", current, red, green, blue);
+            rgbw.setCurrent(moduleConfig.ambient_lighting.current);
+            rgbw.setRed(moduleConfig.ambient_lighting.red);
+            rgbw.setGreen(moduleConfig.ambient_lighting.green);
+            rgbw.setBlue(moduleConfig.ambient_lighting.blue);
+            LOG_DEBUG("Init LP5562 Ambient light w/ current=%d, red=%d, green=%d, blue=%d", moduleConfig.ambient_lighting.current,
+                      moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
 #endif
 #ifdef HAS_NEOPIXEL
-            pixels.fill(pixels.Color(red, green, blue), 0, NEOPIXEL_COUNT);
+            pixels.fill(pixels.Color(moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green,
+                                     moduleConfig.ambient_lighting.blue),
+                        0, NEOPIXEL_COUNT);

 // RadioMaster Bandit has addressable LED at the two buttons
 // this allow us to set different lighting for them in variant.h file.
+#ifdef RADIOMASTER_900_BANDIT
 #if defined(BUTTON1_COLOR) && defined(BUTTON1_COLOR_INDEX)
            pixels.fill(BUTTON1_COLOR, BUTTON1_COLOR_INDEX, 1);
 #endif
 #if defined(BUTTON2_COLOR) && defined(BUTTON2_COLOR_INDEX)
            pixels.fill(BUTTON2_COLOR, BUTTON2_COLOR_INDEX, 1);
+#endif
 #endif
            pixels.show();
-            // LOG_DEBUG("Init NeoPixel Ambient light w/ brightness(current)=%f, red=%d, green=%d, blue=%d",
-            //        current, red, green, blue);
+            // LOG_DEBUG("Init NeoPixel Ambient light w/ brightness(current)=%d, red=%d, green=%d, blue=%d",
+            //        moduleConfig.ambient_lighting.current, moduleConfig.ambient_lighting.red,
+            //        moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
 #endif
 #ifdef RGBLED_CA
-            analogWrite(RGBLED_RED, 255 - red);
-            analogWrite(RGBLED_GREEN, 255 - green);
-            analogWrite(RGBLED_BLUE, 255 - blue);
-            LOG_DEBUG("Init Ambient light RGB Common Anode w/ red=%d, green=%d, blue=%d", red, green, blue);
+            analogWrite(RGBLED_RED, 255 - moduleConfig.ambient_lighting.red);
+            analogWrite(RGBLED_GREEN, 255 - moduleConfig.ambient_lighting.green);
+            analogWrite(RGBLED_BLUE, 255 - moduleConfig.ambient_lighting.blue);
+            LOG_DEBUG("Init Ambient light RGB Common Anode w/ red=%d, green=%d, blue=%d", moduleConfig.ambient_lighting.red,
+                      moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
 #elif defined(RGBLED_RED)
-        analogWrite(RGBLED_RED, red);
-        analogWrite(RGBLED_GREEN, green);
-        analogWrite(RGBLED_BLUE, blue);
-        LOG_DEBUG("Init Ambient light RGB Common Cathode w/ red=%d, green=%d, blue=%d", red, green, blue);
+        analogWrite(RGBLED_RED, moduleConfig.ambient_lighting.red);
+        analogWrite(RGBLED_GREEN, moduleConfig.ambient_lighting.green);
+        analogWrite(RGBLED_BLUE, moduleConfig.ambient_lighting.blue);
+        LOG_DEBUG("Init Ambient light RGB Common Cathode w/ red=%d, green=%d, blue=%d", moduleConfig.ambient_lighting.red,
+                  moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
 #endif
 #ifdef UNPHONE
-            unphone.rgb(red, green, blue);
-            LOG_DEBUG("Init unPhone Ambient light w/ red=%d, green=%d, blue=%d", red, green, blue);
+            unphone.rgb(moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green,
+                        moduleConfig.ambient_lighting.blue);
+            LOG_DEBUG("Init unPhone Ambient light w/ red=%d, green=%d, blue=%d", moduleConfig.ambient_lighting.red,
+                      moduleConfig.ambient_lighting.green, moduleConfig.ambient_lighting.blue);
 #endif
        }
    };
-#endif // AMBIENTLIGHTINGTHREAD_H
+
+} // namespace concurrency
@@ -4,7 +4,6 @@
 #include "configuration.h"
 #include "main.h"
 #include "sleep.h"
-#include <memory>

 #ifdef HAS_I2S
 #include <AudioFileSourcePROGMEM.h>
@@ -30,9 +29,9 @@ class AudioThread : public concurrency::OSThread
        io.digitalWrite(EXPANDS_AMP_EN, HIGH);
 #endif
        setCPUFast(true);
-        rtttlFile = std::unique_ptr<AudioFileSourcePROGMEM>(new AudioFileSourcePROGMEM(data, len));
-        i2sRtttl = std::unique_ptr<AudioGeneratorRTTTL>(new AudioGeneratorRTTTL());
-        i2sRtttl->begin(rtttlFile.get(), audioOut.get());
+        rtttlFile = new AudioFileSourcePROGMEM(data, len);
+        i2sRtttl = new AudioGeneratorRTTTL();
+        i2sRtttl->begin(rtttlFile, audioOut);
    }

    // Also handles actually playing the RTTTL, needs to be called in loop
@@ -48,10 +47,14 @@ class AudioThread : public concurrency::OSThread
    {
        if (i2sRtttl != nullptr) {
            i2sRtttl->stop();
+            delete i2sRtttl;
            i2sRtttl = nullptr;
        }

-        rtttlFile = nullptr;
+        if (rtttlFile != nullptr) {
+            delete rtttlFile;
+            rtttlFile = nullptr;
+        }

        setCPUFast(false);
 #ifdef T_LORA_PAGER
@@ -63,14 +66,16 @@ class AudioThread : public concurrency::OSThread
    {
        if (i2sRtttl != nullptr) {
            i2sRtttl->stop();
+            delete i2sRtttl;
            i2sRtttl = nullptr;
        }

 #ifdef T_LORA_PAGER
        io.digitalWrite(EXPANDS_AMP_EN, HIGH);
 #endif
-        auto sam = std::unique_ptr<ESP8266SAM>(new ESP8266SAM);
-        sam->Say(audioOut.get(), text);
+        ESP8266SAM *sam = new ESP8266SAM;
+        sam->Say(audioOut, text);
+        delete sam;
        setCPUFast(false);
 #ifdef T_LORA_PAGER
        io.digitalWrite(EXPANDS_AMP_EN, LOW);
@@ -91,15 +96,15 @@ class AudioThread : public concurrency::OSThread
  private:
    void initOutput()
    {
-        audioOut = std::unique_ptr<AudioOutputI2S>(new AudioOutputI2S(1, AudioOutputI2S::EXTERNAL_I2S));
+        audioOut = new AudioOutputI2S(1, AudioOutputI2S::EXTERNAL_I2S);
        audioOut->SetPinout(DAC_I2S_BCK, DAC_I2S_WS, DAC_I2S_DOUT, DAC_I2S_MCLK);
        audioOut->SetGain(0.2);
    };

-    std::unique_ptr<AudioGeneratorRTTTL> i2sRtttl = nullptr;
-    std::unique_ptr<AudioOutputI2S> audioOut = nullptr;
+    AudioGeneratorRTTTL *i2sRtttl = nullptr;
+    AudioOutputI2S *audioOut = nullptr;

-    std::unique_ptr<AudioFileSourcePROGMEM> rtttlFile = nullptr;
+    AudioFileSourcePROGMEM *rtttlFile = nullptr;
 };

 #endif
@@ -89,14 +89,22 @@ class BluetoothStatus : public Status
            case ConnectionState::CONNECTED:
                LOG_DEBUG("BluetoothStatus CONNECTED");
 #ifdef BLE_LED
-                digitalWrite(BLE_LED, LED_STATE_ON);
+#ifdef BLE_LED_INVERTED
+                digitalWrite(BLE_LED, LOW);
+#else
+                digitalWrite(BLE_LED, HIGH);
+#endif
 #endif
                break;

            case ConnectionState::DISCONNECTED:
                LOG_DEBUG("BluetoothStatus DISCONNECTED");
 #ifdef BLE_LED
-                digitalWrite(BLE_LED, LED_STATE_OFF);
+#ifdef BLE_LED_INVERTED
+                digitalWrite(BLE_LED, HIGH);
+#else
+                digitalWrite(BLE_LED, LOW);
+#endif
 #endif
                break;
            }
@@ -0,0 +1,66 @@
+#include "Led.h"
+#include "PowerMon.h"
+#include "main.h"
+#include "power.h"
+
+GpioVirtPin ledForceOn, ledBlink;
+
+#if defined(LED_PIN)
+// Most boards have a GPIO for LED control
+static GpioHwPin ledRawHwPin(LED_PIN);
+#else
+static GpioVirtPin ledRawHwPin; // Dummy pin for no hardware
+#endif
+
+#if LED_STATE_ON == 0
+static GpioVirtPin ledHwPin;
+static GpioNotTransformer ledInverter(&ledHwPin, &ledRawHwPin);
+#else
+static GpioPin &ledHwPin = ledRawHwPin;
+#endif
+
+#if defined(HAS_PMU)
+/**
+ * A GPIO controlled by the PMU
+ */
+class GpioPmuPin : public GpioPin
+{
+  public:
+    void set(bool value)
+    {
+        if (pmu_found && PMU) {
+            // blink the axp led
+            PMU->setChargingLedMode(value ? XPOWERS_CHG_LED_ON : XPOWERS_CHG_LED_OFF);
+        }
+    }
+} ledPmuHwPin;
+
+// In some cases we need to drive a PMU LED and a normal LED
+static GpioSplitter ledFinalPin(&ledHwPin, &ledPmuHwPin);
+#else
+static GpioPin &ledFinalPin = ledHwPin;
+#endif
+
+#ifdef USE_POWERMON
+/**
+ * We monitor changes to the LED drive output because we use that as a sanity test in our power monitor stuff.
+ */
+class MonitoredLedPin : public GpioPin
+{
+  public:
+    void set(bool value)
+    {
+        if (powerMon) {
+            if (value)
+                powerMon->setState(meshtastic_PowerMon_State_LED_On);
+            else
+                powerMon->clearState(meshtastic_PowerMon_State_LED_On);
+        }
+        ledFinalPin.set(value);
+    }
+} monitoredLedPin;
+#else
+static GpioPin &monitoredLedPin = ledFinalPin;
+#endif
+
+static GpioBinaryTransformer ledForcer(&ledForceOn, &ledBlink, &monitoredLedPin, GpioBinaryTransformer::Or);
@@ -0,0 +1,7 @@
+#include "GpioLogic.h"
+#include "configuration.h"
+
+/**
+ * ledForceOn and ledForceOff both override the normal ledBlinker behavior (which is controlled by main)
+ */
+extern GpioVirtPin ledForceOn, ledBlink;
--- a/Show More
+++ b/Show More