Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-26 01:35:21 +03:00
Code Issues Wiki Activity

Fluid units

Browse source
This commit is contained in:
Andre Bernet 2015-03-25 11:49:25 +04:00
parent 47274050ed
commit e6b0a01165
10 changed files with 18 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
radio/src/myeeprom.h
View file

@ -1150,6 +1150,8 @@ enum TelemetryUnit {
UNIT_RPMS, UNIT_RPMS,
UNIT_G, UNIT_G,
UNIT_DEGREE, UNIT_DEGREE,
UNIT_MILLILITERS,
UNIT_FLOZ,
UNIT_HOURS, UNIT_HOURS,
UNIT_MINUTES, UNIT_MINUTES,
UNIT_SECONDS, UNIT_SECONDS,
@ -1167,7 +1169,7 @@ enum TelemetryUnit {
UNIT_DATETIME_HOUR_MIN, UNIT_DATETIME_HOUR_MIN,
UNIT_DATETIME_SEC UNIT_DATETIME_SEC
}; };
#define UNIT_MAX UNIT_DEGREE #define UNIT_MAX UNIT_FLOZ
#define UNIT_DIST UNIT_METERS #define UNIT_DIST UNIT_METERS
#define UNIT_TEMPERATURE UNIT_CELSIUS #define UNIT_TEMPERATURE UNIT_CELSIUS
#define UNIT_SPEED UNIT_KMH #define UNIT_SPEED UNIT_KMH

1
radio/src/telemetry/frsky.cpp
View file

@ -579,6 +579,7 @@ void telemetryReset()
setTelemetryValue(TELEM_PROTO_FRSKY_SPORT, CELLS_FIRST_ID, 2, 0x80280220, UNIT_CELLS, 0); setTelemetryValue(TELEM_PROTO_FRSKY_SPORT, CELLS_FIRST_ID, 2, 0x80280220, UNIT_CELLS, 0);
setTelemetryValue(TELEM_PROTO_FRSKY_SPORT, CURR_FIRST_ID, 3, 100, UNIT_AMPS, 2); setTelemetryValue(TELEM_PROTO_FRSKY_SPORT, CURR_FIRST_ID, 3, 100, UNIT_AMPS, 2);
setTelemetryValue(TELEM_PROTO_FRSKY_SPORT, RPM_FIRST_ID, 5, 3600, UNIT_RPMS, 0); setTelemetryValue(TELEM_PROTO_FRSKY_SPORT, RPM_FIRST_ID, 5, 3600, UNIT_RPMS, 0);
setTelemetryValue(TELEM_PROTO_FRSKY_SPORT, FUEL_QTY_FIRST_ID, 11, 1000, UNIT_MILLILITERS, 2);
#endif #endif
} }

2
radio/src/telemetry/frsky.h
View file

@ -140,6 +140,8 @@
#define BATT_ID 0xf104 #define BATT_ID 0xf104
#define SWR_ID 0xf105 #define SWR_ID 0xf105
#define XJT_VERSION_ID 0xf106 #define XJT_VERSION_ID 0xf106
#define FUEL_QTY_FIRST_ID 0x0a10
#define FUEL_QTY_LAST_ID 0x0a1f
// Default sensor data IDs (Physical IDs + CRC) // Default sensor data IDs (Physical IDs + CRC)
#define DATA_ID_VARIO 0x00 // 0 #define DATA_ID_VARIO 0x00 // 0

1
radio/src/telemetry/frsky_sport.cpp
View file

@ -80,6 +80,7 @@ const FrSkySportSensor sportSensors[] = {
{ GPS_ALT_FIRST_ID, GPS_ALT_LAST_ID, ZSTR_GPSALT, UNIT_METERS, 2 }, { GPS_ALT_FIRST_ID, GPS_ALT_LAST_ID, ZSTR_GPSALT, UNIT_METERS, 2 },
{ GPS_TIME_DATE_FIRST_ID, GPS_TIME_DATE_LAST_ID, ZSTR_GPSDATETIME, UNIT_DATETIME, 0 }, { GPS_TIME_DATE_FIRST_ID, GPS_TIME_DATE_LAST_ID, ZSTR_GPSDATETIME, UNIT_DATETIME, 0 },
{ GPS_LONG_LATI_FIRST_ID, GPS_LONG_LATI_LAST_ID, ZSTR_GPS, UNIT_GPS, 0 }, { GPS_LONG_LATI_FIRST_ID, GPS_LONG_LATI_LAST_ID, ZSTR_GPS, UNIT_GPS, 0 },
{ FUEL_QTY_FIRST_ID, FUEL_QTY_LAST_ID, ZSTR_FUEL, UNIT_MILLILITERS, 2 },
{ 0, 0, NULL, UNIT_RAW, 0 } // sentinel { 0, 0, NULL, UNIT_RAW, 0 } // sentinel
}; };

7
radio/src/telemetry/telemetry.cpp
View file

@ -565,7 +565,12 @@ int32_t convertTelemetryValue(int32_t value, uint8_t unit, uint8_t prec, uint8_t
value = 32 + (value*18)/10; value = 32 + (value*18)/10;
} }
} }
else if (unit == UNIT_MILLILITERS) {
if (destUnit == UNIT_FLOZ) {
value = (value * 100) / 2957;
}
}
for (int i=destPrec; i<prec; i++) for (int i=destPrec; i<prec; i++)
value /= 10; value /= 10;

2
radio/src/translations/cz.h.txt
View file

@ -373,7 +373,7 @@
#define LEN_VUNITSSYSTEM TR("\006", "\010") #define LEN_VUNITSSYSTEM TR("\006", "\010")
#define TR_VUNITSSYSTEM TR("Metr.\0""Imper.", "Metrické""Imperial") #define TR_VUNITSSYSTEM TR("Metr.\0""Imper.", "Metrické""Imperial")
#define LEN_VTELEMUNIT "\003" #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" #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"
#else #else
#if defined(IMPERIAL_UNITS) #if defined(IMPERIAL_UNITS)
#define LENGTH_UNIT LENGTH_UNIT_IMP #define LENGTH_UNIT LENGTH_UNIT_IMP

2
radio/src/translations/de.h.txt
View file

@ -375,7 +375,7 @@
#define LEN_VUNITSSYSTEM TR("\006", "\012") #define LEN_VUNITSSYSTEM TR("\006", "\012")
#define TR_VUNITSSYSTEM TR("Metrik""Imper.", "Metrisch\0 ""Imperial\0 ") #define TR_VUNITSSYSTEM TR("Metrik""Imper.", "Metrisch\0 ""Imperial\0 ")
#define LEN_VTELEMUNIT "\003" #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" #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"
#else #else
#if defined(IMPERIAL_UNITS) #if defined(IMPERIAL_UNITS)
#define LENGTH_UNIT LENGTH_UNIT_IMP #define LENGTH_UNIT LENGTH_UNIT_IMP

2
radio/src/translations/en.h.txt
View file

@ -375,7 +375,7 @@
#define LEN_VUNITSSYSTEM TR("\006", "\010") #define LEN_VUNITSSYSTEM TR("\006", "\010")
#define TR_VUNITSSYSTEM TR("Metric""Imper.", "Metric\0 ""Imperial") #define TR_VUNITSSYSTEM TR("Metric""Imper.", "Metric\0 ""Imperial")
#define LEN_VTELEMUNIT "\003" #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" #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"
#else #else
#if defined(IMPERIAL_UNITS) #if defined(IMPERIAL_UNITS)
#define LENGTH_UNIT LENGTH_UNIT_IMP #define LENGTH_UNIT LENGTH_UNIT_IMP

2
radio/src/translations/fr.h.txt
View file

@ -379,7 +379,7 @@
#define LEN_VUNITSSYSTEM TR("\006", "\012") #define LEN_VUNITSSYSTEM TR("\006", "\012")
#define TR_VUNITSSYSTEM TR("Métr.\0""Impér.", "Métriques\0""Impériales") #define TR_VUNITSSYSTEM TR("Métr.\0""Impér.", "Métriques\0""Impériales")
#define LEN_VTELEMUNIT "\003" #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" #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"
#else #else
#if defined(IMPERIAL_UNITS) #if defined(IMPERIAL_UNITS)
#define LENGTH_UNIT LENGTH_UNIT_IMP #define LENGTH_UNIT LENGTH_UNIT_IMP

2
radio/src/translations/pl.h.txt
View file

@ -362,7 +362,7 @@
#define LEN_VUNITSSYSTEM TR("\006", "\010") #define LEN_VUNITSSYSTEM TR("\006", "\010")
#define TR_VUNITSSYSTEM TR("Metr. ""Imper.", "Metryczn""Imperial") #define TR_VUNITSSYSTEM TR("Metr. ""Imper.", "Metryczn""Imperial")
#define LEN_VTELEMUNIT "\003" #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" #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"
#else #else
#if defined(IMPERIAL_UNITS) #if defined(IMPERIAL_UNITS)
#define LENGTH_UNIT LENGTH_UNIT_IMP #define LENGTH_UNIT LENGTH_UNIT_IMP