From fac0e5df5e18faf6c92a06efea175ff32169ab64 Mon Sep 17 00:00:00 2001
From: "bernet.andre@gmail.com"
 <bernet.andre@gmail.com@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Tue, 5 Mar 2013 15:42:10 +0000
Subject: [PATCH] [X9D] Autoswitch fixed

---
 src/menus.cpp  | 7 +++++++
 src/open9x.cpp | 2 +-
 src/open9x.h   | 1 -
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/menus.cpp b/src/menus.cpp
index aaaeef4d0..50c206bea 100644
--- a/src/menus.cpp
+++ b/src/menus.cpp
@@ -145,10 +145,17 @@ int16_t checkIncDec(uint8_t event, int16_t val, int16_t i_min, int16_t i_max, ui
     if (s_editMode>0) {
       int8_t swtch = getMovedSwitch();
       if (swtch) {
+#if defined(PCBX9D)
+        if(swtch == SWSRC_SH2)
+          newval = (newval == SWSRC_SH2 ? SWSRC_SH0 : SWSRC_SH2);
+        else if(swtch != SWSRC_SH0)
+          newval = swtch;
+#else
         if (IS_MOMENTARY(newval) && IS_MOMENTARY(swtch))
           newval = -newval;
         else
           newval = swtch;
+#endif
       }
     }
 
diff --git a/src/open9x.cpp b/src/open9x.cpp
index 5f7eaee97..12bd7fd06 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -972,7 +972,7 @@ int8_t getMovedSwitch()
       else if (i==6)
         result = 1+(3*5)+2+next;
       else
-        result = 1+(3*5)+2+3+next;
+        result = 1+(3*5)+2+3+(next!=0);
     }
   }
 #else
diff --git a/src/open9x.h b/src/open9x.h
index f23931837..628cabd59 100644
--- a/src/open9x.h
+++ b/src/open9x.h
@@ -316,7 +316,6 @@ enum EnumKeys {
 #if defined(PCBX9D)
   #define NUM_SWITCHES  8
   #define IS_3POS(sw)   ((sw) != 5 && (sw) != 7)
-  #define IS_MOMENTARY(sw) (sw == SWSRC_SH0)
   #define MAX_PSWITCH   (SW_SH2-SW_SA0+1)
   #define NUM_POTS      4
   #define NUM_SW_SRCRAW 8