Skip to content

Commit b9fa06c

Browse files
authored
Merge pull request #5056 from cdwilson/cdwilson/circuitpython/fix-feather-stm32f405-express-can-pins
Fix CAN pin assignment on Feather STM32F405 Express board.
2 parents a9735fb + 49dc580 commit b9fa06c

File tree

2 files changed

+4
-4
lines changed
  • ports/stm
    • boards/feather_stm32f405_express
    • peripherals/stm32f4/stm32f405xx

2 files changed

+4
-4
lines changed

ports/stm/boards/feather_stm32f405_express/pins.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
5050
{ MP_ROM_QSTR(MP_QSTR_SDIO_COMMAND), MP_ROM_PTR(&pin_PD02) },
5151
{ MP_ROM_QSTR(MP_QSTR_SDIO_DATA), MP_ROM_PTR(&sdio_data_tuple) },
5252

53-
{ MP_OBJ_NEW_QSTR(MP_QSTR_CAN_RX), MP_ROM_PTR(&pin_PB09) },
54-
{ MP_OBJ_NEW_QSTR(MP_QSTR_CAN_TX), MP_ROM_PTR(&pin_PB08) },
53+
{ MP_ROM_QSTR(MP_QSTR_CAN_RX), MP_ROM_PTR(&pin_PB08) },
54+
{ MP_ROM_QSTR(MP_QSTR_CAN_TX), MP_ROM_PTR(&pin_PB09) },
5555
};
5656
MP_DEFINE_CONST_DICT(board_module_globals, board_module_globals_table);

ports/stm/peripherals/stm32f4/stm32f405xx/periph.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ const mcu_periph_obj_t mcu_sdio_data3_list[1] = {
220220
// CAN
221221
CAN_TypeDef *mcu_can_banks[2] = {CAN1, CAN2};
222222

223-
const mcu_periph_obj_t mcu_can_tx_list[6] = {
223+
const mcu_periph_obj_t mcu_can_rx_list[6] = {
224224
PERIPH(1, 9, &pin_PA11),
225225
PERIPH(1, 9, &pin_PB08),
226226
PERIPH(1, 9, &pin_PD00),
@@ -230,7 +230,7 @@ const mcu_periph_obj_t mcu_can_tx_list[6] = {
230230
PERIPH(2, 9, &pin_PB05),
231231
};
232232

233-
const mcu_periph_obj_t mcu_can_rx_list[6] = {
233+
const mcu_periph_obj_t mcu_can_tx_list[6] = {
234234
PERIPH(1, 9, &pin_PA12),
235235
PERIPH(1, 9, &pin_PB09),
236236
PERIPH(1, 9, &pin_PD01),

0 commit comments

Comments
 (0)