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

[Horus] Refactoring continued

Browse source
This commit is contained in:
Bertrand Songis 2015-10-24 11:27:34 +02:00
parent fb371cf5b7
commit ab0272c16c
116 changed files with 1042 additions and 1269 deletions
Download patch file Download diff file Expand all files Collapse all files

16
radio/src/simu.cpp
View file

@ -269,9 +269,9 @@ void Open9xSim::updateKeysAndSwitches(bool start)
KEY_Left, KEY_LEFT,
KEY_Up, KEY_UP,
KEY_Down, KEY_DOWN,
#endif
#if defined(ROTARY_ENCODER_NAVIGATION)
KEY_F, BTN_REa,
#endif
#endif
};
@ -369,15 +369,23 @@ long Open9xSim::onTimeout(FXObject*, FXSelector, void*)
#endif
updateKeysAndSwitches();
#if defined(PCBHORUS)
extern rotenc_t rotencValue;
#define ROTENC_VALUE rotencValue
#else
#define ROTENC_VALUE g_rotenc[0]
#endif
#if defined(ROTARY_ENCODER_NAVIGATION)
#if defined(ROTARY_ENCODER_NAVIGATION) || defined(PCBHORUS)
extern rotenc_t rotencValue;
static bool rotencAction = false;
if (getApp()->getKeyState(KEY_G)) {
if (!rotencAction) g_rotenc[0] += ROTARY_ENCODER_GRANULARITY;
if (!rotencAction) ROTENC_VALUE += ROTARY_ENCODER_GRANULARITY;
rotencAction = true;
}
else if (getApp()->getKeyState(KEY_D)) {
if (!rotencAction) g_rotenc[0] -= ROTARY_ENCODER_GRANULARITY;
if (!rotencAction) ROTENC_VALUE -= ROTARY_ENCODER_GRANULARITY;
rotencAction = true;
}
else {