Refactor test messages for clarity and consistency in regex tests

Potential fix for pull request finding
Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>
2026-10-07 20:50:05 +10:00 · 2026-04-19 06:24:27 -05:00 · 2026-04-19 06:16:27 -05:00 · 2026-04-19 06:16:18 -05:00 · 2026-04-19 06:16:02 -05:00 · 2026-04-19 06:08:16 -05:00
107 changed files with 372 additions and 6338 deletions
@@ -75,11 +75,11 @@ body:
  - type: checkboxes
    id: mui
    attributes:
-      label: Is this bug report about any UI (https://meshtastic.org/docs/configuration/device-uis/) component firmware?
+      label: Is this bug report about any UI component firmware like InkHUD or Meshtatic UI (MUI)?
      options:
-        - label: Meshtastic UI aka MUI
-        - label: InkHUD
-        - label: BaseUI
+        - label: Meshtastic UI aka MUI colorTFT
+        - label: InkHUD ePaper
+        - label: OLED slide UI on any display

  - type: input
    id: version
@@ -70,70 +70,6 @@ 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

-## Encryption & Key Management
-
-Meshtastic packets on the air are typically encrypted one of two ways: the **per-channel symmetric** layer (AES-CTR with a shared PSK) for broadcasts and channel traffic, and the **per-peer PKI** layer (X25519 ECDH → AES-256-CCM) for direct messages and remote admin. A channel with a 0-byte PSK (or Ham mode, which wipes PSKs) transmits cleartext — see the size table below. Both are implemented in `src/mesh/CryptoEngine.cpp`; the send/receive dispatch lives in `src/mesh/Router.cpp`; admin authorization lives in `src/modules/AdminModule.cpp`.
-
-### High-level model
-
- **Channels** are symmetric rooms: anyone with the PSK can read any message on the channel. Channel 0 is the "primary" channel and ships with the short-form default PSK on factory devices, forming the public mesh most users join. (The LoRa modem preset `LONG_FAST` lives on `config.lora.modem_preset` and is an independent field — don't conflate "channel 0 default PSK" with the modem preset name.)
- **DMs** addressed to a single node require PKI so that other holders of the channel PSK can't read them. Outside Ham mode, Meshtastic does not fall back to channel-symmetric encryption when the destination public key is unknown.
- **Remote admin** is a DM carrying an `AdminMessage`. The receiver only acts on it if the sender's public key is on its allowlist (`config.security.admin_key[0..2]`).
- **Ham mode** (`owner.is_licensed=true`, where `owner` is the local `meshtastic_User` record) disables PKI entirely and sends cleartext — FCC Part 97 prohibits encryption on amateur bands.
- **No ratchet, no session.** Every packet is encrypted from scratch — a stateless design that matches the high-loss, store-and-forward nature of LoRa.
-
-### Symmetric channel encryption (AES-CTR)
-
-`CryptoEngine::encryptPacket` / `decrypt` / `encryptAESCtr` in `src/mesh/CryptoEngine.cpp`.
-
- **Cipher**: AES-CTR, AES-128 or AES-256 depending on key length. Same routine in both directions (CTR is a stream cipher, so encrypt == decrypt).
- **Key**: `ChannelSettings.psk` bytes. Size semantics:
-  - **0 bytes** → no encryption, cleartext on the air
-  - **1 byte** → short-form index into the well-known `defaultpsk[]` in `src/mesh/Channels.h`. Index 0 = cleartext; 1 = defaultpsk unchanged; 2..255 = defaultpsk with its last byte incremented by (index − 1). This is what the CLI's `--ch-set psk default` produces.
-  - **16 bytes** → raw AES-128 key
-  - **32 bytes** → raw AES-256 key
-  - **2..15 bytes** → zero-padded to 16 and used as AES-128 (with a warn log); **17..31 bytes** → zero-padded to 32 and used as AES-256 (with a warn log). Defensive fallback for malformed PSK input, not something to rely on.
- **Nonce (128 bit)**: `packet_id` (u64 LE) ‖ `from_node` (u32 LE) ‖ `block_counter` (u32, starts at 0). Built in `CryptoEngine::initNonce`.
- **No AEAD**: channel packets carry no MAC, so the channel-hash byte is not an integrity or authenticity check. `Channels::getHash` is a 1-byte XOR-derived hint over the channel name bytes and PSK bytes that helps receivers pick a candidate channel/PSK for decryption. Because it is only a small hint and collisions are easy to find, it should be described purely as a PSK-selection aid, not as a security filter an attacker cannot bypass.
- **Channel 0 is special in one way only**: it's the channel the Router attempts PKI decryption on before falling through to AES-CTR. Non-zero channels always go straight to AES-CTR.
-
-### PKI encryption for DMs (X25519 ECDH + AES-256-CCM)
-
-`CryptoEngine::encryptCurve25519` / `decryptCurve25519` in `src/mesh/CryptoEngine.cpp`.
-
- **Keypair**: Curve25519 (aka X25519), 32-byte public + 32-byte private. Stored in `config.security.public_key` / `private_key`; the public half is mirrored into `owner.public_key` so it rides along in NodeInfo broadcasts and propagates through the mesh like any other identity field.
- **Key generation** (`generateKeyPair`): stirs `HardwareRNG::fill()` (64 B from platform TRNG when available), the 16-byte `myNodeInfo.device_id`, and a call to `random()` into the rweather/Crypto library's software RNG, then `Curve25519::dh1`. `regeneratePublicKey` recomputes the public half from a known private (used when restoring from backup).
- **Keygen entry points**: at boot, `NodeDB` calls `generateKeyPair` (or `regeneratePublicKey` when a stored private key is present and passes a low-entropy check) **directly** when `!owner.is_licensed` and `config.lora.region != UNSET`. `ensurePkiKeys` wraps the same logic for runtime/admin flows — it's the path `AdminModule::handleSetConfig` runs when first assigning a valid region or when security config is written; **do not assume it's the universal boot-time gate**, because the NodeDB path bypasses it.
- **Handshake**: `Curve25519::dh2(local_private, remote_public) → 32-byte shared secret → SHA-256 → 32-byte AES-256 key`. Recomputed per packet. The SHA-256 step is effectively a KDF over the raw ECDH output.
- **Cipher**: AES-256-CCM via `aes_ccm_ae` / `aes_ccm_ad` (`src/mesh/aes-ccm.cpp`). MAC length (the `M` parameter) is **8 bytes**. No AAD — the MAC covers ciphertext only.
- **Nonce (13 bytes / 104 bit)**: `aes_ccm_ae`/`aes_ccm_ad` use a 13-byte CCM nonce (`L = 2` is hardcoded in `src/mesh/aes-ccm.cpp`), not a 16-byte nonce. For PKI packets, `CryptoEngine::initNonce(fromNode, packetNum, extraNonce)` starts from the usual packet-derived nonce material, then overwrites nonce bytes `4..7` with a fresh 32-bit `extraNonce = random()`. The effective nonce bytes are therefore: bytes `0..3` = `packet_id`, bytes `4..7` = transmitted `extraNonce`, bytes `8..11` = `from_node`, byte `12` = `0x00`. The receiver reconstructs the same 13-byte nonce from the packet metadata plus the appended `extraNonce`.
- **Wire overhead**: 12 bytes appended to the ciphertext = 8-byte MAC ‖ 4-byte extraNonce. Defined as `MESHTASTIC_PKC_OVERHEAD = 12` in `src/mesh/RadioInterface.h`. Only the 4-byte `extraNonce` is sent; the rest of the 13-byte CCM nonce is reconstructed from packet fields as described above. The Router's send path checks this overhead against `MAX_LORA_PAYLOAD_LEN` before committing to PKI.
- **Send selection** (`Router::send`): the sender enters the PKI path when **all** hold — we're the originator AND not Ham mode AND not Portduino simradio AND not on the `serial`/`gpio` channels (unless the packet is already marked `pki_encrypted`) AND `config.security.private_key.size == 32` AND destination is a single node (not broadcast) AND the portnum isn't infrastructure. `TRACEROUTE_APP`, `NODEINFO_APP`, `ROUTING_APP`, and `POSITION_APP` are routed through channel encryption even when DMed (these need to be readable by relaying peers). Once on the PKI path, if the destination's public key isn't in our NodeDB the send **fails** with `PKI_SEND_FAIL_PUBLIC_KEY` — it does not silently fall back to channel encryption. If the client explicitly set `pki_encrypted=true` and any condition blocks PKI, the send fails with `PKI_FAILED`.
- **Receive selection** (`Router::perhapsDecode`): try PKI decrypt first when `channel == 0` AND `isToUs(p)` AND not broadcast AND both peers have public keys in NodeDB AND `rawSize > MESHTASTIC_PKC_OVERHEAD`. On success the packet gets `pki_encrypted=true` stamped and the sender's public key copied into `p->public_key` for downstream authorization.
-
-### Remote admin authorization
-
-Implemented in `src/modules/AdminModule.cpp` → `handleReceivedProtobuf`. The authorization check runs in this order:
-
-1. **Response messages** — if `messageIsResponse(r)` is true (the payload is a response to one of our earlier admin requests), it's accepted without any further check. The in-file comment flags this as a known-untightened gap: a stricter implementation would remember which `public_key` we last queried and reject responses that don't match.
-2. **Local admin** — `mp.from == 0` (phone app over BLE, serial CLI, internal module); never travels over the air. **Rejected** if `config.security.is_managed` is true, because managed devices expect admin to arrive over the air through an authorized remote path.
-3. **Legacy admin channel (deprecated)** — the packet arrived on a channel named literally `"admin"`. Gated by `config.security.admin_channel_enabled`; returns `NOT_AUTHORIZED` if the flag is false. Kept for backward compatibility; new deployments should use PKI admin.
-4. **PKI admin (preferred for remote)** — `mp.pki_encrypted == true` AND `mp.public_key` matches one of `config.security.admin_key[0..2]` (up to three authorized 32-byte Curve25519 public keys, typically copied from the admin node's own `user.public_key`).
-5. **Fallthrough** → `NOT_AUTHORIZED`.
-
-On top of authorization, any remote admin message that **mutates** state (not a request, not a response) also has to pass a session-key check (`checkPassKey`): the client must first pull a fresh 8-byte `session_passkey` via `get_admin_session_key_request`, then echo that passkey back in the mutating message. The device rotates the passkey after 150 s and rejects values older than 300 s — a narrow anti-replay window on top of the PKI layer.
-
-`config.security.is_managed = true` disables **local** admin writes (`mp.from == 0` is rejected). It does not by itself force every admin action through PKI — the legacy `"admin"` channel still authorizes remote admin when `config.security.admin_channel_enabled == true`. The AdminModule refuses to persist `is_managed=true` unless at least one `admin_key` is populated — a deliberate guard against operators locking themselves out.
-
-### Key-rotation hazards (actions that invalidate peers)
-
- **`factory_reset_device`** (the "full" variant, calls `NodeDB::factoryReset(eraseBleBonds=true)`) → **wipes** the X25519 private key; a fresh keypair is generated on the next region-set. Every existing peer holds the old public key, so DMs to this node silently fail PKI decrypt until every peer re-exchanges NodeInfo.
- **`factory_reset_config`** (the "partial" variant, calls `NodeDB::factoryReset()` with `eraseBleBonds=false`) → **preserves** the X25519 private key in `installDefaultConfig(preserveKey=true)`; the public key is zeroed and gets rebuilt from the preserved private key on the next boot via the NodeDB path's `regeneratePublicKey` call. Identity is preserved and the mesh does not need to re-exchange keys.
- **`region=UNSET → valid region`** → `ensurePkiKeys` runs inside the same `handleSetConfig` path; missing keys get generated at that moment.
- **Ham mode transitions** — entering Ham mode (`user.is_licensed=true`) runs `Channels::ensureLicensedOperation`, which **wipes every channel PSK** (all traffic becomes cleartext) and disables the legacy admin channel. The X25519 private key is preserved on the device but not used because `Router::send` skips PKI when `owner.is_licensed` is true. Leaving Ham mode re-enables PKI with the preserved keypair but does not restore the wiped channel PSKs — the operator has to re-set them.
- **Channel 0 PSK change** → every peer must re-learn the channel hash; cached NodeInfo becomes temporarily unreachable until the next broadcast.
- **`security.private_key` blanked via admin** → regenerates both halves (unless in Ham mode) and propagates the new public key via NodeInfo.
-
 ## Project Structure

 ```
@@ -144,7 +80,7 @@ firmware/
 │   │   ├── NodeDB.*       # Node database management
 │   │   ├── Router.*       # Packet routing
 │   │   ├── Channels.*     # Channel management
-│   │   ├── CryptoEngine.* # AES-CTR (channels) + X25519 ECDH→AES-256-CCM (PKI for DMs/admin)
+│   │   ├── CryptoEngine.* # AES-CCM encryption
 │   │   ├── *Interface.*   # Radio interface implementations
 │   │   ├── api/           # WiFi/Ethernet server APIs (ServerAPI, PacketAPI)
 │   │   ├── http/          # HTTP server (WebServer, ContentHandler)
@@ -360,23 +296,6 @@ Key defines in variant.h:

 ## Build System

-## Agent Tooling Baseline
-
-Mirror counterpart: `AGENTS.md` under **Agent Tooling Baseline**.
-
-To reduce avoidable agent mistakes, assume these tools are available (or install them before significant repo work):
-
- **Required CLI basics**: `bash`, `git`, `find`, `grep`, `sed`, `awk`, `xargs`
- **Strongly recommended**: `rg` (ripgrep) for fast file/text search, `jq` for JSON processing
- **Build/test tools**: `python3`, `pip`, virtualenv (`python3 -m venv`), `platformio` (`pio`)
- **Containerized native testing**: `docker` (especially important on macOS / non-Linux hosts)
-
-Fallback expectations for agents:
-
- If `rg` is unavailable, use `find` + `grep` instead of failing.
- For native tests on hosts without Linux deps, prefer `./bin/test-native-docker.sh`.
- The simulator helper script is `./bin/test-simulator.sh`.
-
 Uses **PlatformIO** with custom scripts:

 - `bin/platformio-pre.py` - Pre-build script
@@ -529,8 +448,6 @@ Run with: `pio test -e native`

 Simulation testing: `bin/test-simulator.sh`

-Quick entry point for new test modules: `test/README.md` (native unit-test authoring guide, skeleton, pitfalls, and setup checklist).
-
 ### Hardware-in-the-loop tests (`mcp-server/tests/`)

 Separate pytest suite that exercises real USB-connected Meshtastic devices. See the **MCP Server & Hardware Test Harness** section below for invocation, tier layout, and agent usage rules.
@@ -118,7 +118,7 @@ CallbackObserver<MyModule, const meshtastic::Status *> statusObserver =

 Add test suite in `test/test_mymodule/`:

-```text
+```
 test/
 └── test_mymodule/
    └── test_main.cpp
@@ -6,7 +6,7 @@ Guide for adding a new Meshtastic hardware variant to the firmware.

 Create under `variants/<arch>/<name>/`:

-```text
+```
 variants/
 ├── esp32/          # ESP32
 ├── esp32s3/        # ESP32-S3
@@ -1,51 +0,0 @@
-name: Build MacOS Binary
-
-on:
-  workflow_call:
-    inputs:
-      macos_ver:
-        required: false
-        default: "26" # ARM64
-        type: string
-
-permissions:
-  contents: read
-
-jobs:
-  build-MacOS:
-    runs-on: macos-${{ inputs.macos_ver }}
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v6
-        with:
-          submodules: recursive
-
-      - name: Install deps
-        shell: bash
-        run: |
-          brew update
-          brew install platformio yaml-cpp libuv openssl@3 libusb argp-standalone pkg-config
-
-      - name: Get release version string
-        run: |
-          echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
-        id: version
-
-      - name: Build for MacOS
-        run: |
-          platformio run -e native-macos
-        env:
-          PKG_VERSION: ${{ steps.version.outputs.long }}
-        # Errors in this step should not fail the entire workflow while MacOS support is in development.
-        continue-on-error: true
-
-      - name: List output files
-        run: ls -lah .pio/build/native-macos/
-
-      - name: Store binaries as an artifact
-        uses: actions/upload-artifact@v7
-        with:
-          name: firmware-macos-${{ inputs.macos_ver }}-${{ steps.version.outputs.long }}
-          overwrite: true
-          path: |
-            .pio/build/native-macos/meshtasticd
@@ -116,20 +116,6 @@ jobs:
      build_location: local
    secrets: inherit

-  MacOS:
-    strategy:
-      fail-fast: false
-      matrix:
-        macos_ver:
-          - "26" # ARM64
-          # - '26-intel' # x86_64
-          - "15" # ARM64
-          # - '15-intel' # x86_64
-    uses: ./.github/workflows/build_macos_bin.yml
-    with:
-      macos_ver: ${{ matrix.macos_ver }}
-    # secrets: inherit
-
  package-pio-deps-native-tft:
    if: ${{ github.repository == 'meshtastic/firmware' && github.event_name == 'workflow_dispatch' }}
    uses: ./.github/workflows/package_pio_deps.yml
@@ -300,7 +286,6 @@ jobs:
      - gather-artifacts
      - build-debian-src
      - package-pio-deps-native-tft
-      # - MacOS
    steps:
      - name: Checkout
        uses: actions/checkout@v6
@@ -8,18 +8,18 @@ plugins:
      uri: https://github.com/trunk-io/plugins
 lint:
  enabled:
-    - checkov@3.2.525
-    - renovate@43.142.0
-    - prettier@3.8.3
-    - trufflehog@3.95.2
+    - checkov@3.2.517
+    - renovate@43.110.9
+    - prettier@3.8.1
+    - trufflehog@3.94.3
    - yamllint@1.38.0
    - bandit@1.9.4
-    - trivy@0.70.0
+    - trivy@0.69.3
    - taplo@0.10.0
-    - ruff@0.15.12
+    - ruff@0.15.9
    - isort@8.0.1
    - markdownlint@0.48.0
-    - oxipng@10.1.1
+    - oxipng@10.1.0
    - svgo@4.0.1
    - actionlint@1.7.12
    - flake8@7.3.0
@@ -48,15 +48,6 @@ Three test-and-diagnose workflows exist as slash commands:

 Bodies live in `.claude/commands/` and `.github/prompts/` respectively. `.claude/commands/README.md` is the index.

-## Encryption at a glance
-
-Two layers, both in `src/mesh/CryptoEngine.cpp`:
-
- **Channel (symmetric)** — **AES-CTR** with a channel-wide PSK (AES-128 or AES-256). Nonce = packet_id ‖ from_node ‖ block_counter. No AEAD; integrity is soft (channel-hash filter). The well-known default PSK lives in `src/mesh/Channels.h`; a 1-byte PSK is a short-form index into it.
- **Per-peer PKI** — **X25519 ECDH** (Curve25519, 32-byte keys) → SHA-256 → **AES-256-CCM** with an 8-byte MAC. Fresh 32-bit `extraNonce` per packet, sent in the clear alongside the MAC. 12-byte wire overhead (`MESHTASTIC_PKC_OVERHEAD`). Used for DMs. Also used for remote admin (`src/modules/AdminModule.cpp`), where AdminMessage authorization is gated by `config.security.admin_key[0..2]`. Disabled entirely in Ham mode (`user.is_licensed=true`).
-
-Key rotation to never trigger casually: only the **full** factory reset (`factory_reset_device`, `eraseBleBonds=true`) wipes `security.private_key` and regenerates the keypair — every peer holds the old public key, so DMs silently fail PKI decrypt until NodeInfo re-exchanges. The **partial** config reset (`factory_reset_config`) preserves the private key and doesn't invalidate peer relationships. Explicitly blanking `security.private_key` via admin also triggers regen. See the **Encryption & Key Management** section of `.github/copilot-instructions.md` for the full spec (nonce layout, send/receive selection logic including infrastructure-portnum exceptions, admin-key + session-passkey authorization, `is_managed` scope, key-rotation hazards).
-
 ## House rules

 - **No destructive device operations without operator approval.** `factory_reset`, `erase_and_flash`, `reboot`, `shutdown`, history-rewriting git ops — describe the action and stop. Operator authorizes.
@@ -31,6 +31,5 @@ basename=meshtasticd-$1-$VERSION
 pio pkg install --environment "$PIO_ENV" || platformioFailed
 pio run --environment "$PIO_ENV" || platformioFailed

-os_name=$(uname -s | tr '[:upper:]' '[:lower:]')
-cp "$BUILDDIR/meshtasticd" "$OUTDIR/meshtasticd_${os_name}_$(uname -m)"
+cp "$BUILDDIR/meshtasticd" "$OUTDIR/meshtasticd_linux_$(uname -m)"
 cp bin/native-install.* $OUTDIR/
@@ -1,31 +0,0 @@
-# For use with Armbian luckfox-pico-max
-# Waveshare LoRa HAT for Raspberry Pi Pico
-# https://www.waveshare.com/wiki/Pico-LoRa-SX1262
-
-Meta:
-  name: luckfox-pico-max-ws-raspberry-pi-pico-hat
-  support: community
-  compatible:
-    - luckfox-pico-max # Armbian
-
-Lora:
-  Module: sx1262
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  spidev: spidev0.0
-  Busy: # GPIO1_C7 / GP2
-    pin: 55
-    gpiochip: 1
-    line: 23
-  CS: # GPIO1_C6 / GP3
-    pin: 54
-    gpiochip: 1
-    line: 22
-  Reset: # GPIO1_D1 / GP15
-    pin: 57
-    gpiochip: 1
-    line: 25
-  IRQ: # GPIO2_A2 / GP20
-    pin: 66
-    gpiochip: 2
-    line: 2
@@ -1,118 +0,0 @@
-#!/bin/bash
-
-# Script to show commits in develop that are not in master
-# with their associated PR info and commit hashes
-# 
-# Usage:
-#   ./show-unmerged-prs.sh            # Show all unmerged commits
-#   ./show-unmerged-prs.sh --bugfix   # Show only bugfix-labeled PRs
-
-set -e
-
-REPO="firmware"
-OWNER="meshtastic"
-BASE_BRANCH="master"
-HEAD_BRANCH="develop"
-LIMIT=100
-FILTER_LABEL=""
-
-# Parse arguments
-for arg in "$@"; do
-    case $arg in
-        --bugfix)
-            FILTER_LABEL="bugfix"
-            shift
-            ;;
-        --feature)
-            FILTER_LABEL="feature"
-            shift
-            ;;
-        --help)
-            echo "Usage: $0 [OPTIONS]"
-            echo "Options:"
-            echo "  --bugfix     Show only PRs labeled with 'bugfix'"
-            echo "  --feature    Show only PRs labeled with 'feature'"
-            echo "  --help       Show this help message"
-            exit 0
-            ;;
-    esac
-done
-
-if [ -n "$FILTER_LABEL" ]; then
-    echo "Fetching commits in $HEAD_BRANCH that are not in $BASE_BRANCH (filtered by label: $FILTER_LABEL)..."
-else
-    echo "Fetching commits in $HEAD_BRANCH that are not in $BASE_BRANCH..."
-fi
-echo ""
-
-# Check if gh CLI is available
-if ! command -v gh &> /dev/null; then
-    echo "ERROR: GitHub CLI (gh) not found. Please install it first."
-    echo "Visit: https://cli.github.com/"
-    exit 1
-fi
-
-# Get commits in develop that are not in master
-# For each commit, try to find associated PR
-git fetch origin develop master 2>/dev/null || true
-
-# Use git to get the list of commits
-commits=$(git log --pretty=format:"%H|%s" origin/master..origin/develop | head -n $LIMIT)
-
-count=0
-displayed=0
-echo "Commits in $HEAD_BRANCH not in $BASE_BRANCH:"
-echo "=============================================="
-echo ""
-
-while IFS='|' read -r hash subject; do
-    ((count++))
-    
-    # Try to find the PR for this commit
-    # Extract PR number, title, description, and labels
-    pr_response=$(gh api -X GET "/repos/$OWNER/$REPO/commits/$hash/pulls" \
-        -H "Accept: application/vnd.github.v3+json" 2>/dev/null | \
-        jq -r '.[0] | "\(.number)|\(.title)|\(.body // "No description")|\(.labels | map(.name) | join(","))"' 2>/dev/null || echo "||||")
-    
-    if [ -z "$pr_response" ] || [ "$pr_response" = "||||" ]; then
-        # If no PR found, skip if filter is active, otherwise show the commit
-        if [ -z "$FILTER_LABEL" ]; then
-            ((displayed++))
-            echo "[$displayed] Commit: $hash"
-            echo "    Subject: $subject"
-            echo "    PR: Not found in GitHub"
-            echo ""
-        fi
-    else
-        IFS='|' read -r pr_num pr_title pr_desc pr_labels <<< "$pr_response"
-        
-        # Check if filter matches
-        if [ -n "$FILTER_LABEL" ]; then
-            # Only show if the label is in the labels list
-            if ! echo "$pr_labels" | grep -q "$FILTER_LABEL"; then
-                continue
-            fi
-        fi
-        
-        ((displayed++))
-        echo "[$displayed] PR #$pr_num - $pr_title"
-        echo "    Commit: $hash"
-        if [ -n "$pr_desc" ] && [ "$pr_desc" != "No description" ]; then
-            # Truncate description to 200 chars
-            desc_short="${pr_desc:0:200}"
-            [ ${#pr_desc} -gt 200 ] && desc_short+="..."
-            echo "    Description: $desc_short"
-        fi
-        if [ -n "$pr_labels" ] && [ "$pr_labels" != "" ]; then
-            echo "    Labels: $pr_labels"
-        fi
-        echo ""
-    fi
-done <<< "$commits"
-
-echo ""
-if [ -n "$FILTER_LABEL" ]; then
-    echo "Done. Showing $displayed PRs with label '$FILTER_LABEL' from $displayed commits checked."
-else
-    echo "Done. Showing $displayed commits from $HEAD_BRANCH not in $BASE_BRANCH."
-fi
@@ -1,43 +0,0 @@
-{
-  "build": {
-    "arduino": {
-      "ldscript": "esp32s3_out.ld",
-      "partitions": "default_16MB.csv",
-      "memory_type": "qio_opi"
-    },
-    "core": "esp32",
-    "extra_flags": [
-      "-DBOARD_HAS_PSRAM",
-      "-DARDUINO_USB_CDC_ON_BOOT=1",
-      "-DARDUINO_USB_MODE=1",
-      "-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": "heltec_v4_r8"
-  },
-  "connectivity": ["wifi", "bluetooth", "lora"],
-  "debug": {
-    "default_tool": "esp-builtin",
-    "onboard_tools": ["esp-builtin"],
-    "openocd_target": "esp32s3.cfg"
-  },
-  "frameworks": ["arduino", "espidf"],
-  "name": "heltec_wifi_lora_32 v4 r8 (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": 921600
-  },
-  "url": "https://heltec.org/",
-  "vendor": "heltec"
-}
@@ -29,7 +29,6 @@ build_flags = -Wno-missing-field-initializers
 	-DUSE_THREAD_NAMES
 	-DTINYGPS_OPTION_NO_CUSTOM_FIELDS
 	-DPB_ENABLE_MALLOC=1
-	-DPB_VALIDATE_UTF8=1
 	-DRADIOLIB_EXCLUDE_CC1101=1
 	-DRADIOLIB_EXCLUDE_NRF24=1
 	-DRADIOLIB_EXCLUDE_RF69=1
@@ -59,6 +58,7 @@ build_flags = -Wno-missing-field-initializers
 	-DMESHTASTIC_EXCLUDE_POWERMON=1
 	-DMESHTASTIC_EXCLUDE_STATUS=1
 	-D MAX_THREADS=40 ; As we've split modules, we have more threads to manage
+	-DLED_BUILTIN=-1
 	#-DBUILD_EPOCH=$UNIX_TIME ; set in platformio-custom.py now
 	#-D OLED_PL=1
 	#-D DEBUG_HEAP=1 ; uncomment to add free heap space / memory leak debugging logs
@@ -68,7 +68,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/6bfd1f135e1ebe37afd6050bb4b9964cea3fcfda.zip
+	https://github.com/meshtastic/esp8266-oled-ssd1306/archive/21e484f409cde18d44012caef84c244eb5ca28f3.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
@@ -126,7 +126,7 @@ lib_deps =
 [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/728932970996ec91bdb93cb6dae29c2cb70c66e2.zip
+	https://github.com/meshtastic/device-ui/archive/56e1da4e7d30abcd746a2092a30e422f8cf5fc2b.zip

 ; Common libs for environmental measurements in telemetry module
 [environmental_base]
@@ -717,17 +717,37 @@ bool Power::setup()
        found = true;
 #endif
    }
-    attachPowerInterrupts();
+#ifdef EXT_PWR_DETECT
+    attachInterrupt(
+        EXT_PWR_DETECT,
+        []() {
+            power->setIntervalFromNow(0);
+            runASAP = true;
+        },
+        CHANGE);
+#endif
+#ifdef BATTERY_CHARGING_INV
+    attachInterrupt(
+        BATTERY_CHARGING_INV,
+        []() {
+            power->setIntervalFromNow(0);
+            runASAP = true;
+        },
+        CHANGE);
+#endif
+#ifdef EXT_CHRG_DETECT
+    attachInterrupt(
+        EXT_CHRG_DETECT,
+        []() {
+            power->setIntervalFromNow(0);
+            runASAP = true;
+            BaseType_t higherWake = 0;
+        },
+        CHANGE);
+#endif
    enabled = found;
    low_voltage_counter = 0;

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

@@ -755,10 +775,8 @@ void Power::reboot()
    rp2040.reboot();
 #elif defined(ARCH_PORTDUINO)
    deInitApiServer();
-#ifdef __linux__
    if (aLinuxInputImpl)
        aLinuxInputImpl->deInit();
-#endif
    SPI.end();
    Wire.end();
    Serial1.end();
@@ -1008,97 +1026,6 @@ int32_t Power::runOnce()
    return (statusHandler && statusHandler->isInitialized()) ? (1000 * 20) : RUN_SAME;
 }

-#ifdef ARCH_ESP32
-
-// Detach our class' interrupts before lightsleep
-// Allows sleep.cpp to configure its own interrupts, which wake the device on user-button press
-int Power::beforeLightSleep(void *unused)
-{
-    LOG_WARN("Detaching power interrupts for sleep");
-    detachPowerInterrupts();
-    return 0; // Indicates success
-}
-
-// Reconfigure our interrupts
-// Our class' interrupts were disconnected during sleep, to allow the user button to wake the device from sleep
-int Power::afterLightSleep(esp_sleep_wakeup_cause_t cause)
-{
-    attachPowerInterrupts();
-    return 0; // Indicates success
-}
-
-#endif
-
-/*
- * Attach (or re-attach) hardware interrupts for power management
- * Public method. Used outside class when waking from MCU sleep
- */
-void Power::attachPowerInterrupts()
-{
-#ifdef EXT_PWR_DETECT
-    attachInterrupt(
-        EXT_PWR_DETECT,
-        []() {
-            power->setIntervalFromNow(0);
-            runASAP = true;
-        },
-        CHANGE);
-#endif
-#ifdef BATTERY_CHARGING_INV
-    attachInterrupt(
-        BATTERY_CHARGING_INV,
-        []() {
-            power->setIntervalFromNow(0);
-            runASAP = true;
-        },
-        CHANGE);
-#endif
-#ifdef EXT_CHRG_DETECT
-    attachInterrupt(
-        EXT_CHRG_DETECT,
-        []() {
-            power->setIntervalFromNow(0);
-            runASAP = true;
-            BaseType_t higherWake = 0;
-        },
-        CHANGE);
-#endif
-#ifdef PMU_IRQ
-    if (PMU) {
-        attachInterrupt(
-            PMU_IRQ,
-            [] {
-                pmu_irq = true;
-                power->setIntervalFromNow(0);
-                runASAP = true;
-            },
-            FALLING);
-    }
-#endif
-}
-
-/*
- * Detach the "normal" button interrupts.
- * Public method. Used before attaching a "wake-on-button" interrupt for MCU sleep
- */
-void Power::detachPowerInterrupts()
-{
-#ifdef EXT_PWR_DETECT
-    detachInterrupt(EXT_PWR_DETECT);
-#endif
-#ifdef BATTERY_CHARGING_INV
-    detachInterrupt(BATTERY_CHARGING_INV);
-#endif
-#ifdef EXT_CHRG_DETECT
-    detachInterrupt(EXT_CHRG_DETECT);
-#endif
-#ifdef PMU_IRQ
-    if (PMU) {
-        detachInterrupt(PMU_IRQ);
-    }
-#endif
-}
-
 /**
 * Init the power manager chip
 *
@@ -1376,6 +1303,8 @@ bool Power::axpChipInit()
    }

    pinMode(PMU_IRQ, INPUT);
+    attachInterrupt(
+        PMU_IRQ, [] { pmu_irq = true; }, FALLING);

    // we do not look for AXPXXX_CHARGING_FINISHED_IRQ & AXPXXX_CHARGING_IRQ
    // because it occurs repeatedly while there is no battery also it could cause
@@ -1,8 +1,8 @@
 #pragma once

 #include "../freertosinc.h"
-#include "Print.h"
 #include "mesh/generated/meshtastic/mesh.pb.h"
+#include <Print.h>
 #include <stdarg.h>
 #include <string>

@@ -157,9 +157,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #elif defined(HELTEC_MESH_NODE_T096)
 #define NUM_PA_POINTS 22
 #define TX_GAIN_LORA 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 13, 13, 13, 12, 11, 10, 9, 8, 7
-#elif defined(HELTEC_V4_R8)
-#define NUM_PA_POINTS 22
-#define TX_GAIN_LORA 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 12, 12, 11, 11, 10, 9, 8, 7
 #else
 // If a board enables USE_KCT8103L_PA but does not match a known variant and has
 // not already provided a PA curve, fail at compile time to avoid unsafe defaults.
@@ -34,7 +34,6 @@ class ScanI2C
        SHT31,
        SHT4X,
        SHTC3,
-        SHTXX,
        LPS22HB,
        QMC6310U,
        QMC6310N,
@@ -70,25 +70,20 @@ bool GPSUpdateScheduling::isUpdateDue()
 // Have we been searching for a GPS position for too long?
 bool GPSUpdateScheduling::searchedTooLong()
 {
-    constexpr uint32_t oneMinuteMs = 60UL * 1000UL;
-    constexpr uint32_t maxSearchClampMs = 15UL * oneMinuteMs; // Hard cap: 15 minutes is always too long
-    uint32_t elapsed = elapsedSearchMs();
-
-    // Anything over 15 minutes is too long, regardless of the broadcast interval.
-    // TODO: Make a smarter algorithm that backs off the search dwell time when not getting a lock.
-    if (elapsed > maxSearchClampMs)
-        return true;
-
    uint32_t minimumOrConfiguredSecs =
        Default::getConfiguredOrMinimumValue(config.position.position_broadcast_secs, default_broadcast_interval_secs);
    uint32_t maxSearchMs = Default::getConfiguredOrDefaultMs(minimumOrConfiguredSecs, default_broadcast_interval_secs);
+    // If broadcast interval set to max, no such thing as "too long"
+    if (maxSearchMs == UINT32_MAX)
+        return false;

    // If we've been searching longer than our position broadcast interval: that's too long
-    if (elapsed > maxSearchMs)
+    else if (elapsedSearchMs() > maxSearchMs)
        return true;

    // Otherwise, not too long yet!
-    return false;
+    else
+        return false;
 }

 // Updates the predicted time-to-get-lock, by exponentially smoothing the latest observation
@@ -428,7 +428,7 @@ static LGFX *tft = nullptr;

 #elif defined(ST7789_CS)
 #include <LovyanGFX.hpp> // Graphics and font library for ST7735 driver chip
-#if defined(HELTEC_V4_TFT) || defined(HELTEC_V4_R8_TFT)
+#ifdef HELTEC_V4_TFT
 #include "chsc6x.h"
 #include "lgfx/v1/Touch.hpp"
 namespace lgfx
@@ -450,11 +450,7 @@ class TOUCH_CHSC6X : public ITouch
    bool init(void) override
    {
        if (chsc6xTouch == nullptr) {
-#if (TOUCH_I2C_PORT == 1)
            chsc6xTouch = new chsc6x(&Wire1, TOUCH_SDA_PIN, TOUCH_SCL_PIN, TOUCH_INT_PIN, TOUCH_RST_PIN);
-#else
-            chsc6xTouch = new chsc6x(&Wire, TOUCH_SDA_PIN, TOUCH_SCL_PIN, TOUCH_INT_PIN, TOUCH_RST_PIN);
-#endif
        }
        chsc6xTouch->chsc6x_init();
        return true;
@@ -491,7 +487,7 @@ class LGFX : public lgfx::LGFX_Device
 #if HAS_TOUCHSCREEN
 #if defined(T_WATCH_S3) || defined(ELECROW)
    lgfx::Touch_FT5x06 _touch_instance;
-#elif defined(HELTEC_V4_TFT) || defined(HELTEC_V4_R8_TFT)
+#elif defined(HELTEC_V4_TFT)
    lgfx::TOUCH_CHSC6X _touch_instance;
 #else
    lgfx::Touch_GT911 _touch_instance;
@@ -510,11 +506,7 @@ class LGFX : public lgfx::LGFX_Device
            cfg.freq_write = SPI_FREQUENCY; // SPI clock for transmission (up to 80MHz, rounded to the value obtained by dividing
                                            // 80MHz by an integer)
            cfg.freq_read = SPI_READ_FREQUENCY; // SPI clock when receiving
-#ifdef SPI_3_WIRE
-            cfg.spi_3wire = SPI_3_WIRE;
-#else
-            cfg.spi_3wire = true;                      // Set to true if reception is done on the MOSI pin
-#endif
+            cfg.spi_3wire = false;
            cfg.use_lock = true;               // Set to true to use transaction locking
            cfg.dma_channel = SPI_DMA_CH_AUTO; // SPI_DMA_CH_AUTO; // Set DMA channel to use (0=not use DMA / 1=1ch / 2=ch /
                                               // SPI_DMA_CH_AUTO=auto setting)
@@ -564,11 +556,8 @@ class LGFX : public lgfx::LGFX_Device
            cfg.rgb_order = false;                        // Set to true if the panel's red and blue are swapped
            cfg.dlen_16bit =
                false;             // Set to true for panels that transmit data length in 16-bit units with 16-bit parallel or SPI
-#if defined(HAS_SDCARD)
            cfg.bus_shared = true; // If the bus is shared with the SD card, set to true (bus control with drawJpgFile etc.)
-#else
-            cfg.bus_shared = false;
-#endif
+
            // Set the following only when the display is shifted with a driver with a variable number of pixels, such as the
            // ST7735 or ILI9163.
            // cfg.memory_width = TFT_WIDTH;   // Maximum width supported by the driver IC
@@ -1,122 +0,0 @@
-/*
-
-    NicheGraphics parallel E-Ink driver for the LilyGo T5-S3-ePaper-Pro (ED047TC1).
-
-    InkHUD buffer format : 1bpp, horizontal bytes, MSB = leftmost pixel, 1 = white
-    FastEPD buffer format: 1bpp, horizontal bytes, MSB = leftmost pixel, 1 = white
-
-    Both formats share the same pixel layout and polarity (1 = white, 0 = black).
-    The InkHUD safe-area buffer (944×523) is copied into the centre of the physical
-    960×540 FastEPD buffer so content clears the panel's inactive edge border.
-    See ED047TC1.h for the H_OFFSET_BYTES / V_OFFSET_TOP / V_OFFSET_BOTTOM constants.
-
-*/
-
-// Ruler diagnostic — uncomment to draw calibration lines at each physical edge.
-// #define EINK_EDGE_LINES
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-#ifdef T5_S3_EPAPER_PRO
-
-#include "./ED047TC1.h"
-
-#include "FastEPD.h"
-#include "configuration.h"
-
-using namespace NicheGraphics::Drivers;
-
-void ED047TC1::begin(SPIClass *spi, uint8_t pin_dc, uint8_t pin_cs, uint8_t pin_busy, uint8_t pin_rst)
-{
-    // Parallel display — SPI parameters are not used
-    (void)spi;
-    (void)pin_dc;
-    (void)pin_cs;
-    (void)pin_busy;
-    (void)pin_rst;
-
-    epaper = new FASTEPD;
-
-#if defined(T5_S3_EPAPER_PRO_V1)
-    epaper->initPanel(BB_PANEL_LILYGO_T5PRO, 28000000);
-#elif defined(T5_S3_EPAPER_PRO_V2)
-    epaper->initPanel(BB_PANEL_LILYGO_T5PRO_V2, 28000000);
-    // Initialize all PCA9535 port-0 pins as outputs / HIGH
-    for (int i = 0; i < 8; i++) {
-        epaper->ioPinMode(i, OUTPUT);
-        epaper->ioWrite(i, HIGH);
-    }
-#else
-#error "ED047TC1 driver: unsupported variant — define T5_S3_EPAPER_PRO_V1 or T5_S3_EPAPER_PRO_V2"
-#endif
-
-    epaper->setMode(BB_MODE_1BPP);
-    epaper->clearWhite();
-    epaper->fullUpdate(true); // Blocking initial clear
-}
-
-void ED047TC1::update(uint8_t *imageData, UpdateTypes type)
-{
-    if (!epaper)
-        return;
-
-    // InkHUD renders into a DISPLAY_WIDTH × DISPLAY_HEIGHT safe-area buffer.
-    // We need to place that into the centre of the physical 960×540 FastEPD buffer,
-    // leaving blank margins at every edge to avoid the panel's inactive border.
-    const uint32_t srcRowBytes = (DISPLAY_WIDTH + 7) / 8; // bytes per row in InkHUD buffer (118)
-    const uint32_t dstRowBytes = (960 + 7) / 8;           // bytes per row in physical buffer (120)
-    const uint32_t dstTotalRows = 540;
-
-    uint8_t *cur = epaper->currentBuffer();
-
-    // Fill physical buffer with white (0xFF = white in FastEPD 1bpp)
-    memset(cur, 0xFF, dstRowBytes * dstTotalRows);
-
-    // Copy each InkHUD row into the physical buffer with horizontal + vertical offsets
-    for (uint32_t row = 0; row < DISPLAY_HEIGHT; row++) {
-        const uint8_t *srcRow = imageData + row * srcRowBytes;
-        uint8_t *dstRow = cur + (row + V_OFFSET_TOP) * dstRowBytes + H_OFFSET_BYTES;
-        memcpy(dstRow, srcRow, srcRowBytes);
-    }
-
-#ifdef EINK_EDGE_LINES
-    // Draw a 1px black box at the exact boundary of the safe area within the
-    // physical buffer. If the margins are correct, all 4 lines should be
-    // fully visible and right at the edge of the usable display area.
-
-    auto setPixelBlack = [&](uint32_t col, uint32_t row) { cur[row * dstRowBytes + col / 8] &= ~(0x80 >> (col % 8)); };
-
-    const uint32_t safeX = H_OFFSET_BYTES * 8;
-    const uint32_t safeY = V_OFFSET_TOP;
-    const uint32_t safeW = DISPLAY_WIDTH;
-    const uint32_t safeH = DISPLAY_HEIGHT;
-
-    // Top edge: horizontal line at safeY
-    for (uint32_t col = safeX; col < safeX + safeW; col++)
-        setPixelBlack(col, safeY);
-
-    // Bottom edge: horizontal line at safeY + safeH - 1
-    for (uint32_t col = safeX; col < safeX + safeW; col++)
-        setPixelBlack(col, safeY + safeH - 1);
-
-    // Left edge: vertical line at safeX
-    for (uint32_t row = safeY; row < safeY + safeH; row++)
-        setPixelBlack(safeX, row);
-
-    // Right edge: vertical line at safeX + safeW - 1
-    for (uint32_t row = safeY; row < safeY + safeH; row++)
-        setPixelBlack(safeX + safeW - 1, row);
-#endif
-
-    if (type == FULL) {
-        epaper->fullUpdate(CLEAR_SLOW, false);
-        epaper->backupPlane(); // Sync pPrevious so next partialUpdate has a correct baseline
-    } else {
-        // FAST: true partial update — compares pCurrent vs pPrevious and only applies
-        // the update waveform to rows that actually changed. Unchanged rows get a neutral
-        // signal (no visible effect). partialUpdate() updates pPrevious internally.
-        epaper->partialUpdate(false, 0, dstTotalRows - 1);
-    }
-}
-
-#endif // T5_S3_EPAPER_PRO
-#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS
@@ -1,90 +0,0 @@
-/*
-
-    E-Ink display driver adapter
-        - ED047TC1 (via FastEPD library)
-        - Manufacturer: E Ink / used in LilyGo T5-E-Paper-S3-Pro
-        - Size: 4.7 inch
-        - Physical resolution: 960px x 540px
-        - Interface: 8-bit parallel (NOT SPI)
-
-    Unlike the other NicheGraphics EInk drivers, this one drives a parallel e-paper
-    panel via the FastEPD library. SPI parameters passed to begin() are ignored.
-
-    The ED047TC1 panel has an inactive pixel border on all four edges (~4–8 physical
-    pixels). DISPLAY_WIDTH / DISPLAY_HEIGHT expose a reduced "safe area" to InkHUD so
-    that content is never drawn into this dead zone. The update() method copies the
-    InkHUD frame buffer into the centre of the larger physical 960×540 buffer, using
-    H_OFFSET_BYTES (horizontal, whole bytes = 8 pixels per byte),
-    V_OFFSET_TOP and V_OFFSET_BOTTOM (vertical, pixel rows) to position it.
-
-    Changing these constants shifts content inward from each physical edge:
-        H_OFFSET_BYTES = 1  →  8px left margin, 8px right margin   (960 – 8 – 8   = 944)
-        V_OFFSET_TOP   = 9  →  9px top margin  (asymmetric: top ≠ bottom)
-        V_OFFSET_BOTTOM = 8 →  8px bottom margin                    (540 – 9 – 8   = 523)
-
-*/
-
-#pragma once
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-
-#include "configuration.h"
-
-#include "./EInk.h"
-
-// Forward declare to avoid pulling FastEPD into all translation units
-class FASTEPD;
-
-namespace NicheGraphics::Drivers
-{
-
-class ED047TC1 : public EInk
-{
-    // Safe-area dimensions exposed to InkHUD (physical panel is 960×540).
-    //
-    // The ED047TC1 has an inactive pixel border on all physical edges.
-    // The physical buffer coordinates do NOT directly match the visual orientation
-    // due to FastEPD's portrait scan direction and InkHUD's rotation=3 (270° CW):
-    //
-    //   Physical buffer          Visual on device (rotation=3)
-    //   ─────────────────        ──────────────────────────────
-    //   Physical LEFT  cols  →   Visual TOP    edge
-    //   Physical RIGHT cols  →   Visual BOTTOM edge
-    //   Physical TOP   rows  →   Visual RIGHT  edge
-    //   Physical BOTTOM rows →   Visual LEFT   edge
-    //
-    // Offset constants shift the InkHUD safe-area away from each physical dead zone:
-    //   H_OFFSET_BYTES : whole bytes from physical left  (8px per byte, affects visual TOP)
-    //   Physical right margin = 960 − H_OFFSET_BYTES×8 − DISPLAY_WIDTH  (affects visual BOTTOM)
-    //   V_OFFSET_TOP   : pixel rows from physical top    (affects visual RIGHT)
-    //   V_OFFSET_BOTTOM: pixel rows from physical bottom (affects visual LEFT)
-    //
-    // Calibrated by flashing a 1px border box and adjusting until all 4 sides are visible.
-
-    static constexpr uint16_t DISPLAY_WIDTH = 944;  // 960 − H_OFFSET_BYTES×8 − right_margin (8+8 = 16px)
-    static constexpr uint16_t DISPLAY_HEIGHT = 523; // 540 − V_OFFSET_TOP − V_OFFSET_BOTTOM (9+8 = 17px)
-
-    static constexpr uint8_t H_OFFSET_BYTES = 1;  // visual TOP  : 8px physical left margin
-                                                  // visual BOTTOM: 960−8−944=8px physical right margin
-    static constexpr uint8_t V_OFFSET_TOP = 9;    // visual RIGHT : CONFIRMED OK
-    static constexpr uint8_t V_OFFSET_BOTTOM = 8; // visual LEFT  : 8px physical bottom margin
-
-    static constexpr UpdateTypes supported = static_cast<UpdateTypes>(FULL | FAST);
-
-  public:
-    ED047TC1() : EInk(DISPLAY_WIDTH, DISPLAY_HEIGHT, supported) {}
-
-    // EInk interface — SPI params are not used for this parallel display
-    void begin(SPIClass *spi, uint8_t pin_dc, uint8_t pin_cs, uint8_t pin_busy, uint8_t pin_rst = 0xFF) override;
-    void update(uint8_t *imageData, UpdateTypes type) override;
-
-  protected:
-    bool isUpdateDone() override { return true; } // FastEPD updates are blocking
-
-  private:
-    FASTEPD *epaper = nullptr;
-};
-
-} // namespace NicheGraphics::Drivers
-
-#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS
@@ -88,12 +88,8 @@ class AppletFont

 // Greek
 #include "graphics/niche/Fonts/FreeSans12pt_Win1253.h"
-#include "graphics/niche/Fonts/FreeSans18pt_Win1253.h"
-#include "graphics/niche/Fonts/FreeSans24pt_Win1253.h"
 #include "graphics/niche/Fonts/FreeSans6pt_Win1253.h"
 #include "graphics/niche/Fonts/FreeSans9pt_Win1253.h"
-#define FREESANS_24PT_WIN1253 InkHUD::AppletFont(FreeSans24pt_Win1253, InkHUD::AppletFont::WINDOWS_1253, -5, 3)
-#define FREESANS_18PT_WIN1253 InkHUD::AppletFont(FreeSans18pt_Win1253, InkHUD::AppletFont::WINDOWS_1253, -4, 2)
 #define FREESANS_12PT_WIN1253 InkHUD::AppletFont(FreeSans12pt_Win1253, InkHUD::AppletFont::WINDOWS_1253, -3, 1)
 #define FREESANS_9PT_WIN1253 InkHUD::AppletFont(FreeSans9pt_Win1253, InkHUD::AppletFont::WINDOWS_1253, -2, -1)
 #define FREESANS_6PT_WIN1253 InkHUD::AppletFont(FreeSans6pt_Win1253, InkHUD::AppletFont::WINDOWS_1253, -1, -2)
@@ -143,10 +143,6 @@ int32_t ButtonThread::runOnce()
        leadUpSequenceActive = false;
        resetLeadUpSequence();
    }
-#ifdef INPUT_DEBUG
-    if (buttonCurrentlyPressed)
-        LOG_WARN("Button held for %u ms", millis() - buttonPressStartTime);
-#endif

    // Progressive lead-up sound system
    if (!_suppressLeadUp && buttonCurrentlyPressed && (millis() - buttonPressStartTime) >= BUTTON_LEADUP_MS) {
@@ -315,8 +311,7 @@ int32_t ButtonThread::runOnce()
 void ButtonThread::attachButtonInterrupts()
 {
    // Interrupt for user button, during normal use. Improves responsiveness.
-    if (_intRoutine != nullptr)
-        attachInterrupt(_pinNum, _intRoutine, CHANGE);
+    attachInterrupt(_pinNum, _intRoutine, CHANGE);
 }

 /*
@@ -325,8 +320,7 @@ void ButtonThread::attachButtonInterrupts()
 */
 void ButtonThread::detachButtonInterrupts()
 {
-    if (_intRoutine != nullptr)
-        detachInterrupt(_pinNum);
+    detachInterrupt(_pinNum);
 }

 #ifdef ARCH_ESP32
@@ -390,11 +390,8 @@ void InputBroker::Init()
                seesawRotary = nullptr;
            }
        }
-#ifdef __linux__
-        // Linux evdev keyboard input only — macOS has no <linux/input.h>.
        aLinuxInputImpl = new LinuxInputImpl();
        aLinuxInputImpl->init();
-#endif
    }
 #endif
 #if !MESHTASTIC_EXCLUDE_INPUTBROKER && HAS_TRACKBALL
@@ -1,8 +1,5 @@
 #pragma once
-// Linux evdev keyboard input. Only compiled on Linux portduino targets;
-// macOS / non-Linux builds have no <linux/input.h> or epoll, and the
-// headless build doesn't need real keyboards anyway.
-#if ARCH_PORTDUINO && defined(__linux__)
+#if ARCH_PORTDUINO
 #include "InputBroker.h"
 #include "concurrency/OSThread.h"
 #include <assert.h>
@@ -1,5 +1,4 @@
-// Linux evdev impl. Same Linux-only gating as LinuxInput.h.
-#if defined(ARCH_PORTDUINO) && defined(__linux__)
+#ifdef ARCH_PORTDUINO
 #pragma once
 #include "LinuxInput.h"
 #include "main.h"
@@ -29,8 +29,7 @@ void TouchScreenImpl1::init()
    return;
 #else
    TouchScreenBase::init(true);
-    if (inputBroker)
-        inputBroker->registerSource(this);
+    inputBroker->registerSource(this);
 #endif
 }

@@ -340,9 +340,138 @@ void setup()

 #ifdef BLE_LED
    pinMode(BLE_LED, OUTPUT);
+#ifdef BLE_LED_INVERTED
+    digitalWrite(BLE_LED, HIGH);
+#else
+    digitalWrite(BLE_LED, LOW);
+#endif
+#endif
+
+#if defined(T_DECK)
+    // GPIO10 manages all peripheral power supplies
+    // Turn on peripheral power immediately after MUC starts.
+    // If some boards are turned on late, ESP32 will reset due to low voltage.
+    // ESP32-C3(Keyboard) , MAX98357A(Audio Power Amplifier) ,
+    // TF Card , Display backlight(AW9364DNR) , AN48841B(Trackball) , ES7210(Decoder)
+    pinMode(KB_POWERON, OUTPUT);
+    digitalWrite(KB_POWERON, HIGH);
+    // T-Deck has all three SPI peripherals (TFT, SD, LoRa) attached to the same SPI bus
+    // We need to initialize all CS pins in advance otherwise there will be SPI communication issues
+    // e.g. when detecting the SD card
+    pinMode(LORA_CS, OUTPUT);
+    digitalWrite(LORA_CS, HIGH);
+    pinMode(SDCARD_CS, OUTPUT);
+    digitalWrite(SDCARD_CS, HIGH);
+    pinMode(TFT_CS, OUTPUT);
+    digitalWrite(TFT_CS, HIGH);
+    delay(100);
+#elif defined(T_DECK_PRO)
+    pinMode(LORA_EN, OUTPUT);
+    digitalWrite(LORA_EN, HIGH);
+    pinMode(LORA_CS, OUTPUT);
+    digitalWrite(LORA_CS, HIGH);
+    pinMode(SDCARD_CS, OUTPUT);
+    digitalWrite(SDCARD_CS, HIGH);
+    pinMode(PIN_EINK_CS, OUTPUT);
+    digitalWrite(PIN_EINK_CS, HIGH);
+#if PIN_EINK_RES >= 0
+    pinMode(PIN_EINK_RES, OUTPUT);
+    digitalWrite(PIN_EINK_RES, HIGH);
+#endif
+    pinMode(CST328_PIN_RST, OUTPUT);
+    digitalWrite(CST328_PIN_RST, HIGH);
+#elif defined(T_LORA_PAGER)
+    pinMode(LORA_CS, OUTPUT);
+    digitalWrite(LORA_CS, HIGH);
+    pinMode(SDCARD_CS, OUTPUT);
+    digitalWrite(SDCARD_CS, HIGH);
+    pinMode(TFT_CS, OUTPUT);
+    digitalWrite(TFT_CS, HIGH);
+    pinMode(KB_INT, INPUT_PULLUP);
+    // io expander
+    io.begin(Wire, XL9555_SLAVE_ADDRESS0, SDA, SCL);
+    io.pinMode(EXPANDS_DRV_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_DRV_EN, HIGH);
+    io.pinMode(EXPANDS_AMP_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_AMP_EN, LOW);
+    io.pinMode(EXPANDS_LORA_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_LORA_EN, HIGH);
+    io.pinMode(EXPANDS_GPS_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_GPS_EN, HIGH);
+    io.pinMode(EXPANDS_KB_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_KB_EN, HIGH);
+    io.pinMode(EXPANDS_SD_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_SD_EN, HIGH);
+    io.pinMode(EXPANDS_GPIO_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_GPIO_EN, HIGH);
+    io.pinMode(EXPANDS_SD_PULLEN, INPUT);
+#elif defined(HACKADAY_COMMUNICATOR)
+    pinMode(KB_INT, INPUT);
    digitalWrite(BLE_LED, LED_STATE_OFF);
 #endif

+#if defined(T_DECK)
+    // GPIO10 manages all peripheral power supplies
+    // Turn on peripheral power immediately after MUC starts.
+    // If some boards are turned on late, ESP32 will reset due to low voltage.
+    // ESP32-C3(Keyboard) , MAX98357A(Audio Power Amplifier) ,
+    // TF Card , Display backlight(AW9364DNR) , AN48841B(Trackball) , ES7210(Decoder)
+    pinMode(KB_POWERON, OUTPUT);
+    digitalWrite(KB_POWERON, HIGH);
+    // T-Deck has all three SPI peripherals (TFT, SD, LoRa) attached to the same SPI bus
+    // We need to initialize all CS pins in advance otherwise there will be SPI communication issues
+    // e.g. when detecting the SD card
+    pinMode(LORA_CS, OUTPUT);
+    digitalWrite(LORA_CS, HIGH);
+    pinMode(SDCARD_CS, OUTPUT);
+    digitalWrite(SDCARD_CS, HIGH);
+    pinMode(TFT_CS, OUTPUT);
+    digitalWrite(TFT_CS, HIGH);
+    delay(100);
+#elif defined(T_DECK_PRO)
+    pinMode(LORA_EN, OUTPUT);
+    digitalWrite(LORA_EN, HIGH);
+    pinMode(LORA_CS, OUTPUT);
+    digitalWrite(LORA_CS, HIGH);
+    pinMode(SDCARD_CS, OUTPUT);
+    digitalWrite(SDCARD_CS, HIGH);
+    pinMode(PIN_EINK_CS, OUTPUT);
+    digitalWrite(PIN_EINK_CS, HIGH);
+#if PIN_EINK_RES >= 0
+    pinMode(PIN_EINK_RES, OUTPUT);
+    digitalWrite(PIN_EINK_RES, HIGH);
+#endif
+    pinMode(CST328_PIN_RST, OUTPUT);
+    digitalWrite(CST328_PIN_RST, HIGH);
+#elif defined(T_LORA_PAGER)
+    pinMode(LORA_CS, OUTPUT);
+    digitalWrite(LORA_CS, HIGH);
+    pinMode(SDCARD_CS, OUTPUT);
+    digitalWrite(SDCARD_CS, HIGH);
+    pinMode(TFT_CS, OUTPUT);
+    digitalWrite(TFT_CS, HIGH);
+    pinMode(KB_INT, INPUT_PULLUP);
+    // io expander
+    io.begin(Wire, XL9555_SLAVE_ADDRESS0, SDA, SCL);
+    io.pinMode(EXPANDS_DRV_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_DRV_EN, HIGH);
+    io.pinMode(EXPANDS_AMP_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_AMP_EN, LOW);
+    io.pinMode(EXPANDS_LORA_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_LORA_EN, HIGH);
+    io.pinMode(EXPANDS_GPS_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_GPS_EN, HIGH);
+    io.pinMode(EXPANDS_KB_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_KB_EN, HIGH);
+    io.pinMode(EXPANDS_SD_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_SD_EN, HIGH);
+    io.pinMode(EXPANDS_GPIO_EN, OUTPUT);
+    io.digitalWrite(EXPANDS_GPIO_EN, HIGH);
+    io.pinMode(EXPANDS_SD_PULLEN, INPUT);
+#elif defined(HACKADAY_COMMUNICATOR)
+    pinMode(KB_INT, INPUT);
+#endif
+
    concurrency::hasBeenSetup = true;
 #if HAS_SCREEN
    meshtastic_Config_DisplayConfig_OledType screen_model =
@@ -4,7 +4,6 @@
 #include <memory>

 #if !(MESHTASTIC_EXCLUDE_PKI)
-#include "HardwareRNG.h"
 #include "NodeDB.h"
 #include "aes-ccm.h"
 #include "meshUtils.h"
@@ -27,15 +26,6 @@ void CryptoEngine::generateKeyPair(uint8_t *pubKey, uint8_t *privKey)
 {
    // Mix in any randomness we can, to make key generation stronger.
    CryptRNG.begin(optstr(APP_VERSION));
-
-    uint8_t hardwareEntropy[64] = {0};
-    if (HardwareRNG::fill(hardwareEntropy, sizeof(hardwareEntropy), true)) {
-        CryptRNG.stir(hardwareEntropy, sizeof(hardwareEntropy));
-    } else {
-        LOG_WARN("Hardware entropy unavailable, falling back to software RNG");
-    }
-    memset(hardwareEntropy, 0, sizeof(hardwareEntropy));
-
    if (myNodeInfo.device_id.size == 16) {
        CryptRNG.stir(myNodeInfo.device_id.bytes, myNodeInfo.device_id.size);
    }
@@ -2,21 +2,18 @@

 #include "meshUtils.h"

-// Convert seconds to ms, clamping at INT32_MAX (~24.86 days)
-static inline uint32_t secondsToMsClamped(uint32_t secs)
-{
-    constexpr uint32_t MAX_MS = static_cast<uint32_t>(INT32_MAX);
-    return (secs > MAX_MS / 1000U) ? MAX_MS : secs * 1000U;
-}
-
 uint32_t Default::getConfiguredOrDefaultMs(uint32_t configuredInterval, uint32_t defaultInterval)
 {
-    return secondsToMsClamped(configuredInterval > 0 ? configuredInterval : defaultInterval);
+    if (configuredInterval > 0)
+        return configuredInterval * 1000;
+    return defaultInterval * 1000;
 }

 uint32_t Default::getConfiguredOrDefaultMs(uint32_t configuredInterval)
 {
-    return secondsToMsClamped(configuredInterval > 0 ? configuredInterval : default_broadcast_interval_secs);
+    if (configuredInterval > 0)
+        return configuredInterval * 1000;
+    return default_broadcast_interval_secs * 1000;
 }

 uint32_t Default::getConfiguredOrDefault(uint32_t configured, uint32_t defaultValue)
@@ -50,14 +47,7 @@ uint32_t Default::getConfiguredOrDefaultMsScaled(uint32_t configured, uint32_t d
                  meshtastic_Config_DeviceConfig_Role_TAK_TRACKER))
        return getConfiguredOrDefaultMs(configured, defaultValue);

-    // Saturate at INT32_MAX to match secondsToMsClamped: float→uint32_t when
-    // out of range is UB, and the result is consumed as an int32_t downstream.
-    constexpr uint32_t MAX_MS = static_cast<uint32_t>(INT32_MAX);
-    uint32_t base = getConfiguredOrDefaultMs(configured, defaultValue);
-    float coef = congestionScalingCoefficient(numOnlineNodes);
-    if (static_cast<double>(base) * static_cast<double>(coef) >= static_cast<double>(MAX_MS))
-        return MAX_MS;
-    return base * coef;
+    return getConfiguredOrDefaultMs(configured, defaultValue) * congestionScalingCoefficient(numOnlineNodes);
 }

 uint32_t Default::getConfiguredOrMinimumValue(uint32_t configured, uint32_t minValue)
@@ -76,4 +66,4 @@ uint8_t Default::getConfiguredOrDefaultHopLimit(uint8_t configured)
 #else
    return (configured >= HOP_MAX) ? HOP_MAX : config.lora.hop_limit;
 #endif
-}
+}
@@ -1,173 +0,0 @@
-#include "HardwareRNG.h"
-
-#include <algorithm>
-#include <cstring>
-#include <random>
-
-#include "configuration.h"
-
-#if HAS_RADIO
-#include "RadioLibInterface.h"
-#endif
-
-#if defined(ARCH_NRF52)
-#include <Adafruit_nRFCrypto.h>
-extern Adafruit_nRFCrypto nRFCrypto;
-#elif defined(ARCH_ESP32)
-#include <esp_system.h>
-#elif defined(ARCH_RP2040)
-#include <Arduino.h>
-#elif defined(ARCH_PORTDUINO)
-#include <random>
-#include <unistd.h>
-#ifdef __linux__
-#include <sys/random.h> // getrandom()
-#else
-#include <stdlib.h> // arc4random_buf() on Darwin/BSD
-#endif
-#endif
-
-namespace HardwareRNG
-{
-
-namespace
-{
-void fillWithRandomDevice(uint8_t *buffer, size_t length)
-{
-    std::random_device rd;
-    size_t offset = 0;
-    while (offset < length) {
-        uint32_t value = rd();
-        size_t toCopy = std::min(length - offset, sizeof(value));
-        memcpy(buffer + offset, &value, toCopy);
-        offset += toCopy;
-    }
-}
-
-#if HAS_RADIO
-bool mixWithLoRaEntropy(uint8_t *buffer, size_t length)
-{
-    // Only attempt to pull entropy from the modem if it is initialized and exposes the helper.
-    // When the radio stack is disabled or has not yet been configured, we simply skip this step
-    // and return false so callers know no extra mixing occurred.
-    RadioLibInterface *radio = RadioLibInterface::instance;
-    if (!radio) {
-        // This path can run during portduinoSetup() before the console is initialized,
-        // both for unit-test binaries and the simulator's meshtasticd; LOG_* dereferences `console`.
-        if (console) {
-            LOG_ERROR("No radio instance available to provide entropy");
-        }
-        return false;
-    }
-
-    constexpr size_t chunkSize = 16;
-    uint8_t scratch[chunkSize];
-    size_t offset = 0;
-    bool mixed = false;
-
-    while (offset < length) {
-        size_t toCopy = std::min(length - offset, chunkSize);
-
-        // randomBytes() returns false if the modem does not support it or is not ready
-        // (for instance, when the radio is powered down). We break immediately to avoid
-        // blocking or returning partially-filled entropy and simply report failure.
-        if (!radio->randomBytes(scratch, toCopy)) {
-            break;
-        }
-
-        for (size_t i = 0; i < toCopy; ++i) {
-            buffer[offset + i] ^= scratch[i];
-        }
-
-        mixed = true;
-        offset += toCopy;
-    }
-
-    // Avoid leaving the modem-sourced bytes sitting on the stack longer than needed.
-    if (mixed) {
-        memset(scratch, 0, sizeof(scratch));
-    }
-
-    return mixed;
-}
-#endif
-} // namespace
-
-bool fill(uint8_t *buffer, size_t length, bool useRadioEntropy)
-{
-    if (!buffer || length == 0) {
-        return false;
-    }
-
-    bool filled = false;
-
-#if defined(ARCH_NRF52)
-    // The Nordic SDK RNG provides cryptographic-quality randomness backed by hardware.
-    nRFCrypto.begin();
-    auto result = nRFCrypto.Random.generate(buffer, length);
-    nRFCrypto.end();
-    filled = result;
-#elif defined(ARCH_ESP32)
-    // ESP32 exposes a true RNG via esp_fill_random().
-    esp_fill_random(buffer, length);
-    filled = true;
-#elif defined(ARCH_RP2040)
-    // RP2040 has a hardware random number generator accessible through the Arduino core.
-    size_t offset = 0;
-    while (offset < length) {
-        uint32_t value = rp2040.hwrand32();
-        size_t toCopy = std::min(length - offset, sizeof(value));
-        memcpy(buffer + offset, &value, toCopy);
-        offset += toCopy;
-    }
-    filled = true;
-#elif defined(ARCH_PORTDUINO)
-    // Prefer the host OS RNG first when running under Portduino.
-#ifdef __linux__
-    ssize_t generated = ::getrandom(buffer, length, 0);
-    if (generated == static_cast<ssize_t>(length)) {
-        filled = true;
-    }
-#else
-    // arc4random_buf is available on Darwin/BSD and cannot fail.
-    ::arc4random_buf(buffer, length);
-    filled = true;
-#endif
-
-    if (!filled) {
-        fillWithRandomDevice(buffer, length);
-        filled = true;
-    }
-#endif
-
-    if (!filled) {
-        // As a last resort, fall back to std::random_device. This should only be reached
-        // if a platform-specific source was unavailable.
-        fillWithRandomDevice(buffer, length);
-        filled = true;
-    }
-
-#if HAS_RADIO
-    if (useRadioEntropy) {
-        // Best-effort: if the radio is active and can provide modem entropy, XOR it over the
-        // buffer to improve overall quality. We consider the filling a success if either a
-        // good platform RNG or the modem RNG provided data, so we return true as long as at
-        // least one of those steps succeeded.
-        filled = mixWithLoRaEntropy(buffer, length) || filled;
-    }
-#endif
-
-    return filled;
-}
-
-bool seed(uint32_t &seedOut)
-{
-    uint32_t candidate = 0;
-    if (!fill(reinterpret_cast<uint8_t *>(&candidate), sizeof(candidate), true)) {
-        return false;
-    }
-    seedOut = candidate;
-    return true;
-}
-
-} // namespace HardwareRNG
@@ -1,28 +0,0 @@
-#pragma once
-
-#include <cstddef>
-#include <cstdint>
-
-namespace HardwareRNG
-{
-
-/**
- * Fill the provided buffer with random bytes sourced from the most
- * appropriate hardware-backed RNG available on the current platform.
- *
- * @param buffer Destination buffer for random bytes
- * @param length Number of bytes to write
- * @param useRadioEntropy If true, attempt to mix radio entropy into the output as well.
- * @return true if the buffer was fully populated with entropy, false on failure
- */
-bool fill(uint8_t *buffer, size_t length, bool useRadioEntropy = false);
-
-/**
- * Populate a 32-bit seed value with hardware-backed randomness where possible.
- *
- * @param seedOut Destination for the generated seed value
- * @return true if a seed was produced from a reliable entropy source
- */
-bool seed(uint32_t &seedOut);
-
-} // namespace HardwareRNG
@@ -4,34 +4,6 @@
 #include "MeshTypes.h"
 #include "PointerQueue.h"
 #include "configuration.h"
-#include "detect/LoRaRadioType.h"
-
-// Sentinel marking the end of a modem preset array. Declared `const` rather
-// than `constexpr` because the cast from 0xFF to the enum is out-of-range and
-// therefore not a valid constant expression on Clang 16+ (Apple Clang on
-// macOS). The value is only ever compared at runtime, so static-init is fine.
-static const meshtastic_Config_LoRaConfig_ModemPreset MODEM_PRESET_END =
-    static_cast<meshtastic_Config_LoRaConfig_ModemPreset>(0xFF);
-
-// Region profile: bundles the preset list with regulatory parameters shared across regions
-struct RegionProfile {
-    const meshtastic_Config_LoRaConfig_ModemPreset *presets; // sentinel-terminated; first entry is the default
-    float spacing;                                           // gaps between radio channels
-    float padding;                                           // padding at each side of the "operating channel"
-    bool audioPermitted;
-    bool licensedOnly;        // a region profile for licensed operators only
-    int8_t textThrottle;      // throttle for text - future expansion
-    int8_t positionThrottle;  // throttle for location data - future expansion
-    int8_t telemetryThrottle; // throttle for telemetry - future expansion
-    uint8_t overrideSlot;     // a per-region override slot for if we need to fix it in place
-};
-
-extern const RegionProfile PROFILE_STD;
-extern const RegionProfile PROFILE_EU868;
-extern const RegionProfile PROFILE_UNDEF;
-// extern const RegionProfile  PROFILE_LITE;
-// extern const RegionProfile  PROFILE_NARROW;
-// extern const RegionProfile  PROFILE_HAM;

 // Map from old region names to new region enums
 struct RegionInfo {
@@ -53,7 +25,7 @@ extern const RegionInfo *myRegion;
 extern void initRegion();

 // Valid LoRa spread factor range and defaults
-constexpr uint8_t LORA_SF_MIN = 5;
+constexpr uint8_t LORA_SF_MIN = 7;
 constexpr uint8_t LORA_SF_MAX = 12;
 constexpr uint8_t LORA_SF_DEFAULT = 11; // LONG_FAST default

@@ -65,14 +37,10 @@ constexpr uint8_t LORA_CR_DEFAULT = 5; // LONG_FAST default
 // Default bandwidth in kHz (LONG_FAST)
 constexpr float LORA_BW_DEFAULT_KHZ = 250.0f;

-/// Clamp spread factor to the valid LoRa range [5, 12].
+/// Clamp spread factor to the valid LoRa range [7, 12].
 /// Out-of-range values (including 0 from unset preset mode) return LORA_SF_DEFAULT.
 static inline uint8_t clampSpreadFactor(uint8_t sf)
 {
-    // We check for RF95 radios that are incompatible with Spreading Factors 5 and 6.
-    if (radioType == RF95_RADIO && (sf == 5 || sf == 6))
-        return LORA_SF_DEFAULT;
-
    if (sf < LORA_SF_MIN || sf > LORA_SF_MAX)
        return LORA_SF_DEFAULT;
    return sf;
@@ -688,7 +688,7 @@ void NodeDB::installDefaultConfig(bool preserveKey = false)
    strncpy(config.network.ntp_server, "meshtastic.pool.ntp.org", 32);

 #if (defined(T_DECK) || defined(T_WATCH_S3) || defined(UNPHONE) || defined(PICOMPUTER_S3) || defined(SENSECAP_INDICATOR) ||      \
-     defined(ELECROW_PANEL) || defined(HELTEC_V4_TFT) || defined(HELTEC_V4_R8_TFT)) &&                                           \
+     defined(ELECROW_PANEL) || defined(HELTEC_V4_TFT)) &&                                                                        \
    HAS_TFT
    // switch BT off by default; use TFT programming mode or hotkey to enable
    config.bluetooth.enabled = false;
@@ -17,4 +17,14 @@ template <class T> class PointerQueue : public TypedQueue<T *>

        return this->dequeue(&p, maxWait) ? p : nullptr;
    }
+
+#ifdef HAS_FREE_RTOS
+    // returns a ptr or null if the queue was empty
+    T *dequeuePtrFromISR(BaseType_t *higherPriWoken)
+    {
+        T *p;
+
+        return this->dequeueFromISR(&p, higherPriWoken) ? p : nullptr;
+    }
+#endif
 };
@@ -109,7 +109,7 @@ bool RadioLibInterface::canSendImmediately()
        return true;
 }

-bool RadioLibInterface::receiveDetected(uint16_t irq, unsigned long syncWordHeaderValidFlag, unsigned long preambleDetectedFlag)
+bool RadioLibInterface::receiveDetected(uint16_t irq, ulong syncWordHeaderValidFlag, ulong preambleDetectedFlag)
 {
    bool detected = (irq & (syncWordHeaderValidFlag | preambleDetectedFlag));
    // Handle false detections
@@ -246,24 +246,6 @@ bool RadioLibInterface::findInTxQueue(NodeNum from, PacketId id)
    return txQueue.find(from, id);
 }

-bool RadioLibInterface::randomBytes(uint8_t *buffer, size_t length)
-{
-    if (!buffer || length == 0 || !iface) {
-        return false;
-    }
-
-    // Older RadioLib versions only expose random(min, max), so fill the buffer byte-by-byte.
-    for (size_t i = 0; i < length; ++i) {
-        int32_t value = iface->random(0, 255);
-        if (value < 0) {
-            return false;
-        }
-        buffer[i] = static_cast<uint8_t>(value & 0xFF);
-    }
-
-    return true;
-}
-
 /** radio helper thread callback.
 We never immediately transmit after any operation (either Rx or Tx). Instead we should wait a random multiple of
 'slotTimes' (see definition in RadioInterface.h) taken from a contention window (CW) to lower the chance of collision.
@@ -605,4 +587,4 @@ bool RadioLibInterface::startSend(meshtastic_MeshPacket *txp)

        return res == RADIOLIB_ERR_NONE;
    }
-}
+}
@@ -172,12 +172,6 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified
    /** Attempt to find a packet in the TxQueue. Returns true if the packet was found. */
    virtual bool findInTxQueue(NodeNum from, PacketId id) override;

-    /**
-     * Request randomness sourced from the LoRa modem, if supported by the active RadioLib interface.
-     * @return true if len bytes were produced, false otherwise.
-     */
-    bool randomBytes(uint8_t *buffer, size_t length);
-
  private:
    /** if we have something waiting to send, start a short (random) timer so we can come check for collision before actually
     * doing the transmit */
@@ -213,7 +207,7 @@ class RadioLibInterface : public RadioInterface, protected concurrency::Notified
  protected:
    uint32_t activeReceiveStart = 0;

-    bool receiveDetected(uint16_t irq, unsigned long syncWordHeaderValidFlag, unsigned long preambleDetectedFlag);
+    bool receiveDetected(uint16_t irq, ulong syncWordHeaderValidFlag, ulong preambleDetectedFlag);

    /** Do any hardware setup needed on entry into send configuration for the radio.
     * Subclasses can customize, but must also call this base method */
@@ -719,13 +719,9 @@ void Router::handleReceived(meshtastic_MeshPacket *p, RxSource src)
    // Also, we should set the time from the ISR and it should have msec level resolution
    p->rx_time = getValidTime(RTCQualityFromNet); // store the arrival timestamp for the phone

-    // Store a copy of the encrypted packet for MQTT.
-    // Local, not a class member: handleReceived re-enters itself when a module
-    // reply broadcast goes through MeshService::sendToMesh -> Router::sendLocal,
-    // and a member would be silently overwritten without release on the inner
-    // call. Each invocation now owns its own copy (issue #9632, #10101, #8729).
+    // Store a copy of encrypted packet for MQTT
    DEBUG_HEAP_BEFORE;
-    meshtastic_MeshPacket *p_encrypted = packetPool.allocCopy(*p);
+    p_encrypted = packetPool.allocCopy(*p);
    DEBUG_HEAP_AFTER("Router::handleReceived", p_encrypted);

    // Take those raw bytes and convert them back into a well structured protobuf we can understand
@@ -819,7 +815,8 @@ void Router::handleReceived(meshtastic_MeshPacket *p, RxSource src)
 #endif
    }

-    packetPool.release(p_encrypted); // Release the encrypted packet (release() handles nullptr)
+    packetPool.release(p_encrypted); // Release the encrypted packet
+    p_encrypted = nullptr;
 }

 void Router::perhapsHandleReceived(meshtastic_MeshPacket *p)
@@ -92,6 +92,9 @@ class Router : protected concurrency::OSThread, protected PacketHistory
        before us */
    uint32_t rxDupe = 0, txRelayCanceled = 0;

+    // pointer to the encrypted packet
+    meshtastic_MeshPacket *p_encrypted = nullptr;
+
  protected:
    friend class RoutingModule;

@@ -448,15 +448,6 @@ template <typename T> void SX126xInterface<T>::resetAGC()
    // RX boosted gain mode
    lora.setRxBoostedGainMode(config.lora.sx126x_rx_boosted_gain);

-    // Re-apply the undocumented 0x8B5 RX sensitivity patch that was set in init().
-    // The CALIBRATE_ALL (0x7F) command above clears bit 0 of register 0x8B5, which
-    // silently removes the RX sensitivity improvement introduced in #9571 / #9777.
-    // Without this re-apply, every SX1262 node loses its RX boost ~60s after boot
-    // and never recovers until reboot. See empirical evidence in the PR description.
-    if (module.SPIsetRegValue(0x8B5, 0x01, 0, 0) != RADIOLIB_ERR_NONE) {
-        LOG_WARN("SX126x resetAGC: failed to re-apply 0x8B5 RX sensitivity patch");
-    }
-
    // 6. Resume receiving
    startReceive();
 }
@@ -1,7 +1,6 @@
 #include "TypeConversions.h"
 #include "mesh/generated/meshtastic/deviceonly.pb.h"
 #include "mesh/generated/meshtastic/mesh.pb.h"
-#include "meshUtils.h"

 meshtastic_NodeInfo TypeConversions::ConvertToNodeInfo(const meshtastic_NodeInfoLite *lite)
 {
@@ -82,11 +81,7 @@ meshtastic_UserLite TypeConversions::ConvertToUserLite(meshtastic_User user)
    meshtastic_UserLite lite = meshtastic_UserLite_init_default;

    strncpy(lite.long_name, user.long_name, sizeof(lite.long_name));
-    lite.long_name[sizeof(lite.long_name) - 1] = '\0';
-    sanitizeUtf8(lite.long_name, sizeof(lite.long_name));
    strncpy(lite.short_name, user.short_name, sizeof(lite.short_name));
-    lite.short_name[sizeof(lite.short_name) - 1] = '\0';
-    sanitizeUtf8(lite.short_name, sizeof(lite.short_name));
    lite.hw_model = user.hw_model;
    lite.role = user.role;
    lite.is_licensed = user.is_licensed;
@@ -104,11 +99,7 @@ meshtastic_User TypeConversions::ConvertToUser(uint32_t nodeNum, meshtastic_User

    snprintf(user.id, sizeof(user.id), "!%08x", nodeNum);
    strncpy(user.long_name, lite.long_name, sizeof(user.long_name));
-    user.long_name[sizeof(user.long_name) - 1] = '\0';
-    sanitizeUtf8(user.long_name, sizeof(user.long_name));
    strncpy(user.short_name, lite.short_name, sizeof(user.short_name));
-    user.short_name[sizeof(user.short_name) - 1] = '\0';
-    sanitizeUtf8(user.short_name, sizeof(user.short_name));
    user.hw_model = lite.hw_model;
    user.role = lite.role;
    user.is_licensed = lite.is_licensed;
@@ -285,18 +285,7 @@ typedef enum _meshtastic_Config_LoRaConfig_RegionCode {
    /* Nepal 865MHz */
    meshtastic_Config_LoRaConfig_RegionCode_NP_865 = 25,
    /* Brazil 902MHz */
-    meshtastic_Config_LoRaConfig_RegionCode_BR_902 = 26,
-    /* ITU Region 1 Amateur Radio 2m band (144-146 MHz) */
-    meshtastic_Config_LoRaConfig_RegionCode_ITU1_2M = 27,
-    /* ITU Region 2 / 3 Amateur Radio 2m band (144-148 MHz) */
-    meshtastic_Config_LoRaConfig_RegionCode_ITU23_2M = 28,
-    /* EU 866MHz band (Band no. 47b of 2006/771/EC and subsequent amendments) for Non-specific short-range devices (SRD) */
-    meshtastic_Config_LoRaConfig_RegionCode_EU_866 = 29,
-    /* EU 874MHz and 917MHz bands (Band no. 1 and 4 of 2022/172/EC and subsequent amendments) for Non-specific short-range devices (SRD) */
-    meshtastic_Config_LoRaConfig_RegionCode_EU_874 = 30,
-    meshtastic_Config_LoRaConfig_RegionCode_EU_917 = 31,
-    /* EU 868MHz band, with narrow presets */
-    meshtastic_Config_LoRaConfig_RegionCode_EU_N_868 = 32
+    meshtastic_Config_LoRaConfig_RegionCode_BR_902 = 26
 } meshtastic_Config_LoRaConfig_RegionCode;

 /* Standard predefined channel settings
@@ -326,24 +315,7 @@ typedef enum _meshtastic_Config_LoRaConfig_ModemPreset {
    meshtastic_Config_LoRaConfig_ModemPreset_SHORT_TURBO = 8,
    /* Long Range - Turbo
 This preset performs similarly to LongFast, but with 500Khz bandwidth. */
-    meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO = 9,
-    /* Lite Fast
- Medium range preset optimized for EU 866MHz SRD band with 125kHz bandwidth.
- Comparable link budget to MEDIUM_FAST but compliant with Band no. 47b of 2006/771/EC. */
-    meshtastic_Config_LoRaConfig_ModemPreset_LITE_FAST = 10,
-    /* Lite Slow
- Medium-to-moderate range preset optimized for EU 866MHz SRD band with 125kHz bandwidth.
- Comparable link budget to LONG_FAST but compliant with Band no. 47b of 2006/771/EC. */
-    meshtastic_Config_LoRaConfig_ModemPreset_LITE_SLOW = 11,
-    /* Narrow Fast
- Medium-to-moderate range preset optimized for EU 868MHz band with 62.5kHz bandwidth.
- Comparable link budget to SHORT_SLOW, but with half the data rate.
- Intended to avoid interference with other devices. */
-    meshtastic_Config_LoRaConfig_ModemPreset_NARROW_FAST = 12,
-    /* Narrow Slow
- Moderate range preset optimized for EU 868MHz band with 62.5kHz bandwidth.
- Comparable link budget and data rate to LONG_FAST. */
-    meshtastic_Config_LoRaConfig_ModemPreset_NARROW_SLOW = 13
+    meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO = 9
 } meshtastic_Config_LoRaConfig_ModemPreset;

 typedef enum _meshtastic_Config_LoRaConfig_FEM_LNA_Mode {
@@ -730,12 +702,12 @@ extern "C" {
 #define _meshtastic_Config_DisplayConfig_CompassOrientation_ARRAYSIZE ((meshtastic_Config_DisplayConfig_CompassOrientation)(meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_270_INVERTED+1))

 #define _meshtastic_Config_LoRaConfig_RegionCode_MIN meshtastic_Config_LoRaConfig_RegionCode_UNSET
-#define _meshtastic_Config_LoRaConfig_RegionCode_MAX meshtastic_Config_LoRaConfig_RegionCode_EU_N_868
-#define _meshtastic_Config_LoRaConfig_RegionCode_ARRAYSIZE ((meshtastic_Config_LoRaConfig_RegionCode)(meshtastic_Config_LoRaConfig_RegionCode_EU_N_868+1))
+#define _meshtastic_Config_LoRaConfig_RegionCode_MAX meshtastic_Config_LoRaConfig_RegionCode_BR_902
+#define _meshtastic_Config_LoRaConfig_RegionCode_ARRAYSIZE ((meshtastic_Config_LoRaConfig_RegionCode)(meshtastic_Config_LoRaConfig_RegionCode_BR_902+1))

 #define _meshtastic_Config_LoRaConfig_ModemPreset_MIN meshtastic_Config_LoRaConfig_ModemPreset_LONG_FAST
-#define _meshtastic_Config_LoRaConfig_ModemPreset_MAX meshtastic_Config_LoRaConfig_ModemPreset_NARROW_SLOW
-#define _meshtastic_Config_LoRaConfig_ModemPreset_ARRAYSIZE ((meshtastic_Config_LoRaConfig_ModemPreset)(meshtastic_Config_LoRaConfig_ModemPreset_NARROW_SLOW+1))
+#define _meshtastic_Config_LoRaConfig_ModemPreset_MAX meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO
+#define _meshtastic_Config_LoRaConfig_ModemPreset_ARRAYSIZE ((meshtastic_Config_LoRaConfig_ModemPreset)(meshtastic_Config_LoRaConfig_ModemPreset_LONG_TURBO+1))

 #define _meshtastic_Config_LoRaConfig_FEM_LNA_Mode_MIN meshtastic_Config_LoRaConfig_FEM_LNA_Mode_DISABLED
 #define _meshtastic_Config_LoRaConfig_FEM_LNA_Mode_MAX meshtastic_Config_LoRaConfig_FEM_LNA_Mode_NOT_PRESENT
@@ -315,8 +315,6 @@ typedef enum _meshtastic_HardwareModel {
    meshtastic_HardwareModel_THINKNODE_M7 = 129,
    meshtastic_HardwareModel_THINKNODE_M8 = 130,
    meshtastic_HardwareModel_THINKNODE_M9 = 131,
-    /* The Heltec-V4-R8 uses an ESP32S3R8 chip, plus an SX1262. */
-    meshtastic_HardwareModel_HELTEC_V4_R8 = 132,
    /* ------------------------------------------------------------------------------------------------------------------------------------------
 Reserved ID For developing private Ports. These will show up in live traffic sparsely, so we can use a high number. Keep it within 8 bits.
 ------------------------------------------------------------------------------------------------------------------------------------------ */
@@ -117,93 +117,4 @@ size_t pb_string_length(const char *str, size_t max_len)
        }
    }
    return len;
-}
-
-bool sanitizeUtf8(char *buf, size_t bufSize)
-{
-    if (!buf || bufSize == 0)
-        return false;
-
-    // Ensure null-terminated within buffer; report if we had to enforce it
-    bool replaced = (buf[bufSize - 1] != '\0');
-    buf[bufSize - 1] = '\0';
-
-    size_t i = 0;
-    size_t len = strlen(buf);
-
-    while (i < len) {
-        uint8_t b = (uint8_t)buf[i];
-
-        // Determine expected sequence length from lead byte
-        size_t seqLen;
-        uint32_t minCodepoint;
-        if (b <= 0x7F) {
-            // ASCII — valid single byte
-            i++;
-            continue;
-        } else if ((b & 0xE0) == 0xC0) {
-            seqLen = 2;
-            minCodepoint = 0x80; // Reject overlong
-        } else if ((b & 0xF0) == 0xE0) {
-            seqLen = 3;
-            minCodepoint = 0x800;
-        } else if ((b & 0xF8) == 0xF0) {
-            seqLen = 4;
-            minCodepoint = 0x10000;
-        } else {
-            // Invalid lead byte (0x80-0xBF or 0xF8+)
-            buf[i] = '?';
-            replaced = true;
-            i++;
-            continue;
-        }
-
-        // Check that we have enough bytes remaining
-        if (i + seqLen > len) {
-            // Truncated sequence at end of string — replace remaining bytes
-            for (size_t j = i; j < len; j++) {
-                buf[j] = '?';
-            }
-            replaced = true;
-            break;
-        }
-
-        // Validate continuation bytes (must be 10xxxxxx)
-        bool valid = true;
-        for (size_t j = 1; j < seqLen; j++) {
-            if (((uint8_t)buf[i + j] & 0xC0) != 0x80) {
-                valid = false;
-                break;
-            }
-        }
-
-        if (valid) {
-            // Decode codepoint to check for overlong encodings and surrogates
-            uint32_t cp = 0;
-            if (seqLen == 2)
-                cp = b & 0x1F;
-            else if (seqLen == 3)
-                cp = b & 0x0F;
-            else
-                cp = b & 0x07;
-            for (size_t j = 1; j < seqLen; j++)
-                cp = (cp << 6) | ((uint8_t)buf[i + j] & 0x3F);
-
-            if (cp < minCodepoint || cp > 0x10FFFF || (cp >= 0xD800 && cp <= 0xDFFF)) {
-                // Overlong encoding, out of Unicode range, or surrogate half
-                valid = false;
-            }
-        }
-
-        if (valid) {
-            i += seqLen;
-        } else {
-            // Replace only the lead byte; continuation bytes will be caught on next iteration
-            buf[i] = '?';
-            replaced = true;
-            i++;
-        }
-    }
-
-    return replaced;
 }
@@ -38,10 +38,6 @@ const std::string vformat(const char *const zcFormat, ...);
 // Get actual string length for nanopb char array fields.
 size_t pb_string_length(const char *str, size_t max_len);

-// Sanitize a fixed-size char buffer in-place by replacing invalid UTF-8 sequences with '?'.
-// Ensures the result is null-terminated within bufSize. Returns true if any bytes were replaced.
-bool sanitizeUtf8(char *buf, size_t bufSize);
-
 /// Calculate 2^n without calling pow() - used for spreading factor and other calculations
 inline uint32_t pow_of_2(uint32_t n)
 {
@@ -599,14 +599,10 @@ void AdminModule::handleSetOwner(const meshtastic_User &o)
    if (*o.long_name) {
        changed |= strcmp(owner.long_name, o.long_name);
        strncpy(owner.long_name, o.long_name, sizeof(owner.long_name));
-        owner.long_name[sizeof(owner.long_name) - 1] = '\0';
-        sanitizeUtf8(owner.long_name, sizeof(owner.long_name));
    }
    if (*o.short_name) {
        changed |= strcmp(owner.short_name, o.short_name);
        strncpy(owner.short_name, o.short_name, sizeof(owner.short_name));
-        owner.short_name[sizeof(owner.short_name) - 1] = '\0';
-        sanitizeUtf8(owner.short_name, sizeof(owner.short_name));
    }
    snprintf(owner.id, sizeof(owner.id), "!%08x", nodeDB->getNodeNum());

@@ -1404,11 +1400,7 @@ void AdminModule::handleSetHamMode(const meshtastic_HamParameters &p)

    // Set call sign and override lora limitations for licensed use
    strncpy(owner.long_name, p.call_sign, sizeof(owner.long_name));
-    owner.long_name[sizeof(owner.long_name) - 1] = '\0';
-    sanitizeUtf8(owner.long_name, sizeof(owner.long_name));
    strncpy(owner.short_name, p.short_name, sizeof(owner.short_name));
-    owner.short_name[sizeof(owner.short_name) - 1] = '\0';
-    sanitizeUtf8(owner.short_name, sizeof(owner.short_name));
    owner.is_licensed = true;
    config.lora.override_duty_cycle = true;
    config.lora.tx_power = p.tx_power;
@@ -32,7 +32,7 @@
 #include <assert.h>
 #include <utility>

-#include "IPAddress.h"
+#include <IPAddress.h>
 #if defined(ARCH_PORTDUINO)
 #include <netinet/in.h>
 #elif !defined(ntohl)
@@ -1,7 +1,6 @@
 #include "NRF52Bluetooth.h"
 #include "BLEDfuSecure.h"
 #include "BluetoothCommon.h"
-#include "HardwareRNG.h"
 #include "PowerFSM.h"
 #include "configuration.h"
 #include "main.h"
@@ -273,13 +272,9 @@ void NRF52Bluetooth::setup()
    Bluefruit.setTxPower(NRF52_BLE_TX_POWER);
 #endif
    if (config.bluetooth.mode != meshtastic_Config_BluetoothConfig_PairingMode_NO_PIN) {
-        if (config.bluetooth.mode == meshtastic_Config_BluetoothConfig_PairingMode_FIXED_PIN) {
-            configuredPasskey = config.bluetooth.fixed_pin;
-        } else {
-            uint32_t hwrand = 0;
-            HardwareRNG::fill(reinterpret_cast<uint8_t *>(&hwrand), sizeof(hwrand));
-            configuredPasskey = hwrand % 900000u + 100000u;
-        }
+        configuredPasskey = config.bluetooth.mode == meshtastic_Config_BluetoothConfig_PairingMode_FIXED_PIN
+                                ? config.bluetooth.fixed_pin
+                                : random(100000, 999999);
        auto pinString = std::to_string(configuredPasskey);
        LOG_INFO("Bluetooth pin set to '%i'", configuredPasskey);
        Bluefruit.Security.setPIN(pinString.c_str());
@@ -17,7 +17,6 @@
 #include <nrfx_wdt.h>
 #include <stdio.h>
 // #include <Adafruit_USBD_Device.h>
-#include "HardwareRNG.h"
 #include "NodeDB.h"
 #include "PowerMon.h"
 #include "error.h"
@@ -399,14 +398,15 @@ void nrf52Setup()
 #endif

    // Init random seed
-    uint32_t seed = 0;
-    if (!HardwareRNG::seed(seed)) {
-        LOG_WARN("Hardware RNG seed unavailable, using PRNG fallback");
-        // Use a hardware timer value as a fallback seed for better entropy
-        seed = micros();
-    }
-    LOG_DEBUG("Set random seed %u", seed);
-    randomSeed(seed);
+    union seedParts {
+        uint32_t seed32;
+        uint8_t seed8[4];
+    } seed;
+    nRFCrypto.begin();
+    nRFCrypto.Random.generate(seed.seed8, sizeof(seed.seed8));
+    LOG_DEBUG("Set random seed %u", seed.seed32);
+    randomSeed(seed.seed32);
+    nRFCrypto.end();

    // Set up nrfx watchdog. Do not enable the watchdog yet (we do that
    // the first time through the main loop), so that other threads can
@@ -1,5 +1,4 @@
 #include "CryptoEngine.h"
-#include "HardwareRNG.h"
 #include "PortduinoGPIO.h"
 #include "SPIChip.h"
 #include "mesh/RF95Interface.h"
@@ -9,10 +8,13 @@
 #include "PortduinoGlue.h"
 #include "SHA256.h"
 #include "api/ServerAPI.h"
+#include "linux/gpio/LinuxGPIOPin.h"
 #include "meshUtils.h"
 #include <ErriezCRC32.h>
 #include <Utility.h>
 #include <assert.h>
+#include <bluetooth/bluetooth.h>
+#include <bluetooth/hci.h>
 #include <filesystem>
 #include <fstream>
 #include <iostream>
@@ -22,12 +24,6 @@
 #include <sys/ioctl.h>
 #include <unistd.h>

-#ifdef PORTDUINO_LINUX_HARDWARE
-#include "linux/gpio/LinuxGPIOPin.h"
-#include <bluetooth/bluetooth.h>
-#include <bluetooth/hci.h>
-#endif
-
 #ifdef PORTDUINO_LINUX_HARDWARE
 #include <cxxabi.h>
 #endif
@@ -133,9 +129,9 @@ void getMacAddr(uint8_t *dmac)
        }
    } else if (portduino_config.mac_address.length() > 11) {
        MAC_from_string(portduino_config.mac_address, dmac);
-        return;
+        exit;
    } else {
-#ifdef PORTDUINO_LINUX_HARDWARE
+
        struct hci_dev_info di = {0};
        di.dev_id = 0;
        bdaddr_t bdaddr;
@@ -155,11 +151,6 @@ void getMacAddr(uint8_t *dmac)
        dmac[3] = di.bdaddr.b[2];
        dmac[4] = di.bdaddr.b[1];
        dmac[5] = di.bdaddr.b[0];
-#else
-        // No BlueZ on non-Linux hosts (e.g. macOS). Leave dmac at its default;
-        // the caller can override via the --hwid CLI flag or the YAML config.
-        (void)dmac;
-#endif
    }
 }

@@ -242,9 +233,7 @@ void portduinoSetup()
        std::cout << "Running in simulated mode." << std::endl;
        portduino_config.MaxNodes = 200; // Default to 200 nodes
        // Set the random seed equal to TCPPort to have a different seed per instance
-        uint32_t seed = TCPPort;
-        HardwareRNG::seed(seed);
-        randomSeed(seed);
+        randomSeed(TCPPort);
        return;
    }

@@ -490,17 +479,10 @@ void portduinoSetup()
            exit(EXIT_FAILURE);
        }
        char serial[9] = {0};
-        // Pass the full buffer size (9 = 8 chars + null) to getSerialString,
-        // not 8. The function treats `len` as buffer size and reserves one
-        // slot for the null terminator, so passing 8 produced a 7-char serial
-        // and broke the `strlen(serial) == 8` check below — masked on Linux
-        // by the BlueZ HCI MAC fallback in getMacAddr(), but on macOS (where
-        // the BlueZ path is __linux__-guarded) it left mac_address empty and
-        // meshtasticd refused to start.
-        ch341Hal->getSerialString(serial, sizeof(serial));
+        ch341Hal->getSerialString(serial, 8);
        std::cout << "CH341 Serial " << serial << std::endl;
        char product_string[96] = {0};
-        ch341Hal->getProductString(product_string, sizeof(product_string));
+        ch341Hal->getProductString(product_string, 95);
        std::cout << "CH341 Product " << product_string << std::endl;
        if (strlen(serial) == 8 && portduino_config.mac_address.length() < 12) {
            std::cout << "Deriving MAC address from Serial and Product String" << std::endl;
@@ -530,9 +512,7 @@ void portduinoSetup()
 #endif
    printf("MAC ADDRESS: %02X:%02X:%02X:%02X:%02X:%02X\n", dmac[0], dmac[1], dmac[2], dmac[3], dmac[4], dmac[5]);
    // Rather important to set this, if not running simulated.
-    uint32_t seed = static_cast<uint32_t>(time(NULL));
-    HardwareRNG::seed(seed);
-    randomSeed(seed);
+    randomSeed(time(NULL));

    std::string defaultGpioChipName = gpioChipName + std::to_string(portduino_config.lora_default_gpiochip);

@@ -665,9 +645,7 @@ void portduinoSetup()
    if (verboseEnabled && portduino_config.logoutputlevel != level_trace) {
        portduino_config.logoutputlevel = level_debug;
    }
-    if (portduino_config.lora_spi_dev != "") {
-        portduinoSetOptions({.realHardware = true});
-    }
+
    return;
 }

@@ -5,7 +5,6 @@
 #include "platform/portduino/PortduinoGlue.h"
 #include <RadioLib.h>
 #include <csignal>
-#include <cstring>
 #include <iostream>
 #include <libpinedio-usb.h>
 #include <unistd.h>
@@ -35,7 +34,7 @@ class Ch341Hal : public RadioLibHal
        : RadioLibHal(PI_INPUT, PI_OUTPUT, PI_LOW, PI_HIGH, PI_RISING, PI_FALLING)
    {
        if (serial != "") {
-            std::strncpy(pinedio.serial_number, serial.c_str(), 8);
+            strncpy(pinedio.serial_number, serial.c_str(), 8);
            pinedio_set_option(&pinedio, PINEDIO_OPTION_SEARCH_SERIAL, 1);
        }
        // LOG_INFO("USB Serial: %s", pinedio.serial_number);
@@ -60,11 +59,8 @@ class Ch341Hal : public RadioLibHal

    void getSerialString(char *_serial, size_t len)
    {
-        if (len == 0)
-            return;
-        size_t bytesCopied = (len - 1) < 8 ? (len - 1) : 8;
-        std::strncpy(_serial, pinedio.serial_number, bytesCopied);
-        _serial[bytesCopied] = '\0';
+        len = len > 8 ? 8 : len;
+        strncpy(_serial, pinedio.serial_number, len);
    }

    void getProductString(char *_product_string, size_t len)
@@ -1,4 +1,3 @@
-#include "HardwareRNG.h"
 #include "configuration.h"
 #include "hardware/xosc.h"
 #include <hardware/clocks.h>
@@ -99,12 +98,10 @@ void getMacAddr(uint8_t *dmac)

 void rp2040Setup()
 {
-    /* Sets a random seed to make sure we get different random numbers on each boot. */
-    uint32_t seed = 0;
-    if (!HardwareRNG::seed(seed)) {
-        seed = rp2040.hwrand32();
-    }
-    randomSeed(seed);
+    /* Sets a random seed to make sure we get different random numbers on each boot.
+       Taken from CPU cycle counter and ROSC oscillator, so should be pretty random.
+    */
+    randomSeed(rp2040.hwrand32());

 #ifdef RP2040_SLOW_CLOCK
    uint f_pll_sys = frequency_count_khz(CLOCKS_FC0_SRC_VALUE_PLL_SYS_CLKSRC_PRIMARY);
@@ -81,7 +81,7 @@ extern RAK9154Sensor rak9154Sensor;
 extern XPowersLibInterface *PMU;
 #endif

-class Power : public concurrency::OSThread
+class Power : private concurrency::OSThread
 {

  public:
@@ -96,14 +96,6 @@ class Power : public concurrency::OSThread
    void setStatusHandler(meshtastic::PowerStatus *handler) { statusHandler = handler; }
    const uint16_t OCV[11] = {OCV_ARRAY};

-#ifdef ARCH_ESP32
-    int beforeLightSleep(void *unused);
-    int afterLightSleep(esp_sleep_wakeup_cause_t cause);
-#endif
-
-    void attachPowerInterrupts();
-    void detachPowerInterrupts();
-
  protected:
    meshtastic::PowerStatus *statusHandler;

@@ -128,14 +120,6 @@ class Power : public concurrency::OSThread
    // open circuit voltage lookup table
    uint8_t low_voltage_counter;
    uint32_t lastLogTime = 0;
-
-#ifdef ARCH_ESP32
-    // Get notified when lightsleep begins and ends
-    CallbackObserver<Power, void *> lsObserver = CallbackObserver<Power, void *>(this, &Power::beforeLightSleep);
-    CallbackObserver<Power, esp_sleep_wakeup_cause_t> lsEndObserver =
-        CallbackObserver<Power, esp_sleep_wakeup_cause_t>(this, &Power::afterLightSleep);
-#endif
-
 #ifdef DEBUG_HEAP
    uint32_t lastheap;
 #endif
@@ -497,12 +497,13 @@ esp_sleep_wakeup_cause_t doLightSleep(uint64_t sleepMsec) // FIXME, use a more r
    esp_sleep_wakeup_cause_t cause = esp_sleep_get_wakeup_cause();
    notifyLightSleepEnd.notifyObservers(cause); // Button interrupts are reattached here

+#ifdef BUTTON_PIN
    if (cause == ESP_SLEEP_WAKEUP_GPIO) {
-        LOG_INFO("Exit light sleep gpio");
-        // If we woke because of a GPIO, it's possible power needs to run to handle.
-        power->setIntervalFromNow(0);
-        runASAP = true;
-    } else {
+        LOG_INFO("Exit light sleep gpio: btn=%d",
+                 !digitalRead(config.device.button_gpio ? config.device.button_gpio : BUTTON_PIN));
+    } else
+#endif
+    {
        LOG_INFO("Exit light sleep cause: %d", cause);
    }

@@ -1,322 +0,0 @@
-# Native Unit Tests — Authoring Guide
-
-This directory contains C++ unit tests that run on the host machine via PlatformIO's native environment. Tests use the [Unity](http://www.throwtheswitch.org/unity) framework.
-
-## Running Tests
-
-```bash
-# All test suites
-pio test -e native
-
-# Single suite
-pio test -e native -f test_your_module
-
-# Verbose (shows build errors in detail)
-pio test -e native -f test_your_module -vvv
-```
-
-### Helper Scripts (Useful Shortcuts)
-
-These wrappers are handy when local host dependencies are missing or when you want repeatable commands.
-
-```bash
-# Run native tests in Docker (recommended on macOS / non-Linux hosts)
-./bin/test-native-docker.sh
-
-# Pass normal PlatformIO test args through to Dockerized test run
-./bin/test-native-docker.sh -f test_your_module
-
-# Force Docker image rebuild (after dependency changes)
-./bin/test-native-docker.sh --rebuild
-
-# Run simulator integration check (build native first)
-pio run -e native && ./bin/test-simulator.sh
-
-# Build and run meshtasticd natively
-./bin/native-run.sh
-
-# Build and run under gdbserver on localhost:2345
-./bin/native-gdbserver.sh
-
-# Build native release artifact into ./release/
-./bin/build-native.sh native
-```
-
-Notes:
-
- The repository script name is `./bin/test-simulator.sh` (there is no `test-native-simulator.sh`).
- `./bin/test-native-docker.sh` is the closest match to CI behavior for native tests and avoids host package setup.
-
-### System Dependencies (Ubuntu/Debian)
-
-The native build requires several system libraries. Install them all at once:
-
-```bash
-sudo apt-get install -y \
-  libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev \
-  libulfius-dev liborcania-dev libusb-1.0-0-dev libi2c-dev libuv1-dev
-```
-
-See `.github/actions/setup-native/action.yml` for the canonical list.
-
-## Creating a New Test Suite
-
-### 1. Directory Structure
-
-```text
-test/test_your_module/test_main.cpp
-```
-
-One file per suite. No per-test `platformio.ini` is needed — tests build under the `[env:native]` environment defined in the root `platformio.ini`.
-
-### 2. File Skeleton
-
-```cpp
-#include "MeshTypes.h"      // Include BEFORE TestUtil.h (provides NodeNum, etc.)
-#include "TestUtil.h"        // initializeTestEnvironment(), testDelay()
-#include <unity.h>
-
-#if YOUR_FEATURE_GUARD       // Same #if guard as the module under test
-
-#include "FSCommon.h"
-#include "gps/RTC.h"
-#include "mesh/NodeDB.h"
-#include "modules/YourModule.h"
-#include <cstdio>
-#include <cstring>
-#include <memory>
-
-// --- Test output helpers ---
-// Unity swallows printf/stdout. Only TEST_MESSAGE() output appears in results.
-#define MSG_BUF_LEN 200
-#define TEST_MSG_FMT(fmt, ...) do { \
-    char _buf[MSG_BUF_LEN]; \
-    snprintf(_buf, sizeof(_buf), fmt, __VA_ARGS__); \
-    TEST_MESSAGE(_buf); \
-} while(0)
-
-// --- Tests ---
-
-void test_example()
-{
-    TEST_MESSAGE("=== Example test ===");
-    TEST_ASSERT_TRUE(true);
-}
-
-// --- Unity lifecycle ---
-
-void setUp(void) { /* runs before every test */ }
-void tearDown(void) { /* runs after every test */ }
-
-void setup()
-{
-    initializeTestEnvironment();   // MUST call — sets up RTC, OSThread, console
-    UNITY_BEGIN();
-    RUN_TEST(test_example);
-    exit(UNITY_END());             // exit() required — Unity runner expects it
-}
-
-void loop() {}
-
-#else // !YOUR_FEATURE_GUARD
-
-void setUp(void) {}
-void tearDown(void) {}
-
-void setup()
-{
-    initializeTestEnvironment();
-    UNITY_BEGIN();
-    exit(UNITY_END());
-}
-
-void loop() {}
-
-#endif
-```
-
-### 3. Feature Guard
-
-Wrap the entire test body in the same `#if` guard the module uses (e.g. `#if HAS_VARIABLE_HOPS`, `#if !MESHTASTIC_EXCLUDE_GPS`). When the feature is disabled, the `#else` branch produces an empty passing suite.
-
-## Common Patterns
-
-### MockNodeDB
-
-Most module tests need to inject nodes with controlled hop distances and ages:
-
-```cpp
-class MockNodeDB : public NodeDB
-{
-  public:
-    void clearTestNodes()
-    {
-        testNodes.clear();
-        numMeshNodes = 0;
-    }
-
-    void addTestNode(NodeNum num, uint8_t hopsAway, bool hasHops,
-                     uint32_t ageSecs, bool viaMqtt = false)
-    {
-        meshtastic_NodeInfoLite node = meshtastic_NodeInfoLite_init_zero;
-        node.num = num;
-        node.has_hops_away = hasHops;
-        node.hops_away = hopsAway;
-        node.via_mqtt = viaMqtt;
-        node.last_heard = getTime() - ageSecs;
-        testNodes.push_back(node);
-        meshNodes = &testNodes;
-        numMeshNodes = testNodes.size();
-    }
-
-    std::vector<meshtastic_NodeInfoLite> testNodes;
-};
-
-static MockNodeDB *mockNodeDB = nullptr;
-```
-
-Set `nodeDB = mockNodeDB;` in `setUp()`.
-
-### Test Shim (Exposing Protected/Private Members)
-
-Subclass the module under test to make protected methods callable and private members writable:
-
-```cpp
-class YourModuleTestShim : public YourModule
-{
-  public:
-    // Expose protected methods
-    using YourModule::runOnce;
-    using YourModule::someProtectedMethod;
-
-    // Access private members via friend (see below)
-    void setPrivateField(int x) { privateField = x; }
-};
-```
-
-In the module header, grant friend access under the `UNIT_TEST` define (set automatically by PlatformIO's test framework):
-
-```cpp
-// In YourModule.h, inside the class body:
-#ifdef UNIT_TEST
-    friend class YourModuleTestShim;
-#endif
-```
-
-### Global Singleton Lifecycle
-
-Most modules use a global pointer (`extern YourModule *yourModule;`). Manage it carefully:
-
-```cpp
-void setUp(void) {
-    // ... setup ...
-}
-
-void tearDown(void) {
-    yourModule = nullptr;   // prevent dangling pointer between tests
-}
-
-void test_something() {
-    auto shim = std::unique_ptr<YourModuleTestShim>(new YourModuleTestShim());
-    yourModule = shim.get();
-    // ... test ...
-    yourModule = nullptr;
-}
-```
-
-## Pitfalls and How to Avoid Them
-
-### 1. Persisted Filesystem State Leaks Between Tests
-
-Modules that save state to `/prefs/*.bin` will have that state loaded by the next test's constructor via `loadState()`. This causes values from one test (e.g. rolling averages from a megamesh scenario) to bleed into unrelated tests.
-
-**Fix:** Delete state files at the start of `setUp()`:
-
-```cpp
-void setUp(void) {
-    // ...
-#ifdef FSCom
-    FSCom.remove("/prefs/your_module.bin");
-#endif
-}
-```
-
-### 2. File-Scope Mutable Globals Persist Across Tests
-
-Variables like `static uint8_t someDenominator = 8;` in the module `.cpp` file retain mutations from previous tests. This is distinct from member variables — it affects all instances.
-
-**Fix:** Add a `static void resetGlobal()` method to the module and call it in `setUp()`.
-
-### 3. Randomness Breaks Determinism
-
-If the module uses `rand()` for jitter or similar, test results become non-reproducible.
-
-**Fix:** Add a static enable/disable flag:
-
-```cpp
-// Module header:
-static void setJitter(bool enabled) { s_jitterEnabled = enabled; }
-
-// Test setUp:
-YourModule::setJitter(false);
-
-// Test tearDown:
-YourModule::setJitter(true);
-```
-
-### 4. Time-Dependent Logic Produces Zeros
-
-Rolling averages weighted by `elapsedMs / ONE_HOUR_MS` collapse to zero when tests complete in microseconds. Sample windows, EMA alphas, and interval-based accumulators all suffer from this.
-
-**Fix:** Expose the timestamp via friend access and simulate realistic elapsed time:
-
-```cpp
-// In test shim:
-void setWindowStartMs(uint32_t ms) { windowStartMs = ms; }
-
-// In test:
-shim.setWindowStartMs(millis() - 3600000UL);  // pretend 1 hour elapsed
-```
-
-### 5. Capacity Limits Cause Cascading Failures
-
-Fixed-size data structures (hash sets, ring buffers) overflow when tests inject more data than fits. This triggers early flushes with near-zero time fractions, compounding the time-dependent-zeros problem.
-
-**Fix:** Simulate multiple realistic time windows rather than one massive burst. Let adaptive mechanisms (if any) self-tune over several rolls.
-
-## setUp/tearDown Checklist
-
- [ ] Create and clear MockNodeDB (if needed)
- [ ] Zero global configs: `config`, `moduleConfig`, `myNodeInfo`
- [ ] Set `nodeDB = mockNodeDB`
- [ ] Delete persisted state files (`FSCom.remove(...)`)
- [ ] Reset file-scope mutable globals
- [ ] Disable randomness/jitter flags
- [ ] In `tearDown`: null the global singleton pointer, restore flags
-
-## Test Organization
-
-A well-structured test suite follows this pattern:
-
-1. **Topology/scenario builders** — static helper functions that set up specific test conditions
-2. **Injection helpers** — simulate realistic traffic, time, or event patterns
-3. **Scenario tests** — each builds a scenario, runs the module, asserts on outcomes
-4. **Lifecycle tests** — state persistence, startup from blank, restart recovery
-5. **Summary test** (optional) — emits a scenario table into the log for quick CI review
-
-## Existing Test Suites
-
-| Suite                        | Module Under Test             |
-| ---------------------------- | ----------------------------- |
-| `test_crypto`                | CryptoEngine                  |
-| `test_mqtt`                  | MQTT integration              |
-| `test_radio`                 | Radio interface               |
-| `test_mesh_module`           | Module framework              |
-| `test_meshpacket_serializer` | Packet serialization          |
-| `test_transmit_history`      | Retransmission tracking       |
-| `test_atak`                  | ATAK integration              |
-| `test_default`               | Default configuration helpers |
-| `test_http_content_handler`  | HTTP handling                 |
-| `test_serial`                | Serial communication          |
-| `test_hop_scaling`           | Hop scaling algorithm         |
-| `test_traffic_management`    | Traffic management            |
@@ -127,60 +127,6 @@ void test_client_uses_public_channel_minimums()
    TEST_ASSERT_EQUAL_UINT32(60 * 60, position);
 }

-// --- Saturation/clamp tests for getConfiguredOrDefaultMs[Scaled] ---
-// These guard the INT32_MAX clamp added to avoid uint32 wrap of secs*1000 and
-// to keep results safe to cast to int32_t for OSThread runOnce returns.
-
-void test_ms_below_threshold()
-{
-    // Ordinary value passes through unchanged.
-    TEST_ASSERT_EQUAL_UINT32(60000U, Default::getConfiguredOrDefaultMs(60, 0));
-}
-
-void test_ms_at_threshold()
-{
-    // INT32_MAX / 1000 = 2,147,483 — largest secs that does not clamp.
-    TEST_ASSERT_EQUAL_UINT32(2147483000U, Default::getConfiguredOrDefaultMs(2147483U, 0));
-}
-
-void test_ms_just_above_threshold()
-{
-    // One second over the boundary must saturate, not wrap.
-    TEST_ASSERT_EQUAL_UINT32(static_cast<uint32_t>(INT32_MAX), Default::getConfiguredOrDefaultMs(2147484U, 0));
-}
-
-void test_ms_uint32_max()
-{
-    // default_sds_secs == UINT32_MAX on non-routers must not wrap.
-    TEST_ASSERT_EQUAL_UINT32(static_cast<uint32_t>(INT32_MAX), Default::getConfiguredOrDefaultMs(UINT32_MAX, 0));
-}
-
-void test_ms_default_clamps()
-{
-    // Clamp also applies when the default-arg path is taken (configured == 0).
-    TEST_ASSERT_EQUAL_UINT32(static_cast<uint32_t>(INT32_MAX), Default::getConfiguredOrDefaultMs(0, UINT32_MAX));
-}
-
-void test_ms_result_is_int32_safe()
-{
-    // Regression guard for runOnce returns: cast to int32_t must not go negative.
-    int32_t result = static_cast<int32_t>(Default::getConfiguredOrDefaultMs(UINT32_MAX, 0));
-    TEST_ASSERT_GREATER_OR_EQUAL_INT32(0, result);
-}
-
-void test_scaled_overflow_saturates()
-{
-    // long_fast (SF11/BW250) with a 24h base and heavy congestion overflows
-    // the uint32 result without the double-precision guard. Must saturate.
-    config.device.role = meshtastic_Config_DeviceConfig_Role_CLIENT;
-    config.lora.use_preset = false;
-    config.lora.spread_factor = 11;
-    config.lora.bandwidth = 250;
-
-    uint32_t res = Default::getConfiguredOrDefaultMsScaled(0, ONE_DAY, 1000);
-    TEST_ASSERT_EQUAL_UINT32(static_cast<uint32_t>(INT32_MAX), res);
-}
-
 void setup()
 {
    // Small delay to match other test mains
@@ -194,13 +140,6 @@ void setup()
    RUN_TEST(test_router_uses_router_minimums);
    RUN_TEST(test_router_late_uses_router_minimums);
    RUN_TEST(test_client_uses_public_channel_minimums);
-    RUN_TEST(test_ms_below_threshold);
-    RUN_TEST(test_ms_at_threshold);
-    RUN_TEST(test_ms_just_above_threshold);
-    RUN_TEST(test_ms_uint32_max);
-    RUN_TEST(test_ms_default_clamps);
-    RUN_TEST(test_ms_result_is_int32_safe);
-    RUN_TEST(test_scaled_overflow_saturates);
    exit(UNITY_END());
 }

@@ -303,10 +303,6 @@ void setup()
 {
    initializeTestEnvironment();

-    // Wait for portduino's millis() clock to start ticking before tests run
-    testDelay(10);
-    testDelay(2000);
-
    UNITY_BEGIN();

    RUN_TEST(test_setLastSentToMesh_stores_millis);
@@ -1,197 +0,0 @@
-#include "meshUtils.h"
-#include <cstring>
-#include <unity.h>
-
-void setUp(void) {}
-void tearDown(void) {}
-
-// --- Valid UTF-8 should pass through unchanged ---
-
-void test_ascii_unchanged()
-{
-    char buf[32] = "Hello World";
-    TEST_ASSERT_FALSE(sanitizeUtf8(buf, sizeof(buf)));
-    TEST_ASSERT_EQUAL_STRING("Hello World", buf);
-}
-
-void test_valid_2byte_unchanged()
-{
-    // "café" — é is C3 A9
-    char buf[16] = "caf\xC3\xA9";
-    TEST_ASSERT_FALSE(sanitizeUtf8(buf, sizeof(buf)));
-    TEST_ASSERT_EQUAL_STRING("caf\xC3\xA9", buf);
-}
-
-void test_valid_3byte_unchanged()
-{
-    // "€" is E2 82 AC
-    char buf[16] = "\xE2\x82\xAC";
-    TEST_ASSERT_FALSE(sanitizeUtf8(buf, sizeof(buf)));
-    TEST_ASSERT_EQUAL_STRING("\xE2\x82\xAC", buf);
-}
-
-void test_valid_4byte_emoji_unchanged()
-{
-    // 🌙 is F0 9F 8C 99
-    char buf[16] = "\xF0\x9F\x8C\x99";
-    TEST_ASSERT_FALSE(sanitizeUtf8(buf, sizeof(buf)));
-    TEST_ASSERT_EQUAL_STRING("\xF0\x9F\x8C\x99", buf);
-}
-
-void test_valid_mixed_unchanged()
-{
-    // "Hi 🌙!" — mix of ASCII and 4-byte
-    char buf[16] = "Hi \xF0\x9F\x8C\x99!";
-    TEST_ASSERT_FALSE(sanitizeUtf8(buf, sizeof(buf)));
-    TEST_ASSERT_EQUAL_STRING("Hi \xF0\x9F\x8C\x99!", buf);
-}
-
-void test_empty_string()
-{
-    char buf[8] = "";
-    TEST_ASSERT_FALSE(sanitizeUtf8(buf, sizeof(buf)));
-    TEST_ASSERT_EQUAL_STRING("", buf);
-}
-
-// --- Invalid sequences observed in the wild ---
-
-void test_truncated_4byte_at_end()
-{
-    // Name with valid emoji 🌙 followed by a truncated 4-byte sequence + ASCII
-    char buf[32] = "Lunar Tower \xF0\x9F\x8C\x99\xF0\x9F\x97"
-                   "4";
-    TEST_ASSERT_TRUE(sanitizeUtf8(buf, sizeof(buf)));
-    // The 🌙 should be preserved; F0 9F 97 is an incomplete 4-byte sequence,
-    // '4' (0x34) is not a valid continuation byte
-    TEST_ASSERT_EQUAL_STRING("Lunar Tower \xF0\x9F\x8C\x99???4", buf);
-}
-
-void test_lone_lead_bytes_without_continuations()
-{
-    // Mixed ASCII with stray multibyte lead bytes (E1, F3) lacking proper continuations
-    char buf[32] = "Mesht\xE1\xF3tic 37e2";
-    TEST_ASSERT_TRUE(sanitizeUtf8(buf, sizeof(buf)));
-    // E1 expects 2 continuation bytes, but F3 is not a continuation → E1 replaced
-    // F3 expects 3 continuation bytes, 't','i','c' are not continuations → F3 replaced
-    TEST_ASSERT_EQUAL_STRING("Mesht??tic 37e2", buf);
-}
-
-// --- Edge cases ---
-
-void test_bare_continuation_byte()
-{
-    // 0x80 alone is invalid (continuation byte with no lead)
-    char buf[8] = "\x80";
-    TEST_ASSERT_TRUE(sanitizeUtf8(buf, sizeof(buf)));
-    TEST_ASSERT_EQUAL_STRING("?", buf);
-}
-
-void test_overlong_2byte()
-{
-    // C0 AF is an overlong encoding of U+002F '/'
-    char buf[8] = "\xC0\xAF";
-    TEST_ASSERT_TRUE(sanitizeUtf8(buf, sizeof(buf)));
-    // C0 is a 2-byte lead, AF is valid continuation, but codepoint 0x2F < 0x80 → overlong
-    // C0 replaced, AF (now bare continuation) also replaced
-    TEST_ASSERT_EQUAL_STRING("??", buf);
-}
-
-void test_surrogate_half()
-{
-    // ED A0 80 encodes U+D800 (surrogate half — invalid in UTF-8)
-    char buf[8] = "\xED\xA0\x80";
-    TEST_ASSERT_TRUE(sanitizeUtf8(buf, sizeof(buf)));
-    TEST_ASSERT_EQUAL_STRING("???", buf);
-}
-
-void test_5byte_sequence_rejected()
-{
-    // F8 80 80 80 80 — 5-byte sequence, not valid UTF-8
-    char buf[8] = "\xF8\x80\x80\x80\x80";
-    TEST_ASSERT_TRUE(sanitizeUtf8(buf, sizeof(buf)));
-    // F8 is invalid lead (>= 0xF8), each 0x80 is bare continuation
-    TEST_ASSERT_EQUAL_STRING("?????", buf);
-}
-
-void test_truncated_3byte_at_buffer_end()
-{
-    // Buffer is exactly 4 bytes: E2 82 then forced null at [3]
-    char buf[4];
-    buf[0] = '\xE2';
-    buf[1] = '\x82';
-    buf[2] = '\0'; // String ends before the 3-byte sequence completes
-    buf[3] = '\0';
-    TEST_ASSERT_TRUE(sanitizeUtf8(buf, sizeof(buf)));
-    TEST_ASSERT_EQUAL_STRING("??", buf);
-}
-
-void test_null_termination_enforced()
-{
-    // Fill buffer completely with no null terminator
-    char buf[5];
-    memset(buf, 'A', sizeof(buf));
-    TEST_ASSERT_TRUE(sanitizeUtf8(buf, sizeof(buf)));
-    // Should be null-terminated and content preserved (all ASCII)
-    TEST_ASSERT_EQUAL_STRING("AAAA", buf);
-}
-
-void test_null_buffer()
-{
-    TEST_ASSERT_FALSE(sanitizeUtf8(nullptr, 10));
-}
-
-void test_zero_size()
-{
-    char buf[4] = "Hi";
-    TEST_ASSERT_FALSE(sanitizeUtf8(buf, 0));
-    // Buffer should be untouched
-    TEST_ASSERT_EQUAL_STRING("Hi", buf);
-}
-
-void test_valid_max_codepoint()
-{
-    // U+10FFFF = F4 8F BF BF (maximum valid Unicode codepoint)
-    char buf[8] = "\xF4\x8F\xBF\xBF";
-    TEST_ASSERT_FALSE(sanitizeUtf8(buf, sizeof(buf)));
-    TEST_ASSERT_EQUAL_STRING("\xF4\x8F\xBF\xBF", buf);
-}
-
-void test_above_max_codepoint()
-{
-    // U+110000 = F4 90 80 80 (just above maximum valid Unicode)
-    char buf[8] = "\xF4\x90\x80\x80";
-    TEST_ASSERT_TRUE(sanitizeUtf8(buf, sizeof(buf)));
-}
-
-void setup()
-{
-    UNITY_BEGIN();
-
-    // Valid UTF-8 passthrough
-    RUN_TEST(test_ascii_unchanged);
-    RUN_TEST(test_valid_2byte_unchanged);
-    RUN_TEST(test_valid_3byte_unchanged);
-    RUN_TEST(test_valid_4byte_emoji_unchanged);
-    RUN_TEST(test_valid_mixed_unchanged);
-    RUN_TEST(test_empty_string);
-
-    // Invalid sequences observed in the wild
-    RUN_TEST(test_truncated_4byte_at_end);
-    RUN_TEST(test_lone_lead_bytes_without_continuations);
-
-    // Edge cases
-    RUN_TEST(test_bare_continuation_byte);
-    RUN_TEST(test_overlong_2byte);
-    RUN_TEST(test_surrogate_half);
-    RUN_TEST(test_5byte_sequence_rejected);
-    RUN_TEST(test_truncated_3byte_at_buffer_end);
-    RUN_TEST(test_null_termination_enforced);
-    RUN_TEST(test_null_buffer);
-    RUN_TEST(test_zero_size);
-    RUN_TEST(test_valid_max_codepoint);
-    RUN_TEST(test_above_max_codepoint);
-
-    exit(UNITY_END());
-}
-
-void loop() {}
@@ -8,6 +8,7 @@ build_flags =
  -I variants/esp32/chatter2
  -DMESHTASTIC_EXCLUDE_WEBSERVER=1
  -DMESHTASTIC_EXCLUDE_PAXCOUNTER=1
+  -ULED_BUILTIN
  
 lib_deps =
  ${esp32_base.lib_deps}
@@ -10,6 +10,7 @@ build_flags =
  -D EBYTE_E22
  -D EBYTE_E22_900M30S ; Assume Tx power curve is identical to 900M30S as there is no documentation
  -I variants/esp32/diy/9m2ibr_aprs_lora_tracker
+  -ULED_BUILTIN
 build_src_filter =
  ${esp32_base.build_src_filter}
  +<../variants/esp32/diy/9m2ibr_aprs_lora_tracker>
@@ -14,3 +14,4 @@ build_flags =
  ${esp32_base.build_flags}
  -D DIY_V1
  -I variants/esp32/diy/hydra
+  -ULED_BUILTIN
@@ -17,3 +17,4 @@ build_flags =
  -D DIY_V1
  -D EBYTE_E22
  -I variants/esp32/diy/v1
+  -ULED_BUILTIN
@@ -14,3 +14,4 @@ build_flags =
  ${esp32_base.build_flags}
  -D HELTEC_V2_1
  -I variants/esp32/heltec_v2.1
+  -ULED_BUILTIN
@@ -14,3 +14,4 @@ build_flags =
  ${esp32_base.build_flags}
  -D HELTEC_V2_0
  -I variants/esp32/heltec_v2
+  -ULED_BUILTIN
@@ -19,7 +19,7 @@ build_flags =
 lib_deps = 
  ${esp32_base.lib_deps}
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
-  zinggjm/GxEPD2@1.6.9
+  zinggjm/GxEPD2@1.6.8
  # renovate: datasource=custom.pio depName=SensorLib packageName=lewisxhe/library/SensorLib
  lewisxhe/SensorLib@0.3.4
 lib_ignore =
@@ -14,3 +14,4 @@ build_flags =
  ${esp32_base.build_flags}
  -D NANO_G1_EXPLORER
  -I variants/esp32/nano-g1-explorer
+  -ULED_BUILTIN
@@ -14,3 +14,4 @@ build_flags =
  ${esp32_base.build_flags}
  -D NANO_G1
  -I variants/esp32/nano-g1
+  -ULED_BUILTIN
@@ -9,6 +9,7 @@ build_flags =
  -DHAS_STK8XXX=1
  -O2
  -I variants/esp32/radiomaster_900_bandit
+  -ULED_BUILTIN
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
 lib_deps =
@@ -13,5 +13,6 @@ build_flags =
  -DCONFIG_DISABLE_HAL_LOCKS=1
  -O2
  -I variants/esp32/radiomaster_900_bandit_nano
+  -ULED_BUILTIN
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
@@ -16,5 +16,6 @@ build_flags =
  -DCONFIG_DISABLE_HAL_LOCKS=1
  -O2
  -I variants/esp32/radiomaster_900_bandit_nano
+  -ULED_BUILTIN
 board_build.f_cpu = 240000000L
 upload_protocol = esptool
@@ -14,3 +14,4 @@ build_flags =
  ${esp32_base.build_flags}
  -D STATION_G1
  -I variants/esp32/station-g1
+  -ULED_BUILTIN
@@ -16,6 +16,7 @@ board_check = true
 build_flags = ${esp32_base.build_flags}
  -D TBEAM_V10
  -I variants/esp32/tbeam
+  -ULED_BUILTIN
 upload_speed = 921600

 [env:tbeam-displayshield]
@@ -13,4 +13,5 @@ build_flags =
  ${esp32_base.build_flags}
  -D TLORA_V1
  -I variants/esp32/tlora_v1
+  -ULED_BUILTIN
 upload_speed = 115200
@@ -12,7 +12,7 @@ extends = esp32_base
 board = ttgo-lora32-v21
 board_check = true
 build_flags = 
-  ${esp32_base.build_flags} -D TLORA_V2_1_16 -I variants/esp32/tlora_v2_1_16
+  ${esp32_base.build_flags} -D TLORA_V2_1_16 -I variants/esp32/tlora_v2_1_16 -ULED_BUILTIN
 upload_speed = 115200

 [env:sugarcube]
@@ -7,4 +7,5 @@ build_flags =
  -D TLORA_V2_1_16
  -I variants/esp32/tlora_v2_1_16
  -D LORA_TCXO_GPIO=33
+  -ULED_BUILTIN
 upload_speed = 115200
@@ -7,3 +7,4 @@ build_flags =
  -I variants/esp32/tlora_v2_1_16
  -D LORA_TCXO_GPIO=12
  -D BUTTON_PIN=0
+  -ULED_BUILTIN
@@ -8,3 +8,4 @@ build_flags =
  -I variants/esp32c6/tlora_c6
  -DARDUINO_USB_CDC_ON_BOOT=1
  -DARDUINO_USB_MODE=1
+  -ULED_BUILTIN
@@ -11,7 +11,7 @@ upload_speed = 921600
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
-  zinggjm/GxEPD2@1.6.9
+  zinggjm/GxEPD2@1.6.8
 build_unflags =
  ${esp32s3_base.build_unflags}
  -DARDUINO_USB_MODE=1
@@ -23,4 +23,4 @@ build_flags = ${esp32s3_base.build_flags}

 lib_deps = ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
-  zinggjm/GxEPD2@1.6.9
+  zinggjm/GxEPD2@1.6.8
@@ -6,4 +6,5 @@ board_build.partitions = default_8MB.csv
 build_flags = 
  ${esp32s3_base.build_flags} -I variants/esp32s3/heltec_capsule_sensor_v3
  -D HELTEC_CAPSULE_SENSOR_V3
+  -ULED_BUILTIN
  ;-D DEBUG_DISABLED ; uncomment this line to disable DEBUG output
@@ -7,3 +7,4 @@ build_flags =
  ${esp32s3_base.build_flags}
  -I variants/esp32s3/heltec_sensor_hub
  -D HELTEC_SENSOR_HUB
+  -ULED_BUILTIN
@@ -18,3 +18,4 @@ build_flags =
  ${esp32s3_base.build_flags}
  -D HELTEC_V3
  -I variants/esp32s3/heltec_v3
+  -ULED_BUILTIN
@@ -8,6 +8,7 @@ build_flags =
  -D HELTEC_V4
  -D HAS_LORA_FEM=1
  -I variants/esp32s3/heltec_v4
+  -ULED_BUILTIN


 [env:heltec-v4]
@@ -89,10 +90,8 @@ build_flags =
  -D VIEW_240x320
  -D DISPLAY_SET_RESOLUTION
  -D DISPLAY_SIZE=240x320 ; portrait mode
-  -D LGFX_SPI_3WIRE=true
  -D LGFX_PIN_SCK=17
  -D LGFX_PIN_MOSI=33
-  -D LGFX_PIN_MISO=-1
  -D LGFX_PIN_DC=16
  -D LGFX_PIN_CS=15
  -D LGFX_PIN_BL=21
@@ -125,7 +124,7 @@ build_flags =
  -D SCREEN_TRANSITION_FRAMERATE=5
  -D BRIGHTNESS_DEFAULT=130 ; Medium Low Brightness
  -D HAS_TOUCHSCREEN=1
-  -D TOUCH_I2C_PORT=1
+  -D TOUCH_I2C_PORT=0
  -D TOUCH_SLAVE_ADDRESS=0x2E
  -D SCREEN_TOUCH_INT=TOUCH_INT_PIN
  -D SCREEN_TOUCH_RST=TOUCH_RST_PIN
@@ -1,56 +0,0 @@
-#ifndef Pins_Arduino_h
-#define Pins_Arduino_h
-
-#include <stdint.h>
-
-#define USB_VID 0x303a
-#define USB_PID 0x1001
-
-static const uint8_t TX = 43;
-static const uint8_t RX = 44;
-
-static const uint8_t SDA = 17;
-static const uint8_t SCL = 18;
-
-static const uint8_t SS = 8;
-static const uint8_t MOSI = 10;
-static const uint8_t MISO = 11;
-static const uint8_t SCK = 9;
-
-static const uint8_t A0 = 1;
-static const uint8_t A1 = 2;
-static const uint8_t A2 = 3;
-static const uint8_t A3 = 4;
-static const uint8_t A4 = 5;
-static const uint8_t A5 = 6;
-static const uint8_t A6 = 7;
-static const uint8_t A7 = 8;
-static const uint8_t A8 = 9;
-static const uint8_t A9 = 10;
-static const uint8_t A10 = 11;
-static const uint8_t A11 = 12;
-static const uint8_t A12 = 13;
-static const uint8_t A13 = 14;
-static const uint8_t A14 = 15;
-static const uint8_t A15 = 16;
-static const uint8_t A16 = 17;
-static const uint8_t A17 = 18;
-static const uint8_t A18 = 19;
-static const uint8_t A19 = 20;
-
-static const uint8_t T1 = 1;
-static const uint8_t T2 = 2;
-static const uint8_t T3 = 3;
-static const uint8_t T4 = 4;
-static const uint8_t T5 = 5;
-static const uint8_t T6 = 6;
-static const uint8_t T7 = 7;
-static const uint8_t T8 = 8;
-static const uint8_t T9 = 9;
-static const uint8_t T10 = 10;
-static const uint8_t T11 = 11;
-static const uint8_t T12 = 12;
-static const uint8_t T13 = 13;
-static const uint8_t T14 = 14;
-
-#endif /* Pins_Arduino_h */
@@ -1,145 +0,0 @@
-[heltec_v4_r8_base] 
-extends = esp32s3_base
-board = heltec_v4_r8
-board_check = true
-board_build.partitions = default_16MB.csv
-build_flags = 
-  ${esp32s3_base.build_flags}
-  -D HELTEC_V4_R8
-  -D HAS_LORA_FEM=1
-  -D BOARD_HAS_PSRAM
-  -I variants/esp32s3/heltec_v4_r8
-  -ULED_BUILTIN
-
-[env:heltec-v4-r8-oled]
-custom_meshtastic_hw_model = 132
-custom_meshtastic_hw_model_slug = HELTEC_V4_R8
-custom_meshtastic_architecture = esp32-s3
-custom_meshtastic_actively_supported = true
-custom_meshtastic_support_level = 1
-custom_meshtastic_display_name = Heltec V4 R8
-custom_meshtastic_images = heltec_v4_r8.svg
-custom_meshtastic_tags = Heltec
-custom_meshtastic_requires_dfu = true
-custom_meshtastic_partition_scheme = 16MB
-
-extends = heltec_v4_r8_base
-build_flags = 
-  ${heltec_v4_r8_base.build_flags}
-  -D HELTEC_V4_R8_OLED
-  -D USE_SSD1306 ; Heltec_v4_R8 has an SSD1315 display (compatible with SSD1306 driver)
-  -D LED_POWER=46
-  -D RESET_OLED=21
-  -D I2C_SDA=17
-  -D I2C_SCL=18
-
-[env:heltec-v4-r8-tft]
-custom_meshtastic_hw_model = 132
-custom_meshtastic_hw_model_slug = HELTEC_V4_R8
-custom_meshtastic_architecture = esp32-s3
-custom_meshtastic_actively_supported = true
-custom_meshtastic_support_level = 1
-custom_meshtastic_display_name = Heltec V4 R8 TFT
-custom_meshtastic_images = heltec_v4_r8_tft.svg
-custom_meshtastic_tags = Heltec
-custom_meshtastic_requires_dfu = true
-custom_meshtastic_partition_scheme = 16MB
-
-extends = heltec_v4_r8_base
-build_flags = 
-  ${heltec_v4_r8_base.build_flags} ;-Os
-  -D HELTEC_V4_R8_TFT
-  -D I2C_SDA=17
-  -D I2C_SCL=18
-  -D PIN_BUTTON2=46
-  -D ALT_BUTTON_PIN=PIN_BUTTON2
-  -D ALT_BUTTON_ACTIVE_LOW=false
-  -D PIN_BUZZER=4
-  -D USE_PIN_BUZZER=PIN_BUZZER
-  -D CONFIG_ARDUHAL_LOG_COLORS
-  -D RADIOLIB_DEBUG_SPI=0
-  -D RADIOLIB_DEBUG_PROTOCOL=0
-  -D RADIOLIB_DEBUG_BASIC=0
-  -D RADIOLIB_VERBOSE_ASSERT=0
-  -D RADIOLIB_SPI_PARANOID=0
-  -D CONFIG_DISABLE_HAL_LOCKS=1
-  -D INPUTDRIVER_BUTTON_TYPE=0
-  -D HAS_SCREEN=1
-  -D HAS_TFT=1
-  -D RAM_SIZE=5120
-  -D LV_LVGL_H_INCLUDE_SIMPLE
-  -D LV_CONF_INCLUDE_SIMPLE
-  -D LV_COMP_CONF_INCLUDE_SIMPLE
-  -D LV_USE_SYSMON=0
-  -D LV_USE_PROFILER=0
-  -D LV_USE_PERF_MONITOR=0
-  -D LV_USE_MEM_MONITOR=0
-  -D LV_USE_LOG=0
-  -D LV_BUILD_TEST=0
-  -D USE_LOG_DEBUG
-  -D LOG_DEBUG_INC=\"DebugConfiguration.h\"
-  -D USE_PACKET_API
-  -D LGFX_DRIVER=LGFX_HELTEC_V4_TFT
-  -D GFX_DRIVER_INC=\"graphics/LGFX/LGFX_HELTEC_V4_TFT.h\"
-  -D VIEW_240x320
-  -D DISPLAY_SET_RESOLUTION
-  -D DISPLAY_SIZE=240x320 ; portrait mode
-  -D LGFX_SPI_3WIRE=false
-  -D LGFX_PIN_SCK=16
-  -D LGFX_PIN_MOSI=15
-  -D LGFX_PIN_MISO=45
-  -D LGFX_PIN_DC=48
-  -D LGFX_PIN_CS=47
-  -D LGFX_PIN_BL=44
-  -D LGFX_PIN_RST=21
-  -D CUSTOM_TOUCH_DRIVER
-  -D TOUCH_SDA_PIN=I2C_SDA
-  -D TOUCH_SCL_PIN=I2C_SCL
-  -D TOUCH_INT_PIN=-1
-  -D TOUCH_RST_PIN=-1
-;base UI
-  -D TFT_CS=LGFX_PIN_CS
-  -D ST7789_CS=TFT_CS
-  -D ST7789_RS=LGFX_PIN_DC
-  -D ST7789_SDA=LGFX_PIN_MOSI
-  -D ST7789_SCK=LGFX_PIN_SCK
-  -D ST7789_RESET=LGFX_PIN_RST
-  -D ST7789_MISO=LGFX_PIN_MISO
-  -D ST7789_BUSY=-1
-  -D ST7789_BL=LGFX_PIN_BL
-  -D ST7789_SPI_HOST=SPI3_HOST
-  -D TFT_BL=ST7789_BL
-  -D SPI_FREQUENCY=75000000
-  -D SPI_READ_FREQUENCY=SPI_FREQUENCY
-  -D SPI_3_WIRE=false
-  -D TFT_HEIGHT=320
-  -D TFT_WIDTH=240
-  -D TFT_OFFSET_X=0
-  -D TFT_OFFSET_Y=0
-  -D TFT_OFFSET_ROTATION=0
-  -D SCREEN_ROTATE
-  -D SCREEN_TRANSITION_FRAMERATE=5
-  -D BRIGHTNESS_DEFAULT=130 ; Medium Low Brightness
-  -D HAS_TOUCHSCREEN=1
-  -D TOUCH_I2C_PORT=0
-  -D TOUCH_SLAVE_ADDRESS=0x2E
-  -D SCREEN_TOUCH_INT=TOUCH_INT_PIN
-  -D SCREEN_TOUCH_RST=TOUCH_RST_PIN
-
-; Have SPI interface SD card slot
-  -D HAS_SDCARD
-  -D SDCARD_USE_SPI1
-  -D SDCARD_USER_SPI_BEGIN
-  -D SPI_MOSI=LGFX_PIN_MOSI
-  -D SPI_SCK=LGFX_PIN_SCK
-  -D SPI_MISO=LGFX_PIN_MISO
-  -D SPI_CS=3
-  -D SDCARD_CS=SPI_CS
-  -D SD_SPI_FREQUENCY=SPI_FREQUENCY
-
-lib_deps = ${heltec_v4_r8_base.lib_deps}
-  ${device-ui_base.lib_deps}
-  # renovate: datasource=custom.pio depName=LovyanGFX packageName=lovyan03/library/LovyanGFX
-  lovyan03/LovyanGFX@1.2.19
-  # renovate: datasource=git-refs depName=Quency-D_chsc6x packageName=https://github.com/Quency-D/chsc6x gitBranch=master
-  https://github.com/Quency-D/chsc6x/archive/3b2b6cebf3177b3e2c33d06e07909b0b10159516.zip
@@ -1,72 +0,0 @@
-#define VEXT_ENABLE 40 // active low, powers the oled display and the lora antenna boost
-#define VEXT_ON_VALUE LOW
-#define BUTTON_PIN 0
-
-#define BATTERY_PIN 1 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
-#define ADC_CHANNEL ADC1_GPIO1_CHANNEL
-#define ADC_ATTENUATION ADC_ATTEN_DB_2_5 // lower dB for high resistance voltage divider
-#define ADC_MULTIPLIER 4.9 * 1.035
-
-#define USE_SX1262
-#define LORA_DIO0 -1 // a No connect on the SX1262 module
-#define LORA_RESET 12
-#define LORA_DIO1 14 // SX1262 IRQ
-#define LORA_DIO2 13 // SX1262 BUSY
-#define LORA_DIO3    // Not connected on PCB, but internally on the TTGO SX1262, if DIO3 is high the TCXO is enabled
-
-#define LORA_SCK 9
-#define LORA_MISO 11
-#define LORA_MOSI 10
-#define LORA_CS 8
-
-#define SX126X_CS LORA_CS
-#define SX126X_DIO1 LORA_DIO1
-#define SX126X_BUSY LORA_DIO2
-#define SX126X_RESET LORA_RESET
-
-#define SX126X_DIO2_AS_RF_SWITCH
-#define SX126X_DIO3_TCXO_VOLTAGE 1.8
-
-// Enable Traffic Management Module for Heltec V4
-#ifndef HAS_TRAFFIC_MANAGEMENT
-#define HAS_TRAFFIC_MANAGEMENT 1
-#endif
-#ifndef TRAFFIC_MANAGEMENT_CACHE_SIZE
-#define TRAFFIC_MANAGEMENT_CACHE_SIZE 2048
-#endif
-
-// ---- KCT8103L RF FRONT END CONFIGURATION ----
-// The Heltec V4.3 uses a KCT8103L FEM chip with integrated PA and LNA
-// RF path: SX1262 -> Pi attenuator -> KCT8103L PA -> Antenna
-// Control logic (from KCT8103L datasheet):
-//   Transmit PA:     CSD=1, CTX=1, CPS=1
-//   Receive LNA:     CSD=1, CTX=0, CPS=X  (21dB gain, 1.9dB NF)
-//   Receive bypass:  CSD=1, CTX=1, CPS=0
-//   Shutdown:        CSD=0, CTX=X, CPS=X
-// Pin mapping:
-//   CPS (pin 5)  -> SX1262 DIO2: TX/RX path select (automatic via SX126X_DIO2_AS_RF_SWITCH)
-//   CSD (pin 4)  -> GPIO2: Chip enable (HIGH=on, LOW=shutdown)
-//   CTX (pin 6)  -> GPIO5: Switch between Receive LNA Mode and Receive Bypass Mode. (HIGH=RX bypass, LOW=RX LNA)
-//   VCC0/VCC1    -> Vfem via U3 LDO, controlled by GPIO7
-// KCT8103L FEM: TX/RX path switching is handled by DIO2 -> CPS pin (via SX126X_DIO2_AS_RF_SWITCH)
-
-#define USE_KCT8103L_PA
-#define LORA_PA_POWER 7        // VFEM_Ctrl - KCT8103L LDO power enable
-#define LORA_KCT8103L_PA_CSD 2 // CSD - KCT8103L chip enable (HIGH=on)
-#define LORA_KCT8103L_PA_CTX 5 // CTX - Switch between Receive LNA Mode and Receive Bypass Mode. (HIGH=RX bypass, LOW=RX LNA)
-
-#if HAS_TFT
-#define USE_TFTDISPLAY 1
-#endif
-/*
- * GPS pins
- */
-#define GPS_L76K
-#define PIN_GPS_EN (42)
-#define GPS_EN_ACTIVE LOW
-#define PERIPHERAL_WARMUP_MS 1000 // Make sure I2C QuickLink has stable power before continuing
-#define PIN_GPS_PPS (41)
-// Seems to be missing on this new board
-#define GPS_TX_PIN (38) // This is for bits going TOWARDS the CPU
-#define GPS_RX_PIN (39) // This is for bits going TOWARDS the GPS
-#define GPS_THREAD_INTERVAL 50
@@ -17,3 +17,4 @@ build_flags =
  ${esp32s3_base.build_flags}
  -D HELTEC_WSL_V3
  -I variants/esp32s3/heltec_wsl_v3
+  -ULED_BUILTIN
@@ -30,7 +30,7 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
-  zinggjm/GxEPD2@1.6.9
+  zinggjm/GxEPD2@1.6.8
  # renovate: datasource=git-refs depName=CSE_Touch packageName=https://github.com/CIRCUITSTATE/CSE_Touch gitBranch=main
  https://github.com/CIRCUITSTATE/CSE_Touch/archive/b44f23b6f870b848f1fbe453c190879bc6cfaafa.zip
  # renovate: datasource=github-tags depName=CSE_CST328 packageName=CIRCUITSTATE/CSE_CST328
@@ -34,7 +34,7 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
-  zinggjm/GxEPD2@1.6.9
+  zinggjm/GxEPD2@1.6.8
  # renovate: datasource=git-refs depName=CSE_Touch packageName=https://github.com/CIRCUITSTATE/CSE_Touch gitBranch=main
  https://github.com/CIRCUITSTATE/CSE_Touch/archive/b44f23b6f870b848f1fbe453c190879bc6cfaafa.zip
  # renovate: datasource=github-tags depName=CSE_CST328 packageName=CIRCUITSTATE/CSE_CST328
@@ -39,7 +39,7 @@
 #define DAC_I2S_BCK 48
 #define DAC_I2S_WS 15
 #define DAC_I2S_DOUT 46
-#define DAC_I2S_MCLK -1
+#define DAC_I2S_MCLK 0

 #define HAS_AXP2101

@@ -6,27 +6,26 @@ NicheGraphics attempts a different approach:
 Per-device config takes place in this setupNicheGraphics() method
 (And a small amount in platformio.ini)

-This file sets up InkHUD for the LilyGo T5-E-Paper-S3-Pro.
-
-The board uses a 4.7" ED047TC1 parallel e-paper display (960×540, 8-bit parallel interface).
-This is driven via the FastEPD library through the NicheGraphics ED047TC1 driver adapter.
+This file sets up InkHUD for Heltec VM-E290.
+Different NicheGraphics UIs and different hardware variants will each have their own setup procedure.

 */

 #pragma once

 #include "configuration.h"
+#include "mesh/MeshModule.h"

 #ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS

 // InkHUD-specific components
 // ---------------------------
-#include "graphics/niche/InkHUD/InkHUD.h"
+// #include "graphics/niche/InkHUD/InkHUD.h"
+#include "graphics/niche/InkHUD/WindowManager.h"

 // Applets
 #include "graphics/niche/InkHUD/Applets/User/AllMessage/AllMessageApplet.h"
 #include "graphics/niche/InkHUD/Applets/User/DM/DMApplet.h"
-#include "graphics/niche/InkHUD/Applets/User/FavoritesMap/FavoritesMapApplet.h"
 #include "graphics/niche/InkHUD/Applets/User/Heard/HeardApplet.h"
 #include "graphics/niche/InkHUD/Applets/User/Positions/PositionsApplet.h"
 #include "graphics/niche/InkHUD/Applets/User/RecentsList/RecentsListApplet.h"
@@ -35,20 +34,26 @@ This is driven via the FastEPD library through the NicheGraphics ED047TC1 driver
 // Shared NicheGraphics components
 // --------------------------------
 #include "graphics/niche/Drivers/Backlight/LatchingBacklight.h"
-#include "graphics/niche/Drivers/EInk/ED047TC1.h"
+#include "graphics/niche/Drivers/EInk/DEPG0290BNS800.h"
 #include "graphics/niche/Inputs/TwoButton.h"

 void setupNicheGraphics()
 {
    using namespace NicheGraphics;

+    // SPI
+    // -----------------------------
+
+    // Display is connected to HSPI
+    SPIClass *hspi = new SPIClass(HSPI);
+    hspi->begin(PIN_EINK_SCLK, -1, PIN_EINK_MOSI, PIN_EINK_CS);
+
    // E-Ink Driver
    // -----------------------------
-    // The ED047TC1 is a parallel display — no SPI bus setup needed.
-    // begin() args are part of the EInk interface but are ignored for parallel displays.

-    Drivers::EInk *driver = new Drivers::ED047TC1;
-    driver->begin(nullptr, 0, 0, 0);
+    // Use E-Ink driver
+    Drivers::EInk *driver = new Drivers::DEPG0290BNS800;
+    driver->begin(hspi, PIN_EINK_DC, PIN_EINK_CS, PIN_EINK_BUSY);

    // InkHUD
    // ----------------------------
@@ -62,57 +67,57 @@ void setupNicheGraphics()
    // Set how unhealthy additional FAST updates beyond this number are
    inkhud->setDisplayResilience(7, 1.5);

-    // Prepare fonts — use larger sizes to suit the 4.7" screen at ~234 DPI
-    InkHUD::Applet::fontLarge = FREESANS_24PT_WIN1253;
-    InkHUD::Applet::fontMedium = FREESANS_18PT_WIN1253;
-    InkHUD::Applet::fontSmall = FREESANS_12PT_WIN1253;
+    // Prepare fonts
+    InkHUD::Applet::fontLarge = FREESANS_9PT_WIN1252;
+    InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252;

-    // Customize default settings
+    // Init settings, and customize defaults
    inkhud->persistence->settings.userTiles.maxCount = 2; // How many tiles can the display handle?
-    inkhud->persistence->settings.rotation = 3;           // 270 degrees clockwise
+    inkhud->persistence->settings.rotation = 1;           // 90 degrees clockwise
    inkhud->persistence->settings.userTiles.count = 1;    // One tile only by default, keep things simple for new users
-    inkhud->persistence->settings.optionalFeatures.batteryIcon = true;
-    inkhud->persistence->settings.optionalMenuItems.backlight = true;
+    inkhud->persistence->settings.optionalMenuItems.nextTile = false;  // Behavior handled by aux button instead
+    inkhud->persistence->settings.optionalFeatures.batteryIcon = true; // Device definitely has a battery

-    // Alignment must cancel rotation for visual-frame touch input: (rotation + alignment) % 4 == 0.
-    inkhud->persistence->settings.joystick.alignment = (4 - inkhud->persistence->settings.rotation) % 4;
+    // Setup backlight
+    // Note: AUX button behavior configured further down
+    Drivers::LatchingBacklight *backlight = Drivers::LatchingBacklight::getInstance();
+    backlight->setPin(PIN_EINK_EN);

    // Pick applets
    // Note: order of applets determines priority of "auto-show" feature
-    inkhud->addApplet("All Messages", new InkHUD::AllMessageApplet, false, false);      // Not Active, not autoshown
-    inkhud->addApplet("DMs", new InkHUD::DMApplet, true, true);                         // Activated, Autoshown
-    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0), true, true);   // Activated, Autoshown
-    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1), false, false); // Not Active, not autoshown
-    inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true, false);           // Activated, not autoshown
-    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet, true, false);      // Activated, not autoshown
+    // Optional arguments for defaults:
+    // - is activated?
+    // - is autoshown?
+    // - is foreground on a specific tile (index)?
+    inkhud->addApplet("All Messages", new InkHUD::AllMessageApplet, true, true); // Activated, autoshown
+    inkhud->addApplet("DMs", new InkHUD::DMApplet);
+    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));
+    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));
+    inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true); // Activated
+    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);
    inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0); // Activated, not autoshown, default on tile 0
-    inkhud->addApplet("Favorites Map", new InkHUD::FavoritesMapApplet, false, false); // Not Active, not autoshown
-
-    // Backlight
-    // ----------------------------
-    Drivers::LatchingBacklight *backlight = Drivers::LatchingBacklight::getInstance();
-    backlight->setPin(BOARD_BL_EN); // GPIO11 on V2
+    // inkhud->addApplet("Basic", new InkHUD::BasicExampleApplet);
+    // inkhud->addApplet("NewMsg", new InkHUD::NewMsgExampleApplet);

    // Start running InkHUD
    inkhud->begin();

-    // Touch navigation requires joystick mode — enforce post-begin so flash cannot override.
-    inkhud->persistence->settings.joystick.enabled = true;
-    inkhud->persistence->settings.joystick.aligned = true;
-
    // Buttons
    // --------------------------

    Inputs::TwoButton *buttons = Inputs::TwoButton::getInstance(); // A shared NicheGraphics component

-    // Setup the main user button (boot button, GPIO 0)
+    // Setup the main user button (0)
    buttons->setWiring(0, BUTTON_PIN);
-    buttons->setHandlerShortPress(0, [inkhud]() { inkhud->shortpress(); });
-    buttons->setHandlerLongPress(0, [inkhud]() { inkhud->longpress(); });
+    buttons->setHandlerShortPress(0, []() { InkHUD::InkHUD::getInstance()->shortpress(); });
+    buttons->setHandlerLongPress(0, []() { InkHUD::InkHUD::getInstance()->longpress(); });

-    // No dedicated aux button on this board
+    // Setup the aux button (1)
+    // Bonus feature of VME290
+    buttons->setWiring(1, BUTTON_PIN_SECONDARY);
+    buttons->setHandlerShortPress(1, []() { InkHUD::InkHUD::getInstance()->nextTile(); });

    buttons->start();
 }

-#endif
+#endif
@@ -2,123 +2,21 @@

 #ifdef T5_S3_EPAPER_PRO

-#include "Observer.h"
 #include "TouchDrvGT911.hpp"
 #include "Wire.h"
-#include "input/InputBroker.h"
 #include "input/TouchScreenImpl1.h"
-#include "sleep.h"
-
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-#include "graphics/niche/InkHUD/InkHUD.h"
-#include "graphics/niche/InkHUD/SystemApplet.h"
-
-// Bridges touch events from TouchScreenImpl1 directly into InkHUD,
-// bypassing the InputBroker (which is excluded in InkHUD builds).
-// Routing mirrors the mini-epaper-s3 two-way rocker pattern:
-//   - Nav left/right: prevApplet/nextApplet when idle, navUp/Down when a system applet has focus (e.g. menu)
-//   - Nav up/down:    navUp/navDown always (menu scroll)
-//   - Tap:            shortpress (cycle applets / confirm in menu)
-//   - Long press:     longpress (open menu / back)
-class TouchInkHUDBridge : public Observer<const InputEvent *>
-{
-    int onNotify(const InputEvent *e) override
-    {
-        auto *inkhud = NicheGraphics::InkHUD::InkHUD::getInstance();
-
-        // Keep alignment in sync with the current rotation so that visual-frame gestures
-        // always pass through nav functions without remapping: (rotation + alignment) % 4 == 0.
-        inkhud->persistence->settings.joystick.alignment = (4 - inkhud->persistence->settings.rotation) % 4;
-
-        // Check whether a system applet (e.g. menu) is currently handling input
-        bool systemHandlingInput = false;
-        for (NicheGraphics::InkHUD::SystemApplet *sa : inkhud->systemApplets) {
-            if (sa->handleInput) {
-                systemHandlingInput = true;
-                break;
-            }
-        }
-
-        switch (e->inputEvent) {
-        case INPUT_BROKER_USER_PRESS:
-            inkhud->shortpress();
-            break;
-        case INPUT_BROKER_SELECT:
-            inkhud->longpress();
-            break;
-        case INPUT_BROKER_LEFT:
-            if (systemHandlingInput)
-                inkhud->navUp();
-            else
-                inkhud->prevApplet();
-            break;
-        case INPUT_BROKER_RIGHT:
-            if (systemHandlingInput)
-                inkhud->navDown();
-            else
-                inkhud->nextApplet();
-            break;
-        case INPUT_BROKER_UP:
-            inkhud->navUp();
-            break;
-        case INPUT_BROKER_DOWN:
-            inkhud->navDown();
-            break;
-        default:
-            break;
-        }
-        return 0;
-    }
-};
-
-static TouchInkHUDBridge touchBridge;
-#endif // MESHTASTIC_INCLUDE_NICHE_GRAPHICS

 TouchDrvGT911 touch;

-// Commands the GT911 into standby before the Wire bus is torn down.
-// notifyDeepSleep fires before Wire.end() in doDeepSleep(), so I2C is still available here.
-struct TouchDeepSleepObserver {
-    int onDeepSleep(void *)
-    {
-        touch.sleep();
-        return 0;
-    }
-    CallbackObserver<TouchDeepSleepObserver, void *> observer{this, &TouchDeepSleepObserver::onDeepSleep};
-} static touchDeepSleepObserver;
-
 bool readTouch(int16_t *x, int16_t *y)
 {
    if (!digitalRead(GT911_PIN_INT)) {
        int16_t raw_x;
        int16_t raw_y;
        if (touch.getPoint(&raw_x, &raw_y)) {
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-            // Transform raw GT911 axes to visual-frame coordinates for the current display rotation.
-            // rotation=3 is the physical identity (device's default orientation).
-            switch (NicheGraphics::InkHUD::InkHUD::getInstance()->persistence->settings.rotation) {
-            default:
-            case 3:
-                *x = raw_x;
-                *y = raw_y;
-                break; // identity
-            case 2:
-                *x = (EPD_WIDTH - 1) - raw_y;
-                *y = raw_x;
-                break; // 90° CW tilt
-            case 1:
-                *x = (EPD_HEIGHT - 1) - raw_x;
-                *y = (EPD_WIDTH - 1) - raw_y;
-                break; // 180° flip
-            case 0:
-                *x = raw_y;
-                *y = (EPD_HEIGHT - 1) - raw_x;
-                break; // 90° CCW tilt
-            }
-#else
-            *x = raw_x;
-            *y = raw_y;
-#endif
+            // rotate 90° for landscape
+            *x = raw_y;
+            *y = EPD_WIDTH - 1 - raw_x;
            LOG_DEBUG("touched(%d/%d)", *x, *y);
            return true;
        }
@@ -133,46 +31,15 @@ void earlyInitVariant()
    pinMode(SDCARD_CS, OUTPUT);
    digitalWrite(SDCARD_CS, HIGH);
    pinMode(BOARD_BL_EN, OUTPUT);
-
-    // Program GT911 touch controller to I2C address 0x14 (GT911_SLAVE_ADDRESS_H) before
-    // the I2C bus scan runs.  GPIO3 (INT) defaults LOW on ESP32-S3 cold boot, which would
-    // leave the GT911 at 0x5D (GT911_SLAVE_ADDRESS_L) — the same address as the SFA30
-    // air quality sensor — causing a false-positive SFA30 detection during the I2C scan.
-    //
-    // GT911 datasheet §4.3 "Address Selection":
-    //   Pull INT HIGH before releasing RST → device latches address 0x14 (SLAVE_ADDRESS_H)
-    //   Pull INT LOW  before releasing RST → device latches address 0x5D (SLAVE_ADDRESS_L)
-    //   Minimum RST assert time: 100 µs; minimum startup time after RST deassert: 5 ms.
-    //
-    // lateInitVariant() calls touch.begin() which repeats this sequence internally while
-    // also performing full I2C initialisation; the double-reset is harmless.
-    pinMode(GT911_PIN_RST, OUTPUT);
-    digitalWrite(GT911_PIN_RST, LOW);
-    pinMode(GT911_PIN_INT, OUTPUT);
-    digitalWrite(GT911_PIN_INT, HIGH); // HIGH → latch address 0x14
-    delay(1);                          // > 100 µs
-    digitalWrite(GT911_PIN_RST, HIGH);
-    delay(10);                     // > 5 ms startup
-    pinMode(GT911_PIN_INT, INPUT); // release INT for interrupt use
-}
-
-void variant_shutdown()
-{
-    // Ensure frontlight is off during deep sleep
-    digitalWrite(BOARD_BL_EN, LOW);
 }

 // T5-S3-ePaper Pro specific (late-) init
 void lateInitVariant(void)
 {
    touch.setPins(GT911_PIN_RST, GT911_PIN_INT);
-    if (touch.begin(Wire, GT911_SLAVE_ADDRESS_H, GT911_PIN_SDA, GT911_PIN_SCL)) {
-        touchDeepSleepObserver.observer.observe(&notifyDeepSleep);
+    if (touch.begin(Wire, GT911_SLAVE_ADDRESS_L, GT911_PIN_SDA, GT911_PIN_SCL)) {
        touchScreenImpl1 = new TouchScreenImpl1(EPD_WIDTH, EPD_HEIGHT, readTouch);
        touchScreenImpl1->init();
-#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
-        touchBridge.observe(touchScreenImpl1);
-#endif
    } else {
        LOG_ERROR("Failed to find touch controller!");
    }
@@ -26,9 +26,9 @@
 #define GT911_PIN_RST 9
 #endif

-#define PCF8563_RTC 0x51
+#define PCF85063_RTC 0x51
 #define HAS_RTC 1
-#define PCF8563_INT 2
+#define PCF85063_INT 2

 #define USE_POWERSAVE
 #define SLEEP_TIME 120
@@ -9,6 +9,8 @@
 #define BUTTON_PIN 0 // The middle button GPIO on the T-Beam S3
 //  #define EXT_NOTIFY_OUT 13 // Default pin to use for Ext Notify Module.

+#define LED_STATE_ON 0 // State when LED is lit
+
 // TTGO uses a common pinout for their SX1262 vs RF95 modules - both can be enabled and we will probe at runtime for RF95 and if
 // not found then probe for SX1262
 #define USE_SX1262
@@ -74,4 +76,4 @@
 // has 32768 Hz crystal
 #define HAS_32768HZ 1

-#define USE_SH1106
+#define USE_SH1106
@@ -2,7 +2,7 @@
 [portduino_base]
 platform =
  # renovate: datasource=git-refs depName=platform-native packageName=https://github.com/meshtastic/platform-native gitBranch=develop
-  https://github.com/meshtastic/platform-native/archive/4ea5e09ac7d51a593e12ec7c1ebb6cd06745ce53.zip
+  https://github.com/meshtastic/platform-native/archive/71ed55bb95feb3c43ebde1ec1e2e17643a424c04.zip
 framework = arduino

 build_src_filter = 
@@ -37,35 +37,25 @@ lib_deps =
  # renovate: datasource=github-tags depName=Adafruit_BME680 packageName=adafruit/Adafruit_BME680
  https://github.com/adafruit/Adafruit_BME680/archive/refs/tags/2.0.6.zip

-; Cross-platform build flags shared between native (Linux) and native-macos builds.
-; Anything Linux-only (libbluetooth, libgpiod, libi2c, /sys/class/gpio,
-; PORTDUINO_LINUX_HARDWARE, glibc-style _FORTIFY_SOURCE) goes in `build_flags`
-; instead. UDP multicast also lives there because the firmware's
-; UdpMulticastHandler.h unconditionally `#include <WiFi.h>` on non-NRF52
-; targets, which requires the framework's bundled WiFi shim that we
-; lib_ignore on macOS.
-build_flags_common =
+build_flags =
  ${arduino_base.build_flags}
  -D ARCH_PORTDUINO
  -fPIC
-  -Isrc/platform/portduino
-  -DRADIOLIB_EEPROM_UNSUPPORTED
-  -lpthread
-  -lyaml-cpp
-  -luv
-  -std=gnu17
-  -std=gnu++17
-
-build_flags =
-  ${portduino_base.build_flags_common}
-  -DHAS_UDP_MULTICAST=1
  -D_FORTIFY_SOURCE=2
  -fstack-protector-all -Wstack-protector --param ssp-buffer-size=4
+  -Isrc/platform/portduino
+  -DRADIOLIB_EEPROM_UNSUPPORTED
  -DPORTDUINO_LINUX_HARDWARE
+  -DHAS_UDP_MULTICAST=1
+  -lpthread
  -lstdc++fs
  -lbluetooth
  -lgpiod
+  -lyaml-cpp
  -li2c
+  -luv
+  -std=gnu17
+  -std=gnu++17
 lib_ignore =
  Adafruit NeoPixel
  Adafruit ST7735 and ST7789 Library
@@ -117,92 +117,3 @@ build_flags = -lgcov --coverage -fprofile-abs-path -fsanitize=address ${env:nati
 test_testing_command =
  ${platformio.build_dir}/${this.__env__}/meshtasticd
  -s
-
-; ---------------------------------------------------------------------------
-; Native build for macOS (Darwin / arm64 + x86_64). Headless meshtasticd that
-; runs in SimRadio mode (`-s`) or against real LoRa hardware via a CH341
-; USB-SPI bridge. No BlueZ, libgpiod, or Linux I2C — those require Linux.
-;
-; Prerequisites (Homebrew):
-;   brew install platformio yaml-cpp libuv openssl@3 libusb argp-standalone pkg-config
-;
-; The macOS-side patches now live upstream:
-;   * meshtastic/platform-native — `String.h`-shadow shim, `-Wno-enum-constexpr-conversion`,
-;     empty-variant-dir guard. Pulled via `portduino_base.platform` zip pin.
-;   * meshtastic/framework-portduino — LinuxHardwareI2C macOS stubs, AsyncUDP
-;     SOCK_NONBLOCK fallback, Common.h __APPLE__ guard, WiFiServer.cpp extern-C
-;     fix, package.json URL refresh. Pulled by platform-native at its pinned commit.
-; This env therefore only carries the firmware-side build flags and src filter.
-;
-; Real LoRa hardware on macOS:
-;   The same lib_dep `pine64/libch341-spi-userspace` used on Linux works on
-;   macOS as-is — its `libusb_detach_kernel_driver()` call is `__linux__`-
-;   guarded, but on macOS the kernel doesn't bind a driver to a CH341A SPI
-;   bridge (PID 0x5512; bDeviceClass=0xff vendor-specific) by default, so
-;   no detach is needed. Apple's bundled CH34x driver targets the CH340
-;   *UART* variant (PID 0x7523) — different product. libusb opens the device
-;   and claims interface 0 directly via IOUSBHostInterface.
-;
-;   To use, point `meshtasticd` at any of the existing `bin/config.d/lora-*.yaml`
-;   files that specify `spidev: ch341` — they're platform-agnostic. Example:
-;     pio run -e native-macos
-;     mkdir -p ~/.meshtasticd && cp bin/config-dist.yaml ~/.meshtasticd/config.yaml
-;     # Edit ~/.meshtasticd/config.yaml: ConfigDirectory: ./config.d/
-;     mkdir ~/.meshtasticd/config.d && cp bin/config.d/lora-meshstick-1262.yaml ~/.meshtasticd/config.d/
-;     cd ~/.meshtasticd && /path/to/firmware/.pio/build/native-macos/meshtasticd
-;
-;   The MAC address auto-derives from the CH341's USB serial + product string
-;   (PortduinoGlue.cpp ~497-518); on Linux a BlueZ HCI socket is the fallback
-;   when that path isn't taken, but BlueZ is `__linux__`-guarded so the
-;   serial-derivation path is mandatory on macOS. Override with
-;   `MACAddress: AA:BB:CC:DD:EE:FF` in config.yaml's `General:` section if
-;   the device's serial isn't 8 hex chars.
-;
-;   Diagnosing CH341 issues on macOS:
-;     ioreg -p IOUSB -l -w 0 | grep -B2 -A30 0x5512
-;       Children should be `IOUSBHostInterface`. If a vendor driver class
-;       (e.g. `com.wch.CH34xVCPDriver` from a third-party WCH installer)
-;       claims interface 0, libusb will fail with LIBUSB_ERROR_BUSY.
-;       Workaround: `sudo kmutil unload -b <bundleID>`.
-;     LIBUSB_DEBUG=4 .pio/build/native-macos/meshtasticd
-;       Verbose libusb trace — useful when claim_interface fails.
-; ---------------------------------------------------------------------------
-[env:native-macos]
-extends = native_base
-; Apple's ld doesn't accept GNU ld's `-Wl,-Map,<file>` syntax (inherited from
-; the top-level platformio.ini). Strip it; the linker map isn't useful for
-; the macOS dev loop anyway, and Apple ld's equivalent (`-Wl,-map,<file>`)
-; uses different argument shape.
-build_unflags = -Wl,-Map,"${platformio.build_dir}"/output.map
-build_flags = ${portduino_base.build_flags_common}
-  -I variants/native/portduino
-  -I/opt/homebrew/include
-  -I/opt/homebrew/opt/argp-standalone/include
-  -I/opt/homebrew/opt/yaml-cpp/include
-  -L/opt/homebrew/lib
-  -L/opt/homebrew/opt/argp-standalone/lib
-  -L/opt/homebrew/opt/yaml-cpp/lib
-  -largp
-  -DPORTDUINO_DARWIN
-  ; Headless build — variants/native/portduino/variant.h would otherwise
-  ; default HAS_SCREEN to 1 and pull in screen-renderer source that uses
-  ; VLA-with-initializer (a GNU/GCC extension Apple Clang rejects).
-  ; MESHTASTIC_EXCLUDE_SCREEN gates the optional `screen->setHeading(...)`-
-  ; style screen-driver hooks scattered through sensor sources.
-  -DHAS_SCREEN=0
-  -DMESHTASTIC_EXCLUDE_SCREEN=1
-  !pkg-config --libs openssl --silence-errors || :
-; src/input/Linux*.{cpp,h} drive evdev (`<linux/input.h>`) which doesn't exist
-; on macOS. graphics/Panel_sdl.* and graphics/TFTDisplay.cpp pull LovyanGFX
-; (which we lib_ignore on macOS for the <malloc.h> issue). Neither is needed
-; for the headless build.
-build_src_filter = ${native_base.build_src_filter}
-  -<input/LinuxInput.cpp>
-  -<input/LinuxInputImpl.cpp>
-  -<graphics/Panel_sdl.cpp>
-  -<graphics/TFTDisplay.cpp>
-; LovyanGFX includes <malloc.h> (Linux-only) and is only needed by TFT
-; variants — not relevant for the headless macOS build.
-lib_ignore =
-  ${portduino_base.lib_ignore}
-  LovyanGFX
@@ -12,5 +12,5 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/Dongle_
 lib_deps = 
  ${nrf52840_base.lib_deps}
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
-  zinggjm/GxEPD2@1.6.9
+  zinggjm/GxEPD2@1.6.8
 debug_tool = jlink
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Ben Meadors	e3bdb5830b	Refactor test messages for clarity and consistency in regex tests	2026-04-19 06:24:27 -05:00
Ben MeadorsandCopilot Autofix powered by AI	f9f450977b	Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-04-19 06:16:27 -05:00
Ben MeadorsandCopilot Autofix powered by AI	f74d3e4816	Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-04-19 06:16:18 -05:00
Ben MeadorsandCopilot Autofix powered by AI	55954c20b7	Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <175728472+Copilot@users.noreply.github.com>	2026-04-19 06:16:02 -05:00
Ben Meadors	55a580e19e	Add USB camera and uhubctl support for new test suite. Also added some bug fixes	2026-04-19 06:08:16 -05:00