From a985d021b69125701512a970ec9caac89f5f5e7b Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Tue, 1 Sep 2015 18:55:44 +0200
Subject: [PATCH] Fixes #2754

---
 radio/src/functions.cpp |  4 ++--
 radio/src/opentx.h      |  6 +++---
 radio/src/switches.cpp  | 21 +++++++--------------
 3 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/radio/src/functions.cpp b/radio/src/functions.cpp
index ccc03740b..99516aef6 100644
--- a/radio/src/functions.cpp
+++ b/radio/src/functions.cpp
@@ -284,10 +284,10 @@ void evalFunctions()
 #endif
 
   for (uint8_t i=0; i<NUM_CFN; i++) {
-    const CustomFunctionData *cfn = &functions[i];
+    const CustomFunctionData * cfn = &functions[i];
     int8_t swtch = CFN_SWITCH(cfn);
     if (swtch) {
-      MASK_CFN_TYPE  switch_mask = ((MASK_CFN_TYPE)1 << i);
+      MASK_CFN_TYPE switch_mask = ((MASK_CFN_TYPE)1 << i);
 
 #if defined(CPUARM)
       bool active = getSwitch(swtch, IS_PLAY_FUNC(CFN_FUNC(cfn)) ? GETSWITCH_MIDPOS_DELAY : 0);
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index b550a5004..4a434962c 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -530,7 +530,7 @@ typedef struct {
   MASK_CFN_TYPE  activeSwitches;
   tmr10ms_t lastFunctionTime[NUM_CFN];
 
-  inline bool isFuunctionActive(uint8_t func)
+  inline bool isFunctionActive(uint8_t func)
   {
     return activeFunctions & ((MASK_FUNC_TYPE)1 << func);
   }
@@ -1333,7 +1333,7 @@ extern CustomFunctionsContext modelFunctionsContext;
 extern CustomFunctionsContext globalFunctionsContext;
 inline bool isFunctionActive(uint8_t func)
 {
-  return globalFunctionsContext.isFuunctionActive(func) || modelFunctionsContext.isFuunctionActive(func);
+  return globalFunctionsContext.isFunctionActive(func) || modelFunctionsContext.isFunctionActive(func);
 }
 void evalFunctions(const CustomFunctionData * functions, CustomFunctionsContext & functionsContext);
 inline void customFunctionsReset()
@@ -1343,7 +1343,7 @@ inline void customFunctionsReset()
 }
 #else
 extern CustomFunctionsContext modelFunctionsContext;
-#define isFunctionActive(func) modelFunctionsContext.isFuunctionActive(func)
+#define isFunctionActive(func) modelFunctionsContext.isFunctionActive(func)
 void evalFunctions();
 #define customFunctionsReset() modelFunctionsContext.reset()
 #endif
diff --git a/radio/src/switches.cpp b/radio/src/switches.cpp
index 7e1a44ce1..bf8c00130 100644
--- a/radio/src/switches.cpp
+++ b/radio/src/switches.cpp
@@ -92,7 +92,7 @@ uint64_t check2PosSwitchPosition(EnumKeys sw)
   else
     index = sw - SW_SA0 + 2;
 
-  result = ((int64_t)1 << index);
+  result = ((uint64_t)1 << index);
 
   if (!(switchesPos & result)) {
     PLAY_SWITCH_MOVED(index);
@@ -101,9 +101,9 @@ uint64_t check2PosSwitchPosition(EnumKeys sw)
   return result;
 }
 
-uint32_t check3PosSwitchPosition(uint8_t idx, EnumKeys sw, bool startup)
+uint64_t check3PosSwitchPosition(uint8_t idx, EnumKeys sw, bool startup)
 {
-  uint32_t result;
+  uint64_t result;
   uint32_t index;
 
   if (switchState(sw)) {
@@ -178,6 +178,7 @@ void getSwitchesPosition(bool startup)
     }
   }
 }
+
 #define SWITCH_POSITION(sw)  (switchesPos & (1<<(sw)))
 #define POT_POSITION(sw)     ((potsPos[(sw)/XPOTS_MULTIPOS_COUNT] & 0x0f) == ((sw) % XPOTS_MULTIPOS_COUNT))
 
@@ -444,18 +445,10 @@ bool getSwitch(int8_t swtch)
   }
   else if (cs_idx <= SWSRC_LAST_SWITCH) {
 #if defined(PCBTARANIS)
-    if (flags & GETSWITCH_MIDPOS_DELAY) {
-      div_t swinfo = switchInfo(cs_idx);
-      if (IS_3POS(swinfo.quot)) {
-        result = SWITCH_POSITION(cs_idx-SWSRC_FIRST_SWITCH);
-      }
-      else {
-        result = switchState((EnumKeys)(SW_BASE+cs_idx-SWSRC_FIRST_SWITCH));
-      }
-    }
-    else {
+    if (flags & GETSWITCH_MIDPOS_DELAY)
+      result = SWITCH_POSITION(cs_idx-SWSRC_FIRST_SWITCH);
+    else
       result = switchState((EnumKeys)(SW_BASE+cs_idx-SWSRC_FIRST_SWITCH));
-    }
 #else
     result = switchState((EnumKeys)(SW_BASE+cs_idx-SWSRC_FIRST_SWITCH));
 #endif