From 633d52297ddd56c413655d42577098fae4075361 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Sat, 30 Apr 2016 21:00:00 +0200 Subject: [PATCH] [Taranis] Consumption calculated sensor bugfix --- radio/src/gui/gui_helpers.cpp | 2 +- radio/src/gui/taranis/menu_model_telemetry.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/radio/src/gui/gui_helpers.cpp b/radio/src/gui/gui_helpers.cpp index f35f358a7..4a57a22c0 100644 --- a/radio/src/gui/gui_helpers.cpp +++ b/radio/src/gui/gui_helpers.cpp @@ -64,7 +64,7 @@ bool isSensorUnit(int sensor, uint8_t unit) return true; } else { - return g_model.telemetrySensors[--sensor].unit == unit; + return g_model.telemetrySensors[sensor-1].unit == unit; } } diff --git a/radio/src/gui/taranis/menu_model_telemetry.cpp b/radio/src/gui/taranis/menu_model_telemetry.cpp index 2837ff6cd..f43aac4c6 100644 --- a/radio/src/gui/taranis/menu_model_telemetry.cpp +++ b/radio/src/gui/taranis/menu_model_telemetry.cpp @@ -280,7 +280,7 @@ void menuModelSensor(uint8_t event) lcd_putsLeft(y, STR_CURRENTSENSOR); putsMixerSource(SENSOR_2ND_COLUMN, y, sensor->consumption.source ? MIXSRC_FIRST_TELEM+3*(sensor->consumption.source-1) : 0, attr); if (attr) { - sensor->consumption.source = checkIncDec(event, sensor->consumption.source, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isTelemetryFieldAvailable); + sensor->consumption.source = checkIncDec(event, sensor->consumption.source, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isSensorAvailable); } break; } @@ -288,7 +288,7 @@ void menuModelSensor(uint8_t event) lcd_putsLeft(y, NO_INDENT(STR_SOURCE)); putsMixerSource(SENSOR_2ND_COLUMN, y, sensor->consumption.source ? MIXSRC_FIRST_TELEM+3*(sensor->consumption.source-1) : 0, attr); if (attr) { - sensor->consumption.source = checkIncDec(event, sensor->consumption.source, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isTelemetryFieldComparisonAvailable); + sensor->consumption.source = checkIncDec(event, sensor->consumption.source, 0, MAX_SENSORS, EE_MODEL|NO_INCDEC_MARKS, isSensorAvailable); } break; }