Merge branch 'develop' into zps-module

trunk fmt
2026-10-08 05:00:05 +10:00 · 2026-04-12 17:19:30 +02:00 · 2026-02-04 14:03:29 +01:00 · 2025-08-28 13:50:22 +10:00 · 2025-08-28 13:50:22 +10:00 · 2025-08-28 13:50:22 +10:00
124 changed files with 813 additions and 3660 deletions
@@ -4,11 +4,11 @@ This document provides context and guidelines for AI assistants working with the

 ## Project Overview

-Meshtastic is an open-source LoRa mesh networking project for long-range, low-power communication without relying on internet or cellular infrastructure. The firmware enables text messaging, location sharing, and telemetry over a decentralized mesh network. The project uses **C++17** as its language standard across all platforms.
+Meshtastic is an open-source LoRa mesh networking project for long-range, low-power communication without relying on internet or cellular infrastructure. The firmware enables text messaging, location sharing, and telemetry over a decentralized mesh network.

 ### Supported Hardware Platforms

- **ESP32** (ESP32, ESP32-S3, ESP32-C3, ESP32-C6) - Most common platform
+- **ESP32** (ESP32, ESP32-S3, ESP32-C3) - Most common platform
 - **nRF52** (nRF52840, nRF52833) - Low power Nordic chips
 - **RP2040/RP2350** - Raspberry Pi Pico variants
 - **STM32WL** - STM32 with integrated LoRa
@@ -80,46 +80,21 @@ firmware/
 │   │   ├── NodeDB.*       # Node database management
 │   │   ├── Router.*       # Packet routing
 │   │   ├── Channels.*     # Channel management
-│   │   ├── CryptoEngine.* # AES-CCM encryption
 │   │   ├── *Interface.*   # Radio interface implementations
-│   │   ├── api/           # WiFi/Ethernet server APIs (ServerAPI, PacketAPI)
-│   │   ├── http/          # HTTP server (WebServer, ContentHandler)
-│   │   ├── wifi/          # WiFi support (WiFiAPClient)
-│   │   ├── eth/           # Ethernet support (ethClient)
-│   │   ├── udp/           # UDP multicast
-│   │   ├── compression/   # Message compression (unishox2)
 │   │   └── generated/     # Protobuf generated code
 │   ├── modules/           # Feature modules (Position, Telemetry, etc.)
-│   │   └── Telemetry/     # Telemetry subsystem
-│   │       └── Sensor/    # 50+ I2C sensor drivers
 │   ├── gps/               # GPS handling
 │   ├── graphics/          # Display drivers and UI
-│   │   └── niche/         # Specialized UIs (InkHUD e-ink framework)
-│   ├── platform/          # Platform-specific code (esp32, nrf52, rp2xx0, stm32wl, portduino)
-│   ├── input/             # Input device handling (InputBroker, keyboards, buttons)
-│   ├── detect/            # I2C hardware auto-detection (80+ device types)
-│   ├── motion/            # Accelerometer drivers (BMA423, BMI270, MPU6050, etc.)
-│   ├── mqtt/              # MQTT bridge client
-│   ├── power/             # Power HAL
-│   ├── nimble/            # BLE via NimBLE
-│   ├── buzz/              # Audio/notification (buzzer, RTTTL)
-│   ├── serialization/     # JSON serialization, COBS encoding
-│   ├── watchdog/          # Hardware watchdog thread
-│   ├── concurrency/       # Threading utilities (OSThread, Lock)
-│   ├── PowerFSM.*         # Power finite state machine
-│   └── Observer.h         # Observer/Observable event pattern
+│   ├── platform/          # Platform-specific code
+│   ├── input/             # Input device handling
+│   └── concurrency/       # Threading utilities
 ├── variants/              # Hardware variant definitions
 │   ├── esp32/            # ESP32 variants
 │   ├── esp32s3/          # ESP32-S3 variants
-│   ├── esp32c3/          # ESP32-C3 variants
-│   ├── esp32c6/          # ESP32-C6 variants
-│   ├── nrf52840/         # nRF52 variants
-│   ├── rp2040/           # RP2040/RP2350 variants
-│   ├── stm32/            # STM32WL variants
-│   └── native/           # Linux/Portduino variants
+│   ├── nrf52/            # nRF52 variants
+│   └── rp2xxx/           # RP2040/RP2350 variants
 ├── protobufs/            # Protocol buffer definitions
 ├── boards/               # Custom PlatformIO board definitions
-├── test/                 # Unit tests (12 test suites)
 └── bin/                  # Build and utility scripts
 ```

@@ -130,7 +105,6 @@ firmware/
 - Follow existing code style - run `trunk fmt` before commits
 - Prefer `LOG_DEBUG`, `LOG_INFO`, `LOG_WARN`, `LOG_ERROR` for logging
 - Use `assert()` for invariants that should never fail
- C++17 features are available (`std::optional`, structured bindings, `if constexpr`, etc.)

 ### Naming Conventions

@@ -144,151 +118,70 @@ firmware/

 #### Module System

-Modules use a three-tier class hierarchy:
+Modules inherit from `MeshModule` or `ProtobufModule<T>` and implement:

-1. **`MeshModule`** - Base class. Implement `wantPacket()` and `handleReceived()`. Returns `ProcessMessage::STOP` or `ProcessMessage::CONTINUE`.
-2. **`SinglePortModule`** - Handles a single portnum. Simplified `wantPacket()` that checks `decoded.portnum`.
-3. **`ProtobufModule<T>`** - Template for protobuf-based modules. Handles encoding/decoding automatically.
-
-Most modules also inherit from **`OSThread`** for periodic tasks (the "mixin" pattern):
+- `handleReceivedProtobuf()` - Process incoming packets
+- `allocReply()` - Generate response packets
+- `runOnce()` - Periodic task execution (returns next run interval in ms)

 ```cpp
-class MyModule : public ProtobufModule<meshtastic_MyMessage>, private concurrency::OSThread
+class MyModule : public ProtobufModule<meshtastic_MyMessage>
 {
-  public:
-    MyModule();
-
  protected:
    virtual bool handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_MyMessage *msg) override;
-    virtual meshtastic_MeshPacket *allocReply() override;       // Generate response packets
-    virtual int32_t runOnce() override;                         // Periodic task (returns next interval in ms)
-    virtual bool alterReceivedProtobuf(meshtastic_MeshPacket &mp, meshtastic_MyMessage *msg); // Modify in-flight
-    virtual bool wantUIFrame();                                 // Request a UI display frame
+    virtual int32_t runOnce() override;
 };
 ```

-Modules are registered in `src/modules/Modules.cpp` guarded by `MESHTASTIC_EXCLUDE_*` flags.
-
-#### Observer/Observable Pattern
-
-Event-driven communication between subsystems uses `src/Observer.h`:
-
-```cpp
-// Observable emits events
-Observable<const meshtastic::Status *> newStatus;
-newStatus.notifyObservers(&status);
-
-// Observer receives events via callback
-CallbackObserver<MyClass, const meshtastic::Status *> statusObserver =
-    CallbackObserver<MyClass, const meshtastic::Status *>(this, &MyClass::handleStatusUpdate);
-```
-
 #### Configuration Access

 - `config.*` - Device configuration (LoRa, position, power, etc.)
 - `moduleConfig.*` - Module-specific configuration
 - `channels.*` - Channel configuration and management
- `owner` - Device owner info
- `myNodeInfo` - Local node info

 #### Default Values

 Use the `Default` class helpers in `src/mesh/Default.h`:

 - `Default::getConfiguredOrDefaultMs(configured, default)` - Returns ms, using default if configured is 0
- `Default::getConfiguredOrDefault(configured, default)` - Generic configured/default getter
 - `Default::getConfiguredOrMinimumValue(configured, min)` - Enforces minimum values
 - `Default::getConfiguredOrDefaultMsScaled(configured, default, numNodes)` - Scales based on network size

 #### Thread Safety

- Use `concurrency::Lock` and `concurrency::LockGuard` for mutex protection
+- Use `concurrency::Lock` for mutex protection
 - Radio SPI access uses `SPILock`
 - Prefer `OSThread` for background tasks

-### Hardware Detection
-
-`src/detect/ScanI2C` automatically enumerates 80+ I2C device types at boot including displays, sensors, RTCs, keyboards, PMUs, and touch controllers. This drives automatic initialization of the correct drivers.
-
-### Graphics/UI System
-
-Multiple display driver families in `src/graphics/`:
-
- **OLED**: SSD1306, SH1106, ST7567
- **TFT**: TFTDisplay (LovyanGFX-based)
- **E-Ink**: EInkDisplay2, EInkDynamicDisplay, EInkParallelDisplay
-
-**InkHUD** (`src/graphics/niche/InkHUD/`) is an event-driven e-ink UI framework:
-
- Applet-based architecture — modular display tiles
- Read-only, static display optimized for minimal refreshes and low power
- Configured per-variant via `nicheGraphics.h`
- Separate PlatformIO config: `src/graphics/niche/InkHUD/PlatformioConfig.ini`
-
-### Input System
-
-`src/input/InputBroker` is the centralized input event dispatcher. Supports multiple input sources: buttons, keyboards (BBQ10, Cardputer, TCA8418), touch screens, rotary encoders, and matrix keyboards.
-
-### Power Management
-
-`src/PowerFSM.*` implements a finite state machine with states: `stateON`, `statePOWER`, `stateSERIAL`, `stateDARK`. Key events: `EVENT_PRESS`, `EVENT_WAKE_TIMER`, `EVENT_LOW_BATTERY`, `EVENT_RECEIVED_MSG`, `EVENT_SHUTDOWN`. Conditionally excluded with `MESHTASTIC_EXCLUDE_POWER_FSM` (falls back to `FakeFsm`).
-
-### Motion Sensors
-
-`src/motion/AccelerometerThread` provides background motion monitoring with automatic screen wake and double-tap button press detection. Supports 10+ accelerometer/gyroscope chips (BMA423, BMI270, MPU6050, LIS3DH, LSM6DS3, STK8XXX, QMA6100P, ICM20948, BMX160).
-
-### Telemetry Sensor Library
-
-`src/modules/Telemetry/Sensor/` contains 50+ I2C sensor drivers organized by category:
-
- **Power monitoring**: INA219/226/260/3221, MAX17048
- **Environmental**: BME280/680, SCD4X (CO₂), SEN5X (particulate)
- **Humidity/Temperature**: SHT3X/4X, AHT10, MCP9808, MLX90614
- **Light**: BH1750, TSL2561/2591, VEML7700, LTR390UV, OPT3001
- **Air quality**: PMSA003I, SFA30
- **Specialized**: CGRadSens (radiation), NAU7802 (weight scale)
-
-### API/Networking
-
-`src/mesh/api/` provides a template-based `ServerAPI` for client communication over WiFi (`WiFiServerAPI`) and Ethernet (`ethServerAPI`). Default port: **4403**. HTTP server in `src/mesh/http/`. JSON serialization in `src/serialization/MeshPacketSerializer`.
-
 ### Hardware Variants

 Each hardware variant has:

 - `variant.h` - Pin definitions and hardware capabilities
 - `platformio.ini` - Build configuration
- Optional: `pins_arduino.h`, `rfswitch.h`, `nicheGraphics.h` (for InkHUD variants)
+- Optional: `pins_arduino.h`, `rfswitch.h`

 Key defines in variant.h:

 ```cpp
 #define USE_SX1262          // Radio chip selection
 #define HAS_GPS 1           // Hardware capabilities
-#define HAS_SCREEN 1        // Display present
 #define LORA_CS 36          // Pin assignments
 #define SX126X_DIO1 14      // Radio-specific pins
 ```

 ### Protobuf Messages

- Defined in `protobufs/meshtastic/*.proto` (~32 proto files)
- Generated code in `src/mesh/generated/meshtastic/`
+- Defined in `protobufs/meshtastic/*.proto`
+- Generated code in `src/mesh/generated/`
 - Regenerate with `bin/regen-protos.sh`
 - Message types prefixed with `meshtastic_`
- Nanopb `.options` files control field sizes and encoding

 ### Conditional Compilation

 ```cpp
 #if !MESHTASTIC_EXCLUDE_GPS        // Feature exclusion
-#if !MESHTASTIC_EXCLUDE_WIFI       // Network feature exclusion
-#if !MESHTASTIC_EXCLUDE_BLUETOOTH  // BLE exclusion
-#if !MESHTASTIC_EXCLUDE_POWER_FSM  // Power FSM exclusion
 #ifdef ARCH_ESP32                   // Architecture-specific
-#ifdef ARCH_NRF52                   // Nordic platform
-#ifdef ARCH_RP2040                  // Raspberry Pi Pico
-#ifdef ARCH_PORTDUINO               // Linux native
 #if defined(USE_SX1262)            // Radio-specific
 #ifdef HAS_SCREEN                   // Hardware capability
 #if USERPREFS_EVENT_MODE           // User preferences
@@ -299,7 +192,7 @@ Key defines in variant.h:
 Uses **PlatformIO** with custom scripts:

 - `bin/platformio-pre.py` - Pre-build script
- `bin/platformio-custom.py` - Custom build logic, manifest generation
+- `bin/platformio-custom.py` - Custom build logic

 Build commands:

@@ -309,38 +202,21 @@ pio run -e tbeam -t upload    # Build and upload
 pio run -e native             # Build native/Linux version
 ```

-### Build Manifest
-
-`bin/platformio-custom.py` emits a build manifest with metadata:
-
- `hasMui`, `hasInkHud` - UI capability flags (overridable via `custom_meshtastic_has_mui`, `custom_meshtastic_has_ink_hud`)
- Architecture normalization (e.g., `esp32s3` → `esp32-s3` for API compatibility)
-
 ## Common Tasks

 ### Adding a New Module

 1. Create `src/modules/MyModule.cpp` and `.h`
-2. Inherit from appropriate base class (`MeshModule`, `SinglePortModule`, or `ProtobufModule<T>`)
-3. Mix in `concurrency::OSThread` if periodic work is needed
-4. Register in `src/modules/Modules.cpp` guarded by `#if !MESHTASTIC_EXCLUDE_MYMODULE`
-5. Add protobuf messages if needed in `protobufs/meshtastic/`
-6. Add test suite in `test/test_mymodule/` if applicable
+2. Inherit from appropriate base class
+3. Register in `src/modules/Modules.cpp`
+4. Add protobuf messages if needed in `protobufs/`

 ### Adding a New Hardware Variant

 1. Create directory under `variants/<arch>/<name>/`
-2. Add `variant.h` with pin definitions and hardware capability defines
-3. Add `platformio.ini` with build config — use `extends` to reference common base (e.g., `esp32s3_base`)
-4. Set `custom_meshtastic_support_level = 1` (PR builds) or `2` (merge builds)
-5. For e-ink displays, add `nicheGraphics.h` for InkHUD configuration
-
-### Adding a New Telemetry Sensor
-
-1. Create driver in `src/modules/Telemetry/Sensor/` following existing sensor pattern
-2. Register I2C address in `src/detect/ScanI2C` for auto-detection
-3. Integrate with the appropriate telemetry module (Environment, Health, Power, AirQuality)
-4. Add proto fields in `protobufs/meshtastic/telemetry.proto` if new data types are needed
+2. Add `variant.h` with pin definitions
+3. Add `platformio.ini` with build config
+4. Reference common configs with `extends`

 ### Modifying Configuration Defaults

@@ -429,22 +305,9 @@ Most workflows can be triggered manually via `workflow_dispatch` for testing.

 ## Testing

-Unit tests in `test/` directory with 12 test suites:
-
- `test_crypto/` - Cryptography
- `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
- `test_http_content_handler/` - HTTP handling
- `test_serial/` - Serial communication
-
-Run with: `pio test -e native`
-
-Simulation testing: `bin/test-simulator.sh`
+- Unit tests in `test/` directory
+- Run with `pio test -e native`
+- Use `bin/test-simulator.sh` for simulation testing

 ## Resources

@@ -1,138 +0,0 @@
-# New Meshtastic Module
-
-Guide for developing a new Meshtastic firmware module.
-
-## Module Hierarchy
-
-Choose the appropriate base class:
-
-1. **`MeshModule`** — Raw base class. Override `wantPacket()` and `handleReceived()`. Returns `ProcessMessage::STOP` or `ProcessMessage::CONTINUE`.
-2. **`SinglePortModule`** — Handles a single `meshtastic_PortNum`. Constructor takes `(name, portNum)`. Simplified `wantPacket()` checking `decoded.portnum`. Use `allocDataPacket()` to create outgoing packets.
-3. **`ProtobufModule<T>`** — Template for protobuf-encoded modules. Constructor takes `(name, portNum, fields)`. Override `handleReceivedProtobuf()`. Use `allocDataProtobuf(payload)` to create outgoing packets.
-
-Most modules also mix in `concurrency::OSThread` for periodic background tasks.
-
-## Implementation Pattern
-
-```cpp
-// src/modules/MyModule.h
-#pragma once
-#include "ProtobufModule.h"
-#include "concurrency/OSThread.h"
-
-class MyModule : public ProtobufModule<meshtastic_MyMessage>, private concurrency::OSThread
-{
-  public:
-    MyModule();
-
-  protected:
-    // Process incoming protobuf packet. Return true to stop further processing.
-    virtual bool handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_MyMessage *msg) override;
-
-    // Generate response packet (optional)
-    virtual meshtastic_MeshPacket *allocReply() override;
-
-    // Periodic task — return next run interval in ms, or disable()
-    virtual int32_t runOnce() override;
-
-    // Modify packet in-flight before delivery (optional)
-    virtual bool alterReceivedProtobuf(meshtastic_MeshPacket &mp, meshtastic_MyMessage *msg);
-
-    // Request a UI display frame (optional)
-    virtual bool wantUIFrame();
-};
-```
-
-## Registration
-
-Register in `src/modules/Modules.cpp` inside `setupModules()`:
-
-```cpp
-#if !MESHTASTIC_EXCLUDE_MYMODULE
-    new MyModule();
-#endif
-```
-
-If other code needs to reference the module instance:
-
-```cpp
-#if !MESHTASTIC_EXCLUDE_MYMODULE
-    myModule = new MyModule();
-#endif
-```
-
-And declare the global in the header:
-
-```cpp
-extern MyModule *myModule;
-```
-
-Some modules also conditionally instantiate based on `moduleConfig`:
-
-```cpp
-#if !MESHTASTIC_EXCLUDE_MYMODULE
-    if (moduleConfig.has_my_module && moduleConfig.my_module.enabled) {
-        new MyModule();
-    }
-#endif
-```
-
-## Conditional Compilation
-
-Add a `MESHTASTIC_EXCLUDE_MYMODULE` guard. This allows the module to be excluded from constrained builds. The flag name must follow the pattern: `MESHTASTIC_EXCLUDE_` + uppercase module name.
-
-## Protobuf Messages (if needed)
-
-1. Define messages in `protobufs/meshtastic/` (e.g., `mymodule.proto`)
-2. Add a `.options` file for nanopb field size constraints
-3. Regenerate with `bin/regen-protos.sh`
-4. Generated code appears in `src/mesh/generated/meshtastic/`
-5. Assign a `meshtastic_PortNum` if the module uses a new port number
-
-## Timing and Defaults
-
-Use `Default` class helpers for configurable intervals:
-
-```cpp
-int32_t MyModule::runOnce()
-{
-    uint32_t interval = Default::getConfiguredOrDefaultMs(moduleConfig.my_module.update_interval,
-                                                          default_my_module_interval);
-    // ... do work ...
-    return interval;
-}
-```
-
-On public/default channels, enforce minimums with `Default::getConfiguredOrMinimumValue()`.
-
-## Observer Pattern
-
-Subscribe to system events:
-
-```cpp
-CallbackObserver<MyModule, const meshtastic::Status *> statusObserver =
-    CallbackObserver<MyModule, const meshtastic::Status *>(this, &MyModule::handleStatusUpdate);
-```
-
-## Testing
-
-Add test suite in `test/test_mymodule/`:
-
-```
-test/
-└── test_mymodule/
-    └── test_main.cpp
-```
-
-Run with: `pio test -e native`
-
-## Checklist
-
- [ ] Header and implementation files in `src/modules/`
- [ ] Inherit from appropriate base class (MeshModule / SinglePortModule / ProtobufModule)
- [ ] Mix in OSThread if periodic work is needed
- [ ] Register in `src/modules/Modules.cpp` with `MESHTASTIC_EXCLUDE_` guard
- [ ] Add protobuf definitions if needed (`protobufs/meshtastic/`)
- [ ] Use `Default::getConfiguredOrDefaultMs()` for timing
- [ ] Respect bandwidth limits on public channels
- [ ] Add test suite in `test/`
@@ -1,149 +0,0 @@
-# New Telemetry Sensor
-
-Guide for adding a new I2C telemetry sensor driver to Meshtastic firmware.
-
-## Overview
-
-Telemetry sensors live in `src/modules/Telemetry/Sensor/`. There are 50+ existing drivers organized by measurement type. Each sensor integrates with one of the telemetry modules:
-
- **EnvironmentTelemetryModule** — Temperature, humidity, pressure, gas, light
- **AirQualityTelemetryModule** — Particulate matter, VOCs
- **PowerTelemetryModule** — Voltage, current, power monitoring
- **HealthTelemetryModule** — Heart rate, SpO2, body temperature
-
-## Sensor Driver Pattern
-
-Each sensor has a `.h` and `.cpp` file pair following this pattern:
-
-```cpp
-// src/modules/Telemetry/Sensor/MySensor.h
-#pragma once
-#include "TelemetrySensor.h"
-#include <MySensorLibrary.h>  // Arduino/PlatformIO library
-
-class MySensor : virtual public TelemetrySensor
-{
-  private:
-    MySensorLibrary sensor;
-
-  public:
-    MySensor() : TelemetrySensor(meshtastic_TelemetrySensorType_MY_SENSOR, "MySensor") {}
-
-    // Initialize sensor hardware. Return true on success.
-    virtual void setup() override;
-
-    // Read sensor data into the telemetry protobuf. Return true on success.
-    virtual bool getMetrics(meshtastic_Telemetry *measurement) override;
-};
-```
-
-```cpp
-// src/modules/Telemetry/Sensor/MySensor.cpp
-#include "MySensor.h"
-#include "TelemetrySensor.h"
-
-void MySensor::setup()
-{
-    sensor.begin();
-    // Configure sensor parameters...
-}
-
-bool MySensor::getMetrics(meshtastic_Telemetry *measurement)
-{
-    // Read from hardware
-    float value = sensor.readValue();
-
-    // Populate the appropriate protobuf variant
-    measurement->variant.environment_metrics.temperature = value;
-    // ... other fields ...
-
-    return true;
-}
-```
-
-## I2C Address Registration
-
-Register the sensor's I2C address(es) in `src/detect/ScanI2C` so it's auto-detected at boot:
-
-1. Add a `DeviceType` enum entry in `src/detect/ScanI2C.h`
-2. Add the I2C address mapping in `src/detect/ScanI2CTwoWire.cpp`
-
-The scan runs at boot and populates a device map that telemetry modules use to decide which sensors to initialize.
-
-## Protobuf Fields
-
-If the sensor provides data not covered by existing telemetry fields:
-
-1. Add fields to the appropriate message in `protobufs/meshtastic/telemetry.proto`:
-   - `EnvironmentMetrics` — Environmental measurements
-   - `AirQualityMetrics` — Air quality data
-   - `PowerMetrics` — Power/energy data
-   - `HealthMetrics` — Health/biometric data
-2. Add a `.options` constraint if needed (field sizes for nanopb)
-3. Regenerate: `bin/regen-protos.sh`
-
-## Sensor Type Enum
-
-Add the sensor to `meshtastic_TelemetrySensorType` enum in `protobufs/meshtastic/telemetry.proto`:
-
-```protobuf
-enum TelemetrySensorType {
-    // ... existing entries ...
-    MY_SENSOR = XX;
-}
-```
-
-## Integration with Telemetry Module
-
-Wire the sensor into the appropriate telemetry module. For environment sensors, this is typically in `src/modules/Telemetry/EnvironmentTelemetry.cpp`:
-
-1. Include the sensor header
-2. Add initialization in `setupSensor()` guarded by detection results
-3. Call `getMetrics()` in the measurement collection path
-
-Example pattern from existing sensors:
-
-```cpp
-#include "Sensor/MySensor.h"
-
-MySensor mySensor;
-
-// In setup:
-if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_MY_SENSOR].first > 0) {
-    mySensor.setup();
-}
-
-// In measurement collection:
-if (nodeTelemetrySensorsMap[meshtastic_TelemetrySensorType_MY_SENSOR].first > 0) {
-    mySensor.getMetrics(&measurement);
-}
-```
-
-## Library Dependencies
-
-If the sensor needs an external library, add it to the `lib_deps` in the relevant base platformio.ini configs:
-
-```ini
-lib_deps =
-    ${env.lib_deps}
-    mysensorlibrary@^1.0.0
-```
-
-Or use a conditional dependency if it's platform-specific.
-
-## Unit Conversions
-
-If the sensor reports values in non-standard units, use `src/modules/Telemetry/UnitConversions.h` for conversion helpers (e.g., Celsius ↔ Fahrenheit, hPa ↔ inHg).
-
-## Checklist
-
- [ ] Create `src/modules/Telemetry/Sensor/MySensor.h` and `.cpp`
- [ ] Inherit from `TelemetrySensor` base class
- [ ] Implement `setup()` and `getMetrics()` methods
- [ ] Add `meshtastic_TelemetrySensorType` enum entry in `telemetry.proto`
- [ ] Add I2C address to `src/detect/ScanI2C` for auto-detection
- [ ] Add protobuf fields in `telemetry.proto` if new data types needed
- [ ] Regenerate protos: `bin/regen-protos.sh`
- [ ] Wire into the appropriate telemetry module (Environment/AirQuality/Power/Health)
- [ ] Add library dependency if external library required
- [ ] Test on hardware or native build
@@ -1,178 +0,0 @@
-# New Hardware Variant
-
-Guide for adding a new Meshtastic hardware variant to the firmware.
-
-## Directory Structure
-
-Create under `variants/<arch>/<name>/`:
-
-```
-variants/
-├── esp32/          # ESP32
-├── esp32s3/        # ESP32-S3
-├── esp32c3/        # ESP32-C3
-├── esp32c6/        # ESP32-C6
-├── nrf52840/       # nRF52840
-├── rp2040/         # RP2040/RP2350
-├── stm32/          # STM32WL
-└── native/         # Linux/Portduino
-```
-
-Each variant needs at minimum:
-
- `variant.h` — Pin definitions and hardware capabilities
- `platformio.ini` — Build configuration
-
-Optional files:
-
- `pins_arduino.h` — Arduino pin mapping overrides
- `rfswitch.h` — RF switch control for multi-band radios
- `nicheGraphics.h` — InkHUD e-ink configuration
-
-## variant.h Template
-
-```cpp
-// Pin definitions
-#define I2C_SDA 21
-#define I2C_SCL 22
-
-// LoRa radio
-#define USE_SX1262              // Radio chip: USE_SX1262, USE_SX1268, USE_SX1280, USE_RF95, USE_LLCC68, USE_LR1110, USE_LR1120, USE_LR1121
-#define LORA_CS   18
-#define LORA_SCK  5
-#define LORA_MOSI 27
-#define LORA_MISO 19
-#define LORA_DIO1 33            // SX126x: DIO1, SX128x: DIO1, RF95: IRQ
-#define LORA_RESET 23
-#define LORA_BUSY 32            // SX126x/SX128x only
-#define SX126X_DIO2_AS_RF_SWITCH // Common for SX1262 boards
-
-// GPS
-#define HAS_GPS 1
-#define GPS_RX_PIN 34
-#define GPS_TX_PIN 12
-// #define PIN_GPS_EN 47         // Optional GPS enable pin
-// #define GPS_BAUDRATE 9600     // Override default 9600
-
-// Display
-#define HAS_SCREEN 1
-// #define USE_SSD1306            // OLED type
-// #define USE_SH1106             // Alternative OLED
-// #define USE_ST7789             // TFT type
-// #define SCREEN_WIDTH 128
-// #define SCREEN_HEIGHT 64
-
-// LEDs
-#define LED_PIN 2               // Status LED (optional)
-// #define HAS_NEOPIXEL 1        // WS2812 support
-
-// Buttons
-#define BUTTON_PIN 38
-// #define BUTTON_PIN_ALT 0      // Secondary button
-
-// Power management
-// #define HAS_AXP192 1          // AXP192 PMU (T-Beam v1.0)
-// #define HAS_AXP2101 1         // AXP2101 PMU (T-Beam v1.2+)
-// #define BATTERY_PIN 35        // ADC battery voltage pin
-// #define ADC_MULTIPLIER 2.0    // Voltage divider ratio
-
-// Optional I2C devices
-// #define HAS_RTC 1             // Real-time clock
-// #define HAS_TELEMETRY 1       // Enable telemetry sensor support
-// #define HAS_SENSOR 1          // I2C sensors present
-```
-
-## platformio.ini Template
-
-```ini
-[env:my_variant]
-extends = esp32s3_base            ; Use architecture-specific base
-board = esp32-s3-devkitc-1        ; PlatformIO board definition (or custom in boards/)
-board_level = extra               ; Build level: extra, or omit for default
-custom_meshtastic_support_level = 1  ; 1 = PR builds, 2 = merge builds only
-
-build_flags =
-    ${esp32s3_base.build_flags}
-    -D MY_VARIANT_SPECIFIC_FLAG=1
-    -I variants/esp32s3/my_variant  ; Include path for variant.h
-
-upload_speed = 921600
-```
-
-### Common Base Configs
-
- `esp32_base` / `esp32-common.ini` — ESP32
- `esp32s3_base` — ESP32-S3
- `esp32c3_base` — ESP32-C3
- `esp32c6_base` — ESP32-C6
- `nrf52840_base` / `nrf52.ini` — nRF52840
- `rp2040_base` — RP2040/RP2350
-
-### Support Levels
-
- `custom_meshtastic_support_level = 1` — Built on every PR (actively supported)
- `custom_meshtastic_support_level = 2` — Built only on merge to main branches
- `board_level = extra` — Only built on full releases
-
-## Build Manifest Metadata
-
-`bin/platformio-custom.py` emits UI capability flags in the build manifest:
-
- `custom_meshtastic_has_mui = true/false` — Override MUI detection
- `custom_meshtastic_has_ink_hud = true/false` — Override InkHUD detection
- Architecture names are normalized (e.g., `esp32s3` → `esp32-s3`)
-
-## InkHUD E-Ink Variants
-
-For e-ink display variants using the InkHUD framework, add `nicheGraphics.h`:
-
-```cpp
-// nicheGraphics.h — InkHUD configuration for this variant
-#define INKHUD                     // Enable InkHUD
-// Configure display, applets, and refresh behavior per device
-```
-
-InkHUD has its own PlatformIO config: `src/graphics/niche/InkHUD/PlatformioConfig.ini`
-
-## I2C Device Detection
-
-If the variant has I2C devices, ensure `src/detect/ScanI2C` will detect them. The auto-detection system handles 80+ device types including displays, sensors, RTCs, keyboards, PMUs, and touch controllers at boot.
-
-## Custom Board Definitions
-
-If the PlatformIO board doesn't exist, create a custom board JSON in `boards/`:
-
-```json
-{
-  "build": {
-    "arduino": { "ldscript": "esp32s3_out.ld" },
-    "core": "esp32",
-    "f_cpu": "240000000L",
-    "f_flash": "80000000L",
-    "flash_mode": "qio",
-    "mcu": "esp32s3",
-    "variant": "esp32s3"
-  },
-  "connectivity": ["wifi", "bluetooth"],
-  "frameworks": ["arduino", "espidf"],
-  "name": "My Custom Board",
-  "upload": {
-    "flash_size": "8MB",
-    "maximum_ram_size": 327680,
-    "maximum_size": 8388608
-  },
-  "url": "https://example.com",
-  "vendor": "MyVendor"
-}
-```
-
-## Checklist
-
- [ ] Create `variants/<arch>/<name>/variant.h` with pin definitions
- [ ] Create `variants/<arch>/<name>/platformio.ini` extending correct base
- [ ] Set `custom_meshtastic_support_level` (1 or 2)
- [ ] Verify radio chip define matches hardware (`USE_SX1262`, etc.)
- [ ] Set hardware capability flags (`HAS_GPS`, `HAS_SCREEN`, etc.)
- [ ] Add custom board JSON in `boards/` if needed
- [ ] Test build: `pio run -e my_variant`
- [ ] For e-ink: add `nicheGraphics.h` with InkHUD config
@@ -56,25 +56,6 @@ jobs:
          echo "long=$(./bin/buildinfo.py long)" >> $GITHUB_OUTPUT
        id: version

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -8,10 +8,10 @@ plugins:
      uri: https://github.com/trunk-io/plugins
 lint:
  enabled:
-    - checkov@3.2.517
-    - renovate@43.110.9
+    - checkov@3.2.513
+    - renovate@43.104.6
    - prettier@3.8.1
-    - trufflehog@3.94.3
+    - trufflehog@3.94.2
    - yamllint@1.38.0
    - bandit@1.9.4
    - trivy@0.69.3
@@ -1,39 +0,0 @@
-# MeshAdv-Pi E22-900M30S
-# https://github.com/chrismyers2000/MeshAdv-Pi-Hat
-Meta:
-  name: MeshAdv-Pi E22-900M30S
-  support: community
-  compatible:
-    - ebyte-ecb41-pge # Armbian
-
-Lora:
-  Module: sx1262
-  CS: # GPIO0_A1 (physical 40)
-    pin: 1
-    gpiochip: 0
-    line: 1
-  IRQ: # GPIO0_A3 (physical 36)
-    pin: 3
-    gpiochip: 0
-    line: 3
-  Busy: # GPIO0_A0 (physical 38)
-    pin: 0
-    gpiochip: 0
-    line: 0
-  Reset: # GPIO0_B4 (physical 12)
-    pin: 12
-    gpiochip: 0
-    line: 12
-  TXen: # GPIO1_D1 (physical 33)
-    pin: 57
-    gpiochip: 1
-    line: 25
-  RXen: # GPIO1_B3 (physical 32)
-    pin: 43
-    gpiochip: 1
-    line: 11
-  DIO3_TCXO_VOLTAGE: true
-  # Only for E22-900M33S:
-  # Limit the output power to 8 dBm
-  # SX126X_MAX_POWER: 8
-  spidev: spidev0.0
@@ -1,33 +0,0 @@
-# MeshAdv Mini E22-900M22S
-# https://github.com/chrismyers2000/MeshAdv-Mini
-Meta:
-  name: MeshAdv Mini E22-900M22S
-  support: community
-  compatible:
-    - ebyte-ecb41-pge # Armbian
-
-Lora:
-  Module: sx1262 # Ebyte E22-900M22S
-  CS: # GPIO0_B6 (physical 24, SPI1_CSN0)
-    pin: 14
-    gpiochip: 0
-    line: 14
-  IRQ: # GPIO0_A3 (physical 36)
-    pin: 3
-    gpiochip: 0
-    line: 3
-  Busy: # GPIO0_A0 (physical 38)
-    pin: 0
-    gpiochip: 0
-    line: 0
-  Reset: # GPIO1_C3 (physical 18)
-    pin: 51
-    gpiochip: 1
-    line: 19
-  RXen: # GPIO1_B3 (physical 32)
-    pin: 43
-    gpiochip: 1
-    line: 11
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  spidev: spidev0.0
@@ -1,38 +0,0 @@
-Meta:
-  name: RAK6421 + RAK13300 Slot 1
-  support: community # Promote when tested
-  compatible:
-    - ebyte-ecb41-pge # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO0_A5 (IO6, physical 15)
-    pin: 5
-    gpiochip: 0
-    line: 5
-  Reset: # GPIO0_A3 (IO4, physical 36)
-    pin: 3
-    gpiochip: 0
-    line: 3
-  Busy: # GPIO1_C3 (IO5, physical 18)
-    pin: 51
-    gpiochip: 1
-    line: 19
-  # Ant_sw: # GPIO1_C2 (IO3, physical 16)
-  #   pin: 50
-  #   gpiochip: 1
-  #   line: 18
-  Enable_Pins:
-    - pin: 43 # GPIO1_B3 (physical 32)
-      gpiochip: 1
-      line: 11
-    - pin: 57 # GPIO1_D1 (physical 33)
-      gpiochip: 1
-      line: 25
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
-  spidev: spidev0.0
-  # CS: # GPIO0_B6 (SPI1_CSN0, physical 24)
-  #   pin: 14
-  #   gpiochip: 0
-  #   line: 14
@@ -1,36 +0,0 @@
-Meta:
-  name: RAK6421 + RAK13300 Slot 2
-  support: community # Promote when tested
-  compatible:
-    - ebyte-ecb41-pge # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO0_B4 (IO6, physical 12)
-    pin: 12
-    gpiochip: 0
-    line: 12
-  Reset: # GPIO1_C3 (IO4, physical 18)
-    pin: 51
-    gpiochip: 1
-    line: 19
-  Busy: # GPIO0_B3 (IO5, physical 35)
-    pin: 11
-    gpiochip: 0
-    line: 11
-  # Ant_sw: # GPIO1_C2 (IO3, physical 16)
-  #   pin: 50
-  #   gpiochip: 1
-  #   line: 18
-  Enable_Pins:
-    - pin: 2 # GPIO0_A2 (physical 37)
-      gpiochip: 0
-      line: 2
-    - pin: 50 # GPIO1_C2 (physical 16)
-      gpiochip: 1
-      line: 18
-  spidev: spidev0.1
-  # CS: # GPIO0_A7 (SPI1_CSN1, physical 26)
-  #   pin: 7
-  #   gpiochip: 0
-  #   line: 7
@@ -1,39 +0,0 @@
-Meta:
-  name: RAK6421 + RAK13302 Slot 1
-  support: community # Promote when tested
-  compatible:
-    - ebyte-ecb41-pge # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO0_A5 (IO6, physical 15)
-    pin: 5
-    gpiochip: 0
-    line: 5
-  Reset: # GPIO0_A3 (IO4, physical 36)
-    pin: 3
-    gpiochip: 0
-    line: 3
-  Busy: # GPIO1_C3 (IO5, physical 18)
-    pin: 51
-    gpiochip: 1
-    line: 19
-  # Ant_sw: # GPIO1_C2 (IO3, physical 16)
-  #   pin: 50
-  #   gpiochip: 1
-  #   line: 18
-  Enable_Pins:
-    - pin: 43 # GPIO1_B3 (physical 32)
-      gpiochip: 1
-      line: 11
-    - pin: 57 # GPIO1_D1 (physical 33)
-      gpiochip: 1
-      line: 25
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
-  spidev: spidev0.0
-  # CS: # GPIO0_B6 (SPI1_CSN0, physical 24)
-  #   pin: 14
-  #   gpiochip: 0
-  #   line: 14
-  TX_GAIN_LORA: [9, 9, 10, 11, 9, 8, 9, 10, 10, 10, 11, 12, 12, 12, 12, 12, 12, 12, 12, 10, 9, 8]
@@ -1,37 +0,0 @@
-Meta:
-  name: RAK6421 + RAK13302 Slot 2
-  support: community # Promote when tested
-  compatible:
-    - ebyte-ecb41-pge # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO0_B4 (IO6, physical 12)
-    pin: 12
-    gpiochip: 0
-    line: 12
-  Reset: # GPIO1_C3 (IO4, physical 18)
-    pin: 51
-    gpiochip: 1
-    line: 19
-  Busy: # GPIO0_B3 (IO5, physical 35)
-    pin: 11
-    gpiochip: 0
-    line: 11
-  # Ant_sw: # GPIO1_C2 (IO3, physical 16)
-  #   pin: 50
-  #   gpiochip: 1
-  #   line: 18
-  Enable_Pins:
-    - pin: 2 # GPIO0_A2 (physical 37)
-      gpiochip: 0
-      line: 2
-    - pin: 50 # GPIO1_C2 (physical 16)
-      gpiochip: 1
-      line: 18
-  spidev: spidev0.1
-  # CS: # GPIO0_A7 (SPI1_CSN1, physical 26)
-  #   pin: 7
-  #   gpiochip: 0
-  #   line: 7
-  TX_GAIN_LORA: [9, 9, 10, 11, 9, 8, 9, 10, 10, 10, 11, 12, 12, 12, 12, 12, 12, 12, 12, 10, 9, 8]
@@ -1,30 +0,0 @@
-Meta:
-  name: Waveshare SX1262
-  support: deprecated
-  compatible:
-    - ebyte-ecb41-pge # Armbian
-
-Lora:
-  Module: sx1262  # Waveshare SX126X XXXM
-  DIO2_AS_RF_SWITCH: true
-  CS: # GPIO0_A1 (physical 40)
-    pin: 1
-    gpiochip: 0
-    line: 1
-  IRQ: # GPIO0_A3 (physical 36)
-    pin: 3
-    gpiochip: 0
-    line: 3
-  Busy: # GPIO0_A0 (physical 38)
-    pin: 0
-    gpiochip: 0
-    line: 0
-  Reset: # GPIO0_B4 (physical 12)
-    pin: 12
-    gpiochip: 0
-    line: 12
-  SX126X_ANT_SW: # GPIO1_B2 (physical 31)
-    pin: 42
-    gpiochip: 1
-    line: 10
-  spidev: spidev0.0
@@ -1,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,41 +0,0 @@
-# !! WARNING: Hats on the OK3506 board are installed "backwards" (facing outwards)
-
-# MeshAdv-Pi E22-900M30S
-# https://github.com/chrismyers2000/MeshAdv-Pi-Hat
-Meta:
-  name: MeshAdv-Pi E22-900M30S
-  support: community
-  compatible:
-    - forlinx-ok3506-s12 # Armbian
-
-Lora:
-  Module: sx1262
-  CS: # GPIO0_B0 (physical 40)
-    pin: 8
-    gpiochip: 0
-    line: 8
-  IRQ: # GPIO3_B0 (physical 36)
-    pin: 104
-    gpiochip: 3
-    line: 8
-  Busy: # GPIO0_B1 (physical 38)
-    pin: 9
-    gpiochip: 0
-    line: 9
-  Reset: # GPIO0_B6 (physical 12)
-    pin: 14
-    gpiochip: 0
-    line: 14
-  TXen: # GPIO0_A3 (physical 33)
-    pin: 3
-    gpiochip: 0
-    line: 3
-  RXen: # GPIO0_A2 (physical 32)
-    pin: 2
-    gpiochip: 0
-    line: 2
-  DIO3_TCXO_VOLTAGE: true
-  # Only for E22-900M33S:
-  # Limit the output power to 8 dBm
-  # SX126X_MAX_POWER: 8
-  spidev: spidev0.0
@@ -1,35 +0,0 @@
-# !! WARNING: Hats on the OK3506 board are installed "backwards" (facing outwards)
-
-# MeshAdv Mini E22-900M22S
-# https://github.com/chrismyers2000/MeshAdv-Mini
-Meta:
-  name: MeshAdv Mini E22-900M22S
-  support: community
-  compatible:
-    - forlinx-ok3506-s12 # Armbian
-
-Lora:
-  Module: sx1262 # Ebyte E22-900M22S
-  CS: # GPIO0_C3 (physical 24, SPI0_CSN0)
-    pin: 19
-    gpiochip: 0
-    line: 19
-  IRQ: # GPIO3_B0 (physical 36)
-    pin: 104
-    gpiochip: 3
-    line: 8
-  Busy: # GPIO0_B1 (physical 38)
-    pin: 9
-    gpiochip: 0
-    line: 9
-  Reset: # GPIO3_A6 (physical 18)
-    pin: 102
-    gpiochip: 3
-    line: 6
-  RXen: # GPIO0_A2 (physical 32)
-    pin: 2
-    gpiochip: 0
-    line: 2
-  DIO2_AS_RF_SWITCH: true
-  DIO3_TCXO_VOLTAGE: true
-  spidev: spidev0.0
@@ -1,40 +0,0 @@
-# !! WARNING: Hats on the OK3506 board are installed "backwards" (facing outwards)
-
-Meta:
-  name: RAK6421 + RAK13300 Slot 1
-  support: community # Promote when tested
-  compatible:
-    - forlinx-ok3506-s12 # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO3_B5 (IO6, physical 15)
-    pin: 109
-    gpiochip: 3
-    line: 13
-  Reset: # GPIO3_B0 (IO4, physical 36)
-    pin: 104
-    gpiochip: 3
-    line: 8
-  Busy: # GPIO3_A6 (IO5, physical 18)
-    pin: 102
-    gpiochip: 3
-    line: 6
-  # Ant_sw: # GPIO0_A3 (IO3, physical 33)
-  #   pin: 3
-  #   gpiochip: 0
-  #   line: 3
-  Enable_Pins:
-    - pin: 2 # GPIO0_A2 (physical 32)
-      gpiochip: 0
-      line: 2
-    - pin: 3 # GPIO0_A3 (physical 33)
-      gpiochip: 0
-      line: 3
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
-  spidev: spidev0.0
-  # CS: # GPIO0_C3 (SPI0_CSN0, physical 24)
-  #   pin: 19
-  #   gpiochip: 0
-  #   line: 19
@@ -1,38 +0,0 @@
-# !! WARNING: Hats on the OK3506 board are installed "backwards" (facing outwards)
-
-Meta:
-  name: RAK6421 + RAK13300 Slot 2
-  support: community # Promote when tested
-  compatible:
-    - forlinx-ok3506-s12 # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO0_B6 (IO6, physical 12)
-    pin: 14
-    gpiochip: 0
-    line: 14
-  Reset: # GPIO3_A6 (IO4, physical 18)
-    pin: 102
-    gpiochip: 3
-    line: 6
-  Busy: # GPIO0_B2 (IO5, physical 35)
-    pin: 10
-    gpiochip: 0
-    line: 10
-  # Ant_sw: # GPIO3_A7 (IO3, physical 16)
-  #   pin: 103
-  #   gpiochip: 3
-  #   line: 7
-  Enable_Pins:
-    - pin: 106 # GPIO3_B2 (physical 37)
-      gpiochip: 3
-      line: 10
-    - pin: 103 # GPIO3_A7 (physical 16)
-      gpiochip: 3
-      line: 7
-  spidev: spidev0.1
-  # CS: # GPIO0_B7 (SPI0_CSN1, physical 26)
-  #   pin: 15
-  #   gpiochip: 0
-  #   line: 15
@@ -1,41 +0,0 @@
-# !! WARNING: Hats on the OK3506 board are installed "backwards" (facing outwards)
-
-Meta:
-  name: RAK6421 + RAK13302 Slot 1
-  support: community # Promote when tested
-  compatible:
-    - forlinx-ok3506-s12 # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO3_B5 (IO6, physical 15)
-    pin: 109
-    gpiochip: 3
-    line: 13
-  Reset: # GPIO3_B0 (IO4, physical 36)
-    pin: 104
-    gpiochip: 3
-    line: 8
-  Busy: # GPIO3_A6 (IO5, physical 18)
-    pin: 102
-    gpiochip: 3
-    line: 6
-  # Ant_sw: # GPIO0_A3 (IO3, physical 33)
-  #   pin: 3
-  #   gpiochip: 0
-  #   line: 3
-  Enable_Pins:
-    - pin: 2 # GPIO0_A2 (physical 32)
-      gpiochip: 0
-      line: 2
-    - pin: 3 # GPIO0_A3 (physical 33)
-      gpiochip: 0
-      line: 3
-  DIO3_TCXO_VOLTAGE: true
-  DIO2_AS_RF_SWITCH: true
-  spidev: spidev0.0
-  # CS: # GPIO0_C3 (SPI0_CSN0, physical 24)
-  #   pin: 19
-  #   gpiochip: 0
-  #   line: 19
-  TX_GAIN_LORA: [9, 9, 10, 11, 9, 8, 9, 10, 10, 10, 11, 12, 12, 12, 12, 12, 12, 12, 12, 10, 9, 8]
@@ -1,39 +0,0 @@
-# !! WARNING: Hats on the OK3506 board are installed "backwards" (facing outwards)
-
-Meta:
-  name: RAK6421 + RAK13302 Slot 2
-  support: community # Promote when tested
-  compatible:
-    - forlinx-ok3506-s12 # Armbian
-
-Lora:
-  Module: sx1262
-  IRQ: # GPIO0_B6 (IO6, physical 12)
-    pin: 14
-    gpiochip: 0
-    line: 14
-  Reset: # GPIO3_A6 (IO4, physical 18)
-    pin: 102
-    gpiochip: 3
-    line: 6
-  Busy: # GPIO0_B2 (IO5, physical 35)
-    pin: 10
-    gpiochip: 0
-    line: 10
-  # Ant_sw: # GPIO3_A7 (IO3, physical 16)
-  #   pin: 103
-  #   gpiochip: 3
-  #   line: 7
-  Enable_Pins:
-    - pin: 106 # GPIO3_B2 (physical 37)
-      gpiochip: 3
-      line: 10
-    - pin: 103 # GPIO3_A7 (physical 16)
-      gpiochip: 3
-      line: 7
-  spidev: spidev0.1
-  # CS: # GPIO0_B7 (SPI0_CSN1, physical 26)
-  #   pin: 15
-  #   gpiochip: 0
-  #   line: 15
-  TX_GAIN_LORA: [9, 9, 10, 11, 9, 8, 9, 10, 10, 10, 11, 12, 12, 12, 12, 12, 12, 12, 12, 10, 9, 8]
@@ -1,32 +0,0 @@
-# !! WARNING: Hats on the OK3506 board are installed "backwards" (facing outwards)
-
-Meta:
-  name: Waveshare SX1262
-  support: deprecated
-  compatible:
-    - forlinx-ok3506-s12 # Armbian
-
-Lora:
-  Module: sx1262  # Waveshare SX126X XXXM
-  DIO2_AS_RF_SWITCH: true
-  CS: # GPIO0_B0 (physical 40)
-    pin: 8
-    gpiochip: 0
-    line: 8
-  IRQ: # GPIO3_B0 (physical 36)
-    pin: 104
-    gpiochip: 3
-    line: 8
-  Busy: # GPIO0_B1 (physical 38)
-    pin: 9
-    gpiochip: 0
-    line: 9
-  Reset: # GPIO0_B6 (physical 12)
-    pin: 14
-    gpiochip: 0
-    line: 14
-  SX126X_ANT_SW: # GPIO3_B3 (physical 31)
-    pin: 107
-    gpiochip: 3
-    line: 11
-  spidev: spidev0.0
@@ -1,31 +1,25 @@
 #!/usr/bin/env python3
-"""Generate release notes from the actual release commit range."""
+"""
+Generate release notes from merged PRs on develop and master branches.
+Categorizes PRs into Enhancements and Bug Fixes/Maintenance sections.
+"""

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


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


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


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

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


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


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

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

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

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

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

  <releases>
-    <release version="2.7.23" date="2026-04-14">
-      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.23</url>
-    </release>
    <release version="2.7.22" date="2026-04-06">
      <url type="details">https://github.com/meshtastic/firmware/releases?q=tag%3Av2.7.22</url>
    </release>
@@ -1,9 +1,3 @@
-meshtasticd (2.7.23.0) unstable; urgency=medium
-
-  * Version 2.7.23
-
- -- GitHub Actions <github-actions[bot]@users.noreply.github.com>  Tue, 14 Apr 2026 12:29:48 +0000
-
 meshtasticd (2.7.22.0) unstable; urgency=medium

  * Version 2.7.22
@@ -50,13 +50,16 @@ build_flags = -Wno-missing-field-initializers
 	-DRADIOLIB_EXCLUDE_APRS=1
 	-DRADIOLIB_EXCLUDE_LORAWAN=1
 	-DMESHTASTIC_EXCLUDE_DROPZONE=1
+	-DMESHTASTIC_EXCLUDE_ZPS=1
 	-DMESHTASTIC_EXCLUDE_REPLYBOT=1
 	-DMESHTASTIC_EXCLUDE_REMOTEHARDWARE=1
 	-DMESHTASTIC_EXCLUDE_HEALTH_TELEMETRY=1
 	-DMESHTASTIC_EXCLUDE_POWERSTRESS=1 ; exclude power stress test module from main firmware
 	-DMESHTASTIC_EXCLUDE_GENERIC_THREAD_MODULE=1
 	-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
@@ -124,122 +127,108 @@ 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/5305670b68eb5b92d14e62b5b536969ca4bb441f.zip
+	https://github.com/meshtastic/device-ui/archive/1897dd17fceb1f101bb1a3245680aa3439edcfdd.zip

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

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

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

 ; Environmental sensors without BSEC (saves ~3.5KB DRAM for original ESP32 targets)
 [environmental_extra_no_bsec]
 lib_deps =
 	${environmental_extra_common.lib_deps}
-	# renovate: datasource=github-tags depName=Adafruit_BME680 packageName=adafruit/Adafruit_BME680
-	https://github.com/adafruit/Adafruit_BME680/archive/refs/tags/2.0.6.zip
+	# renovate: datasource=custom.pio depName=Adafruit_BME680 packageName=adafruit/library/Adafruit BME680 Library
+	adafruit/Adafruit BME680 Library@2.0.6
@@ -21,15 +21,8 @@
 // How many messages are stored (RAM + flash).
 // Define -DMESSAGE_HISTORY_LIMIT=N in build_flags to control memory usage.
 #ifndef MESSAGE_HISTORY_LIMIT
-#if defined(ARCH_ESP32) &&                                                                                                       \
-    !(defined(CONFIG_IDF_TARGET_ESP32C3) || defined(CONFIG_IDF_TARGET_ESP32S3) || defined(CONFIG_IDF_TARGET_ESP32S2))
-// Baseline ESP32 (non-PSRAM variants) has limited heap; reduce message history on resource-constrained builds.
-// Override with -DMESSAGE_HISTORY_LIMIT=N if needed.
-#define MESSAGE_HISTORY_LIMIT 10
-#else
 #define MESSAGE_HISTORY_LIMIT 20
 #endif
-#endif

 // Internal alias used everywhere in code – do NOT redefine elsewhere.
 #define MAX_MESSAGES_SAVED MESSAGE_HISTORY_LIMIT
@@ -40,22 +40,6 @@
 #include "concurrency/LockGuard.h"
 #endif

-#if defined(ARCH_STM32WL) && defined(BATTERY_PIN)
-#include "stm32yyxx_ll_adc.h"
-
-/* Analog read resolution */
-#if defined(LL_ADC_RESOLUTION_12B)
-#define LL_ADC_RESOLUTION LL_ADC_RESOLUTION_12B
-#define BATTERY_SENSE_RESOLUTION_BITS 12
-#elif defined(LL_ADC_DS_DATA_WIDTH_12_BIT)
-#define LL_ADC_RESOLUTION LL_ADC_DS_DATA_WIDTH_12_BIT
-#define BATTERY_SENSE_RESOLUTION_BITS 12
-#else
-#error "ADC resolution could not be defined!"
-#endif
-#define ADC_RANGE (1 << BATTERY_SENSE_RESOLUTION_BITS)
-#endif
-
 #if defined(DEBUG_HEAP_MQTT) && !MESHTASTIC_EXCLUDE_MQTT
 #include "mqtt/MQTT.h"
 #include "target_specific.h"
@@ -344,17 +328,11 @@ class AnalogBatteryLevel : public HasBatteryLevel
            float scaled = 0;

            battery_adcEnable();
-#ifdef ARCH_STM32WL
-            // STM32 ADC with VREFINT runtime calibration
-            Vref = __LL_ADC_CALC_VREFANALOG_VOLTAGE(analogRead(AVREF), LL_ADC_RESOLUTION);
-            raw = analogRead(BATTERY_PIN);
-            scaled = __LL_ADC_CALC_DATA_TO_VOLTAGE(Vref, raw, LL_ADC_RESOLUTION);
-            scaled *= operativeAdcMultiplier;
-#elif defined(ARCH_ESP32) // ADC block for espressif platforms
+#ifdef ARCH_ESP32 // ADC block for espressif platforms
            raw = espAdcRead();
            scaled = esp_adc_cal_raw_to_voltage(raw, adc_characs);
            scaled *= operativeAdcMultiplier;
-#else                     // block for all other platforms
+#else // block for all other platforms
 #ifdef ARCH_NRF52
            concurrency::LockGuard saadcGuard(concurrency::nrf52SaadcLock);
 #endif
@@ -552,11 +530,6 @@ class AnalogBatteryLevel : public HasBatteryLevel
    bool initial_read_done = false;
    float last_read_value = (OCV[NUM_OCV_POINTS - 1] * NUM_CELLS);
    uint32_t last_read_time_ms = 0;
-#ifdef ARCH_STM32WL
-    // 3300mV placeholder for STM32 errata where VREFINT factory calibration may be missing
-    // (e.g. STM32U0, see DS14756 Rev 3 §2.4.1 "VREFINT offset")
-    uint32_t Vref = 3300;
-#endif

 #if HAS_TELEMETRY && !MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR && defined(HAS_RAKPROT)

@@ -666,9 +639,7 @@ bool Power::analogInit()
 #define BATTERY_SENSE_RESOLUTION_BITS 10
 #endif

-#ifdef ARCH_STM32WL
-    analogReadResolution(BATTERY_SENSE_RESOLUTION_BITS);
-#elif defined(ARCH_ESP32) // ESP32 needs special analog stuff
+#ifdef ARCH_ESP32 // ESP32 needs special analog stuff

 #ifndef ADC_WIDTH // max resolution by default
    static const adc_bits_width_t width = ADC_WIDTH_BIT_12;
@@ -678,7 +649,7 @@ bool Power::analogInit()
 #ifndef BAT_MEASURE_ADC_UNIT // ADC1
    adc1_config_width(width);
    adc1_config_channel_atten(adc_channel, atten);
-#else                        // ADC2
+#else // ADC2
    adc2_config_channel_atten(adc_channel, atten);
 #ifndef CONFIG_IDF_TARGET_ESP32S3
    // ADC2 wifi bug workaround
@@ -708,7 +679,7 @@ bool Power::analogInit()

    // NRF52 ADC init moved to powerHAL_init in nrf52 platform

-#if !defined(ARCH_ESP32) && !defined(ARCH_STM32WL)
+#ifndef ARCH_ESP32
    analogReadResolution(BATTERY_SENSE_RESOLUTION_BITS);
 #endif

@@ -30,9 +30,6 @@ SerialConsole *console;

 void consoleInit()
 {
-    if (console) {
-        return;
-    }
    auto sc = new SerialConsole(); // Must be dynamically allocated because we are now inheriting from thread

 #if defined(SERIAL_HAS_ON_RECEIVE)
@@ -1,85 +1,10 @@
 #include "concurrency/BinarySemaphorePosix.h"
 #include "configuration.h"

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

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

 BinarySemaphorePosix::BinarySemaphorePosix() {}

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

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

 } // namespace concurrency

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

 #include "../freertosinc.h"

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

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

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

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

 #endif

-} // namespace concurrency
+} // namespace concurrency
@@ -202,7 +202,7 @@ void EInkParallelDisplay::display(void)

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

    // Track changed row range while converting
    int newTop = h;     // min changed row (initialized to out-of-range)
@@ -1197,7 +1197,7 @@ void Screen::setFrames(FrameFocus focus)
        for (size_t i = 0; i < nodeDB->getNumMeshNodes(); i++) {
            const meshtastic_NodeInfoLite *n = nodeDB->getMeshNodeByIndex(i);
            if (n && n->num != nodeDB->getNodeNum() && n->is_favorite) {
-                favoriteFrames.push_back(graphics::UIRenderer::drawFavoriteNode);
+                favoriteFrames.push_back(graphics::UIRenderer::drawNodeInfo);
            }
        }

@@ -1226,7 +1226,7 @@ void Screen::setFrames(FrameFocus focus)
    static OverlayCallback overlays[] = {graphics::UIRenderer::drawNavigationBar, NotificationRenderer::drawBannercallback};
    ui->setOverlays(overlays, sizeof(overlays) / sizeof(overlays[0]));

-    prevFrame = -1; // Force drawFavoriteNode to pick a new node (because our list just changed)
+    prevFrame = -1; // Force drawNodeInfo to pick a new node (because our list just changed)

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

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

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

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

    std::vector<MessageBlock> blocks = buildMessageBlocks(isHeader, isMine);
@@ -3,9 +3,6 @@
 #include "CompassRenderer.h"
 #include "NodeDB.h"
 #include "NodeListRenderer.h"
-#if !MESHTASTIC_EXCLUDE_STATUS
-#include "modules/StatusMessageModule.h"
-#endif
 #include "UIRenderer.h"
 #include "gps/GeoCoord.h"
 #include "gps/RTC.h" // for getTime() function
@@ -95,41 +92,8 @@ std::string getSafeNodeName(OLEDDisplay *display, meshtastic_NodeInfoLite *node,

    // 1) Choose target candidate (long vs short) only if present
    const char *raw = nullptr;
-
-#if !MESHTASTIC_EXCLUDE_STATUS
-    // If long-name mode is enabled, and we have a recent status for this node,
-    // prefer "(short_name) statusText" as the raw candidate.
-    std::string composedFromStatus;
-    if (config.display.use_long_node_name && node && node->has_user && statusMessageModule) {
-        const auto &recent = statusMessageModule->getRecentReceived();
-        const StatusMessageModule::RecentStatus *found = nullptr;
-        for (auto it = recent.rbegin(); it != recent.rend(); ++it) {
-            if (it->fromNodeId == node->num && !it->statusText.empty()) {
-                found = &(*it);
-                break;
-            }
-        }
-
-        if (found) {
-            const char *shortName = node->user.short_name;
-            composedFromStatus.reserve(4 + (shortName ? std::strlen(shortName) : 0) + 1 + found->statusText.size());
-            composedFromStatus += "(";
-            if (shortName && *shortName) {
-                composedFromStatus += shortName;
-            }
-            composedFromStatus += ") ";
-            composedFromStatus += found->statusText;
-
-            raw = composedFromStatus.c_str(); // safe for now; we'll sanitize immediately into std::string
-        }
-    }
-#endif
-
-    // If we didn't compose from status, use normal long/short selection
-    if (!raw) {
-        if (node && node->has_user) {
-            raw = config.display.use_long_node_name ? node->user.long_name : node->user.short_name;
-        }
+    if (node && node->has_user) {
+        raw = config.display.use_long_node_name ? node->user.long_name : node->user.short_name;
    }

    // 2) Preserve UTF-8 names so emotes can be detected and rendered.
@@ -5,9 +5,6 @@
 #include "MeshService.h"
 #include "NodeDB.h"
 #include "NodeListRenderer.h"
-#if !MESHTASTIC_EXCLUDE_STATUS
-#include "modules/StatusMessageModule.h"
-#endif
 #include "UIRenderer.h"
 #include "airtime.h"
 #include "gps/GeoCoord.h"
@@ -293,7 +290,7 @@ void UIRenderer::drawNodes(OLEDDisplay *display, int16_t x, int16_t y, const mes
 // * Favorite Node Info *
 // **********************
 // cppcheck-suppress constParameterPointer; signature must match FrameCallback typedef from OLEDDisplayUi library
-void UIRenderer::drawFavoriteNode(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
+void UIRenderer::drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y)
 {
    if (favoritedNodes.empty())
        return;
@@ -345,57 +342,6 @@ void UIRenderer::drawFavoriteNode(OLEDDisplay *display, OLEDDisplayUiState *stat
        UIRenderer::drawStringWithEmotes(display, x, getTextPositions(display)[line++], username, FONT_HEIGHT_SMALL, 1, false);
    }

-#if !MESHTASTIC_EXCLUDE_STATUS
-    // === Optional: Last received StatusMessage line for this node ===
-    // Display it directly under the username line (if we have one).
-    if (statusMessageModule) {
-        const auto &recent = statusMessageModule->getRecentReceived();
-        const StatusMessageModule::RecentStatus *found = nullptr;
-
-        // Search newest-to-oldest
-        for (auto it = recent.rbegin(); it != recent.rend(); ++it) {
-            if (it->fromNodeId == node->num && !it->statusText.empty()) {
-                found = &(*it);
-                break;
-            }
-        }
-
-        if (found) {
-            std::string statusLine = std::string(" Status: ") + found->statusText;
-            {
-                const int screenW = display->getWidth();
-                const int ellipseW = display->getStringWidth("...");
-                int w = display->getStringWidth(statusLine.c_str());
-
-                // Only do work if it overflows
-                if (w > screenW) {
-                    bool truncated = false;
-                    if (ellipseW > screenW) {
-                        statusLine.clear();
-                    } else {
-                        while (!statusLine.empty()) {
-                            // remove one char (byte) at a time
-                            statusLine.pop_back();
-                            truncated = true;
-
-                            // Measure candidate with ellipsis appended
-                            std::string candidate = statusLine + "...";
-                            if (display->getStringWidth(candidate.c_str()) <= screenW) {
-                                statusLine = std::move(candidate);
-                                break;
-                            }
-                        }
-                        if (statusLine.empty() && ellipseW <= screenW) {
-                            statusLine = "...";
-                        }
-                    }
-                }
-            }
-            display->drawString(x, getTextPositions(display)[line++], statusLine.c_str());
-        }
-    }
-#endif
-
    // === 2. Signal and Hops (combined on one line, if available) ===
    char signalHopsStr[32] = "";
    bool haveSignal = false;
@@ -50,7 +50,7 @@ class UIRenderer
    // Navigation bar overlay
    static void drawNavigationBar(OLEDDisplay *display, OLEDDisplayUiState *state);

-    static void drawFavoriteNode(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);
+    static void drawNodeInfo(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);

    static void drawDeviceFocused(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y);

@@ -121,6 +121,7 @@ void CardputerKeyboard::pressed(uint8_t key)
        modifierFlag = 0;
    }

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

@@ -10,26 +10,8 @@
 #include "memGet.h"
 #include "configuration.h"

-#if defined(MESHTASTIC_DYNAMIC_SBRK_HEAP)
-#include <malloc.h>
-#include <unistd.h> // sbrk
-
 #ifdef ARCH_STM32WL
-// Returns the uncommitted sbrk headroom: addressable space between the current heap
-// break and the stack pointer that has not yet been committed to the arena.
-static uint32_t sbrkHeadroom()
-{
-    // defined in STM32 linker script
-    extern char _estack;
-    extern char _Min_Stack_Size;
-
-    uint32_t max_sp = (uint32_t)(&_estack - &_Min_Stack_Size);
-    uint32_t heap_end = (uint32_t)sbrk(0);
-    return (max_sp > heap_end) ? (max_sp - heap_end) : 0;
-}
-#else
-#error Unsupported architecture!
-#endif
+#include <malloc.h>
 #endif

 MemGet memGet;
@@ -46,9 +28,9 @@ uint32_t MemGet::getFreeHeap()
    return dbgHeapFree();
 #elif defined(ARCH_RP2040)
    return rp2040.getFreeHeap();
-#elif defined(MESHTASTIC_DYNAMIC_SBRK_HEAP) // Currently: ARCH_STM32WL
+#elif defined(ARCH_STM32WL)
    struct mallinfo m = mallinfo();
-    return m.fordblks + sbrkHeadroom(); // Free space within arena + uncommitted sbrk headroom
+    return m.fordblks; // Total free space (bytes)
 #else
    // this platform does not have heap management function implemented
    return UINT32_MAX;
@@ -67,9 +49,9 @@ uint32_t MemGet::getHeapSize()
    return dbgHeapTotal();
 #elif defined(ARCH_RP2040)
    return rp2040.getTotalHeap();
-#elif defined(MESHTASTIC_DYNAMIC_SBRK_HEAP) // Currently: ARCH_STM32WL
+#elif defined(ARCH_STM32WL)
    struct mallinfo m = mallinfo();
-    return m.arena + sbrkHeadroom(); // Non-mmapped space allocated + uncommitted sbrk headroom
+    return m.arena; // Non-mmapped space allocated (bytes)
 #else
    // this platform does not have heap management function implemented
    return UINT32_MAX;
@@ -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);
    }
@@ -1,160 +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 <sys/random.h>
-#include <unistd.h>
-#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) {
-        // Intentionally silent: this path runs during portduinoSetup() before the
-        // console/SerialConsole is initialized, so LOG_* here would dereference a null pointer.
-        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.
-    ssize_t generated = ::getrandom(buffer, length, 0);
-    if (generated == static_cast<ssize_t>(length)) {
-        filled = true;
-    }
-
-    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,7 +4,6 @@
 #include "MeshTypes.h"
 #include "PointerQueue.h"
 #include "configuration.h"
-#include "detect/LoRaRadioType.h"

 // Sentinel marking the end of a modem preset array
 static constexpr meshtastic_Config_LoRaConfig_ModemPreset MODEM_PRESET_END =
@@ -60,7 +59,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

@@ -72,14 +71,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;
@@ -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 */
@@ -27,42 +27,6 @@ PB_BIND(meshtastic_PLI, meshtastic_PLI, AUTO)
 PB_BIND(meshtastic_AircraftTrack, meshtastic_AircraftTrack, AUTO)


-PB_BIND(meshtastic_CotGeoPoint, meshtastic_CotGeoPoint, AUTO)
-
-
-PB_BIND(meshtastic_DrawnShape, meshtastic_DrawnShape, 2)
-
-
-PB_BIND(meshtastic_Marker, meshtastic_Marker, AUTO)
-
-
-PB_BIND(meshtastic_RangeAndBearing, meshtastic_RangeAndBearing, AUTO)
-
-
-PB_BIND(meshtastic_Route, meshtastic_Route, 2)
-
-
-PB_BIND(meshtastic_Route_Link, meshtastic_Route_Link, AUTO)
-
-
-PB_BIND(meshtastic_CasevacReport, meshtastic_CasevacReport, 2)
-
-
-PB_BIND(meshtastic_ZMistEntry, meshtastic_ZMistEntry, AUTO)
-
-
-PB_BIND(meshtastic_EmergencyAlert, meshtastic_EmergencyAlert, AUTO)
-
-
-PB_BIND(meshtastic_TaskRequest, meshtastic_TaskRequest, AUTO)
-
-
-PB_BIND(meshtastic_TAKEnvironment, meshtastic_TAKEnvironment, AUTO)
-
-
-PB_BIND(meshtastic_SensorFov, meshtastic_SensorFov, AUTO)
-
-
 PB_BIND(meshtastic_TAKPacketV2, meshtastic_TAKPacketV2, 2)


@@ -77,29 +41,3 @@ PB_BIND(meshtastic_TAKPacketV2, meshtastic_TAKPacketV2, 2)



-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -27,9 +27,6 @@ PB_BIND(meshtastic_KeyVerification, meshtastic_KeyVerification, AUTO)
 PB_BIND(meshtastic_StoreForwardPlusPlus, meshtastic_StoreForwardPlusPlus, 2)


-PB_BIND(meshtastic_RemoteShell, meshtastic_RemoteShell, AUTO)
-
-
 PB_BIND(meshtastic_Waypoint, meshtastic_Waypoint, AUTO)


@@ -132,8 +129,6 @@ PB_BIND(meshtastic_ChunkedPayloadResponse, meshtastic_ChunkedPayloadResponse, AU



-
-



@@ -308,13 +308,8 @@ typedef enum _meshtastic_HardwareModel {
    meshtastic_HardwareModel_TDISPLAY_S3_PRO = 126,
    /* Heltec Mesh Node T096 board features an nRF52840 CPU and a TFT screen. */
    meshtastic_HardwareModel_HELTEC_MESH_NODE_T096 = 127,
-    /* Seeed studio T1000-E Pro tracker card. NRF52840 w/ LR2021 radio,
- GPS, button, buzzer, and sensors. */
+    /* Seeed studio T1000-E Pro tracker card. NRF52840 w/ LR2021 radio, GPS, button, buzzer, and sensors. */
    meshtastic_HardwareModel_TRACKER_T1000_E_PRO = 128,
-    /* Elecrow ThinkNode M7, M8 and M9 */
-    meshtastic_HardwareModel_THINKNODE_M7 = 129,
-    meshtastic_HardwareModel_THINKNODE_M8 = 130,
-    meshtastic_HardwareModel_THINKNODE_M9 = 131,
    /* ------------------------------------------------------------------------------------------------------------------------------------------
 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.
 ------------------------------------------------------------------------------------------------------------------------------------------ */
@@ -518,27 +513,6 @@ typedef enum _meshtastic_StoreForwardPlusPlus_SFPP_message_type {
    meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_PROVIDE_SECONDHALF = 6
 } meshtastic_StoreForwardPlusPlus_SFPP_message_type;

-/* Frame op code for PTY session control and stream transport.
-
- Values 1-63 are client->server requests.
- Values 64-127 are server->client responses/events. */
-typedef enum _meshtastic_RemoteShell_OpCode {
-    meshtastic_RemoteShell_OpCode_OP_UNSET = 0,
-    /* Client -> server */
-    meshtastic_RemoteShell_OpCode_OPEN = 1,
-    meshtastic_RemoteShell_OpCode_INPUT = 2,
-    meshtastic_RemoteShell_OpCode_RESIZE = 3,
-    meshtastic_RemoteShell_OpCode_CLOSE = 4,
-    meshtastic_RemoteShell_OpCode_PING = 5,
-    meshtastic_RemoteShell_OpCode_ACK = 6,
-    /* Server -> client */
-    meshtastic_RemoteShell_OpCode_OPEN_OK = 64,
-    meshtastic_RemoteShell_OpCode_OUTPUT = 65,
-    meshtastic_RemoteShell_OpCode_CLOSED = 66,
-    meshtastic_RemoteShell_OpCode_ERROR = 67,
-    meshtastic_RemoteShell_OpCode_PONG = 68
-} meshtastic_RemoteShell_OpCode;
-
 /* The priority of this message for sending.
 Higher priorities are sent first (when managing the transmit queue).
 This field is never sent over the air, it is only used internally inside of a local device node.
@@ -871,31 +845,6 @@ typedef struct _meshtastic_StoreForwardPlusPlus {
    uint32_t chain_count;
 } meshtastic_StoreForwardPlusPlus;

-typedef PB_BYTES_ARRAY_T(200) meshtastic_RemoteShell_payload_t;
-/* The actual over-the-mesh message doing RemoteShell */
-typedef struct _meshtastic_RemoteShell {
-    /* Structured frame operation. */
-    meshtastic_RemoteShell_OpCode op;
-    /* Logical PTY session identifier. */
-    uint32_t session_id;
-    /* Monotonic sequence number for this frame. */
-    uint32_t seq;
-    /* Cumulative ack sequence number. */
-    uint32_t ack_seq;
-    /* Opaque bytes payload for INPUT/OUTPUT/ERROR and other frame bodies. */
-    meshtastic_RemoteShell_payload_t payload;
-    /* Terminal size columns used for OPEN/RESIZE signaling. */
-    uint32_t cols;
-    /* Terminal size rows used for OPEN/RESIZE signaling. */
-    uint32_t rows;
-    /* Bit flags for protocol extensions. */
-    uint32_t flags;
-    /* The last sequence number TX'd. */
-    uint32_t last_tx_seq;
-    /* The last sequence number RX'd. */
-    uint32_t last_rx_seq;
-} meshtastic_RemoteShell;
-
 /* Waypoint message, used to share arbitrary locations across the mesh */
 typedef struct _meshtastic_Waypoint {
    /* Id of the waypoint */
@@ -1436,10 +1385,6 @@ extern "C" {
 #define _meshtastic_StoreForwardPlusPlus_SFPP_message_type_MAX meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_PROVIDE_SECONDHALF
 #define _meshtastic_StoreForwardPlusPlus_SFPP_message_type_ARRAYSIZE ((meshtastic_StoreForwardPlusPlus_SFPP_message_type)(meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_PROVIDE_SECONDHALF+1))

-#define _meshtastic_RemoteShell_OpCode_MIN meshtastic_RemoteShell_OpCode_OP_UNSET
-#define _meshtastic_RemoteShell_OpCode_MAX meshtastic_RemoteShell_OpCode_PONG
-#define _meshtastic_RemoteShell_OpCode_ARRAYSIZE ((meshtastic_RemoteShell_OpCode)(meshtastic_RemoteShell_OpCode_PONG+1))
-
 #define _meshtastic_MeshPacket_Priority_MIN meshtastic_MeshPacket_Priority_UNSET
 #define _meshtastic_MeshPacket_Priority_MAX meshtastic_MeshPacket_Priority_MAX
 #define _meshtastic_MeshPacket_Priority_ARRAYSIZE ((meshtastic_MeshPacket_Priority)(meshtastic_MeshPacket_Priority_MAX+1))
@@ -1470,8 +1415,6 @@ extern "C" {

 #define meshtastic_StoreForwardPlusPlus_sfpp_message_type_ENUMTYPE meshtastic_StoreForwardPlusPlus_SFPP_message_type

-#define meshtastic_RemoteShell_op_ENUMTYPE meshtastic_RemoteShell_OpCode
-



@@ -1516,7 +1459,6 @@ extern "C" {
 #define meshtastic_Data_init_default             {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, 0}
 #define meshtastic_KeyVerification_init_default  {0, {0, {0}}, {0, {0}}}
 #define meshtastic_StoreForwardPlusPlus_init_default {_meshtastic_StoreForwardPlusPlus_SFPP_message_type_MIN, {0, {0}}, {0, {0}}, {0, {0}}, {0, {0}}, 0, 0, 0, 0, 0}
-#define meshtastic_RemoteShell_init_default      {_meshtastic_RemoteShell_OpCode_MIN, 0, 0, 0, {0, {0}}, 0, 0, 0, 0, 0}
 #define meshtastic_Waypoint_init_default         {0, false, 0, false, 0, 0, 0, "", "", 0}
 #define meshtastic_StatusMessage_init_default    {""}
 #define meshtastic_MqttClientProxyMessage_init_default {"", 0, {{0, {0}}}, 0}
@@ -1550,7 +1492,6 @@ extern "C" {
 #define meshtastic_Data_init_zero                {_meshtastic_PortNum_MIN, {0, {0}}, 0, 0, 0, 0, 0, 0, false, 0}
 #define meshtastic_KeyVerification_init_zero     {0, {0, {0}}, {0, {0}}}
 #define meshtastic_StoreForwardPlusPlus_init_zero {_meshtastic_StoreForwardPlusPlus_SFPP_message_type_MIN, {0, {0}}, {0, {0}}, {0, {0}}, {0, {0}}, 0, 0, 0, 0, 0}
-#define meshtastic_RemoteShell_init_zero         {_meshtastic_RemoteShell_OpCode_MIN, 0, 0, 0, {0, {0}}, 0, 0, 0, 0, 0}
 #define meshtastic_Waypoint_init_zero            {0, false, 0, false, 0, 0, 0, "", "", 0}
 #define meshtastic_StatusMessage_init_zero       {""}
 #define meshtastic_MqttClientProxyMessage_init_zero {"", 0, {{0, {0}}}, 0}
@@ -1640,16 +1581,6 @@ extern "C" {
 #define meshtastic_StoreForwardPlusPlus_encapsulated_from_tag 8
 #define meshtastic_StoreForwardPlusPlus_encapsulated_rxtime_tag 9
 #define meshtastic_StoreForwardPlusPlus_chain_count_tag 10
-#define meshtastic_RemoteShell_op_tag            1
-#define meshtastic_RemoteShell_session_id_tag    2
-#define meshtastic_RemoteShell_seq_tag           3
-#define meshtastic_RemoteShell_ack_seq_tag       4
-#define meshtastic_RemoteShell_payload_tag       5
-#define meshtastic_RemoteShell_cols_tag          6
-#define meshtastic_RemoteShell_rows_tag          7
-#define meshtastic_RemoteShell_flags_tag         8
-#define meshtastic_RemoteShell_last_tx_seq_tag   9
-#define meshtastic_RemoteShell_last_rx_seq_tag   10
 #define meshtastic_Waypoint_id_tag               1
 #define meshtastic_Waypoint_latitude_i_tag       2
 #define meshtastic_Waypoint_longitude_i_tag      3
@@ -1882,20 +1813,6 @@ X(a, STATIC,   SINGULAR, UINT32,   chain_count,      10)
 #define meshtastic_StoreForwardPlusPlus_CALLBACK NULL
 #define meshtastic_StoreForwardPlusPlus_DEFAULT NULL

-#define meshtastic_RemoteShell_FIELDLIST(X, a) \
-X(a, STATIC,   SINGULAR, UENUM,    op,                1) \
-X(a, STATIC,   SINGULAR, UINT32,   session_id,        2) \
-X(a, STATIC,   SINGULAR, UINT32,   seq,               3) \
-X(a, STATIC,   SINGULAR, UINT32,   ack_seq,           4) \
-X(a, STATIC,   SINGULAR, BYTES,    payload,           5) \
-X(a, STATIC,   SINGULAR, UINT32,   cols,              6) \
-X(a, STATIC,   SINGULAR, UINT32,   rows,              7) \
-X(a, STATIC,   SINGULAR, UINT32,   flags,             8) \
-X(a, STATIC,   SINGULAR, UINT32,   last_tx_seq,       9) \
-X(a, STATIC,   SINGULAR, UINT32,   last_rx_seq,      10)
-#define meshtastic_RemoteShell_CALLBACK NULL
-#define meshtastic_RemoteShell_DEFAULT NULL
-
 #define meshtastic_Waypoint_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   id,                1) \
 X(a, STATIC,   OPTIONAL, SFIXED32, latitude_i,        2) \
@@ -2178,7 +2095,6 @@ extern const pb_msgdesc_t meshtastic_Routing_msg;
 extern const pb_msgdesc_t meshtastic_Data_msg;
 extern const pb_msgdesc_t meshtastic_KeyVerification_msg;
 extern const pb_msgdesc_t meshtastic_StoreForwardPlusPlus_msg;
-extern const pb_msgdesc_t meshtastic_RemoteShell_msg;
 extern const pb_msgdesc_t meshtastic_Waypoint_msg;
 extern const pb_msgdesc_t meshtastic_StatusMessage_msg;
 extern const pb_msgdesc_t meshtastic_MqttClientProxyMessage_msg;
@@ -2214,7 +2130,6 @@ extern const pb_msgdesc_t meshtastic_ChunkedPayloadResponse_msg;
 #define meshtastic_Data_fields &meshtastic_Data_msg
 #define meshtastic_KeyVerification_fields &meshtastic_KeyVerification_msg
 #define meshtastic_StoreForwardPlusPlus_fields &meshtastic_StoreForwardPlusPlus_msg
-#define meshtastic_RemoteShell_fields &meshtastic_RemoteShell_msg
 #define meshtastic_Waypoint_fields &meshtastic_Waypoint_msg
 #define meshtastic_StatusMessage_fields &meshtastic_StatusMessage_msg
 #define meshtastic_MqttClientProxyMessage_fields &meshtastic_MqttClientProxyMessage_msg
@@ -2270,7 +2185,6 @@ extern const pb_msgdesc_t meshtastic_ChunkedPayloadResponse_msg;
 #define meshtastic_NodeRemoteHardwarePin_size    29
 #define meshtastic_Position_size                 144
 #define meshtastic_QueueStatus_size              23
-#define meshtastic_RemoteShell_size              253
 #define meshtastic_RouteDiscovery_size           256
 #define meshtastic_Routing_size                  259
 #define meshtastic_StatusMessage_size            81
@@ -76,8 +76,6 @@ typedef enum _meshtastic_PortNum {
    meshtastic_PortNum_ALERT_APP = 11,
    /* Module/port for handling key verification requests. */
    meshtastic_PortNum_KEY_VERIFICATION_APP = 12,
-    /* Module/port for handling primitive remote shell access. */
-    meshtastic_PortNum_REMOTE_SHELL_APP = 13,
    /* Provides a 'ping' service that replies to any packet it receives.
 Also serves as a small example module.
 ENCODING: ASCII Plaintext */
@@ -113,9 +113,7 @@ typedef enum _meshtastic_TelemetrySensorType {
    /* SCD30 CO2, humidity, temperature sensor */
    meshtastic_TelemetrySensorType_SCD30 = 49,
    /* SHT family of sensors for temperature and humidity */
-    meshtastic_TelemetrySensorType_SHTXX = 50,
-    /* DS248X Bridge for one-wire temperature sensors */
-    meshtastic_TelemetrySensorType_DS248X = 51
+    meshtastic_TelemetrySensorType_SHTXX = 50
 } meshtastic_TelemetrySensorType;

 /* Struct definitions */
@@ -208,9 +206,6 @@ typedef struct _meshtastic_EnvironmentMetrics {
    /* Soil temperature measured (*C) */
    bool has_soil_temperature;
    float soil_temperature;
-    /* One-wire temperature (*C) */
-    pb_size_t one_wire_temperature_count;
-    float one_wire_temperature[8];
 } meshtastic_EnvironmentMetrics;

 /* Power Metrics (voltage / current / etc) */
@@ -496,8 +491,8 @@ extern "C" {

 /* Helper constants for enums */
 #define _meshtastic_TelemetrySensorType_MIN meshtastic_TelemetrySensorType_SENSOR_UNSET
-#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_DS248X
-#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_DS248X+1))
+#define _meshtastic_TelemetrySensorType_MAX meshtastic_TelemetrySensorType_SHTXX
+#define _meshtastic_TelemetrySensorType_ARRAYSIZE ((meshtastic_TelemetrySensorType)(meshtastic_TelemetrySensorType_SHTXX+1))



@@ -513,7 +508,7 @@ extern "C" {

 /* Initializer values for message structs */
 #define meshtastic_DeviceMetrics_init_default    {false, 0, false, 0, false, 0, false, 0, false, 0}
-#define meshtastic_EnvironmentMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}}
+#define meshtastic_EnvironmentMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_PowerMetrics_init_default     {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_AirQualityMetrics_init_default {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_LocalStats_init_default       {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
@@ -524,7 +519,7 @@ extern "C" {
 #define meshtastic_Nau7802Config_init_default    {0, 0}
 #define meshtastic_SEN5XState_init_default       {0, 0, 0, false, 0, false, 0, false, 0}
 #define meshtastic_DeviceMetrics_init_zero       {false, 0, false, 0, false, 0, false, 0, false, 0}
-#define meshtastic_EnvironmentMetrics_init_zero  {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, 0, {0, 0, 0, 0, 0, 0, 0, 0}}
+#define meshtastic_EnvironmentMetrics_init_zero  {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_PowerMetrics_init_zero        {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_AirQualityMetrics_init_zero   {false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0, false, 0}
 #define meshtastic_LocalStats_init_zero          {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0}
@@ -563,7 +558,6 @@ extern "C" {
 #define meshtastic_EnvironmentMetrics_rainfall_24h_tag 20
 #define meshtastic_EnvironmentMetrics_soil_moisture_tag 21
 #define meshtastic_EnvironmentMetrics_soil_temperature_tag 22
-#define meshtastic_EnvironmentMetrics_one_wire_temperature_tag 23
 #define meshtastic_PowerMetrics_ch1_voltage_tag  1
 #define meshtastic_PowerMetrics_ch1_current_tag  2
 #define meshtastic_PowerMetrics_ch2_voltage_tag  3
@@ -689,8 +683,7 @@ X(a, STATIC,   OPTIONAL, FLOAT,    radiation,        18) \
 X(a, STATIC,   OPTIONAL, FLOAT,    rainfall_1h,      19) \
 X(a, STATIC,   OPTIONAL, FLOAT,    rainfall_24h,     20) \
 X(a, STATIC,   OPTIONAL, UINT32,   soil_moisture,    21) \
-X(a, STATIC,   OPTIONAL, FLOAT,    soil_temperature,  22) \
-X(a, STATIC,   REPEATED, FLOAT,    one_wire_temperature,  23)
+X(a, STATIC,   OPTIONAL, FLOAT,    soil_temperature,  22)
 #define meshtastic_EnvironmentMetrics_CALLBACK NULL
 #define meshtastic_EnvironmentMetrics_DEFAULT NULL

@@ -859,7 +852,7 @@ extern const pb_msgdesc_t meshtastic_SEN5XState_msg;
 #define MESHTASTIC_MESHTASTIC_TELEMETRY_PB_H_MAX_SIZE meshtastic_Telemetry_size
 #define meshtastic_AirQualityMetrics_size        150
 #define meshtastic_DeviceMetrics_size            27
-#define meshtastic_EnvironmentMetrics_size       161
+#define meshtastic_EnvironmentMetrics_size       113
 #define meshtastic_HealthMetrics_size            11
 #define meshtastic_HostMetrics_size              264
 #define meshtastic_LocalStats_size               87
@@ -480,7 +480,7 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
 #if HAS_SCREEN
        IF_SCREEN(screen->showSimpleBanner("Device is rebooting\ninto DFU mode.", 0));
 #endif
-#if defined(ARCH_NRF52) || defined(ARCH_RP2040) || defined(ARCH_STM32WL)
+#if defined(ARCH_NRF52) || defined(ARCH_RP2040)
        enterDfuMode();
 #endif
        break;
@@ -104,6 +104,10 @@
 #include "modules/StatusMessageModule.h"
 #endif

+#if !MESHTASTIC_EXCLUDE_ZPS
+#include "modules/esp32/ZPSModule.h"
+#endif
+
 #if defined(HAS_HARDWARE_WATCHDOG)
 #include "watchdog/watchdogThread.h"
 #endif
@@ -174,6 +178,9 @@ void setupModules()
 #if !MESHTASTIC_EXCLUDE_STATUS
    statusMessageModule = new StatusMessageModule();
 #endif
+#if !MESHTASTIC_EXCLUDE_ZPS
+        zpsModule = new ZPSModule();
+#endif
 #if !MESHTASTIC_EXCLUDE_GENERIC_THREAD_MODULE
    new GenericThreadModule();
 #endif
@@ -29,23 +29,10 @@ int32_t StatusMessageModule::runOnce()
 ProcessMessage StatusMessageModule::handleReceived(const meshtastic_MeshPacket &mp)
 {
    if (mp.which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
-        meshtastic_StatusMessage incomingMessage = meshtastic_StatusMessage_init_zero;
-
+        meshtastic_StatusMessage incomingMessage;
        if (pb_decode_from_bytes(mp.decoded.payload.bytes, mp.decoded.payload.size, meshtastic_StatusMessage_fields,
                                 &incomingMessage)) {
-
            LOG_INFO("Received a NodeStatus message %s", incomingMessage.status);
-
-            RecentStatus entry;
-            entry.fromNodeId = mp.from;
-            entry.statusText = incomingMessage.status;
-
-            recentReceived.push_back(std::move(entry));
-
-            // Keep only last MAX_RECENT_STATUSMESSAGES
-            if (recentReceived.size() > MAX_RECENT_STATUSMESSAGES) {
-                recentReceived.erase(recentReceived.begin()); // drop oldest
-            }
        }
    }
    return ProcessMessage::CONTINUE;
@@ -2,11 +2,10 @@
 #if !MESHTASTIC_EXCLUDE_STATUS
 #include "SinglePortModule.h"
 #include "configuration.h"
-#include <string>
-#include <vector>

 class StatusMessageModule : public SinglePortModule, private concurrency::OSThread
 {
+
  public:
    /** Constructor
     * name is for debugging output
@@ -20,28 +19,16 @@ class StatusMessageModule : public SinglePortModule, private concurrency::OSThre
            this->setInterval(1000 * 12 * 60 * 60);
        }
        // TODO: If we have a string, set the initial delay (15 minutes maybe)
-
-        // Keep vector from reallocating as we fill up to MAX_RECENT_STATUSMESSAGES
-        recentReceived.reserve(MAX_RECENT_STATUSMESSAGES);
    }

    virtual int32_t runOnce() override;

-    struct RecentStatus {
-        uint32_t fromNodeId;    // mp.from
-        std::string statusText; // incomingMessage.status
-    };
-
-    const std::vector<RecentStatus> &getRecentReceived() const { return recentReceived; }
-
  protected:
    /** Called to handle a particular incoming message
     */
    virtual ProcessMessage handleReceived(const meshtastic_MeshPacket &mp) override;

  private:
-    static constexpr size_t MAX_RECENT_STATUSMESSAGES = 5;
-    std::vector<RecentStatus> recentReceived;
 };

 extern StatusMessageModule *statusMessageModule;
@@ -0,0 +1,419 @@
+/*
+ * ZPS - Zero-GPS Positioning System for standalone Meshtastic devices
+ * - experimental tools for estimating own position without a GPS -
+ *
+ * Copyright 2021 all rights reserved by https://github.com/a-f-G-U-C
+ * Released under GPL v3 (see LICENSE file for details)
+ */
+
+#include "ZPSModule.h"
+#include "Default.h"
+#include "MeshService.h"
+#include "NodeDB.h"
+#include "NodeStatus.h"
+#include "Router.h"
+#include "configuration.h"
+#include "gps/RTC.h"
+#include <WiFi.h>
+
+#if !defined(MESHTASTIC_EXCLUDE_BLUETOOTH)
+
+#include "NimBLEDevice.h"
+
+#define BLE_MAX_REC 15
+#define BLE_NO_RESULTS -1 // Indicates a BLE scan is in progress
+
+uint8_t bleCounter = 0; // used internally by the ble scanner
+uint64_t bleResult[BLE_MAX_REC + 1];
+int bleResSize = BLE_NO_RESULTS;
+
+uint64_t scanStart = 0;
+
+ZPSModule *zpsModule;
+
+// Mini BLE scanner, NIMBLE based and modelled loosely after the Wifi scanner
+static int ble_scan(uint32_t duration, bool passive = true, bool dedup = true);
+
+// ZPSModule::ZPSModule()
+//     : ProtobufModule("ZPS", ZPS_PORTNUM, Position_fields), concurrency::OSThread("ZPSModule")
+ZPSModule::ZPSModule() : SinglePortModule("ZPS", ZPS_PORTNUM), concurrency::OSThread("ZPSModule")
+{
+    setIntervalFromNow(ZPS_STARTUP_DELAY); // Delay startup by 10 seconds, no need to race :)
+
+    wantBSS = true;
+    wantBLE = true;
+
+    WiFi.mode(WIFI_STA);
+    WiFi.disconnect();
+    WiFi.scanNetworks(true, true); // nonblock, showhidden
+    scanState = SCAN_BSS_RUN;
+}
+
+ProcessMessage ZPSModule::handleReceived(const meshtastic_MeshPacket &mp)
+{
+    meshtastic_Position pos = meshtastic_Position_init_default;
+
+    auto &pd = mp.decoded;
+    uint8_t nRecs = pd.payload.size >> 3;
+
+    LOG_DEBUG("handleReceived %s 0x%0x->0x%0x, id=0x%x, port=%d, len=%d, rec=%d\n", name, mp.from, mp.to, mp.id, pd.portnum,
+              pd.payload.size, nRecs);
+    if (nRecs > ZPS_DATAPKT_MAXITEMS)
+        nRecs = ZPS_DATAPKT_MAXITEMS;
+    memcpy(&netData, pd.payload.bytes, nRecs << 3);
+
+    // Currently we are unable to act as a position server, so we're
+    // not interested in broadcasts (this will change later)
+    if (mp.to != nodeDB->getNodeNum()) {
+        // Message is not for us, won't process
+        return ProcessMessage::CONTINUE;
+    }
+
+#ifdef ZPS_EXTRAVERBOSE
+    for (int i = 0; i < nRecs; i++) {
+        LOG_DEBUG("ZPS[%d]: %08x"
+                  "%08x\n",
+                  i, (uint32_t)(netData[i] >> 32), (uint32_t)netData[i]);
+    }
+#endif
+
+    if ((netData[0] & 0x800000000000) && (nRecs >= 2)) {
+        // message contains a position
+        pos.PDOP = (netData[0] >> 40) & 0x7f;
+        pos.timestamp = netData[0] & 0xffffffff;
+        // second int64 encodes lat and lon
+        pos.longitude_i = (int32_t)(netData[1] & 0xffffffff);
+        pos.latitude_i = (int32_t)((netData[1] >> 32) & 0xffffffff);
+
+        // FIXME should be conditional, to ensure we don't overwrite a good GPS fix!
+        LOG_DEBUG("ZPS lat/lon/dop/pts %d/%d/%d/%d\n", pos.latitude_i, pos.longitude_i, pos.PDOP, pos.timestamp);
+
+        // Some required fields
+        pos.time = getTime();
+        pos.location_source = meshtastic_Position_LocSource_LOC_EXTERNAL;
+
+        // don't update position if my gps fix is valid
+        if (nodeDB->hasValidPosition(nodeDB->getMeshNode(nodeDB->getNodeNum()))) {
+            LOG_DEBUG("ZPSModule::handleReceived: ignoring position update, GPS is valid\n");
+            return ProcessMessage::CONTINUE;
+        }
+        nodeDB->updatePosition(nodeDB->getNodeNum(), pos);
+    } else {
+        // nothing we can do - for now
+        return ProcessMessage::CONTINUE;
+    }
+
+    return ProcessMessage::CONTINUE; // Let others look at this message also if they want
+}
+
+meshtastic_MeshPacket *ZPSModule::allocReply()
+{
+    meshtastic_MeshPacket *p = allocDataPacket();
+    p->decoded.payload.size = (netRecs + 2) << 3; // actually can be only +1 if no GPS data
+
+    LOG_DEBUG("Allocating dataPacket for %d items, %d bytes\n", netRecs, p->decoded.payload.size);
+    memcpy(p->decoded.payload.bytes, &netData, p->decoded.payload.size);
+
+    return (p);
+}
+
+void ZPSModule::sendDataPacket(NodeNum dest, bool wantReplies)
+{
+    // cancel any not yet sent (now stale) position packets
+    if (prevPacketId)
+        service->cancelSending(prevPacketId);
+
+    meshtastic_MeshPacket *p = allocReply();
+    p->to = dest;
+    p->decoded.portnum = meshtastic_PortNum_ZPS_APP;
+    p->decoded.want_response = wantReplies;
+    p->priority = meshtastic_MeshPacket_Priority_BACKGROUND;
+    prevPacketId = p->id;
+
+    service->sendToMesh(p, RX_SRC_LOCAL);
+}
+
+int32_t ZPSModule::runOnce()
+{
+    meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(nodeDB->getNodeNum());
+    assert(node);
+
+    // LOG_DEBUG("ZPSModule::runOnce() START, scanState: %d\n", (int) scanState);
+
+    int numWifi = 0;
+
+    if (scanState == SCAN_BSS_RUN) {
+        // check completion status of any running Wifi scan
+        numWifi = WiFi.scanComplete();
+
+        if (numWifi >= 0) {
+            // scan is complete
+            LOG_DEBUG("%d BSS found\n", numWifi);
+            LOG_DEBUG("BSS scan done in %d millis\n", millis() - scanStart);
+
+            if (wantBSS && haveBSS) {
+                // old data exists, overwrite it
+                netRecs = 0;
+                haveBSS = haveBLE = false;
+            }
+
+            for (int i = 0; i < numWifi; i++) {
+                // pack each Wifi network record into a 64-bit int
+                uint64_t netBytes = encodeBSS(WiFi.BSSID(i), WiFi.channel(i), abs(WiFi.RSSI(i)));
+
+                if (wantBSS) {
+                    // load into outbound array if needed
+                    outBufAdd(netBytes);
+                    haveBSS = true;
+                }
+#ifdef ZPS_EXTRAVERBOSE
+                LOG_DEBUG("BSS[%02d]: %08x"
+                          "%08x\n",
+                          i, (uint32_t)(netBytes >> 32), (uint32_t)netBytes);
+#endif
+            }
+
+            WiFi.scanDelete();
+            scanState = SCAN_BSS_DONE;
+
+#ifdef ZPS_EXTRAVERBOSE
+        } else if (numWifi == -1) {
+            // LOG_DEBUG("BSS scan in-progress\n");
+        } else {
+            LOG_DEBUG("BSS scan state=%d\n", numWifi);
+#endif
+        }
+    }
+
+    if ((scanState == SCAN_BLE_RUN) && (bleResSize >= 0)) {
+        // completion status checked above (bleResSize >= 0)
+        LOG_DEBUG("BLE scan done in %d millis\n", millis() - scanStart);
+        scanState = SCAN_BLE_DONE;
+
+        if (wantBLE && haveBLE) {
+            // old data exists, overwrite it
+            netRecs = 0;
+            haveBSS = haveBLE = false;
+        }
+
+        for (int i = 0; i < bleResSize; i++) {
+            // load data into output array if needed
+            if (wantBLE) {
+                outBufAdd(bleResult[i]);
+                haveBLE = true;
+            }
+#ifdef ZPS_EXTRAVERBOSE
+            LOG_DEBUG("BLE[%d]: %08x"
+                      "%08x\n",
+                      i, (uint32_t)(bleResult[i] >> 32), (uint32_t)bleResult[i]);
+#endif
+        }
+
+        // Reset the counter once we're done with the dataset
+        bleResSize = BLE_NO_RESULTS;
+    }
+
+    // Are we finished assembling that packet? Then send it out
+    if ((wantBSS == haveBSS) && (wantBLE == haveBLE) &&
+        airTime->isTxAllowedChannelUtil(config.device.role != meshtastic_Config_DeviceConfig_Role_SENSOR) &&
+        airTime->isTxAllowedAirUtil() &&
+        (lastSend == 0 || millis() - lastSend >= Default::getConfiguredOrDefaultMsScaled(config.position.position_broadcast_secs,
+                                                                                         default_broadcast_interval_secs,
+                                                                                         nodeStatus->getNumOnline()))) {
+
+        haveBSS = haveBLE = false;
+        sendDataPacket(NODENUM_BROADCAST, false); // no replies
+        lastSend = millis();
+        netRecs = 0; // reset packet
+    }
+
+    /*
+     * State machine transitions
+     *
+     * FIXME could be managed better, for example: check if we require
+     *   each type of scan (wantBSS/wantBLE), and if not, don't start it!
+     */
+    if (scanState == SCAN_BLE_DONE) {
+        // BLE done, transition to BSS scanning
+        scanStart = millis();
+        LOG_DEBUG("BSS scan start t=%d\n", scanStart);
+        if (WiFi.scanNetworks(true, true) == WIFI_SCAN_RUNNING) // nonblock, showhidden
+            scanState = SCAN_BSS_RUN;
+
+    } else if (scanState == SCAN_BSS_DONE) {
+        // BSS done, transition to BLE scanning
+        scanStart = millis();
+        LOG_DEBUG("BLE scan start t=%d\n", scanStart);
+        if (ble_scan(ZPS_BLE_SCANTIME) == 0)
+            scanState = SCAN_BLE_RUN;
+    }
+
+    // LOG_DEBUG("ZPSModule::runOnce() DONE, scanState=%d\n", scanState);
+    if ((scanState == SCAN_BSS_RUN) || (scanState == SCAN_BLE_RUN)) {
+        return 1000; // scan in progress, re-check soon
+    }
+
+    return 5000;
+}
+
+uint64_t encodeBSS(uint8_t *bssid, uint8_t chan, uint8_t absRSSI)
+{
+    uint64_t netBytes = absRSSI & 0xff;
+    netBytes <<= 8;
+    netBytes |= (chan & 0xff);
+
+    for (uint8_t b = 0; b < 6; b++) {
+        netBytes <<= 8;
+        netBytes |= bssid[b];
+    }
+
+    return netBytes;
+}
+
+uint64_t encodeBLE(uint8_t *addr, uint8_t absRSSI)
+{
+    uint64_t netBytes = absRSSI & 0xff;
+    netBytes <<= 8;
+    netBytes |= 0xff; // "channel" byte reserved in BLE records
+
+    for (uint8_t b = 0; b < 6; b++) {
+        netBytes <<= 8;
+        netBytes |= addr[5 - b] & 0xff;
+    }
+
+    return netBytes;
+}
+
+/**
+ * Event handler
+ */
+static int ble_gap_event(struct ble_gap_event *event, void *arg)
+{
+    // Adverts matching certain patterns are useless for positioning purposes
+    //  (ephemeral MAC etc), so try excluding them if possible
+    //
+    // TODO: Expand the list of reject patterns for BLE adverts.
+    //   There are likely more than 10 patterns to test and reject, including most Apple devices and others.
+    //
+    // TODO: Implement full packet search for reject patterns (use memmem() or similar),
+    //   not just at the beginning (currently uses memcmp()).
+
+    const uint8_t rejPat[] = {0x1e, 0xff, 0x06, 0x00, 0x01}; // one of many
+
+    struct ble_hs_adv_fields fields;
+    int rc;
+    int i = 0;
+
+    uint64_t netBytes = 0;
+
+    switch (event->type) {
+    case BLE_GAP_EVENT_DISC:
+        // called once for every BLE advert received
+        rc = ble_hs_adv_parse_fields(&fields, event->disc.data, event->disc.length_data);
+        if (rc != 0)
+            return 0;
+
+        if (bleResSize != BLE_NO_RESULTS)
+            // as far as we know, we're not in the middle of a BLE scan!
+            LOG_DEBUG("Unexpected BLE_GAP_EVENT_DISC!\n");
+
+#ifdef ZPS_EXTRAVERBOSE
+        // Dump the advertisement packet
+        DEBUG_PORT.hexDump("DEBUG", (unsigned char *)event->disc.data, event->disc.length_data);
+#endif
+        // Reject beacons known to be unreliable (ephemeral etc)
+        if (memcmp(event->disc.data, rejPat, sizeof(rejPat)) == 0) {
+            LOG_DEBUG("(BLE item filtered by pattern)\n");
+            return 0; // Processing-wise, it's still a success
+        }
+
+        //
+        // STORE THE RESULTS IN A SORTED LIST
+        //
+
+        // first, pack each BLE item reading into a 64-bit int
+        netBytes = encodeBLE(event->disc.addr.val, abs(event->disc.rssi));
+
+        // SOME DUPLICATES SURVIVE through filter_duplicates = 1, catch them here
+        // Duplicate filtering is now handled in the sorting loop below,
+        // but right now we write for clarity not optimization
+        for (i = 0; i < bleCounter; i++) {
+            if ((bleResult[i] & 0xffffffffffff) == (netBytes & 0xffffffffffff)) {
+                LOG_DEBUG("(BLE duplicate filtered)\n");
+                return 0;
+            }
+        }
+
+#ifdef ZPS_EXTRAVERBOSE
+        // redundant extraverbosity, but I need it for duplicate hunting
+        LOG_DEBUG("BL_[%02d]: %08x"
+                  "%08x\n",
+                  bleCounter, (uint32_t)(netBytes >> 32), (uint32_t)netBytes);
+#endif
+        // then insert item into a list (up to BLE_MAX_REC records), sorted by RSSI
+        for (i = 0; i < bleCounter; i++) {
+            // find first element greater than ours, that will be our insertion point
+            if (bleResult[i] > netBytes)
+                break;
+        }
+        // any other records move down one position to vacate res[i]
+        for (int j = bleCounter; j > i; j--)
+            bleResult[j] = bleResult[j - 1];
+        // write new element at insertion point
+        bleResult[i] = netBytes;
+
+        // advance tail of list, but not beyond limit
+        if (bleCounter < BLE_MAX_REC)
+            bleCounter++;
+
+        return 0; // SUCCESS
+
+    case BLE_GAP_EVENT_DISC_COMPLETE:
+        LOG_DEBUG("EVENT_DISC_COMPLETE in %d millis\n", (millis() - scanStart));
+        LOG_DEBUG("%d BLE found\n", bleCounter);
+        bleResSize = bleCounter;
+
+        bleCounter = 0; // reset counter
+        return 0;       // SUCCESS
+
+    default:
+        return 0; // SUCCESS
+    }
+}
+
+/**
+ * Initiates the GAP general discovery procedure (non-blocking)
+ */
+static int ble_scan(uint32_t duration, bool passive, bool dedup)
+{
+    uint8_t own_addr_type;
+    struct ble_gap_disc_params disc_params;
+    int rc;
+
+    // Figure out address type to use
+    rc = ble_hs_id_infer_auto(0, &own_addr_type);
+    if (rc != 0) {
+        LOG_DEBUG("error determining address type; rc=%d\n", rc);
+        return rc;
+    }
+
+    // Scanning parameters, these are mostly default
+    disc_params.itvl = 0;
+    disc_params.window = 0;
+    disc_params.filter_policy = 0;
+    disc_params.limited = 0;
+
+    // These two params are the more interesting ones
+    disc_params.filter_duplicates = dedup; // self-explanatory
+    disc_params.passive = passive;         // passive uses less power
+
+    // Start scanning process (non-blocking) and return
+    rc = ble_gap_disc(own_addr_type, duration, &disc_params, ble_gap_event, NULL);
+    if (rc != 0) {
+        LOG_DEBUG("error initiating GAP discovery; rc=%d\n", rc);
+    }
+
+    return rc;
+}
+
+#endif // MESHTASTIC_EXCLUDE_BLUETOOTH
@@ -0,0 +1,86 @@
+#pragma once
+#include "SinglePortModule.h"
+#include "concurrency/OSThread.h"
+#include "gps/RTC.h"
+
+#define ZPS_PORTNUM meshtastic_PortNum_ZPS_APP
+
+#define ZPS_DATAPKT_MAXITEMS 20 // max number of records to pack in an outbound packet (~10)
+#define ZPS_STARTUP_DELAY 10000 // Module startup delay in millis
+
+// Duration of a BLE scan in millis.
+// We want this number to be SLIGHTLY UNDER an integer number of seconds,
+//  to be able to catch the result as fresh as possible on a 1-second polling loop
+#define ZPS_BLE_SCANTIME 2900 // millis
+
+enum SCANSTATE { SCAN_NONE, SCAN_BSS_RUN, SCAN_BSS_DONE, SCAN_BLE_RUN, SCAN_BLE_DONE };
+
+/*
+ * Data packing "compression" functions
+ * Ingest a WiFi BSSID, channel and RSSI (or BLE address and RSSI)
+ *   and encode them into a packed uint64
+ */
+uint64_t encodeBSS(uint8_t *bssid, uint8_t chan, uint8_t absRSSI);
+uint64_t encodeBLE(uint8_t *addr, uint8_t absRSSI);
+
+class ZPSModule : public SinglePortModule, private concurrency::OSThread
+{
+    /// The id of the last packet we sent, to allow us to cancel it if we make something fresher
+    PacketId prevPacketId = 0;
+
+    /// We limit our broadcasts to a max rate
+    uint32_t lastSend = 0;
+
+    bool wantBSS = true;
+    bool haveBSS = false;
+
+    bool wantBLE = true;
+    bool haveBLE = false;
+
+  public:
+    /** Constructor
+     * name is for debugging output
+     */
+    ZPSModule();
+
+    /**
+     * Send our radio environment data into the mesh
+     */
+    void sendDataPacket(NodeNum dest = NODENUM_BROADCAST, bool wantReplies = false);
+
+  protected:
+    /** Called to handle a particular incoming message
+    @return true if you've guaranteed you've handled this message and no other handlers should be considered for it
+    */
+    virtual ProcessMessage handleReceived(const meshtastic_MeshPacket &mp);
+
+    /** Messages can be received that have the want_response bit set.  If set, this callback will be invoked
+     * so that subclasses can (optionally) send a response back to the original sender.  */
+    virtual meshtastic_MeshPacket *allocReply();
+
+    /** Does our periodic broadcast */
+    virtual int32_t runOnce();
+
+  private:
+    // outbound data packet staging buffer and record counter
+    uint64_t netData[ZPS_DATAPKT_MAXITEMS + 2] = {0};
+    uint8_t netRecs = 0;
+
+    // mini state machine to alternate between BSS(Wifi) and BLE scanning
+    SCANSTATE scanState = SCAN_NONE;
+
+    inline void outBufAdd(uint64_t netBytes)
+    {
+        // If this is the first record, initialize the header with the current time and reset the record count.
+        if (!netRecs) {
+            netData[0] = getTime();
+            netData[1] = 0;
+        }
+
+        // push to buffer and update counter
+        if (netRecs < ZPS_DATAPKT_MAXITEMS)
+            netData[2 + (netRecs++)] = netBytes;
+    }
+};
+
+extern ZPSModule *zpsModule;
@@ -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"
@@ -182,10 +181,6 @@ void portduinoSetup()
    // Force stdout to be line buffered
    setvbuf(stdout, stdoutBuffer, _IOLBF, sizeof(stdoutBuffer));

-    // We do this super early so that we can log from the rest of the init code
-    concurrency::hasBeenSetup = true;
-    consoleInit();
-
    if (portduino_config.force_simradio == true) {
        portduino_config.lora_module = use_simradio;
    } else if (configPath != nullptr) {
@@ -238,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;
    }

@@ -519,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);

@@ -654,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;
 }

@@ -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);
@@ -4,57 +4,6 @@
 #include <stm32wle5xx.h>
 #include <stm32wlxx_hal.h>

-// ─── Bootloader redirect ──────────────────────────────────────────────────────
-//
-// Why .noinit + constructor instead of TAMP backup registers:
-//
-//   The STM32duino startup sequence initialises clocks which may call
-//   __HAL_RCC_BACKUPRESET_FORCE/RELEASE when configuring the LSE oscillator,
-//   wiping the entire backup domain (including TAMP->BKP0R) before setup()
-//   ever runs. The backup-register approach therefore cannot reliably survive
-//   a soft reset in this toolchain.
-//
-//   Solution: store the magic in a .noinit SRAM variable.
-//   - NVIC_SystemReset() does NOT clear SRAM.
-//   - The linker script skips zero-init for .noinit sections.
-//   - __attribute__((constructor)) fires before main()/HAL_Init(), so we can
-//     intercept and jump before anything disturbs peripheral state.
-
-#define BOOTLOADER_MAGIC 0xD00DB007UL
-#define SYS_MEM_BASE 0x1FFF0000UL
-
-// Placed in .noinit — not zeroed at startup, survives NVIC_SystemReset().
-__attribute__((section(".noinit"), used)) volatile uint32_t g_bootloaderMagic;
-
-// Fires before main() / HAL_Init(). Must use only core Cortex-M registers.
-__attribute__((constructor(101), used)) static void earlyBootCheck(void)
-{
-    if (g_bootloaderMagic != BOOTLOADER_MAGIC)
-        return;
-    g_bootloaderMagic = 0;
-
-    SysTick->CTRL = 0;
-    SysTick->LOAD = 0;
-    SysTick->VAL = 0;
-    for (int i = 0; i < 8; i++) {
-        NVIC->ICER[i] = 0xFFFFFFFF;
-        NVIC->ICPR[i] = 0xFFFFFFFF;
-    }
-    __DSB();
-    __ISB();
-    SCB->VTOR = SYS_MEM_BASE;
-    __set_MSP(*(volatile uint32_t *)SYS_MEM_BASE);
-    ((void (*)(void))(*(volatile uint32_t *)(SYS_MEM_BASE + 4)))();
-    while (1)
-        ;
-}
-
-void enterDfuMode()
-{
-    g_bootloaderMagic = BOOTLOADER_MAGIC;
-    HAL_NVIC_SystemReset();
-}
-
 void setBluetoothEnable(bool enable) {}

 void playStartMelody() {}
@@ -15,13 +15,8 @@

 // Device specific curves go in variant.h
 #ifndef OCV_ARRAY
-#if defined(ARCH_STM32WL) && BATTERY_PIN == AVBAT
-// STM32 VDD/VBAT absolute maximum is 4V so use an LFP curve
-#define OCV_ARRAY 3650, 3400, 3340, 3320, 3300, 3280, 3270, 3260, 3240, 3200, 2500
-#else
 #define OCV_ARRAY 4190, 4050, 3990, 3890, 3800, 3720, 3630, 3530, 3420, 3300, 3100
 #endif
-#endif

 /*Note: 12V lead acid is 6 cells, most board accept only 1 cell LiIon/LiPo*/
 #ifndef NUM_CELLS
@@ -13,3 +13,7 @@ board_build.f_cpu = 240000000L
 upload_protocol = esptool
 ;upload_port = /dev/ttyUSB0
 upload_speed = 460800
+lib_deps =
+  ${esp32_base.lib_deps}
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
+  adafruit/Adafruit NeoPixel@1.15.4
@@ -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
@@ -10,7 +10,6 @@ build_flags =
  -D BOARD_HAS_PSRAM
  -D RADIOLIB_EXCLUDE_LR11X0=1
  -D RADIOLIB_EXCLUDE_SX128X=1
-  -D RADIOLIB_EXCLUDE_LR2021=1
  -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
  -D MESHTASTIC_EXCLUDE_DETECTIONSENSOR=1
  -D MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR=1
@@ -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
@@ -5,3 +5,6 @@ build_flags =
  ${esp32c3_base.build_flags}
  -D HELTEC_HRU_3601
  -I variants/esp32c3/heltec_hru_3601
+lib_deps = ${esp32c3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
+  adafruit/Adafruit NeoPixel@1.15.4
@@ -23,6 +23,8 @@ build_unflags =
  -D HAS_WIFI
 lib_deps =
  ${esp32c6_base.lib_deps}
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
+  adafruit/Adafruit NeoPixel@1.15.4
  # renovate: datasource=custom.pio depName=NimBLE-Arduino packageName=h2zero/library/NimBLE-Arduino
  h2zero/NimBLE-Arduino@2.3.7
 build_flags = 
@@ -8,3 +8,4 @@ build_flags =
  -I variants/esp32c6/tlora_c6
  -DARDUINO_USB_CDC_ON_BOOT=1
  -DARDUINO_USB_MODE=1
+  -ULED_BUILTIN
@@ -12,6 +12,8 @@ lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
  zinggjm/GxEPD2@1.6.8
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
+  adafruit/Adafruit NeoPixel@1.15.4
 build_unflags =
  ${esp32s3_base.build_unflags}
  -DARDUINO_USB_MODE=1
@@ -8,6 +8,10 @@ board_build.f_cpu = 240000000L
 upload_protocol = esptool
 ;upload_port = /dev/ttyACM0
 upload_speed = 921600
+lib_deps =
+  ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
+  adafruit/Adafruit NeoPixel@1.15.4
 build_unflags =
  ${esp32s3_base.build_unflags}
  -DARDUINO_USB_MODE=1
@@ -24,3 +24,5 @@ build_flags = ${esp32s3_base.build_flags}
 lib_deps = ${esp32s3_base.lib_deps}
  # renovate: datasource=custom.pio depName=GxEPD2 packageName=zinggjm/library/GxEPD2
  zinggjm/GxEPD2@1.6.8
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
+  adafruit/Adafruit NeoPixel@1.15.4
@@ -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,8 @@ build_flags =
  ${esp32s3_base.build_flags}
  -I variants/esp32s3/heltec_sensor_hub
  -D HELTEC_SENSOR_HUB
+  -ULED_BUILTIN
+
+lib_deps = ${esp32s3_base.lib_deps}
+  # renovate: datasource=custom.pio depName=NeoPixel packageName=adafruit/library/Adafruit NeoPixel
+  adafruit/Adafruit NeoPixel@1.15.4
@@ -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]
@@ -20,5 +20,5 @@ build_flags =
 lib_deps =
  ${esp32s3_base.lib_deps}
  # renovate: datasource=git-refs depName=meshtastic-st7789 packageName=https://github.com/meshtastic/st7789 gitBranch=main
-  https://github.com/meshtastic/st7789/archive/92bae2e4a307afb430c3b0bc3d661c55ee1565f0.zip
+  https://github.com/meshtastic/st7789/archive/9ee76d6b18b9a8f45a2c5cae06b1134a587691eb.zip
 upload_speed = 921600
@@ -17,3 +17,4 @@ build_flags =
  ${esp32s3_base.build_flags}
  -D HELTEC_WSL_V3
  -I variants/esp32s3/heltec_wsl_v3
+  -ULED_BUILTIN
@@ -11,4 +11,3 @@ build_flags =
  -DRADIOLIB_EXCLUDE_SX128X=1
  -DRADIOLIB_EXCLUDE_SX127X=1
  -DRADIOLIB_EXCLUDE_LR11X0=1
-  -DRADIOLIB_EXCLUDE_LR2021=1
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Thomas Göttgens	8b9e06b05f	Merge branch 'develop' into zps-module	2026-04-12 17:19:30 +02:00
Thomas Göttgens	b0060b61fe	Merge branch 'develop' into zps-module	2026-02-04 14:03:29 +01:00
Thomas Göttgens	a7435b85a1	trunk fmt	2025-08-28 13:50:22 +10:00
Thomas Göttgens	729d6c576f	everyone's a critic, especially copilot.	2025-08-28 13:50:22 +10:00
Thomas Göttgens	15b84fca01	Fix compile and check issues	2025-08-28 13:50:22 +10:00
Thomas Göttgens	285b30dff0	the original ZPS module from https://github.com/a-f-G-U-C/Meshtastic-ZPS - work in progress, adapted to 2.x firmware convention, disabled by default	2025-08-28 13:50:22 +10:00