WIP: Audio voice memo functionality

Master to dev merge

.github/copilot-instructions.md

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

.github/workflows/test_native.yml

@@ -143,7 +143,7 @@ jobs:
           merge-multiple: true
 
       - name: Test Report
-        uses: dorny/test-reporter@v2.4.0
+        uses: dorny/test-reporter@v2.5.0
         with:
           name: PlatformIO Tests
           path: testreport.xml

.github/workflows/trunk_format_pr.yml

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

.trunk/trunk.yaml

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

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

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

boards/t-beam-1w.json

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

platformio.ini

@@ -119,7 +119,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/a8e2f947f7abaf0c5ac8e6dd189a22156335beaa.zip
+	https://github.com/meshtastic/device-ui/archive/272defcb35651461830ebfd1b39c9167c8f49317.zip
 
 ; Common libs for environmental measurements in telemetry module
 [environmental_base]

src/Power.cpp

@@ -1149,11 +1149,11 @@ bool Power::axpChipInit()
             PMU->setPowerChannelVoltage(XPOWERS_ALDO1, 3300);
             PMU->enablePowerOutput(XPOWERS_ALDO1);
 
-            // sdcard power channel
+            // sdcard (T-Beam S3) / gnns (T-Watch S3 Plus) power channel
             PMU->setPowerChannelVoltage(XPOWERS_BLDO1, 3300);
+#ifndef T_WATCH_S3
             PMU->enablePowerOutput(XPOWERS_BLDO1);
-
-#ifdef T_WATCH_S3
+#else
             // DRV2605 power channel
             PMU->setPowerChannelVoltage(XPOWERS_BLDO2, 3300);
             PMU->enablePowerOutput(XPOWERS_BLDO2);

src/buzz/BuzzerFeedbackThread.cpp

@@ -22,15 +22,19 @@ int BuzzerFeedbackThread::handleInputEvent(const InputEvent *event)
 
     // Handle different input events with appropriate buzzer feedback
     switch (event->inputEvent) {
-    case INPUT_BROKER_USER_PRESS:
-    case INPUT_BROKER_ALT_PRESS:
-        playClick(); // Low delay feedback
-        break;
-
+#ifdef INPUTDRIVER_ENCODER_TYPE
     case INPUT_BROKER_SELECT:
     case INPUT_BROKER_SELECT_LONG:
-        playBeep(); // Confirmation feedback
+        playClick();
         break;
+#else
+    case INPUT_BROKER_USER_PRESS:
+    case INPUT_BROKER_ALT_PRESS:
+    case INPUT_BROKER_SELECT:
+    case INPUT_BROKER_SELECT_LONG:
+        playBeep();
+        break;
+#endif
 
     case INPUT_BROKER_UP:
     case INPUT_BROKER_UP_LONG:

src/buzz/buzz.cpp

@@ -35,6 +35,14 @@ struct ToneDuration {
 #define NOTE_G6 1568
 #define NOTE_E7 2637
 
+#define NOTE_C4 262
+#define NOTE_E4 330
+#define NOTE_G4 392
+#define NOTE_A4 440
+#define NOTE_C5 523
+#define NOTE_E5 659
+#define NOTE_G5 784
+
 const int DURATION_1_16 = 62;  // 1/16 note
 const int DURATION_1_8 = 125;  // 1/8 note
 const int DURATION_1_4 = 250;  // 1/4 note
@@ -65,7 +73,7 @@ void playTones(const ToneDuration *tone_durations, int size)
 
 void playBeep()
 {
-    ToneDuration melody[] = {{NOTE_B3, DURATION_1_8}};
+    ToneDuration melody[] = {{NOTE_B3, DURATION_1_16}};
     playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }
 
@@ -189,3 +197,17 @@ void playComboTune()
     };
     playTones(melody, sizeof(melody) / sizeof(ToneDuration));
 }
+
+void play4ClickDown()
+{
+    ToneDuration melody[] = {{NOTE_G5, 55}, {NOTE_E5, 55}, {NOTE_C5, 60},  {NOTE_A4, 55},  {NOTE_G4, 55},
+                             {NOTE_E4, 65}, {NOTE_C4, 80}, {NOTE_G3, 120}, {NOTE_E3, 160}, {NOTE_SILENT, 120}};
+    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
+}
+
+void play4ClickUp()
+{
+    // Quick high-pitched notes with trills
+    ToneDuration melody[] = {{NOTE_F5, 50}, {NOTE_G6, 45}, {NOTE_E7, 60}};
+    playTones(melody, sizeof(melody) / sizeof(ToneDuration));
+}

src/buzz/buzz.h

@@ -7,6 +7,8 @@ void playShutdownMelody();
 void playGPSEnableBeep();
 void playGPSDisableBeep();
 void playComboTune();
+void play4ClickDown();
+void play4ClickUp();
 void playBoop();
 void playChirp();
 void playClick();

src/detect/ScanI2CTwoWire.cpp

@@ -68,7 +68,7 @@ ScanI2C::DeviceType ScanI2CTwoWire::probeOLED(ScanI2C::DeviceAddress addr) const
         if (r == 0x08 || r == 0x00) {
             logFoundDevice("SH1106", (uint8_t)addr.address);
             o_probe = SCREEN_SH1106; // SH1106
-        } else if (r == 0x03 || r == 0x04 || r == 0x06 || r == 0x07) {
+        } else if (r == 0x03 || r == 0x04 || r == 0x06 || r == 0x07 || r == 0x05) {
             logFoundDevice("SSD1306", (uint8_t)addr.address);
             o_probe = SCREEN_SSD1306; // SSD1306
         }

src/gps/GPS.cpp

@@ -934,8 +934,11 @@ void GPS::setPowerPMU(bool on)
             // t-beam v1.2 GNSS power channel
             on ? PMU->enablePowerOutput(XPOWERS_ALDO3) : PMU->disablePowerOutput(XPOWERS_ALDO3);
         } else if (HW_VENDOR == meshtastic_HardwareModel_LILYGO_TBEAM_S3_CORE) {
-            // t-beam-s3-core GNSS  power channel
+            // t-beam-s3-core GNSS power channel
             on ? PMU->enablePowerOutput(XPOWERS_ALDO4) : PMU->disablePowerOutput(XPOWERS_ALDO4);
+        } else if (HW_VENDOR == meshtastic_HardwareModel_T_WATCH_S3) {
+            // t-watch-s3-plus GNSS power channel
+            on ? PMU->enablePowerOutput(XPOWERS_BLDO1) : PMU->disablePowerOutput(XPOWERS_BLDO1);
         }
     } else if (model == XPOWERS_AXP192) {
         // t-beam v1.1 GNSS  power channel

src/graphics/EInkDisplay2.cpp

@@ -148,7 +148,7 @@ bool EInkDisplay::connect()
 #endif
 #endif
 
-#if defined(TTGO_T_ECHO) || defined(ELECROW_ThinkNode_M1) || defined(T_ECHO_LITE)
+#if defined(TTGO_T_ECHO) || defined(ELECROW_ThinkNode_M1) || defined(T_ECHO_LITE) || defined(TTGO_T_ECHO_PLUS)
     {
         auto lowLevel = new EINK_DISPLAY_MODEL(PIN_EINK_CS, PIN_EINK_DC, PIN_EINK_RES, PIN_EINK_BUSY, SPI1);
 

src/graphics/Screen.cpp

@@ -312,6 +312,7 @@ Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_O
 
     // Only validate the combined value once
     if (rawRGB > 0 && rawRGB <= 255255255) {
+        LOG_INFO("Setting screen RGB color to user chosen: 0x%06X", rawRGB);
         // Extract each component as a normal int first
         int r = (rawRGB >> 16) & 0xFF;
         int g = (rawRGB >> 8) & 0xFF;
@@ -319,6 +320,16 @@ Screen::Screen(ScanI2C::DeviceAddress address, meshtastic_Config_DisplayConfig_O
         if (r >= 0 && r <= 255 && g >= 0 && g <= 255 && b >= 0 && b <= 255) {
             TFT_MESH = COLOR565(static_cast<uint8_t>(r), static_cast<uint8_t>(g), static_cast<uint8_t>(b));
         }
+#ifdef TFT_MESH_OVERRIDE
+    } else if (rawRGB == 0) {
+        LOG_INFO("Setting screen RGB color to TFT_MESH_OVERRIDE: 0x%04X", TFT_MESH_OVERRIDE);
+        // Default to TFT_MESH_OVERRIDE if available
+        TFT_MESH = TFT_MESH_OVERRIDE;
+#endif
+    } else {
+        // Default best readable yellow color
+        LOG_INFO("Setting screen RGB color to default: (255,255,128)");
+        TFT_MESH = COLOR565(255, 255, 128);
     }
 
 #if defined(USE_SH1106) || defined(USE_SH1107) || defined(USE_SH1107_128_64)
@@ -1429,10 +1440,15 @@ int Screen::handleStatusUpdate(const meshtastic::Status *arg)
         }
         nodeDB->updateGUI = false;
         break;
-    case STATUS_TYPE_POWER:
-        forceDisplay(true);
+    case STATUS_TYPE_POWER: {
+        bool currentUSB = powerStatus->getHasUSB();
+        if (currentUSB != lastPowerUSBState) {
+            lastPowerUSBState = currentUSB;
+            forceDisplay(true);
+        }
         break;
     }
+    }
 
     return 0;
 }

src/graphics/Screen.h

@@ -715,6 +715,8 @@ class Screen : public concurrency::OSThread
     // Whether we are showing the regular screen (as opposed to booth screen or
     // Bluetooth PIN screen)
     bool showingNormalScreen = false;
+    /// Track USB power state to only wake screen on actual power state changes
+    bool lastPowerUSBState = false;
 
     // Implementation to Adjust Brightness
     uint8_t brightness = BRIGHTNESS_DEFAULT; // H = 254, MH = 192, ML = 130 L = 103

src/graphics/draw/MenuHandler.cpp

@@ -1840,7 +1840,7 @@ void menuHandler::TFTColorPickerMenu(OLEDDisplay *display)
     static const ScreenColorOption colorOptions[] = {
         {"Back", OptionsAction::Back},
         {"Default", OptionsAction::Select, ScreenColor(0, 0, 0, true)},
-        {"Meshtastic Green", OptionsAction::Select, ScreenColor(103, 234, 148)},
+        {"Meshtastic Green", OptionsAction::Select, ScreenColor(0x67, 0xEA, 0x94)},
         {"Yellow", OptionsAction::Select, ScreenColor(255, 255, 128)},
         {"Red", OptionsAction::Select, ScreenColor(255, 64, 64)},
         {"Orange", OptionsAction::Select, ScreenColor(255, 160, 20)},
@@ -1890,7 +1890,7 @@ void menuHandler::TFTColorPickerMenu(OLEDDisplay *display)
 #ifdef TFT_MESH_OVERRIDE
                 TFT_MESH = TFT_MESH_OVERRIDE;
 #else
-                TFT_MESH = COLOR565(0x67, 0xEA, 0x94);
+                TFT_MESH = COLOR565(255, 255, 128);
 #endif
             } else {
                 TFT_MESH = COLOR565(r, g, b);

src/input/ButtonThread.cpp

@@ -37,6 +37,9 @@ bool ButtonThread::initButton(const ButtonConfig &config)
     _activeLow = config.activeLow;
     _touchQuirk = config.touchQuirk;
     _intRoutine = config.intRoutine;
+    _pressHandler = config.onPress;
+    _releaseHandler = config.onRelease;
+    _suppressLeadUp = config.suppressLeadUpSound;
     _longLongPress = config.longLongPress;
 
     userButton = OneButton(config.pinNumber, config.activeLow, config.activePullup);
@@ -133,6 +136,8 @@ int32_t ButtonThread::runOnce()
 
     // Detect start of button press
     if (buttonCurrentlyPressed && !buttonWasPressed) {
+        if (_pressHandler)
+            _pressHandler();
         buttonPressStartTime = millis();
         leadUpPlayed = false;
         leadUpSequenceActive = false;
@@ -140,7 +145,7 @@ int32_t ButtonThread::runOnce()
     }
 
     // Progressive lead-up sound system
-    if (buttonCurrentlyPressed && (millis() - buttonPressStartTime) >= BUTTON_LEADUP_MS) {
+    if (!_suppressLeadUp && buttonCurrentlyPressed && (millis() - buttonPressStartTime) >= BUTTON_LEADUP_MS) {
 
         // Start the progressive sequence if not already active
         if (!leadUpSequenceActive) {
@@ -160,6 +165,8 @@ int32_t ButtonThread::runOnce()
 
     // Reset when button is released
     if (!buttonCurrentlyPressed && buttonWasPressed) {
+        if (_releaseHandler)
+            _releaseHandler();
         leadUpSequenceActive = false;
         resetLeadUpSequence();
     }
@@ -241,7 +248,21 @@ int32_t ButtonThread::runOnce()
                 this->notifyObservers(&evt);
                 playComboTune();
                 break;
-
+#if !HAS_SCREEN
+            case 4:
+                if (moduleConfig.external_notification.enabled && externalNotificationModule) {
+                    externalNotificationModule->setMute(!externalNotificationModule->getMute());
+                    IF_SCREEN(if (!externalNotificationModule->getMute()) externalNotificationModule->stopNow();)
+                    if (externalNotificationModule->getMute()) {
+                        LOG_INFO("Temporarily Muted");
+                        play4ClickDown(); // Disable tone
+                    } else {
+                        LOG_INFO("Unmuted");
+                        play4ClickUp(); // Enable tone
+                    }
+                }
+                break;
+#endif
             // No valid multipress action
             default:
                 break;

src/input/ButtonThread.h

@@ -13,6 +13,9 @@ struct ButtonConfig {
     bool activePullup = true;
     uint32_t pullupSense = 0;
     voidFuncPtr intRoutine = nullptr;
+    voidFuncPtr onPress = nullptr;   // Optional edge callbacks
+    voidFuncPtr onRelease = nullptr; // Optional edge callbacks
+    bool suppressLeadUpSound = false;
     input_broker_event singlePress = INPUT_BROKER_NONE;
     input_broker_event longPress = INPUT_BROKER_NONE;
     uint16_t longPressTime = 500;
@@ -94,6 +97,9 @@ class ButtonThread : public Observable<const InputEvent *>, public concurrency::
     input_broker_event _shortLong = INPUT_BROKER_NONE;
 
     voidFuncPtr _intRoutine = nullptr;
+    voidFuncPtr _pressHandler = nullptr;
+    voidFuncPtr _releaseHandler = nullptr;
+    bool _suppressLeadUp = false;
     uint16_t _longPressTime = 500;
     uint16_t _longLongPressTime = 3900;
     int _pinNum = 0;

src/input/InputBroker.h

@@ -39,6 +39,7 @@ enum input_broker_event {
 #define INPUT_BROKER_MSG_FN_SYMBOL_ON 0xf1
 #define INPUT_BROKER_MSG_FN_SYMBOL_OFF 0xf2
 #define INPUT_BROKER_MSG_BLUETOOTH_TOGGLE 0xAA
+#define INPUT_BROKER_MSG_VOICEMEMO 0xAD
 #define INPUT_BROKER_MSG_TAB 0x09
 #define INPUT_BROKER_MSG_EMOTE_LIST 0x8F
 

src/input/TCA8418Keyboard.cpp

@@ -28,18 +28,18 @@ static unsigned char TCA8418TapMap[_TCA8418_NUM_KEYS][13] = {
 };
 
 static unsigned char TCA8418LongPressMap[_TCA8418_NUM_KEYS] = {
-    Key::ESC,   // 1
-    Key::UP,    // 2
-    Key::NONE,  // 3
-    Key::LEFT,  // 4
-    Key::NONE,  // 5
-    Key::RIGHT, // 6
-    Key::NONE,  // 7
-    Key::DOWN,  // 8
-    Key::NONE,  // 9
-    Key::BSP,   // *
-    Key::NONE,  // 0
-    Key::NONE,  // #
+    Key::ESC,       // 1
+    Key::UP,        // 2
+    Key::NONE,      // 3
+    Key::LEFT,      // 4
+    Key::NONE,      // 5
+    Key::RIGHT,     // 6
+    Key::NONE,      // 7
+    Key::DOWN,      // 8
+    Key::NONE,      // 9
+    Key::BSP,       // *
+    Key::VOICEMEMO, // 0
+    Key::NONE,      // #
 };
 
 TCA8418Keyboard::TCA8418Keyboard()

src/input/TCA8418KeyboardBase.h

@@ -25,6 +25,7 @@ class TCA8418KeyboardBase
         BT_TOGGLE = 0xAA,
         GPS_TOGGLE = 0x9E,
         MUTE_TOGGLE = 0xAC,
+        VOICEMEMO = 0xAD,
         SEND_PING = 0xAF,
         BL_TOGGLE = 0xAB
     };

src/input/TDeckProKeyboard.cpp

@@ -56,8 +56,8 @@ static unsigned char TDeckProTapMap[_TCA8418_NUM_KEYS][5] = {
     {0x00, 0x00, 0x00}, // Ent, $, m, n, b, v, c, x, z, alt
     {0x00, 0x00, 0x00},
     {0x00, 0x00, 0x00},
-    {0x20, 0x00, 0x00},
-    {0x00, 0x00, '0'},
+    {0x20, 0x00, Key::VOICEMEMO},
+    {Key::VOICEMEMO, 0x00, 0x00},
     {0x00, 0x00, 0x00} // R_Shift, sym, space, mic, L_Shift
 };
 

src/input/TLoraPagerKeyboard.cpp

@@ -56,7 +56,7 @@ static unsigned char TLoraPagerTapMap[_TCA8418_NUM_KEYS][3] = {{'q', 'Q', '1'},
                                                                {'z', 'Z', '_'},
                                                                {'x', 'X', '$'},
                                                                {'c', 'C', ';'},
-                                                               {'v', 'V', '?'},
+                                                               {'v', 'V', Key::VOICEMEMO},
                                                                {'b', 'B', '!'},
                                                                {'n', 'N', ','},
                                                                {'m', 'M', '.'},

src/input/kbI2cBase.cpp

@@ -163,6 +163,16 @@ int32_t KbI2cBase::runOnce()
                         e.kbchar = key.key;
                     }
                     break;
+                case 'v': // sym v - voice memo
+                    if (is_sym) {
+                        e.inputEvent = INPUT_BROKER_ANYKEY;
+                        e.kbchar = INPUT_BROKER_MSG_VOICEMEMO;
+                        is_sym = false; // reset sym state after second keypress
+                    } else {
+                        e.inputEvent = INPUT_BROKER_ANYKEY;
+                        e.kbchar = key.key;
+                    }
+                    break;
                 case 0x13: // Code scanner says the SYM key is 0x13
                     is_sym = !is_sym;
                     e.inputEvent = INPUT_BROKER_ANYKEY;
@@ -370,6 +380,10 @@ int32_t KbI2cBase::runOnce()
 
         if (i2cBus->available()) {
             char c = i2cBus->read();
+            // Debug: log every key press
+            if (c != 0x00) {
+                LOG_DEBUG("T-Deck KB: key=0x%02X ('%c'), is_sym=%d", (uint8_t)c, (c >= 0x20 && c < 0x7f) ? c : '?', is_sym);
+            }
             InputEvent e = {};
             e.inputEvent = INPUT_BROKER_NONE;
             e.source = this->_originName;
@@ -443,6 +457,17 @@ int32_t KbI2cBase::runOnce()
                     e.kbchar = c;
                 }
                 break;
+            case 0x76: // letter v. voice memo trigger
+                if (is_sym) {
+                    is_sym = false;
+                    e.inputEvent = INPUT_BROKER_ANYKEY;
+                    e.kbchar = INPUT_BROKER_MSG_VOICEMEMO;
+                    LOG_DEBUG("T-Deck: Sym+V pressed, sending VOICEMEMO 0x%02X", INPUT_BROKER_MSG_VOICEMEMO);
+                } else {
+                    e.inputEvent = INPUT_BROKER_ANYKEY;
+                    e.kbchar = c;
+                }
+                break;
             case 0x1b: // ESC
                 e.inputEvent = INPUT_BROKER_CANCEL;
                 break;
@@ -466,9 +491,11 @@ int32_t KbI2cBase::runOnce()
                 e.inputEvent = INPUT_BROKER_RIGHT;
                 e.kbchar = 0;
                 break;
-            case 0xc: // Modifier key: 0xc is alt+c (Other options could be: 0xea = shift+mic button or 0x4 shift+$(speaker))
+            case 0x3F: // Sym key on some T-Deck variants (sends '?')
+            case 0xc:  // Modifier key: 0xc is alt+c (Other options could be: 0xea = shift+mic button or 0x4 shift+$(speaker))
                 // toggle moddifiers button.
                 is_sym = !is_sym;
+                LOG_DEBUG("T-Deck: Modifier key pressed, is_sym now=%d", is_sym);
                 e.inputEvent = INPUT_BROKER_ANYKEY;
                 e.kbchar = is_sym ? INPUT_BROKER_MSG_FN_SYMBOL_ON   // send 0xf1 to tell CannedMessages to display that the
                                   : INPUT_BROKER_MSG_FN_SYMBOL_OFF; // modifier key is active

src/main.cpp

@@ -107,6 +107,10 @@ NRF52Bluetooth *nrf52Bluetooth = nullptr;
 
 #if defined(BUTTON_PIN_TOUCH)
 ButtonThread *TouchButtonThread = nullptr;
+#if defined(TTGO_T_ECHO_PLUS) && defined(PIN_EINK_EN)
+static bool touchBacklightWasOn = false;
+static bool touchBacklightActive = false;
+#endif
 #endif
 
 #if defined(BUTTON_PIN) || defined(ARCH_PORTDUINO)
@@ -205,7 +209,7 @@ ScanI2C::FoundDevice rgb_found = ScanI2C::FoundDevice(ScanI2C::DeviceType::NONE,
 /// The I2C address of our Air Quality Indicator (if found)
 ScanI2C::DeviceAddress aqi_found = ScanI2C::ADDRESS_NONE;
 
-#if defined(T_WATCH_S3) || defined(T_LORA_PAGER)
+#ifdef HAS_DRV2605
 Adafruit_DRV2605 drv;
 #endif
 
@@ -795,7 +799,6 @@ void setup()
     // We do this as early as possible because this loads preferences from flash
     // but we need to do this after main cpu init (esp32setup), because we need the random seed set
     nodeDB = new NodeDB;
-
 #if HAS_TFT
     if (config.display.displaymode == meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
         tftSetup();
@@ -841,7 +844,12 @@ void setup()
 #endif
 #endif
 
-#if defined(T_WATCH_S3) || defined(T_LORA_PAGER)
+#ifdef HAS_DRV2605
+#if defined(PIN_DRV_EN)
+    pinMode(PIN_DRV_EN, OUTPUT);
+    digitalWrite(PIN_DRV_EN, HIGH);
+    delay(10);
+#endif
     drv.begin();
     drv.selectLibrary(1);
     // I2C trigger by sending 'go' command
@@ -877,7 +885,7 @@ void setup()
     SPI.begin();
 #endif
 #else
-        // ESP32
+// ESP32
 #if defined(HW_SPI1_DEVICE)
     SPI1.begin(LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);
     LOG_DEBUG("SPI1.begin(SCK=%d, MISO=%d, MOSI=%d, NSS=%d)", LORA_SCK, LORA_MISO, LORA_MOSI, LORA_CS);
@@ -1046,6 +1054,24 @@ void setup()
     };
     touchConfig.singlePress = INPUT_BROKER_NONE;
     touchConfig.longPress = INPUT_BROKER_BACK;
+#if defined(TTGO_T_ECHO_PLUS) && defined(PIN_EINK_EN)
+    // On T-Echo Plus the touch pad should only drive the backlight, not UI navigation/sounds
+    touchConfig.longPress = INPUT_BROKER_NONE;
+    touchConfig.suppressLeadUpSound = true;
+    touchConfig.onPress = []() {
+        touchBacklightWasOn = uiconfig.screen_brightness == 1;
+        if (!touchBacklightWasOn) {
+            digitalWrite(PIN_EINK_EN, HIGH);
+        }
+        touchBacklightActive = true;
+    };
+    touchConfig.onRelease = []() {
+        if (touchBacklightActive && !touchBacklightWasOn) {
+            digitalWrite(PIN_EINK_EN, LOW);
+        }
+        touchBacklightActive = false;
+    };
+#endif
     TouchButtonThread->initButton(touchConfig);
 #endif
 

src/main.h

@@ -42,7 +42,7 @@ extern bool eink_found;
 extern bool pmu_found;
 extern bool isUSBPowered;
 
-#if defined(T_WATCH_S3) || defined(T_LORA_PAGER)
+#ifdef HAS_DRV2605
 #include <Adafruit_DRV2605.h>
 extern Adafruit_DRV2605 drv;
 #endif

src/mesh/RadioInterface.cpp

@@ -246,8 +246,9 @@ uint32_t RadioInterface::getPacketTime(const meshtastic_MeshPacket *p, bool rece
 /** The delay to use for retransmitting dropped packets */
 uint32_t RadioInterface::getRetransmissionMsec(const meshtastic_MeshPacket *p)
 {
-    size_t numbytes =p->which_payload_variant == meshtastic_MeshPacket_decoded_tag ? 
-      pb_encode_to_bytes(bytes, sizeof(bytes), &meshtastic_Data_msg, &p->decoded) : p->encrypted.size+MESHTASTIC_HEADER_LENGTH;
+    size_t numbytes = p->which_payload_variant == meshtastic_MeshPacket_decoded_tag
+                          ? pb_encode_to_bytes(bytes, sizeof(bytes), &meshtastic_Data_msg, &p->decoded)
+                          : p->encrypted.size + MESHTASTIC_HEADER_LENGTH;
     uint32_t packetAirtime = getPacketTime(numbytes + sizeof(PacketHeader));
     // Make sure enough time has elapsed for this packet to be sent and an ACK is received.
     // LOG_DEBUG("Waiting for flooding message with airtime %d and slotTime is %d", packetAirtime, slotTimeMsec);

src/mesh/SX126xInterface.cpp

@@ -53,13 +53,21 @@ template <typename T> bool SX126xInterface<T>::init()
 #endif
 
 #if defined(USE_GC1109_PA)
+    // GC1109 FEM chip initialization
+    // See variant.h for full pin mapping and control logic documentation
+
+    // VFEM_Ctrl (LORA_PA_POWER): Power enable for GC1109 LDO (always on)
     pinMode(LORA_PA_POWER, OUTPUT);
     digitalWrite(LORA_PA_POWER, HIGH);
 
+    // CSD (LORA_PA_EN): Chip enable - must be HIGH to enable GC1109 for both RX and TX
     pinMode(LORA_PA_EN, OUTPUT);
-    digitalWrite(LORA_PA_EN, LOW);
+    digitalWrite(LORA_PA_EN, HIGH);
+
+    // CPS (LORA_PA_TX_EN): PA mode select - HIGH enables full PA during TX, LOW for RX (don't care)
+    // Note: TX/RX path switching (CTX) is handled by DIO2 via SX126X_DIO2_AS_RF_SWITCH
     pinMode(LORA_PA_TX_EN, OUTPUT);
-    digitalWrite(LORA_PA_TX_EN, LOW);
+    digitalWrite(LORA_PA_TX_EN, LOW); // Start in RX-ready state
 #endif
 
 #ifdef RF95_FAN_EN
@@ -377,13 +385,13 @@ template <typename T> bool SX126xInterface<T>::sleep()
     return true;
 }
 
-/** Some boards require GPIO control of tx vs rx paths */
+/** Control PA mode for GC1109 FEM - CPS pin selects full PA (txon=true) or bypass mode (txon=false) */
 template <typename T> void SX126xInterface<T>::setTransmitEnable(bool txon)
 {
 #if defined(USE_GC1109_PA)
-    digitalWrite(LORA_PA_POWER, HIGH);
-    digitalWrite(LORA_PA_EN, HIGH);
-    digitalWrite(LORA_PA_TX_EN, txon ? 1 : 0);
+    digitalWrite(LORA_PA_POWER, HIGH);         // Ensure LDO is on
+    digitalWrite(LORA_PA_EN, HIGH);            // CSD=1: Chip enabled
+    digitalWrite(LORA_PA_TX_EN, txon ? 1 : 0); // CPS: 1=full PA, 0=bypass (for RX, CPS is don't care)
 #endif
 }
 

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

@@ -12,6 +12,9 @@ PB_BIND(meshtastic_AdminMessage, meshtastic_AdminMessage, 2)
 PB_BIND(meshtastic_AdminMessage_InputEvent, meshtastic_AdminMessage_InputEvent, AUTO)
 
 
+PB_BIND(meshtastic_AdminMessage_OTAEvent, meshtastic_AdminMessage_OTAEvent, AUTO)
+
+
 PB_BIND(meshtastic_HamParameters, meshtastic_HamParameters, AUTO)
 
 

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

@@ -113,6 +113,17 @@ typedef struct _meshtastic_AdminMessage_InputEvent {
     uint16_t touch_y;
 } meshtastic_AdminMessage_InputEvent;
 
+typedef PB_BYTES_ARRAY_T(32) meshtastic_AdminMessage_OTAEvent_ota_hash_t;
+/* User is requesting an over the air update.
+ Node will reboot into the OTA loader */
+typedef struct _meshtastic_AdminMessage_OTAEvent {
+    /* Tell the node to reboot into OTA mode for firmware update via BLE or WiFi (ESP32 only for now) */
+    meshtastic_OTAMode reboot_ota_mode;
+    /* A 32 byte hash of the OTA firmware.
+ Used to verify the integrity of the firmware before applying an update. */
+    meshtastic_AdminMessage_OTAEvent_ota_hash_t ota_hash;
+} meshtastic_AdminMessage_OTAEvent;
+
 /* Parameters for setting up Meshtastic for ameteur radio usage */
 typedef struct _meshtastic_HamParameters {
     /* Amateur radio call sign, eg. KD2ABC */
@@ -288,6 +299,8 @@ typedef struct _meshtastic_AdminMessage {
         /* Tell the node to reset the nodedb.
      When true, favorites are preserved through reset. */
         bool nodedb_reset;
+        /* Tell the node to reset into the OTA Loader */
+        meshtastic_AdminMessage_OTAEvent ota_request;
     };
     /* The node generates this key and sends it with any get_x_response packets.
  The client MUST include the same key with any set_x commands. Key expires after 300 seconds.
@@ -329,6 +342,8 @@ extern "C" {
 #define meshtastic_AdminMessage_payload_variant_reboot_ota_mode_ENUMTYPE meshtastic_OTAMode
 
 
+#define meshtastic_AdminMessage_OTAEvent_reboot_ota_mode_ENUMTYPE meshtastic_OTAMode
+
 
 
 
@@ -338,12 +353,14 @@ extern "C" {
 /* Initializer values for message structs */
 #define meshtastic_AdminMessage_init_default     {0, {0}, {0, {0}}}
 #define meshtastic_AdminMessage_InputEvent_init_default {0, 0, 0, 0}
+#define meshtastic_AdminMessage_OTAEvent_init_default {_meshtastic_OTAMode_MIN, {0, {0}}}
 #define meshtastic_HamParameters_init_default    {"", 0, 0, ""}
 #define meshtastic_NodeRemoteHardwarePinsResponse_init_default {0, {meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default, meshtastic_NodeRemoteHardwarePin_init_default}}
 #define meshtastic_SharedContact_init_default    {0, false, meshtastic_User_init_default, 0, 0}
 #define meshtastic_KeyVerificationAdmin_init_default {_meshtastic_KeyVerificationAdmin_MessageType_MIN, 0, 0, false, 0}
 #define meshtastic_AdminMessage_init_zero        {0, {0}, {0, {0}}}
 #define meshtastic_AdminMessage_InputEvent_init_zero {0, 0, 0, 0}
+#define meshtastic_AdminMessage_OTAEvent_init_zero {_meshtastic_OTAMode_MIN, {0, {0}}}
 #define meshtastic_HamParameters_init_zero       {"", 0, 0, ""}
 #define meshtastic_NodeRemoteHardwarePinsResponse_init_zero {0, {meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero, meshtastic_NodeRemoteHardwarePin_init_zero}}
 #define meshtastic_SharedContact_init_zero       {0, false, meshtastic_User_init_zero, 0, 0}
@@ -354,6 +371,8 @@ extern "C" {
 #define meshtastic_AdminMessage_InputEvent_kb_char_tag 2
 #define meshtastic_AdminMessage_InputEvent_touch_x_tag 3
 #define meshtastic_AdminMessage_InputEvent_touch_y_tag 4
+#define meshtastic_AdminMessage_OTAEvent_reboot_ota_mode_tag 1
+#define meshtastic_AdminMessage_OTAEvent_ota_hash_tag 2
 #define meshtastic_HamParameters_call_sign_tag   1
 #define meshtastic_HamParameters_tx_power_tag    2
 #define meshtastic_HamParameters_frequency_tag   3
@@ -422,6 +441,7 @@ extern "C" {
 #define meshtastic_AdminMessage_shutdown_seconds_tag 98
 #define meshtastic_AdminMessage_factory_reset_config_tag 99
 #define meshtastic_AdminMessage_nodedb_reset_tag 100
+#define meshtastic_AdminMessage_ota_request_tag  102
 #define meshtastic_AdminMessage_session_passkey_tag 101
 
 /* Struct field encoding specification for nanopb */
@@ -481,7 +501,8 @@ X(a, STATIC,   ONEOF,    INT32,    (payload_variant,reboot_seconds,reboot_second
 X(a, STATIC,   ONEOF,    INT32,    (payload_variant,shutdown_seconds,shutdown_seconds),  98) \
 X(a, STATIC,   ONEOF,    INT32,    (payload_variant,factory_reset_config,factory_reset_config),  99) \
 X(a, STATIC,   ONEOF,    BOOL,     (payload_variant,nodedb_reset,nodedb_reset), 100) \
-X(a, STATIC,   SINGULAR, BYTES,    session_passkey, 101)
+X(a, STATIC,   SINGULAR, BYTES,    session_passkey, 101) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (payload_variant,ota_request,ota_request), 102)
 #define meshtastic_AdminMessage_CALLBACK NULL
 #define meshtastic_AdminMessage_DEFAULT NULL
 #define meshtastic_AdminMessage_payload_variant_get_channel_response_MSGTYPE meshtastic_Channel
@@ -502,6 +523,7 @@ X(a, STATIC,   SINGULAR, BYTES,    session_passkey, 101)
 #define meshtastic_AdminMessage_payload_variant_store_ui_config_MSGTYPE meshtastic_DeviceUIConfig
 #define meshtastic_AdminMessage_payload_variant_add_contact_MSGTYPE meshtastic_SharedContact
 #define meshtastic_AdminMessage_payload_variant_key_verification_MSGTYPE meshtastic_KeyVerificationAdmin
+#define meshtastic_AdminMessage_payload_variant_ota_request_MSGTYPE meshtastic_AdminMessage_OTAEvent
 
 #define meshtastic_AdminMessage_InputEvent_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, UINT32,   event_code,        1) \
@@ -511,6 +533,12 @@ X(a, STATIC,   SINGULAR, UINT32,   touch_y,           4)
 #define meshtastic_AdminMessage_InputEvent_CALLBACK NULL
 #define meshtastic_AdminMessage_InputEvent_DEFAULT NULL
 
+#define meshtastic_AdminMessage_OTAEvent_FIELDLIST(X, a) \
+X(a, STATIC,   SINGULAR, UENUM,    reboot_ota_mode,   1) \
+X(a, STATIC,   SINGULAR, BYTES,    ota_hash,          2)
+#define meshtastic_AdminMessage_OTAEvent_CALLBACK NULL
+#define meshtastic_AdminMessage_OTAEvent_DEFAULT NULL
+
 #define meshtastic_HamParameters_FIELDLIST(X, a) \
 X(a, STATIC,   SINGULAR, STRING,   call_sign,         1) \
 X(a, STATIC,   SINGULAR, INT32,    tx_power,          2) \
@@ -544,6 +572,7 @@ X(a, STATIC,   OPTIONAL, UINT32,   security_number,   4)
 
 extern const pb_msgdesc_t meshtastic_AdminMessage_msg;
 extern const pb_msgdesc_t meshtastic_AdminMessage_InputEvent_msg;
+extern const pb_msgdesc_t meshtastic_AdminMessage_OTAEvent_msg;
 extern const pb_msgdesc_t meshtastic_HamParameters_msg;
 extern const pb_msgdesc_t meshtastic_NodeRemoteHardwarePinsResponse_msg;
 extern const pb_msgdesc_t meshtastic_SharedContact_msg;
@@ -552,6 +581,7 @@ extern const pb_msgdesc_t meshtastic_KeyVerificationAdmin_msg;
 /* Defines for backwards compatibility with code written before nanopb-0.4.0 */
 #define meshtastic_AdminMessage_fields &meshtastic_AdminMessage_msg
 #define meshtastic_AdminMessage_InputEvent_fields &meshtastic_AdminMessage_InputEvent_msg
+#define meshtastic_AdminMessage_OTAEvent_fields &meshtastic_AdminMessage_OTAEvent_msg
 #define meshtastic_HamParameters_fields &meshtastic_HamParameters_msg
 #define meshtastic_NodeRemoteHardwarePinsResponse_fields &meshtastic_NodeRemoteHardwarePinsResponse_msg
 #define meshtastic_SharedContact_fields &meshtastic_SharedContact_msg
@@ -560,6 +590,7 @@ extern const pb_msgdesc_t meshtastic_KeyVerificationAdmin_msg;
 /* Maximum encoded size of messages (where known) */
 #define MESHTASTIC_MESHTASTIC_ADMIN_PB_H_MAX_SIZE meshtastic_AdminMessage_size
 #define meshtastic_AdminMessage_InputEvent_size  14
+#define meshtastic_AdminMessage_OTAEvent_size    36
 #define meshtastic_AdminMessage_size             511
 #define meshtastic_HamParameters_size            31
 #define meshtastic_KeyVerificationAdmin_size     25

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

@@ -92,8 +92,8 @@ typedef enum _meshtastic_HardwareModel {
  Less common/prototype boards listed here (needs one more byte over the air)
  --------------------------------------------------------------------------- */
     meshtastic_HardwareModel_LORA_RELAY_V1 = 32,
-    /* TODO: REPLACE */
-    meshtastic_HardwareModel_NRF52840DK = 33,
+    /* T-Echo Plus device from LilyGo */
+    meshtastic_HardwareModel_T_ECHO_PLUS = 33,
     /* TODO: REPLACE */
     meshtastic_HardwareModel_PPR = 34,
     /* TODO: REPLACE */
@@ -475,7 +475,10 @@ typedef enum _meshtastic_Routing_Error {
     meshtastic_Routing_Error_ADMIN_PUBLIC_KEY_UNAUTHORIZED = 37,
     /* Airtime fairness rate limit exceeded for a packet
  This typically enforced per portnum and is used to prevent a single node from monopolizing airtime */
-    meshtastic_Routing_Error_RATE_LIMIT_EXCEEDED = 38
+    meshtastic_Routing_Error_RATE_LIMIT_EXCEEDED = 38,
+    /* PKI encryption failed, due to no public key for the remote node
+ This is different from PKI_UNKNOWN_PUBKEY which indicates a failure upon receiving a packet */
+    meshtastic_Routing_Error_PKI_SEND_FAIL_PUBLIC_KEY = 39
 } meshtastic_Routing_Error;
 
 /* Enum of message types */
@@ -1351,8 +1354,12 @@ extern "C" {
 #define _meshtastic_Position_AltSource_ARRAYSIZE ((meshtastic_Position_AltSource)(meshtastic_Position_AltSource_ALT_BAROMETRIC+1))
 
 #define _meshtastic_Routing_Error_MIN meshtastic_Routing_Error_NONE
-#define _meshtastic_Routing_Error_MAX meshtastic_Routing_Error_RATE_LIMIT_EXCEEDED
-#define _meshtastic_Routing_Error_ARRAYSIZE ((meshtastic_Routing_Error)(meshtastic_Routing_Error_RATE_LIMIT_EXCEEDED+1))
+#define _meshtastic_Routing_Error_MAX meshtastic_Routing_Error_PKI_SEND_FAIL_PUBLIC_KEY
+#define _meshtastic_Routing_Error_ARRAYSIZE ((meshtastic_Routing_Error)(meshtastic_Routing_Error_PKI_SEND_FAIL_PUBLIC_KEY+1))
+
+#define _meshtastic_StoreForwardPlusPlus_SFPP_message_type_MIN meshtastic_StoreForwardPlusPlus_SFPP_message_type_CANON_ANNOUNCE
+#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_StoreForwardPlusPlus_SFPP_message_type_MIN meshtastic_StoreForwardPlusPlus_SFPP_message_type_CANON_ANNOUNCE
 #define _meshtastic_StoreForwardPlusPlus_SFPP_message_type_MAX meshtastic_StoreForwardPlusPlus_SFPP_message_type_LINK_PROVIDE_SECONDHALF

src/modules/CannedMessageModule.h

@@ -89,9 +89,8 @@ class CannedMessageModule : public SinglePortModule, public Observable<const UIF
     void handleGetCannedMessageModuleMessages(const meshtastic_MeshPacket &req, meshtastic_AdminMessage *response);
     void handleSetCannedMessageModuleMessages(const char *from_msg);
 
-#ifdef RAK14014
+    // Get current run state (used by VoiceMemoModule to avoid conflicts)
     cannedMessageModuleRunState getRunState() const { return runState; }
-#endif
 
     // === Packet Interest Filter ===
     virtual bool wantPacket(const meshtastic_MeshPacket *p) override

src/modules/ExternalNotificationModule.cpp

@@ -168,7 +168,7 @@ int32_t ExternalNotificationModule::runOnce()
             delay = EXT_NOTIFICATION_FAST_THREAD_MS;
 #endif
 
-#if defined(T_WATCH_S3) || defined(T_LORA_PAGER)
+#ifdef HAS_DRV2605
             drv.go();
 #endif
         }
@@ -283,7 +283,7 @@ void ExternalNotificationModule::setExternalState(uint8_t index, bool on)
 #ifdef UNPHONE
     unphone.rgb(red, green, blue);
 #endif
-#if defined(T_WATCH_S3) || defined(T_LORA_PAGER)
+#ifdef HAS_DRV2605
     if (on) {
         drv.go();
     } else {
@@ -319,7 +319,7 @@ void ExternalNotificationModule::stopNow()
         externalTurnedOn[i] = 0;
     }
     setIntervalFromNow(0);
-#if defined(T_WATCH_S3) || defined(T_LORA_PAGER)
+#ifdef HAS_DRV2605
     drv.stop();
 #endif
 

src/modules/Modules.cpp

@@ -87,6 +87,9 @@
 #if defined(USE_SX1280) && !MESHTASTIC_EXCLUDE_AUDIO
 #include "modules/esp32/AudioModule.h"
 #endif
+#if defined(HAS_I2S) && !MESHTASTIC_EXCLUDE_VOICEMEMO
+#include "modules/VoiceMemoModule.h"
+#endif
 #if !MESHTASTIC_EXCLUDE_PAXCOUNTER
 #include "modules/esp32/PaxcounterModule.h"
 #endif
@@ -285,6 +288,9 @@ void setupModules()
 #if defined(USE_SX1280) && !MESHTASTIC_EXCLUDE_AUDIO
     audioModule = new AudioModule();
 #endif
+#if defined(HAS_I2S) && !MESHTASTIC_EXCLUDE_VOICEMEMO
+    voiceMemoModule = new VoiceMemoModule();
+#endif
 #if !MESHTASTIC_EXCLUDE_PAXCOUNTER
     if (moduleConfig.has_paxcounter && moduleConfig.paxcounter.enabled) {
         paxcounterModule = new PaxcounterModule();

src/modules/SerialModule.cpp

@@ -63,9 +63,9 @@
 SerialModule *serialModule;
 SerialModuleRadio *serialModuleRadio;
 
-#if defined(TTGO_T_ECHO) || defined(CANARYONE) || defined(MESHLINK) || defined(ELECROW_ThinkNode_M1) ||                          \
-    defined(ELECROW_ThinkNode_M5) || defined(HELTEC_MESH_SOLAR) || defined(T_ECHO_LITE) || defined(ELECROW_ThinkNode_M3) ||      \
-    defined(MUZI_BASE)
+#if defined(TTGO_T_ECHO) || defined(TTGO_T_ECHO_PLUS) || defined(CANARYONE) || defined(MESHLINK) ||                              \
+    defined(ELECROW_ThinkNode_M1) || defined(ELECROW_ThinkNode_M5) || defined(HELTEC_MESH_SOLAR) || defined(T_ECHO_LITE) ||      \
+    defined(ELECROW_ThinkNode_M3) || defined(MUZI_BASE)
 SerialModule::SerialModule() : StreamAPI(&Serial), concurrency::OSThread("Serial")
 {
     api_type = TYPE_SERIAL;
@@ -204,8 +204,9 @@ int32_t SerialModule::runOnce()
                 Serial.begin(baud);
                 Serial.setTimeout(moduleConfig.serial.timeout > 0 ? moduleConfig.serial.timeout : TIMEOUT);
             }
-#elif !defined(TTGO_T_ECHO) && !defined(T_ECHO_LITE) && !defined(CANARYONE) && !defined(MESHLINK) &&                             \
-    !defined(ELECROW_ThinkNode_M1) && !defined(ELECROW_ThinkNode_M3) && !defined(ELECROW_ThinkNode_M5) && !defined(MUZI_BASE)
+#elif !defined(TTGO_T_ECHO) && !defined(TTGO_T_ECHO_PLUS) && !defined(T_ECHO_LITE) && !defined(CANARYONE) &&                     \
+    !defined(MESHLINK) && !defined(ELECROW_ThinkNode_M1) && !defined(ELECROW_ThinkNode_M3) && !defined(ELECROW_ThinkNode_M5) &&  \
+    !defined(MUZI_BASE)
             if (moduleConfig.serial.rxd && moduleConfig.serial.txd) {
 #ifdef ARCH_RP2040
                 Serial2.setFIFOSize(RX_BUFFER);
@@ -261,7 +262,7 @@ int32_t SerialModule::runOnce()
                 }
             }
 
-#if !defined(TTGO_T_ECHO) && !defined(T_ECHO_LITE) && !defined(CANARYONE) && !defined(MESHLINK) &&                               \
+#if !defined(TTGO_T_ECHO) && !defined(TTGO_T_ECHO_PLUS) && !defined(T_ECHO_LITE) && !defined(CANARYONE) && !defined(MESHLINK) && \
     !defined(ELECROW_ThinkNode_M1) && !defined(ELECROW_ThinkNode_M3) && !defined(ELECROW_ThinkNode_M5) && !defined(MUZI_BASE)
             else if ((moduleConfig.serial.mode == meshtastic_ModuleConfig_SerialConfig_Serial_Mode_WS85)) {
                 processWXSerial();
@@ -536,9 +537,9 @@ ParsedLine parseLine(const char *line)
  */
 void SerialModule::processWXSerial()
 {
-#if !defined(TTGO_T_ECHO) && !defined(T_ECHO_LITE) && !defined(CANARYONE) && !defined(CONFIG_IDF_TARGET_ESP32C6) &&              \
-    !defined(MESHLINK) && !defined(ELECROW_ThinkNode_M1) && !defined(ELECROW_ThinkNode_M3) && !defined(ELECROW_ThinkNode_M5) &&  \
-    !defined(ARCH_STM32WL) && !defined(MUZI_BASE)
+#if !defined(TTGO_T_ECHO) && !defined(TTGO_T_ECHO_PLUS) && !defined(T_ECHO_LITE) && !defined(CANARYONE) &&                       \
+    !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(MESHLINK) && !defined(ELECROW_ThinkNode_M1) &&                               \
+    !defined(ELECROW_ThinkNode_M3) && !defined(ELECROW_ThinkNode_M5) && !defined(ARCH_STM32WL) && !defined(MUZI_BASE)
     static unsigned int lastAveraged = 0;
     static unsigned int averageIntervalMillis = 300000; // 5 minutes hard coded.
     static double dir_sum_sin = 0;

src/modules/VoiceMemoModule.h

@@ -0,0 +1,180 @@
+#pragma once
+
+#include "SinglePortModule.h"
+#include "concurrency/OSThread.h"
+#include "configuration.h"
+#include "input/InputBroker.h"
+#include "mesh/generated/meshtastic/module_config.pb.h"
+
+#if defined(ARCH_ESP32) && defined(HAS_I2S) && !MESHTASTIC_EXCLUDE_VOICEMEMO
+
+#include <Arduino.h>
+#include <ButterworthFilter.h>
+#include <OLEDDisplay.h>
+#include <OLEDDisplayUi.h>
+#include <codec2.h>
+#include <driver/i2s.h>
+#include <freertos/FreeRTOS.h>
+#include <freertos/task.h>
+
+/**
+ * VoiceMemoModule - Store and forward short codec2 encoded audio messages
+ *
+ * Unlike the existing AudioModule which is designed for real-time push-to-talk,
+ * this module is designed for short voice memos that are:
+ * - Recorded when the user holds Shift+Space
+ * - Encoded with Codec2 for compression
+ * - Sent over the mesh with hop_limit=0 (local only)
+ * - Stored on receiving devices for later playback
+ * - Played back when user long-presses on the notification
+ */
+
+// Voice memo states
+enum class VoiceMemoState { IDLE, RECORDING, SENDING, RECEIVING, PLAYING };
+
+// Codec2 magic header for voice memos
+const char VOICEMEMO_MAGIC[4] = {0xc0, 0xde, 0xc2, 0x4d}; // c0dec2M (M for Memo)
+
+struct VoiceMemoHeader {
+    char magic[4];
+    uint8_t mode;       // Codec2 mode
+    uint8_t sequence;   // Packet sequence number (for multi-packet memos)
+    uint8_t totalParts; // Total number of packets in this memo (0 = unknown/streaming)
+    uint8_t memoId;     // Unique ID for this recording session (to identify related packets)
+};
+
+// Maximum recording time in seconds
+#define VOICEMEMO_MAX_RECORD_SECS 10
+#define VOICEMEMO_ADC_BUFFER_SIZE 320       // Codec2 samples per frame
+#define VOICEMEMO_UPSAMPLE_BUFFER_SIZE 3600 // 320 * (44100/8000) * 2 (stereo) ≈ 3528, rounded up
+#define VOICEMEMO_I2S_PORT I2S_NUM_0
+// Codec2 mode - use protobuf enum minus 1 to get codec2 library mode
+#define VOICEMEMO_CODEC2_MODE (meshtastic_ModuleConfig_AudioConfig_Audio_Baud_CODEC2_700 - 1)
+
+// Storage for received voice memos
+#define VOICEMEMO_MAX_STORED 5
+struct StoredVoiceMemo {
+    NodeNum from;
+    uint32_t timestamp;
+    uint8_t data[meshtastic_Constants_DATA_PAYLOAD_LEN * 4]; // Allow up to 4 packets
+    size_t dataLen;
+    uint8_t codec2Mode;
+    uint8_t memoId;        // Memo ID from sender (to identify related packets)
+    uint8_t receivedParts; // Bitmask of received packet sequences
+    uint8_t expectedParts; // Total expected parts (0 = unknown)
+    bool played;
+};
+
+class VoiceMemoModule : public SinglePortModule, public Observable<const UIFrameEvent *>, private concurrency::OSThread
+{
+  public:
+    VoiceMemoModule();
+
+    /**
+     * Check if we should draw the UI frame
+     */
+    bool shouldDraw();
+
+    /**
+     * Handle keyboard input for Shift+Space detection
+     */
+    int handleInputEvent(const InputEvent *event);
+
+    /**
+     * Play a stored voice memo
+     */
+    void playStoredMemo(int index);
+
+    /**
+     * Get number of unplayed memos
+     */
+    int getUnplayedCount();
+
+    /**
+     * Get stored memo info for UI
+     */
+    const StoredVoiceMemo *getStoredMemo(int index);
+
+  protected:
+    virtual int32_t runOnce() override;
+    virtual meshtastic_MeshPacket *allocReply() override;
+    virtual bool wantUIFrame() override { return shouldDraw(); }
+    virtual Observable<const UIFrameEvent *> *getUIFrameObservable() override { return this; }
+
+#if HAS_SCREEN
+    virtual void drawFrame(OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) override;
+#endif
+
+    virtual ProcessMessage handleReceived(const meshtastic_MeshPacket &mp) override;
+
+  private:
+    // State machine
+    VoiceMemoState state = VoiceMemoState::IDLE;
+
+    // Codec2
+    CODEC2 *codec2 = nullptr;
+    int encodeCodecSize = 0;
+    int adcBufferSize = 0;
+
+    // Audio buffers
+    int16_t speechBuffer[VOICEMEMO_ADC_BUFFER_SIZE] = {};
+    int16_t outputBuffer[VOICEMEMO_ADC_BUFFER_SIZE] = {};
+    int16_t upsampleBuffer[VOICEMEMO_UPSAMPLE_BUFFER_SIZE] = {}; // For 8kHz->44.1kHz upsampling
+    uint8_t encodedFrame[meshtastic_Constants_DATA_PAYLOAD_LEN] = {};
+    size_t encodedFrameIndex = 0;
+
+    // Recording state
+    uint32_t recordingStartMs = 0;
+    uint32_t sendingCompleteMs = 0; // When sending completed (for "Sent!" display timeout)
+    uint8_t currentMemoId = 0;      // Unique ID for current recording session
+    uint8_t currentSequence = 0;    // Current packet sequence number
+
+    // I2S state
+    bool i2sInitialized = false;
+
+    // Stored memos for playback
+    StoredVoiceMemo storedMemos[VOICEMEMO_MAX_STORED];
+    int storedMemoCount = 0;
+
+    // Playback state
+    int playingMemoIndex = -1;
+    size_t playbackPosition = 0;
+
+    // Filter for audio cleanup
+    ButterworthFilter *hpFilter = nullptr;
+
+    // Codec2 task for encoding (needs large stack)
+    TaskHandle_t codec2TaskHandle = nullptr;
+    volatile bool codec2TaskRunning = false;
+    volatile bool audioReady = false;
+
+    // Playback task (also needs large stack for Codec2 decoding)
+    TaskHandle_t playbackTaskHandle = nullptr;
+    volatile bool playbackTaskRunning = false;
+    volatile bool playbackReady = false;
+    const StoredVoiceMemo *currentPlaybackMemo = nullptr;
+
+    // Internal methods
+    bool initES7210();
+    bool initI2S();
+    void deinitI2S();
+    void startRecording();
+    void stopRecording();
+    void processRecordingBuffer();
+    void sendEncodedPayload();
+    void storeMemo(const meshtastic_MeshPacket &mp);
+    void playMemo(const StoredVoiceMemo &memo);
+
+  public:
+    // Called by the codec2 task - needs to be public for task function access
+    void doCodec2Encode();
+    void doCodec2Playback();
+
+    // Keyboard observer
+    CallbackObserver<VoiceMemoModule, const InputEvent *> inputObserver =
+        CallbackObserver<VoiceMemoModule, const InputEvent *>(this, &VoiceMemoModule::handleInputEvent);
+};
+
+extern VoiceMemoModule *voiceMemoModule;
+
+#endif // ARCH_ESP32 && HAS_I2S && !MESHTASTIC_EXCLUDE_VOICEMEMO

src/platform/nrf52/architecture.h

@@ -66,6 +66,8 @@
 #define HW_VENDOR meshtastic_HardwareModel_T_ECHO
 #elif defined(T_ECHO_LITE)
 #define HW_VENDOR meshtastic_HardwareModel_T_ECHO_LITE
+#elif defined(TTGO_T_ECHO_PLUS)
+#define HW_VENDOR meshtastic_HardwareModel_T_ECHO_PLUS
 #elif defined(ELECROW_ThinkNode_M1)
 #define HW_VENDOR meshtastic_HardwareModel_THINKNODE_M1
 #elif defined(ELECROW_ThinkNode_M3)

src/platform/portduino/PortduinoGlue.cpp

@@ -6,6 +6,7 @@
 #include "target_specific.h"
 
 #include "PortduinoGlue.h"
+#include "SHA256.h"
 #include "api/ServerAPI.h"
 #include "linux/gpio/LinuxGPIOPin.h"
 #include "meshUtils.h"
@@ -270,7 +271,39 @@ void portduinoSetup()
                 }
                 std::cout << "autoconf: Found Pi HAT+ " << hat_vendor << " " << autoconf_product << " at /proc/device-tree/hat"
                           << std::endl;
-                found_hat = true;
+
+                // potential TODO: Validate that this is a real UUID
+                std::ifstream hatUUID("/proc/device-tree/hat/uuid");
+                char uuid[38] = {0};
+                if (hatUUID.is_open()) {
+                    hatUUID.read(uuid, 37);
+                    hatUUID.close();
+                    std::cout << "autoconf: UUID " << uuid << std::endl;
+                    SHA256 uuid_hash;
+                    uint8_t uuid_hash_bytes[32] = {0};
+
+                    uuid_hash.reset();
+                    uuid_hash.update(uuid, 37);
+                    uuid_hash.finalize(uuid_hash_bytes, 32);
+
+                    for (int j = 0; j < 16; j++) {
+                        portduino_config.device_id[j] = uuid_hash_bytes[j];
+                    }
+                    portduino_config.has_device_id = true;
+                    uint8_t dmac[6] = {0};
+                    dmac[0] = (uuid_hash_bytes[17] << 4) | 2;
+                    dmac[1] = uuid_hash_bytes[18];
+                    dmac[2] = uuid_hash_bytes[19];
+                    dmac[3] = uuid_hash_bytes[20];
+                    dmac[4] = uuid_hash_bytes[21];
+                    dmac[5] = uuid_hash_bytes[22];
+                    char macBuf[13] = {0};
+                    snprintf(macBuf, sizeof(macBuf), "%02X%02X%02X%02X%02X%02X", dmac[0], dmac[1], dmac[2], dmac[3], dmac[4],
+                             dmac[5]);
+                    portduino_config.mac_address = macBuf;
+                    found_hat = true;
+                }
+
             } else {
                 std::cout << "autoconf: Could not locate Pi HAT+ at /proc/device-tree/hat" << std::endl;
             }
@@ -419,9 +452,11 @@ void portduinoSetup()
         ch341Hal->getProductString(product_string, 95);
         std::cout << "CH341 Product " << product_string << std::endl;
         if (strlen(serial) == 8 && portduino_config.mac_address.length() < 12) {
-            uint8_t hash[32] = {0};
+            std::cout << "Deriving MAC address from Serial and Product String" << std::endl;
+            uint8_t hash[104] = {0};
             memcpy(hash, serial, 8);
-            crypto->hash(hash, 8);
+            memcpy(hash + 8, product_string, strlen(product_string));
+            crypto->hash(hash, 8 + strlen(product_string));
             dmac[0] = (hash[0] << 4) | 2;
             dmac[1] = hash[1];
             dmac[2] = hash[2];

variants/esp32s3/heltec_v4/variant.h

@@ -29,10 +29,32 @@
 #define SX126X_DIO2_AS_RF_SWITCH
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8
 
-#define USE_GC1109_PA   // We have a GC1109 power amplifier+attenuator
-#define LORA_PA_POWER 7 // power en
-#define LORA_PA_EN 2
-#define LORA_PA_TX_EN 46 // enable tx
+// ---- GC1109 RF FRONT END CONFIGURATION ----
+// The Heltec V4 uses a GC1109 FEM chip with integrated PA and LNA
+// RF path: SX1262 -> GC1109 PA -> Pi attenuator -> Antenna
+// Measured net TX gain (non-linear due to PA compression):
+//   +11dB at 0-15dBm input  (e.g., 10dBm in -> 21dBm out)
+//   +10dB at 16-17dBm input
+//   +9dB  at 18-19dBm input
+//   +7dB  at 21dBm input    (e.g., 21dBm in -> 28dBm out max)
+// Control logic (from GC1109 datasheet):
+//   Shutdown:        CSD=0, CTX=X, CPS=X
+//   Receive LNA:     CSD=1, CTX=0, CPS=X  (17dB gain, 2dB NF)
+//   Transmit bypass: CSD=1, CTX=1, CPS=0  (~1dB loss, no PA)
+//   Transmit PA:     CSD=1, CTX=1, CPS=1  (full PA enabled)
+// Pin mapping:
+//   CTX (pin 6)  -> SX1262 DIO2: TX/RX path select (automatic via SX126X_DIO2_AS_RF_SWITCH)
+//   CSD (pin 4)  -> GPIO2: Chip enable (HIGH=on, LOW=shutdown)
+//   CPS (pin 5)  -> GPIO46: PA mode select (HIGH=full PA, LOW=bypass)
+//   VCC0/VCC1    -> Vfem via U3 LDO, controlled by GPIO7
+#define USE_GC1109_PA
+#define LORA_PA_POWER 7  // VFEM_Ctrl - GC1109 LDO power enable
+#define LORA_PA_EN 2     // CSD - GC1109 chip enable (HIGH=on)
+#define LORA_PA_TX_EN 46 // CPS - GC1109 PA mode (HIGH=full PA, LOW=bypass)
+
+// GC1109 FEM: TX/RX path switching is handled by DIO2 -> CTX pin (via SX126X_DIO2_AS_RF_SWITCH)
+// GPIO46 is CPS (PA mode), not TX control - setTransmitEnable() handles it in SX126xInterface.cpp
+// Do NOT use SX126X_TXEN/RXEN as that would cause double-control of GPIO46
 
 #if HAS_TFT
 #define USE_TFTDISPLAY 1

variants/esp32s3/heltec_wireless_tracker_v2/variant.h

@@ -73,7 +73,29 @@
 #define SX126X_DIO2_AS_RF_SWITCH
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8
 
-#define USE_GC1109_PA   // We have a GC1109 power amplifier+attenuator
-#define LORA_PA_POWER 7 // power en
-#define LORA_PA_EN 4
-#define LORA_PA_TX_EN 46 // enable tx
+// ---- GC1109 RF FRONT END CONFIGURATION ----
+// The Heltec Wireless Tracker V2 uses a GC1109 FEM chip with integrated PA and LNA
+// RF path: SX1262 -> GC1109 PA -> Pi attenuator -> Antenna
+// Measured net TX gain (non-linear due to PA compression):
+//   +11dB at 0-15dBm input  (e.g., 10dBm in -> 21dBm out)
+//   +10dB at 16-17dBm input
+//   +9dB  at 18-19dBm input
+//   +7dB  at 21dBm input    (e.g., 21dBm in -> 28dBm out max)
+// Control logic (from GC1109 datasheet):
+//   Shutdown:        CSD=0, CTX=X, CPS=X
+//   Receive LNA:     CSD=1, CTX=0, CPS=X  (17dB gain, 2dB NF)
+//   Transmit bypass: CSD=1, CTX=1, CPS=0  (~1dB loss, no PA)
+//   Transmit PA:     CSD=1, CTX=1, CPS=1  (full PA enabled)
+// Pin mapping:
+//   CTX (pin 6)  -> SX1262 DIO2: TX/RX path select (automatic via SX126X_DIO2_AS_RF_SWITCH)
+//   CSD (pin 4)  -> GPIO4: Chip enable (HIGH=on, LOW=shutdown)
+//   CPS (pin 5)  -> GPIO46: PA mode select (HIGH=full PA, LOW=bypass)
+//   VCC0/VCC1    -> Vfem via U3 LDO, controlled by GPIO7
+#define USE_GC1109_PA
+#define LORA_PA_POWER 7  // VFEM_Ctrl - GC1109 LDO power enable
+#define LORA_PA_EN 4     // CSD - GC1109 chip enable (HIGH=on)
+#define LORA_PA_TX_EN 46 // CPS - GC1109 PA mode (HIGH=full PA, LOW=bypass)
+
+// GC1109 FEM: TX/RX path switching is handled by DIO2 -> CTX pin (via SX126X_DIO2_AS_RF_SWITCH)
+// GPIO46 is CPS (PA mode), not TX control - setTransmitEnable() handles it in SX126xInterface.cpp
+// Do NOT use SX126X_TXEN/RXEN as that would cause double-control of GPIO46

variants/esp32s3/t-beam-1w/pins_arduino.h

@@ -14,7 +14,7 @@ static const uint8_t SDA = 8;
 static const uint8_t SCL = 9;
 
 // Default SPI mapped to Radio/SD
-static const uint8_t SS = 15;   // LoRa CS
+static const uint8_t SS = 15; // LoRa CS
 static const uint8_t MOSI = 11;
 static const uint8_t MISO = 12;
 static const uint8_t SCK = 13;

variants/esp32s3/t-beam-1w/variant.h

@@ -1,4 +1,4 @@
-// LilyGo T-Beam-1W variant.h  
+// LilyGo T-Beam-1W variant.h
 // Configuration based on LilyGO utilities.h and RF documentation
 
 // I2C for OLED display (SH1106 at 0x3C)
@@ -9,13 +9,13 @@
 #define GPS_RX_PIN 5
 #define GPS_TX_PIN 6
 #define GPS_1PPS_PIN 7
-#define GPS_WAKEUP_PIN 16  // GPS_EN_PIN in LilyGO code
+#define GPS_WAKEUP_PIN 16 // GPS_EN_PIN in LilyGO code
 #define HAS_GPS 1
 #define GPS_BAUDRATE 9600
 
 // Buttons
-#define BUTTON_PIN 0         // BUTTON 1
-#define BUTTON_PIN_ALT 17    // BUTTON 2
+#define BUTTON_PIN 0      // BUTTON 1
+#define ALT_BUTTON_PIN 17 // BUTTON 2
 
 // SPI (shared by LoRa and SD)
 #define SPI_MOSI 11
@@ -32,7 +32,7 @@
 #define USE_SX1262
 
 #define LORA_SCK SPI_SCK
-#define LORA_MISO SPI_MISO  
+#define LORA_MISO SPI_MISO
 #define LORA_MOSI SPI_MOSI
 #define LORA_CS 15
 #define LORA_RESET 3
@@ -58,7 +58,7 @@
 // Truth table: DIO2=1,CTRL=0 → TX (PA on, LNA off)
 //              DIO2=0,CTRL=1 → RX (PA off, LNA on)
 #define SX126X_DIO2_AS_RF_SWITCH
-#define SX126X_RXEN 21  // LNA enable - HIGH during RX
+#define SX126X_RXEN 21 // LNA enable - HIGH during RX
 
 // TCXO voltage - required for radio init
 #define SX126X_DIO3_TCXO_VOLTAGE 1.8
@@ -68,7 +68,7 @@
 
 // LED
 #define LED_PIN 18
-#define LED_STATE_ON 1  // HIGH = ON
+#define LED_STATE_ON 1 // HIGH = ON
 
 // Battery ADC
 #define BATTERY_PIN 4
@@ -89,7 +89,7 @@
 #define SX126X_PA_RAMP_US 0x05
 
 // Display - SH1106 OLED (128x64)
-#define USE_SH1106 
+#define USE_SH1106
 #define OLED_WIDTH 128
 #define OLED_HEIGHT 64
 

variants/esp32s3/t-watch-s3/variant.h

@@ -20,6 +20,8 @@
 #define SCREEN_TRANSITION_FRAMERATE 5 // fps
 #define USE_TFTDISPLAY 1
 
+#define HAS_DRV2605 1
+
 #define HAS_TOUCHSCREEN 1
 #define SCREEN_TOUCH_INT 16
 #define SCREEN_TOUCH_USE_I2C1
@@ -51,9 +53,10 @@
 #define HAS_BMA423 1
 #define BMA4XX_INT 14 // Interrupt for BMA_423 axis sensor
 
-#define HAS_GPS 0
-#undef GPS_RX_PIN
-#undef GPS_TX_PIN
+#define GPS_DEFAULT_NOT_PRESENT 1
+#define GPS_BAUDRATE 38400
+#define GPS_RX_PIN 42
+#define GPS_TX_PIN 41
 
 #define USE_SX1262
 #define USE_SX1268

variants/esp32s3/tlora-pager/variant.h

@@ -26,6 +26,8 @@
 #define I2C_SDA SDA
 #define I2C_SCL SCL
 
+#define HAS_DRV2605 1
+
 #define USE_POWERSAVE
 #define SLEEP_TIME 120
 

variants/nrf52840/rak_wismeshtag/variant.h

@@ -234,6 +234,8 @@ SO GPIO 39/TXEN MAY NOT BE DEFINED FOR SUCCESSFUL OPERATION OF THE SX1262 - TG
 
 #define RAK_4631 1
 
+#define HAS_SCREEN 0
+
 #ifdef __cplusplus
 }
 #endif

variants/nrf52840/t-echo-plus/nicheGraphics.h

@@ -0,0 +1,70 @@
+#pragma once
+
+#include "configuration.h"
+
+#ifdef MESHTASTIC_INCLUDE_NICHE_GRAPHICS
+
+#include "graphics/niche/Drivers/Backlight/LatchingBacklight.h"
+#include "graphics/niche/Drivers/EInk/GDEY0154D67.h"
+#include "graphics/niche/InkHUD/Applets/User/AllMessage/AllMessageApplet.h"
+#include "graphics/niche/InkHUD/Applets/User/DM/DMApplet.h"
+#include "graphics/niche/InkHUD/Applets/User/Heard/HeardApplet.h"
+#include "graphics/niche/InkHUD/Applets/User/Positions/PositionsApplet.h"
+#include "graphics/niche/InkHUD/Applets/User/RecentsList/RecentsListApplet.h"
+#include "graphics/niche/InkHUD/Applets/User/ThreadedMessage/ThreadedMessageApplet.h"
+#include "graphics/niche/InkHUD/InkHUD.h"
+#include "graphics/niche/Inputs/TwoButton.h"
+
+void setupNicheGraphics()
+{
+    using namespace NicheGraphics;
+
+    SPI1.begin();
+
+    Drivers::EInk *driver = new Drivers::GDEY0154D67;
+    driver->begin(&SPI1, PIN_EINK_DC, PIN_EINK_CS, PIN_EINK_BUSY, PIN_EINK_RES);
+
+    InkHUD::InkHUD *inkhud = InkHUD::InkHUD::getInstance();
+    inkhud->setDriver(driver);
+    inkhud->setDisplayResilience(20, 1.5);
+    InkHUD::Applet::fontLarge = FREESANS_12PT_WIN1252;
+    InkHUD::Applet::fontMedium = FREESANS_9PT_WIN1252;
+    InkHUD::Applet::fontSmall = FREESANS_6PT_WIN1252;
+    inkhud->persistence->settings.userTiles.maxCount = 2;
+    inkhud->persistence->settings.rotation = 3;
+    inkhud->persistence->settings.optionalFeatures.batteryIcon = true;
+    inkhud->persistence->settings.optionalMenuItems.backlight = true;
+
+    Drivers::LatchingBacklight *backlight = Drivers::LatchingBacklight::getInstance();
+    backlight->setPin(PIN_EINK_BL);
+
+    inkhud->addApplet("All Messages", new InkHUD::AllMessageApplet, true, true);
+    inkhud->addApplet("DMs", new InkHUD::DMApplet);
+    inkhud->addApplet("Channel 0", new InkHUD::ThreadedMessageApplet(0));
+    inkhud->addApplet("Channel 1", new InkHUD::ThreadedMessageApplet(1));
+    inkhud->addApplet("Positions", new InkHUD::PositionsApplet, true);
+    inkhud->addApplet("Recents List", new InkHUD::RecentsListApplet);
+    inkhud->addApplet("Heard", new InkHUD::HeardApplet, true, false, 0);
+
+    inkhud->begin();
+
+    Inputs::TwoButton *buttons = Inputs::TwoButton::getInstance();
+
+    buttons->setWiring(0, Inputs::TwoButton::getUserButtonPin());
+    buttons->setTiming(0, 75, 500);
+    buttons->setHandlerShortPress(0, [inkhud]() { inkhud->shortpress(); });
+    buttons->setHandlerLongPress(0, [inkhud]() { inkhud->longpress(); });
+
+    buttons->setWiring(1, PIN_BUTTON_TOUCH);
+    buttons->setTiming(1, 50, 5000);
+    buttons->setHandlerDown(1, [inkhud, backlight]() {
+        backlight->peek();
+        inkhud->persistence->settings.optionalMenuItems.backlight = false;
+    });
+    buttons->setHandlerLongPress(1, [backlight]() { backlight->latch(); });
+    buttons->setHandlerShortPress(1, [backlight]() { backlight->off(); });
+
+    buttons->start();
+}
+
+#endif

variants/nrf52840/t-echo-plus/platformio.ini

@@ -0,0 +1,26 @@
+[env:t-echo-plus]
+extends = nrf52840_base
+board = t-echo
+board_level = pr
+board_check = true
+debug_tool = jlink
+
+build_flags = ${nrf52840_base.build_flags}
+  -DTTGO_T_ECHO_PLUS
+  -Ivariants/nrf52840/t-echo-plus
+  -DEINK_DISPLAY_MODEL=GxEPD2_154_D67
+  -DEINK_WIDTH=200
+  -DEINK_HEIGHT=200
+  -DUSE_EINK
+  -DUSE_EINK_DYNAMICDISPLAY            ; Enable Dynamic EInk
+  -DEINK_LIMIT_FASTREFRESH=20          ; How many consecutive fast-refreshes are permitted
+  -DEINK_BACKGROUND_USES_FAST          ; (Optional) Use FAST refresh for both BACKGROUND and RESPONSIVE, until a limit is reached.
+  -DI2C_NO_RESCAN
+
+build_src_filter = ${nrf52_base.build_src_filter} +<../variants/nrf52840/t-echo-plus>
+
+lib_deps =
+  ${nrf52840_base.lib_deps}
+  https://github.com/meshtastic/GxEPD2/archive/55f618961db45a23eff0233546430f1e5a80f63a.zip
+  lewisxhe/PCF8563_Library@^1.0.1
+  adafruit/Adafruit DRV2605 Library@1.2.4

variants/nrf52840/t-echo-plus/variant.cpp

@@ -0,0 +1,24 @@
+#include "variant.h"
+#include "nrf.h"
+#include "wiring_constants.h"
+#include "wiring_digital.h"
+
+const uint32_t g_ADigitalPinMap[] = {
+    // P0 - pins 0 and 1 are hardwired for xtal and should never be enabled
+    0xff, 0xff, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31,
+
+    // P1
+    32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47};
+
+void initVariant()
+{
+    // LEDs (if populated)
+    pinMode(PIN_LED1, OUTPUT);
+    ledOff(PIN_LED1);
+
+    pinMode(PIN_LED2, OUTPUT);
+    ledOff(PIN_LED2);
+
+    pinMode(PIN_LED3, OUTPUT);
+    ledOff(PIN_LED3);
+}

variants/nrf52840/t-echo-plus/variant.h

@@ -0,0 +1,145 @@
+#ifndef _VARIANT_T_ECHO_PLUS_
+#define _VARIANT_T_ECHO_PLUS_
+
+#define VARIANT_MCK (64000000ul)
+#define USE_LFXO
+
+#include "WVariant.h"
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// Pin counts
+#define PINS_COUNT (48)
+#define NUM_DIGITAL_PINS (48)
+#define NUM_ANALOG_INPUTS (1)
+#define NUM_ANALOG_OUTPUTS (0)
+
+// LEDs (not documented on pinmap; keep defaults for compatibility)
+#define PIN_LED1 (0 + 14)
+#define PIN_LED2 (0 + 15)
+#define PIN_LED3 (0 + 13)
+
+#define LED_RED PIN_LED3
+#define LED_BLUE PIN_LED1
+#define LED_GREEN PIN_LED2
+
+#define LED_BUILTIN LED_BLUE
+#define LED_CONN LED_GREEN
+
+#define LED_STATE_ON 0
+
+// Buttons / touch
+#define PIN_BUTTON1 (32 + 10)
+#define BUTTON_ACTIVE_LOW true
+#define BUTTON_ACTIVE_PULLUP true
+#define PIN_BUTTON2 (0 + 18)      // reset-labelled but usable as GPIO
+#define PIN_BUTTON_TOUCH (0 + 11) // capacitive touch
+#define BUTTON_TOUCH_ACTIVE_LOW true
+#define BUTTON_TOUCH_ACTIVE_PULLUP true
+
+#define BUTTON_CLICK_MS 400
+#define BUTTON_TOUCH_MS 200
+
+// Analog
+#define PIN_A0 (4)
+#define BATTERY_PIN PIN_A0
+static const uint8_t A0 = PIN_A0;
+#define ADC_RESOLUTION 14
+#define BATTERY_SENSE_RESOLUTION_BITS 12
+#define BATTERY_SENSE_RESOLUTION 4096.0
+#undef AREF_VOLTAGE
+#define AREF_VOLTAGE 3.0
+#define VBAT_AR_INTERNAL AR_INTERNAL_3_0
+#define ADC_MULTIPLIER (2.0F)
+
+// NFC
+#define PIN_NFC1 (9)
+#define PIN_NFC2 (10)
+
+// I2C (IMU BHI260AP, RTC, etc.)
+#define WIRE_INTERFACES_COUNT 1
+#define PIN_WIRE_SDA (0 + 26)
+#define PIN_WIRE_SCL (0 + 27)
+#define HAS_BHI260AP
+
+#define TP_SER_IO (0 + 11)
+
+// RTC interrupt
+#define PIN_RTC_INT (0 + 16)
+
+// QSPI flash
+#define PIN_QSPI_SCK (32 + 14)
+#define PIN_QSPI_CS (32 + 15)
+#define PIN_QSPI_IO0 (32 + 12)
+#define PIN_QSPI_IO1 (32 + 13)
+#define PIN_QSPI_IO2 (0 + 7)
+#define PIN_QSPI_IO3 (0 + 5)
+
+// On-board QSPI Flash
+#define EXTERNAL_FLASH_DEVICES MX25R1635F
+#define EXTERNAL_FLASH_USE_QSPI
+
+// LoRa SX1262
+#define USE_SX1262
+#define USE_SX1268
+#define SX126X_CS (0 + 24)
+#define SX126X_DIO1 (0 + 20)
+#define SX1262_DIO3 (0 + 21)
+#define SX126X_BUSY (0 + 17)
+#define SX126X_RESET (0 + 25)
+#define SX126X_DIO2_AS_RF_SWITCH
+#define SX126X_DIO3_TCXO_VOLTAGE 1.8
+#define TCXO_OPTIONAL
+
+#define SPI_INTERFACES_COUNT 2
+
+#define PIN_SPI_MISO (0 + 23)
+#define PIN_SPI_MOSI (0 + 22)
+#define PIN_SPI_SCK (0 + 19)
+
+// E-paper (1.54" per pinmap)
+// Alias PIN_EINK_EN to keep common eink power control code working
+#define PIN_EINK_BL (32 + 11) // backlight / panel power switch
+#define PIN_EINK_EN PIN_EINK_BL
+#define PIN_EINK_CS (0 + 30)
+#define PIN_EINK_BUSY (0 + 3)
+#define PIN_EINK_DC (0 + 28)
+#define PIN_EINK_RES (0 + 2)
+#define PIN_EINK_SCLK (0 + 31)
+#define PIN_EINK_MOSI (0 + 29) // also called SDI
+
+// Power control
+#define PIN_POWER_EN (0 + 12)
+
+#define PIN_SPI1_MISO (32 + 7) // Placeholder MISO; keep off QSPI pins to avoid contention
+#define PIN_SPI1_MOSI PIN_EINK_MOSI
+#define PIN_SPI1_SCK PIN_EINK_SCLK
+
+// GPS (TX/RX/Wake/Reset/PPS per pinmap)
+#define GPS_L76K
+#define PIN_GPS_REINIT (32 + 5)  // Reset
+#define PIN_GPS_STANDBY (32 + 2) // Wake
+#define PIN_GPS_PPS (32 + 4)
+#define GPS_TX_PIN (32 + 8)
+#define GPS_RX_PIN (32 + 9)
+#define GPS_THREAD_INTERVAL 50
+
+#define PIN_SERIAL1_RX GPS_RX_PIN
+#define PIN_SERIAL1_TX GPS_TX_PIN
+
+// Sensors / accessories
+#define PIN_BUZZER (0 + 6)
+#define PIN_DRV_EN (0 + 8)
+
+#define HAS_DRV2605 1
+
+// Battery / ADC already defined above
+#define HAS_RTC 1
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif