From 19e68bac4d168ac081c24d367005faacd6be2790 Mon Sep 17 00:00:00 2001 From: Andre Bernet Date: Sat, 25 Jul 2015 18:02:01 +0200 Subject: [PATCH] RSSI lacked unit (Fix #2557) dBm renamed to dB (made no sense) --- companion/src/eeprominterface.cpp | 2 +- companion/src/eeprominterface.h | 2 +- radio/src/functions.cpp | 2 +- radio/src/myeeprom.h | 4 ++-- radio/src/telemetry/frsky_sport.cpp | 2 +- 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/nl.h.txt | 2 +- radio/src/translations/pl.h.txt | 2 +- radio/src/translations/pt.h.txt | 2 +- radio/src/translations/se.h.txt | 2 +- radio/src/translations/tts_cz.cpp | 2 +- radio/src/translations/tts_hu.cpp | 2 +- radio/src/translations/tts_pl.cpp | 2 +- radio/src/translations/tts_se.cpp | 2 +- radio/src/translations/tts_sk.cpp | 2 +- 21 files changed, 22 insertions(+), 22 deletions(-) diff --git a/companion/src/eeprominterface.cpp b/companion/src/eeprominterface.cpp index 2a5b8dc5e..3758c24c3 100644 --- a/companion/src/eeprominterface.cpp +++ b/companion/src/eeprominterface.cpp @@ -132,7 +132,7 @@ QString SensorData::unitString() const return QObject::tr("mAh"); case UNIT_WATTS: return QObject::tr("W"); - case UNIT_DBM: + case UNIT_DB: return QObject::tr("dB"); case UNIT_RPMS: return QObject::tr("rpms"); diff --git a/companion/src/eeprominterface.h b/companion/src/eeprominterface.h index 7f8deef4a..9b6d6c898 100644 --- a/companion/src/eeprominterface.h +++ b/companion/src/eeprominterface.h @@ -913,7 +913,7 @@ class SensorData { UNIT_PERCENT, UNIT_MAH, UNIT_WATTS, - UNIT_DBM, + UNIT_DB, UNIT_RPMS, UNIT_G, UNIT_DEGREE, diff --git a/radio/src/functions.cpp b/radio/src/functions.cpp index 197f4c9b2..47923651d 100644 --- a/radio/src/functions.cpp +++ b/radio/src/functions.cpp @@ -119,7 +119,7 @@ PLAY_FUNCTION(playValue, source_t idx) #if defined(FRSKY) case MIXSRC_FIRST_TELEM+TELEM_RSSI_TX-1: case MIXSRC_FIRST_TELEM+TELEM_RSSI_RX-1: - PLAY_NUMBER(val, 1+UNIT_DBM, 0); + PLAY_NUMBER(val, 1+UNIT_DB, 0); break; case MIXSRC_FIRST_TELEM+TELEM_MIN_A1-1: case MIXSRC_FIRST_TELEM+TELEM_MIN_A2-1: diff --git a/radio/src/myeeprom.h b/radio/src/myeeprom.h index 99e1c6980..267d9f96b 100644 --- a/radio/src/myeeprom.h +++ b/radio/src/myeeprom.h @@ -1164,7 +1164,7 @@ enum TelemetryUnit { UNIT_PERCENT, UNIT_MAH, UNIT_WATTS, - UNIT_DBM, + UNIT_DB, UNIT_RPMS, UNIT_G, UNIT_DEGREE, @@ -1205,7 +1205,7 @@ enum TelemetryUnit { UNIT_A1A2_MAX = UNIT_MILLIAMPS, UNIT_MAH, UNIT_WATTS, - UNIT_DBM, + UNIT_DB, UNIT_FEET, UNIT_KTS, UNIT_HOURS, diff --git a/radio/src/telemetry/frsky_sport.cpp b/radio/src/telemetry/frsky_sport.cpp index cc05c7d01..87fa07eb3 100644 --- a/radio/src/telemetry/frsky_sport.cpp +++ b/radio/src/telemetry/frsky_sport.cpp @@ -57,7 +57,7 @@ struct FrSkySportSensor { }; const FrSkySportSensor sportSensors[] = { - { RSSI_ID, RSSI_ID, ZSTR_RSSI, UNIT_RAW, 0 }, + { RSSI_ID, RSSI_ID, ZSTR_RSSI, UNIT_DB, 0 }, { SWR_ID, SWR_ID, ZSTR_SWR, UNIT_RAW, 0 }, { ADC1_ID, ADC1_ID, ZSTR_A1, UNIT_VOLTS, 1 }, { ADC2_ID, ADC2_ID, ZSTR_A2, UNIT_VOLTS, 1 }, diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index 48384da6a..4defb7775 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -381,7 +381,7 @@ #define LEN_VUNITSSYSTEM TR("\006", "\010") #define TR_VUNITSSYSTEM TR("Metr.\0""Imper.", "Metrické""Imperial") #define LEN_VTELEMUNIT "\003" - #define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dBm""rpm""g\0 ""@\0 ""ml\0""fOz" + #define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dB\0""rpm""g\0 ""@\0 ""ml\0""fOz" #else #if defined(IMPERIAL_UNITS) #define LENGTH_UNIT LENGTH_UNIT_IMP diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index fb79587c2..5758b128b 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -388,7 +388,7 @@ #define LEN_VUNITSSYSTEM TR("\006", "\012") #define TR_VUNITSSYSTEM TR("Metrik""Imper.", "Metrisch\0 ""Imperial\0 ") #define LEN_VTELEMUNIT "\003" - #define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dBm""rpm""g\0 ""@\0 ""ml\0""fOz" + #define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dB\0""rpm""g\0 ""@\0 ""ml\0""fOz" #else #if defined(IMPERIAL_UNITS) #define LENGTH_UNIT LENGTH_UNIT_IMP diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index efcea1c8b..4fd0bfc76 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -383,7 +383,7 @@ #define LEN_VUNITSSYSTEM TR("\006", "\010") #define TR_VUNITSSYSTEM TR("Metric""Imper.", "Metric\0 ""Imperial") #define LEN_VTELEMUNIT "\003" - #define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dBm""rpm""g\0 ""@\0 ""ml\0""fOz" + #define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dB\0""rpm""g\0 ""@\0 ""ml\0""fOz" #else #if defined(IMPERIAL_UNITS) #define LENGTH_UNIT LENGTH_UNIT_IMP diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 532ef07da..21fc6d51e 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -379,7 +379,7 @@ #define LEN_VUNITSSYSTEM TR("\006", "\010") #define TR_VUNITSSYSTEM TR("Metric""Imper.", "Metric\0 ""Imperial") #define LEN_VTELEMUNIT "\003" - #define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dBm""rpm""g\0 ""@\0 ""ml\0""fOz" + #define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dB\0""rpm""g\0 ""@\0 ""ml\0""fOz" #else #if defined(IMPERIAL_UNITS) #define LENGTH_UNIT LENGTH_UNIT_IMP diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 184cf02b4..ce396da9f 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -379,7 +379,7 @@ #define LEN_VUNITSSYSTEM TR("\006", "\010") #define TR_VUNITSSYSTEM TR("Metric""Imper.", "Metric\0 ""Imperial") #define LEN_VTELEMUNIT "\003" - #define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dBm""rpm""g\0 ""@\0 ""ml\0""fOz" + #define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dB\0""rpm""g\0 ""@\0 ""ml\0""fOz" #else #if defined(IMPERIAL_UNITS) #define LENGTH_UNIT LENGTH_UNIT_IMP diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 19f72b85a..6298affae 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -383,7 +383,7 @@ #define LEN_VUNITSSYSTEM TR("\006", "\012") #define TR_VUNITSSYSTEM TR("Métr.\0""Impér.", "Métriques\0""Impériales") #define LEN_VTELEMUNIT "\003" - #define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dBm""rpm""g\0 ""@\0 ""ml\0""fOz" + #define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dB\0""rpm""g\0 ""@\0 ""ml\0""fOz" #else #if defined(IMPERIAL_UNITS) #define LENGTH_UNIT LENGTH_UNIT_IMP diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index c0fd997e8..2a939afd5 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -379,7 +379,7 @@ #define LEN_VUNITSSYSTEM TR("\006", "\011") #define TR_VUNITSSYSTEM TR("Metric""Imper.", "Metriche\0""Imperiali") #define LEN_VTELEMUNIT "\003" - #define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dBm""rpm""g\0 ""@\0 ""ml\0""fOz" + #define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dB\0""rpm""g\0 ""@\0 ""ml\0""fOz" #else #if defined(IMPERIAL_UNITS) #define LENGTH_UNIT LENGTH_UNIT_IMP diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index d95396ffb..bfa4b4d8e 100755 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -392,7 +392,7 @@ #define LEN_VUNITSSYSTEM TR("\006", "\010") #define TR_VUNITSSYSTEM TR("Metrs.""Engels", "Metrisch\0 ""Engels\0 ") #define LEN_VTELEMUNIT "\003" - #define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dBm""rpm""g\0 ""@\0 ""ml\0""fOz" + #define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dB\0""rpm""g\0 ""@\0 ""ml\0""fOz" #else #if defined(IMPERIAL_UNITS) #define LENGTH_UNIT LENGTH_UNIT_IMP diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index 7e33f1fec..f25770672 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -387,7 +387,7 @@ #define LEN_VUNITSSYSTEM TR("\006", "\010") /*8 decimal*/ #define TR_VUNITSSYSTEM TR("Metr. ""Imper.", "Metryczn""Imperial") #define LEN_VTELEMUNIT "\003" - #define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dBm""rpm""g\0 ""@\0 ""ml\0""fOz" + #define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dB\0""rpm""g\0 ""@\0 ""ml\0""fOz" #else #if defined(IMPERIAL_UNITS) #define LENGTH_UNIT LENGTH_UNIT_IMP diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 7e465eac7..379d3ac89 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -379,7 +379,7 @@ #define LEN_VUNITSSYSTEM TR("\006", "\010") #define TR_VUNITSSYSTEM TR("Metric""Imper.", "Metric\0 ""Imperial") #define LEN_VTELEMUNIT "\003" - #define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dBm""rpm""g\0 ""@\0 ""ml\0""fOz" + #define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dB\0""rpm""g\0 ""@\0 ""ml\0""fOz" #else #if defined(IMPERIAL_UNITS) #define LENGTH_UNIT LENGTH_UNIT_IMP diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index 2ab5fd821..b03f3736c 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -379,7 +379,7 @@ #define LEN_VUNITSSYSTEM TR("\006", "\010") #define TR_VUNITSSYSTEM TR("Metri.""Imper.", "Metriska""Imperial") #define LEN_VTELEMUNIT "\003" - #define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dBm""rpm""g\0 ""@\0 ""ml\0""fOz" + #define TR_VTELEMUNIT "-\0 ""V\0 ""A\0 ""mA\0""kts""m/s""f/s""kmh""mph""m\0 ""ft\0""@C\0""@F\0""%\0 ""mAh""W\0 ""dB\0""rpm""g\0 ""@\0 ""ml\0""fOz" #else #if defined(IMPERIAL_UNITS) #define LENGTH_UNIT LENGTH_UNIT_IMP diff --git a/radio/src/translations/tts_cz.cpp b/radio/src/translations/tts_cz.cpp index 18c094a60..e27e4cc7e 100644 --- a/radio/src/translations/tts_cz.cpp +++ b/radio/src/translations/tts_cz.cpp @@ -48,7 +48,7 @@ enum CzechPrompts { CZ_PROMPT_MILLIAMPS = CZ_PROMPT_UNITS_BASE+(UNIT_MILLIAMPS*4), CZ_PROMPT_MAH = CZ_PROMPT_UNITS_BASE+(UNIT_MAH*4), CZ_PROMPT_WATTS = CZ_PROMPT_UNITS_BASE+(UNIT_WATTS*4), - CZ_PROMPT_DB = CZ_PROMPT_UNITS_BASE+(UNIT_DBM*4), + CZ_PROMPT_DB = CZ_PROMPT_UNITS_BASE+(UNIT_DB*4), CZ_PROMPT_FEET = CZ_PROMPT_UNITS_BASE+(UNIT_FEET*4), CZ_PROMPT_KTS = CZ_PROMPT_UNITS_BASE+(UNIT_KTS*4), CZ_PROMPT_HOURS = CZ_PROMPT_UNITS_BASE+(UNIT_HOURS*4), diff --git a/radio/src/translations/tts_hu.cpp b/radio/src/translations/tts_hu.cpp index 4c743fa27..9761ed663 100644 --- a/radio/src/translations/tts_hu.cpp +++ b/radio/src/translations/tts_hu.cpp @@ -57,7 +57,7 @@ enum HungarianPrompts { HU_PROMPT_MILLIAMPS = HU_PROMPT_UNITS_BASE+(UNIT_MILLIAMPS*2), HU_PROMPT_MAH = HU_PROMPT_UNITS_BASE+(UNIT_MAH*2), HU_PROMPT_WATTS = HU_PROMPT_UNITS_BASE+(UNIT_WATTS*2), - HU_PROMPT_DB = HU_PROMPT_UNITS_BASE+(UNIT_DBM*2), + HU_PROMPT_DB = HU_PROMPT_UNITS_BASE+(UNIT_DB*2), HU_PROMPT_FEET = HU_PROMPT_UNITS_BASE+(UNIT_FEET*2), HU_PROMPT_MPH = HU_PROMPT_UNITS_BASE+(UNIT_KTS*2), HU_PROMPT_HOURS = HU_PROMPT_UNITS_BASE+(UNIT_HOURS*2), diff --git a/radio/src/translations/tts_pl.cpp b/radio/src/translations/tts_pl.cpp index 43712dba5..b605552fa 100644 --- a/radio/src/translations/tts_pl.cpp +++ b/radio/src/translations/tts_pl.cpp @@ -50,7 +50,7 @@ enum PolishPrompts { PL_PROMPT_MILLIAMPS = PL_PROMPT_UNITS_BASE+(UNIT_MILLIAMPS*4), PL_PROMPT_MAH = PL_PROMPT_UNITS_BASE+(UNIT_MAH*4), PL_PROMPT_WATTS = PL_PROMPT_UNITS_BASE+(UNIT_WATTS*4), - PL_PROMPT_DB = PL_PROMPT_UNITS_BASE+(UNIT_DBM*4), + PL_PROMPT_DB = PL_PROMPT_UNITS_BASE+(UNIT_DB*4), PL_PROMPT_FEET = PL_PROMPT_UNITS_BASE+(UNIT_FEET*4), PL_PROMPT_KTS = PL_PROMPT_UNITS_BASE+(UNIT_KTS*4), PL_PROMPT_HOURS = PL_PROMPT_UNITS_BASE+(UNIT_HOURS*4), diff --git a/radio/src/translations/tts_se.cpp b/radio/src/translations/tts_se.cpp index e817f4267..8d238720d 100644 --- a/radio/src/translations/tts_se.cpp +++ b/radio/src/translations/tts_se.cpp @@ -58,7 +58,7 @@ enum SwedishPrompts { SE_PROMPT_MILLIAMPS = SE_PROMPT_UNITS_BASE+(UNIT_MILLIAMPS*2), SE_PROMPT_MAH = SE_PROMPT_UNITS_BASE+(UNIT_MAH*2), SE_PROMPT_WATTS = SE_PROMPT_UNITS_BASE+(UNIT_WATTS*2), - SE_PROMPT_DB = SE_PROMPT_UNITS_BASE+(UNIT_DBM*2), + SE_PROMPT_DB = SE_PROMPT_UNITS_BASE+(UNIT_DB*2), SE_PROMPT_FEET = SE_PROMPT_UNITS_BASE+(UNIT_FEET*2), SE_PROMPT_KTS = SE_PROMPT_UNITS_BASE+(UNIT_KTS*2), SE_PROMPT_HOURS = SE_PROMPT_UNITS_BASE+(UNIT_HOURS*2), diff --git a/radio/src/translations/tts_sk.cpp b/radio/src/translations/tts_sk.cpp index 83732a94b..056454769 100644 --- a/radio/src/translations/tts_sk.cpp +++ b/radio/src/translations/tts_sk.cpp @@ -63,7 +63,7 @@ enum SlovakPrompts { SK_PROMPT_MILLIAMPS = SK_PROMPT_UNITS_BASE+(UNIT_MILLIAMPS*4), SK_PROMPT_MAH = SK_PROMPT_UNITS_BASE+(UNIT_MAH*4), SK_PROMPT_WATTS = SK_PROMPT_UNITS_BASE+(UNIT_WATTS*4), - SK_PROMPT_DB = SK_PROMPT_UNITS_BASE+(UNIT_DBM*4), + SK_PROMPT_DB = SK_PROMPT_UNITS_BASE+(UNIT_DB*4), SK_PROMPT_FEET = SK_PROMPT_UNITS_BASE+(UNIT_FEET*4), SK_PROMPT_KTS = SK_PROMPT_UNITS_BASE+(UNIT_KTS*4), SK_PROMPT_HOURS = SK_PROMPT_UNITS_BASE+(UNIT_HOURS*4),