From dbeefc843cecd3e780d2ac6815ae955146342207 Mon Sep 17 00:00:00 2001 From: Neil Khera <32021246+NeilKhera@users.noreply.github.com> Date: Fri, 9 Jun 2023 20:14:24 -0400 Subject: [PATCH] Cleanup for Revision B3/02 --- .../boards/pycubedmini/mpconfigboard.h | 3 ++ ports/atmel-samd/boards/pycubedmini/pins.c | 43 +++++++++++-------- 2 files changed, 28 insertions(+), 18 deletions(-) diff --git a/ports/atmel-samd/boards/pycubedmini/mpconfigboard.h b/ports/atmel-samd/boards/pycubedmini/mpconfigboard.h index 6f4bec8e153b0..59fd858806ee6 100755 --- a/ports/atmel-samd/boards/pycubedmini/mpconfigboard.h +++ b/ports/atmel-samd/boards/pycubedmini/mpconfigboard.h @@ -28,5 +28,8 @@ #define DEFAULT_SPI_BUS_MOSI (&pin_PA12) #define DEFAULT_SPI_BUS_MISO (&pin_PA14) +#define DEFAULT_UART_BUS_RX (&pin_PB03) +#define DEFAULT_UART_BUS_TX (&pin_PB02) + #define IGNORE_PIN_PA24 1 #define IGNORE_PIN_PA25 1 diff --git a/ports/atmel-samd/boards/pycubedmini/pins.c b/ports/atmel-samd/boards/pycubedmini/pins.c index f0d185f7fcfb3..98bd8b92cf68b 100755 --- a/ports/atmel-samd/boards/pycubedmini/pins.c +++ b/ports/atmel-samd/boards/pycubedmini/pins.c @@ -6,31 +6,38 @@ STATIC const mp_rom_map_elem_t board_global_dict_table[] = { { MP_ROM_QSTR(MP_QSTR_MOSI), MP_ROM_PTR(&pin_PA12) }, { MP_ROM_QSTR(MP_QSTR_MISO), MP_ROM_PTR(&pin_PA14) }, - { MP_ROM_QSTR(MP_QSTR_SDA1), MP_ROM_PTR(&pin_PB12) }, - { MP_ROM_QSTR(MP_QSTR_SCL1), MP_ROM_PTR(&pin_PB13) }, - { MP_ROM_QSTR(MP_QSTR_SDA2), MP_ROM_PTR(&pin_PA17) }, - { MP_ROM_QSTR(MP_QSTR_SCL2), MP_ROM_PTR(&pin_PA16) }, - { MP_ROM_QSTR(MP_QSTR_SDA3), MP_ROM_PTR(&pin_PB31) }, - { MP_ROM_QSTR(MP_QSTR_SCL3), MP_ROM_PTR(&pin_PB30) }, + { MP_ROM_QSTR(MP_QSTR_SDA1), MP_ROM_PTR(&pin_PB12) }, + { MP_ROM_QSTR(MP_QSTR_SCL1), MP_ROM_PTR(&pin_PB13) }, + { MP_ROM_QSTR(MP_QSTR_SDA2), MP_ROM_PTR(&pin_PA17) }, + { MP_ROM_QSTR(MP_QSTR_SCL2), MP_ROM_PTR(&pin_PA16) }, + { MP_ROM_QSTR(MP_QSTR_SDA3), MP_ROM_PTR(&pin_PB31) }, + { MP_ROM_QSTR(MP_QSTR_SCL3), MP_ROM_PTR(&pin_PB30) }, - { MP_ROM_QSTR(MP_QSTR_RF_IO0), MP_ROM_PTR(&pin_PA05) }, - { MP_ROM_QSTR(MP_QSTR_RF_IO1), MP_ROM_PTR(&pin_PA04) }, - { MP_ROM_QSTR(MP_QSTR_RF_RST), MP_ROM_PTR(&pin_PA20) }, - { MP_ROM_QSTR(MP_QSTR_RF_CS), MP_ROM_PTR(&pin_PA22) }, + { MP_OBJ_NEW_QSTR(MP_QSTR_RX), MP_ROM_PTR(&pin_PB03) }, + { MP_OBJ_NEW_QSTR(MP_QSTR_TX), MP_ROM_PTR(&pin_PB02) }, + + { MP_ROM_QSTR(MP_QSTR_RF_IO0), MP_ROM_PTR(&pin_PA05) }, + { MP_ROM_QSTR(MP_QSTR_RF_IO1), MP_ROM_PTR(&pin_PA04) }, + { MP_ROM_QSTR(MP_QSTR_RF_RST), MP_ROM_PTR(&pin_PA20) }, + { MP_ROM_QSTR(MP_QSTR_RF_CS), MP_ROM_PTR(&pin_PA22) }, + + { MP_ROM_QSTR(MP_QSTR_CAM_CS), MP_ROM_PTR(&pin_PB08) }, + { MP_ROM_QSTR(MP_QSTR_CAM_EN), MP_ROM_PTR(&pin_PB16) }, + { MP_ROM_QSTR(MP_QSTR_M_FAULT), MP_ROM_PTR(&pin_PB14) }, + { MP_ROM_QSTR(MP_QSTR_SD_CS), MP_ROM_PTR(&pin_PB15) }, + { MP_ROM_QSTR(MP_QSTR_IMU_CS), MP_ROM_PTR(&pin_PA15) }, + { MP_ROM_QSTR(MP_QSTR_IMU_INT), MP_ROM_PTR(&pin_PB17) }, + { MP_ROM_QSTR(MP_QSTR_IMU_RST), MP_ROM_PTR(&pin_PB17) }, - { MP_ROM_QSTR(MP_QSTR_CS_CAM), MP_ROM_PTR(&pin_PB08) }, - { MP_ROM_QSTR(MP_QSTR_EN_CAM), MP_ROM_PTR(&pin_PB16) }, - { MP_ROM_QSTR(MP_QSTR_M_EN), MP_ROM_PTR(&pin_PB00) }, - { MP_ROM_QSTR(MP_QSTR_M_FAULT), MP_ROM_PTR(&pin_PB14) }, { MP_ROM_QSTR(MP_QSTR_BURN1), MP_ROM_PTR(&pin_PA19) }, { MP_ROM_QSTR(MP_QSTR_BURN2), MP_ROM_PTR(&pin_PA18) }, - { MP_ROM_QSTR(MP_QSTR_CS_SD), MP_ROM_PTR(&pin_PB15) }, - { MP_ROM_QSTR(MP_QSTR_WDT_WDI), MP_ROM_PTR(&pin_PA23) }, - + { MP_ROM_QSTR(MP_QSTR_WDT_EN), MP_ROM_PTR(&pin_PB22) }, { MP_ROM_QSTR(MP_QSTR_NEOPIXEL), MP_ROM_PTR(&pin_PA21) }, - { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_PA06) }, + { MP_ROM_QSTR(MP_QSTR_BATTERY), MP_ROM_PTR(&pin_PA06) }, + { MP_ROM_QSTR(MP_QSTR_I2C), MP_ROM_PTR(&board_i2c_obj) }, { MP_ROM_QSTR(MP_QSTR_SPI), MP_ROM_PTR(&board_spi_obj) }, + { MP_ROM_QSTR(MP_QSTR_UART), MP_ROM_PTR(&board_uart_obj) }, }; MP_DEFINE_CONST_DICT(board_module_globals, board_global_dict_table);