From f02ab85ad502f3084ca12d3beca2453398bd50dc Mon Sep 17 00:00:00 2001 From: Eric Swanson Date: Mon, 8 Jul 2019 14:57:23 -0700 Subject: [PATCH] More compilation fixes (#6556) --- radio/src/gui/212x64/model_display.cpp | 6 +++--- radio/src/gui/212x64/model_failsafe.cpp | 12 ++++++------ radio/src/gui/212x64/model_gvars.cpp | 12 ++++++------ radio/src/gui/212x64/model_telemetry_sensor.cpp | 10 +++++----- radio/src/gui/480x272/model_gvars.cpp | 12 ++++++------ 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/radio/src/gui/212x64/model_display.cpp b/radio/src/gui/212x64/model_display.cpp index a7ffa120c..857f9a7de 100644 --- a/radio/src/gui/212x64/model_display.cpp +++ b/radio/src/gui/212x64/model_display.cpp @@ -239,11 +239,11 @@ void menuModelDisplay(event_t event) else { for (int c=0; c0) { - value = checkIncDec(event, value, 0, MIXSRC_LAST_TELEM, EE_MODEL|INCDEC_SOURCE|NO_INCDEC_MARKS, isSourceAvailable); + *value = checkIncDec(event, *value, 0, MIXSRC_LAST_TELEM, EE_MODEL|INCDEC_SOURCE|NO_INCDEC_MARKS, isSourceAvailable); } } if (attr && menuHorizontalPosition == NUM_LINE_ITEMS) { diff --git a/radio/src/gui/212x64/model_failsafe.cpp b/radio/src/gui/212x64/model_failsafe.cpp index 2ee301842..c997a97af 100644 --- a/radio/src/gui/212x64/model_failsafe.cpp +++ b/radio/src/gui/212x64/model_failsafe.cpp @@ -47,13 +47,13 @@ void menuModelFailsafe(event_t event) s_editMode = 0; } else { - int16_t & failsafe = g_model.failsafeChannels[menuVerticalPosition]; - if (failsafe < FAILSAFE_CHANNEL_HOLD) - failsafe = FAILSAFE_CHANNEL_HOLD; - else if (failsafe == FAILSAFE_CHANNEL_HOLD) - failsafe = FAILSAFE_CHANNEL_NOPULSE; + int16_t * failsafe = &g_model.failsafeChannels[menuVerticalPosition]; + if (*failsafe < FAILSAFE_CHANNEL_HOLD) + *failsafe = FAILSAFE_CHANNEL_HOLD; + else if (*failsafe == FAILSAFE_CHANNEL_HOLD) + *failsafe = FAILSAFE_CHANNEL_NOPULSE; else - failsafe = 0; + *failsafe = 0; } } else { diff --git a/radio/src/gui/212x64/model_gvars.cpp b/radio/src/gui/212x64/model_gvars.cpp index c77e0db69..b3b83fcff 100644 --- a/radio/src/gui/212x64/model_gvars.cpp +++ b/radio/src/gui/212x64/model_gvars.cpp @@ -23,28 +23,28 @@ void editGVarValue(coord_t x, coord_t y, event_t event, uint8_t gvar, uint8_t flightMode, LcdFlags flags) { FlightModeData * fm = &g_model.flightModeData[flightMode]; - gvar_t & v = fm->gvars[gvar]; + gvar_t * v = &fm->gvars[gvar]; int16_t vmin, vmax; - if (v > GVAR_MAX) { - uint8_t fm = v - GVAR_MAX - 1; + if (*v > GVAR_MAX) { + uint8_t fm = *v - GVAR_MAX - 1; if (fm >= flightMode) fm++; drawFlightMode(x, y, fm + 1, flags&(~LEFT)); vmin = GVAR_MAX + 1; vmax = GVAR_MAX + MAX_FLIGHT_MODES - 1; } else { - drawGVarValue(x, y, gvar, v, flags); + drawGVarValue(x, y, gvar, *v, flags); vmin = GVAR_MIN + g_model.gvars[gvar].min; vmax = GVAR_MAX - g_model.gvars[gvar].max; } if (flags & INVERS) { if (event == EVT_KEY_LONG(KEY_ENTER) && flightMode > 0) { - v = (v > GVAR_MAX ? 0 : GVAR_MAX+1); + *v = (*v > GVAR_MAX ? 0 : GVAR_MAX+1); storageDirty(EE_MODEL); } else if (s_editMode > 0) { - v = checkIncDec(event, v, vmin, vmax, EE_MODEL); + *v = checkIncDec(event, *v, vmin, vmax, EE_MODEL); } } } diff --git a/radio/src/gui/212x64/model_telemetry_sensor.cpp b/radio/src/gui/212x64/model_telemetry_sensor.cpp index 78efb34a0..2daa516cb 100644 --- a/radio/src/gui/212x64/model_telemetry_sensor.cpp +++ b/radio/src/gui/212x64/model_telemetry_sensor.cpp @@ -241,16 +241,16 @@ void menuModelSensor(event_t event) case SENSOR_FIELD_PARAM4: { drawStringWithIndex(0, y, STR_SOURCE, k-SENSOR_FIELD_PARAM1+1); - int8_t & source = sensor->calc.sources[k-SENSOR_FIELD_PARAM1]; + int8_t * source = &sensor->calc.sources[k-SENSOR_FIELD_PARAM1]; if (attr) { - source = checkIncDec(event, source, -MAX_TELEMETRY_SENSORS, MAX_TELEMETRY_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isSensorAvailable); + *source = checkIncDec(event, *source, -MAX_TELEMETRY_SENSORS, MAX_TELEMETRY_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isSensorAvailable); } - if (source < 0) { + if (*source < 0) { lcdDrawChar(SENSOR_2ND_COLUMN, y, '-', attr); - drawSource(lcdNextPos, y, MIXSRC_FIRST_TELEM+3*(-1-source), attr); + drawSource(lcdNextPos, y, MIXSRC_FIRST_TELEM+3*(-1-*source), attr); } else { - drawSource(SENSOR_2ND_COLUMN, y, source ? MIXSRC_FIRST_TELEM+3*(source-1) : 0, attr); + drawSource(SENSOR_2ND_COLUMN, y, *source ? MIXSRC_FIRST_TELEM+3*(*source-1) : 0, attr); } break; } diff --git a/radio/src/gui/480x272/model_gvars.cpp b/radio/src/gui/480x272/model_gvars.cpp index 27e005fc1..202647e08 100644 --- a/radio/src/gui/480x272/model_gvars.cpp +++ b/radio/src/gui/480x272/model_gvars.cpp @@ -23,28 +23,28 @@ void editGVarValue(coord_t x, coord_t y, event_t event, uint8_t gvar, uint8_t flightMode, LcdFlags flags) { FlightModeData * fm = &g_model.flightModeData[flightMode]; - gvar_t & v = fm->gvars[gvar]; + gvar_t * v = &fm->gvars[gvar]; int16_t vmin, vmax; - if (v > GVAR_MAX) { - uint8_t fm = v - GVAR_MAX - 1; + if (*v > GVAR_MAX) { + uint8_t fm = *v - GVAR_MAX - 1; if (fm >= flightMode) fm++; drawFlightMode(x, y, fm + 1, flags&(~LEFT)); vmin = GVAR_MAX + 1; vmax = GVAR_MAX + MAX_FLIGHT_MODES - 1; } else { - drawGVarValue(x, y, gvar, v, flags); + drawGVarValue(x, y, gvar, *v, flags); vmin = GVAR_MIN + g_model.gvars[gvar].min; vmax = GVAR_MAX - g_model.gvars[gvar].max; } if (flags & INVERS) { if (event == EVT_KEY_LONG(KEY_ENTER) && flightMode > 0) { - v = (v > GVAR_MAX ? 0 : GVAR_MAX+1); + *v = (*v > GVAR_MAX ? 0 : GVAR_MAX+1); storageDirty(EE_MODEL); } else if (s_editMode > 0) { - v = checkIncDec(event, v, vmin, vmax, EE_MODEL); + *v = checkIncDec(event, *v, vmin, vmax, EE_MODEL); } } }