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

Implement requested changes, refactors

This commit is contained in:
Hierophect 2019-10-16 13:50:54 -04:00
parent 323fe418f7
commit 14c64159c8
9 changed files with 133 additions and 142 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -39,7 +39,7 @@
#include "stm32f4xx_hal.h"
STATIC bool reserved_uart[10];
STATIC bool reserved_uart[MAX_UART];
void uart_reset(void) {
#ifdef USART1
@ -75,138 +75,23 @@ void uart_reset(void) {
//TODO: this technically needs to go to 10 to support F413. Any way to condense?
}
void common_hal_busio_uart_construct(busio_uart_obj_t *self,
const mcu_pin_obj_t * tx, const mcu_pin_obj_t * rx, uint32_t baudrate,
uint8_t bits, uart_parity_t parity, uint8_t stop, mp_float_t timeout,
uint16_t receiver_buffer_size) {
//match pins to UART objects
USART_TypeDef * USARTx;
uint8_t tx_len = sizeof(mcu_uart_tx_list)/sizeof(*mcu_uart_tx_list);
uint8_t rx_len = sizeof(mcu_uart_rx_list)/sizeof(*mcu_uart_rx_list);
bool uart_taken = false;
//Can have both pins, or either
//TODO: condense in some elegant clever way that I can't currently think of
if ((tx != mp_const_none) && (rx != mp_const_none)) {
//normal find loop if both pins exist
for(uint i=0; i<tx_len;i++) {
if (mcu_uart_tx_list[i].pin == tx) {
//rx
for(uint j=0; j<rx_len;j++) {
if (mcu_uart_rx_list[j].pin == rx
&& mcu_uart_rx_list[j].uart_index == mcu_uart_tx_list[i].uart_index) {
//keep looking if the UART is taken, edge case
if(reserved_uart[mcu_uart_tx_list[i].uart_index-1]) {
uart_taken = true;
continue;
}
//store pins if not
self->tx = &mcu_uart_tx_list[i];
self->rx = &mcu_uart_rx_list[j];
break;
}
}
}
}
//handle typedef selection, errors
if(self->tx!=NULL && self->rx!=NULL) {
USARTx = mcu_uart_banks[self->tx->uart_index-1];
mp_printf(&mp_plat_print, "UART:%d \n", self->tx->uart_index);
//assign a root pointer pointer for IRQ
MP_STATE_PORT(cpy_uart_obj_all)[self->tx->uart_index-1] = self;
} else {
if (uart_taken) {
mp_raise_ValueError(translate("Hardware busy, try alternative pins"));
} else {
mp_raise_ValueError(translate("Invalid UART pin selection"));
}
}
} else if (tx==mp_const_none) {
//run only rx
for(uint i=0; i<rx_len;i++) {
if (mcu_uart_rx_list[i].pin == rx) {
//keep looking if the UART is taken, edge case
if(reserved_uart[mcu_uart_rx_list[i].uart_index-1]) {
uart_taken = true;
continue;
}
//store pins if not
self->rx = &mcu_uart_rx_list[i];
break;
}
}
//handle typedef selection, errors
if(self->rx!=NULL) {
USARTx = mcu_uart_banks[self->rx->uart_index-1];
//assign a root pointer pointer for IRQ
MP_STATE_PORT(cpy_uart_obj_all)[self->rx->uart_index-1] = self;
} else {
if (uart_taken) {
mp_raise_ValueError(translate("Hardware busy, try alternative pins"));
} else {
mp_raise_ValueError(translate("Invalid UART pin selection"));
}
}
} else if (rx==mp_const_none) {
//run only tx
for(uint i=0; i<tx_len;i++) {
if (mcu_uart_tx_list[i].pin == tx) {
//keep looking if the UART is taken, edge case
if(reserved_uart[mcu_uart_tx_list[i].uart_index-1]) {
uart_taken = true;
continue;
}
//store pins if not
self->tx = &mcu_uart_tx_list[i];
break;
}
}
//handle typedef selection, errors
if(self->tx!=NULL) {
USARTx = mcu_uart_banks[self->tx->uart_index-1];
//assign a root pointer pointer for IRQ
MP_STATE_PORT(cpy_uart_obj_all)[self->tx->uart_index-1] = self;
} else {
if (uart_taken) {
mp_raise_ValueError(translate("Hardware busy, try alternative pins"));
} else {
mp_raise_ValueError(translate("Invalid UART pin selection"));
}
}
STATIC USART_TypeDef * assign_uart_or_throw(busio_uart_obj_t *self, bool pin_eval,
int uart_index, bool uart_taken) {
if(pin_eval) {
//assign a root pointer pointer for IRQ
MP_STATE_PORT(cpy_uart_obj_all)[uart_index] = self;
return mcu_uart_banks[uart_index];
} else {
//both pins cannot be empty
mp_raise_ValueError(translate("You must supply at least one UART pin"));
if (uart_taken) {
mp_raise_ValueError(translate("Hardware busy, try alternative pins"));
} else {
mp_raise_ValueError(translate("Invalid UART pin selection"));
}
}
}
//Other errors
if ( receiver_buffer_size == 0 ) {
mp_raise_ValueError(translate("Invalid buffer size"));
}
if ( bits != 8 && bits != 9 ) {
mp_raise_ValueError(translate("Invalid word/bit length"));
}
//GPIO Init
GPIO_InitTypeDef GPIO_InitStruct = {0};
if (self->tx!=NULL) {
GPIO_InitStruct.Pin = pin_mask(tx->number);
GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
GPIO_InitStruct.Pull = GPIO_PULLUP;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
GPIO_InitStruct.Alternate = self->tx->altfn_index;
HAL_GPIO_Init(pin_port(tx->port), &GPIO_InitStruct);
}
if (self->rx!=NULL) {
GPIO_InitStruct.Pin = pin_mask(rx->number);
GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
GPIO_InitStruct.Pull = GPIO_PULLUP;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
GPIO_InitStruct.Alternate = self->rx->altfn_index;
HAL_GPIO_Init(pin_port(rx->port), &GPIO_InitStruct);
}
STATIC void uart_clk_irq_enable(USART_TypeDef * USARTx) {
#ifdef USART1
if(USARTx==USART1) {
reserved_uart[0] = true;
@ -255,7 +140,109 @@ void common_hal_busio_uart_construct(busio_uart_obj_t *self,
HAL_NVIC_EnableIRQ(USART6_IRQn);
}
#endif
//TODO: this technically needs to go to 10 to support F413. Condense?
}
void common_hal_busio_uart_construct(busio_uart_obj_t *self,
const mcu_pin_obj_t * tx, const mcu_pin_obj_t * rx, uint32_t baudrate,
uint8_t bits, uart_parity_t parity, uint8_t stop, mp_float_t timeout,
uint16_t receiver_buffer_size) {
//match pins to UART objects
USART_TypeDef * USARTx;
uint8_t tx_len = sizeof(mcu_uart_tx_list)/sizeof(*mcu_uart_tx_list);
uint8_t rx_len = sizeof(mcu_uart_rx_list)/sizeof(*mcu_uart_rx_list);
bool uart_taken = false;
//Can have both pins, or either
if ((tx != mp_const_none) && (rx != mp_const_none)) {
//normal find loop if both pins exist
for(uint i=0; i<tx_len;i++) {
if (mcu_uart_tx_list[i].pin == tx) {
//rx
for(uint j=0; j<rx_len;j++) {
if (mcu_uart_rx_list[j].pin == rx
&& mcu_uart_rx_list[j].uart_index == mcu_uart_tx_list[i].uart_index) {
//keep looking if the UART is taken, edge case
if(reserved_uart[mcu_uart_tx_list[i].uart_index-1]) {
uart_taken = true;
continue;
}
//store pins if not
self->tx = &mcu_uart_tx_list[i];
self->rx = &mcu_uart_rx_list[j];
break;
}
}
}
}
USARTx = assign_uart_or_throw(self, (self->tx!=NULL && self->rx!=NULL),
self->tx->uart_index-1, uart_taken);
} else if (tx==mp_const_none) {
//If there is no tx, run only rx
for(uint i=0; i<rx_len;i++) {
if (mcu_uart_rx_list[i].pin == rx) {
//keep looking if the UART is taken, edge case
if(reserved_uart[mcu_uart_rx_list[i].uart_index-1]) {
uart_taken = true;
continue;
}
//store pins if not
self->rx = &mcu_uart_rx_list[i];
break;
}
}
USARTx = assign_uart_or_throw(self, (self->rx!=NULL),
self->rx->uart_index-1, uart_taken);
} else if (rx==mp_const_none) {
//If there is no rx, run only tx
for(uint i=0; i<tx_len;i++) {
if (mcu_uart_tx_list[i].pin == tx) {
//keep looking if the UART is taken, edge case
if(reserved_uart[mcu_uart_tx_list[i].uart_index-1]) {
uart_taken = true;
continue;
}
//store pins if not
self->tx = &mcu_uart_tx_list[i];
break;
}
}
USARTx = assign_uart_or_throw(self, (self->tx!=NULL),
(self->tx->uart_index-1), uart_taken);
} else {
//both pins cannot be empty
mp_raise_ValueError(translate("You must supply at least one UART pin"));
}
//Other errors
if ( receiver_buffer_size == 0 ) {
mp_raise_ValueError(translate("Invalid buffer size"));
}
if ( bits != 8 && bits != 9 ) {
mp_raise_ValueError(translate("Invalid word/bit length"));
}
//GPIO Init
GPIO_InitTypeDef GPIO_InitStruct = {0};
if (self->tx!=NULL) {
GPIO_InitStruct.Pin = pin_mask(tx->number);
GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
GPIO_InitStruct.Pull = GPIO_PULLUP;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
GPIO_InitStruct.Alternate = self->tx->altfn_index;
HAL_GPIO_Init(pin_port(tx->port), &GPIO_InitStruct);
}
if (self->rx!=NULL) {
GPIO_InitStruct.Pin = pin_mask(rx->number);
GPIO_InitStruct.Mode = GPIO_MODE_AF_PP;
GPIO_InitStruct.Pull = GPIO_PULLUP;
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_VERY_HIGH;
GPIO_InitStruct.Alternate = self->rx->altfn_index;
HAL_GPIO_Init(pin_port(rx->port), &GPIO_InitStruct);
}
uart_clk_irq_enable(USARTx);
self->handle.Instance = USARTx;
self->handle.Init.BaudRate = baudrate;
@ -446,3 +433,4 @@ void UART5_IRQHandler(void) {
void USART6_IRQHandler(void) {
call_hal_irq(6);
}

3
ports/stm32f4/mpconfigport.h
View File

@ -40,8 +40,7 @@
#include "py/circuitpy_mpconfig.h"
#define MICROPY_PORT_ROOT_POINTERS \
/* pointers to all 10 UART objects (if they have been created) */ \
void *cpy_uart_obj_all[9]; \
void *cpy_uart_obj_all[6]; \
CIRCUITPY_COMMON_ROOT_POINTERS
#endif // __INCLUDED_MPCONFIGPORT_H

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

@ -33,6 +33,8 @@
#include "stm32f4xx_hal.h"
#include "stm32f4/pins.h"
#define MAX_UART 6 //how many UART are implemented
// I2C
// TODO: these objects should be condensed into a single 'periph_pin' unless we
// find a compelling reason to store more unique data in them.

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

@ -86,8 +86,8 @@ const mcu_spi_nss_obj_t mcu_spi_nss_list[6] = {
SPI(3, 6, &pin_PA15),
};
USART_TypeDef * mcu_uart_banks[6] = {USART1, USART2, USART3, UART4, UART5, USART6};
bool mcu_uart_has_usart[6] = {true, true, true, false, false, true};
USART_TypeDef * mcu_uart_banks[MAX_UART] = {USART1, USART2, USART3, UART4, UART5, USART6};
bool mcu_uart_has_usart[MAX_UART] = {true, true, true, false, false, true};
const mcu_uart_tx_obj_t mcu_uart_tx_list[12] = {
UART(4, 8, &pin_PA00),

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

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

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

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

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

@ -42,8 +42,8 @@ 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 USART_TypeDef * mcu_uart_banks[MAX_UART];
bool mcu_uart_has_usart[MAX_UART];
extern const mcu_uart_tx_obj_t mcu_uart_tx_list[7];
extern const mcu_uart_rx_obj_t mcu_uart_rx_list[7];

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

@ -120,6 +120,8 @@ const mcu_spi_nss_obj_t mcu_spi_nss_list[12] = {
SPI(5, 6, &pin_PE11)
};
//UART
USART_TypeDef * mcu_uart_banks[6] = {USART1, USART2, USART3, NULL, NULL, USART6};
bool mcu_uart_has_usart[6] = {true, true, true, false, false, true};

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

@ -43,8 +43,8 @@ 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 USART_TypeDef * mcu_uart_banks[MAX_UART];
bool mcu_uart_has_usart[MAX_UART];
extern const mcu_uart_tx_obj_t mcu_uart_tx_list[11];
extern const mcu_uart_rx_obj_t mcu_uart_rx_list[12];