From e14c2e09161479030b584c2014af36a621fc330f Mon Sep 17 00:00:00 2001 From: bsongis Date: Sat, 21 Jun 2014 20:12:28 +0200 Subject: [PATCH] Another couple of min/max fixed in Logical Switches --- companion/src/eeprominterface.cpp | 9 +++++---- radio/src/opentx.cpp | 15 +++++++++++++-- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp index a2d10c04b..7fd34ceb6 100644 --- a/companion/src/eeprominterface.cpp +++ b/companion/src/eeprominterface.cpp @@ -203,8 +203,8 @@ RawSourceRange RawSource::getRange(const ModelData & model, const GeneralSetting break; case TELEMETRY_SOURCE_VERTICAL_SPEED: result.step = 0.1; - result.min = -12.5; - result.max = 13.0; + result.min = singleprec ? -12.5 : -20.0; + result.max = singleprec ? 13.0 : 20.0; result.decimals = 1; result.unit = QObject::tr("m/s"); break; @@ -229,7 +229,7 @@ RawSourceRange RawSource::getRange(const ModelData & model, const GeneralSetting case TELEMETRY_SOURCE_VFAS: case TELEMETRY_SOURCE_VFAS_MIN: result.step = 0.1; - result.max = 25.5; + result.max = singleprec ? 25.5 : 100.0; result.decimals = 1; result.unit = QObject::tr("V"); break; @@ -256,7 +256,8 @@ RawSourceRange RawSource::getRange(const ModelData & model, const GeneralSetting case TELEMETRY_SOURCE_ACCZ: result.step = 0.01; result.decimals = 2; - result.max = 2.55; + result.max = singleprec ? 2.55 : 10.00; + result.min = singleprec ? 0 : -10.00; result.unit = QObject::tr("g"); break; default: diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index a1a4494b2..a73f90bcc 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -721,9 +721,9 @@ ls_telemetry_value_t minTelemValue(uint8_t channel) case TELEM_ACCx: case TELEM_ACCy: case TELEM_ACCz: - return -255; + return -1000; case TELEM_VSPEED: - return -125; + return -200; default: return 0; } @@ -757,6 +757,17 @@ ls_telemetry_value_t maxTelemValue(uint8_t channel) case TELEM_CELL: case TELEM_MIN_CELL: return 510; + case TELEM_CELLS_SUM: + case TELEM_MIN_CELLS_SUM: + case TELEM_VFAS: + case TELEM_MIN_VFAS: + return 1000; + case TELEM_VSPEED: + return 200; + case TELEM_ACCx: + case TELEM_ACCy: + case TELEM_ACCz: + return 1000; default: return 30000; #else