boards: Update Board ID.

lbuque · lbuque · commit 5801c720c806 · 2024-11-21T11:31:41.000+08:00
Signed-off-by: lbuque &lt;1102390310@qq.com&gt;
diff --git a/m5stack/boards/M5STACK_AtomS3R/mpconfigboard.cmake b/m5stack/boards/M5STACK_AtomS3R/mpconfigboard.cmake
@@ -4,7 +4,7 @@
 
 set(IDF_TARGET esp32s3)
 
-# atoms3 https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L13
+# atoms3r https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L20
 set(BOARD_ID 18)
 
 set(SDKCONFIG_DEFAULTS
diff --git a/m5stack/boards/M5STACK_AtomS3U/mpconfigboard.cmake b/m5stack/boards/M5STACK_AtomS3U/mpconfigboard.cmake
@@ -4,7 +4,7 @@
 
 set(IDF_TARGET esp32s3)
 
-# atoms3u https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L28
+# atoms3u https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L31
 set(BOARD_ID 138)
 
 set(SDKCONFIG_DEFAULTS
diff --git a/m5stack/boards/M5STACK_AtomS3_Lite/mpconfigboard.cmake b/m5stack/boards/M5STACK_AtomS3_Lite/mpconfigboard.cmake
@@ -4,7 +4,7 @@
 
 set(IDF_TARGET esp32s3)
 
-# atoms3-lite https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L27
+# atoms3-lite https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L30
 set(BOARD_ID 137)
 
 set(SDKCONFIG_DEFAULTS
diff --git a/m5stack/boards/M5STACK_AtomU/mpconfigboard.cmake b/m5stack/boards/M5STACK_AtomU/mpconfigboard.cmake
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-# stickc-plus https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L20
+# atomu https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L23
 set(BOARD_ID 130)
 
 set(SDKCONFIG_DEFAULTS
diff --git a/m5stack/boards/M5STACK_Atom_Echo/mpconfigboard.cmake b/m5stack/boards/M5STACK_Atom_Echo/mpconfigboard.cmake
@@ -2,8 +2,8 @@
 #
 # SPDX-License-Identifier: MIT
 
-# atom-echo https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L31
-set(BOARD_ID 141)
+# atom-echo https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L35
+set(BOARD_ID 142)
 
 set(SDKCONFIG_DEFAULTS
     ./boards/sdkconfig.base
diff --git a/m5stack/boards/M5STACK_Atom_Lite/mpconfigboard.cmake b/m5stack/boards/M5STACK_Atom_Lite/mpconfigboard.cmake
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-# stickc-plus https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L18
+# atom-lite https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L21
 set(BOARD_ID 128)
 
 set(SDKCONFIG_DEFAULTS
diff --git a/m5stack/boards/M5STACK_Atom_Matrix/mpconfigboard.cmake b/m5stack/boards/M5STACK_Atom_Matrix/mpconfigboard.cmake
@@ -2,8 +2,8 @@
 #
 # SPDX-License-Identifier: MIT
 
-# stickc-plus https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L30
-set(BOARD_ID 140)
+# atom-matrix https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L34
+set(BOARD_ID 141)
 
 set(SDKCONFIG_DEFAULTS
     ./boards/sdkconfig.base
diff --git a/m5stack/boards/M5STACK_Capsule/mpconfigboard.cmake b/m5stack/boards/M5STACK_Capsule/mpconfigboard.cmake
@@ -4,7 +4,7 @@
 
 set(IDF_TARGET esp32s3)
 
-# capsule https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L29
+# capsule https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L32
 set(BOARD_ID 139)
 
 set(SDKCONFIG_DEFAULTS
diff --git a/m5stack/boards/M5STACK_Cardputer/mpconfigboard.cmake b/m5stack/boards/M5STACK_Cardputer/mpconfigboard.cmake
@@ -4,7 +4,7 @@
 
 set(IDF_TARGET esp32s3)
 
-# dial https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L16
+# cardputer https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L16
 set(BOARD_ID 14)
 
 set(SDKCONFIG_DEFAULTS
diff --git a/m5stack/boards/M5STACK_DinMeter/mpconfigboard.cmake b/m5stack/boards/M5STACK_DinMeter/mpconfigboard.cmake
@@ -4,7 +4,7 @@
 
 set(IDF_TARGET esp32s3)
 
-# dial https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L16
+# dinmeter https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L15
 set(BOARD_ID 13)
 
 set(SDKCONFIG_DEFAULTS
diff --git a/m5stack/boards/M5STACK_Fire/mpconfigboard.cmake b/m5stack/boards/M5STACK_Fire/mpconfigboard.cmake
@@ -2,8 +2,8 @@
 #
 # SPDX-License-Identifier: MIT
 
-# NOTE: fire和basic共用一个bid
-# basic https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L3
+# NOTE: fire和 basic 共用一个 bid
+# fire https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L3
 set(BOARD_ID 1)
 
 set(SDKCONFIG_DEFAULTS
diff --git a/m5stack/boards/M5STACK_NanoC6/mpconfigboard.cmake b/m5stack/boards/M5STACK_NanoC6/mpconfigboard.cmake
@@ -1,6 +1,11 @@
+# SPDX-FileCopyrightText: 2024 M5Stack Technology CO LTD
+#
+# SPDX-License-Identifier: MIT
+
 set(IDF_TARGET esp32c6)
 
-set(BOARD_ID 142)
+# nanoc6 https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L33
+set(BOARD_ID 140)
 
 set(SDKCONFIG_DEFAULTS
     boards/sdkconfig.base
diff --git a/m5stack/boards/M5STACK_Paper/mpconfigboard.cmake b/m5stack/boards/M5STACK_Paper/mpconfigboard.cmake
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-# core2 https://github.com/m5stack/m5stack-board-id/blob/558d0c4e4fc55a72805827c65a5255aa4b844515/board.csv#L4
+# paper https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L9
 set(BOARD_ID 7)
 
 set(SDKCONFIG_DEFAULTS
diff --git a/m5stack/boards/M5STACK_StampS3/mpconfigboard.cmake b/m5stack/boards/M5STACK_StampS3/mpconfigboard.cmake
@@ -4,7 +4,7 @@
 
 set(IDF_TARGET esp32s3)
 
-# stamps3 https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L26
+# stamps3 https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L29
 set(BOARD_ID 136)
 
 set(SDKCONFIG_DEFAULTS
diff --git a/m5stack/boards/M5STACK_Stamp_PICO/mpconfigboard.cmake b/m5stack/boards/M5STACK_Stamp_PICO/mpconfigboard.cmake
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-# stickc-plus https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L23
+# stamppico https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L26
 set(BOARD_ID 133)
 
 set(SDKCONFIG_DEFAULTS
diff --git a/m5stack/boards/M5STACK_Station/mpconfigboard.cmake b/m5stack/boards/M5STACK_Station/mpconfigboard.cmake
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-# Station https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L11
+# station https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L11
 set(BOARD_ID 9)
 
 set(SDKCONFIG_DEFAULTS
diff --git a/m5stack/boards/M5STACK_StickC/mpconfigboard.cmake b/m5stack/boards/M5STACK_StickC/mpconfigboard.cmake
@@ -2,7 +2,7 @@
 #
 # SPDX-License-Identifier: MIT
 
-# stickc-plus https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L5
+# stickc https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L5
 set(BOARD_ID 3)
 
 set(SDKCONFIG_DEFAULTS
diff --git a/m5stack/cmodules/m5unified/m5unified.c b/m5stack/cmodules/m5unified/m5unified.c
@@ -40,9 +40,9 @@ static const mp_rom_map_elem_t m5_board_member_table[] = {
     { MP_ROM_QSTR(MP_QSTR_M5AtomS3Lite),    MP_ROM_INT(137) },
     { MP_ROM_QSTR(MP_QSTR_M5AtomS3U),       MP_ROM_INT(138) },
     { MP_ROM_QSTR(MP_QSTR_M5Capsule),       MP_ROM_INT(139) },
-    { MP_ROM_QSTR(MP_QSTR_M5AtomMatrix),    MP_ROM_INT(140) },
-    { MP_ROM_QSTR(MP_QSTR_M5AtomEcho),      MP_ROM_INT(141) },
-    { MP_ROM_QSTR(MP_QSTR_M5NanoC6),        MP_ROM_INT(142) },
+    { MP_ROM_QSTR(MP_QSTR_M5NanoC6),        MP_ROM_INT(140) },
+    { MP_ROM_QSTR(MP_QSTR_M5AtomMatrix),    MP_ROM_INT(141) },
+    { MP_ROM_QSTR(MP_QSTR_M5AtomEcho),      MP_ROM_INT(142) },
     // external displays
     { MP_ROM_QSTR(MP_QSTR_M5ATOMDisplay),   MP_ROM_INT(192) },
     { MP_ROM_QSTR(MP_QSTR_M5UnitLCD),       MP_ROM_INT(193) },

Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# SPDX-License-Identifier: MIT`
`4`	`4`
`5`		`-# stickc-plus https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L20`
	`5`	`+# atomu https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L23`
`6`	`6`	`set(BOARD_ID 130)`
`7`	`7`
`8`	`8`	`set(SDKCONFIG_DEFAULTS`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`	`#`
`3`	`3`	`# SPDX-License-Identifier: MIT`
`4`	`4`
`5`		`-# atom-echo https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L31`
`6`		`-set(BOARD_ID 141)`
	`5`	`+# atom-echo https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L35`
	`6`	`+set(BOARD_ID 142)`
`7`	`7`
`8`	`8`	`set(SDKCONFIG_DEFAULTS`
`9`	`9`	`./boards/sdkconfig.base`
Original file line number	Diff line number	Diff line change
`@@ -2,8 +2,8 @@`
`2`	`2`	`#`
`3`	`3`	`# SPDX-License-Identifier: MIT`
`4`	`4`
`5`		`-# NOTE: fire和basic共用一个bid`
`6`		`-# basic https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L3`
	`5`	`+# NOTE: fire和 basic 共用一个 bid`
	`6`	`+# fire https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L3`
`7`	`7`	`set(BOARD_ID 1)`
`8`	`8`
`9`	`9`	`set(SDKCONFIG_DEFAULTS`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# SPDX-License-Identifier: MIT`
`4`	`4`
`5`		`-# core2 https://github.com/m5stack/m5stack-board-id/blob/558d0c4e4fc55a72805827c65a5255aa4b844515/board.csv#L4`
	`5`	`+# paper https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L9`
`6`	`6`	`set(BOARD_ID 7)`
`7`	`7`
`8`	`8`	`set(SDKCONFIG_DEFAULTS`
Original file line number	Diff line number	Diff line change
`@@ -2,7 +2,7 @@`
`2`	`2`	`#`
`3`	`3`	`# SPDX-License-Identifier: MIT`
`4`	`4`
`5`		`-# Station https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L11`
	`5`	`+# station https://github.com/m5stack/m5stack-board-id/blob/main/board.csv#L11`
`6`	`6`	`set(BOARD_ID 9)`
`7`	`7`
`8`	`8`	`set(SDKCONFIG_DEFAULTS`