Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-25 17:25:13 +03:00
Code Issues Wiki Activity

Wrong unit used with ASpeed+

Browse source
This commit is contained in:
bsongis 2014-04-17 11:12:10 +02:00
parent c2119f0b22
commit 37960e6a9d
12 changed files with 21 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
radio/src/eeprom_conversions.cpp
View file

@ -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)

5
radio/src/lcd.cpp
View file

@ -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;

4
radio/src/myeeprom.h
View file

@ -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,

13
radio/src/opentx.cpp
View file

@ -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;

2
radio/src/translations/tts_cz.cpp
View file

@ -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,
};

2
radio/src/translations/tts_de.cpp
View file

@ -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,
};

2
radio/src/translations/tts_es.cpp
View file

@ -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,
};

2
radio/src/translations/tts_fr.cpp
View file

@ -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
};

2
radio/src/translations/tts_it.cpp
View file

@ -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,
};

2
radio/src/translations/tts_pl.cpp
View file

@ -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,
};

2
radio/src/translations/tts_pt.cpp
View file

@ -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,
};

2
radio/src/translations/tts_sk.cpp
View file

@ -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,
};