From ce028e7fe4939b64c5045bf8b87ffe06baa46026 Mon Sep 17 00:00:00 2001
From: 3djc <lesitewebdejc@hotmail.com>
Date: Tue, 19 Jan 2021 08:50:10 +0100
Subject: [PATCH] Apply to all targets

---
 radio/src/gui/navigation/navigation_9x.cpp    | 2 +-
 radio/src/gui/navigation/navigation_x7.cpp    | 2 +-
 radio/src/gui/navigation/navigation_x9d.cpp   | 2 +-
 radio/src/gui/navigation/navigation_xlite.cpp | 2 +-
 radio/src/opentx.h                            | 2 ++
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/radio/src/gui/navigation/navigation_9x.cpp b/radio/src/gui/navigation/navigation_9x.cpp
index bbc958c63..db9b34d4e 100644
--- a/radio/src/gui/navigation/navigation_9x.cpp
+++ b/radio/src/gui/navigation/navigation_9x.cpp
@@ -136,7 +136,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, unsigned int i_fla
 #if defined(AUTOSWITCH)
       else {
         uint8_t swtch = abs(getMovedSwitch());
-        if (swtch) {
+        if (swtch && !IS_SWITCH_MULTPOS(swtch)) {
           newval = switchToMix(swtch);
         }
       }
diff --git a/radio/src/gui/navigation/navigation_x7.cpp b/radio/src/gui/navigation/navigation_x7.cpp
index 7e4255dac..3d58c619b 100644
--- a/radio/src/gui/navigation/navigation_x7.cpp
+++ b/radio/src/gui/navigation/navigation_x7.cpp
@@ -106,7 +106,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, unsigned int i_fla
 #if defined(AUTOSWITCH)
       else {
         unsigned int swtch = abs(getMovedSwitch());
-        if (swtch) {
+        if (swtch && !IS_SWITCH_MULTPOS(swtch)) {
           newval = switchToMix(swtch);
         }
       }
diff --git a/radio/src/gui/navigation/navigation_x9d.cpp b/radio/src/gui/navigation/navigation_x9d.cpp
index a5d6fc332..e0a7a9dae 100644
--- a/radio/src/gui/navigation/navigation_x9d.cpp
+++ b/radio/src/gui/navigation/navigation_x9d.cpp
@@ -173,7 +173,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, unsigned int i_fla
 #if defined(AUTOSWITCH)
       else {
         unsigned int swtch = abs(getMovedSwitch());
-        if (swtch) {
+        if (swtch && !IS_SWITCH_MULTPOS(swtch)) {
           newval = switchToMix(swtch);
         }
       }
diff --git a/radio/src/gui/navigation/navigation_xlite.cpp b/radio/src/gui/navigation/navigation_xlite.cpp
index 9cbafda8b..4a914a1d3 100644
--- a/radio/src/gui/navigation/navigation_xlite.cpp
+++ b/radio/src/gui/navigation/navigation_xlite.cpp
@@ -166,7 +166,7 @@ int checkIncDec(event_t event, int val, int i_min, int i_max, unsigned int i_fla
 #if defined(AUTOSWITCH)
       else {
         uint8_t swtch = abs(getMovedSwitch());
-        if (swtch) {
+        if (swtch && !IS_SWITCH_MULTPOS(swtch)) {
           newval = switchToMix(swtch);
         }
       }
diff --git a/radio/src/opentx.h b/radio/src/opentx.h
index ffabdc9b7..ed4a42d43 100644
--- a/radio/src/opentx.h
+++ b/radio/src/opentx.h
@@ -276,11 +276,13 @@ void memswap(void * a, void * b, uint8_t size);
   #define IS_POT_AVAILABLE(x)          (IS_POT(x) && POT_CONFIG(x)!=POT_NONE)
   #define IS_POT_SLIDER_AVAILABLE(x)   (IS_POT_AVAILABLE(x))
   #define IS_MULTIPOS_CALIBRATED(cal)  (cal->count>0 && cal->count<XPOTS_MULTIPOS_COUNT)
+  #define IS_SWITCH_MULTPOS(x)         (SWSRC_FIRST_MULTIPOS_SWITCH <= (x) && (x) <= SWSRC_LAST_MULTIPOS_SWITCH)
 #else
   #define IS_POT_MULTIPOS(x)           (false)
   #define IS_POT_WITHOUT_DETENT(x)     (true)
   #define IS_POT_SLIDER_AVAILABLE(x)   (true)
   #define IS_MULTIPOS_CALIBRATED(cal)  (false)
+  #define IS_SWITCH_MULTPOS(x)         (false)
 #endif
 
 #if defined(PWR_BUTTON_PRESS)