From 3f21e6c1a491a8fa61e9c18140c8d9f5fb3c5833 Mon Sep 17 00:00:00 2001
From: "bernet.andre@gmail.com"
 <bernet.andre@gmail.com@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Sun, 6 Jan 2013 22:56:39 +0000
Subject: [PATCH] [X9D] Switches now match case labels, home screen display
 still to adjust

---
 src/open9x.cpp          |  4 +--
 src/open9x.h            |  2 +-
 src/translations/en.h   |  2 +-
 src/x9d/hal.h           | 28 ++++++++++-----------
 src/x9d/keys_driver.cpp | 56 ++++++++++++++++++++---------------------
 src/x9d/pwr_driver.cpp  |  1 -
 6 files changed, 46 insertions(+), 47 deletions(-)

diff --git a/src/open9x.cpp b/src/open9x.cpp
index 076d441a1..bcb6e09e1 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -639,12 +639,12 @@ int16_t getValue(uint8_t i)
   else if(i<MIXSRC_TrimAil) return calc1000toRESX((int16_t)8 * getTrimValue(s_perout_flight_phase, i-(NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS)));
   else if(i<MIXSRC_MAX) return 1024;
 #if defined(PCBX9D) || defined(PCBACT)
-  else if(i<MIXSRC_SA) return (keyState(SW_SA0) ? -1024 : 1024);
+  else if(i<MIXSRC_SA) return (keyState(SW_SA0) ? -1024 : (keyState(SW_SA1) ? 0 : 1024));  
   else if(i<MIXSRC_SB) return (keyState(SW_SB0) ? -1024 : (keyState(SW_SB1) ? 0 : 1024));
   else if(i<MIXSRC_SC) return (keyState(SW_SC0) ? -1024 : (keyState(SW_SC1) ? 0 : 1024));
   else if(i<MIXSRC_SD) return (keyState(SW_SD0) ? -1024 : (keyState(SW_SD1) ? 0 : 1024));
   else if(i<MIXSRC_SE) return (keyState(SW_SE0) ? -1024 : (keyState(SW_SE1) ? 0 : 1024));
-  else if(i<MIXSRC_SF) return (keyState(SW_SF0) ? -1024 : (keyState(SW_SF1) ? 0 : 1024));
+  else if(i<MIXSRC_SF) return (keyState(SW_SF0) ? -1024 : 1024);
   else if(i<MIXSRC_SG) return (keyState(SW_SG0) ? -1024 : (keyState(SW_SG1) ? 0 : 1024));
   else if(i<MIXSRC_SH) return (keyState(SW_SH0) ? -1024 : 1024);
 #else
diff --git a/src/open9x.h b/src/open9x.h
index 7372b349f..b5a3a1f76 100644
--- a/src/open9x.h
+++ b/src/open9x.h
@@ -487,6 +487,7 @@ enum EnumKeys {
   //SW_ON,
 #if defined(PCBX9D) || defined(PCBACT)
   SW_SA0=SW_BASE,
+  SW_SA1,
   SW_SA2,
   SW_SB0,
   SW_SB1,
@@ -501,7 +502,6 @@ enum EnumKeys {
   SW_SE1,
   SW_SE2,
   SW_SF0,
-  SW_SF1,
   SW_SF2,
   SW_SG0,
   SW_SG1,
diff --git a/src/translations/en.h b/src/translations/en.h
index 5707591f5..a99302734 100644
--- a/src/translations/en.h
+++ b/src/translations/en.h
@@ -197,7 +197,7 @@
 
 #define LEN_VSWITCHES    "\003"
 #if defined(PCBX9D)
-#define TR_VSWITCHES     "SA\300""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF-""SF\301""SG\300""SG-""SG\301""SH\300""SH\301""CS1""CS2""CS3""CS4""CS5""CS6""CS7""CS8""CS9""CSA""CSB""CSC""CSD""CSE""CSF""CSG""CSH""CSI""CSJ""CSK""CSL""CSM""CSN""CSO""CSP""CSQ""CSR""CSS""CST""CSU""CSV""CSW"" ON"
+#define TR_VSWITCHES     "SA\300""SA-""SA\301""SB\300""SB-""SB\301""SC\300""SC-""SC\301""SD\300""SD-""SD\301""SE\300""SE-""SE\301""SF\300""SF\301""SG\300""SG-""SG\301""SH\300""SH\301""CS1""CS2""CS3""CS4""CS5""CS6""CS7""CS8""CS9""CSA""CSB""CSC""CSD""CSE""CSF""CSG""CSH""CSI""CSJ""CSK""CSL""CSM""CSN""CSO""CSP""CSQ""CSR""CSS""CST""CSU""CSV""CSW"" ON"
 #elif defined(PCBSKY9X)
 #define TR_VSWITCHES     "THR""RUD""ELE""ID0""ID1""ID2""AIL""GEA""TRN""CS1""CS2""CS3""CS4""CS5""CS6""CS7""CS8""CS9""CSA""CSB""CSC""CSD""CSE""CSF""CSG""CSH""CSI""CSJ""CSK""CSL""CSM""CSN""CSO""CSP""CSQ""CSR""CSS""CST""CSU""CSV""CSW"" ON"
 #else
diff --git a/src/x9d/hal.h b/src/x9d/hal.h
index 8bd9db216..38037eace 100644
--- a/src/x9d/hal.h
+++ b/src/x9d/hal.h
@@ -26,20 +26,20 @@
 #define PIN_TRIM4_DN                    GPIO_Pin_5      //PE.05
 
 // Switchs
-#define	PIN_SW_A_L		        GPIO_Pin_14	//PE.14
-#define	PIN_SW_B_H		        GPIO_Pin_3	//PB.03
-#define	PIN_SW_B_L		        GPIO_Pin_4	//PB.04
-#define	PIN_SW_C_H		        GPIO_Pin_5	//PB.05
-#define	PIN_SW_C_L		        GPIO_Pin_6	//PB.06
-#define	PIN_SW_D_H		        GPIO_Pin_7	//PB.07
-#define	PIN_SW_D_L		        GPIO_Pin_2	//PE.02
-#define	PIN_SW_E_H		        GPIO_Pin_0	//PB.00
-#define	PIN_SW_E_L		        GPIO_Pin_5	//PA.05
-#define	PIN_SW_F_H		        GPIO_Pin_7	//PE.07
-#define	PIN_SW_F_L		        GPIO_Pin_1	//PB.01
-#define	PIN_SW_G_H		        GPIO_Pin_9	//PE.09
-#define	PIN_SW_G_L		        GPIO_Pin_8	//PE.08
-#define	PIN_SW_H_L		        GPIO_Pin_13	//PE.13
+#define	PIN_SW_F		          GPIO_Pin_14	//PE.14
+#define	PIN_SW_E_L		        GPIO_Pin_3	//PB.03
+#define	PIN_SW_E_H		        GPIO_Pin_4	//PB.04
+#define	PIN_SW_B_H		        GPIO_Pin_5	//PB.05
+#define	PIN_SW_B_L		        GPIO_Pin_6	//PB.06
+#define	PIN_SW_A_H		        GPIO_Pin_7	//PB.07
+#define	PIN_SW_A_L		        GPIO_Pin_2	//PE.02
+#define	PIN_SW_G_L		        GPIO_Pin_0	//PB.00
+#define	PIN_SW_G_H		        GPIO_Pin_5	//PA.05
+#define	PIN_SW_C_L		        GPIO_Pin_7	//PE.07
+#define	PIN_SW_C_H		        GPIO_Pin_1	//PB.01
+#define	PIN_SW_D_H		        GPIO_Pin_9	//PE.09
+#define	PIN_SW_D_L		        GPIO_Pin_8	//PE.08
+#define	PIN_SW_H		          GPIO_Pin_13	//PE.13
 
 // ADC
 #define PIN_STK_J1                      GPIO_Pin_0  //PA.00              
diff --git a/src/x9d/keys_driver.cpp b/src/x9d/keys_driver.cpp
index 0b7ea21d8..2606de6c0 100644
--- a/src/x9d/keys_driver.cpp
+++ b/src/x9d/keys_driver.cpp
@@ -124,77 +124,77 @@ uint32_t keyState(EnumKeys enuk)
 
   switch ((uint8_t) enuk) {
     case SW_SA0:
-      xxx = ~e & PIN_SW_A_L;
+      xxx = (~b & PIN_SW_A_H) && (b & PIN_SW_A_L);
+      break;
+    case SW_SA1:
+      xxx = (b & PIN_SW_A_H) && (b & PIN_SW_A_L);
       break;
     case SW_SA2:
-      xxx = e & PIN_SW_A_L;
+      xxx = (b & PIN_SW_A_H) && (~b & PIN_SW_A_L);
       break;
 
     case SW_SB0:
-      xxx = !(b & (PIN_SW_B_L | PIN_SW_B_H));
+      xxx = (~b & PIN_SW_B_H) && (b & PIN_SW_B_L);
       break;
     case SW_SB1:
-      xxx = (b & PIN_SW_B_H) && (~b & PIN_SW_B_L);
+      xxx = (b & PIN_SW_B_H) && (b & PIN_SW_B_L);
       break;
     case SW_SB2:
-      xxx = (~b & PIN_SW_B_H) && (b & PIN_SW_B_L);
+      xxx = (b & PIN_SW_B_H) && (~b & PIN_SW_B_L);
       break;
 
     case SW_SC0:
-      xxx = !(b & (PIN_SW_C_L | PIN_SW_C_H));
+      xxx = (~b & PIN_SW_C_H) && (e & PIN_SW_C_L);
       break;
     case SW_SC1:
-      xxx = (b & PIN_SW_C_H) && (~b & PIN_SW_C_L);
+      xxx = (b & PIN_SW_C_H) && (e & PIN_SW_C_L);
       break;
     case SW_SC2:
-      xxx = (~b & PIN_SW_C_H) && (b & PIN_SW_C_L);
+      xxx = (b & PIN_SW_C_H) && (~e & PIN_SW_C_L);
       break;
 
     case SW_SD0:
-      xxx = (~e & PIN_SW_D_L) && (~b & PIN_SW_D_H);
+      xxx = (~e & PIN_SW_D_H) && (e & PIN_SW_D_L);
       break;
     case SW_SD1:
-      xxx = (b & PIN_SW_D_H) && (~e & PIN_SW_D_L);
+      xxx = (e & PIN_SW_D_H) && (e & PIN_SW_D_L);
       break;
     case SW_SD2:
-      xxx = (~b & PIN_SW_D_H) && (e & PIN_SW_D_L);
+      xxx = (e & PIN_SW_D_H) && (~e & PIN_SW_D_L);
       break;
 
     case SW_SE0:
-      xxx = (~a & PIN_SW_E_L) && (~b & PIN_SW_E_H);
+      xxx = (~b & PIN_SW_E_H) && (b & PIN_SW_E_L);
       break;
     case SW_SE1:
-      xxx = (b & PIN_SW_E_H) && (~a & PIN_SW_E_L);
+      xxx = (b & PIN_SW_E_H) && (b & PIN_SW_E_L);
       break;
     case SW_SE2:
-      xxx = (~b & PIN_SW_E_H) && (a & PIN_SW_E_L);
+      xxx = (b & PIN_SW_E_H) && (~b & PIN_SW_E_L);
       break;
 
     case SW_SF0:
-      xxx = (~b & PIN_SW_F_L) && (~e & PIN_SW_F_H);
-      break;
-    case SW_SF1:
-      xxx = (e & PIN_SW_F_H) && (~b & PIN_SW_F_L);
+      xxx = ~e & PIN_SW_F;
       break;
     case SW_SF2:
-      xxx = (~e & PIN_SW_F_H) && (b & PIN_SW_F_L);
+      xxx = e & PIN_SW_F;
       break;
 
     case SW_SG0:
-      xxx = !(e & (PIN_SW_G_L | PIN_SW_G_H));
+      xxx = (~a & PIN_SW_G_H) && (b & PIN_SW_G_L);
       break;
     case SW_SG1:
-      xxx = (e & PIN_SW_G_H) && (~e & PIN_SW_G_L);
+      xxx = (a & PIN_SW_G_H) && (b & PIN_SW_G_L);
       break;
     case SW_SG2:
-      xxx = (~e & PIN_SW_G_H) && (e & PIN_SW_G_L);
+      xxx = (a & PIN_SW_G_H) && (~b & PIN_SW_G_L);
       break;
 
     case SW_SH0:
-      xxx = ~e & PIN_SW_H_L;
+      xxx = ~e & PIN_SW_H;
       break;
     case SW_SH2:
-      xxx = e & PIN_SW_H_L;
+      xxx = e & PIN_SW_H;
       break;
 
     default:
@@ -217,8 +217,8 @@ void keysInit()
 
     /* GPIO  Configuration*/
     GPIO_InitStructure.GPIO_Pin = PIN_BUTTON_PLUS | PIN_BUTTON_ENTER | PIN_BUTTON_MINUS | PIN_TRIM3_UP | PIN_TRIM3_DN
-                                  | PIN_TRIM4_UP |PIN_TRIM4_DN | PIN_SW_A_L | PIN_SW_D_L | PIN_SW_F_H | PIN_SW_G_H
-                                  | PIN_SW_G_L | PIN_SW_H_L;
+                                  | PIN_TRIM4_UP |PIN_TRIM4_DN | PIN_SW_A_L | PIN_SW_D_L | PIN_SW_F | PIN_SW_C_L
+                                  | PIN_SW_D_H | PIN_SW_H;
     GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;
     GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz;
     GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
@@ -239,14 +239,14 @@ void keysInit()
     GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP ;
     GPIO_Init(GPIOC, &GPIO_InitStructure);
 
-    GPIO_InitStructure.GPIO_Pin = PIN_SW_B_H | PIN_SW_B_L | PIN_SW_C_H | PIN_SW_C_L | PIN_SW_D_H | PIN_SW_E_H | PIN_SW_F_L;
+    GPIO_InitStructure.GPIO_Pin = PIN_SW_B_H | PIN_SW_B_L | PIN_SW_C_H | PIN_SW_E_L | PIN_SW_E_H | PIN_SW_A_H | PIN_SW_G_L;
     GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;
     GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz;
     GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
     GPIO_InitStructure.GPIO_PuPd = GPIO_PuPd_UP ;
     GPIO_Init(GPIOB, &GPIO_InitStructure);
 
-    GPIO_InitStructure.GPIO_Pin = PIN_SW_E_L;
+    GPIO_InitStructure.GPIO_Pin = PIN_SW_G_H;
     GPIO_InitStructure.GPIO_Mode = GPIO_Mode_IN;
     GPIO_InitStructure.GPIO_Speed = GPIO_Speed_100MHz;
     GPIO_InitStructure.GPIO_OType = GPIO_OType_PP;
diff --git a/src/x9d/pwr_driver.cpp b/src/x9d/pwr_driver.cpp
index 15e347fbf..5f9e98ec2 100644
--- a/src/x9d/pwr_driver.cpp
+++ b/src/x9d/pwr_driver.cpp
@@ -40,7 +40,6 @@ void soft_power_off()
 
 uint32_t check_soft_power()
 {
-  // TODO doesn't work :(
   if (GPIO_ReadInputDataBit(GPIOPWR, PIN_PWR_STATUS) == Bit_RESET)
     return e_power_on;
   else