From 2a4bc2cf6a2b5f4bc824c345176a1322d27b6f46 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sat, 30 Jan 2016 11:23:34 +0100
Subject: [PATCH] Fixes #2022

---
 radio/src/logs.cpp  | 63 ++++++++++++++++++++++++++-------------------
 radio/src/mixer.cpp |  1 -
 2 files changed, 37 insertions(+), 27 deletions(-)

diff --git a/radio/src/logs.cpp b/radio/src/logs.cpp
index 23bf32d12..e06a13a6a 100644
--- a/radio/src/logs.cpp
+++ b/radio/src/logs.cpp
@@ -1,23 +1,23 @@
-/*
- * Copyright (C) OpenTX
- *
- * Based on code named
- *   th9x - http://code.google.com/p/th9x 
- *   er9x - http://code.google.com/p/er9x
- *   gruvin9x - http://code.google.com/p/gruvin9x
- *
- * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- */
-
+/*
+ * Copyright (C) OpenTX
+ *
+ * Based on code named
+ *   th9x - http://code.google.com/p/th9x 
+ *   er9x - http://code.google.com/p/er9x
+ *   gruvin9x - http://code.google.com/p/gruvin9x
+ *
+ * License GPLv2: http://www.gnu.org/licenses/gpl-2.0.html
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ */
+
 #include "opentx.h"
 #include "ff.h"
 
@@ -167,7 +167,7 @@ void writeHeader()
 #endif
 #endif
 
-#if defined(PCBTARANIS)
+#if defined(PCBTARANIS) || defined(PCBHORUS)
   for (uint8_t i=1; i<NUM_STICKS+NUM_POTS+1; i++) {
     const char * p = STR_VSRCRAW + i * STR_VSRCRAW[0] + 2;
     for (uint8_t j=0; j<STR_VSRCRAW[0]-1; ++j) {
@@ -177,12 +177,22 @@ void writeHeader()
     }
     f_putc(',', &g_oLogFile);
   }
-  f_puts("SA,SB,SC,SD,SE,SF,SG,SH\n", &g_oLogFile);
+  #define STR_SWITCHES_LOG_HEADER  "SA,SB,SC,SD,SE,SF,SG,SH"
+  f_puts(STR_SWITCHES_LOG_HEADER ",LS" "\n", &g_oLogFile);
 #else
   f_puts("Rud,Ele,Thr,Ail,P1,P2,P3,THR,RUD,ELE,3POS,AIL,GEA,TRN\n", &g_oLogFile);
 #endif
 }
 
+uint32_t getLogicalSwitchesStates(uint8_t first)
+{
+  uint32_t result = 0;
+  for (uint8_t i=0; i<32; i++) {
+    result |= (getSwitch(SWSRC_FIRST_LOGICAL_SWITCH+first+i) << i);
+  }
+  return result;
+}
+
 void writeLogs()
 {
   static const pm_char * error_displayed = NULL;
@@ -207,8 +217,7 @@ void writeLogs()
       {
         static struct gtm utm;
         static gtime_t lastRtcTime = 0;
-        if ( g_rtcTime != lastRtcTime )
-        {
+        if (g_rtcTime != lastRtcTime) {
           lastRtcTime = g_rtcTime;
           gettime(&utm);
         }
@@ -318,7 +327,7 @@ void writeLogs()
           get2PosState(SE),
           get3PosState(SF));
 #elif defined(PCBTARANIS) || defined(PCBHORUS)
-      int result = f_printf(&g_oLogFile, "%d,%d,%d,%d,%d,%d,%d,%d\n",
+      int result = f_printf(&g_oLogFile, "%d,%d,%d,%d,%d,%d,%d,%d,%lu%lu\n",
           get3PosState(SA),
           get3PosState(SB),
           get3PosState(SC),
@@ -326,7 +335,9 @@ void writeLogs()
           get3PosState(SE),
           get2PosState(SF),
           get3PosState(SG),
-          get2PosState(SH));
+          get2PosState(SH),
+          getLogicalSwitchesStates(32),
+          getLogicalSwitchesStates(0));
 #else
       int result = f_printf(&g_oLogFile, "%d,%d,%d,%d,%d,%d,%d\n",
           get2PosState(THR),
diff --git a/radio/src/mixer.cpp b/radio/src/mixer.cpp
index c8ca65342..0aa5b9f17 100644
--- a/radio/src/mixer.cpp
+++ b/radio/src/mixer.cpp
@@ -260,7 +260,6 @@ getvalue_t getValue(mixsrc_t i)
   else if (i>=MIXSRC_FIRST_STICK && i<=MIXSRC_LAST_POT) {
     return calibratedStick[i-MIXSRC_Rud];
   }
-}
 #endif
 
 #if defined(PCBGRUVIN9X) || defined(PCBMEGA2560) || defined(ROTARY_ENCODERS)