piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Momentary switches should not be bold

Browse Source 
Memory overwrite in function switches (ersky9x)
This commit is contained in:
bsongis
2012-07-03 07:31:39 +00:00
parent 91e2c8222b
commit ed89675f78
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/model_menus.cpp
+1 -1
View File
@@ -2243,7 +2243,7 @@ void menuProcFunctionSwitches(uint8_t event)
uint8_t active = (attr && (s_editMode>0 || p1valdiff));
switch (j) {
case 0:
putsSwitches(3, y, sd->swtch, attr | ((getSwitch(sd->swtch, 0) && (sd->func >= 16 || (FSW_PARAM(sd) & 1))) ? BOLD : 0));
putsSwitches(3, y, sd->swtch, attr | ((abs(sd->swtch) <= MAX_SWITCH && getSwitch(sd->swtch, 0) && (sd->func >= 16 || (FSW_PARAM(sd) & 1))) ? BOLD : 0));
if (active) {
CHECK_INCDEC_MODELSWITCH( event, sd->swtch, SWITCH_OFF-MAX_SWITCH, SWITCH_ON+MAX_SWITCH);
}
src/open9x.cpp
+4 -2
View File
@@ -1701,8 +1701,9 @@ void evalFunctions()
else if (sd->func == FUNC_PLAY_TRACK) {
if (!audioBusy()) {
char lfn[32] = SOUNDS_PATH "/";
strcat(lfn, sd->param);
strcat(lfn, SOUNDS_EXT);
strncpy(lfn+sizeof(SOUNDS_PATH), sd->param, sizeof(sd->param));
lfn[sizeof(SOUNDS_PATH)+sizeof(sd->param)] = '\0';
strcat(lfn+sizeof(SOUNDS_PATH), SOUNDS_EXT);
playFile(lfn);
}
}
@@ -1727,6 +1728,7 @@ void evalFunctions()
#if defined(DEBUG)
if (sd->func == FUNC_TEST) {
printf("%d ", sd->swtch);
testFunc();
}
#endif