fix: 3POS switches on certain radios not detecting all switch positio…

…ns (#3568) * Quick and dirty fix for #3560. * Fixed build error. * Fixed problematic logic. * Code cleanup.
EdgeTX · Jun 22, 2023 · 302bf3e · 302bf3e
1 parent a1528db
commit 302bf3e
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 99 deletions.
diff --git a/radio/src/switches.cpp b/radio/src/switches.cpp
@@ -212,113 +212,66 @@ uint64_t check3PosSwitchPosition(uint8_t idx, uint8_t sw, bool startup)
 
 #define CHECK_2POS(sw)       newPos |= check2PosSwitchPosition(sw ## 0)
 #define CHECK_3POS(idx, sw)  newPos |= check3PosSwitchPosition(idx, sw ## 0, startup)
+#define CHECK_POS(sw)        ((g_eeGeneral.switchConfig >> ((sw - SW_SA) * 2)) & 0x03 == SWITCH_3POS) ? CHECK_3POS(idx++, sw) : CHECK_2POS(sw)
 
 void getSwitchesPosition(bool startup)
 {
   uint64_t newPos = 0;
-#if defined(RADIO_TX12) || defined(RADIO_TX12MK2) || defined(RADIO_ZORRO) || defined(RADIO_BOXER)
-  CHECK_2POS(SW_SA);
-  CHECK_3POS(0, SW_SB);
-  CHECK_3POS(1, SW_SC);
-#elif defined(RADIO_TPRO)
-  CHECK_3POS(0, SW_SA);
-  CHECK_3POS(1, SW_SB);
-  CHECK_2POS(SW_SC);
-  CHECK_2POS(SW_SD);
-#elif defined(PCBNV14)
-  CHECK_2POS(SW_SA);
-  CHECK_3POS(0, SW_SB);
-  CHECK_2POS(SW_SC);
-  CHECK_2POS(SW_SD);
-#else
-  CHECK_3POS(0, SW_SA);
-  CHECK_3POS(1, SW_SB);
-  CHECK_3POS(2, SW_SC);
-#endif
+  uint8_t idx = 0;
 
-#if defined(PCBX9LITES)
-  CHECK_2POS(SW_SD);
-  CHECK_2POS(SW_SE);
-  CHECK_2POS(SW_SF);
-  CHECK_2POS(SW_SG);
-#elif defined(PCBX9LITE)
-  CHECK_2POS(SW_SD);
-  CHECK_2POS(SW_SE);
-#elif defined(PCBXLITES)
-  CHECK_3POS(3, SW_SD);
-  CHECK_2POS(SW_SE);
-  CHECK_2POS(SW_SF);
-  // no SWG and SWH on XLITES
-#elif defined(PCBXLITE)
-  CHECK_3POS(3, SW_SD);
-  // no SWE, SWF, SWG and SWH on XLITE
-#elif defined(RADIO_ZORRO)
-  CHECK_2POS(SW_SD);
-  CHECK_2POS(SW_SE);
-  CHECK_2POS(SW_SF);
-  CHECK_2POS(SW_SG);
-  CHECK_2POS(SW_SH);
-#elif defined(RADIO_TX12) || defined(RADIO_TX12MK2)
-  CHECK_2POS(SW_SD);
-  CHECK_3POS(2, SW_SE);
-  CHECK_3POS(3, SW_SF);
-#elif defined(RADIO_BOXER)
-  CHECK_2POS(SW_SD);
-  CHECK_2POS(SW_SE);
-  CHECK_2POS(SW_SF);
-#elif defined(RADIO_TPRO)
-  CHECK_2POS(SW_SE);
-  CHECK_2POS(SW_SF);
-  CHECK_2POS(SW_SG);
-  CHECK_2POS(SW_SH);
-  CHECK_2POS(SW_SI);
-  CHECK_2POS(SW_SJ);
-#elif defined(PCBX7)
-  CHECK_3POS(3, SW_SD);
-  #if defined(HARDWARE_SWITCH_F)
-    CHECK_2POS(SW_SF);
-  #endif
-  #if defined(HARDWARE_SWITCH_G)
-    CHECK_2POS(SW_SG);
-  #endif
-  #if defined(HARDWARE_SWITCH_H)
-    CHECK_2POS(SW_SH);
-  #endif
-#elif defined(PCBNV14)
-  CHECK_2POS(SW_SE);
-  CHECK_3POS(1, SW_SF);
-  CHECK_3POS(2, SW_SG);
-  CHECK_2POS(SW_SH);
-#else
-  CHECK_3POS(3, SW_SD);
-  CHECK_3POS(4, SW_SE);
-  CHECK_2POS(SW_SF);
-  CHECK_3POS(5, SW_SG);
-  CHECK_2POS(SW_SH);
+#if defined(HARDWARE_SWITCH_A)
+  CHECK_POS(SW_SA);
 #endif
-
-#if defined(RADIO_X9DP2019)
-  CHECK_2POS(SW_SI);
+#if defined(HARDWARE_SWITCH_B)
+  CHECK_POS(SW_SB);
 #endif
-
-#if defined(PCBX7ACCESS)
-  CHECK_2POS(SW_SI);
-#elif defined(PCBHORUS) || (defined(PCBX7) && !defined(RADIO_ZORRO))
-  CHECK_2POS(SW_SI);
-  CHECK_2POS(SW_SJ);
+#if defined(HARDWARE_SWITCH_C)
+  CHECK_POS(SW_SC);
 #endif
-
-#if defined(PCBX9E)
-  CHECK_3POS(6, SW_SI);
-  CHECK_3POS(7, SW_SJ);
-  CHECK_3POS(8, SW_SK);
-  CHECK_3POS(9, SW_SL);
-  CHECK_3POS(10, SW_SM);
-  CHECK_3POS(11, SW_SN);
-  CHECK_3POS(12, SW_SO);
-  CHECK_3POS(13, SW_SP);
-  CHECK_3POS(14, SW_SQ);
-  CHECK_3POS(15, SW_SR);
+#if defined(HARDWARE_SWITCH_D)
+  CHECK_POS(SW_SD);
+#endif
+#if defined(HARDWARE_SWITCH_E)
+  CHECK_POS(SW_SE);
+#endif
+#if defined(HARDWARE_SWITCH_F)
+  CHECK_POS(SW_SF);
+#endif
+#if defined(HARDWARE_SWITCH_G)
+  CHECK_POS(SW_SG);
+#endif
+#if defined(HARDWARE_SWITCH_H)
+  CHECK_POS(SW_SH);
+#endif
+#if defined(HARDWARE_SWITCH_I)
+  CHECK_POS(SW_SI);
+#endif
+#if defined(HARDWARE_SWITCH_J)
+  CHECK_POS(SW_SJ);
+#endif
+#if defined(HARDWARE_SWITCH_K)
+  CHECK_POS(SW_SK);
+#endif
+#if defined(HARDWARE_SWITCH_L)
+  CHECK_POS(SW_SL);
+#endif
+#if defined(HARDWARE_SWITCHMH)
+  CHECK_POS(SW_SM);
+#endif
+#if defined(HARDWARE_SWITCH_N)
+  CHECK_POS(SW_SN);
+#endif
+#if defined(HARDWARE_SWITCH_O)
+  CHECK_POS(SW_SO);
+#endif
+#if defined(HARDWARE_SWITCH_P)
+  CHECK_POS(SW_SP);
+#endif
+#if defined(HARDWARE_SWITCH_Q)
+  CHECK_POS(SW_SQ);
+#endif
+#if defined(HARDWARE_SWITCH_R)
+  CHECK_POS(SW_SR);
 #endif
 
   switchesPos = newPos;

diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h
@@ -260,6 +260,7 @@ enum EnumSwitches
   SW_SK,
   SW_SL,
   SW_SM,
+  SW_SN,
   SW_SO,
   SW_SP,
   SW_SQ,
-Original file line number
+Diff line change
@@ Expand Up / @@ -260,6 +260,7 @@ enum EnumSwitches @@
       SW_SK,
       SW_SL,
       SW_SM,
+      SW_SN,
       SW_SO,
       SW_SP,
       SW_SQ,
@@ Expand Down @@