ESP32 native bootloader mode

2025-12-27 21:20:33 +00:00 · 2025-01-25 12:02:34 -06:00
469 changed files with 3680 additions and 28098 deletions
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -1,10 +1,9 @@
-# trunk-ignore-all(terrascan/AC_DOCKER_0002): Known terrascan issue
-# trunk-ignore-all(hadolint/DL3008): Do not pin apt package versions
-# trunk-ignore-all(hadolint/DL3013): Do not pin pip package versions
 FROM mcr.microsoft.com/devcontainers/cpp:1-debian-12

 USER root

+# trunk-ignore(terrascan/AC_DOCKER_0002): Known terrascan issue
+# trunk-ignore(hadolint/DL3008): Use latest version of packages
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
    && apt-get -y install --no-install-recommends \
    ca-certificates \
@@ -28,15 +27,9 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
    hwdata \
    gpg \
    gnupg2 \
-    libusb-1.0-0-dev \
-    libuv1-dev \
-    libi2c-dev \
-    libxcb-xkb-dev \
-    libxkbcommon-dev \
-    libinput-dev \
    && apt-get clean && rm -rf /var/lib/apt/lists/*

-RUN pipx install platformio
+RUN pipx install platformio==6.1.15

 COPY 99-platformio-udev.rules /etc/udev/rules.d/99-platformio-udev.rules

--- a/.devcontainer/setup.sh
+++ b/.devcontainer/setup.sh
@@ -1,6 +1,3 @@
 #!/usr/bin/env sh

 git submodule update --init
-
-pip install --no-cache-dir setuptools
-pipx install esptool
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,4 @@
 * text=auto eol=lf
-*.cmd text eol=crlf
-*.bat text eol=crlf
-*.ps1 text eol=crlf
+*.{cmd,[cC][mM][dD]} text eol=crlf
+*.{bat,[bB][aA][tT]} text eol=crlf
 *.{sh,[sS][hH]} text eol=lf
--- a/.github/ISSUE_TEMPLATE/Bug
+++ b/.github/ISSUE_TEMPLATE/Bug
@@ -1,7 +1,7 @@
 name: Bug Report
 description: File a bug report
 title: "[Bug]: "
-labels: [bug, triage]
+labels: ["bug", "triage"]
 body:
  - type: markdown
    attributes:
@@ -72,15 +72,6 @@ body:
    validations:
      required: true

-  - type: checkboxes
-    id: mui
-    attributes:
-      label: Is this bug report about any UI component firmware like InkHUD or Meshtatic UI (MUI)?
-      options:
-        - label: Meshtastic UI aka MUI colorTFT
-        - label: InkHUD ePaper
-        - label: OLED slide UI on any display
-
  - type: input
    id: version
    attributes:
--- a/.github/ISSUE_TEMPLATE/New
+++ b/.github/ISSUE_TEMPLATE/New
@@ -1,7 +1,7 @@
 name: New Board
 description: Request us to support new hardware
 title: "[Board]: "
-labels: [enhancement, triage]
+labels: ["enhancement", "triage"]
 body:
  - type: markdown
    attributes:
--- a/.github/ISSUE_TEMPLATE/feature.yml
+++ b/.github/ISSUE_TEMPLATE/feature.yml
@@ -1,7 +1,7 @@
 name: Feature Request
 description: Request a new feature
 title: "[Feature Request]: "
-labels: [enhancement]
+labels: ["enhancement"]
 body:
  - type: markdown
    attributes:
--- a/.github/actionlint.yaml
+++ b/.github/actionlint.yaml
@@ -1,5 +0,0 @@
-# Configuration related to self-hosted runner.
-self-hosted-runner:
-  # Labels of self-hosted runner in array of strings.
-  labels:
-    - test-runner
--- a/.github/actions/build-variant/action.yml
+++ b/.github/actions/build-variant/action.yml
@@ -34,7 +34,7 @@ inputs:
  arch:
    description: Processor arch name
    required: true
-    default: esp32
+    default: "esp32"

 runs:
  using: composite
@@ -43,13 +43,6 @@ runs:
      id: base
      uses: ./.github/actions/setup-base

-    - name: Get web ui version
-      if: inputs.include-web-ui == 'true'
-      id: webver
-      shell: bash
-      run: |
-        echo "ver=$(cat bin/web.version)" >> $GITHUB_OUTPUT
-
    - name: Pull web ui
      if: inputs.include-web-ui == 'true'
      uses: dsaltares/fetch-gh-release-asset@master
@@ -58,7 +51,7 @@ runs:
        file: build.tar
        target: build.tar
        token: ${{ inputs.github_token }}
-        version: tags/v${{ steps.webver.outputs.ver }}
+        version: tags/v2.5.3

    - name: Unpack web ui
      if: inputs.include-web-ui == 'true'
--- a/.github/actions/setup-base/action.yml
+++ b/.github/actions/setup-base/action.yml
@@ -1,13 +1,13 @@
-name: Setup Build Base Composite Action
-description: Base build actions for Meshtastic Platform IO steps
+name: "Setup Build Base Composite Action"
+description: "Base build actions for Meshtastic Platform IO steps"

 runs:
-  using: composite
+  using: "composite"
  steps:
    - name: Checkout code
      uses: actions/checkout@v4
      with:
-        submodules: recursive
+        submodules: "recursive"
        ref: ${{github.event.pull_request.head.ref}}
        repository: ${{github.event.pull_request.head.repo.full_name}}

--- a/.github/actions/setup-native/action.yml
+++ b/.github/actions/setup-native/action.yml
@@ -11,4 +11,4 @@ runs:
    - name: Install libs needed for native build
      shell: bash
      run: |
-        sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev libi2c-dev libuv1-dev
+        sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev libi2c-dev
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,29 +1,26 @@
-#trunk-ignore-all(yamllint/quoted-strings): required by dependabot syntax check
 version: 2
 updates:
  - package-ecosystem: docker
-    directory: /.devcontainer
+    directory: devcontainer
    schedule:
      interval: daily
-      time: "05:00"
+      time: "05:00" # trunk-ignore(yamllint/quoted-strings): required by dependabot syntax check
      timezone: US/Pacific
  - package-ecosystem: docker
    directory: /
    schedule:
      interval: daily
-      time: "05:00"
+      time: "05:00" # trunk-ignore(yamllint/quoted-strings): required by dependabot syntax check
      timezone: US/Pacific
  - package-ecosystem: gitsubmodule
    directory: /
    schedule:
      interval: daily
-      time: "05:00"
+      time: "05:00" # trunk-ignore(yamllint/quoted-strings): required by dependabot syntax check
      timezone: US/Pacific
-    ignore:
-      - dependency-name: protobufs
  - package-ecosystem: github-actions
    directory: /.github/workflows
    schedule:
      interval: daily
-      time: "05:00"
+      time: "05:00" # trunk-ignore(yamllint/quoted-strings): required by dependabot syntax check
      timezone: US/Pacific
--- a/.github/meshtastic_logo.png
+++ b/.github/meshtastic_logo.png
--- a/.github/pull_request_template.md
+++ b/.github/pull_request_template.md
@@ -1,6 +1,7 @@
-## 🙏 Thank you for sending in a pull request, here's some tips to get started!
-
 ### ❌ (Please delete all these tips and replace them with your text) ❌
+
+## Thank you for sending in a pull request, here's some tips to get started!
+
 - 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 accidentially duplicating work etc...
@@ -11,17 +12,4 @@
 - 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 commnunity members can help test your changes.
 - If your PR gets accepted you can request a "Contributor" role in the Meshtastic Discord
-
-
-## 🤝 Attestations
- [ ] I have tested that my proposed changes behave as described.
- [ ] I have tested that my proposed changes do not cause any obvious regressions on the following devices:
-  - [ ] Heltec (Lora32) V3
-  - [ ] LilyGo T-Deck 
-  - [ ] LilyGo T-Beam
-  - [ ] RAK WisBlock 4631
-  - [ ] Seeed Studio T-1000E tracker card
-  - [ ] Other (please specify below)
--- a/.github/workflows/build_debian_src.yml
+++ b/.github/workflows/build_debian_src.yml
@@ -4,7 +4,7 @@ on:
  workflow_call:
    secrets:
      PPA_GPG_PRIVATE_KEY:
-        required: false
+        required: true
    inputs:
      series:
        description: Ubuntu/Debian series to target
--- a/.github/workflows/build_native.yml
+++ b/.github/workflows/build_native.yml
@@ -0,0 +1,38 @@
+name: Build Native
+
+on: workflow_call
+
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+  build-native:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - name: Setup native build
+        id: base
+        uses: ./.github/actions/setup-native
+
+      - name: Build Native
+        run: bin/build-native.sh
+
+      - name: Get release version string
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-native-${{ steps.version.outputs.long }}.zip
+          overwrite: true
+          path: |
+            release/meshtasticd_linux_x86_64
+            bin/config-dist.yaml
--- a/.github/workflows/build_nrf52.yml
+++ b/.github/workflows/build_nrf52.yml
@@ -7,8 +7,6 @@ on:
        required: true
        type: string

-permissions: read-all
-
 jobs:
  build-nrf52:
    runs-on: ubuntu-latest
--- a/.github/workflows/build_raspbian.yml
+++ b/.github/workflows/build_raspbian.yml
@@ -0,0 +1,52 @@
+name: Build Raspbian
+
+on: workflow_call
+
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+  build-raspbian:
+    runs-on: [self-hosted, linux, ARM64]
+    steps:
+      - name: Install libbluetooth
+        shell: bash
+        run: |
+          sudo apt-get update -y --fix-missing
+          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev libi2c-dev
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - name: Upgrade python tools
+        shell: bash
+        run: |
+          python -m pip install --upgrade pip
+          pip install -U platformio adafruit-nrfutil
+          pip install -U meshtastic --pre
+
+      - name: Upgrade platformio
+        shell: bash
+        run: |
+          pio upgrade
+
+      - name: Build Raspbian
+        run: bin/build-native.sh
+
+      - name: Get release version string
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-raspbian-${{ steps.version.outputs.long }}.zip
+          overwrite: true
+          path: |
+            release/meshtasticd_linux_aarch64
+            bin/config-dist.yaml
--- a/.github/workflows/build_raspbian_armv7l.yml
+++ b/.github/workflows/build_raspbian_armv7l.yml
@@ -0,0 +1,52 @@
+name: Build Raspbian Arm
+
+on: workflow_call
+
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+  build-raspbian-armv7l:
+    runs-on: [self-hosted, linux, ARM]
+    steps:
+      - name: Install libbluetooth
+        shell: bash
+        run: |
+          sudo apt-get update -y --fix-missing
+          sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev libi2c-dev
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - name: Upgrade python tools
+        shell: bash
+        run: |
+          python -m pip install --upgrade pip
+          pip install -U platformio adafruit-nrfutil
+          pip install -U meshtastic --pre
+
+      - name: Upgrade platformio
+        shell: bash
+        run: |
+          pio upgrade
+
+      - name: Build Raspbian
+        run: bin/build-native.sh
+
+      - name: Get release version string
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Store binaries as an artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: firmware-raspbian-armv7l-${{ steps.version.outputs.long }}.zip
+          overwrite: true
+          path: |
+            release/meshtasticd_linux_armv7l
+            bin/config-dist.yaml
--- a/.github/workflows/build_rpi2040.yml
+++ b/.github/workflows/build_rpi2040.yml
@@ -7,8 +7,6 @@ on:
        required: true
        type: string

-permissions: read-all
-
 jobs:
  build-rpi2040:
    runs-on: ubuntu-latest
--- a/.github/workflows/build_stm32.yml
+++ b/.github/workflows/build_stm32.yml
@@ -7,8 +7,6 @@ on:
        required: true
        type: string

-permissions: read-all
-
 jobs:
  build-stm32:
    runs-on: ubuntu-latest
--- a/.github/workflows/generate-userprefs.yml
+++ b/.github/workflows/generate-userprefs.yml
@@ -0,0 +1,35 @@
+name: Generate UsersPrefs JSON manifest
+
+on:
+  push:
+    paths:
+      - userPrefs.h
+    branches:
+      - master
+
+jobs:
+  generate-userprefs:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Install Clang
+        run: sudo apt-get install -y clang
+
+      - name: Install trunk
+        run: curl https://get.trunk.io -fsSL | bash
+
+      - name: Generate userPrefs.jsom
+        run: python3 ./bin/build-userprefs-json.py
+
+      - name: Trunk format json
+        run: trunk format userPrefs.json
+
+      - name: Commit userPrefs.json
+        run: |
+          git config --global user.email "actions@github.com"
+          git config --global user.name "GitHub Actions"
+          git add userPrefs.json
+          git commit -m "Update userPrefs.json"
+          git push
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -128,6 +128,15 @@ jobs:
    with:
      board: ${{ matrix.board }}

+  package-raspbian:
+    uses: ./.github/workflows/package_raspbian.yml
+
+  package-raspbian-armv7l:
+    uses: ./.github/workflows/package_raspbian_armv7l.yml
+
+  package-native:
+    uses: ./.github/workflows/package_amd64.yml
+
  build-debian-src:
    uses: ./.github/workflows/build_debian_src.yml
    with:
@@ -135,13 +144,6 @@ jobs:
      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:
    uses: ./.github/workflows/test_native.yml

@@ -156,7 +158,7 @@ jobs:
  docker-alpine-amd64:
    uses: ./.github/workflows/docker_build.yml
    with:
-      distro: alpine
+      distro: debian
      platform: linux/amd64
      runs-on: ubuntu-24.04
      push: false
@@ -287,9 +289,13 @@ jobs:
    outputs:
      upload_url: ${{ steps.create_release.outputs.upload_url }}
    needs:
-      - gather-artifacts
-      - build-debian-src
-      - package-pio-deps-native-tft
+      [
+        gather-artifacts,
+        package-raspbian,
+        package-raspbian-armv7l,
+        package-native,
+        build-debian-src,
+      ]
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@@ -318,6 +324,13 @@ jobs:
          body: |
            Autogenerated by github action, developer should edit as required before publishing...

+      - name: Download deb files
+        uses: actions/download-artifact@v4
+        with:
+          pattern: meshtasticd_${{ steps.version.outputs.long }}_*.deb
+          merge-multiple: true
+          path: ./output
+
      - name: Download source deb
        uses: actions/download-artifact@v4
        with:
@@ -325,30 +338,39 @@ jobs:
          merge-multiple: true
          path: ./output/debian-src

-      - name: Download `native-tft` pio deps
-        uses: actions/download-artifact@v4
-        with:
-          pattern: platformio-deps-native-tft-${{ steps.version.outputs.long }}
-          merge-multiple: true
-          path: ./output/pio-deps-native-tft
-
-      - name: Zip linux sources
+      - name: Zip source deb
        working-directory: output
-        run: |
-          zip -j -9 -r ./meshtasticd-${{ steps.version.outputs.deb }}-src.zip ./debian-src
-          zip -9 -r ./platformio-deps-native-tft-${{ steps.version.outputs.long }}.zip ./pio-deps-native-tft
+        run: zip -j -9 -r ./meshtasticd-${{ steps.version.outputs.deb }}-src.zip ./debian-src

      # For diagnostics
      - name: Display structure of downloaded files
        run: ls -lR

-      - name: Add linux sources to release
+      - name: Add deb files to release
        run: |
+          gh release upload v${{ steps.version.outputs.long }} ./output/meshtasticd_${{ steps.version.outputs.long }}_arm64.deb
+          gh release upload v${{ steps.version.outputs.long }} ./output/meshtasticd_${{ steps.version.outputs.long }}_armhf.deb
+          gh release upload v${{ steps.version.outputs.long }} ./output/meshtasticd_${{ steps.version.outputs.long }}_amd64.deb
          gh release upload v${{ steps.version.outputs.long }} ./output/meshtasticd-${{ steps.version.outputs.deb }}-src.zip
-          gh release upload v${{ steps.version.outputs.long }} ./output/platformio-deps-native-tft-${{ steps.version.outputs.long }}.zip
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

+      - name: Bump version.properties
+        run: >-
+          bin/bump_version.py
+
+      - name: Update debian changelog
+        run: >-
+          debian/ci_changelog.sh
+
+      - name: Create version.properties pull request
+        uses: peter-evans/create-pull-request@v7
+        with:
+          title: Bump version.properties
+          add-paths: |
+            version.properties
+            debian/changelog
+
  release-firmware:
    strategy:
      fail-fast: false
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -4,34 +4,16 @@ on:
    - cron: 0 8 * * 1-5
  workflow_dispatch: {}

-permissions: read-all
-
 jobs:
  trunk_check:
-    name: Trunk Check and Upload
-    runs-on: ubuntu-24.04
+    name: Trunk Check Upload
+    runs-on: ubuntu-latest

    steps:
      - name: Checkout
        uses: actions/checkout@v4

      - name: Trunk Check
-        uses: trunk-io/trunk-action@v1
+        uses: trunk-io/trunk-action@782e83f803ca6e369f035d64c6ba2768174ba61b
        with:
          trunk-token: ${{ secrets.TRUNK_TOKEN }}
-
-  trunk_upgrade:
-    # See: https://github.com/trunk-io/trunk-action/blob/v1/readme.md#automatic-upgrades
-    name: Trunk Upgrade (PR)
-    runs-on: ubuntu-24.04
-    permissions:
-      contents: write # For trunk to create PRs
-      pull-requests: write # For trunk to create PRs
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Trunk Upgrade
-        uses: trunk-io/trunk-action/upgrade@v1
-        with:
-          base: master
--- a/.github/workflows/package_amd64.yml
+++ b/.github/workflows/package_amd64.yml
@@ -0,0 +1,90 @@
+name: Package Native
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+  build-native:
+    uses: ./.github/workflows/build_native.yml
+
+  package-native:
+    runs-on: ubuntu-22.04
+    needs: build-native
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - name: Pull web ui
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          repo: meshtastic/web
+          file: build.tar
+          target: build.tar
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get release version string
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: firmware-native-${{ steps.version.outputs.long }}.zip
+          merge-multiple: true
+
+      - name: Display structure of downloaded files
+        run: ls -R
+
+      - name: build .debpkg
+        run: |
+          mkdir -p .debpkg/DEBIAN
+          mkdir -p .debpkg/usr/share/meshtasticd/web
+          mkdir -p .debpkg/usr/sbin
+          mkdir -p .debpkg/etc/meshtasticd
+          mkdir -p .debpkg/etc/meshtasticd/config.d
+          mkdir -p .debpkg/etc/meshtasticd/available.d
+          mkdir -p .debpkg/usr/lib/systemd/system/
+          tar -xf build.tar -C .debpkg/usr/share/meshtasticd/web
+          shopt -s dotglob nullglob
+          if [ -d .debpkg/usr/share/meshtasticd/web/build ]; then mv  .debpkg/usr/share/meshtasticd/web/build/* .debpkg/usr/share/meshtasticd/web/; fi
+          if [ -d .debpkg/usr/share/meshtasticd/web/build ]; then rmdir .debpkg/usr/share/meshtasticd/web/build; fi
+          if [ -d .debpkg/usr/share/meshtasticd/web/.DS_Store ]; then rm -f .debpkg/usr/share/meshtasticd/web/.DS_Store; fi
+          gunzip .debpkg/usr/share/meshtasticd/web/ -r
+          cp release/meshtasticd_linux_x86_64 .debpkg/usr/sbin/meshtasticd
+          cp bin/config-dist.yaml .debpkg/etc/meshtasticd/config.yaml
+          cp bin/config.d/* .debpkg/etc/meshtasticd/available.d/ -r
+          chmod +x .debpkg/usr/sbin/meshtasticd
+          cp bin/meshtasticd.service .debpkg/usr/lib/systemd/system/meshtasticd.service
+          echo "/etc/meshtasticd/config.yaml" > .debpkg/DEBIAN/conffiles
+          chmod +x .debpkg/DEBIAN/conffiles
+          # Transition /usr/share/doc/meshtasticd to /usr/share/meshtasticd
+          echo "rm -rf /usr/share/doc/meshtasticd" > .debpkg/DEBIAN/preinst
+          chmod +x .debpkg/DEBIAN/preinst
+          echo "ln -sf /usr/share/meshtasticd /usr/share/doc/meshtasticd" > .debpkg/DEBIAN/postinst
+          chmod +x .debpkg/DEBIAN/postinst
+
+      - uses: jiro4989/build-deb-action@v3
+        with:
+          package: meshtasticd
+          package_root: .debpkg
+          maintainer: Jonathan Bennett
+          version: ${{ steps.version.outputs.long }} # refs/tags/v*.*.*
+          arch: amd64
+          depends: libyaml-cpp0.7, openssl, libulfius2.7, libi2c0
+          desc: Native Linux Meshtastic binary.
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: meshtasticd_${{ steps.version.outputs.long }}_amd64.deb
+          overwrite: true
+          path: |
+            ./*.deb
--- a/.github/workflows/package_pio_deps.yml
+++ b/.github/workflows/package_pio_deps.yml
@@ -1,65 +0,0 @@
-name: Package PlatformIO Library Dependencies
-# trunk-ignore-all(checkov/CKV_GHA_7): Allow workflow_dispatch inputs for testing
-
-on:
-  workflow_call:
-    inputs:
-      pio_env:
-        description: PlatformIO environment to target
-        required: true
-        type: string
-  workflow_dispatch:
-    inputs:
-      pio_env:
-        description: PlatformIO environment to target
-        required: true
-        type: string
-
-permissions:
-  contents: write
-  packages: write
-
-jobs:
-  pkg-pio-libdeps:
-    runs-on: ubuntu-24.04
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-        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@v5
-        with:
-          python-version: 3.x
-
-      - name: Install deps
-        shell: bash
-        run: |
-          pip install platformio
-
-      - name: Get release version string
-        run: |
-          echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-        id: version
-
-      - name: Fetch libdeps
-        shell: bash
-        run: |-
-          platformio pkg install -e ${{ inputs.pio_env }}
-          platformio pkg install -e ${{ inputs.pio_env }} -t platformio/tool-scons@4.40502.0
-        env:
-          PLATFORMIO_LIBDEPS_DIR: pio/libdeps
-          PLATFORMIO_PACKAGES_DIR: pio/packages
-          PLATFORMIO_CORE_DIR: pio/core
-
-      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: platformio-deps-${{ inputs.pio_env }}-${{ steps.version.outputs.long }}
-          overwrite: true
-          include-hidden-files: true
-          path: |
-            pio/*
--- a/.github/workflows/package_raspbian.yml
+++ b/.github/workflows/package_raspbian.yml
@@ -0,0 +1,90 @@
+name: Package Raspbian
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+  build-raspbian:
+    uses: ./.github/workflows/build_raspbian.yml
+
+  package-raspbian:
+    runs-on: ubuntu-22.04
+    needs: build-raspbian
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - name: Pull web ui
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          repo: meshtastic/web
+          file: build.tar
+          target: build.tar
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get release version string
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: firmware-raspbian-${{ steps.version.outputs.long }}.zip
+          merge-multiple: true
+
+      - name: Display structure of downloaded files
+        run: ls -R
+
+      - name: build .debpkg
+        run: |
+          mkdir -p .debpkg/DEBIAN
+          mkdir -p .debpkg/usr/share/meshtasticd/web
+          mkdir -p .debpkg/usr/sbin
+          mkdir -p .debpkg/etc/meshtasticd
+          mkdir -p .debpkg/etc/meshtasticd/config.d
+          mkdir -p .debpkg/etc/meshtasticd/available.d
+          mkdir -p .debpkg/usr/lib/systemd/system/
+          tar -xf build.tar -C .debpkg/usr/share/meshtasticd/web
+          shopt -s dotglob nullglob
+          if [ -d .debpkg/usr/share/meshtasticd/web/build ]; then mv  .debpkg/usr/share/meshtasticd/web/build/* .debpkg/usr/share/meshtasticd/web/; fi
+          if [ -d .debpkg/usr/share/meshtasticd/web/build ]; then rmdir .debpkg/usr/share/meshtasticd/web/build; fi
+          if [ -d .debpkg/usr/share/meshtasticd/web/.DS_Store ]; then rm -f .debpkg/usr/share/meshtasticd/web/.DS_Store; fi
+          gunzip .debpkg/usr/share/meshtasticd/web/ -r
+          cp release/meshtasticd_linux_aarch64 .debpkg/usr/sbin/meshtasticd
+          cp bin/config-dist.yaml .debpkg/etc/meshtasticd/config.yaml
+          cp bin/config.d/* .debpkg/etc/meshtasticd/available.d/ -r
+          chmod +x .debpkg/usr/sbin/meshtasticd
+          cp bin/meshtasticd.service .debpkg/usr/lib/systemd/system/meshtasticd.service
+          echo "/etc/meshtasticd/config.yaml" > .debpkg/DEBIAN/conffiles
+          chmod +x .debpkg/DEBIAN/conffiles
+          # Transition /usr/share/doc/meshtasticd to /usr/share/meshtasticd
+          echo "rm -rf /usr/share/doc/meshtasticd" > .debpkg/DEBIAN/preinst
+          chmod +x .debpkg/DEBIAN/preinst
+          echo "ln -sf /usr/share/meshtasticd /usr/share/doc/meshtasticd" > .debpkg/DEBIAN/postinst
+          chmod +x .debpkg/DEBIAN/postinst
+
+      - uses: jiro4989/build-deb-action@v3
+        with:
+          package: meshtasticd
+          package_root: .debpkg
+          maintainer: Jonathan Bennett
+          version: ${{ steps.version.outputs.long }} # refs/tags/v*.*.*
+          arch: arm64
+          depends: libyaml-cpp0.7, openssl, libulfius2.7, libi2c0
+          desc: Native Linux Meshtastic binary.
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: meshtasticd_${{ steps.version.outputs.long }}_arm64.deb
+          overwrite: true
+          path: |
+            ./*.deb
--- a/.github/workflows/package_raspbian_armv7l.yml
+++ b/.github/workflows/package_raspbian_armv7l.yml
@@ -0,0 +1,90 @@
+name: Package Raspbian
+
+on:
+  workflow_call:
+  workflow_dispatch:
+
+permissions:
+  contents: write
+  packages: write
+
+jobs:
+  build-raspbian_armv7l:
+    uses: ./.github/workflows/build_raspbian_armv7l.yml
+
+  package-raspbian_armv7l:
+    runs-on: ubuntu-22.04
+    needs: build-raspbian_armv7l
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - name: Pull web ui
+        uses: dsaltares/fetch-gh-release-asset@master
+        with:
+          repo: meshtastic/web
+          file: build.tar
+          target: build.tar
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Get release version string
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          name: firmware-raspbian-armv7l-${{ steps.version.outputs.long }}.zip
+          merge-multiple: true
+
+      - name: Display structure of downloaded files
+        run: ls -R
+
+      - name: build .debpkg
+        run: |
+          mkdir -p .debpkg/DEBIAN
+          mkdir -p .debpkg/usr/share/meshtasticd/web
+          mkdir -p .debpkg/usr/sbin
+          mkdir -p .debpkg/etc/meshtasticd
+          mkdir -p .debpkg/etc/meshtasticd/config.d
+          mkdir -p .debpkg/etc/meshtasticd/available.d
+          mkdir -p .debpkg/usr/lib/systemd/system/
+          tar -xf build.tar -C .debpkg/usr/share/meshtasticd/web
+          shopt -s dotglob nullglob
+          if [ -d .debpkg/usr/share/meshtasticd/web/build ]; then mv  .debpkg/usr/share/meshtasticd/web/build/* .debpkg/usr/share/meshtasticd/web/; fi
+          if [ -d .debpkg/usr/share/meshtasticd/web/build ]; then rmdir .debpkg/usr/share/meshtasticd/web/build; fi
+          if [ -d .debpkg/usr/share/meshtasticd/web/.DS_Store ]; then rm -f .debpkg/usr/share/meshtasticd/web/.DS_Store; fi
+          gunzip .debpkg/usr/share/meshtasticd/web/ -r
+          cp release/meshtasticd_linux_armv7l .debpkg/usr/sbin/meshtasticd
+          cp bin/config-dist.yaml .debpkg/etc/meshtasticd/config.yaml
+          cp bin/config.d/* .debpkg/etc/meshtasticd/available.d/ -r
+          chmod +x .debpkg/usr/sbin/meshtasticd
+          cp bin/meshtasticd.service .debpkg/usr/lib/systemd/system/meshtasticd.service
+          echo "/etc/meshtasticd/config.yaml" > .debpkg/DEBIAN/conffiles
+          chmod +x .debpkg/DEBIAN/conffiles
+          # Transition /usr/share/doc/meshtasticd to /usr/share/meshtasticd
+          echo "rm -rf /usr/share/doc/meshtasticd" > .debpkg/DEBIAN/preinst
+          chmod +x .debpkg/DEBIAN/preinst
+          echo "ln -sf /usr/share/meshtasticd /usr/share/doc/meshtasticd" > .debpkg/DEBIAN/postinst
+          chmod +x .debpkg/DEBIAN/postinst
+
+      - uses: jiro4989/build-deb-action@v3
+        with:
+          package: meshtasticd
+          package_root: .debpkg
+          maintainer: Jonathan Bennett
+          version: ${{ steps.version.outputs.long }} # refs/tags/v*.*.*
+          arch: armhf
+          depends: libyaml-cpp0.7, openssl, libulfius2.7, libi2c0
+          desc: Native Linux Meshtastic binary.
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: meshtasticd_${{ steps.version.outputs.long }}_armhf.deb
+          overwrite: true
+          path: |
+            ./*.deb
--- a/.github/workflows/release_channels.yml
+++ b/.github/workflows/release_channels.yml
@@ -37,55 +37,9 @@ jobs:
        ${{ contains(github.event.release.name, 'Beta') && 'beta' || contains(github.event.release.name, 'Alpha') && 'alpha' }}
    secrets: inherit

-  hook-copr:
-    uses: ./.github/workflows/hook_copr.yml
-    with:
-      copr_project: |-
-        ${{ contains(github.event.release.name, 'Beta') && 'beta' || contains(github.event.release.name, 'Alpha') && 'alpha' }}
-    secrets: inherit
-
-  # Create a PR to bump version when a release is Published
-  bump-version:
-    if: ${{ github.event.release.published }}
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-      contents: write
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.x
-
-      - 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
-
-      - name: Bump version.properties
-        run: >-
-          bin/bump_version.py
-
-      - name: Ensure debian deps are installed
-        shell: bash
-        run: |
-          sudo apt-get update -y --fix-missing
-          sudo apt-get install -y devscripts
-
-      - name: Update debian changelog
-        run: >-
-          debian/ci_changelog.sh
-
-      - name: Create version.properties pull request
-        uses: peter-evans/create-pull-request@v7
-        with:
-          title: Bump version.properties
-          add-paths: |
-            version.properties
-            debian/changelog
+  # hook-copr:
+  #   uses: ./.github/workflows/hook_copr.yml
+  #   with:
+  #     copr_project: |-
+  #       ${{ contains(github.event.release.name, 'Beta') && 'beta' || contains(github.event.release.name, 'Alpha') && 'alpha' }}
+  #   secrets: inherit
--- a/.github/workflows/sec_sast_flawfinder.yml
+++ b/.github/workflows/sec_sast_flawfinder.yml
@@ -0,0 +1,41 @@
+---
+name: Flawfinder Scan
+
+on:
+  push:
+    branches: [master, develop]
+    paths-ignore:
+      - "**.md"
+      - "version.properties"
+
+jobs:
+  flawfinder:
+    runs-on: ubuntu-latest
+    name: Flawfinder
+
+    steps:
+      # step 1
+      - name: clone application source code
+        uses: actions/checkout@v4
+
+      # step 2
+      - name: flawfinder_scan
+        uses: david-a-wheeler/flawfinder@2.0.19
+        with:
+          arguments: "--sarif ./"
+          output: "flawfinder_report.sarif"
+
+      # step 3
+      - name: save report as pipeline artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: flawfinder_report.sarif
+          overwrite: true
+          path: flawfinder_report.sarif
+
+      # step 4
+      - name: publish code scanning alerts
+        uses: github/codeql-action/upload-sarif@v3
+        with:
+          sarif_file: flawfinder_report.sarif
+          category: flawfinder
--- a/.github/workflows/sec_sast_semgrep_cron.yml
+++ b/.github/workflows/sec_sast_semgrep_cron.yml
@@ -3,17 +3,14 @@ name: Semgrep Full Scan

 on:
  workflow_dispatch:
+    branches:
+      - master
  schedule:
-    - cron: 0 1 * * 6
-
-permissions:
-  actions: read
-  contents: read
-  security-events: write
+    - cron: "0 1 * * 6"

 jobs:
  semgrep-full:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
    container:
      image: semgrep/semgrep

--- a/.github/workflows/sec_sast_semgrep_pull.yml
+++ b/.github/workflows/sec_sast_semgrep_pull.yml
@@ -2,8 +2,6 @@
 name: Semgrep Differential Scan
 on: pull_request

-permissions: read-all
-
 jobs:
  semgrep-diff:
    runs-on: ubuntu-22.04
--- a/.github/workflows/stale_bot.yml
+++ b/.github/workflows/stale_bot.yml
@@ -16,8 +16,7 @@ jobs:

    steps:
      - name: Stale PR+Issues
-        uses: actions/stale@v9.1.0
+        uses: actions/stale@v9.0.0
        with:
-          days-before-stale: 45
          exempt-issue-labels: pinned,3.0
          exempt-pr-labels: pinned,3.0
--- a/.github/workflows/test_native.yml
+++ b/.github/workflows/test_native.yml
@@ -143,7 +143,7 @@ jobs:
          merge-multiple: true

      - name: Test Report
-        uses: dorny/test-reporter@v2.0.0
+        uses: dorny/test-reporter@v1.9.1
        with:
          name: PlatformIO Tests
          path: testreport.xml
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -2,11 +2,9 @@ name: End to end tests

 on:
  schedule:
-    - cron: 0 0 * * * # Run every day at midnight
+    - cron: "0 0 * * *" # Run every day at midnight
  workflow_dispatch: {}

-permissions: read-all
-
 jobs:
  native-tests:
    uses: ./.github/workflows/test_native.yml
--- a/.github/workflows/trunk-check.yml
+++ b/.github/workflows/trunk-check.yml
@@ -9,7 +9,7 @@ permissions: read-all
 jobs:
  trunk_check:
    name: Trunk Check Runner
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
    permissions:
      checks: write # For trunk to post annotations
      contents: read # For repo checkout
@@ -20,5 +20,3 @@ jobs:

      - name: Trunk Check
        uses: trunk-io/trunk-action@v1
-        with:
-          save-annotations: true
--- a/.github/workflows/trunk_annotate_pr.yml
+++ b/.github/workflows/trunk_annotate_pr.yml
@@ -1,26 +0,0 @@
-name: Annotate PR with trunk issues
-# See: https://github.com/trunk-io/trunk-action/blob/v1/readme.md#getting-inline-annotations-for-fork-prs
-
-on:
-  workflow_run:
-    workflows: [Pull Request] # Name from `trunk_check.yml`
-    types: [completed]
-
-permissions: read-all
-
-jobs:
-  trunk_check:
-    name: Trunk Code Quality Annotate
-    runs-on: ubuntu-24.04
-    permissions:
-      checks: write # For trunk to post annotations
-      contents: read # For repo checkout
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Trunk Check
-        uses: trunk-io/trunk-action@v1
-        with:
-          post-annotations: true
--- a/.github/workflows/trunk_format_pr.yml
+++ b/.github/workflows/trunk_format_pr.yml
@@ -4,15 +4,11 @@ on:
  issue_comment:
    types: [created]

-permissions: read-all
-
 jobs:
  trunk-fmt:
    if: github.event.issue.pull_request != null && contains(github.event.comment.body, 'trunk fmt')
    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
+
    steps:
      - name: Checkout repository
        uses: actions/checkout@v4
--- a/.github/workflows/update_protobufs.yml
+++ b/.github/workflows/update_protobufs.yml
@@ -1,14 +1,10 @@
 name: Update protobufs and regenerate classes
 on: workflow_dispatch

-permissions: read-all
-
 jobs:
  update-protobufs:
    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-      pull-requests: write
+
    steps:
      - name: Checkout code
        uses: actions/checkout@v4
--- a/.trunk/configs/.markdownlint.yaml
+++ b/.trunk/configs/.markdownlint.yaml
@@ -8,4 +8,3 @@ line_length: false
 spaces: false
 url: false
 whitespace: false
-headings: false
--- a/.trunk/configs/.prettierrc
+++ b/.trunk/configs/.prettierrc
@@ -1,10 +0,0 @@
-{
-  "overrides": [
-    {
-      "files": "userPrefs.jsonc",
-      "options": {
-        "trailingComma": "none"
-      }
-    }
-  ]
-}
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -1,34 +1,37 @@
 version: 0.1
 cli:
-  version: 1.22.12
+  version: 1.22.8
 plugins:
  sources:
    - id: trunk
-      ref: v1.6.7
+      ref: v1.6.6
      uri: https://github.com/trunk-io/plugins
 lint:
  enabled:
-    - prettier@3.5.3
-    - trufflehog@3.88.23
-    - yamllint@1.37.0
-    - bandit@1.8.3
+    - prettier@3.4.2
+    - trufflehog@3.86.1
+    - yamllint@1.35.1
+    - bandit@1.8.0
+    - checkov@3.2.334
    - terrascan@1.19.9
-    - trivy@0.61.0
+    - trivy@0.58.0
+    #- trufflehog@3.63.2-rc0
    - taplo@0.9.3
-    - ruff@0.11.4
-    - isort@6.0.1
-    - markdownlint@0.44.0
-    - oxipng@9.1.4
+    - ruff@0.8.3
+    - isort@5.13.2
+    - markdownlint@0.43.0
+    - oxipng@9.1.3
    - svgo@3.3.2
-    - actionlint@1.7.7
-    - flake8@7.2.0
+    - actionlint@1.7.4
+    - flake8@7.1.1
    - hadolint@2.12.1-beta
    - shfmt@3.6.0
    - shellcheck@0.10.0
-    - black@25.1.0
+    - black@24.10.0
    - git-diff-check
-    - gitleaks@8.24.2
+    - gitleaks@8.21.2
    - clang-format@16.0.3
+    #- prettier@3.3.3
  ignore:
    - linters: [ALL]
      paths:
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,8 +7,5 @@
  "cmake.configureOnOpen": false,
  "[cpp]": {
    "editor.defaultFormatter": "trunk.io"
-  },
-  "[powershell]": {
-    "editor.defaultFormatter": "ms-vscode.powershell"
  }
 }
--- a/37
+++ b/37
@@ -1,23 +1,21 @@
 # trunk-ignore-all(terrascan/AC_DOCKER_0002): Known terrascan issue
+# trunk-ignore-all(hadolint/DL3008): Use latest version of apt packages for buildchain
 # trunk-ignore-all(trivy/DS002): We must run as root for this container
 # trunk-ignore-all(checkov/CKV_DOCKER_8): We must run as root for this container
 # trunk-ignore-all(hadolint/DL3002): We must run as root for this container
-# trunk-ignore-all(hadolint/DL3008): Do not pin apt package versions
-# trunk-ignore-all(hadolint/DL3013): Do not pin pip package versions

-FROM python:3.13-bookworm AS builder
+FROM python:3.12-bookworm AS builder
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Etc/UTC

 # Install Dependencies
 ENV PIP_ROOT_USER_ACTION=ignore
-RUN apt-get update && apt-get install --no-install-recommends -y \
-        curl wget g++ zip git ca-certificates \
-        libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev libuv1-dev \
-        libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev pkg-config \
-    && apt-get clean && rm -rf /var/lib/apt/lists/* \
-    && pip install --no-cache-dir -U platformio \
-    && mkdir /tmp/firmware
+RUN apt-get update && apt-get install --no-install-recommends -y wget g++ zip git ca-certificates \
+        libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev \
+        libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev pkg-config && \
+    apt-get clean && rm -rf /var/lib/apt/lists/* && \
+    pip install --no-cache-dir -U platformio==6.1.16 && \
+    mkdir /tmp/firmware

 # Copy source code
 WORKDIR /tmp/firmware
@@ -27,12 +25,6 @@ COPY . /tmp/firmware
 RUN bash ./bin/build-native.sh && \
    cp "/tmp/firmware/release/meshtasticd_linux_$(uname -m)" "/tmp/firmware/release/meshtasticd"

-# Fetch web assets
-RUN curl -L "https://github.com/meshtastic/web/releases/download/v$(cat /tmp/firmware/bin/web.version)/build.tar" -o /tmp/web.tar \
-    && mkdir -p /tmp/web \
-    && tar -xf /tmp/web.tar -C /tmp/web/ \
-    && gzip -dr /tmp/web \
-    && rm /tmp/web.tar

 ##### PRODUCTION BUILD #############

@@ -43,16 +35,13 @@ ENV TZ=Etc/UTC
 # nosemgrep: dockerfile.security.last-user-is-root.last-user-is-root
 USER root

-RUN apt-get update && apt-get --no-install-recommends -y install \
-        libc-bin libc6 libgpiod2 libyaml-cpp0.7 libi2c0 libuv1 libusb-1.0-0-dev liborcania2.3 libulfius2.7 libssl3 \
-    && apt-get clean && rm -rf /var/lib/apt/lists/* \
+RUN apt-get update && apt-get --no-install-recommends -y install libc-bin libc6 libgpiod2 libyaml-cpp0.7 libi2c0 libulfius2.7 libusb-1.0-0-dev liborcania2.3 libssl3 && \
+    apt-get clean && rm -rf /var/lib/apt/lists/* \
    && mkdir -p /var/lib/meshtasticd \
-    && mkdir -p /etc/meshtasticd/config.d \
-    && mkdir -p /etc/meshtasticd/ssl
+    && mkdir -p /etc/meshtasticd/config.d

 # Fetch compiled binary from the builder
 COPY --from=builder /tmp/firmware/release/meshtasticd /usr/sbin/
-COPY --from=builder /tmp/web /usr/share/meshtasticd/
 # Copy config templates
 COPY ./bin/config.d /etc/meshtasticd/available.d

@@ -61,9 +50,7 @@ VOLUME /var/lib/meshtasticd

 # Expose Meshtastic TCP API port from the host
 EXPOSE 4403
-# Expose Meshtastic Web UI port from the host
-EXPOSE 443

 CMD [ "sh", "-cx", "meshtasticd -d /var/lib/meshtasticd" ]

-HEALTHCHECK NONE
+HEALTHCHECK NONE
--- a/README.md
+++ b/README.md
@@ -1,7 +1,4 @@
-<div align="center" markdown="1">
-
-<img src=".github/meshtastic_logo.png" alt="Meshtastic Logo" width="80"/>
-<h1>Meshtastic Firmware</h1>
+# Meshtastic Firmware

 ![GitHub release downloads](https://img.shields.io/github/downloads/meshtastic/firmware/total)
 [![CI](https://img.shields.io/github/actions/workflow/status/meshtastic/firmware/main_matrix.yml?branch=master&label=actions&logo=github&color=yellow)](https://github.com/meshtastic/firmware/actions/workflows/ci.yml)
@@ -9,31 +6,13 @@
 [![Fiscal Contributors](https://opencollective.com/meshtastic/tiers/badge.svg?label=Fiscal%20Contributors&color=deeppink)](https://opencollective.com/meshtastic/)
 [![Vercel](https://img.shields.io/static/v1?label=Powered%20by&message=Vercel&style=flat&logo=vercel&color=000000)](https://vercel.com?utm_source=meshtastic&utm_campaign=oss)

-<a href="https://trendshift.io/repositories/5524" target="_blank"><img src="https://trendshift.io/api/badge/repositories/5524" alt="meshtastic%2Ffirmware | Trendshift" style="width: 250px; height: 55px;" width="250" height="55"/></a>
-
-</div>
-
-</div>
-
-<div align="center">
-	<a href="https://meshtastic.org">Website</a>
-	-
-	<a href="https://meshtastic.org/docs/">Documentation</a>
-</div>
-
 ## Overview

-This repository contains the official device firmware for Meshtastic, an open-source LoRa mesh networking project designed for long-range, low-power communication without relying on internet or cellular infrastructure. The firmware supports various hardware platforms, including ESP32, nRF52, RP2040/RP2350, and Linux-based devices.
+This repository contains the device firmware for the Meshtastic project.

-Meshtastic enables text messaging, location sharing, and telemetry over a decentralized mesh network, making it ideal for outdoor adventures, emergency preparedness, and remote operations.
-
-### Get Started
-
- 🔧 **[Building Instructions](https://meshtastic.org/docs/development/firmware/build)** – Learn how to compile the firmware from source.
- ⚡ **[Flashing Instructions](https://meshtastic.org/docs/getting-started/flashing-firmware/)** – Install or update the firmware on your device.
-
-Join our community and help improve Meshtastic! 🚀
+- **[Building Instructions](https://meshtastic.org/docs/development/firmware/build)**
+- **[Flashing Instructions](https://meshtastic.org/docs/getting-started/flashing-firmware/)**

 ## Stats

-![Alt](https://repobeats.axiom.co/api/embed/8025e56c482ec63541593cc5bd322c19d5c0bdcf.svg "Repobeats analytics image")
+![Alt](https://repobeats.axiom.co/api/embed/a92f097d9197ae853e780ec53d7d126e545629ab.svg "Repobeats analytics image")
--- a/alpine.Dockerfile
+++ b/alpine.Dockerfile
@@ -1,18 +1,14 @@
 # trunk-ignore-all(trivy/DS002): We must run as root for this container
 # trunk-ignore-all(checkov/CKV_DOCKER_8): We must run as root for this container
 # trunk-ignore-all(hadolint/DL3002): We must run as root for this container
-# trunk-ignore-all(hadolint/DL3018): Do not pin apk package versions
-# trunk-ignore-all(hadolint/DL3013): Do not pin pip package versions

-FROM python:3.13-alpine3.21 AS builder
+FROM python:3.12-alpine3.21 AS builder

 ENV PIP_ROOT_USER_ACTION=ignore
-RUN apk --no-cache add \
-        bash g++ libstdc++-dev linux-headers zip git ca-certificates libgpiod-dev yaml-cpp-dev bluez-dev \
-        libusb-dev i2c-tools-dev libuv-dev openssl-dev pkgconf argp-standalone \
-    && rm -rf /var/cache/apk/* \
-    && pip install --no-cache-dir -U platformio \
-    && mkdir /tmp/firmware
+RUN apk add bash g++ libstdc++-dev linux-headers zip git ca-certificates libgpiod-dev yaml-cpp-dev bluez-dev \
+        libusb-dev i2c-tools-dev openssl-dev pkgconf argp-standalone && \
+    pip install --no-cache-dir -U platformio==6.1.16 && \
+    mkdir /tmp/firmware

 WORKDIR /tmp/firmware
 COPY . /tmp/firmware
@@ -31,12 +27,9 @@ FROM alpine:3.21
 # nosemgrep: dockerfile.security.last-user-is-root.last-user-is-root
 USER root

-RUN apk --no-cache add \
-        libstdc++ libgpiod yaml-cpp libusb i2c-tools libuv \
-    && rm -rf /var/cache/apk/* \
+RUN apk add libstdc++ libgpiod yaml-cpp libusb i2c-tools \
    && mkdir -p /var/lib/meshtasticd \
-    && mkdir -p /etc/meshtasticd/config.d \
-    && mkdir -p /etc/meshtasticd/ssl
+    && mkdir -p /etc/meshtasticd/config.d
 COPY --from=builder /tmp/firmware/release/meshtasticd /usr/sbin/

 WORKDIR /var/lib/meshtasticd
--- a/arch/esp32/esp32.ini
+++ b/arch/esp32/esp32.ini
@@ -2,7 +2,7 @@
 [esp32_base]
 extends = arduino_base
 custom_esp32_kind = esp32
-platform = platformio/espressif32@6.10.0
+platform = platformio/espressif32@6.9.0

 build_src_filter = 
  ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>
@@ -37,7 +37,6 @@ build_flags =
  -DLIBPAX_ARDUINO
  -DLIBPAX_WIFI
  -DLIBPAX_BLE
-  -DHAS_UDP_MULTICAST=1
  ;-DDEBUG_HEAP

 lib_deps =
@@ -45,11 +44,11 @@ lib_deps =
  ${networking_base.lib_deps}
  ${environmental_base.lib_deps}
  ${radiolib_base.lib_deps}
-  https://github.com/meshtastic/esp32_https_server/archive/23665b3adc080a311dcbb586ed5941b5f94d6ea2.zip
-  h2zero/NimBLE-Arduino@^1.4.3
-  https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
-  lewisxhe/XPowersLib@^0.2.7
-  https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
+  https://github.com/meshtastic/esp32_https_server.git#23665b3adc080a311dcbb586ed5941b5f94d6ea2
+  h2zero/NimBLE-Arduino@^1.4.2
+  https://github.com/dbinfrago/libpax.git#3cdc0371c375676a97967547f4065607d4c53fd1
+  lewisxhe/XPowersLib@^0.2.6
+  https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
  rweather/Crypto@^0.4.0

 lib_ignore = 
@@ -66,4 +65,4 @@ lib_ignore =

 ; customize the partition table
 ; http://docs.platformio.org/en/latest/platforms/espressif32.html#partition-tables
-board_build.partitions = partition-table.csv
+board_build.partitions = partition-table.csv
--- a/arch/esp32/esp32c6.ini
+++ b/arch/esp32/esp32c6.ini
@@ -1,6 +1,6 @@
 [esp32c6_base]
 extends = esp32_base
-platform = https://github.com/Jason2866/platform-espressif32/archive/22faa566df8c789000f8136cd8d0aca49617af55.zip
+platform = https://github.com/Jason2866/platform-espressif32.git#22faa566df8c789000f8136cd8d0aca49617af55
 build_flags =
  ${arduino_base.build_flags}
  -Wall
@@ -24,8 +24,8 @@ lib_deps =
  ${networking_base.lib_deps}
  ${environmental_base.lib_deps}
  ${radiolib_base.lib_deps}
-  lewisxhe/XPowersLib@^0.2.7
-  https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
+  lewisxhe/XPowersLib@^0.2.6
+  https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
  rweather/Crypto@^0.4.0

 build_src_filter = 
@@ -38,4 +38,4 @@ lib_ignore =
  NonBlockingRTTTL
  NimBLE-Arduino
  libpax
-  
+  
--- a/arch/nrf52/nrf52.ini
+++ b/arch/nrf52/nrf52.ini
@@ -1,11 +1,11 @@
 [nrf52_base]
 ; Instead of the standard nordicnrf52 platform, we use our fork which has our added variant files
-platform = platformio/nordicnrf52@^10.8.0
+platform = platformio/nordicnrf52@^10.7.0
 extends = arduino_base
 platform_packages =
  ; our custom Git version until they merge our PR
-  platformio/framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino#e13f5820002a4fb2a5e6754b42ace185277e5adf
-  platformio/toolchain-gccarmnoneeabi@~1.90301.0
+  framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino.git#e13f5820002a4fb2a5e6754b42ace185277e5adf
+  toolchain-gccarmnoneeabi@~1.90301.0

 build_type = debug
 build_flags =
@@ -17,6 +17,7 @@ build_flags =
  -DLFS_NO_ASSERT                      ; Disable LFS assertions , see https://github.com/meshtastic/firmware/pull/3818
  -DMESHTASTIC_EXCLUDE_AUDIO=1
  -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
+  -DMAX_NUM_NODES=80

 build_src_filter = 
  ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>
--- a/arch/nrf52/nrf52840.ini
+++ b/arch/nrf52/nrf52840.ini
@@ -6,7 +6,7 @@ build_flags = ${nrf52_base.build_flags}
 lib_deps =
  ${nrf52_base.lib_deps}
  ${environmental_base.lib_deps}
-  https://github.com/Kongduino/Adafruit_nRFCrypto/archive/e31a8825ea3300b163a0a3c1ddd5de34e10e1371.zip
+  https://github.com/Kongduino/Adafruit_nRFCrypto.git#e31a8825ea3300b163a0a3c1ddd5de34e10e1371

 ; Common NRF52 debugging settings follow.  See the Meshtastic developer docs for how to connect SWD debugging probes to your board.

--- a/arch/portduino/portduino.ini
+++ b/arch/portduino/portduino.ini
@@ -1,6 +1,6 @@
 ; The Portduino based 'native' environment. Currently supported on Linux targets with real LoRa hardware (or simulated).
 [portduino_base]
-platform = https://github.com/meshtastic/platform-native/archive/c5bd469ab9b5a6966321e09557b27d906961da63.zip
+platform = https://github.com/meshtastic/platform-native.git#562d189828f09fbf4c4093b3c0104bae9d8e9ff9
 framework = arduino

 build_src_filter = 
@@ -26,7 +26,7 @@ lib_deps =
  ${radiolib_base.lib_deps}
  rweather/Crypto@^0.4.0
  lovyan03/LovyanGFX@^1.2.0
-  https://github.com/pine64/libch341-spi-userspace/archive/a9b17e3452f7fb747000d9b4ad4409155b39f6ef.zip
+  https://github.com/pine64/libch341-spi-userspace#a9b17e3452f7fb747000d9b4ad4409155b39f6ef

 build_flags =
  ${arduino_base.build_flags}
@@ -34,12 +34,10 @@ build_flags =
  -Isrc/platform/portduino
  -DRADIOLIB_EEPROM_UNSUPPORTED
  -DPORTDUINO_LINUX_HARDWARE
-  -DHAS_UDP_MULTICAST
  -lpthread
  -lstdc++fs
  -lbluetooth
  -lgpiod
  -lyaml-cpp
  -li2c
-  -luv
  -std=c++17
--- a/arch/rp2xx0/rp2040.ini
+++ b/arch/rp2xx0/rp2040.ini
@@ -1,8 +1,8 @@
 ; Common settings for rp2040 Processor based targets
 [rp2040_base]
-platform = https://github.com/maxgerhardt/platform-raspberrypi#76ecf3c7e9dd4503af0331154c4ca1cddc4b03e5 ; For arduino-pico >= 4.4.3
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#19e30129fb1428b823be585c787dcb4ac0d9014c ; For arduino-pico >=4.2.1
 extends = arduino_base
-platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico#4.4.3
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#6024e9a7e82a72e38dd90f42029ba3748835eb2e ; 4.3.0 with fix MDNS

 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
@@ -18,7 +18,6 @@ build_src_filter =

 lib_ignore =
  BluetoothOTA
-  lvgl

 lib_deps =
  ${arduino_base.lib_deps}
--- a/arch/rp2xx0/rp2350.ini
+++ b/arch/rp2xx0/rp2350.ini
@@ -1,8 +1,8 @@
 ; Common settings for rp2040 Processor based targets
 [rp2350_base]
-platform = https://github.com/maxgerhardt/platform-raspberrypi#76ecf3c7e9dd4503af0331154c4ca1cddc4b03e5 ; For arduino-pico >= 4.4.3
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#19e30129fb1428b823be585c787dcb4ac0d9014c ; For arduino-pico >=4.2.1
 extends = arduino_base
-platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico#4.4.3
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#6024e9a7e82a72e38dd90f42029ba3748835eb2e ; 4.3.0 with fix MDNS

 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
@@ -10,6 +10,7 @@ build_flags =
  ${arduino_base.build_flags} -Wno-unused-variable -Wcast-align
  -Isrc/platform/rp2xx0
  -D__PLAT_RP2350__
+#  -D _POSIX_THREADS
 build_src_filter = 
  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<modules/esp32> -<platform/nrf52/> -<platform/stm32wl> -<mesh/eth/> -<mesh/wifi/> -<mesh/http/> -<mesh/raspihttp> -<platform/rp2xx0/pico_sleep> -<platform/rp2xx0/hardware_rosc>

--- a/arch/stm32/stm32.ini
+++ b/arch/stm32/stm32.ini
@@ -1,42 +1,38 @@
 [stm32_base]
 extends = arduino_base
 platform = ststm32
-platform_packages = platformio/framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/2.10.1.zip
-extra_scripts =
-  ${env.extra_scripts}
-  post:extra_scripts/extra_stm32.py
+platform_packages = platformio/framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32.git#ea74156acd823b6d14739f389e6cdc648f8ee36e

 build_type = release

-build_flags =
+;board_build.flash_offset = 0x08000000
+
+build_flags = 
  ${arduino_base.build_flags}
  -flto
  -Isrc/platform/stm32wl -g
-  -DMESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR
-  -DMESHTASTIC_EXCLUDE_INPUTBROKER
-  -DMESHTASTIC_EXCLUDE_I2C
-  -DMESHTASTIC_EXCLUDE_POWERMON
-  -DMESHTASTIC_EXCLUDE_SCREEN
-  -DMESHTASTIC_EXCLUDE_MQTT
-  -DMESHTASTIC_EXCLUDE_BLUETOOTH
+  -DMESHTASTIC_MINIMIZE_BUILD
  -DMESHTASTIC_EXCLUDE_GPS
-  ;-DDEBUG_MUTE
+  -DDEBUG_MUTE
+;  -DVECT_TAB_OFFSET=0x08000000
+  -DconfigUSE_CMSIS_RTOS_V2=1
+;  -DSPI_MODE_0=SPI_MODE0
  -fmerge-all-constants
  -ffunction-sections
  -fdata-sections
-
-build_src_filter =
+  
+build_src_filter = 
  ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<mesh/api/> -<mesh/wifi/> -<mesh/http/> -<modules/esp32> -<mesh/eth/> -<input> -<buzz> -<modules/RemoteHardwareModule.cpp> -<platform/nrf52> -<platform/portduino> -<platform/rp2xx0> -<mesh/raspihttp>

 board_upload.offset_address = 0x08000000
 upload_protocol = stlink
-debug_tool = stlink

 lib_deps =
  ${env.lib_deps}
-  ${radiolib_base.lib_deps}
-  https://github.com/caveman99/Crypto/archive/eae9c768054118a9399690f8af202853d1ae8516.zip
+  charlesbaynham/OSFS@^1.2.3
+  jgromes/RadioLib@7.0.2
+  https://github.com/caveman99/Crypto.git#f61ae26a53f7a2d0ba5511625b8bf8eff3a35d5e

 lib_ignore =
  mathertel/OneButton@2.6.1
-  Wire
+  Wire
--- a/bin/build-esp32.sh
+++ b/bin/build-esp32.sh
@@ -35,11 +35,11 @@ cp $SRCBIN $OUTDIR/$basename-update.bin

 echo "Building Filesystem for ESP32 targets"
 pio run --environment $1 -t buildfs
-cp .pio/build/$1/littlefs.bin $OUTDIR/littlefswebui-$1-$VERSION.bin
+cp .pio/build/$1/littlefs.bin $OUTDIR/littlefswebui-$VERSION.bin
 # Remove webserver files from the filesystem and rebuild
 ls -l data/static # Diagnostic list of files
 rm -rf data/static
 pio run --environment $1 -t buildfs
-cp .pio/build/$1/littlefs.bin $OUTDIR/littlefs-$1-$VERSION.bin
+cp .pio/build/$1/littlefs.bin $OUTDIR/littlefs-$VERSION.bin
 cp bin/device-install.* $OUTDIR
-cp bin/device-update.* $OUTDIR
+cp bin/device-update.* $OUTDIR
--- a/bin/build-firmware.sh
+++ b/bin/build-firmware.sh
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-sed -i 's/#-DBUILD_EPOCH=$UNIX_TIME/-DBUILD_EPOCH=$UNIX_TIME/' platformio.ini
-
-export PIP_BREAK_SYSTEM_PACKAGES=1
-
-if (echo $2 | grep -q "esp32"); then
-  bin/build-esp32.sh $1
-elif (echo $2 | grep -q "nrf52"); then
-  bin/build-nrf52.sh $1
-elif (echo $2 | grep -q "stm32"); then
-  bin/build-stm32.sh $1
-elif (echo $2 | grep -q "rpi2040"); then
-  bin/build-rpi2040.sh $1
-else
-  echo "Unknown target $2"
-  exit 1
-fi
--- a/bin/build-native.sh
+++ b/bin/build-native.sh
@@ -24,7 +24,7 @@ mkdir -p $OUTDIR/
 rm -r $OUTDIR/* || true

 # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
-pio pkg update --environment native || platformioFailed
+platformio pkg update --environment native || platformioFailed
 pio run --environment native || platformioFailed
 cp .pio/build/native/program "$OUTDIR/meshtasticd_linux_$(uname -m)"
 cp bin/native-install.* $OUTDIR
--- a/bin/config-dist.yaml
+++ b/bin/config-dist.yaml
@@ -6,12 +6,6 @@
 ### Including the "Module:" line!
 ---
 Lora:
-  # Default to auto-detecting the module type
-  # This will be overridden by configs from config.d
-  Module: auto
-
-#  # Uncomment to enable Simulation mode, or use --sim
-#  Module: sim

 #  Module: sx1262  # Waveshare SX1302 LISTEN ONLY AT THIS TIME!
 #  CS: 7
@@ -84,8 +78,6 @@ Lora:
 #  TXen: x  # TX and RX enable pins
 #  RXen: x

-#  SX126X_MAX_POWER: 8  # Limit the output power to 8 dBm, useful for amped nodes
-
 #  spiSpeed: 2000000

 ### Set default/fallback gpio chip to use in /dev/. Defaults to 0.
@@ -190,13 +182,10 @@ Logging:
 Webserver:
 #  Port: 443 # Port for Webserver & Webservices
 #  RootPath: /usr/share/meshtasticd/web # Root Dir of WebServer
-#  SSLKey: /etc/meshtasticd/ssl/private_key.pem # Path to SSL Key, generated if not present
-#  SSLCert: /etc/meshtasticd/ssl/certificate.pem # Path to SSL Certificate, generated if not present

 General:
  MaxNodes: 200
  MaxMessageQueue: 100
  ConfigDirectory: /etc/meshtasticd/config.d/
-  AvailableDirectory: /etc/meshtasticd/available.d/
 #  MACAddress: AA:BB:CC:DD:EE:FF
 #  MACAddressSource: eth0
--- a/bin/config.d/MUI/X11_480x480.yaml
+++ b/bin/config.d/MUI/X11_480x480.yaml
@@ -1,4 +0,0 @@
-Display:
-  Panel: X11
-  Width: 480
-  Height: 480
--- a/bin/config.d/lora-Adafruit-RFM9x
+++ b/bin/config.d/lora-Adafruit-RFM9x
@@ -0,0 +1,5 @@
+#  Module: RF95  # Adafruit RFM9x
+#  Reset: 25
+#  CS: 7
+#  IRQ: 22
+#  Busy: 23
--- a/bin/config.d/lora-Adafruit-RFM9x.yaml
+++ b/bin/config.d/lora-Adafruit-RFM9x.yaml
@@ -1,6 +0,0 @@
-Lora:
-  Module: RF95  # Adafruit RFM9x
-  Reset: 25
-  CS: 7
-  IRQ: 22
-#  Busy: 23
--- a/bin/config.d/lora-MeshAdv-900M30S.yaml
+++ b/bin/config.d/lora-MeshAdv-900M30S.yaml
@@ -1,5 +1,3 @@
-# MeshAdv-Pi E22-900M30S
-# https://github.com/chrismyers2000/MeshAdv-Pi-Hat
 Lora:
  Module: sx1262
  CS: 21
@@ -9,6 +7,3 @@ Lora:
  TXen: 13
  RXen: 12
  DIO3_TCXO_VOLTAGE: true
-  # Only for E22-900M33S:
-  # Limit the output power to 8 dBm
-  # SX126X_MAX_POWER: 8
--- a/bin/config.d/lora-MeshAdv-Mini-900M22S.yaml
+++ b/bin/config.d/lora-MeshAdv-Mini-900M22S.yaml
@@ -1,11 +0,0 @@
-# MeshAdv Mini E22-900M22S
-# https://github.com/chrismyers2000/MeshAdv-Mini
-Lora:
-  Module: sx1262  # Ebyte E22-900M22S 
-  CS: 8
-  IRQ: 16
-  Busy: 20
-  Reset: 24
-  TXen: 13
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
--- a/bin/config.d/lora-raxda-rock2f-starter-edition-hat.yaml
+++ b/bin/config.d/lora-raxda-rock2f-starter-edition-hat.yaml
@@ -1,49 +0,0 @@
-Lora:
-
-### Raxda Rock 2F running Armbian Linux 6.1.99-vendor-rk35xx
-### https://github.com/markbirss/rock-2f
-### https://github.com/markbirss/lora-starter-edition-sx1262-i2c
-### https://github.com/radxa-pkg/radxa-overlays/blob/main/arch/arm64/boot/dts/rockchip/overlays/rk3528-spi0-cs1-spidev.dts
-### Require install of https://github.com/radxa-pkg/radxa-overlays and rk3528-spi0-cs1-spidev.dtbo copied to /boot/dtb/rockchip/overlay and enabled 
-### in  /boot/armbianEnv.txt - overlays=rk3528-spi0-cs1-spidev
-### The Radxa Rock 2F employs multiple gpio chips.
-### Each gpio pin must be unique, but can be assigned to a specific gpio chip and line.
-### In case solely a no. is given, the default gpio chip and pin == line will be employed.
-###
-  Module: sx1262  # Radxa Rock 2F + Starter Edition SX1262 HAT by Mark Birss
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: 1.8
-  spidev: spidev0.1
-  CS:             # NSS     PIN_24 -> chip 4, line 14
-    pin: 24
-    gpiochip: 4
-    line: 14
-  SCK:            # SCK     PIN_23 -> chip 4, line 12
-    pin: 23
-    gpiochip: 4
-    line: 12
-  Busy:           # BUSY    PIN_7 -> chip 4, line 6
-    pin: 7
-    gpiochip: 4
-    line: 6
-  MOSI:           # MOSI    PIN_19 -> chip 4, line 10
-    pin: 19
-    gpiochip: 4
-    line: 10
-  MISO:           # MISO    PIN_21 -> chip 4, line 11
-    pin: 21
-    gpiochip: 4
-    line: 11
-  Reset:          # NRST    PIN_12 -> chip 1, line 13
-    pin: 12
-    gpiochip: 1
-    line: 13
-  IRQ:            # DIO1    PIN_15 -> chip 4, line 22
-    pin: 15
-    gpiochip: 4
-    line: 22
-#  RXen:           # RXEN    PIN_22 -> chip 3!, line 17
-#    pin: 22
-#    gpiochip: 3
-#    line: 17
-#  TXen: RADIOLIB_NC # TXEN   no PIN, no line, fallback to default gpio chip
--- a/bin/config.d/lora-starter-edition-sx1262-i2c.yaml
+++ b/bin/config.d/lora-starter-edition-sx1262-i2c.yaml
@@ -1,10 +0,0 @@
-# https://www.waveshare.com/core1262-868m.htm
-# https://github.com/markbirss/lora-starter-edition-sx1262-i2c
-Lora:
-  Module: sx1262  # Starter Edition SX1262 I2C Raspberry Pi HAT
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  CS: 8
-  IRQ: 22
-  Busy: 4
-  Reset: 18
--- a/bin/config.d/lora-usb-meshtoad-e22.yaml
+++ b/bin/config.d/lora-usb-meshtoad-e22.yaml
@@ -1,17 +0,0 @@
-Lora:
-  Module: sx1262
-  CS: 0
-  IRQ: 6
-  Reset: 2
-  Busy: 4
-  RXen: 1
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  spidev: ch341
-  USB_PID: 0x5512
-  USB_VID: 0x1A86
-  # Optional: Reduce power to 10 dBm to
-  # avoid over-drawing the USB port
-  # SX126X_MAX_POWER: 10
-  # Optional: Set the serial number for multi-radio support
-  # USB_Serialnum: 13374201
--- a/bin/config.d/lora-ws-raspberry-pi-pico-to-rpi-adapter.yaml
+++ b/bin/config.d/lora-ws-raspberry-pi-pico-to-rpi-adapter.yaml
@@ -1,10 +0,0 @@
-# https://www.waveshare.com/pico-lora-sx1262-868m.htm
-# https://github.com/markbirss/lora-ws-raspberry-pi-pico-to-rpi-adapter
-Lora:
-  Module: sx1262  # Waveshare Raspberry Pi Pico to Raspberry Pi HAT Adapter
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  CS: 21
-  IRQ: 16
-  Busy: 20
-  Reset: 18
--- a/bin/device-install.bat
+++ b/bin/device-install.bat
@@ -1,295 +1,72 @@
@ECHO OFF
-SETLOCAL EnableDelayedExpansion
-TITLE Meshtastic device-install

-SET "SCRIPT_NAME=%~nx0"
-SET "DEBUG=0"
-SET "PYTHON="
-SET "WEB_APP=0"
-SET "TFT_BUILD=0"
-SET "BIGDB8=0"
-SET "BIGDB16=0"
-SET "ESPTOOL_BAUD=115200"
-SET "ESPTOOL_CMD="
-SET "LOGCOUNTER=0"
+set PYTHON=python
+set WEB_APP=0

-@REM FIXME: Determine mcu from PlatformIO variant, this is unmaintainable.
-SET "S3=s3 v3 t-deck wireless-paper wireless-tracker station-g2 unphone"
-SET "C3=esp32c3"
-@REM FIXME: Determine flash size from PlatformIO variant, this is unmaintainable.
-SET "BIGDB_8MB=picomputer-s3 unphone seeed-sensecap-indicator crowpanel-esp32s3 heltec_capsule_sensor_v3 heltec-v3 heltec-vision-master-e213 heltec-vision-master-e290 heltec-vision-master-t190 heltec-wireless-paper heltec-wireless-tracker heltec-wsl-v3 icarus seeed-xiao-s3 tbeam-s3-core t-watch-s3 tracksenger"
-SET "BIGDB_16MB=t-deck mesh-tab t-energy-s3 dreamcatcher ESP32-S3-Pico m5stack-cores3 station-g2 t-eth-elite"
+:: Determine the correct esptool command to use
+where esptool >nul 2>&1
+if %ERRORLEVEL% EQU 0 (
+    set "ESPTOOL_CMD=esptool"
+) else (
+    set "ESPTOOL_CMD=%PYTHON% -m esptool"
+)

-GOTO getopts
-:help
-ECHO Flash image file to device, but first erasing and writing system information.
-ECHO.
-ECHO Usage: %SCRIPT_NAME% -f filename [-p PORT] [-P python] (--web)
-ECHO.
-ECHO Options:
-ECHO     -f filename      The firmware .bin file to flash.  Custom to your device type and region. (required)
-ECHO                      The file must be located in this current directory.
-ECHO     -p PORT          Set the environment variable for ESPTOOL_PORT.
-ECHO                      If not set, ESPTOOL iterates all ports (Dangerous).
-ECHO     -P python        Specify alternate python interpreter to use to invoke esptool. (default: python)
-ECHO                      If supplied the script will use python.
-ECHO                      If not supplied the script will try to find esptool in Path.
-ECHO     --web            Enable WebUI. (default: false)
-ECHO.
-ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4.bin -p COM11
-ECHO Example: %SCRIPT_NAME% -f firmware-unphone-2.6.0.0b106d4.bin -p COM11 --web
-GOTO eof
+goto GETOPTS
+:HELP
+echo Usage: %~nx0 [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME^|FILENAME] [--web]
+echo Flash image file to device, but first erasing and writing system information
+echo.
+echo     -h               Display this help and exit
+echo     -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerrous).
+echo     -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: %PYTHON%)
+echo     -f FILENAME      The .bin file to flash.  Custom to your device type and region.
+echo     --web            Flash WEB APP.
+goto EOF

-:version
-ECHO %SCRIPT_NAME% [Version 2.6.1]
-ECHO Meshtastic
-GOTO eof
-
-:getopts
-IF "%~1"=="" GOTO endopts
-IF /I "%~1"=="-?" GOTO help
-IF /I "%~1"=="-h" GOTO help
-IF /I "%~1"=="--help" GOTO help
-IF /I "%~1"=="-v" GOTO version
-IF /I "%~1"=="--version" GOTO version
-IF /I "%~1"=="--debug" SET "DEBUG=1" & CALL :LOG_MESSAGE DEBUG "DEBUG mode: enabled."
-IF /I "%~1"=="-f" SET "FILENAME=%~2" & SHIFT
-IF "%~1"=="-p" SET "ESPTOOL_PORT=%~2" & SHIFT
-IF /I "%~1"=="--port" SET "ESPTOOL_PORT=%~2" & SHIFT
-IF "%~1"=="-P" SET "PYTHON=%~2" & SHIFT
-IF /I "%~1"=="--web" SET "WEB_APP=1"
+:GETOPTS
+if /I "%1"=="-h" goto HELP
+if /I "%1"=="--help" goto HELP
+if /I "%1"=="-F" set "FILENAME=%2" & SHIFT
+if /I "%1"=="-p" set ESPTOOL_PORT=%2 & SHIFT
+if /I "%1"=="-P" set PYTHON=%2 & SHIFT
+if /I "%1"=="--web" set WEB_APP=1 & SHIFT
 SHIFT
-GOTO getopts
-:endopts
+IF NOT "__%1__"=="____" goto GETOPTS

-CALL :LOG_MESSAGE DEBUG "Checking FILENAME parameter..."
-IF "__!FILENAME!__"=="____" (
-    CALL :LOG_MESSAGE DEBUG "Missing -f filename input."
-    GOTO help
-) ELSE (
-    CALL :LOG_MESSAGE DEBUG "Filename: !FILENAME!"
-    IF NOT "__!FILENAME: =!__"=="__!FILENAME!__" (
-        CALL :LOG_MESSAGE ERROR "Filename containing spaces are not supported."
-        GOTO help
+IF "__%FILENAME%__" == "____" (
+    echo "Missing FILENAME"
+    goto HELP
+)
+IF EXIST %FILENAME% IF x%FILENAME:update=%==x%FILENAME% (
+    echo Trying to flash update %FILENAME%, but first erasing and writing system information"
+    %ESPTOOL_CMD% --baud 115200 erase_flash
+    %ESPTOOL_CMD% --baud 115200 write_flash 0x00 %FILENAME%
+    
+    @REM Account for S3 and C3 board's different OTA partition
+    IF x%FILENAME:s3=%==x%FILENAME% IF x%FILENAME:v3=%==x%FILENAME% IF x%FILENAME:t-deck=%==x%FILENAME% IF x%FILENAME:wireless-paper=%==x%FILENAME% IF x%FILENAME:wireless-tracker=%==x%FILENAME% IF x%FILENAME:station-g2=%==x%FILENAME% IF x%FILENAME:unphone=%==x%FILENAME% (
+        IF x%FILENAME:esp32c3=%==x%FILENAME% (
+            %ESPTOOL_CMD% --baud 115200 write_flash 0x260000 bleota.bin
+        ) else (
+            %ESPTOOL_CMD% --baud 115200 write_flash 0x260000 bleota-c3.bin
+        )
+    ) else (
+        %ESPTOOL_CMD% --baud 115200 write_flash 0x260000 bleota-s3.bin
    )
-    IF "__!FILENAME:firmware-=!__"=="__!FILENAME!__" (
-        CALL :LOG_MESSAGE ERROR "Filename must be a firmware-* file."
-        GOTO help
+    IF %WEB_APP%==1 (
+        for %%f in (littlefswebui-*.bin) do (
+            %ESPTOOL_CMD% --baud 115200 write_flash 0x300000 %%f
+        )
+    ) else (
+        for %%f in (littlefs-*.bin) do (
+            %ESPTOOL_CMD% --baud 115200 write_flash 0x300000 %%f
+        )
    )
-    @REM Remove ".\" or "./" file prefix if present.
-    SET "FILENAME=!FILENAME:.\=!"
-    SET "FILENAME=!FILENAME:./=!"
+) else (
+    echo "Invalid file: %FILENAME%"
+    goto HELP
+) else (
+    echo "Invalid file: %FILENAME%"
+    goto HELP
 )

-CALL :LOG_MESSAGE DEBUG "Checking if !FILENAME! exists..."
-IF NOT EXIST !FILENAME! (
-    CALL :LOG_MESSAGE ERROR "File does not exist: !FILENAME!. Terminating."
-    GOTO eof
-)
-
-IF NOT "!FILENAME:update=!"=="!FILENAME!" (
-    CALL :LOG_MESSAGE DEBUG "We are working with a *update* file. !FILENAME!"
-    CALL :LOG_MESSAGE INFO "Use script device-update.bat to flash update !FILENAME!."
-    GOTO eof
-) ELSE (
-    CALL :LOG_MESSAGE DEBUG "We are NOT working with a *update* file. !FILENAME!"
-)
-
-CALL :LOG_MESSAGE DEBUG "Determine the correct esptool command to use..."
-IF NOT "__%PYTHON%__"=="____" (
-    SET "ESPTOOL_CMD=!PYTHON! -m esptool"
-    CALL :LOG_MESSAGE DEBUG "Python interpreter supplied."
-) ELSE (
-    CALL :LOG_MESSAGE DEBUG "Python interpreter NOT supplied. Looking for esptool...
-    WHERE esptool >nul 2>&1
-    IF %ERRORLEVEL% EQU 0 (
-        @REM WHERE exits with code 0 if esptool is found.
-        SET "ESPTOOL_CMD=esptool"
-    ) ELSE (
-        SET "ESPTOOL_CMD=python -m esptool"
-        CALL :RESET_ERROR
-    )
-)
-
-CALL :LOG_MESSAGE DEBUG "Checking esptool command !ESPTOOL_CMD!..."
-!ESPTOOL_CMD! >nul 2>&1
-IF %ERRORLEVEL% GEQ 2 (
-    @REM esptool exits with code 1 if help is displayed.
-    CALL :LOG_MESSAGE ERROR "esptool not found: !ESPTOOL_CMD!"
-    EXIT /B 1
-    GOTO eof
-)
-IF %DEBUG% EQU 1 (
-    CALL :LOG_MESSAGE DEBUG "Skipping ESPTOOL_CMD steps."
-    SET "ESPTOOL_CMD=REM !ESPTOOL_CMD!"
-)
-
-CALL :LOG_MESSAGE DEBUG "Using esptool command: !ESPTOOL_CMD!"
-IF "__!ESPTOOL_PORT!__" == "____" (
-    CALL :LOG_MESSAGE WARN "Using esptool port: UNSET."
-) ELSE (
-    SET "ESPTOOL_CMD=!ESPTOOL_CMD! --port !ESPTOOL_PORT!"
-    CALL :LOG_MESSAGE INFO "Using esptool port: !ESPTOOL_PORT!."
-)
-CALL :LOG_MESSAGE INFO "Using esptool baud: !ESPTOOL_BAUD!."
-
-@REM Check if FILENAME contains "-tft-" and set target partitionScheme accordingly.
-@REM https://github.com/meshtastic/web-flasher/blob/main/types/resources.ts#L3
-IF NOT "!FILENAME:-tft-=!"=="!FILENAME!" (
-    CALL :LOG_MESSAGE DEBUG "We are working with a *-tft-* file. !FILENAME!"
-    IF %WEB_APP% EQU 1 (
-        CALL :LOG_MESSAGE ERROR "Cannot enable WebUI (--web) and MUI." & GOTO eof
-    )
-    SET "TFT_BUILD=1"
-) ELSE (
-    CALL :LOG_MESSAGE DEBUG "We are NOT working with a *-tft-* file. !FILENAME!"
-)
-
-FOR %%a IN (%BIGDB_8MB%) DO (
-    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
-        @REM We are working with any of %BIGDB_8MB%.
-        SET "BIGDB8=1"
-        GOTO end_loop_bigdb_8mb
-    )
-)
-:end_loop_bigdb_8mb
-
-FOR %%a IN (%BIGDB_16MB%) DO (
-    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
-        @REM We are working with any of %BIGDB_16MB%.
-        SET "BIGDB16=1"
-        GOTO end_loop_bigdb_16mb
-    )
-)
-:end_loop_bigdb_16mb
-
-IF %BIGDB8% EQU 1 CALL :LOG_MESSAGE INFO "BigDB 8mb partition selected."
-IF %BIGDB16% EQU 1 CALL :LOG_MESSAGE INFO "BigDB 16mb partition selected."
-
-@REM Extract BASENAME from %FILENAME% for later use.
-SET "BASENAME=!FILENAME:firmware-=!"
-CALL :LOG_MESSAGE DEBUG "Computed firmware basename: !BASENAME!"
-
-@REM Account for S3 and C3 board's different OTA partition.
-FOR %%a IN (%S3%) DO (
-    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
-        @REM We are working with any of %S3%.
-        SET "OTA_FILENAME=bleota-s3.bin"
-        GOTO :end_loop_s3
-    )
-)
-
-FOR %%a IN (%C3%) DO (
-    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
-        @REM We are working with any of %C3%.
-        SET "OTA_FILENAME=bleota-c3.bin"
-        GOTO :end_loop_c3
-    )
-)
-
-@REM Everything else
-SET "OTA_FILENAME=bleota.bin"
-:end_loop_s3
-:end_loop_c3
-CALL :LOG_MESSAGE DEBUG "Set OTA_FILENAME to: !OTA_FILENAME!"
-
-@REM Check if (--web) is enabled and prefix BASENAME with "littlefswebui-" else "littlefs-".
-IF %WEB_APP% EQU 1 (
-    CALL :LOG_MESSAGE INFO "WebUI selected."
-    SET "SPIFFS_FILENAME=littlefswebui-%BASENAME%"
-) ELSE (
-    SET "SPIFFS_FILENAME=littlefs-%BASENAME%"
-)
-CALL :LOG_MESSAGE DEBUG "Set SPIFFS_FILENAME to: !SPIFFS_FILENAME!"
-
-@REM Default offsets.
-@REM https://github.com/meshtastic/web-flasher/blob/main/stores/firmwareStore.ts#L202
-SET "OTA_OFFSET=0x260000"
-SET "SPIFFS_OFFSET=0x300000"
-
-@REM Offsets for BigDB 8mb.
-IF %BIGDB8% EQU 1 (
-    SET "OTA_OFFSET=0x340000"
-    SET "SPIFFS_OFFSET=0x670000"
-)
-
-@REM Offsets for BigDB 16mb.
-IF %BIGDB16% EQU 1 (
-    SET "OTA_OFFSET=0x650000"
-    SET "SPIFFS_OFFSET=0xc90000"
-)
-
-CALL :LOG_MESSAGE DEBUG "Set OTA_OFFSET to: !OTA_OFFSET!"
-CALL :LOG_MESSAGE DEBUG "Set SPIFFS_OFFSET to: !SPIFFS_OFFSET!"
-
-@REM Ensure target files exist before flashing operations.
-IF NOT EXIST !FILENAME! CALL :LOG_MESSAGE ERROR "File does not exist: "!FILENAME!". Terminating." & EXIT /B 2 & GOTO eof
-IF NOT EXIST !OTA_FILENAME! CALL :LOG_MESSAGE ERROR "File does not exist: "!OTA_FILENAME!". Terminating." & EXIT /B 2 & GOTO eof
-IF NOT EXIST !SPIFFS_FILENAME! CALL :LOG_MESSAGE ERROR "File does not exist: "!SPIFFS_FILENAME!". Terminating." & EXIT /B 2 & GOTO eof
-
-@REM Flashing operations.
-CALL :LOG_MESSAGE INFO "Trying to flash "!FILENAME!", but first erasing and writing system information..."
-CALL :RUN_ESPTOOL !ESPTOOL_BAUD! erase_flash || GOTO eof
-CALL :RUN_ESPTOOL !ESPTOOL_BAUD! write_flash 0x00 "!FILENAME!" || GOTO eof
-
-CALL :LOG_MESSAGE INFO "Trying to flash BLEOTA "!OTA_FILENAME!" at OTA_OFFSET !OTA_OFFSET!..."
-CALL :RUN_ESPTOOL !ESPTOOL_BAUD! write_flash !OTA_OFFSET! "!OTA_FILENAME!" || GOTO eof
-
-CALL :LOG_MESSAGE INFO "Trying to flash SPIFFS "!SPIFFS_FILENAME!" at SPIFFS_OFFSET !SPIFFS_OFFSET!..."
-CALL :RUN_ESPTOOL !ESPTOOL_BAUD! write_flash !SPIFFS_OFFSET! "!SPIFFS_FILENAME!" || GOTO eof
-
-CALL :LOG_MESSAGE INFO "Script complete!."
-
-:eof
-ENDLOCAL
-EXIT /B %ERRORLEVEL%
-
-
-:RUN_ESPTOOL
-@REM Subroutine used to run ESPTOOL_CMD with arguments.
-@REM Also handles %ERRORLEVEL%.
-@REM CALL :RUN_ESPTOOL [Baud] [erase_flash|write_flash] [OFFSET] [Filename]
-@REM.
-@REM Example:: CALL :RUN_ESPTOOL 115200 write_flash 0x10000 "firmwarefile.bin"
-IF %DEBUG% EQU 1 CALL :LOG_MESSAGE DEBUG "About to run command: !ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4"
-CALL :RESET_ERROR
-!ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4
-IF %ERRORLEVEL% NEQ 0 (
-    CALL :LOG_MESSAGE ERROR "Error running command: !ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4"
-    EXIT /B %ERRORLEVEL%
-)
-GOTO :eof
-
-:LOG_MESSAGE
-@REM Subroutine used to print log messages in four different levels.
-@REM DEBUG messages only get printed if [-d] flag is passed to script.
-@REM CALL :LOG_MESSAGE [ERROR|INFO|WARN|DEBUG] "Message"
-@REM.
-@REM Example:: CALL :LOG_MESSAGE INFO "Message."
-SET /A LOGCOUNTER=LOGCOUNTER+1
-IF "%1" == "ERROR" CALL :GET_TIMESTAMP & ECHO [91m%1 [0m[37m^| !TIMESTAMP! !LOGCOUNTER! [0m[91m%~2[0m
-IF "%1" == "INFO" CALL :GET_TIMESTAMP & ECHO [32m%1  [0m[37m^| !TIMESTAMP! !LOGCOUNTER! [0m[32m%~2[0m
-IF "%1" == "WARN" CALL :GET_TIMESTAMP & ECHO [33m%1  [0m[37m^| !TIMESTAMP! !LOGCOUNTER! [0m[33m%~2[0m
-IF "%1" == "DEBUG" IF %DEBUG% EQU 1 CALL :GET_TIMESTAMP & ECHO [34m%1 [0m[37m^| !TIMESTAMP! !LOGCOUNTER! [0m[34m%~2[0m
-GOTO :eof
-
-:GET_TIMESTAMP
-@REM Subroutine used to set !TIMESTAMP! to HH:MM:ss.
-@REM CALL :GET_TIMESTAMP
-@REM.
-@REM Updates: !TIMESTAMP!
-FOR /F "tokens=1,2,3 delims=:,." %%a IN ("%TIME%") DO (
-    SET "HH=%%a"
-    SET "MM=%%b"
-    SET "ss=%%c"
-)
-SET "TIMESTAMP=!HH!:!MM!:!ss!"
-GOTO :eof
-
-:RESET_ERROR
-@REM Subroutine to reset %ERRORLEVEL% to 0.
-@REM CALL :RESET_ERROR
-@REM.
-@REM Updates: %ERRORLEVEL%
-EXIT /B 0
-GOTO :eof
+:EOF
--- a/bin/device-install.sh
+++ b/bin/device-install.sh
@@ -1,60 +1,18 @@
-#!/bin/bash
+#!/bin/sh

 PYTHON=${PYTHON:-$(which python3 python | head -n 1)}
 WEB_APP=false
-TFT_BUILD=false
-MCU=""
-
-# Variant groups
-BIGDB_8MB=(
-	"picomputer-s3"
-	"unphone"
-	"seeed-sensecap-indicator"
-	"crowpanel-esp32s3"
-	"heltec_capsule_sensor_v3"
-	"heltec-v3"
-	"heltec-vision-master-e213"
-	"heltec-vision-master-e290"
-	"heltec-vision-master-t190"
-	"heltec-wireless-paper"
-	"heltec-wireless-tracker"
-	"heltec-wsl-v3"
-	"icarus"
-	"seeed-xiao-s3"
-	"tbeam-s3-core"
-	"t-watch-s3"
-	"tracksenger"
-)
-BIGDB_16MB=(
-	"t-deck"
-	"mesh-tab"
-	"t-energy-s3"
-	"dreamcatcher"
-	"ESP32-S3-Pico"
-	"m5stack-cores3"
-	"station-g2"
-	"t-eth-elite"
-)
-S3_VARIANTS=(
-	"s3"
-	"-v3"
-	"t-deck"
-	"wireless-paper"
-	"wireless-tracker"
-	"station-g2"
-	"unphone"
-)

 # Determine the correct esptool command to use
 if "$PYTHON" -m esptool version >/dev/null 2>&1; then
-	ESPTOOL_CMD="$PYTHON -m esptool"
+    ESPTOOL_CMD="$PYTHON -m esptool"
 elif command -v esptool >/dev/null 2>&1; then
-	ESPTOOL_CMD="esptool"
+    ESPTOOL_CMD="esptool"
 elif command -v esptool.py >/dev/null 2>&1; then
-	ESPTOOL_CMD="esptool.py"
+    ESPTOOL_CMD="esptool.py"
 else
-	echo "Error: esptool not found"
-	exit 1
+    echo "Error: esptool not found"
+    exit 1
 fi

 set -e
@@ -62,141 +20,75 @@ set -e
 # Usage info
 show_help() {
 	cat <<EOF
-Usage: $(basename $0) [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME] [--web]
-Flash image file to device, but first erasing and writing system information.
+Usage: $(basename $0) [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME|FILENAME] [--web]
+Flash image file to device, but first erasing and writing system information"

-    -h               Display this help and exit.
+    -h               Display this help and exit
    -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerous).
    -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: "$PYTHON")
-    -f FILENAME      The firmware .bin file to flash.  Custom to your device type and region.
-    --web            Enable WebUI. (Default: false)
+    -f FILENAME      The .bin file to flash.  Custom to your device type and region.
+    --web            Flash WEB APP.

 EOF
 }
-# Parse arguments using a single while loop
-while [ $# -gt 0 ]; do
-	case "$1" in
-	-h | --help)
+# Preprocess long options like --web
+for arg in "$@"; do
+    case "$arg" in
+        --web)
+            WEB_APP=true
+            shift # Remove this argument from the list
+            ;;
+    esac
+done
+
+while getopts ":hp:P:f:" opt; do
+	case "${opt}" in
+	h)
 		show_help
 		exit 0
 		;;
-	-p)
-		ESPTOOL_CMD="$ESPTOOL_CMD --port $2"
-		shift
+	p)
+		export ESPTOOL_PORT=${OPTARG}
 		;;
-	-P)
-		PYTHON="$2"
-		shift
+	P)
+		PYTHON=${OPTARG}
 		;;
-	-f)
-		FILENAME="$2"
-		shift
-		;;
-	--web)
-		WEB_APP=true
-		;;
-	--) # Stop parsing options
-		shift
-		break
+	f)
+		FILENAME=${OPTARG}
 		;;
 	*)
-		echo "Unknown argument: $1" >&2
+		echo "Invalid flag."
+		show_help >&2
 		exit 1
 		;;
 	esac
-	shift # Move to the next argument
 done
+shift "$((OPTIND - 1))"

 [ -z "$FILENAME" -a -n "$1" ] && {
 	FILENAME=$1
 	shift
 }

-if [[ $FILENAME != firmware-* ]]; then
-  echo "Filename must be a firmware-* file."
-  exit 1
-fi
-
-# Check if FILENAME contains "-tft-" and prevent web/mui comingling.
-if [[ ${FILENAME//-tft-/} != "$FILENAME" ]]; then
-	TFT_BUILD=true
-	if [[ $WEB_APP == true ]] && [[ $TFT_BUILD == true ]]; then
-		echo "Cannot enable WebUI (--web) and MUI."
-		exit 1
-	fi
-fi
-
-# Extract BASENAME from %FILENAME% for later use.
-BASENAME="${FILENAME/firmware-/}"
-
 if [ -f "${FILENAME}" ] && [ -n "${FILENAME##*"update"*}" ]; then
-	# Default littlefs* offset (--web).
-	OFFSET=0x300000
-
-	# Default OTA Offset
-	OTA_OFFSET=0x260000
-
-	# littlefs* offset for BigDB 8mb and OTA OFFSET.
-	for variant in "${BIGDB_8MB[@]}"; do
-		if [ -z "${FILENAME##*"$variant"*}" ]; then
-			OFFSET=0x670000
-			OTA_OFFSET=0x340000
-		fi
-	done
-
-	# littlefs* offset for BigDB 16mb and OTA OFFSET.
-	for variant in "${BIGDB_16MB[@]}"; do
-		if [ -z "${FILENAME##*"$variant"*}" ]; then
-			OFFSET=0xc90000
-			OTA_OFFSET=0x650000
-		fi
-	done
-
-	# Account for S3 board's different OTA partition
-	# FIXME: Use PlatformIO info to determine MCU type, this is unmaintainable
-	for variant in "${S3_VARIANTS[@]}"; do
-		if [ -z "${FILENAME##*"$variant"*}" ]; then
-			MCU="esp32s3"
-		fi
-	done
-
-	if [ "$MCU" != "esp32s3" ]; then
-		if [ -n "${FILENAME##*"esp32c3"*}" ]; then
-			OTAFILE=bleota.bin
-		else
-			OTAFILE=bleota-c3.bin
-		fi
-	else
-		OTAFILE=bleota-s3.bin
-	fi
-
-	# Check if WEB_APP (--web) is enabled and add "littlefswebui-" to BASENAME else "littlefs-".
-	if [ "$WEB_APP" = true ]; then
-		SPIFFSFILE=littlefswebui-${BASENAME}
-	else
-		SPIFFSFILE=littlefs-${BASENAME}
-	fi
-
-	if [[ ! -f $FILENAME ]]; then
-		echo "Error: file ${FILENAME} wasn't found. Terminating."
-		exit 1
-	fi
-	if [[ ! -f $OTAFILE ]]; then
-		echo "Error: file ${OTAFILE} wasn't found. Terminating."
-		exit 1
-	fi
-	if [[ ! -f $SPIFFSFILE ]]; then
-		echo "Error: file ${SPIFFSFILE} wasn't found. Terminating."
-		exit 1
-	fi
-
 	echo "Trying to flash ${FILENAME}, but first erasing and writing system information"
 	$ESPTOOL_CMD erase_flash
 	$ESPTOOL_CMD write_flash 0x00 "${FILENAME}"
-	echo "Trying to flash ${OTAFILE} at offset ${OTA_OFFSET}"
-	$ESPTOOL_CMD write_flash $OTA_OFFSET "${OTAFILE}"
-	echo "Trying to flash ${SPIFFSFILE}, at offset ${OFFSET}"
-	$ESPTOOL_CMD write_flash $OFFSET "${SPIFFSFILE}"
+	# Account for S3 board's different OTA partition
+	if [ -n "${FILENAME##*"s3"*}" ] && [ -n "${FILENAME##*"-v3"*}" ] && [ -n "${FILENAME##*"t-deck"*}" ] && [ -n "${FILENAME##*"wireless-paper"*}" ] && [ -n "${FILENAME##*"wireless-tracker"*}" ] && [ -n "${FILENAME##*"station-g2"*}" ] && [ -n "${FILENAME##*"unphone"*}" ]; then
+		if [ -n "${FILENAME##*"esp32c3"*}" ]; then
+			$ESPTOOL_CMD write_flash 0x260000 bleota.bin
+		else
+			$ESPTOOL_CMD write_flash 0x260000 bleota-c3.bin
+		fi
+	else
+		$ESPTOOL_CMD write_flash 0x260000 bleota-s3.bin
+	fi
+	if [ "$WEB_APP" = true ]; then
+		$ESPTOOL_CMD write_flash 0x300000 littlefswebui-*.bin
+	else
+		$ESPTOOL_CMD write_flash 0x300000 littlefs-*.bin
+	fi

 else
 	show_help
--- a/bin/device-install_test.ps1
+++ b/bin/device-install_test.ps1
@@ -1,112 +0,0 @@
-<#
-    .SYNOPSIS
-    Unit-test for .\device-install.bat.
-
-    .DESCRIPTION
-    This script performs a positive unit-test on .\device-install.bat by creating the expected .bin
-    files for a device followed by running the .bat script without flashing the firmware (--debug).
-    If any errors are hit they are presented in the standard output. Investigate accordingly.
-
-    This script needs to be placed in the same directory as .\device-install.bat.
-
-    .EXAMPLE
-    .\device-install_test.ps1
-
-    .EXAMPLE
-    .\device-install_test.ps1 -Verbose
-
-    .LINK
-    .\device-install.bat --help
-#>
-
-[CmdletBinding()]
-param()
-
-function New-EmptyFile() {
-    [CmdletBinding()]
-    param (
-        [Parameter(Position = 0, Mandatory = $true)]
-        # Specifies the file name.
-        [string]$FileName,
-        [Parameter(Position = 1)]
-        # Specifies the target path. (Get-Location).Path is the default.
-        [string]$Directory = (Get-Location).Path
-    )
-
-    $filePath = Join-Path -Path $Directory -ChildPath $FileName
-
-    Write-Verbose -Message "Create empty test file if it doesn't exist: $($FileName)"
-    New-Item -Path "$filePath" -ItemType File -ErrorAction SilentlyContinue | Out-Null
-}
-
-function Remove-EmptyFile() {
-    [CmdletBinding()]
-    param (
-        [Parameter(Position = 0, Mandatory = $true)]
-        # Specifies the file name.
-        [string]$FileName,
-        [Parameter(Position = 1)]
-        # Specifies the target path. (Get-Location).Path is the default.
-        [string]$Directory = (Get-Location).Path
-    )
-
-    $filePath = Join-Path -Path $Directory -ChildPath $FileName
-
-    Write-Verbose -Message "Deleted empty test file: $($FileName)"
-    Remove-Item -Path "$filePath" | Out-Null
-}
-
-
-$TestCases = New-Object -TypeName PSObject -Property @{
-    # Use this PSObject to define testcases according to this syntax:
-    # "testname" = @("firmware-testname","bleota","littlefs-testname","args")
-    "t-deck"                       = @("firmware-t-deck-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefs-t-deck-2.6.0.0b106d4.bin", "")
-    "t-deck_web"                   = @("firmware-t-deck-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefswebui-t-deck-2.6.0.0b106d4.bin", "--web")
-    "t-deck-tft"                   = @("firmware-t-deck-tft-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefs-t-deck-tft-2.6.0.0b106d4.bin", "")
-    "heltec-ht62-esp32c3"          = @("firmware-heltec-ht62-esp32c3-sx1262-2.6.0.0b106d4.bin", "bleota-c3.bin", "littlefs-heltec-ht62-esp32c3-sx1262-2.6.0.0b106d4.bin", "")
-    "tlora-c6"                     = @("firmware-tlora-c6-2.6.0.0b106d4.bin", "bleota.bin", "littlefs-tlora-c6-2.6.0.0b106d4.bin", "")
-    "heltec-v3_web"                = @("firmware-heltec-v3-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefswebui-heltec-v3-2.6.0.0b106d4.bin", "--web")
-    "seeed-sensecap-indicator-tft" = @("firmware-seeed-sensecap-indicator-tft-2.6.0.0b106d4.bin", "bleota.bin", "littlefs-seeed-sensecap-indicator-tft-2.6.0.0b106d4.bin", "")
-    "picomputer-s3-tft"            = @("firmware-picomputer-s3-tft-2.6.0.0b106d4.bin", "bleota-s3.bin", "littlefs-picomputer-s3-tft-2.6.0.0b106d4.bin", "")
-}
-
-foreach ($TestCase in $TestCases.PSObject.Properties) {
-    $Name = $TestCase.Name
-    $Files = $TestCase.Value
-    $Errors = $null
-    $Counter = 0
-
-    Write-Host -Object "Testcase: $Name`:" -ForegroundColor Green
-    foreach ($File in $Files) {
-        if ($File.EndsWith(".bin")) {
-            New-EmptyFile -FileName $File
-        }
-    }
-
-    Write-Host -Object "Performing test on $Name..." -ForegroundColor Blue
-    $Test = Invoke-Expression -Command "cmd /c .\device-install.bat --debug -f $($TestCases."$Name"[0]) $($TestCases."$Name"[3])"
-
-    foreach ($Line in $Test) {
-        if ($Line -match "Set OTA_OFFSET to" -or `
-                $Line -match "Set SPIFFS_OFFSET to") {
-            Write-Host -Object "$($Line -replace "^.*?Set","Set")" -ForegroundColor Blue
-        }
-        elseif ($VerbosePreference -eq "Continue") {
-            Write-Host -Object $Line
-        }
-        if ($Line -match "ERROR") {
-            $Errors += $Line
-            $Counter++
-        }
-    }
-    if ($null -ne $Errors) {
-        Write-Host -Object "$Counter ERROR(s) detected!" -ForegroundColor Red
-        if (-not ($VerbosePreference -eq "Continue")) { Write-Host -Object $Errors }
-    }
-
-    foreach ($File in $Files) {
-        if ($File.EndsWith(".bin")) {
-            Remove-EmptyFile -FileName $File
-        }
-    }
-}
--- a/bin/device-update.bat
+++ b/bin/device-update.bat
@@ -1,176 +1,48 @@
@ECHO OFF
-SETLOCAL EnableDelayedExpansion
-TITLE Meshtastic device-update

-SET "SCRIPT_NAME=%~nx0"
-SET "DEBUG=0"
-SET "PYTHON="
-SET "ESPTOOL_BAUD=115200"
-SET "ESPTOOL_CMD="
-SET "LOGCOUNTER=0"
+set PYTHON=python

-GOTO getopts
-:help
-ECHO Flash image file to device, but leave existing system intact.
-ECHO.
-ECHO Usage: %SCRIPT_NAME% -f filename [-p PORT] [-P python]
-ECHO.
-ECHO Options:
-ECHO     -f filename      The update .bin file to flash.  Custom to your device type and region. (required)
-ECHO                      The file must be located in this current directory.
-ECHO     -p PORT          Set the environment variable for ESPTOOL_PORT.
-ECHO                      If not set, ESPTOOL iterates all ports (Dangerous).
-ECHO     -P python        Specify alternate python interpreter to use to invoke esptool. (default: python)
-ECHO                      If supplied the script will use python.
-ECHO                      If not supplied the script will try to find esptool in Path.
-ECHO.
-ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4-update.bin -p COM11
-GOTO eof
+:: Determine the correct esptool command to use
+where esptool >nul 2>&1
+if %ERRORLEVEL% EQU 0 (
+    set "ESPTOOL_CMD=esptool"
+) else (
+    set "ESPTOOL_CMD=%PYTHON% -m esptool"
+)

-:version
-ECHO %SCRIPT_NAME% [Version 2.6.1]
-ECHO Meshtastic
-GOTO eof
+goto GETOPTS
+:HELP
+echo Usage: %~nx0 [-h] [-p ESPTOOL_PORT] [-P PYTHON] [-f FILENAME^|FILENAME]
+echo Flash image file to device, leave existing system intact.
+echo.
+echo     -h               Display this help and exit
+echo     -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerrous).
+echo     -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: %PYTHON%)
+echo     -f FILENAME      The *update.bin file to flash.  Custom to your device type.
+goto EOF

-:getopts
-IF "%~1"=="" GOTO endopts
-IF /I "%~1"=="-?" GOTO help
-IF /I "%~1"=="-h" GOTO help
-IF /I "%~1"=="--help" GOTO help
-IF /I "%~1"=="-v" GOTO version
-IF /I "%~1"=="--version" GOTO version
-IF /I "%~1"=="--debug" SET "DEBUG=1" & CALL :LOG_MESSAGE DEBUG "DEBUG mode: enabled."
-IF /I "%~1"=="-f" SET "FILENAME=%~2" & SHIFT
-IF "%~1"=="-p" SET "ESPTOOL_PORT=%~2" & SHIFT
-IF /I "%~1"=="--port" SET "ESPTOOL_PORT=%~2" & SHIFT
-IF "%~1"=="-P" SET "PYTHON=%~2" & SHIFT
+:GETOPTS
+if /I "%1"=="-h" goto HELP
+if /I "%1"=="--help" goto HELP
+if /I "%1"=="-F" set "FILENAME=%2" & SHIFT
+if /I "%1"=="-p" set ESPTOOL_PORT=%2 & SHIFT
+if /I "%1"=="-P" set PYTHON=%2 & SHIFT
 SHIFT
-GOTO getopts
-:endopts
+IF NOT "__%1__"=="____" goto GETOPTS

-CALL :LOG_MESSAGE DEBUG "Checking FILENAME parameter..."
-IF "__!FILENAME!__"=="____" (
-    CALL :LOG_MESSAGE DEBUG "Missing -f filename input."
-    GOTO help
-) ELSE (
-    CALL :LOG_MESSAGE DEBUG "Filename: !FILENAME!"
-    IF NOT "__!FILENAME: =!__"=="__!FILENAME!__" (
-        CALL :LOG_MESSAGE ERROR "Filename containing spaces are not supported."
-        GOTO help
-    )
-    @REM Remove ".\" or "./" file prefix if present.
-    SET "FILENAME=!FILENAME:.\=!"
-    SET "FILENAME=!FILENAME:./=!"
+IF "__%FILENAME%__" == "____" (
+    echo "Missing FILENAME"
+    goto HELP
+)
+IF EXIST %FILENAME% IF NOT x%FILENAME:update=%==x%FILENAME% (
+    echo Trying to flash update %FILENAME%
+    %ESPTOOL_CMD% --baud 115200 write_flash 0x10000 %FILENAME%
+) else (
+    echo "Invalid file: %FILENAME%"
+    goto HELP
+) else (
+    echo "Invalid file: %FILENAME%"
+    goto HELP
 )

-CALL :LOG_MESSAGE DEBUG "Checking if !FILENAME! exists..."
-IF NOT EXIST !FILENAME! (
-    CALL :LOG_MESSAGE ERROR "File does not exist: !FILENAME!. Terminating."
-    GOTO eof
-)
-
-IF "!FILENAME:update=!"=="!FILENAME!" (
-    CALL :LOG_MESSAGE DEBUG "We are NOT working with a *update* file. !FILENAME!"
-    CALL :LOG_MESSAGE INFO "Use script device-install.bat to flash !FILENAME!."
-    GOTO eof
-) ELSE (
-    CALL :LOG_MESSAGE DEBUG "We are working with a *update* file. !FILENAME!"
-)
-
-CALL :LOG_MESSAGE DEBUG "Determine the correct esptool command to use..."
-IF NOT "__%PYTHON%__"=="____" (
-    SET "ESPTOOL_CMD=!PYTHON! -m esptool"
-    CALL :LOG_MESSAGE DEBUG "Python interpreter supplied."
-) ELSE (
-    CALL :LOG_MESSAGE DEBUG "Python interpreter NOT supplied. Looking for esptool...
-    WHERE esptool >nul 2>&1
-    IF %ERRORLEVEL% EQU 0 (
-        @REM WHERE exits with code 0 if esptool is found.
-        SET "ESPTOOL_CMD=esptool"
-    ) ELSE (
-        SET "ESPTOOL_CMD=python -m esptool"
-        CALL :RESET_ERROR
-    )
-)
-
-CALL :LOG_MESSAGE DEBUG "Checking esptool command !ESPTOOL_CMD!..."
-!ESPTOOL_CMD! >nul 2>&1
-IF %ERRORLEVEL% GEQ 2 (
-    @REM esptool exits with code 1 if help is displayed.
-    CALL :LOG_MESSAGE ERROR "esptool not found: !ESPTOOL_CMD!"
-    EXIT /B 1
-    GOTO eof
-)
-IF %DEBUG% EQU 1 (
-    CALL :LOG_MESSAGE DEBUG "Skipping ESPTOOL_CMD steps."
-    SET "ESPTOOL_CMD=REM !ESPTOOL_CMD!"
-)
-
-CALL :LOG_MESSAGE DEBUG "Using esptool command: !ESPTOOL_CMD!"
-IF "__!ESPTOOL_PORT!__" == "____" (
-    CALL :LOG_MESSAGE WARN "Using esptool port: UNSET."
-) ELSE (
-    SET "ESPTOOL_CMD=!ESPTOOL_CMD! --port !ESPTOOL_PORT!"
-    CALL :LOG_MESSAGE INFO "Using esptool port: !ESPTOOL_PORT!."
-)
-CALL :LOG_MESSAGE INFO "Using esptool baud: !ESPTOOL_BAUD!."
-
-@REM Flashing operations.
-CALL :LOG_MESSAGE INFO "Trying to flash update "!FILENAME!" at OFFSET 0x10000..."
-CALL :RUN_ESPTOOL !ESPTOOL_BAUD! write_flash 0x10000 "!FILENAME!" || GOTO eof
-
-CALL :LOG_MESSAGE INFO "Script complete!."
-
-:eof
-ENDLOCAL
-EXIT /B %ERRORLEVEL%
-
-
-:RUN_ESPTOOL
-@REM Subroutine used to run ESPTOOL_CMD with arguments.
-@REM Also handles %ERRORLEVEL%.
-@REM CALL :RUN_ESPTOOL [Baud] [erase_flash|write_flash] [OFFSET] [Filename]
-@REM.
-@REM Example:: CALL :RUN_ESPTOOL 115200 write_flash 0x10000 "firmwarefile.bin"
-IF %DEBUG% EQU 1 CALL :LOG_MESSAGE DEBUG "About to run command: !ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4"
-CALL :RESET_ERROR
-!ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4
-IF %ERRORLEVEL% NEQ 0 (
-    CALL :LOG_MESSAGE ERROR "Error running command: !ESPTOOL_CMD! --baud %~1 %~2 %~3 %~4"
-    EXIT /B %ERRORLEVEL%
-)
-GOTO :eof
-
-:LOG_MESSAGE
-@REM Subroutine used to print log messages in four different levels.
-@REM DEBUG messages only get printed if [-d] flag is passed to script.
-@REM CALL :LOG_MESSAGE [ERROR|INFO|WARN|DEBUG] "Message"
-@REM.
-@REM Example:: CALL :LOG_MESSAGE INFO "Message."
-SET /A LOGCOUNTER=LOGCOUNTER+1
-IF "%1" == "ERROR" CALL :GET_TIMESTAMP & ECHO [91m%1 [0m[37m^| !TIMESTAMP! !LOGCOUNTER! [0m[91m%~2[0m
-IF "%1" == "INFO" CALL :GET_TIMESTAMP & ECHO [32m%1  [0m[37m^| !TIMESTAMP! !LOGCOUNTER! [0m[32m%~2[0m
-IF "%1" == "WARN" CALL :GET_TIMESTAMP & ECHO [33m%1  [0m[37m^| !TIMESTAMP! !LOGCOUNTER! [0m[33m%~2[0m
-IF "%1" == "DEBUG" IF %DEBUG% EQU 1 CALL :GET_TIMESTAMP & ECHO [34m%1 [0m[37m^| !TIMESTAMP! !LOGCOUNTER! [0m[34m%~2[0m
-GOTO :eof
-
-:GET_TIMESTAMP
-@REM Subroutine used to set !TIMESTAMP! to HH:MM:ss.
-@REM CALL :GET_TIMESTAMP
-@REM.
-@REM Updates: !TIMESTAMP!
-FOR /F "tokens=1,2,3 delims=:,." %%a IN ("%TIME%") DO (
-    SET "HH=%%a"
-    SET "MM=%%b"
-    SET "ss=%%c"
-)
-SET "TIMESTAMP=!HH!:!MM!:!ss!"
-GOTO :eof
-
-:RESET_ERROR
-@REM Subroutine to reset %ERRORLEVEL% to 0.
-@REM CALL :RESET_ERROR
-@REM.
-@REM Updates: %ERRORLEVEL%
-EXIT /B 0
-GOTO :eof
+:EOF
--- a/bin/device-update.sh
+++ b/bin/device-update.sh
@@ -35,8 +35,8 @@ while getopts ":hp:P:f:" opt; do
            show_help
            exit 0
            ;;
-        p)  ESPTOOL_CMD="$ESPTOOL_CMD --port ${OPTARG}"
-	        ;;
+        p)  export ESPTOOL_PORT=${OPTARG}
+	    ;;
        P)  PYTHON=${OPTARG}
            ;;
        f)  FILENAME=${OPTARG}
--- a/bin/generate_ci_matrix.py
+++ b/bin/generate_ci_matrix.py
@@ -35,11 +35,6 @@ for subdir, dirs, files in os.walk(rootdir):
                                    outlist.append(section)
                            else:
                                outlist.append(section)
-                        # Add the TFT variants if the base variant is selected
-                        elif section.replace("-tft", "") in outlist and config[config[c].name].get("board_level") != "extra":
-                            outlist.append(section)
-                        elif section.replace("-inkhud", "") in outlist and config[config[c].name].get("board_level") != "extra":
-                            outlist.append(section)
                    if "board_check" in config[config[c].name]:
                        if (config[config[c].name]["board_check"] == "true") & (
                            "check" in options
@@ -48,4 +43,4 @@ for subdir, dirs, files in os.walk(rootdir):
 if ("quick" in options) & (len(outlist) > 3):
    print(json.dumps(random.sample(outlist, 3)))
 else:
-    print(json.dumps(outlist))
+    print(json.dumps(outlist))
--- a/bin/platformio-custom.py
+++ b/bin/platformio-custom.py
@@ -83,7 +83,7 @@ if platform.name == "espressif32":

 if platform.name == "nordicnrf52":
    env.AddPostAction("$BUILD_DIR/${PROGNAME}.hex",
-                      env.VerboseAction(f"\"{sys.executable}\" ./bin/uf2conv.py $BUILD_DIR/firmware.hex -c -f 0xADA52840 -o $BUILD_DIR/firmware.uf2",
+                      env.VerboseAction(f"{sys.executable} ./bin/uf2conv.py $BUILD_DIR/firmware.hex -c -f 0xADA52840 -o $BUILD_DIR/firmware.uf2",
                                        "Generating UF2 file"))

 Import("projenv")
@@ -102,7 +102,7 @@ pref_flags = []
 for pref in userPrefs:
    if userPrefs[pref].startswith("{"):
        pref_flags.append("-D" + pref + "=" + userPrefs[pref])
-    elif userPrefs[pref].lstrip("-").replace(".", "").isdigit():
+    elif userPrefs[pref].replace(".", "").isdigit():
        pref_flags.append("-D" + pref + "=" + userPrefs[pref])
    elif userPrefs[pref] == "true" or userPrefs[pref] == "false":
        pref_flags.append("-D" + pref + "=" + userPrefs[pref])
@@ -125,9 +125,4 @@ for flag in flags:
    
 projenv.Append(
    CCFLAGS=flags,
-)
-
-for lb in env.GetLibBuilders():
-    if lb.name == "meshtastic-device-ui":
-        lb.env.Append(CPPDEFINES=[("APP_VERSION", verObj["long"])])
-        break
+)
--- a/bin/regen-protos.bat
+++ b/bin/regen-protos.bat
@@ -1,10 +1 @@
-@ECHO OFF
-SETLOCAL
-
-cd protobufs
-..\nanopb-0.4.9\generator-bin\protoc.exe --experimental_allow_proto3_optional "--nanopb_out=-S.cpp -v:..\src\mesh\generated" -I=..\protobufs\ ..\protobufs\meshtastic\*.proto
-GOTO eof
-
-:eof
-ENDLOCAL
-EXIT /B %ERRORLEVEL%
+cd protobufs && ..\nanopb-0.4.9\generator-bin\protoc.exe --experimental_allow_proto3_optional "--nanopb_out=-S.cpp -v:..\src\mesh\generated" -I=..\protobufs\ ..\protobufs\meshtastic\*.proto
--- a/bin/rpkg.macros
+++ b/bin/rpkg.macros
@@ -2,10 +2,6 @@ function meshtastic_version {
    meshtastic_version=$(python3 bin/buildinfo.py short)
    echo -n "$meshtastic_version"
 }
-function web_version {
-    web_version=$(cat bin/web.version)
-    echo -n "$web_version"
-}
 function git_commits_num {
    total_commits=$(git rev-list --all --count)
    echo -n "$total_commits"
--- a/bin/uf2-convert.bat
+++ b/bin/uf2-convert.bat
@@ -1,124 +1,2 @@
-@ECHO OFF
-SETLOCAL EnableDelayedExpansion
-TITLE Meshtastic uf2-convert
-
-SET "SCRIPT_NAME=%~nx0"
-SET "DEBUG=0"
-SET "NRF=0"
-SET "UF2CONV_CMD=python3 .\bin\uf2conv.py"
-
-GOTO getopts
-:help
-ECHO.
-ECHO Usage: %SCRIPT_NAME% -t [t-echo^|rak4631^|nano-g2-ultra^|wio-tracker-wm1110^|canaryone^|
-ECHO                                 heltec-mesh-node-t114^|tracker-t1000-e^|rak_wismeshtap^|rak2560^|
-ECHO                                 nrf52_promicro_diy_tcxo]
-ECHO.
-ECHO Options:
-ECHO     -t target        Specify a platformio NRF target to build for. (required)
-ECHO.
-ECHO Example: %SCRIPT_NAME% -t rak4631
-GOTO eof
-
-:version
-ECHO %SCRIPT_NAME% [Version 2.6.0]
-ECHO Meshtastic
-GOTO eof
-
-:getopts
-IF "%~1"=="" GOTO endopts
-IF /I "%~1"=="-?" GOTO help
-IF /I "%~1"=="-h" GOTO help
-IF /I "%~1"=="--help" GOTO help
-IF /I "%~1"=="-v" GOTO version
-IF /I "%~1"=="--version" GOTO version
-IF /I "%~1"=="--debug" SET "DEBUG=1" & CALL :LOG_MESSAGE DEBUG "DEBUG mode: enabled."
-IF /I "%~1"=="-t" SET "TARGETNAME=%~2" & SHIFT
-IF /I "%~1"=="--target" SET "TARGETNAME=%~2" & SHIFT
-SHIFT
-GOTO getopts
-:endopts
-
-CALL :LOG_MESSAGE DEBUG "Checking TARGETNAME parameter..."
-IF "__!TARGETNAME!__"=="____" (
-    CALL :LOG_MESSAGE DEBUG "Missing -t target input."
-    GOTO help
-)
-
-IF %DEBUG% EQU 1 SET "UF2CONV_CMD=REM python3 .\bin\uf2conv.py"
-
-SET "NRFTARGETS=t-echo rak4631 nano-g2-ultra wio-tracker-wm1110 canaryone heltec-mesh-node-t114 tracker-t1000-e rak_wismeshtap rak2560 nrf52_promicro_diy_tcxo"
-FOR %%a IN (%NRFTARGETS%) DO (
-    IF /I "%%a"=="!TARGETNAME!" (
-        @REM We are working with any of %NRFTARGETS%.
-        SET "NRF=1"
-        GOTO end_loop_nrf
-    )
-)
-:end_loop_nrf
-
-@REM Building operations.
-IF !NRF! EQU 1 (
-    CALL :LOG_MESSAGE INFO "Trying to build for !TARGETNAME!..."
-    CALL :RUN_UF2CONV !TARGETNAME! || GOTO eof
-) ELSE (
-    CALL :LOG_MESSAGE WARN "!TARGETNAME! is not supported..."
-    GOTO eof
-)
-
-CALL :LOG_MESSAGE INFO "Script complete!."
-
-
-:eof
-ENDLOCAL
-EXIT /B %ERRORLEVEL%
-
-
-:RUN_UF2CONV
-@REM Subroutine used to run .\bin\uf2conv.py with arguments.
-@REM Also handles %ERRORLEVEL%.
-@REM CALL :RUN_UF2CONV [target]
-@REM.
-@REM Example:: CALL :RUN_UF2CONV rak4631
-IF %DEBUG% EQU 1 CALL :LOG_MESSAGE DEBUG "About to run command: !UF2CONV_CMD! .\.pio\build\%~1\firmware.hex -c -o .\.pio\build\%~1\firmware.uf2 -f 0xADA52840"
-CALL :RESET_ERROR
-!UF2CONV_CMD! .\.pio\build\%~1\firmware.hex -c -o .\.pio\build\%~1\firmware.uf2 -f 0xADA52840
-IF %ERRORLEVEL% NEQ 0 (
-    CALL :LOG_MESSAGE ERROR "Error running command: !UF2CONV_CMD! .\.pio\build\%~1\firmware.hex -c -o .\.pio\build\%~1\firmware.uf2 -f 0xADA52840"
-    EXIT /B %ERRORLEVEL%
-)
-GOTO :eof
-
-:LOG_MESSAGE
-@REM Subroutine used to print log messages in four different levels.
-@REM DEBUG messages only get printed if [-d] flag is passed to script.
-@REM CALL :LOG_MESSAGE [ERROR|INFO|WARN|DEBUG] "Message"
-@REM.
-@REM Example:: CALL :LOG_MESSAGE INFO "Message."
-SET /A LOGCOUNTER=LOGCOUNTER+1
-IF "%1" == "ERROR" CALL :GET_TIMESTAMP & ECHO [91m%1 [0m[37m^| !TIMESTAMP! !LOGCOUNTER! [0m[91m%~2[0m
-IF "%1" == "INFO" CALL :GET_TIMESTAMP & ECHO [32m%1  [0m[37m^| !TIMESTAMP! !LOGCOUNTER! [0m[32m%~2[0m
-IF "%1" == "WARN" CALL :GET_TIMESTAMP & ECHO [33m%1  [0m[37m^| !TIMESTAMP! !LOGCOUNTER! [0m[33m%~2[0m
-IF "%1" == "DEBUG" IF %DEBUG% EQU 1 CALL :GET_TIMESTAMP & ECHO [34m%1 [0m[37m^| !TIMESTAMP! !LOGCOUNTER! [0m[34m%~2[0m
-GOTO :eof
-
-:GET_TIMESTAMP
-@REM Subroutine used to set !TIMESTAMP! to HH:MM:ss.
-@REM CALL :GET_TIMESTAMP
-@REM.
-@REM Updates: !TIMESTAMP!
-FOR /F "tokens=1,2,3 delims=:,." %%a IN ("%TIME%") DO (
-    SET "HH=%%a"
-    SET "MM=%%b"
-    SET "ss=%%c"
-)
-SET "TIMESTAMP=!HH!:!MM!:!ss!"
-GOTO :eof
-
-:RESET_ERROR
-@REM Subroutine to reset %ERRORLEVEL% to 0.
-@REM CALL :RESET_ERROR
-@REM.
-@REM Updates: %ERRORLEVEL%
-EXIT /B 0
-GOTO :eof
+@echo off
+if [%1]==[] (echo "Please specify a platformio NRF target (i.e. rak4631) as the first argument.") else (python3 .\bin\uf2conv.py .\.pio\build\%1\firmware.hex -c -o .\.pio\build\%1\firmware.uf2 -f 0xADA52840)
--- a/bin/web.version
+++ b/bin/web.version
@@ -1 +0,0 @@
-2.6.0
--- a/boards/ThinkNode-M1.json
+++ b/boards/ThinkNode-M1.json
@@ -1,53 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "nrf52840_s140_v6.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DARDUINO_NRF52840_TTGO_EINK -DNRF52840_XXAA",
-    "f_cpu": "64000000L",
-    "hwids": [
-      ["0x239A", "0x4405"],
-      ["0x239A", "0x0029"],
-      ["0x239A", "0x002A"]
-    ],
-    "usb_product": "elecrow_eink",
-    "mcu": "nrf52840",
-    "variant": "ELECROW-ThinkNode-M1",
-    "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": "elecrow eink",
-  "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": "FIXME",
-  "vendor": "ELECROW"
-}
--- a/boards/esp32-s3-pico.json
+++ b/boards/esp32-s3-pico.json
@@ -7,15 +7,13 @@
    "core": "esp32",
    "extra_flags": [
      "-DARDUINO_ESP32S3_DEV",
+      "-DARDUINO_USB_MODE=1",
      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1",
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DBOARD_HAS_PSRAM"
+      "-DARDUINO_EVENT_RUNNING_CORE=1"
    ],
    "f_cpu": "240000000L",
    "f_flash": "80000000L",
    "flash_mode": "qio",
-    "psram_type": "qio",
    "hwids": [["0x303A", "0x1001"]],
    "mcu": "esp32s3",
    "variant": "esp32s3"
--- a/boards/heltec_vision_master_e213.json
+++ b/boards/heltec_vision_master_e213.json
@@ -2,8 +2,7 @@
  "build": {
    "arduino": {
      "ldscript": "esp32s3_out.ld",
-      "partitions": "default_8MB.csv",
-      "memory_type": "qio_opi"
+      "partitions": "default_8MB.csv"
    },
    "core": "esp32",
    "extra_flags": [
@@ -16,7 +15,6 @@
    "f_cpu": "240000000L",
    "f_flash": "80000000L",
    "flash_mode": "qio",
-    "psram_type": "opi",
    "hwids": [
      ["0x303A", "0x1001"],
      ["0x303A", "0x0002"]
--- a/boards/heltec_vision_master_e290.json
+++ b/boards/heltec_vision_master_e290.json
@@ -2,8 +2,7 @@
  "build": {
    "arduino": {
      "ldscript": "esp32s3_out.ld",
-      "partitions": "default_8MB.csv",
-      "memory_type": "qio_opi"
+      "partitions": "default_8MB.csv"
    },
    "core": "esp32",
    "extra_flags": [
@@ -16,7 +15,6 @@
    "f_cpu": "240000000L",
    "f_flash": "80000000L",
    "flash_mode": "qio",
-    "psram_type": "opi",
    "hwids": [
      ["0x303A", "0x1001"],
      ["0x303A", "0x0002"]
--- a/boards/heltec_vision_master_t190.json
+++ b/boards/heltec_vision_master_t190.json
@@ -2,8 +2,7 @@
  "build": {
    "arduino": {
      "ldscript": "esp32s3_out.ld",
-      "partitions": "default_8MB.csv",
-      "memory_type": "qio_opi"
+      "partitions": "default_8MB.csv"
    },
    "core": "esp32",
    "extra_flags": [
@@ -16,7 +15,6 @@
    "f_cpu": "240000000L",
    "f_flash": "80000000L",
    "flash_mode": "qio",
-    "psram_type": "opi",
    "hwids": [
      ["0x303A", "0x1001"],
      ["0x303A", "0x0002"]
--- a/boards/meshlink.json
+++ b/boards/meshlink.json
@@ -1,52 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "nrf52840_s140_v6.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DMESHLINK -DNRF52840_XXAA",
-    "f_cpu": "64000000L",
-    "hwids": [
-      ["0x239A", "0x00B3"],
-      ["0x239A", "0x8029"],
-      ["0x239A", "0x0029"],
-      ["0x239A", "0x002A"],
-      ["0x239A", "0x802A"]
-    ],
-    "usb_product": "MeshLink",
-    "mcu": "nrf52840",
-    "variant": "meshlink",
-    "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",
-    "svd_path": "nrf52840.svd"
-  },
-  "frameworks": ["arduino"],
-  "name": "MeshLink",
-  "upload": {
-    "maximum_ram_size": 248832,
-    "maximum_size": 815104,
-    "speed": 115200,
-    "protocol": "nrfutil",
-    "protocols": ["nrfutil", "jlink", "nrfjprog", "stlink"],
-    "use_1200bps_touch": true,
-    "require_upload_port": true,
-    "wait_for_upload_port": true
-  },
-  "url": "https://www.loraitalia.it",
-  "vendor": "LoraItalia"
-}
--- a/boards/seeed-sensecap-indicator.json
+++ b/boards/seeed-sensecap-indicator.json
@@ -18,7 +18,6 @@
    "f_boot": "120000000L",
    "boot": "qio",
    "flash_mode": "qio",
-    "psram_type": "opi",
    "hwids": [["0x1A86", "0x7523"]],
    "mcu": "esp32s3",
    "variant": "esp32s3"
--- a/boards/seeed-xiao-s3.json
+++ b/boards/seeed-xiao-s3.json
@@ -15,7 +15,6 @@
    "f_cpu": "240000000L",
    "f_flash": "80000000L",
    "flash_mode": "qio",
-    "psram_type": "opi",
    "hwids": [["0x2886", "0x0059"]],
    "mcu": "esp32s3",
    "variant": "seeed-xiao-s3"
--- a/boards/seeed_xiao_nrf52840_kit.json
+++ b/boards/seeed_xiao_nrf52840_kit.json
@@ -1,56 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "nrf52840_s140_v7.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DARDUINO_MDBT50Q_RX -DNRF52840_XXAA",
-    "f_cpu": "64000000L",
-    "hwids": [
-      ["0x2886", "0x0166"]
-    ],
-    "usb_product": "XIAO-BOOT",
-    "mcu": "nrf52840",
-    "variant": "seeed_xiao_nrf52840_kit",
-    "bsp": {
-      "name": "adafruit"
-    },
-    "softdevice": {
-      "sd_flags": "-DS140",
-      "sd_name": "s140",
-      "sd_version": "7.3.0",
-      "sd_fwid": "0x0123"
-    },
-    "bootloader": {
-      "settings_addr": "0xFF000"
-    }
-  },
-  "connectivity": ["bluetooth"],
-  "debug": {
-    "jlink_device": "nRF52840_xxAA",
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
-  },
-  "frameworks": ["arduino"],
-  "name": "seeed_xiao_nrf52840_kit",
-  "upload": {
-    "maximum_ram_size": 248832,
-    "maximum_size": 815104,
-    "speed": 115200,
-    "protocol": "nrfutil",
-    "protocols": [
-      "jlink",
-      "nrfjprog",
-      "nrfutil",
-      "stlink",
-      "cmsis-dap",
-      "blackmagic"
-    ],
-    "use_1200bps_touch": true,
-    "require_upload_port": true,
-    "wait_for_upload_port": true
-  },
-  "url": "https://www.seeedstudio.com/XIAO-nRF52840-Wio-SX1262-Kit-for-Meshtastic-p-6400.html",
-  "vendor": "seeed"
-}
--- a/boards/t-watch-s3.json
+++ b/boards/t-watch-s3.json
@@ -16,7 +16,6 @@
    "f_cpu": "240000000L",
    "f_flash": "80000000L",
    "flash_mode": "qio",
-    "psram_type": "opi",
    "hwids": [
      ["0x303A", "0x1001"],
      ["0x303A", "0x0002"]
@@ -24,7 +23,7 @@
    "mcu": "esp32s3",
    "variant": "t-watch-s3"
  },
-  "connectivity": ["wifi", "bluetooth"],
+  "connectivity": ["wifi"],
  "debug": {
    "openocd_target": "esp32s3.cfg"
  },
--- a/boards/wiscore_rak11300.json
+++ b/boards/wiscore_rak11300.json
@@ -0,0 +1,40 @@
+{
+  "build": {
+    "arduino": {
+      "earlephilhower": {
+        "boot2_source": "boot2_w25q080_2_padded_checksum.S",
+        "usb_vid": "0x2E8A",
+        "usb_pid": "0x000A"
+      }
+    },
+    "core": "earlephilhower",
+    "cpu": "cortex-m0plus",
+    "extra_flags": "-DARDUINO_GENERIC_RP2040 -DRASPBERRY_PI_PICO -DARDUINO_ARCH_RP2040 -DUSBD_MAX_POWER_MA=250",
+    "f_cpu": "133000000L",
+    "hwids": [
+      ["0x2E8A", "0x00C0"],
+      ["0x2E8A", "0x000A"]
+    ],
+    "mcu": "rp2040",
+    "variant": "WisBlock_RAK11300_Board"
+  },
+  "debug": {
+    "jlink_device": "RP2040_M0_0",
+    "openocd_target": "rp2040.cfg",
+    "svd_path": "rp2040.svd"
+  },
+  "frameworks": ["arduino"],
+  "name": "WisBlock RAK11300",
+  "upload": {
+    "maximum_ram_size": 270336,
+    "maximum_size": 2097152,
+    "require_upload_port": true,
+    "native_usb": true,
+    "use_1200bps_touch": true,
+    "wait_for_upload_port": false,
+    "protocol": "picotool",
+    "protocols": ["cmsis-dap", "raspberrypi-swd", "picotool", "picoprobe"]
+  },
+  "url": "https://docs.rakwireless.com/",
+  "vendor": "RAKwireless"
+}
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,7 @@
-meshtasticd (2.5.22.0) UNRELEASED; urgency=medium
+meshtasticd (2.5.20.0) UNRELEASED; urgency=medium

  * Initial packaging
  * GitHub Actions Automatic version bump
  * GitHub Actions Automatic version bump
-  * GitHub Actions Automatic version bump
-  * GitHub Actions Automatic version bump

- -- Austin Lane <github-actions[bot]@users.noreply.github.com>  Wed, 05 Feb 2025 01:10:33 +0000
+ -- Austin Lane <github-actions[bot]@users.noreply.github.com>  Wed, 15 Jan 2025 14:08:54 +0000
--- a/debian/ci_pack_sdeb.sh
+++ b/debian/ci_pack_sdeb.sh
@@ -10,9 +10,8 @@ platformio pkg install -e native -t platformio/tool-scons@4.40502.0
 # Compress `pio` directory to prevent dh_clean from sanitizing it
 tar -cf pio.tar pio/
 rm -rf pio
-# Download the meshtastic/web release build.tar to `web.tar`
-web_ver=$(cat bin/web.version)
-curl -L "https://github.com/meshtastic/web/releases/download/v$web_ver/build.tar" -o web.tar
+# Download the latest meshtastic/web release build.tar to `web.tar`
+curl -L https://github.com/meshtastic/web/releases/download/latest/build.tar -o web.tar

 package=$(dpkg-parsechangelog --show-field Source)

--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,6 @@ Section: misc
 Priority: optional
 Maintainer: Austin Lane <vidplace7@gmail.com>
 Build-Depends: debhelper-compat (= 13),
-               lsb-release,
               tar,
               gzip,
               platformio,
@@ -17,7 +16,6 @@ Build-Depends: debhelper-compat (= 13),
               libbluetooth-dev,
               libusb-1.0-0-dev,
               libi2c-dev,
-               libuv1-dev,
               openssl,
               libssl-dev,
               libulfius-dev,
--- a/debian/meshtasticd.dirs
+++ b/debian/meshtasticd.dirs
@@ -1,5 +1,4 @@
 etc/meshtasticd
 etc/meshtasticd/config.d
 etc/meshtasticd/available.d
-usr/share/meshtasticd/web
-etc/meshtasticd/ssl
+usr/share/meshtasticd/web
--- a/debian/rules
+++ b/debian/rules
@@ -11,15 +11,6 @@ PIO_ENV:=\
 	PLATFORMIO_LIBDEPS_DIR=pio/libdeps \
 	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
-ifneq (,$(findstring Raspbian,$(shell lsb_release -is)))
-ifeq ($(DEB_BUILD_ARCH),armhf)
-PIO_ENV+=\
-	PLATFORMIO_BUILD_FLAGS="-mfloat-abi=hard -mfpu=vfp -march=armv6zk"
-endif
-endif
-
 override_dh_auto_build:
 	# Extract tarballs within source deb
 	tar -xf pio.tar
--- a/extra_scripts/extra_stm32.py
+++ b/extra_scripts/extra_stm32.py
@@ -1,22 +0,0 @@
-# trunk-ignore-all(ruff/F821)
-# trunk-ignore-all(flake8/F821): For SConstruct imports
-
-Import("env")
-# Custom HEX from ELF
-env.AddPostAction(
-    "$BUILD_DIR/${PROGNAME}.elf",
-    env.VerboseAction(
-        " ".join(
-            [
-                "$OBJCOPY",
-                "-O",
-                "ihex",
-                "-R",
-                ".eeprom",
-                "$BUILD_DIR/${PROGNAME}.elf",
-                "$BUILD_DIR/${PROGNAME}.hex",
-            ]
-        ),
-        "Building $BUILD_DIR/${PROGNAME}.hex",
-    ),
-)
--- a/meshtasticd.spec.rpkg
+++ b/meshtasticd.spec.rpkg
@@ -21,7 +21,7 @@ Summary:        Meshtastic daemon for communicating with Meshtastic devices
 License:        GPL-3.0
 URL:            https://github.com/meshtastic/firmware
 Source0:        {{{ git_dir_pack }}}
-Source1:        https://github.com/meshtastic/web/releases/download/v{{{ web_version }}}/build.tar
+Source1:        https://github.com/meshtastic/web/releases/download/latest/build.tar

 BuildRequires: systemd-rpm-macros
 BuildRequires: python3-devel
@@ -36,7 +36,6 @@ BuildRequires: pkgconfig(libgpiod)
 BuildRequires: pkgconfig(bluez)
 BuildRequires: pkgconfig(libusb-1.0)
 BuildRequires: libi2c-devel
-BuildRequires: pkgconfig(libuv)
 # Web components:
 BuildRequires: pkgconfig(openssl)
 BuildRequires: pkgconfig(liborcania)
@@ -73,8 +72,6 @@ install -D -m 0644 bin/meshtasticd.service %{buildroot}%{_unitdir}/meshtasticd.s
 # Install the web files under /usr/share/meshtasticd/web
 mkdir -p %{buildroot}%{_datadir}/meshtasticd/web
 cp -r web/* %{buildroot}%{_datadir}/meshtasticd/web
-# Install default SSL storage directory (for web)
-mkdir -p %{buildroot}%{_sysconfdir}/meshtasticd/ssl

 %files
 %license LICENSE
@@ -89,7 +86,6 @@ mkdir -p %{buildroot}%{_sysconfdir}/meshtasticd/ssl
 %dir %{_datadir}/meshtasticd
 %dir %{_datadir}/meshtasticd/web
 %{_datadir}/meshtasticd/web/*
-%dir %{_sysconfdir}/meshtasticd/ssl

 %changelog
 %autochangelog
--- a/monitor/filter_c3_exception_decoder.py
+++ b/monitor/filter_c3_exception_decoder.py
@@ -1,6 +1,3 @@
-# trunk-ignore-all(bandit/B404): subprocess is used to call addr2line
-# trunk-ignore-all(bandit/B603): subprocess is used to call addr2line
-
 # Copyright (c) 2014-present PlatformIO <contact@platformio.org>
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
--- a/platformio.ini
+++ b/platformio.ini
@@ -7,8 +7,6 @@ default_envs = tbeam
 extra_configs =
 	arch/*/*.ini
 	variants/*/platformio.ini
-	src/graphics/niche/InkHUD/PlatformioConfig.ini
-
 description = Meshtastic

 [env]
@@ -56,12 +54,12 @@ build_flags = -Wno-missing-field-initializers
 monitor_speed = 115200
 monitor_filters = direct
 lib_deps =
-	https://github.com/meshtastic/esp8266-oled-ssd1306/archive/0119501e9983bd894830b02f545c377ee08d66fe.zip
+	https://github.com/meshtastic/esp8266-oled-ssd1306.git#e16cee124fe26490cb14880c679321ad8ac89c95
 	mathertel/OneButton@2.6.1
-	https://github.com/meshtastic/arduino-fsm/archive/7db3702bf0cfe97b783d6c72595e3f38e0b19159.zip
-	https://github.com/meshtastic/TinyGPSPlus/archive/71a82db35f3b973440044c476d4bcdc673b104f4.zip
-	https://github.com/meshtastic/ArduinoThread/archive/7c3ee9e1951551b949763b1f5280f8db1fa4068d.zip
-	nanopb/Nanopb@0.4.91
+	https://github.com/meshtastic/arduino-fsm.git#7db3702bf0cfe97b783d6c72595e3f38e0b19159
+	https://github.com/meshtastic/TinyGPSPlus.git#71a82db35f3b973440044c476d4bcdc673b104f4
+	https://github.com/meshtastic/ArduinoThread.git#1ae8778c85d0a2a729f989e0b1e7d7c4dc84eef0
+	nanopb/Nanopb@0.4.9
 	erriez/ErriezCRC32@1.0.1

 ; Used for the code analysis in PIO Home / Inspect
@@ -79,7 +77,7 @@ lib_deps =
 	${env.lib_deps}
 	end2endzone/NonBlockingRTTTL@1.3.0
 build_flags = ${env.build_flags} -Os
-build_src_filter = ${env.build_src_filter} -<platform/portduino/> -<graphics/niche/>
+build_src_filter = ${env.build_src_filter} -<platform/portduino/>

 ; Common libs for communicating over TCP/IP networks such as MQTT
 [networking_base]
@@ -92,21 +90,16 @@ lib_deps =
 lib_deps =
 	jgromes/RadioLib@7.1.2

-[device-ui_base]
-lib_deps =
-	https://github.com/meshtastic/device-ui/archive/56ef8db7eb4dda44dc0c1ec5828044debbbc6d33.zip
-
 ; Common libs for environmental measurements in telemetry module
 ; (not included in native / portduino)
 [environmental_base]
 lib_deps =
-	adafruit/Adafruit BusIO@1.17.0
-	adafruit/Adafruit Unified Sensor@1.1.15
+	adafruit/Adafruit BusIO@1.16.2
+	adafruit/Adafruit Unified Sensor@1.1.14
 	adafruit/Adafruit BMP280 Library@2.6.8
 	adafruit/Adafruit BMP085 Library@1.2.4
 	adafruit/Adafruit BME280 Library@2.2.4
-	adafruit/Adafruit BMP3XX Library@2.1.6
-	adafruit/Adafruit DPS310@1.1.5
+	adafruit/Adafruit BMP3XX Library@2.1.5
 	adafruit/Adafruit MCP9808 Library@2.0.2
 	adafruit/Adafruit INA260 Library@1.5.2
 	adafruit/Adafruit INA219@1.2.3
@@ -114,27 +107,27 @@ lib_deps =
 	adafruit/Adafruit SHTC3 Library@1.0.1
 	adafruit/Adafruit LPS2X@2.0.6
 	adafruit/Adafruit SHT31 Library@2.2.2
-	adafruit/Adafruit PM25 AQI Sensor@1.2.0
+	adafruit/Adafruit PM25 AQI Sensor@1.1.1
 	adafruit/Adafruit MPU6050@2.2.6
 	adafruit/Adafruit LIS3DH@1.3.0
 	adafruit/Adafruit AHTX0@2.0.5
-	adafruit/Adafruit LSM6DS@4.7.4
+	adafruit/Adafruit LSM6DS@4.7.3
 	adafruit/Adafruit VEML7700 Library@2.1.6
 	adafruit/Adafruit SHT4x Library@1.0.5
 	adafruit/Adafruit TSL2591 Library@1.4.5
 	sparkfun/SparkFun Qwiic Scale NAU7802 Arduino Library@1.0.6
-	sparkfun/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library@1.3.0
+	sparkfun/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library@1.2.13
 	ClosedCube OPT3001@1.1.2
 	emotibit/EmotiBit MLX90632@1.0.8
 	adafruit/Adafruit MLX90614 Library@2.1.5
-	https://github.com/boschsensortec/Bosch-BSEC2-Library/archive/v1.7.2502.zip
+	https://github.com/boschsensortec/Bosch-BSEC2-Library#v1.7.2502
 	boschsensortec/BME68x Sensor Library@1.1.40407
-	https://github.com/KodinLanewave/INA3221/archive/1.0.1.zip
+	https://github.com/KodinLanewave/INA3221@1.0.1
 	mprograms/QMC5883LCompass@1.2.3
 	dfrobot/DFRobot_RTU@1.0.3
-	https://github.com/meshtastic/DFRobot_LarkWeatherStation/archive/4de3a9cadef0f6a5220a8a906cf9775b02b0040d.zip
-	https://github.com/DFRobot/DFRobot_RainfallSensor/archive/38fea5e02b40a5430be6dab39a99a6f6347d667e.zip
-	robtillaart/INA226@0.6.4
+	https://github.com/meshtastic/DFRobot_LarkWeatherStation#4de3a9cadef0f6a5220a8a906cf9775b02b0040d
+	https://github.com/DFRobot/DFRobot_RainfallSensor#38fea5e02b40a5430be6dab39a99a6f6347d667e
+	robtillaart/INA226@0.6.0

 	; Health Sensor Libraries
 	sparkfun/SparkFun MAX3010x Pulse and Proximity Sensor Library@1.1.2
--- a/2
+++ b/2
--- a/src/AmbientLightingThread.h
+++ b/src/AmbientLightingThread.h
@@ -6,11 +6,6 @@
 NCP5623 rgb;
 #endif

-#ifdef HAS_LP5562
-#include <graphics/NomadStarLED.h>
-LP5562 rgbw;
-#endif
-
 #ifdef HAS_NEOPIXEL
 #include <graphics/NeoPixel.h>
 Adafruit_NeoPixel pixels(NEOPIXEL_COUNT, NEOPIXEL_DATA, NEOPIXEL_TYPE);
@@ -31,7 +26,7 @@ class AmbientLightingThread : public concurrency::OSThread
        notifyDeepSleepObserver.observe(&notifyDeepSleep); // Let us know when shutdown() is issued.

 // Enables Ambient Lighting by default if conditions are meet.
-#ifdef HAS_RGB_LED
+#if defined(HAS_NCP5623) || defined(RGBLED_RED) || defined(HAS_NEOPIXEL) || defined(UNPHONE)
 #ifdef ENABLE_AMBIENTLIGHTING
        moduleConfig.ambient_lighting.led_state = true;
 #endif
@@ -44,7 +39,7 @@ class AmbientLightingThread : public concurrency::OSThread
        // 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)
+#ifdef HAS_NCP5623
        _type = type;
        if (_type == ScanI2C::DeviceType::NONE) {
            LOG_DEBUG("AmbientLighting Disable due to no RGB leds found on I2C bus");
@@ -52,21 +47,17 @@ class AmbientLightingThread : public concurrency::OSThread
            return;
        }
 #endif
-#ifdef HAS_RGB_LED
+#if defined(HAS_NCP5623) || defined(RGBLED_RED) || defined(HAS_NEOPIXEL) || defined(UNPHONE)
        if (!moduleConfig.ambient_lighting.led_state) {
            LOG_DEBUG("AmbientLighting Disable due to moduleConfig.ambient_lighting.led_state OFF");
            disable();
            return;
        }
        LOG_DEBUG("AmbientLighting init");
-#if defined(HAS_NCP5623) || defined(HAS_LP5562)
+#ifdef HAS_NCP5623
        if (_type == ScanI2C::NCP5623) {
            rgb.begin();
 #endif
-#ifdef HAS_LP5562
-        } else if (_type == ScanI2C::LP5562) {
-            rgbw.begin();
-#endif
 #ifdef RGBLED_RED
            pinMode(RGBLED_RED, OUTPUT);
            pinMode(RGBLED_GREEN, OUTPUT);
@@ -79,7 +70,7 @@ class AmbientLightingThread : public concurrency::OSThread
 #endif
            setLighting();
 #endif
-#if defined(HAS_NCP5623) || defined(HAS_LP5562)
+#ifdef HAS_NCP5623
        }
 #endif
    }
@@ -87,13 +78,13 @@ class AmbientLightingThread : public concurrency::OSThread
  protected:
    int32_t runOnce() override
    {
-#ifdef HAS_RGB_LED
-#if defined(HAS_NCP5623) || defined(HAS_LP5562)
-        if ((_type == ScanI2C::NCP5623 || _type == ScanI2C::LP5562) && moduleConfig.ambient_lighting.led_state) {
+#if defined(HAS_NCP5623) || defined(RGBLED_RED) || defined(HAS_NEOPIXEL) || defined(UNPHONE)
+#ifdef HAS_NCP5623
+        if (_type == ScanI2C::NCP5623 && moduleConfig.ambient_lighting.led_state) {
 #endif
            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)
+#ifdef HAS_NCP5623
        }
 #endif
 #endif
@@ -117,14 +108,6 @@ class AmbientLightingThread : public concurrency::OSThread
        rgb.setBlue(0);
        LOG_INFO("OFF: NCP5623 Ambient lighting");
 #endif
-#ifdef HAS_LP5562
-        rgbw.setCurrent(0);
-        rgbw.setRed(0);
-        rgbw.setGreen(0);
-        rgbw.setBlue(0);
-        rgbw.setWhite(0);
-        LOG_INFO("OFF: LP5562 Ambient lighting");
-#endif
 #ifdef HAS_NEOPIXEL
        pixels.clear();
        pixels.show();
@@ -158,14 +141,6 @@ class AmbientLightingThread : public concurrency::OSThread
        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(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(moduleConfig.ambient_lighting.red, moduleConfig.ambient_lighting.green,
                                 moduleConfig.ambient_lighting.blue),
@@ -178,7 +153,7 @@ class AmbientLightingThread : public concurrency::OSThread
        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);
+        pixels.fill(BUTTON2_COLOR, BUTTON1_COLOR_INDEX, 1);
 #endif
 #endif
        pixels.show();
--- a/src/AudioThread.h
+++ b/src/AudioThread.h
@@ -41,8 +41,10 @@ class AudioThread : public concurrency::OSThread
            delete i2sRtttl;
            i2sRtttl = nullptr;
        }
-        delete rtttlFile;
-        rtttlFile = nullptr;
+        if (rtttlFile != nullptr) {
+            delete rtttlFile;
+            rtttlFile = nullptr;
+        }

        setCPUFast(false);
    }
--- a/Show More
+++ b/Show More