From a6e86089ec143bba2aabbe2094b855076491b7dc Mon Sep 17 00:00:00 2001 From: bsongis Date: Tue, 24 Mar 2015 21:45:16 +0100 Subject: [PATCH 1/8] Telemetry totalizer started ... --- radio/src/gui/9X/menu_model_telemetry.cpp | 4 ++-- radio/src/gui/Taranis/menu_model_telemetry.cpp | 12 ++++++++++-- radio/src/myeeprom.h | 2 ++ radio/src/telemetry/telemetry.cpp | 13 ++++++++++++- radio/src/translations/en.h.txt | 2 +- 5 files changed, 27 insertions(+), 6 deletions(-) diff --git a/radio/src/gui/9X/menu_model_telemetry.cpp b/radio/src/gui/9X/menu_model_telemetry.cpp index 6a3a9356b..d41c45fcd 100644 --- a/radio/src/gui/9X/menu_model_telemetry.cpp +++ b/radio/src/gui/9X/menu_model_telemetry.cpp @@ -248,7 +248,7 @@ bool isSensorAvailable(int sensor) #define SENSOR_UNIT_ROWS (sensor->isConfigurable() ? (uint8_t)0 : HIDDEN_ROW) #define SENSOR_PREC_ROWS (sensor->isConfigurable() ? (uint8_t)0 : HIDDEN_ROW) #define SENSOR_PARAM1_ROWS (sensor->unit >= UNIT_FIRST_VIRTUAL ? HIDDEN_ROW : (uint8_t)0) -#define SENSOR_PARAM2_ROWS (sensor->unit == UNIT_RPMS || sensor->unit == UNIT_GPS || sensor->unit == UNIT_DATETIME || sensor->unit == UNIT_CELLS || (sensor->type==TELEM_TYPE_CALCULATED && sensor->formula==TELEM_FORMULA_CONSUMPTION)) ? HIDDEN_ROW : (uint8_t)0 +#define SENSOR_PARAM2_ROWS (sensor->unit == UNIT_RPMS || sensor->unit == UNIT_GPS || sensor->unit == UNIT_DATETIME || sensor->unit == UNIT_CELLS || (sensor->type==TELEM_TYPE_CALCULATED && (sensor->formula==TELEM_FORMULA_CONSUMPTION || sensor->formula==TELEM_FORMULA_TOTALIZE)) ? HIDDEN_ROW : (uint8_t)0 #define SENSOR_PARAM3_ROWS (sensor->type == TELEM_TYPE_CALCULATED && sensor->formula < TELEM_FORMULA_MULTIPLY) ? (uint8_t)0 : HIDDEN_ROW #define SENSOR_PARAM4_ROWS (sensor->type == TELEM_TYPE_CALCULATED && sensor->formula < TELEM_FORMULA_MULTIPLY) ? (uint8_t)0 : HIDDEN_ROW #define SENSOR_AUTOOFFSET_ROWS (sensor->isConfigurable() ? (uint8_t)0 : HIDDEN_ROW) @@ -313,7 +313,7 @@ void menuModelSensor(uint8_t event) } } else { - sensor->formula = selectMenuItem(SENSOR_2ND_COLUMN, y, STR_FORMULA, STR_VFORMULAS, sensor->formula, 0, TELEM_FORMULA_DIST, attr, event); + sensor->formula = selectMenuItem(SENSOR_2ND_COLUMN, y, STR_FORMULA, STR_VFORMULAS, sensor->formula, 0, TELEM_FORMULA_LAST, attr, event); if (attr && checkIncDec_Ret) { sensor->param = 0; if (sensor->formula == TELEM_FORMULA_CELL) { diff --git a/radio/src/gui/Taranis/menu_model_telemetry.cpp b/radio/src/gui/Taranis/menu_model_telemetry.cpp index b98e89b93..ce2c8194b 100644 --- a/radio/src/gui/Taranis/menu_model_telemetry.cpp +++ b/radio/src/gui/Taranis/menu_model_telemetry.cpp @@ -205,7 +205,7 @@ bool isSensorAvailable(int sensor) #define SENSOR_UNIT_ROWS (sensor->isConfigurable() ? (uint8_t)0 : HIDDEN_ROW) #define SENSOR_PREC_ROWS (sensor->isConfigurable() ? (uint8_t)0 : HIDDEN_ROW) #define SENSOR_PARAM1_ROWS (sensor->unit >= UNIT_FIRST_VIRTUAL ? HIDDEN_ROW : (uint8_t)0) -#define SENSOR_PARAM2_ROWS (sensor->unit == UNIT_RPMS || sensor->unit == UNIT_GPS || sensor->unit == UNIT_DATETIME || sensor->unit == UNIT_CELLS || (sensor->type==TELEM_TYPE_CALCULATED && sensor->formula==TELEM_FORMULA_CONSUMPTION)) ? HIDDEN_ROW : (uint8_t)0 +#define SENSOR_PARAM2_ROWS (sensor->unit == UNIT_RPMS || sensor->unit == UNIT_GPS || sensor->unit == UNIT_DATETIME || sensor->unit == UNIT_CELLS || (sensor->type==TELEM_TYPE_CALCULATED && (sensor->formula==TELEM_FORMULA_CONSUMPTION || sensor->formula==TELEM_FORMULA_TOTALIZE))) ? HIDDEN_ROW : (uint8_t)0 #define SENSOR_PARAM3_ROWS (sensor->type == TELEM_TYPE_CALCULATED && sensor->formula < TELEM_FORMULA_MULTIPLY) ? (uint8_t)0 : HIDDEN_ROW #define SENSOR_PARAM4_ROWS (sensor->type == TELEM_TYPE_CALCULATED && sensor->formula < TELEM_FORMULA_MULTIPLY) ? (uint8_t)0 : HIDDEN_ROW #define SENSOR_AUTOOFFSET_ROWS (sensor->isConfigurable() ? (uint8_t)0 : HIDDEN_ROW) @@ -270,7 +270,7 @@ void menuModelSensor(uint8_t event) } } else { - sensor->formula = selectMenuItem(SENSOR_2ND_COLUMN, y, STR_FORMULA, STR_VFORMULAS, sensor->formula, 0, TELEM_FORMULA_DIST, attr, event); + sensor->formula = selectMenuItem(SENSOR_2ND_COLUMN, y, STR_FORMULA, STR_VFORMULAS, sensor->formula, 0, TELEM_FORMULA_LAST, attr, event); if (attr && checkIncDec_Ret) { sensor->param = 0; if (sensor->formula == TELEM_FORMULA_CELL) { @@ -334,6 +334,14 @@ void menuModelSensor(uint8_t event) } break; } + else if (sensor->formula == TELEM_FORMULA_TOTALIZE) { + lcd_putsLeft(y, NO_INDENT(STR_SOURCE)); + putsMixerSource(SENSOR_2ND_COLUMN, y, sensor->consumption.source ? MIXSRC_FIRST_TELEM+3*(sensor->consumption.source-1) : 0, attr); + if (attr) { + sensor->consumption.source = checkIncDec(event, sensor->consumption.source, 0, TELEM_VALUES_MAX, EE_MODEL|NO_INCDEC_MARKS, isTelemetryFieldComparisonAvailable); + } + break; + } } else { if (sensor->unit == UNIT_RPMS) { diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index af4a513d7..2bc9ef6f9 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -1246,6 +1246,8 @@ enum TelemetrySensorFormula TELEM_FORMULA_CELL, TELEM_FORMULA_CONSUMPTION, TELEM_FORMULA_DIST, + TELEM_FORMULA_TOTALIZE, + TELEM_FORMULA_LAST = TELEM_FORMULA_TOTALIZE }; PACK(typedef struct { diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp index 154a25fd3..33561aed9 100644 --- a/radio/src/telemetry/telemetry.cpp +++ b/radio/src/telemetry/telemetry.cpp @@ -14,8 +14,10 @@ void TelemetryItem::gpsReceived() lastReceived = now(); } -void TelemetryItem::setValue(const TelemetrySensor & sensor, int32_t newVal, uint32_t unit, uint32_t prec) +void TelemetryItem::setValue(const TelemetrySensor & sensor, int32_t val, uint32_t unit, uint32_t prec) { + int32_t newVal = val; + if (unit == UNIT_CELLS) { uint32_t data = uint32_t(newVal); uint8_t cellIndex = data & 0xF; @@ -216,6 +218,15 @@ void TelemetryItem::setValue(const TelemetrySensor & sensor, int32_t newVal, uin } } + for (int i=0; i Date: Wed, 25 Mar 2015 10:22:57 +0400 Subject: [PATCH 2/8] Totalizer needs unit --- radio/src/myeeprom.h | 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/es.h.txt | 2 +- radio/src/translations/fi.h.txt | 2 +- radio/src/translations/fr.h.txt | 2 +- radio/src/translations/it.h.txt | 2 +- radio/src/translations/pl.h.txt | 2 +- radio/src/translations/pt.h.txt | 2 +- radio/src/translations/se.h.txt | 2 +- 11 files changed, 12 insertions(+), 12 deletions(-) diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index 2bc9ef6f9..862316b93 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -1243,11 +1243,11 @@ enum TelemetrySensorFormula TELEM_FORMULA_MIN, TELEM_FORMULA_MAX, TELEM_FORMULA_MULTIPLY, + TELEM_FORMULA_TOTALIZE, TELEM_FORMULA_CELL, TELEM_FORMULA_CONSUMPTION, TELEM_FORMULA_DIST, - TELEM_FORMULA_TOTALIZE, - TELEM_FORMULA_LAST = TELEM_FORMULA_TOTALIZE + TELEM_FORMULA_LAST = TELEM_FORMULA_DIST }; PACK(typedef struct { diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index bb255f023..47d907aff 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -535,7 +535,7 @@ #define TR_VSENSORTYPES "Custom\0 ""Calculated" #define LEN_VFORMULAS "\010" -#define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Cell\0 ""Consumpt""Distance" +#define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Totalize""Cell\0 ""Consumpt""Distance" #define LEN_VPREC "\005" #define TR_VPREC "PREC0""PREC1""PREC2" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index 87e1f55bb..17a8687a8 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -534,7 +534,7 @@ #define TR_VSENSORTYPES "Custom\0 ""Calculated" #define LEN_VFORMULAS "\010" -#define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Cell\0 ""Consumpt""Distance" +#define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Totalize""Cell\0 ""Consumpt""Distance" #define LEN_VPREC "\005" #define TR_VPREC "PREC0""PREC1""PREC2" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 03a6ee321..879410158 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -534,7 +534,7 @@ #define TR_VSENSORTYPES "Custom\0 ""Calculated" #define LEN_VFORMULAS "\010" -#define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Cell\0 ""Consumpt""Distance""Totalize" +#define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Totalize""Cell\0 ""Consumpt""Distance" #define LEN_VPREC "\005" #define TR_VPREC "PREC0""PREC1""PREC2" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 2e9e89c91..f82ae4a13 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -495,7 +495,7 @@ #define TR_VSENSORTYPES "Custom\0 ""Calculated" #define LEN_VFORMULAS "\010" -#define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Cell\0 ""Consumpt""Distance" +#define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Totalize""Cell\0 ""Consumpt""Distance" #define LEN_VPREC "\005" #define TR_VPREC "PREC0""PREC1""PREC2" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index b109c2fee..d05d6f383 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -495,7 +495,7 @@ #define TR_VSENSORTYPES "Custom\0 ""Calculated" #define LEN_VFORMULAS "\010" -#define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Cell\0 ""Consumpt""Distance" +#define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Totalize""Cell\0 ""Consumpt""Distance" #define LEN_VPREC "\005" #define TR_VPREC "PREC0""PREC1""PREC2" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 7cfcdf132..65e94dbea 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -538,7 +538,7 @@ #define TR_VSENSORTYPES "Perso\0 ""Calculé\0 " #define LEN_VFORMULAS "\010" -#define TR_VFORMULAS "Addition""Moyenne\0""Min\0 ""Max\0 ""Multipl.""Elément\0""Consomm.""Distance" +#define TR_VFORMULAS "Addition""Moyenne\0""Min\0 ""Max\0 ""Multipl.""Totalise""Elément\0""Consomm.""Distance" #define LEN_VPREC "\005" #define TR_VPREC "PREC0""PREC1""PREC2" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 56a8b27d5..ad7dd93da 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -495,7 +495,7 @@ #define TR_VSENSORTYPES "Custom\0 ""Calculated" #define LEN_VFORMULAS "\010" -#define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Cell\0 ""Consumpt""Distance" +#define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Totalize""Cell\0 ""Consumpt""Distance" #define LEN_VPREC "\005" #define TR_VPREC "PREC0""PREC1""PREC2" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index f462963fa..a9a332e77 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -493,7 +493,7 @@ #define TR_VSENSORTYPES "Custom\0 ""Calculated" #define LEN_VFORMULAS "\010" -#define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Cell\0 ""Consumpt""Distance" +#define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Totalize""Cell\0 ""Consumpt""Distance" #define LEN_VPREC "\005" #define TR_VPREC "PREC0""PREC1""PREC2" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 01a2fd704..4bbabc8e0 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -495,7 +495,7 @@ #define TR_VSENSORTYPES "Custom\0 ""Calculated" #define LEN_VFORMULAS "\010" -#define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Cell\0 ""Consumpt""Distance" +#define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Totalize""Cell\0 ""Consumpt""Distance" #define LEN_VPREC "\005" #define TR_VPREC "PREC0""PREC1""PREC2" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 3b9d171fc..d0a76ed23 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -495,7 +495,7 @@ #define TR_VSENSORTYPES "Custom\0 ""Calculated" #define LEN_VFORMULAS "\010" -#define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Cell\0 ""Consumpt""Distance" +#define TR_VFORMULAS "Add\0 ""Average\0""Min\0 ""Max\0 ""Multiply""Totalize""Cell\0 ""Consumpt""Distance" #define LEN_VPREC "\005" #define TR_VPREC "PREC0""PREC1""PREC2" From 47274050ed2c595d677c122479f03cedbd078607 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Wed, 25 Mar 2015 10:32:32 +0400 Subject: [PATCH 3/8] messed up )'s --- radio/src/gui/9X/menu_model_telemetry.cpp | 2 +- radio/src/gui/Taranis/menu_model_telemetry.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/radio/src/gui/9X/menu_model_telemetry.cpp b/radio/src/gui/9X/menu_model_telemetry.cpp index d41c45fcd..4fb45ae15 100644 --- a/radio/src/gui/9X/menu_model_telemetry.cpp +++ b/radio/src/gui/9X/menu_model_telemetry.cpp @@ -248,7 +248,7 @@ bool isSensorAvailable(int sensor) #define SENSOR_UNIT_ROWS (sensor->isConfigurable() ? (uint8_t)0 : HIDDEN_ROW) #define SENSOR_PREC_ROWS (sensor->isConfigurable() ? (uint8_t)0 : HIDDEN_ROW) #define SENSOR_PARAM1_ROWS (sensor->unit >= UNIT_FIRST_VIRTUAL ? HIDDEN_ROW : (uint8_t)0) -#define SENSOR_PARAM2_ROWS (sensor->unit == UNIT_RPMS || sensor->unit == UNIT_GPS || sensor->unit == UNIT_DATETIME || sensor->unit == UNIT_CELLS || (sensor->type==TELEM_TYPE_CALCULATED && (sensor->formula==TELEM_FORMULA_CONSUMPTION || sensor->formula==TELEM_FORMULA_TOTALIZE)) ? HIDDEN_ROW : (uint8_t)0 +#define SENSOR_PARAM2_ROWS (sensor->unit == UNIT_RPMS || sensor->unit == UNIT_GPS || sensor->unit == UNIT_DATETIME || sensor->unit == UNIT_CELLS || (sensor->type==TELEM_TYPE_CALCULATED && (sensor->formula==TELEM_FORMULA_CONSUMPTION || sensor->formula==TELEM_FORMULA_TOTALIZE)) ? HIDDEN_ROW : (uint8_t)0) #define SENSOR_PARAM3_ROWS (sensor->type == TELEM_TYPE_CALCULATED && sensor->formula < TELEM_FORMULA_MULTIPLY) ? (uint8_t)0 : HIDDEN_ROW #define SENSOR_PARAM4_ROWS (sensor->type == TELEM_TYPE_CALCULATED && sensor->formula < TELEM_FORMULA_MULTIPLY) ? (uint8_t)0 : HIDDEN_ROW #define SENSOR_AUTOOFFSET_ROWS (sensor->isConfigurable() ? (uint8_t)0 : HIDDEN_ROW) diff --git a/radio/src/gui/Taranis/menu_model_telemetry.cpp b/radio/src/gui/Taranis/menu_model_telemetry.cpp index ce2c8194b..39a4059ec 100644 --- a/radio/src/gui/Taranis/menu_model_telemetry.cpp +++ b/radio/src/gui/Taranis/menu_model_telemetry.cpp @@ -205,7 +205,7 @@ bool isSensorAvailable(int sensor) #define SENSOR_UNIT_ROWS (sensor->isConfigurable() ? (uint8_t)0 : HIDDEN_ROW) #define SENSOR_PREC_ROWS (sensor->isConfigurable() ? (uint8_t)0 : HIDDEN_ROW) #define SENSOR_PARAM1_ROWS (sensor->unit >= UNIT_FIRST_VIRTUAL ? HIDDEN_ROW : (uint8_t)0) -#define SENSOR_PARAM2_ROWS (sensor->unit == UNIT_RPMS || sensor->unit == UNIT_GPS || sensor->unit == UNIT_DATETIME || sensor->unit == UNIT_CELLS || (sensor->type==TELEM_TYPE_CALCULATED && (sensor->formula==TELEM_FORMULA_CONSUMPTION || sensor->formula==TELEM_FORMULA_TOTALIZE))) ? HIDDEN_ROW : (uint8_t)0 +#define SENSOR_PARAM2_ROWS (sensor->unit == UNIT_RPMS || sensor->unit == UNIT_GPS || sensor->unit == UNIT_DATETIME || sensor->unit == UNIT_CELLS || (sensor->type==TELEM_TYPE_CALCULATED && (sensor->formula==TELEM_FORMULA_CONSUMPTION || sensor->formula==TELEM_FORMULA_TOTALIZE)) ? HIDDEN_ROW : (uint8_t)0) #define SENSOR_PARAM3_ROWS (sensor->type == TELEM_TYPE_CALCULATED && sensor->formula < TELEM_FORMULA_MULTIPLY) ? (uint8_t)0 : HIDDEN_ROW #define SENSOR_PARAM4_ROWS (sensor->type == TELEM_TYPE_CALCULATED && sensor->formula < TELEM_FORMULA_MULTIPLY) ? (uint8_t)0 : HIDDEN_ROW #define SENSOR_AUTOOFFSET_ROWS (sensor->isConfigurable() ? (uint8_t)0 : HIDDEN_ROW) From e6b0a011652ba9724bfaefff7484da59f0cf92be Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Wed, 25 Mar 2015 11:49:25 +0400 Subject: [PATCH 4/8] Fluid units --- radio/src/myeeprom.h | 4 +++- radio/src/telemetry/frsky.cpp | 1 + radio/src/telemetry/frsky.h | 2 ++ radio/src/telemetry/frsky_sport.cpp | 1 + radio/src/telemetry/telemetry.cpp | 7 ++++++- 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 +- 10 files changed, 18 insertions(+), 7 deletions(-) diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index 862316b93..e1028213f 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -1150,6 +1150,8 @@ enum TelemetryUnit { UNIT_RPMS, UNIT_G, UNIT_DEGREE, + UNIT_MILLILITERS, + UNIT_FLOZ, UNIT_HOURS, UNIT_MINUTES, UNIT_SECONDS, @@ -1167,7 +1169,7 @@ enum TelemetryUnit { UNIT_DATETIME_HOUR_MIN, UNIT_DATETIME_SEC }; -#define UNIT_MAX UNIT_DEGREE +#define UNIT_MAX UNIT_FLOZ #define UNIT_DIST UNIT_METERS #define UNIT_TEMPERATURE UNIT_CELSIUS #define UNIT_SPEED UNIT_KMH diff --git a/radio/src/telemetry/frsky.cpp b/radio/src/telemetry/frsky.cpp index 757eb92b9..067fc2408 100644 --- a/radio/src/telemetry/frsky.cpp +++ b/radio/src/telemetry/frsky.cpp @@ -579,6 +579,7 @@ void telemetryReset() 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, RPM_FIRST_ID, 5, 3600, UNIT_RPMS, 0); + setTelemetryValue(TELEM_PROTO_FRSKY_SPORT, FUEL_QTY_FIRST_ID, 11, 1000, UNIT_MILLILITERS, 2); #endif } diff --git a/radio/src/telemetry/frsky.h b/radio/src/telemetry/frsky.h index 19f4da929..dcfb7442d 100644 --- a/radio/src/telemetry/frsky.h +++ b/radio/src/telemetry/frsky.h @@ -140,6 +140,8 @@ #define BATT_ID 0xf104 #define SWR_ID 0xf105 #define XJT_VERSION_ID 0xf106 +#define FUEL_QTY_FIRST_ID 0x0a10 +#define FUEL_QTY_LAST_ID 0x0a1f // Default sensor data IDs (Physical IDs + CRC) #define DATA_ID_VARIO 0x00 // 0 diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp index 7dd5e7033..848701106 100644 --- a/radio/src/telemetry/frsky_sport.cpp +++ b/radio/src/telemetry/frsky_sport.cpp @@ -80,6 +80,7 @@ const FrSkySportSensor sportSensors[] = { { 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_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 }; diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp index 33561aed9..9b4933333 100644 --- a/radio/src/telemetry/telemetry.cpp +++ b/radio/src/telemetry/telemetry.cpp @@ -565,7 +565,12 @@ int32_t convertTelemetryValue(int32_t value, uint8_t unit, uint8_t prec, uint8_t value = 32 + (value*18)/10; } } - + else if (unit == UNIT_MILLILITERS) { + if (destUnit == UNIT_FLOZ) { + value = (value * 100) / 2957; + } + } + for (int i=destPrec; i Date: Wed, 25 Mar 2015 11:58:24 +0400 Subject: [PATCH 5/8] Missing units in companion --- companion/src/modeledit/telemetry_sensor.ui | 40 +++++++++++++++++++++ 1 file changed, 40 insertions(+) diff --git a/companion/src/modeledit/telemetry_sensor.ui b/companion/src/modeledit/telemetry_sensor.ui index 182159ebb..ce8fafaca 100644 --- a/companion/src/modeledit/telemetry_sensor.ui +++ b/companion/src/modeledit/telemetry_sensor.ui @@ -419,6 +419,46 @@ Percentage (%) + + + Energy (mAh) + + + + + Power (W) + + + + + RF Power (dBm) + + + + + RPM + + + + + Acceleration (g) + + + + + Heading (°) + + + + + Volume (mL) + + + + + Volume (US fl.Oz.) + + From 0bea656cd2afd0dcd962c65d03163ed89807e65f Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Wed, 25 Mar 2015 14:05:02 +0400 Subject: [PATCH 6/8] Don't show ID for calculated sensors --- radio/src/gui/Taranis/menu_model_telemetry.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/radio/src/gui/Taranis/menu_model_telemetry.cpp b/radio/src/gui/Taranis/menu_model_telemetry.cpp index 39a4059ec..1972e80ff 100644 --- a/radio/src/gui/Taranis/menu_model_telemetry.cpp +++ b/radio/src/gui/Taranis/menu_model_telemetry.cpp @@ -509,7 +509,9 @@ void menuModelTelemetry(uint8_t event) lcd_putsAtt(TELEM_COL2, y, "---", 0); // TODO shortcut } TelemetrySensor * sensor = & g_model.telemetrySensors[index]; - lcd_outdezAtt(TELEM_COL3+1*FW, y, sensor->instance, LEFT); + if (sensor->type == TELEM_TYPE_CUSTOM) { + lcd_outdezAtt(TELEM_COL3+1*FW, y, sensor->instance, LEFT); + } if (attr) { s_editMode = 0; s_currIdx = index; From 438090536bb76d6a92e42ad33600aa6d644aaedc Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Wed, 25 Mar 2015 21:03:03 +0400 Subject: [PATCH 7/8] TTS for new units --- radio/src/translations/tts_cz.cpp | 2 ++ radio/src/translations/tts_de.cpp | 4 +++- radio/src/translations/tts_en.cpp | 2 ++ radio/src/translations/tts_es.cpp | 4 +++- radio/src/translations/tts_fr.cpp | 4 ++++ radio/src/translations/tts_hu.cpp | 2 ++ radio/src/translations/tts_it.cpp | 2 ++ radio/src/translations/tts_pl.cpp | 2 ++ radio/src/translations/tts_pt.cpp | 2 ++ radio/src/translations/tts_se.cpp | 2 ++ radio/src/translations/tts_sk.cpp | 2 ++ radio/util/tts.py | 14 ++++++++------ 12 files changed, 34 insertions(+), 8 deletions(-) diff --git a/radio/src/translations/tts_cz.cpp b/radio/src/translations/tts_cz.cpp index 4f45c212c..0d8dc068f 100644 --- a/radio/src/translations/tts_cz.cpp +++ b/radio/src/translations/tts_cz.cpp @@ -56,6 +56,8 @@ enum CzechPrompts { CZ_PROMPT_SECONDS = CZ_PROMPT_UNITS_BASE+(UNIT_SECONDS*4), CZ_PROMPT_RPMS = CZ_PROMPT_UNITS_BASE+(UNIT_RPMS*4), CZ_PROMPT_G = CZ_PROMPT_UNITS_BASE+(UNIT_G*4), + CZ_PROMPT_MILLILITERS = CZ_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*4), + CZ_PROMPT_FLOZ = CZ_PROMPT_UNITS_BASE+(UNIT_FLOZ*4), }; diff --git a/radio/src/translations/tts_de.cpp b/radio/src/translations/tts_de.cpp index 4fcc5567b..a15f12f6f 100644 --- a/radio/src/translations/tts_de.cpp +++ b/radio/src/translations/tts_de.cpp @@ -56,7 +56,9 @@ enum GermanPrompts { DE_PROMPT_MINUTES = DE_PROMPT_UNITS_BASE+UNIT_MINUTES, DE_PROMPT_SECONDS = DE_PROMPT_UNITS_BASE+UNIT_SECONDS, DE_PROMPT_RPMS = DE_PROMPT_UNITS_BASE+UNIT_RPMS, - DE_PROMPT_G= DE_PROMPT_UNITS_BASE+UNIT_G, + DE_PROMPT_G = DE_PROMPT_UNITS_BASE+UNIT_G, + DE_PROMPT_MILLILITERS = DE_PROMPT_UNITS_BASE+UNIT_MILLILITERS, + DE_PROMPT_FLOZ = DE_PROMPT_UNITS_BASE+UNIT_FLOZ, }; diff --git a/radio/src/translations/tts_en.cpp b/radio/src/translations/tts_en.cpp index c72ed749a..0287f4299 100644 --- a/radio/src/translations/tts_en.cpp +++ b/radio/src/translations/tts_en.cpp @@ -65,6 +65,8 @@ enum EnglishPrompts { EN_PROMPT_SECONDS = EN_PROMPT_UNITS_BASE+(UNIT_SECONDS*2), EN_PROMPT_RPMS = EN_PROMPT_UNITS_BASE+(UNIT_RPMS*2), EN_PROMPT_G = EN_PROMPT_UNITS_BASE+(UNIT_G*2), + EN_PROMPT_MILLILITERS = EN_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*2), + EN_PROMPT_FLOZ = EN_PROMPT_UNITS_BASE+(UNIT_FLOZ*2), EN_PROMPT_POINT_BASE = 160, //.0 - .9 diff --git a/radio/src/translations/tts_es.cpp b/radio/src/translations/tts_es.cpp index 4aed68a5c..f86a98a0f 100644 --- a/radio/src/translations/tts_es.cpp +++ b/radio/src/translations/tts_es.cpp @@ -80,7 +80,9 @@ enum SpanishPrompts { ES_PROMPT_MINUTES = ES_PROMPT_UNITS_BASE+UNIT_MINUTES, ES_PROMPT_SECONDS = ES_PROMPT_UNITS_BASE+UNIT_SECONDS, ES_PROMPT_RPMS = ES_PROMPT_UNITS_BASE+UNIT_RPMS, - ES_PROMPT_G= ES_PROMPT_UNITS_BASE+UNIT_G, + ES_PROMPT_G = ES_PROMPT_UNITS_BASE+UNIT_G, + ES_PROMPT_MILLILITERS = ES_PROMPT_UNITS_BASE+UNIT_MILLILITERS, + ES_PROMPT_FLOZ = ES_PROMPT_UNITS_BASE+UNIT_FLOZ, }; diff --git a/radio/src/translations/tts_fr.cpp b/radio/src/translations/tts_fr.cpp index 402fd3d39..a88fa3297 100644 --- a/radio/src/translations/tts_fr.cpp +++ b/radio/src/translations/tts_fr.cpp @@ -62,6 +62,10 @@ enum FrenchPrompts { FR_PROMPT_HEURE = FR_PROMPT_UNITS_BASE+UNIT_HOURS, FR_PROMPT_MINUTE = FR_PROMPT_UNITS_BASE+UNIT_MINUTES, FR_PROMPT_SECONDE = FR_PROMPT_UNITS_BASE+UNIT_SECONDS, + FR_PROMPT_RPMS = FR_PROMPT_UNITS_BASE+UNIT_RPMS, + FR_PROMPT_G = FR_PROMPT_UNITS_BASE+UNIT_G, + FR_PROMPT_MILLILITERS = FR_PROMPT_UNITS_BASE+UNIT_MILLILITERS, + FR_PROMPT_FLOZ = FR_PROMPT_UNITS_BASE+UNIT_FLOZ, FR_PROMPT_VIRGULE_BASE = 180, //,0 - ,9 }; diff --git a/radio/src/translations/tts_hu.cpp b/radio/src/translations/tts_hu.cpp index 1c1763232..7d370dc87 100644 --- a/radio/src/translations/tts_hu.cpp +++ b/radio/src/translations/tts_hu.cpp @@ -65,6 +65,8 @@ enum HungarianPrompts { HU_PROMPT_SECONDS = HU_PROMPT_UNITS_BASE+(UNIT_SECONDS*2), HU_PROMPT_RPMS = HU_PROMPT_UNITS_BASE+(UNIT_RPMS*2), HU_PROMPT_G = HU_PROMPT_UNITS_BASE+(UNIT_G*2), + HU_PROMPT_MILLILITERS = HU_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*2), + HU_PROMPT_FLOZ = HU_PROMPT_UNITS_BASE+(UNIT_FLOZ*2), HU_PROMPT_POINT_BASE = 160, //.0 - .9 diff --git a/radio/src/translations/tts_it.cpp b/radio/src/translations/tts_it.cpp index 4e5dc6f5a..ad88fe816 100644 --- a/radio/src/translations/tts_it.cpp +++ b/radio/src/translations/tts_it.cpp @@ -53,6 +53,8 @@ enum ItalianPrompts { IT_PROMPT_WATTS = IT_PROMPT_UNITS_BASE+UNIT_WATTS, IT_PROMPT_FEET = IT_PROMPT_UNITS_BASE+UNIT_FEET, IT_PROMPT_KTS = IT_PROMPT_UNITS_BASE+UNIT_KTS, + IT_PROMPT_MILLILITERS = IT_PROMPT_UNITS_BASE+UNIT_MILLILITERS, + IT_PROMPT_FLOZ = IT_PROMPT_UNITS_BASE+UNIT_FLOZ, }; diff --git a/radio/src/translations/tts_pl.cpp b/radio/src/translations/tts_pl.cpp index faac6283b..9d0694ce3 100644 --- a/radio/src/translations/tts_pl.cpp +++ b/radio/src/translations/tts_pl.cpp @@ -58,6 +58,8 @@ enum PolishPrompts { PL_PROMPT_SECONDS = PL_PROMPT_UNITS_BASE+(UNIT_SECONDS*4), PL_PROMPT_RPMS = PL_PROMPT_UNITS_BASE+(UNIT_RPMS*4), PL_PROMPT_G = PL_PROMPT_UNITS_BASE+(UNIT_G*4), + PL_PROMPT_MILLILITERS = PL_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*4), + PL_PROMPT_FLOZ = PL_PROMPT_UNITS_BASE+(UNIT_FLOZ*4), }; #if defined(VOICE) diff --git a/radio/src/translations/tts_pt.cpp b/radio/src/translations/tts_pt.cpp index 024b20095..7b3ab5dcd 100644 --- a/radio/src/translations/tts_pt.cpp +++ b/radio/src/translations/tts_pt.cpp @@ -76,6 +76,8 @@ enum PortuguesePrompts { PT_PROMPT_WATTS = PT_PROMPT_UNITS_BASE+UNIT_WATTS, PT_PROMPT_FEET = PT_PROMPT_UNITS_BASE+UNIT_FEET, PT_PROMPT_KTS = PT_PROMPT_UNITS_BASE+UNIT_KTS, + PT_PROMPT_MILLILITERS = PT_PROMPT_UNITS_BASE+UNIT_MILLILITERS, + PT_PROMPT_FLOZ = PT_PROMPT_UNITS_BASE+UNIT_FLOZ, }; #if defined(VOICE) diff --git a/radio/src/translations/tts_se.cpp b/radio/src/translations/tts_se.cpp index b187338a5..e464e729d 100644 --- a/radio/src/translations/tts_se.cpp +++ b/radio/src/translations/tts_se.cpp @@ -66,6 +66,8 @@ enum SwedishPrompts { SE_PROMPT_SECONDS = SE_PROMPT_UNITS_BASE+(UNIT_SECONDS*2), SE_PROMPT_RPMS = SE_PROMPT_UNITS_BASE+(UNIT_RPMS*2), SE_PROMPT_G = SE_PROMPT_UNITS_BASE+(UNIT_G*2), + SE_PROMPT_MILLILITERS = SE_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*2), + SE_PROMPT_FLOZ = SE_PROMPT_UNITS_BASE+(UNIT_FLOZ*2), SE_PROMPT_POINT_BASE = 160, //.0 - .9 diff --git a/radio/src/translations/tts_sk.cpp b/radio/src/translations/tts_sk.cpp index fdea697cc..14ee57485 100644 --- a/radio/src/translations/tts_sk.cpp +++ b/radio/src/translations/tts_sk.cpp @@ -71,6 +71,8 @@ enum SlovakPrompts { SK_PROMPT_SECONDS = SK_PROMPT_UNITS_BASE+(UNIT_SECONDS*4), SK_PROMPT_RPMS = SK_PROMPT_UNITS_BASE+(UNIT_RPMS*4), SK_PROMPT_G = SK_PROMPT_UNITS_BASE+(UNIT_G*4), + SK_PROMPT_MILLILITERS = SK_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*4), + SK_PROMPT_FLOZ = SK_PROMPT_UNITS_BASE+(UNIT_FLOZ*4), }; diff --git a/radio/util/tts.py b/radio/util/tts.py index 4e9ed32fa..79cfd0909 100644 --- a/radio/util/tts.py +++ b/radio/util/tts.py @@ -151,7 +151,9 @@ def ttsEn(): "minute", "minutes", "second", "seconds", "r p m", "r p m", - "g", "g"]): + "g", "g" + "milliliter", "milliliters" + "fluid ounce", "fluid ounces"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+115+i))) for i, s in enumerate(["point zero", "point one", "point two", "point three", "point four", "point five", "point six", @@ -246,7 +248,7 @@ def ttsFr(): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+110+i))) for i, s in enumerate(["virgule", "et", "moins", "minuit", "midi"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+119+i))) - for i, s in enumerate(["volts", u"ampères", u"mètres seconde", "", u"kilomètre heure", u"mètres", u"degrés", "pourcents", u"milli ampères", u"milli ampères / heure", "watt", "db", "pieds", "miles par heure", "heure", "minute", "seconde", "tours minute", "g"]): + for i, s in enumerate(["volts", u"ampères", u"mètres seconde", "", u"kilomètre heure", u"mètres", u"degrés", "pourcents", u"milli ampères", u"milli ampères / heure", "watt", "db", "pieds", "miles par heure", "heure", "minute", "seconde", "tours minute", "g", "millilitres", "onces"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+125+i))) for i, s in enumerate(["timer", "", "tension", "tension", u"émission", u"réception", "altitude", "moteur", "essence", u"température", u"température", "vitesse", "distance", "altitude", u"élément lipo", @@ -306,7 +308,7 @@ def ttsIt(): systemSounds.append(("mille", filename(PROMPT_SYSTEM_BASE+102))) for i, s in enumerate(["virgola", "un", "e", "meno", "ora", "ore", "minuto", "minuti", "secondo", "secondi"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+103+i))) - for i, s in enumerate(["volt", "ampere", "metri per secondo", "", "chilometri/ora", "metri", "gradi", "percento", "milliampere", "milliampere/ora", "watt", "db", "piedi", "nodi", "ore", "minuti", "secondi", "R P M", "g"]): + for i, s in enumerate(["volt", "ampere", "metri per secondo", "", "chilometri/ora", "metri", "gradi", "percento", "milliampere", "milliampere/ora", "watt", "db", "piedi", "nodi", "ore", "minuti", "secondi", "R P M", "g", "millilitri", "once"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+113+i))) for s, f, a in [(u"radio inattiva controllare", "inactiv", 486), (u"batteria della radio scarica", "lowbatt", 485), @@ -388,7 +390,7 @@ def ttsPt(): systemSounds.append(("mil", filename(PROMPT_SYSTEM_BASE+110))) for i, s in enumerate(["virgula", "uma", "duas", "e", "menos", "hora", "horas", "minuto", "minutos", "segundo", "segundos"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+111+i))) - for i, s in enumerate([u"Volt", u"ampére", u"metros por segundo", u"", u"quilômetros por hora", u"metros", u"graus", u"cento", u"miliamperes", u"miliamperes por hora", u"watt", u"db", u"pés", u"nós", u"horas", u"minutos", u"segundos", u"RPM", u"g"]): + for i, s in enumerate([u"Volt", u"ampére", u"metros por segundo", u"", u"quilômetros por hora", u"metros", u"graus", u"cento", u"miliamperes", u"miliamperes por hora", u"watt", u"db", u"pés", u"nós", u"horas", u"minutos", u"segundos", u"RPM", u"g", u"mililitri", u"onças"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+122+i))) for s, f, a in [(u"atenção, o rádio foi esquecido ligado, por favor desligue-o", "inactiv", 486), (u"bateria do rádio fraca", "lowbatt", 485), @@ -468,7 +470,7 @@ def ttsEs(): systemSounds.append(("mil", filename(PROMPT_SYSTEM_BASE+110))) for i, s in enumerate(["coma", "un", "una", "y", "meno", "hora", "horas", "minuto", "minutos", "segundo", "segundos"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+111+i))) - for i, s in enumerate([u"Voltio", u"ampério", u"metros por segundo", u"", u"kilómetro por hora", u"metros", u"grados", u"por ciento", u"miliamperios", u"miliamperios por hora", u"vatio", u"db", u"pés", u"nós", u"horas", u"minutos", u"segundos", u"RPM", u"g"]): + for i, s in enumerate([u"Voltio", u"ampério", u"metros por segundo", u"", u"kilómetro por hora", u"metros", u"grados", u"por ciento", u"miliamperios", u"miliamperios por hora", u"vatio", u"db", u"pés", u"nós", u"horas", u"minutos", u"segundos", u"RPM", u"g", u"mililitro", u"onzas"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+122+i))) for s, f, a in [(u"me tienes abandonada", "inactiv", 486), (u"batería del transmisor baja", "lowbatt", 485), @@ -541,7 +543,7 @@ def ttsDe(): systemSounds.append(("tausend", filename(PROMPT_SYSTEM_BASE+101))) for i, s in enumerate(["comma", "und", "minus", "uhr", "minute", "minuten", "sekunde", "sekunden"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+102+i))) - for i, s in enumerate(["Volt", "Ampere", "Meter pro sekunde", "", "kilometer pro stunde", "Meter", "Grad", "Prozent", "Milliampere", "Milliampere pro stunde", "Watt", "db", "Fuesse", "Knoten", "Uhr", "Minuten", "Secunden", "R P M", "g"]): + for i, s in enumerate(["Volt", "Ampere", "Meter pro sekunde", "", "kilometer pro stunde", "Meter", "Grad", "Prozent", "Milliampere", "Milliampere pro stunde", "Watt", "db", "Fuesse", "Knoten", "Uhr", "Minuten", "Secunden", "R P M", "g", "Milliliter", "Unze"]): systemSounds.append((s, filename(PROMPT_SYSTEM_BASE+110+i))) for s, f, a in [(u"Sender ist inaktiv,bitte Ueberpruefen Sie", "inactiv", 486), (u"Senderakku niedrig", "lowbatt", 485), From 7507f1a85736bd3e312296158e7fb174c5d86a41 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Wed, 25 Mar 2015 21:09:05 +0400 Subject: [PATCH 8/8] ...but only for ARM --- radio/src/translations/tts_cz.cpp | 2 ++ radio/src/translations/tts_de.cpp | 2 ++ radio/src/translations/tts_en.cpp | 2 ++ radio/src/translations/tts_es.cpp | 2 ++ radio/src/translations/tts_fr.cpp | 2 ++ radio/src/translations/tts_hu.cpp | 2 ++ radio/src/translations/tts_it.cpp | 2 ++ radio/src/translations/tts_pl.cpp | 2 ++ radio/src/translations/tts_pt.cpp | 2 ++ radio/src/translations/tts_se.cpp | 2 ++ radio/src/translations/tts_sk.cpp | 2 ++ 11 files changed, 22 insertions(+) diff --git a/radio/src/translations/tts_cz.cpp b/radio/src/translations/tts_cz.cpp index 0d8dc068f..f46c10d68 100644 --- a/radio/src/translations/tts_cz.cpp +++ b/radio/src/translations/tts_cz.cpp @@ -56,8 +56,10 @@ enum CzechPrompts { CZ_PROMPT_SECONDS = CZ_PROMPT_UNITS_BASE+(UNIT_SECONDS*4), CZ_PROMPT_RPMS = CZ_PROMPT_UNITS_BASE+(UNIT_RPMS*4), CZ_PROMPT_G = CZ_PROMPT_UNITS_BASE+(UNIT_G*4), +#if defined(CPUARM) CZ_PROMPT_MILLILITERS = CZ_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*4), CZ_PROMPT_FLOZ = CZ_PROMPT_UNITS_BASE+(UNIT_FLOZ*4), +#endif }; diff --git a/radio/src/translations/tts_de.cpp b/radio/src/translations/tts_de.cpp index a15f12f6f..c655fd261 100644 --- a/radio/src/translations/tts_de.cpp +++ b/radio/src/translations/tts_de.cpp @@ -57,8 +57,10 @@ enum GermanPrompts { DE_PROMPT_SECONDS = DE_PROMPT_UNITS_BASE+UNIT_SECONDS, DE_PROMPT_RPMS = DE_PROMPT_UNITS_BASE+UNIT_RPMS, DE_PROMPT_G = DE_PROMPT_UNITS_BASE+UNIT_G, +#if defined(CPUARM) DE_PROMPT_MILLILITERS = DE_PROMPT_UNITS_BASE+UNIT_MILLILITERS, DE_PROMPT_FLOZ = DE_PROMPT_UNITS_BASE+UNIT_FLOZ, +#endif }; diff --git a/radio/src/translations/tts_en.cpp b/radio/src/translations/tts_en.cpp index 0287f4299..4b5e93908 100644 --- a/radio/src/translations/tts_en.cpp +++ b/radio/src/translations/tts_en.cpp @@ -65,8 +65,10 @@ enum EnglishPrompts { EN_PROMPT_SECONDS = EN_PROMPT_UNITS_BASE+(UNIT_SECONDS*2), EN_PROMPT_RPMS = EN_PROMPT_UNITS_BASE+(UNIT_RPMS*2), EN_PROMPT_G = EN_PROMPT_UNITS_BASE+(UNIT_G*2), +#if defined(CPUARM) EN_PROMPT_MILLILITERS = EN_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*2), EN_PROMPT_FLOZ = EN_PROMPT_UNITS_BASE+(UNIT_FLOZ*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 f86a98a0f..b6f74ec88 100644 --- a/radio/src/translations/tts_es.cpp +++ b/radio/src/translations/tts_es.cpp @@ -81,8 +81,10 @@ enum SpanishPrompts { ES_PROMPT_SECONDS = ES_PROMPT_UNITS_BASE+UNIT_SECONDS, ES_PROMPT_RPMS = ES_PROMPT_UNITS_BASE+UNIT_RPMS, ES_PROMPT_G = ES_PROMPT_UNITS_BASE+UNIT_G, +#if defined(CPUARM) ES_PROMPT_MILLILITERS = ES_PROMPT_UNITS_BASE+UNIT_MILLILITERS, ES_PROMPT_FLOZ = ES_PROMPT_UNITS_BASE+UNIT_FLOZ, +#endif }; diff --git a/radio/src/translations/tts_fr.cpp b/radio/src/translations/tts_fr.cpp index a88fa3297..82ebcc98c 100644 --- a/radio/src/translations/tts_fr.cpp +++ b/radio/src/translations/tts_fr.cpp @@ -64,8 +64,10 @@ enum FrenchPrompts { FR_PROMPT_SECONDE = FR_PROMPT_UNITS_BASE+UNIT_SECONDS, FR_PROMPT_RPMS = FR_PROMPT_UNITS_BASE+UNIT_RPMS, FR_PROMPT_G = FR_PROMPT_UNITS_BASE+UNIT_G, +#if defined(CPUARM) FR_PROMPT_MILLILITERS = FR_PROMPT_UNITS_BASE+UNIT_MILLILITERS, FR_PROMPT_FLOZ = FR_PROMPT_UNITS_BASE+UNIT_FLOZ, +#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 7d370dc87..3d1a28a63 100644 --- a/radio/src/translations/tts_hu.cpp +++ b/radio/src/translations/tts_hu.cpp @@ -65,8 +65,10 @@ enum HungarianPrompts { HU_PROMPT_SECONDS = HU_PROMPT_UNITS_BASE+(UNIT_SECONDS*2), HU_PROMPT_RPMS = HU_PROMPT_UNITS_BASE+(UNIT_RPMS*2), HU_PROMPT_G = HU_PROMPT_UNITS_BASE+(UNIT_G*2), +#if defined(CPUARM) HU_PROMPT_MILLILITERS = HU_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*2), HU_PROMPT_FLOZ = HU_PROMPT_UNITS_BASE+(UNIT_FLOZ*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 ad88fe816..e178ef73f 100644 --- a/radio/src/translations/tts_it.cpp +++ b/radio/src/translations/tts_it.cpp @@ -53,8 +53,10 @@ enum ItalianPrompts { IT_PROMPT_WATTS = IT_PROMPT_UNITS_BASE+UNIT_WATTS, IT_PROMPT_FEET = IT_PROMPT_UNITS_BASE+UNIT_FEET, IT_PROMPT_KTS = IT_PROMPT_UNITS_BASE+UNIT_KTS, +#if defined(CPUARM) IT_PROMPT_MILLILITERS = IT_PROMPT_UNITS_BASE+UNIT_MILLILITERS, IT_PROMPT_FLOZ = IT_PROMPT_UNITS_BASE+UNIT_FLOZ, +#endif }; diff --git a/radio/src/translations/tts_pl.cpp b/radio/src/translations/tts_pl.cpp index 9d0694ce3..85a0d909b 100644 --- a/radio/src/translations/tts_pl.cpp +++ b/radio/src/translations/tts_pl.cpp @@ -58,8 +58,10 @@ enum PolishPrompts { PL_PROMPT_SECONDS = PL_PROMPT_UNITS_BASE+(UNIT_SECONDS*4), PL_PROMPT_RPMS = PL_PROMPT_UNITS_BASE+(UNIT_RPMS*4), PL_PROMPT_G = PL_PROMPT_UNITS_BASE+(UNIT_G*4), +#if defined(CPUARM) PL_PROMPT_MILLILITERS = PL_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*4), PL_PROMPT_FLOZ = PL_PROMPT_UNITS_BASE+(UNIT_FLOZ*4), +#endif }; #if defined(VOICE) diff --git a/radio/src/translations/tts_pt.cpp b/radio/src/translations/tts_pt.cpp index 7b3ab5dcd..38bcef083 100644 --- a/radio/src/translations/tts_pt.cpp +++ b/radio/src/translations/tts_pt.cpp @@ -76,8 +76,10 @@ enum PortuguesePrompts { PT_PROMPT_WATTS = PT_PROMPT_UNITS_BASE+UNIT_WATTS, PT_PROMPT_FEET = PT_PROMPT_UNITS_BASE+UNIT_FEET, PT_PROMPT_KTS = PT_PROMPT_UNITS_BASE+UNIT_KTS, +#if defined(CPUARM) PT_PROMPT_MILLILITERS = PT_PROMPT_UNITS_BASE+UNIT_MILLILITERS, PT_PROMPT_FLOZ = PT_PROMPT_UNITS_BASE+UNIT_FLOZ, +#endif }; #if defined(VOICE) diff --git a/radio/src/translations/tts_se.cpp b/radio/src/translations/tts_se.cpp index e464e729d..a2021ec51 100644 --- a/radio/src/translations/tts_se.cpp +++ b/radio/src/translations/tts_se.cpp @@ -66,8 +66,10 @@ enum SwedishPrompts { SE_PROMPT_SECONDS = SE_PROMPT_UNITS_BASE+(UNIT_SECONDS*2), SE_PROMPT_RPMS = SE_PROMPT_UNITS_BASE+(UNIT_RPMS*2), SE_PROMPT_G = SE_PROMPT_UNITS_BASE+(UNIT_G*2), +#if defined(CPUARM) SE_PROMPT_MILLILITERS = SE_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*2), SE_PROMPT_FLOZ = SE_PROMPT_UNITS_BASE+(UNIT_FLOZ*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 14ee57485..b132ca73a 100644 --- a/radio/src/translations/tts_sk.cpp +++ b/radio/src/translations/tts_sk.cpp @@ -71,8 +71,10 @@ enum SlovakPrompts { SK_PROMPT_SECONDS = SK_PROMPT_UNITS_BASE+(UNIT_SECONDS*4), SK_PROMPT_RPMS = SK_PROMPT_UNITS_BASE+(UNIT_RPMS*4), SK_PROMPT_G = SK_PROMPT_UNITS_BASE+(UNIT_G*4), +#if defined(CPUARM) SK_PROMPT_MILLILITERS = SK_PROMPT_UNITS_BASE+(UNIT_MILLILITERS*4), SK_PROMPT_FLOZ = SK_PROMPT_UNITS_BASE+(UNIT_FLOZ*4), +#endif };