From 2f378d83d6d1ed049226d82300e4e3e0d2d2d0ca Mon Sep 17 00:00:00 2001 From: Executive Date: Fri, 9 Oct 2015 20:14:25 +0100 Subject: [PATCH] Corrected ambiguity in ZSTR_TEMP referring to both TEMP1_ID and TEMP2_ID. --- radio/src/telemetry/frsky_d_arm.cpp | 4 ++-- radio/src/telemetry/frsky_sport.cpp | 3 ++- radio/src/translations/cz.h.txt | 3 ++- radio/src/translations/de.h.txt | 3 ++- radio/src/translations/en.h.txt | 3 ++- radio/src/translations/es.h.txt | 3 ++- radio/src/translations/fi.h.txt | 3 ++- radio/src/translations/fr.h.txt | 3 ++- radio/src/translations/it.h.txt | 3 ++- radio/src/translations/nl.h.txt | 3 ++- radio/src/translations/pl.h.txt | 3 ++- radio/src/translations/pt.h.txt | 3 ++- radio/src/translations/se.h.txt | 3 ++- 13 files changed, 26 insertions(+), 14 deletions(-) diff --git a/radio/src/telemetry/frsky_d_arm.cpp b/radio/src/telemetry/frsky_d_arm.cpp index d94138822..eadcae3fa 100644 --- a/radio/src/telemetry/frsky_d_arm.cpp +++ b/radio/src/telemetry/frsky_d_arm.cpp @@ -116,8 +116,8 @@ const FrSkyDSensor frskyDSensors[] = { { D_A2_ID, ZSTR_A2, UNIT_VOLTS, 1 }, { RPM_ID, ZSTR_RPM, UNIT_RPMS, 0 }, { FUEL_ID, ZSTR_FUEL, UNIT_PERCENT, 0 }, - { TEMP1_ID, ZSTR_TEMP, UNIT_CELSIUS, 0 }, - { TEMP2_ID, ZSTR_TEMP, UNIT_CELSIUS, 0 }, + { TEMP1_ID, ZSTR_TEMP1, UNIT_CELSIUS, 0 }, + { TEMP2_ID, ZSTR_TEMP2, UNIT_CELSIUS, 0 }, { CURRENT_ID, ZSTR_CURR, UNIT_AMPS, 1 }, { ACCEL_X_ID, ZSTR_ACCX, UNIT_G, 3 }, { ACCEL_Y_ID, ZSTR_ACCY, UNIT_G, 3 }, diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp index b2f6930d5..1394d9081 100644 --- a/radio/src/telemetry/frsky_sport.cpp +++ b/radio/src/telemetry/frsky_sport.cpp @@ -64,7 +64,8 @@ const FrSkySportSensor sportSensors[] = { { A3_FIRST_ID, A3_LAST_ID, ZSTR_A3, UNIT_VOLTS, 2 }, { A4_FIRST_ID, A4_LAST_ID, ZSTR_A4, UNIT_VOLTS, 2 }, { BATT_ID, BATT_ID, ZSTR_BATT, UNIT_VOLTS, 1 }, - { T1_FIRST_ID, T2_LAST_ID, ZSTR_TEMP, UNIT_CELSIUS, 0 }, + { T1_FIRST_ID, T1_LAST_ID, ZSTR_TEMP1, UNIT_CELSIUS, 0 }, + { T2_FIRST_ID, T2_LAST_ID, ZSTR_TEMP2, UNIT_CELSIUS, 0 }, { RPM_FIRST_ID, RPM_LAST_ID, ZSTR_RPM, UNIT_RPMS, 0 }, { FUEL_FIRST_ID, FUEL_LAST_ID, ZSTR_FUEL, UNIT_PERCENT, 0 }, { ALT_FIRST_ID, ALT_LAST_ID, ZSTR_ALT, UNIT_METERS, 2 }, diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 64fa05a9e..bc404cc32 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -1111,7 +1111,8 @@ #define ZSTR_A4 "A4" #define ZSTR_BATT "RxBt" #define ZSTR_ALT "Alt" -#define ZSTR_TEMP "Temp" +#define ZSTR_TEMP1 "Tmp1" +#define ZSTR_TEMP2 "Tmp2" #define ZSTR_RPM "RPM" #define ZSTR_FUEL "Fuel" #define ZSTR_VSPD "VSpd" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index fe92950c8..5360c51bf 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -1115,7 +1115,8 @@ #define ZSTR_A4 "A4" #define ZSTR_BATT "RxBt" #define ZSTR_ALT "Alt" -#define ZSTR_TEMP "Temp" +#define ZSTR_TEMP1 "Tmp1" +#define ZSTR_TEMP2 "Tmp2" #define ZSTR_RPM "RPM" #define ZSTR_FUEL "Fuel" #define ZSTR_VSPD "VSpd" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 4f6ddb12f..4936d8d44 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -1110,7 +1110,8 @@ #define ZSTR_A4 "A4" #define ZSTR_BATT "RxBt" #define ZSTR_ALT "Alt" -#define ZSTR_TEMP "Temp" +#define ZSTR_TEMP1 "Tmp1" +#define ZSTR_TEMP2 "Tmp2" #define ZSTR_RPM "RPM" #define ZSTR_FUEL "Fuel" #define ZSTR_VSPD "VSpd" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 453989119..d09331755 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -1065,7 +1065,8 @@ #define ZSTR_A4 "A4" #define ZSTR_BATT "RxBt" #define ZSTR_ALT "Alt" -#define ZSTR_TEMP "Temp" +#define ZSTR_TEMP1 "Tmp1" +#define ZSTR_TEMP2 "Tmp2" #define ZSTR_RPM "RPM" #define ZSTR_FUEL "Fuel" #define ZSTR_VSPD "VSpd" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 5971630bc..65c8a1840 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -1065,7 +1065,8 @@ #define ZSTR_A4 "A4" #define ZSTR_BATT "RxBt" #define ZSTR_ALT "Alt" -#define ZSTR_TEMP "Temp" +#define ZSTR_TEMP1 "Tmp1" +#define ZSTR_TEMP2 "Tmp2" #define ZSTR_RPM "RPM" #define ZSTR_FUEL "Fuel" #define ZSTR_VSPD "VSpd" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 205947a98..7ec9a6eaf 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -1102,7 +1102,8 @@ #define ZSTR_A4 "A4" #define ZSTR_BATT "BtRx" #define ZSTR_ALT "Alt" -#define ZSTR_TEMP "Temp" +#define ZSTR_TEMP1 "Tmp1" +#define ZSTR_TEMP2 "Tmp2" #define ZSTR_RPM "RPM" #define ZSTR_FUEL "Fuel" #define ZSTR_VSPD "VSpd" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index de460532e..ab26bbf76 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -1113,7 +1113,8 @@ #define ZSTR_A4 "A4" #define ZSTR_BATT "RxBt" #define ZSTR_ALT "Alt" -#define ZSTR_TEMP "Temp" +#define ZSTR_TEMP1 "Tmp1" +#define ZSTR_TEMP2 "Tmp2" #define ZSTR_RPM "RPM" #define ZSTR_FUEL "Fuel" #define ZSTR_VSPD "VSpd" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index 737f51d07..6155920dc 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -1133,7 +1133,8 @@ #define ZSTR_A4 "A4" #define ZSTR_BATT "RxBt" #define ZSTR_ALT "Alt" -#define ZSTR_TEMP "Temp" +#define ZSTR_TEMP1 "Tmp1" +#define ZSTR_TEMP2 "Tmp2" #define ZSTR_RPM "RPM" #define ZSTR_FUEL "Fuel" #define ZSTR_VSPD "VSpd" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 8e08b12a3..8e4b2344d 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -1114,7 +1114,8 @@ #define ZSTR_A4 "A4" #define ZSTR_BATT "RxBt" #define ZSTR_ALT "Alt" -#define ZSTR_TEMP "Temp" +#define ZSTR_TEMP1 "Tmp1" +#define ZSTR_TEMP2 "Tmp2" #define ZSTR_RPM "RPM" #define ZSTR_FUEL "Fuel" #define ZSTR_VSPD "VSpd" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index f43e8bb85..a7bf22fbe 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -1065,7 +1065,8 @@ #define ZSTR_A4 "A4" #define ZSTR_BATT "RxBt" #define ZSTR_ALT "Alt" -#define ZSTR_TEMP "Temp" +#define ZSTR_TEMP1 "Tmp1" +#define ZSTR_TEMP2 "Tmp2" #define ZSTR_RPM "RPM" #define ZSTR_FUEL "Fuel" #define ZSTR_VSPD "VSpd" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index e5ff44a7a..690c6b2d2 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -1065,7 +1065,8 @@ #define ZSTR_A4 "A4" #define ZSTR_BATT "RxBt" #define ZSTR_ALT "Alt" -#define ZSTR_TEMP "Temp" +#define ZSTR_TEMP1 "Tmp1" +#define ZSTR_TEMP2 "Tmp2" #define ZSTR_RPM "RPM" #define ZSTR_FUEL "Fuel" #define ZSTR_VSPD "VSpd"