From 4e4be8287548fb92c05368598d8ceadd8e6bee88 Mon Sep 17 00:00:00 2001
From: Andre Bernet <andre@andrebernet.ch>
Date: Thu, 2 Apr 2015 23:55:55 +0400
Subject: [PATCH] ft/s unit added

---
 companion/src/modeledit/telemetry_sensor.ui | 5 +++++
 radio/src/myeeprom.h                        | 1 +
 radio/src/telemetry/telemetry.cpp           | 4 ++--
 radio/src/translations/cz.h.txt             | 2 +-
 radio/src/translations/de.h.txt             | 2 +-
 radio/src/translations/en.h.txt             | 2 +-
 radio/src/translations/fr.h.txt             | 2 +-
 radio/src/translations/pl.h.txt             | 2 +-
 radio/src/translations/tts_cz.cpp           | 1 +
 radio/src/translations/tts_de.cpp           | 1 +
 radio/src/translations/tts_en.cpp           | 1 +
 radio/src/translations/tts_es.cpp           | 1 +
 radio/src/translations/tts_fr.cpp           | 1 +
 radio/src/translations/tts_hu.cpp           | 1 +
 radio/src/translations/tts_it.cpp           | 1 +
 radio/src/translations/tts_pl.cpp           | 1 +
 radio/src/translations/tts_pt.cpp           | 1 +
 radio/src/translations/tts_se.cpp           | 1 +
 radio/src/translations/tts_sk.cpp           | 1 +
 19 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/companion/src/modeledit/telemetry_sensor.ui b/companion/src/modeledit/telemetry_sensor.ui
index c00836fb7..09db2719e 100644
--- a/companion/src/modeledit/telemetry_sensor.ui
+++ b/companion/src/modeledit/telemetry_sensor.ui
@@ -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>
diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h
index 373fbd667..738fe467b 100644
--- a/radio/src/myeeprom.h
+++ b/radio/src/myeeprom.h
@@ -1137,6 +1137,7 @@ enum TelemetryUnit {
   UNIT_MILLIAMPS,
   UNIT_KTS,
   UNIT_METERS_PER_SECOND,
+  UNIT_FEET_PER_SECOND,
   UNIT_KMH,
   UNIT_MPH,
   UNIT_METERS,
diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp
index 26f474803..4f7804a76 100644
--- a/radio/src/telemetry/telemetry.cpp
+++ b/radio/src/telemetry/telemetry.cpp
@@ -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;
     }
diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt
index 988b94329..9d6f751f5 100644
--- a/radio/src/translations/cz.h.txt
+++ b/radio/src/translations/cz.h.txt
@@ -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
diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt
index 7ecf75a82..a8048b30d 100644
--- a/radio/src/translations/de.h.txt
+++ b/radio/src/translations/de.h.txt
@@ -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
diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt
index 7db45e790..ba580c793 100644
--- a/radio/src/translations/en.h.txt
+++ b/radio/src/translations/en.h.txt
@@ -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
diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt
index c616dacbd..d127c149d 100644
--- a/radio/src/translations/fr.h.txt
+++ b/radio/src/translations/fr.h.txt
@@ -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
diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt
index d72ceeadb..8453c944b 100644
--- a/radio/src/translations/pl.h.txt
+++ b/radio/src/translations/pl.h.txt
@@ -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
diff --git a/radio/src/translations/tts_cz.cpp b/radio/src/translations/tts_cz.cpp
index f46c10d68..18c094a60 100644
--- a/radio/src/translations/tts_cz.cpp
+++ b/radio/src/translations/tts_cz.cpp
@@ -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
 
 };
diff --git a/radio/src/translations/tts_de.cpp b/radio/src/translations/tts_de.cpp
index c655fd261..cb9c10341 100644
--- a/radio/src/translations/tts_de.cpp
+++ b/radio/src/translations/tts_de.cpp
@@ -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
 
 };
diff --git a/radio/src/translations/tts_en.cpp b/radio/src/translations/tts_en.cpp
index 4b5e93908..c5379cf5b 100644
--- a/radio/src/translations/tts_en.cpp
+++ b/radio/src/translations/tts_en.cpp
@@ -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
diff --git a/radio/src/translations/tts_es.cpp b/radio/src/translations/tts_es.cpp
index b6f74ec88..9f3c45118 100644
--- a/radio/src/translations/tts_es.cpp
+++ b/radio/src/translations/tts_es.cpp
@@ -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
 
 };
diff --git a/radio/src/translations/tts_fr.cpp b/radio/src/translations/tts_fr.cpp
index 82ebcc98c..143f04d17 100644
--- a/radio/src/translations/tts_fr.cpp
+++ b/radio/src/translations/tts_fr.cpp
@@ -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
diff --git a/radio/src/translations/tts_hu.cpp b/radio/src/translations/tts_hu.cpp
index 3d1a28a63..4c743fa27 100644
--- a/radio/src/translations/tts_hu.cpp
+++ b/radio/src/translations/tts_hu.cpp
@@ -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
diff --git a/radio/src/translations/tts_it.cpp b/radio/src/translations/tts_it.cpp
index e178ef73f..b2845a39c 100644
--- a/radio/src/translations/tts_it.cpp
+++ b/radio/src/translations/tts_it.cpp
@@ -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
 
 };
diff --git a/radio/src/translations/tts_pl.cpp b/radio/src/translations/tts_pl.cpp
index 85a0d909b..43712dba5 100644
--- a/radio/src/translations/tts_pl.cpp
+++ b/radio/src/translations/tts_pl.cpp
@@ -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
 };
 
diff --git a/radio/src/translations/tts_pt.cpp b/radio/src/translations/tts_pt.cpp
index 38bcef083..3926d306a 100644
--- a/radio/src/translations/tts_pt.cpp
+++ b/radio/src/translations/tts_pt.cpp
@@ -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
 };
 
diff --git a/radio/src/translations/tts_se.cpp b/radio/src/translations/tts_se.cpp
index a2021ec51..e817f4267 100644
--- a/radio/src/translations/tts_se.cpp
+++ b/radio/src/translations/tts_se.cpp
@@ -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
diff --git a/radio/src/translations/tts_sk.cpp b/radio/src/translations/tts_sk.cpp
index b132ca73a..83732a94b 100644
--- a/radio/src/translations/tts_sk.cpp
+++ b/radio/src/translations/tts_sk.cpp
@@ -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
 
 };