From 7312bd2655f6d8d11c3b762fe60f9268b29f434d Mon Sep 17 00:00:00 2001 From: Damjan Adamic Date: Fri, 26 Jun 2015 21:35:09 +0200 Subject: [PATCH] Fixes #2382: new atribute onlyPositive for telemetry sensor Conflicts: radio/src/translations/it.h.txt --- radio/src/gui/9X/menu_model_telemetry.cpp | 5 ++++ .../src/gui/Taranis/menu_model_telemetry.cpp | 7 +++++- radio/src/myeeprom.h | 3 ++- radio/src/telemetry/frsky_sport.cpp | 4 +++ radio/src/telemetry/telemetry.cpp | 3 +-- radio/src/translations.cpp | 13 +++++----- radio/src/translations.h | 13 +++++----- radio/src/translations/cz.h.txt | 1 + radio/src/translations/de.h.txt | 25 ++++++++++--------- radio/src/translations/en.h.txt | 1 + radio/src/translations/es.h.txt | 1 + radio/src/translations/fi.h.txt | 1 + radio/src/translations/fr.h.txt | 1 + radio/src/translations/it.h.txt | 13 +++++----- radio/src/translations/pl.h.txt | 1 + radio/src/translations/pt.h.txt | 13 +++++----- radio/src/translations/se.h.txt | 13 +++++----- 17 files changed, 72 insertions(+), 46 deletions(-) diff --git a/radio/src/gui/9X/menu_model_telemetry.cpp b/radio/src/gui/9X/menu_model_telemetry.cpp index 6546e7e6a..99936f4f1 100644 --- a/radio/src/gui/9X/menu_model_telemetry.cpp +++ b/radio/src/gui/9X/menu_model_telemetry.cpp @@ -193,6 +193,7 @@ enum SensorFields { SENSOR_FIELD_PARAM3, SENSOR_FIELD_PARAM4, SENSOR_FIELD_AUTOOFFSET, + SENSOR_FIELD_ONLYPOSITIVE, SENSOR_FIELD_FILTER, SENSOR_FIELD_PERSISTENT, SENSOR_FIELD_LOGS, @@ -445,6 +446,10 @@ void menuModelSensor(uint8_t event) ON_OFF_MENU_ITEM(sensor->autoOffset, SENSOR_2ND_COLUMN, y, STR_AUTOOFFSET, attr, event); break; + case SENSOR_FIELD_ONLYPOSITIVE: + ON_OFF_MENU_ITEM(sensor->onlyPositive, SENSOR_2ND_COLUMN, y, STR_ONLYPOSITIVE, attr, event); + break; + case SENSOR_FIELD_FILTER: ON_OFF_MENU_ITEM(sensor->filter, SENSOR_2ND_COLUMN, y, STR_FILTER, attr, event); break; diff --git a/radio/src/gui/Taranis/menu_model_telemetry.cpp b/radio/src/gui/Taranis/menu_model_telemetry.cpp index 8dad5dd2b..1a2364c33 100644 --- a/radio/src/gui/Taranis/menu_model_telemetry.cpp +++ b/radio/src/gui/Taranis/menu_model_telemetry.cpp @@ -155,6 +155,7 @@ enum SensorFields { SENSOR_FIELD_PARAM3, SENSOR_FIELD_PARAM4, SENSOR_FIELD_AUTOOFFSET, + SENSOR_FIELD_ONLYPOSITIVE, SENSOR_FIELD_FILTER, SENSOR_FIELD_PERSISTENT, SENSOR_FIELD_LOGS, @@ -423,7 +424,11 @@ void menuModelSensor(uint8_t event) case SENSOR_FIELD_AUTOOFFSET: ON_OFF_MENU_ITEM(sensor->autoOffset, SENSOR_2ND_COLUMN, y, STR_AUTOOFFSET, attr, event); break; - + + case SENSOR_FIELD_ONLYPOSITIVE: + ON_OFF_MENU_ITEM(sensor->onlyPositive, SENSOR_2ND_COLUMN, y, STR_ONLYPOSITIVE, attr, event); + break; + case SENSOR_FIELD_FILTER: ON_OFF_MENU_ITEM(sensor->filter, SENSOR_2ND_COLUMN, y, STR_FILTER, attr, event); break; diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index 3c1f4902f..0b39a38b1 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -1276,7 +1276,8 @@ PACK(typedef struct { uint8_t filter:1; uint8_t logs:1; uint8_t persistent:1; - uint8_t spare:4; + uint8_t onlyPositive:1; + uint8_t spare:3; union { PACK(struct { uint16_t ratio; diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp index 5a5a35a20..c0107b006 100644 --- a/radio/src/telemetry/frsky_sport.cpp +++ b/radio/src/telemetry/frsky_sport.cpp @@ -273,6 +273,10 @@ void frskySportSetDefault(int index, uint16_t id, uint8_t instance) telemetrySensor.custom.ratio = 132; telemetrySensor.filter = 1; } + else if (id >= CURR_FIRST_ID && id <= CURR_LAST_ID) { + telemetrySensor.onlyPositive = 1; + } + // TODO set telemetrySensor.onlyPositive for other sensors that need it else if (unit == UNIT_RPMS) { telemetrySensor.custom.ratio = 1; telemetrySensor.custom.offset = 1; diff --git a/radio/src/telemetry/telemetry.cpp b/radio/src/telemetry/telemetry.cpp index dae0f902e..7f65e2343 100644 --- a/radio/src/telemetry/telemetry.cpp +++ b/radio/src/telemetry/telemetry.cpp @@ -599,10 +599,9 @@ int32_t TelemetrySensor::getValue(int32_t value, uint8_t unit, uint8_t prec) con if (type == TELEM_TYPE_CUSTOM) { value += custom.offset; - if (value < 0 && unit >= UNIT_VOLTS && unit <= UNIT_MPH) { + if (value < 0 && onlyPositive) { value = 0; } - } return value; diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 28a2203e1..e6649ab1f 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -212,7 +212,7 @@ const pm_char STR_CV[] PROGMEM = TR_CV; const pm_char STR_GV[] PROGMEM = TR_GV; const pm_char STR_ACHANNEL[] PROGMEM = TR_ACHANNEL; const pm_char STR_RANGE[] PROGMEM = TR_RANGE; -const pm_char STR_CENTER[] PROGMEM = TR_CENTER; +const pm_char STR_CENTER[] PROGMEM = TR_CENTER; const pm_char STR_BAR[] PROGMEM = TR_BAR; const pm_char STR_ALARM[] PROGMEM = TR_ALARM; const pm_char STR_USRDATA[] PROGMEM = TR_USRDATA; @@ -457,8 +457,8 @@ const pm_char STR_EEPROM_CONVERTING[] PROGMEM = TR_EEPROM_CONVERTING; const pm_char STR_THROTTLEWARN[] PROGMEM = TR_THROTTLEWARN; const pm_char STR_ALARMSWARN[] PROGMEM = TR_ALARMSWARN; const pm_char STR_SWITCHWARN[] PROGMEM = TR_SWITCHWARN; -const pm_char STR_FAILSAFEWARN[] PROGMEM = TR_FAILSAFEWARN; -const pm_char STR_NO_FAILSAFE[] PROGMEM = TR_NO_FAILSAFE; +const pm_char STR_FAILSAFEWARN[] PROGMEM = TR_FAILSAFEWARN; +const pm_char STR_NO_FAILSAFE[] PROGMEM = TR_NO_FAILSAFE; const pm_char STR_KEYSTUCK[] PROGMEM = TR_KEYSTUCK; const pm_char STR_SPEAKER_VOLUME[] PROGMEM = TR_SPEAKER_VOLUME; @@ -567,6 +567,7 @@ const pm_char STR_BLCOLOR[] PROGMEM = TR_BLCOLOR; const pm_char STR_GPSSENSOR[] PROGMEM = TR_GPSSENSOR; const pm_char STR_CURRENTSENSOR[] PROGMEM = TR_CURRENTSENSOR; const pm_char STR_AUTOOFFSET[] PROGMEM = TR_AUTOOFFSET; + const pm_char STR_ONLYPOSITIVE[] PROGMEM = TR_ONLYPOSITIVE; const pm_char STR_FILTER[] PROGMEM = TR_FILTER; const pm_char STR_TELEMETRYFULL[] PROGMEM = TR_TELEMETRYFULL; #endif @@ -606,13 +607,13 @@ const pm_char STR_BLCOLOR[] PROGMEM = TR_BLCOLOR; const pm_char STR_MENU_HELI[] PROGMEM = TR_MENU_HELI; const pm_char STR_MENU_TRIMS[] PROGMEM = TR_MENU_TRIMS; const pm_char STR_MENU_SWITCHES[] PROGMEM = TR_MENU_SWITCHES; -const pm_char STR_MENU_LOGICAL_SWITCHES[] PROGMEM = TR_MENU_LOGICAL_SWITCHES; +const pm_char STR_MENU_LOGICAL_SWITCHES[] PROGMEM = TR_MENU_LOGICAL_SWITCHES; const pm_char STR_MENU_TRAINER[] PROGMEM = TR_MENU_TRAINER; const pm_char STR_MENU_CHANNELS[] PROGMEM = TR_MENU_CHANNELS; const pm_char STR_MENU_GVARS[] PROGMEM = TR_MENU_GVARS; const pm_char STR_MENU_TELEMETRY[] PROGMEM = TR_MENU_TELEMETRY; -const pm_char STR_MENU_OTHER[] PROGMEM = TR_MENU_OTHER; -const pm_char STR_MENU_INVERT[] PROGMEM = TR_MENU_INVERT; +const pm_char STR_MENU_OTHER[] PROGMEM = TR_MENU_OTHER; +const pm_char STR_MENU_INVERT[] PROGMEM = TR_MENU_INVERT; #endif #if MENUS_LOCK == 1 diff --git a/radio/src/translations.h b/radio/src/translations.h index d6bda464a..fdcc65469 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -407,7 +407,7 @@ extern const pm_char STR_CV[]; extern const pm_char STR_GV[]; extern const pm_char STR_ACHANNEL[]; extern const pm_char STR_RANGE[]; -extern const pm_char STR_CENTER[]; +extern const pm_char STR_CENTER[]; extern const pm_char STR_BAR[]; extern const pm_char STR_ALARM[]; extern const pm_char STR_USRDATA[]; @@ -637,8 +637,8 @@ extern const pm_char STR_EEPROM_CONVERTING[]; extern const pm_char STR_THROTTLEWARN[]; extern const pm_char STR_ALARMSWARN[]; extern const pm_char STR_SWITCHWARN[]; -extern const pm_char STR_FAILSAFEWARN[]; -extern const pm_char STR_NO_FAILSAFE[]; +extern const pm_char STR_FAILSAFEWARN[]; +extern const pm_char STR_NO_FAILSAFE[]; extern const pm_char STR_KEYSTUCK[]; extern const pm_char STR_SPEAKER_VOLUME[]; @@ -783,6 +783,7 @@ extern const pm_char STR_BLCOLOR[]; extern const pm_char STR_GPSSENSOR[]; extern const pm_char STR_CURRENTSENSOR[]; extern const pm_char STR_AUTOOFFSET[]; + extern const pm_char STR_ONLYPOSITIVE[]; extern const pm_char STR_FILTER[]; extern const pm_char STR_TELEMETRYFULL[]; #endif @@ -822,13 +823,13 @@ extern const pm_char STR_BLCOLOR[]; extern const pm_char STR_MENU_HELI[]; extern const pm_char STR_MENU_TRIMS[]; extern const pm_char STR_MENU_SWITCHES[]; -extern const pm_char STR_MENU_LOGICAL_SWITCHES[]; +extern const pm_char STR_MENU_LOGICAL_SWITCHES[]; extern const pm_char STR_MENU_TRAINER[]; extern const pm_char STR_MENU_CHANNELS[]; extern const pm_char STR_MENU_GVARS[]; extern const pm_char STR_MENU_TELEMETRY[]; -extern const pm_char STR_MENU_OTHER[]; -extern const pm_char STR_MENU_INVERT[]; +extern const pm_char STR_MENU_OTHER[]; +extern const pm_char STR_MENU_INVERT[]; #endif #if MENUS_LOCK == 1 diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index e70b50d6a..bdceac36e 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -1076,6 +1076,7 @@ #define TR_GPSSENSOR "GPS sensor" #define TR_CURRENTSENSOR "Current sensor" #define TR_AUTOOFFSET "Auto Offset" +#define TR_ONLYPOSITIVE "Positive" #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index d45f1623e..f233e49e5 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -106,13 +106,13 @@ #define LEN_TARANIS_PROTOCOLS "\004" #define TR_TARANIS_PROTOCOLS "AUS\0""PPM\0""XJT\0""DSM2" -#if defined(MODULE_D16_EU_ONLY_SUPPORT) - #define LEN_XJT_PROTOCOLS "\006" - #define TR_XJT_PROTOCOLS "AUS\0 ""D16-EU" -#else +#if defined(MODULE_D16_EU_ONLY_SUPPORT) + #define LEN_XJT_PROTOCOLS "\006" + #define TR_XJT_PROTOCOLS "AUS\0 ""D16-EU" +#else #define LEN_XJT_PROTOCOLS "\004" #define TR_XJT_PROTOCOLS "AUS\0""X16\0""D8\0 ""LR12" -#endif +#endif #define LEN_DSM_PROTOCOLS "\004" #define TR_DSM_PROTOCOLS "LP45""DSM2""DSMX" @@ -661,8 +661,8 @@ #define TR_CV "KV" #define TR_GV "GV" #define TR_ACHANNEL TR("A\004gemessen","A\004Kanal gemessen =>") //9XR-Pro -#define TR_RANGE TR(INDENT"Bereich", INDENT "Reichweite") // 9XR-Pro -#define TR_CENTER INDENT "Center" +#define TR_RANGE TR(INDENT"Bereich", INDENT "Reichweite") // 9XR-Pro +#define TR_CENTER INDENT "Center" #define TR_BAR "Streifen" #define TR_ALARM INDENT"Alarm" #define TR_USRDATA "Daten berechnen aus" @@ -831,8 +831,8 @@ #define TR_THROTTLEWARN "GAS" #define TR_ALARMSWARN "ALARM" #define TR_SWITCHWARN "SCHALTER" -#define TR_FAILSAFEWARN "FAILSAFE" -#define TR_NO_FAILSAFE "Failsafe not set" +#define TR_FAILSAFEWARN "FAILSAFE" +#define TR_NO_FAILSAFE "Failsafe not set" #define TR_KEYSTUCK "Taste klemmt" //Key stuck=Taste klemmt #define TR_INVERT_THR TR("Gas umkehren?","Vollgas hinten?") // Th9x 9XR #define TR_SPEAKER_VOLUME INDENT "Lautstärke" @@ -1080,6 +1080,7 @@ #define TR_GPSSENSOR "GPS sensor" #define TR_CURRENTSENSOR "Current sensor" #define TR_AUTOOFFSET "Auto Offset" +#define TR_ONLYPOSITIVE "Positive" #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" @@ -1091,13 +1092,13 @@ #define TR_MENU_HELI "\316Cyclic" #define TR_MENU_TRIMS "\313Trims" #define TR_MENU_SWITCHES "\312Switches" -#define TR_MENU_LOGICAL_SWITCHES "\312Logical Switches" +#define TR_MENU_LOGICAL_SWITCHES "\312Logical Switches" #define TR_MENU_TRAINER "\317Trainer" #define TR_MENU_CHANNELS "\320Channels" #define TR_MENU_GVARS "\311GVars" #define TR_MENU_TELEMETRY "\321Telemetry" -#define TR_MENU_OTHER "Other" -#define TR_MENU_INVERT "Invert" +#define TR_MENU_OTHER "Other" +#define TR_MENU_INVERT "Invert" #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 2727b4d52..706a99e8a 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -1075,6 +1075,7 @@ #define TR_GPSSENSOR "GPS sensor" #define TR_CURRENTSENSOR "Curr. sensor" #define TR_AUTOOFFSET "Auto Offset" +#define TR_ONLYPOSITIVE "Positive" #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 841ce3c72..7263e1d1a 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -1030,6 +1030,7 @@ #define TR_GPSSENSOR "GPS sensor" #define TR_CURRENTSENSOR "Current sensor" #define TR_AUTOOFFSET "Auto Offset" +#define TR_ONLYPOSITIVE "Positive" #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index ea32476ea..a116aa7e2 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -1030,6 +1030,7 @@ #define TR_GPSSENSOR "GPS sensor" #define TR_CURRENTSENSOR "Current sensor" #define TR_AUTOOFFSET "Auto Offset" +#define TR_ONLYPOSITIVE "Positive" #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 1450a4170..f0db9bf4f 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -1067,6 +1067,7 @@ #define TR_GPSSENSOR "Capteur GPS" #define TR_CURRENTSENSOR "Capt courant" #define TR_AUTOOFFSET "Offset auto" +#define TR_ONLYPOSITIVE "Positive" #define TR_FILTER "Filtrage" #define TR_TELEMETRYFULL "Plus de capteurs libres!" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index 1aba997e4..02f387616 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -623,7 +623,7 @@ #define TR_GV "GV" #define TR_ACHANNEL "A\002ingresso" #define TR_RANGE TR(INDENT"Inter.", INDENT"Intervallo") -#define TR_CENTER INDENT "Center" +#define TR_CENTER INDENT "Center" #define TR_BAR "Barra" #define TR_ALARM TR(INDENT"Allar.", INDENT"Allarme") #define TR_USRDATA "Dati" @@ -781,8 +781,8 @@ #define TR_THROTTLEWARN "MOTORE" #define TR_ALARMSWARN "ALLARMI" #define TR_SWITCHWARN "CONTROLLI" -#define TR_FAILSAFEWARN "FAILSAFE" -#define TR_NO_FAILSAFE "Failsafe not set" +#define TR_FAILSAFEWARN "FAILSAFE" +#define TR_NO_FAILSAFE "Failsafe not set" #define TR_KEYSTUCK "Key stuck" #define TR_INVERT_THR "Inverti Mot?" #define TR_SPEAKER_VOLUME "Volume Audio" @@ -1030,6 +1030,7 @@ #define TR_GPSSENSOR "GPS sensor" #define TR_CURRENTSENSOR "Current sensor" #define TR_AUTOOFFSET "Auto Offset" +#define TR_ONLYPOSITIVE "Positive" #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" @@ -1041,13 +1042,13 @@ #define TR_MENU_HELI "\316Cyclic" #define TR_MENU_TRIMS "\313Trims" #define TR_MENU_SWITCHES "\312Switches" -#define TR_MENU_LOGICAL_SWITCHES "\312Logical Switches" +#define TR_MENU_LOGICAL_SWITCHES "\312Logical Switches" #define TR_MENU_TRAINER "\317Trainer" #define TR_MENU_CHANNELS "\320Channels" #define TR_MENU_GVARS "\311GVars" #define TR_MENU_TELEMETRY "\321Telemetry" -#define TR_MENU_OTHER "Other" -#define TR_MENU_INVERT "Invert" +#define TR_MENU_OTHER "Other" +#define TR_MENU_INVERT "Invert" #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 03dcb9954..0642c6504 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -1079,6 +1079,7 @@ #define TR_GPSSENSOR "GPS sensor" #define TR_CURRENTSENSOR "Curr. sensor" #define TR_AUTOOFFSET "Auto Offset" +#define TR_ONLYPOSITIVE "Positive" #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 221e13844..8f10deb58 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -623,7 +623,7 @@ #define TR_GV "GV" #define TR_ACHANNEL "A\004Canal" #define TR_RANGE INDENT"Range" -#define TR_CENTER INDENT "Center" +#define TR_CENTER INDENT "Center" #define TR_BAR "Bar" #define TR_ALARM INDENT"Alarme" #define TR_USRDATA "UsrData" @@ -781,8 +781,8 @@ #define TR_THROTTLEWARN "ACELERAD" #define TR_ALARMSWARN "ALARMES" #define TR_SWITCHWARN "CHAVES" -#define TR_FAILSAFEWARN "FAILSAFE" -#define TR_NO_FAILSAFE "Failsafe not set" +#define TR_FAILSAFEWARN "FAILSAFE" +#define TR_NO_FAILSAFE "Failsafe not set" #define TR_KEYSTUCK "Key stuck" #define TR_INVERT_THR "Inverte Acel?" #define TR_SPEAKER_VOLUME INDENT "Volume" @@ -1030,6 +1030,7 @@ #define TR_GPSSENSOR "GPS sensor" #define TR_CURRENTSENSOR "Current sensor" #define TR_AUTOOFFSET "Auto Offset" +#define TR_ONLYPOSITIVE "Positive" #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" @@ -1041,13 +1042,13 @@ #define TR_MENU_HELI "\316Cyclic" #define TR_MENU_TRIMS "\313Trims" #define TR_MENU_SWITCHES "\312Switches" -#define TR_MENU_LOGICAL_SWITCHES "\312Logical Switches" +#define TR_MENU_LOGICAL_SWITCHES "\312Logical Switches" #define TR_MENU_TRAINER "\317Trainer" #define TR_MENU_CHANNELS "\320Channels" #define TR_MENU_GVARS "\311GVars" #define TR_MENU_TELEMETRY "\321Telemetry" -#define TR_MENU_OTHER "Other" -#define TR_MENU_INVERT "Invert" +#define TR_MENU_OTHER "Other" +#define TR_MENU_INVERT "Invert" #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 1df97bf51..ecd802a07 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -623,7 +623,7 @@ #define TR_GV "GV" #define TR_ACHANNEL "A\004kanal " #define TR_RANGE INDENT"MinMax" -#define TR_CENTER INDENT "Center" +#define TR_CENTER INDENT "Center" #define TR_BAR "Data" #define TR_ALARM INDENT"Alarm" #define TR_USRDATA "Användardata" @@ -781,8 +781,8 @@ #define TR_THROTTLEWARN "GAS" #define TR_ALARMSWARN "ALARM" #define TR_SWITCHWARN "BRYTARE" -#define TR_FAILSAFEWARN "FAILSAFE" -#define TR_NO_FAILSAFE "Failsafe not set" +#define TR_FAILSAFEWARN "FAILSAFE" +#define TR_NO_FAILSAFE "Failsafe not set" #define TR_KEYSTUCK "Knapp-fel" #define TR_INVERT_THR TR("Invert.Gas?", "Invertera Gasen?") #define TR_SPEAKER_VOLUME INDENT "Volym" @@ -1030,6 +1030,7 @@ #define TR_GPSSENSOR "GPS sensor" #define TR_CURRENTSENSOR "Current sensor" #define TR_AUTOOFFSET "Auto Offset" +#define TR_ONLYPOSITIVE "Positive" #define TR_FILTER "Filter" #define TR_TELEMETRYFULL "All telemetry slots full!" @@ -1041,13 +1042,13 @@ #define TR_MENU_HELI "\316Cyclic" #define TR_MENU_TRIMS "\313Trims" #define TR_MENU_SWITCHES "\312Switches" -#define TR_MENU_LOGICAL_SWITCHES "\312Logical Switches" +#define TR_MENU_LOGICAL_SWITCHES "\312Logical Switches" #define TR_MENU_TRAINER "\317Trainer" #define TR_MENU_CHANNELS "\320Channels" #define TR_MENU_GVARS "\311GVars" #define TR_MENU_TELEMETRY "\321Telemetry" -#define TR_MENU_OTHER "Other" -#define TR_MENU_INVERT "Invert" +#define TR_MENU_OTHER "Other" +#define TR_MENU_INVERT "Invert" #define ZSTR_RSSI "RSSI" #define ZSTR_SWR "SWR"