Skip to content

Commit 7ce3f25

Browse files
microdev1microdev1
authored
Merge pull request #5299 from Neradoc/nera-rework-board-dicts
change board dicts to include a common macro with __name__
2 parents 69e7b8b + 8625e53 commit 7ce3f25

File tree

234 files changed

+585
-573
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

234 files changed

+585
-573
lines changed

‎ports/atmel-samd/boards/8086_commander/pins.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "shared-bindings/board/__init__.h"
22

3-
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4-
{ MP_ROM_QSTR(MP_QSTR_board_id), MP_ROM_PTR(&board_module_id_obj) },
3+
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
55

66

77
// Serial
@@ -62,4 +62,4 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
6262
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
6363

6464
};
65-
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
65+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/atmel-samd/boards/adafruit_neokey_trinkey_m0/pins.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
#include "shared-bindings/board/__init__.h"
22

3-
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4-
{ MP_ROM_QSTR(MP_QSTR_board_id), MP_ROM_PTR(&board_module_id_obj) },
3+
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
55

66
{ MP_ROM_QSTR(MP_QSTR_TOUCH), MP_ROM_PTR(&pin_PA07) },
77
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA15) },
88
{ MP_ROM_QSTR(MP_QSTR_SWITCH), MP_ROM_PTR(&pin_PA28) },
99
};
10-
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
10+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/atmel-samd/boards/adafruit_proxlight_trinkey_m0/pins.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "shared-bindings/board/__init__.h"
22

3-
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4-
{ MP_ROM_QSTR(MP_QSTR_board_id), MP_ROM_PTR(&board_module_id_obj) },
3+
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
55

66
{ MP_ROM_QSTR(MP_QSTR_INTERRUPT), MP_ROM_PTR(&pin_PA00) },
77

@@ -14,4 +14,4 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
1414

1515
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
1616
};
17-
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
17+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/atmel-samd/boards/adafruit_rotary_trinkey_m0/pins.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
#include "shared-bindings/board/__init__.h"
22

3-
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4-
{ MP_ROM_QSTR(MP_QSTR_board_id), MP_ROM_PTR(&board_module_id_obj) },
3+
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
55

66
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA01) },
77
{ MP_ROM_QSTR(MP_QSTR_ROTA), MP_ROM_PTR(&pin_PA04) },
88
{ MP_ROM_QSTR(MP_QSTR_ROTB), MP_ROM_PTR(&pin_PA00) },
99
{ MP_ROM_QSTR(MP_QSTR_SWITCH), MP_ROM_PTR(&pin_PA27) },
1010
{ MP_ROM_QSTR(MP_QSTR_TOUCH), MP_ROM_PTR(&pin_PA06) },
1111
};
12-
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
12+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/atmel-samd/boards/adafruit_slide_trinkey_m0/pins.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "shared-bindings/board/__init__.h"
22

3-
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4-
{ MP_ROM_QSTR(MP_QSTR_board_id), MP_ROM_PTR(&board_module_id_obj) },
3+
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
55

66
{ MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA04) },
77

@@ -10,4 +10,4 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
1010

1111
{ MP_ROM_QSTR(MP_QSTR_TOUCH), MP_ROM_PTR(&pin_PA07) },
1212
};
13-
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
13+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/atmel-samd/boards/aloriumtech_evo_m51/pins.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "shared-bindings/board/__init__.h"
22

3-
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4-
{ MP_ROM_QSTR(MP_QSTR_board_id), MP_ROM_PTR(&board_module_id_obj) },
3+
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
55

66
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
77
{ MP_ROM_QSTR(MP_QSTR_D14), MP_ROM_PTR(&pin_PA02) },
@@ -59,4 +59,4 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
5959
{ MP_ROM_QSTR(MP_QSTR_SDA_1), MP_ROM_PTR(&pin_PD09) },
6060
{ MP_ROM_QSTR(MP_QSTR_SCL_1), MP_ROM_PTR(&pin_PD08) },
6161
};
62-
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
62+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/atmel-samd/boards/arduino_mkr1300/pins.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "shared-bindings/board/__init__.h"
22

3-
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4-
{ MP_ROM_QSTR(MP_QSTR_board_id), MP_ROM_PTR(&board_module_id_obj) },
3+
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
55

66
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
77
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PB02) },
@@ -45,4 +45,4 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4545
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
4646
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
4747
};
48-
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
48+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/atmel-samd/boards/arduino_mkrzero/pins.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "shared-bindings/board/__init__.h"
22

3-
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4-
{ MP_ROM_QSTR(MP_QSTR_board_id), MP_ROM_PTR(&board_module_id_obj) },
3+
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
55

66
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
77
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PB02) },
@@ -48,4 +48,4 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4848
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
4949
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
5050
};
51-
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
51+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/atmel-samd/boards/arduino_nano_33_iot/pins.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "shared-bindings/board/__init__.h"
22

3-
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4-
{ MP_ROM_QSTR(MP_QSTR_board_id), MP_ROM_PTR(&board_module_id_obj) },
3+
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
55

66
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
77
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PB02) },
@@ -57,4 +57,4 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
5757
{ MP_OBJ_NEW_QSTR(MP_QSTR_ESP_GPIO0), MP_ROM_PTR(&pin_PA27) },
5858
{ MP_OBJ_NEW_QSTR(MP_QSTR_ESP_BUSY), MP_ROM_PTR(&pin_PA28) },
5959
};
60-
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
60+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

‎ports/atmel-samd/boards/arduino_zero/pins.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#include "shared-bindings/board/__init__.h"
22

3-
STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4-
{ MP_ROM_QSTR(MP_QSTR_board_id), MP_ROM_PTR(&board_module_id_obj) },
3+
STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
4+
CIRCUITPYTHON_BOARD_DICT_STANDARD_ITEMS
55

66
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA02) },
77
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PB08) },
@@ -41,4 +41,4 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
4141
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
4242
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
4343
};
44-
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);
44+
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

0 commit comments

Comments
 (0)