Merge branch 'develop' into sfpp

* Add null check for p_encrypted before MQTT publish

A user on BayMesh observed a strange crash in MQTT::onSend that seemed to be a null pointer dereference of this value.

* Trunk

.clusterfuzzlite/Dockerfile

@@ -18,7 +18,7 @@ ENV PIP_ROOT_USER_ACTION=ignore
 # trunk-ignore(hadolint/DL3008): apt packages are not pinned.
 # trunk-ignore(terrascan/AC_DOCKER_0002): apt packages are not pinned.
 RUN apt-get update && apt-get install --no-install-recommends -y \
-        cmake git zip libgpiod-dev libjsoncpp-dev libbluetooth-dev libi2c-dev \
+        cmake git zip libgpiod-dev libbluetooth-dev libi2c-dev \
         libunistring-dev libmicrohttpd-dev libgnutls28-dev libgcrypt20-dev \
         libusb-1.0-0-dev libssl-dev pkg-config libsqlite3-dev libsdl2-dev && \
     apt-get clean && rm -rf /var/lib/apt/lists/* && \

.clusterfuzzlite/build.sh

@@ -31,7 +31,7 @@ cmake --install "$WORK/ulfius/$SANITIZER" --prefix /usr
 cd "$SRC/firmware"
 
 PLATFORMIO_EXTRA_SCRIPTS=$(echo -e "pre:.clusterfuzzlite/platformio-clusterfuzzlite-pre.py\npost:.clusterfuzzlite/platformio-clusterfuzzlite-post.py")
-STATIC_LIBS=$(pkg-config --libs --static libulfius openssl libgpiod yaml-cpp jsoncpp bluez --silence-errors)
+STATIC_LIBS=$(pkg-config --libs --static libulfius openssl libgpiod yaml-cpp bluez --silence-errors)
 export PLATFORMIO_EXTRA_SCRIPTS
 export STATIC_LIBS
 export PLATFORMIO_WORKSPACE_DIR="$WORK/pio/$SANITIZER"

.devcontainer/Dockerfile

@@ -16,7 +16,6 @@ RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     libssl-dev \
     libulfius-dev \
     libyaml-cpp-dev \
-    libjsoncpp-dev \
     pipx \
     pkg-config \
     python3 \

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

@@ -13,7 +13,7 @@ runs:
       shell: bash
       run: |
         sudo apt-get -y update --fix-missing
-        sudo apt-get install -y cppcheck libbluetooth-dev libgpiod-dev libyaml-cpp-dev libjsoncpp-dev lsb-release
+        sudo apt-get install -y cppcheck libbluetooth-dev libgpiod-dev libyaml-cpp-dev lsb-release
 
     - name: Setup Python
       uses: actions/setup-python@v6

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

@@ -11,4 +11,4 @@ runs:
     - name: Install libs needed for native build
       shell: bash
       run: |
-        sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev libjsoncpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev libi2c-dev libuv1-dev
+        sudo apt-get install -y libbluetooth-dev libgpiod-dev libyaml-cpp-dev openssl libssl-dev libulfius-dev liborcania-dev libusb-1.0-0-dev libi2c-dev libuv1-dev

.github/copilot-instructions.md

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

.github/prompts/new-module.prompt.md

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

.github/prompts/new-sensor.prompt.md

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

.github/prompts/new-variant.prompt.md

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

.github/workflows/main_matrix.yml

@@ -301,12 +301,10 @@ 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 }}
 
@@ -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 }}
 

Dockerfile

@@ -12,7 +12,7 @@ ENV TZ=Etc/UTC
 ENV PIP_ROOT_USER_ACTION=ignore
 RUN apt-get update && apt-get install --no-install-recommends -y \
         curl wget g++ zip git ca-certificates pkg-config \
-        libgpiod-dev libyaml-cpp-dev libjsoncpp-dev libbluetooth-dev libi2c-dev libuv1-dev \
+        libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev libuv1-dev \
         libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev \
         libx11-dev libinput-dev libxkbcommon-x11-dev libsqlite3-dev libsdl2-dev \
     && apt-get clean && rm -rf /var/lib/apt/lists/* \
@@ -51,7 +51,7 @@ ENV TZ=Etc/UTC
 USER root
 
 RUN apt-get update && apt-get --no-install-recommends -y install \
-        libc-bin libc6 libgpiod3 libyaml-cpp0.8 libjsoncpp26 libi2c0 libuv1t64 libusb-1.0-0-dev \
+        libc-bin libc6 libgpiod3 libyaml-cpp0.8 libi2c0 libuv1t64 libusb-1.0-0-dev \
         liborcania2.3 libulfius2.7t64 libssl3t64 \
         libx11-6 libinput10 libxkbcommon-x11-0 libsdl2-2.0-0 \
     && apt-get clean && rm -rf /var/lib/apt/lists/* \

Dockerfile.test

@@ -7,7 +7,7 @@ ENV PIP_ROOT_USER_ACTION=ignore
 # hadolint ignore=DL3008
 RUN apt-get update && apt-get install --no-install-recommends -y \
         g++ git ca-certificates pkg-config \
-        libgpiod-dev libyaml-cpp-dev libjsoncpp-dev libbluetooth-dev libi2c-dev libuv1-dev \
+        libgpiod-dev libyaml-cpp-dev libbluetooth-dev libi2c-dev libuv1-dev \
         libusb-1.0-0-dev libulfius-dev liborcania-dev libssl-dev \
         libx11-dev libinput-dev libxkbcommon-x11-dev libsqlite3-dev libsdl2-dev \
     && apt-get clean && rm -rf /var/lib/apt/lists/* \

alpine.Dockerfile

@@ -9,7 +9,7 @@ ENV PIP_ROOT_USER_ACTION=ignore
 
 RUN apk --no-cache add \
         bash g++ libstdc++-dev linux-headers zip git ca-certificates libbsd-dev \
-        libgpiod-dev yaml-cpp-dev jsoncpp-dev bluez-dev \
+        libgpiod-dev yaml-cpp-dev bluez-dev \
         libusb-dev i2c-tools-dev libuv-dev openssl-dev pkgconf argp-standalone \
         libx11-dev libinput-dev libxkbcommon-dev sqlite-dev sdl2-dev \
     && rm -rf /var/cache/apk/* \
@@ -41,7 +41,7 @@ LABEL org.opencontainers.image.title="Meshtastic" \
 USER root
 
 RUN apk --no-cache add \
-        shadow libstdc++ libbsd libgpiod yaml-cpp jsoncpp libusb \
+        shadow libstdc++ libbsd libgpiod yaml-cpp libusb \
         i2c-tools libuv libx11 libinput libxkbcommon sdl2 \
     && rm -rf /var/cache/apk/* \
     && mkdir -p /var/lib/meshtasticd \

bin/config-dist.yaml

@@ -204,6 +204,16 @@ HostMetrics:
 #  UserStringCommand: cat /sys/firmware/devicetree/base/serial-number # Command to execute, to send the results as the userString
 
 
+StoreAndForward:
+#  Enabled: true # Enable Store and Forward++, true by default
+#  DBPath: /var/lib/meshtasticd/ # Path to the S&F++ Sqlite DB
+#  Stratum0: false # Specify if this node is a Stratum 0 node, the controller node.
+#  InitialSync: 10 # Number of messages to 
+#  Hops: 3 # Number of hops to use for SF++ messages
+#  AnnounceInterval: 5 # Interval in minutes between announcing tip of chain hash
+#  MaxChainLength: 1000 # Maximum number of messages to store in a chain
+
+
 Config:
 #  DisplayMode: TWOCOLOR # uncomment to force BaseUI
 #  DisplayMode: COLOR # uncomment to force MUI

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

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

bin/generate_release_notes.py

@@ -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 = []

bin/org.meshtastic.meshtasticd.metainfo.xml

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

debian/changelog

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

debian/control

@@ -14,7 +14,6 @@ Build-Depends: debhelper-compat (= 13),
                g++,
                pkg-config,
                libyaml-cpp-dev,
-               libjsoncpp-dev,
                libgpiod-dev,
                libbluetooth-dev,
                libusb-1.0-0-dev,

meshtasticd.spec.rpkg

@@ -34,7 +34,6 @@ BuildRequires: python3dist(grpcio-tools)
 BuildRequires: git-core
 BuildRequires: gcc-c++
 BuildRequires: pkgconfig(yaml-cpp)
-BuildRequires: pkgconfig(jsoncpp)
 BuildRequires: pkgconfig(libgpiod)
 BuildRequires: pkgconfig(bluez)
 BuildRequires: pkgconfig(libusb-1.0)

platformio.ini

@@ -56,7 +56,9 @@ build_flags = -Wno-missing-field-initializers
 	-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
@@ -100,7 +102,7 @@ build_unflags =
 	-std=gnu++11
 build_flags = ${env.build_flags} -Os
 	-std=gnu++17
-build_src_filter = ${env.build_src_filter} -<platform/portduino/> -<graphics/niche/>
+build_src_filter = ${env.build_src_filter} -<platform/portduino/> -<graphics/niche/> -<modules/Native/>
 
 ; Common libs for communicating over TCP/IP networks such as MQTT
 [networking_base]
@@ -124,7 +126,7 @@ lib_deps =
 [device-ui_base]
 lib_deps =
 	# renovate: datasource=git-refs depName=meshtastic/device-ui packageName=https://github.com/meshtastic/device-ui gitBranch=master
-	https://github.com/meshtastic/device-ui/archive/5305670b68eb5b92d14e62b5b536969ca4bb441f.zip
+	https://github.com/meshtastic/device-ui/archive/1897dd17fceb1f101bb1a3245680aa3439edcfdd.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]

src/MessageStore.h

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

src/Power.cpp

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

src/RedirectablePrint.cpp

@@ -51,7 +51,7 @@ size_t RedirectablePrint::write(uint8_t c)
 size_t RedirectablePrint::vprintf(const char *logLevel, const char *format, va_list arg)
 {
     va_list copy;
-#if ARCH_PORTDUINO
+#if ENABLE_JSON_LOGGING || ARCH_PORTDUINO
     static char printBuf[512];
 #else
     static char printBuf[160];

src/SerialConsole.cpp

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

src/graphics/Screen.cpp

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

src/graphics/draw/MessageRenderer.cpp

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

src/graphics/draw/NodeListRenderer.cpp

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

src/graphics/draw/UIRenderer.cpp

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

src/graphics/draw/UIRenderer.h

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

src/input/CardputerKeyboard.cpp

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

src/memGet.cpp

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

src/mesh/MeshRadio.h

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

src/mesh/NextHopRouter.cpp

@@ -161,6 +161,18 @@ bool NextHopRouter::perhapsRebroadcast(const meshtastic_MeshPacket *p)
                         tosend->hop_start -= (tosend->hop_limit - 2);
                         tosend->hop_limit = 2;
                     }
+#elif ARCH_PORTDUINO
+                    if (tosend->which_payload_variant == meshtastic_MeshPacket_decoded_tag &&
+                        portduino_config.nohop_ports.size()) {
+                        for (const auto &port : portduino_config.nohop_ports) {
+                            if (port == tosend->decoded.portnum) {
+                                LOG_DEBUG("0-hopping portnum %u", tosend->decoded.portnum);
+                                tosend->hop_start -= tosend->hop_limit;
+                                tosend->hop_limit = 0;
+                                break;
+                            }
+                        }
+                    }
 #endif
 
                     if (p->next_hop == NO_NEXT_HOP_PREFERENCE) {

src/mesh/RadioInterface.cpp

@@ -626,9 +626,9 @@ uint32_t RadioInterface::getTxDelayMsecWeighted(meshtastic_MeshPacket *p)
 void printPacket(const char *prefix, const meshtastic_MeshPacket *p)
 {
 #if defined(DEBUG_PORT) && !defined(DEBUG_MUTE)
-    std::string out =
-        DEBUG_PORT.mt_sprintf("%s (id=0x%08x fr=0x%08x to=0x%08x, transport = %u, WantAck=%d, HopLim=%d Ch=0x%x", prefix, p->id,
-                              p->from, p->to, p->transport_mechanism, p->want_ack, p->hop_limit, p->channel);
+    std::string out = DEBUG_PORT.mt_sprintf(
+        "%s (id=0x%08x fr=0x%08x to=0x%08x, transport = %u, WantAck=%d, HopLim=%d HopStart=%d Ch=0x%x", prefix, p->id, p->from,
+        p->to, p->transport_mechanism, p->want_ack, p->hop_limit, p->hop_start, p->channel);
     if (p->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
         auto &s = p->decoded;
 

src/mesh/Router.cpp

@@ -19,8 +19,11 @@
 #endif
 #include "Default.h"
 #if ARCH_PORTDUINO
+#include "modules/Native/StoreForwardPlusPlus.h"
 #include "Throttle.h"
 #include "platform/portduino/PortduinoGlue.h"
+#endif
+#if ENABLE_JSON_LOGGING || ARCH_PORTDUINO
 #include "serialization/MeshPacketSerializer.h"
 #endif
 
@@ -381,6 +384,12 @@ ErrorCode Router::send(meshtastic_MeshPacket *p)
             abortSendAndNak(encodeResult, p);
             return encodeResult; // FIXME - this isn't a valid ErrorCode
         }
+#if ARCH_PORTDUINO
+        if (p_decoded->decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_APP &&
+            (p->from == 0 || p->from == nodeDB->getNodeNum()) && storeForwardPlusPlusModule && portduino_config.sfpp_enabled) {
+            storeForwardPlusPlusModule->handleEncrypted(p_decoded, p);
+        }
+#endif
 #if !MESHTASTIC_EXCLUDE_MQTT
         // Only publish to MQTT if we're the original transmitter of the packet
         if (moduleConfig.mqtt.enabled && isFromUs(p) && mqtt) {
@@ -542,7 +551,9 @@ DecodeState perhapsDecode(meshtastic_MeshPacket *p)
         } */
 
         printPacket("decoded message", p);
-#if ARCH_PORTDUINO
+#if ENABLE_JSON_LOGGING
+        LOG_TRACE("%s", MeshPacketSerializer::JsonSerialize(p, false).c_str());
+#elif ARCH_PORTDUINO
         if (portduino_config.traceFilename != "" || portduino_config.logoutputlevel == level_trace) {
             LOG_TRACE("%s", MeshPacketSerializer::JsonSerialize(p, false).c_str());
         } else if (portduino_config.JSONFilename != "") {
@@ -778,6 +789,22 @@ void Router::handleReceived(meshtastic_MeshPacket *p, RxSource src)
             cancelSending(p->from, p->id);
             skipHandle = true;
         }
+#if ARCH_PORTDUINO
+        if (portduino_config.whitelist_enabled) {
+            bool allowed = false;
+            for (const auto &port : portduino_config.whitelist_ports) {
+                if (port == p->decoded.portnum) {
+                    allowed = true;
+                    break;
+                }
+            }
+            if (!allowed) {
+                LOG_DEBUG("Dropping packet not on Portduino Whitelist");
+                cancelSending(p->from, p->id);
+                skipHandle = true;
+            }
+        }
+#endif
     } else {
         printPacket("packet decoding failed or skipped (no PSK?)", p);
     }
@@ -834,7 +861,11 @@ void Router::handleReceived(meshtastic_MeshPacket *p, RxSource src)
 
 void Router::perhapsHandleReceived(meshtastic_MeshPacket *p)
 {
-#if ARCH_PORTDUINO
+#if ENABLE_JSON_LOGGING
+    // Even ignored packets get logged in the trace
+    p->rx_time = getValidTime(RTCQualityFromNet); // store the arrival timestamp for the phone
+    LOG_TRACE("%s", MeshPacketSerializer::JsonSerializeEncrypted(p).c_str());
+#elif ARCH_PORTDUINO
     // Even ignored packets get logged in the trace
     if (portduino_config.traceFilename != "" || portduino_config.logoutputlevel == level_trace) {
         p->rx_time = getValidTime(RTCQualityFromNet); // store the arrival timestamp for the phone

src/mesh/generated/meshtastic/atak.pb.cpp

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

src/mesh/generated/meshtastic/mesh.pb.cpp

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

src/mesh/generated/meshtastic/mesh.pb.h

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

src/mesh/generated/meshtastic/portnums.pb.h

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

src/mesh/generated/meshtastic/telemetry.pb.h

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

src/mesh/http/ContentHandler.cpp

@@ -11,12 +11,11 @@
 #endif
 #include "SPILock.h"
 #include "power.h"
+#include "serialization/JSON.h"
 #include <FSCommon.h>
 #include <HTTPBodyParser.hpp>
 #include <HTTPMultipartBodyParser.hpp>
 #include <HTTPURLEncodedBodyParser.hpp>
-#include <cmath>
-#include <sstream>
 
 #ifdef ARCH_ESP32
 #include "esp_task_wdt.h"
@@ -260,95 +259,40 @@ void htmlDeleteDir(const char *dirname)
     root.close();
 }
 
-// Escape a string into a JSON double-quoted literal. Matches the previous
-// SimpleJSON StringifyString behavior (0x00-0x1F and 0x7F -> \u00xx lowercase,
-// escapes " \ / \b \f \n \r \t, UTF-8 passes through unchanged).
-static std::string jsonEscape(const std::string &str)
-{
-    std::string out = "\"";
-    for (size_t i = 0; i < str.size(); ++i) {
-        char chr = str[i];
-        if (chr == '"' || chr == '\\' || chr == '/') {
-            out += '\\';
-            out += chr;
-        } else if (chr == '\b') {
-            out += "\\b";
-        } else if (chr == '\f') {
-            out += "\\f";
-        } else if (chr == '\n') {
-            out += "\\n";
-        } else if (chr == '\r') {
-            out += "\\r";
-        } else if (chr == '\t') {
-            out += "\\t";
-        } else if ((unsigned char)chr < 0x20 || chr == 0x7F) {
-            char buf[8];
-            snprintf(buf, sizeof(buf), "\\u%04x", (unsigned char)chr);
-            out += buf;
-        } else {
-            out += chr;
-        }
-    }
-    out += "\"";
-    return out;
-}
-
-// Format a numeric value the way the previous SimpleJSON serializer did
-// (std::stringstream with precision 15, NaN/Inf -> "null").
-static std::string jsonNum(double v)
-{
-    if (std::isinf(v) || std::isnan(v))
-        return "null";
-    std::ostringstream ss;
-    ss.precision(15);
-    ss << v;
-    return ss.str();
-}
-
-// Build a serialized JSON array string listing files in `dirname`.
-// Subdirectories recurse as nested arrays (up to `levels` deep).
-std::string htmlListDir(const char *dirname, uint8_t levels)
+JSONArray htmlListDir(const char *dirname, uint8_t levels)
 {
     File root = FSCom.open(dirname, FILE_O_READ);
-    std::string out = "[";
-    bool first = true;
+    JSONArray fileList;
     if (!root) {
-        out += "]";
-        return out;
+        return fileList;
     }
     if (!root.isDirectory()) {
-        out += "]";
-        return out;
+        return fileList;
     }
 
     // iterate over the file list
     File file = root.openNextFile();
     while (file) {
-        std::string element;
-        bool haveElement = false;
         if (file.isDirectory() && !String(file.name()).endsWith(".")) {
             if (levels) {
 #ifdef ARCH_ESP32
-                element = htmlListDir(file.path(), levels - 1);
+                fileList.push_back(new JSONValue(htmlListDir(file.path(), levels - 1)));
 #else
-                element = htmlListDir(file.name(), levels - 1);
+                fileList.push_back(new JSONValue(htmlListDir(file.name(), levels - 1)));
 #endif
-                haveElement = true;
                 file.close();
             }
         } else {
+            JSONObject thisFileMap;
+            thisFileMap["size"] = new JSONValue((int)file.size());
 #ifdef ARCH_ESP32
             String fileName = String(file.path()).substring(1);
+            thisFileMap["name"] = new JSONValue(fileName.c_str());
 #else
             String fileName = String(file.name()).substring(1);
+            thisFileMap["name"] = new JSONValue(fileName.c_str());
 #endif
             String tempName = String(file.name()).substring(1);
-            // Keys in the previous std::map<string,...> were emitted in
-            // alphabetical order: name, nameModified, size.
-            element = "{";
-            element += jsonEscape("name");
-            element += ":";
-            element += jsonEscape(fileName.c_str());
             if (tempName.endsWith(".gz")) {
 #ifdef ARCH_ESP32
                 String modifiedFile = String(file.path()).substring(1);
@@ -356,30 +300,15 @@ std::string htmlListDir(const char *dirname, uint8_t levels)
                 String modifiedFile = String(file.name()).substring(1);
 #endif
                 modifiedFile.remove((modifiedFile.length() - 3), 3);
-                element += ",";
-                element += jsonEscape("nameModified");
-                element += ":";
-                element += jsonEscape(modifiedFile.c_str());
+                thisFileMap["nameModified"] = new JSONValue(modifiedFile.c_str());
             }
-            element += ",";
-            element += jsonEscape("size");
-            element += ":";
-            element += jsonNum((int)file.size());
-            element += "}";
-            haveElement = true;
-        }
-        if (haveElement) {
-            if (!first)
-                out += ",";
-            out += element;
-            first = false;
+            fileList.push_back(new JSONValue(thisFileMap));
         }
         file.close();
         file = root.openNextFile();
     }
     root.close();
-    out += "]";
-    return out;
+    return fileList;
 }
 
 void handleFsBrowseStatic(HTTPRequest *req, HTTPResponse *res)
@@ -389,25 +318,28 @@ void handleFsBrowseStatic(HTTPRequest *req, HTTPResponse *res)
     res->setHeader("Access-Control-Allow-Methods", "GET");
 
     concurrency::LockGuard g(spiLock);
-    std::string fileList = htmlListDir("/static", 10);
+    auto fileList = htmlListDir("/static", 10);
 
-    uint64_t total = FSCom.totalBytes();
-    uint64_t used = FSCom.usedBytes();
+    // create json output structure
+    JSONObject filesystemObj;
+    filesystemObj["total"] = new JSONValue((int)FSCom.totalBytes());
+    filesystemObj["used"] = new JSONValue((int)FSCom.usedBytes());
+    filesystemObj["free"] = new JSONValue(int(FSCom.totalBytes() - FSCom.usedBytes()));
 
-    // Key order matches the previous std::map-based emission (alphabetical).
-    std::string out;
-    out.reserve(fileList.size() + 128);
-    out += "{\"data\":{\"files\":";
-    out += fileList;
-    out += ",\"filesystem\":{\"free\":";
-    out += jsonNum((int)(total - used));
-    out += ",\"total\":";
-    out += jsonNum((int)total);
-    out += ",\"used\":";
-    out += jsonNum((int)used);
-    out += "}},\"status\":\"ok\"}";
+    JSONObject jsonObjInner;
+    jsonObjInner["files"] = new JSONValue(fileList);
+    jsonObjInner["filesystem"] = new JSONValue(filesystemObj);
 
-    res->print(out.c_str());
+    JSONObject jsonObjOuter;
+    jsonObjOuter["data"] = new JSONValue(jsonObjInner);
+    jsonObjOuter["status"] = new JSONValue("ok");
+
+    JSONValue *value = new JSONValue(jsonObjOuter);
+
+    std::string jsonString = value->Stringify();
+    res->print(jsonString.c_str());
+
+    delete value;
 }
 
 void handleFsDeleteStatic(HTTPRequest *req, HTTPResponse *res)
@@ -422,13 +354,27 @@ void handleFsDeleteStatic(HTTPRequest *req, HTTPResponse *res)
     if (params->getQueryParameter("delete", paramValDelete)) {
         std::string pathDelete = "/" + paramValDelete;
         concurrency::LockGuard g(spiLock);
-        const char *status = FSCom.remove(pathDelete.c_str()) ? "ok" : "Error";
-        LOG_INFO("%s", pathDelete.c_str());
-        std::string out = "{\"status\":";
-        out += jsonEscape(status);
-        out += "}";
-        res->print(out.c_str());
-        return;
+        if (FSCom.remove(pathDelete.c_str())) {
+
+            LOG_INFO("%s", pathDelete.c_str());
+            JSONObject jsonObjOuter;
+            jsonObjOuter["status"] = new JSONValue("ok");
+            JSONValue *value = new JSONValue(jsonObjOuter);
+            std::string jsonString = value->Stringify();
+            res->print(jsonString.c_str());
+            delete value;
+            return;
+        } else {
+
+            LOG_INFO("%s", pathDelete.c_str());
+            JSONObject jsonObjOuter;
+            jsonObjOuter["status"] = new JSONValue("Error");
+            JSONValue *value = new JSONValue(jsonObjOuter);
+            std::string jsonString = value->Stringify();
+            res->print(jsonString.c_str());
+            delete value;
+            return;
+        }
     }
 }
 
@@ -669,113 +615,95 @@ void handleReport(HTTPRequest *req, HTTPResponse *res)
         res->println("<pre>");
     }
 
-    auto arrayFromLog = [](const uint32_t *logArray, int count) -> std::string {
-        std::string s = "[";
+    // Helper lambda to create JSON array and clean up memory properly
+    auto createJSONArrayFromLog = [](const uint32_t *logArray, int count) -> JSONValue * {
+        JSONArray tempArray;
         for (int i = 0; i < count; i++) {
-            if (i)
-                s += ",";
-            s += jsonNum((int)logArray[i]);
+            tempArray.push_back(new JSONValue((int)logArray[i]));
         }
-        s += "]";
-        return s;
+        JSONValue *result = new JSONValue(tempArray);
+        // Note: Don't delete tempArray elements here - JSONValue now owns them
+        return result;
     };
 
+    // data->airtime->tx_log
     uint32_t *logArray;
     logArray = airTime->airtimeReport(TX_LOG);
-    std::string txLog = arrayFromLog(logArray, airTime->getPeriodsToLog());
-    logArray = airTime->airtimeReport(RX_LOG);
-    std::string rxLog = arrayFromLog(logArray, airTime->getPeriodsToLog());
-    logArray = airTime->airtimeReport(RX_ALL_LOG);
-    std::string rxAllLog = arrayFromLog(logArray, airTime->getPeriodsToLog());
+    JSONValue *txLogJsonValue = createJSONArrayFromLog(logArray, airTime->getPeriodsToLog());
 
+    // data->airtime->rx_log
+    logArray = airTime->airtimeReport(RX_LOG);
+    JSONValue *rxLogJsonValue = createJSONArrayFromLog(logArray, airTime->getPeriodsToLog());
+
+    // data->airtime->rx_all_log
+    logArray = airTime->airtimeReport(RX_ALL_LOG);
+    JSONValue *rxAllLogJsonValue = createJSONArrayFromLog(logArray, airTime->getPeriodsToLog());
+
+    // data->airtime
+    JSONObject jsonObjAirtime;
+    jsonObjAirtime["tx_log"] = txLogJsonValue;
+    jsonObjAirtime["rx_log"] = rxLogJsonValue;
+    jsonObjAirtime["rx_all_log"] = rxAllLogJsonValue;
+    jsonObjAirtime["channel_utilization"] = new JSONValue(airTime->channelUtilizationPercent());
+    jsonObjAirtime["utilization_tx"] = new JSONValue(airTime->utilizationTXPercent());
+    jsonObjAirtime["seconds_since_boot"] = new JSONValue(int(airTime->getSecondsSinceBoot()));
+    jsonObjAirtime["seconds_per_period"] = new JSONValue(int(airTime->getSecondsPerPeriod()));
+    jsonObjAirtime["periods_to_log"] = new JSONValue(airTime->getPeriodsToLog());
+
+    // data->wifi
+    JSONObject jsonObjWifi;
+    jsonObjWifi["rssi"] = new JSONValue(WiFi.RSSI());
     String wifiIPString = WiFi.localIP().toString();
     std::string wifiIP = wifiIPString.c_str();
+    jsonObjWifi["ip"] = new JSONValue(wifiIP.c_str());
 
+    // data->memory
+    JSONObject jsonObjMemory;
+    jsonObjMemory["heap_total"] = new JSONValue((int)memGet.getHeapSize());
+    jsonObjMemory["heap_free"] = new JSONValue((int)memGet.getFreeHeap());
+    jsonObjMemory["psram_total"] = new JSONValue((int)memGet.getPsramSize());
+    jsonObjMemory["psram_free"] = new JSONValue((int)memGet.getFreePsram());
     spiLock->lock();
-    uint64_t fsTotal = FSCom.totalBytes();
-    uint64_t fsUsed = FSCom.usedBytes();
+    jsonObjMemory["fs_total"] = new JSONValue((int)FSCom.totalBytes());
+    jsonObjMemory["fs_used"] = new JSONValue((int)FSCom.usedBytes());
+    jsonObjMemory["fs_free"] = new JSONValue(int(FSCom.totalBytes() - FSCom.usedBytes()));
     spiLock->unlock();
 
-    // Emit keys in the same alphabetical order as the previous
-    // std::map-based JSON output to keep responses byte-compatible.
-    std::string out;
-    out.reserve(1024);
-    out += "{\"data\":{";
+    // data->power
+    JSONObject jsonObjPower;
+    jsonObjPower["battery_percent"] = new JSONValue(powerStatus->getBatteryChargePercent());
+    jsonObjPower["battery_voltage_mv"] = new JSONValue(powerStatus->getBatteryVoltageMv());
+    jsonObjPower["has_battery"] = new JSONValue(BoolToString(powerStatus->getHasBattery()));
+    jsonObjPower["has_usb"] = new JSONValue(BoolToString(powerStatus->getHasUSB()));
+    jsonObjPower["is_charging"] = new JSONValue(BoolToString(powerStatus->getIsCharging()));
 
-    // airtime
-    out += "\"airtime\":{";
-    out += "\"channel_utilization\":";
-    out += jsonNum(airTime->channelUtilizationPercent());
-    out += ",\"periods_to_log\":";
-    out += jsonNum(airTime->getPeriodsToLog());
-    out += ",\"rx_all_log\":";
-    out += rxAllLog;
-    out += ",\"rx_log\":";
-    out += rxLog;
-    out += ",\"seconds_per_period\":";
-    out += jsonNum((int)airTime->getSecondsPerPeriod());
-    out += ",\"seconds_since_boot\":";
-    out += jsonNum((int)airTime->getSecondsSinceBoot());
-    out += ",\"tx_log\":";
-    out += txLog;
-    out += ",\"utilization_tx\":";
-    out += jsonNum(airTime->utilizationTXPercent());
-    out += "}";
+    // data->device
+    JSONObject jsonObjDevice;
+    jsonObjDevice["reboot_counter"] = new JSONValue((int)myNodeInfo.reboot_count);
 
-    // device
-    out += ",\"device\":{\"reboot_counter\":";
-    out += jsonNum((int)myNodeInfo.reboot_count);
-    out += "}";
+    // data->radio
+    JSONObject jsonObjRadio;
+    jsonObjRadio["frequency"] = new JSONValue(RadioLibInterface::instance->getFreq());
+    jsonObjRadio["lora_channel"] = new JSONValue((int)RadioLibInterface::instance->getChannelNum() + 1);
 
-    // memory
-    out += ",\"memory\":{";
-    out += "\"fs_free\":";
-    out += jsonNum((int)(fsTotal - fsUsed));
-    out += ",\"fs_total\":";
-    out += jsonNum((int)fsTotal);
-    out += ",\"fs_used\":";
-    out += jsonNum((int)fsUsed);
-    out += ",\"heap_free\":";
-    out += jsonNum((int)memGet.getFreeHeap());
-    out += ",\"heap_total\":";
-    out += jsonNum((int)memGet.getHeapSize());
-    out += ",\"psram_free\":";
-    out += jsonNum((int)memGet.getFreePsram());
-    out += ",\"psram_total\":";
-    out += jsonNum((int)memGet.getPsramSize());
-    out += "}";
+    // collect data to inner data object
+    JSONObject jsonObjInner;
+    jsonObjInner["airtime"] = new JSONValue(jsonObjAirtime);
+    jsonObjInner["wifi"] = new JSONValue(jsonObjWifi);
+    jsonObjInner["memory"] = new JSONValue(jsonObjMemory);
+    jsonObjInner["power"] = new JSONValue(jsonObjPower);
+    jsonObjInner["device"] = new JSONValue(jsonObjDevice);
+    jsonObjInner["radio"] = new JSONValue(jsonObjRadio);
 
-    // power (has_* / is_charging were serialized as the strings "true"/"false")
-    out += ",\"power\":{";
-    out += "\"battery_percent\":";
-    out += jsonNum(powerStatus->getBatteryChargePercent());
-    out += ",\"battery_voltage_mv\":";
-    out += jsonNum(powerStatus->getBatteryVoltageMv());
-    out += ",\"has_battery\":";
-    out += jsonEscape(BoolToString(powerStatus->getHasBattery()));
-    out += ",\"has_usb\":";
-    out += jsonEscape(BoolToString(powerStatus->getHasUSB()));
-    out += ",\"is_charging\":";
-    out += jsonEscape(BoolToString(powerStatus->getIsCharging()));
-    out += "}";
-
-    // radio
-    out += ",\"radio\":{\"frequency\":";
-    out += jsonNum(RadioLibInterface::instance->getFreq());
-    out += ",\"lora_channel\":";
-    out += jsonNum((int)RadioLibInterface::instance->getChannelNum() + 1);
-    out += "}";
-
-    // wifi
-    out += ",\"wifi\":{\"ip\":";
-    out += jsonEscape(wifiIP);
-    out += ",\"rssi\":";
-    out += jsonNum(WiFi.RSSI());
-    out += "}";
-
-    out += "},\"status\":\"ok\"}";
-
-    res->print(out.c_str());
+    // create json output structure
+    JSONObject jsonObjOuter;
+    jsonObjOuter["data"] = new JSONValue(jsonObjInner);
+    jsonObjOuter["status"] = new JSONValue("ok");
+    // serialize and write it to the stream
+    JSONValue *value = new JSONValue(jsonObjOuter);
+    std::string jsonString = value->Stringify();
+    res->print(jsonString.c_str());
+    delete value;
 }
 
 void handleNodes(HTTPRequest *req, HTTPResponse *res)
@@ -796,65 +724,58 @@ void handleNodes(HTTPRequest *req, HTTPResponse *res)
         res->println("<pre>");
     }
 
-    std::string out;
-    out.reserve(2048);
-    out += "{\"data\":{\"nodes\":[";
+    JSONArray nodesArray;
 
-    bool firstNode = true;
     uint32_t readIndex = 0;
     const meshtastic_NodeInfoLite *tempNodeInfo = nodeDB->readNextMeshNode(readIndex);
     while (tempNodeInfo != NULL) {
         if (tempNodeInfo->has_user) {
+            JSONObject node;
+
             char id[16];
             snprintf(id, sizeof(id), "!%08x", tempNodeInfo->num);
+
+            node["id"] = new JSONValue(id);
+            node["snr"] = new JSONValue(tempNodeInfo->snr);
+            node["via_mqtt"] = new JSONValue(BoolToString(tempNodeInfo->via_mqtt));
+            node["last_heard"] = new JSONValue((int)tempNodeInfo->last_heard);
+            node["position"] = new JSONValue();
+
+            if (nodeDB->hasValidPosition(tempNodeInfo)) {
+                JSONObject position;
+                position["latitude"] = new JSONValue((float)tempNodeInfo->position.latitude_i * 1e-7);
+                position["longitude"] = new JSONValue((float)tempNodeInfo->position.longitude_i * 1e-7);
+                position["altitude"] = new JSONValue((int)tempNodeInfo->position.altitude);
+                node["position"] = new JSONValue(position);
+            }
+
+            node["long_name"] = new JSONValue(tempNodeInfo->user.long_name);
+            node["short_name"] = new JSONValue(tempNodeInfo->user.short_name);
             char macStr[18];
             snprintf(macStr, sizeof(macStr), "%02X:%02X:%02X:%02X:%02X:%02X", tempNodeInfo->user.macaddr[0],
                      tempNodeInfo->user.macaddr[1], tempNodeInfo->user.macaddr[2], tempNodeInfo->user.macaddr[3],
                      tempNodeInfo->user.macaddr[4], tempNodeInfo->user.macaddr[5]);
+            node["mac_address"] = new JSONValue(macStr);
+            node["hw_model"] = new JSONValue(tempNodeInfo->user.hw_model);
 
-            std::string position;
-            if (nodeDB->hasValidPosition(tempNodeInfo)) {
-                position = "{\"altitude\":";
-                position += jsonNum((int)tempNodeInfo->position.altitude);
-                position += ",\"latitude\":";
-                position += jsonNum((float)tempNodeInfo->position.latitude_i * 1e-7);
-                position += ",\"longitude\":";
-                position += jsonNum((float)tempNodeInfo->position.longitude_i * 1e-7);
-                position += "}";
-            } else {
-                position = "null";
-            }
-
-            if (!firstNode)
-                out += ",";
-            firstNode = false;
-
-            // Alphabetical key order matches previous std::map-based output.
-            out += "{\"hw_model\":";
-            out += jsonNum(tempNodeInfo->user.hw_model);
-            out += ",\"id\":";
-            out += jsonEscape(id);
-            out += ",\"last_heard\":";
-            out += jsonNum((int)tempNodeInfo->last_heard);
-            out += ",\"long_name\":";
-            out += jsonEscape(tempNodeInfo->user.long_name);
-            out += ",\"mac_address\":";
-            out += jsonEscape(macStr);
-            out += ",\"position\":";
-            out += position;
-            out += ",\"short_name\":";
-            out += jsonEscape(tempNodeInfo->user.short_name);
-            out += ",\"snr\":";
-            out += jsonNum(tempNodeInfo->snr);
-            out += ",\"via_mqtt\":";
-            out += jsonEscape(BoolToString(tempNodeInfo->via_mqtt));
-            out += "}";
+            nodesArray.push_back(new JSONValue(node));
         }
         tempNodeInfo = nodeDB->readNextMeshNode(readIndex);
     }
 
-    out += "]},\"status\":\"ok\"}";
-    res->print(out.c_str());
+    // collect data to inner data object
+    JSONObject jsonObjInner;
+    jsonObjInner["nodes"] = new JSONValue(nodesArray);
+
+    // create json output structure
+    JSONObject jsonObjOuter;
+    jsonObjOuter["data"] = new JSONValue(jsonObjInner);
+    jsonObjOuter["status"] = new JSONValue("ok");
+    // serialize and write it to the stream
+    JSONValue *value = new JSONValue(jsonObjOuter);
+    std::string jsonString = value->Stringify();
+    res->print(jsonString.c_str());
+    delete value;
 }
 
 /*
@@ -976,28 +897,20 @@ void handleScanNetworks(HTTPRequest *req, HTTPResponse *res)
 
     int n = WiFi.scanNetworks();
 
-    std::string out = "{\"data\":[";
-    bool firstNet = true;
+    // build list of network objects
+    JSONArray networkObjs;
     if (n > 0) {
         for (int i = 0; i < n; ++i) {
             char ssidArray[50];
-            // The previous implementation pre-escaped quotes before handing
-            // the value to the JSON serializer; preserve that (byte-compatible
-            // even if it double-encodes a quote) so existing clients are not
-            // affected by this refactor.
             String ssidString = String(WiFi.SSID(i));
             ssidString.replace("\"", "\\\"");
             ssidString.toCharArray(ssidArray, 50);
 
             if (WiFi.encryptionType(i) != WIFI_AUTH_OPEN) {
-                if (!firstNet)
-                    out += ",";
-                firstNet = false;
-                out += "{\"rssi\":";
-                out += jsonNum((int)WiFi.RSSI(i));
-                out += ",\"ssid\":";
-                out += jsonEscape(ssidArray);
-                out += "}";
+                JSONObject thisNetwork;
+                thisNetwork["ssid"] = new JSONValue(ssidArray);
+                thisNetwork["rssi"] = new JSONValue(int(WiFi.RSSI(i)));
+                networkObjs.push_back(new JSONValue(thisNetwork));
             }
             // Yield some cpu cycles to IP stack.
             //   This is important in case the list is large and it takes us time to return
@@ -1005,7 +918,16 @@ void handleScanNetworks(HTTPRequest *req, HTTPResponse *res)
             yield();
         }
     }
-    out += "],\"status\":\"ok\"}";
-    res->print(out.c_str());
+
+    // build output structure
+    JSONObject jsonObjOuter;
+    jsonObjOuter["data"] = new JSONValue(networkObjs);
+    jsonObjOuter["status"] = new JSONValue("ok");
+
+    // serialize and write it to the stream
+    JSONValue *value = new JSONValue(jsonObjOuter);
+    std::string jsonString = value->Stringify();
+    res->print(jsonString.c_str());
+    delete value;
 }
 #endif

src/modules/AdminModule.cpp

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

src/modules/Modules.cpp

@@ -49,6 +49,9 @@
 #include "modules/WaypointModule.h"
 #endif
 #if ARCH_PORTDUINO
+#include "input/LinuxInputImpl.h"
+#include "input/SeesawRotary.h"
+#include "modules/Native/StoreForwardPlusPlus.h"
 #include "modules/Telemetry/HostMetrics.h"
 #if !MESHTASTIC_EXCLUDE_STOREFORWARD
 #include "modules/StoreForwardModule.h"
@@ -195,6 +198,11 @@ void setupModules()
 #endif
 #if ARCH_PORTDUINO
     new HostMetricsModule();
+#if SFPP_ENABLED
+    if (portduino_config.sfpp_enabled) {
+        storeForwardPlusPlusModule = new StoreForwardPlusPlusModule();
+    }
+#endif
 #endif
 #if HAS_TELEMETRY
     new DeviceTelemetryModule();

src/modules/Native/StoreForwardPlusPlus.h

@@ -0,0 +1,310 @@
+#pragma once
+#if __has_include("sqlite3.h")
+#define SFPP_ENABLED 1
+#include "Channels.h"
+#include "ProtobufModule.h"
+#include "Router.h"
+#include "SinglePortModule.h"
+#include "sqlite3.h"
+
+#define SFPP_HASH_SIZE 16
+#define SFPP_SHORT_HASH_SIZE 8
+
+/**
+ * Store and forward ++ module
+ * There's an obvious need for a store-and-forward mechanism in Meshtastic.
+ * This module takes heavy inspiration from Git, building a chain of messages that can be synced between nodes.
+ * Each message is hashed, and the chain is built by hashing the previous commit hash and the current message hash.
+ * Nodes can request missing messages by requesting the next message after a given commit hash.
+ *
+ * The current focus is text messages, limited to the primary channel.
+ *
+ * Each chain is identified by a root hash, which is derived from the channelHash, the local nodenum, and the timestamp when
+ * created.
+ *
+ * Each message is also given a message hash, derived from the encrypted payload, the to, from, id.
+ * Notably not the timestamp, as we want these to match across nodes, even if the timestamps differ.
+ *
+ * The authoritative node for the chain will generate a commit hash for each message when adding it to the chain.
+ * The first message's commit hash is derived from the root hash and the message hash.
+ * Subsequent messages' commit hashes are derived from the previous commit hash and the current message hash.
+ * This allows a node to see only the last commit hash, and confirm it hasn't missed any messages.
+ *
+ * Nodes can request the next message in the chain by sending a LINK_REQUEST message with the root hash and the last known commit
+ * hash. Any node that has the next message can respond with a LINK_PROVIDE message containing the next message.
+ *
+ * When a satellite node sees a new text message, it stores it in a scratch database.
+ * These messages are periodically offered to the authoritative node for inclusion in the chain.
+ *
+ * The LINK_PROVIDE message does double-duty, sending both on-chain and off-chain messages.
+ * The differentiator is whether the commit hash is set or left empty.
+ *
+ * When a satellite node receives a canonical link message, it checks if it has the message in scratch.
+ * And evicts it when adding it to the canonical chain.
+ *
+ * This approach allows a node to know whether it has seen a given message before, or if it is new coming via SFPP.
+ * If new, and the timestamp is within the rebroadcast timeout, it will process that message as if it were just received from the
+ * mesh, allowing it to be decrypted, shown to the user, and rebroadcast.
+ */
+class StoreForwardPlusPlusModule : public ProtobufModule<meshtastic_StoreForwardPlusPlus>, private concurrency::OSThread
+{
+    struct link_object {
+        uint32_t to;
+        uint32_t from;
+        uint32_t id;
+        uint32_t rx_time = 0;
+        ChannelHash channel_hash;
+        uint8_t encrypted_bytes[256] = {0};
+        size_t encrypted_len;
+        uint8_t message_hash[SFPP_HASH_SIZE] = {0};
+        size_t message_hash_len = 0;
+        uint8_t root_hash[SFPP_HASH_SIZE] = {0};
+        size_t root_hash_len = 0;
+        uint8_t commit_hash[SFPP_HASH_SIZE] = {0};
+        size_t commit_hash_len = 0;
+        uint32_t counter = 0;
+        std::string payload;
+        bool validObject = true; // set this false when a chain calulation fails, etc.
+    };
+
+  public:
+    /** Constructor
+     *
+     */
+    StoreForwardPlusPlusModule();
+
+    /*
+      -Override the wantPacket method.
+    */
+    virtual bool wantPacket(const meshtastic_MeshPacket *p) override
+    {
+        if (p->decoded.portnum == meshtastic_PortNum_TEXT_MESSAGE_APP ||
+            p->decoded.portnum == (portduino_config.sfpp_steal_port ? meshtastic_PortNum_TEXT_MESSAGE_COMPRESSED_APP
+                                                                    : meshtastic_PortNum_STORE_FORWARD_PLUSPLUS_APP)) {
+            return true;
+        } else {
+            return false;
+        }
+    }
+
+    void handleEncrypted(const meshtastic_MeshPacket *, const meshtastic_MeshPacket *);
+
+  protected:
+    /** Called to handle a particular incoming message
+    @return ProcessMessage::STOP 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) override;
+    virtual bool handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshtastic_StoreForwardPlusPlus *t) override;
+
+    virtual int32_t runOnce() override;
+
+  private:
+    sqlite3 *ppDb;
+    sqlite3_stmt *chain_insert_stmt;
+    sqlite3_stmt *scratch_insert_stmt;
+    sqlite3_stmt *checkDupMessageHash;
+    sqlite3_stmt *checkDupCommitHash;
+    sqlite3_stmt *checkScratch;
+    sqlite3_stmt *removeScratch;
+    sqlite3_stmt *updatePayloadStmt;
+    sqlite3_stmt *getPayloadFromScratchStmt;
+    sqlite3_stmt *fromScratchStmt;
+    sqlite3_stmt *fromScratchByHashStmt;
+    sqlite3_stmt *getNextHashStmt;
+    sqlite3_stmt *getChainEndStmt;
+    sqlite3_stmt *getLinkStmt;
+    sqlite3_stmt *getLinkFromMessageHashStmt;
+    sqlite3_stmt *getHashFromRootStmt;
+    sqlite3_stmt *addRootToMappingsStmt;
+    sqlite3_stmt *getRootFromChannelHashStmt;
+    sqlite3_stmt *getFullRootHashStmt;
+    sqlite3_stmt *setChainCountStmt;
+    sqlite3_stmt *getChainCountStmt;
+    sqlite3_stmt *getScratchCountStmt;
+    sqlite3_stmt *getRootCanonScratchCountStmt;
+    sqlite3_stmt *pruneScratchQueueStmt;
+    sqlite3_stmt *trimOldestLinkStmt;
+    sqlite3_stmt *maybeAddPeerStmt;
+    sqlite3_stmt *getPeerStmt;
+    sqlite3_stmt *updatePeerStmt;
+    sqlite3_stmt *clearChainStmt;
+    sqlite3_stmt *canon_scratch_insert_stmt;
+    sqlite3_stmt *getCanonScratchCountStmt;
+    sqlite3_stmt *getCanonScratchStmt;
+    sqlite3_stmt *removeCanonScratch;
+    sqlite3_stmt *clearCanonScratchStmt;
+
+    // For a given Meshtastic ChannelHash, fills the root_hash buffer with a 32-byte root hash
+    // returns true if the root hash was found
+    bool getRootFromChannelHash(ChannelHash, uint8_t *);
+
+    // For a given root hash, returns the ChannelHash
+    // can handle partial root hashes
+    ChannelHash getChannelHashFromRoot(uint8_t *_root_hash, size_t);
+
+    // given a root hash and commit hash, returns the next commit hash in the chain
+    // can handle partial root and commit hashes, always fills the buffer with 32 bytes
+    // returns true if a next hash was found
+    bool getNextHash(uint8_t *, size_t, uint8_t *, size_t, uint8_t *);
+
+    // For a given Meshtastic ChannelHash, fills the root_hash buffer with a 32-byte root hash
+    // but this function will add the root hash if it is not already present
+    // returns hash size or 0 if not found/added
+    size_t getOrAddRootFromChannelHash(ChannelHash, uint8_t *);
+
+    // adds the ChannelHash and root_hash to the mappings table
+    void addRootToMappings(ChannelHash, uint8_t *);
+
+    // requests the next message in the chain from the mesh network
+    // Sends a LINK_REQUEST message
+    void requestNextMessage(uint8_t *, size_t, uint8_t *, size_t);
+
+    // request the message X entries from the end.
+    // used to bootstrap a chain, without downloading all of the history
+    void requestMessageCount(uint8_t *, size_t, uint32_t);
+
+    // sends a LINK_PROVIDE message broadcasting the given link object
+    void broadcastLink(uint8_t *, size_t);
+
+    // sends a LINK_PROVIDE message broadcasting the given link object
+    void broadcastLink(link_object &, bool, bool = false);
+
+    // sends a LINK_PROVIDE message broadcasting the given link object from scratch message store
+    bool sendFromScratch(uint8_t *);
+
+    // Adds the given link object to the canonical chain database
+    bool addToChain(link_object &);
+
+    // Adds an incoming text message to the scratch database
+    bool addToScratch(link_object &);
+
+    // sends a CANON_ANNOUNCE message, specifying the given root and commit hashes
+    void canonAnnounce(link_object &);
+
+    // checks if the message hash is present in the canonical chain database
+    bool isInDB(uint8_t *, size_t);
+
+    // checks if the commit hash is present in the canonical chain database
+    bool isCommitInDB(uint8_t *, size_t);
+
+    // checks if the message hash is present in the scratch database
+    bool isInScratch(uint8_t *, size_t);
+
+    // retrieves a link object from the scratch database
+    link_object getFromScratch(uint8_t *, size_t);
+
+    // removes a link object from the scratch database
+    void removeFromScratch(uint8_t *, size_t);
+
+    // iterate through our scratch database, and see if we can speculate a chain up to the given commit hash
+    bool speculateScratchChain(uint8_t *, size_t, uint8_t *, uint8_t *);
+
+    // retrieves the next link object from scratch given a root hash
+    link_object getNextScratchObject(uint8_t *);
+
+    // fills the payload section with the decrypted data for the given message hash
+    // probably not needed for production, but useful for testing
+    void updatePayload(uint8_t *, size_t, std::string);
+
+    // Takes the decrypted MeshPacket and the encrypted packet copy, and builds a link_object
+    // Generates a message hash, but does not set the commit hash
+    link_object ingestTextPacket(const meshtastic_MeshPacket &, const meshtastic_MeshPacket *);
+
+    // ingests a LINK_PROVIDE message and builds a link_object
+    // confirms the root hash and commit hash
+    link_object ingestLinkMessage(meshtastic_StoreForwardPlusPlus *);
+
+    // retrieves a link object from the canonical chain database given a commit hash
+    link_object getLink(uint8_t *, size_t);
+
+    // retrieves a link object from the canonical chain database given a message hash
+    link_object getLinkFromMessageHash(uint8_t *, size_t);
+
+    // puts the encrypted payload back into the queue as if it were just received
+    void rebroadcastLinkObject(link_object &);
+
+    // Check if an incoming link object's commit hash matches the calculated commit hash
+    bool checkCommitHash(link_object &lo, uint8_t *commit_hash_bytes, size_t hash_len);
+
+    // given a partial root hash, looks up the full 32-byte root hash
+    // returns true if found
+    bool lookUpFullRootHash(uint8_t *partial_root_hash, size_t partial_root_hash_len, uint8_t *full_root_hash);
+
+    // update the mappings table to set the chain count for the given root hash
+    void setChainCount(uint8_t *, size_t, uint32_t);
+
+    // get the chain count for the given root hash
+    uint32_t getChainCount(uint8_t *, size_t);
+
+    // get the scratch count for the given root hash
+    uint32_t getScratchCount(uint8_t *, size_t);
+
+    // get the canon scratch count for the given root hash
+    uint32_t getCanonScratchCount(uint8_t *, size_t);
+
+    link_object getLinkFromPositionFromTip(uint32_t, uint8_t *, size_t);
+
+    void pruneScratchQueue();
+
+    void trimOldestLink(uint8_t *, size_t);
+
+    void clearChain(uint8_t *, size_t);
+
+    void recalculateMessageHash(link_object &);
+
+    // given a link object with a payload and other fields, recalculates the message hash
+    // returns true if a match
+    bool recalculateHash(link_object &, uint8_t *, size_t, uint8_t *, size_t);
+
+    void updatePeers(const meshtastic_MeshPacket &, meshtastic_StoreForwardPlusPlus_SFPP_message_type);
+
+    void maybeMoveFromCanonScratch(uint8_t *, size_t);
+
+    void addToCanonScratch(link_object &);
+
+    link_object getfromCanonScratch(uint8_t *, size_t);
+    void removeFromCanonScratch(uint8_t *, size_t);
+
+    void clearCanonScratch(uint8_t *, size_t, uint32_t);
+
+    bool isInCanonScratch(uint8_t *, size_t);
+
+    void logLinkObject(link_object &);
+
+    // Track if we have a scheduled runOnce pending
+    // useful to not accudentally delay a scheduled runOnce
+    bool pendingRun = false;
+
+    // Once we have multiple chain types, we can extend this
+    enum chain_types {
+        channel_chain = 0,
+    };
+
+    uint32_t rebroadcastTimeout = 3600; // Messages older than this (in seconds) will not be rebroadcast
+    bool doing_split_send = false;
+    link_object split_link_out;
+
+    bool doing_split_receive = false;
+    link_object split_link_in;
+
+    bool did_announce_last = false;
+
+    uint32_t texts_rebroadcast = 0;
+    uint32_t links_speculated = 0;
+    uint32_t canon_announces = 0;
+    uint32_t links_requested = 0;
+    uint32_t links_provided = 0;
+    uint32_t links_added = 0;
+    uint32_t links_from_canon_scratch = 0;
+    uint32_t links_from_scratch = 0;
+    uint32_t split_links_sent = 0;
+    uint32_t split_links_received = 0;
+    uint32_t links_pruned = 0;
+    uint32_t scratch_timed_out = 0;
+    uint32_t sent_from_scratch = 0;
+    uint32_t received_from_scratch = 0;
+};
+
+extern StoreForwardPlusPlusModule *storeForwardPlusPlusModule;
+#endif

src/modules/StatusMessageModule.cpp

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

src/modules/StatusMessageModule.h

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

src/mqtt/MQTT.cpp

@@ -24,6 +24,10 @@
 #define ETH ETH2
 #endif // HAS_ETHERNET
 #include "Default.h"
+#if !defined(ARCH_NRF52) || NRF52_USE_JSON
+#include "serialization/JSON.h"
+#include "serialization/MeshPacketSerializer.h"
+#endif
 #include <Throttle.h>
 #include <assert.h>
 #include <utility>
@@ -144,6 +148,96 @@ inline void onReceiveProto(char *topic, byte *payload, size_t length)
         router->enqueueReceivedMessage(p.release());
 }
 
+#if !defined(ARCH_NRF52) || NRF52_USE_JSON
+// returns true if this is a valid JSON envelope which we accept on downlink
+inline bool isValidJsonEnvelope(JSONObject &json)
+{
+    // Generate node ID from nodenum for comparison
+    std::string nodeId = nodeDB->getNodeId();
+    // if "sender" is provided, avoid processing packets we uplinked
+    return (json.find("sender") != json.end() ? (json["sender"]->AsString().compare(nodeId) != 0) : true) &&
+           (json.find("hopLimit") != json.end() ? json["hopLimit"]->IsNumber() : true) && // hop limit should be a number
+           (json.find("from") != json.end()) && json["from"]->IsNumber() &&
+           (json["from"]->AsNumber() == nodeDB->getNodeNum()) &&            // only accept message if the "from" is us
+           (json.find("type") != json.end()) && json["type"]->IsString() && // should specify a type
+           (json.find("payload") != json.end());                            // should have a payload
+}
+
+inline void onReceiveJson(byte *payload, size_t length)
+{
+    char payloadStr[length + 1];
+    memcpy(payloadStr, payload, length);
+    payloadStr[length] = 0; // null terminated string
+    std::unique_ptr<JSONValue> json_value(JSON::Parse(payloadStr));
+    if (json_value == nullptr) {
+        LOG_ERROR("JSON received payload on MQTT but not a valid JSON");
+        return;
+    }
+
+    JSONObject json;
+    json = json_value->AsObject();
+
+    if (!isValidJsonEnvelope(json)) {
+        LOG_ERROR("JSON received payload on MQTT but not a valid envelope");
+        return;
+    }
+
+    // this is a valid envelope
+    if (json["type"]->AsString().compare("sendtext") == 0 && json["payload"]->IsString()) {
+        std::string jsonPayloadStr = json["payload"]->AsString();
+        LOG_INFO("JSON payload %s, length %u", jsonPayloadStr.c_str(), jsonPayloadStr.length());
+
+        // construct protobuf data packet using TEXT_MESSAGE, send it to the mesh
+        meshtastic_MeshPacket *p = router->allocForSending();
+        p->decoded.portnum = meshtastic_PortNum_TEXT_MESSAGE_APP;
+        if (json.find("channel") != json.end() && json["channel"]->IsNumber() &&
+            (json["channel"]->AsNumber() < channels.getNumChannels()))
+            p->channel = json["channel"]->AsNumber();
+        if (json.find("to") != json.end() && json["to"]->IsNumber())
+            p->to = json["to"]->AsNumber();
+        if (json.find("hopLimit") != json.end() && json["hopLimit"]->IsNumber())
+            p->hop_limit = json["hopLimit"]->AsNumber();
+        if (jsonPayloadStr.length() <= sizeof(p->decoded.payload.bytes)) {
+            memcpy(p->decoded.payload.bytes, jsonPayloadStr.c_str(), jsonPayloadStr.length());
+            p->decoded.payload.size = jsonPayloadStr.length();
+            service->sendToMesh(p, RX_SRC_LOCAL);
+        } else {
+            LOG_WARN("Received MQTT json payload too long, drop");
+        }
+    } else if (json["type"]->AsString().compare("sendposition") == 0 && json["payload"]->IsObject()) {
+        // invent the "sendposition" type for a valid envelope
+        JSONObject posit;
+        posit = json["payload"]->AsObject(); // get nested JSON Position
+        meshtastic_Position pos = meshtastic_Position_init_default;
+        if (posit.find("latitude_i") != posit.end() && posit["latitude_i"]->IsNumber())
+            pos.latitude_i = posit["latitude_i"]->AsNumber();
+        if (posit.find("longitude_i") != posit.end() && posit["longitude_i"]->IsNumber())
+            pos.longitude_i = posit["longitude_i"]->AsNumber();
+        if (posit.find("altitude") != posit.end() && posit["altitude"]->IsNumber())
+            pos.altitude = posit["altitude"]->AsNumber();
+        if (posit.find("time") != posit.end() && posit["time"]->IsNumber())
+            pos.time = posit["time"]->AsNumber();
+
+        // construct protobuf data packet using POSITION, send it to the mesh
+        meshtastic_MeshPacket *p = router->allocForSending();
+        p->decoded.portnum = meshtastic_PortNum_POSITION_APP;
+        if (json.find("channel") != json.end() && json["channel"]->IsNumber() &&
+            (json["channel"]->AsNumber() < channels.getNumChannels()))
+            p->channel = json["channel"]->AsNumber();
+        if (json.find("to") != json.end() && json["to"]->IsNumber())
+            p->to = json["to"]->AsNumber();
+        if (json.find("hopLimit") != json.end() && json["hopLimit"]->IsNumber())
+            p->hop_limit = json["hopLimit"]->AsNumber();
+        p->decoded.payload.size =
+            pb_encode_to_bytes(p->decoded.payload.bytes, sizeof(p->decoded.payload.bytes), &meshtastic_Position_msg,
+                               &pos); // make the Data protobuf from position
+        service->sendToMesh(p, RX_SRC_LOCAL);
+    } else {
+        LOG_DEBUG("JSON ignore downlink message with unsupported type");
+    }
+}
+#endif
+
 /// Determines if the given IPAddress is a private IPv4 address, i.e. not routable on the public internet.
 bool isPrivateIpAddress(const IPAddress &ip)
 {
@@ -288,6 +382,26 @@ void MQTT::onReceive(char *topic, byte *payload, size_t length)
         return;
     }
 
+    // check if this is a json payload message by comparing the topic start
+    if (moduleConfig.mqtt.json_enabled && (strncmp(topic, jsonTopic.c_str(), jsonTopic.length()) == 0)) {
+#if !defined(ARCH_NRF52) || NRF52_USE_JSON
+        // parse the channel name from the topic string
+        // the topic has been checked above for having jsonTopic prefix, so just move past it
+        char *channelName = topic + jsonTopic.length();
+        // if another "/" was added, parse string up to that character
+        channelName = strtok(channelName, "/") ? strtok(channelName, "/") : channelName;
+        // We allow downlink JSON packets only on a channel named "mqtt"
+        const meshtastic_Channel &sendChannel = channels.getByName(channelName);
+        if (!(strncasecmp(channels.getGlobalId(sendChannel.index), Channels::mqttChannel, strlen(Channels::mqttChannel)) == 0 &&
+              sendChannel.settings.downlink_enabled)) {
+            LOG_WARN("JSON downlink received on channel not called 'mqtt' or without downlink enabled");
+            return;
+        }
+        onReceiveJson(payload, length);
+#endif
+        return;
+    }
+
     onReceiveProto(topic, payload, length);
 }
 
@@ -312,10 +426,12 @@ MQTT::MQTT() : concurrency::OSThread("mqtt"), mqttQueue(MAX_MQTT_QUEUE)
 
         if (*moduleConfig.mqtt.root) {
             cryptTopic = moduleConfig.mqtt.root + cryptTopic;
+            jsonTopic = moduleConfig.mqtt.root + jsonTopic;
             mapTopic = moduleConfig.mqtt.root + mapTopic;
             isConfiguredForDefaultRootTopic = isDefaultRootTopic(moduleConfig.mqtt.root);
         } else {
             cryptTopic = "msh" + cryptTopic;
+            jsonTopic = "msh" + jsonTopic;
             mapTopic = "msh" + mapTopic;
             isConfiguredForDefaultRootTopic = true;
         }
@@ -466,6 +582,14 @@ void MQTT::sendSubscriptions()
             std::string topic = cryptTopic + channels.getGlobalId(i) + "/+";
             LOG_INFO("Subscribe to %s", topic.c_str());
             pubSub.subscribe(topic.c_str(), 1); // FIXME, is QOS 1 right?
+#if !defined(ARCH_NRF52) ||                                                                                                      \
+    defined(NRF52_USE_JSON) // JSON is not supported on nRF52, see issue #2804 ### Fixed by using ArduinoJSON ###
+            if (moduleConfig.mqtt.json_enabled == true) {
+                std::string topicDecoded = jsonTopic + channels.getGlobalId(i) + "/+";
+                LOG_INFO("Subscribe to %s", topicDecoded.c_str());
+                pubSub.subscribe(topicDecoded.c_str(), 1); // FIXME, is QOS 1 right?
+            }
+#endif // ARCH_NRF52 NRF52_USE_JSON
         }
     }
 #if !MESHTASTIC_EXCLUDE_PKI
@@ -604,6 +728,33 @@ void MQTT::publishQueuedMessages()
     const std::unique_ptr<QueueEntry> entry(mqttQueue.dequeuePtr(0));
     LOG_INFO("publish %s, %u bytes from queue", entry->topic.c_str(), entry->envBytes.size());
     publish(entry->topic.c_str(), entry->envBytes.data(), entry->envBytes.size(), false);
+
+#if !defined(ARCH_NRF52) ||                                                                                                      \
+    defined(NRF52_USE_JSON) // JSON is not supported on nRF52, see issue #2804 ### Fixed by using ArduinoJson ###
+    if (!moduleConfig.mqtt.json_enabled)
+        return;
+
+    // handle json topic
+    const DecodedServiceEnvelope env(entry->envBytes.data(), entry->envBytes.size());
+    if (!env.validDecode || env.packet == NULL || env.channel_id == NULL)
+        return;
+
+    auto jsonString = MeshPacketSerializer::JsonSerialize(env.packet);
+    if (jsonString.length() == 0)
+        return;
+
+    // Generate node ID from nodenum for topic
+    std::string nodeId = nodeDB->getNodeId();
+
+    std::string topicJson;
+    if (env.packet->pki_encrypted) {
+        topicJson = jsonTopic + "PKI/" + nodeId;
+    } else {
+        topicJson = jsonTopic + env.channel_id + "/" + nodeId;
+    }
+    LOG_INFO("JSON publish message to %s, %u bytes: %s", topicJson.c_str(), jsonString.length(), jsonString.c_str());
+    publish(topicJson.c_str(), jsonString.c_str(), false);
+#endif // ARCH_NRF52 NRF52_USE_JSON
 }
 
 void MQTT::onSend(const meshtastic_MeshPacket &mp_encrypted, const meshtastic_MeshPacket &mp_decoded, ChannelIndex chIndex)
@@ -667,6 +818,21 @@ void MQTT::onSend(const meshtastic_MeshPacket &mp_encrypted, const meshtastic_Me
     if (moduleConfig.mqtt.proxy_to_client_enabled || this->isConnectedDirectly()) {
         LOG_DEBUG("MQTT Publish %s, %u bytes", topic.c_str(), numBytes);
         publish(topic.c_str(), bytes, numBytes, false);
+
+#if !defined(ARCH_NRF52) ||                                                                                                      \
+    defined(NRF52_USE_JSON) // JSON is not supported on nRF52, see issue #2804 ### Fixed by using ArduinoJson ###
+        if (!moduleConfig.mqtt.json_enabled)
+            return;
+        // handle json topic
+        auto jsonString = MeshPacketSerializer::JsonSerialize(&mp_decoded);
+        if (jsonString.length() == 0)
+            return;
+        // Generate node ID from nodenum for JSON topic
+        std::string nodeIdForJson = nodeDB->getNodeId();
+        std::string topicJson = jsonTopic + channelId + "/" + nodeIdForJson;
+        LOG_INFO("JSON publish message to %s, %u bytes: %s", topicJson.c_str(), jsonString.length(), jsonString.c_str());
+        publish(topicJson.c_str(), jsonString.c_str(), false);
+#endif // ARCH_NRF52 NRF52_USE_JSON
     } else {
         LOG_INFO("MQTT not connected, queue packet");
         QueueEntry *entry;

src/mqtt/MQTT.h

@@ -6,6 +6,9 @@
 #include "concurrency/OSThread.h"
 #include "mesh/Channels.h"
 #include "mesh/generated/meshtastic/mqtt.pb.h"
+#if !defined(ARCH_NRF52) || NRF52_USE_JSON
+#include "serialization/JSON.h"
+#endif
 #if HAS_WIFI
 #include <WiFiClient.h>
 #if __has_include(<WiFiClientSecure.h>)
@@ -98,8 +101,9 @@ class MQTT : private concurrency::OSThread
     explicit MQTT(std::unique_ptr<MQTTClient> mqttClient);
 #endif
 
-    std::string cryptTopic = "/2/e/"; // msh/2/e/CHANNELID/NODEID
-    std::string mapTopic = "/2/map/"; // For protobuf-encoded MapReport messages
+    std::string cryptTopic = "/2/e/";   // msh/2/e/CHANNELID/NODEID
+    std::string jsonTopic = "/2/json/"; // msh/2/json/CHANNELID/NODEID
+    std::string mapTopic = "/2/map/";   // For protobuf-encoded MapReport messages
 
     // For map reporting (only applies when enabled)
     const uint32_t default_map_position_precision = 14; // defaults to max. offset of ~1459m

src/platform/portduino/PortduinoGlue.cpp

@@ -182,12 +182,9 @@ 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;
+        portduino_config.sfpp_enabled = false;
     } else if (configPath != nullptr) {
         if (loadConfig(configPath)) {
             if (!yamlOnly)
@@ -654,9 +651,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;
 }
 
@@ -994,6 +989,28 @@ bool loadConfig(const char *configPath)
             }
         }
 
+        if (yamlConfig["StoreAndForward"]) {
+            portduino_config.sfpp_stratum0 = (yamlConfig["StoreAndForward"]["Stratum0"]).as<bool>(false);
+            portduino_config.sfpp_enabled = (yamlConfig["StoreAndForward"]["Enabled"]).as<bool>(true);
+            portduino_config.sfpp_db_path = (yamlConfig["StoreAndForward"]["DBPath"]).as<std::string>("/var/lib/meshtasticd/");
+            portduino_config.sfpp_initial_sync = (yamlConfig["StoreAndForward"]["InitialSync"]).as<int>(10);
+            portduino_config.sfpp_hops = (yamlConfig["StoreAndForward"]["Hops"]).as<int>(3);
+            portduino_config.sfpp_announce_interval = (yamlConfig["StoreAndForward"]["AnnounceInterval"]).as<int>(5);
+            portduino_config.sfpp_max_chain = (yamlConfig["StoreAndForward"]["MaxChainLength"]).as<uint32_t>(1000);
+            portduino_config.sfpp_backlog_limit = (yamlConfig["StoreAndForward"]["BacklogLimit"]).as<uint32_t>(100);
+            portduino_config.sfpp_steal_port = (yamlConfig["StoreAndForward"]["StealPort"]).as<bool>(false);
+        }
+        if (yamlConfig["Routing"]) {
+            if (yamlConfig["Routing"]["WhitelistPorts"]) {
+                portduino_config.whitelist_ports = (yamlConfig["Routing"]["WhitelistPorts"]).as<std::vector<int>>();
+                if (portduino_config.whitelist_ports.size() > 0) {
+                    portduino_config.whitelist_enabled = true;
+                }
+            }
+            if (yamlConfig["Routing"]["NoHopPorts"]) {
+                portduino_config.nohop_ports = (yamlConfig["Routing"]["NoHopPorts"]).as<std::vector<int>>();
+            }
+        }
         if (yamlConfig["General"]) {
             portduino_config.MaxNodes = (yamlConfig["General"]["MaxNodes"]).as<int>(200);
             portduino_config.maxtophone = (yamlConfig["General"]["MaxMessageQueue"]).as<int>(100);

src/platform/portduino/PortduinoGlue.h

@@ -187,6 +187,26 @@ extern struct portduino_config_struct {
     bool has_statusMessage = false;
     bool enable_UDP = false;
 
+    // Store and Forward++
+    std::string sfpp_db_path = "/var/lib/meshtasticd/";
+    bool sfpp_stratum0 = false;
+    bool sfpp_enabled = true;
+    bool sfpp_steal_port = false;
+    int sfpp_initial_sync = 10;
+    int sfpp_hops = 3;
+    int sfpp_announce_interval = 5; // minutes
+    uint32_t sfpp_max_chain = 1000;
+    uint32_t sfpp_backlog_limit = 100;
+    // allowed root hashes
+    // upstream node
+    // Are we allowing unknown channel hashes? Does this even make sense?
+    // Allow DMs
+
+    // Routing
+    bool whitelist_enabled = false;
+    std::vector<int> whitelist_ports = {};
+    std::vector<int> nohop_ports = {};
+
     // General
     std::string mac_address = "";
     bool mac_address_explicit = false;
@@ -552,6 +572,29 @@ extern struct portduino_config_struct {
             out << YAML::EndMap; // Config
         }
 
+        // StoreAndForward
+        if (sfpp_enabled) {
+            out << YAML::Key << "StoreAndForward" << YAML::Value << YAML::BeginMap;
+            out << YAML::Key << "Enabled" << YAML::Value << sfpp_enabled;
+            out << YAML::Key << "DBPath" << YAML::Value << sfpp_db_path;
+            out << YAML::Key << "Stratum0" << YAML::Value << sfpp_stratum0;
+            out << YAML::Key << "InitialSync" << YAML::Value << sfpp_initial_sync;
+            out << YAML::Key << "Hops" << YAML::Value << sfpp_hops;
+            out << YAML::Key << "AnnounceInterval" << YAML::Value << sfpp_announce_interval;
+            out << YAML::Key << "BacklogLimit" << YAML::Value << sfpp_backlog_limit;
+            out << YAML::Key << "MaxChainLength" << YAML::Value << sfpp_max_chain;
+            out << YAML::Key << "StealPort" << YAML::Value << sfpp_steal_port;
+            out << YAML::EndMap; // StoreAndForward
+        }
+
+        // Routing
+        if (whitelist_enabled || nohop_ports.size() > 0) {
+            out << YAML::Key << "Routing" << YAML::Value << YAML::BeginMap;
+            out << YAML::Key << "WhitelistPorts" << YAML::Value << whitelist_ports;
+            out << YAML::Key << "NoHopPorts" << YAML::Value << nohop_ports;
+            out << YAML::EndMap; // Routing
+        }
+
         // General
         out << YAML::Key << "General" << YAML::Value << YAML::BeginMap;
         if (config_directory != "")

src/platform/stm32wl/main-stm32wl.cpp

@@ -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() {}

src/power.h

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

src/serialization/JSON.cpp

@@ -0,0 +1,245 @@
+/*
+ * File JSON.cpp part of the SimpleJSON Library - http://mjpa.in/json
+ *
+ * Copyright (C) 2010 Mike Anchor
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "JSON.h"
+
+/**
+ * Blocks off the public constructor
+ *
+ * @access private
+ *
+ */
+JSON::JSON() {}
+
+/**
+ * Parses a complete JSON encoded string
+ *
+ * @access public
+ *
+ * @param char* data The JSON text
+ *
+ * @return JSONValue* Returns a JSON Value representing the root, or NULL on error
+ */
+JSONValue *JSON::Parse(const char *data)
+{
+    // Skip any preceding whitespace, end of data = no JSON = fail
+    if (!SkipWhitespace(&data))
+        return NULL;
+
+    // We need the start of a value here now...
+    JSONValue *value = JSONValue::Parse(&data);
+    if (value == NULL)
+        return NULL;
+
+    // Can be white space now and should be at the end of the string then...
+    if (SkipWhitespace(&data)) {
+        delete value;
+        return NULL;
+    }
+
+    // We're now at the end of the string
+    return value;
+}
+
+/**
+ * Turns the passed in JSONValue into a JSON encode string
+ *
+ * @access public
+ *
+ * @param JSONValue* value The root value
+ *
+ * @return std::string Returns a JSON encoded string representation of the given value
+ */
+std::string JSON::Stringify(const JSONValue *value)
+{
+    if (value != NULL)
+        return value->Stringify();
+    else
+        return "";
+}
+
+/**
+ * Skips over any whitespace characters (space, tab, \r or \n) defined by the JSON spec
+ *
+ * @access protected
+ *
+ * @param char** data Pointer to a char* that contains the JSON text
+ *
+ * @return bool Returns true if there is more data, or false if the end of the text was reached
+ */
+bool JSON::SkipWhitespace(const char **data)
+{
+    while (**data != 0 && (**data == ' ' || **data == '\t' || **data == '\r' || **data == '\n'))
+        (*data)++;
+
+    return **data != 0;
+}
+
+/**
+ * Extracts a JSON String as defined by the spec - "<some chars>"
+ * Any escaped characters are swapped out for their unescaped values
+ *
+ * @access protected
+ *
+ * @param char** data Pointer to a char* that contains the JSON text
+ * @param std::string& str Reference to a std::string to receive the extracted string
+ *
+ * @return bool Returns true on success, false on failure
+ */
+bool JSON::ExtractString(const char **data, std::string &str)
+{
+    str = "";
+
+    while (**data != 0) {
+        // Save the char so we can change it if need be
+        char next_char = **data;
+
+        // Escaping something?
+        if (next_char == '\\') {
+            // Move over the escape char
+            (*data)++;
+
+            // Deal with the escaped char
+            switch (**data) {
+            case '"':
+                next_char = '"';
+                break;
+            case '\\':
+                next_char = '\\';
+                break;
+            case '/':
+                next_char = '/';
+                break;
+            case 'b':
+                next_char = '\b';
+                break;
+            case 'f':
+                next_char = '\f';
+                break;
+            case 'n':
+                next_char = '\n';
+                break;
+            case 'r':
+                next_char = '\r';
+                break;
+            case 't':
+                next_char = '\t';
+                break;
+            case 'u': {
+                // We need 5 chars (4 hex + the 'u') or its not valid
+                if (!simplejson_csnlen(*data, 5))
+                    return false;
+
+                // Deal with the chars
+                next_char = 0;
+                for (int i = 0; i < 4; i++) {
+                    // Do it first to move off the 'u' and leave us on the
+                    // final hex digit as we move on by one later on
+                    (*data)++;
+
+                    next_char <<= 4;
+
+                    // Parse the hex digit
+                    if (**data >= '0' && **data <= '9')
+                        next_char |= (**data - '0');
+                    else if (**data >= 'A' && **data <= 'F')
+                        next_char |= (10 + (**data - 'A'));
+                    else if (**data >= 'a' && **data <= 'f')
+                        next_char |= (10 + (**data - 'a'));
+                    else {
+                        // Invalid hex digit = invalid JSON
+                        return false;
+                    }
+                }
+                break;
+            }
+
+            // By the spec, only the above cases are allowed
+            default:
+                return false;
+            }
+        }
+
+        // End of the string?
+        else if (next_char == '"') {
+            (*data)++;
+            str.shrink_to_fit(); // Remove unused capacity
+            return true;
+        }
+
+        // Disallowed char?
+        else if (next_char < ' ' && next_char != '\t') {
+            // SPEC Violation: Allow tabs due to real world cases
+            return false;
+        }
+
+        // Add the next char
+        str += next_char;
+
+        // Move on
+        (*data)++;
+    }
+
+    // If we're here, the string ended incorrectly
+    return false;
+}
+
+/**
+ * Parses some text as though it is an integer
+ *
+ * @access protected
+ *
+ * @param char** data Pointer to a char* that contains the JSON text
+ *
+ * @return double Returns the double value of the number found
+ */
+double JSON::ParseInt(const char **data)
+{
+    double integer = 0;
+    while (**data != 0 && **data >= '0' && **data <= '9')
+        integer = integer * 10 + (*(*data)++ - '0');
+
+    return integer;
+}
+
+/**
+ * Parses some text as though it is a decimal
+ *
+ * @access protected
+ *
+ * @param char** data Pointer to a char* that contains the JSON text
+ *
+ * @return double Returns the double value of the decimal found
+ */
+double JSON::ParseDecimal(const char **data)
+{
+    double decimal = 0.0;
+    double factor = 0.1;
+    while (**data != 0 && **data >= '0' && **data <= '9') {
+        int digit = (*(*data)++ - '0');
+        decimal = decimal + digit * factor;
+        factor *= 0.1;
+    }
+    return decimal;
+}

src/serialization/JSON.h

@@ -0,0 +1,73 @@
+/*
+ * File JSON.h part of the SimpleJSON Library - http://mjpa.in/json
+ *
+ * Copyright (C) 2010 Mike Anchor
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef _JSON_H_
+#define _JSON_H_
+
+#include <cstring>
+#include <map>
+#include <string>
+#include <vector>
+
+// Simple function to check a string 's' has at least 'n' characters
+static inline bool simplejson_csnlen(const char *s, size_t n)
+{
+    if (s == 0)
+        return false;
+
+    const char *save = s;
+    while (n-- > 0) {
+        if (*(save++) == 0)
+            return false;
+    }
+
+    return true;
+}
+
+// Custom types
+class JSONValue;
+typedef std::vector<JSONValue *> JSONArray;
+typedef std::map<std::string, JSONValue *> JSONObject;
+
+#include "JSONValue.h"
+
+class JSON
+{
+    friend class JSONValue;
+
+  public:
+    static JSONValue *Parse(const char *data);
+    static std::string Stringify(const JSONValue *value);
+
+  protected:
+    static bool SkipWhitespace(const char **data);
+    static bool ExtractString(const char **data, std::string &str);
+    static double ParseInt(const char **data);
+    static double ParseDecimal(const char **data);
+
+  private:
+    JSON();
+};
+
+#endif

src/serialization/JSONValue.cpp

@@ -0,0 +1,897 @@
+/*
+ * File JSONValue.cpp part of the SimpleJSON Library - http://mjpa.in/json
+ *
+ * Copyright (C) 2010 Mike Anchor
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include <math.h>
+#include <sstream>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <string>
+#include <vector>
+
+#include "JSONValue.h"
+
+// Macros to free an array/object
+#define FREE_ARRAY(x)                                                                                                            \
+    {                                                                                                                            \
+        JSONArray::iterator iter;                                                                                                \
+        for (iter = x.begin(); iter != x.end(); ++iter) {                                                                        \
+            delete *iter;                                                                                                        \
+        }                                                                                                                        \
+    }
+#define FREE_OBJECT(x)                                                                                                           \
+    {                                                                                                                            \
+        JSONObject::iterator iter;                                                                                               \
+        for (iter = x.begin(); iter != x.end(); ++iter) {                                                                        \
+            delete (*iter).second;                                                                                               \
+        }                                                                                                                        \
+    }
+
+/**
+ * Parses a JSON encoded value to a JSONValue object
+ *
+ * @access protected
+ *
+ * @param char** data Pointer to a char* that contains the data
+ *
+ * @return JSONValue* Returns a pointer to a JSONValue object on success, NULL on error
+ */
+JSONValue *JSONValue::Parse(const char **data)
+{
+    // Is it a string?
+    if (**data == '"') {
+        std::string str;
+        if (!JSON::ExtractString(&(++(*data)), str))
+            return NULL;
+        else
+            return new JSONValue(str);
+    }
+
+    // Is it a boolean?
+    else if ((simplejson_csnlen(*data, 4) && strncasecmp(*data, "true", 4) == 0) ||
+             (simplejson_csnlen(*data, 5) && strncasecmp(*data, "false", 5) == 0)) {
+        bool value = strncasecmp(*data, "true", 4) == 0;
+        (*data) += value ? 4 : 5;
+        return new JSONValue(value);
+    }
+
+    // Is it a null?
+    else if (simplejson_csnlen(*data, 4) && strncasecmp(*data, "null", 4) == 0) {
+        (*data) += 4;
+        return new JSONValue();
+    }
+
+    // Is it a number?
+    else if (**data == '-' || (**data >= '0' && **data <= '9')) {
+        // Negative?
+        bool neg = **data == '-';
+        if (neg)
+            (*data)++;
+
+        double number = 0.0;
+
+        // Parse the whole part of the number - only if it wasn't 0
+        if (**data == '0')
+            (*data)++;
+        else if (**data >= '1' && **data <= '9')
+            number = JSON::ParseInt(data);
+        else
+            return NULL;
+
+        // Could be a decimal now...
+        if (**data == '.') {
+            (*data)++;
+
+            // Not get any digits?
+            if (!(**data >= '0' && **data <= '9'))
+                return NULL;
+
+            // Find the decimal and sort the decimal place out
+            // Use ParseDecimal as ParseInt won't work with decimals less than 0.1
+            // thanks to Javier Abadia for the report & fix
+            double decimal = JSON::ParseDecimal(data);
+
+            // Save the number
+            number += decimal;
+        }
+
+        // Could be an exponent now...
+        if (**data == 'E' || **data == 'e') {
+            (*data)++;
+
+            // Check signage of expo
+            bool neg_expo = false;
+            if (**data == '-' || **data == '+') {
+                neg_expo = **data == '-';
+                (*data)++;
+            }
+
+            // Not get any digits?
+            if (!(**data >= '0' && **data <= '9'))
+                return NULL;
+
+            // Sort the expo out
+            double expo = JSON::ParseInt(data);
+            for (double i = 0.0; i < expo; i++)
+                number = neg_expo ? (number / 10.0) : (number * 10.0);
+        }
+
+        // Was it neg?
+        if (neg)
+            number *= -1;
+
+        return new JSONValue(number);
+    }
+
+    // An object?
+    else if (**data == '{') {
+        JSONObject object;
+
+        (*data)++;
+
+        while (**data != 0) {
+            // Whitespace at the start?
+            if (!JSON::SkipWhitespace(data)) {
+                FREE_OBJECT(object);
+                return NULL;
+            }
+
+            // Special case - empty object
+            if (object.size() == 0 && **data == '}') {
+                (*data)++;
+                return new JSONValue(object);
+            }
+
+            // We want a string now...
+            std::string name;
+            if (!JSON::ExtractString(&(++(*data)), name)) {
+                FREE_OBJECT(object);
+                return NULL;
+            }
+
+            // More whitespace?
+            if (!JSON::SkipWhitespace(data)) {
+                FREE_OBJECT(object);
+                return NULL;
+            }
+
+            // Need a : now
+            if (*((*data)++) != ':') {
+                FREE_OBJECT(object);
+                return NULL;
+            }
+
+            // More whitespace?
+            if (!JSON::SkipWhitespace(data)) {
+                FREE_OBJECT(object);
+                return NULL;
+            }
+
+            // The value is here
+            JSONValue *value = Parse(data);
+            if (value == NULL) {
+                FREE_OBJECT(object);
+                return NULL;
+            }
+
+            // Add the name:value
+            if (object.find(name) != object.end())
+                delete object[name];
+            object[name] = value;
+
+            // More whitespace?
+            if (!JSON::SkipWhitespace(data)) {
+                FREE_OBJECT(object);
+                return NULL;
+            }
+
+            // End of object?
+            if (**data == '}') {
+                (*data)++;
+                return new JSONValue(object);
+            }
+
+            // Want a , now
+            if (**data != ',') {
+                FREE_OBJECT(object);
+                return NULL;
+            }
+
+            (*data)++;
+        }
+
+        // Only here if we ran out of data
+        FREE_OBJECT(object);
+        return NULL;
+    }
+
+    // An array?
+    else if (**data == '[') {
+        JSONArray array;
+
+        (*data)++;
+
+        while (**data != 0) {
+            // Whitespace at the start?
+            if (!JSON::SkipWhitespace(data)) {
+                FREE_ARRAY(array);
+                return NULL;
+            }
+
+            // Special case - empty array
+            if (array.size() == 0 && **data == ']') {
+                (*data)++;
+                return new JSONValue(array);
+            }
+
+            // Get the value
+            JSONValue *value = Parse(data);
+            if (value == NULL) {
+                FREE_ARRAY(array);
+                return NULL;
+            }
+
+            // Add the value
+            array.push_back(value);
+
+            // More whitespace?
+            if (!JSON::SkipWhitespace(data)) {
+                FREE_ARRAY(array);
+                return NULL;
+            }
+
+            // End of array?
+            if (**data == ']') {
+                (*data)++;
+                return new JSONValue(array);
+            }
+
+            // Want a , now
+            if (**data != ',') {
+                FREE_ARRAY(array);
+                return NULL;
+            }
+
+            (*data)++;
+        }
+
+        // Only here if we ran out of data
+        FREE_ARRAY(array);
+        return NULL;
+    }
+
+    // Ran out of possibilities, it's bad!
+    else {
+        return NULL;
+    }
+}
+
+/**
+ * Basic constructor for creating a JSON Value of type NULL
+ *
+ * @access public
+ */
+JSONValue::JSONValue(/*NULL*/)
+{
+    type = JSONType_Null;
+}
+
+/**
+ * Basic constructor for creating a JSON Value of type String
+ *
+ * @access public
+ *
+ * @param char* m_char_value The string to use as the value
+ */
+JSONValue::JSONValue(const char *m_char_value)
+{
+    type = JSONType_String;
+    string_value = new std::string(std::string(m_char_value));
+}
+
+/**
+ * Basic constructor for creating a JSON Value of type String
+ *
+ * @access public
+ *
+ * @param std::string m_string_value The string to use as the value
+ */
+JSONValue::JSONValue(const std::string &m_string_value)
+{
+    type = JSONType_String;
+    string_value = new std::string(m_string_value);
+}
+
+/**
+ * Basic constructor for creating a JSON Value of type Bool
+ *
+ * @access public
+ *
+ * @param bool m_bool_value The bool to use as the value
+ */
+JSONValue::JSONValue(bool m_bool_value)
+{
+    type = JSONType_Bool;
+    bool_value = m_bool_value;
+}
+
+/**
+ * Basic constructor for creating a JSON Value of type Number
+ *
+ * @access public
+ *
+ * @param double m_number_value The number to use as the value
+ */
+JSONValue::JSONValue(double m_number_value)
+{
+    type = JSONType_Number;
+    number_value = m_number_value;
+}
+
+/**
+ * Basic constructor for creating a JSON Value of type Number
+ *
+ * @access public
+ *
+ * @param int m_integer_value The number to use as the value
+ */
+JSONValue::JSONValue(int m_integer_value)
+{
+    type = JSONType_Number;
+    number_value = (double)m_integer_value;
+}
+
+/**
+ * Basic constructor for creating a JSON Value of type Number
+ *
+ * @access public
+ *
+ * @param unsigned int m_integer_value The number to use as the value
+ */
+JSONValue::JSONValue(unsigned int m_integer_value)
+{
+    type = JSONType_Number;
+    number_value = (double)m_integer_value;
+}
+
+/**
+ * Basic constructor for creating a JSON Value of type Array
+ *
+ * @access public
+ *
+ * @param JSONArray m_array_value The JSONArray to use as the value
+ */
+JSONValue::JSONValue(const JSONArray &m_array_value)
+{
+    type = JSONType_Array;
+    array_value = new JSONArray(m_array_value);
+}
+
+/**
+ * Basic constructor for creating a JSON Value of type Object
+ *
+ * @access public
+ *
+ * @param JSONObject m_object_value The JSONObject to use as the value
+ */
+JSONValue::JSONValue(const JSONObject &m_object_value)
+{
+    type = JSONType_Object;
+    object_value = new JSONObject(m_object_value);
+}
+
+/**
+ * Copy constructor to perform a deep copy of array / object values
+ *
+ * @access public
+ *
+ * @param JSONValue m_source The source JSONValue that is being copied
+ */
+JSONValue::JSONValue(const JSONValue &m_source)
+{
+    type = m_source.type;
+
+    switch (type) {
+    case JSONType_String:
+        string_value = new std::string(*m_source.string_value);
+        break;
+
+    case JSONType_Bool:
+        bool_value = m_source.bool_value;
+        break;
+
+    case JSONType_Number:
+        number_value = m_source.number_value;
+        break;
+
+    case JSONType_Array: {
+        JSONArray source_array = *m_source.array_value;
+        JSONArray::iterator iter;
+        array_value = new JSONArray();
+        for (iter = source_array.begin(); iter != source_array.end(); ++iter)
+            array_value->push_back(new JSONValue(**iter));
+        break;
+    }
+
+    case JSONType_Object: {
+        JSONObject source_object = *m_source.object_value;
+        object_value = new JSONObject();
+        JSONObject::iterator iter;
+        for (iter = source_object.begin(); iter != source_object.end(); ++iter) {
+            std::string name = (*iter).first;
+            (*object_value)[name] = new JSONValue(*((*iter).second));
+        }
+        break;
+    }
+
+    case JSONType_Null:
+        // Nothing to do.
+        break;
+    }
+}
+
+/**
+ * The destructor for the JSON Value object
+ * Handles deleting the objects in the array or the object value
+ *
+ * @access public
+ */
+JSONValue::~JSONValue()
+{
+    if (type == JSONType_Array) {
+        JSONArray::iterator iter;
+        for (iter = array_value->begin(); iter != array_value->end(); ++iter)
+            delete *iter;
+        delete array_value;
+    } else if (type == JSONType_Object) {
+        JSONObject::iterator iter;
+        for (iter = object_value->begin(); iter != object_value->end(); ++iter) {
+            delete (*iter).second;
+        }
+        delete object_value;
+    } else if (type == JSONType_String) {
+        delete string_value;
+    }
+}
+
+/**
+ * Checks if the value is a NULL
+ *
+ * @access public
+ *
+ * @return bool Returns true if it is a NULL value, false otherwise
+ */
+bool JSONValue::IsNull() const
+{
+    return type == JSONType_Null;
+}
+
+/**
+ * Checks if the value is a String
+ *
+ * @access public
+ *
+ * @return bool Returns true if it is a String value, false otherwise
+ */
+bool JSONValue::IsString() const
+{
+    return type == JSONType_String;
+}
+
+/**
+ * Checks if the value is a Bool
+ *
+ * @access public
+ *
+ * @return bool Returns true if it is a Bool value, false otherwise
+ */
+bool JSONValue::IsBool() const
+{
+    return type == JSONType_Bool;
+}
+
+/**
+ * Checks if the value is a Number
+ *
+ * @access public
+ *
+ * @return bool Returns true if it is a Number value, false otherwise
+ */
+bool JSONValue::IsNumber() const
+{
+    return type == JSONType_Number;
+}
+
+/**
+ * Checks if the value is an Array
+ *
+ * @access public
+ *
+ * @return bool Returns true if it is an Array value, false otherwise
+ */
+bool JSONValue::IsArray() const
+{
+    return type == JSONType_Array;
+}
+
+/**
+ * Checks if the value is an Object
+ *
+ * @access public
+ *
+ * @return bool Returns true if it is an Object value, false otherwise
+ */
+bool JSONValue::IsObject() const
+{
+    return type == JSONType_Object;
+}
+
+/**
+ * Retrieves the String value of this JSONValue
+ * Use IsString() before using this method.
+ *
+ * @access public
+ *
+ * @return std::string Returns the string value
+ */
+const std::string &JSONValue::AsString() const
+{
+    return (*string_value);
+}
+
+/**
+ * Retrieves the Bool value of this JSONValue
+ * Use IsBool() before using this method.
+ *
+ * @access public
+ *
+ * @return bool Returns the bool value
+ */
+bool JSONValue::AsBool() const
+{
+    return bool_value;
+}
+
+/**
+ * Retrieves the Number value of this JSONValue
+ * Use IsNumber() before using this method.
+ *
+ * @access public
+ *
+ * @return double Returns the number value
+ */
+double JSONValue::AsNumber() const
+{
+    return number_value;
+}
+
+/**
+ * Retrieves the Array value of this JSONValue
+ * Use IsArray() before using this method.
+ *
+ * @access public
+ *
+ * @return JSONArray Returns the array value
+ */
+const JSONArray &JSONValue::AsArray() const
+{
+    return (*array_value);
+}
+
+/**
+ * Retrieves the Object value of this JSONValue
+ * Use IsObject() before using this method.
+ *
+ * @access public
+ *
+ * @return JSONObject Returns the object value
+ */
+const JSONObject &JSONValue::AsObject() const
+{
+    return (*object_value);
+}
+
+/**
+ * Retrieves the number of children of this JSONValue.
+ * This number will be 0 or the actual number of children
+ * if IsArray() or IsObject().
+ *
+ * @access public
+ *
+ * @return The number of children.
+ */
+std::size_t JSONValue::CountChildren() const
+{
+    switch (type) {
+    case JSONType_Array:
+        return array_value->size();
+    case JSONType_Object:
+        return object_value->size();
+    default:
+        return 0;
+    }
+}
+
+/**
+ * Checks if this JSONValue has a child at the given index.
+ * Use IsArray() before using this method.
+ *
+ * @access public
+ *
+ * @return bool Returns true if the array has a value at the given index.
+ */
+bool JSONValue::HasChild(std::size_t index) const
+{
+    if (type == JSONType_Array) {
+        return index < array_value->size();
+    } else {
+        return false;
+    }
+}
+
+/**
+ * Retrieves the child of this JSONValue at the given index.
+ * Use IsArray() before using this method.
+ *
+ * @access public
+ *
+ * @return JSONValue* Returns JSONValue at the given index or NULL
+ *                    if it doesn't exist.
+ */
+JSONValue *JSONValue::Child(std::size_t index)
+{
+    if (index < array_value->size()) {
+        return (*array_value)[index];
+    } else {
+        return NULL;
+    }
+}
+
+/**
+ * Checks if this JSONValue has a child at the given key.
+ * Use IsObject() before using this method.
+ *
+ * @access public
+ *
+ * @return bool Returns true if the object has a value at the given key.
+ */
+bool JSONValue::HasChild(const char *name) const
+{
+    if (type == JSONType_Object) {
+        return object_value->find(name) != object_value->end();
+    } else {
+        return false;
+    }
+}
+
+/**
+ * Retrieves the child of this JSONValue at the given key.
+ * Use IsObject() before using this method.
+ *
+ * @access public
+ *
+ * @return JSONValue* Returns JSONValue for the given key in the object
+ *                    or NULL if it doesn't exist.
+ */
+JSONValue *JSONValue::Child(const char *name)
+{
+    JSONObject::const_iterator it = object_value->find(name);
+    if (it != object_value->end()) {
+        return it->second;
+    } else {
+        return NULL;
+    }
+}
+
+/**
+ * Retrieves the keys of the JSON Object or an empty vector
+ * if this value is not an object.
+ *
+ * @access public
+ *
+ * @return std::vector<std::string> A vector containing the keys.
+ */
+std::vector<std::string> JSONValue::ObjectKeys() const
+{
+    std::vector<std::string> keys;
+
+    if (type == JSONType_Object) {
+        JSONObject::const_iterator iter = object_value->begin();
+        while (iter != object_value->end()) {
+            keys.push_back(iter->first);
+
+            ++iter;
+        }
+    }
+
+    return keys;
+}
+
+/**
+ * Creates a JSON encoded string for the value with all necessary characters escaped
+ *
+ * @access public
+ *
+ * @param bool prettyprint Enable prettyprint
+ *
+ * @return std::string Returns the JSON string
+ */
+std::string JSONValue::Stringify(bool const prettyprint) const
+{
+    size_t const indentDepth = prettyprint ? 1 : 0;
+    return StringifyImpl(indentDepth);
+}
+
+/**
+ * Creates a JSON encoded string for the value with all necessary characters escaped
+ *
+ * @access private
+ *
+ * @param size_t indentDepth The prettyprint indentation depth (0 : no prettyprint)
+ *
+ * @return std::string Returns the JSON string
+ */
+std::string JSONValue::StringifyImpl(size_t const indentDepth) const
+{
+    std::string ret_string;
+    size_t const indentDepth1 = indentDepth ? indentDepth + 1 : 0;
+    std::string const indentStr = Indent(indentDepth);
+    std::string const indentStr1 = Indent(indentDepth1);
+
+    switch (type) {
+    case JSONType_Null:
+        ret_string = "null";
+        break;
+
+    case JSONType_String:
+        ret_string = StringifyString(*string_value);
+        break;
+
+    case JSONType_Bool:
+        ret_string = bool_value ? "true" : "false";
+        break;
+
+    case JSONType_Number: {
+        if (isinf(number_value) || isnan(number_value))
+            ret_string = "null";
+        else {
+            std::stringstream ss;
+            ss.precision(15);
+            ss << number_value;
+            ret_string = ss.str();
+        }
+        break;
+    }
+
+    case JSONType_Array: {
+        ret_string = indentDepth ? "[\n" + indentStr1 : "[";
+        JSONArray::const_iterator iter = array_value->begin();
+        while (iter != array_value->end()) {
+            ret_string += (*iter)->StringifyImpl(indentDepth1);
+
+            // Not at the end - add a separator
+            if (++iter != array_value->end())
+                ret_string += ",";
+        }
+        ret_string += indentDepth ? "\n" + indentStr + "]" : "]";
+        break;
+    }
+
+    case JSONType_Object: {
+        ret_string = indentDepth ? "{\n" + indentStr1 : "{";
+        JSONObject::const_iterator iter = object_value->begin();
+        while (iter != object_value->end()) {
+            ret_string += StringifyString((*iter).first);
+            ret_string += ":";
+            ret_string += (*iter).second->StringifyImpl(indentDepth1);
+
+            // Not at the end - add a separator
+            if (++iter != object_value->end())
+                ret_string += ",";
+        }
+        ret_string += indentDepth ? "\n" + indentStr + "}" : "}";
+        break;
+    }
+    }
+
+    return ret_string;
+}
+
+/**
+ * Creates a JSON encoded string with all required fields escaped
+ * Works from http://www.ecma-internationl.org/publications/files/ECMA-ST/ECMA-262.pdf
+ * Section 15.12.3.
+ *
+ * @access private
+ *
+ * @param std::string str The string that needs to have the characters escaped
+ *
+ * @return std::string Returns the JSON string
+ */
+std::string JSONValue::StringifyString(const std::string &str)
+{
+    std::string str_out = "\"";
+
+    std::string::const_iterator iter = str.begin();
+    while (iter != str.end()) {
+        char chr = *iter;
+
+        if (chr == '"' || chr == '\\' || chr == '/') {
+            str_out += '\\';
+            str_out += chr;
+        } else if (chr == '\b') {
+            str_out += "\\b";
+        } else if (chr == '\f') {
+            str_out += "\\f";
+        } else if (chr == '\n') {
+            str_out += "\\n";
+        } else if (chr == '\r') {
+            str_out += "\\r";
+        } else if (chr == '\t') {
+            str_out += "\\t";
+        } else if (chr < 0x20 || chr == 0x7F) {
+            char buf[7];
+            snprintf(buf, sizeof(buf), "\\u%04x", chr);
+            str_out += buf;
+        } else if (chr < 0x80) {
+            str_out += chr;
+        } else {
+            str_out += chr;
+            size_t remain = str.end() - iter - 1;
+            if ((chr & 0xE0) == 0xC0 && remain >= 1) {
+                ++iter;
+                str_out += *iter;
+            } else if ((chr & 0xF0) == 0xE0 && remain >= 2) {
+                str_out += *(++iter);
+                str_out += *(++iter);
+            } else if ((chr & 0xF8) == 0xF0 && remain >= 3) {
+                str_out += *(++iter);
+                str_out += *(++iter);
+                str_out += *(++iter);
+            }
+        }
+
+        ++iter;
+    }
+
+    str_out += "\"";
+    return str_out;
+}
+
+/**
+ * Creates the indentation string for the depth given
+ *
+ * @access private
+ *
+ * @param size_t indent The prettyprint indentation depth (0 : no indentation)
+ *
+ * @return std::string Returns the string
+ */
+std::string JSONValue::Indent(size_t depth)
+{
+    const size_t indent_step = 2;
+    depth ? --depth : 0;
+    std::string indentStr(depth * indent_step, ' ');
+    return indentStr;
+}

src/serialization/JSONValue.h

@@ -0,0 +1,95 @@
+/*
+ * File JSONValue.h part of the SimpleJSON Library - http://mjpa.in/json
+ *
+ * Copyright (C) 2010 Mike Anchor
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#ifndef _JSONVALUE_H_
+#define _JSONVALUE_H_
+
+#include <string>
+#include <vector>
+
+#include "JSON.h"
+
+class JSON;
+
+enum JSONType { JSONType_Null, JSONType_String, JSONType_Bool, JSONType_Number, JSONType_Array, JSONType_Object };
+
+class JSONValue
+{
+    friend class JSON;
+
+  public:
+    JSONValue(/*NULL*/);
+    explicit JSONValue(const char *m_char_value);
+    explicit JSONValue(const std::string &m_string_value);
+    explicit JSONValue(bool m_bool_value);
+    explicit JSONValue(double m_number_value);
+    explicit JSONValue(int m_integer_value);
+    explicit JSONValue(unsigned int m_integer_value);
+    explicit JSONValue(const JSONArray &m_array_value);
+    explicit JSONValue(const JSONObject &m_object_value);
+    explicit JSONValue(const JSONValue &m_source);
+    ~JSONValue();
+
+    bool IsNull() const;
+    bool IsString() const;
+    bool IsBool() const;
+    bool IsNumber() const;
+    bool IsArray() const;
+    bool IsObject() const;
+
+    const std::string &AsString() const;
+    bool AsBool() const;
+    double AsNumber() const;
+    const JSONArray &AsArray() const;
+    const JSONObject &AsObject() const;
+
+    std::size_t CountChildren() const;
+    bool HasChild(std::size_t index) const;
+    JSONValue *Child(std::size_t index);
+    bool HasChild(const char *name) const;
+    JSONValue *Child(const char *name);
+    std::vector<std::string> ObjectKeys() const;
+
+    std::string Stringify(bool const prettyprint = false) const;
+
+  protected:
+    static JSONValue *Parse(const char **data);
+
+  private:
+    static std::string StringifyString(const std::string &str);
+    std::string StringifyImpl(size_t const indentDepth) const;
+    static std::string Indent(size_t depth);
+
+    JSONType type;
+
+    union {
+        bool bool_value;
+        double number_value;
+        std::string *string_value;
+        JSONArray *array_value;
+        JSONObject *object_value;
+    };
+};
+
+#endif

src/serialization/MeshPacketSerializer.cpp

@@ -1,12 +1,11 @@
-#if ARCH_PORTDUINO
+#ifndef NRF52_USE_JSON
 #include "MeshPacketSerializer.h"
+#include "JSON.h"
 #include "NodeDB.h"
 #include "mesh/generated/meshtastic/mqtt.pb.h"
 #include "mesh/generated/meshtastic/telemetry.pb.h"
 #include "modules/RoutingModule.h"
 #include <DebugConfiguration.h>
-#include <json/json.h>
-#include <memory>
 #include <mesh-pb-constants.h>
 #if defined(ARCH_ESP32)
 #include "../mesh/generated/meshtastic/paxcount.pb.h"
@@ -16,49 +15,41 @@
 
 static const char *errStr = "Error decoding proto for %s message!";
 
-static std::string writeCompact(const Json::Value &v)
-{
-    Json::StreamWriterBuilder b;
-    b["indentation"] = "";
-    b["emitUTF8"] = true;
-    return Json::writeString(b, v);
-}
-
-static bool tryParseJson(const char *s, Json::Value &out)
-{
-    Json::CharReaderBuilder b;
-    std::unique_ptr<Json::CharReader> reader(b.newCharReader());
-    std::string errs;
-    const char *end = s + strlen(s);
-    return reader->parse(s, end, &out, &errs);
-}
-
 std::string MeshPacketSerializer::JsonSerialize(const meshtastic_MeshPacket *mp, bool shouldLog)
 {
+    // the created jsonObj is immutable after creation, so
+    // we need to do the heavy lifting before assembling it.
     std::string msgType;
-    Json::Value jsonObj(Json::objectValue);
+    JSONObject jsonObj;
 
     if (mp->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
-        Json::Value msgPayload(Json::objectValue);
+        JSONObject msgPayload;
         switch (mp->decoded.portnum) {
         case meshtastic_PortNum_TEXT_MESSAGE_APP: {
             msgType = "text";
+            // convert bytes to string
             if (shouldLog)
                 LOG_DEBUG("got text message of size %u", mp->decoded.payload.size);
 
             char payloadStr[(mp->decoded.payload.size) + 1];
             memcpy(payloadStr, mp->decoded.payload.bytes, mp->decoded.payload.size);
-            payloadStr[mp->decoded.payload.size] = 0;
-            Json::Value parsed;
-            if (tryParseJson(payloadStr, parsed)) {
+            payloadStr[mp->decoded.payload.size] = 0; // null terminated string
+            // check if this is a JSON payload
+            JSONValue *json_value = JSON::Parse(payloadStr);
+            if (json_value != NULL) {
                 if (shouldLog)
                     LOG_INFO("text message payload is of type json");
-                jsonObj["payload"] = parsed;
+
+                // if it is, then we can just use the json object
+                jsonObj["payload"] = json_value;
             } else {
+                // if it isn't, then we need to create a json object
+                // with the string as the value
                 if (shouldLog)
                     LOG_INFO("text message payload is of type plaintext");
-                msgPayload["text"] = payloadStr;
-                jsonObj["payload"] = msgPayload;
+
+                msgPayload["text"] = new JSONValue(payloadStr);
+                jsonObj["payload"] = new JSONValue(msgPayload);
             }
             break;
         }
@@ -70,129 +61,133 @@ std::string MeshPacketSerializer::JsonSerialize(const meshtastic_MeshPacket *mp,
             if (pb_decode_from_bytes(mp->decoded.payload.bytes, mp->decoded.payload.size, &meshtastic_Telemetry_msg, &scratch)) {
                 decoded = &scratch;
                 if (decoded->which_variant == meshtastic_Telemetry_device_metrics_tag) {
+                    // If battery is present, encode the battery level value
+                    // TODO - Add a condition to send a code for a non-present value
                     if (decoded->variant.device_metrics.has_battery_level) {
-                        msgPayload["battery_level"] = (int)decoded->variant.device_metrics.battery_level;
+                        msgPayload["battery_level"] = new JSONValue((int)decoded->variant.device_metrics.battery_level);
                     }
-                    msgPayload["voltage"] = decoded->variant.device_metrics.voltage;
-                    msgPayload["channel_utilization"] = decoded->variant.device_metrics.channel_utilization;
-                    msgPayload["air_util_tx"] = decoded->variant.device_metrics.air_util_tx;
-                    msgPayload["uptime_seconds"] = (Json::UInt)decoded->variant.device_metrics.uptime_seconds;
+                    msgPayload["voltage"] = new JSONValue(decoded->variant.device_metrics.voltage);
+                    msgPayload["channel_utilization"] = new JSONValue(decoded->variant.device_metrics.channel_utilization);
+                    msgPayload["air_util_tx"] = new JSONValue(decoded->variant.device_metrics.air_util_tx);
+                    msgPayload["uptime_seconds"] = new JSONValue((unsigned int)decoded->variant.device_metrics.uptime_seconds);
                 } else if (decoded->which_variant == meshtastic_Telemetry_environment_metrics_tag) {
+                    // Avoid sending 0s for sensors that could be 0
                     if (decoded->variant.environment_metrics.has_temperature) {
-                        msgPayload["temperature"] = decoded->variant.environment_metrics.temperature;
+                        msgPayload["temperature"] = new JSONValue(decoded->variant.environment_metrics.temperature);
                     }
                     if (decoded->variant.environment_metrics.has_relative_humidity) {
-                        msgPayload["relative_humidity"] = decoded->variant.environment_metrics.relative_humidity;
+                        msgPayload["relative_humidity"] = new JSONValue(decoded->variant.environment_metrics.relative_humidity);
                     }
                     if (decoded->variant.environment_metrics.has_barometric_pressure) {
-                        msgPayload["barometric_pressure"] = decoded->variant.environment_metrics.barometric_pressure;
+                        msgPayload["barometric_pressure"] =
+                            new JSONValue(decoded->variant.environment_metrics.barometric_pressure);
                     }
                     if (decoded->variant.environment_metrics.has_gas_resistance) {
-                        msgPayload["gas_resistance"] = decoded->variant.environment_metrics.gas_resistance;
+                        msgPayload["gas_resistance"] = new JSONValue(decoded->variant.environment_metrics.gas_resistance);
                     }
                     if (decoded->variant.environment_metrics.has_voltage) {
-                        msgPayload["voltage"] = decoded->variant.environment_metrics.voltage;
+                        msgPayload["voltage"] = new JSONValue(decoded->variant.environment_metrics.voltage);
                     }
                     if (decoded->variant.environment_metrics.has_current) {
-                        msgPayload["current"] = decoded->variant.environment_metrics.current;
+                        msgPayload["current"] = new JSONValue(decoded->variant.environment_metrics.current);
                     }
                     if (decoded->variant.environment_metrics.has_lux) {
-                        msgPayload["lux"] = decoded->variant.environment_metrics.lux;
+                        msgPayload["lux"] = new JSONValue(decoded->variant.environment_metrics.lux);
                     }
                     if (decoded->variant.environment_metrics.has_white_lux) {
-                        msgPayload["white_lux"] = decoded->variant.environment_metrics.white_lux;
+                        msgPayload["white_lux"] = new JSONValue(decoded->variant.environment_metrics.white_lux);
                     }
                     if (decoded->variant.environment_metrics.has_iaq) {
-                        msgPayload["iaq"] = (Json::UInt)decoded->variant.environment_metrics.iaq;
+                        msgPayload["iaq"] = new JSONValue((uint)decoded->variant.environment_metrics.iaq);
                     }
                     if (decoded->variant.environment_metrics.has_distance) {
-                        msgPayload["distance"] = decoded->variant.environment_metrics.distance;
+                        msgPayload["distance"] = new JSONValue(decoded->variant.environment_metrics.distance);
                     }
                     if (decoded->variant.environment_metrics.has_wind_speed) {
-                        msgPayload["wind_speed"] = decoded->variant.environment_metrics.wind_speed;
+                        msgPayload["wind_speed"] = new JSONValue(decoded->variant.environment_metrics.wind_speed);
                     }
                     if (decoded->variant.environment_metrics.has_wind_direction) {
-                        msgPayload["wind_direction"] = (Json::UInt)decoded->variant.environment_metrics.wind_direction;
+                        msgPayload["wind_direction"] = new JSONValue((uint)decoded->variant.environment_metrics.wind_direction);
                     }
                     if (decoded->variant.environment_metrics.has_wind_gust) {
-                        msgPayload["wind_gust"] = decoded->variant.environment_metrics.wind_gust;
+                        msgPayload["wind_gust"] = new JSONValue(decoded->variant.environment_metrics.wind_gust);
                     }
                     if (decoded->variant.environment_metrics.has_wind_lull) {
-                        msgPayload["wind_lull"] = decoded->variant.environment_metrics.wind_lull;
+                        msgPayload["wind_lull"] = new JSONValue(decoded->variant.environment_metrics.wind_lull);
                     }
                     if (decoded->variant.environment_metrics.has_radiation) {
-                        msgPayload["radiation"] = decoded->variant.environment_metrics.radiation;
+                        msgPayload["radiation"] = new JSONValue(decoded->variant.environment_metrics.radiation);
                     }
                     if (decoded->variant.environment_metrics.has_ir_lux) {
-                        msgPayload["ir_lux"] = decoded->variant.environment_metrics.ir_lux;
+                        msgPayload["ir_lux"] = new JSONValue(decoded->variant.environment_metrics.ir_lux);
                     }
                     if (decoded->variant.environment_metrics.has_uv_lux) {
-                        msgPayload["uv_lux"] = decoded->variant.environment_metrics.uv_lux;
+                        msgPayload["uv_lux"] = new JSONValue(decoded->variant.environment_metrics.uv_lux);
                     }
                     if (decoded->variant.environment_metrics.has_weight) {
-                        msgPayload["weight"] = decoded->variant.environment_metrics.weight;
+                        msgPayload["weight"] = new JSONValue(decoded->variant.environment_metrics.weight);
                     }
                     if (decoded->variant.environment_metrics.has_rainfall_1h) {
-                        msgPayload["rainfall_1h"] = decoded->variant.environment_metrics.rainfall_1h;
+                        msgPayload["rainfall_1h"] = new JSONValue(decoded->variant.environment_metrics.rainfall_1h);
                     }
                     if (decoded->variant.environment_metrics.has_rainfall_24h) {
-                        msgPayload["rainfall_24h"] = decoded->variant.environment_metrics.rainfall_24h;
+                        msgPayload["rainfall_24h"] = new JSONValue(decoded->variant.environment_metrics.rainfall_24h);
                     }
                     if (decoded->variant.environment_metrics.has_soil_moisture) {
-                        msgPayload["soil_moisture"] = (Json::UInt)decoded->variant.environment_metrics.soil_moisture;
+                        msgPayload["soil_moisture"] = new JSONValue((uint)decoded->variant.environment_metrics.soil_moisture);
                     }
                     if (decoded->variant.environment_metrics.has_soil_temperature) {
-                        msgPayload["soil_temperature"] = decoded->variant.environment_metrics.soil_temperature;
+                        msgPayload["soil_temperature"] = new JSONValue(decoded->variant.environment_metrics.soil_temperature);
                     }
                 } else if (decoded->which_variant == meshtastic_Telemetry_air_quality_metrics_tag) {
                     if (decoded->variant.air_quality_metrics.has_pm10_standard) {
-                        msgPayload["pm10"] = (Json::UInt)decoded->variant.air_quality_metrics.pm10_standard;
+                        msgPayload["pm10"] = new JSONValue((unsigned int)decoded->variant.air_quality_metrics.pm10_standard);
                     }
                     if (decoded->variant.air_quality_metrics.has_pm25_standard) {
-                        msgPayload["pm25"] = (Json::UInt)decoded->variant.air_quality_metrics.pm25_standard;
+                        msgPayload["pm25"] = new JSONValue((unsigned int)decoded->variant.air_quality_metrics.pm25_standard);
                     }
                     if (decoded->variant.air_quality_metrics.has_pm100_standard) {
-                        msgPayload["pm100"] = (Json::UInt)decoded->variant.air_quality_metrics.pm100_standard;
+                        msgPayload["pm100"] = new JSONValue((unsigned int)decoded->variant.air_quality_metrics.pm100_standard);
                     }
                     if (decoded->variant.air_quality_metrics.has_co2) {
-                        msgPayload["co2"] = (Json::UInt)decoded->variant.air_quality_metrics.co2;
+                        msgPayload["co2"] = new JSONValue((unsigned int)decoded->variant.air_quality_metrics.co2);
                     }
                     if (decoded->variant.air_quality_metrics.has_co2_temperature) {
-                        msgPayload["co2_temperature"] = decoded->variant.air_quality_metrics.co2_temperature;
+                        msgPayload["co2_temperature"] = new JSONValue(decoded->variant.air_quality_metrics.co2_temperature);
                     }
                     if (decoded->variant.air_quality_metrics.has_co2_humidity) {
-                        msgPayload["co2_humidity"] = decoded->variant.air_quality_metrics.co2_humidity;
+                        msgPayload["co2_humidity"] = new JSONValue(decoded->variant.air_quality_metrics.co2_humidity);
                     }
                     if (decoded->variant.air_quality_metrics.has_form_formaldehyde) {
-                        msgPayload["form_formaldehyde"] = decoded->variant.air_quality_metrics.form_formaldehyde;
+                        msgPayload["form_formaldehyde"] = new JSONValue(decoded->variant.air_quality_metrics.form_formaldehyde);
                     }
                     if (decoded->variant.air_quality_metrics.has_form_temperature) {
-                        msgPayload["form_temperature"] = decoded->variant.air_quality_metrics.form_temperature;
+                        msgPayload["form_temperature"] = new JSONValue(decoded->variant.air_quality_metrics.form_temperature);
                     }
                     if (decoded->variant.air_quality_metrics.has_form_humidity) {
-                        msgPayload["form_humidity"] = decoded->variant.air_quality_metrics.form_humidity;
+                        msgPayload["form_humidity"] = new JSONValue(decoded->variant.air_quality_metrics.form_humidity);
                     }
                 } else if (decoded->which_variant == meshtastic_Telemetry_power_metrics_tag) {
                     if (decoded->variant.power_metrics.has_ch1_voltage) {
-                        msgPayload["voltage_ch1"] = decoded->variant.power_metrics.ch1_voltage;
+                        msgPayload["voltage_ch1"] = new JSONValue(decoded->variant.power_metrics.ch1_voltage);
                     }
                     if (decoded->variant.power_metrics.has_ch1_current) {
-                        msgPayload["current_ch1"] = decoded->variant.power_metrics.ch1_current;
+                        msgPayload["current_ch1"] = new JSONValue(decoded->variant.power_metrics.ch1_current);
                     }
                     if (decoded->variant.power_metrics.has_ch2_voltage) {
-                        msgPayload["voltage_ch2"] = decoded->variant.power_metrics.ch2_voltage;
+                        msgPayload["voltage_ch2"] = new JSONValue(decoded->variant.power_metrics.ch2_voltage);
                     }
                     if (decoded->variant.power_metrics.has_ch2_current) {
-                        msgPayload["current_ch2"] = decoded->variant.power_metrics.ch2_current;
+                        msgPayload["current_ch2"] = new JSONValue(decoded->variant.power_metrics.ch2_current);
                     }
                     if (decoded->variant.power_metrics.has_ch3_voltage) {
-                        msgPayload["voltage_ch3"] = decoded->variant.power_metrics.ch3_voltage;
+                        msgPayload["voltage_ch3"] = new JSONValue(decoded->variant.power_metrics.ch3_voltage);
                     }
                     if (decoded->variant.power_metrics.has_ch3_current) {
-                        msgPayload["current_ch3"] = decoded->variant.power_metrics.ch3_current;
+                        msgPayload["current_ch3"] = new JSONValue(decoded->variant.power_metrics.ch3_current);
                     }
                 }
-                jsonObj["payload"] = msgPayload;
+                jsonObj["payload"] = new JSONValue(msgPayload);
             } else if (shouldLog) {
                 LOG_ERROR(errStr, msgType.c_str());
             }
@@ -205,12 +200,12 @@ std::string MeshPacketSerializer::JsonSerialize(const meshtastic_MeshPacket *mp,
             memset(&scratch, 0, sizeof(scratch));
             if (pb_decode_from_bytes(mp->decoded.payload.bytes, mp->decoded.payload.size, &meshtastic_User_msg, &scratch)) {
                 decoded = &scratch;
-                msgPayload["id"] = decoded->id;
-                msgPayload["longname"] = decoded->long_name;
-                msgPayload["shortname"] = decoded->short_name;
-                msgPayload["hardware"] = (int)decoded->hw_model;
-                msgPayload["role"] = (int)decoded->role;
-                jsonObj["payload"] = msgPayload;
+                msgPayload["id"] = new JSONValue(decoded->id);
+                msgPayload["longname"] = new JSONValue(decoded->long_name);
+                msgPayload["shortname"] = new JSONValue(decoded->short_name);
+                msgPayload["hardware"] = new JSONValue(decoded->hw_model);
+                msgPayload["role"] = new JSONValue((int)decoded->role);
+                jsonObj["payload"] = new JSONValue(msgPayload);
             } else if (shouldLog) {
                 LOG_ERROR(errStr, msgType.c_str());
             }
@@ -224,38 +219,38 @@ std::string MeshPacketSerializer::JsonSerialize(const meshtastic_MeshPacket *mp,
             if (pb_decode_from_bytes(mp->decoded.payload.bytes, mp->decoded.payload.size, &meshtastic_Position_msg, &scratch)) {
                 decoded = &scratch;
                 if ((int)decoded->time) {
-                    msgPayload["time"] = (Json::UInt)decoded->time;
+                    msgPayload["time"] = new JSONValue((unsigned int)decoded->time);
                 }
                 if ((int)decoded->timestamp) {
-                    msgPayload["timestamp"] = (Json::UInt)decoded->timestamp;
+                    msgPayload["timestamp"] = new JSONValue((unsigned int)decoded->timestamp);
                 }
-                msgPayload["latitude_i"] = (int)decoded->latitude_i;
-                msgPayload["longitude_i"] = (int)decoded->longitude_i;
+                msgPayload["latitude_i"] = new JSONValue((int)decoded->latitude_i);
+                msgPayload["longitude_i"] = new JSONValue((int)decoded->longitude_i);
                 if ((int)decoded->altitude) {
-                    msgPayload["altitude"] = (int)decoded->altitude;
+                    msgPayload["altitude"] = new JSONValue((int)decoded->altitude);
                 }
                 if ((int)decoded->ground_speed) {
-                    msgPayload["ground_speed"] = (Json::UInt)decoded->ground_speed;
+                    msgPayload["ground_speed"] = new JSONValue((unsigned int)decoded->ground_speed);
                 }
                 if (int(decoded->ground_track)) {
-                    msgPayload["ground_track"] = (Json::UInt)decoded->ground_track;
+                    msgPayload["ground_track"] = new JSONValue((unsigned int)decoded->ground_track);
                 }
                 if (int(decoded->sats_in_view)) {
-                    msgPayload["sats_in_view"] = (Json::UInt)decoded->sats_in_view;
+                    msgPayload["sats_in_view"] = new JSONValue((unsigned int)decoded->sats_in_view);
                 }
                 if ((int)decoded->PDOP) {
-                    msgPayload["PDOP"] = (int)decoded->PDOP;
+                    msgPayload["PDOP"] = new JSONValue((int)decoded->PDOP);
                 }
                 if ((int)decoded->HDOP) {
-                    msgPayload["HDOP"] = (int)decoded->HDOP;
+                    msgPayload["HDOP"] = new JSONValue((int)decoded->HDOP);
                 }
                 if ((int)decoded->VDOP) {
-                    msgPayload["VDOP"] = (int)decoded->VDOP;
+                    msgPayload["VDOP"] = new JSONValue((int)decoded->VDOP);
                 }
                 if ((int)decoded->precision_bits) {
-                    msgPayload["precision_bits"] = (int)decoded->precision_bits;
+                    msgPayload["precision_bits"] = new JSONValue((int)decoded->precision_bits);
                 }
-                jsonObj["payload"] = msgPayload;
+                jsonObj["payload"] = new JSONValue(msgPayload);
             } else if (shouldLog) {
                 LOG_ERROR(errStr, msgType.c_str());
             }
@@ -268,14 +263,14 @@ std::string MeshPacketSerializer::JsonSerialize(const meshtastic_MeshPacket *mp,
             memset(&scratch, 0, sizeof(scratch));
             if (pb_decode_from_bytes(mp->decoded.payload.bytes, mp->decoded.payload.size, &meshtastic_Waypoint_msg, &scratch)) {
                 decoded = &scratch;
-                msgPayload["id"] = (Json::UInt)decoded->id;
-                msgPayload["name"] = decoded->name;
-                msgPayload["description"] = decoded->description;
-                msgPayload["expire"] = (Json::UInt)decoded->expire;
-                msgPayload["locked_to"] = (Json::UInt)decoded->locked_to;
-                msgPayload["latitude_i"] = (int)decoded->latitude_i;
-                msgPayload["longitude_i"] = (int)decoded->longitude_i;
-                jsonObj["payload"] = msgPayload;
+                msgPayload["id"] = new JSONValue((unsigned int)decoded->id);
+                msgPayload["name"] = new JSONValue(decoded->name);
+                msgPayload["description"] = new JSONValue(decoded->description);
+                msgPayload["expire"] = new JSONValue((unsigned int)decoded->expire);
+                msgPayload["locked_to"] = new JSONValue((unsigned int)decoded->locked_to);
+                msgPayload["latitude_i"] = new JSONValue((int)decoded->latitude_i);
+                msgPayload["longitude_i"] = new JSONValue((int)decoded->longitude_i);
+                jsonObj["payload"] = new JSONValue(msgPayload);
             } else if (shouldLog) {
                 LOG_ERROR(errStr, msgType.c_str());
             }
@@ -289,26 +284,26 @@ std::string MeshPacketSerializer::JsonSerialize(const meshtastic_MeshPacket *mp,
             if (pb_decode_from_bytes(mp->decoded.payload.bytes, mp->decoded.payload.size, &meshtastic_NeighborInfo_msg,
                                      &scratch)) {
                 decoded = &scratch;
-                msgPayload["node_id"] = (Json::UInt)decoded->node_id;
-                msgPayload["node_broadcast_interval_secs"] = (Json::UInt)decoded->node_broadcast_interval_secs;
-                msgPayload["last_sent_by_id"] = (Json::UInt)decoded->last_sent_by_id;
-                msgPayload["neighbors_count"] = (Json::UInt)decoded->neighbors_count;
-                Json::Value neighbors(Json::arrayValue);
+                msgPayload["node_id"] = new JSONValue((unsigned int)decoded->node_id);
+                msgPayload["node_broadcast_interval_secs"] = new JSONValue((unsigned int)decoded->node_broadcast_interval_secs);
+                msgPayload["last_sent_by_id"] = new JSONValue((unsigned int)decoded->last_sent_by_id);
+                msgPayload["neighbors_count"] = new JSONValue(decoded->neighbors_count);
+                JSONArray neighbors;
                 for (uint8_t i = 0; i < decoded->neighbors_count; i++) {
-                    Json::Value neighborObj(Json::objectValue);
-                    neighborObj["node_id"] = (Json::UInt)decoded->neighbors[i].node_id;
-                    neighborObj["snr"] = (int)decoded->neighbors[i].snr;
-                    neighbors.append(neighborObj);
+                    JSONObject neighborObj;
+                    neighborObj["node_id"] = new JSONValue((unsigned int)decoded->neighbors[i].node_id);
+                    neighborObj["snr"] = new JSONValue((int)decoded->neighbors[i].snr);
+                    neighbors.push_back(new JSONValue(neighborObj));
                 }
-                msgPayload["neighbors"] = neighbors;
-                jsonObj["payload"] = msgPayload;
+                msgPayload["neighbors"] = new JSONValue(neighbors);
+                jsonObj["payload"] = new JSONValue(msgPayload);
             } else if (shouldLog) {
                 LOG_ERROR(errStr, msgType.c_str());
             }
             break;
         }
         case meshtastic_PortNum_TRACEROUTE_APP: {
-            if (mp->decoded.request_id) {
+            if (mp->decoded.request_id) { // Only report the traceroute response
                 msgType = "traceroute";
                 meshtastic_RouteDiscovery scratch;
                 meshtastic_RouteDiscovery *decoded = NULL;
@@ -316,43 +311,45 @@ std::string MeshPacketSerializer::JsonSerialize(const meshtastic_MeshPacket *mp,
                 if (pb_decode_from_bytes(mp->decoded.payload.bytes, mp->decoded.payload.size, &meshtastic_RouteDiscovery_msg,
                                          &scratch)) {
                     decoded = &scratch;
-                    Json::Value route(Json::arrayValue);
-                    Json::Value routeBack(Json::arrayValue);
-                    Json::Value snrTowards(Json::arrayValue);
-                    Json::Value snrBack(Json::arrayValue);
+                    JSONArray route;      // Route this message took
+                    JSONArray routeBack;  // Route this message took back
+                    JSONArray snrTowards; // Snr for forward route
+                    JSONArray snrBack;    // Snr for reverse route
 
-                    auto addToRoute = [](Json::Value *r, NodeNum num) {
+                    // Lambda function for adding a long name to the route
+                    auto addToRoute = [](JSONArray *route, NodeNum num) {
                         char long_name[40] = "Unknown";
                         meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(num);
                         bool name_known = node ? node->has_user : false;
                         if (name_known)
                             memcpy(long_name, node->user.long_name, sizeof(long_name));
-                        r->append(long_name);
+                        route->push_back(new JSONValue(long_name));
                     };
-                    addToRoute(&route, mp->to);
+                    addToRoute(&route, mp->to); // Started at the original transmitter (destination of response)
                     for (uint8_t i = 0; i < decoded->route_count; i++) {
                         addToRoute(&route, decoded->route[i]);
                     }
-                    addToRoute(&route, mp->from);
+                    addToRoute(&route, mp->from); // Ended at the original destination (source of response)
 
-                    addToRoute(&routeBack, mp->from);
+                    addToRoute(&routeBack, mp->from); // Started at the original destination (source of response)
                     for (uint8_t i = 0; i < decoded->route_back_count; i++) {
                         addToRoute(&routeBack, decoded->route_back[i]);
                     }
-                    addToRoute(&routeBack, mp->to);
+                    addToRoute(&routeBack, mp->to); // Ended at the original transmitter (destination of response)
 
                     for (uint8_t i = 0; i < decoded->snr_back_count; i++) {
-                        snrBack.append((float)decoded->snr_back[i] / 4);
-                    }
-                    for (uint8_t i = 0; i < decoded->snr_towards_count; i++) {
-                        snrTowards.append((float)decoded->snr_towards[i] / 4);
+                        snrBack.push_back(new JSONValue((float)decoded->snr_back[i] / 4));
                     }
 
-                    msgPayload["route"] = route;
-                    msgPayload["route_back"] = routeBack;
-                    msgPayload["snr_back"] = snrBack;
-                    msgPayload["snr_towards"] = snrTowards;
-                    jsonObj["payload"] = msgPayload;
+                    for (uint8_t i = 0; i < decoded->snr_towards_count; i++) {
+                        snrTowards.push_back(new JSONValue((float)decoded->snr_towards[i] / 4));
+                    }
+
+                    msgPayload["route"] = new JSONValue(route);
+                    msgPayload["route_back"] = new JSONValue(routeBack);
+                    msgPayload["snr_back"] = new JSONValue(snrBack);
+                    msgPayload["snr_towards"] = new JSONValue(snrTowards);
+                    jsonObj["payload"] = new JSONValue(msgPayload);
                 } else if (shouldLog) {
                     LOG_ERROR(errStr, msgType.c_str());
                 }
@@ -363,9 +360,9 @@ std::string MeshPacketSerializer::JsonSerialize(const meshtastic_MeshPacket *mp,
             msgType = "detection";
             char payloadStr[(mp->decoded.payload.size) + 1];
             memcpy(payloadStr, mp->decoded.payload.bytes, mp->decoded.payload.size);
-            payloadStr[mp->decoded.payload.size] = 0;
-            msgPayload["text"] = payloadStr;
-            jsonObj["payload"] = msgPayload;
+            payloadStr[mp->decoded.payload.size] = 0; // null terminated string
+            msgPayload["text"] = new JSONValue(payloadStr);
+            jsonObj["payload"] = new JSONValue(msgPayload);
             break;
         }
 #ifdef ARCH_ESP32
@@ -376,10 +373,10 @@ std::string MeshPacketSerializer::JsonSerialize(const meshtastic_MeshPacket *mp,
             memset(&scratch, 0, sizeof(scratch));
             if (pb_decode_from_bytes(mp->decoded.payload.bytes, mp->decoded.payload.size, &meshtastic_Paxcount_msg, &scratch)) {
                 decoded = &scratch;
-                msgPayload["wifi_count"] = (Json::UInt)decoded->wifi;
-                msgPayload["ble_count"] = (Json::UInt)decoded->ble;
-                msgPayload["uptime"] = (Json::UInt)decoded->uptime;
-                jsonObj["payload"] = msgPayload;
+                msgPayload["wifi_count"] = new JSONValue((unsigned int)decoded->wifi);
+                msgPayload["ble_count"] = new JSONValue((unsigned int)decoded->ble);
+                msgPayload["uptime"] = new JSONValue((unsigned int)decoded->uptime);
+                jsonObj["payload"] = new JSONValue(msgPayload);
             } else if (shouldLog) {
                 LOG_ERROR(errStr, msgType.c_str());
             }
@@ -395,19 +392,20 @@ std::string MeshPacketSerializer::JsonSerialize(const meshtastic_MeshPacket *mp,
                 decoded = &scratch;
                 if (decoded->type == meshtastic_HardwareMessage_Type_GPIOS_CHANGED) {
                     msgType = "gpios_changed";
-                    msgPayload["gpio_value"] = (Json::UInt)decoded->gpio_value;
-                    jsonObj["payload"] = msgPayload;
+                    msgPayload["gpio_value"] = new JSONValue((unsigned int)decoded->gpio_value);
+                    jsonObj["payload"] = new JSONValue(msgPayload);
                 } else if (decoded->type == meshtastic_HardwareMessage_Type_READ_GPIOS_REPLY) {
                     msgType = "gpios_read_reply";
-                    msgPayload["gpio_value"] = (Json::UInt)decoded->gpio_value;
-                    msgPayload["gpio_mask"] = (Json::UInt)decoded->gpio_mask;
-                    jsonObj["payload"] = msgPayload;
+                    msgPayload["gpio_value"] = new JSONValue((unsigned int)decoded->gpio_value);
+                    msgPayload["gpio_mask"] = new JSONValue((unsigned int)decoded->gpio_mask);
+                    jsonObj["payload"] = new JSONValue(msgPayload);
                 }
             } else if (shouldLog) {
                 LOG_ERROR(errStr, "RemoteHardware");
             }
             break;
         }
+        // add more packet types here if needed
         default:
             break;
         }
@@ -415,56 +413,64 @@ std::string MeshPacketSerializer::JsonSerialize(const meshtastic_MeshPacket *mp,
         LOG_WARN("Couldn't convert encrypted payload of MeshPacket to JSON");
     }
 
-    jsonObj["id"] = (Json::UInt)mp->id;
-    jsonObj["timestamp"] = (Json::UInt)mp->rx_time;
-    jsonObj["to"] = (Json::UInt)mp->to;
-    jsonObj["from"] = (Json::UInt)mp->from;
-    jsonObj["channel"] = (Json::UInt)mp->channel;
-    jsonObj["type"] = msgType;
-    jsonObj["sender"] = nodeDB->getNodeId();
+    jsonObj["id"] = new JSONValue((unsigned int)mp->id);
+    jsonObj["timestamp"] = new JSONValue((unsigned int)mp->rx_time);
+    jsonObj["to"] = new JSONValue((unsigned int)mp->to);
+    jsonObj["from"] = new JSONValue((unsigned int)mp->from);
+    jsonObj["channel"] = new JSONValue((unsigned int)mp->channel);
+    jsonObj["type"] = new JSONValue(msgType.c_str());
+    jsonObj["sender"] = new JSONValue(nodeDB->getNodeId().c_str());
     if (mp->rx_rssi != 0)
-        jsonObj["rssi"] = (int)mp->rx_rssi;
+        jsonObj["rssi"] = new JSONValue((int)mp->rx_rssi);
     if (mp->rx_snr != 0)
-        jsonObj["snr"] = (float)mp->rx_snr;
+        jsonObj["snr"] = new JSONValue((float)mp->rx_snr);
     const int8_t hopsAway = getHopsAway(*mp);
     if (hopsAway >= 0) {
-        jsonObj["hops_away"] = (Json::UInt)(hopsAway);
-        jsonObj["hop_start"] = (Json::UInt)(mp->hop_start);
+        jsonObj["hops_away"] = new JSONValue((unsigned int)(hopsAway));
+        jsonObj["hop_start"] = new JSONValue((unsigned int)(mp->hop_start));
     }
 
-    std::string jsonStr = writeCompact(jsonObj);
+    // serialize and write it to the stream
+    JSONValue *value = new JSONValue(jsonObj);
+    std::string jsonStr = value->Stringify();
 
     if (shouldLog)
         LOG_INFO("serialized json message: %s", jsonStr.c_str());
 
+    delete value;
     return jsonStr;
 }
 
 std::string MeshPacketSerializer::JsonSerializeEncrypted(const meshtastic_MeshPacket *mp)
 {
-    Json::Value jsonObj(Json::objectValue);
+    JSONObject jsonObj;
 
-    jsonObj["id"] = (Json::UInt)mp->id;
-    jsonObj["time_ms"] = (double)millis();
-    jsonObj["timestamp"] = (Json::UInt)mp->rx_time;
-    jsonObj["to"] = (Json::UInt)mp->to;
-    jsonObj["from"] = (Json::UInt)mp->from;
-    jsonObj["channel"] = (Json::UInt)mp->channel;
-    jsonObj["want_ack"] = mp->want_ack;
+    jsonObj["id"] = new JSONValue((unsigned int)mp->id);
+    jsonObj["time_ms"] = new JSONValue((double)millis());
+    jsonObj["timestamp"] = new JSONValue((unsigned int)mp->rx_time);
+    jsonObj["to"] = new JSONValue((unsigned int)mp->to);
+    jsonObj["from"] = new JSONValue((unsigned int)mp->from);
+    jsonObj["channel"] = new JSONValue((unsigned int)mp->channel);
+    jsonObj["want_ack"] = new JSONValue(mp->want_ack);
 
     if (mp->rx_rssi != 0)
-        jsonObj["rssi"] = (int)mp->rx_rssi;
+        jsonObj["rssi"] = new JSONValue((int)mp->rx_rssi);
     if (mp->rx_snr != 0)
-        jsonObj["snr"] = (float)mp->rx_snr;
+        jsonObj["snr"] = new JSONValue((float)mp->rx_snr);
     const int8_t hopsAway = getHopsAway(*mp);
     if (hopsAway >= 0) {
-        jsonObj["hops_away"] = (Json::UInt)(hopsAway);
-        jsonObj["hop_start"] = (Json::UInt)(mp->hop_start);
+        jsonObj["hops_away"] = new JSONValue((unsigned int)(hopsAway));
+        jsonObj["hop_start"] = new JSONValue((unsigned int)(mp->hop_start));
     }
-    jsonObj["size"] = (Json::UInt)mp->encrypted.size;
+    jsonObj["size"] = new JSONValue((unsigned int)mp->encrypted.size);
     auto encryptedStr = bytesToHex(mp->encrypted.bytes, mp->encrypted.size);
-    jsonObj["bytes"] = encryptedStr;
+    jsonObj["bytes"] = new JSONValue(encryptedStr.c_str());
 
-    return writeCompact(jsonObj);
+    // serialize and write it to the stream
+    JSONValue *value = new JSONValue(jsonObj);
+    std::string jsonStr = value->Stringify();
+
+    delete value;
+    return jsonStr;
 }
-#endif
+#endif

src/serialization/MeshPacketSerializer_nRF52.cpp

@@ -0,0 +1,421 @@
+#ifdef NRF52_USE_JSON
+#warning 'Using nRF52 Serializer'
+
+#include "ArduinoJson.h"
+#include "MeshPacketSerializer.h"
+#include "NodeDB.h"
+#include "mesh/generated/meshtastic/mqtt.pb.h"
+#include "mesh/generated/meshtastic/remote_hardware.pb.h"
+#include "mesh/generated/meshtastic/telemetry.pb.h"
+#include "modules/RoutingModule.h"
+#include <DebugConfiguration.h>
+#include <mesh-pb-constants.h>
+
+StaticJsonDocument<1024> jsonObj;
+StaticJsonDocument<1024> arrayObj;
+
+std::string MeshPacketSerializer::JsonSerialize(const meshtastic_MeshPacket *mp, bool shouldLog)
+{
+    // the created jsonObj is immutable after creation, so
+    // we need to do the heavy lifting before assembling it.
+    std::string msgType;
+    jsonObj.clear();
+    arrayObj.clear();
+
+    if (mp->which_payload_variant == meshtastic_MeshPacket_decoded_tag) {
+        switch (mp->decoded.portnum) {
+        case meshtastic_PortNum_TEXT_MESSAGE_APP: {
+            msgType = "text";
+            // convert bytes to string
+            if (shouldLog)
+                LOG_DEBUG("got text message of size %u", mp->decoded.payload.size);
+
+            char payloadStr[(mp->decoded.payload.size) + 1];
+            memcpy(payloadStr, mp->decoded.payload.bytes, mp->decoded.payload.size);
+            payloadStr[mp->decoded.payload.size] = 0; // null terminated string
+            // check if this is a JSON payload
+            StaticJsonDocument<512> text_doc;
+            DeserializationError error = deserializeJson(text_doc, payloadStr);
+            if (error) {
+                // if it isn't, then we need to create a json object
+                // with the string as the value
+                if (shouldLog)
+                    LOG_INFO("text message payload is of type plaintext");
+                jsonObj["payload"]["text"] = payloadStr;
+            } else {
+                // if it is, then we can just use the json object
+                if (shouldLog)
+                    LOG_INFO("text message payload is of type json");
+                jsonObj["payload"] = text_doc;
+            }
+            break;
+        }
+        case meshtastic_PortNum_TELEMETRY_APP: {
+            msgType = "telemetry";
+            meshtastic_Telemetry scratch;
+            meshtastic_Telemetry *decoded = NULL;
+            memset(&scratch, 0, sizeof(scratch));
+            if (pb_decode_from_bytes(mp->decoded.payload.bytes, mp->decoded.payload.size, &meshtastic_Telemetry_msg, &scratch)) {
+                decoded = &scratch;
+                if (decoded->which_variant == meshtastic_Telemetry_device_metrics_tag) {
+                    // If battery is present, encode the battery level value
+                    // TODO - Add a condition to send a code for a non-present value
+                    if (decoded->variant.device_metrics.has_battery_level) {
+                        jsonObj["payload"]["battery_level"] = (int)decoded->variant.device_metrics.battery_level;
+                    }
+                    jsonObj["payload"]["voltage"] = decoded->variant.device_metrics.voltage;
+                    jsonObj["payload"]["channel_utilization"] = decoded->variant.device_metrics.channel_utilization;
+                    jsonObj["payload"]["air_util_tx"] = decoded->variant.device_metrics.air_util_tx;
+                    jsonObj["payload"]["uptime_seconds"] = (unsigned int)decoded->variant.device_metrics.uptime_seconds;
+                } else if (decoded->which_variant == meshtastic_Telemetry_environment_metrics_tag) {
+                    if (decoded->variant.environment_metrics.has_temperature) {
+                        jsonObj["payload"]["temperature"] = decoded->variant.environment_metrics.temperature;
+                    }
+                    if (decoded->variant.environment_metrics.has_relative_humidity) {
+                        jsonObj["payload"]["relative_humidity"] = decoded->variant.environment_metrics.relative_humidity;
+                    }
+                    if (decoded->variant.environment_metrics.has_barometric_pressure) {
+                        jsonObj["payload"]["barometric_pressure"] = decoded->variant.environment_metrics.barometric_pressure;
+                    }
+                    if (decoded->variant.environment_metrics.has_gas_resistance) {
+                        jsonObj["payload"]["gas_resistance"] = decoded->variant.environment_metrics.gas_resistance;
+                    }
+                    if (decoded->variant.environment_metrics.has_voltage) {
+                        jsonObj["payload"]["voltage"] = decoded->variant.environment_metrics.voltage;
+                    }
+                    if (decoded->variant.environment_metrics.has_current) {
+                        jsonObj["payload"]["current"] = decoded->variant.environment_metrics.current;
+                    }
+                    if (decoded->variant.environment_metrics.has_lux) {
+                        jsonObj["payload"]["lux"] = decoded->variant.environment_metrics.lux;
+                    }
+                    if (decoded->variant.environment_metrics.has_white_lux) {
+                        jsonObj["payload"]["white_lux"] = decoded->variant.environment_metrics.white_lux;
+                    }
+                    if (decoded->variant.environment_metrics.has_iaq) {
+                        jsonObj["payload"]["iaq"] = (uint)decoded->variant.environment_metrics.iaq;
+                    }
+                    if (decoded->variant.environment_metrics.has_wind_speed) {
+                        jsonObj["payload"]["wind_speed"] = decoded->variant.environment_metrics.wind_speed;
+                    }
+                    if (decoded->variant.environment_metrics.has_wind_direction) {
+                        jsonObj["payload"]["wind_direction"] = (uint)decoded->variant.environment_metrics.wind_direction;
+                    }
+                    if (decoded->variant.environment_metrics.has_wind_gust) {
+                        jsonObj["payload"]["wind_gust"] = decoded->variant.environment_metrics.wind_gust;
+                    }
+                    if (decoded->variant.environment_metrics.has_wind_lull) {
+                        jsonObj["payload"]["wind_lull"] = decoded->variant.environment_metrics.wind_lull;
+                    }
+                    if (decoded->variant.environment_metrics.has_radiation) {
+                        jsonObj["payload"]["radiation"] = decoded->variant.environment_metrics.radiation;
+                    }
+                } else if (decoded->which_variant == meshtastic_Telemetry_air_quality_metrics_tag) {
+                    if (decoded->variant.air_quality_metrics.has_pm10_standard) {
+                        jsonObj["payload"]["pm10"] = (unsigned int)decoded->variant.air_quality_metrics.pm10_standard;
+                    }
+                    if (decoded->variant.air_quality_metrics.has_pm25_standard) {
+                        jsonObj["payload"]["pm25"] = (unsigned int)decoded->variant.air_quality_metrics.pm25_standard;
+                    }
+                    if (decoded->variant.air_quality_metrics.has_pm100_standard) {
+                        jsonObj["payload"]["pm100"] = (unsigned int)decoded->variant.air_quality_metrics.pm100_standard;
+                    }
+                    if (decoded->variant.air_quality_metrics.has_co2) {
+                        jsonObj["payload"]["co2"] = (unsigned int)decoded->variant.air_quality_metrics.co2;
+                    }
+                    if (decoded->variant.air_quality_metrics.has_co2_temperature) {
+                        jsonObj["payload"]["co2_temperature"] = decoded->variant.air_quality_metrics.co2_temperature;
+                    }
+                    if (decoded->variant.air_quality_metrics.has_co2_humidity) {
+                        jsonObj["payload"]["co2_humidity"] = decoded->variant.air_quality_metrics.co2_humidity;
+                    }
+                    if (decoded->variant.air_quality_metrics.has_form_formaldehyde) {
+                        jsonObj["payload"]["form_formaldehyde"] = decoded->variant.air_quality_metrics.form_formaldehyde;
+                    }
+                    if (decoded->variant.air_quality_metrics.has_form_temperature) {
+                        jsonObj["payload"]["form_temperature"] = decoded->variant.air_quality_metrics.form_temperature;
+                    }
+                    if (decoded->variant.air_quality_metrics.has_form_humidity) {
+                        jsonObj["payload"]["form_humidity"] = decoded->variant.air_quality_metrics.form_humidity;
+                    }
+                } else if (decoded->which_variant == meshtastic_Telemetry_power_metrics_tag) {
+                    if (decoded->variant.power_metrics.has_ch1_voltage) {
+                        jsonObj["payload"]["voltage_ch1"] = decoded->variant.power_metrics.ch1_voltage;
+                    }
+                    if (decoded->variant.power_metrics.has_ch1_current) {
+                        jsonObj["payload"]["current_ch1"] = decoded->variant.power_metrics.ch1_current;
+                    }
+                    if (decoded->variant.power_metrics.has_ch2_voltage) {
+                        jsonObj["payload"]["voltage_ch2"] = decoded->variant.power_metrics.ch2_voltage;
+                    }
+                    if (decoded->variant.power_metrics.has_ch2_current) {
+                        jsonObj["payload"]["current_ch2"] = decoded->variant.power_metrics.ch2_current;
+                    }
+                    if (decoded->variant.power_metrics.has_ch3_voltage) {
+                        jsonObj["payload"]["voltage_ch3"] = decoded->variant.power_metrics.ch3_voltage;
+                    }
+                    if (decoded->variant.power_metrics.has_ch3_current) {
+                        jsonObj["payload"]["current_ch3"] = decoded->variant.power_metrics.ch3_current;
+                    }
+                }
+            } else if (shouldLog) {
+                LOG_ERROR("Error decoding proto for telemetry message!");
+                return "";
+            }
+            break;
+        }
+        case meshtastic_PortNum_NODEINFO_APP: {
+            msgType = "nodeinfo";
+            meshtastic_User scratch;
+            meshtastic_User *decoded = NULL;
+            memset(&scratch, 0, sizeof(scratch));
+            if (pb_decode_from_bytes(mp->decoded.payload.bytes, mp->decoded.payload.size, &meshtastic_User_msg, &scratch)) {
+                decoded = &scratch;
+                jsonObj["payload"]["id"] = decoded->id;
+                jsonObj["payload"]["longname"] = decoded->long_name;
+                jsonObj["payload"]["shortname"] = decoded->short_name;
+                jsonObj["payload"]["hardware"] = decoded->hw_model;
+                jsonObj["payload"]["role"] = (int)decoded->role;
+            } else if (shouldLog) {
+                LOG_ERROR("Error decoding proto for nodeinfo message!");
+                return "";
+            }
+            break;
+        }
+        case meshtastic_PortNum_POSITION_APP: {
+            msgType = "position";
+            meshtastic_Position scratch;
+            meshtastic_Position *decoded = NULL;
+            memset(&scratch, 0, sizeof(scratch));
+            if (pb_decode_from_bytes(mp->decoded.payload.bytes, mp->decoded.payload.size, &meshtastic_Position_msg, &scratch)) {
+                decoded = &scratch;
+                if ((int)decoded->time) {
+                    jsonObj["payload"]["time"] = (unsigned int)decoded->time;
+                }
+                if ((int)decoded->timestamp) {
+                    jsonObj["payload"]["timestamp"] = (unsigned int)decoded->timestamp;
+                }
+                jsonObj["payload"]["latitude_i"] = (int)decoded->latitude_i;
+                jsonObj["payload"]["longitude_i"] = (int)decoded->longitude_i;
+                if ((int)decoded->altitude) {
+                    jsonObj["payload"]["altitude"] = (int)decoded->altitude;
+                }
+                if ((int)decoded->ground_speed) {
+                    jsonObj["payload"]["ground_speed"] = (unsigned int)decoded->ground_speed;
+                }
+                if (int(decoded->ground_track)) {
+                    jsonObj["payload"]["ground_track"] = (unsigned int)decoded->ground_track;
+                }
+                if (int(decoded->sats_in_view)) {
+                    jsonObj["payload"]["sats_in_view"] = (unsigned int)decoded->sats_in_view;
+                }
+                if ((int)decoded->PDOP) {
+                    jsonObj["payload"]["PDOP"] = (int)decoded->PDOP;
+                }
+                if ((int)decoded->HDOP) {
+                    jsonObj["payload"]["HDOP"] = (int)decoded->HDOP;
+                }
+                if ((int)decoded->VDOP) {
+                    jsonObj["payload"]["VDOP"] = (int)decoded->VDOP;
+                }
+                if ((int)decoded->precision_bits) {
+                    jsonObj["payload"]["precision_bits"] = (int)decoded->precision_bits;
+                }
+            } else if (shouldLog) {
+                LOG_ERROR("Error decoding proto for position message!");
+                return "";
+            }
+            break;
+        }
+        case meshtastic_PortNum_WAYPOINT_APP: {
+            msgType = "position";
+            meshtastic_Waypoint scratch;
+            meshtastic_Waypoint *decoded = NULL;
+            memset(&scratch, 0, sizeof(scratch));
+            if (pb_decode_from_bytes(mp->decoded.payload.bytes, mp->decoded.payload.size, &meshtastic_Waypoint_msg, &scratch)) {
+                decoded = &scratch;
+                jsonObj["payload"]["id"] = (unsigned int)decoded->id;
+                jsonObj["payload"]["name"] = decoded->name;
+                jsonObj["payload"]["description"] = decoded->description;
+                jsonObj["payload"]["expire"] = (unsigned int)decoded->expire;
+                jsonObj["payload"]["locked_to"] = (unsigned int)decoded->locked_to;
+                jsonObj["payload"]["latitude_i"] = (int)decoded->latitude_i;
+                jsonObj["payload"]["longitude_i"] = (int)decoded->longitude_i;
+            } else if (shouldLog) {
+                LOG_ERROR("Error decoding proto for position message!");
+                return "";
+            }
+            break;
+        }
+        case meshtastic_PortNum_NEIGHBORINFO_APP: {
+            msgType = "neighborinfo";
+            meshtastic_NeighborInfo scratch;
+            meshtastic_NeighborInfo *decoded = NULL;
+            memset(&scratch, 0, sizeof(scratch));
+            if (pb_decode_from_bytes(mp->decoded.payload.bytes, mp->decoded.payload.size, &meshtastic_NeighborInfo_msg,
+                                     &scratch)) {
+                decoded = &scratch;
+                jsonObj["payload"]["node_id"] = (unsigned int)decoded->node_id;
+                jsonObj["payload"]["node_broadcast_interval_secs"] = (unsigned int)decoded->node_broadcast_interval_secs;
+                jsonObj["payload"]["last_sent_by_id"] = (unsigned int)decoded->last_sent_by_id;
+                jsonObj["payload"]["neighbors_count"] = decoded->neighbors_count;
+
+                JsonObject neighbors_obj = arrayObj.to<JsonObject>();
+                JsonArray neighbors = neighbors_obj.createNestedArray("neighbors");
+                JsonObject neighbors_0 = neighbors.createNestedObject();
+
+                for (uint8_t i = 0; i < decoded->neighbors_count; i++) {
+                    neighbors_0["node_id"] = (unsigned int)decoded->neighbors[i].node_id;
+                    neighbors_0["snr"] = (int)decoded->neighbors[i].snr;
+                    neighbors[i + 1] = neighbors_0;
+                    neighbors_0.clear();
+                }
+                neighbors.remove(0);
+                jsonObj["payload"]["neighbors"] = neighbors;
+            } else if (shouldLog) {
+                LOG_ERROR("Error decoding proto for neighborinfo message!");
+                return "";
+            }
+            break;
+        }
+        case meshtastic_PortNum_TRACEROUTE_APP: {
+            if (mp->decoded.request_id) { // Only report the traceroute response
+                msgType = "traceroute";
+                meshtastic_RouteDiscovery scratch;
+                meshtastic_RouteDiscovery *decoded = NULL;
+                memset(&scratch, 0, sizeof(scratch));
+                if (pb_decode_from_bytes(mp->decoded.payload.bytes, mp->decoded.payload.size, &meshtastic_RouteDiscovery_msg,
+                                         &scratch)) {
+                    decoded = &scratch;
+                    JsonArray route = arrayObj.createNestedArray("route");
+
+                    auto addToRoute = [](JsonArray *route, NodeNum num) {
+                        char long_name[40] = "Unknown";
+                        meshtastic_NodeInfoLite *node = nodeDB->getMeshNode(num);
+                        bool name_known = node ? node->has_user : false;
+                        if (name_known)
+                            memcpy(long_name, node->user.long_name, sizeof(long_name));
+                        route->add(long_name);
+                    };
+
+                    addToRoute(&route, mp->to); // route.add(mp->to);
+                    for (uint8_t i = 0; i < decoded->route_count; i++) {
+                        addToRoute(&route, decoded->route[i]); // route.add(decoded->route[i]);
+                    }
+                    addToRoute(&route,
+                               mp->from); // route.add(mp->from); // Ended at the original destination (source of response)
+
+                    jsonObj["payload"]["route"] = route;
+                } else if (shouldLog) {
+                    LOG_ERROR("Error decoding proto for traceroute message!");
+                    return "";
+                }
+            } else {
+                LOG_WARN("Traceroute response not reported");
+                return "";
+            }
+            break;
+        }
+        case meshtastic_PortNum_DETECTION_SENSOR_APP: {
+            msgType = "detection";
+            char payloadStr[(mp->decoded.payload.size) + 1];
+            memcpy(payloadStr, mp->decoded.payload.bytes, mp->decoded.payload.size);
+            payloadStr[mp->decoded.payload.size] = 0; // null terminated string
+            jsonObj["payload"]["text"] = payloadStr;
+            break;
+        }
+        case meshtastic_PortNum_REMOTE_HARDWARE_APP: {
+            meshtastic_HardwareMessage scratch;
+            meshtastic_HardwareMessage *decoded = NULL;
+            memset(&scratch, 0, sizeof(scratch));
+            if (pb_decode_from_bytes(mp->decoded.payload.bytes, mp->decoded.payload.size, &meshtastic_HardwareMessage_msg,
+                                     &scratch)) {
+                decoded = &scratch;
+                if (decoded->type == meshtastic_HardwareMessage_Type_GPIOS_CHANGED) {
+                    msgType = "gpios_changed";
+                    jsonObj["payload"]["gpio_value"] = (unsigned int)decoded->gpio_value;
+                } else if (decoded->type == meshtastic_HardwareMessage_Type_READ_GPIOS_REPLY) {
+                    msgType = "gpios_read_reply";
+                    jsonObj["payload"]["gpio_value"] = (unsigned int)decoded->gpio_value;
+                    jsonObj["payload"]["gpio_mask"] = (unsigned int)decoded->gpio_mask;
+                }
+            } else if (shouldLog) {
+                LOG_ERROR("Error decoding proto for RemoteHardware message!");
+                return "";
+            }
+            break;
+        }
+        // add more packet types here if needed
+        default:
+            LOG_WARN("Unsupported packet type %d", mp->decoded.portnum);
+            return "";
+            break;
+        }
+    } else if (shouldLog) {
+        LOG_WARN("Couldn't convert encrypted payload of MeshPacket to JSON");
+        return "";
+    }
+
+    jsonObj["id"] = (unsigned int)mp->id;
+    jsonObj["timestamp"] = (unsigned int)mp->rx_time;
+    jsonObj["to"] = (unsigned int)mp->to;
+    jsonObj["from"] = (unsigned int)mp->from;
+    jsonObj["channel"] = (unsigned int)mp->channel;
+    jsonObj["type"] = msgType.c_str();
+    jsonObj["sender"] = nodeDB->getNodeId().c_str();
+    if (mp->rx_rssi != 0)
+        jsonObj["rssi"] = (int)mp->rx_rssi;
+    if (mp->rx_snr != 0)
+        jsonObj["snr"] = (float)mp->rx_snr;
+    const int8_t hopsAway = getHopsAway(*mp);
+    if (hopsAway >= 0) {
+        jsonObj["hops_away"] = (unsigned int)(hopsAway);
+        jsonObj["hop_start"] = (unsigned int)(mp->hop_start);
+    }
+
+    // serialize and write it to the stream
+
+    // Serial.printf("serialized json message: \r");
+    // serializeJson(jsonObj, Serial);
+    // Serial.println("");
+
+    std::string jsonStr = "";
+    serializeJson(jsonObj, jsonStr);
+
+    if (shouldLog)
+        LOG_INFO("serialized json message: %s", jsonStr.c_str());
+
+    return jsonStr;
+}
+
+std::string MeshPacketSerializer::JsonSerializeEncrypted(const meshtastic_MeshPacket *mp)
+{
+    jsonObj.clear();
+    jsonObj["id"] = (unsigned int)mp->id;
+    jsonObj["time_ms"] = (double)millis();
+    jsonObj["timestamp"] = (unsigned int)mp->rx_time;
+    jsonObj["to"] = (unsigned int)mp->to;
+    jsonObj["from"] = (unsigned int)mp->from;
+    jsonObj["channel"] = (unsigned int)mp->channel;
+    jsonObj["want_ack"] = mp->want_ack;
+
+    if (mp->rx_rssi != 0)
+        jsonObj["rssi"] = (int)mp->rx_rssi;
+    if (mp->rx_snr != 0)
+        jsonObj["snr"] = (float)mp->rx_snr;
+    const int8_t hopsAway = getHopsAway(*mp);
+    if (hopsAway >= 0) {
+        jsonObj["hops_away"] = (unsigned int)(hopsAway);
+        jsonObj["hop_start"] = (unsigned int)(mp->hop_start);
+    }
+    jsonObj["size"] = (unsigned int)mp->encrypted.size;
+    auto encryptedStr = bytesToHex(mp->encrypted.bytes, mp->encrypted.size);
+    jsonObj["bytes"] = encryptedStr.c_str();
+
+    // serialize and write it to the stream
+    std::string jsonStr = "";
+    serializeJson(jsonObj, jsonStr);
+
+    return jsonStr;
+}
+#endif

test/test_meshpacket_serializer/ports/test_encrypted.cpp

@@ -1,31 +1,42 @@
 #include "../test_helpers.h"
 
-static void assert_encrypted_packet(const std::string &json, const meshtastic_MeshPacket &packet)
+// Helper function for all encrypted packet assertions
+void assert_encrypted_packet(const std::string &json, meshtastic_MeshPacket packet)
 {
+    // Parse and validate JSON
     TEST_ASSERT_TRUE(json.length() > 0);
 
-    Json::Value root = parse_json(json);
-    TEST_ASSERT_TRUE(root.isObject());
+    JSONValue *root = JSON::Parse(json.c_str());
+    TEST_ASSERT_NOT_NULL(root);
+    TEST_ASSERT_TRUE(root->IsObject());
 
-    TEST_ASSERT_TRUE(root.isMember("from"));
-    TEST_ASSERT_EQUAL(packet.from, root["from"].asUInt());
+    JSONObject jsonObj = root->AsObject();
 
-    TEST_ASSERT_TRUE(root.isMember("to"));
-    TEST_ASSERT_EQUAL(packet.to, root["to"].asUInt());
+    // Assert basic packet fields
+    TEST_ASSERT_TRUE(jsonObj.find("from") != jsonObj.end());
+    TEST_ASSERT_EQUAL(packet.from, (uint32_t)jsonObj.at("from")->AsNumber());
 
-    TEST_ASSERT_TRUE(root.isMember("id"));
-    TEST_ASSERT_EQUAL(packet.id, root["id"].asUInt());
+    TEST_ASSERT_TRUE(jsonObj.find("to") != jsonObj.end());
+    TEST_ASSERT_EQUAL(packet.to, (uint32_t)jsonObj.at("to")->AsNumber());
 
-    TEST_ASSERT_TRUE(root.isMember("bytes"));
-    TEST_ASSERT_TRUE(root["bytes"].isString());
+    TEST_ASSERT_TRUE(jsonObj.find("id") != jsonObj.end());
+    TEST_ASSERT_EQUAL(packet.id, (uint32_t)jsonObj.at("id")->AsNumber());
 
-    TEST_ASSERT_TRUE(root.isMember("size"));
-    TEST_ASSERT_EQUAL(packet.encrypted.size, (int)root["size"].asInt());
+    // Assert encrypted data fields
+    TEST_ASSERT_TRUE(jsonObj.find("bytes") != jsonObj.end());
+    TEST_ASSERT_TRUE(jsonObj.at("bytes")->IsString());
 
-    std::string encrypted_hex = root["bytes"].asString();
+    TEST_ASSERT_TRUE(jsonObj.find("size") != jsonObj.end());
+    TEST_ASSERT_EQUAL(packet.encrypted.size, (int)jsonObj.at("size")->AsNumber());
+
+    // Assert hex encoding
+    std::string encrypted_hex = jsonObj["bytes"]->AsString();
     TEST_ASSERT_EQUAL(packet.encrypted.size * 2, encrypted_hex.length());
+
+    delete root;
 }
 
+// Test encrypted packet serialization
 void test_encrypted_packet_serialization()
 {
     const char *data = "encrypted_payload_data";
@@ -37,6 +48,7 @@ void test_encrypted_packet_serialization()
     assert_encrypted_packet(json, packet);
 }
 
+// Test empty encrypted packet
 void test_empty_encrypted_packet()
 {
     meshtastic_MeshPacket packet =

test/test_meshpacket_serializer/ports/test_nodeinfo.cpp

@@ -13,6 +13,7 @@ static size_t encode_user_info(uint8_t *buffer, size_t buffer_size)
     return stream.bytes_written;
 }
 
+// Test NODEINFO_APP port
 void test_nodeinfo_serialization()
 {
     uint8_t buffer[256];
@@ -23,20 +24,28 @@ void test_nodeinfo_serialization()
     std::string json = MeshPacketSerializer::JsonSerialize(&packet, false);
     TEST_ASSERT_TRUE(json.length() > 0);
 
-    Json::Value root = parse_json(json);
-    TEST_ASSERT_TRUE(root.isObject());
+    JSONValue *root = JSON::Parse(json.c_str());
+    TEST_ASSERT_NOT_NULL(root);
+    TEST_ASSERT_TRUE(root->IsObject());
 
-    TEST_ASSERT_TRUE(root.isMember("type"));
-    TEST_ASSERT_EQUAL_STRING("nodeinfo", root["type"].asString().c_str());
+    JSONObject jsonObj = root->AsObject();
 
-    TEST_ASSERT_TRUE(root.isMember("payload"));
-    TEST_ASSERT_TRUE(root["payload"].isObject());
+    // Check message type
+    TEST_ASSERT_TRUE(jsonObj.find("type") != jsonObj.end());
+    TEST_ASSERT_EQUAL_STRING("nodeinfo", jsonObj["type"]->AsString().c_str());
 
-    const Json::Value &payload = root["payload"];
+    // Check payload
+    TEST_ASSERT_TRUE(jsonObj.find("payload") != jsonObj.end());
+    TEST_ASSERT_TRUE(jsonObj["payload"]->IsObject());
 
-    TEST_ASSERT_TRUE(payload.isMember("shortname"));
-    TEST_ASSERT_EQUAL_STRING("TEST", payload["shortname"].asString().c_str());
+    JSONObject payload = jsonObj["payload"]->AsObject();
 
-    TEST_ASSERT_TRUE(payload.isMember("longname"));
-    TEST_ASSERT_EQUAL_STRING("Test User", payload["longname"].asString().c_str());
+    // Verify user data
+    TEST_ASSERT_TRUE(payload.find("shortname") != payload.end());
+    TEST_ASSERT_EQUAL_STRING("TEST", payload["shortname"]->AsString().c_str());
+
+    TEST_ASSERT_TRUE(payload.find("longname") != payload.end());
+    TEST_ASSERT_EQUAL_STRING("Test User", payload["longname"]->AsString().c_str());
+
+    delete root;
 }

test/test_meshpacket_serializer/ports/test_position.cpp

@@ -3,8 +3,8 @@
 static size_t encode_position(uint8_t *buffer, size_t buffer_size)
 {
     meshtastic_Position position = meshtastic_Position_init_zero;
-    position.latitude_i = 374208000;
-    position.longitude_i = -1221981000;
+    position.latitude_i = 374208000;    // 37.4208 degrees * 1e7
+    position.longitude_i = -1221981000; // -122.1981 degrees * 1e7
     position.altitude = 123;
     position.time = 1609459200;
     position.has_altitude = true;
@@ -16,6 +16,7 @@ static size_t encode_position(uint8_t *buffer, size_t buffer_size)
     return stream.bytes_written;
 }
 
+// Test POSITION_APP port
 void test_position_serialization()
 {
     uint8_t buffer[256];
@@ -26,23 +27,31 @@ void test_position_serialization()
     std::string json = MeshPacketSerializer::JsonSerialize(&packet, false);
     TEST_ASSERT_TRUE(json.length() > 0);
 
-    Json::Value root = parse_json(json);
-    TEST_ASSERT_TRUE(root.isObject());
+    JSONValue *root = JSON::Parse(json.c_str());
+    TEST_ASSERT_NOT_NULL(root);
+    TEST_ASSERT_TRUE(root->IsObject());
 
-    TEST_ASSERT_TRUE(root.isMember("type"));
-    TEST_ASSERT_EQUAL_STRING("position", root["type"].asString().c_str());
+    JSONObject jsonObj = root->AsObject();
 
-    TEST_ASSERT_TRUE(root.isMember("payload"));
-    TEST_ASSERT_TRUE(root["payload"].isObject());
+    // Check message type
+    TEST_ASSERT_TRUE(jsonObj.find("type") != jsonObj.end());
+    TEST_ASSERT_EQUAL_STRING("position", jsonObj["type"]->AsString().c_str());
 
-    const Json::Value &payload = root["payload"];
+    // Check payload
+    TEST_ASSERT_TRUE(jsonObj.find("payload") != jsonObj.end());
+    TEST_ASSERT_TRUE(jsonObj["payload"]->IsObject());
 
-    TEST_ASSERT_TRUE(payload.isMember("latitude_i"));
-    TEST_ASSERT_EQUAL(374208000, payload["latitude_i"].asInt());
+    JSONObject payload = jsonObj["payload"]->AsObject();
 
-    TEST_ASSERT_TRUE(payload.isMember("longitude_i"));
-    TEST_ASSERT_EQUAL(-1221981000, payload["longitude_i"].asInt());
+    // Verify position data
+    TEST_ASSERT_TRUE(payload.find("latitude_i") != payload.end());
+    TEST_ASSERT_EQUAL(374208000, (int)payload["latitude_i"]->AsNumber());
 
-    TEST_ASSERT_TRUE(payload.isMember("altitude"));
-    TEST_ASSERT_EQUAL(123, payload["altitude"].asInt());
+    TEST_ASSERT_TRUE(payload.find("longitude_i") != payload.end());
+    TEST_ASSERT_EQUAL(-1221981000, (int)payload["longitude_i"]->AsNumber());
+
+    TEST_ASSERT_TRUE(payload.find("altitude") != payload.end());
+    TEST_ASSERT_EQUAL(123, (int)payload["altitude"]->AsNumber());
+
+    delete root;
 }

test/test_meshpacket_serializer/ports/test_telemetry.cpp

@@ -1,62 +1,6 @@
 #include "../test_helpers.h"
 
-static void fill_all_env_metrics(meshtastic_Telemetry &telemetry)
-{
-    telemetry.variant.environment_metrics.temperature = 23.56f;
-    telemetry.variant.environment_metrics.has_temperature = true;
-    telemetry.variant.environment_metrics.relative_humidity = 65.43f;
-    telemetry.variant.environment_metrics.has_relative_humidity = true;
-    telemetry.variant.environment_metrics.barometric_pressure = 1013.27f;
-    telemetry.variant.environment_metrics.has_barometric_pressure = true;
-
-    telemetry.variant.environment_metrics.gas_resistance = 50.58f;
-    telemetry.variant.environment_metrics.has_gas_resistance = true;
-    telemetry.variant.environment_metrics.iaq = 120;
-    telemetry.variant.environment_metrics.has_iaq = true;
-
-    telemetry.variant.environment_metrics.voltage = 3.34f;
-    telemetry.variant.environment_metrics.has_voltage = true;
-    telemetry.variant.environment_metrics.current = 0.53f;
-    telemetry.variant.environment_metrics.has_current = true;
-
-    telemetry.variant.environment_metrics.lux = 450.12f;
-    telemetry.variant.environment_metrics.has_lux = true;
-    telemetry.variant.environment_metrics.white_lux = 380.95f;
-    telemetry.variant.environment_metrics.has_white_lux = true;
-    telemetry.variant.environment_metrics.ir_lux = 25.37f;
-    telemetry.variant.environment_metrics.has_ir_lux = true;
-    telemetry.variant.environment_metrics.uv_lux = 15.68f;
-    telemetry.variant.environment_metrics.has_uv_lux = true;
-
-    telemetry.variant.environment_metrics.distance = 150.29f;
-    telemetry.variant.environment_metrics.has_distance = true;
-
-    telemetry.variant.environment_metrics.wind_direction = 180;
-    telemetry.variant.environment_metrics.has_wind_direction = true;
-    telemetry.variant.environment_metrics.wind_speed = 5.52f;
-    telemetry.variant.environment_metrics.has_wind_speed = true;
-    telemetry.variant.environment_metrics.wind_gust = 8.24f;
-    telemetry.variant.environment_metrics.has_wind_gust = true;
-    telemetry.variant.environment_metrics.wind_lull = 2.13f;
-    telemetry.variant.environment_metrics.has_wind_lull = true;
-
-    telemetry.variant.environment_metrics.weight = 75.56f;
-    telemetry.variant.environment_metrics.has_weight = true;
-
-    telemetry.variant.environment_metrics.radiation = 0.13f;
-    telemetry.variant.environment_metrics.has_radiation = true;
-
-    telemetry.variant.environment_metrics.rainfall_1h = 2.57f;
-    telemetry.variant.environment_metrics.has_rainfall_1h = true;
-    telemetry.variant.environment_metrics.rainfall_24h = 15.89f;
-    telemetry.variant.environment_metrics.has_rainfall_24h = true;
-
-    telemetry.variant.environment_metrics.soil_moisture = 85;
-    telemetry.variant.environment_metrics.has_soil_moisture = true;
-    telemetry.variant.environment_metrics.soil_temperature = 18.54f;
-    telemetry.variant.environment_metrics.has_soil_temperature = true;
-}
-
+// Helper function to create and encode device metrics
 static size_t encode_telemetry_device_metrics(uint8_t *buffer, size_t buffer_size)
 {
     meshtastic_Telemetry telemetry = meshtastic_Telemetry_init_zero;
@@ -78,233 +22,507 @@ static size_t encode_telemetry_device_metrics(uint8_t *buffer, size_t buffer_siz
     return stream.bytes_written;
 }
 
+// Helper function to create and encode empty environment metrics (no fields set)
 static size_t encode_telemetry_environment_metrics_empty(uint8_t *buffer, size_t buffer_size)
 {
     meshtastic_Telemetry telemetry = meshtastic_Telemetry_init_zero;
     telemetry.time = 1609459200;
     telemetry.which_variant = meshtastic_Telemetry_environment_metrics_tag;
 
+    // NO fields are set - all has_* flags remain false
+    // This tests that empty environment metrics don't produce any JSON fields
+
     pb_ostream_t stream = pb_ostream_from_buffer(buffer, buffer_size);
     pb_encode(&stream, &meshtastic_Telemetry_msg, &telemetry);
     return stream.bytes_written;
 }
 
+// Helper function to create environment metrics with ALL possible fields set
+// This function should be updated whenever new fields are added to the protobuf
+static size_t encode_telemetry_environment_metrics_all_fields(uint8_t *buffer, size_t buffer_size)
+{
+    meshtastic_Telemetry telemetry = meshtastic_Telemetry_init_zero;
+    telemetry.time = 1609459200;
+    telemetry.which_variant = meshtastic_Telemetry_environment_metrics_tag;
+
+    // Basic environment metrics
+    telemetry.variant.environment_metrics.temperature = 23.56f;
+    telemetry.variant.environment_metrics.has_temperature = true;
+    telemetry.variant.environment_metrics.relative_humidity = 65.43f;
+    telemetry.variant.environment_metrics.has_relative_humidity = true;
+    telemetry.variant.environment_metrics.barometric_pressure = 1013.27f;
+    telemetry.variant.environment_metrics.has_barometric_pressure = true;
+
+    // Gas and air quality
+    telemetry.variant.environment_metrics.gas_resistance = 50.58f;
+    telemetry.variant.environment_metrics.has_gas_resistance = true;
+    telemetry.variant.environment_metrics.iaq = 120;
+    telemetry.variant.environment_metrics.has_iaq = true;
+
+    // Power measurements
+    telemetry.variant.environment_metrics.voltage = 3.34f;
+    telemetry.variant.environment_metrics.has_voltage = true;
+    telemetry.variant.environment_metrics.current = 0.53f;
+    telemetry.variant.environment_metrics.has_current = true;
+
+    // Light measurements (ALL 4 types)
+    telemetry.variant.environment_metrics.lux = 450.12f;
+    telemetry.variant.environment_metrics.has_lux = true;
+    telemetry.variant.environment_metrics.white_lux = 380.95f;
+    telemetry.variant.environment_metrics.has_white_lux = true;
+    telemetry.variant.environment_metrics.ir_lux = 25.37f;
+    telemetry.variant.environment_metrics.has_ir_lux = true;
+    telemetry.variant.environment_metrics.uv_lux = 15.68f;
+    telemetry.variant.environment_metrics.has_uv_lux = true;
+
+    // Distance measurement
+    telemetry.variant.environment_metrics.distance = 150.29f;
+    telemetry.variant.environment_metrics.has_distance = true;
+
+    // Wind measurements (ALL 4 types)
+    telemetry.variant.environment_metrics.wind_direction = 180;
+    telemetry.variant.environment_metrics.has_wind_direction = true;
+    telemetry.variant.environment_metrics.wind_speed = 5.52f;
+    telemetry.variant.environment_metrics.has_wind_speed = true;
+    telemetry.variant.environment_metrics.wind_gust = 8.24f;
+    telemetry.variant.environment_metrics.has_wind_gust = true;
+    telemetry.variant.environment_metrics.wind_lull = 2.13f;
+    telemetry.variant.environment_metrics.has_wind_lull = true;
+
+    // Weight measurement
+    telemetry.variant.environment_metrics.weight = 75.56f;
+    telemetry.variant.environment_metrics.has_weight = true;
+
+    // Radiation measurement
+    telemetry.variant.environment_metrics.radiation = 0.13f;
+    telemetry.variant.environment_metrics.has_radiation = true;
+
+    // Rainfall measurements (BOTH types)
+    telemetry.variant.environment_metrics.rainfall_1h = 2.57f;
+    telemetry.variant.environment_metrics.has_rainfall_1h = true;
+    telemetry.variant.environment_metrics.rainfall_24h = 15.89f;
+    telemetry.variant.environment_metrics.has_rainfall_24h = true;
+
+    // Soil measurements (BOTH types)
+    telemetry.variant.environment_metrics.soil_moisture = 85;
+    telemetry.variant.environment_metrics.has_soil_moisture = true;
+    telemetry.variant.environment_metrics.soil_temperature = 18.54f;
+    telemetry.variant.environment_metrics.has_soil_temperature = true;
+
+    // IMPORTANT: When new environment fields are added to the protobuf,
+    // they MUST be added here too, or the coverage test will fail!
+
+    pb_ostream_t stream = pb_ostream_from_buffer(buffer, buffer_size);
+    pb_encode(&stream, &meshtastic_Telemetry_msg, &telemetry);
+    return stream.bytes_written;
+}
+
+// Helper function to create and encode environment metrics with all current fields
 static size_t encode_telemetry_environment_metrics(uint8_t *buffer, size_t buffer_size)
 {
     meshtastic_Telemetry telemetry = meshtastic_Telemetry_init_zero;
     telemetry.time = 1609459200;
     telemetry.which_variant = meshtastic_Telemetry_environment_metrics_tag;
-    fill_all_env_metrics(telemetry);
+
+    // Basic environment metrics
+    telemetry.variant.environment_metrics.temperature = 23.56f;
+    telemetry.variant.environment_metrics.has_temperature = true;
+    telemetry.variant.environment_metrics.relative_humidity = 65.43f;
+    telemetry.variant.environment_metrics.has_relative_humidity = true;
+    telemetry.variant.environment_metrics.barometric_pressure = 1013.27f;
+    telemetry.variant.environment_metrics.has_barometric_pressure = true;
+
+    // Gas and air quality
+    telemetry.variant.environment_metrics.gas_resistance = 50.58f;
+    telemetry.variant.environment_metrics.has_gas_resistance = true;
+    telemetry.variant.environment_metrics.iaq = 120;
+    telemetry.variant.environment_metrics.has_iaq = true;
+
+    // Power measurements
+    telemetry.variant.environment_metrics.voltage = 3.34f;
+    telemetry.variant.environment_metrics.has_voltage = true;
+    telemetry.variant.environment_metrics.current = 0.53f;
+    telemetry.variant.environment_metrics.has_current = true;
+
+    // Light measurements
+    telemetry.variant.environment_metrics.lux = 450.12f;
+    telemetry.variant.environment_metrics.has_lux = true;
+    telemetry.variant.environment_metrics.white_lux = 380.95f;
+    telemetry.variant.environment_metrics.has_white_lux = true;
+    telemetry.variant.environment_metrics.ir_lux = 25.37f;
+    telemetry.variant.environment_metrics.has_ir_lux = true;
+    telemetry.variant.environment_metrics.uv_lux = 15.68f;
+    telemetry.variant.environment_metrics.has_uv_lux = true;
+
+    // Distance measurement
+    telemetry.variant.environment_metrics.distance = 150.29f;
+    telemetry.variant.environment_metrics.has_distance = true;
+
+    // Wind measurements
+    telemetry.variant.environment_metrics.wind_direction = 180;
+    telemetry.variant.environment_metrics.has_wind_direction = true;
+    telemetry.variant.environment_metrics.wind_speed = 5.52f;
+    telemetry.variant.environment_metrics.has_wind_speed = true;
+    telemetry.variant.environment_metrics.wind_gust = 8.24f;
+    telemetry.variant.environment_metrics.has_wind_gust = true;
+    telemetry.variant.environment_metrics.wind_lull = 2.13f;
+    telemetry.variant.environment_metrics.has_wind_lull = true;
+
+    // Weight measurement
+    telemetry.variant.environment_metrics.weight = 75.56f;
+    telemetry.variant.environment_metrics.has_weight = true;
+
+    // Radiation measurement
+    telemetry.variant.environment_metrics.radiation = 0.13f;
+    telemetry.variant.environment_metrics.has_radiation = true;
+
+    // Rainfall measurements
+    telemetry.variant.environment_metrics.rainfall_1h = 2.57f;
+    telemetry.variant.environment_metrics.has_rainfall_1h = true;
+    telemetry.variant.environment_metrics.rainfall_24h = 15.89f;
+    telemetry.variant.environment_metrics.has_rainfall_24h = true;
+
+    // Soil measurements
+    telemetry.variant.environment_metrics.soil_moisture = 85;
+    telemetry.variant.environment_metrics.has_soil_moisture = true;
+    telemetry.variant.environment_metrics.soil_temperature = 18.54f;
+    telemetry.variant.environment_metrics.has_soil_temperature = true;
 
     pb_ostream_t stream = pb_ostream_from_buffer(buffer, buffer_size);
     pb_encode(&stream, &meshtastic_Telemetry_msg, &telemetry);
     return stream.bytes_written;
 }
 
-static Json::Value serialize_and_get_payload(meshtastic_PortNum port, const uint8_t *buffer, size_t payload_size)
-{
-    meshtastic_MeshPacket packet = create_test_packet(port, buffer, payload_size);
-    std::string json = MeshPacketSerializer::JsonSerialize(&packet, false);
-    TEST_ASSERT_TRUE(json.length() > 0);
-
-    Json::Value root = parse_json(json);
-    TEST_ASSERT_TRUE(root.isObject());
-    TEST_ASSERT_TRUE(root.isMember("payload"));
-    TEST_ASSERT_TRUE(root["payload"].isObject());
-    return root;
-}
-
+// Test TELEMETRY_APP port with device metrics
 void test_telemetry_device_metrics_serialization()
 {
     uint8_t buffer[256];
     size_t payload_size = encode_telemetry_device_metrics(buffer, sizeof(buffer));
 
-    Json::Value root = serialize_and_get_payload(meshtastic_PortNum_TELEMETRY_APP, buffer, payload_size);
+    meshtastic_MeshPacket packet = create_test_packet(meshtastic_PortNum_TELEMETRY_APP, buffer, payload_size);
 
-    TEST_ASSERT_TRUE(root.isMember("type"));
-    TEST_ASSERT_EQUAL_STRING("telemetry", root["type"].asString().c_str());
+    std::string json = MeshPacketSerializer::JsonSerialize(&packet, false);
+    TEST_ASSERT_TRUE(json.length() > 0);
 
-    const Json::Value &payload = root["payload"];
+    JSONValue *root = JSON::Parse(json.c_str());
+    TEST_ASSERT_NOT_NULL(root);
+    TEST_ASSERT_TRUE(root->IsObject());
 
-    TEST_ASSERT_TRUE(payload.isMember("battery_level"));
-    TEST_ASSERT_EQUAL(85, payload["battery_level"].asInt());
+    JSONObject jsonObj = root->AsObject();
 
-    TEST_ASSERT_TRUE(payload.isMember("voltage"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 3.72f, payload["voltage"].asFloat());
+    // Check message type
+    TEST_ASSERT_TRUE(jsonObj.find("type") != jsonObj.end());
+    TEST_ASSERT_EQUAL_STRING("telemetry", jsonObj["type"]->AsString().c_str());
 
-    TEST_ASSERT_TRUE(payload.isMember("channel_utilization"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 15.56f, payload["channel_utilization"].asFloat());
+    // Check payload
+    TEST_ASSERT_TRUE(jsonObj.find("payload") != jsonObj.end());
+    TEST_ASSERT_TRUE(jsonObj["payload"]->IsObject());
 
-    TEST_ASSERT_TRUE(payload.isMember("uptime_seconds"));
-    TEST_ASSERT_EQUAL(12345, payload["uptime_seconds"].asInt());
+    JSONObject payload = jsonObj["payload"]->AsObject();
+
+    // Verify telemetry data
+    TEST_ASSERT_TRUE(payload.find("battery_level") != payload.end());
+    TEST_ASSERT_EQUAL(85, (int)payload["battery_level"]->AsNumber());
+
+    TEST_ASSERT_TRUE(payload.find("voltage") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 3.72f, payload["voltage"]->AsNumber());
+
+    TEST_ASSERT_TRUE(payload.find("channel_utilization") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 15.56f, payload["channel_utilization"]->AsNumber());
+
+    TEST_ASSERT_TRUE(payload.find("uptime_seconds") != payload.end());
+    TEST_ASSERT_EQUAL(12345, (int)payload["uptime_seconds"]->AsNumber());
+
+    // Note: JSON serialization may not preserve exact 2-decimal formatting due to float precision
+    // We verify the numeric values are correct within tolerance
+
+    delete root;
 }
 
+// Test that telemetry environment metrics are properly serialized
 void test_telemetry_environment_metrics_serialization()
 {
     uint8_t buffer[256];
     size_t payload_size = encode_telemetry_environment_metrics(buffer, sizeof(buffer));
 
-    Json::Value root = serialize_and_get_payload(meshtastic_PortNum_TELEMETRY_APP, buffer, payload_size);
-    const Json::Value &payload = root["payload"];
+    meshtastic_MeshPacket packet = create_test_packet(meshtastic_PortNum_TELEMETRY_APP, buffer, payload_size);
 
-    TEST_ASSERT_TRUE(payload.isMember("temperature"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 23.56f, payload["temperature"].asFloat());
+    std::string json = MeshPacketSerializer::JsonSerialize(&packet, false);
+    TEST_ASSERT_TRUE(json.length() > 0);
 
-    TEST_ASSERT_TRUE(payload.isMember("relative_humidity"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 65.43f, payload["relative_humidity"].asFloat());
+    JSONValue *root = JSON::Parse(json.c_str());
+    TEST_ASSERT_NOT_NULL(root);
+    TEST_ASSERT_TRUE(root->IsObject());
 
-    TEST_ASSERT_TRUE(payload.isMember("distance"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 150.29f, payload["distance"].asFloat());
+    JSONObject jsonObj = root->AsObject();
+
+    // Check payload exists
+    TEST_ASSERT_TRUE(jsonObj.find("payload") != jsonObj.end());
+    TEST_ASSERT_TRUE(jsonObj["payload"]->IsObject());
+
+    JSONObject payload = jsonObj["payload"]->AsObject();
+
+    // Test key fields that should be present in the serializer
+    TEST_ASSERT_TRUE(payload.find("temperature") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 23.56f, payload["temperature"]->AsNumber());
+
+    TEST_ASSERT_TRUE(payload.find("relative_humidity") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 65.43f, payload["relative_humidity"]->AsNumber());
+
+    TEST_ASSERT_TRUE(payload.find("distance") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 150.29f, payload["distance"]->AsNumber());
+
+    // Note: JSON serialization may have float precision limitations
+    // We focus on verifying numeric accuracy rather than exact string formatting
+
+    delete root;
 }
 
+// Test comprehensive environment metrics coverage
 void test_telemetry_environment_metrics_comprehensive()
 {
     uint8_t buffer[256];
     size_t payload_size = encode_telemetry_environment_metrics(buffer, sizeof(buffer));
 
-    Json::Value root = serialize_and_get_payload(meshtastic_PortNum_TELEMETRY_APP, buffer, payload_size);
-    const Json::Value &payload = root["payload"];
+    meshtastic_MeshPacket packet = create_test_packet(meshtastic_PortNum_TELEMETRY_APP, buffer, payload_size);
 
-    TEST_ASSERT_TRUE(payload.isMember("temperature"));
-    TEST_ASSERT_TRUE(payload.isMember("relative_humidity"));
-    TEST_ASSERT_TRUE(payload.isMember("barometric_pressure"));
-    TEST_ASSERT_TRUE(payload.isMember("gas_resistance"));
-    TEST_ASSERT_TRUE(payload.isMember("voltage"));
-    TEST_ASSERT_TRUE(payload.isMember("current"));
-    TEST_ASSERT_TRUE(payload.isMember("iaq"));
-    TEST_ASSERT_TRUE(payload.isMember("distance"));
-    TEST_ASSERT_TRUE(payload.isMember("lux"));
-    TEST_ASSERT_TRUE(payload.isMember("white_lux"));
-    TEST_ASSERT_TRUE(payload.isMember("wind_direction"));
-    TEST_ASSERT_TRUE(payload.isMember("wind_speed"));
-    TEST_ASSERT_TRUE(payload.isMember("wind_gust"));
-    TEST_ASSERT_TRUE(payload.isMember("wind_lull"));
-    TEST_ASSERT_TRUE(payload.isMember("radiation"));
+    std::string json = MeshPacketSerializer::JsonSerialize(&packet, false);
+    TEST_ASSERT_TRUE(json.length() > 0);
+
+    JSONValue *root = JSON::Parse(json.c_str());
+    TEST_ASSERT_NOT_NULL(root);
+    TEST_ASSERT_TRUE(root->IsObject());
+
+    JSONObject jsonObj = root->AsObject();
+
+    // Check payload exists
+    TEST_ASSERT_TRUE(jsonObj.find("payload") != jsonObj.end());
+    TEST_ASSERT_TRUE(jsonObj["payload"]->IsObject());
+
+    JSONObject payload = jsonObj["payload"]->AsObject();
+
+    // Check all 15 originally supported fields
+    TEST_ASSERT_TRUE(payload.find("temperature") != payload.end());
+    TEST_ASSERT_TRUE(payload.find("relative_humidity") != payload.end());
+    TEST_ASSERT_TRUE(payload.find("barometric_pressure") != payload.end());
+    TEST_ASSERT_TRUE(payload.find("gas_resistance") != payload.end());
+    TEST_ASSERT_TRUE(payload.find("voltage") != payload.end());
+    TEST_ASSERT_TRUE(payload.find("current") != payload.end());
+    TEST_ASSERT_TRUE(payload.find("iaq") != payload.end());
+    TEST_ASSERT_TRUE(payload.find("distance") != payload.end());
+    TEST_ASSERT_TRUE(payload.find("lux") != payload.end());
+    TEST_ASSERT_TRUE(payload.find("white_lux") != payload.end());
+    TEST_ASSERT_TRUE(payload.find("wind_direction") != payload.end());
+    TEST_ASSERT_TRUE(payload.find("wind_speed") != payload.end());
+    TEST_ASSERT_TRUE(payload.find("wind_gust") != payload.end());
+    TEST_ASSERT_TRUE(payload.find("wind_lull") != payload.end());
+    TEST_ASSERT_TRUE(payload.find("radiation") != payload.end());
+
+    delete root;
 }
 
+// Test for the 7 environment fields that were added to complete coverage
 void test_telemetry_environment_metrics_missing_fields()
 {
     uint8_t buffer[256];
     size_t payload_size = encode_telemetry_environment_metrics(buffer, sizeof(buffer));
 
-    Json::Value root = serialize_and_get_payload(meshtastic_PortNum_TELEMETRY_APP, buffer, payload_size);
-    const Json::Value &payload = root["payload"];
+    meshtastic_MeshPacket packet = create_test_packet(meshtastic_PortNum_TELEMETRY_APP, buffer, payload_size);
 
-    TEST_ASSERT_TRUE(payload.isMember("ir_lux"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 25.37f, payload["ir_lux"].asFloat());
+    std::string json = MeshPacketSerializer::JsonSerialize(&packet, false);
+    TEST_ASSERT_TRUE(json.length() > 0);
 
-    TEST_ASSERT_TRUE(payload.isMember("uv_lux"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 15.68f, payload["uv_lux"].asFloat());
+    JSONValue *root = JSON::Parse(json.c_str());
+    TEST_ASSERT_NOT_NULL(root);
+    TEST_ASSERT_TRUE(root->IsObject());
 
-    TEST_ASSERT_TRUE(payload.isMember("weight"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 75.56f, payload["weight"].asFloat());
+    JSONObject jsonObj = root->AsObject();
 
-    TEST_ASSERT_TRUE(payload.isMember("rainfall_1h"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 2.57f, payload["rainfall_1h"].asFloat());
+    // Check payload exists
+    TEST_ASSERT_TRUE(jsonObj.find("payload") != jsonObj.end());
+    TEST_ASSERT_TRUE(jsonObj["payload"]->IsObject());
 
-    TEST_ASSERT_TRUE(payload.isMember("rainfall_24h"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 15.89f, payload["rainfall_24h"].asFloat());
+    JSONObject payload = jsonObj["payload"]->AsObject();
 
-    TEST_ASSERT_TRUE(payload.isMember("soil_moisture"));
-    TEST_ASSERT_EQUAL(85, payload["soil_moisture"].asInt());
+    // Check the 7 fields that were previously missing
+    TEST_ASSERT_TRUE(payload.find("ir_lux") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 25.37f, payload["ir_lux"]->AsNumber());
 
-    TEST_ASSERT_TRUE(payload.isMember("soil_temperature"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 18.54f, payload["soil_temperature"].asFloat());
+    TEST_ASSERT_TRUE(payload.find("uv_lux") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 15.68f, payload["uv_lux"]->AsNumber());
+
+    TEST_ASSERT_TRUE(payload.find("weight") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 75.56f, payload["weight"]->AsNumber());
+
+    TEST_ASSERT_TRUE(payload.find("rainfall_1h") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 2.57f, payload["rainfall_1h"]->AsNumber());
+
+    TEST_ASSERT_TRUE(payload.find("rainfall_24h") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 15.89f, payload["rainfall_24h"]->AsNumber());
+
+    TEST_ASSERT_TRUE(payload.find("soil_moisture") != payload.end());
+    TEST_ASSERT_EQUAL(85, (int)payload["soil_moisture"]->AsNumber());
+
+    TEST_ASSERT_TRUE(payload.find("soil_temperature") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 18.54f, payload["soil_temperature"]->AsNumber());
+
+    // Note: JSON float serialization may not preserve exact decimal formatting
+    // We verify the values are numerically correct within tolerance
+
+    delete root;
 }
 
-// Canary test: if a new env field is added to the protobuf but not to the serializer
-// (or to fill_all_env_metrics), this test will fail.
+// Test that ALL environment fields are serialized (canary test for forgotten fields)
+// This test will FAIL if a new environment field is added to the protobuf but not to the serializer
 void test_telemetry_environment_metrics_complete_coverage()
 {
     uint8_t buffer[256];
-    size_t payload_size = encode_telemetry_environment_metrics(buffer, sizeof(buffer));
+    size_t payload_size = encode_telemetry_environment_metrics_all_fields(buffer, sizeof(buffer));
 
-    Json::Value root = serialize_and_get_payload(meshtastic_PortNum_TELEMETRY_APP, buffer, payload_size);
-    const Json::Value &payload = root["payload"];
+    meshtastic_MeshPacket packet = create_test_packet(meshtastic_PortNum_TELEMETRY_APP, buffer, payload_size);
 
-    TEST_ASSERT_TRUE(payload.isMember("temperature"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 23.56f, payload["temperature"].asFloat());
-    TEST_ASSERT_TRUE(payload.isMember("relative_humidity"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 65.43f, payload["relative_humidity"].asFloat());
-    TEST_ASSERT_TRUE(payload.isMember("barometric_pressure"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 1013.27f, payload["barometric_pressure"].asFloat());
+    std::string json = MeshPacketSerializer::JsonSerialize(&packet, false);
+    TEST_ASSERT_TRUE(json.length() > 0);
 
-    TEST_ASSERT_TRUE(payload.isMember("gas_resistance"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 50.58f, payload["gas_resistance"].asFloat());
-    TEST_ASSERT_TRUE(payload.isMember("iaq"));
-    TEST_ASSERT_EQUAL(120, payload["iaq"].asInt());
+    JSONValue *root = JSON::Parse(json.c_str());
+    TEST_ASSERT_NOT_NULL(root);
+    TEST_ASSERT_TRUE(root->IsObject());
 
-    TEST_ASSERT_TRUE(payload.isMember("voltage"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 3.34f, payload["voltage"].asFloat());
-    TEST_ASSERT_TRUE(payload.isMember("current"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 0.53f, payload["current"].asFloat());
+    JSONObject jsonObj = root->AsObject();
 
-    TEST_ASSERT_TRUE(payload.isMember("lux"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 450.12f, payload["lux"].asFloat());
-    TEST_ASSERT_TRUE(payload.isMember("white_lux"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 380.95f, payload["white_lux"].asFloat());
-    TEST_ASSERT_TRUE(payload.isMember("ir_lux"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 25.37f, payload["ir_lux"].asFloat());
-    TEST_ASSERT_TRUE(payload.isMember("uv_lux"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 15.68f, payload["uv_lux"].asFloat());
+    // Check payload exists
+    TEST_ASSERT_TRUE(jsonObj.find("payload") != jsonObj.end());
+    TEST_ASSERT_TRUE(jsonObj["payload"]->IsObject());
 
-    TEST_ASSERT_TRUE(payload.isMember("distance"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 150.29f, payload["distance"].asFloat());
+    JSONObject payload = jsonObj["payload"]->AsObject();
 
-    TEST_ASSERT_TRUE(payload.isMember("wind_direction"));
-    TEST_ASSERT_EQUAL(180, payload["wind_direction"].asInt());
-    TEST_ASSERT_TRUE(payload.isMember("wind_speed"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 5.52f, payload["wind_speed"].asFloat());
-    TEST_ASSERT_TRUE(payload.isMember("wind_gust"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 8.24f, payload["wind_gust"].asFloat());
-    TEST_ASSERT_TRUE(payload.isMember("wind_lull"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 2.13f, payload["wind_lull"].asFloat());
+    // ✅ ALL 22 environment fields MUST be present and correct
+    // If this test fails, it means either:
+    // 1. A new field was added to the protobuf but not to the serializer
+    // 2. The encode_telemetry_environment_metrics_all_fields() function wasn't updated
 
-    TEST_ASSERT_TRUE(payload.isMember("weight"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 75.56f, payload["weight"].asFloat());
+    // Basic environment (3 fields)
+    TEST_ASSERT_TRUE(payload.find("temperature") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 23.56f, payload["temperature"]->AsNumber());
+    TEST_ASSERT_TRUE(payload.find("relative_humidity") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 65.43f, payload["relative_humidity"]->AsNumber());
+    TEST_ASSERT_TRUE(payload.find("barometric_pressure") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 1013.27f, payload["barometric_pressure"]->AsNumber());
 
-    TEST_ASSERT_TRUE(payload.isMember("radiation"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 0.13f, payload["radiation"].asFloat());
+    // Gas and air quality (2 fields)
+    TEST_ASSERT_TRUE(payload.find("gas_resistance") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 50.58f, payload["gas_resistance"]->AsNumber());
+    TEST_ASSERT_TRUE(payload.find("iaq") != payload.end());
+    TEST_ASSERT_EQUAL(120, (int)payload["iaq"]->AsNumber());
 
-    TEST_ASSERT_TRUE(payload.isMember("rainfall_1h"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 2.57f, payload["rainfall_1h"].asFloat());
-    TEST_ASSERT_TRUE(payload.isMember("rainfall_24h"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 15.89f, payload["rainfall_24h"].asFloat());
+    // Power measurements (2 fields)
+    TEST_ASSERT_TRUE(payload.find("voltage") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 3.34f, payload["voltage"]->AsNumber());
+    TEST_ASSERT_TRUE(payload.find("current") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 0.53f, payload["current"]->AsNumber());
 
-    TEST_ASSERT_TRUE(payload.isMember("soil_moisture"));
-    TEST_ASSERT_EQUAL(85, payload["soil_moisture"].asInt());
-    TEST_ASSERT_TRUE(payload.isMember("soil_temperature"));
-    TEST_ASSERT_FLOAT_WITHIN(0.01f, 18.54f, payload["soil_temperature"].asFloat());
+    // Light measurements (4 fields)
+    TEST_ASSERT_TRUE(payload.find("lux") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 450.12f, payload["lux"]->AsNumber());
+    TEST_ASSERT_TRUE(payload.find("white_lux") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 380.95f, payload["white_lux"]->AsNumber());
+    TEST_ASSERT_TRUE(payload.find("ir_lux") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 25.37f, payload["ir_lux"]->AsNumber());
+    TEST_ASSERT_TRUE(payload.find("uv_lux") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 15.68f, payload["uv_lux"]->AsNumber());
+
+    // Distance measurement (1 field)
+    TEST_ASSERT_TRUE(payload.find("distance") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 150.29f, payload["distance"]->AsNumber());
+
+    // Wind measurements (4 fields)
+    TEST_ASSERT_TRUE(payload.find("wind_direction") != payload.end());
+    TEST_ASSERT_EQUAL(180, (int)payload["wind_direction"]->AsNumber());
+    TEST_ASSERT_TRUE(payload.find("wind_speed") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 5.52f, payload["wind_speed"]->AsNumber());
+    TEST_ASSERT_TRUE(payload.find("wind_gust") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 8.24f, payload["wind_gust"]->AsNumber());
+    TEST_ASSERT_TRUE(payload.find("wind_lull") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 2.13f, payload["wind_lull"]->AsNumber());
+
+    // Weight measurement (1 field)
+    TEST_ASSERT_TRUE(payload.find("weight") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 75.56f, payload["weight"]->AsNumber());
+
+    // Radiation measurement (1 field)
+    TEST_ASSERT_TRUE(payload.find("radiation") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 0.13f, payload["radiation"]->AsNumber());
+
+    // Rainfall measurements (2 fields)
+    TEST_ASSERT_TRUE(payload.find("rainfall_1h") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 2.57f, payload["rainfall_1h"]->AsNumber());
+    TEST_ASSERT_TRUE(payload.find("rainfall_24h") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 15.89f, payload["rainfall_24h"]->AsNumber());
+
+    // Soil measurements (2 fields)
+    TEST_ASSERT_TRUE(payload.find("soil_moisture") != payload.end());
+    TEST_ASSERT_EQUAL(85, (int)payload["soil_moisture"]->AsNumber());
+    TEST_ASSERT_TRUE(payload.find("soil_temperature") != payload.end());
+    TEST_ASSERT_FLOAT_WITHIN(0.01f, 18.54f, payload["soil_temperature"]->AsNumber());
+
+    // Total: 22 environment fields
+    // This test ensures 100% coverage of environment metrics
+
+    // Note: JSON float serialization precision may vary due to the underlying library
+    // The important aspect is that all values are numerically accurate within tolerance
+
+    delete root;
 }
 
+// Test that unset environment fields are not present in JSON
 void test_telemetry_environment_metrics_unset_fields()
 {
     uint8_t buffer[256];
     size_t payload_size = encode_telemetry_environment_metrics_empty(buffer, sizeof(buffer));
 
-    Json::Value root = serialize_and_get_payload(meshtastic_PortNum_TELEMETRY_APP, buffer, payload_size);
-    const Json::Value &payload = root["payload"];
+    meshtastic_MeshPacket packet = create_test_packet(meshtastic_PortNum_TELEMETRY_APP, buffer, payload_size);
 
-    TEST_ASSERT_FALSE(payload.isMember("temperature"));
-    TEST_ASSERT_FALSE(payload.isMember("relative_humidity"));
-    TEST_ASSERT_FALSE(payload.isMember("barometric_pressure"));
-    TEST_ASSERT_FALSE(payload.isMember("gas_resistance"));
-    TEST_ASSERT_FALSE(payload.isMember("iaq"));
-    TEST_ASSERT_FALSE(payload.isMember("voltage"));
-    TEST_ASSERT_FALSE(payload.isMember("current"));
-    TEST_ASSERT_FALSE(payload.isMember("lux"));
-    TEST_ASSERT_FALSE(payload.isMember("white_lux"));
-    TEST_ASSERT_FALSE(payload.isMember("ir_lux"));
-    TEST_ASSERT_FALSE(payload.isMember("uv_lux"));
-    TEST_ASSERT_FALSE(payload.isMember("distance"));
-    TEST_ASSERT_FALSE(payload.isMember("wind_direction"));
-    TEST_ASSERT_FALSE(payload.isMember("wind_speed"));
-    TEST_ASSERT_FALSE(payload.isMember("wind_gust"));
-    TEST_ASSERT_FALSE(payload.isMember("wind_lull"));
-    TEST_ASSERT_FALSE(payload.isMember("weight"));
-    TEST_ASSERT_FALSE(payload.isMember("radiation"));
-    TEST_ASSERT_FALSE(payload.isMember("rainfall_1h"));
-    TEST_ASSERT_FALSE(payload.isMember("rainfall_24h"));
-    TEST_ASSERT_FALSE(payload.isMember("soil_moisture"));
-    TEST_ASSERT_FALSE(payload.isMember("soil_temperature"));
+    std::string json = MeshPacketSerializer::JsonSerialize(&packet, false);
+    TEST_ASSERT_TRUE(json.length() > 0);
+
+    JSONValue *root = JSON::Parse(json.c_str());
+    TEST_ASSERT_NOT_NULL(root);
+    TEST_ASSERT_TRUE(root->IsObject());
+
+    JSONObject jsonObj = root->AsObject();
+
+    // Check payload exists
+    TEST_ASSERT_TRUE(jsonObj.find("payload") != jsonObj.end());
+    TEST_ASSERT_TRUE(jsonObj["payload"]->IsObject());
+
+    JSONObject payload = jsonObj["payload"]->AsObject();
+
+    // With completely empty environment metrics, NO fields should be present
+    // Only basic telemetry fields like "time" might be present
+
+    // All 22 environment fields should be absent (none were set)
+    TEST_ASSERT_TRUE(payload.find("temperature") == payload.end());
+    TEST_ASSERT_TRUE(payload.find("relative_humidity") == payload.end());
+    TEST_ASSERT_TRUE(payload.find("barometric_pressure") == payload.end());
+    TEST_ASSERT_TRUE(payload.find("gas_resistance") == payload.end());
+    TEST_ASSERT_TRUE(payload.find("iaq") == payload.end());
+    TEST_ASSERT_TRUE(payload.find("voltage") == payload.end());
+    TEST_ASSERT_TRUE(payload.find("current") == payload.end());
+    TEST_ASSERT_TRUE(payload.find("lux") == payload.end());
+    TEST_ASSERT_TRUE(payload.find("white_lux") == payload.end());
+    TEST_ASSERT_TRUE(payload.find("ir_lux") == payload.end());
+    TEST_ASSERT_TRUE(payload.find("uv_lux") == payload.end());
+    TEST_ASSERT_TRUE(payload.find("distance") == payload.end());
+    TEST_ASSERT_TRUE(payload.find("wind_direction") == payload.end());
+    TEST_ASSERT_TRUE(payload.find("wind_speed") == payload.end());
+    TEST_ASSERT_TRUE(payload.find("wind_gust") == payload.end());
+    TEST_ASSERT_TRUE(payload.find("wind_lull") == payload.end());
+    TEST_ASSERT_TRUE(payload.find("weight") == payload.end());
+    TEST_ASSERT_TRUE(payload.find("radiation") == payload.end());
+    TEST_ASSERT_TRUE(payload.find("rainfall_1h") == payload.end());
+    TEST_ASSERT_TRUE(payload.find("rainfall_24h") == payload.end());
+    TEST_ASSERT_TRUE(payload.find("soil_moisture") == payload.end());
+    TEST_ASSERT_TRUE(payload.find("soil_temperature") == payload.end());
+
+    delete root;
 }

test/test_meshpacket_serializer/ports/test_text_message.cpp

@@ -1,30 +1,48 @@
 #include "../test_helpers.h"
+#include <memory>
 
-static void verify_text_message_packet_structure(const std::string &json, const char *expected_text)
+// Helper function to test common packet fields and structure
+void verify_text_message_packet_structure(const std::string &json, const char *expected_text)
 {
     TEST_ASSERT_TRUE(json.length() > 0);
 
-    Json::Value root = parse_json(json);
-    TEST_ASSERT_TRUE(root.isObject());
+    // Use smart pointer for automatic memory management
+    std::unique_ptr<JSONValue> root(JSON::Parse(json.c_str()));
+    TEST_ASSERT_NOT_NULL(root.get());
+    TEST_ASSERT_TRUE(root->IsObject());
 
-    TEST_ASSERT_TRUE(root.isMember("from"));
-    TEST_ASSERT_EQUAL(0x11223344u, root["from"].asUInt());
-    TEST_ASSERT_TRUE(root.isMember("to"));
-    TEST_ASSERT_EQUAL(0x55667788u, root["to"].asUInt());
-    TEST_ASSERT_TRUE(root.isMember("id"));
-    TEST_ASSERT_EQUAL(0x9999u, root["id"].asUInt());
+    JSONObject jsonObj = root->AsObject();
 
-    TEST_ASSERT_TRUE(root.isMember("type"));
-    TEST_ASSERT_EQUAL_STRING("text", root["type"].asString().c_str());
+    // Check basic packet fields - use helper function to reduce duplication
+    auto check_field = [&](const char *field, uint32_t expected_value) {
+        auto it = jsonObj.find(field);
+        TEST_ASSERT_TRUE(it != jsonObj.end());
+        TEST_ASSERT_EQUAL(expected_value, (uint32_t)it->second->AsNumber());
+    };
 
-    TEST_ASSERT_TRUE(root.isMember("payload"));
-    TEST_ASSERT_TRUE(root["payload"].isObject());
+    check_field("from", 0x11223344);
+    check_field("to", 0x55667788);
+    check_field("id", 0x9999);
 
-    const Json::Value &payload = root["payload"];
-    TEST_ASSERT_TRUE(payload.isMember("text"));
-    TEST_ASSERT_EQUAL_STRING(expected_text, payload["text"].asString().c_str());
+    // Check message type
+    auto type_it = jsonObj.find("type");
+    TEST_ASSERT_TRUE(type_it != jsonObj.end());
+    TEST_ASSERT_EQUAL_STRING("text", type_it->second->AsString().c_str());
+
+    // Check payload
+    auto payload_it = jsonObj.find("payload");
+    TEST_ASSERT_TRUE(payload_it != jsonObj.end());
+    TEST_ASSERT_TRUE(payload_it->second->IsObject());
+
+    JSONObject payload = payload_it->second->AsObject();
+    auto text_it = payload.find("text");
+    TEST_ASSERT_TRUE(text_it != payload.end());
+    TEST_ASSERT_EQUAL_STRING(expected_text, text_it->second->AsString().c_str());
+
+    // No need for manual delete with smart pointer
 }
 
+// Test TEXT_MESSAGE_APP port
 void test_text_message_serialization()
 {
     const char *test_text = "Hello Meshtastic!";
@@ -35,6 +53,7 @@ void test_text_message_serialization()
     verify_text_message_packet_structure(json, test_text);
 }
 
+// Test with nullptr to check robustness
 void test_text_message_serialization_null()
 {
     meshtastic_MeshPacket packet = create_test_packet(meshtastic_PortNum_TEXT_MESSAGE_APP, nullptr, 0);
@@ -43,9 +62,11 @@ void test_text_message_serialization_null()
     verify_text_message_packet_structure(json, "");
 }
 
+// Test TEXT_MESSAGE_APP port with very long message (boundary testing)
 void test_text_message_serialization_long_text()
 {
-    constexpr size_t MAX_MESSAGE_SIZE = 200;
+    // Test with actual message size limits
+    constexpr size_t MAX_MESSAGE_SIZE = 200; // Typical LoRa payload limit
     std::string long_text(MAX_MESSAGE_SIZE, 'A');
 
     meshtastic_MeshPacket packet = create_test_packet(meshtastic_PortNum_TEXT_MESSAGE_APP,
@@ -55,25 +76,30 @@ void test_text_message_serialization_long_text()
     verify_text_message_packet_structure(json, long_text.c_str());
 }
 
+// Test with message over size limit (should fail)
 void test_text_message_serialization_oversized()
 {
-    constexpr size_t OVERSIZED_MESSAGE = 250;
+    constexpr size_t OVERSIZED_MESSAGE = 250; // Over the limit
     std::string oversized_text(OVERSIZED_MESSAGE, 'B');
 
     meshtastic_MeshPacket packet = create_test_packet(
         meshtastic_PortNum_TEXT_MESSAGE_APP, reinterpret_cast<const uint8_t *>(oversized_text.c_str()), oversized_text.length());
 
+    // Should fail or return empty/error
     std::string json = MeshPacketSerializer::JsonSerialize(&packet, false);
+    // Should only verify first 234 characters for oversized messages
     std::string expected_text = oversized_text.substr(0, 234);
     verify_text_message_packet_structure(json, expected_text.c_str());
 }
 
+// Add test for malformed UTF-8 sequences
 void test_text_message_serialization_invalid_utf8()
 {
-    const uint8_t invalid_utf8[] = {0xFF, 0xFE, 0xFD, 0x00};
+    const uint8_t invalid_utf8[] = {0xFF, 0xFE, 0xFD, 0x00}; // Invalid UTF-8
     meshtastic_MeshPacket packet =
         create_test_packet(meshtastic_PortNum_TEXT_MESSAGE_APP, invalid_utf8, sizeof(invalid_utf8) - 1);
 
+    // Should not crash, may produce replacement characters
     std::string json = MeshPacketSerializer::JsonSerialize(&packet, false);
     TEST_ASSERT_TRUE(json.length() > 0);
-}
+}

test/test_meshpacket_serializer/ports/test_waypoint.cpp

@@ -6,7 +6,7 @@ static size_t encode_waypoint(uint8_t *buffer, size_t buffer_size)
     waypoint.id = 12345;
     waypoint.latitude_i = 374208000;
     waypoint.longitude_i = -1221981000;
-    waypoint.expire = 1609459200 + 3600;
+    waypoint.expire = 1609459200 + 3600; // 1 hour from now
     strcpy(waypoint.name, "Test Point");
     strcpy(waypoint.description, "Test waypoint description");
 
@@ -15,6 +15,7 @@ static size_t encode_waypoint(uint8_t *buffer, size_t buffer_size)
     return stream.bytes_written;
 }
 
+// Test WAYPOINT_APP port
 void test_waypoint_serialization()
 {
     uint8_t buffer[256];
@@ -25,20 +26,28 @@ void test_waypoint_serialization()
     std::string json = MeshPacketSerializer::JsonSerialize(&packet, false);
     TEST_ASSERT_TRUE(json.length() > 0);
 
-    Json::Value root = parse_json(json);
-    TEST_ASSERT_TRUE(root.isObject());
+    JSONValue *root = JSON::Parse(json.c_str());
+    TEST_ASSERT_NOT_NULL(root);
+    TEST_ASSERT_TRUE(root->IsObject());
 
-    TEST_ASSERT_TRUE(root.isMember("type"));
-    TEST_ASSERT_EQUAL_STRING("waypoint", root["type"].asString().c_str());
+    JSONObject jsonObj = root->AsObject();
 
-    TEST_ASSERT_TRUE(root.isMember("payload"));
-    TEST_ASSERT_TRUE(root["payload"].isObject());
+    // Check message type
+    TEST_ASSERT_TRUE(jsonObj.find("type") != jsonObj.end());
+    TEST_ASSERT_EQUAL_STRING("waypoint", jsonObj["type"]->AsString().c_str());
 
-    const Json::Value &payload = root["payload"];
+    // Check payload
+    TEST_ASSERT_TRUE(jsonObj.find("payload") != jsonObj.end());
+    TEST_ASSERT_TRUE(jsonObj["payload"]->IsObject());
 
-    TEST_ASSERT_TRUE(payload.isMember("id"));
-    TEST_ASSERT_EQUAL(12345, payload["id"].asInt());
+    JSONObject payload = jsonObj["payload"]->AsObject();
 
-    TEST_ASSERT_TRUE(payload.isMember("name"));
-    TEST_ASSERT_EQUAL_STRING("Test Point", payload["name"].asString().c_str());
+    // Verify waypoint data
+    TEST_ASSERT_TRUE(payload.find("id") != payload.end());
+    TEST_ASSERT_EQUAL(12345, (int)payload["id"]->AsNumber());
+
+    TEST_ASSERT_TRUE(payload.find("name") != payload.end());
+    TEST_ASSERT_EQUAL_STRING("Test Point", payload["name"]->AsString().c_str());
+
+    delete root;
 }

test/test_meshpacket_serializer/test_helpers.h

@@ -1,9 +1,8 @@
 #pragma once
 
+#include "serialization/JSON.h"
 #include "serialization/MeshPacketSerializer.h"
 #include <Arduino.h>
-#include <json/json.h>
-#include <memory>
 #include <meshtastic/mesh.pb.h>
 #include <meshtastic/mqtt.pb.h>
 #include <meshtastic/telemetry.pb.h>
@@ -11,18 +10,6 @@
 #include <pb_encode.h>
 #include <unity.h>
 
-// Parse a JSON string into a Json::Value; returns Json::nullValue on failure.
-static inline Json::Value parse_json(const std::string &s)
-{
-    Json::CharReaderBuilder b;
-    Json::Value root;
-    std::string errs;
-    std::unique_ptr<Json::CharReader> reader(b.newCharReader());
-    if (!reader->parse(s.c_str(), s.c_str() + s.size(), &root, &errs))
-        return Json::Value();
-    return root;
-}
-
 // Helper function to create a test packet with the given port and payload
 static meshtastic_MeshPacket create_test_packet(meshtastic_PortNum port, const uint8_t *payload, size_t payload_size,
                                                 int payload_variant = meshtastic_MeshPacket_decoded_tag)
@@ -49,8 +36,7 @@ static meshtastic_MeshPacket create_test_packet(meshtastic_PortNum port, const u
         packet.encrypted.size = payload_size;
         memcpy(packet.encrypted.bytes, payload, packet.encrypted.size);
     }
-    if (payload && payload_size)
-        memcpy(packet.decoded.payload.bytes, payload, payload_size);
+    memcpy(packet.decoded.payload.bytes, payload, payload_size);
     packet.decoded.payload.size = payload_size;
     packet.decoded.want_response = false;
     packet.decoded.dest = 0x55667788;

variants/esp32/chatter2/platformio.ini

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

variants/esp32/diy/9m2ibr_aprs_lora_tracker/platformio.ini

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

variants/esp32/diy/hydra/platformio.ini

@@ -14,3 +14,4 @@ build_flags =
   ${esp32_base.build_flags}
   -D DIY_V1
   -I variants/esp32/diy/hydra
+  -ULED_BUILTIN

variants/esp32/diy/v1/platformio.ini

@@ -17,3 +17,4 @@ build_flags =
   -D DIY_V1
   -D EBYTE_E22
   -I variants/esp32/diy/v1
+  -ULED_BUILTIN

variants/esp32/heltec_v2.1/platformio.ini

@@ -14,3 +14,4 @@ build_flags =
   ${esp32_base.build_flags}
   -D HELTEC_V2_1
   -I variants/esp32/heltec_v2.1
+  -ULED_BUILTIN

variants/esp32/heltec_v2/platformio.ini

@@ -14,3 +14,4 @@ build_flags =
   ${esp32_base.build_flags}
   -D HELTEC_V2_0
   -I variants/esp32/heltec_v2
+  -ULED_BUILTIN

variants/esp32/heltec_wireless_bridge/platformio.ini

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

variants/esp32/nano-g1-explorer/platformio.ini

@@ -14,3 +14,4 @@ build_flags =
   ${esp32_base.build_flags}
   -D NANO_G1_EXPLORER
   -I variants/esp32/nano-g1-explorer
+  -ULED_BUILTIN

variants/esp32/nano-g1/platformio.ini

@@ -14,3 +14,4 @@ build_flags =
   ${esp32_base.build_flags}
   -D NANO_G1
   -I variants/esp32/nano-g1
+  -ULED_BUILTIN

variants/esp32/radiomaster_900_bandit/platformio.ini

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

variants/esp32/radiomaster_900_bandit_micro/platformio.ini

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

variants/esp32/radiomaster_900_bandit_nano/platformio.ini

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

variants/esp32/station-g1/platformio.ini

@@ -14,3 +14,4 @@ build_flags =
   ${esp32_base.build_flags}
   -D STATION_G1
   -I variants/esp32/station-g1
+  -ULED_BUILTIN

variants/esp32/tbeam/platformio.ini

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

variants/esp32/tlora_v1/platformio.ini

@@ -13,4 +13,5 @@ build_flags =
   ${esp32_base.build_flags}
   -D TLORA_V1
   -I variants/esp32/tlora_v1
+  -ULED_BUILTIN
 upload_speed = 115200

variants/esp32/tlora_v2_1_16/platformio.ini

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

variants/esp32/tlora_v2_1_16_tcxo/platformio.ini

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

variants/esp32/tlora_v3_3_0_tcxo/platformio.ini

@@ -7,3 +7,4 @@ build_flags =
   -I variants/esp32/tlora_v2_1_16
   -D LORA_TCXO_GPIO=12
   -D BUTTON_PIN=0
+  -ULED_BUILTIN

variants/esp32c6/tlora_c6/platformio.ini

@@ -8,3 +8,4 @@ build_flags =
   -I variants/esp32c6/tlora_c6
   -DARDUINO_USB_CDC_ON_BOOT=1
   -DARDUINO_USB_MODE=1
+  -ULED_BUILTIN

variants/esp32s3/heltec_capsule_sensor_v3/platformio.ini

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

variants/esp32s3/heltec_sensor_hub/platformio.ini

@@ -7,3 +7,4 @@ build_flags =
   ${esp32s3_base.build_flags}
   -I variants/esp32s3/heltec_sensor_hub
   -D HELTEC_SENSOR_HUB
+  -ULED_BUILTIN

variants/esp32s3/heltec_v3/platformio.ini

@@ -18,3 +18,4 @@ build_flags =
   ${esp32s3_base.build_flags}
   -D HELTEC_V3
   -I variants/esp32s3/heltec_v3
+  -ULED_BUILTIN

variants/esp32s3/heltec_v4/platformio.ini

@@ -8,6 +8,7 @@ build_flags =
   -D HELTEC_V4
   -D HAS_LORA_FEM=1
   -I variants/esp32s3/heltec_v4
+  -ULED_BUILTIN
 
 
 [env:heltec-v4]

variants/esp32s3/heltec_vision_master_t190/platformio.ini

@@ -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/a787beea5c6c8f864ba6787eb432bbefc575e6ad.zip
 upload_speed = 921600

variants/esp32s3/heltec_wsl_v3/platformio.ini

@@ -17,3 +17,4 @@ build_flags =
   ${esp32s3_base.build_flags}
   -D HELTEC_WSL_V3
   -I variants/esp32s3/heltec_wsl_v3
+  -ULED_BUILTIN

variants/esp32s3/link32_s3_v1/platformio.ini

@@ -11,4 +11,3 @@ build_flags =
   -DRADIOLIB_EXCLUDE_SX128X=1
   -DRADIOLIB_EXCLUDE_SX127X=1
   -DRADIOLIB_EXCLUDE_LR11X0=1
-  -DRADIOLIB_EXCLUDE_LR2021=1

variants/esp32s3/m5stack_cardputer_adv/platformio.ini

@@ -16,7 +16,7 @@ build_src_filter =
 lib_deps =
   ${esp32s3_base.lib_deps}
   # renovate: datasource=git-refs depName=meshtastic-st7789 packageName=https://github.com/meshtastic/st7789 gitBranch=main
-  https://github.com/meshtastic/st7789/archive/92bae2e4a307afb430c3b0bc3d661c55ee1565f0.zip
+  https://github.com/meshtastic/st7789/archive/a787beea5c6c8f864ba6787eb432bbefc575e6ad.zip
   # renovate: datasource=github-tags depName=pschatzmann_arduino-audio-driver packageName=pschatzmann/arduino-audio-driver
   https://github.com/pschatzmann/arduino-audio-driver/archive/v0.2.1.zip
   # renovate: datasource=git-refs depName=ESP8266Audio packageName=https://github.com/meshtastic/ESP8266Audio gitBranch=meshtastic-2.0.0-dacfix

variants/native/portduino.ini

@@ -2,7 +2,7 @@
 [portduino_base]
 platform =
   # renovate: datasource=git-refs depName=platform-native packageName=https://github.com/meshtastic/platform-native gitBranch=develop
-  https://github.com/meshtastic/platform-native/archive/71ed55bb95feb3c43ebde1ec1e2e17643a424c04.zip
+  https://github.com/meshtastic/platform-native/archive/f566d364204416cdbf298e349213f7d551f793d9.zip
 framework = arduino
 
 build_src_filter = 
@@ -52,8 +52,6 @@ build_flags =
   -lbluetooth
   -lgpiod
   -lyaml-cpp
-  -ljsoncpp
-  !pkg-config --cflags jsoncpp --silence-errors || :
   -li2c
   -luv
   -std=gnu17

variants/native/portduino/platformio.ini

@@ -9,7 +9,7 @@ lib_deps =
   # renovate: datasource=custom.pio depName=Melopero RV3028 packageName=melopero/library/Melopero RV3028
   melopero/Melopero RV3028@1.2.0
 
-build_src_filter = ${portduino_base.build_src_filter}
+build_src_filter = ${portduino_base.build_src_filter} +<modules/Native/>
 
 [env:native]
 extends = native_base
@@ -20,6 +20,7 @@ build_flags = ${native_base.build_flags}
   !pkg-config --libs openssl --silence-errors || :
   !pkg-config --cflags --libs sdl2 --silence-errors || :
   !pkg-config --cflags --libs libbsd-overlay --silence-errors || :
+  !pkg-config --cflags --libs sqlite3 --silence-errors || :
 
 [env:native-tft]
 extends = native_base
@@ -46,6 +47,7 @@ build_flags = ${native_base.build_flags} -Os -lX11 -linput -lxkbcommon -ffunctio
   !pkg-config --libs openssl --silence-errors || :
   !pkg-config --cflags --libs sdl2 --silence-errors || :
   !pkg-config --cflags --libs libbsd-overlay --silence-errors || :
+  !pkg-config --cflags --libs sqlite3 --silence-errors || :
 build_src_filter =
   ${native_base.build_src_filter}
 
@@ -75,6 +77,7 @@ build_flags = ${native_base.build_flags} -Os -ffunction-sections -fdata-sections
   !pkg-config --libs libulfius --silence-errors || :
   !pkg-config --libs openssl --silence-errors || :
   !pkg-config --cflags --libs libbsd-overlay --silence-errors || :
+  !pkg-config --cflags --libs sqlite3 --silence-errors || :
 build_src_filter =
   ${native_base.build_src_filter}
 
@@ -108,6 +111,7 @@ build_flags = ${native_base.build_flags} -O0 -fsanitize=address -lX11 -linput -l
   !pkg-config --libs libulfius --silence-errors || :
   !pkg-config --libs openssl --silence-errors || :
   !pkg-config --cflags --libs libbsd-overlay --silence-errors || :
+  !pkg-config --cflags --libs sqlite3 --silence-errors || :
 build_src_filter = ${env:native-tft.build_src_filter}
 
 [env:coverage]

variants/nrf52840/gat562_mesh_trial_tracker/platformio.ini

@@ -11,5 +11,4 @@ build_flags = ${nrf52840_base.build_flags}
   -DRADIOLIB_EXCLUDE_SX128X=1
   -DRADIOLIB_EXCLUDE_SX127X=1
   -DRADIOLIB_EXCLUDE_LR11X0=1
-  -DRADIOLIB_EXCLUDE_LR2021=1
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/gat562_mesh_trial_tracker>

variants/nrf52840/heltec_mesh_node_t114/platformio.ini

@@ -23,4 +23,4 @@ build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/heltec_
 lib_deps = 
   ${nrf52840_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/a787beea5c6c8f864ba6787eb432bbefc575e6ad.zip

variants/nrf52840/heltec_mesh_solar/platformio.ini

@@ -132,4 +132,4 @@ build_flags = ${heltec_mesh_solar_base.build_flags}
 lib_deps =
   ${heltec_mesh_solar_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/a787beea5c6c8f864ba6787eb432bbefc575e6ad.zip