diff --git a/extras/board_spec/boards/m5atomlite.json b/extras/board_spec/boards/m5atomlite.json index e8489870..680de677 100644 --- a/extras/board_spec/boards/m5atomlite.json +++ b/extras/board_spec/boards/m5atomlite.json @@ -6,6 +6,16 @@ "legacy_board_id": 128, "chip": "esp32_d0wdq6", "pins": { + "12": { + "roles": [ + "dev:ir.pwm" + ], + "note": "IR transmitter GPIO from the official pin map." + }, + "18": { + "roles": [], + "note": "Unconnected GPIO sampled by the Atom family exclusion gate." + }, "21": { "roles": [ "bus:internal_i2c.scl" @@ -65,6 +75,9 @@ "devices": { "rgb_led": { "kind": "led_strip" + }, + "ir": { + "kind": "led" } }, "connectors": { diff --git a/extras/board_spec/boards/m5atommatrix.json b/extras/board_spec/boards/m5atommatrix.json index 4945d563..20a5beb2 100644 --- a/extras/board_spec/boards/m5atommatrix.json +++ b/extras/board_spec/boards/m5atommatrix.json @@ -6,6 +6,12 @@ "legacy_board_id": 141, "chip": "esp32_d0wdq6", "pins": { + "12": { + "roles": [ + "dev:ir.pwm" + ], + "note": "IR transmitter GPIO from the official pin map." + }, "21": { "roles": [ "bus:internal_i2c.scl" @@ -65,6 +71,9 @@ "devices": { "rgb_led": { "kind": "led_strip" + }, + "ir": { + "kind": "led" } }, "connectors": { diff --git a/extras/board_spec/boards/m5atomu.json b/extras/board_spec/boards/m5atomu.json index ecaf4e61..4271dc92 100644 --- a/extras/board_spec/boards/m5atomu.json +++ b/extras/board_spec/boards/m5atomu.json @@ -6,6 +6,12 @@ "legacy_board_id": 130, "chip": "esp32_d0wdq6", "pins": { + "12": { + "roles": [ + "dev:ir.pwm" + ], + "note": "IR transmitter GPIO from the official pin map." + }, "21": { "roles": [ "bus:internal_i2c.scl" @@ -65,6 +71,9 @@ "devices": { "rgb_led": { "kind": "led_strip" + }, + "ir": { + "kind": "led" } }, "connectors": { diff --git a/extras/board_spec/boards/m5stack_stackchan.json b/extras/board_spec/boards/m5stack_stackchan.json index 74fe5b63..0791e777 100644 --- a/extras/board_spec/boards/m5stack_stackchan.json +++ b/extras/board_spec/boards/m5stack_stackchan.json @@ -75,7 +75,8 @@ ], "verified": { "roles": "generated" - } + }, + "note": "Base pulls GPIO5 D (measured)." }, "6": { "roles": [ @@ -83,7 +84,8 @@ ], "verified": { "roles": "generated" - } + }, + "note": "Base pulls GPIO6 U (measured)." }, "7": { "roles": [ @@ -91,7 +93,8 @@ ], "verified": { "roles": "generated" - } + }, + "note": "Base pulls GPIO7 D (measured)." }, "8": { "roles": [ diff --git a/extras/board_spec/cli/spec.js b/extras/board_spec/cli/spec.js index 2c49332e..b0702bcf 100644 --- a/extras/board_spec/cli/spec.js +++ b/extras/board_spec/cli/spec.js @@ -437,6 +437,7 @@ class M5Unified { public: static int8_t _get_pin_table[${PIN_NAMES.length}]; static void _setup_pinmap(board_t); + static int8_t _get_power_hold_pin(board_t); }; int8_t M5Unified::_get_pin_table[${PIN_NAMES.length}]; ${tableSource} diff --git a/extras/board_spec/detector_order.json b/extras/board_spec/detector_order.json index 341d9ac0..d890c2b8 100644 --- a/extras/board_spec/detector_order.json +++ b/extras/board_spec/detector_order.json @@ -144,13 +144,6 @@ "boards": [ "m5unitpoep4" ] - }, - { - "detector": "stampp4_detector", - "boards": [ - "m5stampp4", - "m5stampp4x" - ] } ], "constraints": [ @@ -163,11 +156,6 @@ "before": "tab5_family_detector", "after": "unitpoep4_detector", "reason": "Probe Tab5 internal devices before driving Ethernet management pins" - }, - { - "before": "unitpoep4_detector", - "after": "stampp4_detector", - "reason": "StampP4 is only a fallback candidate after all P4 probes" } ] } diff --git a/extras/board_spec/dist/board_spec_editor.html b/extras/board_spec/dist/board_spec_editor.html index 7c1145e8..c8365ca5 100644 --- a/extras/board_spec/dist/board_spec_editor.html +++ b/extras/board_spec/dist/board_spec_editor.html @@ -963,8 +963,8 @@
- - + +