[Taranis] Consumption calculated sensor bugfix

This commit is contained in:
Bertrand Songis
2016-04-30 21:00:00 +02:00
parent e859baea3d
commit 633d52297d
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -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;
}
}
@@ -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;
}