Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

Cosmetics

Browse source
This commit is contained in:
Bertrand Songis 2016-06-18 17:13:41 +02:00
parent e80d3ff642
commit dad37f36ba
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
radio/src/targets/horus/serial2_driver.cpp
View file

@ -73,7 +73,7 @@ void uart3Setup(unsigned int baudrate, bool dma)
DMA_Cmd(SERIAL_DMA_Stream_RX, ENABLE); DMA_Cmd(SERIAL_DMA_Stream_RX, ENABLE);
} }
else { else {
#if !defined(USB_SERIAL) && defined(CLI) #if !defined(USB_SERIAL) && (defined(CLI) || defined(DEBUG))
USART_Cmd(SERIAL_USART, ENABLE); USART_Cmd(SERIAL_USART, ENABLE);
USART_ITConfig(SERIAL_USART, USART_IT_RXNE, ENABLE); USART_ITConfig(SERIAL_USART, USART_IT_RXNE, ENABLE);
USART_ITConfig(SERIAL_USART, USART_IT_TXE, DISABLE); USART_ITConfig(SERIAL_USART, USART_IT_TXE, DISABLE);
@ -115,7 +115,6 @@ void serial2Putc(char c)
void serial2SbusInit() void serial2SbusInit()
{ {
// TODO is it possible on Horus?
uart3Setup(SBUS_BAUDRATE, true); uart3Setup(SBUS_BAUDRATE, true);
SERIAL_USART->CR1 |= USART_CR1_M | USART_CR1_PCE ; SERIAL_USART->CR1 |= USART_CR1_M | USART_CR1_PCE ;
} }
@ -128,10 +127,13 @@ void serial2Stop()
uint8_t serial2TracesEnabled() uint8_t serial2TracesEnabled()
{ {
return 1; // TODO (serial2Mode == 0); #if defined(DEBUG)
return (serial2Mode == UART_MODE_DEBUG);
#else
return false;
#endif
} }
#if !defined(SIMU)
extern "C" void SERIAL_USART_IRQHandler(void) extern "C" void SERIAL_USART_IRQHandler(void)
{ {
DEBUG_INTERRUPT(INT_SER2); DEBUG_INTERRUPT(INT_SER2);
@ -162,6 +164,4 @@ extern "C" void SERIAL_USART_IRQHandler(void)
status = SERIAL_USART->SR; status = SERIAL_USART->SR;
} }
#endif #endif
} }
#endif

1
radio/src/targets/taranis/serial2_driver.cpp
View file

@ -45,7 +45,6 @@ void uart3Setup(unsigned int baudrate, bool dma)
USART_InitStructure.USART_Parity = USART_Parity_No; USART_InitStructure.USART_Parity = USART_Parity_No;
USART_InitStructure.USART_HardwareFlowControl = USART_HardwareFlowControl_None; USART_InitStructure.USART_HardwareFlowControl = USART_HardwareFlowControl_None;
USART_InitStructure.USART_Mode = USART_Mode_Tx | USART_Mode_Rx; USART_InitStructure.USART_Mode = USART_Mode_Tx | USART_Mode_Rx;
USART_Init(SERIAL_USART, &USART_InitStructure); USART_Init(SERIAL_USART, &USART_InitStructure);
if (dma) { if (dma) {