djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix conflicting definitions on discovery boards

Browse Source
This commit is contained in:
Hierophect 2019-11-12 13:03:13 -05:00
parent bbc366b85b
commit e40bd07fcf
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/stm32f4/peripherals/stm32f4/stm32f405xx/periph.h
View File

@ -43,7 +43,7 @@ extern const mcu_spi_nss_obj_t mcu_spi_nss_list[6];
//UART //UART
extern USART_TypeDef * mcu_uart_banks[MAX_UART]; extern USART_TypeDef * mcu_uart_banks[MAX_UART];
bool mcu_uart_has_usart[MAX_UART]; extern bool mcu_uart_has_usart[MAX_UART];
extern const mcu_uart_tx_obj_t mcu_uart_tx_list[12]; extern const mcu_uart_tx_obj_t mcu_uart_tx_list[12];
extern const mcu_uart_rx_obj_t mcu_uart_rx_list[12]; extern const mcu_uart_rx_obj_t mcu_uart_rx_list[12];

2
ports/stm32f4/peripherals/stm32f4/stm32f411xe/periph.h
View File

@ -43,7 +43,7 @@ extern const mcu_spi_nss_obj_t mcu_spi_nss_list[12];
//UART //UART
extern USART_TypeDef * mcu_uart_banks[MAX_UART]; extern USART_TypeDef * mcu_uart_banks[MAX_UART];
bool mcu_uart_has_usart[MAX_UART]; extern bool mcu_uart_has_usart[MAX_UART];
extern const mcu_uart_tx_obj_t mcu_uart_tx_list[7]; extern const mcu_uart_tx_obj_t mcu_uart_tx_list[7];
extern const mcu_uart_rx_obj_t mcu_uart_rx_list[7]; extern const mcu_uart_rx_obj_t mcu_uart_rx_list[7];

4
ports/stm32f4/peripherals/stm32f4/stm32f412zx/periph.c
View File

@ -122,8 +122,8 @@ const mcu_spi_nss_obj_t mcu_spi_nss_list[12] = {
//UART //UART
USART_TypeDef * mcu_uart_banks[6] = {USART1, USART2, USART3, NULL, NULL, USART6}; USART_TypeDef * mcu_uart_banks[MAX_UART] = {USART1, USART2, USART3, NULL, NULL, USART6};
bool mcu_uart_has_usart[6] = {true, true, true, false, false, true}; bool mcu_uart_has_usart[MAX_UART] = {true, true, true, false, false, true};
const mcu_uart_tx_obj_t mcu_uart_tx_list[11] = { const mcu_uart_tx_obj_t mcu_uart_tx_list[11] = {
UART(2, 7, &pin_PA02), UART(2, 7, &pin_PA02),

2
ports/stm32f4/peripherals/stm32f4/stm32f412zx/periph.h
View File

@ -44,7 +44,7 @@ extern const mcu_spi_nss_obj_t mcu_spi_nss_list[12];
//UART //UART
extern USART_TypeDef * mcu_uart_banks[MAX_UART]; extern USART_TypeDef * mcu_uart_banks[MAX_UART];
bool mcu_uart_has_usart[MAX_UART]; extern bool mcu_uart_has_usart[MAX_UART];
extern const mcu_uart_tx_obj_t mcu_uart_tx_list[11]; extern const mcu_uart_tx_obj_t mcu_uart_tx_list[11];
extern const mcu_uart_rx_obj_t mcu_uart_rx_list[12]; extern const mcu_uart_rx_obj_t mcu_uart_rx_list[12];