Merge branch 'master' into crowpanelV2

2026-10-10 05:51:01 +10:00 · 2026-03-28 07:54:33 +01:00 · 2026-03-06 16:05:24 -06:00 · 2026-03-06 05:55:46 -06:00 · 2026-03-04 08:25:49 -06:00 · 2026-03-03 20:00:10 +01:00
117 changed files with 281 additions and 1824 deletions
@@ -5,7 +5,7 @@ on:
  workflow_dispatch:
  push:
    branches:
-      - develop # Default branch, same as 'cron' above
+      - master
    paths:
      - debian/**
      - "*.rpkg"
@@ -56,25 +56,6 @@ jobs:
          echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
        id: version

-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4
-        with:
-          cache-image: true
-
-      - name: Docker setup
-        uses: docker/setup-buildx-action@v4
-        with:
-          # Add Google/Amazon DockerHub mirrors to buildkit config
-          # https://docs.docker.com/build/ci/github-actions/configure-builder/#registry-mirror
-          buildkitd-config-inline: |
-            [registry."docker.io"]
-              mirrors = ["mirror.gcr.io", "public.ecr.aws"]
-
-      - name: Sanitize platform string
-        id: sanitize_platform
-        # Replace slashes with underscores
-        run: echo "cleaned_platform=${{ inputs.platform }}" | sed 's/\//_/g' >> $GITHUB_OUTPUT
-
      - name: Docker login
        if: ${{ inputs.push }}
        uses: docker/login-action@v4
@@ -82,6 +63,17 @@ jobs:
          username: meshtastic
          password: ${{ secrets.DOCKER_FIRMWARE_TOKEN }}

+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v4
+
+      - name: Docker setup
+        uses: docker/setup-buildx-action@v4
+
+      - name: Sanitize platform string
+        id: sanitize_platform
+        # Replace slashes with underscores
+        run: echo "cleaned_platform=${{ inputs.platform }}" | sed 's/\//_/g' >> $GITHUB_OUTPUT
+
      - name: Docker tag
        id: meta
        uses: docker/metadata-action@v6
@@ -103,6 +95,3 @@ jobs:
          platforms: ${{ inputs.platform }}
          build-args: |
            PIO_ENV=${{ inputs.pio_env }}
-          # Cache image layers in GitHub Actions cache to speed up subsequent builds.
-          cache-from: type=gha
-          cache-to: type=gha,mode=max
@@ -301,17 +301,15 @@ jobs:
        id: release_notes
        run: |
          chmod +x ./bin/generate_release_notes.py
-          NOTES=$(./bin/generate_release_notes.py ${{ needs.version.outputs.long }} --compare-ref HEAD 2>release_notes.log)
+          NOTES=$(./bin/generate_release_notes.py ${{ needs.version.outputs.long }})
          echo "notes<<EOF" >> $GITHUB_OUTPUT
          echo "$NOTES" >> $GITHUB_OUTPUT
          echo "EOF" >> $GITHUB_OUTPUT
-          echo "### Release note range" >> $GITHUB_STEP_SUMMARY
-          cat release_notes.log >> $GITHUB_STEP_SUMMARY
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

      - name: Create release
-        uses: softprops/action-gh-release@v3
+        uses: softprops/action-gh-release@v2
        id: create_release
        with:
          draft: true
@@ -468,7 +466,7 @@ jobs:
      - name: Generate release notes
        run: |
          chmod +x ./bin/generate_release_notes.py
-          ./bin/generate_release_notes.py ${{ needs.version.outputs.long }} --compare-ref HEAD > ./publish/release_notes.md
+          ./bin/generate_release_notes.py ${{ needs.version.outputs.long }} > ./publish/release_notes.md
        env:
          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

@@ -38,7 +38,7 @@ jobs:

      - name: Apply quality label if needed
        if: steps.quality.outputs.response != '' && steps.quality.outputs.response != 'ok'
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
        env:
          QUALITY_LABEL: ${{ steps.quality.outputs.response }}
        with:
@@ -80,7 +80,7 @@ jobs:
      # ─────────────────────────────────────────────────────────────────────────
      - name: Determine if completeness check should be skipped
        if: steps.quality.outputs.response == 'ok' || steps.quality.outputs.response == ''
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
        id: check-skip
        with:
          script: |
@@ -134,7 +134,7 @@ jobs:

      - name: Process analysis result
        if: (steps.quality.outputs.response == 'ok' || steps.quality.outputs.response == '') && steps.check-skip.outputs.should_skip != 'true' && steps.analysis.outputs.response != ''
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
        id: process
        env:
          AI_RESPONSE: ${{ steps.analysis.outputs.response }}
@@ -174,7 +174,7 @@ jobs:

      - name: Apply triage label
        if: steps.process.outputs.label != '' && steps.process.outputs.label != 'none'
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
        env:
          LABEL_NAME: ${{ steps.process.outputs.label }}
        with:
@@ -200,7 +200,7 @@ jobs:

      - name: Comment on issue
        if: steps.process.outputs.should_comment == 'true'
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
        env:
          COMMENT_BODY: ${{ steps.process.outputs.comment_body }}
        with:
@@ -22,7 +22,7 @@ jobs:
      # Step 1: Check if PR already has automation/type labels (skip if so)
      # ─────────────────────────────────────────────────────────────────────────
      - name: Check existing labels
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
        id: check-labels
        with:
          script: |
@@ -58,7 +58,7 @@ jobs:

      - name: Apply quality label if needed
        if: steps.check-labels.outputs.skip_all != 'true' && steps.quality.outputs.response != '' && steps.quality.outputs.response != 'ok'
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
        id: quality-label
        env:
          QUALITY_LABEL: ${{ steps.quality.outputs.response }}
@@ -113,7 +113,7 @@ jobs:

      - name: Apply type label
        if: steps.check-labels.outputs.skip_all != 'true' && steps.check-labels.outputs.has_type_label != 'true' && steps.classify.outputs.response != ''
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
        env:
          TYPE_LABEL: ${{ steps.classify.outputs.response }}
        with:
@@ -5,8 +5,6 @@ on:
    secrets:
      PPA_GPG_PRIVATE_KEY:
        required: true
-      PPA_SFTP_PRIVATE_KEY:
-        required: true
    inputs:
      ppa_repo:
        description: Meshtastic PPA to target
@@ -29,7 +27,6 @@ jobs:
      build_location: ppa

  package-ppa:
-    if: ${{ github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
    runs-on: ubuntu-24.04
    needs: build-debian-src
    steps:
@@ -43,7 +40,7 @@ jobs:
        shell: bash
        run: |
          sudo apt-get update -y --fix-missing
-          sudo apt-get install -y dput openssh-client
+          sudo apt-get install -y dput

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

-      - name: Trust Launchpad's SSH key
+      - name: Publish with dput
+        if: ${{ github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
        run: |
-          mkdir -p ~/.ssh
-          ssh-keyscan -H ppa.launchpad.net >> ~/.ssh/known_hosts
-
-      - name: Setup dput config
-        env:
-          ppa_login: meshtasticorg
-        run: |
-          sudo tee /etc/meshtastic-dput.cf >/dev/null <<EOF
-          [ppa]
-          fqdn                    = ppa.launchpad.net
-          method                  = ftp
-          incoming                = ~%(ppa)s
-          login                   = anonymous
-
-          [ssh-ppa]
-          fqdn                    = ppa.launchpad.net
-          method                  = sftp
-          incoming                = ~%(ssh-ppa)s
-          login                   = ${ppa_login}
-          EOF
-
-      - name: Import SSH key
-        uses: webfactory/ssh-agent@v0.10.0
-        with:
-          ssh-private-key: ${{ secrets.PPA_SFTP_PRIVATE_KEY }}
-        id: ssh
-
-      - name: Publish with dput (sftp)
-        timeout-minutes: 30 # dput is terrible, sometimes runs 'forever'
-        env:
-          up_ppa_repo: ${{ inputs.ppa_repo }}
-          up_series: ${{ inputs.series }}
-          up_version: ${{ steps.version.outputs.deb }}
-        run: >
-          dput -c /etc/meshtastic-dput.cf
-          ssh-${up_ppa_repo}
-          meshtasticd_${up_version}~${up_series}_source.changes
+          dput ${{ inputs.ppa_repo }} meshtasticd_${{ steps.version.outputs.deb }}~${{ inputs.series }}_source.changes
@@ -13,7 +13,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Check for PR labels
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
        with:
          script: |
            const labels = context.payload.pull_request.labels.map(label => label.name);
@@ -177,7 +177,7 @@ jobs:

      - name: Comment test results on PR
        if: github.event_name == 'pull_request' && needs.native-tests.result != 'skipped'
-        uses: actions/github-script@v9
+        uses: actions/github-script@v8
        with:
          script: |
            const fs = require('fs');
@@ -52,7 +52,7 @@ jobs:
          node-version: 24

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

@@ -8,20 +8,20 @@ plugins:
      uri: https://github.com/trunk-io/plugins
 lint:
  enabled:
-    - checkov@3.2.517
-    - renovate@43.110.9
+    - checkov@3.2.511
+    - renovate@43.92.1
    - prettier@3.8.1
-    - trufflehog@3.94.3
+    - trufflehog@3.94.1
    - yamllint@1.38.0
    - bandit@1.9.4
    - trivy@0.69.3
    - taplo@0.10.0
-    - ruff@0.15.9
+    - ruff@0.15.8
    - isort@8.0.1
    - markdownlint@0.48.0
    - oxipng@10.1.0
    - svgo@4.0.1
-    - actionlint@1.7.12
+    - actionlint@1.7.11
    - flake8@7.3.0
    - hadolint@2.14.0
    - shfmt@3.6.0
@@ -1,39 +0,0 @@
-# MeshAdv-Pi E22-900M30S
-# https://github.com/chrismyers2000/MeshAdv-Pi-Hat
-Meta:
-  name: MeshAdv-Pi E22-900M30S
-  support: community
-  compatible:
-    - ebyte-ecb41-pge # Armbian
-
-Lora:
-  Module: sx1262
-  CS: # GPIO0_A1 (physical 40)
-    pin: 1
-    gpiochip: 0
-    line: 1
-  IRQ: # GPIO0_A3 (physical 36)
-    pin: 3
-    gpiochip: 0
-    line: 3
-  Busy: # GPIO0_A0 (physical 38)
-    pin: 0
-    gpiochip: 0
-    line: 0
-  Reset: # GPIO0_B4 (physical 12)
-    pin: 12
-    gpiochip: 0
-    line: 12
-  TXen: # GPIO1_D1 (physical 33)
-    pin: 57
-    gpiochip: 1
-    line: 25
-  RXen: # GPIO1_B3 (physical 32)
-    pin: 43
-    gpiochip: 1
-    line: 11
-  DIO3_TCXO_VOLTAGE: true
-  # Only for E22-900M33S:
-  # Limit the output power to 8 dBm
-  # SX126X_MAX_POWER: 8
-  spidev: spidev0.0
@@ -1,33 +0,0 @@
-# MeshAdv Mini E22-900M22S
-# https://github.com/chrismyers2000/MeshAdv-Mini
-Meta:
-  name: MeshAdv Mini E22-900M22S
-  support: community
-  compatible:
-    - ebyte-ecb41-pge # Armbian
-
-Lora:
-  Module: sx1262 # Ebyte E22-900M22S
-  CS: # GPIO0_B6 (physical 24, SPI1_CSN0)
-    pin: 14
-    gpiochip: 0
-    line: 14
-  IRQ: # GPIO0_A3 (physical 36)
-    pin: 3
-    gpiochip: 0
-    line: 3
-  Busy: # GPIO0_A0 (physical 38)
-    pin: 0
-    gpiochip: 0
-    line: 0
-  Reset: # GPIO1_C3 (physical 18)
-    pin: 51
-    gpiochip: 1
-    line: 19
-  RXen: # GPIO1_B3 (physical 32)
-    pin: 43
-    gpiochip: 1
-    line: 11
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  spidev: spidev0.0
@@ -1,38 +0,0 @@
-Meta:
-  name: RAK6421 + RAK13300 Slot 1
-  support: community # Promote when tested
-  compatible:
-    - ebyte-ecb41-pge # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO0_A5 (IO6, physical 15)
-    pin: 5
-    gpiochip: 0
-    line: 5
-  Reset: # GPIO0_A3 (IO4, physical 36)
-    pin: 3
-    gpiochip: 0
-    line: 3
-  Busy: # GPIO1_C3 (IO5, physical 18)
-    pin: 51
-    gpiochip: 1
-    line: 19
-  # Ant_sw: # GPIO1_C2 (IO3, physical 16)
-  #   pin: 50
-  #   gpiochip: 1
-  #   line: 18
-  Enable_Pins:
-    - pin: 43 # GPIO1_B3 (physical 32)
-      gpiochip: 1
-      line: 11
-    - pin: 57 # GPIO1_D1 (physical 33)
-      gpiochip: 1
-      line: 25
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
-  spidev: spidev0.0
-  # CS: # GPIO0_B6 (SPI1_CSN0, physical 24)
-  #   pin: 14
-  #   gpiochip: 0
-  #   line: 14
@@ -1,36 +0,0 @@
-Meta:
-  name: RAK6421 + RAK13300 Slot 2
-  support: community # Promote when tested
-  compatible:
-    - ebyte-ecb41-pge # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO0_B4 (IO6, physical 12)
-    pin: 12
-    gpiochip: 0
-    line: 12
-  Reset: # GPIO1_C3 (IO4, physical 18)
-    pin: 51
-    gpiochip: 1
-    line: 19
-  Busy: # GPIO0_B3 (IO5, physical 35)
-    pin: 11
-    gpiochip: 0
-    line: 11
-  # Ant_sw: # GPIO1_C2 (IO3, physical 16)
-  #   pin: 50
-  #   gpiochip: 1
-  #   line: 18
-  Enable_Pins:
-    - pin: 2 # GPIO0_A2 (physical 37)
-      gpiochip: 0
-      line: 2
-    - pin: 50 # GPIO1_C2 (physical 16)
-      gpiochip: 1
-      line: 18
-  spidev: spidev0.1
-  # CS: # GPIO0_A7 (SPI1_CSN1, physical 26)
-  #   pin: 7
-  #   gpiochip: 0
-  #   line: 7
@@ -1,39 +0,0 @@
-Meta:
-  name: RAK6421 + RAK13302 Slot 1
-  support: community # Promote when tested
-  compatible:
-    - ebyte-ecb41-pge # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO0_A5 (IO6, physical 15)
-    pin: 5
-    gpiochip: 0
-    line: 5
-  Reset: # GPIO0_A3 (IO4, physical 36)
-    pin: 3
-    gpiochip: 0
-    line: 3
-  Busy: # GPIO1_C3 (IO5, physical 18)
-    pin: 51
-    gpiochip: 1
-    line: 19
-  # Ant_sw: # GPIO1_C2 (IO3, physical 16)
-  #   pin: 50
-  #   gpiochip: 1
-  #   line: 18
-  Enable_Pins:
-    - pin: 43 # GPIO1_B3 (physical 32)
-      gpiochip: 1
-      line: 11
-    - pin: 57 # GPIO1_D1 (physical 33)
-      gpiochip: 1
-      line: 25
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
-  spidev: spidev0.0
-  # CS: # GPIO0_B6 (SPI1_CSN0, physical 24)
-  #   pin: 14
-  #   gpiochip: 0
-  #   line: 14
-  TX_GAIN_LORA: [9, 9, 10, 11, 9, 8, 9, 10, 10, 10, 11, 12, 12, 12, 12, 12, 12, 12, 12, 10, 9, 8]
@@ -1,37 +0,0 @@
-Meta:
-  name: RAK6421 + RAK13302 Slot 2
-  support: community # Promote when tested
-  compatible:
-    - ebyte-ecb41-pge # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO0_B4 (IO6, physical 12)
-    pin: 12
-    gpiochip: 0
-    line: 12
-  Reset: # GPIO1_C3 (IO4, physical 18)
-    pin: 51
-    gpiochip: 1
-    line: 19
-  Busy: # GPIO0_B3 (IO5, physical 35)
-    pin: 11
-    gpiochip: 0
-    line: 11
-  # Ant_sw: # GPIO1_C2 (IO3, physical 16)
-  #   pin: 50
-  #   gpiochip: 1
-  #   line: 18
-  Enable_Pins:
-    - pin: 2 # GPIO0_A2 (physical 37)
-      gpiochip: 0
-      line: 2
-    - pin: 50 # GPIO1_C2 (physical 16)
-      gpiochip: 1
-      line: 18
-  spidev: spidev0.1
-  # CS: # GPIO0_A7 (SPI1_CSN1, physical 26)
-  #   pin: 7
-  #   gpiochip: 0
-  #   line: 7
-  TX_GAIN_LORA: [9, 9, 10, 11, 9, 8, 9, 10, 10, 10, 11, 12, 12, 12, 12, 12, 12, 12, 12, 10, 9, 8]
@@ -1,30 +0,0 @@
-Meta:
-  name: Waveshare SX1262
-  support: deprecated
-  compatible:
-    - ebyte-ecb41-pge # Armbian
-
-Lora:
-  Module: sx1262  # Waveshare SX126X XXXM
-  DIO2_AS_RF_SWITCH: true
-  CS: # GPIO0_A1 (physical 40)
-    pin: 1
-    gpiochip: 0
-    line: 1
-  IRQ: # GPIO0_A3 (physical 36)
-    pin: 3
-    gpiochip: 0
-    line: 3
-  Busy: # GPIO0_A0 (physical 38)
-    pin: 0
-    gpiochip: 0
-    line: 0
-  Reset: # GPIO0_B4 (physical 12)
-    pin: 12
-    gpiochip: 0
-    line: 12
-  SX126X_ANT_SW: # GPIO1_B2 (physical 31)
-    pin: 42
-    gpiochip: 1
-    line: 10
-  spidev: spidev0.0
@@ -1,39 +0,0 @@
-# MeshAdv-Pi E22-900M30S
-# https://github.com/chrismyers2000/MeshAdv-Pi-Hat
-Meta:
-  name: MeshAdv-Pi E22-900M30S
-  support: community
-  compatible:
-    - luckfox-lyra-zero-w # Armbian
-
-Lora:
-  Module: sx1262
-  CS: # GPIO0_C2 (physical 40)
-    pin: 18
-    gpiochip: 0
-    line: 18
-  IRQ: # GPIO1_D1 (physical 36)
-    pin: 57
-    gpiochip: 1
-    line: 25
-  Busy: # GPIO0_C1 (physical 38)
-    pin: 17
-    gpiochip: 0
-    line: 17
-  Reset: # GPIO0_B6 (physical 12)
-    pin: 14
-    gpiochip: 0
-    line: 14
-  TXen: # GPIO1_C2 (physical 33)
-    pin: 50
-    gpiochip: 1
-    line: 18
-  RXen: # GPIO1_D2 (physical 32)
-    pin: 58
-    gpiochip: 1
-    line: 26
-  DIO3_TCXO_VOLTAGE: true
-  # Only for E22-900M33S:
-  # Limit the output power to 8 dBm
-  # SX126X_MAX_POWER: 8
-  spidev: spidev0.0
@@ -1,33 +0,0 @@
-# MeshAdv Mini E22-900M22S
-# https://github.com/chrismyers2000/MeshAdv-Mini
-Meta:
-  name: MeshAdv Mini E22-900M22S
-  support: community
-  compatible:
-    - luckfox-lyra-zero-w # Armbian
-
-Lora:
-  Module: sx1262 # Ebyte E22-900M22S
-  CS: # GPIO0_B2_d (phys 24, RPi CE0)
-    pin: 10
-    gpiochip: 0
-    line: 10
-  IRQ: # GPIO1_D1_d (phys 36, RPi GPIO16)
-    pin: 57
-    gpiochip: 1
-    line: 25
-  Busy: # GPIO0_C1_d (phys 38, RPi GPIO20)
-    pin: 17
-    gpiochip: 0
-    line: 17
-  Reset: # GPIO0_B4_d (phys 18, RPi GPIO24)
-    pin: 12
-    gpiochip: 0
-    line: 12
-  RXen: # GPIO1_D2_d (phys 32, RPi GPIO12)
-    pin: 58
-    gpiochip: 1
-    line: 26
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  spidev: spidev0.0
@@ -1,38 +0,0 @@
-Meta:
-  name: RAK6421 + RAK13300 Slot 1
-  support: community # Promote when tested
-  compatible:
-    - luckfox-lyra-zero-w # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO0_A5 (IO6)
-    pin: 5
-    gpiochip: 0
-    line: 5
-  Reset: # GPIO1_D1 (IO4)
-    pin: 57
-    gpiochip: 1
-    line: 25
-  Busy: # GPIO0_B4 (IO5)
-    pin: 12
-    gpiochip: 0
-    line: 12
-  # Ant_sw: # GPIO1_C2 (IO3)
-  #   pin: 50
-  #   gpiochip: 1
-  #   line: 18
-  Enable_Pins:
-    - pin: 58 # GPIO1_D2
-      gpiochip: 1
-      line: 26
-    - pin: 50 # GPIO1_C2
-      gpiochip: 1
-      line: 18
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
-  spidev: spidev0.0
-  # CS: # GPIO0_B2
-  #   pin: 10
-  #   gpiochip: 0
-  #   line: 10
@@ -1,36 +0,0 @@
-Meta:
-  name: RAK6421 + RAK13300 Slot 2
-  support: community # Promote when tested
-  compatible:
-    - luckfox-lyra-zero-w # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO0_B6 (IO6)
-    pin: 14
-    gpiochip: 0
-    line: 14
-  Reset: # GPIO0_B4 (IO4)
-    pin: 12
-    gpiochip: 0
-    line: 12
-  Busy: # GPIO1_C0 (IO5)
-    pin: 48
-    gpiochip: 1
-    line: 16
-  # Ant_sw: # GPIO0_B5 (IO3)
-  #   pin: 13
-  #   gpiochip: 0
-  #   line: 13
-  Enable_Pins:
-    - pin: 51 # GPIO1_C3
-      gpiochip: 1
-      line: 19
-    - pin: 13 # GPIO0_B5
-      gpiochip: 0
-      line: 13
-  spidev: spidev0.1
-  # CS: # GPIO0_B1
-  #   pin: 9
-  #   gpiochip: 0
-  #   line: 9
@@ -1,39 +0,0 @@
-Meta:
-  name: RAK6421 + RAK13300 Slot 1
-  support: community # Promote when tested
-  compatible:
-    - luckfox-lyra-zero-w # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO0_A5 (IO6)
-    pin: 5
-    gpiochip: 0
-    line: 5
-  Reset: # GPIO1_D1 (IO4)
-    pin: 57
-    gpiochip: 1
-    line: 25
-  Busy: # GPIO0_B4 (IO5)
-    pin: 12
-    gpiochip: 0
-    line: 12
-  # Ant_sw: # GPIO1_C2 (IO3)
-  #   pin: 50
-  #   gpiochip: 1
-  #   line: 18
-  Enable_Pins:
-    - pin: 58 # GPIO1_D2
-      gpiochip: 1
-      line: 26
-    - pin: 50 # GPIO1_C2
-      gpiochip: 1
-      line: 18
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
-  spidev: spidev0.0
-  # CS: # GPIO0_B2
-  #   pin: 10
-  #   gpiochip: 0
-  #   line: 10
-  TX_GAIN_LORA: [9, 9, 10, 11, 9, 8, 9, 10, 10, 10, 11, 12, 12, 12, 12, 12, 12, 12, 12, 10, 9, 8]
@@ -1,37 +0,0 @@
-Meta:
-  name: RAK6421 + RAK13300 Slot 2
-  support: community # Promote when tested
-  compatible:
-    - luckfox-lyra-zero-w # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO0_B6 (IO6)
-    pin: 14
-    gpiochip: 0
-    line: 14
-  Reset: # GPIO0_B4 (IO4)
-    pin: 12
-    gpiochip: 0
-    line: 12
-  Busy: # GPIO1_C0 (IO5)
-    pin: 48
-    gpiochip: 1
-    line: 16
-  # Ant_sw: # GPIO0_B5 (IO3)
-  #   pin: 13
-  #   gpiochip: 0
-  #   line: 13
-  Enable_Pins:
-    - pin: 51 # GPIO1_C3
-      gpiochip: 1
-      line: 19
-    - pin: 13 # GPIO0_B5
-      gpiochip: 0
-      line: 13
-  spidev: spidev0.1
-  # CS: # GPIO0_B1
-  #   pin: 9
-  #   gpiochip: 0
-  #   line: 9
-  TX_GAIN_LORA: [9, 9, 10, 11, 9, 8, 9, 10, 10, 10, 11, 12, 12, 12, 12, 12, 12, 12, 12, 10, 9, 8]
@@ -1,30 +0,0 @@
-Meta:
-  name: Waveshare SX1262
-  support: deprecated
-  compatible:
-    - luckfox-lyra-zero-w # Armbian
-
-Lora:
-  Module: sx1262  # Waveshare SX126X XXXM
-  DIO2_AS_RF_SWITCH: true
-  CS: # GPIO0_C2 (physical 40)
-    pin: 18
-    gpiochip: 0
-    line: 18
-  IRQ: # GPIO1_D1 (physical 36)
-    pin: 57
-    gpiochip: 1
-    line: 25
-  Busy: # GPIO0_C1 (physical 38)
-    pin: 17
-    gpiochip: 0
-    line: 17
-  Reset: # GPIO0_B6 (physical 12)
-    pin: 14
-    gpiochip: 0
-    line: 14
-  SX126X_ANT_SW: # GPIO1_B3 (physical 31)
-    pin: 43
-    gpiochip: 1
-    line: 11
-  spidev: spidev0.0
@@ -1,41 +0,0 @@
-# !! WARNING: Hats on the OK3506 board are installed "backwards" (facing outwards)
-
-# MeshAdv-Pi E22-900M30S
-# https://github.com/chrismyers2000/MeshAdv-Pi-Hat
-Meta:
-  name: MeshAdv-Pi E22-900M30S
-  support: community
-  compatible:
-    - forlinx-ok3506-s12 # Armbian
-
-Lora:
-  Module: sx1262
-  CS: # GPIO0_B0 (physical 40)
-    pin: 8
-    gpiochip: 0
-    line: 8
-  IRQ: # GPIO3_B0 (physical 36)
-    pin: 104
-    gpiochip: 3
-    line: 8
-  Busy: # GPIO0_B1 (physical 38)
-    pin: 9
-    gpiochip: 0
-    line: 9
-  Reset: # GPIO0_B6 (physical 12)
-    pin: 14
-    gpiochip: 0
-    line: 14
-  TXen: # GPIO0_A3 (physical 33)
-    pin: 3
-    gpiochip: 0
-    line: 3
-  RXen: # GPIO0_A2 (physical 32)
-    pin: 2
-    gpiochip: 0
-    line: 2
-  DIO3_TCXO_VOLTAGE: true
-  # Only for E22-900M33S:
-  # Limit the output power to 8 dBm
-  # SX126X_MAX_POWER: 8
-  spidev: spidev0.0
@@ -1,35 +0,0 @@
-# !! WARNING: Hats on the OK3506 board are installed "backwards" (facing outwards)
-
-# MeshAdv Mini E22-900M22S
-# https://github.com/chrismyers2000/MeshAdv-Mini
-Meta:
-  name: MeshAdv Mini E22-900M22S
-  support: community
-  compatible:
-    - forlinx-ok3506-s12 # Armbian
-
-Lora:
-  Module: sx1262 # Ebyte E22-900M22S
-  CS: # GPIO0_C3 (physical 24, SPI0_CSN0)
-    pin: 19
-    gpiochip: 0
-    line: 19
-  IRQ: # GPIO3_B0 (physical 36)
-    pin: 104
-    gpiochip: 3
-    line: 8
-  Busy: # GPIO0_B1 (physical 38)
-    pin: 9
-    gpiochip: 0
-    line: 9
-  Reset: # GPIO3_A6 (physical 18)
-    pin: 102
-    gpiochip: 3
-    line: 6
-  RXen: # GPIO0_A2 (physical 32)
-    pin: 2
-    gpiochip: 0
-    line: 2
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  spidev: spidev0.0
@@ -1,40 +0,0 @@
-# !! WARNING: Hats on the OK3506 board are installed "backwards" (facing outwards)
-
-Meta:
-  name: RAK6421 + RAK13300 Slot 1
-  support: community # Promote when tested
-  compatible:
-    - forlinx-ok3506-s12 # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO3_B5 (IO6, physical 15)
-    pin: 109
-    gpiochip: 3
-    line: 13
-  Reset: # GPIO3_B0 (IO4, physical 36)
-    pin: 104
-    gpiochip: 3
-    line: 8
-  Busy: # GPIO3_A6 (IO5, physical 18)
-    pin: 102
-    gpiochip: 3
-    line: 6
-  # Ant_sw: # GPIO0_A3 (IO3, physical 33)
-  #   pin: 3
-  #   gpiochip: 0
-  #   line: 3
-  Enable_Pins:
-    - pin: 2 # GPIO0_A2 (physical 32)
-      gpiochip: 0
-      line: 2
-    - pin: 3 # GPIO0_A3 (physical 33)
-      gpiochip: 0
-      line: 3
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
-  spidev: spidev0.0
-  # CS: # GPIO0_C3 (SPI0_CSN0, physical 24)
-  #   pin: 19
-  #   gpiochip: 0
-  #   line: 19
@@ -1,38 +0,0 @@
-# !! WARNING: Hats on the OK3506 board are installed "backwards" (facing outwards)
-
-Meta:
-  name: RAK6421 + RAK13300 Slot 2
-  support: community # Promote when tested
-  compatible:
-    - forlinx-ok3506-s12 # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO0_B6 (IO6, physical 12)
-    pin: 14
-    gpiochip: 0
-    line: 14
-  Reset: # GPIO3_A6 (IO4, physical 18)
-    pin: 102
-    gpiochip: 3
-    line: 6
-  Busy: # GPIO0_B2 (IO5, physical 35)
-    pin: 10
-    gpiochip: 0
-    line: 10
-  # Ant_sw: # GPIO3_A7 (IO3, physical 16)
-  #   pin: 103
-  #   gpiochip: 3
-  #   line: 7
-  Enable_Pins:
-    - pin: 106 # GPIO3_B2 (physical 37)
-      gpiochip: 3
-      line: 10
-    - pin: 103 # GPIO3_A7 (physical 16)
-      gpiochip: 3
-      line: 7
-  spidev: spidev0.1
-  # CS: # GPIO0_B7 (SPI0_CSN1, physical 26)
-  #   pin: 15
-  #   gpiochip: 0
-  #   line: 15
@@ -1,41 +0,0 @@
-# !! WARNING: Hats on the OK3506 board are installed "backwards" (facing outwards)
-
-Meta:
-  name: RAK6421 + RAK13302 Slot 1
-  support: community # Promote when tested
-  compatible:
-    - forlinx-ok3506-s12 # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO3_B5 (IO6, physical 15)
-    pin: 109
-    gpiochip: 3
-    line: 13
-  Reset: # GPIO3_B0 (IO4, physical 36)
-    pin: 104
-    gpiochip: 3
-    line: 8
-  Busy: # GPIO3_A6 (IO5, physical 18)
-    pin: 102
-    gpiochip: 3
-    line: 6
-  # Ant_sw: # GPIO0_A3 (IO3, physical 33)
-  #   pin: 3
-  #   gpiochip: 0
-  #   line: 3
-  Enable_Pins:
-    - pin: 2 # GPIO0_A2 (physical 32)
-      gpiochip: 0
-      line: 2
-    - pin: 3 # GPIO0_A3 (physical 33)
-      gpiochip: 0
-      line: 3
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
-  spidev: spidev0.0
-  # CS: # GPIO0_C3 (SPI0_CSN0, physical 24)
-  #   pin: 19
-  #   gpiochip: 0
-  #   line: 19
-  TX_GAIN_LORA: [9, 9, 10, 11, 9, 8, 9, 10, 10, 10, 11, 12, 12, 12, 12, 12, 12, 12, 12, 10, 9, 8]
@@ -1,39 +0,0 @@
-# !! WARNING: Hats on the OK3506 board are installed "backwards" (facing outwards)
-
-Meta:
-  name: RAK6421 + RAK13302 Slot 2
-  support: community # Promote when tested
-  compatible:
-    - forlinx-ok3506-s12 # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO0_B6 (IO6, physical 12)
-    pin: 14
-    gpiochip: 0
-    line: 14
-  Reset: # GPIO3_A6 (IO4, physical 18)
-    pin: 102
-    gpiochip: 3
-    line: 6
-  Busy: # GPIO0_B2 (IO5, physical 35)
-    pin: 10
-    gpiochip: 0
-    line: 10
-  # Ant_sw: # GPIO3_A7 (IO3, physical 16)
-  #   pin: 103
-  #   gpiochip: 3
-  #   line: 7
-  Enable_Pins:
-    - pin: 106 # GPIO3_B2 (physical 37)
-      gpiochip: 3
-      line: 10
-    - pin: 103 # GPIO3_A7 (physical 16)
-      gpiochip: 3
-      line: 7
-  spidev: spidev0.1
-  # CS: # GPIO0_B7 (SPI0_CSN1, physical 26)
-  #   pin: 15
-  #   gpiochip: 0
-  #   line: 15
-  TX_GAIN_LORA: [9, 9, 10, 11, 9, 8, 9, 10, 10, 10, 11, 12, 12, 12, 12, 12, 12, 12, 12, 10, 9, 8]
@@ -1,32 +0,0 @@
-# !! WARNING: Hats on the OK3506 board are installed "backwards" (facing outwards)
-
-Meta:
-  name: Waveshare SX1262
-  support: deprecated
-  compatible:
-    - forlinx-ok3506-s12 # Armbian
-
-Lora:
-  Module: sx1262  # Waveshare SX126X XXXM
-  DIO2_AS_RF_SWITCH: true
-  CS: # GPIO0_B0 (physical 40)
-    pin: 8
-    gpiochip: 0
-    line: 8
-  IRQ: # GPIO3_B0 (physical 36)
-    pin: 104
-    gpiochip: 3
-    line: 8
-  Busy: # GPIO0_B1 (physical 38)
-    pin: 9
-    gpiochip: 0
-    line: 9
-  Reset: # GPIO0_B6 (physical 12)
-    pin: 14
-    gpiochip: 0
-    line: 14
-  SX126X_ANT_SW: # GPIO3_B3 (physical 31)
-    pin: 107
-    gpiochip: 3
-    line: 11
-  spidev: spidev0.0
@@ -43,7 +43,7 @@ for pio_env in pio_envs:
  env = {
    "ci": {"board": pio_env, "platform": env_platform},
    "board_level": cfg.get(f"env:{pio_env}", "board_level", default=None),
-    "board_check": cfg.get(f"env:{pio_env}", "board_check", default="false").strip().lower() == "true",
+    "board_check": bool(cfg.get(f"env:{pio_env}", "board_check", default=False)),
  }
  all_envs.append(env)

@@ -1,31 +1,25 @@
 #!/usr/bin/env python3
-"""Generate release notes from the actual release commit range."""
+"""
+Generate release notes from merged PRs on develop and master branches.
+Categorizes PRs into Enhancements and Bug Fixes/Maintenance sections.
+"""

-import argparse
-import json
-import re
 import subprocess
+import re
+import json
 import sys
+from datetime import datetime


-def get_last_release_tag(compare_ref, exclude_tag=None):
-    """Get the most recent version tag merged into compare_ref."""
+def get_last_release_tag():
+    """Get the most recent release tag."""
    result = subprocess.run(
-        ["git", "tag", "--merged", compare_ref, "--sort=-version:refname", "v*"],
+        ["git", "describe", "--tags", "--abbrev=0"],
        capture_output=True,
        text=True,
        check=True,
    )
-
-    for line in result.stdout.splitlines():
-        candidate = line.strip()
-        if not candidate:
-            continue
-        if exclude_tag and candidate == exclude_tag:
-            continue
-        return candidate
-
-    raise subprocess.CalledProcessError(result.returncode, result.args, output=result.stdout, stderr=result.stderr)
+    return result.stdout.strip()


 def get_tag_date(tag):
@@ -39,18 +33,18 @@ def get_tag_date(tag):
    return result.stdout.strip()


-def get_merged_prs_in_range(tag, compare_ref):
-    """Get all merged PRs in the git range between tag and compare_ref."""
+def get_merged_prs_since_tag(tag, branch):
+    """Get all merged PRs since the given tag on the specified branch."""
+    # Get commits since tag on the branch - look for PR numbers in parentheses
    result = subprocess.run(
        [
            "git",
            "log",
-            f"{tag}..{compare_ref}",
+            f"{tag}..origin/{branch}",
            "--oneline",
        ],
        capture_output=True,
        text=True,
-        check=True,
    )

    prs = []
@@ -71,25 +65,6 @@ def get_merged_prs_in_range(tag, compare_ref):
    return prs


-def parse_args():
-    """Parse CLI arguments."""
-    parser = argparse.ArgumentParser(
-        description="Generate release notes from the actual release commit range."
-    )
-    parser.add_argument("new_version", help="Version that will be tagged for this release")
-    parser.add_argument(
-        "--base-tag",
-        dest="base_tag",
-        help="Existing version tag to diff from. Defaults to the latest version tag merged into the compare ref.",
-    )
-    parser.add_argument(
-        "--compare-ref",
-        default="HEAD",
-        help="Git ref to diff to. Defaults to HEAD.",
-    )
-    return parser.parse_args()
-
-
 def get_pr_details(pr_number):
    """Get PR details from GitHub API via gh CLI."""
    try:
@@ -293,28 +268,28 @@ def get_new_contributors(pr_details_list, tag, repo="meshtastic/firmware"):


 def main():
-    args = parse_args()
-    new_version = args.new_version
-    compare_ref = args.compare_ref
-    current_tag = f"v{new_version}"
+    if len(sys.argv) < 2:
+        print("Usage: generate_release_notes.py <new_version>", file=sys.stderr)
+        sys.exit(1)
+
+    new_version = sys.argv[1]

    # Get last release tag
    try:
-        last_tag = args.base_tag or get_last_release_tag(compare_ref, exclude_tag=current_tag)
+        last_tag = get_last_release_tag()
    except subprocess.CalledProcessError:
        print("Error: Could not find last release tag", file=sys.stderr)
        sys.exit(1)

-    print(
-        f"Resolved release note range: {last_tag}..{compare_ref}",
-        file=sys.stderr,
-    )
+    # Collect PRs from both branches
+    all_pr_numbers = set()

-    try:
-        all_pr_numbers = set(get_merged_prs_in_range(last_tag, compare_ref))
-    except subprocess.CalledProcessError as e:
-        print(f"Error: Could not get PRs for range {last_tag}..{compare_ref}: {e}", file=sys.stderr)
-        sys.exit(1)
+    for branch in ["develop", "master"]:
+        try:
+            prs = get_merged_prs_since_tag(last_tag, branch)
+            all_pr_numbers.update(prs)
+        except Exception as e:
+            print(f"Warning: Could not get PRs from {branch}: {e}", file=sys.stderr)

    # Get details for all PRs
    enhancements = []
@@ -87,9 +87,6 @@
  </screenshots>

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

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

 ; Used for the code analysis in PIO Home / Inspect
 check_tool = cppcheck
@@ -95,8 +95,8 @@ check_flags =
 framework = arduino
 lib_deps =
 	${env.lib_deps}
-	# renovate: datasource=github-tags depName=NonBlockingRTTTL packageName=end2endzone/NonBlockingRTTTL
-	https://github.com/end2endzone/NonBlockingRTTTL/archive/refs/tags/1.4.0.zip
+	# renovate: datasource=custom.pio depName=NonBlockingRTTTL packageName=end2endzone/library/NonBlockingRTTTL
+	end2endzone/NonBlockingRTTTL@1.4.0
 build_unflags =
 	-std=c++11
 	-std=gnu++11
@@ -107,139 +107,131 @@ build_src_filter = ${env.build_src_filter} -<platform/portduino/> -<graphics/nic
 ; Common libs for communicating over TCP/IP networks such as MQTT
 [networking_base]
 lib_deps =
-	# renovate: datasource=github-tags depName=TBPubSubClient packageName=thingsboard/pubsubclient
-	https://github.com/thingsboard/pubsubclient/archive/refs/tags/v2.12.1.zip
-	# renovate: datasource=github-tags depName=NTPClient packageName=arduino-libraries/NTPClient
-	https://github.com/arduino-libraries/NTPClient/archive/refs/tags/3.2.1.zip
+	# renovate: datasource=custom.pio depName=TBPubSubClient packageName=thingsboard/library/TBPubSubClient
+	thingsboard/TBPubSubClient@2.12.1
+	# renovate: datasource=custom.pio depName=NTPClient packageName=arduino-libraries/library/NTPClient
+	arduino-libraries/NTPClient@3.2.1

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

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

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

 ; Common libs for environmental measurements in telemetry module
 [environmental_base]
 lib_deps =
-	# renovate: datasource=github-tags depName=Adafruit BusIO packageName=adafruit/Adafruit_BusIO
-	https://github.com/adafruit/Adafruit_BusIO/archive/refs/tags/1.17.4.zip
-	# renovate: datasource=github-tags depName=Adafruit Unified Sensor packageName=adafruit/Adafruit_Sensor
-	https://github.com/adafruit/Adafruit_Sensor/archive/refs/tags/1.1.15.zip
-	# renovate: datasource=github-tags depName=Adafruit GFX packageName=adafruit/Adafruit-GFX-Library
-	https://github.com/adafruit/Adafruit-GFX-Library/archive/refs/tags/1.12.6.zip
-	# renovate: datasource=github-tags depName=NeoPixel packageName=adafruit/Adafruit_NeoPixel
-	https://github.com/adafruit/Adafruit_NeoPixel/archive/refs/tags/1.15.4.zip
-	# renovate: datasource=github-tags depName=Adafruit SSD1306 packageName=adafruit/Adafruit_SSD1306
-	https://github.com/adafruit/Adafruit_SSD1306/archive/refs/tags/2.5.16.zip
-	# renovate: datasource=github-tags depName=Adafruit BMP280 packageName=adafruit/Adafruit_BMP280_Library
-	https://github.com/adafruit/Adafruit_BMP280_Library/archive/refs/tags/3.0.0.zip
-	# renovate: datasource=github-tags depName=Adafruit BMP085 packageName=adafruit/Adafruit-BMP085-Library
-	https://github.com/adafruit/Adafruit-BMP085-Library/archive/refs/tags/1.2.4.zip
-	# renovate: datasource=github-tags depName=Adafruit BME280 packageName=adafruit/Adafruit_BME280_Library
-	https://github.com/adafruit/Adafruit_BME280_Library/archive/refs/tags/2.3.0.zip
-	# renovate: datasource=github-tags depName=Adafruit DPS310 packageName=adafruit/Adafruit_DPS310
-	https://github.com/adafruit/Adafruit_DPS310/archive/refs/tags/1.1.6.zip
-	# renovate: datasource=github-tags depName=Adafruit SH110x packageName=adafruit/Adafruit_SH110x
-	https://github.com/adafruit/Adafruit_SH110x/archive/refs/tags/2.1.14.zip
-	# renovate: datasource=github-tags depName=Adafruit MCP9808 packageName=adafruit/Adafruit_MCP9808_Library
-	https://github.com/adafruit/Adafruit_MCP9808_Library/archive/refs/tags/2.0.2.zip
-	# renovate: datasource=github-tags depName=Adafruit INA260 packageName=adafruit/Adafruit_INA260
-	https://github.com/adafruit/Adafruit_INA260/archive/refs/tags/1.5.3.zip
-	# renovate: datasource=github-tags depName=Adafruit INA219 packageName=adafruit/Adafruit_INA219
-	https://github.com/adafruit/Adafruit_INA219/archive/refs/tags/1.2.3.zip
-	# renovate: datasource=github-tags depName=Adafruit MPU6050 packageName=adafruit/Adafruit_MPU6050
-	https://github.com/adafruit/Adafruit_MPU6050/archive/refs/tags/2.2.9.zip
-	# renovate: datasource=github-tags depName=Adafruit LIS3DH packageName=adafruit/Adafruit_LIS3DH
-	https://github.com/adafruit/Adafruit_LIS3DH/archive/refs/tags/1.3.0.zip
-	# renovate: datasource=github-tags depName=Adafruit AHTX0 packageName=adafruit/Adafruit_AHTX0
-	https://github.com/adafruit/Adafruit_AHTX0/archive/refs/tags/2.0.6.zip
-	# renovate: datasource=github-tags depName=Adafruit LSM6DS packageName=adafruit/Adafruit_LSM6DS
-	https://github.com/adafruit/Adafruit_LSM6DS/archive/refs/tags/4.7.4.zip
-	# renovate: datasource=github-tags depName=Adafruit TSL2591 packageName=adafruit/Adafruit_TSL2591_Library
-	https://github.com/adafruit/Adafruit_TSL2591_Library/archive/refs/tags/1.4.5.zip
-	# renovate: datasource=github-tags depName=EmotiBit MLX90632 packageName=emotibit/EmotiBit_MLX90632
-	https://github.com/EmotiBit/EmotiBit_MLX90632/archive/refs/tags/v1.0.8.zip
-	# renovate: datasource=github-tags depName=Adafruit MLX90614 packageName=adafruit/Adafruit_MLX90614
-	https://github.com/adafruit/Adafruit-MLX90614-Library/archive/refs/tags/2.1.6.zip
+	# renovate: datasource=custom.pio depName=Adafruit BusIO packageName=adafruit/library/Adafruit BusIO
+	adafruit/Adafruit BusIO@1.17.4
+	# renovate: datasource=custom.pio depName=Adafruit Unified Sensor packageName=adafruit/library/Adafruit Unified Sensor
+	adafruit/Adafruit Unified Sensor@1.1.15
+	# renovate: datasource=custom.pio depName=Adafruit BMP280 packageName=adafruit/library/Adafruit BMP280 Library
+	adafruit/Adafruit BMP280 Library@3.0.0
+	# renovate: datasource=custom.pio depName=Adafruit BMP085 packageName=adafruit/library/Adafruit BMP085 Library
+	adafruit/Adafruit BMP085 Library@1.2.4
+	# renovate: datasource=custom.pio depName=Adafruit BME280 packageName=adafruit/library/Adafruit BME280 Library
+	adafruit/Adafruit BME280 Library@2.3.0
+	# renovate: datasource=custom.pio depName=Adafruit DPS310 packageName=adafruit/library/Adafruit DPS310
+	adafruit/Adafruit DPS310@1.1.6
+	# renovate: datasource=custom.pio depName=Adafruit MCP9808 packageName=adafruit/library/Adafruit MCP9808 Library
+	adafruit/Adafruit MCP9808 Library@2.0.2
+	# renovate: datasource=custom.pio depName=Adafruit INA260 packageName=adafruit/library/Adafruit INA260 Library
+	adafruit/Adafruit INA260 Library@1.5.3
+	# renovate: datasource=custom.pio depName=Adafruit INA219 packageName=adafruit/library/Adafruit INA219
+	adafruit/Adafruit INA219@1.2.3
+	# renovate: datasource=custom.pio depName=Adafruit MPU6050 packageName=adafruit/library/Adafruit MPU6050
+	adafruit/Adafruit MPU6050@2.2.9
+	# renovate: datasource=custom.pio depName=Adafruit LIS3DH packageName=adafruit/library/Adafruit LIS3DH
+	adafruit/Adafruit LIS3DH@1.3.0
+	# renovate: datasource=custom.pio depName=Adafruit AHTX0 packageName=adafruit/library/Adafruit AHTX0
+	adafruit/Adafruit AHTX0@2.0.6
+	# renovate: datasource=custom.pio depName=Adafruit LSM6DS packageName=adafruit/library/Adafruit LSM6DS
+	adafruit/Adafruit LSM6DS@4.7.4
+	# renovate: datasource=custom.pio depName=Adafruit TSL2591 packageName=adafruit/library/Adafruit TSL2591 Library
+	adafruit/Adafruit TSL2591 Library@1.4.5
+	# renovate: datasource=custom.pio depName=EmotiBit MLX90632 packageName=emotibit/library/EmotiBit MLX90632
+	emotibit/EmotiBit MLX90632@1.0.8
+	# renovate: datasource=custom.pio depName=Adafruit MLX90614 packageName=adafruit/library/Adafruit MLX90614 Library
+	adafruit/Adafruit MLX90614 Library@2.1.6
 	# renovate: datasource=git-refs depName=INA3221 packageName=https://github.com/sgtwilko/INA3221 gitBranch=FixOverflow
 	https://github.com/sgtwilko/INA3221/archive/bb03d7e9bfcc74fc798838a54f4f99738f29fc6a.zip
-	# renovate: datasource=github-tags depName=QMC5883L Compass packageName=mprograms/QMC5883LCompass
-	https://github.com/mprograms/QMC5883LCompass/archive/refs/tags/v1.2.3.zip
-	# renovate: datasource=github-tags depName=DFRobot_RTU packageName=dfrobot/DFRobot_RTU
-	https://github.com/DFRobot/DFRobot_RTU/archive/refs/tags/V1.0.6.zip
+	# renovate: datasource=custom.pio depName=QMC5883L Compass packageName=mprograms/library/QMC5883LCompass
+	mprograms/QMC5883LCompass@1.2.3
+	# renovate: datasource=custom.pio depName=DFRobot_RTU packageName=dfrobot/library/DFRobot_RTU
+	dfrobot/DFRobot_RTU@1.0.6
 	# renovate: datasource=git-refs depName=DFRobot_RainfallSensor packageName=https://github.com/DFRobot/DFRobot_RainfallSensor gitBranch=master
 	https://github.com/DFRobot/DFRobot_RainfallSensor/archive/38fea5e02b40a5430be6dab39a99a6f6347d667e.zip
-	# renovate: datasource=github-tags depName=INA226 packageName=robtillaart/INA226
-	https://github.com/RobTillaart/INA226/archive/refs/tags/0.6.6.zip
-	# renovate: datasource=github-tags depName=SparkFun MAX3010x packageName=sparkfun/SparkFun_MAX3010x_Sensor_Library
-	https://github.com/sparkfun/SparkFun_MAX3010x_Sensor_Library/archive/refs/tags/v1.1.2.zip
-	# renovate: datasource=github-tags depName=SparkFun 9DoF IMU Breakout ICM 20948 packageName=sparkfun/SparkFun_ICM-20948_ArduinoLibrary
-	https://github.com/sparkfun/SparkFun_ICM-20948_ArduinoLibrary/archive/refs/tags/v1.3.2.zip
-	# renovate: datasource=github-tags depName=Adafruit LTR390 Library packageName=adafruit/Adafruit_LTR390
-	https://github.com/adafruit/Adafruit_LTR390/archive/refs/tags/1.1.2.zip
-	# renovate: datasource=github-tags depName=Adafruit PCT2075 packageName=adafruit/Adafruit_PCT2075
-	https://github.com/adafruit/Adafruit_PCT2075/archive/refs/tags/1.0.6.zip
-	# renovate: datasource=github-tags depName=DFRobot_BMM150 packageName=dfrobot/DFRobot_BMM150
-	https://github.com/DFRobot/DFRobot_BMM150/archive/refs/tags/V1.0.0.zip
-	# renovate: datasource=github-tags depName=Adafruit_TSL2561 packageName=adafruit/Adafruit_TSL2561
-	https://github.com/adafruit/Adafruit_TSL2561/archive/refs/tags/1.1.3.zip
-	# renovate: datasource=github-tags depName=BH1750_WE packageName=wollewald/BH1750_WE
-	https://github.com/wollewald/BH1750_WE/archive/refs/tags/1.1.10.zip
+	# renovate: datasource=custom.pio depName=INA226 packageName=robtillaart/library/INA226
+	robtillaart/INA226@0.6.6
+	# renovate: datasource=custom.pio depName=SparkFun MAX3010x packageName=sparkfun/library/SparkFun MAX3010x Pulse and Proximity Sensor Library
+	sparkfun/SparkFun MAX3010x Pulse and Proximity Sensor Library@1.1.2
+	# renovate: datasource=custom.pio depName=SparkFun 9DoF IMU Breakout ICM 20948 packageName=sparkfun/library/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library
+	sparkfun/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library@1.3.2
+	# renovate: datasource=custom.pio depName=Adafruit LTR390 Library packageName=adafruit/library/Adafruit LTR390 Library
+	adafruit/Adafruit LTR390 Library@1.1.2
+	# renovate: datasource=custom.pio depName=Adafruit PCT2075 packageName=adafruit/library/Adafruit PCT2075
+	adafruit/Adafruit PCT2075@1.0.6
+	# renovate: datasource=custom.pio depName=DFRobot_BMM150 packageName=dfrobot/library/DFRobot_BMM150
+	dfrobot/DFRobot_BMM150@1.0.0
+	# renovate: datasource=custom.pio depName=Adafruit_TSL2561 packageName=adafruit/library/Adafruit TSL2561
+	adafruit/Adafruit TSL2561@1.1.3
+	# renovate: datasource=custom.pio depName=BH1750_WE packageName=wollewald/library/BH1750_WE
+	wollewald/BH1750_WE@1.1.10

 ; Common environmental sensor libraries (not included in native / portduino)
 [environmental_extra_common]
 lib_deps =
-	# renovate: datasource=github-tags depName=Adafruit BMP3XX packageName=adafruit/Adafruit_BMP3XX
-	https://github.com/adafruit/Adafruit_BMP3XX/archive/refs/tags/2.1.6.zip
-	# renovate: datasource=github-tags depName=Adafruit MAX1704X packageName=adafruit/Adafruit_MAX1704X
-	https://github.com/adafruit/Adafruit_MAX1704X/archive/refs/tags/1.0.3.zip
-	# renovate: datasource=github-tags depName=Adafruit SHTC3 packageName=adafruit/Adafruit_SHTC3
-	https://github.com/adafruit/Adafruit_SHTC3/archive/refs/tags/1.0.2.zip
-	# renovate: datasource=github-tags depName=Adafruit LPS2X packageName=adafruit/Adafruit_LPS2X
-	https://github.com/adafruit/Adafruit_LPS2X/archive/refs/tags/2.0.6.zip
-	# renovate: datasource=github-tags depName=Adafruit SHT31 packageName=adafruit/Adafruit_SHT31
-	https://github.com/adafruit/Adafruit_SHT31/archive/refs/tags/2.2.2.zip
-	# renovate: datasource=github-tags depName=Adafruit VEML7700 packageName=adafruit/Adafruit_VEML7700
-	https://github.com/adafruit/Adafruit_VEML7700/archive/refs/tags/2.1.6.zip
-	# renovate: datasource=github-tags depName=Adafruit SHT4x packageName=adafruit/Adafruit_SHT4X
-	https://github.com/adafruit/Adafruit_SHT4X/archive/refs/tags/1.0.5.zip
-	# renovate: datasource=github-tags depName=SparkFun Qwiic Scale NAU7802 packageName=sparkfun/SparkFun_Qwiic_Scale_NAU7802_Arduino_Library
-	https://github.com/sparkfun/SparkFun_Qwiic_Scale_NAU7802_Arduino_Library/archive/refs/tags/v1.0.6.zip
+	# renovate: datasource=custom.pio depName=Adafruit BMP3XX packageName=adafruit/library/Adafruit BMP3XX Library
+	adafruit/Adafruit BMP3XX Library@2.1.6
+	# renovate: datasource=custom.pio depName=Adafruit MAX1704X packageName=adafruit/library/Adafruit MAX1704X
+	adafruit/Adafruit MAX1704X@1.0.3
+	# renovate: datasource=custom.pio depName=Adafruit SHTC3 packageName=adafruit/library/Adafruit SHTC3 Library
+	adafruit/Adafruit SHTC3 Library@1.0.2
+	# renovate: datasource=custom.pio depName=Adafruit LPS2X packageName=adafruit/library/Adafruit LPS2X
+	adafruit/Adafruit LPS2X@2.0.6
+	# renovate: datasource=custom.pio depName=Adafruit SHT31 packageName=adafruit/library/Adafruit SHT31 Library
+	adafruit/Adafruit SHT31 Library@2.2.2
+	# renovate: datasource=custom.pio depName=Adafruit VEML7700 packageName=adafruit/library/Adafruit VEML7700 Library
+	adafruit/Adafruit VEML7700 Library@2.1.6
+	# renovate: datasource=custom.pio depName=Adafruit SHT4x packageName=adafruit/library/Adafruit SHT4x Library
+	adafruit/Adafruit SHT4x Library@1.0.5
+	# renovate: datasource=custom.pio depName=SparkFun Qwiic Scale NAU7802 packageName=sparkfun/library/SparkFun Qwiic Scale NAU7802 Arduino Library
+	sparkfun/SparkFun Qwiic Scale NAU7802 Arduino Library@1.0.6
 	# renovate: datasource=custom.pio depName=ClosedCube OPT3001 packageName=closedcube/library/ClosedCube OPT3001
 	closedcube/ClosedCube OPT3001@1.1.2
 	# renovate: datasource=git-refs depName=meshtastic-DFRobot_LarkWeatherStation packageName=https://github.com/meshtastic/DFRobot_LarkWeatherStation gitBranch=master
 	https://github.com/meshtastic/DFRobot_LarkWeatherStation/archive/4de3a9cadef0f6a5220a8a906cf9775b02b0040d.zip
-	# renovate: datasource=github-tags depName=Sensirion Core packageName=sensirion/arduino-core
-	https://github.com/Sensirion/arduino-core/archive/refs/tags/0.7.3.zip
-	# renovate: datasource=github-tags depName=Sensirion I2C SCD4x packageName=sensirion/arduino-i2c-scd4x
-	https://github.com/Sensirion/arduino-i2c-scd4x/archive/refs/tags/1.1.0.zip
-	# renovate: datasource=github-tags depName=Sensirion I2C SFA3x packageName=sensirion/arduino-i2c-sfa3x
-	https://github.com/Sensirion/arduino-i2c-sfa3x/archive/refs/tags/1.0.0.zip
-	# renovate: datasource=github-tags depName=Sensirion I2C SCD30 packageName=sensirion/arduino-i2c-scd30
-	https://github.com/Sensirion/arduino-i2c-scd30/archive/refs/tags/1.0.0.zip
+	# renovate: datasource=custom.pio depName=Sensirion Core packageName=sensirion/library/Sensirion Core
+	sensirion/Sensirion Core@0.7.3
+	# renovate: datasource=custom.pio depName=Sensirion I2C SCD4x packageName=sensirion/library/Sensirion I2C SCD4x
+	sensirion/Sensirion I2C SCD4x@1.1.0
+	# renovate: datasource=custom.pio depName=Sensirion I2C SFA3x packageName=sensirion/library/Sensirion I2C SFA3x
+	sensirion/Sensirion I2C SFA3x@1.0.0
+	# renovate: datasource=custom.pio depName=Sensirion I2C SCD30 packageName=sensirion/library/Sensirion I2C SCD30
+	sensirion/Sensirion I2C SCD30@1.0.0

 ; Environmental sensors with BSEC2 (Bosch proprietary IAQ)
 [environmental_extra]
 lib_deps =
 	${environmental_extra_common.lib_deps}
-	# renovate: datasource=github-tags depName=Bosch BSEC2 packageName=boschsensortec/Bosch-BSEC2-Library
-	https://github.com/boschsensortec/Bosch-BSEC2-Library/archive/refs/tags/1.10.2610.zip
-	# renovate: datasource=github-tags depName=Bosch BME68x packageName=boschsensortec/Bosch-BME68x-Library
-	https://github.com/boschsensortec/Bosch-BME68x-Library/archive/refs/tags/v1.3.40408.zip
+	# renovate: datasource=custom.pio depName=Bosch BSEC2 packageName=boschsensortec/library/bsec2
+	boschsensortec/bsec2@1.10.2610
+	# renovate: datasource=custom.pio depName=Bosch BME68x packageName=boschsensortec/library/BME68x Sensor Library
+	boschsensortec/BME68x Sensor Library@1.3.40408

 ; Environmental sensors without BSEC (saves ~3.5KB DRAM for original ESP32 targets)
 [environmental_extra_no_bsec]
 lib_deps =
 	${environmental_extra_common.lib_deps}
-	# renovate: datasource=github-tags depName=Adafruit_BME680 packageName=adafruit/Adafruit_BME680
-	https://github.com/adafruit/Adafruit_BME680/archive/refs/tags/2.0.6.zip
+	# renovate: datasource=custom.pio depName=Adafruit_BME680 packageName=adafruit/library/Adafruit BME680 Library
+	adafruit/Adafruit BME680 Library@2.0.6
@@ -4,8 +4,6 @@
    ":dependencyDashboard",
    ":semanticCommitTypeAll(chore)",
    ":ignoreModulesAndTests",
-    ":noUnscheduledUpdates",
-    "schedule:daily",
    "group:recommended",
    "replacements:all",
    "workarounds:all"
@@ -98,6 +98,7 @@ Syslog &Syslog::logMask(uint8_t priMask)

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

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

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

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

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

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

@@ -21,15 +21,8 @@
 // How many messages are stored (RAM + flash).
 // Define -DMESSAGE_HISTORY_LIMIT=N in build_flags to control memory usage.
 #ifndef MESSAGE_HISTORY_LIMIT
-#if defined(ARCH_ESP32) &&                                                                                                       \
-    !(defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32S2))
-// Baseline ESP32 (non-PSRAM variants) has limited heap; reduce message history on resource-constrained builds.
-// Override with -DMESSAGE_HISTORY_LIMIT=N if needed.
-#define MESSAGE_HISTORY_LIMIT 10
-#else
 #define MESSAGE_HISTORY_LIMIT 20
 #endif
-#endif

 // Internal alias used everywhere in code – do NOT redefine elsewhere.
 #define MAX_MESSAGES_SAVED MESSAGE_HISTORY_LIMIT
@@ -35,11 +35,6 @@
 #include "nrfx_power.h"
 #endif

-#if defined(ARCH_NRF52)
-#include "Nrf52SaadcLock.h"
-#include "concurrency/LockGuard.h"
-#endif
-
 #if defined(DEBUG_HEAP_MQTT) && !MESHTASTIC_EXCLUDE_MQTT
 #include "mqtt/MQTT.h"
 #include "target_specific.h"
@@ -333,9 +328,6 @@ class AnalogBatteryLevel : public HasBatteryLevel
            scaled = esp_adc_cal_raw_to_voltage(raw, adc_characs);
            scaled *= operativeAdcMultiplier;
 #else // block for all other platforms
-#ifdef ARCH_NRF52
-            concurrency::LockGuard saadcGuard(concurrency::nrf52SaadcLock);
-#endif
            for (uint32_t i = 0; i < BATTERY_SENSE_SAMPLES; i++) {
                raw += analogRead(BATTERY_PIN);
            }
@@ -1,85 +1,10 @@
 #include "concurrency/BinarySemaphorePosix.h"
 #include "configuration.h"

-#include <errno.h>
-#include <sys/time.h>
-
 #ifndef HAS_FREE_RTOS

 namespace concurrency
 {
-#ifdef ARCH_PORTDUINO
-
-BinarySemaphorePosix::BinarySemaphorePosix()
-{
-    if (pthread_mutex_init(&mutex, NULL) != 0) {
-        throw std::runtime_error("pthread_mutex_init failed");
-    }
-    if (pthread_cond_init(&cond, NULL) != 0) {
-        pthread_mutex_destroy(&mutex);
-        throw std::runtime_error("pthread_cond_init failed");
-    }
-    signaled = false;
-}
-
-BinarySemaphorePosix::~BinarySemaphorePosix()
-{
-    pthread_cond_destroy(&cond);
-    pthread_mutex_destroy(&mutex);
-}
-
-/**
- * Returns false if we timed out
- */
-bool BinarySemaphorePosix::take(uint32_t msec)
-{
-    pthread_mutex_lock(&mutex);
-
-    if (!signaled) {
-        struct timespec ts;
-        clock_gettime(CLOCK_REALTIME, &ts);
-
-        ts.tv_sec += msec / 1000;
-        ts.tv_nsec += (msec % 1000) * 1000000L;
-        if (ts.tv_nsec >= 1000000000L) {
-            ts.tv_sec += 1;
-            ts.tv_nsec -= 1000000000L;
-        }
-
-        while (!signaled) {
-            int rc = pthread_cond_timedwait(&cond, &mutex, &ts);
-            if (rc == ETIMEDOUT)
-                break;
-            if (rc != 0) {
-                // Some other error occurred
-                pthread_mutex_unlock(&mutex);
-                throw std::runtime_error("pthread_cond_timedwait failed: " + std::to_string(rc));
-            }
-        }
-    }
-
-    bool wasSignaled = signaled;
-    signaled = false; // consume the signal (binary semaphore)
-
-    pthread_mutex_unlock(&mutex);
-    return wasSignaled;
-}
-
-void BinarySemaphorePosix::give()
-{
-    pthread_mutex_lock(&mutex);
-    signaled = true;
-    pthread_cond_signal(&cond);
-    pthread_mutex_unlock(&mutex);
-}
-
-IRAM_ATTR void BinarySemaphorePosix::giveFromISR(BaseType_t *pxHigherPriorityTaskWoken)
-{
-    give();
-    if (pxHigherPriorityTaskWoken)
-        *pxHigherPriorityTaskWoken = true;
-}
-#else

 BinarySemaphorePosix::BinarySemaphorePosix() {}

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

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

 } // namespace concurrency

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

 #include "../freertosinc.h"

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

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

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

  public:
    BinarySemaphorePosix();
@@ -36,4 +27,4 @@ class BinarySemaphorePosix

 #endif

-} // namespace concurrency
+} // namespace concurrency
@@ -301,6 +301,9 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define TCA9535_ADDR 0x20
 #define TCA9555_ADDR 0x26

+// used for display brightness control
+#define STC8H1K28_ADDR 0x30
+
 // -----------------------------------------------------------------------------
 // Touchscreen
 // -----------------------------------------------------------------------------
@@ -63,6 +63,7 @@ class ScanI2C
        NAU7802,
        FT6336U,
        STK8BAXX,
+        STC8H1K28,
        ICM20948,
        SCD4X,
        MAX30102,
@@ -304,6 +304,8 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
 #endif
 #ifdef HAS_LP5562
                SCAN_SIMPLE_CASE(LP5562_ADDR, LP5562, "LP5562", (uint8_t)addr.address);
+#else
+                SCAN_SIMPLE_CASE(STC8H1K28_ADDR, LP5562, "STC8H1K28", (uint8_t)addr.address);
 #endif
            case XPOWERS_AXP192_AXP2101_ADDRESS:
                // Do we have the axp2101/192 or the TCA8418
@@ -202,7 +202,7 @@ void EInkParallelDisplay::display(void)

    // Get pointers to internal buffers
    uint8_t *cur = epaper->currentBuffer();
-    const uint8_t *prev = epaper->previousBuffer(); // may be NULL on first init
+    uint8_t *prev = epaper->previousBuffer(); // may be NULL on first init

    // Track changed row range while converting
    int newTop = h;     // min changed row (initialized to out-of-range)
@@ -422,17 +422,6 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16
    std::vector<bool> isMine;   // track alignment
    std::vector<bool> isHeader; // track header lines
    std::vector<AckStatus> ackForLine;
-    // Hard limit on total cached lines to prevent unbounded growth from a single long message.
-    // Reserve to the actual cache cap up front, because a single message can expand to many more
-    // wrapped display lines than a small per-message estimate would predict. For a display
-    // rendering only ~5-30 lines at a time, caching more than this limit wastes heap. Stop
-    // appending once we reach MAX_CACHED_LINES to prevent a single message from blowing out the
-    // heap.
-    constexpr size_t MAX_CACHED_LINES = 100U; // ~5-6KB for std::string overhead on 32-bit (if each ~50-60 bytes avg)
-    allLines.reserve(MAX_CACHED_LINES);
-    isMine.reserve(MAX_CACHED_LINES);
-    isHeader.reserve(MAX_CACHED_LINES);
-    ackForLine.reserve(MAX_CACHED_LINES);

    for (auto it = filtered.rbegin(); it != filtered.rend(); ++it) {
        const auto &m = *it;
@@ -576,23 +565,16 @@ void drawTextMessageFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16

        int wrapWidth = mine ? rightTextWidth : leftTextWidth;
        std::vector<std::string> wrapped = generateLines(display, "", msgText, wrapWidth);
-        // Per-message wrap-line limit: even if wrapping produces many lines, cap them to prevent
-        // a single long message from consuming most or all of the cache.
-        constexpr size_t MAX_WRAPPED_LINES_PER_MSG = 20U;
-        size_t wrappedCount = 0;
        for (auto &ln : wrapped) {
-            if (allLines.size() >= MAX_CACHED_LINES || wrappedCount >= MAX_WRAPPED_LINES_PER_MSG)
-                break; // Cache limit or per-message limit reached; stop adding lines from this message
-            allLines.emplace_back(std::move(ln));
+            allLines.push_back(ln);
            isMine.push_back(mine);
            isHeader.push_back(false);
            ackForLine.push_back(AckStatus::NONE);
-            ++wrappedCount;
        }
    }

    // Cache lines and heights
-    cachedLines.swap(allLines);
+    cachedLines = allLines;
    cachedHeights = calculateLineHeights(cachedLines, emotes, isHeader);

    std::vector<MessageBlock> blocks = buildMessageBlocks(isHeader, isMine);
@@ -121,6 +121,7 @@ void CardputerKeyboard::pressed(uint8_t key)
        modifierFlag = 0;
    }

+    uint8_t next_key = 0;
    int row = (key - 1) / 10;
    int col = (key - 1) % 10;

@@ -299,7 +299,6 @@ void InputBroker::Init()
    // Buttons. Moved here cause we need NodeDB to be initialized
    // If your variant.h has a BUTTON_PIN defined, go ahead and define BUTTON_ACTIVE_LOW and BUTTON_ACTIVE_PULLUP
    UserButtonThread = new ButtonThread("UserButton");
-#if !MESHTASTIC_EXCLUDE_SCREEN
    if (screen) {
        ButtonConfig userConfig;
        userConfig.pinNumber = (uint8_t)_pinNum;
@@ -318,9 +317,7 @@ void InputBroker::Init()
        userConfig.longPressTime = 500;
        userConfig.longLongPress = INPUT_BROKER_SHUTDOWN;
        UserButtonThread->initButton(userConfig);
-    } else
-#endif
-    {
+    } else {
        ButtonConfig userConfigNoScreen;
        userConfigNoScreen.pinNumber = (uint8_t)_pinNum;
        userConfigNoScreen.activeLow = BUTTON_ACTIVE_LOW;
@@ -382,13 +379,11 @@ void InputBroker::Init()
    }
 #endif // HAS_BUTTON
 #if ARCH_PORTDUINO
-    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
-        if (portduino_config.i2cdev != "") {
-            seesawRotary = new SeesawRotary("SeesawRotary");
-            if (!seesawRotary->init()) {
-                delete seesawRotary;
-                seesawRotary = nullptr;
-            }
+    if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR && portduino_config.i2cdev != "") {
+        seesawRotary = new SeesawRotary("SeesawRotary");
+        if (!seesawRotary->init()) {
+            delete seesawRotary;
+            seesawRotary = nullptr;
        }
        aLinuxInputImpl = new LinuxInputImpl();
        aLinuxInputImpl->init();
@@ -819,7 +819,7 @@ void NodeDB::installDefaultModuleConfig()
    moduleConfig.has_store_forward = true;
    moduleConfig.has_telemetry = true;
    moduleConfig.has_external_notification = true;
-#if defined(PIN_BUZZER) || defined(PIN_VIBRATION) || defined(LED_NOTIFICATION) || defined(PCA_LED_NOTIFICATION)
+#if defined(PIN_BUZZER) || defined(PIN_VIBRATION) || defined(LED_NOTIFICATION)
    moduleConfig.external_notification.enabled = true;
 #endif
 #if defined(PIN_BUZZER)
@@ -130,10 +130,8 @@ const RegionInfo regions[] = {

    /*
       https://lora-alliance.org/wp-content/uploads/2020/11/lorawan_regional_parameters_v1.0.3reva_0.pdf
-       https://standard.nbtc.go.th/getattachment/Standards/%E0%B8%A1%E0%B8%B2%E0%B8%95%E0%B8%A3%E0%B8%90%E0%B8%B2%E0%B8%99%E0%B8%97%E0%B8%B2%E0%B8%87%E0%B9%80%E0%B8%97%E0%B8%84%E0%B8%99%E0%B8%B4%E0%B8%84%E0%B8%82%E0%B8%AD%E0%B8%87%E0%B9%80%E0%B8%84%E0%B8%A3%E0%B8%B7%E0%B9%88%E0%B8%AD%E0%B8%87%E0%B9%82%E0%B8%97%E0%B8%A3%E0%B8%84%E0%B8%A1%E0%B8%99%E0%B8%B2%E0%B8%84%E0%B8%A1/1033-2565.pdf.aspx?lang=th-TH
-       Thailand 920–925 MHz set max TX power to 27 dBm and enforce 10% duty cycle, aligned with NBTC regulations.
    */
-    RDEF(TH, 920.0f, 925.0f, 10, 0, 27, true, false, false),
+    RDEF(TH, 920.0f, 925.0f, 100, 0, 16, true, false, false),

    /*
        433,05-434,7 Mhz 10 mW
@@ -102,6 +102,7 @@ static int32_t reconnectETH()

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

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

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


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



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

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

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

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

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


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



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

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

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

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

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

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

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

@@ -20,11 +20,10 @@ bool RoutingModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, mesh
        if ((nodeDB->getMeshNode(mp.from) == NULL || !nodeDB->getMeshNode(mp.from)->has_user) &&
            (nodeDB->getMeshNode(mp.to) == NULL || !nodeDB->getMeshNode(mp.to)->has_user))
            return false;
-    } else if (owner.is_licensed && ((nodeDB->getLicenseStatus(mp.from) == UserLicenseStatus::NotLicensed) ||
-                                     (nodeDB->getLicenseStatus(mp.to) == UserLicenseStatus::NotLicensed))) {
-        // Don't let licensed users to rebroadcast packets to or from unlicensed users
+    } else if (owner.is_licensed && nodeDB->getLicenseStatus(mp.from) == UserLicenseStatus::NotLicensed) {
+        // Don't let licensed users to rebroadcast packets from unlicensed users
        // If we know they are in-fact unlicensed
-        LOG_DEBUG("Packet to or from unlicensed user, ignoring packet");
+        LOG_DEBUG("Packet from unlicensed user, ignoring packet");
        return false;
    }

@@ -231,9 +231,7 @@ void cpuDeepSleep(uint32_t msecToWake)
 #if SOC_RTCIO_HOLD_SUPPORTED && SOC_PM_SUPPORT_EXT_WAKEUP
    uint64_t gpioMask = (1ULL << (config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN));
 #endif
-#ifdef ALT_BUTTON_WAKE
-    gpioMask |= (1ULL << BUTTON_PIN_ALT);
-#endif
+
 #ifdef BUTTON_NEED_PULLUP
    gpio_pullup_en((gpio_num_t)BUTTON_PIN);
 #endif
@@ -23,6 +23,5 @@ void lateInitVariant()
    cfg.i2s.bits = BIT_LENGTH_16BITS;
    cfg.i2s.rate = RATE_44K;
    board.begin(cfg);
-    board.setVolume(75); // 75% volume
 }
 #endif
@@ -1,13 +0,0 @@
-#include "Nrf52SaadcLock.h"
-#include "concurrency/Lock.h"
-#include "configuration.h"
-
-#ifdef ARCH_NRF52
-
-namespace concurrency
-{
-static Lock nrf52SaadcLockInstance;
-Lock *nrf52SaadcLock = &nrf52SaadcLockInstance;
-} // namespace concurrency
-
-#endif
@@ -1,12 +0,0 @@
-#pragma once
-
-#ifdef ARCH_NRF52
-
-namespace concurrency
-{
-class Lock;
-/** Shared mutex for SAADC configuration and reads (VDD + battery analog path). */
-extern Lock *nrf52SaadcLock;
-} // namespace concurrency
-
-#endif
@@ -25,8 +25,6 @@
 #include "power.h"
 #include <power/PowerHAL.h>

-#include "Nrf52SaadcLock.h"
-#include "concurrency/LockGuard.h"
 #include <hal/nrf_lpcomp.h>

 #ifdef BQ25703A_ADDR
@@ -53,10 +51,6 @@ uint16_t getVDDVoltage();
 void variant_shutdown() __attribute__((weak));
 void variant_shutdown() {}

-// Optional variant hook called each nrf52Loop(); e.g. for low-VDD System OFF.
-void variant_nrf52LoopHook(void) __attribute__((weak));
-void variant_nrf52LoopHook(void) {}
-
 static nrfx_wdt_t nrfx_wdt = NRFX_WDT_INSTANCE(0);
 static nrfx_wdt_channel_id nrfx_wdt_channel_id_nrf52_main;

@@ -80,18 +74,11 @@ bool powerHAL_isVBUSConnected()

 bool powerHAL_isPowerLevelSafe()
 {
+
    static bool powerLevelSafe = true;

-#ifdef SAFE_VDD_VOLTAGE_THRESHOLD_MV
-    uint16_t threshold = SAFE_VDD_VOLTAGE_THRESHOLD_MV;
-#else
-    uint16_t threshold = (uint16_t)(SAFE_VDD_VOLTAGE_THRESHOLD * 1000.0f + 0.5f); // convert V to mV
-#endif
-#ifdef SAFE_VDD_VOLTAGE_THRESHOLD_HYST_MV
-    uint16_t hysteresis = SAFE_VDD_VOLTAGE_THRESHOLD_HYST_MV;
-#else
-    uint16_t hysteresis = (uint16_t)(SAFE_VDD_VOLTAGE_THRESHOLD_HYST * 1000.0f + 0.5f);
-#endif
+    uint16_t threshold = SAFE_VDD_VOLTAGE_THRESHOLD * 1000; // convert V to mV
+    uint16_t hysteresis = SAFE_VDD_VOLTAGE_THRESHOLD_HYST * 1000;

    if (powerLevelSafe) {
        if (getVDDVoltage() < threshold) {
@@ -138,12 +125,11 @@ void powerHAL_platformInit()
 // get VDD voltage (in millivolts)
 uint16_t getVDDVoltage()
 {
-    concurrency::LockGuard guard(concurrency::nrf52SaadcLock);
-
-    // Match battery read resolution; SAADC is shared with AnalogBatteryLevel in Power.cpp.
+    // we use the same values as regular battery read so there is no conflict on SAADC
    analogReadResolution(BATTERY_SENSE_RESOLUTION_BITS);

    // VDD range on NRF52840 is 1.8-3.3V so we need to remap analog reference to 3.6V
+    // let's hope battery reading runs in same task and we don't have race condition
    analogReference(AR_INTERNAL);

    uint16_t vddADCRead = analogReadVDD();
@@ -340,8 +326,6 @@ void nrf52Loop()

    checkSDEvents();
    reportLittleFSCorruptionOnce();
-
-    variant_nrf52LoopHook(); // Optional variant hook called each nrf52Loop();
 }

 #ifdef USE_SEMIHOSTING
@@ -13,3 +13,7 @@ board_build.f_cpu = 240000000L
 upload_protocol = esptool
 ;upload_port = /dev/ttyUSB0
 upload_speed = 460800
+lib_deps =
+  ${esp32_base.lib_deps}
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
+  adafruit/Adafruit NeoPixel@1.15.4
@@ -68,7 +68,7 @@ lib_deps =
  ${environmental_extra.lib_deps}
  ${radiolib_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-esp32_https_server packageName=https://github.com/meshtastic/esp32_https_server gitBranch=master
-  https://github.com/meshtastic/esp32_https_server/archive/0c71f380390ad483ff134ad938e07f6cf1226c5b.zip
+  https://github.com/meshtastic/esp32_https_server/archive/b78f12c86ea65c3ca08968840ff554ff7ed69b60.zip
  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
  h2zero/NimBLE-Arduino@1.4.3
  # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
@@ -9,7 +9,7 @@ custom_meshtastic_display_name = Nano G1 Explorer
 custom_meshtastic_tags = B&Q

 extends = esp32_base
-board = ttgo-tbeam
+board = ttgo-t-beam
 build_flags = 
  ${esp32_base.build_flags}
  -D NANO_G1_EXPLORER
@@ -9,7 +9,7 @@ custom_meshtastic_display_name = Nano G1
 custom_meshtastic_tags = B&Q

 extends = esp32_base
-board = ttgo-tbeam
+board = ttgo-t-beam
 build_flags = 
  ${esp32_base.build_flags}
  -D NANO_G1
@@ -9,7 +9,10 @@ custom_meshtastic_display_name = Station G1
 custom_meshtastic_tags = B&Q

 extends = esp32_base
-board = ttgo-tbeam
+board = ttgo-t-beam
+build_unflags =
+  ${esp32_common.build_unflags}
+  -DBOARD_HAS_PSRAM
 build_flags = 
  ${esp32_base.build_flags}
  -D STATION_G1
@@ -10,12 +10,14 @@ custom_meshtastic_images = tbeam.svg
 custom_meshtastic_tags = LilyGo

 extends = esp32_base
-board = ttgo-tbeam
+board = ttgo-t-beam

 board_check = true
 build_flags = ${esp32_base.build_flags}
  -D TBEAM_V10
  -I variants/esp32/tbeam
+  -DBOARD_HAS_PSRAM
+  -mfix-esp32-psram-cache-issue
  -ULED_BUILTIN
 upload_speed = 921600

@@ -9,7 +9,7 @@ custom_meshtastic_tags = LilyGo

 board_level = extra
 extends = esp32_base
-board = ttgo-tbeam
+board = ttgo-t-beam
 build_flags = 
  ${esp32_base.build_flags}
  -D TBEAM_V07
@@ -5,3 +5,6 @@ build_flags =
  ${esp32c3_base.build_flags}
  -D HELTEC_HRU_3601
  -I variants/esp32c3/heltec_hru_3601
+lib_deps = ${esp32c3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
+  adafruit/Adafruit NeoPixel@1.15.4
@@ -3,9 +3,6 @@ extends = esp32_common
 platform =
  # Do not renovate until we have switched to pioarduino tagged builds
  https://github.com/Jason2866/platform-espressif32/archive/22faa566df8c789000f8136cd8d0aca49617af55.zip
-platform_packages =
-  # HACK: This release was automatically removed upstream
-  framework-arduinoespressif32 @ https://github.com/vidplace7/platform-espressif32/releases/download/meshtastic-esp32c6/framework-arduinoespressif32-all-release_v5.1-124d64e.zip
 build_flags =
  ${arduino_base.build_flags}
  -Wall
@@ -23,6 +23,8 @@ build_unflags =
  -D HAS_WIFI
 lib_deps =
  ${esp32c6_base.lib_deps}
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
+  adafruit/Adafruit NeoPixel@1.15.4
  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
  h2zero/NimBLE-Arduino@2.3.7
 build_flags = 
@@ -9,11 +9,11 @@ void earlyInitVariant()
    io.pinMode(PCA_PIN_EINK_EN, OUTPUT);
    io.pinMode(PCA_PIN_POWER_EN, OUTPUT);
    io.pinMode(PCA_LED_POWER, OUTPUT);
-    io.pinMode(PCA_LED_NOTIFICATION, OUTPUT);
+    io.pinMode(PCA_LED_USER, OUTPUT);
    io.pinMode(PCA_LED_ENABLE, OUTPUT);

    io.digitalWrite(PCA_PIN_POWER_EN, HIGH);
-    io.digitalWrite(PCA_LED_NOTIFICATION, LOW);
+    io.digitalWrite(PCA_LED_USER, LOW);
    io.digitalWrite(PCA_LED_ENABLE, LOW);
 }

@@ -8,9 +8,9 @@

 // LED
 // Both of these are on the GPIO expander
-#define PCA_LED_NOTIFICATION 1 // the Blue LED
-#define PCA_LED_ENABLE 2       // the power supply to the LEDs, in an OR arrangement with VBUS power
-#define PCA_LED_POWER 3        // the Red LED? Seems to have hardware logic to blink when USB is plugged in.
+#define PCA_LED_USER 1   // the Blue LED
+#define PCA_LED_ENABLE 2 // the power supply to the LEDs, in an OR arrangement with VBUS power
+#define PCA_LED_POWER 3  // the Red LED? Seems to have hardware logic to blink when USB is plugged in.
 #define POWER_LED_HARDWARE_BLINKS_WHILE_CHARGING

 // USB_CHECK
@@ -18,7 +18,7 @@
 #define BATTERY_PIN 8
 #define ADC_CHANNEL ADC1_GPIO8_CHANNEL

-#define ADC_MULTIPLIER 2.0 // 2.0 + 10% for correction of display undervoltage.
+#define ADC_MULTIPLIER 2.11 // 2.0 + 10% for correction of display undervoltage.

 #define PIN_BUZZER 9

@@ -86,7 +86,6 @@

 #define BUTTON_PIN PIN_BUTTON1
 #define BUTTON_PIN_ALT PIN_BUTTON2
-#define ALT_BUTTON_WAKE

 #define SERIAL_PRINT_PORT 0
 #endif
@@ -12,6 +12,8 @@ lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
  zinggjm/GxEPD2@1.6.8
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
+  adafruit/Adafruit NeoPixel@1.15.4
 build_unflags =
  ${esp32s3_base.build_unflags}
  -DARDUINO_USB_MODE=1
@@ -8,6 +8,10 @@ board_build.f_cpu = 240000000L
 upload_protocol = esptool
 ;upload_port = /dev/ttyACM0
 upload_speed = 921600
+lib_deps =
+  ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
+  adafruit/Adafruit NeoPixel@1.15.4
 build_unflags =
  ${esp32s3_base.build_unflags}
  -DARDUINO_USB_MODE=1
@@ -84,7 +84,6 @@ custom_meshtastic_images = crowpanel_2_4.svg, crowpanel_2_8.svg
 custom_meshtastic_tags = Elecrow
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 16MB
-custom_meshtastic_has_mui = true

 extends = crowpanel_small_esp32s3_base
 build_flags =
@@ -120,7 +119,6 @@ custom_meshtastic_images = crowpanel_3_5.svg
 custom_meshtastic_tags = Elecrow
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 16MB
-custom_meshtastic_has_mui = true

 extends = crowpanel_small_esp32s3_base
 board_level = pr
@@ -160,10 +158,12 @@ custom_meshtastic_images = crowpanel_5_0.svg, crowpanel_7_0.svg
 custom_meshtastic_tags = Elecrow
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 16MB
-custom_meshtastic_has_mui = true

 extends = crowpanel_large_esp32s3_base
 build_flags =
  ${crowpanel_large_esp32s3_base.build_flags}
  -D VIEW_320x240
  -D DISPLAY_SIZE=800x480 ; landscape mode
+build_src_filter =
+  ${esp32s3_base.build_src_filter}
+  +<../variants/esp32s3/elecrow_panel>
@@ -0,0 +1,21 @@
+// meshtastic/firmware/variants/elecrow_panel/variant.cpp
+
+#include "variant.h"
+#include "Arduino.h"
+#include "Wire.h"
+
+bool elecrow_v2 = false; // false = v1, true = v2
+
+extern "C" {
+
+void initVariant()
+{
+    Wire.begin(I2C_SDA, I2C_SCL, 100000);
+    delay(50);
+    Wire.beginTransmission(0x30);
+    if (Wire.endTransmission() == 0) {
+        elecrow_v2 = true;
+    }
+    Wire.end();
+}
+}
@@ -1,6 +1,8 @@
 #define I2C_SDA 15
 #define I2C_SCL 16

+extern bool elecrow_v2; // false = v1, true = v2
+
 #if CROW_SELECT == 1
 #define WAKE_ON_TOUCH
 #define SCREEN_TOUCH_INT 47
@@ -17,7 +19,7 @@
 #define DAC_I2S_DOUT 12
 #define DAC_I2S_MCLK 8 // don't use GPIO0 because it's assigned to LoRa or button
 #else
-#define PIN_BUZZER 8
+#define PIN_BUZZER (elecrow_v2 ? 0 : 8)
 #endif

 // GPS via UART1 connector
@@ -72,7 +74,7 @@
 #define SENSOR_POWER_ON LOW
 #else
 // 4.3", 5.0", 7.0"
-#define LORA_CS 0
+#define LORA_CS (elecrow_v2 ? 8 : 0)
 #define LORA_SCK 5
 #define LORA_MISO 4
 #define LORA_MOSI 6
@@ -24,3 +24,5 @@ build_flags = ${esp32s3_base.build_flags}
 lib_deps = ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
  zinggjm/GxEPD2@1.6.8
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
+  adafruit/Adafruit NeoPixel@1.15.4
@@ -8,3 +8,7 @@ build_flags =
  -I variants/esp32s3/heltec_sensor_hub
  -D HELTEC_SENSOR_HUB
  -ULED_BUILTIN
+
+lib_deps = ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
+  adafruit/Adafruit NeoPixel@1.15.4
@@ -22,7 +22,6 @@ custom_meshtastic_images = heltec_v4.svg
 custom_meshtastic_tags = Heltec
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 16MB
-custom_meshtastic_has_mui = true

 extends = heltec_v4_base
 build_flags = 
@@ -9,7 +9,6 @@ custom_meshtastic_images = heltec-vision-master-e213.svg
 custom_meshtastic_tags = Heltec
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 8MB
-custom_meshtastic_has_ink_hud = true

 extends = esp32s3_base
 board = heltec_vision_master_e213
@@ -10,7 +10,6 @@ custom_meshtastic_images = heltec-vision-master-e290.svg
 custom_meshtastic_tags = Heltec
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 8MB
-custom_meshtastic_has_ink_hud = true

 extends = esp32s3_base
 board = heltec_vision_master_e290
@@ -20,5 +20,5 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-st7789 packageName=https://github.com/meshtastic/st7789 gitBranch=main
-  https://github.com/meshtastic/st7789/archive/a787beea5c6c8f864ba6787eb432bbefc575e6ad.zip
+  https://github.com/meshtastic/st7789/archive/9ee76d6b18b9a8f45a2c5cae06b1134a587691eb.zip
 upload_speed = 921600
@@ -9,7 +9,6 @@ custom_meshtastic_display_name = Heltec Wireless Paper
 custom_meshtastic_images = heltec-wireless-paper.svg
 custom_meshtastic_tags = Heltec
 custom_meshtastic_partition_scheme = 8MB
-custom_meshtastic_has_ink_hud = true

 extends = esp32s3_base
 board = heltec_wifi_lora_32_V3
@@ -16,10 +16,12 @@ build_src_filter =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-st7789 packageName=https://github.com/meshtastic/st7789 gitBranch=main
-  https://github.com/meshtastic/st7789/archive/a787beea5c6c8f864ba6787eb432bbefc575e6ad.zip
+  https://github.com/meshtastic/st7789/archive/9ee76d6b18b9a8f45a2c5cae06b1134a587691eb.zip
  # renovate: datasource=github-tags depName=pschatzmann_arduino-audio-driver packageName=pschatzmann/arduino-audio-driver
  https://github.com/pschatzmann/arduino-audio-driver/archive/v0.2.1.zip
  # renovate: datasource=git-refs depName=ESP8266Audio packageName=https://github.com/meshtastic/ESP8266Audio gitBranch=meshtastic-2.0.0-dacfix
  https://github.com/meshtastic/ESP8266Audio/archive/343024632ee78d6216907b2353fc943a62422d80.zip
  # renovate: datasource=custom.pio depName=ESP8266SAM packageName=earlephilhower/library/ESP8266SAM
  earlephilhower/ESP8266SAM@1.1.0
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
+  adafruit/Adafruit NeoPixel@1.15.4
@@ -12,7 +12,6 @@ build_flags = ${esp32s3_base.build_flags}
  -D CONFIG_ARDUHAL_ESP_LOG
  -D CONFIG_ARDUHAL_LOG_COLORS=1
  -D CONFIG_DISABLE_HAL_LOCKS=1
-  -D MESHTASTIC_EXCLUDE_SCREEN=1
  -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
  -D MESHTASTIC_EXCLUDE_INPUTBROKER=1
  -D MESHTASTIC_EXCLUDE_BLUETOOTH=1
@@ -32,10 +31,7 @@ build_flags = ${esp32s3_base.build_flags}
  -D HAS_SCREEN=0
  -D HAS_TFT=1
  -D USE_PIN_BUZZER
-  -D MAP_TILES_GREY ; required for 2MB PSRAM
-  -D RAM_SIZE=1432
-  -D STBI_ARENA_SIZE=450000
-  -D LV_CACHE_DEF_SIZE=0
+  -D RAM_SIZE=1024
  -D LGFX_DRIVER_TEMPLATE
  -D LGFX_DRIVER=LGFX_GENERIC
  -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_GENERIC.h\"
@@ -98,7 +98,7 @@ void setupNicheGraphics()
    buttons->setTwoWayRockerPressHandlers(
        [inkhud]() {
            bool systemHandlingInput = false;
-            for (const InkHUD::SystemApplet *sa : inkhud->systemApplets) {
+            for (InkHUD::SystemApplet *sa : inkhud->systemApplets) {
                if (sa->handleInput) {
                    systemHandlingInput = true;
                    break;
@@ -112,7 +112,7 @@ void setupNicheGraphics()
        },
        [inkhud]() {
            bool systemHandlingInput = false;
-            for (const InkHUD::SystemApplet *sa : inkhud->systemApplets) {
+            for (InkHUD::SystemApplet *sa : inkhud->systemApplets) {
                if (sa->handleInput) {
                    systemHandlingInput = true;
                    break;
@@ -1,5 +1,5 @@
 [env:mini-epaper-s3]
-custom_meshtastic_hw_model = 125
+;custom_meshtastic_hw_model =
 custom_meshtastic_hw_model_slug = MINI_EPAPER_S3
 custom_meshtastic_architecture = esp32-s3
 custom_meshtastic_actively_supported = true
@@ -8,7 +8,6 @@ custom_meshtastic_display_name = LILYGO Mini ePaper S3 E-Ink
 custom_meshtastic_images = mini-epaper-s3.svg
 custom_meshtastic_tags = LilyGo
 custom_meshtastic_requires_dfu = no
-custom_meshtastic_has_mui = false

 extends = esp32s3_base
 board = mini-epaper-s3
@@ -6,7 +6,6 @@ custom_meshtastic_actively_supported = true
 custom_meshtastic_support_level = 3
 custom_meshtastic_display_name = Pi Computer S3
 custom_meshtastic_partition_scheme = 8MB
-custom_meshtastic_has_mui = true

 extends = esp32s3_base
 board = bpi_picow_esp32_s3
@@ -9,7 +9,6 @@ custom_meshtastic_images = rak_3312.svg
 custom_meshtastic_tags = RAK
 custom_meshtastic_requires_dfu = false
 custom_meshtastic_partition_scheme = 16MB
-custom_meshtastic_has_mui = false

 extends = esp32s3_base
 board = wiscore_rak3312
@@ -20,7 +20,6 @@ custom_meshtastic_display_name = RAK WisMesh Tap V2
 custom_meshtastic_images = rak-wismesh-tap-v2.svg
 custom_meshtastic_tags = RAK
 custom_meshtastic_partition_scheme = 8MB
-custom_meshtastic_has_mui = true

 extends = esp32s3_base
 board = wiscore_rak3312
@@ -44,7 +43,6 @@ extends = env:rak_wismesh_tap_v2

 build_flags =
  ${env:rak_wismesh_tap_v2.build_flags}
-  -D MESHTASTIC_EXCLUDE_WEBSERVER=1
  -D CONFIG_ARDUHAL_ESP_LOG
  -D CONFIG_ARDUHAL_LOG_COLORS=1
  -D CONFIG_DISABLE_HAL_LOCKS=1
@@ -9,7 +9,7 @@ custom_meshtastic_display_name = Seeed SenseCAP Indicator
 custom_meshtastic_images = seeed-sensecap-indicator.svg
 custom_meshtastic_tags = Seeed
 custom_meshtastic_partition_scheme = 8MB
-custom_meshtastic_has_mui = true
+ = true

 extends = esp32s3_base
 platform_packages =
@@ -8,7 +8,6 @@ custom_meshtastic_support_level = 1
 custom_meshtastic_display_name = LILYGO T-Beam 1W
 custom_meshtastic_images = tbeam-1w.svg
 custom_meshtastic_tags = LilyGo
-custom_meshtastic_has_mui = false

 extends = esp32s3_base
 board = t-beam-1w
@@ -9,7 +9,6 @@ custom_meshtastic_images = tdeck_pro.svg
 custom_meshtastic_tags = LilyGo
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 16MB
-custom_meshtastic_has_mui = false

 extends = esp32s3_base
 board = t-deck-pro
@@ -10,7 +10,6 @@ custom_meshtastic_images = t-deck.svg
 custom_meshtastic_tags = LilyGo
 custom_meshtastic_requires_dfu = true
 custom_meshtastic_partition_scheme = 16MB
-custom_meshtastic_has_mui = true

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