Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-15 04:15:26 +03:00
Code Issues Wiki Activity

Attempt at getting the simu interface usable with the extra trims

Browse source
This commit is contained in:
Andre Bernet 2016-04-02 17:03:24 +04:00
parent 1f6a711d24
commit d207a600e8
5 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
companion/src/eeprominterface.h
View file

@ -135,7 +135,11 @@ enum FailsafeModes {
#define TRIM_RV_UP 5 #define TRIM_RV_UP 5
#define TRIM_RH_L 6 #define TRIM_RH_L 6
#define TRIM_RH_R 7 #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 // Beep center bits
#define BC_BIT_RUD (0x01) #define BC_BIT_RUD (0x01)

7
companion/src/simulation/simulatordialoghorus.cpp
View file

@ -141,7 +141,12 @@ void SimulatorDialogHorus::getValues()
trimPressed == TRIM_RV_DN, trimPressed == TRIM_RV_DN,
trimPressed == TRIM_RV_UP, trimPressed == TRIM_RV_UP,
trimPressed == TRIM_RH_L, 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*/
} }
}; };

2
companion/src/simulation/simulatorimport.h
View file

@ -37,7 +37,7 @@ for (int i=0; i<C9X_NUM_SWITCHES; i++)
simuSetSwitch(i, inputs.switches[i]); simuSetSwitch(i, inputs.switches[i]);
for (int i=0; i<C9X_NUM_KEYS; i++) for (int i=0; i<C9X_NUM_KEYS; i++)
simuSetKey(i, inputs.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]); simuSetTrim(i, inputs.trims[i]);
#ifdef PCBGRUVIN9X #ifdef PCBGRUVIN9X

2
companion/src/simulation/simulatorinterface.h
View file

@ -39,7 +39,7 @@ struct TxInputs
int switches[C9X_NUM_SWITCHES]; int switches[C9X_NUM_SWITCHES];
bool keys[C9X_NUM_KEYS]; bool keys[C9X_NUM_KEYS];
bool rotenc; bool rotenc;
bool trims[8]; bool trims[12];
}; };
class TxOutputs class TxOutputs

2
radio/src/simu.cpp
View file

@ -266,7 +266,7 @@ void Open9xSim::updateKeysAndSwitches(bool start)
// order of trim sliders // 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 }; static FXuint trimKeys[] = { KEY_E, KEY_R, KEY_U, KEY_I, KEY_R, KEY_E, KEY_Y, KEY_T, KEY_Q, KEY_W };
#else #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 #endif
for (unsigned i=0; i<DIM(trimKeys); i++) { for (unsigned i=0; i<DIM(trimKeys); i++) {