From 78d8d976b4658f41e697d3d8efdc295314f0a8bb Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Wed, 15 Sep 2021 11:21:15 +0200
Subject: [PATCH] Fixed ifdefs

---
 radio/src/gui/colorlcd/model_setup.cpp | 9 ++++++++-
 radio/src/pulses/flysky.cpp            | 1 -
 radio/src/targets/nv14/hal.h           | 1 -
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/radio/src/gui/colorlcd/model_setup.cpp b/radio/src/gui/colorlcd/model_setup.cpp
index 6728563cb..1d9c9e7bd 100644
--- a/radio/src/gui/colorlcd/model_setup.cpp
+++ b/radio/src/gui/colorlcd/model_setup.cpp
@@ -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;
diff --git a/radio/src/pulses/flysky.cpp b/radio/src/pulses/flysky.cpp
index 3ab95f609..4406c2ad0 100644
--- a/radio/src/pulses/flysky.cpp
+++ b/radio/src/pulses/flysky.cpp
@@ -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);
 
diff --git a/radio/src/targets/nv14/hal.h b/radio/src/targets/nv14/hal.h
index a074d0d2a..3a96c5c2e 100644
--- a/radio/src/targets/nv14/hal.h
+++ b/radio/src/targets/nv14/hal.h
@@ -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