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

Cleanup

Browse Source
This commit is contained in:
Hierophect 2019-10-16 12:32:34 -04:00
parent 14eefaafee
commit b4a6246e30
2 changed files with 17 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,26 +45,32 @@ void uart_reset(void) {
#ifdef USART1 #ifdef USART1
reserved_uart[0] = false; reserved_uart[0] = false;
__HAL_RCC_USART1_CLK_DISABLE(); __HAL_RCC_USART1_CLK_DISABLE();
HAL_NVIC_DisableIRQ(USART1_IRQn);
#endif #endif
#ifdef USART2 #ifdef USART2
reserved_uart[1] = false; reserved_uart[1] = false;
__HAL_RCC_USART2_CLK_DISABLE(); __HAL_RCC_USART2_CLK_DISABLE();
HAL_NVIC_DisableIRQ(USART2_IRQn);
#endif #endif
#ifdef USART3 #ifdef USART3
reserved_uart[2] = false; reserved_uart[2] = false;
__HAL_RCC_USART3_CLK_DISABLE(); __HAL_RCC_USART3_CLK_DISABLE();
HAL_NVIC_DisableIRQ(USART3_IRQn);
#endif #endif
#ifdef UART4 #ifdef UART4
reserved_uart[3] = false; reserved_uart[3] = false;
__HAL_RCC_UART4_CLK_DISABLE(); __HAL_RCC_UART4_CLK_DISABLE();
HAL_NVIC_DisableIRQ(UART4_IRQn);
#endif #endif
#ifdef UART5 #ifdef UART5
reserved_uart[4] = false; reserved_uart[4] = false;
__HAL_RCC_UART5_CLK_DISABLE(); __HAL_RCC_UART5_CLK_DISABLE();
HAL_NVIC_DisableIRQ(UART5_IRQn);
#endif #endif
#ifdef USART6 #ifdef USART6
reserved_uart[5] = false; reserved_uart[5] = false;
__HAL_RCC_USART6_CLK_DISABLE(); __HAL_RCC_USART6_CLK_DISABLE();
HAL_NVIC_DisableIRQ(USART6_IRQn);
#endif #endif
//TODO: this technically needs to go to 10 to support F413. Any way to condense? //TODO: this technically needs to go to 10 to support F413. Any way to condense?
} }
@ -237,15 +243,18 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
if(USARTx==UART5) { if(USARTx==UART5) {
reserved_uart[4] = true; reserved_uart[4] = true;
__HAL_RCC_UART5_CLK_ENABLE(); __HAL_RCC_UART5_CLK_ENABLE();
HAL_NVIC_SetPriority(UART5_IRQn, 0, 1);
HAL_NVIC_EnableIRQ(UART5_IRQn);
} }
#endif #endif
#ifdef USART6 #ifdef USART6
if(USARTx==USART6) { if(USARTx==USART6) {
reserved_uart[5] = true; reserved_uart[5] = true;
__HAL_RCC_USART6_CLK_ENABLE(); __HAL_RCC_USART6_CLK_ENABLE();
HAL_NVIC_SetPriority(USART6_IRQn, 0, 1);
HAL_NVIC_EnableIRQ(USART6_IRQn);
} }
#endif #endif
//TODO: this technically needs to go to 10 to support F413. Condense? //TODO: this technically needs to go to 10 to support F413. Condense?
self->handle.Instance = USARTx; self->handle.Instance = USARTx;
@ -284,8 +293,6 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
if (HAL_UART_Receive_IT(&self->handle, &self->rx_char, 1) != HAL_OK) { if (HAL_UART_Receive_IT(&self->handle, &self->rx_char, 1) != HAL_OK) {
mp_raise_ValueError(translate("HAL recieve IT start error")); mp_raise_ValueError(translate("HAL recieve IT start error"));
} }
//__HAL_UART_ENABLE_IT(&self->uart, UART_IT_RXNE);
} }
bool common_hal_busio_uart_deinited(busio_uart_obj_t *self) { bool common_hal_busio_uart_deinited(busio_uart_obj_t *self) {
@ -301,9 +308,9 @@ void common_hal_busio_uart_deinit(busio_uart_obj_t *self) {
// Read characters. // Read characters.
size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data, size_t len, int *errcode) { size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data, size_t len, int *errcode) {
// if ( nrf_uarte_rx_pin_get(self->uarte->p_reg) == NRF_UARTE_PSEL_DISCONNECTED ) { if (self->rx == NULL) {
// mp_raise_ValueError(translate("No RX pin")); mp_raise_ValueError(translate("No RX pin"));
// } }
size_t rx_bytes = 0; size_t rx_bytes = 0;
uint64_t start_ticks = ticks_ms; uint64_t start_ticks = ticks_ms;
@ -340,6 +347,10 @@ size_t common_hal_busio_uart_read(busio_uart_obj_t *self, uint8_t *data, size_t
// Write characters. // Write characters.
size_t common_hal_busio_uart_write(busio_uart_obj_t *self, const uint8_t *data, size_t len, int *errcode) { size_t common_hal_busio_uart_write(busio_uart_obj_t *self, const uint8_t *data, size_t len, int *errcode) {
if (self->tx == NULL) {
mp_raise_ValueError(translate("No TX pin"));
}
if (HAL_UART_Transmit(&self->handle, (uint8_t *)data, len, 500) == HAL_OK) { if (HAL_UART_Transmit(&self->handle, (uint8_t *)data, len, 500) == HAL_OK) {
return len; return len;
} else { } else {
@ -348,11 +359,6 @@ size_t common_hal_busio_uart_write(busio_uart_obj_t *self, const uint8_t *data,
return 0; return 0;
} }
void HAL_UART_TxCpltCallback(UART_HandleTypeDef *handle)
{
//not used at the moment.
}
void HAL_UART_RxCpltCallback(UART_HandleTypeDef *handle) void HAL_UART_RxCpltCallback(UART_HandleTypeDef *handle)
{ {
for(int i=0; i<7; i++) { for(int i=0; i<7; i++) {

1
ports/stm32f4/common-hal/busio/UART.h
View File

@ -45,7 +45,6 @@ typedef struct {
uint32_t baudrate; uint32_t baudrate;
uint32_t timeout_ms; uint32_t timeout_ms;
//bool tx_complete;
} busio_uart_obj_t; } busio_uart_obj_t;
void uart_reset(void); void uart_reset(void);