Skip to content

Commit 0f0bbd8

Browse files
dhalbertdhalbert
authored
Merge pull request adafruit#3770 from dhalbert/esp-uart-pins
ESP UART pins misnamed on some boards
2 parents bd87201 + dbfabdd commit 0f0bbd8

6 files changed

Lines changed: 6 additions & 24 deletions

File tree

‎ports/atmel-samd/boards/pybadge_airlift/mpconfigboard.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,6 @@
2323
#define DEFAULT_SPI_BUS_MOSI (&pin_PB23)
2424
#define DEFAULT_SPI_BUS_MISO (&pin_PB22)
2525

26-
#define DEFAULT_UART_BUS_RX (&pin_PB17)
27-
#define DEFAULT_UART_BUS_TX (&pin_PB16)
28-
2926
// USB is always used internally so skip the pin objects for it.
3027
#define IGNORE_PIN_PA24 1
3128
#define IGNORE_PIN_PA25 1

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,6 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
3030
{MP_OBJ_NEW_QSTR(MP_QSTR_D12), MP_ROM_PTR(&pin_PA22)},
3131
{MP_OBJ_NEW_QSTR(MP_QSTR_D13), MP_ROM_PTR(&pin_PA23)},
3232

33-
// UART
34-
{MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PB17)},
35-
{MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PB16)},
36-
3733
// I2C
3834
{MP_OBJ_NEW_QSTR(MP_QSTR_SDA), MP_ROM_PTR(&pin_PA12)},
3935
{MP_OBJ_NEW_QSTR(MP_QSTR_SCL), MP_ROM_PTR(&pin_PA13)},
@@ -58,6 +54,8 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
5854
{MP_OBJ_NEW_QSTR(MP_QSTR_ESP_GPIO0), MP_ROM_PTR(&pin_PA31)},
5955
{MP_OBJ_NEW_QSTR(MP_QSTR_ESP_BUSY), MP_ROM_PTR(&pin_PA00)},
6056
{MP_OBJ_NEW_QSTR(MP_QSTR_ESP_RESET), MP_ROM_PTR(&pin_PB12)},
57+
{MP_OBJ_NEW_QSTR(MP_QSTR_ESP_TX), MP_ROM_PTR(&pin_PB16)},
58+
{MP_OBJ_NEW_QSTR(MP_QSTR_ESP_RX), MP_ROM_PTR(&pin_PB17)},
6159

6260
// TFT control pins
6361
{MP_OBJ_NEW_QSTR(MP_QSTR_TFT_LITE), MP_ROM_PTR(&pin_PA01)},
@@ -69,7 +67,6 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
6967

7068
{MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj)},
7169
{MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj)},
72-
{MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj)},
7370

7471
{MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display)}};
7572
MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);

‎ports/atmel-samd/boards/pyportal/mpconfigboard.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,6 @@
2424
#define DEFAULT_SPI_BUS_MOSI (&pin_PA12)
2525
#define DEFAULT_SPI_BUS_MISO (&pin_PA14)
2626

27-
#define DEFAULT_UART_BUS_RX (&pin_PB13)
28-
#define DEFAULT_UART_BUS_TX (&pin_PB12)
29-
3027
// USB is always used internally so skip the pin objects for it.
3128
#define IGNORE_PIN_PA24 1
3229
#define IGNORE_PIN_PA25 1

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,8 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
5858
{ MP_OBJ_NEW_QSTR(MP_QSTR_ESP_BUSY), MP_ROM_PTR(&pin_PB16) },
5959
{ MP_OBJ_NEW_QSTR(MP_QSTR_ESP_RESET), MP_ROM_PTR(&pin_PB17) },
6060
{ MP_OBJ_NEW_QSTR(MP_QSTR_ESP_RTS), MP_ROM_PTR(&pin_PA15) },
61-
62-
// UART
63-
{ MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PB12) },
64-
{ MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PB13) },
61+
{ MP_OBJ_NEW_QSTR(MP_QSTR_ESP_TX), MP_ROM_PTR(&pin_PB12) },
62+
{ MP_OBJ_NEW_QSTR(MP_QSTR_ESP_RX), MP_ROM_PTR(&pin_PB13) },
6563

6664
// SPI
6765
{ MP_OBJ_NEW_QSTR(MP_QSTR_MOSI),MP_ROM_PTR(&pin_PA12) },
@@ -78,7 +76,6 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
7876

7977
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
8078
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
81-
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
8279

8380
{ MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display) },
8481
};

‎ports/atmel-samd/boards/pyportal_titano/mpconfigboard.h‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@
2222
#define DEFAULT_SPI_BUS_MOSI (&pin_PA12)
2323
#define DEFAULT_SPI_BUS_MISO (&pin_PA14)
2424

25-
#define DEFAULT_UART_BUS_RX (&pin_PB13)
26-
#define DEFAULT_UART_BUS_TX (&pin_PB12)
27-
2825
// USB is always used internally so skip the pin objects for it.
2926
#define IGNORE_PIN_PA24 1
3027
#define IGNORE_PIN_PA25 1

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,8 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
5858
{ MP_OBJ_NEW_QSTR(MP_QSTR_ESP_BUSY), MP_ROM_PTR(&pin_PB16) },
5959
{ MP_OBJ_NEW_QSTR(MP_QSTR_ESP_RESET), MP_ROM_PTR(&pin_PB17) },
6060
{ MP_OBJ_NEW_QSTR(MP_QSTR_ESP_RTS), MP_ROM_PTR(&pin_PA15) },
61-
62-
// UART
63-
{ MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PB12) },
64-
{ MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PB13) },
61+
{ MP_OBJ_NEW_QSTR(MP_QSTR_ESP_TX), MP_ROM_PTR(&pin_PB12) },
62+
{ MP_OBJ_NEW_QSTR(MP_QSTR_ESP_RX), MP_ROM_PTR(&pin_PB13) },
6563

6664
// SPI
6765
{ MP_OBJ_NEW_QSTR(MP_QSTR_MOSI),MP_ROM_PTR(&pin_PA12) },
@@ -78,7 +76,6 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = {
7876

7977
{ MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) },
8078
{ MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) },
81-
{ MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) },
8279

8380
{ MP_ROM_QSTR(MP_QSTR_DISPLAY), MP_ROM_PTR(&displays[0].display) },
8481
};

0 commit comments

Comments
 (0)