Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions extras/board_spec/boards/m5atomlite.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -65,6 +75,9 @@
"devices": {
"rgb_led": {
"kind": "led_strip"
},
"ir": {
"kind": "led"
}
},
"connectors": {
Expand Down
9 changes: 9 additions & 0 deletions extras/board_spec/boards/m5atommatrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -65,6 +71,9 @@
"devices": {
"rgb_led": {
"kind": "led_strip"
},
"ir": {
"kind": "led"
}
},
"connectors": {
Expand Down
9 changes: 9 additions & 0 deletions extras/board_spec/boards/m5atomu.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -65,6 +71,9 @@
"devices": {
"rgb_led": {
"kind": "led_strip"
},
"ir": {
"kind": "led"
}
},
"connectors": {
Expand Down
9 changes: 6 additions & 3 deletions extras/board_spec/boards/m5stack_stackchan.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,23 +75,26 @@
],
"verified": {
"roles": "generated"
}
},
"note": "Base pulls GPIO5 D (measured)."
},
"6": {
"roles": [
"conn:mbus.21"
],
"verified": {
"roles": "generated"
}
},
"note": "Base pulls GPIO6 U (measured)."
},
"7": {
"roles": [
"conn:mbus.22"
],
"verified": {
"roles": "generated"
}
},
"note": "Base pulls GPIO7 D (measured)."
},
"8": {
"roles": [
Expand Down
1 change: 1 addition & 0 deletions extras/board_spec/cli/spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down
12 changes: 0 additions & 12 deletions extras/board_spec/detector_order.json
Original file line number Diff line number Diff line change
Expand Up @@ -144,13 +144,6 @@
"boards": [
"m5unitpoep4"
]
},
{
"detector": "stampp4_detector",
"boards": [
"m5stampp4",
"m5stampp4x"
]
}
],
"constraints": [
Expand All @@ -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"
}
]
}
Expand Down
4 changes: 2 additions & 2 deletions extras/board_spec/dist/board_spec_editor.html

Large diffs are not rendered by default.

16 changes: 16 additions & 0 deletions extras/board_spec/generated/resolved/m5atomlite.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -71,6 +81,12 @@
"verified": {
"signals": "generated"
}
},
"ir": {
"kind": "led",
"signals": {
"pwm": "gpio:12"
}
}
},
"connectors": {
Expand Down
12 changes: 12 additions & 0 deletions extras/board_spec/generated/resolved/m5atommatrix.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -71,6 +77,12 @@
"verified": {
"signals": "generated"
}
},
"ir": {
"kind": "led",
"signals": {
"pwm": "gpio:12"
}
}
},
"connectors": {
Expand Down
12 changes: 12 additions & 0 deletions extras/board_spec/generated/resolved/m5atomu.json
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -71,6 +77,12 @@
"verified": {
"signals": "generated"
}
},
"ir": {
"kind": "led",
"signals": {
"pwm": "gpio:12"
}
}
},
"connectors": {
Expand Down
9 changes: 6 additions & 3 deletions extras/board_spec/generated/resolved/m5stack_stackchan.json
Original file line number Diff line number Diff line change
Expand Up @@ -75,23 +75,26 @@
],
"verified": {
"roles": "generated"
}
},
"note": "Base pulls GPIO5 D (measured)."
},
"6": {
"roles": [
"conn:mbus.21"
],
"verified": {
"roles": "generated"
}
},
"note": "Base pulls GPIO6 U (measured)."
},
"7": {
"roles": [
"conn:mbus.22"
],
"verified": {
"roles": "generated"
}
},
"note": "Base pulls GPIO7 D (measured)."
},
"8": {
"roles": [
Expand Down
4 changes: 3 additions & 1 deletion extras/board_spec/lib/emit/m5gfx_detector_order.js
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,9 @@ export function renderDetectorOrderHeaders(boards, groups) {
maxFamilies = Math.max(maxFamilies, group.ordered.length);
const array = `static const board_detector_t* const ${name}[] = {\n`
+ group.ordered.map((detector) => ` &${detector},`).join("\n")
+ "\n nullptr,\n};\n";
+ "\n nullptr,\n};\n"
+ `static_assert(sizeof(${name}) / sizeof(${name}[0]) - 1 <= max_detector_families,\n`
+ ` "${name} exceeds the detection session family limit");\n`;
outputs.set(group.output, (outputs.get(group.output) ?? "// Generated from detector_order.json and board catalog.\n#pragma once\n\n") + array + "\n");
}
const ids = boards.filter(hasGpioPowerHold).map((board) => board.legacy_board_id).sort((a, b) => a - b);
Expand Down
4 changes: 3 additions & 1 deletion extras/board_spec/targets.json
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
"m5stack_core2": {
"chip": "esp32_d0wdq6", "legacy_board_id": 2, "cpp_namespace": "core2", "board_enum": "board_M5StackCore2", "desc_name": "desc_core2",
"wiring_fields": ["display", "shared_sd", "i2c", "hold"], "desc_internal_i2c": true, "wiring_output": "esp32_d0wdq6_wiring.hpp",
"probe_pins": [12, 32, 33],
"options": [
{ "name": "new_pmic", "bit": 0, "select": { "pmic": "axp2101" } },
{ "name": "lcd_e", "bit": 1, "select": { "lcd": "ili9342e" } }
Expand All @@ -17,6 +18,7 @@
"m5tough": {
"chip": "esp32_d0wdq6", "legacy_board_id": 8, "cpp_namespace": "tough", "board_enum": "board_M5Tough", "desc_name": "desc_tough",
"wiring_fields": ["display", "shared_sd", "i2c", "hold"], "desc_internal_i2c": true, "wiring_output": "esp32_d0wdq6_wiring.hpp",
"probe_pins": [12, 32, 33],
"options": [
{ "name": "reserved", "bit": 0 },
{ "name": "lcd_e", "bit": 1, "select": { "lcd": "ili9342e" } }
Expand Down Expand Up @@ -53,7 +55,7 @@
},
"m5atomlite": {
"chip": "esp32_d0wdq6", "legacy_board_id": 128, "cpp_namespace": "atomlite", "board_enum": "board_M5AtomLite", "desc_name": "desc_atomlite",
"wiring_fields": [], "probe_pins": [25], "wiring_output": "esp32_d0wdq6_wiring.hpp"
"wiring_fields": [], "probe_pins": [12, 18, 25], "wiring_output": "esp32_d0wdq6_wiring.hpp"
},
"m5atomu": {
"chip": "esp32_d0wdq6", "legacy_board_id": 130, "board_enum": "board_M5AtomU", "desc_name": "desc_atomu"
Expand Down
Loading
Loading