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

Minor bug fixes

Browse source
This commit is contained in:
bsongis 2012-05-16 09:20:04 +00:00
parent 14f1e30287
commit ad95946378
1 changed files with 14 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

21
src/model_menus.cpp
View file

@ -1471,10 +1471,14 @@ void menuProcMixOne(uint8_t event)
if (attr) CHECK_INFLIGHT_INCDEC_MODELVAR(event, md2->sOffset, -125, 125, 0, STR_MIXEROFFSET); if (attr) CHECK_INFLIGHT_INCDEC_MODELVAR(event, md2->sOffset, -125, 125, 0, STR_MIXEROFFSET);
break; break;
case MIX_FIELD_TRIM: case MIX_FIELD_TRIM:
{
uint8_t not_stick = (md2->srcRaw > NUM_STICKS);
int8_t carryTrim = -md2->carryTrim;
lcd_puts(2*FW, y, STR_TRIM); lcd_puts(2*FW, y, STR_TRIM);
lcd_putsiAtt(FW*10, y, STR_VMIXTRIMS, 1-md2->carryTrim, attr); lcd_putsiAtt(FW*10, y, STR_VMIXTRIMS, (not_stick && carryTrim == 0) ? 0 : carryTrim+1, attr);
if (attr) md2->carryTrim = -checkIncDecModel(event, -(int8_t)md2->carryTrim, -TRIM_OFF, -TRIM_AIL); if (attr) md2->carryTrim = -checkIncDecModel(event, carryTrim, not_stick ? TRIM_ON : -TRIM_OFF, -TRIM_AIL);
break; break;
}
case MIX_FIELD_CURVE: case MIX_FIELD_CURVE:
lcd_puts(2*FW, y, STR_CURVES); lcd_puts(2*FW, y, STR_CURVES);
putsCurve(FW*10, y, md2->curve, attr); putsCurve(FW*10, y, md2->curve, attr);
@ -1846,10 +1850,13 @@ void menuProcLimits(uint8_t event)
// last line available - add the "copy trim menu" line // last line available - add the "copy trim menu" line
uint8_t attr = (sub==NUM_CHNOUT) ? INVERS : 0; uint8_t attr = (sub==NUM_CHNOUT) ? INVERS : 0;
lcd_putsAtt(3*FW, y, STR_TRIMS2OFFSETS, s_noHi ? 0 : attr); lcd_putsAtt(3*FW, y, STR_TRIMS2OFFSETS, s_noHi ? 0 : attr);
if (attr && event==EVT_KEY_LONG(KEY_MENU)) { if (attr) {
s_noHi = NO_HI_LEN; s_editMode = 0;
killEvents(event); if (event==EVT_KEY_LONG(KEY_MENU)) {
moveTrimsToOffsets(); // if highlighted and menu pressed - move trims to offsets s_noHi = NO_HI_LEN;
killEvents(event);
moveTrimsToOffsets(); // if highlighted and menu pressed - move trims to offsets
}
} }
return; return;
} }
@ -2094,7 +2101,7 @@ void menuProcFunctionSwitches(uint8_t event)
uint8_t func_displayed; uint8_t func_displayed;
if (sd->func < 16) { if (sd->func < 16) {
func_displayed = 0; func_displayed = 0;
putsChnRaw(14*FW-2, y, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS+2+3+NUM_PPM+sd->func+1, attr); putsChnRaw(14*FW-2, y, NUM_STICKS+NUM_POTS+NUM_ROTARY_ENCODERS+NUM_STICKS+2+3+NUM_PPM+sd->func+1, attr);
} }
else if (sd->func < 16 + NUM_STICKS + 1) { else if (sd->func < 16 + NUM_STICKS + 1) {
func_displayed = 1; func_displayed = 1;