From 37960e6a9d98c4007d05a088c59500be28fb7654 Mon Sep 17 00:00:00 2001 From: bsongis Date: Thu, 17 Apr 2014 11:12:10 +0200 Subject: [PATCH] Wrong unit used with ASpeed+ --- radio/src/eeprom_conversions.cpp | 2 +- radio/src/lcd.cpp | 5 +++-- radio/src/myeeprom.h | 4 ++-- radio/src/opentx.cpp | 13 +++++++------ radio/src/translations/tts_cz.cpp | 2 +- radio/src/translations/tts_de.cpp | 2 +- radio/src/translations/tts_es.cpp | 2 +- radio/src/translations/tts_fr.cpp | 2 +- radio/src/translations/tts_it.cpp | 2 +- radio/src/translations/tts_pl.cpp | 2 +- radio/src/translations/tts_pt.cpp | 2 +- radio/src/translations/tts_sk.cpp | 2 +- 12 files changed, 21 insertions(+), 19 deletions(-) diff --git a/radio/src/eeprom_conversions.cpp b/radio/src/eeprom_conversions.cpp index af715fef8..aa5a4d946 100644 --- a/radio/src/eeprom_conversions.cpp +++ b/radio/src/eeprom_conversions.cpp @@ -342,7 +342,7 @@ int ConvertTelemetrySource_215_to_216(int source) if (source >= TELEM_A3) source += 2; // ASpd and dTE added + 5 reserve - if (source >= TELEM_ASPD) + if (source >= TELEM_ASPEED) source += 7; // A3 and A4 MIN added if (source >= TELEM_MIN_A3) diff --git a/radio/src/lcd.cpp b/radio/src/lcd.cpp index 95926954a..bf5293ef0 100644 --- a/radio/src/lcd.cpp +++ b/radio/src/lcd.cpp @@ -1245,11 +1245,12 @@ void putsTelemetryChannel(xcoord_t x, uint8_t y, uint8_t channel, lcdint_t val, putsTelemetryValue(x, y, val, UNIT_RAW, att|PREC2); break; - case TELEM_VSPD-1: + case TELEM_VSPEED-1: putsTelemetryValue(x, y, div10_and_round(val), UNIT_RAW, att|PREC1); break; - case TELEM_ASPD-1: + case TELEM_ASPEED-1: + case TELEM_MAX_ASPEED-1: putsTelemetryValue(x, y, val, UNIT_KTS, att); break; diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index cdb3fff0b..ddf2edd51 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -1015,8 +1015,8 @@ enum TelemetrySource { TELEM_ACCy, TELEM_ACCz, TELEM_HDG, - TELEM_VSPD, - TELEM_ASPD, + TELEM_VSPEED, + TELEM_ASPEED, TELEM_DTE, #if defined(CPUARM) TELEM_RESERVE1, diff --git a/radio/src/opentx.cpp b/radio/src/opentx.cpp index 9678e8587..771064b51 100644 --- a/radio/src/opentx.cpp +++ b/radio/src/opentx.cpp @@ -1316,8 +1316,8 @@ getvalue_t getValue(uint8_t i) else if (i==MIXSRC_FIRST_TELEM-1+TELEM_ACCy) return frskyData.hub.accelY; else if (i==MIXSRC_FIRST_TELEM-1+TELEM_ACCz) return frskyData.hub.accelZ; else if (i==MIXSRC_FIRST_TELEM-1+TELEM_HDG) return frskyData.hub.gpsCourse_bp; - else if (i==MIXSRC_FIRST_TELEM-1+TELEM_VSPD) return frskyData.hub.varioSpeed; - else if (i==MIXSRC_FIRST_TELEM-1+TELEM_ASPD) return frskyData.hub.airSpeed; + else if (i==MIXSRC_FIRST_TELEM-1+TELEM_VSPEED) return frskyData.hub.varioSpeed; + else if (i==MIXSRC_FIRST_TELEM-1+TELEM_ASPEED) return frskyData.hub.airSpeed; else if (i==MIXSRC_FIRST_TELEM-1+TELEM_DTE) return frskyData.hub.dTE; else if (i==MIXSRC_FIRST_TELEM-1+TELEM_MIN_A1) return frskyData.analog[0].min; else if (i==MIXSRC_FIRST_TELEM-1+TELEM_MIN_A2) return frskyData.analog[1].min; @@ -2071,7 +2071,7 @@ getvalue_t convert16bitsTelemValue(uint8_t channel, ls_telemetry_value_t value) result = value * 100; break; #endif - case TELEM_VSPD: + case TELEM_VSPEED: result = value * 10; break; @@ -2134,7 +2134,7 @@ getvalue_t convert8bitsTelemValue(uint8_t channel, ls_telemetry_value_t value) case TELEM_CONSUMPTION: result = value * 20; break; - case TELEM_VSPD: + case TELEM_VSPEED: result = ((getvalue_t)value - 125) * 10; break; #endif @@ -3313,11 +3313,12 @@ PLAY_FUNCTION(playValue, uint8_t idx) PLAY_NUMBER(div10_and_round(val), 1+UNIT_G, PREC1); break; - case MIXSRC_FIRST_TELEM+TELEM_VSPD-1: + case MIXSRC_FIRST_TELEM+TELEM_VSPEED-1: PLAY_NUMBER(div10_and_round(val), 1+UNIT_METERS_PER_SECOND, PREC1); break; - case MIXSRC_FIRST_TELEM+TELEM_ASPD-1: + case MIXSRC_FIRST_TELEM+TELEM_ASPEED-1: + case MIXSRC_FIRST_TELEM+TELEM_MAX_ASPEED-1: PLAY_NUMBER(val, 1+UNIT_KTS, 0); break; diff --git a/radio/src/translations/tts_cz.cpp b/radio/src/translations/tts_cz.cpp index 1eb7e6107..1fcfd0e82 100644 --- a/radio/src/translations/tts_cz.cpp +++ b/radio/src/translations/tts_cz.cpp @@ -82,7 +82,7 @@ enum CzechPrompts { CZ_PROMPT_ACCELy = CZ_PROMPT_LABELS_BASE+TELEM_ACCy, CZ_PROMPT_ACCELz = CZ_PROMPT_LABELS_BASE+TELEM_ACCz, CZ_PROMPT_HDG = CZ_PROMPT_LABELS_BASE+TELEM_HDG, - CZ_PROMPT_VARIO = CZ_PROMPT_LABELS_BASE+TELEM_VSPD, + CZ_PROMPT_VARIO = CZ_PROMPT_LABELS_BASE+TELEM_VSPEED, }; diff --git a/radio/src/translations/tts_de.cpp b/radio/src/translations/tts_de.cpp index 62ff70f31..067de6cca 100644 --- a/radio/src/translations/tts_de.cpp +++ b/radio/src/translations/tts_de.cpp @@ -83,7 +83,7 @@ enum GermanPrompts { DE_PROMPT_ACCELy = DE_PROMPT_LABELS_BASE+TELEM_ACCy, DE_PROMPT_ACCELz = DE_PROMPT_LABELS_BASE+TELEM_ACCz, DE_PROMPT_HDG = DE_PROMPT_LABELS_BASE+TELEM_HDG, - DE_PROMPT_VARIO = DE_PROMPT_LABELS_BASE+TELEM_VSPD, + DE_PROMPT_VARIO = DE_PROMPT_LABELS_BASE+TELEM_VSPEED, }; diff --git a/radio/src/translations/tts_es.cpp b/radio/src/translations/tts_es.cpp index db1e8ff2b..bc949c377 100644 --- a/radio/src/translations/tts_es.cpp +++ b/radio/src/translations/tts_es.cpp @@ -107,7 +107,7 @@ enum SpanishPrompts { ES_PROMPT_ACCELy = ES_PROMPT_LABELS_BASE+TELEM_ACCy, ES_PROMPT_ACCELz = ES_PROMPT_LABELS_BASE+TELEM_ACCz, ES_PROMPT_HDG = ES_PROMPT_LABELS_BASE+TELEM_HDG, - ES_PROMPT_VARIO = ES_PROMPT_LABELS_BASE+TELEM_VSPD, + ES_PROMPT_VARIO = ES_PROMPT_LABELS_BASE+TELEM_VSPEED, }; diff --git a/radio/src/translations/tts_fr.cpp b/radio/src/translations/tts_fr.cpp index 17258042c..4bcaa0723 100644 --- a/radio/src/translations/tts_fr.cpp +++ b/radio/src/translations/tts_fr.cpp @@ -86,7 +86,7 @@ enum FrenchPrompts { FR_PROMPT_ACCELy = FR_PROMPT_LABELS_BASE+TELEM_ACCy, FR_PROMPT_ACCELz = FR_PROMPT_LABELS_BASE+TELEM_ACCz, FR_PROMPT_HDG = FR_PROMPT_LABELS_BASE+TELEM_HDG, - FR_PROMPT_VARIO = FR_PROMPT_LABELS_BASE+TELEM_VSPD, + FR_PROMPT_VARIO = FR_PROMPT_LABELS_BASE+TELEM_VSPEED, FR_PROMPT_VIRGULE_BASE = 180, //,0 - ,9 }; diff --git a/radio/src/translations/tts_it.cpp b/radio/src/translations/tts_it.cpp index b3d90e6b6..e729f4452 100644 --- a/radio/src/translations/tts_it.cpp +++ b/radio/src/translations/tts_it.cpp @@ -79,7 +79,7 @@ enum ItalianPrompts { IT_PROMPT_ACCELy = IT_PROMPT_LABELS_BASE+TELEM_ACCy, IT_PROMPT_ACCELz = IT_PROMPT_LABELS_BASE+TELEM_ACCz, IT_PROMPT_HDG = IT_PROMPT_LABELS_BASE+TELEM_HDG, - IT_PROMPT_VARIO = IT_PROMPT_LABELS_BASE+TELEM_VSPD, + IT_PROMPT_VARIO = IT_PROMPT_LABELS_BASE+TELEM_VSPEED, }; diff --git a/radio/src/translations/tts_pl.cpp b/radio/src/translations/tts_pl.cpp index da5f2ffe6..9b0bef745 100644 --- a/radio/src/translations/tts_pl.cpp +++ b/radio/src/translations/tts_pl.cpp @@ -83,7 +83,7 @@ enum PolishPrompts { PL_PROMPT_ACCELy = PL_PROMPT_LABELS_BASE+TELEM_ACCy, PL_PROMPT_ACCELz = PL_PROMPT_LABELS_BASE+TELEM_ACCz, PL_PROMPT_HDG = PL_PROMPT_LABELS_BASE+TELEM_HDG, - PL_PROMPT_VARIO = PL_PROMPT_LABELS_BASE+TELEM_VSPD, + PL_PROMPT_VARIO = PL_PROMPT_LABELS_BASE+TELEM_VSPEED, }; diff --git a/radio/src/translations/tts_pt.cpp b/radio/src/translations/tts_pt.cpp index f48f59917..cee09ac7b 100644 --- a/radio/src/translations/tts_pt.cpp +++ b/radio/src/translations/tts_pt.cpp @@ -102,7 +102,7 @@ enum PortuguesePrompts { PT_PROMPT_ACCELy = PT_PROMPT_LABELS_BASE+TELEM_ACCy, PT_PROMPT_ACCELz = PT_PROMPT_LABELS_BASE+TELEM_ACCz, PT_PROMPT_HDG = PT_PROMPT_LABELS_BASE+TELEM_HDG, - PT_PROMPT_VARIO = PT_PROMPT_LABELS_BASE+TELEM_VSPD, + PT_PROMPT_VARIO = PT_PROMPT_LABELS_BASE+TELEM_VSPEED, }; diff --git a/radio/src/translations/tts_sk.cpp b/radio/src/translations/tts_sk.cpp index 32d46dcb9..9dc3191c1 100644 --- a/radio/src/translations/tts_sk.cpp +++ b/radio/src/translations/tts_sk.cpp @@ -97,7 +97,7 @@ enum SlovakPrompts { SK_PROMPT_ACCELy = SK_PROMPT_LABELS_BASE+TELEM_ACCy, SK_PROMPT_ACCELz = SK_PROMPT_LABELS_BASE+TELEM_ACCz, SK_PROMPT_HDG = SK_PROMPT_LABELS_BASE+TELEM_HDG, - SK_PROMPT_VARIO = SK_PROMPT_LABELS_BASE+TELEM_VSPD, + SK_PROMPT_VARIO = SK_PROMPT_LABELS_BASE+TELEM_VSPEED, };