Add trunk rules matching other Dockerfiles

Remove device-ui checkin
Include meshtasticd dependencies
2025-12-15 07:12:34 +00:00 · 2025-02-26 21:29:35 -05:00 · 2025-02-26 20:46:16 -05:00 · 2025-02-26 20:46:16 -05:00
608 changed files with 4242 additions and 40191 deletions
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -29,11 +29,7 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
    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
--- 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
@@ -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/actions/build-variant/action.yml
+++ b/.github/actions/build-variant/action.yml
@@ -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-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
@@ -0,0 +1,27 @@
+#trunk-ignore-all(yamllint/quoted-strings): required by dependabot syntax check
+version: 2
+updates:
+  - package-ecosystem: docker
+    directory: /.devcontainer
+    schedule:
+      interval: daily
+      time: "05:00"
+      timezone: US/Pacific
+  - package-ecosystem: docker
+    directory: /
+    schedule:
+      interval: daily
+      time: "05:00"
+      timezone: US/Pacific
+  - package-ecosystem: gitsubmodule
+    directory: /
+    schedule:
+      interval: daily
+      time: "05:00"
+      timezone: US/Pacific
+  - package-ecosystem: github-actions
+    directory: /.github/workflows
+    schedule:
+      interval: daily
+      time: "05:00"
+      timezone: US/Pacific
--- 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/docker_build.yml
+++ b/.github/workflows/docker_build.yml
@@ -26,11 +26,6 @@ on:
        required: false
        type: boolean
        default: false
-      pio_env:
-        description: PlatformIO environment to build
-        required: false
-        type: string
-        default: native
    outputs:
      digest:
        description: Digest of built image
@@ -95,5 +90,3 @@ jobs:
          push: ${{ inputs.push }}
          tags: ${{ steps.meta.outputs.tags }} # Tag is only meant to be consumed by the "manifest" job
          platforms: ${{ inputs.platform }}
-          build-args: |
-            PIO_ENV=${{ inputs.pio_env }}
--- a/.github/workflows/main_matrix.yml
+++ b/.github/workflows/main_matrix.yml
@@ -5,20 +5,14 @@ concurrency:
 on:
  # # Triggers the workflow on push but only for the master branch
  push:
-    branches:
-      - master
-      - develop
-      - event/*
+    branches: [master, develop]
    paths-ignore:
      - "**.md"
      - version.properties

  # Note: This is different from "pull_request". Need to specify ref when doing checkouts.
  pull_request_target:
-    branches:
-      - master
-      - develop
-      - event/*
+    branches: [master, develop]
    paths-ignore:
      - "**.md"
      #- "**.yml"
@@ -38,12 +32,12 @@ jobs:
        name: Checkout base
      - id: jsonStep
        run: |
-          if [[ "$GITHUB_HEAD_REF" == "" ]]; then
+          if [[ "${{ github.head_ref }}" == "" ]]; then
            TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}})
          else  
            TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}} quick)
          fi
-          echo "Name: $GITHUB_REF_NAME Base: $GITHUB_BASE_REF Ref: $GITHUB_REF Targets: $TARGETS"
+          echo "Name: ${{ github.ref_name }} Base: ${{ github.base_ref }} } Ref: ${{ github.ref }} Targets: $TARGETS"
          echo "${{matrix.arch}}=$(jq -cn --argjson environments "$TARGETS" '{board: $environments}')" >> $GITHUB_OUTPUT
    outputs:
      esp32: ${{ steps.jsonStep.outputs.esp32 }}
@@ -141,18 +135,16 @@ jobs:
      build_location: local
    secrets: inherit

-  package-pio-deps-native-tft:
-    if: ${{ github.event_name == 'workflow_dispatch' }}
+  package-pio-deps-native:
    uses: ./.github/workflows/package_pio_deps.yml
    with:
-      pio_env: native-tft
+      pio_env: native
    secrets: inherit

  test-native:
-    if: ${{ !contains(github.ref_name, 'event/') }}
    uses: ./.github/workflows/test_native.yml

-  docker-deb-amd64:
+  docker-debian-amd64:
    uses: ./.github/workflows/docker_build.yml
    with:
      distro: debian
@@ -160,16 +152,7 @@ jobs:
      runs-on: ubuntu-24.04
      push: false

-  docker-deb-amd64-tft:
-    uses: ./.github/workflows/docker_build.yml
-    with:
-      distro: debian
-      platform: linux/amd64
-      runs-on: ubuntu-24.04
-      push: false
-      pio_env: native-tft
-
-  docker-alp-amd64:
+  docker-alpine-amd64:
    uses: ./.github/workflows/docker_build.yml
    with:
      distro: alpine
@@ -177,16 +160,7 @@ jobs:
      runs-on: ubuntu-24.04
      push: false

-  docker-alp-amd64-tft:
-    uses: ./.github/workflows/docker_build.yml
-    with:
-      distro: alpine
-      platform: linux/amd64
-      runs-on: ubuntu-24.04
-      push: false
-      pio_env: native-tft
-
-  docker-deb-arm64:
+  docker-debian-arm64:
    uses: ./.github/workflows/docker_build.yml
    with:
      distro: debian
@@ -194,7 +168,7 @@ jobs:
      runs-on: ubuntu-24.04-arm
      push: false

-  docker-deb-armv7:
+  docker-debian-armv7:
    uses: ./.github/workflows/docker_build.yml
    with:
      distro: debian
@@ -202,6 +176,17 @@ jobs:
      runs-on: ubuntu-24.04-arm
      push: false

+  after-checks:
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'workflow_dispatch' }}
+    needs: [check]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
  gather-artifacts:
    permissions:
      contents: write
@@ -303,7 +288,7 @@ jobs:
    needs:
      - gather-artifacts
      - build-debian-src
-      - package-pio-deps-native-tft
+      - package-pio-deps-native
    steps:
      - name: Checkout
        uses: actions/checkout@v4
@@ -339,32 +324,52 @@ jobs:
          merge-multiple: true
          path: ./output/debian-src

-      - name: Download `native-tft` pio deps
+      - name: Download native pio deps
        uses: actions/download-artifact@v4
        with:
-          pattern: platformio-deps-native-tft-${{ steps.version.outputs.long }}
+          pattern: platformio-deps-native-${{ steps.version.outputs.long }}
          merge-multiple: true
-          path: ./output/pio-deps-native-tft
+          path: ./output/pio-deps-native

-      - name: Zip Linux sources
+      - name: Zip linux sources
        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
+          zip -9 -r ./platformio-deps-native-${{ steps.version.outputs.long }}.zip ./pio-deps-native

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

-      - name: Add Linux sources to GtiHub Release
-        # Only run when targeting master branch with workflow_dispatch
-        if: ${{ github.ref_name == 'master' }}
+      - name: Add linux sources to release
        run: |
          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
+          gh release upload v${{ steps.version.outputs.long }} ./output/platformio-deps-native-${{ steps.version.outputs.long }}.zip
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

+      - 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
+
  release-firmware:
    strategy:
      fail-fast: false
@@ -416,53 +421,9 @@ jobs:
      - name: Display structure of downloaded files
        run: ls -lR

-      - name: Add bins and debug elfs to GitHub Release
-        # Only run when targeting master branch with workflow_dispatch
-        if: ${{ github.ref_name == 'master' }}
+      - name: Add bins and debug elfs to release
        run: |
          gh release upload v${{ steps.version.outputs.long }} ./firmware-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip
          gh release upload v${{ steps.version.outputs.long }} ./debug-elfs-${{matrix.arch}}-${{ steps.version.outputs.long }}.zip
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-  publish-firmware:
-    runs-on: ubuntu-latest
-    if: ${{ github.event_name == 'workflow_dispatch' }}
-    needs: [release-firmware]
-    env:
-      targets: esp32,esp32s3,esp32c3,esp32c6,nrf52840,rp2040,stm32
-    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
-        id: version
-
-      - uses: actions/download-artifact@v4
-        with:
-          pattern: firmware-{${{ env.targets }}}-${{ steps.version.outputs.long }}
-          merge-multiple: true
-          path: ./publish
-
-      - name: Publish firmware to meshtastic.github.io
-        uses: peaceiris/actions-gh-pages@v4
-        env:
-          # On event/* branches, use the event name as the destination prefix
-          DEST_PREFIX: ${{ contains(github.ref_name, 'event/') && format('{0}/', github.ref_name) || '' }}
-        with:
-          deploy_key: ${{ secrets.DIST_PAGES_DEPLOY_KEY }}
-          external_repository: meshtastic/meshtastic.github.io
-          publish_branch: master
-          publish_dir: ./publish
-          destination_dir: ${{ env.DEST_PREFIX }}firmware-${{ steps.version.outputs.long }}
-          keep_files: true
-          user_name: github-actions[bot]
-          user_email: github-actions[bot]@users.noreply.github.com
-          commit_message: ${{ steps.version.outputs.long }}
-          enable_jekyll: true
--- a/.github/workflows/release_channels.yml
+++ b/.github/workflows/release_channels.yml
@@ -43,64 +43,3 @@ jobs:
      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.action == 'published'
-    runs-on: ubuntu-latest
-    permissions:
-      pull-requests: write
-      contents: write
-    defaults:
-      run:
-        shell: bash
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-
-      - name: Setup Python
-        uses: actions/setup-python@v5
-        with:
-          python-version: 3.x
-
-      - name: Bump version.properties
-        run: |
-          # Bump version.properties
-          chmod +x ./bin/bump_version.py
-          ./bin/bump_version.py
-
-      - name: Get new release version string
-        run: |
-          echo "short=$(./bin/buildinfo.py short)" >> $GITHUB_OUTPUT
-        id: new_version
-
-      - name: Ensure debian deps are installed
-        run: |
-          sudo apt-get update -y --fix-missing
-          sudo apt-get install -y devscripts
-
-      - name: Update debian changelog
-        run: |
-          # Update debian changelog
-          chmod +x ./debian/ci_changelog.sh
-          ./debian/ci_changelog.sh
-
-      - name: Bump org.meshtastic.meshtasticd.metainfo.xml
-        run: |
-          # Bump org.meshtastic.meshtasticd.metainfo.xml
-          pip install -r bin/bump_metainfo/requirements.txt -q
-          chmod +x ./bin/bump_metainfo/bump_metainfo.py
-          ./bin/bump_metainfo/bump_metainfo.py --file bin/org.meshtastic.meshtasticd.metainfo.xml "${{ steps.new_version.outputs.short }}"
-        env:
-          PIP_DISABLE_PIP_VERSION_CHECK: 1
-
-      - name: Create Bumps pull request
-        uses: peter-evans/create-pull-request@v7
-        with:
-          base: ${{ github.event.repository.default_branch }}
-          title: Bump release version
-          commit-message: automated bumps
-          add-paths: |
-            version.properties
-            debian/changelog
-            bin/org.meshtastic.meshtasticd.metainfo.xml
--- a/.github/workflows/sec_sast_semgrep_cron.yml
+++ b/.github/workflows/sec_sast_semgrep_cron.yml
@@ -6,14 +6,11 @@ on:
  schedule:
    - cron: 0 1 * * 6

-permissions:
-  actions: read
-  contents: read
-  security-events: write
+permissions: read-all

 jobs:
  semgrep-full:
-    runs-on: ubuntu-24.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
@@ -6,7 +6,7 @@ permissions: read-all

 jobs:
  semgrep-diff:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
    container:
      image: semgrep/semgrep

--- a/.github/workflows/stale_bot.yml
+++ b/.github/workflows/stale_bot.yml
@@ -18,6 +18,5 @@ jobs:
      - name: Stale PR+Issues
        uses: actions/stale@v9.1.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.1.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
@@ -5,10 +5,7 @@ on:
    - cron: 0 0 * * * # Run every day at midnight
  workflow_dispatch: {}

-permissions:
-  contents: read
-  actions: read
-  checks: write
+permissions: read-all

 jobs:
  native-tests:
@@ -47,7 +44,7 @@ jobs:
      - name: Setup Node
        uses: actions/setup-node@v4
        with:
-          node-version: 22
+          node-version: 18

      - name: Setup pnpm
        uses: pnpm/action-setup@v4
--- a/.trunk/configs/.prettierignore
+++ b/.trunk/configs/.prettierignore
@@ -1 +0,0 @@
-renovate.json
--- a/.trunk/trunk.yaml
+++ b/.trunk/trunk.yaml
@@ -1,34 +1,34 @@
 version: 0.1
 cli:
-  version: 1.24.0
+  version: 1.22.10
 plugins:
  sources:
    - id: trunk
-      ref: v1.7.0
+      ref: v1.6.7
      uri: https://github.com/trunk-io/plugins
 lint:
  enabled:
-    - checkov@3.2.435
-    - renovate@40.34.4
-    - prettier@3.5.3
-    - trufflehog@3.88.34
-    - yamllint@1.37.1
+    - prettier@3.5.2
+    - trufflehog@3.88.12
+    - yamllint@1.35.1
    - bandit@1.8.3
-    - trivy@0.62.1
+    - checkov@3.2.373
+    - terrascan@1.19.9
+    - trivy@0.59.1
    - taplo@0.9.3
-    - ruff@0.11.11
-    - isort@6.0.1
-    - markdownlint@0.45.0
-    - oxipng@9.1.5
+    - ruff@0.9.7
+    - isort@6.0.0
+    - markdownlint@0.44.0
+    - oxipng@9.1.4
    - svgo@3.3.2
    - actionlint@1.7.7
-    - flake8@7.2.0
+    - flake8@7.1.2
    - hadolint@2.12.1-beta
    - shfmt@3.6.0
    - shellcheck@0.10.0
    - black@25.1.0
    - git-diff-check
-    - gitleaks@8.26.0
+    - gitleaks@8.24.0
    - clang-format@16.0.3
  ignore:
    - linters: [ALL]
@@ -38,7 +38,7 @@ runtimes:
  enabled:
    - python@3.10.8
    - go@1.21.0
-    - node@22.16.0
+    - node@18.20.5
 actions:
  disabled:
    - trunk-announce
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -7,62 +7,5 @@
  "cmake.configureOnOpen": false,
  "[cpp]": {
    "editor.defaultFormatter": "trunk.io"
-  },
-  "[powershell]": {
-    "editor.defaultFormatter": "ms-vscode.powershell"
-  },
-  "files.associations": {
-    "array": "cpp",
-    "atomic": "cpp",
-    "*.tcc": "cpp",
-    "cctype": "cpp",
-    "clocale": "cpp",
-    "cmath": "cpp",
-    "csignal": "cpp",
-    "cstdarg": "cpp",
-    "cstddef": "cpp",
-    "cstdint": "cpp",
-    "cstdio": "cpp",
-    "cstdlib": "cpp",
-    "cstring": "cpp",
-    "ctime": "cpp",
-    "cwchar": "cpp",
-    "cwctype": "cpp",
-    "deque": "cpp",
-    "list": "cpp",
-    "unordered_map": "cpp",
-    "unordered_set": "cpp",
-    "vector": "cpp",
-    "exception": "cpp",
-    "algorithm": "cpp",
-    "functional": "cpp",
-    "iterator": "cpp",
-    "map": "cpp",
-    "memory": "cpp",
-    "memory_resource": "cpp",
-    "numeric": "cpp",
-    "optional": "cpp",
-    "random": "cpp",
-    "string": "cpp",
-    "string_view": "cpp",
-    "system_error": "cpp",
-    "tuple": "cpp",
-    "type_traits": "cpp",
-    "utility": "cpp",
-    "fstream": "cpp",
-    "initializer_list": "cpp",
-    "iomanip": "cpp",
-    "iosfwd": "cpp",
-    "iostream": "cpp",
-    "istream": "cpp",
-    "limits": "cpp",
-    "new": "cpp",
-    "ostream": "cpp",
-    "sstream": "cpp",
-    "stdexcept": "cpp",
-    "streambuf": "cpp",
-    "cinttypes": "cpp",
-    "typeinfo": "cpp",
-    "*.xbm": "cpp"
  }
 }
--- a/38
+++ b/38
@@ -1,20 +1,20 @@
+# trunk-ignore-all(terrascan/AC_DOCKER_0002): Known terrascan issue
 # 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
-ARG PIO_ENV=native
 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 pkg-config \
-        libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev libuv1-dev \
-        libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev \
-        libx11-dev libinput-dev libxkbcommon-x11-dev \
+        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 \
    && mkdir /tmp/firmware
@@ -24,26 +24,13 @@ WORKDIR /tmp/firmware
 COPY . /tmp/firmware

 # Build
-RUN bash ./bin/build-native.sh "$PIO_ENV" && \
+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 #############

 FROM debian:bookworm-slim
-LABEL org.opencontainers.image.title="Meshtastic" \
-      org.opencontainers.image.description="Debian Meshtastic daemon and web interface" \
-      org.opencontainers.image.url="https://meshtastic.org" \
-      org.opencontainers.image.documentation="https://meshtastic.org/docs/" \
-      org.opencontainers.image.authors="Meshtastic" \
-      org.opencontainers.image.licenses="GPL-3.0-or-later" \
-      org.opencontainers.image.source="https://github.com/meshtastic/firmware/"
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TZ=Etc/UTC

@@ -51,17 +38,14 @@ ENV TZ=Etc/UTC
 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 \
-        libx11-6 libinput10 libxkbcommon-x11-0 \
+        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

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

@@ -70,9 +54,7 @@ VOLUME /var/lib/meshtasticd

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

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

-HEALTHCHECK NONE
+HEALTHCHECK NONE
--- a/SECURITY.md
+++ b/SECURITY.md
@@ -4,8 +4,8 @@

 | Firmware Version | Supported          |
 | ---------------- | ------------------ |
-| 2.6.x            | :white_check_mark: |
-| <= 2.5.x         | :x:                |
+| 2.5.x            | :white_check_mark: |
+| <= 2.4.x         | :x:                |

 ## Reporting a Vulnerability

--- a/alpine.Dockerfile
+++ b/alpine.Dockerfile
@@ -1,16 +1,15 @@
 # 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
-ARG PIO_ENV=native
-ENV PIP_ROOT_USER_ACTION=ignore

+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 \
-        libx11-dev libinput-dev libxkbcommon-dev \
+        libusb-dev i2c-tools-dev openssl-dev pkgconf argp-standalone \
    && rm -rf /var/cache/apk/* \
    && pip install --no-cache-dir -U platformio \
    && mkdir /tmp/firmware
@@ -22,35 +21,23 @@ COPY . /tmp/firmware
 # Add `argp` for musl
 ENV PLATFORMIO_BUILD_FLAGS="-Os -ffunction-sections -fdata-sections -Wl,--gc-sections -largp"

-RUN bash ./bin/build-native.sh "$PIO_ENV" && \
+RUN bash ./bin/build-native.sh && \
    cp "/tmp/firmware/release/meshtasticd_linux_$(uname -m)" "/tmp/firmware/release/meshtasticd"

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

 FROM alpine:3.21
-LABEL org.opencontainers.image.title="Meshtastic" \
-      org.opencontainers.image.description="Alpine Meshtastic daemon" \
-      org.opencontainers.image.url="https://meshtastic.org" \
-      org.opencontainers.image.documentation="https://meshtastic.org/docs/" \
-      org.opencontainers.image.authors="Meshtastic" \
-      org.opencontainers.image.licenses="GPL-3.0-or-later" \
-      org.opencontainers.image.source="https://github.com/meshtastic/firmware/"

 # nosemgrep: dockerfile.security.last-user-is-root.last-user-is-root
 USER root

 RUN apk --no-cache add \
-        shadow libstdc++ libgpiod yaml-cpp libusb i2c-tools libuv \
-        libx11 libinput libxkbcommon \
+        libstdc++ libgpiod yaml-cpp libusb i2c-tools \
    && rm -rf /var/cache/apk/* \
    && mkdir -p /var/lib/meshtasticd \
    && mkdir -p /etc/meshtasticd/config.d \
    && mkdir -p /etc/meshtasticd/ssl
-
-# Fetch compiled binary from the builder
-COPY --from=builder /tmp/firmware/release/meshtasticd /usr/bin/
-# Copy config templates
-COPY ./bin/config.d /etc/meshtasticd/available.d
+COPY --from=builder /tmp/firmware/release/meshtasticd /usr/sbin/

 WORKDIR /var/lib/meshtasticd
 VOLUME /var/lib/meshtasticd
--- a/arch/esp32/esp32.ini
+++ b/arch/esp32/esp32.ini
@@ -2,9 +2,7 @@
 [esp32_base]
 extends = arduino_base
 custom_esp32_kind = esp32
-platform =
-  # renovate: datasource=custom.pio depName=platformio/espressif32 packageName=platformio/platform/espressif32
-  platformio/espressif32@6.10.0
+platform = platformio/espressif32@6.10.0

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

 lib_deps =
  ${arduino_base.lib_deps}
  ${networking_base.lib_deps}
  ${environmental_base.lib_deps}
-  ${environmental_extra.lib_deps}
  ${radiolib_base.lib_deps}
-  # renovate: datasource=git-refs depName=meshtastic-esp32_https_server packageName=https://github.com/meshtastic/esp32_https_server gitBranch=master
-  https://github.com/meshtastic/esp32_https_server/archive/896f1771ceb5979987a0b41028bf1b4e7aad419b.zip
-  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
+  https://github.com/meshtastic/esp32_https_server.git#23665b3adc080a311dcbb586ed5941b5f94d6ea2
  h2zero/NimBLE-Arduino@^1.4.3
-  # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
-  https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
-  # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
+  https://github.com/dbinfrago/libpax.git#3cdc0371c375676a97967547f4065607d4c53fd1
  lewisxhe/XPowersLib@^0.2.7
-  # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
-  https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
-  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
+  https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
+  rweather/Crypto@^0.4.0

 lib_ignore = 
  segger_rtt
--- a/arch/esp32/esp32c6.ini
+++ b/arch/esp32/esp32c6.ini
@@ -1,8 +1,6 @@
 [esp32c6_base]
 extends = esp32_base
-platform =
-  # Do not renovate until we have switched to pioarduino tagged builds
-  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
@@ -25,14 +23,10 @@ lib_deps =
  ${arduino_base.lib_deps}
  ${networking_base.lib_deps}
  ${environmental_base.lib_deps}
-  ${environmental_extra.lib_deps}
  ${radiolib_base.lib_deps}
-  # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
  lewisxhe/XPowersLib@^0.2.7
-  # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
-  https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
-  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
+  https://github.com/meshtastic/ESP32_Codec2.git#633326c78ac251c059ab3a8c430fcdf25b41672f
+  rweather/Crypto@^0.4.0

 build_src_filter = 
 ${esp32_base.build_src_filter} -<mesh/http> 
--- a/arch/esp32/esp32s2.ini
+++ b/arch/esp32/esp32s2.ini
@@ -16,4 +16,4 @@ build_flags =
 lib_ignore = 
  ${esp32_base.lib_ignore} 
  NimBLE-Arduino
-  libpax
+  libpax
--- a/arch/esp32/esp32s3.ini
+++ b/arch/esp32/esp32s3.ini
@@ -3,3 +3,4 @@ extends = esp32_base
 custom_esp32_kind = esp32s3

 monitor_speed = 115200
+
--- a/arch/nrf52/nrf52.ini
+++ b/arch/nrf52/nrf52.ini
@@ -1,14 +1,10 @@
 [nrf52_base]
 ; Instead of the standard nordicnrf52 platform, we use our fork which has our added variant files
-platform =
-  # renovate: datasource=custom.pio depName=platformio/nordicnrf52 packageName=platformio/platform/nordicnrf52
-  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
-  # TODO renovate
-  platformio/framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino#e13f5820002a4fb2a5e6754b42ace185277e5adf
-  ; Don't renovate toolchain-gccarmnoneeabi
+  platformio/framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino.git#e13f5820002a4fb2a5e6754b42ace185277e5adf
  platformio/toolchain-gccarmnoneeabi@~1.90301.0

 build_type = debug
@@ -21,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>
@@ -28,9 +25,8 @@ build_src_filter =
 lib_deps=
  ${arduino_base.lib_deps}
  ${radiolib_base.lib_deps}
-  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
+  rweather/Crypto@^0.4.0

 lib_ignore =
  BluetoothOTA
-  lvgl
+  lvgl
--- a/arch/nrf52/nrf52840.ini
+++ b/arch/nrf52/nrf52840.ini
@@ -6,9 +6,7 @@ build_flags = ${nrf52_base.build_flags}
 lib_deps =
  ${nrf52_base.lib_deps}
  ${environmental_base.lib_deps}
-  ${environmental_extra.lib_deps}
-  # renovate: datasource=git-refs depName=Kongduino-Adafruit_nRFCrypto packageName=https://github.com/Kongduino/Adafruit_nRFCrypto gitBranch=master
-  https://github.com/Kongduino/Adafruit_nRFCrypto/archive/5f838d2709461a2c981f642917aa50254a25c14c.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,8 +1,6 @@
 ; The Portduino based 'native' environment. Currently supported on Linux targets with real LoRa hardware (or simulated).
 [portduino_base]
-platform =
-  # renovate: datasource=git-refs depName=platform-native packageName=https://github.com/meshtastic/platform-native gitBranch=develop
-  https://github.com/meshtastic/platform-native/archive/622341c6de8a239704318b10c3dbb00c21a3eab3.zip
+platform = https://github.com/meshtastic/platform-native.git#562d189828f09fbf4c4093b3c0104bae9d8e9ff9
 framework = arduino

 build_src_filter = 
@@ -17,19 +15,18 @@ build_src_filter =
  +<mesh/raspihttp/>
  -<mesh/eth/>
  -<modules/esp32>
+  -<modules/Telemetry/EnvironmentTelemetry.cpp>
+  -<modules/Telemetry/AirQualityTelemetry.cpp>
+  -<modules/Telemetry/Sensor>
  +<../variants/portduino>

 lib_deps =
  ${env.lib_deps}
  ${networking_base.lib_deps}
  ${radiolib_base.lib_deps}
-  ${environmental_base.lib_deps}
-  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
-  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
+  rweather/Crypto@^0.4.0
  lovyan03/LovyanGFX@^1.2.0
-  # renovate: datasource=git-refs depName=libch341-spi-userspace packageName=https://github.com/pine64/libch341-spi-userspace gitBranch=main
-  https://github.com/pine64/libch341-spi-userspace/archive/af9bc27c9c30fa90772279925b7c5913dff789b4.zip
+  https://github.com/pine64/libch341-spi-userspace#a9b17e3452f7fb747000d9b4ad4409155b39f6ef

 build_flags =
  ${arduino_base.build_flags}
@@ -37,15 +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=gnu17
  -std=c++17
-
-lib_ignore = Adafruit NeoPixel
--- a/arch/rp2xx0/rp2040.ini
+++ b/arch/rp2xx0/rp2040.ini
@@ -1,13 +1,8 @@
 ; Common settings for rp2040 Processor based targets
 [rp2040_base]
-platform =
-  # TODO renovate
-  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 =
-  # TODO renovate
-  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
@@ -23,12 +18,9 @@ build_src_filter =

 lib_ignore =
  BluetoothOTA
-  lvgl

 lib_deps =
  ${arduino_base.lib_deps}
  ${environmental_base.lib_deps}
-  ${environmental_extra.lib_deps}
  ${radiolib_base.lib_deps}
-  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
+  rweather/Crypto
--- a/arch/rp2xx0/rp2350.ini
+++ b/arch/rp2xx0/rp2350.ini
@@ -1,13 +1,8 @@
-; Common settings for rp2350 Processor based targets
+; Common settings for rp2040 Processor based targets
 [rp2350_base]
-platform =
-  # TODO renovate
-  https://github.com/maxgerhardt/platform-raspberrypi#76ecf3c7e9dd4503af0331154c4ca1cddc4b03e5
-  ; For arduino-pico >= 4.4.3
+platform = https://github.com/maxgerhardt/platform-raspberrypi.git#76ecf3c7e9dd4503af0331154c4ca1cddc4b03e5 ; For arduino-pico >= 4.4.3
 extends = arduino_base
-platform_packages =
-  # TODO renovate
-  framework-arduinopico@https://github.com/earlephilhower/arduino-pico#4.4.3
+platform_packages = framework-arduinopico@https://github.com/earlephilhower/arduino-pico.git#4.4.3

 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
@@ -25,7 +20,5 @@ lib_ignore =
 lib_deps =
  ${arduino_base.lib_deps}
  ${environmental_base.lib_deps}
-  ${environmental_extra.lib_deps}
  ${radiolib_base.lib_deps}
-  # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
+  rweather/Crypto
--- a/arch/stm32/stm32.ini
+++ b/arch/stm32/stm32.ini
@@ -1,18 +1,13 @@
 [stm32_base]
 extends = arduino_base
-platform =
-  # renovate: datasource=custom.pio depName=platformio/ststm32 packageName=platformio/platform/ststm32
-  platformio/ststm32@19.1.0
-platform_packages =
-  # TODO renovate
-  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 = platformio/ststm32
+platform_packages = platformio/framework-arduinoststm32@^4.20900.0

 build_type = release

-build_flags =
+;board_build.flash_offset = 0x08000000
+
+build_flags = 
  ${arduino_base.build_flags}
  -flto
  -Isrc/platform/stm32wl -g
@@ -23,25 +18,27 @@ build_flags =
  -DMESHTASTIC_EXCLUDE_SCREEN
  -DMESHTASTIC_EXCLUDE_MQTT
  -DMESHTASTIC_EXCLUDE_BLUETOOTH
+  -DMESHTASTIC_EXCLUDE_PKI
  -DMESHTASTIC_EXCLUDE_GPS
-  ;-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}
-  # renovate: datasource=git-refs depName=caveman99-stm32-Crypto packageName=https://github.com/caveman99/Crypto gitBranch=main
-  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/99-meshtasticd-udev.rules
+++ b/bin/99-meshtasticd-udev.rules
@@ -1,7 +0,0 @@
-# Set spidev ownership to 'spi' group
-SUBSYSTEM=="spidev", KERNEL=="spidev*", GROUP="spi", MODE="0660"
-# Allow access to USB CH341 devices
-SUBSYSTEM=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="5512", MODE="0666"
-# Set gpio ownership to 'gpio' group
-SUBSYSTEM=="*gpiomem*", GROUP="gpio", MODE="0660"
-SUBSYSTEM=="gpio", GROUP="gpio", MODE="0660"
--- 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-native.sh
+++ b/bin/build-native.sh
@@ -15,7 +15,6 @@ platformioFailed() {

 VERSION=$(bin/buildinfo.py long)
 SHORT_VERSION=$(bin/buildinfo.py short)
-PIO_ENV=${1:-native}

 OUTDIR=release/

@@ -25,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 "$PIO_ENV" || platformioFailed
-pio run --environment "$PIO_ENV" || platformioFailed
-cp ".pio/build/$PIO_ENV/program" "$OUTDIR/meshtasticd_linux_$(uname -m)"
+pio 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/bump_metainfo/bump_metainfo.py
+++ b/bin/bump_metainfo/bump_metainfo.py
@@ -1,72 +0,0 @@
-#!/usr/bin/env python3
-import argparse
-import xml.etree.ElementTree as ET
-from defusedxml.ElementTree import parse
-from datetime import datetime, timezone
-
-
-# Indent by 2 spaces to align with xml formatting.
-def indent(elem, level=0):
-    i = "\n" + level * "  "
-    if len(elem):
-        if not elem.text or not elem.text.strip():
-            elem.text = i + "  "
-        for child in elem:
-            indent(child, level + 1)
-        if not child.tail or not child.tail.strip():
-            child.tail = i
-    if level and (not elem.tail or not elem.tail.strip()):
-        elem.tail = i
-
-
-def main():
-    parser = argparse.ArgumentParser(
-        description="Prepend new release entry to metainfo.xml file.")
-    parser.add_argument("--file", help="Path to the metainfo.xml file",
-                        default="org.meshtastic.meshtasticd.metainfo.xml")
-    parser.add_argument("version", help="Version string (e.g. 2.6.4)")
-    parser.add_argument("--date", help="Release date (YYYY-MM-DD), defaults to today",
-                        default=datetime.now(timezone.utc).date().isoformat())
-
-    args = parser.parse_args()
-
-    tree = parse(args.file)
-    root = tree.getroot()
-
-    releases = root.find('releases')
-    if releases is None:
-        raise RuntimeError("<releases> element not found in XML.")
-
-    existing_versions = {
-        release.get('version'): release
-        for release in releases.findall('release')
-    }
-    existing_release = existing_versions.get(args.version)
-
-    if existing_release is not None:
-        if not existing_release.get('date'):
-            print(f"Version {args.version} found without date. Adding date...")
-            existing_release.set('date', args.date)
-        else:
-            print(
-                f"Version {args.version} is already present with date, skipping insertion.")
-    else:
-        new_release = ET.Element('release', {
-            'version': args.version,
-            'date': args.date
-        })
-        url = ET.SubElement(new_release, 'url', {'type': 'details'})
-        url.text = f"https://github.com/meshtastic/firmware/releases?q=tag%3Av{args.version}"
-
-        releases.insert(0, new_release)
-
-        indent(releases, level=1)
-        releases.tail = "\n"
-
-        print(f"Inserted new release: {args.version}")
-
-    tree.write(args.file, encoding='UTF-8', xml_declaration=True)
-
-
-if __name__ == "__main__":
-    main()
--- a/bin/bump_metainfo/requirements.txt
+++ b/bin/bump_metainfo/requirements.txt
@@ -1 +0,0 @@
-defusedxml==0.7.1
--- 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
@@ -188,22 +182,14 @@ Logging:
 #  AsciiLogs: true     # default if not specified is !isatty() on stdout

 Webserver:
-#  Port: 9443 # Port for Webserver & Webservices
+#  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

-
-HostMetrics:
-#  ReportInterval: 30 # Interval in minutes between HostMetrics report packets, or 0 for disabled
-#  Channel: 0 # channel to send Host Metrics over. Defaults to the primary channel.
-#  UserStringCommand: cat /sys/firmware/devicetree/base/serial-number # Command to execute, to send the results as the userString
-
-
 General:
  MaxNodes: 200
  MaxMessageQueue: 100
  ConfigDirectory: /etc/meshtasticd/config.d/
-  AvailableDirectory: /etc/meshtasticd/available.d/
 #  MACAddress: AA:BB:CC:DD:EE:FF
-#  MACAddressSource: eth0
+#  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
@@ -11,4 +9,4 @@ Lora:
  DIO3_TCXO_VOLTAGE: true
  # Only for E22-900M33S:
  # Limit the output power to 8 dBm
-  # SX126X_MAX_POWER: 8
+  # 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-piggystick-lr1121.yaml
+++ b/bin/config.d/lora-piggystick-lr1121.yaml
@@ -1,11 +0,0 @@
-Lora:
-  Module: lr1121
-  CS: 0
-  IRQ: 6
-  Reset: 2
-  Busy: 4
-  spidev: ch341
-  DIO3_TCXO_VOLTAGE: 1.8
-#  USB_Serialnum: 12345678
-  USB_PID: 0x5512
-  USB_VID: 0x1A86
--- 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 tracksenger"
-SET "BIGDB_16MB=t-deck mesh-tab t-energy-s3 dreamcatcher ESP32-S3-Pico m5stack-cores3 station-g2 t-eth-elite t-watch-s3"
+:: 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,70 +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"
-	"tracksenger"
-)
-BIGDB_16MB=(
-	"t-deck"
-	"mesh-tab"
-	"t-energy-s3"
-	"dreamcatcher"
-	"ESP32-S3-Pico"
-	"m5stack-cores3"
-	"station-g2"
-	"t-eth-elite"
-	"t-watch-s3"
-)
-S3_VARIANTS=(
-	"s3"
-	"-v3"
-	"t-deck"
-	"wireless-paper"
-	"wireless-tracker"
-	"station-g2"
-	"unphone"
-	"t-eth-elite"
- 	"mesh-tab"
-	"dreamcatcher"
-	"ESP32-S3-Pico"
-	"seeed-sensecap-indicator"
-	"heltec_capsule_sensor_v3"
-	"vision-master"
-	"icarus"
-	"tracksenger"
-	"elecrow-adv"
-)

 # 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
@@ -72,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/meshtasticd.service
+++ b/bin/meshtasticd.service
@@ -5,11 +5,10 @@ StartLimitInterval=200
 StartLimitBurst=5

 [Service]
-AmbientCapabilities=CAP_NET_BIND_SERVICE
-User=meshtasticd
-Group=meshtasticd
+User=root
+Group=root
 Type=simple
-ExecStart=/usr/bin/meshtasticd
+ExecStart=/usr/sbin/meshtasticd
 Restart=always
 RestartSec=3

--- a/bin/native-install.sh
+++ b/bin/native-install.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash

-cp "release/meshtasticd_linux_$(uname -m)" /usr/bin/meshtasticd
+cp "release/meshtasticd_linux_$(uname -m)" /usr/sbin/meshtasticd
 mkdir -p /etc/meshtasticd
 if [[ -f "/etc/meshtasticd/config.yaml" ]]; then
 	cp bin/config-dist.yaml /etc/meshtasticd/config-upgrade.yaml
--- a/bin/org.meshtastic.meshtasticd.desktop
+++ b/bin/org.meshtastic.meshtasticd.desktop
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Name=Meshtastic
-Comment=Meshtastic App
-Exec=meshtasticd
-Icon=org.meshtastic.meshtasticd
-Terminal=true
-Type=Application
-Categories=Network;Chat;HamRadio;
--- a/bin/org.meshtastic.meshtasticd.metainfo.xml
+++ b/bin/org.meshtastic.meshtasticd.metainfo.xml
@@ -1,112 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<component type="desktop-application">
-  <id>org.meshtastic.meshtasticd</id>
-
-  <name>Meshtastic</name>
-  <summary>Decentralized mesh communication</summary>
-
-  <metadata_license>CC-BY-4.0</metadata_license>
-  <project_license>GPL-3.0-or-later</project_license>
-
-  <developer id="org.meshtastic">
-    <name>Meshtastic</name>
-  </developer>
-
-  <description>
-    <p>
-      Meshtastic is an open source project for creating off-grid, affordable, and resilient communication with LoRa mesh networks.
-    </p>
-  </description>
-
-  <launchable type="desktop-id">org.meshtastic.meshtasticd.desktop</launchable>
-
-  <categories>
-    <category>Network</category>
-    <category>Chat</category>
-    <category>HamRadio</category>
-  </categories>
-  <keywords>
-    <keyword>mesh</keyword>
-    <keyword>LoRa</keyword>
-  </keywords>
-
-  <recommends>
-    <control>keyboard</control>
-    <control>pointing</control>
-    <control>touch</control>
-  </recommends>
-  <requires>
-    <display_length compare="ge">360</display_length>
-  </requires>
-
-  <branding>
-    <color type="primary" scheme_preference="light">#97be89</color>
-    <color type="primary" scheme_preference="dark">#206538</color>
-  </branding>
-
-  <content_rating type="oars-1.1">
-    <content_attribute id="social-chat">intense</content_attribute>
-    <content_attribute id="social-location">intense</content_attribute>
-  </content_rating>
-
-  <url type="bugtracker">https://github.com/meshtastic/firmware/issues</url>
-  <url type="homepage">https://meshtastic.org/</url>
-  <url type="donation">https://opencollective.com/meshtastic</url>
-  <url type="faq">https://meshtastic.org/docs/software/linux/usage/</url>
-  <url type="vcs-browser">https://github.com/meshtastic/firmware/</url>
-
-  <screenshots>
-    <screenshot type="default">
-      <image>https://meshtastic.org/img/software/meshtastic-ui/mui_home_dashboard_dark.webp</image>
-      <caption>Home Dashboard</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://meshtastic.org/img/software/meshtastic-ui/mui_initial_boot.webp</image>
-      <caption>Setup</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://meshtastic.org/img/software/meshtastic-ui/mui_node_list_dark.webp</image>
-      <caption>Nodes List</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://meshtastic.org/img/software/meshtastic-ui/mui_chat_list_dark.webp</image>
-      <caption>Chats List</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://meshtastic.org/img/software/meshtastic-ui/mui_chat_message_dark.webp</image>
-      <caption>Messages</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://meshtastic.org/img/software/meshtastic-ui/mui_map_dark.webp</image>
-      <caption>Map</caption>
-    </screenshot>
-    <screenshot>
-      <image>https://meshtastic.org/img/software/meshtastic-ui/mui_settings_dark.webp</image>
-      <caption>Settings</caption>
-    </screenshot>
-  </screenshots>
-
-  <releases>
-    <release version="2.6.10" date="2025-05-25">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.10</url>
-    </release>
-    <release version="2.6.9" date="2025-05-15">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.9</url>
-    </release>
-    <release version="2.6.8" date="2025-05-05">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.8</url>
-    </release>
-    <release version="2.6.7" date="2025-04-28">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.7</url>
-    </release>
-    <release version="2.6.6" date="2025-04-15">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.6</url>
-    </release>
-    <release version="2.6.5" date="2025-03-30">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.5</url>
-    </release>
-    <release version="2.6.4" date="2025-03-28">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.6.4</url>
-    </release>
-  </releases>
-</component>
--- a/bin/org.meshtastic.meshtasticd.svg
+++ b/bin/org.meshtastic.meshtasticd.svg
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="512" height="512" viewBox="0 0 512 512" xml:space="preserve">
-<desc>Created with Fabric.js 4.6.0</desc>
-<defs>
-</defs>
-<g transform="matrix(1 0 0 1 256 256)" id="xYQ9Gk9Jwpgj_HMOXB3F_"  >
-<path style="stroke: rgb(213,130,139); stroke-width: 0; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: miter; stroke-miterlimit: 4; fill: rgb(103,234,148); fill-rule: nonzero; opacity: 1;" vector-effect="non-scaling-stroke"  transform=" translate(-256, -256)" d="M 0 0 L 512 0 L 512 512 L 0 512 z" stroke-linecap="round" />
-</g>
-<g transform="matrix(1.79 0 0 1.79 313.74 258.36)" id="1xBsk2n9FZp60Rz1O-ceJ"  >
-<path style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: round; stroke-miterlimit: 2; fill: rgb(44,45,60); fill-rule: evenodd; opacity: 1;" vector-effect="non-scaling-stroke"  transform=" translate(-250.97, -362.41)" d="M 250.908 330.267 L 193.126 415.005 L 180.938 406.694 L 244.802 313.037 C 246.174 311.024 248.453 309.819 250.889 309.816 C 253.326 309.814 255.606 311.015 256.982 313.026 L 320.994 406.536 L 308.821 414.869 L 250.908 330.267 Z" stroke-linecap="round" />
-</g>
-<g transform="matrix(1.81 0 0 1.81 145 256.15)" id="KxN7E9YpbyPgz0S4z4Cl6"  >
-<path style="stroke: none; stroke-width: 1; stroke-dasharray: none; stroke-linecap: butt; stroke-dashoffset: 0; stroke-linejoin: round; stroke-miterlimit: 2; fill: rgb(44,45,60); fill-rule: evenodd; opacity: 1;" vector-effect="non-scaling-stroke"  transform=" translate(-115.14, -528.06)" d="M 87.642 581.398 L 154.757 482.977 L 142.638 474.713 L 75.523 573.134 L 87.642 581.398 Z" stroke-linecap="round" />
-</g>
-</svg>
--- 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")
@@ -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.5.3
--- 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/crowpanel.json
+++ b/boards/crowpanel.json
@@ -1,43 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "esp32s3_out.ld",
-      "memory_type": "qio_opi",
-      "partitions": "default_16MB.csv"
-    },
-    "core": "esp32",
-    "extra_flags": [
-      "-DBOARD_HAS_PSRAM",
-      "-DARDUINO_USB_CDC_ON_BOOT=0",
-      "-DARDUINO_USB_MODE=1",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=0"
-    ],
-    "f_cpu": "240000000L",
-    "f_flash": "80000000L",
-    "flash_mode": "qio",
-    "hwids": [["0x303A", "0x1001"]],
-    "mcu": "esp32s3",
-    "variant": "ESP32-S3-WROOM-1-N16R8"
-  },
-  "connectivity": ["wifi", "bluetooth", "lora"],
-  "debug": {
-    "default_tool": "esp-builtin",
-    "onboard_tools": ["esp-builtin"],
-    "openocd_target": "esp32s3.cfg"
-  },
-  "frameworks": ["arduino", "espidf"],
-  "name": "ESP32-S3-WROOM-1-N16R8 (16 MB Flash, 8 MB PSRAM)",
-  "upload": {
-    "flash_size": "16MB",
-    "maximum_ram_size": 524288,
-    "maximum_size": 16777216,
-    "require_upload_port": true,
-    "speed": 921600
-  },
-  "monitor": {
-    "speed": 115200
-  },
-  "url": "https://www.espressif.com/sites/default/files/documentation/esp32-s3-wroom-1_wroom-1u_datasheet_en.pdf",
-  "vendor": "Espressif"
-}
--- 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_mesh_pocket.json
+++ b/boards/heltec_mesh_pocket.json
@@ -1,53 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "nrf52840_s140_v6.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DNRF52840_XXAA",
-    "f_cpu": "64000000L",
-    "hwids": [
-      ["0x239A", "0x4405"],
-      ["0x239A", "0x0029"],
-      ["0x239A", "0x002A"]
-    ],
-    "usb_product": "HT-n5262",
-    "mcu": "nrf52840",
-    "variant": "heltec_mesh_pocket",
-    "variants_dir": "variants",
-    "bsp": {
-      "name": "adafruit"
-    },
-    "softdevice": {
-      "sd_flags": "-DS140",
-      "sd_name": "s140",
-      "sd_version": "6.1.1",
-      "sd_fwid": "0x00B6"
-    },
-    "bootloader": {
-      "settings_addr": "0xFF000"
-    }
-  },
-  "connectivity": ["bluetooth"],
-  "debug": {
-    "jlink_device": "nRF52840_xxAA",
-    "onboard_tools": ["jlink"],
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
-  },
-  "frameworks": ["arduino"],
-  "name": "Heltec nrf (Adafruit BSP)",
-  "upload": {
-    "maximum_ram_size": 248832,
-    "maximum_size": 815104,
-    "speed": 115200,
-    "protocol": "nrfutil",
-    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
-    "use_1200bps_touch": true,
-    "require_upload_port": true,
-    "wait_for_upload_port": true
-  },
-  "url": "https://heltec.org/project/meshpocket/",
-  "vendor": "Heltec"
-}
--- 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/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_solar_node.json
+++ b/boards/seeed_solar_node.json
@@ -1,54 +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", "0x0059"]],
-    "usb_product": "XIAO-BOOT",
-    "mcu": "nrf52840",
-    "variant": "seeed_solar_node",
-    "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_solar_node",
-  "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/Seeed-XIAO-BLE-Sense-nRF52840-p-5253.html",
-  "vendor": "Seeed Studio"
-}
--- a/boards/seeed_wio_tracker_L1.json
+++ b/boards/seeed_wio_tracker_L1.json
@@ -1,54 +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", "0x1668"]],
-    "usb_product": "TRACKER L1",
-    "mcu": "nrf52840",
-    "variant": "seeed_wio_tracker_L1",
-    "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_wio_tracker_L1",
-  "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/Wio-Tracker-L1-p-6477.html",
-  "vendor": "Seeed Studio"
-}
--- 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,16 +23,16 @@
    "mcu": "esp32s3",
    "variant": "t-watch-s3"
  },
-  "connectivity": ["wifi", "bluetooth", "lora"],
+  "connectivity": ["wifi"],
  "debug": {
    "openocd_target": "esp32s3.cfg"
  },
  "frameworks": ["arduino"],
  "name": "LilyGo T-Watch 2020 V3",
  "upload": {
-    "flash_size": "16MB",
+    "flash_size": "8MB",
    "maximum_ram_size": 327680,
-    "maximum_size": 16777216,
+    "maximum_size": 8388608,
    "require_upload_port": true,
    "use_1200bps_touch": true,
    "wait_for_upload_port": true,
--- 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,19 +1,9 @@
-meshtasticd (2.6.10.0) UNRELEASED; urgency=medium
+meshtasticd (2.5.22.0) UNRELEASED; urgency=medium

-  [ Austin Lane ]
  * Initial packaging
  * GitHub Actions Automatic version bump
  * GitHub Actions Automatic version bump
  * GitHub Actions Automatic version bump
  * GitHub Actions Automatic version bump

-  [  ]
-  * GitHub Actions Automatic version bump
-
-  [  ]
-  * GitHub Actions Automatic version bump
-
-  [  ]
-  * GitHub Actions Automatic version bump
-
- --  <github-actions[bot]@users.noreply.github.com>  Sun, 25 May 2025 20:46:49 +0000
+ -- Austin Lane <github-actions[bot]@users.noreply.github.com>  Wed, 05 Feb 2025 01:10:33 +0000
--- a/debian/ci_pack_sdeb.sh
+++ b/debian/ci_pack_sdeb.sh
@@ -5,14 +5,13 @@ export PLATFORMIO_PACKAGES_DIR=pio/packages
 export PLATFORMIO_CORE_DIR=pio/core

 # Download libraries to `pio`
-platformio pkg install -e native-tft
-platformio pkg install -e native-tft -t platformio/tool-scons@4.40502.0
+platformio pkg install -e native
+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/latest/download/build.tar -o web.tar

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

--- a/debian/control
+++ b/debian/control
@@ -17,23 +17,17 @@ Build-Depends: debhelper-compat (= 13),
               libbluetooth-dev,
               libusb-1.0-0-dev,
               libi2c-dev,
-               libuv1-dev,
               openssl,
               libssl-dev,
               libulfius-dev,
-               liborcania-dev,
-               libx11-dev,
-               libinput-dev,
-               libxkbcommon-x11-dev
+               liborcania-dev
 Standards-Version: 4.6.2
 Homepage: https://github.com/meshtastic/firmware
 Rules-Requires-Root: no

 Package: meshtasticd
 Architecture: any
-Depends: adduser,
-         ${misc:Depends},
-         ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: Meshtastic daemon for communicating with Meshtastic devices
 Meshtastic is an off-grid text communication platform that uses inexpensive 
- LoRa radios.
+ LoRa radios.
--- a/debian/meshtasticd.dirs
+++ b/debian/meshtasticd.dirs
@@ -1,6 +1,5 @@
-var/lib/meshtasticd
 etc/meshtasticd
 etc/meshtasticd/config.d
 etc/meshtasticd/available.d
 usr/share/meshtasticd/web
-etc/meshtasticd/ssl
+etc/meshtasticd/ssl
--- a/debian/meshtasticd.install
+++ b/debian/meshtasticd.install
@@ -1,8 +1,8 @@
-.pio/build/native-tft/meshtasticd  usr/bin
+.pio/build/native/meshtasticd  usr/sbin

-bin/config.yaml                    etc/meshtasticd
-bin/config.d/*                     etc/meshtasticd/available.d
+bin/config.yaml                etc/meshtasticd
+bin/config.d/*                 etc/meshtasticd/available.d

-bin/meshtasticd.service            lib/systemd/system
+bin/meshtasticd.service        lib/systemd/system

-web/*                              usr/share/meshtasticd/web
+web/*                          usr/share/meshtasticd/web
--- a/debian/meshtasticd.postinst
+++ b/debian/meshtasticd.postinst
@@ -1,80 +0,0 @@
-#!/bin/sh
-# postinst script for meshtasticd
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postinst> `configure' <most-recently-configured-version>
-#        * <old-postinst> `abort-upgrade' <new version>
-#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
-#          <new-version>
-#        * <postinst> `abort-remove'
-#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
-#          <failed-install-package> <version> `removing'
-#          <conflicting-package> <version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    configure|reconfigure)
-    # create spi, gpio groups (for udev rules)
-    # these groups already exist on Raspberry Pi OS
-        getent group spi >/dev/null 2>/dev/null || addgroup --system spi
-        getent group gpio >/dev/null 2>/dev/null || addgroup --system gpio
-    # create a meshtasticd group and user
-        getent passwd meshtasticd >/dev/null 2>/dev/null || adduser --system --home /var/lib/meshtasticd --no-create-home meshtasticd
-        getent group meshtasticd >/dev/null 2>/dev/null || addgroup --system meshtasticd
-        adduser meshtasticd meshtasticd >/dev/null 2>/dev/null
-        adduser meshtasticd spi >/dev/null 2>/dev/null
-        adduser meshtasticd gpio >/dev/null 2>/dev/null
-    # add meshtasticd user to appropriate groups (if they exist)
-        getent group plugdev >/dev/null 2>/dev/null && adduser meshtasticd plugdev >/dev/null 2>/dev/null
-        getent group dialout >/dev/null 2>/dev/null && adduser meshtasticd dialout >/dev/null 2>/dev/null
-        getent group i2c >/dev/null 2>/dev/null && adduser meshtasticd i2c >/dev/null 2>/dev/null
-        getent group video >/dev/null 2>/dev/null && adduser meshtasticd video >/dev/null 2>/dev/null
-        getent group audio >/dev/null 2>/dev/null && adduser meshtasticd audio >/dev/null 2>/dev/null
-        getent group input >/dev/null 2>/dev/null && adduser meshtasticd input >/dev/null 2>/dev/null
-
-
-    # migrate /root/.portduino to /var/lib/meshtasticd/.portduino
-    # should only run once, upon upgrade from < 2.6.9
-    if [ -n "$2" ] && dpkg --compare-versions "$2" lt 2.6.9; then
-        if [ -d /root/.portduino ] && [ ! -e /var/lib/meshtasticd/.portduino ]; then
-            cp -r /root/.portduino /var/lib/meshtasticd/.portduino
-            echo "Migrated meshtasticd VFS from /root/.portduino to /var/lib/meshtasticd/.portduino"
-            echo "meshtasticd now runs as the 'meshtasticd' user, not 'root'."
-            echo "See https://github.com/meshtastic/firmware/pull/6718 for details"
-        fi
-    fi
-
-    if [ -d /var/lib/meshtasticd ]; then
-        chown -R meshtasticd:meshtasticd /var/lib/meshtasticd
-    fi
-
-    if [ -d /etc/meshtasticd ]; then
-        chown -R meshtasticd:meshtasticd /etc/meshtasticd
-    fi
-
-    if [ -d /usr/share/meshtasticd ]; then
-        chown -R meshtasticd:meshtasticd /usr/share/meshtasticd
-    fi
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-        echo "postinst called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
--- a/debian/meshtasticd.postrm
+++ b/debian/meshtasticd.postrm
@@ -1,41 +0,0 @@
-#!/bin/sh
-# postrm script for meshtasticd
-#
-# see: dh_installdeb(1)
-
-set -e
-
-# summary of how this script can be called:
-#        * <postrm> `remove'
-#        * <postrm> `purge'
-#        * <old-postrm> `upgrade' <new-version>
-#        * <new-postrm> `failed-upgrade' <old-version>
-#        * <new-postrm> `abort-install'
-#        * <new-postrm> `abort-install' <old-version>
-#        * <new-postrm> `abort-upgrade' <old-version>
-#        * <disappearer's-postrm> `disappear' <overwriter>
-#          <overwriter-version>
-# for details, see http://www.debian.org/doc/debian-policy/ or
-# the debian-policy package
-
-
-case "$1" in
-    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
-      # Only remove /var/lib/meshtasticd on purge
-      if [ "${1}" = "purge" ] ; then
-          rm -rf /var/lib/meshtasticd
-      fi
-    ;;
-
-    *)
-        echo "postrm called with unknown argument \`$1'" >&2
-        exit 1
-    ;;
-esac
-
-# dh_installdeb will replace this with shell code automatically
-# generated by other debhelper scripts.
-
-#DEBHELPER#
-
-exit 0
--- a/debian/meshtasticd.udev
+++ b/debian/meshtasticd.udev
@@ -1,7 +0,0 @@
-# Set spidev ownership to 'spi' group
-SUBSYSTEM=="spidev", KERNEL=="spidev*", GROUP="spi", MODE="0660"
-# Allow access to USB CH341 devices
-SUBSYSTEM=="usb", ATTRS{idVendor}=="1a86", ATTRS{idProduct}=="5512", MODE="0666"
-# Set gpio ownership to 'gpio' group
-SUBSYSTEM=="*gpiomem*", GROUP="gpio", MODE="0660"
-SUBSYSTEM=="gpio", GROUP="gpio", MODE="0660"
--- a/debian/rules
+++ b/debian/rules
@@ -26,7 +26,7 @@ override_dh_auto_build:
 	mkdir -p web && tar -xf web.tar -C web
 	gunzip web/ -r
 	# Build with platformio
-	$(PIO_ENV) platformio run -e native-tft
+	$(PIO_ENV) platformio run -e native
 	# Move the binary and default config to the correct name
-	mv .pio/build/native-tft/program .pio/build/native-tft/meshtasticd
+	mv .pio/build/native/program .pio/build/native/meshtasticd
 	cp bin/config-dist.yaml bin/config.yaml
--- 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
@@ -10,8 +10,6 @@
 # - https://docs.pagure.org/rpkg-util/v3/index.html
 # - https://docs.fedoraproject.org/en-US/packaging-guidelines/Versioning/

-%global  meshtasticd_user          meshtasticd   
-
 Name:           meshtasticd
 # Version Ex:   2.5.19
 Version:        {{{ meshtastic_version }}}
@@ -23,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/latest/download/build.tar

 BuildRequires: systemd-rpm-macros
 BuildRequires: python3-devel
@@ -38,18 +36,11 @@ 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)
 BuildRequires: pkgconfig(libyder)
 BuildRequires: pkgconfig(libulfius)
-# TFT components:
-BuildRequires: pkgconfig(x11)
-BuildRequires: pkgconfig(libinput)
-BuildRequires: pkgconfig(xkbcommon-x11)
-
-Requires:      systemd-udev

 %description
 Meshtastic daemon for controlling Meshtastic devices. Meshtastic is an off-grid
@@ -63,29 +54,19 @@ tar -xf %{SOURCE1} -C web
 gzip -dr web

 %build
-# Use the “native-tft” environment from platformio to build a Linux binary
-platformio run -e native-tft
+# Use the “native” environment from platformio to build a Linux binary
+platformio run -e native

 %install
-# Install meshtasticd binary
-mkdir -p %{buildroot}%{_bindir}
-install -m 0755 .pio/build/native-tft/program %{buildroot}%{_bindir}/meshtasticd
+mkdir -p %{buildroot}%{_sbindir}
+install -m 0755 .pio/build/native/program %{buildroot}%{_sbindir}/meshtasticd

-# Install portduino VFS dir
-install -p -d -m 0770 %{buildroot}%{_localstatedir}/lib/meshtasticd
-
-# Install udev rules
-mkdir -p %{buildroot}%{_udevrulesdir}
-install -m 0644 bin/99-meshtasticd-udev.rules %{buildroot}%{_udevrulesdir}/99-meshtasticd-udev.rules
-
-# Install config dirs
 mkdir -p %{buildroot}%{_sysconfdir}/meshtasticd
 install -m 0644 bin/config-dist.yaml %{buildroot}%{_sysconfdir}/meshtasticd/config.yaml
 mkdir -p %{buildroot}%{_sysconfdir}/meshtasticd/config.d
 mkdir -p %{buildroot}%{_sysconfdir}/meshtasticd/available.d
 cp -r bin/config.d/* %{buildroot}%{_sysconfdir}/meshtasticd/available.d

-# Install systemd service
 install -D -m 0644 bin/meshtasticd.service %{buildroot}%{_unitdir}/meshtasticd.service

 # Install the web files under /usr/share/meshtasticd/web
@@ -94,54 +75,10 @@ cp -r web/* %{buildroot}%{_datadir}/meshtasticd/web
 # Install default SSL storage directory (for web)
 mkdir -p %{buildroot}%{_sysconfdir}/meshtasticd/ssl

-%pre
-# create spi group (for udev rules)
-getent group spi > /dev/null || groupadd -r spi
-# create a meshtasticd group and user
-getent group %{meshtasticd_user} > /dev/null || groupadd -r %{meshtasticd_user}
-getent passwd %{meshtasticd_user} > /dev/null || \
-    useradd -r -d %{_localstatedir}/lib/meshtasticd -g %{meshtasticd_user} -G spi \
-    -s /sbin/nologin -c "Meshtastic Daemon" %{meshtasticd_user}
-# add meshtasticd user to appropriate groups (if they exist)
-getent group gpio > /dev/null && usermod -a -G gpio %{meshtasticd_user} > /dev/null
-getent group plugdev > /dev/null && usermod -a -G plugdev %{meshtasticd_user} > /dev/null
-getent group dialout > /dev/null && usermod -a -G dialout %{meshtasticd_user} > /dev/null
-getent group i2c > /dev/null && usermod -a -G i2c %{meshtasticd_user} > /dev/null
-getent group video > /dev/null && usermod -a -G video %{meshtasticd_user} > /dev/null
-getent group audio > /dev/null && usermod -a -G audio %{meshtasticd_user} > /dev/null
-getent group input > /dev/null && usermod -a -G input %{meshtasticd_user} > /dev/null
-exit 0
-
-%triggerin -- meshtasticd < 2.6.9
-# migrate .portduino (if it exists and hasn’t already been copied)
-if [ -d /root/.portduino ] && [ ! -e /var/lib/meshtasticd/.portduino ]; then
-    mkdir -p /var/lib/meshtasticd
-    cp -r /root/.portduino /var/lib/meshtasticd/.portduino
-    chown -R %{meshtasticd_user}:%{meshtasticd_user} \
-        %{_localstatedir}/lib/meshtasticd || :
-    # Fix SELinux labels if present (no-op on non-SELinux systems)
-    restorecon -R /var/lib/meshtasticd/.portduino 2>/dev/null || :
-    echo "Migrated meshtasticd VFS from /root/.portduino to /var/lib/meshtasticd/.portduino"
-    echo "meshtasticd now runs as the 'meshtasticd' user, not 'root'."
-    echo "See https://github.com/meshtastic/firmware/pull/6718 for details"
-fi
-
-%post
-%systemd_post meshtasticd.service
-
-%preun
-%systemd_preun meshtasticd.service
-
-%postun
-%systemd_postun_with_restart meshtasticd.service
-
 %files
-%defattr(-,%{meshtasticd_user},%{meshtasticd_user})
 %license LICENSE
 %doc README.md
-%{_bindir}/meshtasticd
-%dir %{_localstatedir}/lib/meshtasticd
-%{_udevrulesdir}/99-meshtasticd-udev.rules
+%{_sbindir}/meshtasticd
 %dir %{_sysconfdir}/meshtasticd
 %dir %{_sysconfdir}/meshtasticd/config.d
 %dir %{_sysconfdir}/meshtasticd/available.d
@@ -154,4 +91,4 @@ fi
 %dir %{_sysconfdir}/meshtasticd/ssl

 %changelog
-%autochangelog
+%autochangelog
--- 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]
@@ -50,26 +48,18 @@ build_flags = -Wno-missing-field-initializers
 	-DMESHTASTIC_EXCLUDE_REMOTEHARDWARE=1
 	-DMESHTASTIC_EXCLUDE_HEALTH_TELEMETRY=1
  	-DMESHTASTIC_EXCLUDE_POWERSTRESS=1 ; exclude power stress test module from main firmware
-	-DMESHTASTIC_EXCLUDE_GENERIC_THREAD_MODULE=1
        #-DBUILD_EPOCH=$UNIX_TIME
        #-D OLED_PL=1

 monitor_speed = 115200
 monitor_filters = direct
 lib_deps =
-	# renovate: datasource=git-refs depName=meshtastic-esp8266-oled-ssd1306 packageName=https://github.com/meshtastic/esp8266-oled-ssd1306 gitBranch=master
-	https://github.com/meshtastic/esp8266-oled-ssd1306/archive/0119501e9983bd894830b02f545c377ee08d66fe.zip
-	# renovate: datasource=custom.pio depName=OneButton packageName=mathertel/library/OneButton
+	https://github.com/meshtastic/esp8266-oled-ssd1306.git#e16cee124fe26490cb14880c679321ad8ac89c95
 	mathertel/OneButton@2.6.1
-	# renovate: datasource=git-refs depName=meshtastic-arduino-fsm packageName=https://github.com/meshtastic/arduino-fsm gitBranch=master
-	https://github.com/meshtastic/arduino-fsm/archive/7db3702bf0cfe97b783d6c72595e3f38e0b19159.zip
-	# renovate: datasource=git-refs depName=meshtastic-TinyGPSPlus packageName=https://github.com/meshtastic/TinyGPSPlus gitBranch=master
-	https://github.com/meshtastic/TinyGPSPlus/archive/71a82db35f3b973440044c476d4bcdc673b104f4.zip
-	# renovate: datasource=git-refs depName=meshtastic-ArduinoThread packageName=https://github.com/meshtastic/ArduinoThread gitBranch=master
-	https://github.com/meshtastic/ArduinoThread/archive/7c3ee9e1951551b949763b1f5280f8db1fa4068d.zip
-	# renovate: datasource=custom.pio depName=Nanopb packageName=nanopb/library/Nanopb
+	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.91
-	# renovate: datasource=custom.pio depName=ErriezCRC32 packageName=erriez/library/ErriezCRC32
 	erriez/ErriezCRC32@1.0.1

 ; Used for the code analysis in PIO Home / Inspect
@@ -85,111 +75,59 @@ check_flags =
 framework = arduino
 lib_deps =
 	${env.lib_deps}
-	# renovate: datasource=custom.pio depName=NonBlockingRTTTL packageName=end2endzone/library/NonBlockingRTTTL
 	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]
 lib_deps =
-	# renovate: datasource=custom.pio depName=TBPubSubClient packageName=thingsboard/library/TBPubSubClient
-	thingsboard/TBPubSubClient@2.12.1
-	# renovate: datasource=custom.pio depName=NTPClient packageName=arduino-libraries/library/NTPClient
-	arduino-libraries/NTPClient@3.2.1
-	# renovate: datasource=custom.pio depName=Syslog packageName=arcao/library/Syslog
+	knolleary/PubSubClient@2.8
+	arduino-libraries/NTPClient@3.1.0
 	arcao/Syslog@2.0.0

 [radiolib_base]
 lib_deps =
-	# renovate: datasource=custom.pio depName=RadioLib packageName=jgromes/library/RadioLib
 	jgromes/RadioLib@7.1.2

-[device-ui_base]
-lib_deps =
-	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/37e2fb84a8d1b7d8cc1e2ed00d34cfb1f284bd59.zip
-
 ; Common libs for environmental measurements in telemetry module
+; (not included in native / portduino)
 [environmental_base]
 lib_deps =
-	# renovate: datasource=custom.pio depName=Adafruit BusIO packageName=adafruit/library/Adafruit BusIO
-	adafruit/Adafruit BusIO@1.17.1
-	# renovate: datasource=custom.pio depName=Adafruit Unified Sensor packageName=adafruit/library/Adafruit Unified Sensor
-	adafruit/Adafruit Unified Sensor@1.1.15
-	# renovate: datasource=custom.pio depName=Adafruit BMP280 packageName=adafruit/library/Adafruit BMP280 Library
+	adafruit/Adafruit BusIO@1.16.2
+	adafruit/Adafruit Unified Sensor@1.1.14
 	adafruit/Adafruit BMP280 Library@2.6.8
-	# renovate: datasource=custom.pio depName=Adafruit BMP085 packageName=adafruit/library/Adafruit BMP085 Library
 	adafruit/Adafruit BMP085 Library@1.2.4
-	# renovate: datasource=custom.pio depName=Adafruit BME280 packageName=adafruit/library/Adafruit BME280 Library
-	adafruit/Adafruit BME280 Library@2.3.0
-	# renovate: datasource=custom.pio depName=Adafruit DPS310 packageName=adafruit/library/Adafruit DPS310
-	adafruit/Adafruit DPS310@1.1.5
-	# renovate: datasource=custom.pio depName=Adafruit MCP9808 packageName=adafruit/library/Adafruit MCP9808 Library
+	adafruit/Adafruit BME280 Library@2.2.4
+	adafruit/Adafruit BMP3XX Library@2.1.5
 	adafruit/Adafruit MCP9808 Library@2.0.2
-	# renovate: datasource=custom.pio depName=Adafruit INA260 packageName=adafruit/library/Adafruit INA260 Library
 	adafruit/Adafruit INA260 Library@1.5.2
-	# renovate: datasource=custom.pio depName=Adafruit INA219 packageName=adafruit/library/Adafruit INA219
 	adafruit/Adafruit INA219@1.2.3
-	# renovate: datasource=custom.pio depName=Adafruit PM25 AQI Sensor packageName=adafruit/library/Adafruit PM25 AQI Sensor
-	adafruit/Adafruit PM25 AQI Sensor@2.0.0
-	# renovate: datasource=custom.pio depName=Adafruit MPU6050 packageName=adafruit/library/Adafruit MPU6050
-	adafruit/Adafruit MPU6050@2.2.6
-	# renovate: datasource=custom.pio depName=Adafruit LIS3DH packageName=adafruit/library/Adafruit LIS3DH
-	adafruit/Adafruit LIS3DH@1.3.0
-	# renovate: datasource=custom.pio depName=Adafruit AHTX0 packageName=adafruit/library/Adafruit AHTX0
-	adafruit/Adafruit AHTX0@2.0.5
-	# renovate: datasource=custom.pio depName=Adafruit LSM6DS packageName=adafruit/library/Adafruit LSM6DS
-	adafruit/Adafruit LSM6DS@4.7.4
-	# renovate: datasource=custom.pio depName=Adafruit TSL2591 packageName=adafruit/library/Adafruit TSL2591 Library
-	adafruit/Adafruit TSL2591 Library@1.4.5
-	# renovate: datasource=custom.pio depName=EmotiBit MLX90632 packageName=emotibit/library/EmotiBit MLX90632
-	emotibit/EmotiBit MLX90632@1.0.8
-	# renovate: datasource=custom.pio depName=Adafruit MLX90614 packageName=adafruit/library/Adafruit MLX90614 Library
-	adafruit/Adafruit MLX90614 Library@2.1.5
-	# renovate: datasource=github-tags depName=INA3221 packageName=KodinLanewave/INA3221
-	https://github.com/KodinLanewave/INA3221/archive/1.0.1.zip
-	# renovate: datasource=custom.pio depName=QMC5883L Compass packageName=mprograms/library/QMC5883LCompass
-	mprograms/QMC5883LCompass@1.2.3
-	# renovate: datasource=custom.pio depName=DFRobot_RTU packageName=dfrobot/library/DFRobot_RTU
-	dfrobot/DFRobot_RTU@1.0.3
-	# renovate: datasource=git-refs depName=DFRobot_RainfallSensor packageName=https://github.com/DFRobot/DFRobot_RainfallSensor gitBranch=master
-	https://github.com/DFRobot/DFRobot_RainfallSensor/archive/38fea5e02b40a5430be6dab39a99a6f6347d667e.zip
-	# renovate: datasource=custom.pio depName=INA226 packageName=robtillaart/library/INA226
-	robtillaart/INA226@0.6.4
-	# renovate: datasource=custom.pio depName=SparkFun MAX3010x packageName=sparkfun/library/SparkFun MAX3010x Pulse and Proximity Sensor Library
-	sparkfun/SparkFun MAX3010x Pulse and Proximity Sensor Library@1.1.2
-	# renovate: datasource=custom.pio depName=SparkFun 9DoF IMU Breakout ICM 20948 packageName=sparkfun/library/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library
-	sparkfun/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library@1.3.2
-	# renovate: datasource=custom.pio depName=Adafruit LTR390 Library packageName=adafruit/library/Adafruit LTR390 Library
-	adafruit/Adafruit LTR390 Library@1.1.2
-	# renovate: datasource=custom.pio depName=Adafruit PCT2075 packageName=adafruit/library/Adafruit PCT2075
-	adafruit/Adafruit PCT2075@1.0.5
-  
-  ; (not included in native / portduino)
-[environmental_extra]
-lib_deps =
-	# renovate: datasource=custom.pio depName=Adafruit BMP3XX packageName=adafruit/library/Adafruit BMP3XX Library
-	adafruit/Adafruit BMP3XX Library@2.1.6
-	# renovate: datasource=custom.pio depName=Adafruit MAX1704X packageName=adafruit/library/Adafruit MAX1704X
 	adafruit/Adafruit MAX1704X@1.0.3
-	# renovate: datasource=custom.pio depName=Adafruit SHTC3 packageName=adafruit/library/Adafruit SHTC3 Library
 	adafruit/Adafruit SHTC3 Library@1.0.1
-	# renovate: datasource=custom.pio depName=Adafruit LPS2X packageName=adafruit/library/Adafruit LPS2X
 	adafruit/Adafruit LPS2X@2.0.6
-	# renovate: datasource=custom.pio depName=Adafruit SHT31 packageName=adafruit/library/Adafruit SHT31 Library
 	adafruit/Adafruit SHT31 Library@2.2.2
-	# renovate: datasource=custom.pio depName=Adafruit VEML7700 packageName=adafruit/library/Adafruit VEML7700 Library
+	adafruit/Adafruit 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.3
 	adafruit/Adafruit VEML7700 Library@2.1.6
-	# renovate: datasource=custom.pio depName=Adafruit SHT4x packageName=adafruit/library/Adafruit SHT4x Library
 	adafruit/Adafruit SHT4x Library@1.0.5
-	# renovate: datasource=custom.pio depName=SparkFun Qwiic Scale NAU7802 packageName=sparkfun/library/SparkFun Qwiic Scale NAU7802 Arduino Library
+	adafruit/Adafruit TSL2591 Library@1.4.5
 	sparkfun/SparkFun Qwiic Scale NAU7802 Arduino Library@1.0.6
-	# renovate: datasource=custom.pio depName=ClosedCube OPT3001 packageName=closedcube/library/ClosedCube OPT3001
+	sparkfun/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library@1.2.13
 	ClosedCube OPT3001@1.1.2
-	# renovate: datasource=custom.pio depName=Bosch BSEC2 packageName=boschsensortec/library/bsec2
-	boschsensortec/bsec2@1.10.2610
-	# renovate: datasource=custom.pio depName=Bosch BME68x packageName=boschsensortec/library/BME68x Sensor Library
-	boschsensortec/BME68x Sensor Library@1.3.40408
-	# renovate: datasource=git-refs depName=meshtastic-DFRobot_LarkWeatherStation packageName=https://github.com/meshtastic/DFRobot_LarkWeatherStation gitBranch=master
-	https://github.com/meshtastic/DFRobot_LarkWeatherStation/archive/4de3a9cadef0f6a5220a8a906cf9775b02b0040d.zip
+	emotibit/EmotiBit MLX90632@1.0.8
+	adafruit/Adafruit MLX90614 Library@2.1.5
+	https://github.com/boschsensortec/Bosch-BSEC2-Library#v1.7.2502
+	boschsensortec/BME68x Sensor Library@1.1.40407
+	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#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/renovate.json
+++ b/renovate.json
@@ -1,99 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    ":dependencyDashboard",
-    ":semanticCommitTypeAll(chore)",
-    ":ignoreModulesAndTests",
-    "group:recommended",
-    "replacements:all",
-    "workarounds:all"
-  ],
-  "forkProcessing": "enabled",
-  "ignoreDeps": [
-    "protobufs"
-  ],
-  "git-submodules": {
-    "enabled": true
-  },
-  "pip_requirements": {
-    "managerFilePatterns": [
-      "/bin/bump_metainfo/requirements.txt/"
-    ]
-  },
-  "commitMessageTopic": "{{depName}}",
-  "labels": [
-    "dependencies"
-  ],
-  "customDatasources": {
-    "pio": {
-      "description": "PlatformIO Registry",
-      "defaultRegistryUrlTemplate": "https://api.registry.platformio.org/v3/packages/{{packageName}}",
-      "format": "json",
-      "transformTemplates": [
-        "{\"releases\": [$map($.versions, function($v) { { \"version\": $v.name, \"releaseTimestamp\": $v.released_at } })], \"homepage\": $encodeUrl($join([\"https://registry.platformio.org/\",$.type,\"/\",$.owner.username,\"/\",$.name])) }"
-      ]
-    }
-  },
-  "customManagers": [
-    {
-      "customType": "regex",
-      "description": "Match meshtastic/web version",
-      "managerFilePatterns": [
-        "/bin/web.version/"
-      ],
-      "matchStrings": [
-        "(?<currentValue>.+)$"
-      ],
-      "datasourceTemplate": "github-releases",
-      "depNameTemplate": "meshtastic/web",
-      "versioningTemplate": "semver-coerced"
-    },
-    {
-      "customType": "regex",
-      "description": "Match normal PIO dependencies",
-      "managerFilePatterns": [
-        "/.*\\.ini$/"
-      ],
-      "matchStrings": [
-        "# renovate: datasource=(?<datasource>.*?)(?: depName=(?<depName>.+?))? packageName=(?<packageName>.+?)(?: versioning=(?<versioning>[a-z-]+?))?\\s+?.+?@(?<currentValue>.+?)\\s"
-      ],
-      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}"
-    },
-    {
-      "customType": "regex",
-      "description": "Match PIO zipped dependencies with github tag ref",
-      "managerFilePatterns": [
-        "/.*\\.ini$/"
-      ],
-      "matchStrings": [
-        "# renovate: datasource=github-tags(?: depName=(?<depName>.+?))? packageName=(?<packageName>.+?)(?: versioning=(?<versioning>[a-z-]+?))?\\s+?https://.+?archive/(?<currentValue>.+?).zip\\s"
-      ],
-      "datasourceTemplate": "github-tags",
-      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}semver-coerced{{/if}}"
-    },
-    {
-      "customType": "regex",
-      "description": "Match PIO zipped dependencies with git commit ref",
-      "managerFilePatterns": [
-        "/.*\\.ini$/"
-      ],
-      "matchStrings": [
-        "# renovate: datasource=git-refs(?: depName=(?<depName>.+?))? packageName=(?<packageName>.+?)(?: versioning=(?<versioning>[a-z-]+?))?\\sgitBranch=(?<gitBranch>.+?)\\s+?https://.+?archive/(?<currentDigest>.+?).zip\\s"
-      ],
-      "datasourceTemplate": "git-refs",
-      "currentValueTemplate": "{{{gitBranch}}}",
-      "versioningTemplate": "{{#if versioning}}{{{versioning}}}{{else}}git{{/if}}"
-    }
-  ],
-  "packageRules": [
-    {
-      "matchDepNames": [
-        "meshtastic/device-ui"
-      ],
-      "reviewers": [
-        "mverch67"
-      ],
-      "changelogUrl": "https://github.com/meshtastic/device-ui/compare/{{currentDigest}}...{{newDigest}}"
-    }
-  ]
-}
--- 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),
--- 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/src/BluetoothStatus.h
+++ b/src/BluetoothStatus.h
@@ -1,105 +0,0 @@
-#pragma once
-#include "Status.h"
-#include "assert.h"
-#include "configuration.h"
-#include "meshUtils.h"
-#include <Arduino.h>
-
-namespace meshtastic
-{
-
-// Describes the state of the Bluetooth connection
-// Allows display to handle pairing events without each UI needing to explicitly hook the Bluefruit / NimBLE code
-class BluetoothStatus : public Status
-{
-  public:
-    enum class ConnectionState {
-        DISCONNECTED,
-        PAIRING,
-        CONNECTED,
-    };
-
-  private:
-    CallbackObserver<BluetoothStatus, const BluetoothStatus *> statusObserver =
-        CallbackObserver<BluetoothStatus, const BluetoothStatus *>(this, &BluetoothStatus::updateStatus);
-
-    ConnectionState state = ConnectionState::DISCONNECTED;
-    std::string passkey; // Stored as string, because Bluefruit allows passkeys with a leading zero
-
-  public:
-    BluetoothStatus() { statusType = STATUS_TYPE_BLUETOOTH; }
-
-    // New BluetoothStatus: connected or disconnected
-    explicit BluetoothStatus(ConnectionState state)
-    {
-        assert(state != ConnectionState::PAIRING); // If pairing, use constructor which specifies passkey
-        statusType = STATUS_TYPE_BLUETOOTH;
-        this->state = state;
-    }
-
-    // New BluetoothStatus: pairing, with passkey
-    explicit BluetoothStatus(const std::string &passkey) : Status()
-    {
-        statusType = STATUS_TYPE_BLUETOOTH;
-        this->state = ConnectionState::PAIRING;
-        this->passkey = passkey;
-    }
-
-    ConnectionState getConnectionState() const { return this->state; }
-
-    std::string getPasskey() const
-    {
-        assert(state == ConnectionState::PAIRING);
-        return this->passkey;
-    }
-
-    void observe(Observable<const BluetoothStatus *> *source) { statusObserver.observe(source); }
-
-    bool matches(const BluetoothStatus *newStatus) const
-    {
-        if (this->state == newStatus->getConnectionState()) {
-            // Same state: CONNECTED / DISCONNECTED
-            if (this->state != ConnectionState::PAIRING)
-                return true;
-            // Same state: PAIRING, and passkey matches
-            else if (this->getPasskey() == newStatus->getPasskey())
-                return true;
-        }
-
-        return false;
-    }
-
-    int updateStatus(const BluetoothStatus *newStatus)
-    {
-        // Has the status changed?
-        if (!matches(newStatus)) {
-            // Copy the members
-            state = newStatus->getConnectionState();
-            if (state == ConnectionState::PAIRING)
-                passkey = newStatus->getPasskey();
-
-            // Tell anyone interested that we have an update
-            onNewStatus.notifyObservers(this);
-
-            // Debug only:
-            switch (state) {
-            case ConnectionState::PAIRING:
-                LOG_DEBUG("BluetoothStatus PAIRING, key=%s", passkey.c_str());
-                break;
-            case ConnectionState::CONNECTED:
-                LOG_DEBUG("BluetoothStatus CONNECTED");
-                break;
-
-            case ConnectionState::DISCONNECTED:
-                LOG_DEBUG("BluetoothStatus DISCONNECTED");
-                break;
-            }
-        }
-
-        return 0;
-    }
-};
-
-} // namespace meshtastic
-
-extern meshtastic::BluetoothStatus *bluetoothStatus;
--- a/src/ButtonThread.cpp
+++ b/src/ButtonThread.cpp
@@ -9,10 +9,8 @@
 #include "RadioLibInterface.h"
 #include "buzz.h"
 #include "main.h"
-#include "modules/CannedMessageModule.h"
 #include "modules/ExternalNotificationModule.h"
 #include "power.h"
-#include "sleep.h"
 #ifdef ARCH_PORTDUINO
 #include "platform/portduino/PortduinoGlue.h"
 #endif
@@ -27,7 +25,6 @@
 using namespace concurrency;

 ButtonThread *buttonThread; // Declared extern in header
-extern CannedMessageModule *cannedMessageModule;
 volatile ButtonThread::ButtonEventType ButtonThread::btnEvent = ButtonThread::BUTTON_EVENT_NONE;

 #if defined(BUTTON_PIN) || defined(ARCH_PORTDUINO) || defined(USERPREFS_BUTTON_PIN)
@@ -49,7 +46,7 @@ ButtonThread::ButtonThread() : OSThread("Button")
 #ifdef USERPREFS_BUTTON_PIN
    int pin = config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN; // Resolved button pin
 #endif
-#if defined(HELTEC_CAPSULE_SENSOR_V3) || defined(HELTEC_SENSOR_HUB)
+#if defined(HELTEC_CAPSULE_SENSOR_V3)
    this->userButton = OneButton(pin, false, false);
 #elif defined(BUTTON_ACTIVE_LOW)
    this->userButton = OneButton(pin, BUTTON_ACTIVE_LOW, BUTTON_ACTIVE_PULLUP);
@@ -75,28 +72,23 @@ ButtonThread::ButtonThread() : OSThread("Button")
    userButton.setDebounceMs(1);
    userButton.attachDoubleClick(userButtonDoublePressed);
    userButton.attachMultiClick(userButtonMultiPressed, this); // Reference to instance: get click count from non-static OneButton
-#if !defined(T_DECK) &&                                                                                                          \
-    !defined(                                                                                                                    \
-        ELECROW_ThinkNode_M2) // T-Deck immediately wakes up after shutdown, Thinknode M2 has this on the smaller ALT button
+#ifndef T_DECK // T-Deck immediately wakes up after shutdown, so disable this function
    userButton.attachLongPressStart(userButtonPressedLongStart);
    userButton.attachLongPressStop(userButtonPressedLongStop);
 #endif
 #endif

 #ifdef BUTTON_PIN_ALT
-#if defined(ELECROW_ThinkNode_M2)
-    this->userButtonAlt = OneButton(BUTTON_PIN_ALT, false, false);
-#else
-    this->userButtonAlt = OneButton(BUTTON_PIN_ALT, true, true);
-#endif
+    userButtonAlt = OneButton(BUTTON_PIN_ALT, true, true);
 #ifdef INPUT_PULLUP_SENSE
    // Some platforms (nrf52) have a SENSE variant which allows wake from sleep - override what OneButton did
    pinMode(BUTTON_PIN_ALT, INPUT_PULLUP_SENSE);
 #endif
-    userButtonAlt.attachClick(userButtonPressedScreen);
+    userButtonAlt.attachClick(userButtonPressed);
    userButtonAlt.setClickMs(BUTTON_CLICK_MS);
    userButtonAlt.setPressMs(BUTTON_LONGPRESS_MS);
    userButtonAlt.setDebounceMs(1);
+    userButtonAlt.attachDoubleClick(userButtonDoublePressed);
    userButtonAlt.attachLongPressStart(userButtonPressedLongStart);
    userButtonAlt.attachLongPressStop(userButtonPressedLongStop);
 #endif
@@ -107,71 +99,10 @@ ButtonThread::ButtonThread() : OSThread("Button")
    userButtonTouch.attachLongPressStart(touchPressedLongStart); // Better handling with longpress than click?
 #endif

-#ifdef ARCH_ESP32
-    // Register callbacks for before and after lightsleep
-    // Used to detach and reattach interrupts
-    lsObserver.observe(&notifyLightSleep);
-    lsEndObserver.observe(&notifyLightSleepEnd);
-#endif
-
    attachButtonInterrupts();
 #endif
 }

-void ButtonThread::switchPage()
-{
-    // Prevent screen switch if CannedMessageModule is focused and intercepting input
-#if HAS_SCREEN
-    extern CannedMessageModule *cannedMessageModule;
-
-    if (cannedMessageModule && cannedMessageModule->isInterceptingAndFocused()) {
-        LOG_DEBUG("User button ignored during canned message input");
-        return; // Skip screen change
-    }
-#endif
-
-    // Default behavior if not blocked
-#ifdef BUTTON_PIN
-#if !defined(USERPREFS_BUTTON_PIN)
-    if (((config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN) !=
-         moduleConfig.canned_message.inputbroker_pin_press) ||
-        !(moduleConfig.canned_message.updown1_enabled || moduleConfig.canned_message.rotary1_enabled) ||
-        !moduleConfig.canned_message.enabled) {
-        powerFSM.trigger(EVENT_PRESS);
-    }
-#endif
-#if defined(USERPREFS_BUTTON_PIN)
-    if (((config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN) !=
-         moduleConfig.canned_message.inputbroker_pin_press) ||
-        !(moduleConfig.canned_message.updown1_enabled || moduleConfig.canned_message.rotary1_enabled) ||
-        !moduleConfig.canned_message.enabled) {
-        powerFSM.trigger(EVENT_PRESS);
-    }
-#endif
-#endif
-
-#if defined(ARCH_PORTDUINO)
-    if ((settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC) &&
-            (settingsMap[user] != moduleConfig.canned_message.inputbroker_pin_press) ||
-        !moduleConfig.canned_message.enabled) {
-        powerFSM.trigger(EVENT_PRESS);
-    }
-#endif
-}
-
-void ButtonThread::sendAdHocPosition()
-{
-    service->refreshLocalMeshNode();
-    auto sentPosition = service->trySendPosition(NODENUM_BROADCAST, true);
-    if (screen) {
-        if (sentPosition)
-            screen->print("Sent ad-hoc position\n");
-        else
-            screen->print("Sent ad-hoc nodeinfo\n");
-        screen->forceDisplay(true); // Force a new UI frame, then force an EInk update
-    }
-}
-
 int32_t ButtonThread::runOnce()
 {
    // If the button is pressed we suppress CPU sleep until release
@@ -202,86 +133,65 @@ int32_t ButtonThread::runOnce()
            // If a nag notification is running, stop it and prevent other actions
            if (moduleConfig.external_notification.enabled && (externalNotificationModule->nagCycleCutoff != UINT32_MAX)) {
                externalNotificationModule->stopNow();
-                break;
+                return 50;
            }
-#ifdef ELECROW_ThinkNode_M1
-            sendAdHocPosition();
-            break;
+#ifdef BUTTON_PIN
+#if !defined(USERPREFS_BUTTON_PIN)
+            if (((config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN) !=
 #endif
-            switchPage();
-            break;
-        }
-
-        case BUTTON_EVENT_PRESSED_SCREEN: {
-            LOG_BUTTON("AltPress!");
-#ifdef ELECROW_ThinkNode_M1
-            // If a nag notification is running, stop it and prevent other actions
-            if (moduleConfig.external_notification.enabled && (externalNotificationModule->nagCycleCutoff != UINT32_MAX)) {
-                externalNotificationModule->stopNow();
-                break;
+#if defined(USERPREFS_BUTTON_PIN)
+            if (((config.device.button_gpio ? config.device.button_gpio : USERPREFS_BUTTON_PIN) !=
+#endif
+                 moduleConfig.canned_message.inputbroker_pin_press) ||
+                !(moduleConfig.canned_message.updown1_enabled || moduleConfig.canned_message.rotary1_enabled) ||
+                !moduleConfig.canned_message.enabled) {
+                powerFSM.trigger(EVENT_PRESS);
+            }
+#endif
+#if defined(ARCH_PORTDUINO)
+            if ((settingsMap.count(user) != 0 && settingsMap[user] != RADIOLIB_NC) &&
+                    (settingsMap[user] != moduleConfig.canned_message.inputbroker_pin_press) ||
+                !moduleConfig.canned_message.enabled) {
+                powerFSM.trigger(EVENT_PRESS);
            }
-            switchPage();
-            break;
 #endif
-            // turn screen on or off
-            screen_flag = !screen_flag;
-            if (screen)
-                screen->setOn(screen_flag);
            break;
        }

        case BUTTON_EVENT_DOUBLE_PRESSED: {
            LOG_BUTTON("Double press!");
-
-#ifdef ELECROW_ThinkNode_M1
-            digitalWrite(PIN_EINK_EN, digitalRead(PIN_EINK_EN) == LOW);
-            break;
-#endif
-
-            // Send GPS position immediately
-            sendAdHocPosition();
-
-            // Show temporary on-screen confirmation banner for 3 seconds
-            screen->showOverlayBanner("Ad-hoc Ping Sent", 3000);
+            service->refreshLocalMeshNode();
+            auto sentPosition = service->trySendPosition(NODENUM_BROADCAST, true);
+            if (screen) {
+                if (sentPosition)
+                    screen->print("Sent ad-hoc position\n");
+                else
+                    screen->print("Sent ad-hoc nodeinfo\n");
+                screen->forceDisplay(true); // Force a new UI frame, then force an EInk update
+            }
            break;
        }

        case BUTTON_EVENT_MULTI_PRESSED: {
            LOG_BUTTON("Mulitipress! %hux", multipressClickCount);
            switch (multipressClickCount) {
-#if HAS_GPS && !defined(ELECROW_ThinkNode_M1)
+#if HAS_GPS
            // 3 clicks: toggle GPS
            case 3:
                if (!config.device.disable_triple_click && (gps != nullptr)) {
                    gps->toggleGpsMode();
-
-                    const char *statusMsg = (config.position.gps_mode == meshtastic_Config_PositionConfig_GpsMode_ENABLED)
-                                                ? "GPS Enabled"
-                                                : "GPS Disabled";
-
-                    if (screen) {
+                    if (screen)
                        screen->forceDisplay(true); // Force a new UI frame, then force an EInk update
-                        screen->showOverlayBanner(statusMsg, 3000);
-                    }
                }
                break;
-#elif defined(ELECROW_ThinkNode_M1) || defined(ELECROW_ThinkNode_M2)
-            case 3:
-                LOG_INFO("3 clicks: toggle buzzer");
-                buzzer_flag = !buzzer_flag;
-                if (!buzzer_flag)
-                    noTone(PIN_BUZZER);
-                break;
-
 #endif
-
-#if defined(USE_EINK) && defined(PIN_EINK_EN) && !defined(ELECROW_ThinkNode_M1) // i.e. T-Echo
+#if defined(USE_EINK) && defined(PIN_EINK_EN) // i.e. T-Echo
            // 4 clicks: toggle backlight
            case 4:
                digitalWrite(PIN_EINK_EN, digitalRead(PIN_EINK_EN) == LOW);
                break;
 #endif
-#if !MESHTASTIC_EXCLUDE_SCREEN && HAS_SCREEN
+#if defined(RAK_4631)
            // 5 clicks: start accelerometer/magenetometer calibration for 30 seconds
            case 5:
                if (accelerometerThread) {
@@ -306,12 +216,9 @@ int32_t ButtonThread::runOnce()
        case BUTTON_EVENT_LONG_PRESSED: {
            LOG_BUTTON("Long press!");
            powerFSM.trigger(EVENT_PRESS);
-
            if (screen) {
-                // Show shutdown message as a temporary overlay banner
-                screen->showOverlayBanner("Shutting Down..."); // Display for 3 seconds
+                screen->startAlert("Shutting down...");
            }
-
            playBeep();
            break;
        }
@@ -323,30 +230,20 @@ int32_t ButtonThread::runOnce()
            playShutdownMelody();
            delay(3000);
            power->shutdown();
-            nodeDB->saveToDisk();
            break;
        }

 #ifdef BUTTON_PIN_TOUCH
        case BUTTON_EVENT_TOUCH_LONG_PRESSED: {
            LOG_BUTTON("Touch press!");
-            // Ignore if: no screen
-            if (!screen)
-                break;
+            if (screen) {
+                // Wake if asleep
+                if (powerFSM.getState() == &stateDARK)
+                    powerFSM.trigger(EVENT_PRESS);

-#ifdef TTGO_T_ECHO
-            // Ignore if: TX in progress
-            // Uncommon T-Echo hardware bug, LoRa TX triggers touch button
-            if (!RadioLibInterface::instance || RadioLibInterface::instance->isSending())
-                break;
-#endif
-
-            // Wake if asleep
-            if (powerFSM.getState() == &stateDARK)
-                powerFSM.trigger(EVENT_PRESS);
-
-            // Update display (legacy behaviour)
-            screen->forceDisplay();
+                // Update display (legacy behaviour)
+                screen->forceDisplay();
+            }
            break;
        }
 #endif // BUTTON_PIN_TOUCH
@@ -388,12 +285,8 @@ void ButtonThread::attachButtonInterrupts()
 #endif

 #ifdef BUTTON_PIN_ALT
-#ifdef ELECROW_ThinkNode_M2
-    wakeOnIrq(BUTTON_PIN_ALT, RISING);
-#else
    wakeOnIrq(BUTTON_PIN_ALT, FALLING);
 #endif
-#endif

 #ifdef BUTTON_PIN_TOUCH
    wakeOnIrq(BUTTON_PIN_TOUCH, FALLING);
@@ -427,26 +320,6 @@ void ButtonThread::detachButtonInterrupts()
 #endif
 }

-#ifdef ARCH_ESP32
-
-// Detach our class' interrupts before lightsleep
-// Allows sleep.cpp to configure its own interrupts, which wake the device on user-button press
-int ButtonThread::beforeLightSleep(void *unused)
-{
-    detachButtonInterrupts();
-    return 0; // Indicates success
-}
-
-// Reconfigure our interrupts
-// Our class' interrupts were disconnected during sleep, to allow the user button to wake the device from sleep
-int ButtonThread::afterLightSleep(esp_sleep_wakeup_cause_t cause)
-{
-    attachButtonInterrupts();
-    return 0; // Indicates success
-}
-
-#endif
-
 /**
 * Watch a GPIO and if we get an IRQ, wake the main thread.
 * Use to add wake on button press
--- a/src/ButtonThread.h
+++ b/src/ButtonThread.h
@@ -24,7 +24,6 @@ class ButtonThread : public concurrency::OSThread
    enum ButtonEventType {
        BUTTON_EVENT_NONE,
        BUTTON_EVENT_PRESSED,
-        BUTTON_EVENT_PRESSED_SCREEN,
        BUTTON_EVENT_DOUBLE_PRESSED,
        BUTTON_EVENT_MULTI_PRESSED,
        BUTTON_EVENT_LONG_PRESSED,
@@ -37,16 +36,7 @@ class ButtonThread : public concurrency::OSThread
    void attachButtonInterrupts();
    void detachButtonInterrupts();
    void storeClickCount();
-    bool isBuzzing() { return buzzer_flag; }
-    void setScreenFlag(bool flag) { screen_flag = flag; }
-    bool getScreenFlag() { return screen_flag; }
-    bool isInterceptingAndFocused();

-    // Disconnect and reconnect interrupts for light sleep
-#ifdef ARCH_ESP32
-    int beforeLightSleep(void *unused);
-    int afterLightSleep(esp_sleep_wakeup_cause_t cause);
-#endif
  private:
 #if defined(BUTTON_PIN) || defined(ARCH_PORTDUINO) || defined(USERPREFS_BUTTON_PIN)
    static OneButton userButton; // Static - accessed from an interrupt
@@ -58,30 +48,16 @@ class ButtonThread : public concurrency::OSThread
    OneButton userButtonTouch;
 #endif

-#ifdef ARCH_ESP32
-    // Get notified when lightsleep begins and ends
-    CallbackObserver<ButtonThread, void *> lsObserver =
-        CallbackObserver<ButtonThread, void *>(this, &ButtonThread::beforeLightSleep);
-    CallbackObserver<ButtonThread, esp_sleep_wakeup_cause_t> lsEndObserver =
-        CallbackObserver<ButtonThread, esp_sleep_wakeup_cause_t>(this, &ButtonThread::afterLightSleep);
-#endif
-
    // set during IRQ
    static volatile ButtonEventType btnEvent;
-    bool buzzer_flag = false;
-    bool screen_flag = true;

    // Store click count during callback, for later use
    volatile int multipressClickCount = 0;

    static void wakeOnIrq(int irq, int mode);

-    static void sendAdHocPosition();
-    static void switchPage();
-
    // IRQ callbacks
    static void userButtonPressed() { btnEvent = BUTTON_EVENT_PRESSED; }
-    static void userButtonPressedScreen() { btnEvent = BUTTON_EVENT_PRESSED_SCREEN; }
    static void userButtonDoublePressed() { btnEvent = BUTTON_EVENT_DOUBLE_PRESSED; }
    static void userButtonMultiPressed(void *callerThread); // Retrieve click count from non-static Onebutton while still valid
    static void userButtonPressedLongStart();
--- a/src/DebugConfiguration.h
+++ b/src/DebugConfiguration.h
@@ -121,15 +121,10 @@ extern "C" void logLegacy(const char *level, const char *fmt, ...);
 // Default Bluetooth PIN
 #define defaultBLEPin 123456

-#if HAS_ETHERNET && !defined(USE_WS5500)
+#if HAS_ETHERNET
 #include <RAK13800_W5100S.h>
 #endif // HAS_ETHERNET

-#if HAS_ETHERNET && defined(USE_WS5500)
-#include <ETHClass2.h>
-#define ETH ETH2
-#endif // HAS_ETHERNET
-
 #if HAS_WIFI
 #include <WiFi.h>
 #endif // HAS_WIFI
@@ -169,4 +164,4 @@ class Syslog
    bool vlogf(uint16_t pri, const char *appName, const char *fmt, va_list args) __attribute__((format(printf, 3, 0)));
 };

-#endif // HAS_NETWORKING
+#endif // HAS_ETHERNET || HAS_WIFI
--- a/src/DisplayFormatters.cpp
+++ b/src/DisplayFormatters.cpp
@@ -27,6 +27,9 @@ const char *DisplayFormatters::getModemPresetDisplayName(meshtastic_Config_LoRaC
    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE:
        return useShortName ? "LongM" : "LongMod";
        break;
+    case meshtastic_Config_LoRaConfig_ModemPreset_VERY_LONG_SLOW:
+        return useShortName ? "VeryL" : "VLongSlow";
+        break;
    default:
        return useShortName ? "Custom" : "Invalid";
        break;
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
vidplace7	24fb23442b	Add trunk rules matching other Dockerfiles	2025-02-26 21:29:35 -05:00
vidplace7	9431a75326	Remove device-ui checkin	2025-02-26 20:46:16 -05:00
rickmark	02ccb43092	Include meshtasticd dependencies	2025-02-26 20:46:16 -05:00