Taranis hangs when compiled in DEBUG mode without CLI
This commit is contained in:
@@ -1025,11 +1025,11 @@ endif()
|
|||||||
set(CMAKE_C_FLAGS "${COMMON_FLAGS} -Wimplicit")
|
set(CMAKE_C_FLAGS "${COMMON_FLAGS} -Wimplicit")
|
||||||
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${COMMON_FLAGS} -Wimplicit -g")
|
set(CMAKE_C_FLAGS_RELWITHDEBINFO "${COMMON_FLAGS} -Wimplicit -g")
|
||||||
set(CMAKE_C_FLAGS_RELEASE "${COMMON_FLAGS} -Wimplicit")
|
set(CMAKE_C_FLAGS_RELEASE "${COMMON_FLAGS} -Wimplicit")
|
||||||
set(CMAKE_C_FLAGS_DEBUG "${COMMON_FLAGS} -Wimplicit -g")
|
set(CMAKE_C_FLAGS_DEBUG "${COMMON_FLAGS} -Wimplicit -g")
|
||||||
set(CMAKE_CXX_FLAGS "${COMMON_CPP_FLAGS}")
|
set(CMAKE_CXX_FLAGS "${COMMON_CPP_FLAGS}")
|
||||||
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${COMMON_CPP_FLAGS} -g")
|
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${COMMON_CPP_FLAGS} -g")
|
||||||
set(CMAKE_CXX_FLAGS_RELEASE "${COMMON_CPP_FLAGS}")
|
set(CMAKE_CXX_FLAGS_RELEASE "${COMMON_CPP_FLAGS}")
|
||||||
set(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CPP_FLAGS} -g")
|
set(CMAKE_CXX_FLAGS_DEBUG "${COMMON_CPP_FLAGS} -g")
|
||||||
set(CMAKE_EXE_LINKER_FLAGS "-mcpu=${MCU} -mthumb -lm -T${RADIO_SRC_DIRECTORY}/${LINKER_SCRIPT} -Wl,-Map=firmware.map,--cref,--no-warn-mismatch,--gc-sections")
|
set(CMAKE_EXE_LINKER_FLAGS "-mcpu=${MCU} -mthumb -lm -T${RADIO_SRC_DIRECTORY}/${LINKER_SCRIPT} -Wl,-Map=firmware.map,--cref,--no-warn-mismatch,--gc-sections")
|
||||||
|
|
||||||
if(PCB STREQUAL TARANIS)
|
if(PCB STREQUAL TARANIS)
|
||||||
|
|||||||
@@ -74,7 +74,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);
|
||||||
@@ -135,7 +135,6 @@ uint8_t serial2TracesEnabled()
|
|||||||
#endif
|
#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);
|
||||||
@@ -166,6 +165,4 @@ extern "C" void SERIAL_USART_IRQHandler(void)
|
|||||||
status = SERIAL_USART->SR;
|
status = SERIAL_USART->SR;
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|||||||
@@ -71,7 +71,11 @@
|
|||||||
#define TR_TRNCHN "CH1CH2CH3CH4"
|
#define TR_TRNCHN "CH1CH2CH3CH4"
|
||||||
|
|
||||||
#define LEN_UART3MODES "\015"
|
#define LEN_UART3MODES "\015"
|
||||||
|
#if defined(CLI) || defined(DEBUG)
|
||||||
|
#define TR_UART3MODES "Debug\0 ""S-Port Mirror""Telemetry\0 ""SBUS Trainer\0""Debug\0"
|
||||||
|
#else
|
||||||
#define TR_UART3MODES "OFF\0 ""S-Port Mirror""Telemetry\0 ""SBUS Trainer\0""Debug\0"
|
#define TR_UART3MODES "OFF\0 ""S-Port Mirror""Telemetry\0 ""SBUS Trainer\0""Debug\0"
|
||||||
|
#endif
|
||||||
|
|
||||||
#define LEN_SWTYPES "\006"
|
#define LEN_SWTYPES "\006"
|
||||||
#define TR_SWTYPES "None\0 ""Toggle""2POS\0 ""3POS\0"
|
#define TR_SWTYPES "None\0 ""Toggle""2POS\0 ""3POS\0"
|
||||||
|
|||||||
Reference in New Issue
Block a user