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

CFN alignments #584

Browse source 
costs 28B :(
This commit is contained in:
mhotar 2014-01-25 01:43:19 +01:00
parent b66fafbec3
commit 1d0ebe5642
1 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
radio/src/gui/menu_model.cpp
View file

@ -4735,12 +4735,9 @@ void menuModelCustomFunctions(uint8_t event)
uint8_t func_displayed; uint8_t func_displayed;
if (CFN_FUNC(sd) < FUNC_TRAINER) { if (CFN_FUNC(sd) < FUNC_TRAINER) {
func_displayed = 0; func_displayed = 0;
putsChn(MODEL_CUSTOM_FUNC_2ND_COLUMN+6*FW, y, CFN_CH_NUMBER(sd)+1, attr);
} }
else if (CFN_FUNC(sd) <= FUNC_TRAINER + NUM_STICKS) { else if (CFN_FUNC(sd) <= FUNC_TRAINER + NUM_STICKS) {
func_displayed = 1; func_displayed = 1;
if (CFN_FUNC(sd) != FUNC_TRAINER)
putsMixerSource(MODEL_CUSTOM_FUNC_2ND_COLUMN+7*FW, y, MIXSRC_Rud+CFN_FUNC(sd)-FUNC_TRAINER-1, attr);
} }
#if defined(DEBUG) #if defined(DEBUG)
else if (CFN_FUNC(sd) == FUNC_TEST) { else if (CFN_FUNC(sd) == FUNC_TEST) {
@ -4754,13 +4751,26 @@ void menuModelCustomFunctions(uint8_t event)
#if defined(GVARS) #if defined(GVARS)
else if (CFN_FUNC(sd) >= FUNC_ADJUST_GV1) { else if (CFN_FUNC(sd) >= FUNC_ADJUST_GV1) {
func_displayed = FUNC_ADJUST_GV1 - FUNC_TRAINER - NUM_STICKS + 1; func_displayed = FUNC_ADJUST_GV1 - FUNC_TRAINER - NUM_STICKS + 1;
putsStrIdx(MODEL_CUSTOM_FUNC_2ND_COLUMN+7*FW, y, STR_GV, CFN_FUNC(sd)-FUNC_ADJUST_GV1+1, attr);
} }
#endif #endif
else { else {
func_displayed = 2 + CFN_FUNC(sd) - FUNC_TRAINER - NUM_STICKS - 1; func_displayed = 2 + CFN_FUNC(sd) - FUNC_TRAINER - NUM_STICKS - 1;
} }
lcd_putsiAtt(MODEL_CUSTOM_FUNC_2ND_COLUMN, y, STR_VFSWFUNC, func_displayed, attr); lcd_putsiAtt(MODEL_CUSTOM_FUNC_2ND_COLUMN, y, STR_VFSWFUNC, func_displayed, attr);
if (CFN_FUNC(sd) < FUNC_TRAINER) {
putsChn(lcdNextPos, y, CFN_CH_NUMBER(sd)+1, attr);
}
else if (CFN_FUNC(sd) <= FUNC_TRAINER + NUM_STICKS) {
if (CFN_FUNC(sd) != FUNC_TRAINER)
putsMixerSource(lcdNextPos, y, MIXSRC_Rud+CFN_FUNC(sd)-FUNC_TRAINER-1, attr);
}
#if defined(GVARS)
else if (CFN_FUNC(sd) >= FUNC_ADJUST_GV1) {
putsStrIdx(lcdNextPos, y, STR_GV, CFN_FUNC(sd)-FUNC_ADJUST_GV1+1, attr);
}
#endif
if (active) { if (active) {
#if defined(CPUARM) #if defined(CPUARM)
CHECK_INCDEC_MODELVAR_ZERO(event, CFN_FUNC(sd), FUNC_MAX-1); CHECK_INCDEC_MODELVAR_ZERO(event, CFN_FUNC(sd), FUNC_MAX-1);