From c07e0a7f2fd831f58eab8547eac41de128fe776e Mon Sep 17 00:00:00 2001
From: "bernet.andre@gmail.com"
 <bernet.andre@gmail.com@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Tue, 8 Jan 2013 18:54:10 +0000
Subject: [PATCH] [X9D] Pot directions harmonized, slider display matched,
 prompts adapted to key labels

---
 src/main_views.cpp    |  7 ++++---
 src/open9x.cpp        |  6 +++---
 src/translations/en.h | 14 +++++++++++++-
 3 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/main_views.cpp b/src/main_views.cpp
index 7d9dd5ce4..865c4126d 100644
--- a/src/main_views.cpp
+++ b/src/main_views.cpp
@@ -162,11 +162,12 @@ void displayTrims(uint8_t phase)
 void displaySliders()
 {
   for (uint8_t i=NUM_STICKS; i<NUM_STICKS+NUM_POTS; i++) {
-    xcoord_t x = (i>NUM_STICKS+1 ? DISPLAY_W-5 : 3);
-    int8_t y = (i%2 ? DISPLAY_H/2+1 : 1);
+    xcoord_t x = (i%2 ? DISPLAY_W-5 : 3);
+    int8_t y = (i>NUM_STICKS+1 ? DISPLAY_H/2+1 : 1);
     lcd_vline(x, y, DISPLAY_H/2-2);
     lcd_vline(x+1, y, DISPLAY_H/2-2);
-    y += ((calibratedStick[i]+RESX)*(DISPLAY_H/2-4)/(RESX*2));  // calculate once per loop
+    y += DISPLAY_H/2-4;
+    y -= ((calibratedStick[i]+RESX)*(DISPLAY_H/2-4)/(RESX*2));  // calculate once per loop
     lcd_vline(x-1, y, 2);
     lcd_vline(x+2, y, 2);
   }
diff --git a/src/open9x.cpp b/src/open9x.cpp
index ea2ba4180..56b8b9744 100644
--- a/src/open9x.cpp
+++ b/src/open9x.cpp
@@ -1547,9 +1547,9 @@ int16_t thrAnaIn(uint8_t chan)
 uint16_t anaIn(uint8_t chan)
 {
 #if defined(PCBX9D)
-  // crossAna[]={LH,LV,RH,RV,S1,LS,S2,RS,BAT 
+  // crossAna[]={LH,LV,RH,RV,S1,S2,LS,RS,BAT 
   // s_anaFilt[]={LH,LV,RH,RV,S1,S2,LS,RS,_BAT
-  static const uint8_t crossAna[]={0,1,2,3,4,6,5,7,8};
+  static const uint8_t crossAna[]={0,1,2,3,4,5,6,7,8};
 #elif defined(PCBSKY9X) && !defined(REVA)
   static const uint8_t crossAna[]={1,5,7,0,4,6,2,3};
   if (chan == TX_CURRENT) {
@@ -1772,7 +1772,7 @@ BeepANACenter evalSticks(uint8_t mode)
     if(v >  RESX) v =  RESX;
     	
  #if defined(PCBX9D)
-    if(i == 2 || i == 3 || i == 6 || i == 7)
+    if(i == 2 || i == 3 || i == 4 || i == 6)
     	v = -v;
  #endif
 
diff --git a/src/translations/en.h b/src/translations/en.h
index a99302734..32b1ed618 100644
--- a/src/translations/en.h
+++ b/src/translations/en.h
@@ -206,7 +206,7 @@
 
 #define LEN_VSRCRAW      "\004"
 #if defined(PCBX9D)
-#define TR_POTS_VSRCRAW  "S1\0 ""S2\0 ""S3\0 ""S4\0 "
+#define TR_POTS_VSRCRAW  "S1\0 ""S2\0 ""LS\0 ""RS\0 "
 #define TR_SW_VSRCRAW    "SA\0 ""SB\0 ""SC\0 ""SD\0 ""SE\0 ""SF\0 ""SG\0 ""SH\0 "
 #else
 #define TR_POTS_VSRCRAW  "P1\0 ""P2\0 ""P3\0 "
@@ -241,9 +241,17 @@
 #define LEN_INDENT             1
 #define INDENT_WIDTH           (FW/2)
 
+#if defined(PCBX9D)
+#define TR_POPUPS              "[ENTER]\010[EXIT]"
+#else
 #define TR_POPUPS              "[MENU]\010[EXIT]"
+#endif
 #define OFS_EXIT               7
+#if defined(PCBX9D)
+#define TR_MENUWHENDONE        CENTER"\006[ENTER] WHEN DONE"
+#else
 #define TR_MENUWHENDONE        CENTER"\006[MENU] WHEN DONE"
+#endif
 #define TR_FREE                "free"
 #define TR_DELETEMODEL         "DELETE MODEL"
 #define TR_COPYINGMODEL        "Copying model..."
@@ -335,7 +343,11 @@
 #define TR_CAL                 "Cal"
 #define TR_VTRIM               "Trim- +"
 #define TR_BG                  "BG:"
+#if defined(PCBX9D)
+#define TR_MENUTOSTART         CENTER"\006[ENTER] TO START"
+#else
 #define TR_MENUTOSTART         CENTER"\006[MENU] TO START"
+#endif
 #define TR_SETMIDPOINT         CENTER"SET MIDPOINT"
 #define TR_MOVESTICKSPOTS      CENTER"MOVE STICKS/POTS"
 #define TR_RXBATT              "Rx Batt:"