[Taranis] Flight phase selection in line by line nav - SHOULD not have broken other boards, I just can't test rotenc...
This commit is contained in:
+12
-5
@@ -1306,12 +1306,19 @@ PhasesType editPhases(uint8_t x, uint8_t y, uint8_t event, PhasesType value, uin
|
|||||||
if (expoMenu && ((attr && p < posHorz-4) || (x > EXPO_ONE_2ND_COLUMN+2*FW)))
|
if (expoMenu && ((attr && p < posHorz-4) || (x > EXPO_ONE_2ND_COLUMN+2*FW)))
|
||||||
continue;
|
continue;
|
||||||
#endif
|
#endif
|
||||||
|
#if defined(PCBTARANIS)
|
||||||
|
LcdFlags flags = ((posHorz==p) && attr) ? BLINK|INVERS : ((value & (1<<p)) ? 0 : INVERS);
|
||||||
|
if (m_posHorz<0)
|
||||||
|
flags = BLINK|INVERS;
|
||||||
|
lcd_putcAtt(x, y, '0'+p, flags);
|
||||||
|
#else
|
||||||
lcd_putcAtt(x, y, '0'+p, ((posHorz==p) && attr) ? BLINK|INVERS : ((value & (1<<p)) ? 0 : INVERS));
|
lcd_putcAtt(x, y, '0'+p, ((posHorz==p) && attr) ? BLINK|INVERS : ((value & (1<<p)) ? 0 : INVERS));
|
||||||
|
#endif
|
||||||
x += FW;
|
x += FW;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (attr) {
|
if (attr) {
|
||||||
if ((event==EVT_KEY_BREAK(KEY_ENTER)) || p1valdiff) {
|
if (s_editMode && ((event==EVT_KEY_BREAK(KEY_ENTER) || p1valdiff))) {
|
||||||
s_editMode = 0;
|
s_editMode = 0;
|
||||||
value ^= (1<<posHorz);
|
value ^= (1<<posHorz);
|
||||||
STORE_MODELVARS;
|
STORE_MODELVARS;
|
||||||
@@ -2188,7 +2195,7 @@ void menuModelExpoOne(uint8_t event)
|
|||||||
ExpoData *ed = expoaddress(s_currIdx);
|
ExpoData *ed = expoaddress(s_currIdx);
|
||||||
putsMixerSource(7*FW+FW/2, 0, ed->chn+1, 0);
|
putsMixerSource(7*FW+FW/2, 0, ed->chn+1, 0);
|
||||||
|
|
||||||
SUBMENU(STR_MENUDREXPO, EXPO_FIELD_MAX, {IF_CPUARM(0) 0, 0, IF_CURVES(0) IF_FLIGHT_PHASES(MAX_PHASES-1) 0 /*, ...*/});
|
SUBMENU(STR_MENUDREXPO, EXPO_FIELD_MAX, {IF_CPUARM(0) 0, 0, IF_CURVES(0) IF_FLIGHT_PHASES((MAX_PHASES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/});
|
||||||
|
|
||||||
int8_t sub = m_posVert;
|
int8_t sub = m_posVert;
|
||||||
|
|
||||||
@@ -2312,11 +2319,11 @@ void menuModelMixOne(uint8_t event)
|
|||||||
#else
|
#else
|
||||||
if (m_posVert == MIX_FIELD_TRIM && md2->srcRaw > NUM_STICKS)
|
if (m_posVert == MIX_FIELD_TRIM && md2->srcRaw > NUM_STICKS)
|
||||||
#endif
|
#endif
|
||||||
SUBMENU_NOTITLE(MIX_FIELD_COUNT, {IF_CPUARM(0) 0, 0, 0, 0, IF_CURVES(0) IF_FLIGHT_PHASES(MAX_PHASES-1) 0, 0 /*, ...*/})
|
SUBMENU_NOTITLE(MIX_FIELD_COUNT, {IF_CPUARM(0) 0, 0, 0, 0, IF_CURVES(0) IF_FLIGHT_PHASES((MAX_PHASES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/})
|
||||||
else
|
else
|
||||||
SUBMENU_NOTITLE(MIX_FIELD_COUNT, {IF_CPUARM(0) 0, 0, 0, 1, IF_CURVES(1) IF_FLIGHT_PHASES(MAX_PHASES-1) 0, 0 /*, ...*/});
|
SUBMENU_NOTITLE(MIX_FIELD_COUNT, {IF_CPUARM(0) 0, 0, 0, 1, IF_CURVES(1) IF_FLIGHT_PHASES((MAX_PHASES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/});
|
||||||
#else
|
#else
|
||||||
SUBMENU_NOTITLE(MIX_FIELD_COUNT, {IF_CPUARM(0) 0, 0, 0, 1, IF_CURVES(1) IF_FLIGHT_PHASES(MAX_PHASES-1) 0, 0 /*, ...*/});
|
SUBMENU_NOTITLE(MIX_FIELD_COUNT, {IF_CPUARM(0) 0, 0, 0, 1, IF_CURVES(1) IF_FLIGHT_PHASES((MAX_PHASES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/});
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if MENU_COLUMNS > 1
|
#if MENU_COLUMNS > 1
|
||||||
|
|||||||
Reference in New Issue
Block a user