From 1f06e7982aae9992c29eb96b38d6adafd88b4d07 Mon Sep 17 00:00:00 2001 From: bsongis Date: Sun, 19 Jul 2015 22:27:06 +0200 Subject: [PATCH] Fixes #2506 --- radio/src/gui/Taranis/menu_model_telemetry.cpp | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/radio/src/gui/Taranis/menu_model_telemetry.cpp b/radio/src/gui/Taranis/menu_model_telemetry.cpp index 1a2364c33..0ceb03e5b 100644 --- a/radio/src/gui/Taranis/menu_model_telemetry.cpp +++ b/radio/src/gui/Taranis/menu_model_telemetry.cpp @@ -222,7 +222,7 @@ void menuModelSensor(uint8_t event) { TelemetrySensor * sensor = & g_model.telemetrySensors[s_currIdx]; - SUBMENU(STR_MENUSENSOR, SENSOR_FIELD_MAX, {0, 0, sensor->type == TELEM_TYPE_CALCULATED ? (uint8_t)0 : (uint8_t)1, SENSOR_UNIT_ROWS, SENSOR_PREC_ROWS, SENSOR_PARAM1_ROWS, SENSOR_PARAM2_ROWS, SENSOR_PARAM3_ROWS, SENSOR_PARAM4_ROWS, SENSOR_AUTOOFFSET_ROWS, SENSOR_FILTER_ROWS, SENSOR_PERSISTENT_ROWS, 0 }); + SUBMENU(STR_MENUSENSOR, SENSOR_FIELD_MAX, { 0, 0, 0, SENSOR_UNIT_ROWS, SENSOR_PREC_ROWS, SENSOR_PARAM1_ROWS, SENSOR_PARAM2_ROWS, SENSOR_PARAM3_ROWS, SENSOR_PARAM4_ROWS, SENSOR_AUTOOFFSET_ROWS, SENSOR_FILTER_ROWS, SENSOR_PERSISTENT_ROWS, 0 }); lcd_outdezAtt(PSIZE(TR_MENUSENSOR)*FW+1, 0, s_currIdx+1, INVERS|LEFT); putsTelemetryChannelValue(SENSOR_2ND_COLUMN, 0, s_currIdx, getValue(MIXSRC_FIRST_TELEM+3*s_currIdx), LEFT); @@ -261,19 +261,9 @@ void menuModelSensor(uint8_t event) case SENSOR_FIELD_ID: if (sensor->type == TELEM_TYPE_CUSTOM) { lcd_putsLeft(y, STR_ID); - lcd_outhex4(SENSOR_2ND_COLUMN, y, sensor->id, LEFT|(m_posHorz==0 ? attr : 0)); - lcd_outdezAtt(SENSOR_3RD_COLUMN, y, sensor->instance, LEFT|(m_posHorz==1 ? attr : 0)); - if (attr) { - switch (m_posHorz) { - case 0: - CHECK_INCDEC_MODELVAR_ZERO(event, sensor->id, 0xffff); - break; - - case 1: - CHECK_INCDEC_MODELVAR_ZERO(event, sensor->instance, 0xff); - break; - } - } + lcd_outhex4(SENSOR_2ND_COLUMN, y, sensor->id, LEFT); + lcd_outdezAtt(SENSOR_3RD_COLUMN, y, sensor->instance, LEFT|attr); + if (attr) CHECK_INCDEC_MODELVAR_ZERO(event, sensor->instance, 0xff); } else { sensor->formula = selectMenuItem(SENSOR_2ND_COLUMN, y, STR_FORMULA, STR_VFORMULAS, sensor->formula, 0, TELEM_FORMULA_LAST, attr, event);