Skip to content

Commit d0e5499

Browse files
authored
Merge pull request #3914 from askpatrickw/feathers2-Nsync
Feathers2 nsync
2 parents 80fa60d + 2ce0720 commit d0e5499

File tree

4 files changed

+12
-9
lines changed

4 files changed

+12
-9
lines changed

ports/esp32s2/boards/unexpectedmaker_feathers2/mpconfigboard.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
#define MICROPY_HW_MCU_NAME "ESP32S2"
3131

3232
#define CIRCUITPY_BOOT_BUTTON (&pin_GPIO0)
33-
3433
#define BOARD_USER_SAFE_MODE_ACTION translate("pressing boot button at start up.\n")
3534

3635
#define AUTORESET_DELAY_MS 500

ports/esp32s2/boards/unexpectedmaker_feathers2/pins.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
1212
{ MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
1313
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_GPIO13) },
1414
{ MP_ROM_QSTR(MP_QSTR_D16), MP_ROM_PTR(&pin_GPIO13) },
15+
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
1516

1617
{ MP_ROM_QSTR(MP_QSTR_IO12), MP_ROM_PTR(&pin_GPIO12) },
1718
{ MP_ROM_QSTR(MP_QSTR_A3), MP_ROM_PTR(&pin_GPIO12) },
@@ -85,13 +86,9 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
8586
{ MP_ROM_QSTR(MP_QSTR_APA102_MOSI), MP_ROM_PTR(&pin_GPIO40) }, // MTDO
8687
{ MP_ROM_QSTR(MP_QSTR_APA102_SCK), MP_ROM_PTR(&pin_GPIO45) },
8788

88-
8989
{ MP_ROM_QSTR(MP_QSTR_LDO2), MP_ROM_PTR(&pin_GPIO21) },
9090
{ MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
9191

92-
{ MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
93-
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
94-
9592
{ MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
9693
{ MP_ROM_QSTR(MP_QSTR_AMB), MP_ROM_PTR(&pin_GPIO4) },
9794

ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/mpconfigboard.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,3 +36,13 @@
3636

3737
// #define MICROPY_HW_APA102_MOSI (&pin_GPIO40)
3838
// #define MICROPY_HW_APA102_SCK (&pin_GPIO45)
39+
40+
#define DEFAULT_I2C_BUS_SCL (&pin_GPIO38)
41+
#define DEFAULT_I2C_BUS_SDA (&pin_GPIO33)
42+
43+
#define DEFAULT_SPI_BUS_SCK (&pin_GPIO36)
44+
#define DEFAULT_SPI_BUS_MOSI (&pin_GPIO35)
45+
#define DEFAULT_SPI_BUS_MISO (&pin_GPIO37)
46+
47+
#define DEFAULT_UART_BUS_RX (&pin_GPIO44)
48+
#define DEFAULT_UART_BUS_TX (&pin_GPIO43)

ports/esp32s2/boards/unexpectedmaker_feathers2_prerelease/pins.c

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
2626
{ MP_ROM_QSTR(MP_QSTR_A5), MP_ROM_PTR(&pin_GPIO5) },
2727
{ MP_ROM_QSTR(MP_QSTR_D19), MP_ROM_PTR(&pin_GPIO5) },
2828

29-
{ MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
29+
{ MP_ROM_QSTR(MP_QSTR_IO36), MP_ROM_PTR(&pin_GPIO36) },
3030
{ MP_ROM_QSTR(MP_QSTR_SCK), MP_ROM_PTR(&pin_GPIO36) },
3131
{ MP_ROM_QSTR(MP_QSTR_D25), MP_ROM_PTR(&pin_GPIO36) },
3232

@@ -89,9 +89,6 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
8989
{ MP_ROM_QSTR(MP_QSTR_LDO2), MP_ROM_PTR(&pin_GPIO21) },
9090
{ MP_ROM_QSTR(MP_QSTR_IO21), MP_ROM_PTR(&pin_GPIO21) },
9191

92-
{ MP_ROM_QSTR(MP_QSTR_IO13), MP_ROM_PTR(&pin_GPIO13) },
93-
{ MP_ROM_QSTR(MP_QSTR_LED), MP_ROM_PTR(&pin_GPIO13) },
94-
9592
{ MP_ROM_QSTR(MP_QSTR_IO4), MP_ROM_PTR(&pin_GPIO4) },
9693
{ MP_ROM_QSTR(MP_QSTR_AMB), MP_ROM_PTR(&pin_GPIO4) },
9794

0 commit comments

Comments
 (0)