Fixed ifdefs
This commit is contained in:
@@ -836,7 +836,9 @@ class ModuleWindow : public FormGroup {
|
|||||||
update();
|
update();
|
||||||
rfChoice->setFocus(SET_FOCUS_DEFAULT);
|
rfChoice->setFocus(SET_FOCUS_DEFAULT);
|
||||||
});
|
});
|
||||||
} else if (isModuleFlySky(moduleIdx)) {
|
}
|
||||||
|
#if defined(AFHDS2) || defined(AFHDS3)
|
||||||
|
else if (isModuleFlySky(moduleIdx)) {
|
||||||
rfChoice =
|
rfChoice =
|
||||||
new Choice(this, grid.getFieldSlot(2, 1),
|
new Choice(this, grid.getFieldSlot(2, 1),
|
||||||
STR_FLYSKY_PROTOCOLS, 0, FLYSKY_SUBTYPE_AFHDS2A,
|
STR_FLYSKY_PROTOCOLS, 0, FLYSKY_SUBTYPE_AFHDS2A,
|
||||||
@@ -929,6 +931,7 @@ class ModuleWindow : public FormGroup {
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
#if defined(MULTIMODULE)
|
#if defined(MULTIMODULE)
|
||||||
else if (isModuleMultimodule(moduleIdx)) {
|
else if (isModuleMultimodule(moduleIdx)) {
|
||||||
Choice * mmSubProto = nullptr;
|
Choice * mmSubProto = nullptr;
|
||||||
@@ -1187,7 +1190,9 @@ class ModuleWindow : public FormGroup {
|
|||||||
}
|
}
|
||||||
if (moduleState[moduleIdx].mode == MODULE_MODE_BIND) {
|
if (moduleState[moduleIdx].mode == MODULE_MODE_BIND) {
|
||||||
moduleState[moduleIdx].mode = MODULE_MODE_NORMAL;
|
moduleState[moduleIdx].mode = MODULE_MODE_NORMAL;
|
||||||
|
#if defined(AFHDS2)
|
||||||
if (isModuleFlySky(moduleIdx)) resetPulsesAFHDS2();
|
if (isModuleFlySky(moduleIdx)) resetPulsesAFHDS2();
|
||||||
|
#endif
|
||||||
return 0;
|
return 0;
|
||||||
} else {
|
} else {
|
||||||
#if defined(MULTIMODULE)
|
#if defined(MULTIMODULE)
|
||||||
@@ -1196,9 +1201,11 @@ class ModuleWindow : public FormGroup {
|
|||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
moduleState[moduleIdx].mode = MODULE_MODE_BIND;
|
moduleState[moduleIdx].mode = MODULE_MODE_BIND;
|
||||||
|
#if defined(AFHDS2)
|
||||||
if (isModuleFlySky(moduleIdx)) {
|
if (isModuleFlySky(moduleIdx)) {
|
||||||
resetPulsesAFHDS2();
|
resetPulsesAFHDS2();
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
return 0;
|
return 0;
|
||||||
|
|||||||
@@ -144,7 +144,6 @@ void setFlyskyState(uint8_t state);
|
|||||||
void onFlySkyBindReceiver();
|
void onFlySkyBindReceiver();
|
||||||
void onFlySkyModuleSetPower(bool isPowerOn);
|
void onFlySkyModuleSetPower(bool isPowerOn);
|
||||||
void afhds2Command(uint8_t type, uint8_t cmd);
|
void afhds2Command(uint8_t type, uint8_t cmd);
|
||||||
void intmoduleSendBufferDMA(uint8_t* data, uint16_t size);
|
|
||||||
void onFlySkyGetVersionInfoStart(uint8_t isRfTransfer);
|
void onFlySkyGetVersionInfoStart(uint8_t isRfTransfer);
|
||||||
// void usbDownloadTransmit(uint8_t *buffer, uint32_t size);
|
// void usbDownloadTransmit(uint8_t *buffer, uint32_t size);
|
||||||
|
|
||||||
|
|||||||
@@ -413,7 +413,6 @@
|
|||||||
#define INTMODULE_USART_IRQHandler UART7_IRQHandler
|
#define INTMODULE_USART_IRQHandler UART7_IRQHandler
|
||||||
#define INTMODULE_DMA_STREAM DMA1_Stream1
|
#define INTMODULE_DMA_STREAM DMA1_Stream1
|
||||||
#define INTMODULE_DMA_STREAM_IRQ DMA1_Stream1_IRQn
|
#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_FLAG_TC DMA_IT_TCIF1
|
||||||
#define INTMODULE_DMA_CHANNEL DMA_Channel_5
|
#define INTMODULE_DMA_CHANNEL DMA_Channel_5
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user