Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-14 20:10:08 +03:00
Code Issues Wiki Activity

Some more assert to break the simu a little bit more in case of array overflow

Browse source
This commit is contained in:
Bertrand Songis 2019-06-25 15:18:12 +02:00
parent 2b61d609ba
commit 03a0ebd9f7
No known key found for this signature in database
GPG key ID: F189F79290FEC50F
2 changed files with 10 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

8
radio/src/simu.cpp
View file

@ -232,7 +232,7 @@ void OpenTxSim::doEvents()
long OpenTxSim::onKeypress(FXObject *, FXSelector, void * v) long OpenTxSim::onKeypress(FXObject *, FXSelector, void * v)
{ {
FXEvent *evt = (FXEvent *)v; auto * evt = (FXEvent *)v;
// TRACE("keypress %x", evt->code); // TRACE("keypress %x", evt->code);
@ -245,7 +245,7 @@ long OpenTxSim::onKeypress(FXObject *, FXSelector, void * v)
void OpenTxSim::updateKeysAndSwitches(bool start) void OpenTxSim::updateKeysAndSwitches(bool start)
{ {
static int keys1[] = { static int keys[] = {
#if defined(PCBHORUS) #if defined(PCBHORUS)
KEY_Page_Up, KEY_PGUP, KEY_Page_Up, KEY_PGUP,
KEY_Page_Down, KEY_PGDN, KEY_Page_Down, KEY_PGDN,
@ -283,8 +283,8 @@ void OpenTxSim::updateKeysAndSwitches(bool start)
#endif #endif
}; };
for (unsigned int i=0; i<DIM(keys1); i+=2) { for (unsigned int i=0; i<DIM(keys); i+=2) {
simuSetKey(keys1[i+1], start ? false : getApp()->getKeyState(keys1[i])); simuSetKey(keys[i+1], start ? false : getApp()->getKeyState(keys[i]));
} }
#ifdef __APPLE__ #ifdef __APPLE__

7
radio/src/targets/simu/simpgmspace.cpp
View file

@ -142,12 +142,16 @@ void simuInit()
bool keysStates[NUM_KEYS] = { false }; bool keysStates[NUM_KEYS] = { false };
void simuSetKey(uint8_t key, bool state) void simuSetKey(uint8_t key, bool state)
{ {
// TRACE("simuSetKey(%d, %d)", key, state);
assert(key < DIM(keysStates));
keysStates[key] = state; keysStates[key] = state;
} }
bool trimsStates[NUM_TRIMS*2] = { false }; bool trimsStates[NUM_TRIMS * 2] = { false };
void simuSetTrim(uint8_t trim, bool state) void simuSetTrim(uint8_t trim, bool state)
{ {
// TRACE("simuSetTrim(%d, %d)", trim, state);
assert(trim < DIM(trimsStates));
trimsStates[trim] = state; trimsStates[trim] = state;
} }
@ -155,6 +159,7 @@ int8_t switchesStates[NUM_SWITCHES] = { -1 };
void simuSetSwitch(uint8_t swtch, int8_t state) void simuSetSwitch(uint8_t swtch, int8_t state)
{ {
// TRACE("simuSetSwitch(%d, %d)", swtch, state); // TRACE("simuSetSwitch(%d, %d)", swtch, state);
assert(swtch < DIM(switchesStates));
switchesStates[swtch] = state; switchesStates[swtch] = state;
} }