Skip to content

Commit e4e1173

Browse files
committed
fix/m5: use new board id
Signed-off-by: lbuque <[email protected]>
1 parent bfaeb08 commit e4e1173

File tree

3 files changed

+36
-32
lines changed

3 files changed

+36
-32
lines changed

m5stack/cmodules/m5unified/m5unified.c

Lines changed: 34 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,38 +5,42 @@ STATIC const mp_rom_map_elem_t m5_board_member_table[] = {
55
/* *FORMAT-OFF* */
66
// with display boards
77
{ MP_ROM_QSTR(MP_QSTR_unknown), MP_ROM_INT(0) },
8-
{ MP_ROM_QSTR(MP_QSTR_Non_Panel), MP_ROM_INT(1) },
9-
{ MP_ROM_QSTR(MP_QSTR_M5Stack), MP_ROM_INT(2) },
10-
{ MP_ROM_QSTR(MP_QSTR_M5StackCore2), MP_ROM_INT(3) },
11-
{ MP_ROM_QSTR(MP_QSTR_M5StickC), MP_ROM_INT(4) },
12-
{ MP_ROM_QSTR(MP_QSTR_M5StickCPlus), MP_ROM_INT(5) },
13-
{ MP_ROM_QSTR(MP_QSTR_M5StickCPlus2), MP_ROM_INT(6) },
14-
{ MP_ROM_QSTR(MP_QSTR_M5StackCoreInk), MP_ROM_INT(7) },
15-
{ MP_ROM_QSTR(MP_QSTR_M5Paper), MP_ROM_INT(8) },
16-
{ MP_ROM_QSTR(MP_QSTR_M5Tough), MP_ROM_INT(9) },
17-
{ MP_ROM_QSTR(MP_QSTR_M5Station), MP_ROM_INT(10) },
18-
{ MP_ROM_QSTR(MP_QSTR_M5StackCoreS3), MP_ROM_INT(11) },
19-
{ MP_ROM_QSTR(MP_QSTR_M5AtomS3), MP_ROM_INT(12) },
8+
{ MP_ROM_QSTR(MP_QSTR_M5Stack), MP_ROM_INT(1) },
9+
{ MP_ROM_QSTR(MP_QSTR_M5StackCore2), MP_ROM_INT(2) },
10+
{ MP_ROM_QSTR(MP_QSTR_M5StickC), MP_ROM_INT(3) },
11+
{ MP_ROM_QSTR(MP_QSTR_M5StickCPlus), MP_ROM_INT(4) },
12+
{ MP_ROM_QSTR(MP_QSTR_M5StickCPlus2), MP_ROM_INT(5) },
13+
{ MP_ROM_QSTR(MP_QSTR_M5StackCoreInk), MP_ROM_INT(6) },
14+
{ MP_ROM_QSTR(MP_QSTR_M5Paper), MP_ROM_INT(7) },
15+
{ MP_ROM_QSTR(MP_QSTR_M5Tough), MP_ROM_INT(8) },
16+
{ MP_ROM_QSTR(MP_QSTR_M5Station), MP_ROM_INT(9) },
17+
{ MP_ROM_QSTR(MP_QSTR_M5StackCoreS3), MP_ROM_INT(10) },
18+
{ MP_ROM_QSTR(MP_QSTR_M5AtomS3), MP_ROM_INT(11) },
19+
{ MP_ROM_QSTR(MP_QSTR_M5Dial), MP_ROM_INT(12) },
20+
{ MP_ROM_QSTR(MP_QSTR_M5DinMeter), MP_ROM_INT(13) },
2021
// non display boards
21-
{ MP_ROM_QSTR(MP_QSTR_M5Atom), MP_ROM_INT(13) },
22-
{ MP_ROM_QSTR(MP_QSTR_M5AtomPsram), MP_ROM_INT(14) },
23-
{ MP_ROM_QSTR(MP_QSTR_M5AtomU), MP_ROM_INT(15) },
24-
{ MP_ROM_QSTR(MP_QSTR_M5Camera), MP_ROM_INT(16) },
25-
{ MP_ROM_QSTR(MP_QSTR_M5TimerCam), MP_ROM_INT(17) },
26-
{ MP_ROM_QSTR(MP_QSTR_M5StampPico), MP_ROM_INT(18) },
27-
{ MP_ROM_QSTR(MP_QSTR_M5StampC3), MP_ROM_INT(19) },
28-
{ MP_ROM_QSTR(MP_QSTR_M5StampC3U), MP_ROM_INT(20) },
29-
{ MP_ROM_QSTR(MP_QSTR_M5StampS3), MP_ROM_INT(21) },
30-
{ MP_ROM_QSTR(MP_QSTR_M5AtomS3Lite), MP_ROM_INT(22) },
31-
{ MP_ROM_QSTR(MP_QSTR_M5AtomS3U), MP_ROM_INT(23) },
22+
{ MP_ROM_QSTR(MP_QSTR_M5Atom), MP_ROM_INT(128) },
23+
{ MP_ROM_QSTR(MP_QSTR_M5AtomPsram), MP_ROM_INT(129) },
24+
{ MP_ROM_QSTR(MP_QSTR_M5AtomU), MP_ROM_INT(130) },
25+
{ MP_ROM_QSTR(MP_QSTR_M5Camera), MP_ROM_INT(131) },
26+
{ MP_ROM_QSTR(MP_QSTR_M5TimerCam), MP_ROM_INT(132) },
27+
{ MP_ROM_QSTR(MP_QSTR_M5StampPico), MP_ROM_INT(133) },
28+
{ MP_ROM_QSTR(MP_QSTR_M5StampC3), MP_ROM_INT(134) },
29+
{ MP_ROM_QSTR(MP_QSTR_M5StampC3U), MP_ROM_INT(135) },
30+
{ MP_ROM_QSTR(MP_QSTR_M5StampS3), MP_ROM_INT(136) },
31+
{ MP_ROM_QSTR(MP_QSTR_M5AtomS3Lite), MP_ROM_INT(137) },
32+
{ MP_ROM_QSTR(MP_QSTR_M5AtomS3U), MP_ROM_INT(138) },
33+
{ MP_ROM_QSTR(MP_QSTR_M5Capsule), MP_ROM_INT(139) },
3234
// external displays
33-
{ MP_ROM_QSTR(MP_QSTR_M5ATOMDisplay), MP_ROM_INT(24) },
34-
{ MP_ROM_QSTR(MP_QSTR_M5UnitLCD), MP_ROM_INT(25) },
35-
{ MP_ROM_QSTR(MP_QSTR_M5UnitOLED), MP_ROM_INT(26) },
36-
{ MP_ROM_QSTR(MP_QSTR_M5UnitGLASS), MP_ROM_INT(27) },
37-
{ MP_ROM_QSTR(MP_QSTR_M5UnitRCA), MP_ROM_INT(28) },
38-
{ MP_ROM_QSTR(MP_QSTR_M5ModuleDisplay), MP_ROM_INT(29) },
39-
{ MP_ROM_QSTR(MP_QSTR_M5RCAModule), MP_ROM_INT(30) },
35+
{ MP_ROM_QSTR(MP_QSTR_M5ATOMDisplay), MP_ROM_INT(192) },
36+
{ MP_ROM_QSTR(MP_QSTR_M5UnitLCD), MP_ROM_INT(193) },
37+
{ MP_ROM_QSTR(MP_QSTR_M5UnitOLED), MP_ROM_INT(194) },
38+
{ MP_ROM_QSTR(MP_QSTR_M5UnitMiniOLED), MP_ROM_INT(195) },
39+
{ MP_ROM_QSTR(MP_QSTR_M5UnitGLASS), MP_ROM_INT(196) },
40+
{ MP_ROM_QSTR(MP_QSTR_M5UnitGLASS2), MP_ROM_INT(197) },
41+
{ MP_ROM_QSTR(MP_QSTR_M5UnitRCA), MP_ROM_INT(198) },
42+
{ MP_ROM_QSTR(MP_QSTR_M5ModuleDisplay), MP_ROM_INT(199) },
43+
{ MP_ROM_QSTR(MP_QSTR_M5ModuleRCA), MP_ROM_INT(200) },
4044
/* *FORMAT-ON* */
4145
};
4246
STATIC MP_DEFINE_CONST_DICT(m5_board_member, m5_board_member_table);

0 commit comments

Comments
 (0)