From e07c5d596ed6430983636a021b8154b47430c53e Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Thu, 27 Jun 2019 23:27:32 +0200
Subject: [PATCH] Compilation fix

---
 radio/src/logs.cpp                |  4 ++--
 radio/src/switches.cpp            | 35 +++++++++++++++----------------
 radio/src/targets/taranis/board.h |  4 +---
 3 files changed, 20 insertions(+), 23 deletions(-)

diff --git a/radio/src/logs.cpp b/radio/src/logs.cpp
index 1094d6af7..0ac375041 100644
--- a/radio/src/logs.cpp
+++ b/radio/src/logs.cpp
@@ -274,12 +274,12 @@ void logsWrite()
 
 // TODO: use hardware config to populate
 #if defined(PCBX9LITE)
-f_printf(&g_oLogFile, "%d,%d,%d,%d,0x%08X%08X,",
+      f_printf(&g_oLogFile, "%d,%d,%d,%d,0x%08X%08X,",
           GET_3POS_STATE(SA),
           GET_3POS_STATE(SB),
           GET_3POS_STATE(SC),
+          GET_2POS_STATE(SD),
           GET_2POS_STATE(SE),
-          GET_2POS_STATE(SF),
           getLogicalSwitchesStates(32),
           getLogicalSwitchesStates(0));
 #elif defined(PCBXLITE)
diff --git a/radio/src/switches.cpp b/radio/src/switches.cpp
index 6b2199a0d..642dd704b 100644
--- a/radio/src/switches.cpp
+++ b/radio/src/switches.cpp
@@ -131,31 +131,30 @@ void getSwitchesPosition(bool startup)
   CHECK_3POS(0, SW_SA);
   CHECK_3POS(1, SW_SB);
   CHECK_3POS(2, SW_SC);
-#if !defined(PCBX9LITE)
+
+#if defined(PCBX9LITE)
+  CHECK_2POS(SW_SD);
+  CHECK_2POS(SW_SE);
+#elif defined(PCBXLITES)
   CHECK_3POS(3, SW_SD);
-#endif
-#if defined(PCBXLITES) || defined(PCBX9LITE)
   CHECK_2POS(SW_SE);
-#elif defined(PCBX7) || defined(PCBXLITE) || defined(PCBX9LITE)
-  // No SE
-#else
-  CHECK_3POS(4, SW_SE);
-#endif
-#if defined(PCBXLITE) && !defined(PCBXLITES)
-  // No SF
-#else
   CHECK_2POS(SW_SF);
-#endif
-#if defined(PCBX7) || defined(PCBXLITE) || defined(PCBX9LITE)
-  // No SG
+  // no SWG and SWH on XLITES
+#elif defined(PCBXLITE)
+  CHECK_3POS(3, SW_SD);
+  // no SWE, SWF, SWG and SWH on XLITE
+#elif defined(PCBX7)
+  CHECK_3POS(3, SW_SD);
+  CHECK_2POS(SW_SF);
+  CHECK_2POS(SW_SH);
 #else
+  CHECK_3POS(3, SW_SD);
+  CHECK_3POS(4, SW_SE);
+  CHECK_2POS(SW_SF);
   CHECK_3POS(5, SW_SG);
-#endif
-#if defined(PCBXLITE) || defined(PCBX9LITE)
-  // No SH
-#else
   CHECK_2POS(SW_SH);
 #endif
+
 #if defined(PCBX9E)
   CHECK_3POS(6, SW_SI);
   CHECK_3POS(7, SW_SJ);
diff --git a/radio/src/targets/taranis/board.h b/radio/src/targets/taranis/board.h
index 31641c30a..b659cffab 100644
--- a/radio/src/targets/taranis/board.h
+++ b/radio/src/targets/taranis/board.h
@@ -377,17 +377,15 @@ enum EnumSwitchesPositions
   SW_SC0,
   SW_SC1,
   SW_SC2,
-#if !defined(PCBX9LITE)
   SW_SD0,
   SW_SD1,
   SW_SD2,
-#endif
 #if defined(PCBX9) || defined(PCBXLITES)
   SW_SE0,
   SW_SE1,
   SW_SE2,
 #endif
-#if defined(PCBX9) || defined(PCBX7) || defined(PCBXLITES)
+#if defined(PCBX9D) || defined(PCBX9DP) || defined(PCBX9E) || defined(PCBX7) || defined(PCBXLITES)
   SW_SF0,
   SW_SF1,
   SW_SF2,