Merge pull request adafruit#5056 from cdwilson/cdwilson/circuitpython/fix-feather-stm32f405-express-can-pins

jepler · web-flow · commit b9fa06cf6bb3 · 2021-07-26T09:00:11.000-05:00
Fix CAN pin assignment on Feather STM32F405 Express board.
diff --git a/ports/stm/boards/feather_stm32f405_express/pins.c b/ports/stm/boards/feather_stm32f405_express/pins.c
@@ -50,7 +50,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
     { MP_ROM_QSTR(MP_QSTR_SDIO_COMMAND), MP_ROM_PTR(&pin_PD02) },
     { MP_ROM_QSTR(MP_QSTR_SDIO_DATA), MP_ROM_PTR(&sdio_data_tuple) },
 
-    { MP_OBJ_NEW_QSTR(MP_QSTR_CAN_RX),  MP_ROM_PTR(&pin_PB09) },
-    { MP_OBJ_NEW_QSTR(MP_QSTR_CAN_TX),  MP_ROM_PTR(&pin_PB08) },
+    { MP_ROM_QSTR(MP_QSTR_CAN_RX),  MP_ROM_PTR(&pin_PB08) },
+    { MP_ROM_QSTR(MP_QSTR_CAN_TX),  MP_ROM_PTR(&pin_PB09) },
 };
 MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);
diff --git a/ports/stm/peripherals/stm32f4/stm32f405xx/periph.c b/ports/stm/peripherals/stm32f4/stm32f405xx/periph.c
@@ -220,7 +220,7 @@ const mcu_periph_obj_t mcu_sdio_data3_list[1] = {
 // CAN
 CAN_TypeDef *mcu_can_banks[2] = {CAN1, CAN2};
 
-const mcu_periph_obj_t mcu_can_tx_list[6] = {
+const mcu_periph_obj_t mcu_can_rx_list[6] = {
     PERIPH(1, 9, &pin_PA11),
     PERIPH(1, 9, &pin_PB08),
     PERIPH(1, 9, &pin_PD00),
@@ -230,7 +230,7 @@ const mcu_periph_obj_t mcu_can_tx_list[6] = {
     PERIPH(2, 9, &pin_PB05),
 };
 
-const mcu_periph_obj_t mcu_can_rx_list[6] = {
+const mcu_periph_obj_t mcu_can_tx_list[6] = {
     PERIPH(1, 9, &pin_PA12),
     PERIPH(1, 9, &pin_PB09),
     PERIPH(1, 9, &pin_PD01),
