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

Rename serial2 to aux_serial

Browse Source
This commit is contained in:
Bertrand Songis
2019-06-04 16:57:35 +02:00
parent 0dbbfa1670
commit c9581630ff
30 changed files with 98 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/targets/common/arm/stm32/serial2_driver.cpp → radio/src/targets/common/arm/stm32/aux_serial_driver.cpp
+28 -25
View File
@@ -20,11 +20,11 @@
#include "opentx.h"
uint8_t serial2Mode = 0;
Fifo<uint8_t, 512> serial2TxFifo;
DMAFifo<32> serial2RxFifo __DMA (AUX_SERIAL_DMA_Stream_RX);
uint8_t auxSerialMode = 0;
Fifo<uint8_t, 512> auxSerialTxFifo;
DMAFifo<32> auxSerialRxFifo __DMA (AUX_SERIAL_DMA_Stream_RX);
void uart3Setup(unsigned int baudrate, bool dma)
void auxSerialSetup(unsigned int baudrate, bool dma)
{
USART_InitTypeDef USART_InitStructure;
GPIO_InitTypeDef GPIO_InitStructure;
@@ -49,14 +49,14 @@ void uart3Setup(unsigned int baudrate, bool dma)
if (dma) {
DMA_InitTypeDef DMA_InitStructure;
serial2RxFifo.clear();
auxSerialRxFifo.clear();
USART_ITConfig(AUX_SERIAL_USART, USART_IT_RXNE, DISABLE);
USART_ITConfig(AUX_SERIAL_USART, USART_IT_TXE, DISABLE);
DMA_InitStructure.DMA_Channel = AUX_SERIAL_DMA_Channel_RX;
DMA_InitStructure.DMA_PeripheralBaseAddr = CONVERT_PTR_UINT(&AUX_SERIAL_USART->DR);
DMA_InitStructure.DMA_Memory0BaseAddr = CONVERT_PTR_UINT(serial2RxFifo.buffer());
DMA_InitStructure.DMA_Memory0BaseAddr = CONVERT_PTR_UINT(auxSerialRxFifo.buffer());
DMA_InitStructure.DMA_DIR = DMA_DIR_PeripheralToMemory;
DMA_InitStructure.DMA_BufferSize = serial2RxFifo.size();
DMA_InitStructure.DMA_BufferSize = auxSerialRxFifo.size();
DMA_InitStructure.DMA_PeripheralInc = DMA_PeripheralInc_Disable;
DMA_InitStructure.DMA_MemoryInc = DMA_MemoryInc_Enable;
DMA_InitStructure.DMA_PeripheralDataSize = DMA_PeripheralDataSize_Byte;
@@ -81,66 +81,69 @@ void uart3Setup(unsigned int baudrate, bool dma)
}
}
void serial2Init(unsigned int mode, unsigned int protocol)
void auxSerialInit(unsigned int mode, unsigned int protocol)
{
serial2Stop();
auxSerialStop();
serial2Mode = mode;
auxSerialMode = mode;
switch (mode) {
case UART_MODE_TELEMETRY_MIRROR:
#if defined(CROSSFIRE)
if (protocol == PROTOCOL_TELEMETRY_CROSSFIRE) {
uart3Setup(CROSSFIRE_TELEM_MIRROR_BAUDRATE, false);
auxSerialSetup(CROSSFIRE_TELEM_MIRROR_BAUDRATE, false);
break;
}
#endif
uart3Setup(FRSKY_SPORT_BAUDRATE, false);
auxSerialSetup(FRSKY_SPORT_BAUDRATE, false);
break;
#if defined(DEBUG) || defined(CLI)
case UART_MODE_DEBUG:
uart3Setup(DEBUG_BAUDRATE, false);
auxSerialSetup(DEBUG_BAUDRATE, false);
break;
#endif
case UART_MODE_TELEMETRY:
if (protocol == PROTOCOL_TELEMETRY_FRSKY_D_SECONDARY) {
uart3Setup(FRSKY_D_BAUDRATE, true);
auxSerialSetup(FRSKY_D_BAUDRATE, true);
}
break;
case UART_MODE_LUA:
uart3Setup(DEBUG_BAUDRATE, false);
auxSerialSetup(DEBUG_BAUDRATE, false);
}
}
void serial2Putc(char c)
void auxSerialPutc(char c)
{
#if !defined(SIMU)
int n = 0;
while (serial2TxFifo.isFull()) {
while (auxSerialTxFifo.isFull()) {
delay_ms(1);
if (++n > 100) return;
}
serial2TxFifo.push(c);
auxSerialTxFifo.push(c);
USART_ITConfig(AUX_SERIAL_USART, USART_IT_TXE, ENABLE);
#endif
}
void serial2SbusInit()
void auxSerialSbusInit()
{
uart3Setup(SBUS_BAUDRATE, true);
auxSerialSetup(SBUS_BAUDRATE, true);
AUX_SERIAL_USART->CR1 |= USART_CR1_M | USART_CR1_PCE ;
}
void serial2Stop()
void auxSerialStop()
{
DMA_DeInit(AUX_SERIAL_DMA_Stream_RX);
USART_DeInit(AUX_SERIAL_USART);
}
uint8_t serial2TracesEnabled()
uint8_t auxSerialTracesEnabled()
{
#if defined(DEBUG)
return (serial2Mode == UART_MODE_DEBUG);
return (auxSerialMode == UART_MODE_DEBUG);
#else
return false;
#endif
@@ -153,7 +156,7 @@ extern "C" void AUX_SERIAL_USART_IRQHandler(void)
// Send
if (USART_GetITStatus(AUX_SERIAL_USART, USART_IT_TXE) != RESET) {
uint8_t txchar;
if (serial2TxFifo.pop(txchar)) {
if (auxSerialTxFifo.pop(txchar)) {
/* Write one byte to the transmit data register */
USART_SendData(AUX_SERIAL_USART, txchar);
}
@@ -169,7 +172,7 @@ extern "C" void AUX_SERIAL_USART_IRQHandler(void)
while (status & (USART_FLAG_RXNE | USART_FLAG_ERRORS)) {
uint8_t data = AUX_SERIAL_USART->DR;
if (!(status & USART_FLAG_ERRORS)) {
switch (serial2Mode) {
switch (auxSerialMode) {
case UART_MODE_DEBUG:
cliRxFifo.push(data);
break;
radio/src/targets/common/arm/stm32/bootloader/CMakeLists.txt
+1 -1
View File
@@ -116,7 +116,7 @@ else()
${BOOTLOADER_SRC}
../../../../../${STM32LIB_DIR}/STM32F4xx_StdPeriph_Driver/src/stm32f4xx_usart.c
../../../../../serial.cpp
../serial2_driver.cpp
../aux_serial_driver.cpp
)
endif()
endif()
radio/src/targets/common/arm/stm32/bootloader/boot.cpp
+2 -1
View File
@@ -231,10 +231,11 @@ int main()
delaysInit(); // needed for lcdInit()
#if defined(DEBUG)
serial2Init(UART_MODE_DEBUG, 0); // default serial mode (None if DEBUG not defined)
auxSerialInit(UART_MODE_DEBUG, 0); // default serial mode (None if DEBUG not defined)
#endif
__enable_irq();
TRACE("\nBootloader started :)");
lcdInit();
radio/src/targets/horus/CMakeLists.txt
+1 -1
View File
@@ -118,7 +118,7 @@ if(INTERNAL_GPS)
message("Horus: Internal GPS enabled")
endif()
set(AUX_SERIAL_DRIVER ../common/arm/stm32/serial2_driver.cpp)
set(AUX_SERIAL_DRIVER ../common/arm/stm32/aux_serial_driver.cpp)
set(GVAR_SCREEN model_gvars.cpp)
radio/src/targets/horus/board.cpp
+4 -4
View File
@@ -178,7 +178,7 @@ void boardInit()
delaysInit();
#if defined(DEBUG)
serial2Init(0, 0); // default serial mode (None if DEBUG not defined)
auxSerialInit(0, 0); // default serial mode (None if DEBUG not defined)
#endif
__enable_irq();
@@ -261,7 +261,7 @@ void checkTrainerSettings()
stop_trainer_ppm();
break;
case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT:
serial2Stop();
auxSerialStop();
}
currentTrainerMode = requiredTrainerMode;
@@ -270,8 +270,8 @@ void checkTrainerSettings()
init_trainer_ppm();
break;
case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT:
if (g_eeGeneral.serial2Mode == UART_MODE_SBUS_TRAINER) {
serial2SbusInit();
if (g_eeGeneral.auxSerialMode == UART_MODE_SBUS_TRAINER) {
auxSerialSbusInit();
break;
}
// no break
radio/src/targets/horus/board.h
+8 -8
View File
@@ -631,18 +631,18 @@ void gpsSendByte(uint8_t byte);
// Second serial port driver
#define AUX_SERIAL
#define DEBUG_BAUDRATE 115200
extern uint8_t serial2Mode;
void serial2Init(unsigned int mode, unsigned int protocol);
void serial2Putc(char c);
#define serial2TelemetryInit(protocol) serial2Init(UART_MODE_TELEMETRY, protocol)
void serial2SbusInit(void);
void serial2Stop(void);
extern uint8_t auxSerialMode;
void auxSerialInit(unsigned int mode, unsigned int protocol);
void auxSerialPutc(char c);
#define auxSerialTelemetryInit(protocol) auxSerialInit(UART_MODE_TELEMETRY, protocol)
void auxSerialSbusInit(void);
void auxSerialStop(void);
#define USART_FLAG_ERRORS (USART_FLAG_ORE | USART_FLAG_NE | USART_FLAG_FE | USART_FLAG_PE)
// BT driver
#define BT_TX_FIFO_SIZE 64
#define BT_RX_FIFO_SIZE 128
#define BLUETOOTH_BOOTLOADER_BAUDRATE 230400
#define BLUETOOTH_BOOTLOADER_BAUDRATE 230400
#define BLUETOOTH_FACTORY_BAUDRATE 57600
#define BLUETOOTH_DEFAULT_BAUDRATE 115200
void bluetoothInit(uint32_t baudrate, bool enable);
@@ -657,7 +657,7 @@ void checkTrainerSettings(void);
#include "fifo.h"
#include "dmafifo.h"
extern DMAFifo<512> telemetryFifo;
extern DMAFifo<32> serial2RxFifo;
extern DMAFifo<32> auxSerialRxFifo;
#endif
#if NUM_PWMSTICKS > 0
radio/src/targets/sky9x/CMakeLists.txt
+1 -1
View File
@@ -121,7 +121,7 @@ set(TARGET_SRC
haptic_driver.cpp
sdcard_driver.cpp
massstorage.cpp
serial2_driver.cpp
aux_serial_driver.cpp
audio_driver.cpp
trainer_driver.cpp
)
radio/src/targets/sky9x/serial2_driver.cpp → radio/src/targets/sky9x/aux_serial_driver.cpp
+6 -6
View File
@@ -28,7 +28,7 @@
/** Pins description corresponding to Rxd,Txd, (UART pins) */
#define SECOND_SERIAL_PINS {PINS_UART}
Fifo<uint8_t, 512> serial2RxFifo;
Fifo<uint8_t, 512> auxSerialRxFifo;
#if !defined(SIMU)
/*
@@ -37,7 +37,7 @@ Fifo<uint8_t, 512> serial2RxFifo;
* This function is synchronous (i.e. uses polling).
* c Character to send.
*/
void serial2Putc(const unsigned char c)
void auxSerialPutc(const unsigned char c)
{
Uart *pUart = SECOND_SERIAL_UART;
@@ -48,7 +48,7 @@ void serial2Putc(const unsigned char c)
pUart->UART_THR = c;
}
uint8_t serial2TracesEnabled()
uint8_t auxSerialTracesEnabled()
{
return false;
}
@@ -101,7 +101,7 @@ extern "C" void UART0_IRQHandler()
{
if ( SECOND_SERIAL_UART->UART_SR & UART_SR_RXRDY )
{
serial2RxFifo.push(SECOND_SERIAL_UART->UART_RHR);
auxSerialRxFifo.push(SECOND_SERIAL_UART->UART_RHR);
}
}
@@ -110,14 +110,14 @@ extern "C" void UART0_IRQHandler()
#endif
#if defined(TELEMETRY_FRSKY)
void serial2TelemetryInit(unsigned int /*protocol*/)
void auxSerialTelemetryInit(unsigned int /*protocol*/)
{
SECOND_UART_Configure(FRSKY_D_BAUDRATE, Master_frequency);
}
bool telemetrySecondPortReceive(uint8_t & data)
{
return serial2RxFifo.pop(data);
return auxSerialRxFifo.pop(data);
}
#endif
radio/src/targets/sky9x/board.h
+2 -2
View File
@@ -388,8 +388,8 @@ void rxPdcUsart( void (*pChProcess)(uint8_t x) );
void sportSendBuffer(const uint8_t * buffer, uint32_t size);
// Second UART driver
void serial2TelemetryInit(unsigned int protocol);
void serial2Putc(const unsigned char c);
void auxSerialTelemetryInit(unsigned int protocol);
void auxSerialPutc(const unsigned char c);
#if defined(__cplusplus)
bool telemetrySecondPortReceive(uint8_t & data);
#endif
radio/src/targets/taranis/CMakeLists.txt
+3 -3
View File
@@ -23,7 +23,7 @@ if(PCB STREQUAL X9E)
top_lcd_driver.cpp
startup_stm32f40_41xxx.s
)
set(AUX_SERIAL_DRIVER ../common/arm/stm32/serial2_driver.cpp)
set(AUX_SERIAL_DRIVER ../common/arm/stm32/aux_serial_driver.cpp)
if(STICKS STREQUAL HORUS)
add_definitions(-DHORUS_STICKS)
endif()
@@ -48,7 +48,7 @@ elseif(PCB STREQUAL X9D+)
set(BITMAPS_TARGET taranis_bitmaps)
set(FONTS_TARGET taranis_fonts)
set(LCD_DRIVER lcd_driver_spi.cpp)
set(AUX_SERIAL_DRIVER ../common/arm/stm32/serial2_driver.cpp)
set(AUX_SERIAL_DRIVER ../common/arm/stm32/aux_serial_driver.cpp)
set(GVAR_SCREEN model_gvars.cpp)
set(STATUS_LEDS NO)
elseif(PCB STREQUAL X9D)
@@ -65,7 +65,7 @@ elseif(PCB STREQUAL X9D)
set(BITMAPS_TARGET taranis_bitmaps)
set(FONTS_TARGET taranis_fonts)
set(LCD_DRIVER lcd_driver_aspi.cpp)
set(AUX_SERIAL_DRIVER ../common/arm/stm32/serial2_driver.cpp)
set(AUX_SERIAL_DRIVER ../common/arm/stm32/aux_serial_driver.cpp)
set(GVAR_SCREEN model_gvars.cpp)
set(STATUS_LEDS NO)
elseif(PCB STREQUAL X7)
radio/src/targets/taranis/board.cpp
+4 -4
View File
@@ -228,7 +228,7 @@ void boardInit()
usbInit();
#if defined(DEBUG) && defined(AUX_SERIAL_GPIO)
serial2Init(0, 0); // default serial mode (None if DEBUG not defined)
auxSerialInit(0, 0); // default serial mode (None if DEBUG not defined)
TRACE("\nTaranis board started :)");
#endif
@@ -369,7 +369,7 @@ void checkTrainerSettings()
break;
#if defined(TRAINER_BATTERY_COMPARTMENT)
case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT:
serial2Stop();
auxSerialStop();
#endif
}
@@ -386,8 +386,8 @@ void checkTrainerSettings()
break;
#if defined(TRAINER_BATTERY_COMPARTMENT)
case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT:
if (g_eeGeneral.serial2Mode == UART_MODE_SBUS_TRAINER) {
serial2SbusInit();
if (g_eeGeneral.auxSerialMode == UART_MODE_SBUS_TRAINER) {
auxSerialSbusInit();
break;
}
// no break
radio/src/targets/taranis/board.h
+7 -7
View File
@@ -773,12 +773,12 @@ void hapticOff(void);
#if defined(AUX_SERIAL_GPIO)
#define DEBUG_BAUDRATE 115200
#define AUX_SERIAL
extern uint8_t serial2Mode;
void serial2Init(unsigned int mode, unsigned int protocol);
void serial2Putc(char c);
#define serial2TelemetryInit(protocol) serial2Init(UART_MODE_TELEMETRY, protocol)
void serial2SbusInit(void);
void serial2Stop(void);
extern uint8_t auxSerialMode;
void auxSerialInit(unsigned int mode, unsigned int protocol);
void auxSerialPutc(char c);
#define auxSerialTelemetryInit(protocol) auxSerialInit(UART_MODE_TELEMETRY, protocol)
void auxSerialSbusInit(void);
void auxSerialStop(void);
#endif
// BT driver
@@ -876,7 +876,7 @@ void checkTrainerSettings(void);
#endif
extern Fifo<uint8_t, TELEMETRY_FIFO_SIZE> telemetryFifo;
extern DMAFifo<32> serial2RxFifo;
extern DMAFifo<32> auxSerialRxFifo;
#endif
// Gyro driver
radio/src/targets/taranis/telemetry_driver.cpp
+2 -2
View File
@@ -186,8 +186,8 @@ uint8_t telemetryGetByte(uint8_t * byte)
{
#if defined(AUX_SERIAL)
if (telemetryProtocol == PROTOCOL_TELEMETRY_FRSKY_D_SECONDARY) {
if (serial2Mode == UART_MODE_TELEMETRY)
return serial2RxFifo.pop(*byte);
if (auxSerialMode == UART_MODE_TELEMETRY)
return auxSerialRxFifo.pop(*byte);
else
return false;
}
radio/src/targets/taranis/trainer_driver.cpp
+1 -1
View File
@@ -311,7 +311,7 @@ int sbusGetByte(uint8_t * byte)
#endif
#if defined(AUX_SERIAL_USART)
case TRAINER_MODE_MASTER_BATTERY_COMPARTMENT:
return serial2RxFifo.pop(*byte);
return auxSerialRxFifo.pop(*byte);
#endif
default:
return false;