From e90c300bf4d34455377fec4bd89bd5f12181c95b Mon Sep 17 00:00:00 2001
From: Raphael Coeffic <raphael.coeffic@frafos.com>
Date: Tue, 14 Sep 2021 12:45:18 +0200
Subject: [PATCH] Clean-up / renaming MODULE_TYPE_AFHDS3 to MODULE_TYPE_FLYSKY

---
 radio/src/gui/gui_common.cpp         |  8 ++++----
 radio/src/pulses/modules_constants.h |  3 +--
 radio/src/pulses/modules_helpers.h   | 11 +++++++++--
 radio/src/pulses/pulses.cpp          |  2 +-
 radio/src/telemetry/telemetry.h      | 16 ++++++++++------
 5 files changed, 25 insertions(+), 15 deletions(-)

diff --git a/radio/src/gui/gui_common.cpp b/radio/src/gui/gui_common.cpp
index 47bb95fc9..f36779cff 100644
--- a/radio/src/gui/gui_common.cpp
+++ b/radio/src/gui/gui_common.cpp
@@ -573,7 +573,7 @@ bool isModuleUsingSport(uint8_t moduleBay, uint8_t moduleType)
     case MODULE_TYPE_ISRM_PXX2:
     case MODULE_TYPE_R9M_LITE_PXX2:
     case MODULE_TYPE_R9M_LITE_PRO_PXX2:
-    case MODULE_TYPE_AFHDS3:
+    case MODULE_TYPE_FLYSKY:
       return false;
 
     case MODULE_TYPE_XJT_PXX1:
@@ -628,7 +628,7 @@ bool isInternalModuleAvailable(int moduleType)
   }
 
 #if (defined(AFHDS3) || defined(AFHDS2A)) && (defined(INTERNAL_MODULE_AFHDS2A) || defined(INTERNAL_MODULE_AFHDS3))
-  if (moduleType == MODULE_TYPE_AFHDS3) {
+  if (moduleType == MODULE_TYPE_FLYSKY) {
     return true;
   }
 #endif
@@ -712,8 +712,8 @@ bool isExternalModuleAvailable(int moduleType)
     return false;
 #endif
 
-#if !defined(AFHDS3)
-  if (moduleType == MODULE_TYPE_AFHDS3)
+#if !defined(AFHDS3) && !defined(AFHDS2A)
+  if (moduleType == MODULE_TYPE_FLYSKY)
     return false;
 #endif
 
diff --git a/radio/src/pulses/modules_constants.h b/radio/src/pulses/modules_constants.h
index 4774c3dae..40a440cb4 100644
--- a/radio/src/pulses/modules_constants.h
+++ b/radio/src/pulses/modules_constants.h
@@ -37,8 +37,7 @@ enum ModuleType {
   MODULE_TYPE_R9M_LITE_PRO_PXX2,
   MODULE_TYPE_SBUS,
   MODULE_TYPE_XJT_LITE_PXX2,
-  MODULE_TYPE_AFHDS3, //no more protocols possible because of 4 bits value
-  //MODULE_TYPE_AFHDS2A,
+  MODULE_TYPE_FLYSKY, //no more protocols possible because of 4 bits value
   MODULE_TYPE_COUNT,
   MODULE_TYPE_MAX = MODULE_TYPE_COUNT - 1
 };
diff --git a/radio/src/pulses/modules_helpers.h b/radio/src/pulses/modules_helpers.h
index f9d91a5df..89c36e4f4 100644
--- a/radio/src/pulses/modules_helpers.h
+++ b/radio/src/pulses/modules_helpers.h
@@ -101,6 +101,11 @@ inline bool isModuleTypeXJT(uint8_t type)
   return type == MODULE_TYPE_XJT_PXX1 || type == MODULE_TYPE_XJT_LITE_PXX2;
 }
 
+inline bool isModuleNone(uint8_t idx)
+{
+  return g_model.moduleData[idx].type == MODULE_TYPE_NONE;
+}
+
 inline bool isModuleXJT(uint8_t idx)
 {
   return isModuleTypeXJT(g_model.moduleData[idx].type);
@@ -322,7 +327,7 @@ inline bool isModuleSBUS(uint8_t moduleIdx)
 inline bool isModuleFlySky(uint8_t idx)
 {
   return
-    (g_model.moduleData[idx].type == MODULE_TYPE_AFHDS3);
+    (g_model.moduleData[idx].type == MODULE_TYPE_FLYSKY);
 }
 
 inline bool isModuleAFHDS2A(uint8_t idx)
@@ -700,8 +705,10 @@ inline void setModuleType(uint8_t moduleIdx, uint8_t moduleType)
     moduleData.sbus.refreshRate = -31;
   else if (moduleData.type == MODULE_TYPE_PPM)
     setDefaultPpmFrameLength(moduleIdx);
-  else if (moduleData.type == MODULE_TYPE_AFHDS3)
+  else if (moduleData.type == MODULE_TYPE_FLYSKY) {
+    // TODO: what if AFHDS2A
     resetAfhds3Options(moduleIdx);
+  }
   else
     resetAccessAuthenticationCount();
 }
diff --git a/radio/src/pulses/pulses.cpp b/radio/src/pulses/pulses.cpp
index 2a9a6e7f3..b1e28f7cf 100755
--- a/radio/src/pulses/pulses.cpp
+++ b/radio/src/pulses/pulses.cpp
@@ -189,7 +189,7 @@ uint8_t getRequiredProtocol(uint8_t module)
 #endif
 
 #if defined(AFHDS3) || defined(AFHDS2)
-    case MODULE_TYPE_AFHDS3:
+    case MODULE_TYPE_FLYSKY:
       if (isModuleAFHDS3(module)) {
         protocol = PROTOCOL_CHANNELS_AFHDS3;
       } else if (isModuleAFHDS2A(module)) {
diff --git a/radio/src/telemetry/telemetry.h b/radio/src/telemetry/telemetry.h
index e7063a0e7..0cecee0c9 100644
--- a/radio/src/telemetry/telemetry.h
+++ b/radio/src/telemetry/telemetry.h
@@ -153,41 +153,45 @@ inline bool isSportLineUsedByInternalModule()
 }
 #endif
 
+#include "pulses/modules_helpers.h"
+
 inline uint8_t modelTelemetryProtocol()
 {
   bool sportUsed = isSportLineUsedByInternalModule();
 
 #if defined(CROSSFIRE)
-  if (g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_CROSSFIRE) {
+  if (isModuleCrossfire(EXTERNAL_MODULE)) {
     return PROTOCOL_TELEMETRY_CROSSFIRE;
   }
 #endif
 
 #if defined(GHOST)
-  if (g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_GHOST) {
+  if (isModuleGhost(EXTERNAL_MODULE)) {
     return PROTOCOL_TELEMETRY_GHOST;
   }
 #endif
 
-  if (!sportUsed && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_PPM) {
+  if (!sportUsed && isModulePPM(EXTERNAL_MODULE)) {
     return g_model.telemetryProtocol;
   }
 
 #if defined(MULTIMODULE)
-  if (!sportUsed && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_MULTIMODULE) {
+  if (!sportUsed && isModuleMultimodule(EXTERNAL_MODULE)) {
     return PROTOCOL_TELEMETRY_MULTIMODULE;
   }
 #if defined(INTERNAL_MODULE_MULTI)
-  if (g_model.moduleData[INTERNAL_MODULE].type == MODULE_TYPE_MULTIMODULE && g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_NONE) {
+  if (isModuleMultimodule(INTERNAL_MODULE) && isModuleNone(EXTERNAL_MODULE)) {
     return PROTOCOL_TELEMETRY_MULTIMODULE;
   }
 #endif
 #endif
+
 #if defined(AFHDS3)
-  if (g_model.moduleData[EXTERNAL_MODULE].type == MODULE_TYPE_AFHDS3) {
+  if (isModuleAFHDS3(EXTERNAL_MODULE)) {
     return PROTOCOL_TELEMETRY_AFHDS3;
   }
 #endif
+
   // default choice
   return PROTOCOL_TELEMETRY_FRSKY_SPORT;
 }