PXX2 always defined. PROTOCOL enums renamed. IRPROTOS removed

This commit is contained in:
Bertrand Songis
2018-11-28 18:02:14 +01:00
parent b30c9b63cd
commit b72ccb4836
34 changed files with 174 additions and 343 deletions
+1 -7
View File
@@ -132,13 +132,7 @@ set(PULSES_SRC
ppm_arm.cpp
pxx.cpp
pxx1.cpp
pxx2.cpp
dsm2_arm.cpp
sbus_arm.cpp
)
if(PXX2)
set(PULSES_SRC
${PULSES_SRC}
pxx2.cpp
)
endif()
@@ -124,7 +124,7 @@ extern "C" void INTMODULE_DMA_STREAM_IRQHandler(void)
void intmoduleSendNextFrame()
{
if (s_current_protocol[INTERNAL_MODULE] == PROTO_PXX) {
if (s_current_protocol[INTERNAL_MODULE] == PROTOCOL_CHANNELS_PXX) {
DMA_InitTypeDef DMA_InitStructure;
DMA_DeInit(INTMODULE_DMA_STREAM);
DMA_InitStructure.DMA_Channel = INTMODULE_DMA_CHANNEL;
@@ -97,7 +97,7 @@ void serial2Init(unsigned int mode, unsigned int protocol)
break;
#endif
case UART_MODE_TELEMETRY:
if (protocol == PROTOCOL_FRSKY_D_SECONDARY) {
if (protocol == PROTOCOL_TELEMETRY_FRSKY_D_SECONDARY) {
uart3Setup(FRSKY_D_BAUDRATE, true);
}
break;