piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

ft/s unit added

Browse Source
This commit is contained in:
Andre Bernet
2015-04-02 23:55:55 +04:00
parent 7000d3bf82
commit 4e4be82875
19 changed files with 24 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/modeledit/telemetry_sensor.ui
+5
View File
@@ -384,6 +384,11 @@
<string>Speed (m/s)</string>
</property>
</item>
<item>
<property name="text">
<string>Speed (ft/s)</string>
</property>
</item>
<item>
<property name="text">
<string>Speed (km/h)</string>
radio/src/myeeprom.h
+1
View File
@@ -1137,6 +1137,7 @@ enum TelemetryUnit {
UNIT_MILLIAMPS,
UNIT_KTS,
UNIT_METERS_PER_SECOND,
UNIT_FEET_PER_SECOND,
UNIT_KMH,
UNIT_MPH,
UNIT_METERS,
radio/src/telemetry/telemetry.cpp
+2 -2
View File
@@ -543,8 +543,8 @@ int32_t convertTelemetryValue(int32_t value, uint8_t unit, uint8_t prec, uint8_t
for (int i=prec; i<destPrec; i++)
value *= 10;
if (unit == UNIT_METERS) {
if (destUnit == UNIT_FEET) {
if (unit == UNIT_METERS || unit == UNIT_METERS_PER_SECOND) {
if (destUnit == UNIT_FEET || destUnit == UNIT_FEET_PER_SECOND) {
// m to ft *105/32
value = (value * 105) / 32;
}
radio/src/translations/cz.h.txt
+1 -1
View File
@@ -373,7 +373,7 @@
#define LEN_VUNITSSYSTEM TR("\006", "\010")
#define TR_VUNITSSYSTEM TR("Metr.\0""Imper.", "Metrické""Imperial")
#define LEN_VTELEMUNIT "\003"
#define TR_VTELEMUNIT "-\0 ""v\0 ""A\0 ""mA\0""kts""m/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dBm""rpm""g\0 ""@\0 ""ml\0""fOz"
#define TR_VTELEMUNIT "-\0 ""v\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dBm""rpm""g\0 ""@\0 ""ml\0""fOz"
#else
#if defined(IMPERIAL_UNITS)
#define LENGTH_UNIT LENGTH_UNIT_IMP
radio/src/translations/de.h.txt
+1 -1
View File
@@ -375,7 +375,7 @@
#define LEN_VUNITSSYSTEM TR("\006", "\012")
#define TR_VUNITSSYSTEM TR("Metrik""Imper.", "Metrisch\0 ""Imperial\0 ")
#define LEN_VTELEMUNIT "\003"
#define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dBm""rpm""g\0 ""@\0 ""ml\0""fOz"
#define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dBm""rpm""g\0 ""@\0 ""ml\0""fOz"
#else
#if defined(IMPERIAL_UNITS)
#define LENGTH_UNIT LENGTH_UNIT_IMP
radio/src/translations/en.h.txt
+1 -1
View File
@@ -375,7 +375,7 @@
#define LEN_VUNITSSYSTEM TR("\006", "\010")
#define TR_VUNITSSYSTEM TR("Metric""Imper.", "Metric\0 ""Imperial")
#define LEN_VTELEMUNIT "\003"
#define TR_VTELEMUNIT "-\0 ""v\0 ""A\0 ""mA\0""kts""m/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dBm""rpm""g\0 ""@\0 ""ml\0""fOz"
#define TR_VTELEMUNIT "-\0 ""v\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dBm""rpm""g\0 ""@\0 ""ml\0""fOz"
#else
#if defined(IMPERIAL_UNITS)
#define LENGTH_UNIT LENGTH_UNIT_IMP
radio/src/translations/fr.h.txt
+1 -1
View File
@@ -375,7 +375,7 @@
#define LEN_VUNITSSYSTEM TR("\006", "\012")
#define TR_VUNITSSYSTEM TR("Métr.\0""Impér.", "Métriques\0""Impériales")
#define LEN_VTELEMUNIT "\003"
#define TR_VTELEMUNIT "-\0 ""v\0 ""A\0 ""mA\0""kts""m/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dBm""rpm""g\0 ""@\0 ""ml\0""fOz"
#define TR_VTELEMUNIT "-\0 ""v\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dBm""rpm""g\0 ""@\0 ""ml\0""fOz"
#else
#if defined(IMPERIAL_UNITS)
#define LENGTH_UNIT LENGTH_UNIT_IMP
radio/src/translations/pl.h.txt
+1 -1
View File
@@ -365,7 +365,7 @@
#define LEN_VUNITSSYSTEM TR("\006", "\010")
#define TR_VUNITSSYSTEM TR("Metr. ""Imper.", "Metryczn""Imperial")
#define LEN_VTELEMUNIT "\003"
#define TR_VTELEMUNIT "-\0 ""v\0 ""A\0 ""mA\0""kts""m/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dBm""rpm""g\0 ""@\0 ""ml\0""fOz"
#define TR_VTELEMUNIT "-\0 ""v\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dBm""rpm""g\0 ""@\0 ""ml\0""fOz"
#else
#if defined(IMPERIAL_UNITS)
#define LENGTH_UNIT LENGTH_UNIT_IMP
radio/src/translations/tts_cz.cpp
+1
View File
@@ -59,6 +59,7 @@ enum CzechPrompts {
#if defined(CPUARM)
CZ_PROMPT_MILLILITERS = CZ_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*4),
CZ_PROMPT_FLOZ = CZ_PROMPT_UNITS_BASE+(UNIT_FLOZ*4),
CZ_PROMPT_FEET_PER_SECOND = CZ_PROMPT_UNITS_BASE+(UNIT_FEET_PER_SECOND*4),
#endif
};
radio/src/translations/tts_de.cpp
+1
View File
@@ -60,6 +60,7 @@ enum GermanPrompts {
#if defined(CPUARM)
DE_PROMPT_MILLILITERS = DE_PROMPT_UNITS_BASE+UNIT_MILLILITERS,
DE_PROMPT_FLOZ = DE_PROMPT_UNITS_BASE+UNIT_FLOZ,
DE_PROMPT_FEET_PER_SECOND = DE_PROMPT_UNITS_BASE+UNIT_FEET_PER_SECOND,
#endif
};
radio/src/translations/tts_en.cpp
+1
View File
@@ -68,6 +68,7 @@ enum EnglishPrompts {
#if defined(CPUARM)
EN_PROMPT_MILLILITERS = EN_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*2),
EN_PROMPT_FLOZ = EN_PROMPT_UNITS_BASE+(UNIT_FLOZ*2),
EN_PROMPT_FEET_PER_SECOND = EN_PROMPT_UNITS_BASE+(UNIT_FEET_PER_SECOND*2),
#endif
EN_PROMPT_POINT_BASE = 160, //.0 - .9
radio/src/translations/tts_es.cpp
+1
View File
@@ -84,6 +84,7 @@ enum SpanishPrompts {
#if defined(CPUARM)
ES_PROMPT_MILLILITERS = ES_PROMPT_UNITS_BASE+UNIT_MILLILITERS,
ES_PROMPT_FLOZ = ES_PROMPT_UNITS_BASE+UNIT_FLOZ,
ES_PROMPT_FEET_PER_SECOND = ES_PROMPT_UNITS_BASE+UNIT_FEET_PER_SECOND,
#endif
};
radio/src/translations/tts_fr.cpp
+1
View File
@@ -67,6 +67,7 @@ enum FrenchPrompts {
#if defined(CPUARM)
FR_PROMPT_MILLILITERS = FR_PROMPT_UNITS_BASE+UNIT_MILLILITERS,
FR_PROMPT_FLOZ = FR_PROMPT_UNITS_BASE+UNIT_FLOZ,
FR_PROMPT_FEET_PER_SECOND = FR_PROMPT_UNITS_BASE+UNIT_FEET_PER_SECOND,
#endif
FR_PROMPT_VIRGULE_BASE = 180, //,0 - ,9
radio/src/translations/tts_hu.cpp
+1
View File
@@ -68,6 +68,7 @@ enum HungarianPrompts {
#if defined(CPUARM)
HU_PROMPT_MILLILITERS = HU_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*2),
HU_PROMPT_FLOZ = HU_PROMPT_UNITS_BASE+(UNIT_FLOZ*2),
HU_PROMPT_FEET_PER_SECOND = HU_PROMPT_UNITS_BASE+(UNIT_FEET_PER_SECOND*2),
#endif
HU_PROMPT_POINT_BASE = 160, //.0 - .9
radio/src/translations/tts_it.cpp
+1
View File
@@ -56,6 +56,7 @@ enum ItalianPrompts {
#if defined(CPUARM)
IT_PROMPT_MILLILITERS = IT_PROMPT_UNITS_BASE+UNIT_MILLILITERS,
IT_PROMPT_FLOZ = IT_PROMPT_UNITS_BASE+UNIT_FLOZ,
IT_PROMPT_FEET_PER_SECOND = IT_PROMPT_UNITS_BASE+UNIT_FEET_PER_SECOND,
#endif
};
radio/src/translations/tts_pl.cpp
+1
View File
@@ -61,6 +61,7 @@ enum PolishPrompts {
#if defined(CPUARM)
PL_PROMPT_MILLILITERS = PL_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*4),
PL_PROMPT_FLOZ = PL_PROMPT_UNITS_BASE+(UNIT_FLOZ*4),
PL_PROMPT_FEET_PER_SECOND = PL_PROMPT_UNITS_BASE+(UNIT_FEET_PER_SECOND*4),
#endif
};
radio/src/translations/tts_pt.cpp
+1
View File
@@ -79,6 +79,7 @@ enum PortuguesePrompts {
#if defined(CPUARM)
PT_PROMPT_MILLILITERS = PT_PROMPT_UNITS_BASE+UNIT_MILLILITERS,
PT_PROMPT_FLOZ = PT_PROMPT_UNITS_BASE+UNIT_FLOZ,
PT_PROMPT_FEET_PER_SECOND = PT_PROMPT_UNITS_BASE+UNIT_FEET_PER_SECOND,
#endif
};
radio/src/translations/tts_se.cpp
+1
View File
@@ -69,6 +69,7 @@ enum SwedishPrompts {
#if defined(CPUARM)
SE_PROMPT_MILLILITERS = SE_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*2),
SE_PROMPT_FLOZ = SE_PROMPT_UNITS_BASE+(UNIT_FLOZ*2),
SE_PROMPT_FEET_PER_SECOND = SE_PROMPT_UNITS_BASE+(UNIT_FEET_PER_SECOND*2),
#endif
SE_PROMPT_POINT_BASE = 160, //.0 - .9
radio/src/translations/tts_sk.cpp
+1
View File
@@ -74,6 +74,7 @@ enum SlovakPrompts {
#if defined(CPUARM)
SK_PROMPT_MILLILITERS = SK_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*4),
SK_PROMPT_FLOZ = SK_PROMPT_UNITS_BASE+(UNIT_FLOZ*4),
SK_PROMPT_FEET_PER_SECOND = SK_PROMPT_UNITS_BASE+(UNIT_FEET_PER_SECOND*4),
#endif
};