From 50fa9a4dfd3a8e52827602fdfff78753aa57279c Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Tue, 31 Mar 2015 16:14:37 +0400 Subject: [PATCH] [Companion] Telemetry sensor ratio/offset weren't imported --- companion/src/firmwares/opentx/opentxeeprom.cpp | 2 ++ companion/src/modeledit/telemetry.cpp | 2 +- companion/src/modeledit/telemetry.h | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/companion/src/firmwares/opentx/opentxeeprom.cpp b/companion/src/firmwares/opentx/opentxeeprom.cpp index fb6eca8ca..7e1f67224 100644 --- a/companion/src/firmwares/opentx/opentxeeprom.cpp +++ b/companion/src/firmwares/opentx/opentxeeprom.cpp @@ -2730,6 +2730,8 @@ class SensorField: public TransformedField { if (sensor.type == SensorData::TYPE_CUSTOM) { sensor.id = _id; sensor.instance = _instance; + sensor.ratio = _param & 0xFF; + sensor.offset = (_param >> 16) & 0xFF; } else { sensor.persistentValue = _id; diff --git a/companion/src/modeledit/telemetry.cpp b/companion/src/modeledit/telemetry.cpp index 5eb2fb33f..9e77effa4 100644 --- a/companion/src/modeledit/telemetry.cpp +++ b/companion/src/modeledit/telemetry.cpp @@ -643,7 +643,7 @@ void TelemetrySensorPanel::on_unit_currentIndexChanged(int index) } } -void TelemetrySensorPanel::on_prec_editingFinished() +void TelemetrySensorPanel::on_prec_valueChanged() { if (!lock) { sensor.prec = ui->prec->value(); diff --git a/companion/src/modeledit/telemetry.h b/companion/src/modeledit/telemetry.h index 9be399456..c7f993e3f 100644 --- a/companion/src/modeledit/telemetry.h +++ b/companion/src/modeledit/telemetry.h @@ -95,7 +95,7 @@ class TelemetrySensorPanel: public ModelPanel void on_type_currentIndexChanged(int index); void on_formula_currentIndexChanged(int index); void on_unit_currentIndexChanged(int index); - void on_prec_editingFinished(); + void on_prec_valueChanged(); protected: void updateSourcesComboBox(AutoComboBox * cb, bool negative);