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

[RedundancyBus] Fields renamed (not PowerBox anymore)

Browse Source
This commit is contained in:
Bertrand Songis
2016-02-21 10:00:01 +01:00
parent 71e54b3072
commit dcf7cd2c65
12 changed files with 88 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/telemetry/frsky_sport.cpp
+6 -6
View File
@@ -68,12 +68,12 @@ const FrSkySportSensor sportSensors[] = {
{ GPS_LONG_LATI_FIRST_ID, GPS_LONG_LATI_LAST_ID, 0, ZSTR_GPS, UNIT_GPS, 0 },
{ FUEL_QTY_FIRST_ID, FUEL_QTY_LAST_ID, 0, ZSTR_FUEL, UNIT_MILLILITERS, 2 },
{ GPS_COURS_FIRST_ID, GPS_COURS_LAST_ID, 0, ZSTR_HDG, UNIT_DEGREE, 2 },
{ POWERBOX_BATT1_FIRST_ID, POWERBOX_BATT1_LAST_ID, 0, ZSTR_PBOX1, UNIT_VOLTS, 3 },
{ POWERBOX_BATT2_FIRST_ID, POWERBOX_BATT2_LAST_ID, 0, ZSTR_PBOX2, UNIT_VOLTS, 3 },
{ POWERBOX_BATT1_FIRST_ID, POWERBOX_BATT1_LAST_ID, 1, ZSTR_PBOX1, UNIT_AMPS, 2 },
{ POWERBOX_BATT2_FIRST_ID, POWERBOX_BATT2_LAST_ID, 1, ZSTR_PBOX2, UNIT_AMPS, 2 },
{ POWERBOX_CNSP_FIRST_ID, POWERBOX_CNSP_LAST_ID, 0, ZSTR_PBOX1, UNIT_MAH, 0 },
{ POWERBOX_CNSP_FIRST_ID, POWERBOX_CNSP_LAST_ID, 1, ZSTR_PBOX2, UNIT_MAH, 0 },
{ POWERBOX_BATT1_FIRST_ID, POWERBOX_BATT1_LAST_ID, 0, ZSTR_BATT1_VOLTAGE, UNIT_VOLTS, 3 },
{ POWERBOX_BATT2_FIRST_ID, POWERBOX_BATT2_LAST_ID, 0, ZSTR_BATT2_VOLTAGE, UNIT_VOLTS, 3 },
{ POWERBOX_BATT1_FIRST_ID, POWERBOX_BATT1_LAST_ID, 1, ZSTR_BATT1_CURRENT, UNIT_AMPS, 2 },
{ POWERBOX_BATT2_FIRST_ID, POWERBOX_BATT2_LAST_ID, 1, ZSTR_BATT2_CURRENT, UNIT_AMPS, 2 },
{ POWERBOX_CNSP_FIRST_ID, POWERBOX_CNSP_LAST_ID, 0, ZSTR_BATT1_CONSUMPTION, UNIT_MAH, 0 },
{ POWERBOX_CNSP_FIRST_ID, POWERBOX_CNSP_LAST_ID, 1, ZSTR_BATT2_CONSUMPTION, UNIT_MAH, 0 },
{ POWERBOX_STATE_FIRST_ID, POWERBOX_STATE_LAST_ID, 0, ZSTR_RX1_FAILSAFE, UNIT_RAW, 0 },
{ POWERBOX_STATE_FIRST_ID, POWERBOX_STATE_LAST_ID, 1, ZSTR_RX1_LOSTFRAME, UNIT_RAW, 0 },
{ POWERBOX_STATE_FIRST_ID, POWERBOX_STATE_LAST_ID, 2, ZSTR_RX2_FAILSAFE, UNIT_RAW, 0 },
radio/src/translations/cz.h.txt
+6 -2
View File
@@ -1145,8 +1145,12 @@
#define ZSTR_GPSALT "GAlt"
#define ZSTR_GPSDATETIME "Date"
#define ZSTR_GPS "GPS"
#define ZSTR_PBOX1 "PBx1"
#define ZSTR_PBOX2 "PBx2"
#define ZSTR_BATT1_VOLTAGE "RB1V"
#define ZSTR_BATT2_VOLTAGE "RB2V"
#define ZSTR_BATT1_CURRENT "RB1A"
#define ZSTR_BATT2_CURRENT "RB2A"
#define ZSTR_BATT1_CONSUMPTION "RB1C"
#define ZSTR_BATT2_CONSUMPTION "RB2C"
#define ZSTR_RX1_FAILSAFE "Rx1F"
#define ZSTR_RX1_LOSTFRAME "Rx1L"
#define ZSTR_RX1_CONN_LOST "Rx1C"
radio/src/translations/de.h.txt
+10 -6
View File
@@ -1102,10 +1102,10 @@
#define TR_STOP_DISCOVER_SENSORS INDENT "Stop Sensorsuche"
#define TR_DELETE_ALL_SENSORS INDENT "Lösche alle Sensoren"
#define TR_CONFIRMDELETE "Wirklich alle löschen?"
#define TR_SELECT_WIDGET "Select widget"
#define TR_REMOVE_WIDGET "Remove widget"
#define TR_WIDGET_SETTINGS "Widget settings"
#define TR_REMOVE_SCREEN "Remove screen"
#define TR_SELECT_WIDGET "Select widget"
#define TR_REMOVE_WIDGET "Remove widget"
#define TR_WIDGET_SETTINGS "Widget settings"
#define TR_REMOVE_SCREEN "Remove screen"
// ----------------------------- Symbole für Auswahlliste----------
#define TR_MENU_INPUTS "\314Inputs"
#define TR_MENU_LUA "\322Lua Scripte"
@@ -1148,8 +1148,12 @@
#define ZSTR_GPSALT "GAlt"
#define ZSTR_GPSDATETIME "Date"
#define ZSTR_GPS "GPS"
#define ZSTR_PBOX1 "PBx1"
#define ZSTR_PBOX2 "PBx2"
#define ZSTR_BATT1_VOLTAGE "RB1V"
#define ZSTR_BATT2_VOLTAGE "RB2V"
#define ZSTR_BATT1_CURRENT "RB1A"
#define ZSTR_BATT2_CURRENT "RB2A"
#define ZSTR_BATT1_CONSUMPTION "RB1C"
#define ZSTR_BATT2_CONSUMPTION "RB2C"
#define ZSTR_RX1_FAILSAFE "Rx1F"
#define ZSTR_RX1_LOSTFRAME "Rx1L"
#define ZSTR_RX1_CONN_LOST "Rx1C"
radio/src/translations/en.h.txt
+6 -2
View File
@@ -1174,8 +1174,12 @@
#define ZSTR_GPSALT "GAlt"
#define ZSTR_GPSDATETIME "Date"
#define ZSTR_GPS "GPS"
#define ZSTR_PBOX1 "PBx1"
#define ZSTR_PBOX2 "PBx2"
#define ZSTR_BATT1_VOLTAGE "RB1V"
#define ZSTR_BATT2_VOLTAGE "RB2V"
#define ZSTR_BATT1_CURRENT "RB1A"
#define ZSTR_BATT2_CURRENT "RB2A"
#define ZSTR_BATT1_CONSUMPTION "RB1C"
#define ZSTR_BATT2_CONSUMPTION "RB2C"
#define ZSTR_RX1_FAILSAFE "Rx1F"
#define ZSTR_RX1_LOSTFRAME "Rx1L"
#define ZSTR_RX1_CONN_LOST "Rx1C"
radio/src/translations/es.h.txt
+6 -2
View File
@@ -1100,8 +1100,12 @@
#define ZSTR_GPSALT "GAlt"
#define ZSTR_GPSDATETIME "Date"
#define ZSTR_GPS "GPS"
#define ZSTR_PBOX1 "PBx1"
#define ZSTR_PBOX2 "PBx2"
#define ZSTR_BATT1_VOLTAGE "RB1V"
#define ZSTR_BATT2_VOLTAGE "RB2V"
#define ZSTR_BATT1_CURRENT "RB1A"
#define ZSTR_BATT2_CURRENT "RB2A"
#define ZSTR_BATT1_CONSUMPTION "RB1C"
#define ZSTR_BATT2_CONSUMPTION "RB2C"
#define ZSTR_RX1_FAILSAFE "Rx1F"
#define ZSTR_RX1_LOSTFRAME "Rx1L"
#define ZSTR_RX1_CONN_LOST "Rx1C"
radio/src/translations/fi.h.txt
+6 -2
View File
@@ -1100,8 +1100,12 @@
#define ZSTR_GPSALT "GAlt"
#define ZSTR_GPSDATETIME "Date"
#define ZSTR_GPS "GPS"
#define ZSTR_PBOX1 "PBx1"
#define ZSTR_PBOX2 "PBx2"
#define ZSTR_BATT1_VOLTAGE "RB1V"
#define ZSTR_BATT2_VOLTAGE "RB2V"
#define ZSTR_BATT1_CURRENT "RB1A"
#define ZSTR_BATT2_CURRENT "RB2A"
#define ZSTR_BATT1_CONSUMPTION "RB1C"
#define ZSTR_BATT2_CONSUMPTION "RB2C"
#define ZSTR_RX1_FAILSAFE "Rx1F"
#define ZSTR_RX1_LOSTFRAME "Rx1L"
#define ZSTR_RX1_CONN_LOST "Rx1C"
radio/src/translations/fr.h.txt
+6 -2
View File
@@ -1135,8 +1135,12 @@
#define ZSTR_GPSALT "GAlt"
#define ZSTR_GPSDATETIME "Date"
#define ZSTR_GPS "GPS"
#define ZSTR_PBOX1 "PBx1"
#define ZSTR_PBOX2 "PBx2"
#define ZSTR_BATT1_VOLTAGE "RB1V"
#define ZSTR_BATT2_VOLTAGE "RB2V"
#define ZSTR_BATT1_CURRENT "RB1A"
#define ZSTR_BATT2_CURRENT "RB2A"
#define ZSTR_BATT1_CONSUMPTION "RB1C"
#define ZSTR_BATT2_CONSUMPTION "RB2C"
#define ZSTR_RX1_FAILSAFE "Rx1F"
#define ZSTR_RX1_LOSTFRAME "Rx1L"
#define ZSTR_RX1_CONN_LOST "Rx1C"
radio/src/translations/it.h.txt
+10 -6
View File
@@ -1101,10 +1101,10 @@
#define TR_STOP_DISCOVER_SENSORS INDENT "Ferma ricerca.."
#define TR_DELETE_ALL_SENSORS INDENT "Elimina tutti i sensori"
#define TR_CONFIRMDELETE "Confermi eliminazione?"
#define TR_SELECT_WIDGET "Select widget"
#define TR_REMOVE_WIDGET "Remove widget"
#define TR_WIDGET_SETTINGS "Widget settings"
#define TR_REMOVE_SCREEN "Remove screen"
#define TR_SELECT_WIDGET "Select widget"
#define TR_REMOVE_WIDGET "Remove widget"
#define TR_WIDGET_SETTINGS "Widget settings"
#define TR_REMOVE_SCREEN "Remove screen"
#define TR_MENU_INPUTS "\314Ingressi"
#define TR_MENU_LUA "\322Lua scripts"
@@ -1147,8 +1147,12 @@
#define ZSTR_GPSALT "GAlt"
#define ZSTR_GPSDATETIME "Data"
#define ZSTR_GPS "GPS"
#define ZSTR_PBOX1 "PBx1"
#define ZSTR_PBOX2 "PBx2"
#define ZSTR_BATT1_VOLTAGE "RB1V"
#define ZSTR_BATT2_VOLTAGE "RB2V"
#define ZSTR_BATT1_CURRENT "RB1A"
#define ZSTR_BATT2_CURRENT "RB2A"
#define ZSTR_BATT1_CONSUMPTION "RB1C"
#define ZSTR_BATT2_CONSUMPTION "RB2C"
#define ZSTR_RX1_FAILSAFE "Rx1F"
#define ZSTR_RX1_LOSTFRAME "Rx1L"
#define ZSTR_RX1_CONN_LOST "Rx1C"
radio/src/translations/nl.h.txt
+6 -2
View File
@@ -1167,8 +1167,12 @@
#define ZSTR_GPSALT "GAlt"
#define ZSTR_GPSDATETIME "Date"
#define ZSTR_GPS "GPS"
#define ZSTR_PBOX1 "PBx1"
#define ZSTR_PBOX2 "PBx2"
#define ZSTR_BATT1_VOLTAGE "RB1V"
#define ZSTR_BATT2_VOLTAGE "RB2V"
#define ZSTR_BATT1_CURRENT "RB1A"
#define ZSTR_BATT2_CURRENT "RB2A"
#define ZSTR_BATT1_CONSUMPTION "RB1C"
#define ZSTR_BATT2_CONSUMPTION "RB2C"
#define ZSTR_RX1_FAILSAFE "Rx1F"
#define ZSTR_RX1_LOSTFRAME "Rx1L"
#define ZSTR_RX1_CONN_LOST "Rx1C"
radio/src/translations/pl.h.txt
+6 -2
View File
@@ -1148,8 +1148,12 @@
#define ZSTR_GPSALT "GAlt"
#define ZSTR_GPSDATETIME "Date"
#define ZSTR_GPS "GPS"
#define ZSTR_PBOX1 "PBx1"
#define ZSTR_PBOX2 "PBx2"
#define ZSTR_BATT1_VOLTAGE "RB1V"
#define ZSTR_BATT2_VOLTAGE "RB2V"
#define ZSTR_BATT1_CURRENT "RB1A"
#define ZSTR_BATT2_CURRENT "RB2A"
#define ZSTR_BATT1_CONSUMPTION "RB1C"
#define ZSTR_BATT2_CONSUMPTION "RB2C"
#define ZSTR_RX1_FAILSAFE "Rx1F"
#define ZSTR_RX1_LOSTFRAME "Rx1L"
#define ZSTR_RX1_CONN_LOST "Rx1C"
radio/src/translations/pt.h.txt
+10 -6
View File
@@ -1048,10 +1048,10 @@
#define TR_STOP_DISCOVER_SENSORS INDENT "Stop discovery"
#define TR_DELETE_ALL_SENSORS INDENT "Delete all sensors"
#define TR_CONFIRMDELETE "Really delete all?"
#define TR_SELECT_WIDGET "Select widget"
#define TR_REMOVE_WIDGET "Remove widget"
#define TR_WIDGET_SETTINGS "Widget settings"
#define TR_REMOVE_SCREEN "Remove screen"
#define TR_SELECT_WIDGET "Select widget"
#define TR_REMOVE_WIDGET "Remove widget"
#define TR_WIDGET_SETTINGS "Widget settings"
#define TR_REMOVE_SCREEN "Remove screen"
#define TR_MENU_INPUTS "\314Inputs"
#define TR_MENU_LUA "\322Lua scripts"
@@ -1094,8 +1094,12 @@
#define ZSTR_GPSALT "GAlt"
#define ZSTR_GPSDATETIME "Date"
#define ZSTR_GPS "GPS"
#define ZSTR_PBOX1 "PBx1"
#define ZSTR_PBOX2 "PBx2"
#define ZSTR_BATT1_VOLTAGE "RB1V"
#define ZSTR_BATT2_VOLTAGE "RB2V"
#define ZSTR_BATT1_CURRENT "RB1A"
#define ZSTR_BATT2_CURRENT "RB2A"
#define ZSTR_BATT1_CONSUMPTION "RB1C"
#define ZSTR_BATT2_CONSUMPTION "RB2C"
#define ZSTR_RX1_FAILSAFE "Rx1F"
#define ZSTR_RX1_LOSTFRAME "Rx1L"
#define ZSTR_RX1_CONN_LOST "Rx1C"
radio/src/translations/se.h.txt
+10 -6
View File
@@ -1125,10 +1125,10 @@
#define TR_STOP_DISCOVER_SENSORS INDENT "Avbryt sökning"
#define TR_DELETE_ALL_SENSORS INDENT "Ta bort alla sensorer"
#define TR_CONFIRMDELETE "Ta bort alla?"
#define TR_SELECT_WIDGET "Select widget"
#define TR_REMOVE_WIDGET "Remove widget"
#define TR_WIDGET_SETTINGS "Widget settings"
#define TR_REMOVE_SCREEN "Remove screen"
#define TR_SELECT_WIDGET "Select widget"
#define TR_REMOVE_WIDGET "Remove widget"
#define TR_WIDGET_SETTINGS "Widget settings"
#define TR_REMOVE_SCREEN "Remove screen"
#define TR_MENU_INPUTS "\314Inputs"
#define TR_MENU_LUA "\322Lua scripts"
@@ -1171,8 +1171,12 @@
#define ZSTR_GPSALT "GAlt"
#define ZSTR_GPSDATETIME "Date"
#define ZSTR_GPS "GPS"
#define ZSTR_PBOX1 "PBx1"
#define ZSTR_PBOX2 "PBx2"
#define ZSTR_BATT1_VOLTAGE "RB1V"
#define ZSTR_BATT2_VOLTAGE "RB2V"
#define ZSTR_BATT1_CURRENT "RB1A"
#define ZSTR_BATT2_CURRENT "RB2A"
#define ZSTR_BATT1_CONSUMPTION "RB1C"
#define ZSTR_BATT2_CONSUMPTION "RB2C"
#define ZSTR_RX1_FAILSAFE "Rx1F"
#define ZSTR_RX1_LOSTFRAME "Rx1L"
#define ZSTR_RX1_CONN_LOST "Rx1C"