Skip to content

fix(firmware): map T_ECHO_CARD (136) to SoftDevice 6.1.1 - #6776

Merged
jamesarich merged 1 commit into
mainfrom
fix/t-echo-card-softdevice
Aug 19, 2026
Merged

fix(firmware): map T_ECHO_CARD (136) to SoftDevice 6.1.1#6776
jamesarich merged 1 commit into
mainfrom
fix/t-echo-card-softdevice

Conversation

@jamesarich

@jamesarich jamesarich commented Aug 19, 2026

Copy link
Copy Markdown
Collaborator

What

Unblocks CI for every open PR. The scheduled hardware-catalog update (#6758) added the LilyGo T-Echo-Card (hwModel 136, nrf52840) with no row in device_bootloader_ota_quirks.json. SoftDeviceQuirkCoverageTest is fail-closed by design, so the shard-app test job now fails on every PR's merge with main (see #6773, #6774, #6775).

How

One row: hwModel 136 / T_ECHO_CARD / target t-echo-card / SoftDevice 6.1.1.

Derived per the test's own instructions from meshtastic/firmware (develop): variants/nrf52840/t-echo-card/platformio.ini extends board = t-echo, and boards/t-echo.json declares build.arduino.ldscript = nrf52840_s140_v6.ld → S140 6.1.1 (sd_fwid 0x00B6), matching the rest of the T-Echo family (T_ECHO 7, T_ECHO_PLUS 33, T_ECHO_LITE 109).

Verification

:androidApp:testFdroidDebugUnitTest --tests "org.meshtastic.app.firmware.SoftDeviceQuirkCoverageTest" — all 6 tests pass locally against the updated catalog; spotlessCheck passes.

Constitution Check (v1.3.3)

I. KMP Core — N/A (asset only). II. Zero Lint — spotlessCheck passes. III. CMP UI — N/A. IV. Privacy — N/A. V. Design Standards — N/A. VI. Docs Freshness — no user-facing behavior change (restores factory-erase availability for a new board via existing documented flow). VII. Verify Before Push — test run above; CI confirmed after push.

🤖 Generated with Claude Code

Summary by CodeRabbit

  • New Features
    • Added support for the T-ECHO Card device.
    • Enabled compatibility with its hardware model, PlatformIO target, and SoftDevice version.

The scheduled hardware-catalog update (#6758) added the LilyGo
T-Echo-Card, a new nrf52840 model with no row in
device_bootloader_ota_quirks.json. SoftDeviceQuirkCoverageTest is
fail-closed by design, so every PR's shard-app test run now fails
against the merge with main.

In meshtastic/firmware, variants/nrf52840/t-echo-card/platformio.ini
extends board = t-echo, whose boards/t-echo.json declares
build.arduino.ldscript = nrf52840_s140_v6.ld — SoftDevice S140 6.1.1,
matching the rest of the T-Echo family.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>
@github-actions github-actions Bot added the bugfix PR tag label Aug 19, 2026
@coderabbitai

coderabbitai Bot commented Aug 19, 2026

Copy link
Copy Markdown
Contributor

Review Change Stack

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Path: .coderabbit.yaml

Review profile: CHILL

Plan: Pro Plus

Run ID: 6d6be6cd-1135-4eef-8d9d-afed48a3ec8f

📥 Commits

Reviewing files that changed from the base of the PR and between 582d320 and 384c99f.

📒 Files selected for processing (1)
  • androidApp/src/main/assets/device_bootloader_ota_quirks.json

Included review availability: Your plan provides up to 4 included reviews per hour; 2 remain after this review.


📝 Walkthrough

Walkthrough

The OTA quirks configuration adds the T_ECHO_CARD device with hardware model 136, PlatformIO target t-echo-card, and SoftDevice version 6.1.1.

Changes

T_ECHO_CARD support

Layer / File(s) Summary
Register T_ECHO_CARD variant
androidApp/src/main/assets/device_bootloader_ota_quirks.json
The softDeviceVariants configuration includes the T_ECHO_CARD hardware model, PlatformIO target, and SoftDevice version.

Estimated code review effort: 1 (Trivial) | ~2 minutes

Merge Risk: ⚪ Minimal · up to 384c9

This change adds the missing SoftDevice mapping for the T-Echo-Card and restores the existing firmware flow for that board; no actionable merge-blocking risk remains after normal checks and review.

🚥 Pre-merge checks | ✅ 7 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Regression Coverage For Changed Behavior ⚠️ Warning The new row feeds applySoftDeviceVariant and USB factory erase, but tests check only row presence and recognized values; no test pins hwModel 136 to S140_6_1_1. Add an asset-backed repository test for hwModel 136 and target t-echo-card that asserts S140_6_1_1 and fails when the row is absent or changed.
✅ Passed checks (7 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and concisely describes the added T_ECHO_CARD mapping to SoftDevice 6.1.1.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Sibling Call Sites And Presence Semantics ✅ Passed The diff only adds a JSON SoftDevice mapping for T_ECHO_CARD; it changes no nullable or absent-value representation and adds no zero-default physical measurement field.
Tests Prove The Path, Not The End State ✅ Passed The PR diff changes only device_bootloader_ota_quirks.json; it adds or changes no tests, so the test-path failure conditions do not apply.
Moved Code Diffed Against Its Original ✅ Passed The commit only adds one JSON entry to softDeviceVariants; it deletes no type or function and performs no code move or extraction.

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@jamesarich
jamesarich merged commit b3ed54a into main Aug 19, 2026
15 checks passed
@jamesarich
jamesarich deleted the fix/t-echo-card-softdevice branch August 19, 2026 22:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

bugfix PR tag

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant