piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Move external module serial to HAL LL

Browse Source
This commit is contained in:
Raphael Coeffic
2022-03-20 16:22:14 +01:00
parent 74d8444f9a
commit 60f5b58212
7 changed files with 124 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/targets/common/arm/stm32/extmodule_serial_driver.cpp
+64 -57
View File
@@ -19,6 +19,7 @@
* GNU General Public License for more details.
*/
#include "stm32_hal_ll.h"
#include "extmodule_serial_driver.h"
#include "board.h"
@@ -63,24 +64,24 @@ static void extmoduleSerialStart(const etx_serial_init* params)
extmodule_driver.on_error = params->on_error;
// TX + RX Pins
GPIO_PinAFConfig(EXTMODULE_USART_GPIO, EXTMODULE_TX_GPIO_PinSource,
EXTMODULE_USART_GPIO_AF);
GPIO_PinAFConfig(EXTMODULE_USART_GPIO, EXTMODULE_RX_GPIO_PinSource,
EXTMODULE_USART_GPIO_AF);
GPIO_InitTypeDef GPIO_InitStructure;
GPIO_InitStructure.GPIO_Pin = EXTMODULE_TX_GPIO_PIN | EXTMODULE_RX_GPIO_PIN;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_AF;
GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz;
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP;
GPIO_Init(EXTMODULE_USART_GPIO, &GPIO_InitStructure);
LL_GPIO_InitTypeDef pinInit;
LL_GPIO_StructInit(&pinInit);
pinInit.Pin = EXTMODULE_TX_GPIO_PIN | EXTMODULE_RX_GPIO_PIN;
pinInit.Mode = LL_GPIO_MODE_ALTERNATE;
pinInit.Pull = LL_GPIO_PULL_UP;
pinInit.Alternate = EXTMODULE_USART_GPIO_AF_LL;
LL_GPIO_Init(EXTMODULE_USART_GPIO, &pinInit);
// UART config
stm32_usart_init(EXTMODULE_USART, params);
extmoduleFifo.clear();
USART_ITConfig(EXTMODULE_USART, USART_IT_RXNE, ENABLE);
// Enable TX DMA request
LL_USART_EnableDMAReq_TX(EXTMODULE_USART);
// Enable RX IRQ
LL_USART_EnableIT_RXNE(EXTMODULE_USART);
NVIC_SetPriority(EXTMODULE_USART_IRQn, 6);
NVIC_EnableIRQ(EXTMODULE_USART_IRQn);
}
@@ -107,17 +108,18 @@ void extmoduleSerialStop()
{
DMA_DeInit(EXTMODULE_USART_TX_DMA_STREAM);
GPIO_InitTypeDef GPIO_InitStructure;
GPIO_InitStructure.GPIO_Pin = EXTMODULE_TX_GPIO_PIN | EXTMODULE_RX_GPIO_PIN;
GPIO_InitStructure.GPIO_Mode = GPIO_Mode_OUT;
GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_DOWN;
GPIO_InitStructure.GPIO_Speed = GPIO_Speed_2MHz;
GPIO_Init(EXTMODULE_USART_GPIO, &GPIO_InitStructure);
// Reconfigure pin as output
LL_GPIO_InitTypeDef pinInit;
LL_GPIO_StructInit(&pinInit);
USART_DeInit(EXTMODULE_USART);
pinInit.Pin = EXTMODULE_TX_GPIO_PIN | EXTMODULE_RX_GPIO_PIN;
pinInit.Mode = LL_GPIO_MODE_OUTPUT;
pinInit.Pull = LL_GPIO_PULL_DOWN;
LL_GPIO_Init(EXTMODULE_TX_GPIO, &pinInit);
GPIO_ResetBits(EXTMODULE_USART_GPIO, EXTMODULE_TX_GPIO_PIN | EXTMODULE_RX_GPIO_PIN);
LL_USART_DeInit(EXTMODULE_USART);
LL_GPIO_ResetOutputPin(EXTMODULE_USART_GPIO,
EXTMODULE_TX_GPIO_PIN | EXTMODULE_RX_GPIO_PIN);
// reset callbacks
extmodule_driver.on_receive = nullptr;
@@ -126,35 +128,27 @@ void extmoduleSerialStop()
static void extmoduleSendByte(uint8_t byte)
{
while (!(EXTMODULE_USART->SR & USART_SR_TXE));
USART_SendData(EXTMODULE_USART, byte);
while (!LL_USART_IsActiveFlag_TXE(EXTMODULE_USART));
LL_USART_TransmitData8(EXTMODULE_USART, byte);
}
static void extmoduleSendBuffer(const uint8_t * data, uint8_t size)
{
if (size == 0)
return;
if (size == 0) return;
LL_DMA_DeInit(EXTMODULE_USART_TX_DMA, EXTMODULE_USART_TX_DMA_STREAM_LL);
DMA_InitTypeDef DMA_InitStructure;
DMA_DeInit(EXTMODULE_USART_TX_DMA_STREAM);
DMA_InitStructure.DMA_Channel = EXTMODULE_USART_TX_DMA_CHANNEL;
DMA_InitStructure.DMA_PeripheralBaseAddr = CONVERT_PTR_UINT(&EXTMODULE_USART->DR);
DMA_InitStructure.DMA_DIR = DMA_DIR_MemoryToPeripheral;
DMA_InitStructure.DMA_Memory0BaseAddr = CONVERT_PTR_UINT(data);
DMA_InitStructure.DMA_BufferSize = size;
DMA_InitStructure.DMA_PeripheralInc = DMA_PeripheralInc_Disable;
DMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Enable;
DMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_Byte;
DMA_InitStructure.DMA_MemoryDataSize = DMA_MemoryDataSize_Byte;
DMA_InitStructure.DMA_Mode = DMA_Mode_Normal;
DMA_InitStructure.DMA_Priority = DMA_Priority_VeryHigh;
DMA_InitStructure.DMA_FIFOMode = DMA_FIFOMode_Disable;
DMA_InitStructure.DMA_FIFOThreshold = DMA_FIFOThreshold_Full;
DMA_InitStructure.DMA_MemoryBurst = DMA_MemoryBurst_Single;
DMA_InitStructure.DMA_PeripheralBurst = DMA_PeripheralBurst_Single;
DMA_Init(EXTMODULE_USART_TX_DMA_STREAM, &DMA_InitStructure);
DMA_Cmd(EXTMODULE_USART_TX_DMA_STREAM, ENABLE);
USART_DMACmd(EXTMODULE_USART, USART_DMAReq_Tx, ENABLE);
LL_DMA_InitTypeDef dmaInit;
LL_DMA_StructInit(&dmaInit);
dmaInit.Channel = EXTMODULE_USART_TX_DMA_CHANNEL;
dmaInit.PeriphOrM2MSrcAddress = CONVERT_PTR_UINT(&EXTMODULE_USART->DR);
dmaInit.Direction = LL_DMA_DIRECTION_MEMORY_TO_PERIPH;
dmaInit.MemoryOrM2MDstAddress = CONVERT_PTR_UINT(data);
dmaInit.MemoryOrM2MDstIncMode = LL_DMA_MEMORY_INCREMENT;
dmaInit.NbData = size;
dmaInit.Priority = LL_DMA_PRIORITY_VERYHIGH;
LL_DMA_Init(EXTMODULE_USART_TX_DMA, EXTMODULE_USART_TX_DMA_STREAM_LL, &dmaInit);
LL_DMA_EnableStream(EXTMODULE_USART_TX_DMA, EXTMODULE_USART_TX_DMA_STREAM_LL);
}
#define USART_FLAG_ERRORS (USART_FLAG_ORE | USART_FLAG_NE | USART_FLAG_FE | USART_FLAG_PE)
@@ -163,9 +157,9 @@ extern "C" void EXTMODULE_USART_IRQHandler(void)
// No ISR based send loop: DMA only
// Receive
uint32_t status = EXTMODULE_USART->SR;
uint32_t status = LL_USART_ReadReg(EXTMODULE_USART, SR);
while (status & (USART_FLAG_RXNE | USART_FLAG_ERRORS)) {
uint8_t data = EXTMODULE_USART->DR;
uint8_t data = LL_USART_ReceiveData8(EXTMODULE_USART);
if (status & USART_FLAG_ERRORS) {
if (extmodule_driver.on_error)
extmodule_driver.on_error();
@@ -174,23 +168,36 @@ extern "C" void EXTMODULE_USART_IRQHandler(void)
if (extmodule_driver.on_receive)
extmodule_driver.on_receive(data);
}
status = EXTMODULE_USART->SR;
status = LL_USART_ReadReg(EXTMODULE_USART, SR);
}
}
static void extmoduleWaitForTxCompleted()
{
#if !defined(SIMU)
// TODO: check if everything is properly initialised, this seems to block when
// the port has been initialised with a zero baudrate
if (DMA_GetCmdStatus(EXTMODULE_USART_TX_DMA_STREAM) == ENABLE) {
while (DMA_GetFlagStatus(EXTMODULE_USART_TX_DMA_STREAM,
EXTMODULE_USART_TX_DMA_FLAG_TC) == RESET)
;
DMA_ClearFlag(EXTMODULE_USART_TX_DMA_STREAM,
EXTMODULE_USART_TX_DMA_FLAG_TC);
if (LL_DMA_IsEnabledStream(EXTMODULE_USART_TX_DMA,
EXTMODULE_USART_TX_DMA_STREAM_LL)) {
static_assert(EXTMODULE_USART_TX_DMA_STREAM_LL == LL_DMA_STREAM_3 ||
EXTMODULE_USART_TX_DMA_STREAM_LL == LL_DMA_STREAM_6 ||
EXTMODULE_USART_TX_DMA_STREAM_LL == LL_DMA_STREAM_7, "");
switch(EXTMODULE_USART_TX_DMA_STREAM_LL) {
case LL_DMA_STREAM_3:
while (LL_DMA_IsActiveFlag_TC3(EXTMODULE_USART_TX_DMA));
LL_DMA_ClearFlag_TC3(EXTMODULE_USART_TX_DMA);
break;
case LL_DMA_STREAM_6:
while (LL_DMA_IsActiveFlag_TC6(EXTMODULE_USART_TX_DMA));
LL_DMA_ClearFlag_TC6(EXTMODULE_USART_TX_DMA);
break;
case LL_DMA_STREAM_7:
while (LL_DMA_IsActiveFlag_TC7(EXTMODULE_USART_TX_DMA));
LL_DMA_ClearFlag_TC7(EXTMODULE_USART_TX_DMA);
break;
}
}
#endif
}
const etx_serial_driver_t ExtmoduleSerialDriver = {