From 413c146fe0082ed3a8091f87664885f942e6d818 Mon Sep 17 00:00:00 2001
From: Bertrand Songis <bsongis@gmail.com>
Date: Sun, 2 Feb 2014 22:50:36 +0100
Subject: [PATCH] [Taranis] 6pos multiswitch fix

---
 radio/src/gui/menu_general.cpp | 4 ++--
 radio/src/opentx.cpp           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/radio/src/gui/menu_general.cpp b/radio/src/gui/menu_general.cpp
index 7dec9d6c8..28656db26 100644
--- a/radio/src/gui/menu_general.cpp
+++ b/radio/src/gui/menu_general.cpp
@@ -1284,7 +1284,7 @@ void menuGeneralHardware(uint8_t event)
 }
 #endif
 
-#define XPOT_DELTA 7
+#define XPOT_DELTA 5
 
 void menuCommonCalib(uint8_t event)
 {
@@ -1305,7 +1305,7 @@ void menuCommonCalib(uint8_t event)
         else {
           if (reusableBuffer.calib.xpotsCalib[idx].lastCount < 255) reusableBuffer.calib.xpotsCalib[idx].lastCount++;
         }
-        if (reusableBuffer.calib.xpotsCalib[idx].lastCount == 20/*200ms*/) {
+        if (reusableBuffer.calib.xpotsCalib[idx].lastCount == 10/*100ms*/) {
           int16_t position = reusableBuffer.calib.xpotsCalib[idx].lastPosition;
           bool found = false;
           for (int j=0; j<count; j++) {
diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp
index 515f2d6ae..5a33763be 100644
--- a/radio/src/opentx.cpp
+++ b/radio/src/opentx.cpp
@@ -2519,7 +2519,7 @@ void getADC()
 #if defined(PCBTARANIS)
     if (s_noScroll) v = temp[x] >> 1;
     StepsCalibData * calib = (StepsCalibData *) &g_eeGeneral.calib[x];
-    if (IS_MULTIPOS_POT(x) && calib->count>0 && calib->count<POTS_POS_COUNT) {
+    if (!s_noScroll && IS_MULTIPOS_POT(x) && calib->count>0 && calib->count<POTS_POS_COUNT) {
       uint8_t vShifted = (v >> 4);
       s_anaFilt[x] = 2*RESX;
       for (int i=0; i<calib->count; i++) {