Fixed ifdefs

This commit is contained in:
Raphael Coeffic
2021-09-19 16:17:47 +02:00
parent c374e3369b
commit 78d8d976b4
3 changed files with 8 additions and 3 deletions
+8 -1
View File
@@ -836,7 +836,9 @@ class ModuleWindow : public FormGroup {
update();
rfChoice->setFocus(SET_FOCUS_DEFAULT);
});
} else if (isModuleFlySky(moduleIdx)) {
}
#if defined(AFHDS2) || defined(AFHDS3)
else if (isModuleFlySky(moduleIdx)) {
rfChoice =
new Choice(this, grid.getFieldSlot(2, 1),
STR_FLYSKY_PROTOCOLS, 0, FLYSKY_SUBTYPE_AFHDS2A,
@@ -929,6 +931,7 @@ class ModuleWindow : public FormGroup {
}
#endif
}
#endif
#if defined(MULTIMODULE)
else if (isModuleMultimodule(moduleIdx)) {
Choice * mmSubProto = nullptr;
@@ -1187,7 +1190,9 @@ class ModuleWindow : public FormGroup {
}
if (moduleState[moduleIdx].mode == MODULE_MODE_BIND) {
moduleState[moduleIdx].mode = MODULE_MODE_NORMAL;
#if defined(AFHDS2)
if (isModuleFlySky(moduleIdx)) resetPulsesAFHDS2();
#endif
return 0;
} else {
#if defined(MULTIMODULE)
@@ -1196,9 +1201,11 @@ class ModuleWindow : public FormGroup {
}
#endif
moduleState[moduleIdx].mode = MODULE_MODE_BIND;
#if defined(AFHDS2)
if (isModuleFlySky(moduleIdx)) {
resetPulsesAFHDS2();
}
#endif
return 1;
}
return 0;
-1
View File
@@ -144,7 +144,6 @@ void setFlyskyState(uint8_t state);
void onFlySkyBindReceiver();
void onFlySkyModuleSetPower(bool isPowerOn);
void afhds2Command(uint8_t type, uint8_t cmd);
void intmoduleSendBufferDMA(uint8_t* data, uint16_t size);
void onFlySkyGetVersionInfoStart(uint8_t isRfTransfer);
// void usbDownloadTransmit(uint8_t *buffer, uint32_t size);
-1
View File
@@ -413,7 +413,6 @@
#define INTMODULE_USART_IRQHandler UART7_IRQHandler
#define INTMODULE_DMA_STREAM DMA1_Stream1
#define INTMODULE_DMA_STREAM_IRQ DMA1_Stream1_IRQn
#define INTMODULE_DMA_STREAM_IRQHandler DMA2_Stream7_IRQHandler
#define INTMODULE_DMA_FLAG_TC DMA_IT_TCIF1
#define INTMODULE_DMA_CHANNEL DMA_Channel_5