From d207a600e8f68a780c56ca274a016bb803a470fb Mon Sep 17 00:00:00 2001
From: Andre Bernet <andre@andrebernet.ch>
Date: Sat, 2 Apr 2016 17:03:24 +0400
Subject: [PATCH] Attempt at getting the simu interface usable with the extra
 trims

---
 companion/src/eeprominterface.h                   | 6 +++++-
 companion/src/simulation/simulatordialoghorus.cpp | 7 ++++++-
 companion/src/simulation/simulatorimport.h        | 2 +-
 companion/src/simulation/simulatorinterface.h     | 2 +-
 radio/src/simu.cpp                                | 2 +-
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h
index da8862c87..f7d8f9a1b 100644
--- a/companion/src/eeprominterface.h
+++ b/companion/src/eeprominterface.h
@@ -135,7 +135,11 @@ enum FailsafeModes {
 #define TRIM_RV_UP 5
 #define TRIM_RH_L  6
 #define TRIM_RH_R  7
-#define TRIM_NONE  8
+#define TRIM_T5_DN 8
+#define TRIM_T5_UP 9
+#define TRIM_T6_DN 10
+#define TRIM_T6_UP 11
+#define TRIM_NONE  12
 
 // Beep center bits
 #define BC_BIT_RUD (0x01)
diff --git a/companion/src/simulation/simulatordialoghorus.cpp b/companion/src/simulation/simulatordialoghorus.cpp
index 9e69e3b59..0345a3c42 100644
--- a/companion/src/simulation/simulatordialoghorus.cpp
+++ b/companion/src/simulation/simulatordialoghorus.cpp
@@ -141,7 +141,12 @@ void SimulatorDialogHorus::getValues()
       trimPressed == TRIM_RV_DN,
       trimPressed == TRIM_RV_UP,
       trimPressed == TRIM_RH_L,
-      trimPressed == TRIM_RH_R
+      trimPressed == TRIM_RH_R,
+      0,0,0,0
+      /*trimPressed == TRIM_T5_DN,
+      trimPressed == TRIM_T5_UP,
+      trimPressed == TRIM_T6_DN,
+      trimPressed == TRIM_T6_UP*/
     }
   };
 
diff --git a/companion/src/simulation/simulatorimport.h b/companion/src/simulation/simulatorimport.h
index 5bf52b265..6278ac70d 100644
--- a/companion/src/simulation/simulatorimport.h
+++ b/companion/src/simulation/simulatorimport.h
@@ -37,7 +37,7 @@ for (int i=0; i<C9X_NUM_SWITCHES; i++)
   simuSetSwitch(i, inputs.switches[i]);
 for (int i=0; i<C9X_NUM_KEYS; i++)
   simuSetKey(i, inputs.keys[i]);
-for (int i=0; i<NUM_STICKS*2; i++)
+for (int i=0; i<(NUM_STICKS+NUM_AUX_TRIMS)*2; i++)
   simuSetTrim(i, inputs.trims[i]);
 
 #ifdef PCBGRUVIN9X
diff --git a/companion/src/simulation/simulatorinterface.h b/companion/src/simulation/simulatorinterface.h
index af7ed710b..1f4adf883 100644
--- a/companion/src/simulation/simulatorinterface.h
+++ b/companion/src/simulation/simulatorinterface.h
@@ -39,7 +39,7 @@ struct TxInputs
     int  switches[C9X_NUM_SWITCHES];
     bool keys[C9X_NUM_KEYS];
     bool rotenc;
-    bool trims[8];
+    bool trims[12];
 };
 
 class TxOutputs
diff --git a/radio/src/simu.cpp b/radio/src/simu.cpp
index c9adee146..76c32baaf 100644
--- a/radio/src/simu.cpp
+++ b/radio/src/simu.cpp
@@ -266,7 +266,7 @@ void Open9xSim::updateKeysAndSwitches(bool start)
   //         order of trim sliders
   static FXuint trimKeys[] = { KEY_E, KEY_R, KEY_U, KEY_I, KEY_R, KEY_E, KEY_Y, KEY_T, KEY_Q, KEY_W };
 #else
-  static FXuint trimKeys[] = { KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, KEY_F8 };
+  static FXuint trimKeys[] = { KEY_F1, KEY_F2, KEY_F3, KEY_F4, KEY_F5, KEY_F6, KEY_F7, KEY_F8, KEY_F9, KEY_F10, KEY_F11, KEY_F12 };
 #endif
 
   for (unsigned i=0; i<DIM(trimKeys); i++) {