Upgrade trunk

.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.

.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@v6
+      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/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/workflows/build_debian_src.yml

@@ -64,7 +64,7 @@ jobs:
           PKG_VERSION: ${{ steps.version.outputs.deb }}
 
       - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
         with:
           name: firmware-debian-${{ steps.version.outputs.deb }}~${{ inputs.series }}-src
           overwrite: true

.github/workflows/build_firmware.yml

@@ -18,10 +18,9 @@ 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:
@@ -29,6 +28,23 @@ jobs:
           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
         uses: meshtastic/gh-action-firmware@main
@@ -36,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@v6
-        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@v6
-        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_arch.yml

@@ -0,0 +1,176 @@
+name: Build One Arch
+
+on:
+  workflow_dispatch:
+    inputs:
+      # trunk-ignore(checkov/CKV_GHA_7)
+      arch:
+        type: choice
+        options:
+          - esp32
+          - esp32s3
+          - esp32c3
+          - esp32c6
+          - nrf52840
+          - rp2040
+          - rp2350
+          - stm32
+          - native
+
+permissions: read-all
+
+env:
+  INPUT_ARCH: ${{ github.event.inputs.arch }}
+
+jobs:
+  setup:
+    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: |
+          TARGETS=$(./bin/generate_ci_matrix.py $INPUT_ARCH --level extra)
+          echo "Name: $GITHUB_REF_NAME Base: $GITHUB_BASE_REF Ref: $GITHUB_REF"
+          echo "selected_arch=$TARGETS" >> $GITHUB_OUTPUT
+    outputs:
+      selected_arch: ${{ steps.jsonStep.outputs.selected_arch }}
+
+  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 }}
+
+  build:
+    if: ${{ github.event_name != 'workflow_dispatch' }}
+    needs: [setup, version]
+    strategy:
+      fail-fast: false
+      matrix:
+        build: ${{ fromJson(needs.setup.outputs.selected_arch) }}
+    uses: ./.github/workflows/build_firmware.yml
+    with:
+      version: ${{ needs.version.outputs.long }}
+      pio_env: ${{ matrix.build.board }}
+      platform: ${{ matrix.build.arch }}
+
+  build-debian-src:
+    if: ${{ github.repository == 'meshtastic/firmware' && github.event_name != 'workflow_dispatch' || inputs.arch == 'native' }}
+    uses: ./.github/workflows/build_debian_src.yml
+    with:
+      series: UNRELEASED
+      build_location: local
+    secrets: inherit
+
+  package-pio-deps-native-tft:
+    if: ${{ inputs.arch == 'native' }}
+    uses: ./.github/workflows/package_pio_deps.yml
+    with:
+      pio_env: native-tft
+    secrets: inherit
+
+  test-native:
+    if: ${{ !contains(github.ref_name, 'event/') && github.event_name != 'workflow_dispatch' ||  !contains(github.ref_name, 'event/') && inputs.arch == 'native' }}
+    uses: ./.github/workflows/test_native.yml
+
+  gather-artifacts:
+    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-${{inputs.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-${{inputs.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-${{inputs.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-${{inputs.arch}}-${{ needs.version.outputs.long }}.zip ./output
+
+      - name: Repackage in single elfs zip
+        uses: actions/upload-artifact@v5
+        with:
+          name: debug-elfs-${{inputs.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-${{inputs.arch}}-${{ needs.version.outputs.long }}
+          description: "Download firmware-${{inputs.arch}}-${{ needs.version.outputs.long }}.zip. This artifact will be available for 90 days from creation"
+          github-token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/build_one_target.yml

@@ -15,6 +15,7 @@ on:
           - rp2040
           - rp2350
           - stm32
+          - native
       target:
         type: string
         required: false
@@ -41,6 +42,7 @@ jobs:
           - rp2040
           - rp2350
           - stm32
+
     runs-on: ubuntu-24.04
     steps:
       - uses: actions/checkout@v6
@@ -58,7 +60,7 @@ jobs:
           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
+          echo $TARGETS >> $GITHUB_STEP_SUMMARY
 
   version:
     if: ${{ inputs.target != '' }}
@@ -85,6 +87,25 @@ jobs:
       pio_env: ${{ inputs.target }}
       platform: ${{ inputs.arch }}
 
+  build-debian-src:
+    if: ${{ github.repository == 'meshtastic/firmware' && inputs.arch == 'native' }}
+    uses: ./.github/workflows/build_debian_src.yml
+    with:
+      series: UNRELEASED
+      build_location: local
+    secrets: inherit
+
+  package-pio-deps-native-tft:
+    if: ${{ inputs.arch == 'native' }}
+    uses: ./.github/workflows/package_pio_deps.yml
+    with:
+      pio_env: native-tft
+    secrets: inherit
+
+  test-native:
+    if: ${{ !contains(github.ref_name, 'event/') && github.event_name != 'workflow_dispatch' ||  !contains(github.ref_name, 'event/') && inputs.arch == 'native' && inputs.target != '' }}
+    uses: ./.github/workflows/test_native.yml
+
   gather-artifacts:
     permissions:
       contents: write
@@ -98,7 +119,7 @@ jobs:
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
 
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
         with:
           path: ./
           pattern: firmware-*-*
@@ -111,7 +132,7 @@ jobs:
         run: mv -b -t ./ ./bin/device-*.sh ./bin/device-*.bat
 
       - name: Repackage in single firmware zip
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
         with:
           name: firmware-${{inputs.target}}-${{ needs.version.outputs.long }}
           overwrite: true
@@ -119,7 +140,7 @@ jobs:
             ./firmware-*.bin
             ./firmware-*.uf2
             ./firmware-*.hex
-            ./firmware-*.zip
+            ./firmware-*-ota.zip
             ./device-*.sh
             ./device-*.bat
             ./littlefs-*.bin
@@ -127,7 +148,7 @@ jobs:
             ./Meshtastic_nRF52_factory_erase*.uf2
           retention-days: 30
 
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
         with:
           pattern: firmware-*-${{ needs.version.outputs.long }}
           merge-multiple: true
@@ -139,14 +160,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@v6
+        uses: actions/upload-artifact@v5
         with:
           name: debug-elfs-${{inputs.target}}-${{ needs.version.outputs.long }}.zip
           overwrite: true

.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/main_matrix.yml

@@ -8,9 +8,7 @@ on:
     branches:
       - master
       - develop
-      - pioarduino # Remove when merged // use `feature/` in the future.
       - event/*
-      - feature/*
     paths-ignore:
       - "**.md"
       - version.properties
@@ -20,9 +18,7 @@ on:
     branches:
       - master
       - develop
-      - pioarduino # Remove when merged // use `feature/` in the future.
       - event/*
-      - feature/*
     paths-ignore:
       - "**.md"
       #- "**.yml"
@@ -81,21 +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
-          ref: ${{github.event.pull_request.head.ref}}
-          repository: ${{github.event.pull_request.head.repo.full_name}}
+      - 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]
@@ -177,7 +168,7 @@ jobs:
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
 
-      - uses: actions/download-artifact@v7
+      - 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@v6
+        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@v7
+      - uses: actions/download-artifact@v6
         with:
           name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
           merge-multiple: true
@@ -217,16 +209,16 @@ 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@v6
+        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
@@ -238,55 +230,12 @@ jobs:
           description: "Download firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}.zip. This artifact will be available for 90 days from creation"
           github-token: ${{ secrets.GITHUB_TOKEN }}
 
-  shame:
-    if: github.repository == 'meshtastic/firmware'
-    continue-on-error: true
-    runs-on: ubuntu-latest
-    needs: [build]
-    steps:
-      - uses: actions/checkout@v6
-        if: github.event_name == 'pull_request_target'
-        with:
-          filter: blob:none # means we download all the git history but none of the commit (except ones with checkout like the head)
-          fetch-depth: 0
-      - name: Download the current manifests
-        uses: actions/download-artifact@v7
-        with:
-          path: ./manifests-new/
-          pattern: manifest-*
-          merge-multiple: true
-      - name: Upload combined manifests for later commit and global stats crunching.
-        uses: actions/upload-artifact@v6
-        id: upload-manifest
-        with:
-          name: manifests-${{ github.sha }}
-          overwrite: true
-          path: manifests-new/*.mt.json
-      - name: Find the merge base
-        if: github.event_name == 'pull_request_target'
-        run: echo "MERGE_BASE=$(git merge-base "origin/$base" "$head")" >> $GITHUB_ENV
-        env:
-          base: ${{ github.base_ref }}
-          head: ${{ github.sha }}
-      # Currently broken (for-loop through EVERY artifact -- rate limiting)
-      # - name: Download the old manifests
-      #   if: github.event_name == 'pull_request_target'
-      #   run: gh run download -R "$repo" --name "manifests-$merge_base" --dir manifest-old/
-      #   env:
-      #     GH_TOKEN: ${{ github.token }}
-      #     merge_base: ${{ env.MERGE_BASE }}
-      #     repo: ${{ github.repository }}
-      # - name: Do scan and post comment
-      #   if: github.event_name == 'pull_request_target'
-      #   run: python3 bin/shame.py ${{ github.event.pull_request.number }} manifests-old/ manifests-new/
-
   release-artifacts:
     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
@@ -294,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
@@ -321,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@v7
+        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@v7
+        uses: actions/download-artifact@v6
         with:
           pattern: platformio-deps-native-tft-${{ needs.version.outputs.long }}
           merge-multiple: true
@@ -347,25 +284,10 @@ 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@v6
-        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:
@@ -396,7 +318,7 @@ jobs:
         with:
           python-version: 3.x
 
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
         with:
           pattern: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
           merge-multiple: true
@@ -407,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@v7
+      - 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
 
@@ -445,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@v7
+      - 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@v7
-        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

@@ -147,7 +147,7 @@ jobs:
           ref: ${{github.event.pull_request.head.ref}}
           repository: ${{github.event.pull_request.head.repo.full_name}}
 
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
         with:
           path: ./
           pattern: firmware-${{matrix.arch}}-*
@@ -160,7 +160,7 @@ jobs:
         run: mv -b -t ./ ./bin/device-*.sh ./bin/device-*.bat
 
       - name: Repackage in single firmware zip
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
         with:
           name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
           overwrite: true
@@ -168,7 +168,7 @@ jobs:
             ./firmware-*.bin
             ./firmware-*.uf2
             ./firmware-*.hex
-            ./firmware-*.zip
+            ./firmware-*-ota.zip
             ./device-*.sh
             ./device-*.bat
             ./littlefs-*.bin
@@ -176,7 +176,7 @@ jobs:
             ./Meshtastic_nRF52_factory_erase*.uf2
           retention-days: 30
 
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
         with:
           name: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
           merge-multiple: true
@@ -188,16 +188,16 @@ 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@v6
+        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
@@ -223,6 +223,11 @@ jobs:
       - 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
@@ -235,14 +240,14 @@ jobs:
             Autogenerated by github action, developer should edit as required before publishing...
 
       - name: Download source deb
-        uses: actions/download-artifact@v7
+        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@v7
+        uses: actions/download-artifact@v6
         with:
           pattern: platformio-deps-native-tft-${{ needs.version.outputs.long }}
           merge-multiple: true
@@ -292,7 +297,7 @@ jobs:
         with:
           python-version: 3.x
 
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
         with:
           pattern: firmware-${{matrix.arch}}-${{ needs.version.outputs.long }}
           merge-multiple: true
@@ -303,15 +308,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@v7
+      - 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
 
@@ -347,7 +352,7 @@ jobs:
         with:
           python-version: 3.x
 
-      - uses: actions/download-artifact@v7
+      - uses: actions/download-artifact@v6
         with:
           pattern: firmware-{${{ env.targets }}}-${{ needs.version.outputs.long }}
           merge-multiple: true

.github/workflows/package_obs.yml

@@ -58,7 +58,7 @@ jobs:
         id: version
 
       - name: Download artifacts
-        uses: actions/download-artifact@v7
+        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

@@ -56,7 +56,7 @@ jobs:
           PLATFORMIO_CORE_DIR: pio/core
 
       - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v6
+        uses: actions/upload-artifact@v5
         with:
           name: platformio-deps-${{ inputs.pio_env }}-${{ steps.version.outputs.long }}
           overwrite: true

.github/workflows/package_ppa.yml

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

.github/workflows/pr_tests.yml

@@ -50,9 +50,9 @@ jobs:
 
       - name: Download test artifacts
         if: needs.native-tests.result != 'skipped'
-        uses: actions/download-artifact@v7
+        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

@@ -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@v6
+        uses: actions/upload-artifact@v5
         with:
           name: report.sarif
           overwrite: true

.github/workflows/test_native.yml

@@ -40,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..."
@@ -59,10 +59,10 @@ jobs:
         id: version
 
       - name: Save coverage information
-        uses: actions/upload-artifact@v6
+        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
 
@@ -94,9 +94,9 @@ jobs:
 
       - name: Save test results
         if: always() # run this step even if previous step failed
-        uses: actions/upload-artifact@v6
+        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
 
@@ -108,10 +108,10 @@ jobs:
           sed -i -e "s#${PWD}#.#" coverage_tests.info # Make paths relative.
 
       - name: Save coverage information
-        uses: actions/upload-artifact@v6
+        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
 
@@ -137,22 +137,22 @@ jobs:
         id: version
 
       - name: Download test artifacts
-        uses: actions/download-artifact@v7
+        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@v2.5.0
+        uses: dorny/test-reporter@v2.3.0
         with:
           name: PlatformIO Tests
           path: testreport.xml
           reporter: java-junit
 
       - name: Download coverage artifacts
-        uses: actions/download-artifact@v7
+        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
 
@@ -163,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@v6
+        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'
 

.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

@@ -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

@@ -41,12 +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/*

.trunk/trunk.yaml

@@ -8,20 +8,20 @@ plugins:
       uri: https://github.com/trunk-io/plugins
 lint:
   enabled:
-    - checkov@3.2.497
-    - renovate@42.81.8
-    - prettier@3.8.0
-    - trufflehog@3.92.4
-    - yamllint@1.38.0
+    - checkov@3.2.495
+    - renovate@42.40.3
+    - prettier@3.7.4
+    - trufflehog@3.91.2
+    - yamllint@1.37.1
     - bandit@1.9.2
-    - trivy@0.68.2
+    - trivy@0.68.1
     - taplo@0.10.0
-    - ruff@0.14.11
+    - ruff@0.14.8
     - isort@7.0.0
-    - markdownlint@0.47.0
+    - markdownlint@0.46.0
     - oxipng@10.0.0
     - svgo@4.0.0
-    - actionlint@1.7.10
+    - actionlint@1.7.9
     - flake8@7.3.0
     - hadolint@2.14.0
     - shfmt@3.6.0

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
 

arch/esp32/esp32.ini

@@ -1,16 +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.12.0
-
-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>
@@ -49,12 +43,10 @@ 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}
@@ -66,6 +58,8 @@ lib_deps =
   https://github.com/dbinfrago/libpax/archive/3cdc0371c375676a97967547f4065607d4c53fd1.zip
   # renovate: datasource=github-tags depName=XPowersLib packageName=lewisxhe/XPowersLib
   https://github.com/lewisxhe/XPowersLib/archive/v0.3.2.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
 

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,5 +1,5 @@
 [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
@@ -35,13 +35,12 @@ lib_deps =
   rweather/Crypto@0.4.0
 
 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,7 +2,7 @@
 ; 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.10.0
+  platformio/nordicnrf52@^10.8.0
 extends = arduino_base
 platform_packages =
   ; our custom Git version until they merge our PR
@@ -11,30 +11,16 @@ platform_packages =
   ; 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
-build_unflags =
-  -Ofast
-  -Og
-  -ggdb3
-  -ggdb2
-  -g3
-  -g2
-  -g
-  -g1
-  -g0
 
 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/>

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,21 +21,18 @@ 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
   # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.7
+  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/Adafruit BME680 Library packageName=adafruit/library/Adafruit BME680
-  adafruit/Adafruit BME680 Library@^2.0.5
 
 build_flags =
   ${arduino_base.build_flags}

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>

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>
 

arch/stm32/stm32.ini

@@ -4,11 +4,11 @@ platform =
   # renovate: datasource=custom.pio depName=platformio/ststm32 packageName=platformio/platform/ststm32
   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
 
@@ -51,6 +51,7 @@ 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
 

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/config-dist.yaml

@@ -105,8 +105,6 @@ Lora:
 
 GPS:
 #  SerialPath: /dev/ttyS0
-#  ExtraPins:
-#    - 22
 
 ### Specify I2C device, or leave blank for none
 
@@ -186,8 +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
-#  JSONFilter: position # filter for packets to save to JSON file
 #  AsciiLogs: true     # default if not specified is !isatty() on stdout
 
 Webserver:

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

@@ -1,11 +0,0 @@
-Lora:
-
-  ### RAK13300in Slot 1
-  Module: sx1262
-  IRQ: 22 #IO6
-  Reset: 16 # IO4
-  Busy: 24 # IO5
-  # Ant_sw: 13 # IO3 
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
-  spidev: spidev0.0

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

@@ -1,14 +0,0 @@
-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-umesh-1262.yaml

@@ -1,15 +0,0 @@
-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: 30
-# Reduce output power to improve EMI

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

@@ -1,15 +0,0 @@
-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: 30
-# Reduce output power to improve EMI

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,26 +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!"
-
-IF "__!MCU!__" == "__esp32s3__" (
-    @REM We are working with ESP32-S3
-    SET "OTA_FILENAME=bleota-s3.bin"
-) ELSE IF "__!MCU!__" == "__esp32c3__" (
-    @REM We are working with ESP32-C3
-    SET "OTA_FILENAME=bleota-c3.bin"
+@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 (
-    @REM Everything else
-    SET "OTA_FILENAME=bleota.bin"
+    CALL :LOG_MESSAGE DEBUG "We are NOT working with a *-tft-* file. !FILENAME!"
 )
+
+FOR %%a IN (%BIGDB_8MB%) DO (
+    IF NOT "!FILENAME:%%a=!"=="!FILENAME!" (
+        @REM We are working with any of %BIGDB_8MB%.
+        SET "BIGDB8=1"
+        GOTO end_loop_bigdb_8mb
+    )
+)
+:end_loop_bigdb_8mb
+
+FOR %%a IN (%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,14 +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
-
 set -e
 
 # Usage info
@@ -43,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
@@ -92,43 +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
-        MCU=$(jq -r '.mcu' "$METAFILE")
-    else
-        echo "ERROR: No metadata file found at ${METAFILE}"
-        exit 1
-    fi
+    done
 
-    # Determine OTA filename based on MCU type
-    if [ "$MCU" == "esp32s3" ]; then
-        OTAFILE=bleota-s3.bin
-    elif [ "$MCU" == "esp32c3" ]; then
-        OTAFILE=bleota-c3.bin
+    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
     else
-        OTAFILE=bleota.bin
+        OTAFILE=bleota-s3.bin
     fi
 
     # 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."

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

@@ -29,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
@@ -78,7 +78,7 @@ 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 write-flash $UPDATE_OFFSET "${FILENAME}"
 else

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":

bin/generate_release_notes.py

@@ -1,355 +0,0 @@
-#!/usr/bin/env python3
-"""
-Generate release notes from merged PRs on develop and master branches.
-Categorizes PRs into Enhancements and Bug Fixes/Maintenance sections.
-"""
-
-import subprocess
-import re
-import json
-import sys
-from datetime import datetime
-
-
-def get_last_release_tag():
-    """Get the most recent release tag."""
-    result = subprocess.run(
-        ["git", "describe", "--tags", "--abbrev=0"],
-        capture_output=True,
-        text=True,
-        check=True,
-    )
-    return result.stdout.strip()
-
-
-def get_tag_date(tag):
-    """Get the commit date (ISO 8601) of the tag."""
-    result = subprocess.run(
-        ["git", "show", "-s", "--format=%cI", tag],
-        capture_output=True,
-        text=True,
-        check=True,
-    )
-    return result.stdout.strip()
-
-
-def get_merged_prs_since_tag(tag, branch):
-    """Get all merged PRs since the given tag on the specified branch."""
-    # Get commits since tag on the branch - look for PR numbers in parentheses
-    result = subprocess.run(
-        [
-            "git",
-            "log",
-            f"{tag}..origin/{branch}",
-            "--oneline",
-        ],
-        capture_output=True,
-        text=True,
-    )
-
-    prs = []
-    seen_pr_numbers = set()
-
-    for line in result.stdout.strip().split("\n"):
-        if not line:
-            continue
-
-        # Extract PR number from commit message - format: "Title (#1234)"
-        pr_match = re.search(r"\(#(\d+)\)", line)
-        if pr_match:
-            pr_number = pr_match.group(1)
-            if pr_number not in seen_pr_numbers:
-                seen_pr_numbers.add(pr_number)
-                prs.append(pr_number)
-
-    return prs
-
-
-def get_pr_details(pr_number):
-    """Get PR details from GitHub API via gh CLI."""
-    try:
-        result = subprocess.run(
-            [
-                "gh",
-                "pr",
-                "view",
-                pr_number,
-                "--json",
-                "title,author,labels,url",
-            ],
-            capture_output=True,
-            text=True,
-            check=True,
-        )
-        return json.loads(result.stdout)
-    except subprocess.CalledProcessError:
-        return None
-
-
-def should_exclude_pr(pr_details):
-    """Check if PR should be excluded from release notes."""
-    if not pr_details:
-        return True
-
-    title = pr_details.get("title", "").lower()
-
-    # Exclude trunk update PRs
-    if "upgrade trunk" in title or "update trunk" in title or "trunk update" in title:
-        return True
-
-    # Exclude protobuf update PRs
-    if "update protobufs" in title or "update protobuf" in title:
-        return True
-
-    # Exclude automated version bump PRs
-    if "bump release version" in title or "bump version" in title:
-        return True
-
-    return False
-
-
-def is_dependency_update(pr_details):
-    """Check if PR is a dependency/chore update."""
-    if not pr_details:
-        return False
-
-    title = pr_details.get("title", "").lower()
-    author = pr_details.get("author", {}).get("login", "").lower()
-    labels = [label.get("name", "").lower() for label in pr_details.get("labels", [])]
-
-    # Check for renovate or dependabot authors
-    if "renovate" in author or "dependabot" in author:
-        return True
-
-    # Check for chore(deps) pattern
-    if re.match(r"^chore\(deps\):", title):
-        return True
-
-    # Check for digest update patterns
-    if re.match(r".*digest to [a-f0-9]+", title, re.IGNORECASE):
-        return True
-
-    # Check for dependency-related labels
-    dependency_labels = ["dependencies", "deps", "renovate"]
-    if any(dep in label for label in labels for dep in dependency_labels):
-        return True
-
-    return False
-
-
-def is_enhancement(pr_details):
-    """Determine if PR is an enhancement based on labels and title."""
-    labels = [label.get("name", "").lower() for label in pr_details.get("labels", [])]
-
-    # Check labels first
-    enhancement_labels = ["enhancement", "feature", "feat", "new feature"]
-    for label in labels:
-        if any(enh in label for enh in enhancement_labels):
-            return True
-
-    # Check title prefixes
-    title = pr_details.get("title", "")
-    enhancement_prefixes = ["feat:", "feature:", "add:"]
-    title_lower = title.lower()
-    for prefix in enhancement_prefixes:
-        if title_lower.startswith(prefix) or f" {prefix}" in title_lower:
-            return True
-
-    return False
-
-
-def clean_title(title):
-    """Clean up PR title for release notes."""
-    # Remove common prefixes
-    prefixes_to_remove = [
-        r"^fix:\s*",
-        r"^feat:\s*",
-        r"^feature:\s*",
-        r"^bug:\s*",
-        r"^bugfix:\s*",
-        r"^chore:\s*",
-        r"^chore\([^)]+\):\s*",
-        r"^refactor:\s*",
-        r"^docs:\s*",
-        r"^ci:\s*",
-        r"^build:\s*",
-        r"^perf:\s*",
-        r"^style:\s*",
-        r"^test:\s*",
-    ]
-
-    cleaned = title
-    for prefix in prefixes_to_remove:
-        cleaned = re.sub(prefix, "", cleaned, flags=re.IGNORECASE)
-
-    # Ensure first letter is capitalized
-    if cleaned:
-        cleaned = cleaned[0].upper() + cleaned[1:]
-
-    return cleaned.strip()
-
-
-def format_pr_line(pr_details):
-    """Format a PR as a markdown bullet point."""
-    title = clean_title(pr_details.get("title", "Unknown"))
-    author = pr_details.get("author", {}).get("login", "unknown")
-    url = pr_details.get("url", "")
-
-    return f"- {title} by @{author} in {url}"
-
-
-def get_new_contributors(pr_details_list, tag, repo="meshtastic/firmware"):
-    """Find contributors who made their first merged PR before this release.
-
-    GitHub usernames do not necessarily match git commit authors, so we use the
-    GitHub search API via `gh` to see if the user has any merged PRs before the
-    tag date. This mirrors how GitHub's "Generate release notes" feature works.
-    """
-
-    bot_authors = {"github-actions", "renovate", "dependabot", "app/renovate", "app/github-actions", "app/dependabot"}
-
-    new_contributors = []
-    seen_authors = set()
-
-    try:
-        tag_date = get_tag_date(tag)
-    except subprocess.CalledProcessError:
-        print(f"Warning: Could not determine tag date for {tag}; skipping new contributor detection", file=sys.stderr)
-        return []
-
-    for pr in pr_details_list:
-        author = pr.get("author", {}).get("login", "")
-        if not author or author in seen_authors:
-            continue
-
-        # Skip bots
-        if author.lower() in bot_authors or author.startswith("app/"):
-            continue
-
-        seen_authors.add(author)
-
-        try:
-            # Search for merged PRs by this author created before the tag date
-            search_query = f"is:pr author:{author} repo:{repo} closed:<=\"{tag_date}\""
-            search = subprocess.run(
-                [
-                    "gh",
-                    "search",
-                    "issues",
-                    "--json",
-                    "number,mergedAt,createdAt",
-                    "--state",
-                    "closed",
-                    "--limit",
-                    "200",
-                    search_query,
-                ],
-                capture_output=True,
-                text=True,
-            )
-
-            if search.returncode != 0:
-                # If gh fails, be conservative and skip adding to new contributors
-                print(f"Warning: gh search failed for author {author}: {search.stderr.strip()}", file=sys.stderr)
-                continue
-
-            results = json.loads(search.stdout or "[]")
-            # If any merged PR exists before or on tag date, not a new contributor
-            had_prior_pr = any(item.get("mergedAt") for item in results)
-
-            if not had_prior_pr:
-                new_contributors.append((author, pr.get("url", "")))
-
-        except Exception as e:
-            print(f"Warning: Could not check contributor history for {author}: {e}", file=sys.stderr)
-            continue
-
-    return new_contributors
-
-
-def main():
-    if len(sys.argv) < 2:
-        print("Usage: generate_release_notes.py <new_version>", file=sys.stderr)
-        sys.exit(1)
-
-    new_version = sys.argv[1]
-
-    # Get last release tag
-    try:
-        last_tag = get_last_release_tag()
-    except subprocess.CalledProcessError:
-        print("Error: Could not find last release tag", file=sys.stderr)
-        sys.exit(1)
-
-    # Collect PRs from both branches
-    all_pr_numbers = set()
-
-    for branch in ["develop", "master"]:
-        try:
-            prs = get_merged_prs_since_tag(last_tag, branch)
-            all_pr_numbers.update(prs)
-        except Exception as e:
-            print(f"Warning: Could not get PRs from {branch}: {e}", file=sys.stderr)
-
-    # Get details for all PRs
-    enhancements = []
-    bug_fixes = []
-    dependencies = []
-    all_pr_details = []
-
-    for pr_number in sorted(all_pr_numbers, key=int):
-        details = get_pr_details(pr_number)
-        if details and not should_exclude_pr(details):
-            all_pr_details.append(details)
-            if is_dependency_update(details):
-                dependencies.append(details)
-            elif is_enhancement(details):
-                enhancements.append(details)
-            else:
-                bug_fixes.append(details)
-
-    # Generate release notes
-    output = []
-
-    if enhancements:
-        output.append("## 🚀 Enhancements\n")
-        for pr in enhancements:
-            output.append(format_pr_line(pr))
-        output.append("")
-
-    if bug_fixes:
-        output.append("## 🐛 Bug fixes and maintenance\n")
-        for pr in bug_fixes:
-            output.append(format_pr_line(pr))
-        output.append("")
-
-    if dependencies:
-        output.append("## ⚙️ Dependencies\n")
-        for pr in dependencies:
-            output.append(format_pr_line(pr))
-        output.append("")
-
-    # Find new contributors (GitHub-accurate check using merged PRs before tag date)
-    new_contributors = get_new_contributors(all_pr_details, last_tag)
-    if new_contributors:
-        output.append("## New Contributors\n")
-        for author, url in new_contributors:
-            # Find first PR URL for this contributor
-            first_pr_url = url
-            for pr in all_pr_details:
-                if pr.get("author", {}).get("login") == author:
-                    first_pr_url = pr.get("url", url)
-                    break
-            output.append(f"- @{author} made their first contribution in {first_pr_url}")
-        output.append("")
-
-    # Add full changelog link
-    output.append(
-        f"**Full Changelog**: https://github.com/meshtastic/firmware/compare/{last_tag}...v{new_version}"
-    )
-
-    print("\n".join(output))
-
-
-if __name__ == "__main__":
-    main()

bin/meshtasticd-start.sh

@@ -1,32 +0,0 @@
-#!/usr/bin/env sh
-
-INSTANCE=$1
-CONF_DIR="/etc/meshtasticd/config.d"
-VFS_DIR="/var/lib"
-
-# If no instance ID provided, start bare daemon and exit
-echo "no instance ID provided, starting bare meshtasticd service"
-if [ -z "${INSTANCE}" ]; then
-  /usr/bin/meshtasticd
-  exit 0
-fi
-
-# Make VFS dir if it does not exist
-if [ ! -d "${VFS_DIR}/meshtasticd-${INSTANCE}" ]; then
-  echo "vfs for ${INSTANCE} does not exist, creating it."
-  mkdir "${VFS_DIR}/meshtasticd-${INSTANCE}"
-fi
-
-# Abort if config for $INSTANCE does not exist
-if [ ! -f "${CONF_DIR}/config-${INSTANCE}.yaml" ]; then
-  echo "no config for ${INSTANCE} found in ${CONF_DIR}. refusing to start" >&2
-  exit 1
-fi
-
-# Start meshtasticd with instance parameters
-printf "starting meshtasticd-%s..., ${INSTANCE}"
-if /usr/bin/meshtasticd --config="${CONF_DIR}/config-${INSTANCE}.yaml" --fsdir="${VFS_DIR}/meshtasticd-${INSTANCE}"; then
-  echo "ok"
-else
-  echo "failed"
-fi

bin/meshtasticd.service

@@ -1,5 +1,5 @@
 [Unit]
-Description=Meshtastic %i Daemon
+Description=Meshtastic Native Daemon
 After=network-online.target
 StartLimitInterval=200
 StartLimitBurst=5
@@ -9,7 +9,7 @@ AmbientCapabilities=CAP_NET_BIND_SERVICE
 User=meshtasticd
 Group=meshtasticd
 Type=simple
-ExecStart=/usr/bin/meshtasticd-start.sh %i
+ExecStart=/usr/bin/meshtasticd
 Restart=always
 RestartSec=3
 

bin/native-gdbserver.sh

@@ -2,4 +2,4 @@
 
 set -e
 pio run --environment native
-gdbserver --once localhost:2345 .pio/build/native/meshtasticd "$@"
+gdbserver --once localhost:2345 .pio/build/native/program "$@"

bin/native-install.sh

@@ -1,7 +1,6 @@
 #!/usr/bin/env bash
 
 cp "release/meshtasticd_linux_$(uname -m)" /usr/bin/meshtasticd
-cp "bin/meshtasticd-start.sh" /usr/bin/meshtasticd-start.sh
 mkdir -p /etc/meshtasticd
 if [[ -f "/etc/meshtasticd/config.yaml" ]]; then
 	cp bin/config-dist.yaml /etc/meshtasticd/config-upgrade.yaml

bin/native-run.sh

@@ -2,4 +2,4 @@
 
 set -e
 pio run --environment native
-.pio/build/native/meshtasticd "$@"
+.pio/build/native/program "$@"

bin/org.meshtastic.meshtasticd.metainfo.xml

@@ -87,12 +87,6 @@
   </screenshots>
 
   <releases>
-    <release version="2.7.18" date="2026-01-02">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.18</url>
-    </release>
-    <release version="2.7.17" date="2025-11-28">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.17</url>
-    </release>
     <release version="2.7.16" date="2025-11-19">
       <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.16</url>
     </release>

bin/platformio-custom.py

@@ -6,202 +6,94 @@ from os.path import join
 import subprocess
 import json
 import re
+import time
 from datetime import datetime
-from typing import Dict
 
 from readprops import readProps
 
 Import("env")
 platform = env.PioPlatform()
-progname = env.get("PROGNAME")
-lfsbin = f"{progname.replace('firmware-', 'littlefs-')}.bin"
-manifest_ran = False
 
-def infer_architecture(board_cfg):
-    try:
-        mcu = board_cfg.get("build.mcu") if board_cfg else None
-    except KeyError:
-        mcu = None
-    except Exception:
-        mcu = None
-    if not mcu:
-        return None
-    mcu_l = str(mcu).lower()
-    if "esp32s3" in mcu_l:
-        return "esp32-s3"
-    if "esp32c6" in mcu_l:
-        return "esp32-c6"
-    if "esp32c3" in mcu_l:
-        return "esp32-c3"
-    if "esp32" in mcu_l:
-        return "esp32"
-    if "rp2040" in mcu_l:
-        return "rp2040"
-    if "rp2350" in mcu_l:
-        return "rp2350"
-    if "nrf52" in mcu_l or "nrf52840" in mcu_l:
-        return "nrf52840"
-    if "stm32" in mcu_l:
-        return "stm32"
-    return None
 
-def manifest_gather(source, target, env):
-    global manifest_ran
-    if manifest_ran:
-        return
-    # Skip manifest generation if we cannot determine architecture (host/native builds)
-    board_arch = infer_architecture(env.BoardConfig())
-    if not board_arch:
-        print(f"Skipping mtjson generation for unknown architecture (env={env.get('PIOENV')})")
-        manifest_ran = True
-        return
-    manifest_ran = True
-    out = []
-    board_platform = env.BoardConfig().get("platform")
-    board_mcu = env.BoardConfig().get("build.mcu").lower()
-    needs_ota_suffix = board_platform == "nordicnrf52"
-    
-    # Mapping of bin files to their target partition names
-    # Maps the filename pattern to the partition name where it should be flashed
-    partition_map = {
-        f"{progname}.bin": "app0",              # primary application slot (app0 / OTA_0)
-        lfsbin: "spiffs",                        # filesystem image flashed to spiffs
-    }
-    
-    check_paths = [
-        progname,
-        f"{progname}.elf",
-        f"{progname}.bin",
-        f"{progname}.factory.bin",
-        f"{progname}.hex",
-        f"{progname}.merged.hex",
-        f"{progname}.uf2",
-        f"{progname}.factory.uf2",
-        f"{progname}.zip",
-        lfsbin,
-        f"mt-{board_mcu}-ota.bin",
-        "bleota-c3.bin"
-    ]
-    for p in check_paths:
-        f = env.File(env.subst(f"$BUILD_DIR/{p}"))
-        if f.exists():
-            manifest_name = p
-            if needs_ota_suffix and p == f"{progname}.zip":
-                manifest_name = f"{progname}-ota.zip"
-            d = {
-                "name": manifest_name,
-                "md5": f.get_content_hash(), # Returns MD5 hash
-                "bytes": f.get_size() # Returns file size in bytes
-            }
-            # Add part_name if this file represents a partition that should be flashed
-            if p in partition_map:
-                d["part_name"] = partition_map[p]
-            out.append(d)
-            print(d)
-    manifest_write(out, env)
+def esp32_create_combined_bin(source, target, env):
+    # this sub is borrowed from ESPEasy build toolchain. It's licensed under GPL V3
+    # https://github.com/letscontrolit/ESPEasy/blob/mega/tools/pio/post_esp32.py
+    print("Generating combined binary for serial flashing")
 
-def manifest_write(files, env):
-    # Defensive: also skip manifest writing if we cannot determine architecture
-    def get_project_option(name):
-        try:
-            return env.GetProjectOption(name)
-        except Exception:
-            return None
+    app_offset = 0x10000
 
-    def get_project_option_any(names):
-        for name in names:
-            val = get_project_option(name)
-            if val is not None:
-                return val
-        return None
-
-    def as_bool(val):
-        return str(val).strip().lower() in ("1", "true", "yes", "on")
-
-    def as_int(val):
-        try:
-            return int(str(val), 10)
-        except (TypeError, ValueError):
-            return None
-
-    def as_list(val):
-        return [item.strip() for item in str(val).split(",") if item.strip()]
-
-    manifest = {
-        "version": verObj["long"],
-        "build_epoch": build_epoch,
-        "platformioTarget": env.get("PIOENV"),
-        "mcu": env.get("BOARD_MCU"),
-        "repo": repo_owner,
-        "files": files,
-        "has_mui": False,
-        "has_inkhud": False,
-    }
-    # Get partition table (generated in esp32_pre.py) if it exists
-    if env.get("custom_mtjson_part"):
-        # custom_mtjson_part is a JSON string, convert it back to a dict
-        pj = json.loads(env.get("custom_mtjson_part"))
-        manifest["part"] = pj
-    # Enable has_mui for TFT builds
-    if ("HAS_TFT", 1) in env.get("CPPDEFINES", []):
-        manifest["has_mui"] = True
-    if "MESHTASTIC_INCLUDE_INKHUD" in env.get("CPPDEFINES", []):
-        manifest["has_inkhud"] = True
-
-    pioenv = env.get("PIOENV")
-    device_meta = {}
-    device_meta_fields = [
-        ("hwModel", ["custom_meshtastic_hw_model"], as_int),
-        ("hwModelSlug", ["custom_meshtastic_hw_model_slug"], str),
-        ("architecture", ["custom_meshtastic_architecture"], str),
-        ("activelySupported", ["custom_meshtastic_actively_supported"], as_bool),
-        ("displayName", ["custom_meshtastic_display_name"], str),
-        ("supportLevel", ["custom_meshtastic_support_level"], as_int),
-        ("images", ["custom_meshtastic_images"], as_list),
-        ("tags", ["custom_meshtastic_tags"], as_list),
-        ("requiresDfu", ["custom_meshtastic_requires_dfu"], as_bool),
-        ("partitionScheme", ["custom_meshtastic_partition_scheme"], str),
-        ("url", ["custom_meshtastic_url"], str),
-        ("key", ["custom_meshtastic_key"], str),
-        ("variant", ["custom_meshtastic_variant"], str),
+    new_file_name = env.subst("$BUILD_DIR/${PROGNAME}.factory.bin")
+    sections = env.subst(env.get("FLASH_EXTRA_IMAGES"))
+    firmware_name = env.subst("$BUILD_DIR/${PROGNAME}.bin")
+    chip = env.get("BOARD_MCU")
+    flash_size = env.BoardConfig().get("upload.flash_size")
+    flash_freq = env.BoardConfig().get("build.f_flash", "40m")
+    flash_freq = flash_freq.replace("000000L", "m")
+    flash_mode = env.BoardConfig().get("build.flash_mode", "dio")
+    memory_type = env.BoardConfig().get("build.arduino.memory_type", "qio_qspi")
+    if flash_mode == "qio" or flash_mode == "qout":
+        flash_mode = "dio"
+    if memory_type == "opi_opi" or memory_type == "opi_qspi":
+        flash_mode = "dout"
+    cmd = [
+        "--chip",
+        chip,
+        "merge_bin",
+        "-o",
+        new_file_name,
+        "--flash_mode",
+        flash_mode,
+        "--flash_freq",
+        flash_freq,
+        "--flash_size",
+        flash_size,
     ]
 
+    print("    Offset | File")
+    for section in sections:
+        sect_adr, sect_file = section.split(" ", 1)
+        print(f" -  {sect_adr} | {sect_file}")
+        cmd += [sect_adr, sect_file]
 
-    for manifest_key, option_keys, caster in device_meta_fields:
-        raw_val = get_project_option_any(option_keys)
-        if raw_val is None:
-            continue
-        parsed = caster(raw_val) if callable(caster) else raw_val
-        if parsed is not None and parsed != "":
-            device_meta[manifest_key] = parsed
+    print(f" - {hex(app_offset)} | {firmware_name}")
+    cmd += [hex(app_offset), firmware_name]
 
-    # Determine architecture once; if we can't infer it, skip manifest generation
-    board_arch = device_meta.get("architecture") or infer_architecture(env.BoardConfig())
-    if not board_arch:
-        print(f"Skipping mtjson write for unknown architecture (env={env.get('PIOENV')})")
-        return
+    print("Using esptool.py arguments: %s" % " ".join(cmd))
 
-    device_meta["architecture"] = board_arch
+    esptool.main(cmd)
 
-    # Always set requiresDfu: true for nrf52840 targets
-    if board_arch == "nrf52840":
-        device_meta["requiresDfu"] = True
 
-    device_meta.setdefault("displayName", pioenv)
-    device_meta.setdefault("activelySupported", False)
+if platform.name == "espressif32":
+    sys.path.append(join(platform.get_package_dir("tool-esptoolpy")))
+    import esptool
 
-    if device_meta:
-        manifest.update(device_meta)
+    env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin)
 
-    # Write the manifest to the build directory
-    with open(env.subst("$BUILD_DIR/${PROGNAME}.mt.json"), "w") as f:
-        json.dump(manifest, f, indent=2)
+    esp32_kind = env.GetProjectOption("custom_esp32_kind")
+    if esp32_kind == "esp32":
+        # Free up some IRAM by removing auxiliary SPI flash chip drivers.
+        # Wrapped stub symbols are defined in src/platform/esp32/iram-quirk.c.
+        env.Append(
+            LINKFLAGS=[
+                "-Wl,--wrap=esp_flash_chip_gd",
+                "-Wl,--wrap=esp_flash_chip_issi",
+                "-Wl,--wrap=esp_flash_chip_winbond",
+            ]
+        )
+    else:
+        # For newer ESP32 targets, using newlib nano works better.
+        env.Append(LINKFLAGS=["--specs=nano.specs", "-u", "_printf_float"])
+
+if platform.name == "nordicnrf52":
+    env.AddPostAction("$BUILD_DIR/${PROGNAME}.hex",
+                      env.VerboseAction(f"\"{sys.executable}\" ./bin/uf2conv.py \"$BUILD_DIR/firmware.hex\" -c -f 0xADA52840 -o \"$BUILD_DIR/firmware.uf2\"",
+                                        "Generating UF2 file"))
 
 Import("projenv")
 
 prefsLoc = projenv["PROJECT_DIR"] + "/version.properties"
 verObj = readProps(prefsLoc)
-print(f"Using meshtastic platformio-custom.py, firmware version {verObj['long']} on {env.get('PIOENV')}")
+print("Using meshtastic platformio-custom.py, firmware version " + verObj["long"] + " on " + env.get("PIOENV"))
 
 # get repository owner if git is installed
 try:
@@ -247,10 +139,10 @@ flags = [
         "-DBUILD_EPOCH=" + str(build_epoch),
     ] + pref_flags
 
-print("Using flags:")
+print ("Using flags:")
 for flag in flags:
     print(flag)
-
+    
 projenv.Append(
     CCFLAGS=flags,
 )
@@ -288,42 +180,4 @@ def load_boot_logo(source, target, env):
 
 # Load the boot logo on TFT builds
 if ("HAS_TFT", 1) in env.get("CPPDEFINES", []):
-    env.AddPreAction(f"$BUILD_DIR/{lfsbin}", load_boot_logo)
-
-board_arch = infer_architecture(env.BoardConfig())
-should_skip_manifest = board_arch is None
-
-# For host/native envs, avoid depending on 'buildprog' (some targets don't define it)
-mtjson_deps = [] if should_skip_manifest else ["buildprog"]
-if not should_skip_manifest and platform.name == "espressif32":
-    # Build littlefs image as part of mtjson target
-    # Equivalent to `pio run -t buildfs`
-    target_lfs = env.DataToBin(
-        join("$BUILD_DIR", "${ESP32_FS_IMAGE_NAME}"), "$PROJECT_DATA_DIR"
-    )
-    mtjson_deps.append(target_lfs)
-
-if should_skip_manifest:
-    def skip_manifest(source, target, env):
-        print(f"mtjson: skipped for native environment: {env.get('PIOENV')}")
-
-    env.AddCustomTarget(
-        name="mtjson",
-        dependencies=mtjson_deps,
-        actions=[skip_manifest],
-        title="Meshtastic Manifest (skipped)",
-        description="mtjson generation is skipped for native environments",
-        always_build=True,
-    )
-else:
-    env.AddCustomTarget(
-        name="mtjson",
-        dependencies=mtjson_deps,
-        actions=[manifest_gather],
-        title="Meshtastic Manifest",
-        description="Generating Meshtastic manifest JSON + Checksums",
-        always_build=True,
-    )
-
-    # Run manifest generation as part of the default build pipeline for non-native builds.
-    env.Default("mtjson")
+    env.AddPreAction('$BUILD_DIR/littlefs.bin', load_boot_logo)

bin/platformio-pre.py

@@ -1,19 +0,0 @@
-#!/usr/bin/env python3
-# trunk-ignore-all(ruff/F821)
-# trunk-ignore-all(flake8/F821): For SConstruct imports
-Import("env")
-platform = env.PioPlatform()
-
-if platform.name == "native":
-    env.Replace(PROGNAME="meshtasticd")
-else:
-    from readprops import readProps
-    prefsLoc = env["PROJECT_DIR"] + "/version.properties"
-    verObj = readProps(prefsLoc)
-    env.Replace(PROGNAME=f"firmware-{env.get('PIOENV')}-{verObj['long']}")
-    env.Replace(ESP32_FS_IMAGE_NAME=f"littlefs-{env.get('PIOENV')}-{verObj['long']}")
-
-# Print the new program name for verification
-print(f"PROGNAME: {env.get('PROGNAME')}")
-if platform.name == "espressif32":
-    print(f"ESP32_FS_IMAGE_NAME: {env.get('ESP32_FS_IMAGE_NAME')}")

bin/readprops.py

@@ -18,9 +18,8 @@ def readProps(prefsLoc):
 
     # Try to find current build SHA if if the workspace is clean.  This could fail if git is not installed
     try:
-        # Pin abbreviation length to keep local builds and CI matching (avoid auto-shortening)
         sha = (
-            subprocess.check_output(["git", "rev-parse", "--short=7", "HEAD"])
+            subprocess.check_output(["git", "rev-parse", "--short", "HEAD"])
             .decode("utf-8")
             .strip()
         )

bin/shame.py

@@ -1,95 +0,0 @@
-import sys
-import os
-import json
-from github import Github
-
-def parseFile(path):
-    with open(path, "r") as f:
-        data = json.loads(f)
-    for file in data["files"]:
-        if file["name"].endswith(".bin"):
-            return file["name"], file["bytes"]
-
-if len(sys.argv) != 4:
-    print(f"expected usage: {sys.argv[0]} <PR number> <path to old-manifests> <path to new-manifests>")
-    sys.exit(1)
-
-pr_number = int(sys.argv[1])
-
-token = os.getenv("GITHUB_TOKEN")
-if not token:
-    raise EnvironmentError("GITHUB_TOKEN not found in environment.")
-
-repo_name = os.getenv("GITHUB_REPOSITORY")  # "owner/repo"
-if not repo_name:
-    raise EnvironmentError("GITHUB_REPOSITORY not found in environment.")
-
-oldFiles = sys.argv[2]
-old = set(os.path.join(oldFiles, f) for f in os.listdir(oldFiles) if os.path.isfile(f))
-newFiles = sys.argv[3]
-new = set(os.path.join(newFiles, f) for f in os.listdir(newFiles) if os.path.isfile(f))
-
-startMarkdown = "# Target Size Changes\n\n"
-markdown = ""
-
-newlyIntroduced = new - old
-if len(newlyIntroduced) > 0:
-    markdown += "## Newly Introduced Targets\n\n"
-    # create a table
-    markdown += "| File | Size |\n"
-    markdown += "| ---- | ---- |\n"
-    for f in newlyIntroduced:
-        name, size = parseFile(f)
-        markdown += f"| `{name}` | {size}b |\n"
-
-# do not log removed targets
-# PRs only run a small subset of builds, so removed targets are not meaningful
-# since they are very likely to just be not ran in PR CI
-
-both = old & new
-degradations = []
-improvements = []
-for f in both:
-    oldName, oldSize = parseFile(f)
-    _, newSize = parseFile(f)
-    if oldSize != newSize:
-        if newSize < oldSize:
-            improvements.append((oldName, oldSize, newSize))
-        else:
-            degradations.append((oldName, oldSize, newSize))
-
-if len(degradations) > 0:
-    markdown += "\n## Degradation\n\n"
-    # create a table
-    markdown += "| File | Difference | Old Size | New Size |\n"
-    markdown += "| ---- | ---------- | -------- | -------- |\n"
-    for oldName, oldSize, newSize in degradations:
-        markdown += f"| `{oldName}` | **{oldSize - newSize}b** | {oldSize}b | {newSize}b |\n"
-
-if len(improvements) > 0:
-    markdown += "\n## Improvement\n\n"
-    # create a table
-    markdown += "| File | Difference | Old Size | New Size |\n"
-    markdown += "| ---- | ---------- | -------- | -------- |\n"
-    for oldName, oldSize, newSize in improvements:
-        markdown += f"| `{oldName}` | **{oldSize - newSize}b** | {oldSize}b | {newSize}b |\n"
-
-if len(markdown) == 0:
-    markdown = "No changes in target sizes detected."
-
-g = Github(token)
-repo = g.get_repo(repo_name)
-pr = repo.get_pull(pr_number)
-
-existing_comment = None
-for comment in pr.get_issue_comments():
-    if comment.body.startswith(startMarkdown):
-        existing_comment = comment
-        break
-
-final_markdown = startMarkdown + markdown
-
-if existing_comment:
-    existing_comment.edit(body=final_markdown)
-else:
-    pr.create_issue_comment(body=final_markdown)

bin/test-simulator.sh

@@ -3,7 +3,7 @@
 set -e
 
 echo "Starting simulator"
-.pio/build/native/meshtasticd -s &
+.pio/build/native/program &
 sleep 20 # 5 seconds was not enough
 
 echo "Simulator started, launching python test..."

boards/CDEBYTE_EoRa-Hub.json

@@ -1,38 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "esp32s3_out.ld",
-      "partitions": "default.csv",
-      "memory_type": "qio_qspi"
-    },
-    "core": "esp32",
-    "extra_flags": [
-      "-DBOARD_HAS_PSRAM",
-      "-DARDUINO_USB_CDC_ON_BOOT=0",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1"
-    ],
-    "f_cpu": "240000000L",
-    "f_flash": "80000000L",
-    "flash_mode": "qio",
-    "mcu": "esp32s3",
-    "variant": "esp32s3"
-  },
-  "connectivity": ["wifi"],
-  "debug": {
-    "openocd_target": "esp32s3.cfg"
-  },
-  "frameworks": ["arduino", "espidf"],
-  "name": "CDEBYTE_EoRa-Hub",
-  "upload": {
-    "flash_size": "4MB",
-    "maximum_ram_size": 327680,
-    "maximum_size": 4194304,
-    "use_1200bps_touch": true,
-    "wait_for_upload_port": true,
-    "require_upload_port": true,
-    "speed": 921600
-  },
-  "url": "https://www.cdebyte.com/products/EoRa-HUB-900TB",
-  "vendor": "CDEBYTE"
-}

boards/ThinkNode-M4.json

@@ -1,53 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "nrf52840_s140_v6.ld"
-    },
-    "core": "nRF5",
-    "cpu": "cortex-m4",
-    "extra_flags": "-DARDUINO_NRF52840_ELECROW_M4 -DNRF52840_XXAA",
-    "f_cpu": "64000000L",
-    "hwids": [
-      ["0x239A", "0x4405"],
-      ["0x239A", "0x0029"],
-      ["0x239A", "0x002A"]
-    ],
-    "usb_product": "elecrow_thinknode_m4",
-    "mcu": "nrf52840",
-    "variant": "ELECROW-ThinkNode-M4",
-    "variants_dir": "variants",
-    "bsp": {
-      "name": "adafruit"
-    },
-    "softdevice": {
-      "sd_flags": "-DS140",
-      "sd_name": "s140",
-      "sd_version": "6.1.1",
-      "sd_fwid": "0x00B6"
-    },
-    "bootloader": {
-      "settings_addr": "0xFF000"
-    }
-  },
-  "connectivity": ["bluetooth"],
-  "debug": {
-    "jlink_device": "nRF52840_xxAA",
-    "onboard_tools": ["jlink"],
-    "svd_path": "nrf52840.svd",
-    "openocd_target": "nrf52840-mdk-rs"
-  },
-  "frameworks": ["arduino"],
-  "name": "ELECROW ThinkNode m4",
-  "upload": {
-    "maximum_ram_size": 248832,
-    "maximum_size": 815104,
-    "speed": 115200,
-    "protocol": "nrfutil",
-    "protocols": ["jlink", "nrfjprog", "nrfutil", "stlink"],
-    "use_1200bps_touch": true,
-    "require_upload_port": true,
-    "wait_for_upload_port": true
-  },
-  "url": "https://www.elecrow.com/thinknode-m4-power-bank-lora-device-with-meshtastic-lora-tracker-function-powered-by-nrf52840.html",
-  "vendor": "ELECROW"
-}

boards/hackaday-communicator.json

@@ -1,41 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "esp32s3_out.ld",
-      "memory_type": "qio_opi"
-    },
-    "core": "esp32",
-    "extra_flags": [
-      "-DBOARD_HAS_PSRAM",
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1"
-    ],
-    "f_cpu": "240000000L",
-    "f_flash": "80000000L",
-    "flash_mode": "qio",
-    "hwids": [["0x303A", "0x1001"]],
-    "mcu": "esp32s3",
-    "variant": "hackaday-communicator"
-  },
-  "connectivity": ["wifi", "bluetooth", "lora"],
-  "debug": {
-    "default_tool": "esp-builtin",
-    "onboard_tools": ["esp-builtin"],
-    "openocd_target": "esp32s3.cfg"
-  },
-  "frameworks": ["arduino", "espidf"],
-  "name": "hackaday-communicator (16 MB FLASH, 8 MB PSRAM)",
-  "upload": {
-    "flash_size": "16MB",
-    "maximum_ram_size": 327680,
-    "maximum_size": 16777216,
-    "use_1200bps_touch": true,
-    "wait_for_upload_port": true,
-    "require_upload_port": true,
-    "speed": 1500000
-  },
-  "url": "hackaday.com",
-  "vendor": "hackaday"
-}

boards/heltec_v4.json

@@ -9,7 +9,7 @@
     "extra_flags": [
       "-DBOARD_HAS_PSRAM",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_USB_MODE=0",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],

boards/t-beam-1w.json

@@ -1,39 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "esp32s3_out.ld",
-      "memory_type": "qio_opi"
-    },
-    "core": "esp32",
-    "extra_flags": [
-      "-DBOARD_HAS_PSRAM",
-      "-DLILYGO_TBEAM_1W",
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=0",
-      "-DARDUINO_RUNNING_CORE=1",
-      "-DARDUINO_EVENT_RUNNING_CORE=1"
-    ],
-    "f_cpu": "240000000L",
-    "f_flash": "80000000L",
-    "flash_mode": "qio",
-    "psram_type": "opi",
-    "hwids": [["0x303A", "0x1001"]],
-    "mcu": "esp32s3",
-    "variant": "t-beam-1w"
-  },
-  "connectivity": ["wifi", "bluetooth", "lora"],
-  "debug": {
-    "openocd_target": "esp32s3.cfg"
-  },
-  "frameworks": ["arduino"],
-  "name": "LilyGo TBeam-1W",
-  "upload": {
-    "flash_size": "16MB",
-    "maximum_ram_size": 327680,
-    "maximum_size": 16777216,
-    "require_upload_port": true,
-    "speed": 921600
-  },
-  "url": "http://www.lilygo.cn/",
-  "vendor": "LilyGo"
-}

boards/t-watch-s3.json

@@ -9,7 +9,7 @@
       "-DBOARD_HAS_PSRAM",
       "-DT_WATCH_S3",
       "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=1",
+      "-DARDUINO_USB_MODE=0",
       "-DARDUINO_RUNNING_CORE=1",
       "-DARDUINO_EVENT_RUNNING_CORE=1"
     ],

debian/changelog

@@ -1,15 +1,3 @@
-meshtasticd (2.7.18.0) unstable; urgency=medium
-
-  * Version 2.7.18
-
- -- GitHub Actions <github-actions[bot]@users.noreply.github.com>  Fri, 02 Jan 2026 12:45:36 +0000
-
-meshtasticd (2.7.17.0) unstable; urgency=medium
-
-  * Version 2.7.17
-
- -- GitHub Actions <github-actions[bot]@users.noreply.github.com>  Fri, 28 Nov 2025 15:11:34 +0000
-
 meshtasticd (2.7.16.0) unstable; urgency=medium
 
   * Version 2.7.16

debian/meshtasticd.install

@@ -4,6 +4,5 @@ bin/config.yaml                    etc/meshtasticd
 bin/config.d/*                     etc/meshtasticd/available.d
 
 bin/meshtasticd.service            lib/systemd/system
-bin/meshtasticd-start.sh           usr/bin
 
 web/*                              usr/share/meshtasticd/web

debian/rules

@@ -28,4 +28,5 @@ override_dh_auto_build:
 	# Build with platformio
 	$(PIO_ENV) platformio run -e native-tft
 	# Move the binary and default config to the correct name
+	mv .pio/build/native-tft/program .pio/build/native-tft/meshtasticd
 	cp bin/config-dist.yaml bin/config.yaml

extra_scripts/disable_adafruit_usb.py

@@ -1,9 +1,10 @@
-#!/usr/bin/env python3
 # trunk-ignore-all(flake8/F821)
 # trunk-ignore-all(ruff/F821)
 
 Import("env")
 
+# NOTE: This is not currently used, but can serve as an example on how to write extra_scripts
+
 # print("Current CLI targets", COMMAND_LINE_TARGETS)
 # print("Current Build targets", BUILD_TARGETS)
 # print("CPP defs", env.get("CPPDEFINES"))

extra_scripts/esp32_extra.py

@@ -1,86 +0,0 @@
-#!/usr/bin/env python3
-# trunk-ignore-all(ruff/F821)
-# trunk-ignore-all(flake8/F821): For SConstruct imports
-# trunk-ignore-all(ruff/E402): Hacky esptool import
-# trunk-ignore-all(flake8/E402): Hacky esptool import
-import sys
-from os.path import join
-
-Import("env")
-platform = env.PioPlatform()
-
-sys.path.append(join(platform.get_package_dir("tool-esptoolpy")))
-# IntelHex workaround, remove after fixed upstream
-# https://github.com/platformio/platform-espressif32/issues/1632
-try:
-    import intelhex
-except ImportError:
-    env.Execute("$PYTHONEXE -m pip install intelhex")
-import esptool
-
-
-def esp32_create_combined_bin(source, target, env):
-    # this sub is borrowed from ESPEasy build toolchain. It's licensed under GPL V3
-    # https://github.com/letscontrolit/ESPEasy/blob/mega/tools/pio/post_esp32.py
-    print("Generating combined binary for serial flashing")
-
-    app_offset = 0x10000
-
-    new_file_name = env.subst("$BUILD_DIR/${PROGNAME}.factory.bin")
-    sections = env.subst(env.get("FLASH_EXTRA_IMAGES"))
-    firmware_name = env.subst("$BUILD_DIR/${PROGNAME}.bin")
-    chip = env.get("BOARD_MCU")
-    board = env.BoardConfig()
-    flash_size = board.get("upload.flash_size")
-    flash_freq = board.get("build.f_flash", "40m")
-    flash_freq = flash_freq.replace("000000L", "m")
-    flash_mode = board.get("build.flash_mode", "dio")
-    memory_type = board.get("build.arduino.memory_type", "qio_qspi")
-    if flash_mode == "qio" or flash_mode == "qout":
-        flash_mode = "dio"
-    if memory_type == "opi_opi" or memory_type == "opi_qspi":
-        flash_mode = "dout"
-    cmd = [
-        "--chip",
-        chip,
-        "merge_bin",
-        "-o",
-        new_file_name,
-        "--flash_mode",
-        flash_mode,
-        "--flash_freq",
-        flash_freq,
-        "--flash_size",
-        flash_size,
-    ]
-
-    print("    Offset | File")
-    for section in sections:
-        sect_adr, sect_file = section.split(" ", 1)
-        print(f" -  {sect_adr} | {sect_file}")
-        cmd += [sect_adr, sect_file]
-
-    print(f" - {hex(app_offset)} | {firmware_name}")
-    cmd += [hex(app_offset), firmware_name]
-
-    print("Using esptool.py arguments: %s" % " ".join(cmd))
-
-    esptool.main(cmd)
-
-
-env.AddPostAction("$BUILD_DIR/${PROGNAME}.bin", esp32_create_combined_bin)
-
-esp32_kind = env.GetProjectOption("custom_esp32_kind")
-if esp32_kind == "esp32":
-    # Free up some IRAM by removing auxiliary SPI flash chip drivers.
-    # Wrapped stub symbols are defined in src/platform/esp32/iram-quirk.c.
-    env.Append(
-        LINKFLAGS=[
-            "-Wl,--wrap=esp_flash_chip_gd",
-            "-Wl,--wrap=esp_flash_chip_issi",
-            "-Wl,--wrap=esp_flash_chip_winbond",
-        ]
-    )
-else:
-    # For newer ESP32 targets, using newlib nano works better.
-    env.Append(LINKFLAGS=["--specs=nano.specs", "-u", "_printf_float"])

extra_scripts/esp32_pre.py

@@ -1,73 +0,0 @@
-#!/usr/bin/env python3
-# trunk-ignore-all(ruff/F821)
-# trunk-ignore-all(flake8/F821): For SConstruct imports
-import json
-import sys
-from os.path import isfile
-
-Import("env")
-
-
-# From https://github.com/platformio/platform-espressif32/blob/develop/builder/main.py
-def _parse_size(value):
-    if isinstance(value, int):
-        return value
-    elif value.isdigit():
-        return int(value)
-    elif value.startswith("0x"):
-        return int(value, 16)
-    elif value[-1].upper() in ("K", "M"):
-        base = 1024 if value[-1].upper() == "K" else 1024 * 1024
-        return int(value[:-1]) * base
-    return value
-
-
-def _parse_partitions(env):
-    partitions_csv = env.subst("$PARTITIONS_TABLE_CSV")
-    if not isfile(partitions_csv):
-        sys.stderr.write(
-            "Could not find the file %s with partitions " "table.\n" % partitions_csv
-        )
-        env.Exit(1)
-        return
-
-    result = []
-    # The first offset is 0x9000 because partition table is flashed to 0x8000 and
-    # occupies an entire flash sector, which size is 0x1000
-    next_offset = 0x9000
-    with open(partitions_csv) as fp:
-        for line in fp.readlines():
-            line = line.strip()
-            if not line or line.startswith("#"):
-                continue
-            tokens = [t.strip() for t in line.split(",")]
-            if len(tokens) < 5:
-                continue
-
-            bound = 0x10000 if tokens[1] in ("0", "app") else 4
-            calculated_offset = (next_offset + bound - 1) & ~(bound - 1)
-            partition = {
-                "name": tokens[0],
-                "type": tokens[1],
-                "subtype": tokens[2],
-                "offset": tokens[3] or calculated_offset,
-                "size": tokens[4],
-                "flags": tokens[5] if len(tokens) > 5 else None,
-            }
-            result.append(partition)
-            next_offset = _parse_size(partition["offset"]) + _parse_size(
-                partition["size"]
-            )
-
-    return result
-
-
-def mtjson_esp32_part(target, source, env):
-    part = _parse_partitions(env)
-    pj = json.dumps(part)
-    # print(f"JSON_PARTITIONS: {pj}")
-    # Dump json string to 'custom_mtjson_part' variable to use later when writing the manifest
-    env.Replace(custom_mtjson_part=pj)
-
-
-env.AddPreAction("mtjson", mtjson_esp32_part)

extra_scripts/extra_stm32.py

@@ -1,9 +1,7 @@
-#!/usr/bin/env python3
 # trunk-ignore-all(ruff/F821)
 # trunk-ignore-all(flake8/F821): For SConstruct imports
 
 Import("env")
-
 # Custom HEX from ELF
 env.AddPostAction(
     "$BUILD_DIR/${PROGNAME}.elf",

extra_scripts/nrf52_extra.py

@@ -1,50 +0,0 @@
-#!/usr/bin/env python3
-# trunk-ignore-all(ruff/F821)
-# trunk-ignore-all(flake8/F821): For SConstruct imports
-
-import sys
-from os.path import basename
-
-Import("env")
-
-
-# Custom HEX from ELF
-# Convert hex to uf2 for nrf52
-def nrf52_hex_to_uf2(source, target, env):
-    hex_path = target[0].get_abspath()
-    # When using merged hex, drop 'merged' from uf2 filename
-    uf2_path = hex_path.replace(".merged.", ".")
-    uf2_path = uf2_path.replace(".hex", ".uf2")
-    env.Execute(
-        env.VerboseAction(
-            f'"{sys.executable}" ./bin/uf2conv.py "{hex_path}" -c -f 0xADA52840 -o "{uf2_path}"',
-            f"Generating UF2 file from {basename(hex_path)}",
-        )
-    )
-
-
-def nrf52_mergehex(source, target, env):
-    hex_path = target[0].get_abspath()
-    merged_hex_path = hex_path.replace(".hex", ".merged.hex")
-    merge_with = None
-    if "wio-sdk-wm1110" == str(env.get("PIOENV")):
-        merge_with = env.subst("$PROJECT_DIR/bin/s140_nrf52_7.3.0_softdevice.hex")
-    else:
-        print("merge_with not defined for this target")
-
-    if merge_with is not None:
-        env.Execute(
-            env.VerboseAction(
-                f'"$PROJECT_DIR/bin/mergehex" -m "{hex_path}" "{merge_with}" -o "{merged_hex_path}"',
-                "Merging HEX with SoftDevice",
-            )
-        )
-        print(f'Merged file saved at "{basename(merged_hex_path)}"')
-        nrf52_hex_to_uf2([hex_path, merge_with], [env.File(merged_hex_path)], env)
-
-
-# if WM1110 target, merge hex with softdevice 7.3.0
-if "wio-sdk-wm1110" == env.get("PIOENV"):
-    env.AddPostAction("$BUILD_DIR/${PROGNAME}.hex", nrf52_mergehex)
-else:
-    env.AddPostAction("$BUILD_DIR/${PROGNAME}.hex", nrf52_hex_to_uf2)

meshtasticd.spec.rpkg

@@ -76,7 +76,7 @@ platformio run -e native-tft
 %install
 # Install meshtasticd binary
 mkdir -p %{buildroot}%{_bindir}
-install -m 0755 .pio/build/native-tft/meshtasticd %{buildroot}%{_bindir}/meshtasticd
+install -m 0755 .pio/build/native-tft/program %{buildroot}%{_bindir}/meshtasticd
 
 # Install portduino VFS dir
 install -p -d -m 0770 %{buildroot}%{_localstatedir}/lib/meshtasticd
@@ -95,9 +95,6 @@ cp -r bin/config.d/* %{buildroot}%{_sysconfdir}/meshtasticd/available.d
 # Install systemd service
 install -D -m 0644 bin/meshtasticd.service %{buildroot}%{_unitdir}/meshtasticd.service
 
-# Install meshtasticd start wrapper
-install -D -m 0755 bin/meshtasticd-start.sh %{buildroot}%{_bindir}/meshtasticd-start.sh
-
 # Install the web files under /usr/share/meshtasticd/web
 mkdir -p %{buildroot}%{_datadir}/meshtasticd/web
 cp -r web/* %{buildroot}%{_datadir}/meshtasticd/web

platformio.ini

@@ -5,7 +5,7 @@
 default_envs = tbeam
 
 extra_configs =
-	variants/*/*.ini
+	arch/*/*.ini
 	variants/*/*/platformio.ini
 	variants/*/diy/*/platformio.ini
 	src/graphics/niche/InkHUD/PlatformioConfig.ini
@@ -14,9 +14,7 @@ description = Meshtastic
 
 [env]
 test_build_src = true
-extra_scripts =
-	pre:bin/platformio-pre.py
-	bin/platformio-custom.py
+extra_scripts = bin/platformio-custom.py
 ; note: we add src to our include search path so that lmic_project_config can override
 ; note: TINYGPS_OPTION_NO_CUSTOM_FIELDS is VERY important.  We don't use custom fields and somewhere in that pile
 ; of code is a heap corruption bug!
@@ -54,7 +52,6 @@ build_flags = -Wno-missing-field-initializers
 	-DMESHTASTIC_EXCLUDE_HEALTH_TELEMETRY=1
 	-DMESHTASTIC_EXCLUDE_POWERSTRESS=1 ; exclude power stress test module from main firmware
 	-DMESHTASTIC_EXCLUDE_GENERIC_THREAD_MODULE=1
-	-DMESHTASTIC_EXCLUDE_POWERMON=1
 	-D MAX_THREADS=40 ; As we've split modules, we have more threads to manage
 	#-DBUILD_EPOCH=$UNIX_TIME ; set in platformio-custom.py now
 	#-D OLED_PL=1
@@ -65,7 +62,7 @@ monitor_speed = 115200
 monitor_filters = direct
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic-esp8266-oled-ssd1306 packageName=https://github.com/meshtastic/esp8266-oled-ssd1306 gitBranch=master
-	https://github.com/meshtastic/esp8266-oled-ssd1306/archive/b34c6817c25d6faabb3a8a162b5d14fb75395433.zip
+	https://github.com/meshtastic/esp8266-oled-ssd1306/archive/2887bf4a19f64d92c984dcc8fd5ca7429e425e4a.zip
 	# renovate: datasource=git-refs depName=meshtastic-OneButton packageName=https://github.com/meshtastic/OneButton gitBranch=master
 	https://github.com/meshtastic/OneButton/archive/fa352d668c53f290cfa480a5f79ad422cd828c70.zip
 	# renovate: datasource=git-refs depName=meshtastic-arduino-fsm packageName=https://github.com/meshtastic/arduino-fsm gitBranch=master
@@ -104,22 +101,27 @@ lib_deps =
 	thingsboard/TBPubSubClient@2.12.1
 	# renovate: datasource=custom.pio depName=NTPClient packageName=arduino-libraries/library/NTPClient
 	arduino-libraries/NTPClient@3.2.1
-
-; Extra TCP/IP networking libs for supported devices
-[networking_extra]
-lib_deps =
 	# renovate: datasource=custom.pio depName=Syslog packageName=arcao/library/Syslog
 	arcao/Syslog@2.0.0
 
+; Minimal networking libs for nrf52 (excludes Syslog to save flash)
+[nrf52_networking_base]
+lib_deps =
+	# renovate: datasource=custom.pio depName=TBPubSubClient packageName=thingsboard/library/TBPubSubClient
+	thingsboard/TBPubSubClient@2.12.1
+	# renovate: datasource=custom.pio depName=NTPClient packageName=arduino-libraries/library/NTPClient
+	arduino-libraries/NTPClient@3.2.1
+
 [radiolib_base]
 lib_deps =
 	# renovate: datasource=custom.pio depName=RadioLib packageName=jgromes/library/RadioLib
-	jgromes/RadioLib@7.5.0
+	# jgromes/RadioLib@7.4.0
+	https://github.com/jgromes/RadioLib/archive/536c7267362e2c1345be7054ba45e503252975ff.zip
 
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/5a870c623a4e9ab7a7abe3d02950536f107d1a31.zip
+	https://github.com/meshtastic/device-ui/archive/4fb5f24787caa841b58dbf623a52c4c5861d6722.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]
@@ -129,7 +131,7 @@ lib_deps =
 	# renovate: datasource=custom.pio depName=Adafruit Unified Sensor packageName=adafruit/library/Adafruit Unified Sensor
 	adafruit/Adafruit Unified Sensor@1.1.15
 	# renovate: datasource=custom.pio depName=Adafruit BMP280 packageName=adafruit/library/Adafruit BMP280 Library
-	adafruit/Adafruit BMP280 Library@3.0.0
+	adafruit/Adafruit BMP280 Library@2.6.8
 	# renovate: datasource=custom.pio depName=Adafruit BMP085 packageName=adafruit/library/Adafruit BMP085 Library
 	adafruit/Adafruit BMP085 Library@1.2.4
 	# renovate: datasource=custom.pio depName=Adafruit BME280 packageName=adafruit/library/Adafruit BME280 Library
@@ -142,6 +144,8 @@ lib_deps =
 	adafruit/Adafruit INA260 Library@1.5.3
 	# renovate: datasource=custom.pio depName=Adafruit INA219 packageName=adafruit/library/Adafruit INA219
 	adafruit/Adafruit INA219@1.2.3
+	# renovate: datasource=custom.pio depName=Adafruit PM25 AQI Sensor packageName=adafruit/library/Adafruit PM25 AQI Sensor
+	adafruit/Adafruit PM25 AQI Sensor@2.0.0
 	# renovate: datasource=custom.pio depName=Adafruit MPU6050 packageName=adafruit/library/Adafruit MPU6050
 	adafruit/Adafruit MPU6050@2.2.6
 	# renovate: datasource=custom.pio depName=Adafruit LIS3DH packageName=adafruit/library/Adafruit LIS3DH
@@ -156,8 +160,8 @@ lib_deps =
 	emotibit/EmotiBit MLX90632@1.0.8
 	# renovate: datasource=custom.pio depName=Adafruit MLX90614 packageName=adafruit/library/Adafruit MLX90614 Library
 	adafruit/Adafruit MLX90614 Library@2.1.5
-	# renovate: datasource=git-refs depName=INA3221 packageName=https://github.com/sgtwilko/INA3221 gitBranch=FixOverflow
-	https://github.com/sgtwilko/INA3221/archive/bb03d7e9bfcc74fc798838a54f4f99738f29fc6a.zip
+	# renovate: datasource=github-tags depName=INA3221 packageName=sgtwilko/INA3221
+	https://github.com/sgtwilko/INA3221#bb03d7e9bfcc74fc798838a54f4f99738f29fc6a
 	# renovate: datasource=custom.pio depName=QMC5883L Compass packageName=mprograms/library/QMC5883LCompass
 	mprograms/QMC5883LCompass@1.2.3
 	# renovate: datasource=custom.pio depName=DFRobot_RTU packageName=dfrobot/library/DFRobot_RTU
@@ -165,7 +169,7 @@ lib_deps =
 	# renovate: datasource=git-refs depName=DFRobot_RainfallSensor packageName=https://github.com/DFRobot/DFRobot_RainfallSensor gitBranch=master
 	https://github.com/DFRobot/DFRobot_RainfallSensor/archive/38fea5e02b40a5430be6dab39a99a6f6347d667e.zip
 	# renovate: datasource=custom.pio depName=INA226 packageName=robtillaart/library/INA226
-	robtillaart/INA226@0.6.6
+	robtillaart/INA226@0.6.5
 	# renovate: datasource=custom.pio depName=SparkFun MAX3010x packageName=sparkfun/library/SparkFun MAX3010x Pulse and Proximity Sensor Library
 	sparkfun/SparkFun MAX3010x Pulse and Proximity Sensor Library@1.1.2
 	# renovate: datasource=custom.pio depName=SparkFun 9DoF IMU Breakout ICM 20948 packageName=sparkfun/library/SparkFun 9DoF IMU Breakout - ICM 20948 - Arduino Library
@@ -201,7 +205,7 @@ lib_deps =
 	# renovate: datasource=custom.pio depName=SparkFun Qwiic Scale NAU7802 packageName=sparkfun/library/SparkFun Qwiic Scale NAU7802 Arduino Library
 	sparkfun/SparkFun Qwiic Scale NAU7802 Arduino Library@1.0.6
 	# renovate: datasource=custom.pio depName=ClosedCube OPT3001 packageName=closedcube/library/ClosedCube OPT3001
-	closedcube/ClosedCube OPT3001@1.1.2
+	ClosedCube OPT3001@1.1.2
 	# renovate: datasource=custom.pio depName=Bosch BSEC2 packageName=boschsensortec/library/bsec2
 	boschsensortec/bsec2@1.10.2610
 	# renovate: datasource=custom.pio depName=Bosch BME68x packageName=boschsensortec/library/BME68x Sensor Library

src/AudioThread.h

@@ -50,11 +50,8 @@ class AudioThread : public concurrency::OSThread
             delete i2sRtttl;
             i2sRtttl = nullptr;
         }
-
-        if (rtttlFile != nullptr) {
-            delete rtttlFile;
-            rtttlFile = nullptr;
-        }
+        delete rtttlFile;
+        rtttlFile = nullptr;
 
         setCPUFast(false);
 #ifdef T_LORA_PAGER
@@ -102,9 +99,9 @@ class AudioThread : public concurrency::OSThread
     };
 
     AudioGeneratorRTTTL *i2sRtttl = nullptr;
-    AudioOutputI2S *audioOut = nullptr;
+    AudioOutputI2S *audioOut;
 
-    AudioFileSourcePROGMEM *rtttlFile = nullptr;
+    AudioFileSourcePROGMEM *rtttlFile;
 };
 
 #endif

src/DebugConfiguration.cpp

@@ -41,8 +41,7 @@ extern "C" void logLegacy(const char *level, const char *fmt, ...)
 }
 
 #if HAS_NETWORKING
-namespace meshtastic
-{
+
 Syslog::Syslog(UDP &client)
 {
     this->_client = &client;
@@ -196,6 +195,4 @@ inline bool Syslog::_sendLog(uint16_t pri, const char *appName, const char *mess
     return true;
 }
 
-}; // namespace meshtastic
-
 #endif

src/DebugConfiguration.h

@@ -162,8 +162,6 @@ extern "C" void logLegacy(const char *level, const char *fmt, ...);
 
 #if HAS_NETWORKING
 
-namespace meshtastic
-{
 class Syslog
 {
   private:
@@ -197,6 +195,4 @@ class Syslog
     bool vlogf(uint16_t pri, const char *appName, const char *fmt, va_list args) __attribute__((format(printf, 3, 0)));
 };
 
-}; // namespace meshtastic
-
-#endif // HAS_NETWORKING
+#endif // HAS_NETWORKING

src/DisplayFormatters.cpp

@@ -31,9 +31,6 @@ const char *DisplayFormatters::getModemPresetDisplayName(meshtastic_Config_LoRaC
     case meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST:
         return useShortName ? "LongF" : "LongFast";
         break;
-    case meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO:
-        return useShortName ? "LongT" : "LongTurbo";
-        break;
     case meshtastic_Config_LoRaConfig_ModemPreset_LONG_MODERATE:
         return useShortName ? "LongM" : "LongMod";
         break;

src/MessageStore.cpp

@@ -1,514 +0,0 @@
-#include "configuration.h"
-#if HAS_SCREEN
-#include "FSCommon.h"
-#include "MessageStore.h"
-#include "NodeDB.h"
-#include "SPILock.h"
-#include "SafeFile.h"
-#include "gps/RTC.h"
-#include "graphics/draw/MessageRenderer.h"
-#include <cstring> // memcpy
-
-#ifndef MESSAGE_TEXT_POOL_SIZE
-#define MESSAGE_TEXT_POOL_SIZE (MAX_MESSAGES_SAVED * MAX_MESSAGE_SIZE)
-#endif
-
-// Default autosave interval 2 hours, override per device later with -DMESSAGE_AUTOSAVE_INTERVAL_SEC=300 (etc)
-#ifndef MESSAGE_AUTOSAVE_INTERVAL_SEC
-#define MESSAGE_AUTOSAVE_INTERVAL_SEC (2 * 60 * 60)
-#endif
-
-// Global message text pool and state
-static char *g_messagePool = nullptr;
-static size_t g_poolWritePos = 0;
-
-// Reset pool (called on boot or clear)
-static inline void resetMessagePool()
-{
-    if (!g_messagePool) {
-        g_messagePool = static_cast<char *>(malloc(MESSAGE_TEXT_POOL_SIZE));
-        if (!g_messagePool) {
-            LOG_ERROR("MessageStore: Failed to allocate %d bytes for message pool", MESSAGE_TEXT_POOL_SIZE);
-            return;
-        }
-    }
-    g_poolWritePos = 0;
-    memset(g_messagePool, 0, MESSAGE_TEXT_POOL_SIZE);
-}
-
-// Allocate text in pool and return offset
-// If not enough space remains, wrap around (ring buffer style)
-static inline uint16_t storeTextInPool(const char *src, size_t len)
-{
-    if (len >= MAX_MESSAGE_SIZE)
-        len = MAX_MESSAGE_SIZE - 1;
-
-    // Wrap pool if out of space
-    if (g_poolWritePos + len + 1 >= MESSAGE_TEXT_POOL_SIZE) {
-        g_poolWritePos = 0;
-    }
-
-    uint16_t offset = g_poolWritePos;
-    memcpy(&g_messagePool[g_poolWritePos], src, len);
-    g_messagePool[g_poolWritePos + len] = '\0';
-    g_poolWritePos += (len + 1);
-    return offset;
-}
-
-// Retrieve a const pointer to message text by offset
-static inline const char *getTextFromPool(uint16_t offset)
-{
-    if (!g_messagePool || offset >= MESSAGE_TEXT_POOL_SIZE)
-        return "";
-    return &g_messagePool[offset];
-}
-
-// Helper: assign a timestamp (RTC if available, else boot-relative)
-static inline void assignTimestamp(StoredMessage &sm)
-{
-    uint32_t nowSecs = getValidTime(RTCQuality::RTCQualityDevice, true);
-    if (nowSecs) {
-        sm.timestamp = nowSecs;
-        sm.isBootRelative = false;
-    } else {
-        sm.timestamp = millis() / 1000;
-        sm.isBootRelative = true;
-    }
-}
-
-// Generic push with cap (used by live + persisted queues)
-template <typename T> static inline void pushWithLimit(std::deque<T> &queue, const T &msg)
-{
-    if (queue.size() >= MAX_MESSAGES_SAVED)
-        queue.pop_front();
-    queue.push_back(msg);
-}
-
-template <typename T> static inline void pushWithLimit(std::deque<T> &queue, T &&msg)
-{
-    if (queue.size() >= MAX_MESSAGES_SAVED)
-        queue.pop_front();
-    queue.emplace_back(std::move(msg));
-}
-
-MessageStore::MessageStore(const std::string &label)
-{
-    filename = "/Messages_" + label + ".msgs";
-    resetMessagePool(); // initialize text pool on boot
-}
-
-// Live message handling (RAM only)
-void MessageStore::addLiveMessage(StoredMessage &&msg)
-{
-    pushWithLimit(liveMessages, std::move(msg));
-}
-void MessageStore::addLiveMessage(const StoredMessage &msg)
-{
-    pushWithLimit(liveMessages, msg);
-}
-
-#if ENABLE_MESSAGE_PERSISTENCE
-static bool g_messageStoreHasUnsavedChanges = false;
-static uint32_t g_lastAutoSaveMs = 0; // last time we actually saved
-
-static inline uint32_t autosaveIntervalMs()
-{
-    uint32_t sec = (uint32_t)MESSAGE_AUTOSAVE_INTERVAL_SEC;
-    if (sec < 60)
-        sec = 60;
-    return sec * 1000UL;
-}
-
-static inline bool reachedMs(uint32_t now, uint32_t target)
-{
-    return (int32_t)(now - target) >= 0;
-}
-
-// Mark new messages in RAM that need to be saved later
-static inline void markMessageStoreUnsaved()
-{
-    g_messageStoreHasUnsavedChanges = true;
-
-    if (g_lastAutoSaveMs == 0) {
-        g_lastAutoSaveMs = millis();
-    }
-}
-
-// Called periodically from the main loop in main.cpp
-static inline void autosaveTick(MessageStore *store)
-{
-    if (!store)
-        return;
-
-    uint32_t now = millis();
-
-    if (g_lastAutoSaveMs == 0) {
-        g_lastAutoSaveMs = now;
-        return;
-    }
-
-    if (!reachedMs(now, g_lastAutoSaveMs + autosaveIntervalMs()))
-        return;
-
-    // Autosave interval reached, only save if there are unsaved messages.
-    if (g_messageStoreHasUnsavedChanges) {
-        LOG_INFO("Autosaving MessageStore to flash");
-        store->saveToFlash();
-    } else {
-        LOG_INFO("Autosave skipped, no changes to save");
-        g_lastAutoSaveMs = now;
-    }
-}
-#endif
-
-// Add from incoming/outgoing packet
-const StoredMessage &MessageStore::addFromPacket(const meshtastic_MeshPacket &packet)
-{
-    StoredMessage sm;
-    assignTimestamp(sm);
-    sm.channelIndex = packet.channel;
-
-    const char *payload = reinterpret_cast<const char *>(packet.decoded.payload.bytes);
-    size_t len = strnlen(payload, MAX_MESSAGE_SIZE - 1);
-    sm.textOffset = storeTextInPool(payload, len);
-    sm.textLength = len;
-
-    // Determine sender
-    uint32_t localNode = nodeDB->getNodeNum();
-    sm.sender = (packet.from == 0) ? localNode : packet.from;
-
-    sm.dest = packet.to;
-
-    bool isDM = (sm.dest != 0 && sm.dest != NODENUM_BROADCAST);
-
-    if (packet.from == 0) {
-        sm.type = isDM ? MessageType::DM_TO_US : MessageType::BROADCAST;
-        sm.ackStatus = AckStatus::NONE;
-    } else {
-        sm.type = isDM ? MessageType::DM_TO_US : MessageType::BROADCAST;
-        sm.ackStatus = AckStatus::ACKED;
-    }
-
-    addLiveMessage(sm);
-
-#if ENABLE_MESSAGE_PERSISTENCE
-    markMessageStoreUnsaved();
-#endif
-
-    return liveMessages.back();
-}
-
-// Outgoing/manual message
-void MessageStore::addFromString(uint32_t sender, uint8_t channelIndex, const std::string &text)
-{
-    StoredMessage sm;
-
-    // Always use our local time (helper handles RTC vs boot time)
-    assignTimestamp(sm);
-
-    sm.sender = sender;
-    sm.channelIndex = channelIndex;
-    sm.textOffset = storeTextInPool(text.c_str(), text.size());
-    sm.textLength = text.size();
-
-    // Use the provided destination
-    sm.dest = sender;
-    sm.type = MessageType::DM_TO_US;
-
-    // Outgoing messages always start with unknown ack status
-    sm.ackStatus = AckStatus::NONE;
-
-    addLiveMessage(sm);
-
-#if ENABLE_MESSAGE_PERSISTENCE
-    markMessageStoreUnsaved();
-#endif
-}
-
-#if ENABLE_MESSAGE_PERSISTENCE
-
-// Compact, fixed-size on-flash representation using offset + length
-struct __attribute__((packed)) StoredMessageRecord {
-    uint32_t timestamp;
-    uint32_t sender;
-    uint8_t channelIndex;
-    uint32_t dest;
-    uint8_t isBootRelative;
-    uint8_t ackStatus;           // static_cast<uint8_t>(AckStatus)
-    uint8_t type;                // static_cast<uint8_t>(MessageType)
-    uint16_t textLength;         // message length
-    char text[MAX_MESSAGE_SIZE]; // store actual text here
-};
-
-// Serialize one StoredMessage to flash
-static inline void writeMessageRecord(SafeFile &f, const StoredMessage &m)
-{
-    StoredMessageRecord rec = {};
-    rec.timestamp = m.timestamp;
-    rec.sender = m.sender;
-    rec.channelIndex = m.channelIndex;
-    rec.dest = m.dest;
-    rec.isBootRelative = m.isBootRelative;
-    rec.ackStatus = static_cast<uint8_t>(m.ackStatus);
-    rec.type = static_cast<uint8_t>(m.type);
-    rec.textLength = m.textLength;
-
-    // Copy the actual text into the record from RAM pool
-    const char *txt = getTextFromPool(m.textOffset);
-    strncpy(rec.text, txt, MAX_MESSAGE_SIZE - 1);
-    rec.text[MAX_MESSAGE_SIZE - 1] = '\0';
-
-    f.write(reinterpret_cast<const uint8_t *>(&rec), sizeof(rec));
-}
-
-// Deserialize one StoredMessage from flash; returns false on short read
-static inline bool readMessageRecord(File &f, StoredMessage &m)
-{
-    StoredMessageRecord rec = {};
-    if (f.readBytes(reinterpret_cast<char *>(&rec), sizeof(rec)) != sizeof(rec))
-        return false;
-
-    m.timestamp = rec.timestamp;
-    m.sender = rec.sender;
-    m.channelIndex = rec.channelIndex;
-    m.dest = rec.dest;
-    m.isBootRelative = rec.isBootRelative;
-    m.ackStatus = static_cast<AckStatus>(rec.ackStatus);
-    m.type = static_cast<MessageType>(rec.type);
-    m.textLength = rec.textLength;
-
-    // 💡 Re-store text into pool and update offset
-    m.textLength = strnlen(rec.text, MAX_MESSAGE_SIZE - 1);
-    m.textOffset = storeTextInPool(rec.text, m.textLength);
-
-    return true;
-}
-
-void MessageStore::saveToFlash()
-{
-#ifdef FSCom
-    // Ensure root exists
-    spiLock->lock();
-    FSCom.mkdir("/");
-    spiLock->unlock();
-
-    SafeFile f(filename.c_str(), false);
-
-    spiLock->lock();
-    uint8_t count = static_cast<uint8_t>(liveMessages.size());
-    if (count > MAX_MESSAGES_SAVED)
-        count = MAX_MESSAGES_SAVED;
-    f.write(&count, 1);
-
-    for (uint8_t i = 0; i < count; ++i) {
-        writeMessageRecord(f, liveMessages[i]);
-    }
-    spiLock->unlock();
-
-    f.close();
-#endif
-
-    // Reset autosave state after any save
-    g_messageStoreHasUnsavedChanges = false;
-    g_lastAutoSaveMs = millis();
-}
-
-void MessageStore::loadFromFlash()
-{
-    std::deque<StoredMessage>().swap(liveMessages);
-    resetMessagePool(); // reset pool when loading
-
-#ifdef FSCom
-    concurrency::LockGuard guard(spiLock);
-
-    if (!FSCom.exists(filename.c_str()))
-        return;
-
-    auto f = FSCom.open(filename.c_str(), FILE_O_READ);
-    if (!f)
-        return;
-
-    uint8_t count = 0;
-    f.readBytes(reinterpret_cast<char *>(&count), 1);
-    if (count > MAX_MESSAGES_SAVED)
-        count = MAX_MESSAGES_SAVED;
-
-    for (uint8_t i = 0; i < count; ++i) {
-        StoredMessage m;
-        if (!readMessageRecord(f, m))
-            break;
-        liveMessages.push_back(m);
-    }
-
-    f.close();
-#endif
-    // Loading messages does not trigger an autosave
-    g_messageStoreHasUnsavedChanges = false;
-    g_lastAutoSaveMs = millis();
-}
-
-#else
-// If persistence is disabled, these functions become no-ops
-void MessageStore::saveToFlash() {}
-void MessageStore::loadFromFlash() {}
-#endif
-
-// Clear all messages (RAM + persisted queue)
-void MessageStore::clearAllMessages()
-{
-    std::deque<StoredMessage>().swap(liveMessages);
-    resetMessagePool();
-
-#ifdef FSCom
-    SafeFile f(filename.c_str(), false);
-    uint8_t count = 0;
-    f.write(&count, 1); // write "0 messages"
-    f.close();
-#endif
-
-#if ENABLE_MESSAGE_PERSISTENCE
-    g_messageStoreHasUnsavedChanges = false;
-    g_lastAutoSaveMs = millis();
-#endif
-}
-
-// Internal helper: erase first or last message matching a predicate
-template <typename Predicate> static void eraseIf(std::deque<StoredMessage> &deque, Predicate pred, bool fromBack = false)
-{
-    if (fromBack) {
-        // Iterate from the back and erase all matches from the end
-        for (auto it = deque.rbegin(); it != deque.rend();) {
-            if (pred(*it)) {
-                it = std::deque<StoredMessage>::reverse_iterator(deque.erase(std::next(it).base()));
-            } else {
-                ++it;
-            }
-        }
-    } else {
-        // Manual forward search to erase all matches
-        for (auto it = deque.begin(); it != deque.end();) {
-            if (pred(*it)) {
-                it = deque.erase(it);
-            } else {
-                ++it;
-            }
-        }
-    }
-}
-
-// Delete oldest message (RAM + persisted queue)
-void MessageStore::deleteOldestMessage()
-{
-    eraseIf(liveMessages, [](StoredMessage &) { return true; });
-    saveToFlash();
-}
-
-// Delete oldest message in a specific channel
-void MessageStore::deleteOldestMessageInChannel(uint8_t channel)
-{
-    auto pred = [channel](const StoredMessage &m) { return m.type == MessageType::BROADCAST && m.channelIndex == channel; };
-    eraseIf(liveMessages, pred);
-    saveToFlash();
-}
-
-void MessageStore::deleteAllMessagesInChannel(uint8_t channel)
-{
-    auto pred = [channel](const StoredMessage &m) { return m.type == MessageType::BROADCAST && m.channelIndex == channel; };
-    eraseIf(liveMessages, pred, false /* delete ALL, not just first */);
-    saveToFlash();
-}
-
-void MessageStore::deleteAllMessagesWithPeer(uint32_t peer)
-{
-    uint32_t local = nodeDB->getNodeNum();
-    auto pred = [&](const StoredMessage &m) {
-        if (m.type != MessageType::DM_TO_US)
-            return false;
-        uint32_t other = (m.sender == local) ? m.dest : m.sender;
-        return other == peer;
-    };
-    eraseIf(liveMessages, pred, false);
-    saveToFlash();
-}
-
-// Delete oldest message in a direct chat with a node
-void MessageStore::deleteOldestMessageWithPeer(uint32_t peer)
-{
-    auto pred = [peer](const StoredMessage &m) {
-        if (m.type != MessageType::DM_TO_US)
-            return false;
-        uint32_t other = (m.sender == nodeDB->getNodeNum()) ? m.dest : m.sender;
-        return other == peer;
-    };
-    eraseIf(liveMessages, pred);
-    saveToFlash();
-}
-
-std::deque<StoredMessage> MessageStore::getChannelMessages(uint8_t channel) const
-{
-    std::deque<StoredMessage> result;
-    for (const auto &m : liveMessages) {
-        if (m.type == MessageType::BROADCAST && m.channelIndex == channel) {
-            result.push_back(m);
-        }
-    }
-    return result;
-}
-
-std::deque<StoredMessage> MessageStore::getDirectMessages() const
-{
-    std::deque<StoredMessage> result;
-    for (const auto &m : liveMessages) {
-        if (m.type == MessageType::DM_TO_US) {
-            result.push_back(m);
-        }
-    }
-    return result;
-}
-
-// Upgrade boot-relative timestamps once RTC is valid
-// Only same-boot boot-relative messages are healed.
-// Persisted boot-relative messages from old boots stay ??? forever.
-void MessageStore::upgradeBootRelativeTimestamps()
-{
-    uint32_t nowSecs = getValidTime(RTCQuality::RTCQualityDevice, true);
-    if (nowSecs == 0)
-        return; // Still no valid RTC
-
-    uint32_t bootNow = millis() / 1000;
-
-    auto fix = [&](std::deque<StoredMessage> &dq) {
-        for (auto &m : dq) {
-            if (m.isBootRelative && m.timestamp <= bootNow) {
-                uint32_t bootOffset = nowSecs - bootNow;
-                m.timestamp += bootOffset;
-                m.isBootRelative = false;
-            }
-        }
-    };
-    fix(liveMessages);
-}
-
-const char *MessageStore::getText(const StoredMessage &msg)
-{
-    // Wrapper around the internal helper
-    return getTextFromPool(msg.textOffset);
-}
-
-uint16_t MessageStore::storeText(const char *src, size_t len)
-{
-    // Wrapper around the internal helper
-    return storeTextInPool(src, len);
-}
-
-#if ENABLE_MESSAGE_PERSISTENCE
-void messageStoreAutosaveTick()
-{
-    // Called from the main loop to check autosave timing
-    autosaveTick(&messageStore);
-}
-#endif
-
-// Global definition
-MessageStore messageStore("default");
-#endif

src/MessageStore.h

@@ -1,136 +0,0 @@
-#pragma once
-
-#if HAS_SCREEN
-
-// Disable debug logging entirely on release builds of HELTEC_MESH_SOLAR for space constraints
-#if defined(HELTEC_MESH_SOLAR)
-#define LOG_DEBUG(...)
-#endif
-
-// Enable or disable message persistence (flash storage)
-// Define -DENABLE_MESSAGE_PERSISTENCE=0 in build_flags to disable it entirely
-#ifndef ENABLE_MESSAGE_PERSISTENCE
-#define ENABLE_MESSAGE_PERSISTENCE 1
-#endif
-
-#include "mesh/generated/meshtastic/mesh.pb.h"
-#include <cstdint>
-#include <deque>
-#include <string>
-
-// How many messages are stored (RAM + flash).
-// Define -DMESSAGE_HISTORY_LIMIT=N in build_flags to control memory usage.
-#ifndef MESSAGE_HISTORY_LIMIT
-#define MESSAGE_HISTORY_LIMIT 20
-#endif
-
-// Internal alias used everywhere in code – do NOT redefine elsewhere.
-#define MAX_MESSAGES_SAVED MESSAGE_HISTORY_LIMIT
-
-// Maximum text payload size per message in bytes.
-// This still defines the max message length, but we no longer reserve this space per message.
-#define MAX_MESSAGE_SIZE 220
-
-// Total shared text pool size for all messages combined.
-// The text pool is RAM-only. Text is re-stored from flash into the pool on boot.
-#ifndef MESSAGE_TEXT_POOL_SIZE
-#define MESSAGE_TEXT_POOL_SIZE (MAX_MESSAGES_SAVED * MAX_MESSAGE_SIZE)
-#endif
-
-// Explicit message classification
-enum class MessageType : uint8_t {
-    BROADCAST = 0, // broadcast message
-    DM_TO_US = 1   // direct message addressed to this node
-};
-
-// Delivery status for messages we sent
-enum class AckStatus : uint8_t {
-    NONE = 0,    // just sent, waiting (no symbol shown)
-    ACKED = 1,   // got a valid ACK from destination
-    NACKED = 2,  // explicitly failed
-    TIMEOUT = 3, // no ACK after retry window
-    RELAYED = 4  // got an ACK from relay, not destination
-};
-
-struct StoredMessage {
-    uint32_t timestamp;   // When message was created (secs since boot or RTC)
-    uint32_t sender;      // NodeNum of sender
-    uint8_t channelIndex; // Channel index used
-    uint32_t dest;        // Destination node (broadcast or direct)
-    MessageType type;     // Derived from dest (explicit classification)
-    bool isBootRelative;  // true = millis()/1000 fallback; false = epoch/RTC absolute
-    AckStatus ackStatus;  // Delivery status (only meaningful for our own sent messages)
-
-    // Text storage metadata — rebuilt from flash at boot
-    uint16_t textOffset; // Offset into global text pool (valid only after loadFromFlash())
-    uint16_t textLength; // Length of text in bytes
-
-    // Default constructor initializes all fields safely
-    StoredMessage()
-        : timestamp(0), sender(0), channelIndex(0), dest(0xffffffff), type(MessageType::BROADCAST), isBootRelative(false),
-          ackStatus(AckStatus::NONE), textOffset(0), textLength(0)
-    {
-    }
-};
-
-class MessageStore
-{
-  public:
-    explicit MessageStore(const std::string &label);
-
-    // Live RAM methods (always current, used by UI and runtime)
-    void addLiveMessage(StoredMessage &&msg);
-    void addLiveMessage(const StoredMessage &msg); // convenience overload
-    const std::deque<StoredMessage> &getLiveMessages() const { return liveMessages; }
-
-    // Add new messages from packets or manual input
-    const StoredMessage &addFromPacket(const meshtastic_MeshPacket &mp);                // Incoming/outgoing → RAM only
-    void addFromString(uint32_t sender, uint8_t channelIndex, const std::string &text); // Manual add
-
-    // Persistence methods (used only on boot/shutdown)
-    void saveToFlash();   // Save messages to flash
-    void loadFromFlash(); // Load messages from flash
-
-    // Clear all messages (RAM + persisted queue + text pool)
-    void clearAllMessages();
-
-    // Delete helpers
-    void deleteOldestMessage(); // remove oldest from RAM (and flash on save)
-    void deleteOldestMessageInChannel(uint8_t channel);
-    void deleteOldestMessageWithPeer(uint32_t peer);
-    void deleteAllMessagesInChannel(uint8_t channel);
-    void deleteAllMessagesWithPeer(uint32_t peer);
-
-    // Unified accessor (for UI code, defaults to RAM buffer)
-    const std::deque<StoredMessage> &getMessages() const { return liveMessages; }
-
-    // Helper filters for future use
-    std::deque<StoredMessage> getChannelMessages(uint8_t channel) const; // Only broadcast messages on a channel
-    std::deque<StoredMessage> getDirectMessages() const;                 // Only direct messages
-
-    // Upgrade boot-relative timestamps once RTC is valid
-    void upgradeBootRelativeTimestamps();
-
-    // Retrieve the C-string text for a stored message
-    static const char *getText(const StoredMessage &msg);
-
-    // Allocate text into pool (used by sender-side code)
-    static uint16_t storeText(const char *src, size_t len);
-
-    // Used when loading from flash to rebuild the text pool
-    static uint16_t rebuildTextFromFlash(const char *src, size_t len);
-
-  private:
-    std::deque<StoredMessage> liveMessages; // Single in-RAM message buffer (also used for persistence)
-    std::string filename;                   // Flash filename for persistence
-};
-
-#if ENABLE_MESSAGE_PERSISTENCE
-// Called periodically from main loop to trigger time based autosave
-void messageStoreAutosaveTick();
-#endif
-
-// Global instance (defined in MessageStore.cpp)
-extern MessageStore messageStore;
-
-#endif

src/Power.cpp

@@ -11,7 +11,6 @@
  * For more information, see: https://meshtastic.org/
  */
 #include "power.h"
-#include "MessageStore.h"
 #include "NodeDB.h"
 #include "PowerFSM.h"
 #include "Throttle.h"
@@ -476,9 +475,7 @@ class AnalogBatteryLevel : public HasBatteryLevel
             return (rak9154Sensor.isCharging()) ? OptTrue : OptFalse;
         }
 #endif
-#if defined(ELECROW_ThinkNode_M6)
-        return digitalRead(EXT_CHRG_DETECT) == ext_chrg_detect_value || isVbusIn();
-#elif EXT_CHRG_DETECT
+#ifdef EXT_CHRG_DETECT
         return digitalRead(EXT_CHRG_DETECT) == ext_chrg_detect_value;
 #elif defined(BATTERY_CHARGING_INV)
         return !digitalRead(BATTERY_CHARGING_INV);
@@ -695,8 +692,6 @@ bool Power::setup()
         found = true;
     } else if (lipoChargerInit()) {
         found = true;
-    } else if (serialBatteryInit()) {
-        found = true;
     } else if (meshSolarInit()) {
         found = true;
     } else if (analogInit()) {
@@ -791,9 +786,7 @@ void Power::shutdown()
     playShutdownMelody();
 #endif
     nodeDB->saveToDisk();
-#if HAS_SCREEN
-    messageStore.saveToFlash();
-#endif
+
 #if defined(ARCH_NRF52) || defined(ARCH_ESP32) || defined(ARCH_RP2040)
 #ifdef PIN_LED1
     ledOff(PIN_LED1);
@@ -1153,11 +1146,11 @@ bool Power::axpChipInit()
             PMU->setPowerChannelVoltage(XPOWERS_ALDO1, 3300);
             PMU->enablePowerOutput(XPOWERS_ALDO1);
 
-            // sdcard (T-Beam S3) / gnns (T-Watch S3 Plus) power channel
+            // sdcard power channel
             PMU->setPowerChannelVoltage(XPOWERS_BLDO1, 3300);
-#ifndef T_WATCH_S3
             PMU->enablePowerOutput(XPOWERS_BLDO1);
-#else
+
+#ifdef T_WATCH_S3
             // DRV2605 power channel
             PMU->setPowerChannelVoltage(XPOWERS_BLDO2, 3300);
             PMU->enablePowerOutput(XPOWERS_BLDO2);
@@ -1460,7 +1453,7 @@ class LipoCharger : public HasBatteryLevel
     /**
      * return true if there is an external power source detected
      */
-    virtual bool isVbusIn() override { return PPM->isVbusIn(); }
+    virtual bool isVbusIn() override { return PPM->getVbusVoltage() > 0; }
 
     /**
      * return true if the battery is currently charging
@@ -1573,135 +1566,3 @@ bool Power::meshSolarInit()
     return false;
 }
 #endif
-
-#ifdef HAS_SERIAL_BATTERY_LEVEL
-#include <SoftwareSerial.h>
-
-/**
- * SerialBatteryLevel class for pulling battery information from a secondary MCU over serial.
- */
-class SerialBatteryLevel : public HasBatteryLevel
-{
-
-  public:
-    /**
-     * Init the I2C meshSolar battery level sensor
-     */
-    bool runOnce()
-    {
-        BatterySerial.begin(4800);
-
-        return true;
-    }
-
-    /**
-     * Battery state of charge, from 0 to 100 or -1 for unknown
-     */
-    virtual int getBatteryPercent() override { return v_percent; }
-
-    /**
-     * The raw voltage of the battery in millivolts, or NAN if unknown
-     */
-    virtual uint16_t getBattVoltage() override { return voltage * 1000; }
-
-    /**
-     * return true if there is a battery installed in this unit
-     */
-    virtual bool isBatteryConnect() override
-    {
-        // definitely need to gobble up more bytes at once
-        if (BatterySerial.available() > 5) {
-            // LOG_WARN("SerialBatteryLevel: %u bytes available", BatterySerial.available());
-            while (BatterySerial.available() > 11) {
-                BatterySerial.read(); // flush old data
-            }
-            // LOG_WARN("SerialBatteryLevel: %u bytes now available", BatterySerial.available());
-            int tries = 0;
-            while (BatterySerial.read() != 0xFE) {
-                tries++; // wait for start byte
-                if (tries > 10) {
-                    LOG_WARN("SerialBatteryLevel: no start byte found");
-                    return 1;
-                }
-            }
-
-            Data[1] = BatterySerial.read();
-            Data[2] = BatterySerial.read();
-            Data[3] = BatterySerial.read();
-            Data[4] = BatterySerial.read();
-            Data[5] = BatterySerial.read();
-            if (Data[5] != 0xFD) {
-                LOG_WARN("SerialBatteryLevel: invalid end byte %02x", Data[5]);
-                return true;
-            }
-            v_percent = Data[1];
-            voltage = Data[2] + (((float)Data[3]) / 100) + (((float)Data[4]) / 10000);
-            voltage *= 2;
-            // LOG_WARN("SerialBatteryLevel: received data %u, %f, %02x", v_percent, voltage, Data[5]);
-            return true;
-        }
-        // This function runs first, so use it to grab the latest data from the secondary MCU
-        return true;
-    }
-
-    /**
-     * return true if there is an external power source detected
-     */
-    virtual bool isVbusIn() override
-    {
-#if defined(EXT_CHRG_DETECT)
-
-        return digitalRead(EXT_CHRG_DETECT) == ext_chrg_detect_value;
-
-#endif
-        return false;
-    }
-
-    virtual bool isCharging() override
-    {
-#ifdef EXT_CHRG_DETECT
-        return digitalRead(EXT_CHRG_DETECT) == ext_chrg_detect_value;
-
-#endif
-        // by default, we check the battery voltage only
-        return isVbusIn();
-    }
-
-  private:
-    SoftwareSerial BatterySerial = SoftwareSerial(SERIAL_BATTERY_RX, SERIAL_BATTERY_TX);
-    uint8_t Data[6] = {0};
-    int v_percent = 0;
-    float voltage = 0.0;
-};
-
-SerialBatteryLevel serialBatteryLevel;
-
-/**
- * Init the serial battery level sensor
- */
-bool Power::serialBatteryInit()
-{
-#ifdef EXT_PWR_DETECT
-    pinMode(EXT_PWR_DETECT, INPUT);
-#endif
-#ifdef EXT_CHRG_DETECT
-    pinMode(EXT_CHRG_DETECT, ext_chrg_detect_mode);
-#endif
-
-    bool result = serialBatteryLevel.runOnce();
-    LOG_DEBUG("Power::serialBatteryInit serial battery sensor is %s", result ? "ready" : "not ready yet");
-    if (!result)
-        return false;
-    batteryLevel = &serialBatteryLevel;
-    return true;
-}
-
-#else
-/**
- * If this device has no serial battery level sensor, don't try to use it.
- */
-bool Power::serialBatteryInit()
-{
-    return false;
-}
-#endif

src/PowerFSM.cpp

@@ -57,21 +57,21 @@ static bool isPowered()
 
 static void sdsEnter()
 {
-    LOG_POWERFSM("State: SDS");
+    LOG_DEBUG("State: SDS");
     // FIXME - make sure GPS and LORA radio are off first - because we want close to zero current draw
     doDeepSleep(Default::getConfiguredOrDefaultMs(config.power.sds_secs), false, false);
 }
 
 static void lowBattSDSEnter()
 {
-    LOG_POWERFSM("State: Lower batt SDS");
+    LOG_DEBUG("State: Lower batt SDS");
     doDeepSleep(Default::getConfiguredOrDefaultMs(config.power.sds_secs), false, true);
 }
 extern Power *power;
 
 static void shutdownEnter()
 {
-    LOG_POWERFSM("State: SHUTDOWN");
+    LOG_DEBUG("State: SHUTDOWN");
     shutdownAtMsec = millis();
 }
 
@@ -81,7 +81,7 @@ static uint32_t secsSlept;
 
 static void lsEnter()
 {
-    LOG_POWERFSM("lsEnter begin, ls_secs=%u", config.power.ls_secs);
+    LOG_INFO("lsEnter begin, ls_secs=%u", config.power.ls_secs);
     if (screen)
         screen->setOn(false);
     secsSlept = 0; // How long have we been sleeping this time
@@ -155,12 +155,12 @@ static void lsIdle()
 
 static void lsExit()
 {
-    LOG_POWERFSM("State: lsExit");
+    LOG_INFO("Exit state: LS");
 }
 
 static void nbEnter()
 {
-    LOG_POWERFSM("State: nbEnter");
+    LOG_DEBUG("State: NB");
     if (screen)
         screen->setOn(false);
 #ifdef ARCH_ESP32
@@ -173,7 +173,6 @@ static void nbEnter()
 
 static void darkEnter()
 {
-    LOG_POWERFSM("State: darkEnter");
     setBluetoothEnable(true);
     if (screen)
         screen->setOn(false);
@@ -181,7 +180,7 @@ static void darkEnter()
 
 static void serialEnter()
 {
-    LOG_POWERFSM("State: serialEnter");
+    LOG_DEBUG("State: SERIAL");
     setBluetoothEnable(false);
     if (screen) {
         screen->setOn(true);
@@ -190,14 +189,13 @@ static void serialEnter()
 
 static void serialExit()
 {
-    LOG_POWERFSM("State: serialExit");
     // Turn bluetooth back on when we leave serial stream API
     setBluetoothEnable(true);
 }
 
 static void powerEnter()
 {
-    LOG_POWERFSM("State: powerEnter");
+    // LOG_DEBUG("State: POWER");
     if (!isPowered()) {
         // If we got here, we are in the wrong state - we should be in powered, let that state handle things
         LOG_INFO("Loss of power in Powered");
@@ -212,7 +210,6 @@ static void powerEnter()
 
 static void powerIdle()
 {
-    // LOG_POWERFSM("State: powerIdle"); // very chatty
     if (!isPowered()) {
         // If we got here, we are in the wrong state
         LOG_INFO("Loss of power in Powered");
@@ -222,13 +219,14 @@ static void powerIdle()
 
 static void powerExit()
 {
-    LOG_POWERFSM("State: powerExit");
+    if (screen)
+        screen->setOn(true);
     setBluetoothEnable(true);
 }
 
 static void onEnter()
 {
-    LOG_POWERFSM("State: onEnter");
+    LOG_DEBUG("State: ON");
     if (screen)
         screen->setOn(true);
     setBluetoothEnable(true);
@@ -236,7 +234,6 @@ static void onEnter()
 
 static void onIdle()
 {
-    LOG_POWERFSM("State: onIdle");
     if (isPowered()) {
         // If we got here, we are in the wrong state - we should be in powered, let that state handle things
         powerFSM.trigger(EVENT_POWER_CONNECTED);
@@ -245,7 +242,7 @@ static void onIdle()
 
 static void bootEnter()
 {
-    LOG_POWERFSM("State: bootEnter");
+    LOG_DEBUG("State: BOOT");
 }
 
 State stateSHUTDOWN(shutdownEnter, NULL, NULL, "SHUTDOWN");
@@ -322,6 +319,11 @@ void PowerFSM_setup()
         // if any packet destined for phone arrives, turn on bluetooth at least
         powerFSM.add_transition(&stateNB, &stateDARK, EVENT_PACKET_FOR_PHONE, NULL, "Packet for phone");
 
+        // Removed 2.7: we don't show the nodes individually for every node on the screen anymore
+        // powerFSM.add_transition(&stateNB, &stateON, EVENT_NODEDB_UPDATED, NULL, "NodeDB update");
+        // powerFSM.add_transition(&stateDARK, &stateON, EVENT_NODEDB_UPDATED, NULL, "NodeDB update");
+        // powerFSM.add_transition(&stateON, &stateON, EVENT_NODEDB_UPDATED, NULL, "NodeDB update");
+
         // Show the received text message
         powerFSM.add_transition(&stateLS, &stateON, EVENT_RECEIVED_MSG, NULL, "Received text");
         powerFSM.add_transition(&stateNB, &stateON, EVENT_RECEIVED_MSG, NULL, "Received text");
@@ -370,7 +372,7 @@ void PowerFSM_setup()
     // Don't add power saving transitions if we are a power saving tracker or sensor or have Wifi enabled. Sleep will be initiated
     // through the modules
 
-#if HAS_WIFI && !defined(MESHTASTIC_EXCLUDE_WIFI)
+#if HAS_WIFI || !defined(MESHTASTIC_EXCLUDE_WIFI)
     bool isTrackerOrSensor = config.device.role == meshtastic_Config_DeviceConfig_Role_TRACKER ||
                              config.device.role == meshtastic_Config_DeviceConfig_Role_TAK_TRACKER ||
                              config.device.role == meshtastic_Config_DeviceConfig_Role_SENSOR;

src/PowerFSM.h

@@ -2,12 +2,6 @@
 
 #include "configuration.h"
 
-#ifdef PowerFSMDebug
-#define LOG_POWERFSM(...) LOG_DEBUG(__VA_ARGS__)
-#else
-#define LOG_POWERFSM(...)
-#endif
-
 // See sw-design.md for documentation
 
 #define EVENT_PRESS 1

src/RedirectablePrint.cpp

@@ -18,7 +18,7 @@
 #endif
 
 #if HAS_NETWORKING
-extern meshtastic::Syslog syslog;
+extern Syslog syslog;
 #endif
 void RedirectablePrint::rpInit()
 {
@@ -131,7 +131,6 @@ void RedirectablePrint::log_to_serial(const char *logLevel, const char *format,
         int hour = hms / SEC_PER_HOUR;
         int min = (hms % SEC_PER_HOUR) / SEC_PER_MIN;
         int sec = (hms % SEC_PER_HOUR) % SEC_PER_MIN; // or hms % SEC_PER_MIN
-
 #ifdef ARCH_PORTDUINO
         ::printf("%s ", logLevel);
         if (color) {

src/SafeFile.cpp

@@ -54,7 +54,7 @@ size_t SafeFile::write(const uint8_t *buffer, size_t size)
 }
 
 /**
- * Atomically close the file (overwriting any old version) and readback the contents to confirm the hash matches
+ * Atomically close the file (deleting any old versions) and readback the contents to confirm the hash matches
  *
  * @return false for failure
  */
@@ -73,7 +73,15 @@ bool SafeFile::close()
     if (!testReadback())
         return false;
 
-    // Rename or overwrite (atomic operation)
+    { // Scope for lock
+        concurrency::LockGuard g(spiLock);
+        // brief window of risk here ;-)
+        if (fullAtomic && FSCom.exists(filename.c_str()) && !FSCom.remove(filename.c_str())) {
+            LOG_ERROR("Can't remove old pref file");
+            return false;
+        }
+    }
+
     String filenameTmp = filename;
     filenameTmp += ".tmp";
     if (!renameFile(filenameTmp.c_str(), filename.c_str())) {

src/buzz/BuzzerFeedbackThread.cpp

@@ -22,19 +22,12 @@ int BuzzerFeedbackThread::handleInputEvent(const InputEvent *event)
 
     // Handle different input events with appropriate buzzer feedback
     switch (event->inputEvent) {
-#ifdef INPUTDRIVER_ENCODER_TYPE
-    case INPUT_BROKER_SELECT:
-    case INPUT_BROKER_SELECT_LONG:
-        playClick();
-        break;
-#else
     case INPUT_BROKER_USER_PRESS:
     case INPUT_BROKER_ALT_PRESS:
     case INPUT_BROKER_SELECT:
     case INPUT_BROKER_SELECT_LONG:
-        playBeep();
+        playBeep(); // Confirmation feedback
         break;
-#endif
 
     case INPUT_BROKER_UP:
     case INPUT_BROKER_UP_LONG:
@@ -65,4 +58,4 @@ int BuzzerFeedbackThread::handleInputEvent(const InputEvent *event)
     }
 
     return 0; // Allow other handlers to process the event
-}
+}

src/buzz/buzz.cpp

@@ -16,7 +16,6 @@ struct ToneDuration {
 };
 
 // Some common frequencies.
-#define NOTE_SILENT 1
 #define NOTE_C3 131
 #define NOTE_CS3 139
 #define NOTE_D3 147
@@ -30,24 +29,11 @@ struct ToneDuration {
 #define NOTE_AS3 233
 #define NOTE_B3 247
 #define NOTE_CS4 277
-#define NOTE_B4 494
-#define NOTE_F5 698
-#define NOTE_G6 1568
-#define NOTE_E7 2637
 
-#define NOTE_C4 262
-#define NOTE_E4 330
-#define NOTE_G4 392
-#define NOTE_A4 440
-#define NOTE_C5 523
-#define NOTE_E5 659
-#define NOTE_G5 784
-
-const int DURATION_1_16 = 62;  // 1/16 note
 const int DURATION_1_8 = 125;  // 1/8 note
 const int DURATION_1_4 = 250;  // 1/4 note
 const int DURATION_1_2 = 500;  // 1/2 note
-const int DURATION_3_4 = 750;  // 3/4 note
+const int DURATION_3_4 = 750;  // 1/4 note
 const int DURATION_1_1 = 1000; // 1/1 note
 
 void playTones(const ToneDuration *tone_durations, int size)
@@ -73,7 +59,7 @@ void playTones(const ToneDuration *tone_durations, int size)
 
 void playBeep()
 {
-    ToneDuration melody[] = {{NOTE_B3, DURATION_1_16}};
+    ToneDuration melody[] = {{NOTE_B3, DURATION_1_8}};
     playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }
 
@@ -85,24 +71,13 @@ void playLongBeep()
 
 void playGPSEnableBeep()
 {
-#if defined(R1_NEO) || defined(MUZI_BASE)
-    ToneDuration melody[] = {
-        {NOTE_F5, DURATION_1_2}, {NOTE_G6, DURATION_1_8}, {NOTE_E7, DURATION_1_4}, {NOTE_SILENT, DURATION_1_2}};
-#else
     ToneDuration melody[] = {{NOTE_C3, DURATION_1_8}, {NOTE_FS3, DURATION_1_4}, {NOTE_CS4, DURATION_1_4}};
-#endif
     playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }
 
 void playGPSDisableBeep()
 {
-#if defined(R1_NEO) || defined(MUZI_BASE)
-    ToneDuration melody[] = {{NOTE_B4, DURATION_1_16}, {NOTE_B4, DURATION_1_16},   {NOTE_SILENT, DURATION_1_8},
-                             {NOTE_F3, DURATION_1_16}, {NOTE_F3, DURATION_1_16},   {NOTE_SILENT, DURATION_1_8},
-                             {NOTE_C3, DURATION_1_1},  {NOTE_SILENT, DURATION_1_1}};
-#else
     ToneDuration melody[] = {{NOTE_CS4, DURATION_1_8}, {NOTE_FS3, DURATION_1_4}, {NOTE_C3, DURATION_1_4}};
-#endif
     playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }
 
@@ -121,14 +96,7 @@ void playShutdownMelody()
 void playChirp()
 {
     // A short, friendly "chirp" sound for key presses
-    ToneDuration melody[] = {{NOTE_AS3, 20}}; // Short AS3 note
-    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
-}
-
-void playClick()
-{
-    // A very short "click" sound with minimum delay; ideal for rotary encoder events
-    ToneDuration melody[] = {{NOTE_AS3, 1}}; // Very Short AS3
+    ToneDuration melody[] = {{NOTE_AS3, 20}}; // Very short AS3 note
     playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }
 
@@ -197,17 +165,3 @@ void playComboTune()
     };
     playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }
-
-void play4ClickDown()
-{
-    ToneDuration melody[] = {{NOTE_G5, 55}, {NOTE_E5, 55}, {NOTE_C5, 60},  {NOTE_A4, 55},  {NOTE_G4, 55},
-                             {NOTE_E4, 65}, {NOTE_C4, 80}, {NOTE_G3, 120}, {NOTE_E3, 160}, {NOTE_SILENT, 120}};
-    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
-}
-
-void play4ClickUp()
-{
-    // Quick high-pitched notes with trills
-    ToneDuration melody[] = {{NOTE_F5, 50}, {NOTE_G6, 45}, {NOTE_E7, 60}};
-    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
-}

src/buzz/buzz.h

@@ -7,11 +7,8 @@ void playShutdownMelody();
 void playGPSEnableBeep();
 void playGPSDisableBeep();
 void playComboTune();
-void play4ClickDown();
-void play4ClickUp();
 void playBoop();
 void playChirp();
-void playClick();
 void playLongPressLeadUp();
 bool playNextLeadUpNote();  // Play the next note in the lead-up sequence
 void resetLeadUpSequence(); // Reset the lead-up sequence to start from beginning

src/configuration.h

@@ -29,36 +29,13 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #if __has_include("Melopero_RV3028.h")
 #include "Melopero_RV3028.h"
 #endif
-#if __has_include("SensorRtcHelper.hpp")
-#include "SensorRtcHelper.hpp"
+#if __has_include("pcf8563.h")
+#include "pcf8563.h"
 #endif
 
 /* Offer chance for variant-specific defines */
 #include "variant.h"
 
-// -----------------------------------------------------------------------------
-// Display feature overrides
-// -----------------------------------------------------------------------------
-
-// Allow build environments to opt-in explicitly to the E-Ink UI stack while
-// keeping headless targets slim by default. Existing variants that already
-// define USE_EINK continue to work without additional flags.
-#ifndef MESHTASTIC_USE_EINK_UI
-#ifdef USE_EINK
-#define MESHTASTIC_USE_EINK_UI 1
-#else
-#define MESHTASTIC_USE_EINK_UI 0
-#endif
-#endif
-
-#if MESHTASTIC_USE_EINK_UI
-#ifndef USE_EINK
-#define USE_EINK
-#endif
-#else
-#undef USE_EINK
-#endif
-
 // -----------------------------------------------------------------------------
 // Version
 // -----------------------------------------------------------------------------
@@ -172,12 +149,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 // -----------------------------------------------------------------------------
 // OLED & Input
 // -----------------------------------------------------------------------------
-#define SSD1306_ADDRESS_L 0x3C // Addr = 0
-#define SSD1306_ADDRESS_H 0x3D // Addr = 1
-
 #if defined(SEEED_WIO_TRACKER_L1) && !defined(SEEED_WIO_TRACKER_L1_EINK)
-#define SSD1306_ADDRESS SSD1306_ADDRESS_H
+#define SSD1306_ADDRESS 0x3D
 #define USE_SH1106
+#else
+#define SSD1306_ADDRESS 0x3C
 #endif
 #define ST7567_ADDRESS 0x3F
 
@@ -206,7 +182,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define INA_ADDR_WAVESHARE_UPS 0x43
 #define INA3221_ADDR 0x42
 #define MAX1704X_ADDR 0x36
-#define QMC6310U_ADDR 0x1C
+#define QMC6310_ADDR 0x1C
 #define QMI8658_ADDR 0x6B
 #define QMC5883L_ADDR 0x0D
 #define HMC5883L_ADDR 0x1E
@@ -215,7 +191,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define LPS22HB_ADDR_ALT 0x5D
 #define SHT31_4x_ADDR 0x44
 #define SHT31_4x_ADDR_ALT 0x45
-#define PMSA003I_ADDR 0x12
+#define PMSA0031_ADDR 0x12
 #define QMA6100P_ADDR 0x12
 #define AHT10_ADDR 0x38
 #define RCWL9620_ADDR 0x57
@@ -395,9 +371,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #ifndef HAS_BLUETOOTH
 #define HAS_BLUETOOTH 0
 #endif
-#ifndef USE_TFTDISPLAY
-#define USE_TFTDISPLAY 0
-#endif
 
 #ifndef HW_VENDOR
 #error HW_VENDOR must be defined
@@ -445,18 +418,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #endif
 #endif
 
-// BME680 BSEC2 support detection
-#if !defined(MESHTASTIC_BME680_BSEC2_SUPPORTED)
-#if defined(RAK_4631) || defined(TBEAM_V10)
-
-#define MESHTASTIC_BME680_BSEC2_SUPPORTED 1
-#define MESHTASTIC_BME680_HEADER <bsec2.h>
-#else
-#define MESHTASTIC_BME680_BSEC2_SUPPORTED 0
-#define MESHTASTIC_BME680_HEADER <Adafruit_BME680.h>
-#endif // defined(RAK_4631)
-#endif // !defined(MESHTASTIC_BME680_BSEC2_SUPPORTED)
-
 // -----------------------------------------------------------------------------
 // Global switches to turn off features for a minimized build
 // -----------------------------------------------------------------------------
@@ -481,7 +442,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define MESHTASTIC_EXCLUDE_AUDIO 1
 #define MESHTASTIC_EXCLUDE_DETECTIONSENSOR 1
 #define MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR 1
-#define MESHTASTIC_EXCLUDE_AIR_QUALITY_SENSOR 1
 #define MESHTASTIC_EXCLUDE_HEALTH_TELEMETRY 1
 #define MESHTASTIC_EXCLUDE_EXTERNALNOTIFICATION 1
 #define MESHTASTIC_EXCLUDE_PAXCOUNTER 1

src/detect/ScanI2C.cpp

@@ -25,8 +25,8 @@ ScanI2C::FoundDevice ScanI2C::firstScreen() const
 
 ScanI2C::FoundDevice ScanI2C::firstRTC() const
 {
-    ScanI2C::DeviceType types[] = {RTC_RV3028, RTC_PCF8563, RTC_PCF85063, RTC_RX8130CE};
-    return firstOfOrNONE(4, types);
+    ScanI2C::DeviceType types[] = {RTC_RV3028, RTC_PCF8563, RTC_RX8130CE};
+    return firstOfOrNONE(3, types);
 }
 
 ScanI2C::FoundDevice ScanI2C::firstKeyboard() const
@@ -43,7 +43,7 @@ ScanI2C::FoundDevice ScanI2C::firstAccelerometer() const
 
 ScanI2C::FoundDevice ScanI2C::firstAQI() const
 {
-    ScanI2C::DeviceType types[] = {PMSA003I, SCD4X};
+    ScanI2C::DeviceType types[] = {PMSA0031, SCD4X};
     return firstOfOrNONE(2, types);
 }
 

src/detect/ScanI2C.h

@@ -14,7 +14,6 @@ class ScanI2C
         SCREEN_ST7567,
         RTC_RV3028,
         RTC_PCF8563,
-        RTC_PCF85063,
         RTC_RX8130CE,
         CARDKB,
         TDECKKB,
@@ -35,12 +34,11 @@ class ScanI2C
         SHT4X,
         SHTC3,
         LPS22HB,
-        QMC6310U,
-        QMC6310N,
+        QMC6310,
         QMI8658,
         QMC5883L,
         HMC5883L,
-        PMSA003I,
+        PMSA0031,
         QMA6100P,
         MPU6050,
         LIS3DH,

src/detect/ScanI2CTwoWire.cpp

@@ -63,16 +63,12 @@ ScanI2C::DeviceType ScanI2CTwoWire::probeOLED(ScanI2C::DeviceAddress addr) const
         if (i2cBus->available()) {
             r = i2cBus->read();
         }
-        if (r == 0x80) {
-            LOG_INFO("QMC6310N found at address 0x%02X", addr.address);
-            return ScanI2C::DeviceType::QMC6310N;
-        }
         r &= 0x0f;
 
         if (r == 0x08 || r == 0x00) {
             logFoundDevice("SH1106", (uint8_t)addr.address);
             o_probe = SCREEN_SH1106; // SH1106
-        } else if (r == 0x03 || r == 0x04 || r == 0x06 || r == 0x07 || r == 0x05) {
+        } else if (r == 0x03 || r == 0x04 || r == 0x06 || r == 0x07) {
             logFoundDevice("SSD1306", (uint8_t)addr.address);
             o_probe = SCREEN_SSD1306; // SSD1306
         }
@@ -110,7 +106,7 @@ uint16_t ScanI2CTwoWire::getRegisterValue(const ScanI2CTwoWire::RegisterLocation
         if (i2cBus->available())
             i2cBus->read();
     }
-    LOG_DEBUG("Register value from 0x%x: 0x%x", registerLocation.i2cAddress.address, value);
+    LOG_DEBUG("Register value: 0x%x", value);
     return value;
 }
 
@@ -179,8 +175,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
         type = NONE;
         if (err == 0) {
             switch (addr.address) {
-            case SSD1306_ADDRESS_H:
-            case SSD1306_ADDRESS_L:
+            case SSD1306_ADDRESS:
                 type = probeOLED(addr);
                 break;
 
@@ -207,10 +202,6 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                 SCAN_SIMPLE_CASE(RX8130CE_RTC, RTC_RX8130CE, "RX8130CE", (uint8_t)addr.address)
 #endif
 
-#ifdef PCF85063_RTC
-                SCAN_SIMPLE_CASE(PCF85063_RTC, RTC_PCF85063, "PCF85063", (uint8_t)addr.address)
-#endif
-
             case CARDKB_ADDR:
                 // Do we have the RAK14006 instead?
                 registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x04), 1);
@@ -387,11 +378,11 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                 }
             case SHT31_4x_ADDR:     // same as OPT3001_ADDR_ALT
             case SHT31_4x_ADDR_ALT: // same as OPT3001_ADDR
-                if (getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x7E), 2) == 0x5449) {
+                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x7E), 2);
+                if (registerValue == 0x5449) {
                     type = OPT3001;
                     logFoundDevice("OPT3001", (uint8_t)addr.address);
-                } else if (getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x89), 6) !=
-                           0) { // unique SHT4x serial number (6 bytes inc. CRC)
+                } else if (getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x89), 2) != 0) { // unique SHT4x serial number
                     type = SHT4X;
                     logFoundDevice("SHT4X", (uint8_t)addr.address);
                 } else {
@@ -417,7 +408,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
 
             case LPS22HB_ADDR_ALT:
                 SCAN_SIMPLE_CASE(LPS22HB_ADDR, LPS22HB, "LPS22HB", (uint8_t)addr.address)
-                SCAN_SIMPLE_CASE(QMC6310U_ADDR, QMC6310U, "QMC6310U", (uint8_t)addr.address)
+                SCAN_SIMPLE_CASE(QMC6310_ADDR, QMC6310, "QMC6310", (uint8_t)addr.address)
 
             case QMI8658_ADDR:
                 registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x0A), 1); // get ID
@@ -447,7 +438,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
 #ifdef HAS_QMA6100P
                 SCAN_SIMPLE_CASE(QMA6100P_ADDR, QMA6100P, "QMA6100P", (uint8_t)addr.address)
 #else
-                SCAN_SIMPLE_CASE(PMSA003I_ADDR, PMSA003I, "PMSA003I", (uint8_t)addr.address)
+                SCAN_SIMPLE_CASE(PMSA0031_ADDR, PMSA0031, "PMSA0031", (uint8_t)addr.address)
 #endif
             case BMA423_ADDR: // this can also be LIS3DH_ADDR_ALT
                 registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x0F), 2);
@@ -492,7 +483,7 @@ void ScanI2CTwoWire::scanPort(I2CPort port, uint8_t *address, uint8_t asize)
                 }
                 break;
             case TSL25911_ADDR:
-                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0xA0 | 0x12), 1);
+                registerValue = getRegisterValue(ScanI2CTwoWire::RegisterLocation(addr, 0x12), 1);
                 if (registerValue == 0x50) {
                     type = TSL2591;
                     logFoundDevice("TSL25911", (uint8_t)addr.address);

src/detect/reClockI2C.h

@@ -1,41 +0,0 @@
-#ifdef CAN_RECLOCK_I2C
-#include "ScanI2CTwoWire.h"
-
-uint32_t reClockI2C(uint32_t desiredClock, TwoWire *i2cBus)
-{
-
-    uint32_t currentClock;
-
-    /* See https://github.com/arduino/Arduino/issues/11457
-      Currently, only ESP32 can getClock()
-      While all cores can setClock()
-      https://github.com/sandeepmistry/arduino-nRF5/blob/master/libraries/Wire/Wire.h#L50
-      https://github.com/earlephilhower/arduino-pico/blob/master/libraries/Wire/src/Wire.h#L60
-      https://github.com/stm32duino/Arduino_Core_STM32/blob/main/libraries/Wire/src/Wire.h#L103
-      For cases when I2C speed is different to the ones defined by sensors (see defines in sensor classes)
-      we need to reclock I2C and set it back to the previous desired speed.
-      Only for cases where we can know OR predefine the speed, we can do this.
-    */
-
-#ifdef ARCH_ESP32
-    currentClock = i2cBus->getClock();
-#elif defined(ARCH_NRF52)
-    // TODO add getClock function or return a predefined clock speed per variant?
-    return 0;
-#elif defined(ARCH_RP2040)
-    // TODO add getClock function or return a predefined clock speed per variant
-    return 0;
-#elif defined(ARCH_STM32WL)
-    // TODO add getClock function or return a predefined clock speed per variant
-    return 0;
-#else
-    return 0;
-#endif
-
-    if (currentClock != desiredClock) {
-        LOG_DEBUG("Changing I2C clock to %u", desiredClock);
-        i2cBus->setClock(desiredClock);
-    }
-    return currentClock;
-}
-#endif