Improve NV14 CMake

This commit is contained in:
Raphael Coeffic
2022-08-11 12:15:46 +02:00
committed by Raphael Coeffic
parent f952c5f7c7
commit 1a918bf072
6 changed files with 25 additions and 26 deletions
+3 -3
View File
@@ -378,7 +378,7 @@ static void enablePulsesInternalModule(uint8_t protocol)
}
switch (protocol) {
#if defined(PXX1) && !defined(INTMODULE_USART)
#if defined(INTERNAL_MODULE_PXX1) && !defined(INTMODULE_USART)
case PROTOCOL_CHANNELS_PXX1_PULSES:
intmodulePxx1PulsesStart();
#if defined(INTMODULE_HEARTBEAT)
@@ -388,14 +388,14 @@ static void enablePulsesInternalModule(uint8_t protocol)
break;
#endif
#if defined(PXX1) && defined(INTMODULE_USART)
#if defined(INTERNAL_MODULE_PXX1) && defined(INTMODULE_USART)
case PROTOCOL_CHANNELS_PXX1_SERIAL:
internalModuleContext = Pxx1InternalSerialDriver.init(INTERNAL_MODULE);
internalModuleDriver = &Pxx1InternalSerialDriver;
break;
#endif
#if defined(PXX2)
#if defined(INTERNAL_MODULE_PXX2)
case PROTOCOL_CHANNELS_PXX2_HIGHSPEED:
internalModuleContext = Pxx2InternalDriver.init(INTERNAL_MODULE);
internalModuleDriver = &Pxx2InternalDriver;
+5 -5
View File
@@ -148,7 +148,7 @@ PACK(struct GhostPulsesData {
});
union InternalModulePulsesData {
#if defined(PXX1)
#if defined(INTERNAL_MODULE_PXX1)
#if defined(INTMODULE_USART)
UartPxx1Pulses pxx_uart;
#else
@@ -156,19 +156,19 @@ union InternalModulePulsesData {
#endif
#endif
#if defined(PXX2)
#if defined(INTERNAL_MODULE_PXX2)
Pxx2Pulses pxx2;
#endif
#if defined(INTMODULE_USART) && defined(AFHDS2)
#if defined(INTERNAL_MODULE_AFHDS2A)
FlySkySerialPulsesData flysky;
#endif
#if defined(MULTIMODULE)
#if defined(INTERNAL_MODULE_MULTI)
UartMultiPulses multi;
#endif
#if defined(CROSSFIRE)
#if defined(INTERNAL_MODULE_CRSF)
CrossfirePulsesData crossfire;
#endif
+1 -1
View File
@@ -222,7 +222,7 @@ template class Pxx1Pulses<StandardPxx1Transport<PwmPxxBitTransport> >;
template class Pxx1Pulses<StandardPxx1Transport<SerialPxxBitTransport> >;
template class Pxx1Pulses<UartPxx1Transport>;
#if defined(INTMODULE_USART)
#if defined(INTMODULE_USART) && defined(INTERNAL_MODULE_PXX1)
#include "intmodule_serial_driver.h"
static const etx_serial_init pxx1SerialInit = {