From 134cf38617c1687cac81531fd93c79751c9bd4d7 Mon Sep 17 00:00:00 2001
From: Andre Bernet <andre@andrebernet.ch>
Date: Mon, 22 Jun 2015 12:45:11 +0200
Subject: [PATCH] Fix switch conversion issues on radio

---
 radio/src/eeprom_conversions.cpp | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/radio/src/eeprom_conversions.cpp b/radio/src/eeprom_conversions.cpp
index d2e1a7495..6823f1374 100644
--- a/radio/src/eeprom_conversions.cpp
+++ b/radio/src/eeprom_conversions.cpp
@@ -831,10 +831,10 @@ int ConvertSwitch_216_to_217(int swtch)
   if (swtch < 0)
     return -ConvertSwitch_216_to_217(-swtch);
 
-  if (swtch >= SWSRC_SF0)
+  if (swtch > SWSRC_SF0)
     swtch += 1;
 
-  if (swtch >= SWSRC_SH0)
+  if (swtch > SWSRC_SH0)
     swtch += 1;
 
   return swtch;
@@ -998,10 +998,11 @@ void ConvertModel_216_to_217(ModelData &model)
         sw.v2 = ConvertSource_216_to_217((uint8_t)sw.v2);
       }
     }
-    else if (cstate == LS_FAMILY_BOOL) {
+    else if (cstate == LS_FAMILY_BOOL || cstate == LS_FAMILY_STICKY) {
       sw.v1 = ConvertSwitch_216_to_217(sw.v1);
       sw.v2 = ConvertSwitch_216_to_217(sw.v2);
     }
+    sw.andsw = ConvertSwitch_216_to_217(sw.andsw);
   }
   for (int i=0; i<NUM_CFN; i++) {
     CustomFunctionData & fn = newModel.customFn[i];