Corrected ambiguity in ZSTR_TEMP referring to both TEMP1_ID and TEMP2_ID.

This commit is contained in:
Executive
2015-10-12 14:13:43 +01:00
parent 0d9f011a4e
commit 2f378d83d6
13 changed files with 26 additions and 14 deletions
+2 -2
View File
@@ -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 },
+2 -1
View File
@@ -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 },
+2 -1
View File
@@ -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"
+2 -1
View File
@@ -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"
+2 -1
View File
@@ -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"
+2 -1
View File
@@ -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"
+2 -1
View File
@@ -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"
+2 -1
View File
@@ -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"
+2 -1
View File
@@ -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"
+2 -1
View File
@@ -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"
+2 -1
View File
@@ -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"
+2 -1
View File
@@ -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"
+2 -1
View File
@@ -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"