Some fixes for xeddsa pr (#9610)

* fix: add null check for getMeshNode() in NodeInfoModule

getMeshNode() can return nullptr for unknown nodes. Dereferencing
without a check crashes the firmware when receiving NodeInfo from
a node not yet in the database.

* fix: enforce XEdDSA signature verification and prevent stripping

Previously, failed signature verification still allowed the packet
through, making signatures purely cosmetic. Now:

- Failed verification drops the packet (DECODE_FAILURE)
- Successfully verified nodes get HAS_XEDDSA_SIGNED bitfield set
- Unsigned packets from previously-signing nodes are rejected
- Log levels reduced from WARN/ERROR to DEBUG/WARN as appropriate

* fix: include packet metadata in XEdDSA signature

The signature now covers [fromNode | packetId | portnum | payload]
instead of just the payload bytes. This prevents:
- Replay attacks (different packetId fails verification)
- Reattribution (different fromNode fails verification)
- Portnum redirection (different portnum fails verification)

Also adds a key initialization check to xeddsa_sign (returns false
if XEdDSA keys are all zeros) and checks the return value in the
encode path.

* fix: handle existing key pair in AdminModule security config

When a user provides both a valid private key and public key via
admin config, the crypto engine's DH private key and owner public
key were never loaded. DMs and XEdDSA signing would silently break.

Add an else branch to load both keys into the crypto engine.

* perf: cache Ed25519 public key conversion in xeddsa_verify

curve_to_ed_pub() performs field element parsing, inversion, and
multiplication on every call. Since packets from the same node
tend to arrive in bursts, a single-entry cache avoids repeating
this expensive conversion for consecutive packets from one sender.

* fix: skip identity cleanup when node number is unchanged

createNewIdentity() was called on every generateCryptoKeyPair(),
including normal boots where the same key is regenerated. This
caused unnecessary NodeDB writes and old-node cleanup logic to
run when the node number hadn't actually changed.

Also fixes only zeroing byte[0] of the old node's public key
instead of clearing the entire array.

* fix: replace hardcoded 120 with derived XEDDSA_SIGNATURE_SIZE constant

The payload size check for XEdDSA signing used a magic number (120).
Replace with a derivation from DATA_PAYLOAD_LEN and XEDDSA_SIGNATURE_SIZE
so the limit adjusts automatically if constants change. This also
increases the max signable payload from 120 to 169 bytes, which is
still safe since the actual encoded size is checked after pb_encode.

* fix: add const qualifiers to XEdDSA verify and curve_to_ed_pub inputs

pubKey, payload, and signature parameters in xeddsa_verify are
input-only and should not be modified. Same for curve_pubkey in
curve_to_ed_pub.

* chore: remove commented-out old Crypto dependency in portduino.ini

* Leave out the admin module change for now

---------

Co-authored-by: Jonathan Bennett <jbennett@incomsystems.biz>

.clusterfuzzlite/Dockerfile

@@ -20,7 +20,7 @@ ENV PIP_ROOT_USER_ACTION=ignore
 RUN apt-get update && apt-get install --no-install-recommends -y \
         cmake git zip libgpiod-dev libbluetooth-dev libi2c-dev \
         libunistring-dev libmicrohttpd-dev libgnutls28-dev libgcrypt20-dev \
-        libusb-1.0-0-dev libssl-dev pkg-config libsqlite3-dev libsdl2-dev && \
+        libusb-1.0-0-dev libssl-dev pkg-config && \
     apt-get clean && rm -rf /var/lib/apt/lists/* && \
     pip install --no-cache-dir -U \
         platformio==6.1.16 \

.clusterfuzzlite/build.sh

@@ -51,7 +51,7 @@ for f in .clusterfuzzlite/*_fuzzer.cpp; do
 	fuzzer=$(basename "$f" .cpp)
 	cp -f "$f" src/fuzzer.cpp
 	pio run -vvv --environment "$PIO_ENV"
-	program="$PLATFORMIO_WORKSPACE_DIR/build/$PIO_ENV/meshtasticd"
+	program="$PLATFORMIO_WORKSPACE_DIR/build/$PIO_ENV/program"
 	cp "$program" "$OUT/$fuzzer"
 
 	# Copy shared libraries used by the fuzzer.

.envrc

@@ -1 +0,0 @@
-use nix

.github/actionlint.yaml

@@ -2,5 +2,4 @@
 self-hosted-runner:
   # Labels of self-hosted runner in array of strings.
   labels:
-    - arctastic
     - test-runner

.github/actions/build-variant/action.yml

@@ -76,7 +76,7 @@ runs:
         done
 
     - name: PlatformIO ${{ inputs.arch }} download cache
-      uses: actions/cache@v5
+      uses: actions/cache@v4
       with:
         path: ~/.platformio/.cache
         key: pio-cache-${{ inputs.arch }}-${{ hashFiles('.github/actions/**', '**.ini') }}
@@ -100,9 +100,9 @@ runs:
       id: version
 
     - name: Store binaries as an artifact
-      uses: actions/upload-artifact@v7
+      uses: actions/upload-artifact@v5
       with:
-        name: firmware-${{ inputs.arch }}-${{ inputs.board }}-${{ steps.version.outputs.long }}
+        name: firmware-${{ inputs.arch }}-${{ inputs.board }}-${{ steps.version.outputs.long }}.zip
         overwrite: true
         path: |
           ${{ inputs.artifact-paths }}

.github/actions/setup-base/action.yml

@@ -8,6 +8,8 @@ runs:
       uses: actions/checkout@v6
       with:
         submodules: recursive
+        ref: ${{github.event.pull_request.head.ref}}
+        repository: ${{github.event.pull_request.head.repo.full_name}}
 
     - name: Install dependencies
       shell: bash

.github/copilot-instructions.md

@@ -1,314 +0,0 @@
-# Meshtastic Firmware - Copilot Instructions
-
-This document provides context and guidelines for AI assistants working with the Meshtastic firmware codebase.
-
-## Project Overview
-
-Meshtastic is an open-source LoRa mesh networking project for long-range, low-power communication without relying on internet or cellular infrastructure. The firmware enables text messaging, location sharing, and telemetry over a decentralized mesh network.
-
-### Supported Hardware Platforms
-
-- **ESP32** (ESP32, ESP32-S3, ESP32-C3) - Most common platform
-- **nRF52** (nRF52840, nRF52833) - Low power Nordic chips
-- **RP2040/RP2350** - Raspberry Pi Pico variants
-- **STM32WL** - STM32 with integrated LoRa
-- **Linux/Portduino** - Native Linux builds (Raspberry Pi, etc.)
-
-### Supported Radio Chips
-
-- **SX1262/SX1268** - Sub-GHz LoRa (868/915 MHz regions)
-- **SX1280** - 2.4 GHz LoRa
-- **LR1110/LR1120/LR1121** - Wideband radios (sub-GHz and 2.4 GHz capable, but not simultaneously)
-- **RF95** - Legacy RFM95 modules
-- **LLCC68** - Low-cost LoRa
-
-### MQTT Integration
-
-MQTT provides a bridge between Meshtastic mesh networks and the internet, enabling nodes with network connectivity to share messages with remote meshes or external services.
-
-#### Key Components
-
-- **`src/mqtt/MQTT.cpp`** - Main MQTT client singleton, handles connection and message routing
-- **`src/mqtt/ServiceEnvelope.cpp`** - Protobuf wrapper for mesh packets sent over MQTT
-- **`moduleConfig.mqtt`** - MQTT module configuration
-
-#### MQTT Topic Structure
-
-Messages are published/subscribed using a hierarchical topic format:
-
-```
-{root}/{channel_id}/{gateway_id}
-```
-
-- `root` - Configurable prefix (default: `msh`)
-- `channel_id` - Channel name/identifier
-- `gateway_id` - Node ID of the publishing gateway
-
-#### Configuration Defaults (from `Default.h`)
-
-```cpp
-#define default_mqtt_address "mqtt.meshtastic.org"
-#define default_mqtt_username "meshdev"
-#define default_mqtt_password "large4cats"
-#define default_mqtt_root "msh"
-#define default_mqtt_encryption_enabled true
-#define default_mqtt_tls_enabled false
-```
-
-#### Key Concepts
-
-- **Uplink** - Mesh packets sent TO the MQTT broker (controlled by `uplink_enabled` per channel)
-- **Downlink** - MQTT messages received and injected INTO the mesh (controlled by `downlink_enabled` per channel)
-- **Encryption** - When `encryption_enabled` is true, only encrypted packets are sent; plaintext JSON is disabled
-- **ServiceEnvelope** - Protobuf wrapper containing packet + channel_id + gateway_id for routing
-- **JSON Support** - Optional JSON encoding for integration with external systems (disabled on nRF52 by default)
-
-#### PKI Messages
-
-PKI (Public Key Infrastructure) messages have special handling:
-
-- Accepted on a special "PKI" channel
-- Allow encrypted DMs between nodes that discovered each other on downlink-enabled channels
-
-## Project Structure
-
-```
-firmware/
-├── src/                    # Main source code
-│   ├── main.cpp           # Application entry point
-│   ├── mesh/              # Core mesh networking
-│   │   ├── NodeDB.*       # Node database management
-│   │   ├── Router.*       # Packet routing
-│   │   ├── Channels.*     # Channel management
-│   │   ├── *Interface.*   # Radio interface implementations
-│   │   └── generated/     # Protobuf generated code
-│   ├── modules/           # Feature modules (Position, Telemetry, etc.)
-│   ├── gps/               # GPS handling
-│   ├── graphics/          # Display drivers and UI
-│   ├── platform/          # Platform-specific code
-│   ├── input/             # Input device handling
-│   └── concurrency/       # Threading utilities
-├── variants/              # Hardware variant definitions
-│   ├── esp32/            # ESP32 variants
-│   ├── esp32s3/          # ESP32-S3 variants
-│   ├── nrf52/            # nRF52 variants
-│   └── rp2xxx/           # RP2040/RP2350 variants
-├── protobufs/            # Protocol buffer definitions
-├── boards/               # Custom PlatformIO board definitions
-└── bin/                  # Build and utility scripts
-```
-
-## Coding Conventions
-
-### General Style
-
-- Follow existing code style - run `trunk fmt` before commits
-- Prefer `LOG_DEBUG`, `LOG_INFO`, `LOG_WARN`, `LOG_ERROR` for logging
-- Use `assert()` for invariants that should never fail
-
-### Naming Conventions
-
-- Classes: `PascalCase` (e.g., `PositionModule`, `NodeDB`)
-- Functions/Methods: `camelCase` (e.g., `sendOurPosition`, `getNodeNum`)
-- Constants/Defines: `UPPER_SNAKE_CASE` (e.g., `MAX_INTERVAL`, `ONE_DAY`)
-- Member variables: `camelCase` (e.g., `lastGpsSend`, `nodeDB`)
-- Config defines: `USERPREFS_*` for user-configurable options
-
-### Key Patterns
-
-#### Module System
-
-Modules inherit from `MeshModule` or `ProtobufModule<T>` and implement:
-
-- `handleReceivedProtobuf()` - Process incoming packets
-- `allocReply()` - Generate response packets
-- `runOnce()` - Periodic task execution (returns next run interval in ms)
-
-```cpp
-class MyModule : public ProtobufModule<meshtastic_MyMessage>
-{
-  protected:
-    virtual bool handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_MyMessage *msg) override;
-    virtual int32_t runOnce() override;
-};
-```
-
-#### Configuration Access
-
-- `config.*` - Device configuration (LoRa, position, power, etc.)
-- `moduleConfig.*` - Module-specific configuration
-- `channels.*` - Channel configuration and management
-
-#### Default Values
-
-Use the `Default` class helpers in `src/mesh/Default.h`:
-
-- `Default::getConfiguredOrDefaultMs(configured, default)` - Returns ms, using default if configured is 0
-- `Default::getConfiguredOrMinimumValue(configured, min)` - Enforces minimum values
-- `Default::getConfiguredOrDefaultMsScaled(configured, default, numNodes)` - Scales based on network size
-
-#### Thread Safety
-
-- Use `concurrency::Lock` for mutex protection
-- Radio SPI access uses `SPILock`
-- Prefer `OSThread` for background tasks
-
-### Hardware Variants
-
-Each hardware variant has:
-
-- `variant.h` - Pin definitions and hardware capabilities
-- `platformio.ini` - Build configuration
-- Optional: `pins_arduino.h`, `rfswitch.h`
-
-Key defines in variant.h:
-
-```cpp
-#define USE_SX1262          // Radio chip selection
-#define HAS_GPS 1           // Hardware capabilities
-#define LORA_CS 36          // Pin assignments
-#define SX126X_DIO1 14      // Radio-specific pins
-```
-
-### Protobuf Messages
-
-- Defined in `protobufs/meshtastic/*.proto`
-- Generated code in `src/mesh/generated/`
-- Regenerate with `bin/regen-protos.sh`
-- Message types prefixed with `meshtastic_`
-
-### Conditional Compilation
-
-```cpp
-#if !MESHTASTIC_EXCLUDE_GPS        // Feature exclusion
-#ifdef ARCH_ESP32                   // Architecture-specific
-#if defined(USE_SX1262)            // Radio-specific
-#ifdef HAS_SCREEN                   // Hardware capability
-#if USERPREFS_EVENT_MODE           // User preferences
-```
-
-## Build System
-
-Uses **PlatformIO** with custom scripts:
-
-- `bin/platformio-pre.py` - Pre-build script
-- `bin/platformio-custom.py` - Custom build logic
-
-Build commands:
-
-```bash
-pio run -e tbeam              # Build specific target
-pio run -e tbeam -t upload    # Build and upload
-pio run -e native             # Build native/Linux version
-```
-
-## Common Tasks
-
-### Adding a New Module
-
-1. Create `src/modules/MyModule.cpp` and `.h`
-2. Inherit from appropriate base class
-3. Register in `src/modules/Modules.cpp`
-4. Add protobuf messages if needed in `protobufs/`
-
-### Adding a New Hardware Variant
-
-1. Create directory under `variants/<arch>/<name>/`
-2. Add `variant.h` with pin definitions
-3. Add `platformio.ini` with build config
-4. Reference common configs with `extends`
-
-### Modifying Configuration Defaults
-
-- Check `src/mesh/Default.h` for default value defines
-- Check `src/mesh/NodeDB.cpp` for initialization logic
-- Consider `isDefaultChannel()` checks for public channel restrictions
-
-## Important Considerations
-
-### Traffic Management
-
-The mesh network has limited bandwidth. When modifying broadcast intervals:
-
-- Respect minimum intervals on default/public channels
-- Use `Default::getConfiguredOrMinimumValue()` to enforce minimums
-- Consider `numOnlineNodes` scaling for congestion control
-
-### Power Management
-
-Many devices are battery-powered:
-
-- Use `IF_ROUTER(routerVal, normalVal)` for role-based defaults
-- Check `config.power.is_power_saving` for power-saving modes
-- Implement proper `sleep()` methods in radio interfaces
-
-### Channel Security
-
-- `channels.isDefaultChannel(index)` - Check if using default/public settings
-- Default channels get stricter rate limits to prevent abuse
-- Private channels may have relaxed limits
-
-## GitHub Actions CI/CD
-
-The project uses GitHub Actions extensively for CI/CD. Key workflows are in `.github/workflows/`:
-
-### Core CI Workflows
-
-- **`main_matrix.yml`** - Main CI pipeline, runs on push to `master`/`develop` and PRs
-  - Uses `bin/generate_ci_matrix.py` to dynamically generate build targets
-  - Builds all supported hardware variants
-  - PRs build a subset (`--level pr`) for faster feedback
-
-- **`trunk_check.yml`** - Code quality checks on PRs
-  - Runs Trunk.io for linting and formatting
-  - Must pass before merge
-
-- **`tests.yml`** - End-to-end and hardware tests
-  - Runs daily on schedule
-  - Includes native tests and hardware-in-the-loop testing
-
-- **`test_native.yml`** - Native platform unit tests
-  - Runs `pio test -e native`
-
-### Release Workflows
-
-- **`release_channels.yml`** - Triggered on GitHub release publish
-  - Builds Docker images
-  - Packages for PPA (Ubuntu), OBS (openSUSE), and COPR (Fedora)
-  - Handles Alpha/Beta/Stable release channels
-
-- **`nightly.yml`** - Nightly builds from develop branch
-
-- **`docker_build.yml`** / **`docker_manifest.yml`** - Docker image builds
-
-### Build Matrix Generation
-
-The CI uses `bin/generate_ci_matrix.py` to dynamically select which targets to build:
-
-```bash
-# Generate full build matrix
-./bin/generate_ci_matrix.py all
-
-# Generate PR-level matrix (subset for faster builds)
-./bin/generate_ci_matrix.py all --level pr
-```
-
-Variants can specify their support level in `platformio.ini`:
-
-- `custom_meshtastic_support_level = 1` - Actively supported, built on every PR
-- `custom_meshtastic_support_level = 2` - Supported, built on merge to main branches
-- `board_level = extra` - Extra builds, only on full releases
-
-### Running Workflows Locally
-
-Most workflows can be triggered manually via `workflow_dispatch` for testing.
-
-## Testing
-
-- Unit tests in `test/` directory
-- Run with `pio test -e native`
-- Use `bin/test-simulator.sh` for simulation testing
-
-## Resources
-
-- [Documentation](https://meshtastic.org/docs/)

.github/pull_request_template.md

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

.github/workflows/build_debian_src.yml

@@ -16,7 +16,8 @@ on:
         type: string
 
 permissions:
-  contents: read
+  contents: write
+  packages: write
 
 jobs:
   build-debian-src:
@@ -27,6 +28,8 @@ jobs:
         with:
           submodules: recursive
           path: meshtasticd
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
 
       - name: Install deps
         shell: bash
@@ -39,8 +42,7 @@ jobs:
           sudo mk-build-deps --install --remove --tool='apt-get -o Debug::pkgProblemResolver=yes --no-install-recommends --yes' debian/control
 
       - name: Import GPG key
-        if: github.event_name != 'pull_request' && github.event_name != 'pull_request_target'
-        uses: crazy-max/ghaction-import-gpg@v7
+        uses: crazy-max/ghaction-import-gpg@v6
         with:
           gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }}
         id: gpg
@@ -58,11 +60,11 @@ jobs:
         run: debian/ci_pack_sdeb.sh
         env:
           SERIES: ${{ inputs.series }}
-          GPG_KEY_ID: ${{ steps.gpg.outputs.keyid || '' }}
+          GPG_KEY_ID: ${{ steps.gpg.outputs.keyid }}
           PKG_VERSION: ${{ steps.version.outputs.deb }}
 
       - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: firmware-debian-${{ steps.version.outputs.deb }}~${{ inputs.series }}-src
           overwrite: true

.github/workflows/build_firmware.yml

@@ -18,14 +18,32 @@ permissions: read-all
 jobs:
   pio-build:
     name: build-${{ inputs.platform }}
-    # Use 'arctastic' self-hosted runner pool when building in the main repo
-    runs-on: ${{ github.repository_owner == 'meshtastic' && 'arctastic' || 'ubuntu-latest' }}
+    runs-on: ubuntu-24.04
     outputs:
-      artifact-id: ${{ steps.upload-firmware.outputs.artifact-id }}
+      artifact-id: ${{ steps.upload.outputs.artifact-id }}
     steps:
       - uses: actions/checkout@v6
         with:
           submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - name: Set OTA firmware source and target
+        if: startsWith(inputs.platform, 'esp32')
+        id: ota_dir
+        env:
+          PIO_PLATFORM: ${{ inputs.platform }}
+        run: |
+          if [ "$PIO_PLATFORM" = "esp32s3" ]; then
+            echo "src=firmware-s3.bin" >> $GITHUB_OUTPUT
+            echo "tgt=release/bleota-s3.bin" >> $GITHUB_OUTPUT
+          elif [ "$PIO_PLATFORM" = "esp32c3" ] || [ "$PIO_PLATFORM" = "esp32c6" ]; then
+            echo "src=firmware-c3.bin" >> $GITHUB_OUTPUT
+            echo "tgt=release/bleota-c3.bin" >> $GITHUB_OUTPUT
+          elif [ "$PIO_PLATFORM" = "esp32" ]; then
+            echo "src=firmware.bin" >> $GITHUB_OUTPUT
+            echo "tgt=release/bleota.bin" >> $GITHUB_OUTPUT
+          fi
 
       - name: Build ${{ inputs.platform }}
         id: build
@@ -34,101 +52,18 @@ jobs:
           pio_platform: ${{ inputs.platform }}
           pio_env: ${{ inputs.pio_env }}
           pio_target: build
-
-      - name: ESP32 - Download Unified OTA firmware
-        # Currently only esp32 and esp32s3 use the unified ota
-        if: inputs.platform == 'esp32' || inputs.platform == 'esp32s3'
-        id: dl-ota-unified
-        env:
-          PIO_PLATFORM: ${{ inputs.platform }}
-          PIO_ENV: ${{ inputs.pio_env }}
-          OTA_URL: https://github.com/meshtastic/esp32-unified-ota/releases/latest/download/mt-${{ inputs.platform }}-ota.bin
-        working-directory: release
-        run: |
-          curl -L -o "mt-$PIO_PLATFORM-ota.bin" $OTA_URL
-
-      - name: ESP32-C* - Download BLE-Only OTA firmware
-        if: inputs.platform == 'esp32c3' || inputs.platform == 'esp32c6'
-        id: dl-ota-ble
-        env:
-          PIO_ENV: ${{ inputs.pio_env }}
-          OTA_URL: https://github.com/meshtastic/firmware-ota/releases/latest/download/firmware-c3.bin
-        working-directory: release
-        run: |
-          curl -L -o bleota-c3.bin $OTA_URL
-
-      - name: Update manifest with OTA file
-        if: inputs.platform == 'esp32' || inputs.platform == 'esp32s3' || inputs.platform == 'esp32c3' || inputs.platform == 'esp32c6'
-        working-directory: release
-        env:
-          PIO_PLATFORM: ${{ inputs.platform }}
-        run: |
-          # Determine OTA filename based on platform
-          if [[ "$PIO_PLATFORM" == "esp32" || "$PIO_PLATFORM" == "esp32s3" ]]; then
-            OTA_FILE="mt-${PIO_PLATFORM}-ota.bin"
-          else
-            OTA_FILE="bleota-c3.bin"
-          fi
-
-          # Check if OTA file exists
-          if [[ ! -f "$OTA_FILE" ]]; then
-            echo "OTA file $OTA_FILE not found, skipping manifest update"
-            exit 0
-          fi
-
-          # Calculate MD5 and size
-          if command -v md5sum &> /dev/null; then
-            OTA_MD5=$(md5sum "$OTA_FILE" | cut -d' ' -f1)
-          else
-            OTA_MD5=$(md5 -q "$OTA_FILE")
-          fi
-          OTA_SIZE=$(stat -f%z "$OTA_FILE" 2>/dev/null || stat -c%s "$OTA_FILE")
-
-          # Find and update manifest file
-          for manifest in firmware-*.mt.json; do
-            if [[ -f "$manifest" ]]; then
-              echo "Updating $manifest with $OTA_FILE (md5: $OTA_MD5, size: $OTA_SIZE)"
-              # Add OTA entry to files array if not already present
-              jq --arg name "$OTA_FILE" --arg md5 "$OTA_MD5" --argjson bytes "$OTA_SIZE" --arg part "app1" \
-                'if .files | map(select(.name == $name)) | length == 0 then .files += [{"name": $name, "md5": $md5, "bytes": $bytes, "part_name": $part}] else . end' \
-                "$manifest" > "${manifest}.tmp" && mv "${manifest}.tmp" "$manifest"
-            fi
-          done
-
-      - name: Job summary
-        env:
-          PIO_ENV: ${{ inputs.pio_env }}
-        run: |
-          echo "## $PIO_ENV" >> $GITHUB_STEP_SUMMARY
-          echo "<details><summary><strong>Manifest</strong></summary>" >> $GITHUB_STEP_SUMMARY
-          echo '' >> $GITHUB_STEP_SUMMARY
-          echo '```json' >> $GITHUB_STEP_SUMMARY
-          cat release/firmware-*.mt.json >> $GITHUB_STEP_SUMMARY
-          echo '' >> $GITHUB_STEP_SUMMARY
-          echo '```' >> $GITHUB_STEP_SUMMARY
-          echo "</details>" >> $GITHUB_STEP_SUMMARY
+          ota_firmware_source: ${{ steps.ota_dir.outputs.src || '' }}
+          ota_firmware_target: ${{ steps.ota_dir.outputs.tgt || '' }}
 
       - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v7
-        id: upload-firmware
+        uses: actions/upload-artifact@v5
+        id: upload
         with:
-          name: firmware-${{ inputs.platform }}-${{ inputs.pio_env }}-${{ inputs.version }}
+          name: firmware-${{ inputs.platform }}-${{ inputs.pio_env }}-${{ inputs.version }}.zip
           overwrite: true
           path: |
-            release/*.mt.json
             release/*.bin
             release/*.elf
             release/*.uf2
             release/*.hex
-            release/*.zip
-            release/device-*.sh
-            release/device-*.bat
-
-      - name: Store manifests as an artifact
-        uses: actions/upload-artifact@v7
-        id: upload-manifest
-        with:
-          name: manifest-${{ inputs.platform }}-${{ inputs.pio_env }}-${{ inputs.version }}
-          overwrite: true
-          path: |
-            release/*.mt.json
+            release/*-ota.zip

.github/workflows/build_one_target.yml

@@ -4,14 +4,9 @@ on:
   workflow_dispatch:
     inputs:
       # trunk-ignore(checkov/CKV_GHA_7)
-      target:
-        type: string
-        required: false
-        description: Choose the target board, e.g. nrf52_promicro_diy_tcxo. If blank, will find available targets.
       arch:
         type: choice
         options:
-          - all
           - esp32
           - esp32s3
           - esp32c3
@@ -20,18 +15,32 @@ on:
           - rp2040
           - rp2350
           - stm32
-        description: Choose an arch to limit the search, or 'all' to search all architectures.
-        default: all
+      target:
+        type: string
+        required: false
+        description: Choose the target board, e.g. nrf52_promicro_diy_tcxo. If blank, will find available targets.
+      # find-target:
+      #   type: boolean
+      #   default: true
+      #   description: 'Find the available targets'
 
 permissions: read-all
 
 jobs:
   find-targets:
+    if: ${{ inputs.target == '' }}
     strategy:
       fail-fast: false
       matrix:
         arch:
-          - all
+          - esp32
+          - esp32s3
+          - esp32c3
+          - esp32c6
+          - nrf52840
+          - rp2040
+          - rp2350
+          - stm32
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v6
@@ -42,37 +51,14 @@ jobs:
       - run: pip install -U platformio
       - name: Generate matrix
         id: jsonStep
-        env:
-          BUILDTARGET: ${{ inputs.target }}
-          MATRIXARCH: ${{ inputs.arch }}
         run: |
           TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}} --level extra)
-          if [ "$BUILDTARGET" = "" ]; then
-            echo "Name: $GITHUB_REF_NAME" >> $GITHUB_STEP_SUMMARY
-            echo "Base: $GITHUB_BASE_REF" >> $GITHUB_STEP_SUMMARY
-            echo "Arch: $MATRIXARCH" >> $GITHUB_STEP_SUMMARY
-            echo "Ref: $GITHUB_REF" >> $GITHUB_STEP_SUMMARY
-            echo "## 🎯 The following target boards are available to build:" >> $GITHUB_STEP_SUMMARY
-            echo "| Platform | Board |" >> $GITHUB_STEP_SUMMARY
-            echo "| -------- | ----- |" >> $GITHUB_STEP_SUMMARY
-            echo $TARGETS | jq -r 'sort_by(.board) | sort_by(.platform) |.[] | "| " + .platform + " | " + .board + " |" ' >> $GITHUB_STEP_SUMMARY
-          else
-            echo "We build this one:" >> $GITHUB_STEP_SUMMARY
-            ARCH=$(echo "$TARGETS" | jq --arg BUILDTARGET "$BUILDTARGET" -r '.[] | select(.board==$BUILDTARGET) | .platform')
-            echo "| Platform | Board |" >> $GITHUB_STEP_SUMMARY
-            echo "| -------- | ----- |" >> $GITHUB_STEP_SUMMARY
-            echo "| $ARCH | "$BUILDTARGET" |" >> $GITHUB_STEP_SUMMARY
-            echo "" >> $GITHUB_STEP_SUMMARY
-            if [[ "$ARCH" == "" ]]; then
-              echo "## ❌ Error: Target "$BUILDTARGET" not found!" >> $GITHUB_STEP_SUMMARY
-            else
-              echo "## ✅ Target "$BUILDTARGET" found, proceeding to build." >> $GITHUB_STEP_SUMMARY
-            fi
-            echo "You may need to refresh this page to make the built firmware appear below." >> $GITHUB_STEP_SUMMARY
-            echo "arch=$ARCH" >> $GITHUB_OUTPUT
-          fi
-    outputs:
-      arch: ${{ steps.jsonStep.outputs.arch }}
+          echo "Name: $GITHUB_REF_NAME" >> $GITHUB_STEP_SUMMARY
+          echo "Base: $GITHUB_BASE_REF" >> $GITHUB_STEP_SUMMARY
+          echo "Arch: ${{matrix.arch}}" >> $GITHUB_STEP_SUMMARY
+          echo "Ref: $GITHUB_REF" >> $GITHUB_STEP_SUMMARY
+          echo "Targets:" >> $GITHUB_STEP_SUMMARY
+          echo $TARGETS | jq -r 'sort_by(.board) |.[] | "- " + .board' >> $GITHUB_STEP_SUMMARY
 
   version:
     if: ${{ inputs.target != '' }}
@@ -92,16 +78,16 @@ jobs:
 
   build:
     if: ${{ inputs.target != '' && inputs.arch != 'native' }}
-    needs: [version, find-targets]
+    needs: [version]
     uses: ./.github/workflows/build_firmware.yml
     with:
       version: ${{ needs.version.outputs.long }}
       pio_env: ${{ inputs.target }}
-      platform: ${{ needs.find-targets.outputs.arch }}
+      platform: ${{ inputs.arch }}
 
   gather-artifacts:
     permissions:
-      contents: read
+      contents: write
       pull-requests: write
     runs-on: ubuntu-latest
     needs: [version, build]
@@ -112,7 +98,7 @@ jobs:
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
 
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v6
         with:
           path: ./
           pattern: firmware-*-*
@@ -125,7 +111,7 @@ jobs:
         run: mv -b -t ./ ./bin/device-*.sh ./bin/device-*.bat
 
       - name: Repackage in single firmware zip
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: firmware-${{inputs.target}}-${{ needs.version.outputs.long }}
           overwrite: true
@@ -133,7 +119,7 @@ jobs:
             ./firmware-*.bin
             ./firmware-*.uf2
             ./firmware-*.hex
-            ./firmware-*.zip
+            ./firmware-*-ota.zip
             ./device-*.sh
             ./device-*.bat
             ./littlefs-*.bin
@@ -141,7 +127,7 @@ jobs:
             ./Meshtastic_nRF52_factory_erase*.uf2
           retention-days: 30
 
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v6
         with:
           pattern: firmware-*-${{ needs.version.outputs.long }}
           merge-multiple: true
@@ -153,14 +139,14 @@ jobs:
 
       - name: Device scripts permissions
         run: |
-          chmod +x ./output/device-install.sh || true
-          chmod +x ./output/device-update.sh || true
+          chmod +x ./output/device-install.sh
+          chmod +x ./output/device-update.sh
 
       - name: Zip firmware
         run: zip -j -9 -r ./firmware-${{inputs.target}}-${{ needs.version.outputs.long }}.zip ./output
 
       - name: Repackage in single elfs zip
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: debug-elfs-${{inputs.target}}-${{ needs.version.outputs.long }}.zip
           overwrite: true

.github/workflows/daily_packaging.yml

@@ -5,7 +5,7 @@ on:
   workflow_dispatch:
   push:
     branches:
-      - develop # Default branch, same as 'cron' above
+      - master
     paths:
       - debian/**
       - "*.rpkg"
@@ -16,7 +16,7 @@ on:
       - .github/workflows/hook_copr.yml
 
 permissions:
-  contents: read
+  contents: write
   packages: write
 
 jobs:
@@ -35,8 +35,8 @@ jobs:
         series:
           - jammy # 22.04 LTS
           - noble # 24.04 LTS
+          - plucky # 25.04
           - questing # 25.10
-          - resolute # 26.04 LTS
     uses: ./.github/workflows/package_ppa.yml
     with:
       ppa_repo: ppa:meshtastic/daily

.github/workflows/docker_build.yml

@@ -37,7 +37,7 @@ on:
         value: ${{ jobs.docker-build.outputs.digest }}
 
 permissions:
-  contents: read
+  contents: write
   packages: write
 
 jobs:
@@ -50,6 +50,8 @@ jobs:
         uses: actions/checkout@v6
         with:
           submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
 
       - name: Get release version string
         run: |
@@ -58,16 +60,16 @@ jobs:
 
       - name: Docker login
         if: ${{ inputs.push }}
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           username: meshtastic
           password: ${{ secrets.DOCKER_FIRMWARE_TOKEN }}
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v4
+        uses: docker/setup-qemu-action@v3
 
       - name: Docker setup
-        uses: docker/setup-buildx-action@v4
+        uses: docker/setup-buildx-action@v3
 
       - name: Sanitize platform string
         id: sanitize_platform
@@ -76,7 +78,7 @@ jobs:
 
       - name: Docker tag
         id: meta
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: meshtastic/meshtasticd
           tags: |
@@ -84,7 +86,7 @@ jobs:
           flavor: latest=false
 
       - name: Docker build and push
-        uses: docker/build-push-action@v7
+        uses: docker/build-push-action@v6
         id: docker_variant
         with:
           context: .

.github/workflows/docker_manifest.yml

@@ -12,7 +12,7 @@ on:
         type: string
 
 permissions:
-  contents: read
+  contents: write
   packages: write
 
 jobs:
@@ -86,6 +86,8 @@ jobs:
         uses: actions/checkout@v6
         with:
           submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
 
       - name: Get release version string
         run: |
@@ -137,14 +139,14 @@ jobs:
         id: tags
 
       - name: Docker login
-        uses: docker/login-action@v4
+        uses: docker/login-action@v3
         with:
           username: meshtastic
           password: ${{ secrets.DOCKER_FIRMWARE_TOKEN }}
 
       - name: Docker meta (Debian)
         id: meta_debian
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: meshtastic/meshtasticd
           tags: |
@@ -165,7 +167,7 @@ jobs:
 
       - name: Docker meta (Alpine)
         id: meta_alpine
-        uses: docker/metadata-action@v6
+        uses: docker/metadata-action@v5
         with:
           images: meshtastic/meshtasticd
           tags: |

.github/workflows/first_time_contributor.yml

@@ -1,47 +0,0 @@
-name: Welcome First-Time Contributor
-
-on:
-  issues:
-    types: opened
-  pull_request_target:
-    types: opened
-
-permissions: {}
-
-jobs:
-  welcome:
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write # Required to post comments and labels on issues
-      pull-requests: write # Required to post comments and labels on PRs
-    steps:
-      - uses: plbstl/first-contribution@v4
-        with:
-          labels: first-contribution
-          issue-opened-msg: |
-            ### @{fc-author}, Welcome to Meshtastic! :wave:
-
-            Thanks for opening your first issue. If it's helpful, an easy way
-            to get logs is the "Open Serial Monitor" button on the [Web Flasher](https://flasher.meshtastic.org).
-
-            If you have ideas for features, note that we often debate big ideas
-            in the [discussions tab](https://github.com/meshtastic/firmware/discussions/categories/ideas)
-            first. This tracker tends to be for ideas that have community
-            consensus and a clear implementation.
-
-            We're very active [on discord](https://discord.com/invite/meshtastic),
-            especially the \#firmware and \#alphanauts-testing channels. If you'll
-            be around for a while, we'd love to see you there!
-
-            Welcome to the community! :heart:
-
-          pr-opened-msg: |
-            ### @{fc-author}, Welcome to Meshtastic!
-
-            Thanks for opening your first pull request. We really appreciate it.
-
-            We discuss work as a team in discord, please join us in the [#firmware channel](https://discord.com/invite/meshtastic).
-            There's a big backlog of patches at the moment. If you have time,
-            please help us with some code review and testing of [other PRs](https://github.com/meshtastic/firmware/pulls)!
-
-            Welcome to the team :smile:

.github/workflows/hook_copr.yml

@@ -11,7 +11,8 @@ on:
         type: string
 
 permissions:
-  contents: read
+  contents: write
+  packages: write
 
 jobs:
   build-copr-hook:
@@ -21,6 +22,8 @@ jobs:
         uses: actions/checkout@v6
         with:
           submodules: recursive
+          ref: ${{ github.ref }}
+          repository: ${{ github.repository }}
 
       - name: Trigger COPR build
         uses: vidplace7/copr-build@main

.github/workflows/main_matrix.yml

@@ -8,28 +8,23 @@ on:
     branches:
       - master
       - develop
-      - pioarduino # Remove when merged // use `feature/` in the future.
       - event/*
-      - feature/*
     paths-ignore:
       - "**.md"
       - version.properties
 
-  pull_request:
+  # Note: This is different from "pull_request". Need to specify ref when doing checkouts.
+  pull_request_target:
     branches:
       - master
       - develop
-      - pioarduino # Remove when merged // use `feature/` in the future.
       - event/*
-      - feature/*
     paths-ignore:
       - "**.md"
       #- "**.yml"
 
   workflow_dispatch:
 
-permissions: read-all
-
 jobs:
   setup:
     strategy:
@@ -82,19 +77,16 @@ jobs:
       fail-fast: false
       matrix:
         check: ${{ fromJson(needs.setup.outputs.check) }}
-    # Use 'arctastic' self-hosted runner pool when checking in the main repo
-    runs-on: ${{ github.repository_owner == 'meshtastic' && 'arctastic' || 'ubuntu-latest' }}
+
+    runs-on: ubuntu-latest
     if: ${{ github.event_name != 'workflow_dispatch' && github.repository == 'meshtastic/firmware' }}
     steps:
       - uses: actions/checkout@v6
-        with:
-          submodules: recursive
+      - name: Build base
+        id: base
+        uses: ./.github/actions/setup-base
       - name: Check ${{ matrix.check.board }}
-        uses: meshtastic/gh-action-firmware@main
-        with:
-          pio_platform: ${{ matrix.check.platform }}
-          pio_env: ${{ matrix.check.board }}
-          pio_target: check
+        run: bin/check-all.sh ${{ matrix.check.board }}
 
   build:
     needs: [setup, version]
@@ -125,16 +117,9 @@ jobs:
 
   test-native:
     if: ${{ !contains(github.ref_name, 'event/') && github.repository == 'meshtastic/firmware' }}
-    permissions: # Needed for dorny/test-reporter.
-      contents: read
-      actions: read
-      checks: write
     uses: ./.github/workflows/test_native.yml
 
   docker:
-    permissions: # Needed for pushing to GHCR.
-      contents: read
-      packages: write
     strategy:
       fail-fast: false
       matrix:
@@ -159,6 +144,9 @@ jobs:
   gather-artifacts:
     # trunk-ignore(checkov/CKV2_GHA_1)
     if: github.repository == 'meshtastic/firmware'
+    permissions:
+      contents: write
+      pull-requests: write
     strategy:
       fail-fast: false
       matrix:
@@ -176,8 +164,11 @@ jobs:
     steps:
       - name: Checkout code
         uses: actions/checkout@v6
+        with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
 
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v6
         with:
           path: ./
           pattern: firmware-${{matrix.arch}}-*
@@ -186,26 +177,27 @@ jobs:
       - name: Display structure of downloaded files
         run: ls -R
 
+      - name: Move files up
+        run: mv -b -t ./ ./bin/device-*.sh ./bin/device-*.bat
+
       - name: Repackage in single firmware zip
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
           overwrite: true
           path: |
-            ./firmware-*.mt.json
             ./firmware-*.bin
             ./firmware-*.uf2
             ./firmware-*.hex
-            ./firmware-*.zip
+            ./firmware-*-ota.zip
             ./device-*.sh
             ./device-*.bat
             ./littlefs-*.bin
             ./bleota*bin
-            ./mt-*-ota.bin
             ./Meshtastic_nRF52_factory_erase*.uf2
           retention-days: 30
 
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v6
         with:
           name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
           merge-multiple: true
@@ -217,71 +209,33 @@ jobs:
 
       - name: Device scripts permissions
         run: |
-          chmod +x ./output/device-install.sh || true
-          chmod +x ./output/device-update.sh || true
+          chmod +x ./output/device-install.sh
+          chmod +x ./output/device-update.sh
 
       - name: Zip firmware
         run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output
 
       - name: Repackage in single elfs zip
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
-          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
           overwrite: true
           path: ./*.elf
           retention-days: 30
 
-  shame:
-    if: github.repository == 'meshtastic/firmware'
-    continue-on-error: true
-    runs-on: ubuntu-latest
-    needs: [build]
-    steps:
-      - uses: actions/checkout@v6
-        if: github.event_name == 'pull_request'
+      - uses: scruplelesswizard/comment-artifact@main
+        if: ${{ github.event_name == 'pull_request' }}
         with:
-          filter: blob:none # means we download all the git history but none of the commit (except ones with checkout like the head)
-          fetch-depth: 0
-      - name: Download the current manifests
-        uses: actions/download-artifact@v8
-        with:
-          path: ./manifests-new/
-          pattern: manifest-*
-          merge-multiple: true
-      - name: Upload combined manifests for later commit and global stats crunching.
-        uses: actions/upload-artifact@v7
-        id: upload-manifest
-        with:
-          name: manifests-${{ github.sha }}
-          overwrite: true
-          path: manifests-new/*.mt.json
-      - name: Find the merge base
-        if: github.event_name == 'pull_request'
-        run: echo "MERGE_BASE=$(git merge-base "origin/$base" "$head")" >> $GITHUB_ENV
-        env:
-          base: ${{ github.base_ref }}
-          head: ${{ github.sha }}
-      # Currently broken (for-loop through EVERY artifact -- rate limiting)
-      # - name: Download the old manifests
-      #   if: github.event_name == 'pull_request'
-      #   run: gh run download -R "$repo" --name "manifests-$merge_base" --dir manifest-old/
-      #   env:
-      #     GH_TOKEN: ${{ github.token }}
-      #     merge_base: ${{ env.MERGE_BASE }}
-      #     repo: ${{ github.repository }}
-      # - name: Do scan and post comment
-      #   if: github.event_name == 'pull_request'
-      #   run: python3 bin/shame.py ${{ github.event.pull_request.number }} manifests-old/ manifests-new/
+          name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          description: "Download firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip. This artifact will be available for 90 days from creation"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
 
   release-artifacts:
-    permissions: # Needed for 'gh release upload'.
-      contents: write
     runs-on: ubuntu-latest
     if: ${{ github.event_name == 'workflow_dispatch' && github.repository == 'meshtastic/firmware' }}
     outputs:
       upload_url: ${{ steps.create_release.outputs.upload_url }}
     needs:
-      - setup
       - version
       - gather-artifacts
       - build-debian-src
@@ -289,25 +243,12 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
 
       - name: Setup Python
         uses: actions/setup-python@v6
         with:
           python-version: 3.x
 
-      - name: Generate release notes
-        id: release_notes
-        run: |
-          chmod +x ./bin/generate_release_notes.py
-          NOTES=$(./bin/generate_release_notes.py ${{ needs.version.outputs.long }})
-          echo "notes<<EOF" >> $GITHUB_OUTPUT
-          echo "$NOTES" >> $GITHUB_OUTPUT
-          echo "EOF" >> $GITHUB_OUTPUT
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Create release
         uses: softprops/action-gh-release@v2
         id: create_release
@@ -316,17 +257,18 @@ jobs:
           prerelease: true
           name: Meshtastic Firmware ${{ needs.version.outputs.long }} Alpha
           tag_name: v${{ needs.version.outputs.long }}
-          body: ${{ steps.release_notes.outputs.notes }}
+          body: |
+            Autogenerated by github action, developer should edit as required before publishing...
 
       - name: Download source deb
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v6
         with:
           pattern: firmware-debian-${{ needs.version.outputs.deb }}~UNRELEASED-src
           merge-multiple: true
           path: ./output/debian-src
 
       - name: Download `native-tft` pio deps
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v6
         with:
           pattern: platformio-deps-native-tft-${{ needs.version.outputs.long }}
           merge-multiple: true
@@ -342,33 +284,16 @@ jobs:
       - name: Display structure of downloaded files
         run: ls -lR
 
-      - name: Generate Release manifest
-        run: |
-          jq -n --arg ver "${{ needs.version.outputs.long }}" --argjson targets ${{ toJson(needs.setup.outputs.all) }} '{
-            "version": $ver,
-            "targets": $targets
-          }' > firmware-${{ needs.version.outputs.long }}.json
-
-      - name: Save Release manifest artifact
-        uses: actions/upload-artifact@v7
-        with:
-          name: manifest-${{ needs.version.outputs.long }}
-          overwrite: true
-          path: firmware-${{ needs.version.outputs.long }}.json
-
-      - name: Add sources to GitHub Release
+      - name: Add Linux sources to GtiHub Release
         # Only run when targeting master branch with workflow_dispatch
         if: ${{ github.ref_name == 'master' }}
         run: |
-          gh release upload v${{ needs.version.outputs.long }} ./firmware-${{ needs.version.outputs.long }}.json
           gh release upload v${{ needs.version.outputs.long }} ./output/meshtasticd-${{ needs.version.outputs.deb }}-src.zip
           gh release upload v${{ needs.version.outputs.long }} ./output/platformio-deps-native-tft-${{ needs.version.outputs.long }}.zip
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
   release-firmware:
-    permissions: # Needed for 'gh release upload'.
-      contents: write
     strategy:
       fail-fast: false
       matrix:
@@ -393,7 +318,7 @@ jobs:
         with:
           python-version: 3.x
 
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v6
         with:
           pattern: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
           merge-multiple: true
@@ -404,15 +329,15 @@ jobs:
 
       - name: Device scripts permissions
         run: |
-          chmod +x ./output/device-install.sh || true
-          chmod +x ./output/device-update.sh || true
+          chmod +x ./output/device-install.sh
+          chmod +x ./output/device-update.sh
 
       - name: Zip firmware
         run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output
 
-      - uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v6
         with:
-          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
           merge-multiple: true
           path: ./elfs
 
@@ -442,34 +367,18 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v6
-        with:
-          fetch-depth: 0
 
       - name: Setup Python
         uses: actions/setup-python@v6
         with:
           python-version: 3.x
 
-      - name: Get firmware artifacts
-        uses: actions/download-artifact@v8
+      - uses: actions/download-artifact@v6
         with:
           pattern: firmware-{${{ env.targets }}}-${{ needs.version.outputs.long }}
           merge-multiple: true
           path: ./publish
 
-      - name: Get manifest artifact
-        uses: actions/download-artifact@v8
-        with:
-          pattern: manifest-${{ needs.version.outputs.long }}
-          path: ./publish
-
-      - name: Generate release notes
-        run: |
-          chmod +x ./bin/generate_release_notes.py
-          ./bin/generate_release_notes.py ${{ needs.version.outputs.long }} > ./publish/release_notes.md
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
       - name: Publish firmware to meshtastic.github.io
         uses: peaceiris/actions-gh-pages@v4
         env:

.github/workflows/merge_queue.yml

@@ -0,0 +1,376 @@
+name: Merge Queue
+# Not sure how concurrency works in merge_queue, removing for now.
+# concurrency:
+#   group: merge-queue-${{ github.head_ref || github.run_id }}
+#   cancel-in-progress: true
+on:
+  # Merge group is a special trigger that is used to trigger the workflow when a merge group is created.
+  merge_group:
+
+jobs:
+  setup:
+    strategy:
+      fail-fast: true
+      matrix:
+        arch:
+          - all
+          - check
+    runs-on: ubuntu-24.04
+    steps:
+      - uses: actions/checkout@v6
+      - uses: actions/setup-python@v6
+        with:
+          python-version: 3.x
+          cache: pip
+      - run: pip install -U platformio
+      - name: Generate matrix
+        id: jsonStep
+        run: |
+          if [[ "$GITHUB_HEAD_REF" == "" ]]; then
+            TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}})
+          else  
+            TARGETS=$(./bin/generate_ci_matrix.py ${{matrix.arch}} --level pr)
+          fi
+          echo "Name: $GITHUB_REF_NAME Base: $GITHUB_BASE_REF Ref: $GITHUB_REF"
+          echo "${{matrix.arch}}=$TARGETS" >> $GITHUB_OUTPUT
+    outputs:
+      all: ${{ steps.jsonStep.outputs.all }}
+      check: ${{ steps.jsonStep.outputs.check }}
+
+  version:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v6
+      - name: Get release version string
+        run: |
+          echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+          echo "deb=$(./bin/buildinfo.py deb)" >> $GITHUB_OUTPUT
+        id: version
+        env:
+          BUILD_LOCATION: local
+    outputs:
+      long: ${{ steps.version.outputs.long }}
+      deb: ${{ steps.version.outputs.deb }}
+
+  check:
+    needs: setup
+    strategy:
+      fail-fast: true
+      matrix:
+        check: ${{ fromJson(needs.setup.outputs.check) }}
+
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name != 'workflow_dispatch' }}
+    steps:
+      - uses: actions/checkout@v6
+      - name: Build base
+        id: base
+        uses: ./.github/actions/setup-base
+      - name: Check ${{ matrix.check.board }}
+        run: bin/check-all.sh ${{ matrix.check.board }}
+
+  build:
+    needs: [setup, version]
+    strategy:
+      matrix:
+        build: ${{ fromJson(needs.setup.outputs.all) }}
+    uses: ./.github/workflows/build_firmware.yml
+    with:
+      version: ${{ needs.version.outputs.long }}
+      pio_env: ${{ matrix.build.board }}
+      platform: ${{ matrix.build.platform }}
+
+  build-debian-src:
+    if: github.repository == 'meshtastic/firmware'
+    uses: ./.github/workflows/build_debian_src.yml
+    with:
+      series: UNRELEASED
+      build_location: local
+    secrets: inherit
+
+  package-pio-deps-native-tft:
+    if: ${{ github.event_name == 'workflow_dispatch' }}
+    uses: ./.github/workflows/package_pio_deps.yml
+    with:
+      pio_env: native-tft
+    secrets: inherit
+
+  test-native:
+    if: ${{ !contains(github.ref_name, 'event/') }}
+    uses: ./.github/workflows/test_native.yml
+
+  docker:
+    strategy:
+      fail-fast: false
+      matrix:
+        distro: [debian, alpine]
+        platform: [linux/amd64, linux/arm64, linux/arm/v7]
+        pio_env: [native, native-tft]
+        exclude:
+          - distro: alpine
+            platform: linux/arm/v7
+          - pio_env: native-tft
+            platform: linux/arm64
+          - pio_env: native-tft
+            platform: linux/arm/v7
+    uses: ./.github/workflows/docker_build.yml
+    with:
+      distro: ${{ matrix.distro }}
+      platform: ${{ matrix.platform }}
+      runs-on: ${{ contains(matrix.platform, 'arm') && 'ubuntu-24.04-arm' || 'ubuntu-24.04' }}
+      pio_env: ${{ matrix.pio_env }}
+      push: false
+
+  gather-artifacts:
+    # trunk-ignore(checkov/CKV2_GHA_1)
+    permissions:
+      contents: write
+      pull-requests: write
+    strategy:
+      fail-fast: false
+      matrix:
+        arch:
+          - esp32
+          - esp32s3
+          - esp32c3
+          - esp32c6
+          - nrf52840
+          - rp2040
+          - rp2350
+          - stm32
+    runs-on: ubuntu-latest
+    needs: [version, build]
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v6
+        with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - uses: actions/download-artifact@v6
+        with:
+          path: ./
+          pattern: firmware-${{matrix.arch}}-*
+          merge-multiple: true
+
+      - name: Display structure of downloaded files
+        run: ls -R
+
+      - name: Move files up
+        run: mv -b -t ./ ./bin/device-*.sh ./bin/device-*.bat
+
+      - name: Repackage in single firmware zip
+        uses: actions/upload-artifact@v5
+        with:
+          name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          overwrite: true
+          path: |
+            ./firmware-*.bin
+            ./firmware-*.uf2
+            ./firmware-*.hex
+            ./firmware-*-ota.zip
+            ./device-*.sh
+            ./device-*.bat
+            ./littlefs-*.bin
+            ./bleota*bin
+            ./Meshtastic_nRF52_factory_erase*.uf2
+          retention-days: 30
+
+      - uses: actions/download-artifact@v6
+        with:
+          name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          merge-multiple: true
+          path: ./output
+
+      # For diagnostics
+      - name: Show artifacts
+        run: ls -lR
+
+      - name: Device scripts permissions
+        run: |
+          chmod +x ./output/device-install.sh
+          chmod +x ./output/device-update.sh
+
+      - name: Zip firmware
+        run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output
+
+      - name: Repackage in single elfs zip
+        uses: actions/upload-artifact@v5
+        with:
+          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
+          overwrite: true
+          path: ./*.elf
+          retention-days: 30
+
+      - uses: scruplelesswizard/comment-artifact@main
+        if: ${{ github.event_name == 'pull_request' }}
+        with:
+          name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          description: "Download firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip. This artifact will be available for 90 days from creation"
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+  release-artifacts:
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'workflow_dispatch' }}
+    outputs:
+      upload_url: ${{ steps.create_release.outputs.upload_url }}
+    needs:
+      - version
+      - gather-artifacts
+      - build-debian-src
+      - package-pio-deps-native-tft
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Setup Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: 3.x
+
+      - name: Create release
+        uses: softprops/action-gh-release@v2
+        id: create_release
+        with:
+          draft: true
+          prerelease: true
+          name: Meshtastic Firmware ${{ needs.version.outputs.long }} Alpha
+          tag_name: v${{ needs.version.outputs.long }}
+          body: |
+            Autogenerated by github action, developer should edit as required before publishing...
+
+      - name: Download source deb
+        uses: actions/download-artifact@v6
+        with:
+          pattern: firmware-debian-${{ needs.version.outputs.deb }}~UNRELEASED-src
+          merge-multiple: true
+          path: ./output/debian-src
+
+      - name: Download `native-tft` pio deps
+        uses: actions/download-artifact@v6
+        with:
+          pattern: platformio-deps-native-tft-${{ needs.version.outputs.long }}
+          merge-multiple: true
+          path: ./output/pio-deps-native-tft
+
+      - name: Zip Linux sources
+        working-directory: output
+        run: |
+          zip -j -9 -r ./meshtasticd-${{ needs.version.outputs.deb }}-src.zip ./debian-src
+          zip -9 -r ./platformio-deps-native-tft-${{ needs.version.outputs.long }}.zip ./pio-deps-native-tft
+
+      # For diagnostics
+      - name: Display structure of downloaded files
+        run: ls -lR
+
+      - name: Add Linux sources to GtiHub Release
+        # Only run when targeting master branch with workflow_dispatch
+        if: ${{ github.ref_name == 'master' }}
+        run: |
+          gh release upload v${{ needs.version.outputs.long }} ./output/meshtasticd-${{ needs.version.outputs.deb }}-src.zip
+          gh release upload v${{ needs.version.outputs.long }} ./output/platformio-deps-native-tft-${{ needs.version.outputs.long }}.zip
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  release-firmware:
+    strategy:
+      fail-fast: false
+      matrix:
+        arch:
+          - esp32
+          - esp32s3
+          - esp32c3
+          - esp32c6
+          - nrf52840
+          - rp2040
+          - rp2350
+          - stm32
+    runs-on: ubuntu-latest
+    if: ${{ github.event_name == 'workflow_dispatch' }}
+    needs: [release-artifacts, version]
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Setup Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: 3.x
+
+      - uses: actions/download-artifact@v6
+        with:
+          pattern: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
+          merge-multiple: true
+          path: ./output
+
+      - name: Display structure of downloaded files
+        run: ls -lR
+
+      - name: Device scripts permissions
+        run: |
+          chmod +x ./output/device-install.sh
+          chmod +x ./output/device-update.sh
+
+      - name: Zip firmware
+        run: zip -j -9 -r ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./output
+
+      - uses: actions/download-artifact@v6
+        with:
+          name: debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
+          merge-multiple: true
+          path: ./elfs
+
+      - name: Zip debug elfs
+        run: zip -j -9 -r ./debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip ./elfs
+
+      # For diagnostics
+      - name: Display structure of downloaded files
+        run: ls -lR
+
+      - name: Add bins and debug elfs to GitHub Release
+        # Only run when targeting master branch with workflow_dispatch
+        if: ${{ github.ref_name == 'master' }}
+        run: |
+          gh release upload v${{ needs.version.outputs.long }} ./firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
+          gh release upload v${{ needs.version.outputs.long }} ./debug-elfs-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+  publish-firmware:
+    runs-on: ubuntu-24.04
+    if: ${{ github.event_name == 'workflow_dispatch' }}
+    needs: [release-firmware, version]
+    env:
+      targets: |-
+        esp32,esp32s3,esp32c3,esp32c6,nrf52840,rp2040,rp2350,stm32
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v6
+
+      - name: Setup Python
+        uses: actions/setup-python@v6
+        with:
+          python-version: 3.x
+
+      - uses: actions/download-artifact@v6
+        with:
+          pattern: firmware-{${{ env.targets }}}-${{ needs.version.outputs.long }}
+          merge-multiple: true
+          path: ./publish
+
+      - name: Publish firmware to meshtastic.github.io
+        uses: peaceiris/actions-gh-pages@v4
+        env:
+          # On event/* branches, use the event name as the destination prefix
+          DEST_PREFIX: ${{ contains(github.ref_name, 'event/') && format('{0}/', github.ref_name) || '' }}
+        with:
+          deploy_key: ${{ secrets.DIST_PAGES_DEPLOY_KEY }}
+          external_repository: meshtastic/meshtastic.github.io
+          publish_branch: master
+          publish_dir: ./publish
+          destination_dir: ${{ env.DEST_PREFIX }}firmware-${{ needs.version.outputs.long }}
+          keep_files: true
+          user_name: github-actions[bot]
+          user_email: github-actions[bot]@users.noreply.github.com
+          commit_message: ${{ needs.version.outputs.long }}
+          enable_jekyll: true

.github/workflows/models_issue_triage.yml

@@ -1,213 +0,0 @@
-name: Issue Triage (Models)
-
-on:
-  issues:
-    types: [opened]
-
-permissions:
-  issues: write
-  models: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.issue.number }}
-  cancel-in-progress: true
-
-jobs:
-  triage:
-    if: ${{ github.repository == 'meshtastic/firmware' && github.event.issue.user.type != 'Bot' }}
-    runs-on: ubuntu-latest
-    steps:
-      # ─────────────────────────────────────────────────────────────────────────
-      # Step 1: Quality check (spam/AI-slop detection) - runs first, exits early if spam
-      # ─────────────────────────────────────────────────────────────────────────
-      - name: Detect spam or low-quality content
-        uses: actions/ai-inference@v2
-        id: quality
-        continue-on-error: true
-        with:
-          max-tokens: 20
-          prompt: |
-            Is this GitHub issue spam, AI-generated slop, or low quality?
-
-            Title: ${{ github.event.issue.title }}
-            Body: ${{ github.event.issue.body }}
-
-            Respond with exactly one of: spam, ai-generated, needs-review, ok
-          system-prompt: You detect spam and low-quality contributions. Be conservative - only flag obvious spam or AI slop.
-          model: openai/gpt-4o-mini
-
-      - name: Apply quality label if needed
-        if: steps.quality.outputs.response != '' && steps.quality.outputs.response != 'ok'
-        uses: actions/github-script@v8
-        env:
-          QUALITY_LABEL: ${{ steps.quality.outputs.response }}
-        with:
-          script: |
-            const label = (process.env.QUALITY_LABEL || '').trim().toLowerCase();
-            const labelMeta = {
-              'spam': { color: 'd73a4a', description: 'Possible spam' },
-              'ai-generated': { color: 'fbca04', description: 'Possible AI-generated low-quality content' },
-              'needs-review': { color: 'f9d0c4', description: 'Needs human review' },
-            };
-            const meta = labelMeta[label];
-            if (!meta) return;
-
-            // Ensure label exists
-            try {
-              await github.rest.issues.getLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label });
-            } catch (e) {
-              if (e.status !== 404) throw e;
-              await github.rest.issues.createLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label, color: meta.color, description: meta.description });
-            }
-
-            // Apply label
-            await github.rest.issues.addLabels({ owner: context.repo.owner, repo: context.repo.repo, issue_number: context.payload.issue.number, labels: [label] });
-
-            // Set output to skip remaining steps
-            core.setOutput('is_spam', 'true');
-
-      # ─────────────────────────────────────────────────────────────────────────
-      # Step 2: Duplicate detection - only if not spam
-      # ─────────────────────────────────────────────────────────────────────────
-      - name: Detect duplicate issues
-        if: steps.quality.outputs.response == 'ok' || steps.quality.outputs.response == ''
-        uses: pelikhan/action-genai-issue-dedup@bdb3b5d9451c1090ffcdf123d7447a5e7c7a2528 # v0.0.19
-        with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-
-      # ─────────────────────────────────────────────────────────────────────────
-      # Step 3: Completeness check + auto-labeling (combined into one AI call)
-      # ─────────────────────────────────────────────────────────────────────────
-      - name: Determine if completeness check should be skipped
-        if: steps.quality.outputs.response == 'ok' || steps.quality.outputs.response == ''
-        uses: actions/github-script@v8
-        id: check-skip
-        with:
-          script: |
-            const title = (context.payload.issue.title || '').toLowerCase();
-            const labels = (context.payload.issue.labels || []).map(label => label.name);
-            const hasFeatureRequest = title.includes('feature request');
-            const hasEnhancement = labels.includes('enhancement');
-            const shouldSkip = hasFeatureRequest && hasEnhancement;
-            core.setOutput('should_skip', shouldSkip ? 'true' : 'false');
-
-      - name: Analyze issue completeness and determine labels
-        if: (steps.quality.outputs.response == 'ok' || steps.quality.outputs.response == '') && steps.check-skip.outputs.should_skip != 'true'
-        uses: actions/ai-inference@v2
-        id: analysis
-        continue-on-error: true
-        with:
-          prompt: |
-            Analyze this GitHub issue for completeness and determine if it needs labels.
-
-            IMPORTANT: Distinguish between:
-            - Device/firmware bugs (crashes, reboots, lockups, radio/GPS/display/power issues) - these need device logs
-            - Build/release/packaging issues (missing files, CI failures, download problems) - these do NOT need device logs
-            - Documentation or website issues - these do NOT need device logs
-
-            If this is a device/firmware bug, request device logs and explain how to get them:
-
-            Web Flasher logs:
-            - Go to https://flasher.meshtastic.org
-            - Connect the device via USB and click Connect
-            - Open the device console/log output, reproduce the problem, then copy/download and attach/paste the logs
-
-            Meshtastic CLI logs:
-            - Run: meshtastic --port <serial-port> --noproto
-            - Reproduce the problem, then copy/paste the terminal output
-
-            Also request key context if missing: device model/variant, firmware version, region, steps to reproduce, expected vs actual.
-
-            Respond ONLY with valid JSON (no markdown, no code fences):
-            {"complete": true, "comment": "", "label": "none"}
-            OR
-            {"complete": false, "comment": "Your helpful comment", "label": "needs-logs"}
-
-            Use "needs-logs" ONLY if this is a device/firmware bug AND no logs are attached.
-            Use "needs-info" if basic info like firmware version or steps to reproduce are missing.
-            Use "none" if the issue is complete, is a feature request, or is a build/CI/packaging issue.
-
-            Title: ${{ github.event.issue.title }}
-            Body: ${{ github.event.issue.body }}
-          system-prompt: You are a helpful assistant that triages GitHub issues. Be conservative with labels. Only request device logs for actual device/firmware bugs, not for build/release/CI issues.
-          model: openai/gpt-4o-mini
-
-      - name: Process analysis result
-        if: (steps.quality.outputs.response == 'ok' || steps.quality.outputs.response == '') && steps.check-skip.outputs.should_skip != 'true' && steps.analysis.outputs.response != ''
-        uses: actions/github-script@v8
-        id: process
-        env:
-          AI_RESPONSE: ${{ steps.analysis.outputs.response }}
-        with:
-          script: |
-            let raw = (process.env.AI_RESPONSE || '').trim();
-
-            // Strip markdown code fences if present
-            raw = raw.replace(/^```(?:json)?\s*/i, '').replace(/\s*```$/i, '').trim();
-
-            let complete = true;
-            let comment = '';
-            let label = 'none';
-
-            try {
-              const parsed = JSON.parse(raw);
-              complete = !!parsed.complete;
-              comment = (parsed.comment ?? '').toString().trim();
-              label = (parsed.label ?? 'none').toString().trim().toLowerCase();
-            } catch {
-              // If JSON parse fails, log warning and don't comment (avoid posting raw JSON)
-              console.log('Failed to parse AI response as JSON:', raw);
-              complete = true;
-              comment = '';
-              label = 'none';
-            }
-
-            // Validate label
-            const allowedLabels = new Set(['needs-logs', 'needs-info', 'none']);
-            if (!allowedLabels.has(label)) label = 'none';
-
-            // Only comment if we have a valid parsed comment (not raw JSON)
-            const shouldComment = !complete && comment.length > 0 && !comment.startsWith('{');
-            core.setOutput('should_comment', shouldComment ? 'true' : 'false');
-            core.setOutput('comment_body', comment);
-            core.setOutput('label', label);
-
-      - name: Apply triage label
-        if: steps.process.outputs.label != '' && steps.process.outputs.label != 'none'
-        uses: actions/github-script@v8
-        env:
-          LABEL_NAME: ${{ steps.process.outputs.label }}
-        with:
-          script: |
-            const label = process.env.LABEL_NAME;
-            const labelMeta = {
-              'needs-logs': { color: 'cfd3d7', description: 'Device logs requested for triage' },
-              'needs-info': { color: 'f9d0c4', description: 'More information requested for triage' },
-            };
-            const meta = labelMeta[label];
-            if (!meta) return;
-
-            // Ensure label exists
-            try {
-              await github.rest.issues.getLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label });
-            } catch (e) {
-              if (e.status !== 404) throw e;
-              await github.rest.issues.createLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label, color: meta.color, description: meta.description });
-            }
-
-            // Apply label
-            await github.rest.issues.addLabels({ owner: context.repo.owner, repo: context.repo.repo, issue_number: context.payload.issue.number, labels: [label] });
-
-      - name: Comment on issue
-        if: steps.process.outputs.should_comment == 'true'
-        uses: actions/github-script@v8
-        env:
-          COMMENT_BODY: ${{ steps.process.outputs.comment_body }}
-        with:
-          script: |
-            await github.rest.issues.createComment({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.payload.issue.number,
-              body: process.env.COMMENT_BODY
-            });

.github/workflows/models_pr_triage.yml

@@ -1,139 +0,0 @@
-name: PR Triage (Models)
-
-on:
-  pull_request_target:
-    types: [opened]
-
-permissions:
-  pull-requests: write
-  issues: write
-  models: read
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.pull_request.number }}
-  cancel-in-progress: true
-
-jobs:
-  triage:
-    if: ${{ github.repository == 'meshtastic/firmware' && github.event.pull_request.user.type != 'Bot' }}
-    runs-on: ubuntu-latest
-    steps:
-      # ─────────────────────────────────────────────────────────────────────────
-      # Step 1: Check if PR already has automation/type labels (skip if so)
-      # ─────────────────────────────────────────────────────────────────────────
-      - name: Check existing labels
-        uses: actions/github-script@v8
-        id: check-labels
-        with:
-          script: |
-            const skipLabels = new Set(['automation']);
-            const typeLabels = new Set(['bugfix', 'hardware-support', 'enhancement', 'dependencies', 'submodules', 'github_actions', 'trunk', 'cleanup']);
-            const prLabels = context.payload.pull_request.labels.map(l => l.name);
-
-            const shouldSkipAll = prLabels.some(l => skipLabels.has(l));
-            const hasTypeLabel = prLabels.some(l => typeLabels.has(l));
-
-            core.setOutput('skip_all', shouldSkipAll ? 'true' : 'false');
-            core.setOutput('has_type_label', hasTypeLabel ? 'true' : 'false');
-
-      # ─────────────────────────────────────────────────────────────────────────
-      # Step 2: Quality check (spam/AI-slop detection)
-      # ─────────────────────────────────────────────────────────────────────────
-      - name: Detect spam or low-quality content
-        if: steps.check-labels.outputs.skip_all != 'true'
-        uses: actions/ai-inference@v2
-        id: quality
-        continue-on-error: true
-        with:
-          max-tokens: 20
-          prompt: |
-            Is this GitHub pull request spam, AI-generated slop, or low quality?
-
-            Title: ${{ github.event.pull_request.title }}
-            Body: ${{ github.event.pull_request.body }}
-
-            Respond with exactly one of: spam, ai-generated, needs-review, ok
-          system-prompt: You detect spam and low-quality contributions. Be conservative - only flag obvious spam or AI slop.
-          model: openai/gpt-4o-mini
-
-      - name: Apply quality label if needed
-        if: steps.check-labels.outputs.skip_all != 'true' && steps.quality.outputs.response != '' && steps.quality.outputs.response != 'ok'
-        uses: actions/github-script@v8
-        id: quality-label
-        env:
-          QUALITY_LABEL: ${{ steps.quality.outputs.response }}
-        with:
-          script: |
-            const label = (process.env.QUALITY_LABEL || '').trim().toLowerCase();
-            const labelMeta = {
-              'spam': { color: 'd73a4a', description: 'Possible spam' },
-              'ai-generated': { color: 'fbca04', description: 'Possible AI-generated low-quality content' },
-              'needs-review': { color: 'f9d0c4', description: 'Needs human review' },
-            };
-            const meta = labelMeta[label];
-            if (!meta) return;
-
-            // Ensure label exists
-            try {
-              await github.rest.issues.getLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label });
-            } catch (e) {
-              if (e.status !== 404) throw e;
-              await github.rest.issues.createLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label, color: meta.color, description: meta.description });
-            }
-
-            // Apply label
-            await github.rest.issues.addLabels({ owner: context.repo.owner, repo: context.repo.repo, issue_number: context.payload.pull_request.number, labels: [label] });
-
-            core.setOutput('is_spam', 'true');
-
-      # ─────────────────────────────────────────────────────────────────────────
-      # Step 3: Auto-label PR type (bugfix/hardware-support/enhancement)
-      # Only skip for spam/ai-generated; still classify needs-review PRs
-      # ─────────────────────────────────────────────────────────────────────────
-      - name: Classify PR for labeling
-        if: steps.check-labels.outputs.skip_all != 'true' && steps.check-labels.outputs.has_type_label != 'true' && steps.quality.outputs.response != 'spam' && steps.quality.outputs.response != 'ai-generated'
-        uses: actions/ai-inference@v2
-        id: classify
-        continue-on-error: true
-        with:
-          max-tokens: 30
-          prompt: |
-            Classify this pull request into exactly one category.
-
-            Return exactly one of: bugfix, hardware-support, enhancement
-
-            Use bugfix if it fixes a bug, crash, or incorrect behavior.
-            Use hardware-support if it adds or improves support for a specific hardware device/variant.
-            Use enhancement if it adds a new feature, improves performance, or refactors code.
-
-            Title: ${{ github.event.pull_request.title }}
-            Body: ${{ github.event.pull_request.body }}
-          system-prompt: You classify pull requests into categories. Be conservative and pick the most appropriate single label.
-          model: openai/gpt-4o-mini
-
-      - name: Apply type label
-        if: steps.check-labels.outputs.skip_all != 'true' && steps.check-labels.outputs.has_type_label != 'true' && steps.classify.outputs.response != ''
-        uses: actions/github-script@v8
-        env:
-          TYPE_LABEL: ${{ steps.classify.outputs.response }}
-        with:
-          script: |
-            const label = (process.env.TYPE_LABEL || '').trim().toLowerCase();
-            const labelMeta = {
-              'bugfix': { color: 'd73a4a', description: 'Bug fix' },
-              'hardware-support': { color: '0e8a16', description: 'Hardware support addition or improvement' },
-              'enhancement': { color: 'a2eeef', description: 'New feature or enhancement' },
-            };
-            const meta = labelMeta[label];
-            if (!meta) return;
-
-            // Ensure label exists
-            try {
-              await github.rest.issues.getLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label });
-            } catch (e) {
-              if (e.status !== 404) throw e;
-              await github.rest.issues.createLabel({ owner: context.repo.owner, repo: context.repo.repo, name: label, color: meta.color, description: meta.description });
-            }
-
-            // Apply label
-            await github.rest.issues.addLabels({ owner: context.repo.owner, repo: context.repo.repo, issue_number: context.payload.pull_request.number, labels: [label] });

.github/workflows/package_obs.yml

@@ -18,7 +18,8 @@ on:
         type: string
 
 permissions:
-  contents: read
+  contents: write
+  packages: write
 
 jobs:
   build-debian-src:
@@ -57,7 +58,7 @@ jobs:
         id: version
 
       - name: Download artifacts
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v6
         with:
           name: firmware-debian-${{ steps.version.outputs.deb }}~${{ inputs.series }}-src
           merge-multiple: true

.github/workflows/package_pio_deps.yml

@@ -16,7 +16,8 @@ on:
         type: string
 
 permissions:
-  contents: read
+  contents: write
+  packages: write
 
 jobs:
   pkg-pio-libdeps:
@@ -26,6 +27,8 @@ jobs:
         uses: actions/checkout@v6
         with:
           submodules: recursive
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
 
       - name: Setup Python
         uses: actions/setup-python@v6
@@ -51,19 +54,9 @@ jobs:
           PLATFORMIO_LIBDEPS_DIR: pio/libdeps
           PLATFORMIO_PACKAGES_DIR: pio/packages
           PLATFORMIO_CORE_DIR: pio/core
-          PLATFORMIO_SETTING_ENABLE_TELEMETRY: 0
-          PLATFORMIO_SETTING_CHECK_PLATFORMIO_INTERVAL: 3650
-          PLATFORMIO_SETTING_CHECK_PRUNE_SYSTEM_THRESHOLD: 10240
-
-      - name: Mangle platformio cache
-        # Add "1" to epoch-timestamps of all downloads in the cache.
-        # This is a hack to prevent internet access at build-time.
-        run: |
-          cp pio/core/.cache/downloads/usage.db pio/core/.cache/downloads/usage.db.bak
-          jq -c 'with_entries(.value |= (. | tostring + "1" | tonumber))' pio/core/.cache/downloads/usage.db.bak > pio/core/.cache/downloads/usage.db
 
       - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
           name: platformio-deps-${{ inputs.pio_env }}-${{ steps.version.outputs.long }}
           overwrite: true

.github/workflows/package_ppa.yml

@@ -16,7 +16,8 @@ on:
         type: string
 
 permissions:
-  contents: read
+  contents: write
+  packages: write
 
 jobs:
   build-debian-src:
@@ -35,6 +36,8 @@ jobs:
         with:
           submodules: recursive
           path: meshtasticd
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
 
       - name: Install deps
         shell: bash
@@ -43,7 +46,7 @@ jobs:
           sudo apt-get install -y dput
 
       - name: Import GPG key
-        uses: crazy-max/ghaction-import-gpg@v7
+        uses: crazy-max/ghaction-import-gpg@v6
         with:
           gpg_private_key: ${{ secrets.PPA_GPG_PRIVATE_KEY }}
         id: gpg
@@ -57,7 +60,7 @@ jobs:
         id: version
 
       - name: Download artifacts
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v6
         with:
           name: firmware-debian-${{ steps.version.outputs.deb }}~${{ inputs.series }}-src
           merge-multiple: true
@@ -67,6 +70,5 @@ jobs:
 
       - name: Publish with dput
         if: ${{ github.event_name != 'pull_request_target' && github.event_name != 'pull_request' }}
-        timeout-minutes: 15 # dput is terrible, sometimes runs 'forever'
         run: |
           dput ${{ inputs.ppa_repo }} meshtasticd_${{ steps.version.outputs.deb }}~${{ inputs.series }}_source.changes

.github/workflows/pr_enforce_labels.yml

@@ -17,7 +17,7 @@ jobs:
         with:
           script: |
             const labels = context.payload.pull_request.labels.map(label => label.name);
-            const requiredLabels = ['bugfix', 'enhancement', 'hardware-support', 'dependencies', 'submodules', 'github_actions', 'trunk', 'cleanup'];
+            const requiredLabels = ['bugfix', 'enhancement', 'hardware-support', 'dependencies', 'submodules', 'github_actions', 'trunk'];
             const hasRequiredLabel = labels.some(label => requiredLabels.includes(label));
             if (!hasRequiredLabel) {
               core.setFailed(`PR must have at least one of the following labels before it can be merged: ${requiredLabels.join(', ')}.`);

.github/workflows/pr_tests.yml

@@ -50,9 +50,9 @@ jobs:
 
       - name: Download test artifacts
         if: needs.native-tests.result != 'skipped'
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v6
         with:
-          name: platformio-test-report-${{ steps.version.outputs.long }}
+          name: platformio-test-report-${{ steps.version.outputs.long }}.zip
           merge-multiple: true
 
       - name: Parse test results and create detailed summary

.github/workflows/release_channels.yml

@@ -23,8 +23,8 @@ jobs:
         series:
           - jammy # 22.04 LTS
           - noble # 24.04 LTS
+          - plucky # 25.04
           - questing # 25.10
-          - resolute # 26.04 LTS
     uses: ./.github/workflows/package_ppa.yml
     with:
       ppa_repo: |-
@@ -48,37 +48,6 @@ jobs:
         ${{ contains(github.event.release.name, 'Beta') && 'beta' || contains(github.event.release.name, 'Alpha') && 'alpha' }}
     secrets: inherit
 
-  publish-release-notes:
-    if: github.event.action == 'published'
-    runs-on: ubuntu-latest
-    steps:
-      - name: Get release version
-        id: version
-        run: |
-          # Extract version from tag (e.g., v2.7.15.567b8ea -> 2.7.15.567b8ea)
-          VERSION=${GITHUB_REF#refs/tags/v}
-          echo "version=$VERSION" >> $GITHUB_OUTPUT
-
-      - name: Get release notes
-        run: |
-          mkdir -p ./publish
-          gh release view ${{ github.event.release.tag_name }} --json body --jq '.body' > ./publish/release_notes.md
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Publish release notes to meshtastic.github.io
-        uses: peaceiris/actions-gh-pages@v4
-        with:
-          deploy_key: ${{ secrets.DIST_PAGES_DEPLOY_KEY }}
-          external_repository: meshtastic/meshtastic.github.io
-          publish_branch: master
-          publish_dir: ./publish
-          destination_dir: firmware-${{ steps.version.outputs.version }}
-          user_name: github-actions[bot]
-          user_email: github-actions[bot]@users.noreply.github.com
-          commit_message: Release notes for ${{ steps.version.outputs.version }}
-          enable_jekyll: true
-
   # Create a PR to bump version when a release is Published
   bump-version:
     if: github.event.action == 'published'
@@ -133,7 +102,7 @@ jobs:
           PIP_DISABLE_PIP_VERSION_CHECK: 1
 
       - name: Create Bumps pull request
-        uses: peter-evans/create-pull-request@v8
+        uses: peter-evans/create-pull-request@v7
         with:
           base: ${{ github.event.repository.default_branch }}
           branch: create-pull-request/bump-version

.github/workflows/sec_sast_semgrep_cron.yml

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

.github/workflows/stale_bot.yml

@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: Stale PR+Issues
-        uses: actions/stale@v10.2.0
+        uses: actions/stale@v10.1.0
         with:
           days-before-stale: 45
           stale-issue-message: This issue has not had any comment or update in the last month. If it is still relevant, please post update comments. If no comments are made, this issue will be closed automagically in 7 days.

.github/workflows/test_native.yml

@@ -16,6 +16,8 @@ jobs:
     steps:
       - uses: actions/checkout@v6
         with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
           submodules: recursive
 
       - name: Setup native build
@@ -38,7 +40,7 @@ jobs:
 
       - name: Integration test
         run: |
-          .pio/build/coverage/meshtasticd -s &
+          .pio/build/coverage/program -s &
           PID=$!
           timeout 20 bash -c "until ls -al /proc/$PID/fd | grep socket; do sleep 1; done"
           echo "Simulator started, launching python test..."
@@ -57,10 +59,10 @@ jobs:
         id: version
 
       - name: Save coverage information
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         if: always() # run this step even if previous step failed
         with:
-          name: lcov-coverage-info-native-simulator-test-${{ steps.version.outputs.long }}
+          name: lcov-coverage-info-native-simulator-test-${{ steps.version.outputs.long }}.zip
           overwrite: true
           path: ./coverage_*.info
 
@@ -70,6 +72,8 @@ jobs:
     steps:
       - uses: actions/checkout@v6
         with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
           submodules: recursive
 
       - name: Setup native build
@@ -90,9 +94,9 @@ jobs:
 
       - name: Save test results
         if: always() # run this step even if previous step failed
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
-          name: platformio-test-report-${{ steps.version.outputs.long }}
+          name: platformio-test-report-${{ steps.version.outputs.long }}.zip
           overwrite: true
           path: ./testreport.xml
 
@@ -104,10 +108,10 @@ jobs:
           sed -i -e "s#${PWD}#.#" coverage_tests.info # Make paths relative.
 
       - name: Save coverage information
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         if: always() # run this step even if previous step failed
         with:
-          name: lcov-coverage-info-native-platformio-tests-${{ steps.version.outputs.long }}
+          name: lcov-coverage-info-native-platformio-tests-${{ steps.version.outputs.long }}.zip
           overwrite: true
           path: ./coverage_*.info
 
@@ -124,28 +128,31 @@ jobs:
     if: always()
     steps:
       - uses: actions/checkout@v6
+        with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
 
       - name: Get release version string
         run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
         id: version
 
       - name: Download test artifacts
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v6
         with:
-          name: platformio-test-report-${{ steps.version.outputs.long }}
+          name: platformio-test-report-${{ steps.version.outputs.long }}.zip
           merge-multiple: true
 
       - name: Test Report
-        uses: dorny/test-reporter@v3.0.0
+        uses: dorny/test-reporter@v2.2.0
         with:
           name: PlatformIO Tests
           path: testreport.xml
           reporter: java-junit
 
       - name: Download coverage artifacts
-        uses: actions/download-artifact@v8
+        uses: actions/download-artifact@v6
         with:
-          pattern: lcov-coverage-info-native-*-${{ steps.version.outputs.long }}
+          pattern: lcov-coverage-info-native-*-${{ steps.version.outputs.long }}.zip
           path: code-coverage-report
           merge-multiple: true
 
@@ -156,7 +163,7 @@ jobs:
           genhtml --quiet --legend --prefix "${PWD}" code-coverage-report/coverage_src.info --output-directory code-coverage-report
 
       - name: Save Code Coverage Report
-        uses: actions/upload-artifact@v7
+        uses: actions/upload-artifact@v5
         with:
-          name: code-coverage-report-${{ steps.version.outputs.long }}
+          name: code-coverage-report-${{ steps.version.outputs.long }}.zip
           path: code-coverage-report

.github/workflows/tests.yml

@@ -22,7 +22,7 @@ jobs:
       - name: Checkout code
         uses: actions/checkout@v6
 
-      # - uses: actions/setup-python@v6
+      # - uses: actions/setup-python@v5
       #   with:
       #     python-version: '3.10'
 
@@ -52,7 +52,7 @@ jobs:
           node-version: 24
 
       - name: Setup pnpm
-        uses: pnpm/action-setup@v5
+        uses: pnpm/action-setup@v4
         with:
           version: latest
 

.github/workflows/trunk_format_pr.yml

@@ -0,0 +1,51 @@
+name: Run Trunk Fmt on PR Comment
+
+on:
+  issue_comment:
+    types: [created]
+
+permissions: read-all
+
+jobs:
+  trunk-fmt:
+    if: github.event.issue.pull_request != null && contains(github.event.comment.body, 'trunk fmt')
+    runs-on: ubuntu-latest
+    permissions:
+      contents: write
+      pull-requests: write
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@v6
+        with:
+          ref: ${{github.event.pull_request.head.ref}}
+          repository: ${{github.event.pull_request.head.repo.full_name}}
+
+      - name: Install trunk
+        run: curl https://get.trunk.io -fsSL | bash
+
+      - name: Run Trunk Fmt
+        run: trunk fmt
+
+      - name: Get release version string
+        run: echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
+        id: version
+
+      - name: Commit and push changes
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "github-actions[bot]@users.noreply.github.com"
+          git add .
+          git commit -m "Add firmware version ${{ steps.version.outputs.long }}"
+          git push
+
+      - name: Comment on PR
+        uses: actions/github-script@v8
+        with:
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          script: |
+            github.issues.createComment({
+              issue_number: context.issue.number,
+              owner: context.repo.owner,
+              repo: context.repo.repo,
+              body: '`trunk fmt` has been run on this PR.'
+            })

.github/workflows/update_protobufs.yml

@@ -6,7 +6,7 @@ permissions: read-all
 jobs:
   update-protobufs:
     runs-on: ubuntu-latest
-    permissions: # Needed for peter-evans/create-pull-request.
+    permissions:
       contents: write
       pull-requests: write
     steps:
@@ -16,7 +16,7 @@ jobs:
           submodules: true
 
       - name: Update submodule
-        if: ${{ github.ref == 'refs/heads/master' || github.ref == 'refs/heads/develop' }}
+        if: ${{ github.ref == 'refs/heads/master' }}
         run: |
           git submodule update --remote protobufs
 
@@ -31,7 +31,7 @@ jobs:
           ./bin/regen-protos.sh
 
       - name: Create pull request
-        uses: peter-evans/create-pull-request@v8
+        uses: peter-evans/create-pull-request@v7
         with:
           branch: create-pull-request/update-protobufs
           labels: submodules

.gitignore

@@ -33,7 +33,6 @@ __pycache__
 *~
 
 venv/
-.venv/
 release/
 .vscode/extensions.json
 /compile_commands.json
@@ -42,15 +41,3 @@ src/mesh/raspihttp/private_key.pem
 
 # Ignore logo (set at build time with platformio-custom.py)
 data/boot/logo.*
-
-# pioarduino platform
-managed_components/*
-arduino-lib-builder*
-dependencies.lock
-idf_component.yml
-CMakeLists.txt
-/sdkconfig.*
-.dummy/*
-
-# PYTHONPATH used by the Nix shell
-.python3

.trunk/trunk.yaml

@@ -4,31 +4,31 @@ cli:
 plugins:
   sources:
     - id: trunk
-      ref: v1.7.6
+      ref: v1.7.4
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - checkov@3.2.513
-    - renovate@43.100.0
-    - prettier@3.8.1
-    - trufflehog@3.94.1
-    - yamllint@1.38.0
-    - bandit@1.9.4
-    - trivy@0.69.3
+    - checkov@3.2.495
+    - renovate@42.24.1
+    - prettier@3.6.2
+    - trufflehog@3.91.1
+    - yamllint@1.37.1
+    - bandit@1.9.2
+    - trivy@0.67.2
     - taplo@0.10.0
-    - ruff@0.15.8
-    - isort@8.0.1
-    - markdownlint@0.48.0
-    - oxipng@10.1.0
-    - svgo@4.0.1
-    - actionlint@1.7.11
+    - ruff@0.14.6
+    - isort@7.0.0
+    - markdownlint@0.46.0
+    - oxipng@9.1.5
+    - svgo@4.0.0
+    - actionlint@1.7.9
     - flake8@7.3.0
     - hadolint@2.14.0
     - shfmt@3.6.0
     - shellcheck@0.11.0
-    - black@26.3.1
+    - black@25.11.0
     - git-diff-check
-    - gitleaks@8.30.1
+    - gitleaks@8.30.0
     - clang-format@16.0.3
   ignore:
     - linters: [ALL]

Dockerfile

@@ -14,7 +14,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
         curl wget g++ zip git ca-certificates pkg-config \
         libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev libuv1-dev \
         libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev \
-        libx11-dev libinput-dev libxkbcommon-x11-dev libsqlite3-dev libsdl2-dev \
+        libx11-dev libinput-dev libxkbcommon-x11-dev \
     && apt-get clean && rm -rf /var/lib/apt/lists/* \
     && pip install --no-cache-dir -U platformio \
     && mkdir /tmp/firmware
@@ -53,7 +53,7 @@ USER root
 RUN apt-get update && apt-get --no-install-recommends -y install \
         libc-bin libc6 libgpiod3 libyaml-cpp0.8 libi2c0 libuv1t64 libusb-1.0-0-dev \
         liborcania2.3 libulfius2.7t64 libssl3t64 \
-        libx11-6 libinput10 libxkbcommon-x11-0 libsdl2-2.0-0 \
+        libx11-6 libinput10 libxkbcommon-x11-0 \
     && apt-get clean && rm -rf /var/lib/apt/lists/* \
     && mkdir -p /var/lib/meshtasticd \
     && mkdir -p /etc/meshtasticd/config.d \

Dockerfile.test

@@ -1,26 +0,0 @@
-# Lightweight container for running native PlatformIO tests on non-Linux hosts
-FROM python:3.14-slim-trixie
-
-ENV DEBIAN_FRONTEND=noninteractive
-ENV PIP_ROOT_USER_ACTION=ignore
-
-# hadolint ignore=DL3008
-RUN apt-get update && apt-get install --no-install-recommends -y \
-        g++ git ca-certificates pkg-config \
-        libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev libuv1-dev \
-        libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev \
-        libx11-dev libinput-dev libxkbcommon-x11-dev libsqlite3-dev libsdl2-dev \
-    && apt-get clean && rm -rf /var/lib/apt/lists/* \
-    && pip install --no-cache-dir platformio==6.1.19 \
-        && useradd --create-home --shell /usr/sbin/nologin meshtastic
-
-WORKDIR /firmware
-RUN chown -R meshtastic:meshtastic /firmware
-
-HEALTHCHECK --interval=30s --timeout=5s --start-period=10s --retries=3 \
-    CMD platformio --version || exit 1
-
-USER meshtastic
-
-# Run tests by default; override with docker run args for specific filters
-CMD ["platformio", "test", "-e", "coverage", "-v"]

SECURITY.md

@@ -4,8 +4,8 @@
 
 | Firmware Version | Supported          |
 | ---------------- | ------------------ |
-| 2.7.x            | :white_check_mark: |
-| <= 2.6.x         | :x:                |
+| 2.6.x            | :white_check_mark: |
+| <= 2.5.x         | :x:                |
 
 ## Reporting a Vulnerability
 

alpine.Dockerfile

@@ -11,7 +11,7 @@ RUN apk --no-cache add \
         bash g++ libstdc++-dev linux-headers zip git ca-certificates libbsd-dev \
         libgpiod-dev yaml-cpp-dev bluez-dev \
         libusb-dev i2c-tools-dev libuv-dev openssl-dev pkgconf argp-standalone \
-        libx11-dev libinput-dev libxkbcommon-dev sqlite-dev sdl2-dev \
+        libx11-dev libinput-dev libxkbcommon-dev \
     && rm -rf /var/cache/apk/* \
     && pip install --no-cache-dir -U platformio \
     && mkdir /tmp/firmware
@@ -28,7 +28,7 @@ RUN bash ./bin/build-native.sh "$PIO_ENV" && \
 
 # ##### PRODUCTION BUILD #############
 
-FROM alpine:3.23
+FROM alpine:3.22
 LABEL org.opencontainers.image.title="Meshtastic" \
       org.opencontainers.image.description="Alpine Meshtastic daemon" \
       org.opencontainers.image.url="https://meshtastic.org" \
@@ -42,7 +42,7 @@ USER root
 
 RUN apk --no-cache add \
         shadow libstdc++ libbsd libgpiod yaml-cpp libusb \
-        i2c-tools libuv libx11 libinput libxkbcommon sdl2 \
+        i2c-tools libuv libx11 libinput libxkbcommon \
     && rm -rf /var/cache/apk/* \
     && mkdir -p /var/lib/meshtasticd \
     && mkdir -p /etc/meshtasticd/config.d \

arch/esp32/esp32.ini

@@ -1,19 +1,10 @@
-; Common settings for ESP targets, mixin with extends = esp32_common
-[esp32_common]
+; Common settings for ESP targes, mixin with extends = esp32_base
+[esp32_base]
 extends = arduino_base
-custom_esp32_kind =
-custom_mtjson_part =
+custom_esp32_kind = esp32
 platform =
   # renovate: datasource=custom.pio depName=platformio/espressif32 packageName=platformio/platform/espressif32
-  platformio/espressif32@6.13.0
-platform_packages =
-  # renovate: datasource=custom.pio depName=platformio/tool-mklittlefs packageName=platformio/tool/tool-mklittlefs
-  platformio/tool-mklittlefs@1.203.210628
-
-extra_scripts =
-  ${env.extra_scripts}
-  pre:extra_scripts/esp32_pre.py
-  extra_scripts/esp32_extra.py
+  platformio/espressif32@6.11.0
 
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/nrf52/> -<platform/stm32wl> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp>
@@ -27,20 +18,14 @@ board_build.filesystem = littlefs
 # Remove -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL for low level BLE logging.
 # See library directory for BLE logging possible values: .pio/libdeps/tbeam/NimBLE-Arduino/src/log_common/log_common.h
 # This overrides the BLE logging default of LOG_LEVEL_INFO (1) from: .pio/libdeps/tbeam/NimBLE-Arduino/src/esp_nimble_cfg.h
-build_unflags =
-  -fno-lto
-  # Keep explicit std unflags on ESP32; base-level unflags are not sufficient
-  # to prevent framework-injected C++11 fallback on this platform.
-  -std=c++11
-  -std=gnu++11
+build_unflags = -fno-lto
 build_flags =
   ${arduino_base.build_flags}
   -flto
   -Wall
   -Wextra
   -Isrc/platform/esp32
-  -include mbedtls/error.h
-  -std=gnu++17
+  -std=c++11
   -DLOG_LOCAL_LEVEL=ESP_LOG_DEBUG
   -DCORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
   -DMYNEWT_VAL_BLE_HS_LOG_LVL=LOG_LEVEL_CRITICAL
@@ -58,25 +43,25 @@ build_flags =
   -DLIBPAX_BLE
   -DHAS_UDP_MULTICAST=1
   ;-DDEBUG_HEAP
-  -DCAN_RECLOCK_I2C
 
 lib_deps =
   ${arduino_base.lib_deps}
   ${networking_base.lib_deps}
-  ${networking_extra.lib_deps}
   ${environmental_base.lib_deps}
   ${environmental_extra.lib_deps}
   ${radiolib_base.lib_deps}
   # renovate: datasource=git-refs depName=meshtastic-esp32_https_server packageName=https://github.com/meshtastic/esp32_https_server gitBranch=master
-  https://github.com/meshtastic/esp32_https_server/archive/b78f12c86ea65c3ca08968840ff554ff7ed69b60.zip
+  https://github.com/meshtastic/esp32_https_server/archive/3223704846752e6d545139204837bdb2a55459ca.zip
   # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
-  h2zero/NimBLE-Arduino@1.4.3
+  h2zero/NimBLE-Arduino@^1.4.3
   # renovate: datasource=git-refs depName=libpax packageName=https://github.com/dbinfrago/libpax gitBranch=master
   https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
-  # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
-  lewisxhe/XPowersLib@0.3.3
+  # renovate: datasource=github-tags depName=XPowersLib packageName=lewisxhe/XPowersLib
+  https://github.com/lewisxhe/XPowersLib/archive/v0.3.1.zip
+  # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
+  https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
   # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
+  https://github.com/meshtastic/Crypto/archive/1aa30eb536bd52a576fde6dfa393bf7349cf102d.zip
 
 lib_ignore = 
   segger_rtt

arch/esp32/esp32c3.ini

@@ -0,0 +1,6 @@
+[esp32c3_base]
+extends = esp32_base
+custom_esp32_kind = esp32c3
+
+monitor_speed = 115200
+monitor_filters = esp32_c3_exception_decoder

arch/esp32/esp32c6.ini

@@ -1,16 +1,14 @@
 [esp32c6_base]
-extends = esp32_common
+extends = esp32_base
 platform =
   # Do not renovate until we have switched to pioarduino tagged builds
   https://github.com/Jason2866/platform-espressif32/archive/22faa566df8c789000f8136cd8d0aca49617af55.zip
-platform_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
   -Wextra
   -Isrc/platform/esp32
+  -std=c++11
   -DESP_OPENSSL_SUPPRESS_LEGACY_WARNING
   -DSERIAL_BUFFER_SIZE=4096
   -DLIBPAX_ARDUINO
@@ -30,20 +28,19 @@ lib_deps =
   ${environmental_extra.lib_deps}
   ${radiolib_base.lib_deps}
   # renovate: datasource=custom.pio depName=XPowersLib packageName=lewisxhe/library/XPowersLib
-  lewisxhe/XPowersLib@0.3.3
+  lewisxhe/XPowersLib@0.3.1
   # renovate: datasource=git-refs depName=meshtastic-ESP32_Codec2 packageName=https://github.com/meshtastic/ESP32_Codec2 gitBranch=master
   https://github.com/meshtastic/ESP32_Codec2/archive/633326c78ac251c059ab3a8c430fcdf25b41672f.zip
   # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
+  https://github.com/meshtastic/Crypto/archive/1aa30eb536bd52a576fde6dfa393bf7349cf102d.zip
 
 build_src_filter = 
-  ${esp32_common.build_src_filter} -<mesh/http>
+ ${esp32_base.build_src_filter} -<mesh/http> 
 
 monitor_speed = 460800
 monitor_filters = esp32_c3_exception_decoder
 
 lib_ignore =
-  ${esp32_common.lib_ignore}
   NonBlockingRTTTL
   NimBLE-Arduino
   libpax

arch/esp32/esp32s2.ini

@@ -0,0 +1,19 @@
+[esp32s2_base]
+extends = esp32_base
+custom_esp32_kind = esp32s2
+
+build_src_filter = 
+ ${esp32_base.build_src_filter} - <libpax/> -<nimble/> -<mesh/raspihttp>
+
+monitor_speed = 115200
+
+build_flags =
+  ${esp32_base.build_flags} 
+  -DHAS_BLUETOOTH=0
+  -DMESHTASTIC_EXCLUDE_PAXCOUNTER
+  -DMESHTASTIC_EXCLUDE_BLUETOOTH
+  
+lib_ignore = 
+  ${esp32_base.lib_ignore} 
+  NimBLE-Arduino
+  libpax

arch/esp32/esp32s3.ini

@@ -0,0 +1,5 @@
+[esp32s3_base]
+extends = esp32_base
+custom_esp32_kind = esp32s3
+
+monitor_speed = 115200

arch/nrf52/nrf52.ini

@@ -2,42 +2,25 @@
 ; Instead of the standard nordicnrf52 platform, we use our fork which has our added variant files
 platform =
   # renovate: datasource=custom.pio depName=platformio/nordicnrf52 packageName=platformio/platform/nordicnrf52
-  platformio/nordicnrf52@10.11.0
+  platformio/nordicnrf52@^10.8.0
 extends = arduino_base
 platform_packages =
-  ; our custom Git version with C++17 support in platform.txt
+  ; our custom Git version until they merge our PR
   # TODO renovate
-  platformio/framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino#cpp17-platform
+  platformio/framework-arduinoadafruitnrf52 @ https://github.com/meshtastic/Adafruit_nRF52_Arduino#c770c8a16a351b55b86e347a3d9d7b74ad0bbf39
   ; Don't renovate toolchain-gccarmnoneeabi
   platformio/toolchain-gccarmnoneeabi@~1.90301.0
 
-extra_scripts =
-  ${env.extra_scripts}
-  extra_scripts/nrf52_extra.py
-
-build_type = release
+build_type = debug
 build_flags =
-  -include variants/nrf52840/cpp_overrides/lfs_util.h
+  -include arch/nrf52/cpp_overrides/lfs_util.h
   ${arduino_base.build_flags}
+  -DSERIAL_BUFFER_SIZE=1024
   -Wno-unused-variable
   -Isrc/platform/nrf52
   -DLFS_NO_ASSERT                      ; Disable LFS assertions , see https://github.com/meshtastic/firmware/pull/3818
   -DMESHTASTIC_EXCLUDE_AUDIO=1
   -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
-  -Os
-  -std=gnu++17
-build_unflags =
-  -Ofast
-  -Og
-  -ggdb3
-  -ggdb2
-  -g3
-  -g2
-  -g
-  -g1
-  -g0
-  -std=c++11
-  -std=gnu++11
 
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/esp32/> -<platform/stm32wl> -<nimble/> -<mesh/wifi/> -<mesh/api/> -<mesh/http/> -<modules/esp32> -<platform/rp2xx0> -<mesh/eth/> -<mesh/raspihttp> -<serialization/>
@@ -46,7 +29,7 @@ lib_deps=
   ${arduino_base.lib_deps}
   ${radiolib_base.lib_deps}
   # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
+  https://github.com/meshtastic/Crypto/archive/1aa30eb536bd52a576fde6dfa393bf7349cf102d.zip
 
 lib_ignore =
   BluetoothOTA

arch/nrf52/nrf52832.ini

@@ -0,0 +1,7 @@
+[nrf52832_base]
+extends = nrf52_base
+
+build_flags = ${nrf52_base.build_flags} 
+
+lib_deps =
+  ${nrf52_base.lib_deps}

arch/nrf52/nrf52840.ini

@@ -1,9 +1,7 @@
 [nrf52840_base]
 extends = nrf52_base
 
-build_flags =
-   ${nrf52_base.build_flags}
-  -DSERIAL_BUFFER_SIZE=4096
+build_flags = ${nrf52_base.build_flags} 
 
 lib_deps =
   ${nrf52_base.lib_deps}

arch/portduino/portduino.ini

@@ -21,28 +21,23 @@ build_src_filter =
 lib_deps =
   ${env.lib_deps}
   ${networking_base.lib_deps}
-  ${networking_extra.lib_deps}
   ${radiolib_base.lib_deps}
   ${environmental_base.lib_deps}
   # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
+  https://github.com/meshtastic/Crypto/archive/1aa30eb536bd52a576fde6dfa393bf7349cf102d.zip
   # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.19
-  ; # renovate: datasource=git-refs depName=libch341-spi-userspace packageName=https://github.com/pine64/libch341-spi-userspace gitBranch=main
-  https://github.com/pine64/libch341-spi-userspace/archive/23c42319a69cffcb65868e3c72e6bed83974a393.zip
+  lovyan03/LovyanGFX@^1.2.0
+  # renovate: datasource=git-refs depName=libch341-spi-userspace packageName=https://github.com/pine64/libch341-spi-userspace gitBranch=main
+  https://github.com/pine64/libch341-spi-userspace/archive/af9bc27c9c30fa90772279925b7c5913dff789b4.zip
   # renovate: datasource=custom.pio depName=adafruit/Adafruit seesaw Library packageName=adafruit/library/Adafruit seesaw Library
 	adafruit/Adafruit seesaw Library@1.7.9
   # renovate: datasource=git-refs depName=RAK12034-BMX160 packageName=https://github.com/RAKWireless/RAK12034-BMX160 gitBranch=main
   https://github.com/RAKWireless/RAK12034-BMX160/archive/dcead07ffa267d3c906e9ca4a1330ab989e957e2.zip
-  # renovate: datasource=custom.pio depName=Adafruit_BME680 packageName=adafruit/library/Adafruit BME680 Library
-  adafruit/Adafruit BME680 Library@2.0.6
 
 build_flags =
   ${arduino_base.build_flags}
   -D ARCH_PORTDUINO
   -fPIC
-  -D_FORTIFY_SOURCE=2
-  -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4
   -Isrc/platform/portduino
   -DRADIOLIB_EEPROM_UNSUPPORTED
   -DPORTDUINO_LINUX_HARDWARE
@@ -55,7 +50,8 @@ build_flags =
   -li2c
   -luv
   -std=gnu17
-  -std=gnu++17
+  -std=c++17
+
 lib_ignore =
   Adafruit NeoPixel
   Adafruit ST7735 and ST7789 Library

arch/rp2xx0/rp2040.ini

@@ -2,12 +2,12 @@
 [rp2040_base]
 platform =
   # TODO renovate
-  https://github.com/maxgerhardt/platform-raspberrypi#cc24cfef37ed22ca9f2a6aead28c2deb76c39f24
-  ; For arduino-pico >= 5.4.4
+  https://github.com/maxgerhardt/platform-raspberrypi#76ecf3c7e9dd4503af0331154c4ca1cddc4b03e5
+  ; For arduino-pico >= 4.4.3
 extends = arduino_base
 platform_packages =
   # TODO renovate
-  arduino-pico@https://github.com/earlephilhower/arduino-pico/releases/download/5.4.4/rp2040-5.4.4.zip
+  framework-arduinopico@https://github.com/earlephilhower/arduino-pico#4.4.3
 
 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
@@ -17,7 +17,6 @@ build_flags =
   -Isrc/platform/rp2xx0/hardware_rosc/include
   -Isrc/platform/rp2xx0/pico_sleep/include
   -D__PLAT_RP2040__
-  -D__FREERTOS=1
 #  -D _POSIX_THREADS
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<modules/esp32> -<platform/nrf52/> -<platform/stm32wl> -<mesh/eth/> -<mesh/wifi/> -<mesh/http/> -<mesh/raspihttp>
@@ -32,4 +31,4 @@ lib_deps =
   ${environmental_extra.lib_deps}
   ${radiolib_base.lib_deps}
   # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
+  https://github.com/meshtastic/Crypto/archive/1aa30eb536bd52a576fde6dfa393bf7349cf102d.zip

arch/rp2xx0/rp2350.ini

@@ -2,12 +2,12 @@
 [rp2350_base]
 platform =
   # TODO renovate
-  https://github.com/maxgerhardt/platform-raspberrypi#cc24cfef37ed22ca9f2a6aead28c2deb76c39f24
-  ; For arduino-pico >= 5.4.4
+  https://github.com/maxgerhardt/platform-raspberrypi#76ecf3c7e9dd4503af0331154c4ca1cddc4b03e5
+  ; For arduino-pico >= 4.4.3
 extends = arduino_base
 platform_packages =
   # TODO renovate
-  arduino-pico@https://github.com/earlephilhower/arduino-pico/releases/download/5.4.4/rp2040-5.4.4.zip
+  framework-arduinopico@https://github.com/earlephilhower/arduino-pico#4.4.3
 
 board_build.core = earlephilhower
 board_build.filesystem_size = 0.5m
@@ -15,7 +15,6 @@ build_flags =
   ${arduino_base.build_flags} -Wno-unused-variable -Wcast-align
   -Isrc/platform/rp2xx0
   -D__PLAT_RP2350__
-  -D__FREERTOS=1
 build_src_filter = 
   ${arduino_base.build_src_filter} -<platform/esp32/> -<nimble/> -<modules/esp32> -<platform/nrf52/> -<platform/stm32wl> -<mesh/eth/> -<mesh/wifi/> -<mesh/http/> -<mesh/raspihttp> -<platform/rp2xx0/pico_sleep> -<platform/rp2xx0/hardware_rosc>
 
@@ -29,4 +28,4 @@ lib_deps =
   ${environmental_extra.lib_deps}
   ${radiolib_base.lib_deps}
   # renovate: datasource=custom.pio depName=rweather/Crypto packageName=rweather/library/Crypto
-  rweather/Crypto@0.4.0
+  https://github.com/meshtastic/Crypto/archive/1aa30eb536bd52a576fde6dfa393bf7349cf102d.zip

arch/stm32/stm32.ini

@@ -2,13 +2,13 @@
 extends = arduino_base
 platform =
   # renovate: datasource=custom.pio depName=platformio/ststm32 packageName=platformio/platform/ststm32
-  platformio/ststm32@19.5.0
+  platformio/ststm32@19.4.0
 platform_packages =
-  # renovate: datasource=github-tags depName=Arduino_Core_STM32 packageName=stm32duino/Arduino_Core_STM32
+  # TODO renovate
   platformio/framework-arduinoststm32@https://github.com/stm32duino/Arduino_Core_STM32/archive/2.10.1.zip
 extra_scripts =
   ${env.extra_scripts}
-  extra_scripts/stm32_extra.py
+  post:extra_scripts/extra_stm32.py
 
 build_type = release
 
@@ -27,7 +27,7 @@ build_flags =
   -DMESHTASTIC_EXCLUDE_TZ=1 ; Exclude TZ to save some flash space.
   -DSERIAL_RX_BUFFER_SIZE=256 ; For GPS - the default of 64 is too small.
   -DHAS_SCREEN=0 ; Always disable screen for STM32, it is not supported.
-  ;-DPIO_FRAMEWORK_ARDUINO_NANOLIB_FLOAT_PRINTF ; Enable this if enabling debugg logging. It is REQUIRED for at least traceroute debug prints - without it the length returned by printf ends up uninitialized.
+  -DPIO_FRAMEWORK_ARDUINO_NANOLIB_FLOAT_PRINTF ; This is REQUIRED for at least traceroute debug prints - without it the length ends up uninitialized.
   -DDEBUG_MUTE ; You can #undef DEBUG_MUTE in certain source files if you need the logs.
   -fmerge-all-constants
   -ffunction-sections
@@ -51,8 +51,9 @@ debug_tool = stlink
 lib_deps =
   ${env.lib_deps}
   ${radiolib_base.lib_deps}
+
   # renovate: datasource=git-refs depName=caveman99-stm32-Crypto packageName=https://github.com/caveman99/Crypto gitBranch=main
-  https://github.com/caveman99/Crypto/archive/1aa30eb536bd52a576fde6dfa393bf7349cf102d.zip
+  https://github.com/meshtastic/Crypto/archive/1aa30eb536bd52a576fde6dfa393bf7349cf102d.zip
 
 lib_ignore =
   OneButton

bin/analyze_map.py

@@ -1,165 +0,0 @@
-#!/usr/bin/env python3
-"""Summarise linker map output to highlight heavy object files and libraries.
-
-Usage:
-    python bin/analyze_map.py --map .pio/build/rak4631/output.map --top 20
-
-The script parses GNU ld map files and aggregates section sizes per object file
-and per archive/library, then prints sortable tables that make it easy to spot
-modules worth trimming or hiding behind feature flags.
-"""
-from __future__ import annotations
-
-import argparse
-import collections
-import os
-import re
-import sys
-from typing import DefaultDict, Dict, Tuple
-
-
-SECTION_LINE_RE = re.compile(r"^\s+(?P<section>\S+)\s+0x[0-9A-Fa-f]+\s+0x(?P<size>[0-9A-Fa-f]+)\s+(?P<object>.+)$")
-ARCHIVE_MEMBER_RE = re.compile(r"^(?P<archive>.+)\((?P<object>[^)]+)\)$")
-
-
-def human_size(num_bytes: int) -> str:
-    """Return a friendly size string with one decimal place."""
-    if num_bytes < 1024:
-        return f"{num_bytes:,} B"
-    num = float(num_bytes)
-    for unit in ("KB", "MB", "GB"):
-        num /= 1024.0
-        if num < 1024.0:
-            return f"{num:.1f} {unit}"
-    return f"{num:.1f} TB"
-
-
-def shorten_path(path: str, root: str) -> str:
-    """Prefer repository-relative paths for readability."""
-    path = path.strip()
-    if not path:
-        return path
-
-    # Normalise Windows archives (backslashes) to POSIX style for consistency.
-    path = path.replace("\\", "/")
-
-    # Attempt to strip the root when an absolute path lives inside the repo.
-    if os.path.isabs(path):
-        try:
-            rel = os.path.relpath(path, root)
-            if not rel.startswith(".."):
-                return rel
-        except ValueError:
-            # relpath can fail on mixed drives on Windows; fall back to basename.
-            pass
-    return path
-
-
-def describe_object(raw_object: str, root: str) -> Tuple[str, str]:
-    """Return a human friendly object label and the library it belongs to."""
-    raw_object = raw_object.strip()
-    lib_label = "[app]"
-    match = ARCHIVE_MEMBER_RE.match(raw_object)
-    if match:
-        archive = shorten_path(match.group("archive"), root)
-        obj = match.group("object")
-        lib_label = os.path.basename(archive) or archive
-        label = f"{archive}:{obj}"
-    else:
-        label = shorten_path(raw_object, root)
-        # If the object lives under libs, hint at the containing directory.
-        parent = os.path.basename(os.path.dirname(label))
-        if parent:
-            lib_label = parent
-    return label, lib_label
-
-
-def parse_map(map_path: str, repo_root: str) -> Tuple[Dict[str, int], Dict[str, int], Dict[str, Dict[str, int]]]:
-    per_object: DefaultDict[str, int] = collections.defaultdict(int)
-    per_library: DefaultDict[str, int] = collections.defaultdict(int)
-    per_object_sections: DefaultDict[str, DefaultDict[str, int]] = collections.defaultdict(lambda: collections.defaultdict(int))
-
-    try:
-        with open(map_path, "r", encoding="utf-8", errors="ignore") as handle:
-            for line in handle:
-                match = SECTION_LINE_RE.match(line)
-                if not match:
-                    continue
-
-                section = match.group("section")
-                if section.startswith("*") or section in {"LOAD", "ORIGIN"}:
-                    continue
-
-                size = int(match.group("size"), 16)
-                if size == 0:
-                    continue
-
-                obj_token = match.group("object").strip()
-                if not obj_token or obj_token.startswith("*") or "load address" in obj_token:
-                    continue
-
-                label, lib_label = describe_object(obj_token, repo_root)
-                per_object[label] += size
-                per_library[lib_label] += size
-                per_object_sections[label][section] += size
-    except FileNotFoundError:
-        raise SystemExit(f"error: map file '{map_path}' not found. Run a build first.")
-
-    return per_object, per_library, per_object_sections
-
-
-def format_section_breakdown(section_sizes: Dict[str, int], total: int, limit: int = 3) -> str:
-    items = sorted(section_sizes.items(), key=lambda kv: kv[1], reverse=True)
-    parts = []
-    for section, size in items[:limit]:
-        pct = (size / total) * 100 if total else 0
-        parts.append(f"{section} {pct:.1f}%")
-    if len(items) > limit:
-        remainder = total - sum(size for _, size in items[:limit])
-        pct = (remainder / total) * 100 if total else 0
-        parts.append(f"other {pct:.1f}%")
-    return ", ".join(parts)
-
-
-def print_report(map_path: str, top_n: int, per_object: Dict[str, int], per_library: Dict[str, int], per_object_sections: Dict[str, Dict[str, int]]):
-    total_bytes = sum(per_object.values())
-    if total_bytes == 0:
-        print("No section data found in map file.")
-        return
-
-    print(f"Map file: {map_path}")
-    print(f"Accounted size: {human_size(total_bytes)} across {len(per_object)} object files\n")
-
-    sorted_objects = sorted(per_object.items(), key=lambda kv: kv[1], reverse=True)
-    print(f"Top {min(top_n, len(sorted_objects))} object files by linked size:")
-    for idx, (obj, size) in enumerate(sorted_objects[:top_n], 1):
-        pct = (size / total_bytes) * 100
-        breakdown = format_section_breakdown(per_object_sections[obj], size)
-        print(f"{idx:2}. {human_size(size):>9}  ({size:,} B, {pct:5.2f}% of linked size)")
-        print(f"    {obj}")
-        if breakdown:
-            print(f"    sections: {breakdown}")
-    print()
-
-    sorted_libs = sorted(per_library.items(), key=lambda kv: kv[1], reverse=True)
-    print(f"Top {min(top_n, len(sorted_libs))} libraries or source roots:")
-    for idx, (lib, size) in enumerate(sorted_libs[:top_n], 1):
-        pct = (size / total_bytes) * 100
-        print(f"{idx:2}. {human_size(size):>9}  ({size:,} B, {pct:5.2f}% of linked size)  {lib}")
-
-
-def main() -> None:
-    parser = argparse.ArgumentParser(description="Highlight heavy object files from a GNU ld map file.")
-    parser.add_argument("--map", default=".pio/build/rak4631/output.map", help="Path to the map file (default: %(default)s)")
-    parser.add_argument("--top", type=int, default=20, help="Number of entries to display per table (default: %(default)s)")
-    args = parser.parse_args()
-
-    map_path = os.path.abspath(args.map)
-    repo_root = os.path.abspath(os.getcwd())
-
-    per_object, per_library, per_object_sections = parse_map(map_path, repo_root)
-    print_report(os.path.relpath(map_path, repo_root), args.top, per_object, per_library, per_object_sections)
-
-
-if __name__ == "__main__":
-    main()

bin/build-esp32.sh

@@ -5,8 +5,7 @@ set -e
 VERSION=`bin/buildinfo.py long`
 SHORT_VERSION=`bin/buildinfo.py short`
 
-BUILDDIR=.pio/build/$1
-OUTDIR=release
+OUTDIR=release/
 
 rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
@@ -15,27 +14,33 @@ rm -r $OUTDIR/* || true
 platformio pkg install -e $1
 
 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
-rm -f $BUILDDIR/firmware*
+rm -f .pio/build/$1/firmware.*
 
 # The shell vars the build tool expects to find
 export APP_VERSION=$VERSION
 
 basename=firmware-$1-$VERSION
 
-pio run --environment $1 -t mtjson # -v
-
-cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf
+pio run --environment $1 # -v
+SRCELF=.pio/build/$1/firmware.elf
+cp $SRCELF $OUTDIR/$basename.elf
 
 echo "Copying ESP32 bin file"
-cp $BUILDDIR/$basename.factory.bin $OUTDIR/$basename.factory.bin
+SRCBIN=.pio/build/$1/firmware.factory.bin
+cp $SRCBIN $OUTDIR/$basename.bin
 
 echo "Copying ESP32 update bin file"
-cp $BUILDDIR/$basename.bin $OUTDIR/$basename.bin
+SRCBIN=.pio/build/$1/firmware.bin
+cp $SRCBIN $OUTDIR/$basename-update.bin
 
-echo "Copying Filesystem for ESP32 targets"
-cp $BUILDDIR/littlefs-$1-$VERSION.bin $OUTDIR/littlefs-$1-$VERSION.bin
-cp bin/device-install.* $OUTDIR/
-cp bin/device-update.* $OUTDIR/
-
-echo "Copying manifest"
-cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json || true
+echo "Building Filesystem for ESP32 targets"
+# If you want to build the webui, uncomment the following lines
+# pio run --environment $1 -t buildfs
+# cp .pio/build/$1/littlefs.bin $OUTDIR/littlefswebui-$1-$VERSION.bin
+# # Remove webserver files from the filesystem and rebuild
+# ls -l data/static # Diagnostic list of files
+# rm -rf data/static
+pio run --environment $1 -t buildfs
+cp .pio/build/$1/littlefs.bin $OUTDIR/littlefs-$1-$VERSION.bin
+cp bin/device-install.* $OUTDIR
+cp bin/device-update.* $OUTDIR

bin/build-native.sh

@@ -17,19 +17,15 @@ VERSION=$(bin/buildinfo.py long)
 SHORT_VERSION=$(bin/buildinfo.py short)
 PIO_ENV=${1:-native}
 
-BUILDDIR=.pio/build/$PIO_ENV
-OUTDIR=release
+OUTDIR=release/
 
-rm -f $OUTDIR/meshtasticd*
+rm -f $OUTDIR/firmware*
 
 mkdir -p $OUTDIR/
 rm -r $OUTDIR/* || true
 
-basename=meshtasticd-$1-$VERSION
-
 # Important to pull latest version of libs into all device flavors, otherwise some devices might be stale
 pio pkg install --environment "$PIO_ENV" || platformioFailed
 pio run --environment "$PIO_ENV" || platformioFailed
-
-cp "$BUILDDIR/meshtasticd" "$OUTDIR/meshtasticd_linux_$(uname -m)"
-cp bin/native-install.* $OUTDIR/
+cp ".pio/build/$PIO_ENV/program" "$OUTDIR/meshtasticd_linux_$(uname -m)"
+cp bin/native-install.* $OUTDIR

bin/build-nrf52.sh

@@ -5,8 +5,7 @@ set -e
 VERSION=$(bin/buildinfo.py long)
 SHORT_VERSION=$(bin/buildinfo.py short)
 
-BUILDDIR=.pio/build/$1
-OUTDIR=release
+OUTDIR=release/
 
 rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
@@ -15,38 +14,40 @@ rm -r $OUTDIR/* || true
 platformio pkg install -e $1
 
 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
-rm -f $BUILDDIR/firmware*
+rm -f .pio/build/$1/firmware.*
 
 # The shell vars the build tool expects to find
 export APP_VERSION=$VERSION
 
 basename=firmware-$1-$VERSION
-ota_basename=${basename}-ota
 
-pio run --environment $1 -t mtjson # -v
+pio run --environment $1 # -v
+SRCELF=.pio/build/$1/firmware.elf
+cp $SRCELF $OUTDIR/$basename.elf
 
-cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf
+echo "Generating NRF52 dfu file"
+DFUPKG=.pio/build/$1/firmware.zip
+cp $DFUPKG $OUTDIR/$basename-ota.zip
 
-echo "Copying NRF52 dfu (OTA) file"
-cp $BUILDDIR/$basename.zip $OUTDIR/$ota_basename.zip
+echo "Generating NRF52 uf2 file"
+SRCHEX=.pio/build/$1/firmware.hex
 
-echo "Copying NRF52 UF2 file"
-cp $BUILDDIR/$basename.uf2 $OUTDIR/$basename.uf2
-cp bin/*.uf2 $OUTDIR/
-
-SRCHEX=$BUILDDIR/$basename.hex
-
-# if WM1110 target, copy the merged.hex
+# if WM1110 target, merge hex with softdevice 7.3.0
 if (echo $1 | grep -q "wio-sdk-wm1110"); then
-	echo "Copying .merged.hex file"
-	SRCHEX=$BUILDDIR/$basename.merged.hex
-	cp $SRCHEX $OUTDIR/
+	echo "Merging with softdevice"
+	bin/mergehex -m bin/s140_nrf52_7.3.0_softdevice.hex $SRCHEX -o .pio/build/$1/$basename.hex
+	SRCHEX=.pio/build/$1/$basename.hex
+	bin/uf2conv.py $SRCHEX -c -o $OUTDIR/$basename.uf2 -f 0xADA52840
+	cp $SRCHEX $OUTDIR
+	cp bin/*.uf2 $OUTDIR
+else
+	bin/uf2conv.py $SRCHEX -c -o $OUTDIR/$basename.uf2 -f 0xADA52840
+	cp bin/device-install.* $OUTDIR
+	cp bin/device-update.* $OUTDIR
+	cp bin/*.uf2 $OUTDIR
 fi
 
 if (echo $1 | grep -q "rak4631"); then
-	echo "Copying .hex file"
-	cp $SRCHEX $OUTDIR/
-fi
-
-echo "Copying manifest"
-cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json || true
+	echo "Copying hex file"
+	cp .pio/build/$1/firmware.hex $OUTDIR/$basename.hex
+fi

bin/build-rp2xx0.sh

@@ -5,8 +5,7 @@ set -e
 VERSION=`bin/buildinfo.py long`
 SHORT_VERSION=`bin/buildinfo.py short`
 
-BUILDDIR=.pio/build/$1
-OUTDIR=release
+OUTDIR=release/
 
 rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
@@ -15,19 +14,20 @@ rm -r $OUTDIR/* || true
 platformio pkg install -e $1
 
 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
-rm -f $BUILDDIR/firmware*
+rm -f .pio/build/$1/firmware.*
 
 # The shell vars the build tool expects to find
 export APP_VERSION=$VERSION
 
 basename=firmware-$1-$VERSION
 
-pio run --environment $1 -t mtjson # -v
-
-cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf
+pio run --environment $1 # -v
+SRCELF=.pio/build/$1/firmware.elf
+cp $SRCELF $OUTDIR/$basename.elf
 
 echo "Copying uf2 file"
-cp $BUILDDIR/$basename.uf2 $OUTDIR/$basename.uf2
+SRCBIN=.pio/build/$1/firmware.uf2
+cp $SRCBIN $OUTDIR/$basename.uf2
 
-echo "Copying manifest"
-cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json || true
+cp bin/device-install.* $OUTDIR
+cp bin/device-update.* $OUTDIR

bin/build-stm32wl.sh

@@ -5,8 +5,7 @@ set -e
 VERSION=$(bin/buildinfo.py long)
 SHORT_VERSION=$(bin/buildinfo.py short)
 
-BUILDDIR=.pio/build/$1
-OUTDIR=release
+OUTDIR=release/
 
 rm -f $OUTDIR/firmware*
 rm -r $OUTDIR/* || true
@@ -15,19 +14,16 @@ rm -r $OUTDIR/* || true
 platformio pkg install -e $1
 
 echo "Building for $1 with $PLATFORMIO_BUILD_FLAGS"
-rm -f $BUILDDIR/firmware*
+rm -f .pio/build/$1/firmware.*
 
 # The shell vars the build tool expects to find
 export APP_VERSION=$VERSION
 
 basename=firmware-$1-$VERSION
 
-pio run --environment $1 -t mtjson # -v
+pio run --environment $1 # -v
+SRCELF=.pio/build/$1/firmware.elf
+cp $SRCELF $OUTDIR/$basename.elf
 
-cp $BUILDDIR/$basename.elf $OUTDIR/$basename.elf
-
-echo "Copying STM32 bin file"
-cp $BUILDDIR/$basename.bin $OUTDIR/$basename.bin
-
-echo "Copying manifest"
-cp $BUILDDIR/$basename.mt.json $OUTDIR/$basename.mt.json || true
+SRCBIN=.pio/build/$1/firmware.bin
+cp $SRCBIN $OUTDIR/$basename.bin

bin/check-all.sh

@@ -23,4 +23,4 @@ for BOARD in $BOARDS; do
 	CHECK="${CHECK} -e ${BOARD}"
 done
 
-pio check --flags "-DAPP_VERSION=${APP_VERSION} --suppressions-list=suppressions.txt --inline-suppr" $CHECK --skip-packages --pattern="src/" --fail-on-defect=low --fail-on-defect=medium --fail-on-defect=high
+pio check --flags "-DAPP_VERSION=${APP_VERSION} --suppressions-list=suppressions.txt --inline-suppr" $CHECK --skip-packages --pattern="src/" --fail-on-defect=medium --fail-on-defect=high

bin/config-dist.yaml

@@ -105,8 +105,6 @@ Lora:
 
 GPS:
 #  SerialPath: /dev/ttyS0
-#  ExtraPins:
-#    - 22
 
 ### Specify I2C device, or leave blank for none
 
@@ -186,9 +184,6 @@ Input:
 Logging:
   LogLevel: info # debug, info, warn, error
 #  TraceFile: /var/log/meshtasticd.json
-#  JSONFile: /packets.json # File location for JSON output of decoded packets
-#  JSONFileRotate: 60 # Rotate JSON file every N minutes, or 0 for no rotation
-#  JSONFilter: position # filter for packets to save to JSON file
 #  AsciiLogs: true     # default if not specified is !isatty() on stdout
 
 Webserver:
@@ -215,4 +210,3 @@ General:
   AvailableDirectory: /etc/meshtasticd/available.d/
 #  MACAddress: AA:BB:CC:DD:EE:FF
 #  MACAddressSource: eth0
-#  APIPort: 4403

bin/config.d/OpenWRT/BananaPi-BPI-R4-sx1262.yaml

@@ -1,9 +1,3 @@
-Meta:
-  name: BananaPi-BPI-R4-sx1262
-  support: community
-  compatible:
-    - bananapi_bpi-r4 # OpenWrt target
-
 Lora:
   Module: sx1262  # BananaPi-BPI-R4 SPI via 26p GPIO Header
 ##  CS: 28

bin/config.d/OpenWRT/OpenWRT-One-mikroBUS-LR-IOT-CLICK.yaml

@@ -1,10 +1,4 @@
 ##  https://www.mikroe.com/lr-iot-click
-Meta:
-  name: OpenWRT One mikroBUS LR-IOT-CLICK
-  support: community
-  compatible:
-    - openwrt_one # OpenWrt target
-
 Lora:
   Module: lr1110  # OpenWRT ONE mikroBUS with LR-IOT-CLICK
 #  CS: 25

bin/config.d/OpenWRT/OpenWRT_One_mikroBUS_sx1262.yaml

@@ -1,9 +1,3 @@
-Meta:
-  name: OpenWRT One mikroBUS sx1262
-  support: community
-  compatible:
-    - openwrt_one # OpenWrt target
-
 Lora:
   Module: sx1262
   IRQ: 10

bin/config.d/README.md

@@ -1,28 +0,0 @@
-# meshtasticd configuration files
-
-This directory contains YAML configuration files for meshtasticd. Each file describes a specific hardware configuration, including the LoRa module and pin assignments. These configurations are used by meshtasticd to correctly interface with the hardware.
-
-## Metadata structure
-
-Each configuration file includes a `Meta` section that provides information about the configuration.
-This configuration is consumed by configuration-selection tools.
-
-```yaml
-Meta:
-  name: MeshAdv-Pi E22-900M30S # A unique identifier for this configuration.
-  support: community # community, official, or deprecated; determined by Meshtastic Leads.
-  compatible: # A list of compatible products or platforms.
-    - raspberry-pi
-```
-`name`: A unique identifier for the configuration, typically reflecting the hardware it supports.
-
-`support`: Indicates the level of support for this configuration. It can be one of the following:
-
-- `community`: Supported by the Meshtastic community. Meshtastic Members may not possess, or have not tested this configuration.
-- `official`: Fully supported by Meshtastic. Meshtastic Members have tested and verified this configuration.
-- `deprecated`: No longer recommended for deployment by Meshtastic.
-
-`compatible`: A list of compatible products or platforms that can use this configuration.
-This will vary depending on the intended use case / platform.
-Multiple compatible entries can be included. E.g. Armbian `BOARD` value or OpenWrt `TARGET` value.
-These tags can be consumed by different configuration-selection tools, filtering based upon their platform/etc.

bin/config.d/display-waveshare-1-44.yaml

@@ -1,9 +1,3 @@
-Meta:
-  name: Waveshare 1.44inch LCD HAT
-  support: community
-  compatible:
-    - raspberry-pi
-
 ### Waveshare 1.44inch LCD HAT
 Display:
   Panel: ST7735S

bin/config.d/display-waveshare-2.8.yaml

@@ -1,9 +1,3 @@
-Meta:
-  name: Waveshare 2.8inch LCD HAT
-  support: community
-  compatible:
-    - raspberry-pi
-
 Display:
 
 ### Waveshare 2.8inch RPi LCD

bin/config.d/femtofox/femtofox_E80-900M2213S.yaml

@@ -1,30 +0,0 @@
----
-Lora:
-## Ebyte E80-900M22S
-## This is a bit experimental
-## 
-##
-  Module: lr1121
-  gpiochip: 1 # subtract 32 from the gpio numbers
-  DIO3_TCXO_VOLTAGE: 1.8
-  CS: 16 #pin6 / GPIO48 1C0
-  IRQ: 23  #pin17 / GPIO55 1C7
-  Busy: 22 #pin16 / GPIO54 1C6
-  Reset: 25 #pin13 / GPIO57 1D1
-
-
-  spidev: spidev0.0 #pins are (CS=16, CLK=17, MOSI=18, MISO=19)
-  spiSpeed: 2000000
-  
-rfswitch_table:
-  pins: [DIO5, DIO6, DIO7]
-  MODE_STBY: [LOW, LOW, LOW]
-  MODE_RX: [LOW, HIGH, LOW]
-  MODE_TX: [HIGH, HIGH, LOW]
-  MODE_TX_HP: [HIGH, LOW, LOW]
-  MODE_TX_HF: [LOW, LOW, LOW]
-  MODE_GNSS: [LOW, LOW, HIGH]
-  MODE_WIFI: [LOW, LOW, LOW]
-
-General:
-  MACAddressSource: eth0

bin/config.d/femtofox/femtofox_LR1121 generic.yaml

@@ -1,46 +0,0 @@
----
-Lora:
-## Ebyte E80-900M22S
-## This is a bit experimental
-## 
-##
-  Module: lr1121
-  gpiochip: 1 # subtract 32 from the gpio numbers
-  DIO3_TCXO_VOLTAGE: 1.8
-  CS: 16 #pin6 / GPIO48 1C0
-  IRQ: 23  #pin17 / GPIO55 1C7
-  Busy: 22 #pin16 / GPIO54 1C6
-  Reset: 25 #pin13 / GPIO57 1D1
-
-
-  spidev: spidev0.0 #pins are (CS=16, CLK=17, MOSI=18, MISO=19)
-  spiSpeed: 2000000
-  
-rfswitch_table:
-  pins:
-    - DIO5
-    - DIO6
-  MODE_STBY:
-    - LOW
-    - LOW
-  MODE_RX:
-    - HIGH
-    - LOW
-  MODE_TX:
-    - HIGH
-    - HIGH
-  MODE_TX_HP:
-    - LOW
-    - HIGH
-  MODE_TX_HF:
-    - LOW
-    - LOW
-  MODE_GNSS:
-    - LOW
-    - LOW
-  MODE_WIFI:
-    - LOW
-    - LOW
-
-General:
-  MACAddressSource: eth0

bin/config.d/femtofox/femtofox_LR1121_TCXO.yaml

@@ -1,22 +1,20 @@
----
-Meta:
-  name: Femtofox Ebyte E80-900M22S with TCXO
-  support: community
-  compatible:
-    - luckfox-pico-mini # Armbian
-
-Lora:
-## Ebyte E80-900M22S
-## This is a bit experimental
-## 
-##
-  Module: lr1121
-  gpiochip: 1 # subtract 32 from the gpio numbers
-  DIO3_TCXO_VOLTAGE: 1.8
-  CS: 16 #pin6 / GPIO48 1C0
-  IRQ: 23  #pin17 / GPIO55 1C7
-  Busy: 22 #pin16 / GPIO54 1C6
-  Reset: 25 #pin13 / GPIO57 1D1
-
-  spidev: spidev0.0 #pins are (CS=16, CLK=17, MOSI=18, MISO=19)
-  spiSpeed: 2000000
+---
+Lora:
+## Ebyte E80-900M22S
+## This is a bit experimental
+## 
+##
+  Module: lr1121
+  gpiochip: 1 # subtract 32 from the gpio numbers
+  DIO3_TCXO_VOLTAGE: 1.8
+  CS: 16 #pin6 / GPIO48 1C0
+  IRQ: 23  #pin17 / GPIO55 1C7
+  Busy: 22 #pin16 / GPIO54 1C6
+  Reset: 25 #pin13 / GPIO57 1D1
+
+
+  spidev: spidev0.0 #pins are (CS=16, CLK=17, MOSI=18, MISO=19)
+  spiSpeed: 2000000
+  
+General:
+  MACAddressSource: eth0

bin/config.d/femtofox/femtofox_SX1262_TCXO.yaml

@@ -1,24 +1,21 @@
----
-Meta:
-  name: Femtofox SX1262 TCXO
-  support: community
-  compatible:
-    - luckfox-pico-mini # Armbian
-
-Lora:
-## Ebyte E22-900M30S, E22-900M22S with or without external RF switching setup
-## HT-RA62 (Has internal switching, but whatever)
-## Seeed WIO SX1262 (already has TXEN-DIO2 link, but needs RXEN)
-## Will work with any module with or without RF switching, and with TCXO
-  Module: sx1262
-  gpiochip: 1 # subtract 32 from the gpio numbers
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  CS: 16 #pin6 / GPIO48 1C0
-  IRQ: 23  #pin17 / GPIO55 1C7
-  Busy: 22 #pin16 / GPIO54 1C6
-  Reset: 25 #pin13 / GPIO57 1D1
-  RXen: 24 #pin12 / GPIO56 1D0 # Not strictly needed for auto-switching, but why complicate things?
-#  TXen: bridge to DIO2 on E22 module
-  spidev: spidev0.0 #pins are (CS=16, CLK=17, MOSI=18, MISO=19)
-  spiSpeed: 2000000
+---
+Lora:
+## Ebyte E22-900M30S, E22-900M22S with or without external RF switching setup
+## HT-RA62 (Has internal switching, but whatever)
+## Seeed WIO SX1262 (already has TXEN-DIO2 link, but needs RXEN)
+## Will work with any module with or without RF switching, and with TCXO
+  Module: sx1262
+  gpiochip: 1 # subtract 32 from the gpio numbers
+  DIO2_AS_RF_SWITCH: true
+  DIO3_TCXO_VOLTAGE: true
+  CS: 16 #pin6 / GPIO48 1C0
+  IRQ: 23  #pin17 / GPIO55 1C7
+  Busy: 22 #pin16 / GPIO54 1C6
+  Reset: 25 #pin13 / GPIO57 1D1
+  RXen: 24 #pin12 / GPIO56 1D0 # Not strictly needed for auto-switching, but why complicate things?
+#  TXen: bridge to DIO2 on E22 module
+  spidev: spidev0.0 #pins are (CS=16, CLK=17, MOSI=18, MISO=19)
+  spiSpeed: 2000000
+  
+General:
+  MACAddressSource: eth0

bin/config.d/femtofox/femtofox_SX1262_XTAL.yaml

@@ -1,24 +1,21 @@
----
-Meta:
-  name: Femtofox SX1262 XTAL
-  support: community
-  compatible:
-    - luckfox-pico-mini # Armbian
-
-Lora:
-## Ebyte E22-900MM22S with no external RF switching setup
-## Waveshare SX126X XXXM, AI Thinker RA-01SH
-## Will work with any module with or without RF switching and no TCXO
-
-  Module: sx1262  
-  gpiochip: 1 # subtract 32 from the gpio numbers
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: false
-  CS: 16 #pin6 / GPIO48 1C0
-  IRQ: 23  #pin17 / GPIO55 1C7
-  Busy: 22 #pin16 / GPIO54 1C6
-  Reset: 25 #pin13 / GPIO57 1D1 
-  RXen: 24 #pin12 / GPIO56 1D0 # Not strictly needed for auto-switching, but why complicate things?
-#  TXen: bridge to DIO2 on E22 module
-  spidev: spidev0.0 #pins are (CS=16, CLK=17, MOSI=18, MISO=19)
-  spiSpeed: 2000000
+---
+Lora:
+## Ebyte E22-900MM22S with no external RF switching setup
+## Waveshare SX126X XXXM, AI Thinker RA-01SH
+## Will work with any module with or without RF switching and no TCXO
+
+  Module: sx1262  
+  gpiochip: 1 # subtract 32 from the gpio numbers
+  DIO2_AS_RF_SWITCH: true
+  DIO3_TCXO_VOLTAGE: false
+  CS: 16 #pin6 / GPIO48 1C0
+  IRQ: 23  #pin17 / GPIO55 1C7
+  Busy: 22 #pin16 / GPIO54 1C6
+  Reset: 25 #pin13 / GPIO57 1D1 
+  RXen: 24 #pin12 / GPIO56 1D0 # Not strictly needed for auto-switching, but why complicate things?
+#  TXen: bridge to DIO2 on E22 module
+  spidev: spidev0.0 #pins are (CS=16, CLK=17, MOSI=18, MISO=19)
+  spiSpeed: 2000000
+
+General:
+  MACAddressSource: eth0

bin/config.d/femtofox/femtofox_WIO-LR1121.yaml

@@ -1,30 +0,0 @@
----
-Lora:
-## Ebyte E80-900M22S
-## This is a bit experimental
-## 
-##
-  Module: lr1121
-  gpiochip: 1 # subtract 32 from the gpio numbers
-  DIO3_TCXO_VOLTAGE: 1.8
-  CS: 16 #pin6 / GPIO48 1C0
-  IRQ: 23  #pin17 / GPIO55 1C7
-  Busy: 22 #pin16 / GPIO54 1C6
-  Reset: 25 #pin13 / GPIO57 1D1
-
-
-  spidev: spidev0.0 #pins are (CS=16, CLK=17, MOSI=18, MISO=19)
-  spiSpeed: 2000000
-  
-rfswitch_table:
-  pins: [DIO5, DIO6, DIO7]
-  MODE_STBY: [LOW, LOW, LOW]
-  MODE_RX: [LOW, LOW, LOW]
-  MODE_TX: [LOW, HIGH, LOW]
-  MODE_TX_HP: [HIGH, LOW, LOW]
-  # MODE_TX_HF: []
-  # MODE_GNSS: []
-  MODE_WIFI: [LOW, LOW, LOW]
-
-General:
-  MACAddressSource: eth0

bin/config.d/lora-Adafruit-RFM9x.yaml

@@ -1,9 +1,3 @@
-Meta:
-  name: Adafruit RFM9x
-  support: deprecated
-  compatible:
-    - raspberry-pi
-
 Lora:
   Module: RF95  # Adafruit RFM9x
   Reset: 25

bin/config.d/lora-MeshAdv-900M30S.yaml

@@ -1,11 +1,5 @@
 # MeshAdv-Pi E22-900M30S
 # https://github.com/chrismyers2000/MeshAdv-Pi-Hat
-Meta:
-  name: MeshAdv-Pi E22-900M30S
-  support: community
-  compatible:
-    - raspberry-pi
-
 Lora:
   Module: sx1262
   CS: 21

bin/config.d/lora-MeshAdv-Mini-900M22S.yaml

@@ -1,11 +1,5 @@
 # MeshAdv Mini E22-900M22S
 # https://github.com/chrismyers2000/MeshAdv-Mini
-Meta:
-  name: MeshAdv Mini E22-900M22S
-  support: community
-  compatible:
-    - raspberry-pi
-
 Lora:
   Module: sx1262  # Ebyte E22-900M22S 
   CS: 8

bin/config.d/lora-RAK6421-13300-slot1.yaml

@@ -1,20 +1,11 @@
-Meta:
-  name: RAK6421 + RAK13300 Slot 1
-  support: official
-  compatible:
-    - raspberry-pi
-
 Lora:
 
-  ### RAK13300 in Slot 1
+  ### RAK13300in Slot 1
   Module: sx1262
   IRQ: 22 #IO6
   Reset: 16 # IO4
   Busy: 24 # IO5
   # Ant_sw: 13 # IO3 
-  Enable_Pins:
-    - 12
-    - 13
   DIO3_TCXO_VOLTAGE: true
   DIO2_AS_RF_SWITCH: true
   spidev: spidev0.0

bin/config.d/lora-RAK6421-13300-slot2.yaml

@@ -1,17 +1,8 @@
-Meta:
-  name: RAK6421 + RAK13300 Slot 2
-  support: official
-  compatible:
-    - raspberry-pi
-
 Lora:
-  ### RAK13300 in Slot 2 pins
+  ### RAK13300in Slot 2 pins
   IRQ: 18 #IO6
   Reset: 24 # IO4
   Busy: 19 # IO5
   # Ant_sw: 23 # IO3 
-  Enable_Pins:
-    - 26
-    - 23
   spidev: spidev0.1
   # CS: 7

bin/config.d/lora-RAK6421-13302-slot1.yaml

@@ -1,22 +0,0 @@
-Meta:
-  name: RAK6421 + RAK13302 Slot 1
-  support: official
-  compatible:
-    - raspberry-pi
-
-Lora:
-
-  ### RAK13302 in Slot 1
-  Module: sx1262
-  IRQ: 22 #IO6
-  Reset: 16 # IO4
-  Busy: 24 # IO5
-  # Ant_sw: 13 # IO3 
-  Enable_Pins:
-    - 12
-    - 13
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
-  spidev: spidev0.0
-  # CS: 8
-  TX_GAIN_LORA: [9, 9, 10, 11, 9, 8, 9, 10, 10, 10, 11, 12, 12, 12, 12, 12, 12, 12, 12, 10, 9, 8]

bin/config.d/lora-RAK6421-13302-slot2.yaml

@@ -1,18 +0,0 @@
-Meta:
-  name: RAK6421 + RAK13302 Slot 2
-  support: official
-  compatible:
-    - raspberry-pi
-
-Lora:
-  ### RAK13302 in Slot 2 pins
-  IRQ: 18 #IO6
-  Reset: 24 # IO4
-  Busy: 19 # IO5
-  # Ant_sw: 23 # IO3 
-  Enable_Pins:
-    - 26
-    - 23
-  spidev: spidev0.1
-  # CS: 7
-  TX_GAIN_LORA: [9, 9, 10, 11, 9, 8, 9, 10, 10, 10, 11, 12, 12, 12, 12, 12, 12, 12, 12, 10, 9, 8]

bin/config.d/lora-hat-rak-6421-pi-hat.yaml

@@ -1,21 +0,0 @@
-Meta:
-  name: RAK6421 + RAK13300 Slot 1 (Autoconf default)
-  support: official
-  compatible:
-    - raspberry-pi
-
-Lora:
-
-  ### RAK13300 in Slot 1
-  Module: sx1262
-  IRQ: 22 #IO6
-  Reset: 16 # IO4
-  Busy: 24 # IO5
-  Enable_Pins:
-    - 12
-    - 13
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
-  spidev: spidev0.0
-  # GPIO_DETECT_PA: 13
-  TX_GAIN_LORA: [9, 9, 10, 11, 9, 8, 9, 10, 10, 10, 11, 12, 12, 12, 12, 12, 12, 12, 12, 10, 9, 8]

bin/config.d/lora-lyra-picocalc-wio-sx1262.yaml

@@ -1,9 +1,3 @@
-Meta:
-  name: Luckfox Lyra PicoCalc Wio LoRa SX1262
-  support: official
-  compatible:
-    - luckfox-lyra-plus # Armbian
-
 Lora:
   Module: sx1262
   DIO2_AS_RF_SWITCH: true

bin/config.d/lora-lyra-ultra_1w.yaml

@@ -1,23 +0,0 @@
-# For use with Armbian luckfox-lyra-ultra-w
-# Enable overlay 'luckfox-lyra-ultra-w-spi0-cs0-spidev' with armbian-config
-# https://github.com/wehooper4/Meshtastic-Hardware/tree/main/Luckfox%20Ultra%20Hat
-# 1 Watt Lyra Ultra hat
-Meta:
-  name: wehooper4 Luckfox Ultra 1W
-  support: community
-  compatible:
-    - luckfox-pico-ultra # Armbian
-    - luckfox-lyra-ultra # Armbian
-
-Lora:
-  Module: sx1262
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  CS: 10
-  IRQ: 5
-  Busy: 11
-  Reset: 9
-  RXen: 14
-
-  spidev: spidev0.0 #pins are (CS=10, CLK=8, MOSI=6, MISO=7)
-  spiSpeed: 2000000

bin/config.d/lora-lyra-ultra_2w.yaml

@@ -1,24 +0,0 @@
-# For use with Armbian luckfox-lyra-ultra-w
-# Enable overlay 'luckfox-lyra-ultra-w-spi0-cs0-spidev' with armbian-config
-# https://github.com/wehooper4/Meshtastic-Hardware/tree/main/Luckfox%20Ultra%20Hat
-# 2 Watt Lyra Ultra hat
-Meta:
-  name: wehooper4 Luckfox Ultra 2W
-  support: community
-  compatible:
-    - luckfox-pico-ultra # Armbian
-    - luckfox-lyra-ultra # Armbian
-
-Lora:
-  Module: sx1262
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  SX126X_MAX_POWER: 8
-  CS: 10
-  IRQ: 5
-  Busy: 11
-  Reset: 9
-  RXen: 14
-
-  spidev: spidev0.0 #pins are (CS=10, CLK=8, MOSI=6, MISO=7)
-  spiSpeed: 2000000

bin/config.d/lora-lyra-ws-raspberry-pi-pico-hat.yaml

@@ -1,31 +0,0 @@
-# For use with Armbian luckfox-lyra // luckfox-lyra-plus
-# Enable overlay 'luckfox-lyra-plus-spi0-cs0_rmio13-spidev' with armbian-config
-# Waveshare LoRa HAT for Raspberry Pi Pico
-# https://www.waveshare.com/wiki/Pico-LoRa-SX1262
-Meta:
-  name: Waveshare LoRa HAT for Raspberry Pi Pico
-  support: community
-  compatible:
-    - luckfox-lyra-plus # Armbian
-
-Lora:
-  Module: sx1262
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  spidev: spidev0.0
-  CS: # GPIO0_B5
-    pin: 13
-    gpiochip: 0
-    line: 13
-  IRQ: # GPIO1_C2
-    pin: 50
-    gpiochip: 1
-    line: 18
-  Busy: # GPIO0_B4
-    pin: 12
-    gpiochip: 0
-    line: 12
-  Reset: # GPIO0_A2
-    pin: 2
-    gpiochip: 0
-    line: 2

bin/config.d/lora-meshstick-1262.yaml

@@ -1,9 +1,3 @@
-Meta:
-  name: Lora Meshstick SX1262
-  support: official
-  compatible:
-    - usb
-
 Lora:
   Module: sx1262
   CS: 0

bin/config.d/lora-piggystick-lr1121.yaml

@@ -1,9 +1,3 @@
-Meta:
-  name: Lora Meshstick SX1262
-  support: community
-  compatible:
-    - usb
-
 Lora:
   Module: lr1121
   CS: 0

bin/config.d/lora-pinedio-usb-sx1262.yaml

@@ -1,11 +1,5 @@
-Meta:
-  name: Pinedio USB SX1262
-  support: deprecated
-  compatible:
-    - usb
-
 Lora:
   Module: sx1262
   CS: 0 
   IRQ: 10
-  spidev: ch341
+  spidev: ch341

bin/config.d/lora-raxda-rock2f-starter-edition-hat.yaml

@@ -1,9 +1,3 @@
-Meta:
-  name: raxda-rock2f-starter-edition-hat
-  support: community
-  compatible:
-    - rock-2f # Armbian
-
 Lora:
 
 ### Raxda Rock 2F running Armbian Linux 6.1.99-vendor-rk35xx

bin/config.d/lora-starter-edition-sx1262-i2c.yaml

@@ -1,11 +1,5 @@
 # https://www.waveshare.com/core1262-868m.htm
 # https://github.com/markbirss/lora-starter-edition-sx1262-i2c
-Meta:
-  name: lora-starter-edition-sx1262-i2c
-  support: community
-  compatible:
-    - raspberry-pi
-
 Lora:
   Module: sx1262  # Starter Edition SX1262 I2C Raspberry Pi HAT
   DIO2_AS_RF_SWITCH: true

bin/config.d/lora-usb-meshstick-1262.yaml

@@ -1,20 +0,0 @@
-Meta:
-  name: meshstick-1262
-  support: official
-  compatible:
-    - usb
-
-Lora:
-  Module: sx1262
-  CS: 0
-  IRQ: 6
-  Reset: 2
-  Busy: 4
-  RXen: 1
-  DIO2_AS_RF_SWITCH: true
-  spidev: ch341
-  DIO3_TCXO_VOLTAGE: true
-#  USB_Serialnum: 12345678
-  USB_PID: 0x5512
-  USB_VID: 0x1A86
-  SX126X_MAX_POWER: 22

bin/config.d/lora-usb-meshtoad-e22.yaml

@@ -1,9 +1,3 @@
-Meta:
-  name: meshtoad-e22
-  support: official
-  compatible:
-    - usb
-
 Lora:
   Module: sx1262
   CS: 0

bin/config.d/lora-usb-umesh-1262-30dbm.yaml

@@ -1,28 +0,0 @@
-Meta:
-  name: umesh-1262-30dbm
-  support: community
-  compatible:
-    - clockwork-uconsole
-
-Lora:
-  Module: sx1262
-  CS: 0
-  IRQ: 6
-  Reset: 1
-  Busy: 4
-  RXen: 2
-  DIO2_AS_RF_SWITCH: true
-  spidev: ch341
-  USB_PID: 0x5512
-  USB_VID: 0x1A86
-  DIO3_TCXO_VOLTAGE: true
-#  USB_Serialnum: 12345678
-  SX126X_MAX_POWER: 22
-# Reduce output power to improve EMI
-  TX_GAIN_LORA: [12, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 10, 10, 9, 8, 8, 7]
-# Note: This module integrates an additional PA to achieve higher output power.
-# The 'power' parameter here does not represent the actual RF output.
-# TX_GAIN_LORA defines the gain offset applied at each SX1262 input power step (1–22 dBm).
-# Each array element corresponds to the additional gain when that input level is set,
-# The effective RF output is: Pout ≈ Pset + TX_GAIN_LORA[index].
-# Please refer to https://github.com/linser233/uMesh/blob/main/RF_Power.md for detailed information.

bin/config.d/lora-usb-umesh-1268-30dbm.yaml

@@ -1,28 +0,0 @@
-Meta:
-  name: umesh-1268-30dbm
-  support: community
-  compatible:
-    - clockwork-uconsole
-
-Lora:
-  Module: sx1268
-  CS: 0
-  IRQ: 6
-  Reset: 1
-  Busy: 4
-  RXen: 2
-  DIO2_AS_RF_SWITCH: true
-  spidev: ch341
-  USB_PID: 0x5512
-  USB_VID: 0x1A86
-  DIO3_TCXO_VOLTAGE: true
-#  USB_Serialnum: 12345678
-  SX126X_MAX_POWER: 22
-# Reduce output power to improve EMI
-  TX_GAIN_LORA: [12, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 10, 10, 9, 8, 8, 7]
-# Note: This module integrates an additional PA to achieve higher output power.
-# The 'power' parameter here does not represent the actual RF output.
-# TX_GAIN_LORA defines the gain offset applied at each SX1262 input power step (1–22 dBm).
-# Each array element corresponds to the additional gain when that input level is set,
-# The effective RF output is: Pout ≈ Pset + TX_GAIN_LORA[index].
-# Please refer to https://github.com/linser233/uMesh/blob/main/RF_Power.md for detailed information.

bin/config.d/lora-waveshare-sxxx.yaml

@@ -1,9 +1,3 @@
-Meta:
-  name: Waveshare SX1262
-  support: deprecated
-  compatible:
-    - raspberry-pi
-
 Lora:
   Module: sx1262  # Waveshare SX126X XXXM
   DIO2_AS_RF_SWITCH: true

bin/config.d/lora-ws-raspberry-pi-pico-to-rpi-adapter.yaml

@@ -1,12 +1,5 @@
 # https://www.waveshare.com/pico-lora-sx1262-868m.htm
 # https://github.com/markbirss/lora-ws-raspberry-pi-pico-to-rpi-adapter
-
-Meta:
-  name: ws-raspberry-pico-to-rpi-adapter
-  support: community
-  compatible:
-    - raspberry-pi
-
 Lora:
   Module: sx1262  # Waveshare Raspberry Pi Pico to Raspberry Pi HAT Adapter
   DIO2_AS_RF_SWITCH: true

bin/config.d/lora-ws-raspberry-pico-to-orangepi-03.yaml

@@ -15,12 +15,6 @@
 #   5     CS          24
 #   26    DIO1/IRQ    26
 
-Meta:
-  name: ws-raspberry-pico-to-orangepi-03
-  support: community
-  compatible:
-    - orange-pi-zero-3 # Armbian
-
 Lora:
   Module: sx1262  # Waveshare Raspberry Pico Lora module
   DIO2_AS_RF_SWITCH: true

bin/device-install.bat

@@ -5,14 +5,22 @@ TITLE Meshtastic device-install
 SET "SCRIPT_NAME=%~nx0"
 SET "DEBUG=0"
 SET "PYTHON="
+SET "TFT_BUILD=0"
+SET "BIGDB8=0"
+SET "MUIDB8=0"
+SET "BIGDB16=0"
 SET "ESPTOOL_BAUD=115200"
 SET "ESPTOOL_CMD="
 SET "LOGCOUNTER=0"
 SET "BPS_RESET=0"
-@REM Default offsets.
-@REM https://github.com/meshtastic/web-flasher/blob/main/stores/firmwareStore.ts#L202
-SET "OTA_OFFSET=0x260000"
-SET "SPIFFS_OFFSET=0x300000"
+
+@REM FIXME: Determine mcu from PlatformIO variant, this is unmaintainable.
+SET "S3=s3 v3 t-deck wireless-paper wireless-tracker station-g2 unphone t-eth-elite tlora-pager mesh-tab dreamcatcher ESP32-S3-Pico seeed-sensecap-indicator heltec_capsule_sensor_v3 vision-master icarus tracksenger elecrow-adv heltec-v4"
+SET "C3=esp32c3"
+@REM FIXME: Determine flash size from PlatformIO variant, this is unmaintainable.
+SET "BIGDB_8MB=crowpanel-esp32s3 heltec_capsule_sensor_v3 heltec-v3 heltec-vision-master-e213 heltec-vision-master-e290 heltec-vision-master-t190 heltec-wireless-paper heltec-wireless-tracker heltec-wsl-v3 icarus seeed-xiao-s3 tbeam-s3-core tracksenger"
+SET "MUIDB_8MB=picomputer-s3 unphone seeed-sensecap-indicator"
+SET "BIGDB_16MB=t-deck mesh-tab t-energy-s3 dreamcatcher ESP32-S3-Pico m5stack-cores3 station-g2 t-eth-elite tlora-pager t-watch-s3 elecrow-adv heltec-v4"
 
 GOTO getopts
 :help
@@ -21,7 +29,7 @@ ECHO.
 ECHO Usage: %SCRIPT_NAME% -f filename [-p PORT] [-P python] [--1200bps-reset]
 ECHO.
 ECHO Options:
-ECHO     -f filename      The firmware .factory.bin file to flash.  Custom to your device type and region. (required)
+ECHO     -f filename      The firmware .bin file to flash.  Custom to your device type and region. (required)
 ECHO                      The file must be located in this current directory.
 ECHO     -p PORT          Set the environment variable for ESPTOOL_PORT.
 ECHO                      If not set, ESPTOOL iterates all ports (Dangerous).
@@ -32,12 +40,12 @@ ECHO     --1200bps-reset  Attempt to place the device in correct mode. (1200bps
 ECHO                      Some hardware requires this twice.
 ECHO.
 ECHO Example: %SCRIPT_NAME% -p COM17 --1200bps-reset
-ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4.factory.bin -p COM11
-ECHO Example: %SCRIPT_NAME% -f firmware-unphone-2.6.0.0b106d4.factory.bin -p COM11
+ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4.bin -p COM11
+ECHO Example: %SCRIPT_NAME% -f firmware-unphone-2.6.0.0b106d4.bin -p COM11
 GOTO eof
 
 :version
-ECHO %SCRIPT_NAME% [Version 2.7.0]
+ECHO %SCRIPT_NAME% [Version 2.6.2]
 ECHO Meshtastic
 GOTO eof
 
@@ -70,8 +78,8 @@ IF "__!FILENAME!__"=="____" (
         CALL :LOG_MESSAGE ERROR "Filename containing spaces are not supported."
         GOTO help
     )
-    IF NOT "__!FILENAME:.factory.bin=!__"=="__!FILENAME!__" (
-        CALL :LOG_MESSAGE ERROR "Filename must be a firmware-*.factory.bin file."
+    IF "__!FILENAME:firmware-=!__"=="__!FILENAME!__" (
+        CALL :LOG_MESSAGE ERROR "Filename must be a firmware-* file."
         GOTO help
     )
     @REM Remove ".\" or "./" file prefix if present.
@@ -85,26 +93,12 @@ IF NOT EXIST !FILENAME! (
     GOTO eof
 )
 
-CALL :LOG_MESSAGE DEBUG "Checking for metadata..."
-@REM Derive metadata filename from firmware filename.
-SET "METAFILE=!FILENAME:.factory.bin=!.mt.json"
-IF EXIST !METAFILE! (
-    @REM Print parsed json with powershell
-    CALL :LOG_MESSAGE INFO "Firmware metadata: !METAFILE!"
-    powershell -NoProfile -Command "(Get-Content '!METAFILE!' | ConvertFrom-Json | Out-String).Trim()"
-
-    @REM Save metadata values to variables for later use.
-    FOR /f "usebackq" %%A IN (`powershell -NoProfile -Command ^
-        "(Get-Content '!METAFILE!' | ConvertFrom-Json).mcu"`) DO SET "MCU=%%A"
-    FOR /f "usebackq" %%A IN (`powershell -NoProfile -Command ^
-        "(Get-Content '!METAFILE!' | ConvertFrom-Json).part | Where-Object { $_.subtype -eq 'ota_1' } | Select-Object -ExpandProperty offset"`
-    ) DO SET "OTA_OFFSET=%%A"
-    FOR /f "usebackq" %%A IN (`powershell -NoProfile -Command ^
-        "(Get-Content '!METAFILE!' | ConvertFrom-Json).part | Where-Object { $_.subtype -eq 'spiffs' } | Select-Object -ExpandProperty offset"`
-    ) DO SET "SPIFFS_OFFSET=%%A"
-) ELSE (
-    CALL :LOG_MESSAGE ERROR "No metadata file found: !METAFILE!"
+IF NOT "!FILENAME:update=!"=="!FILENAME!" (
+    CALL :LOG_MESSAGE DEBUG "We are working with a *update* file. !FILENAME!"
+    CALL :LOG_MESSAGE INFO "Use script device-update.bat to flash update !FILENAME!."
     GOTO eof
+) ELSE (
+    CALL :LOG_MESSAGE DEBUG "We are NOT working with a *update* file. !FILENAME!"
 )
 
 :skip-filename
@@ -114,7 +108,7 @@ IF NOT "__%PYTHON%__"=="____" (
     SET "ESPTOOL_CMD=!PYTHON! -m esptool"
     CALL :LOG_MESSAGE DEBUG "Python interpreter supplied."
 ) ELSE (
-    CALL :LOG_MESSAGE DEBUG "Python interpreter NOT supplied. Looking for esptool..."
+    CALL :LOG_MESSAGE DEBUG "Python interpreter NOT supplied. Looking for esptool...
     WHERE esptool >nul 2>&1
     IF %ERRORLEVEL% EQU 0 (
         @REM WHERE exits with code 0 if esptool is found.
@@ -152,18 +146,100 @@ IF %BPS_RESET% EQU 1 (
     GOTO eof
 )
 
-@REM Extract PROGNAME from %FILENAME% for later use.
-SET "PROGNAME=!FILENAME:.factory.bin=!"
-CALL :LOG_MESSAGE DEBUG "Computed PROGNAME: !PROGNAME!"
+@REM Check if FILENAME contains "-tft-" and set target partitionScheme accordingly.
+@REM https://github.com/meshtastic/web-flasher/blob/main/types/resources.ts#L3
+IF NOT "!FILENAME:-tft-=!"=="!FILENAME!" (
+    CALL :LOG_MESSAGE DEBUG "We are working with a *-tft-* file. !FILENAME!"
+    SET "TFT_BUILD=1"
+) ELSE (
+    CALL :LOG_MESSAGE DEBUG "We are NOT working with a *-tft-* file. !FILENAME!"
+)
 
-@REM Determine OTA filename based on MCU type (unified OTA format)
-SET "OTA_FILENAME=mt-!MCU!-ota.bin"
+FOR %%a IN (%BIGDB_8MB%) DO (
+    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
+        @REM We are working with any of %BIGDB_8MB%.
+        SET "BIGDB8=1"
+        GOTO end_loop_bigdb_8mb
+    )
+)
+:end_loop_bigdb_8mb
+
+FOR %%a IN (%MUIDB_8MB%) DO (
+    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
+        @REM We are working with any of %MUIDB_8MB%.
+        SET "MUIDB8=1"
+        GOTO end_loop_muidb_8mb
+    )
+)
+:end_loop_muidb_8mb
+
+FOR %%a IN (%BIGDB_16MB%) DO (
+    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
+        @REM We are working with any of %BIGDB_16MB%.
+        SET "BIGDB16=1"
+        GOTO end_loop_bigdb_16mb
+    )
+)
+:end_loop_bigdb_16mb
+
+IF %BIGDB8% EQU 1 CALL :LOG_MESSAGE INFO "BigDB 8mb partition selected."
+IF %MUIDB8% EQU 1 CALL :LOG_MESSAGE INFO "MUIDB 8mb partition selected."
+IF %BIGDB16% EQU 1 CALL :LOG_MESSAGE INFO "BigDB 16mb partition selected."
+
+@REM Extract BASENAME from %FILENAME% for later use.
+SET "BASENAME=!FILENAME:firmware-=!"
+CALL :LOG_MESSAGE DEBUG "Computed firmware basename: !BASENAME!"
+
+@REM Account for S3 and C3 board's different OTA partition.
+FOR %%a IN (%S3%) DO (
+    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
+        @REM We are working with any of %S3%.
+        SET "OTA_FILENAME=bleota-s3.bin"
+        GOTO :end_loop_s3
+    )
+)
+
+FOR %%a IN (%C3%) DO (
+    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
+        @REM We are working with any of %C3%.
+        SET "OTA_FILENAME=bleota-c3.bin"
+        GOTO :end_loop_c3
+    )
+)
+
+@REM Everything else
+SET "OTA_FILENAME=bleota.bin"
+:end_loop_s3
+:end_loop_c3
 CALL :LOG_MESSAGE DEBUG "Set OTA_FILENAME to: !OTA_FILENAME!"
 
 @REM Set SPIFFS filename with "littlefs-" prefix.
-SET "SPIFFS_FILENAME=littlefs-!PROGNAME:firmware-=!.bin"
+SET "SPIFFS_FILENAME=littlefs-%BASENAME%"
 CALL :LOG_MESSAGE DEBUG "Set SPIFFS_FILENAME to: !SPIFFS_FILENAME!"
 
+@REM Default offsets.
+@REM https://github.com/meshtastic/web-flasher/blob/main/stores/firmwareStore.ts#L202
+SET "OTA_OFFSET=0x260000"
+SET "SPIFFS_OFFSET=0x300000"
+
+@REM Offsets for BigDB 8mb.
+IF %BIGDB8% EQU 1 (
+    SET "OTA_OFFSET=0x340000"
+    SET "SPIFFS_OFFSET=0x670000"
+)
+
+@REM Offsets for MUIDB 8mb.
+IF %MUIDB8% EQU 1 (
+    SET "OTA_OFFSET=0x5D0000"
+    SET "SPIFFS_OFFSET=0x670000"
+)
+
+@REM Offsets for BigDB 16mb.
+IF %BIGDB16% EQU 1 (
+    SET "OTA_OFFSET=0x650000"
+    SET "SPIFFS_OFFSET=0xc90000"
+)
+
 CALL :LOG_MESSAGE DEBUG "Set OTA_OFFSET to: !OTA_OFFSET!"
 CALL :LOG_MESSAGE DEBUG "Set SPIFFS_OFFSET to: !SPIFFS_OFFSET!"
 

bin/device-install.sh

@@ -2,15 +2,69 @@
 
 PYTHON=${PYTHON:-$(which python3 python | head -n 1)}
 BPS_RESET=false
+TFT_BUILD=false
 MCU=""
 
 # Constants
 RESET_BAUD=1200
 FIRMWARE_OFFSET=0x00
-# Default littlefs* offset.
-OFFSET=0x300000
-# Default OTA Offset
-OTA_OFFSET=0x260000
+
+# Variant groups
+BIGDB_8MB=(
+    "crowpanel-esp32s3"
+    "heltec_capsule_sensor_v3"
+    "heltec-v3"
+    "heltec-vision-master-e213"
+    "heltec-vision-master-e290"
+    "heltec-vision-master-t190"
+    "heltec-wireless-paper"
+    "heltec-wireless-tracker"
+    "heltec-wsl-v3"
+    "icarus"
+    "seeed-xiao-s3"
+    "tbeam-s3-core"
+    "tracksenger"
+)
+MUIDB_8MB=(
+    "picomputer-s3"
+    "unphone"
+    "seeed-sensecap-indicator"
+)
+BIGDB_16MB=(
+    "dreamcatcher"
+    "elecrow-adv"
+    "ESP32-S3-Pico"
+    "heltec-v4"
+    "m5stack-cores3"
+    "mesh-tab"
+    "station-g2"
+    "t-deck"
+    "t-energy-s3"
+    "t-eth-elite"
+    "t-watch-s3"
+    "tlora-pager"
+)
+S3_VARIANTS=(
+    "s3"
+    "-v3"
+    "-v4"
+    "t-deck"
+    "wireless-paper"
+    "wireless-tracker"
+    "station-g2"
+    "unphone"
+    "t-eth-elite"
+    "tlora-pager"
+    "mesh-tab"
+    "dreamcatcher"
+    "ESP32-S3-Pico"
+    "seeed-sensecap-indicator"
+    "heltec_capsule_sensor_v3"
+    "vision-master"
+    "icarus"
+    "tracksenger"
+    "elecrow-adv"
+)
 
 # Determine the correct esptool command to use
 if "$PYTHON" -m esptool version >/dev/null 2>&1; then
@@ -24,27 +78,6 @@ else
     exit 1
 fi
 
-# Check for jq
-if ! command -v jq >/dev/null 2>&1; then
-    echo "Error: jq not found" >&2
-    echo "Install jq with your package manager." >&2
-    echo "e.g. 'apt install jq', 'dnf install jq', 'brew install jq', etc." >&2
-    exit 1
-fi
-
-# esptool v5 supports commands with dashes and deprecates commands with
-# underscores. Prior versions only support commands with underscores
-if ${ESPTOOL_CMD} | grep --quiet write-flash
-then
-    ESPTOOL_WRITE_FLASH=write-flash
-    ESPTOOL_ERASE_FLASH=erase-flash
-    ESPTOOL_READ_FLASH_STATUS=read-flash-status
-else
-    ESPTOOL_WRITE_FLASH=write_flash
-    ESPTOOL_ERASE_FLASH=erase_flash
-    ESPTOOL_READ_FLASH_STATUS=read_flash_status
-fi
-
 set -e
 
 # Usage info
@@ -56,7 +89,7 @@ Flash image file to device, but first erasing and writing system information.
     -h               Display this help and exit.
     -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerous).
     -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: "$PYTHON")
-    -f FILENAME      The firmware *.factory.bin file to flash.  Custom to your device type and region.
+    -f FILENAME      The firmware .bin file to flash.  Custom to your device type and region.
     --1200bps-reset  Attempt to place the device in correct mode. Some hardware requires this twice. (1200bps Reset)
 
 EOF
@@ -96,8 +129,8 @@ while [ $# -gt 0 ]; do
 done
 
 if [[ $BPS_RESET == true ]]; then
-    $ESPTOOL_CMD --baud $RESET_BAUD --after no_reset ${ESPTOOL_READ_FLASH_STATUS}
-    exit 0
+	$ESPTOOL_CMD --baud $RESET_BAUD --after no_reset read_flash_status
+	exit 0
 fi
 
 [ -z "$FILENAME" ] && [ -n "$1" ] && {
@@ -105,37 +138,69 @@ fi
     shift
 }
 
-if [[ $(basename "$FILENAME") != firmware-*.factory.bin ]]; then
-  echo "Filename must be a firmware-*.factory.bin file."
+if [[ "$FILENAME" != firmware-* ]]; then
+  echo "Filename must be a firmware-* file."
   exit 1
 fi
 
-# Extract PROGNAME from %FILENAME% for later use.
-PROGNAME="${FILENAME/.factory.bin/}"
-# Derive metadata filename from %PROGNAME%.
-METAFILE="${PROGNAME}.mt.json"
+# Check if FILENAME contains "-tft-" and set target partitionScheme accordingly.
+if [[ "${FILENAME//-tft-/}" != "$FILENAME" ]]; then
+    TFT_BUILD=true
+fi
 
-if [[ -f "$FILENAME" && "$FILENAME" == *.factory.bin ]]; then
-    # Display metadata if it exists
-    if [[ -f "$METAFILE" ]]; then
-        echo "Firmware metadata: ${METAFILE}"
-        jq . "$METAFILE"
-        # Extract relevant fields from metadata
-        if [[ $(jq -r '.part' "$METAFILE") != "null" ]]; then
-            OTA_OFFSET=$(jq -r '.part[] | select(.subtype == "ota_1") | .offset' "$METAFILE")
-            SPIFFS_OFFSET=$(jq -r '.part[] | select(.subtype == "spiffs") | .offset' "$METAFILE")
+# Extract BASENAME from %FILENAME% for later use.
+BASENAME="${FILENAME/firmware-/}"
+
+if [ -f "${FILENAME}" ] && [ -n "${FILENAME##*"update"*}" ]; then
+    # Default littlefs* offset.
+    OFFSET=0x300000
+
+    # Default OTA Offset
+    OTA_OFFSET=0x260000
+
+    # littlefs* offset for BigDB 8mb and OTA OFFSET.
+    for variant in "${BIGDB_8MB[@]}"; do
+        if [ -z "${FILENAME##*"$variant"*}" ]; then
+            OFFSET=0x670000
+            OTA_OFFSET=0x340000
+        fi
+    done
+
+    for variant in "${MUIDB_8MB[@]}"; do
+        if [ -z "${FILENAME##*"$variant"*}" ]; then
+            OFFSET=0x670000
+            OTA_OFFSET=0x5D0000
+        fi
+    done
+
+    # littlefs* offset for BigDB 16mb and OTA OFFSET.
+    for variant in "${BIGDB_16MB[@]}"; do
+        if [ -z "${FILENAME##*"$variant"*}" ]; then
+            OFFSET=0xc90000
+            OTA_OFFSET=0x650000
+        fi
+    done
+
+    # Account for S3 board's different OTA partition
+    # FIXME: Use PlatformIO info to determine MCU type, this is unmaintainable
+    for variant in "${S3_VARIANTS[@]}"; do
+        if [ -z "${FILENAME##*"$variant"*}" ]; then
+            MCU="esp32s3"
+        fi
+    done
+
+    if [ "$MCU" != "esp32s3" ]; then
+        if [ -n "${FILENAME##*"esp32c3"*}" ]; then
+            OTAFILE=bleota.bin
+        else
+            OTAFILE=bleota-c3.bin
         fi
-        MCU=$(jq -r '.mcu' "$METAFILE")
     else
-        echo "ERROR: No metadata file found at ${METAFILE}"
-        exit 1
+        OTAFILE=bleota-s3.bin
     fi
 
-    # Determine OTA filename based on MCU type (unified OTA format)
-    OTAFILE="mt-${MCU}-ota.bin"
-
     # Set SPIFFS filename with "littlefs-" prefix.
-    SPIFFSFILE="littlefs-${PROGNAME/firmware-/}.bin"
+    SPIFFSFILE=littlefs-${BASENAME}
 
     if [[ ! -f "$FILENAME" ]]; then
         echo "Error: file ${FILENAME} wasn't found. Terminating."
@@ -151,12 +216,12 @@ if [[ -f "$FILENAME" && "$FILENAME" == *.factory.bin ]]; then
     fi
 
     echo "Trying to flash ${FILENAME}, but first erasing and writing system information"
-    $ESPTOOL_CMD ${ESPTOOL_ERASE_FLASH}
-    $ESPTOOL_CMD ${ESPTOOL_WRITE_FLASH} $FIRMWARE_OFFSET "${FILENAME}"
+    $ESPTOOL_CMD erase-flash
+    $ESPTOOL_CMD write-flash $FIRMWARE_OFFSET "${FILENAME}"
     echo "Trying to flash ${OTAFILE} at offset ${OTA_OFFSET}"
-    $ESPTOOL_CMD ${ESPTOOL_WRITE_FLASH} $OTA_OFFSET "${OTAFILE}"
+    $ESPTOOL_CMD write_flash $OTA_OFFSET "${OTAFILE}"
     echo "Trying to flash ${SPIFFSFILE}, at offset ${OFFSET}"
-    $ESPTOOL_CMD ${ESPTOOL_WRITE_FLASH} $OFFSET "${SPIFFSFILE}"
+    $ESPTOOL_CMD write_flash $OFFSET "${SPIFFSFILE}"
 
 else
     show_help

bin/device-update.bat

@@ -30,11 +30,11 @@ ECHO     --change-mode    Attempt to place the device in correct mode. (1200bps
 ECHO                      Some hardware requires this twice.
 ECHO.
 ECHO Example: %SCRIPT_NAME% -p COM17 --change-mode
-ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4.bin -p COM11
+ECHO Example: %SCRIPT_NAME% -f firmware-t-deck-tft-2.6.0.0b106d4-update.bin -p COM11
 GOTO eof
 
 :version
-ECHO %SCRIPT_NAME% [Version 2.7.0]
+ECHO %SCRIPT_NAME% [Version 2.6.2]
 ECHO Meshtastic
 GOTO eof
 
@@ -78,12 +78,12 @@ IF NOT EXIST !FILENAME! (
     GOTO eof
 )
 
-IF NOT "__!FILENAME:.factory.bin=!__"=="__!FILENAME!__" (
-    CALL :LOG_MESSAGE DEBUG "We are working with a *.factory.bin* file. !FILENAME!"
+IF "!FILENAME:update=!"=="!FILENAME!" (
+    CALL :LOG_MESSAGE DEBUG "We are NOT working with a *update* file. !FILENAME!"
     CALL :LOG_MESSAGE INFO "Use script device-install.bat to flash !FILENAME!."
     GOTO eof
 ) ELSE (
-    CALL :LOG_MESSAGE DEBUG "We are not working with a *.factory.bin* file. !FILENAME!"
+    CALL :LOG_MESSAGE DEBUG "We are working with a *update* file. !FILENAME!"
 )
 
 :skip-filename

bin/device-update.sh

@@ -20,17 +20,6 @@ else
     exit 1
 fi
 
-# esptool v5 supports commands with dashes and deprecates commands with
-# underscores. Prior versions only support commands with underscores
-if ${ESPTOOL_CMD} | grep --quiet write-flash
-then
-    ESPTOOL_WRITE_FLASH=write-flash
-    ESPTOOL_READ_FLASH_STATUS=read-flash-status
-else
-    ESPTOOL_WRITE_FLASH=write_flash
-    ESPTOOL_READ_FLASH_STATUS=read_flash_status
-fi
-
 # Usage info
 show_help() {
 cat << EOF
@@ -40,7 +29,7 @@ Flash image file to device, leave existing system intact."
     -h               Display this help and exit
     -p ESPTOOL_PORT  Set the environment variable for ESPTOOL_PORT.  If not set, ESPTOOL iterates all ports (Dangerous).
     -P PYTHON        Specify alternate python interpreter to use to invoke esptool. (Default: "$PYTHON")
-    -f FILENAME      The *.bin file to flash.  Custom to your device type.
+    -f FILENAME      The *update.bin file to flash.  Custom to your device type.
     --change-mode    Attempt to place the device in correct mode. Some hardware requires this twice. (1200bps Reset)
 
 EOF
@@ -80,7 +69,7 @@ done
 shift "$((OPTIND-1))"
 
 if [ "$CHANGE_MODE" = true ]; then
-    $ESPTOOL_CMD --baud $RESET_BAUD --after no_reset ${ESPTOOL_READ_FLASH_STATUS}
+	$ESPTOOL_CMD --baud $RESET_BAUD --after no_reset read_flash_status
     exit 0
 fi
 
@@ -89,9 +78,9 @@ fi
     shift
 }
 
-if [[ -f "$FILENAME" && "$FILENAME" != *.factory.bin ]]; then
+if [ -f "${FILENAME}" ] && [ -z "${FILENAME##*"update"*}" ]; then
     echo "Trying to flash update ${FILENAME}"
-    $ESPTOOL_CMD --baud $FLASH_BAUD ${ESPTOOL_WRITE_FLASH} $UPDATE_OFFSET "${FILENAME}"
+    $ESPTOOL_CMD --baud $FLASH_BAUD write-flash $UPDATE_OFFSET "${FILENAME}"
 else
     show_help
     echo "Invalid file: ${FILENAME}"

bin/exception_decoder.py

@@ -75,7 +75,7 @@ TOOLS = {
 }
 
 BACKTRACE_REGEX = re.compile(
-    r"\b(0x4[0-9a-fA-F]{7,8}):0x[0-9a-fA-F]{8}\b"
+    r"(?:\s+(0x40[0-2](?:\d|[a-f]|[A-F]){5}):0x(?:\d|[a-f]|[A-F]){8})\b"
 )
 EXCEPTION_REGEX = re.compile("^Exception \\((?P<exc>[0-9]*)\\):$")
 COUNTER_REGEX = re.compile(
@@ -89,7 +89,7 @@ POINTER_REGEX = re.compile(
 STACK_BEGIN = ">>>stack>>>"
 STACK_END = "<<<stack<<<"
 STACK_REGEX = re.compile(
-    r"^(?P<off>[0-9a-f]+):\W+(?P<c1>[0-9a-f]+) (?P<c2>[0-9a-f]+) (?P<c3>[0-9a-f]+) (?P<c4>[0-9a-f]+)(\W.*)?$"
+    "^(?P<off>[0-9a-f]+):\W+(?P<c1>[0-9a-f]+) (?P<c2>[0-9a-f]+) (?P<c3>[0-9a-f]+) (?P<c4>[0-9a-f]+)(\W.*)?$"
 )
 
 StackLine = namedtuple("StackLine", ["offset", "content"])
@@ -223,7 +223,7 @@ class AddressResolver(object):
             if match is None:
                 if last is not None and line.startswith("(inlined by)"):
                     line = line[12:].strip()
-                    self._address_map[last] += "\n  \\-> inlined by: " + line
+                    self._address_map[last] += "\n  \-> inlined by: " + line
                 continue
 
             if match.group("result") == "?? ??:0":