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

Remove CASE_CURVES

Browse source
This commit is contained in:
Arne Schwabe 2018-07-05 11:09:28 +02:00
parent 8530cce10a
commit fdedcf4de0
13 changed files with 26 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

4
radio/src/gui/128x64/menus.h
View file

@ -114,7 +114,7 @@ enum MenuModelIndexes {
MENU_MODEL_INPUTS, MENU_MODEL_INPUTS,
MENU_MODEL_MIXES, MENU_MODEL_MIXES,
MENU_MODEL_OUTPUTS, MENU_MODEL_OUTPUTS,
CASE_CURVES(MENU_MODEL_CURVES) MENU_MODEL_CURVES,
MENU_MODEL_LOGICAL_SWITCHES, MENU_MODEL_LOGICAL_SWITCHES,
MENU_MODEL_SPECIAL_FUNCTIONS, MENU_MODEL_SPECIAL_FUNCTIONS,
#if defined(LUA_MODEL_SCRIPTS) #if defined(LUA_MODEL_SCRIPTS)
@ -156,7 +156,7 @@ static const MenuHandlerFunc menuTabModel[] PROGMEM = {
menuModelExposAll, menuModelExposAll,
menuModelMixAll, menuModelMixAll,
menuModelLimits, menuModelLimits,
CASE_CURVES(menuModelCurvesAll) menuModelCurvesAll,
menuModelLogicalSwitches, menuModelLogicalSwitches,
menuModelSpecialFunctions, menuModelSpecialFunctions,
#if defined(LUA_MODEL_SCRIPTS) #if defined(LUA_MODEL_SCRIPTS)

6
radio/src/gui/128x64/model_input_edit.cpp
View file

@ -60,8 +60,8 @@ enum ExposFields {
EXPO_FIELD_SCALE, EXPO_FIELD_SCALE,
EXPO_FIELD_WEIGHT, EXPO_FIELD_WEIGHT,
EXPO_FIELD_OFFSET, EXPO_FIELD_OFFSET,
CASE_CURVES(EXPO_FIELD_CURVE_LABEL) EXPO_FIELD_CURVE_LABEL,
CASE_CURVES(EXPO_FIELD_CURVE) EXPO_FIELD_CURVE,
CASE_FLIGHT_MODES(EXPO_FIELD_FLIGHT_MODES_LABEL) CASE_FLIGHT_MODES(EXPO_FIELD_FLIGHT_MODES_LABEL)
CASE_FLIGHT_MODES(EXPO_FIELD_FLIGHT_MODES) CASE_FLIGHT_MODES(EXPO_FIELD_FLIGHT_MODES)
EXPO_FIELD_SWITCH, EXPO_FIELD_SWITCH,
@ -75,7 +75,7 @@ void menuModelExpoOne(event_t event)
ExpoData * ed = expoAddress(s_currIdx); ExpoData * ed = expoAddress(s_currIdx);
drawSource(PSIZE(TR_MENUINPUTS)*FW+FW, 0, MIXSRC_FIRST_INPUT+ed->chn, 0); drawSource(PSIZE(TR_MENUINPUTS)*FW+FW, 0, MIXSRC_FIRST_INPUT+ed->chn, 0);
SUBMENU(STR_MENUINPUTS, EXPO_FIELD_MAX, {0, 0, 0, ed->srcRaw >= MIXSRC_FIRST_TELEM ? (uint8_t)0 : (uint8_t)HIDDEN_ROW, 0, 0, CASE_CURVES(LABEL(Curve)) CASE_CURVES(1) CASE_FLIGHT_MODES(LABEL(Flight Mode)) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/}); SUBMENU(STR_MENUINPUTS, EXPO_FIELD_MAX, {0, 0, 0, ed->srcRaw >= MIXSRC_FIRST_TELEM ? (uint8_t)0 : (uint8_t)HIDDEN_ROW, 0, 0, LABEL(Curve), 1, CASE_FLIGHT_MODES(LABEL(Flight Mode)) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/});
int8_t sub = menuVerticalPosition; int8_t sub = menuVerticalPosition;

12
radio/src/gui/128x64/model_inputs_mixes.cpp
View file

@ -220,7 +220,7 @@ enum ExposFields {
EXPO_FIELD_NAME, EXPO_FIELD_NAME,
EXPO_FIELD_WEIGHT, EXPO_FIELD_WEIGHT,
EXPO_FIELD_EXPO, EXPO_FIELD_EXPO,
CASE_CURVES(EXPO_FIELD_CURVE) EXPO_FIELD_CURVE,
CASE_FLIGHT_MODES(EXPO_FIELD_FLIGHT_MODES) CASE_FLIGHT_MODES(EXPO_FIELD_FLIGHT_MODES)
EXPO_FIELD_SWITCH, EXPO_FIELD_SWITCH,
EXPO_FIELD_SIDE, EXPO_FIELD_SIDE,
@ -234,7 +234,7 @@ void menuModelExpoOne(event_t event)
ExpoData * ed = expoAddress(s_currIdx); ExpoData * ed = expoAddress(s_currIdx);
drawSource(7*FW+FW/2, 0, MIXSRC_Rud+ed->chn, 0); drawSource(7*FW+FW/2, 0, MIXSRC_Rud+ed->chn, 0);
SUBMENU(STR_MENUINPUTS, EXPO_FIELD_MAX, {0, 0, 0, CASE_CURVES(CURVE_ROWS) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/}); SUBMENU(STR_MENUINPUTS, EXPO_FIELD_MAX, {0, 0, 0, CURVE_ROWS, CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/});
int8_t sub = menuVerticalPosition; int8_t sub = menuVerticalPosition;
@ -318,7 +318,7 @@ enum MixFields {
MIX_FIELD_WEIGHT, MIX_FIELD_WEIGHT,
MIX_FIELD_OFFSET, MIX_FIELD_OFFSET,
MIX_FIELD_TRIM, MIX_FIELD_TRIM,
CASE_CURVES(MIX_FIELD_CURVE) MIX_FIELD_CURVE,
CASE_FLIGHT_MODES(MIX_FIELD_FLIGHT_PHASE) CASE_FLIGHT_MODES(MIX_FIELD_FLIGHT_PHASE)
MIX_FIELD_SWITCH, MIX_FIELD_SWITCH,
MIX_FIELD_WARNING, MIX_FIELD_WARNING,
@ -384,11 +384,11 @@ void menuModelMixOne(event_t event)
#if defined(ROTARY_ENCODERS) #if defined(ROTARY_ENCODERS)
if ((menuVerticalPosition == MIX_FIELD_TRIM && md2->srcRaw > NUM_STICKS) || (menuVerticalPosition == MIX_FIELD_CURVE && md2->curveMode == MODE_CURVE)) if ((menuVerticalPosition == MIX_FIELD_TRIM && md2->srcRaw > NUM_STICKS) || (menuVerticalPosition == MIX_FIELD_CURVE && md2->curveMode == MODE_CURVE))
SUBMENU_NOTITLE(MIX_FIELD_COUNT, {0, 0, 0, 0, 0, CASE_CURVES(0) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/}) SUBMENU_NOTITLE(MIX_FIELD_COUNT, {0, 0, 0, 0, 0, 0, CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/})
else else
SUBMENU_NOTITLE(MIX_FIELD_COUNT, {0, 0, 0, 0, 1, CASE_CURVES(1) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/}); SUBMENU_NOTITLE(MIX_FIELD_COUNT, {0, 0, 0, 0, 1, 1, CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/});
#else #else
SUBMENU_NOTITLE(MIX_FIELD_COUNT, {0, 0, 0, 0, 1, CASE_CURVES(1) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/}); SUBMENU_NOTITLE(MIX_FIELD_COUNT, {0, 0, 0, 0, 1, 1, CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/});
#endif #endif
int8_t sub = menuVerticalPosition; int8_t sub = menuVerticalPosition;

4
radio/src/gui/128x64/model_mix_edit.cpp
View file

@ -26,7 +26,7 @@ enum MixFields {
MIX_FIELD_WEIGHT, MIX_FIELD_WEIGHT,
MIX_FIELD_OFFSET, MIX_FIELD_OFFSET,
MIX_FIELD_TRIM, MIX_FIELD_TRIM,
CASE_CURVES(MIX_FIELD_CURVE) MIX_FIELD_CURVE,
CASE_FLIGHT_MODES(MIX_FIELD_FLIGHT_MODE) CASE_FLIGHT_MODES(MIX_FIELD_FLIGHT_MODE)
MIX_FIELD_SWITCH, MIX_FIELD_SWITCH,
MIX_FIELD_WARNING, MIX_FIELD_WARNING,
@ -88,7 +88,7 @@ void menuModelMixOne(event_t event)
MixData * md2 = mixAddress(s_currIdx) ; MixData * md2 = mixAddress(s_currIdx) ;
putsChn(PSIZE(TR_MIXER)*FW+FW, 0, md2->destCh+1,0); putsChn(PSIZE(TR_MIXER)*FW+FW, 0, md2->destCh+1,0);
SUBMENU(STR_MIXER, MIX_FIELD_COUNT, {0, 0, 0, 0, 0, CASE_CURVES(1) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/}); SUBMENU(STR_MIXER, MIX_FIELD_COUNT, {0, 0, 0, 0, 0, 1, CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/});
int8_t sub = menuVerticalPosition; int8_t sub = menuVerticalPosition;
int8_t editMode = s_editMode; int8_t editMode = s_editMode;

2
radio/src/gui/212x64/menu_model.cpp
View file

@ -28,7 +28,7 @@ const MenuHandlerFunc menuTabModel[] = {
menuModelExposAll, menuModelExposAll,
menuModelMixAll, menuModelMixAll,
menuModelLimits, menuModelLimits,
CASE_CURVES(menuModelCurvesAll) menuModelCurvesAll,
#if defined(GVARS) && defined(FLIGHT_MODES) #if defined(GVARS) && defined(FLIGHT_MODES)
CASE_GVARS(menuModelGVars) CASE_GVARS(menuModelGVars)
#endif #endif

2
radio/src/gui/212x64/menus.h
View file

@ -93,7 +93,7 @@ enum MenuModelIndexes {
MENU_MODEL_INPUTS, MENU_MODEL_INPUTS,
MENU_MODEL_MIXES, MENU_MODEL_MIXES,
MENU_MODEL_OUTPUTS, MENU_MODEL_OUTPUTS,
CASE_CURVES(MENU_MODEL_CURVES) MENU_MODEL_CURVES,
CASE_GVARS(MENU_MODEL_GVARS) CASE_GVARS(MENU_MODEL_GVARS)
MENU_MODEL_LOGICAL_SWITCHES, MENU_MODEL_LOGICAL_SWITCHES,
MENU_MODEL_SPECIAL_FUNCTIONS, MENU_MODEL_SPECIAL_FUNCTIONS,

4
radio/src/gui/212x64/model_input_edit.cpp
View file

@ -59,7 +59,7 @@ enum ExposFields {
EXPO_FIELD_SCALE, EXPO_FIELD_SCALE,
EXPO_FIELD_WEIGHT, EXPO_FIELD_WEIGHT,
EXPO_FIELD_OFFSET, EXPO_FIELD_OFFSET,
CASE_CURVES(EXPO_FIELD_CURVE) EXPO_FIELD_CURVE,
CASE_FLIGHT_MODES(EXPO_FIELD_FLIGHT_MODES) CASE_FLIGHT_MODES(EXPO_FIELD_FLIGHT_MODES)
EXPO_FIELD_SWITCH, EXPO_FIELD_SWITCH,
EXPO_FIELD_SIDE, EXPO_FIELD_SIDE,
@ -80,7 +80,7 @@ void menuModelExpoOne(event_t event)
drawSource(PSIZE(TR_MENUINPUTS)*FW+FW, 0, MIXSRC_FIRST_INPUT+ed->chn, 0); drawSource(PSIZE(TR_MENUINPUTS)*FW+FW, 0, MIXSRC_FIRST_INPUT+ed->chn, 0);
lcdDrawFilledRect(0, 0, LCD_W, FH, SOLID, FILL_WHITE|GREY_DEFAULT); lcdDrawFilledRect(0, 0, LCD_W, FH, SOLID, FILL_WHITE|GREY_DEFAULT);
SUBMENU(STR_MENUINPUTS, EXPO_FIELD_MAX, {0, 0, 0, ed->srcRaw >= MIXSRC_FIRST_TELEM ? (uint8_t)0 : (uint8_t)HIDDEN_ROW, 0, 0, CASE_CURVES(CURVE_ROWS) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/}); SUBMENU(STR_MENUINPUTS, EXPO_FIELD_MAX, {0, 0, 0, ed->srcRaw >= MIXSRC_FIRST_TELEM ? (uint8_t)0 : (uint8_t)HIDDEN_ROW, 0, 0, CURVE_ROWS, CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/});
SET_SCROLLBAR_X(EXPO_ONE_2ND_COLUMN+10*FW); SET_SCROLLBAR_X(EXPO_ONE_2ND_COLUMN+10*FW);

4
radio/src/gui/212x64/model_mix_edit.cpp
View file

@ -26,7 +26,7 @@ enum MixFields {
MIX_FIELD_WEIGHT, MIX_FIELD_WEIGHT,
MIX_FIELD_OFFSET, MIX_FIELD_OFFSET,
MIX_FIELD_TRIM, MIX_FIELD_TRIM,
CASE_CURVES(MIX_FIELD_CURVE) MIX_FIELD_CURVE,
CASE_FLIGHT_MODES(MIX_FIELD_FLIGHT_MODE) CASE_FLIGHT_MODES(MIX_FIELD_FLIGHT_MODE)
MIX_FIELD_SWITCH, MIX_FIELD_SWITCH,
MIX_FIELD_WARNING, MIX_FIELD_WARNING,
@ -94,7 +94,7 @@ void menuModelMixOne(event_t event)
putsChn(PSIZE(TR_MIXER)*FW+FW, 0, md2->destCh+1,0); putsChn(PSIZE(TR_MIXER)*FW+FW, 0, md2->destCh+1,0);
lcdDrawFilledRect(0, 0, LCD_W, FH, SOLID, FILL_WHITE|GREY_DEFAULT); lcdDrawFilledRect(0, 0, LCD_W, FH, SOLID, FILL_WHITE|GREY_DEFAULT);
SUBMENU(STR_MIXER, MIX_FIELD_COUNT, {0, 0, 0, 0, 0, CASE_CURVES(1) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/}); SUBMENU(STR_MIXER, MIX_FIELD_COUNT, {0, 0, 0, 0, 0, 1, CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0, 0 /*, ...*/});
int8_t sub = menuVerticalPosition; int8_t sub = menuVerticalPosition;
int8_t editMode = s_editMode; int8_t editMode = s_editMode;

2
radio/src/gui/480x272/menu_model.cpp
View file

@ -27,7 +27,7 @@ const MenuHandlerFunc menuTabModel[] = {
menuModelExposAll, menuModelExposAll,
menuModelMixAll, menuModelMixAll,
menuModelLimits, menuModelLimits,
CASE_CURVES(menuModelCurvesAll) menuModelCurvesAll,
#if defined(GVARS) && defined(FLIGHT_MODES) #if defined(GVARS) && defined(FLIGHT_MODES)
CASE_GVARS(menuModelGVars) CASE_GVARS(menuModelGVars)
#endif #endif

4
radio/src/gui/480x272/menus.h
View file

@ -107,7 +107,7 @@ enum EnumTabModel {
MENU_MODEL_INPUTS, MENU_MODEL_INPUTS,
MENU_MODEL_MIXES, MENU_MODEL_MIXES,
MENU_MODEL_OUTPUTS, MENU_MODEL_OUTPUTS,
CASE_CURVES(MENU_MODEL_CURVES) MENU_MODEL_CURVES,
CASE_GVARS(MENU_MODEL_GVARS) CASE_GVARS(MENU_MODEL_GVARS)
MENU_MODEL_LOGICAL_SWITCHES, MENU_MODEL_LOGICAL_SWITCHES,
MENU_MODEL_SPECIAL_FUNCTIONS, MENU_MODEL_SPECIAL_FUNCTIONS,
@ -136,7 +136,7 @@ const uint8_t MODEL_ICONS[] = {
ICON_MODEL_INPUTS, ICON_MODEL_INPUTS,
ICON_MODEL_MIXER, ICON_MODEL_MIXER,
ICON_MODEL_OUTPUTS, ICON_MODEL_OUTPUTS,
CASE_CURVES(ICON_MODEL_CURVES) ICON_MODEL_CURVES,
CASE_GVARS(ICON_MODEL_GVARS) CASE_GVARS(ICON_MODEL_GVARS)
ICON_MODEL_LOGICAL_SWITCHES, ICON_MODEL_LOGICAL_SWITCHES,
ICON_MODEL_SPECIAL_FUNCTIONS, ICON_MODEL_SPECIAL_FUNCTIONS,

4
radio/src/gui/480x272/model_inputs.cpp
View file

@ -162,7 +162,7 @@ enum ExposFields {
EXPO_FIELD_SCALE, EXPO_FIELD_SCALE,
EXPO_FIELD_WEIGHT, EXPO_FIELD_WEIGHT,
EXPO_FIELD_OFFSET, EXPO_FIELD_OFFSET,
CASE_CURVES(EXPO_FIELD_CURVE) EXPO_FIELD_CURVE,
CASE_FLIGHT_MODES(EXPO_FIELD_FLIGHT_MODES) CASE_FLIGHT_MODES(EXPO_FIELD_FLIGHT_MODES)
EXPO_FIELD_SWITCH, EXPO_FIELD_SWITCH,
EXPO_FIELD_SIDE, EXPO_FIELD_SIDE,
@ -176,7 +176,7 @@ bool menuModelExpoOne(event_t event)
{ {
ExpoData * ed = expoAddress(s_currIdx); ExpoData * ed = expoAddress(s_currIdx);
SUBMENU_WITH_OPTIONS(STR_MENUINPUTS, ICON_MODEL_INPUTS, EXPO_FIELD_MAX, OPTION_MENU_NO_FOOTER|OPTION_MENU_NO_SCROLLBAR, { 0, 0, 0, (ed->srcRaw >= MIXSRC_FIRST_TELEM ? (uint8_t)0 : (uint8_t)HIDDEN_ROW), 0, 0, CASE_CURVES(CURVE_ROWS) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/}); SUBMENU_WITH_OPTIONS(STR_MENUINPUTS, ICON_MODEL_INPUTS, EXPO_FIELD_MAX, OPTION_MENU_NO_FOOTER|OPTION_MENU_NO_SCROLLBAR, { 0, 0, 0, (ed->srcRaw >= MIXSRC_FIRST_TELEM ? (uint8_t)0 : (uint8_t)HIDDEN_ROW), 0, 0, CURVE_ROWS, CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/});
lcdDrawSizedText(50, 3+FH, g_model.inputNames[ed->chn], LEN_INPUT_NAME, ZCHAR|MENU_TITLE_COLOR); lcdDrawSizedText(50, 3+FH, g_model.inputNames[ed->chn], LEN_INPUT_NAME, ZCHAR|MENU_TITLE_COLOR);
lcdDrawSolidFilledRect(0, MENU_FOOTER_TOP, 230, MENU_FOOTER_HEIGHT, HEADER_BGCOLOR); lcdDrawSolidFilledRect(0, MENU_FOOTER_TOP, 230, MENU_FOOTER_HEIGHT, HEADER_BGCOLOR);

4
radio/src/gui/480x272/model_mixes.cpp
View file

@ -152,7 +152,7 @@ enum MixFields {
MIX_FIELD_WEIGHT, MIX_FIELD_WEIGHT,
MIX_FIELD_OFFSET, MIX_FIELD_OFFSET,
MIX_FIELD_TRIM, MIX_FIELD_TRIM,
CASE_CURVES(MIX_FIELD_CURVE) MIX_FIELD_CURVE,
CASE_FLIGHT_MODES(MIX_FIELD_FLIGHT_MODE) CASE_FLIGHT_MODES(MIX_FIELD_FLIGHT_MODE)
MIX_FIELD_SWITCH, MIX_FIELD_SWITCH,
MIX_FIELD_WARNING, MIX_FIELD_WARNING,
@ -176,7 +176,7 @@ bool menuModelMixOne(event_t event)
{ {
MixData * md2 = mixAddress(s_currIdx) ; MixData * md2 = mixAddress(s_currIdx) ;
SUBMENU_WITH_OPTIONS(STR_MIXER, ICON_MODEL_MIXER, MIX_FIELD_COUNT, OPTION_MENU_NO_SCROLLBAR, { 0, 0, 0, 0, 0, CASE_CURVES(1) CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/ }); SUBMENU_WITH_OPTIONS(STR_MIXER, ICON_MODEL_MIXER, MIX_FIELD_COUNT, OPTION_MENU_NO_SCROLLBAR, { 0, 0, 0, 0, 0, 1, CASE_FLIGHT_MODES((MAX_FLIGHT_MODES-1) | NAVIGATION_LINE_BY_LINE) 0 /*, ...*/ });
putsChn(50, 3+FH, md2->destCh+1, MENU_TITLE_COLOR); putsChn(50, 3+FH, md2->destCh+1, MENU_TITLE_COLOR);
displayMixStatus(md2->destCh); displayMixStatus(md2->destCh);

2
radio/src/opentx.h
View file

@ -161,8 +161,6 @@
#define CASE_FLIGHT_MODES(x) #define CASE_FLIGHT_MODES(x)
#endif #endif
#define CASE_CURVES(x) x,
#if defined(GVARS) #if defined(GVARS)
#define CASE_GVARS(x) x, #define CASE_GVARS(x) x,
#else #else