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

Fix USB issues, frequency macro, F412 tests

Browse Source
This commit is contained in:
Hierophect 2019-10-07 14:22:12 -04:00
parent 0b85172ba6
commit cc3a17845c
6 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ports/stm32f4/Makefile
View File

@ -120,7 +120,7 @@ LIBS += -lm
endif
# TinyUSB defines
CFLAGS += -DHSE_VALUE=8000000 -DCFG_TUSB_MCU=OPT_MCU_STM32F4 -DCFG_TUD_CDC_RX_BUFSIZE=1024 -DCFG_TUD_CDC_TX_BUFSIZE=1024 -DCFG_TUD_MSC_BUFSIZE=4096 -DCFG_TUD_MIDI_RX_BUFSIZE=128 -DCFG_TUD_MIDI_TX_BUFSIZE=128
CFLAGS += -DCFG_TUSB_MCU=OPT_MCU_STM32F4 -DCFG_TUD_CDC_RX_BUFSIZE=1024 -DCFG_TUD_CDC_TX_BUFSIZE=1024 -DCFG_TUD_MSC_BUFSIZE=4096 -DCFG_TUD_MIDI_RX_BUFSIZE=128 -DCFG_TUD_MIDI_TX_BUFSIZE=128
######################################

1
ports/stm32f4/boards/stm32f412zg_discovery/mpconfigboard.mk
View File

@ -2,6 +2,7 @@ USB_VID = 0x239A
USB_PID = 0x8056
USB_PRODUCT = "STM32F412ZG Discovery Board - CPy"
USB_MANUFACTURER = "STMicroelectronics"
USB_DEVICES = "CDC,MSC,HID"
INTERNAL_FLASH_FILESYSTEM = 1
LONGINT_IMPL = NONE

4
ports/stm32f4/boards/stm32f412zg_discovery/pins.c
View File

@ -74,8 +74,8 @@ STATIC const mp_rom_map_elem_t board_module_globals_table[] = {
{ MP_ROM_QSTR(MP_QSTR_D4), MP_ROM_PTR(&pin_PG12) },
{ MP_ROM_QSTR(MP_QSTR_D3), MP_ROM_PTR(&pin_PF04) },
{ MP_ROM_QSTR(MP_QSTR_D2), MP_ROM_PTR(&pin_PG13) },
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PG14) },
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PG09) },
{ MP_ROM_QSTR(MP_QSTR_D1), MP_ROM_PTR(&pin_PG14) }, //USART6 TX
{ MP_ROM_QSTR(MP_QSTR_D0), MP_ROM_PTR(&pin_PG09) }, //USART6 RX
{ MP_ROM_QSTR(MP_QSTR_A0), MP_ROM_PTR(&pin_PA01) },
{ MP_ROM_QSTR(MP_QSTR_A1), MP_ROM_PTR(&pin_PC01) },
{ MP_ROM_QSTR(MP_QSTR_A2), MP_ROM_PTR(&pin_PC03) },

7
ports/stm32f4/common-hal/busio/UART.c
View File

@ -173,7 +173,7 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
#endif
self->handle.Instance = USARTx;
self->handle.Init.BaudRate = 115200;
self->handle.Init.BaudRate = 9600;
self->handle.Init.WordLength = UART_WORDLENGTH_8B;
self->handle.Init.StopBits = UART_STOPBITS_1;
self->handle.Init.Parity = UART_PARITY_NONE;
@ -183,6 +183,11 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
if (HAL_UART_Init(&self->handle) != HAL_OK)
{
mp_raise_ValueError(translate("UART Init Error"));
} else {
mp_printf(&mp_plat_print, "Init Success, ");
const char msg[] = "Program has started";
if(HAL_UART_Transmit(&self->handle, (uint8_t *)msg, sizeof(msg)/sizeof(*msg), 5000) == HAL_OK) mp_printf(&mp_plat_print, "Write Success");
}
claim_pin(tx);
claim_pin(rx);

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

@ -120,4 +120,13 @@ const mcu_spi_nss_obj_t mcu_spi_nss_list[12] = {
SPI(5, 6, &pin_PE11)
};
//UART, Etc
USART_TypeDef * mcu_uart_banks[6] = {USART1, USART2, USART3, NULL, NULL, USART6};
bool mcu_uart_has_usart[6] = {true, true, true, false, false, true};
const mcu_uart_tx_obj_t mcu_uart_tx_list[1] = {
UART(6, 8, &pin_PG14),
};
const mcu_uart_rx_obj_t mcu_uart_rx_list[1] = {
UART(6, 8, &pin_PG09),
};

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

@ -42,4 +42,12 @@ extern const mcu_spi_mosi_obj_t mcu_spi_mosi_list[14];
extern const mcu_spi_miso_obj_t mcu_spi_miso_list[12];
extern const mcu_spi_nss_obj_t mcu_spi_nss_list[12];
//UART
extern USART_TypeDef * mcu_uart_banks[6];
bool mcu_uart_has_usart[6];
extern const mcu_uart_tx_obj_t mcu_uart_tx_list[1];
extern const mcu_uart_rx_obj_t mcu_uart_rx_list[1];
#endif // MICROPY_INCLUDED_STM32F4_PERIPHERALS_STM32F411VE_PERIPH_H