From 137374bd2fe350026ba911ec04f56a53b3716e73 Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Mon, 19 Aug 2019 08:27:05 +0200 Subject: [PATCH 1/2] fix clang warnings (unused variables) --- radio/src/bluetooth.cpp | 6 +++--- radio/src/stamp.cpp | 2 +- radio/src/translations.cpp | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/radio/src/bluetooth.cpp b/radio/src/bluetooth.cpp index 7a9b52f04..b06133de7 100644 --- a/radio/src/bluetooth.cpp +++ b/radio/src/bluetooth.cpp @@ -600,11 +600,11 @@ enum { CMD_RET_SUCCESS = 0x40, }; -constexpr uint32_t CC26XX_FLASH_SIZE = 0x00020000; +//constexpr uint32_t CC26XX_FLASH_SIZE = 0x00020000; constexpr uint32_t CC26XX_BOOTLOADER_SIZE = 0x00001000; -constexpr uint32_t CC26XX_DATA_SIZE = 0x00001000; +//constexpr uint32_t CC26XX_DATA_SIZE = 0x00001000; constexpr uint32_t CC26XX_FIRMWARE_BASE = CC26XX_BOOTLOADER_SIZE; -constexpr uint32_t CC26XX_FIRMWARE_SIZE = CC26XX_FLASH_SIZE - CC26XX_DATA_SIZE - CC26XX_BOOTLOADER_SIZE; +//constexpr uint32_t CC26XX_FIRMWARE_SIZE = CC26XX_FLASH_SIZE - CC26XX_DATA_SIZE - CC26XX_BOOTLOADER_SIZE; constexpr uint32_t CC26XX_PAGE_ERASE_SIZE = 0x1000; constexpr uint32_t CC26XX_MAX_BYTES_PER_TRANSFER = 252; diff --git a/radio/src/stamp.cpp b/radio/src/stamp.cpp index f112a97dc..85d5106a2 100644 --- a/radio/src/stamp.cpp +++ b/radio/src/stamp.cpp @@ -47,7 +47,7 @@ * Retrieves the version of the bootloader or firmware * @return */ -#if defined(STM32) +#if defined(STM32) && !defined(SIMU) __SECTION_USED(".fwversiondata") const char firmware_version[] = "opentx-" FLAVOUR "-" VERSION " (" GIT_STR ")"; __SECTION_USED(".bootversiondata") const char boot_version[] = "opentx-" FLAVOUR "-" VERSION " (" GIT_STR ")"; diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 5c7c72bdf..ac88149f3 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -24,7 +24,7 @@ ISTR(OFFON); ISTR(MMMINV); -ISTR(NCHANNELS); +//ISTR(NCHANNELS); ISTR(VBEEPMODE); ISTR(TRNMODE); ISTR(TRNCHN); @@ -32,7 +32,7 @@ ISTR(VTRIMINC); ISTR(VDISPLAYTRIMS); ISTR(RETA123); ISTR(VPROTOS); -ISTR(POSNEG); +//ISTR(POSNEG); ISTR(VBLMODE); ISTR(VCURVEFUNC); ISTR(VMLTPX); @@ -43,18 +43,18 @@ ISTR(VFSWFUNC); ISTR(VFSWRESET); ISTR(FUNCSOUNDS); ISTR(VTELEMUNIT); -ISTR(VALARM); -ISTR(VALARMFN); -ISTR(VTELPROTO); +//ISTR(VALARM); +//ISTR(VALARMFN); +//ISTR(VTELPROTO); ISTR(GPSFORMAT); -ISTR(AMPSRC); -ISTR(VARIOSRC); +//ISTR(AMPSRC); +//ISTR(VARIOSRC); ISTR(VTELEMSCREENTYPE); ISTR(VKEYS); ISTR(VSWITCHES); ISTR(VSRCRAW); ISTR(VTMRMODES); -ISTR(DATETIME); +//ISTR(DATETIME); ISTR(VPERSISTENT); ISTR(VLCD); ISTR(VUNITSSYSTEM); @@ -77,7 +77,7 @@ ISTR(XJT_ACCST_RF_PROTOCOLS); ISTR(ISRM_RF_PROTOCOLS); ISTR(R9M_PXX2_RF_PROTOCOLS); ISTR(DSM_PROTOCOLS); -ISTR(VOLTSRC); +//ISTR(VOLTSRC); ISTR(CURVE_TYPES); ISTR(VSENSORTYPES); ISTR(VFORMULAS); @@ -86,7 +86,7 @@ ISTR(VCELLINDEX); ISTR(VANTENNATYPES); #if !defined(GRAPHICS) -ISTR(VBEEPLEN); +//ISTR(VBEEPLEN); #endif ISTR(AUX_SERIAL_MODES); From 48018f1085865f436f135c3ebaabe6246603295a Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 20 Aug 2019 12:12:28 +0200 Subject: [PATCH 2/2] More code removed --- radio/src/bluetooth.cpp | 3 --- radio/src/translations.cpp | 14 ---------- radio/src/translations/cz.h.txt | 45 +++++---------------------------- radio/src/translations/de.h.txt | 37 ++------------------------- radio/src/translations/en.h.txt | 37 ++------------------------- radio/src/translations/es.h.txt | 33 ------------------------ radio/src/translations/fi.h.txt | 41 +++--------------------------- radio/src/translations/fr.h.txt | 41 +++--------------------------- radio/src/translations/it.h.txt | 45 +++++---------------------------- radio/src/translations/nl.h.txt | 44 ++++---------------------------- radio/src/translations/pl.h.txt | 45 +++++---------------------------- radio/src/translations/pt.h.txt | 33 ------------------------ radio/src/translations/se.h.txt | 45 +++++---------------------------- 13 files changed, 41 insertions(+), 422 deletions(-) diff --git a/radio/src/bluetooth.cpp b/radio/src/bluetooth.cpp index b06133de7..db02e6e54 100644 --- a/radio/src/bluetooth.cpp +++ b/radio/src/bluetooth.cpp @@ -600,11 +600,8 @@ enum { CMD_RET_SUCCESS = 0x40, }; -//constexpr uint32_t CC26XX_FLASH_SIZE = 0x00020000; constexpr uint32_t CC26XX_BOOTLOADER_SIZE = 0x00001000; -//constexpr uint32_t CC26XX_DATA_SIZE = 0x00001000; constexpr uint32_t CC26XX_FIRMWARE_BASE = CC26XX_BOOTLOADER_SIZE; -//constexpr uint32_t CC26XX_FIRMWARE_SIZE = CC26XX_FLASH_SIZE - CC26XX_DATA_SIZE - CC26XX_BOOTLOADER_SIZE; constexpr uint32_t CC26XX_PAGE_ERASE_SIZE = 0x1000; constexpr uint32_t CC26XX_MAX_BYTES_PER_TRANSFER = 252; diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index ac88149f3..cad731156 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -24,7 +24,6 @@ ISTR(OFFON); ISTR(MMMINV); -//ISTR(NCHANNELS); ISTR(VBEEPMODE); ISTR(TRNMODE); ISTR(TRNCHN); @@ -32,7 +31,6 @@ ISTR(VTRIMINC); ISTR(VDISPLAYTRIMS); ISTR(RETA123); ISTR(VPROTOS); -//ISTR(POSNEG); ISTR(VBLMODE); ISTR(VCURVEFUNC); ISTR(VMLTPX); @@ -43,18 +41,12 @@ ISTR(VFSWFUNC); ISTR(VFSWRESET); ISTR(FUNCSOUNDS); ISTR(VTELEMUNIT); -//ISTR(VALARM); -//ISTR(VALARMFN); -//ISTR(VTELPROTO); ISTR(GPSFORMAT); -//ISTR(AMPSRC); -//ISTR(VARIOSRC); ISTR(VTELEMSCREENTYPE); ISTR(VKEYS); ISTR(VSWITCHES); ISTR(VSRCRAW); ISTR(VTMRMODES); -//ISTR(DATETIME); ISTR(VPERSISTENT); ISTR(VLCD); ISTR(VUNITSSYSTEM); @@ -77,18 +69,12 @@ ISTR(XJT_ACCST_RF_PROTOCOLS); ISTR(ISRM_RF_PROTOCOLS); ISTR(R9M_PXX2_RF_PROTOCOLS); ISTR(DSM_PROTOCOLS); -//ISTR(VOLTSRC); ISTR(CURVE_TYPES); ISTR(VSENSORTYPES); ISTR(VFORMULAS); ISTR(VPREC); ISTR(VCELLINDEX); ISTR(VANTENNATYPES); - -#if !defined(GRAPHICS) -//ISTR(VBEEPLEN); -#endif - ISTR(AUX_SERIAL_MODES); ISTR(SWTYPES); ISTR(POTTYPES); diff --git a/radio/src/translations/cz.h.txt b/radio/src/translations/cz.h.txt index d253bb52a..a38c6a917 100644 --- a/radio/src/translations/cz.h.txt +++ b/radio/src/translations/cz.h.txt @@ -48,15 +48,9 @@ #define LEN_MMMINV "\003" #define TR_MMMINV "---""INV" -#define LEN_NCHANNELS "\004" -#define TR_NCHANNELS "\0014CH\0016CH\0018CH10CH12CH14CH16CH" - #define LEN_VBEEPMODE TR("\005","\012") #define TR_VBEEPMODE TR("Tichý""Alarm""BezKl""Vše\0", "Tichý\0 ""Jen alarm\0""Bez kláves""Vše\0 ") -#define LEN_VBEEPLEN "\005" -#define TR_VBEEPLEN "O====""=O===""==O==""===O=""====O" - #define LEN_VRENAVIG "\003" #define TR_VRENAVIG "Ne REaREb" @@ -85,9 +79,6 @@ #define LEN_SLIDERTYPES "\006" #define TR_SLIDERTYPES "Žádný\0""Slider" -#define LEN_DATETIME "\006" -#define TR_DATETIME "DATUM:""ČAS: " - #define LEN_VLCD "\006" #define TR_VLCD "NormalOptrex" @@ -155,9 +146,6 @@ #define TR_VPROTOS "PPM\0 " TR_PXX TR_DSM2 -#define LEN_POSNEG "\003" -#define TR_POSNEG "POZ""NEG" - #if defined(PCBSKY9X) && defined(REVX) #define LEN_VOUTPUT_TYPE "\011" #define TR_VOUTPUT_TYPE "OpenDrain""PushPull\0" @@ -299,37 +287,16 @@ #define LENGTH_UNIT_METR "m\0 " #define SPEED_UNIT_METR "kmh" - #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 ""mW\0""dB\0""rpm""g\0 ""@\0 ""rad""ml\0""fOz" +#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 ""mW\0""dB\0""rpm""g\0 ""@\0 ""rad""ml\0""fOz" #define STR_V (STR_VTELEMUNIT+1) #define STR_A (STR_VTELEMUNIT+4) -#define LEN_VALARM "\004" -#define TR_VALARM "----""žlut""oran""červ" - -#define LEN_VALARMFN "\001" -#define TR_VALARMFN "<>" - -#define LEN_VTELPROTO "\007" -#define TR_VTELPROTO "---\0 ""Hub\0 ""WSHHigh" - - #define LEN_AMPSRC TR("\003", "\005") - #define TR_AMPSRC TR("---""A1\0""A2\0""A3\0""A4\0""FAS""Cel", "---\0 ""A1\0 ""A2\0 ""A3\0 ""A4\0 ""FAS\0 ""Cells") - #define LEN_VOLTSRC TR("\003", "\005") - #define TR_VOLTSRC TR("A1\0""A2\0""A3\0""A4\0""FAS""Cel", "A1\0 ""A2\0 ""A3\0 ""A4\0 ""FAS\0 ""Cells") - -#define LEN_VARIOSRC "\004" -#if defined(TELEMETRY_FRSKY_SPORT) - #define TR_VARIOSRC "VSpd""A1\0 ""A2\0 ""dTE\0" -#else - #define TR_VARIOSRC "Alt\0""Alt+""VSpd""A1\0 ""A2\0" -#endif - - #define LEN_VTELEMSCREENTYPE "\010" - #define TR_VTELEMSCREENTYPE "Nic\0 ""Hodnota ""Ukazatel""Skript\0" +#define LEN_VTELEMSCREENTYPE "\010" +#define TR_VTELEMSCREENTYPE "Nic\0 ""Hodnota ""Ukazatel""Skript\0" #define LEN_GPSFORMAT "\004" #define TR_GPSFORMAT "DMS\0""NMEA" diff --git a/radio/src/translations/de.h.txt b/radio/src/translations/de.h.txt index f8abd9eff..6681950dd 100644 --- a/radio/src/translations/de.h.txt +++ b/radio/src/translations/de.h.txt @@ -49,15 +49,9 @@ #define LEN_MMMINV "\003" #define TR_MMMINV "---""INV" -#define LEN_NCHANNELS "\004" -#define TR_NCHANNELS "\0014CH\0016CH\0018CH10CH12CH14CH16CH" - #define LEN_VBEEPMODE "\005" #define TR_VBEEPMODE "Stumm""Alarm""NoKey""Alle\0" -#define LEN_VBEEPLEN "\005" -#define TR_VBEEPLEN "0====""=0===""==0==""===0=""====0" - #define LEN_VRENAVIG "\003" #define TR_VRENAVIG "AUSDGaDGb" @@ -86,9 +80,6 @@ #define LEN_SLIDERTYPES "\006" #define TR_SLIDERTYPES "Keine\0""Slider" -#define LEN_DATETIME "\005" -#define TR_DATETIME "DATE:""ZEIT:" - #define LEN_VLCD "\006" #define TR_VLCD "NormalOptrex" @@ -156,9 +147,6 @@ #define TR_VPROTOS "PPM\0 " TR_DSM2 -#define LEN_POSNEG "\003" -#define TR_POSNEG "POS""NEG" - #if defined(PCBSKY9X) && defined(REVX) #define LEN_VOUTPUT_TYPE "\011" #define TR_VOUTPUT_TYPE "OpenDrain""PushPull\0" @@ -327,29 +315,8 @@ #define STR_V (STR_VTELEMUNIT+1) #define STR_A (STR_VTELEMUNIT+4) -#define LEN_VALARM "\003" -#define TR_VALARM "---""Glb""Org""Rot" - -#define LEN_VALARMFN "\001" -#define TR_VALARMFN "<>" - -#define LEN_VTELPROTO "\007" -#define TR_VTELPROTO "Kein\0 ""Hub\0 ""WSHHigh" - - #define LEN_AMPSRC TR("\003", "\005") - #define TR_AMPSRC TR("---""A1\0""A2\0""A3\0""A4\0""FAS""Cel", "---\0 ""A1\0 ""A2\0 ""A3\0 ""A4\0 ""FAS\0 ""Cells") - #define LEN_VOLTSRC TR("\003", "\005") - #define TR_VOLTSRC TR("A1\0""A2\0""A3\0""A4\0""FAS""Cel", "A1\0 ""A2\0 ""A3\0 ""A4\0 ""FAS\0 ""Cells") - -#define LEN_VARIOSRC "\004" -#if defined(TELEMETRY_FRSKY_SPORT) - #define TR_VARIOSRC "Vspd""A1\0 ""A2\0 ""dTE\0" -#else - #define TR_VARIOSRC "Alt\0""Alt+""Vspd""A1\0 ""A2\0 " -#endif - - #define LEN_VTELEMSCREENTYPE "\007" - #define TR_VTELEMSCREENTYPE " None "" Werte "" Balken"" Script" +#define LEN_VTELEMSCREENTYPE "\007" +#define TR_VTELEMSCREENTYPE " None "" Werte "" Balken"" Script" #define LEN_GPSFORMAT "\004" #define TR_GPSFORMAT "GMS\0""NMEA" //Koordinatenanzeige diff --git a/radio/src/translations/en.h.txt b/radio/src/translations/en.h.txt index 11783de8c..5202fd000 100644 --- a/radio/src/translations/en.h.txt +++ b/radio/src/translations/en.h.txt @@ -49,15 +49,9 @@ #define LEN_MMMINV "\003" #define TR_MMMINV "---""INV" -#define LEN_NCHANNELS "\004" -#define TR_NCHANNELS "\0014CH\0016CH\0018CH10CH12CH14CH16CH" - #define LEN_VBEEPMODE "\005" #define TR_VBEEPMODE "Quiet""Alarm""NoKey""All\0 " -#define LEN_VBEEPLEN "\005" -#define TR_VBEEPLEN "0====""=0===""==0==""===0=""====0" - #define LEN_VRENAVIG "\003" #define TR_VRENAVIG "No REaREb" @@ -86,9 +80,6 @@ #define LEN_SLIDERTYPES "\006" #define TR_SLIDERTYPES "None\0 ""Slider" -#define LEN_DATETIME "\005" -#define TR_DATETIME "DATE:""TIME:" - #define LEN_VLCD "\006" #define TR_VLCD "NormalOptrex" @@ -156,9 +147,6 @@ #define TR_VPROTOS "PPM\0 " TR_PXX TR_DSM2 -#define LEN_POSNEG "\003" -#define TR_POSNEG "POS""NEG" - #if defined(PCBSKY9X) && defined(REVX) #define LEN_VOUTPUT_TYPE "\011" #define TR_VOUTPUT_TYPE "OpenDrain""PushPull\0" @@ -310,29 +298,8 @@ #define STR_V (STR_VTELEMUNIT+1) #define STR_A (STR_VTELEMUNIT+4) -#define LEN_VALARM "\003" -#define TR_VALARM "---""Yel""Org""Red" - -#define LEN_VALARMFN "\001" -#define TR_VALARMFN "<>" - -#define LEN_VTELPROTO "\007" -#define TR_VTELPROTO "None\0 ""Hub\0 ""WSHHigh" - -#define LEN_AMPSRC TR("\003", "\005") -#define TR_AMPSRC TR("---""A1\0""A2\0""A3\0""A4\0""FAS""Cel", "---\0 ""A1\0 ""A2\0 ""A3\0 ""A4\0 ""FAS\0 ""Cells") -#define LEN_VOLTSRC TR("\003", "\005") -#define TR_VOLTSRC TR("A1\0""A2\0""A3\0""A4\0""FAS""Cel", "A1\0 ""A2\0 ""A3\0 ""A4\0 ""FAS\0 ""Cells") - -#define LEN_VARIOSRC "\004" -#if defined(TELEMETRY_FRSKY_SPORT) - #define TR_VARIOSRC "VSpd""A1\0 ""A2\0 ""dTE\0" -#else - #define TR_VARIOSRC "Alt\0""Alt+""VSpd""A1\0 ""A2\0" -#endif - - #define LEN_VTELEMSCREENTYPE "\006" - #define TR_VTELEMSCREENTYPE "None\0 ""Nums\0 ""Bars\0 ""Script" +#define LEN_VTELEMSCREENTYPE "\006" +#define TR_VTELEMSCREENTYPE "None\0 ""Nums\0 ""Bars\0 ""Script" #define LEN_GPSFORMAT "\004" #define TR_GPSFORMAT "DMS\0""NMEA" diff --git a/radio/src/translations/es.h.txt b/radio/src/translations/es.h.txt index 30af9cc34..3d195d2e9 100644 --- a/radio/src/translations/es.h.txt +++ b/radio/src/translations/es.h.txt @@ -49,15 +49,9 @@ #define LEN_MMMINV "\003" #define TR_MMMINV "---""INV" -#define LEN_NCHANNELS "\004" -#define TR_NCHANNELS "\0014CH\0016CH\0018CH10CH12CH14CH16CH" - #define LEN_VBEEPMODE "\005" #define TR_VBEEPMODE "Mudo ""Alarm""NoKey""Todo " -#define LEN_VBEEPLEN "\005" -#define TR_VBEEPLEN "0====""=0===""==0==""===0=""====0" - #define LEN_VRENAVIG "\003" #define TR_VRENAVIG "No REaREb" @@ -86,9 +80,6 @@ #define LEN_SLIDERTYPES "\006" #define TR_SLIDERTYPES "Rien\0 ""Slider" -#define LEN_DATETIME "\005" -#define TR_DATETIME "DATA:""HORA:" - #define LEN_VLCD "\006" #define TR_VLCD "NormalOptrex" @@ -156,9 +147,6 @@ #define TR_VPROTOS "PPM\0 " TR_PXX TR_DSM2 -#define LEN_POSNEG "\003" -#define TR_POSNEG "POS""NEG" - #if defined(PCBSKY9X) && defined(REVX) #define LEN_VOUTPUT_TYPE "\011" #define TR_VOUTPUT_TYPE "OpenDrain""PushPull\0" @@ -325,27 +313,6 @@ #define STR_V (STR_VTELEMUNIT+1) #define STR_A (STR_VTELEMUNIT+4) -#define LEN_VALARM "\003" -#define TR_VALARM "---""Ama""Nar""Roj" - -#define LEN_VALARMFN "\001" -#define TR_VALARMFN "<>" - -#define LEN_VTELPROTO "\007" -#define TR_VTELPROTO "Nada\0 ""Hub\0 ""WSHHigh" - - #define LEN_AMPSRC TR("\003", "\007") - #define TR_AMPSRC TR("---""A1\0""A2\0""A3\0""A4\0""FAS""Cel", "---\0 ""A1\0 ""A2\0 ""A3\0 ""A4\0 ""FAS\0 ""Cells\0 ") - #define LEN_VOLTSRC TR("\003", "\007") - #define TR_VOLTSRC TR("A1\0""A2\0""A3\0""A4\0""FAS""Cel", "A1\0 ""A2\0 ""A3\0 ""A4\0 ""FAS\0 ""Cells\0 ") - -#define LEN_VARIOSRC "\005" -#if defined(TELEMETRY_FRSKY_SPORT) - #define TR_VARIOSRC "Vario""A1\0 ""A2\0" -#else - #define TR_VARIOSRC "Alti\0""Alti+""Vario""A1\0 ""A2\0" -#endif - #define LEN_VTELEMSCREENTYPE "\004" #define TR_VTELEMSCREENTYPE "Nums""Bars" diff --git a/radio/src/translations/fi.h.txt b/radio/src/translations/fi.h.txt index 8ab2eeca2..2a2afd4f5 100644 --- a/radio/src/translations/fi.h.txt +++ b/radio/src/translations/fi.h.txt @@ -49,15 +49,9 @@ #define LEN_MMMINV "\003" #define TR_MMMINV "---""KÄÄ" -#define LEN_NCHANNELS "\004" -#define TR_NCHANNELS "\0014CH\0016CH\0018CH10CH12CH14CH16CH" - #define LEN_VBEEPMODE "\005" #define TR_VBEEPMODE "Äänet""Hälyt""EiNap""Kaikk" -#define LEN_VBEEPLEN "\005" -#define TR_VBEEPLEN "0====""=0===""==0==""===0=""====0" - #define LEN_VRENAVIG "\003" #define TR_VRENAVIG "No REaREb" @@ -86,9 +80,6 @@ #define LEN_SLIDERTYPES "\006" #define TR_SLIDERTYPES "Rien\0 ""Slider" -#define LEN_DATETIME "\005" -#define TR_DATETIME "PÄIV:""AIKA:" - #define LEN_VLCD "\006" #define TR_VLCD "NormalOptrex" @@ -156,9 +147,6 @@ #define TR_VPROTOS "PPM\0 " TR_PXX TR_DSM2 -#define LEN_POSNEG "\003" -#define TR_POSNEG "POS""NEG" - #if defined(PCBSKY9X) && defined(REVX) #define LEN_VOUTPUT_TYPE "\011" #define TR_VOUTPUT_TYPE "OpenDrain""PushPull\0" @@ -317,35 +305,14 @@ #define LENGTH_UNIT_METR "m\0 " #define SPEED_UNIT_METR "kmh" - #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 ""mW\0""dB\0""rpm""g\0 ""@\0 ""rad""ml\0""fOz" +#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 ""mW\0""dB\0""rpm""g\0 ""@\0 ""rad""ml\0""fOz" #define STR_V (STR_VTELEMUNIT+1) #define STR_A (STR_VTELEMUNIT+4) -#define LEN_VALARM "\003" -#define TR_VALARM "---""Yel""Org""Red" - -#define LEN_VALARMFN "\001" -#define TR_VALARMFN "<>" - -#define LEN_VTELPROTO "\007" -#define TR_VTELPROTO "None\0 ""Hub\0 ""WSHHigh" - - #define LEN_AMPSRC TR("\003", "\007") - #define TR_AMPSRC TR("---""A1\0""A2\0""A3\0""A4\0""FAS""Cel", "---\0 ""A1\0 ""A2\0 ""A3\0 ""A4\0 ""FAS\0 ""Cells\0 ") - #define LEN_VOLTSRC TR("\003", "\007") - #define TR_VOLTSRC TR("A1\0""A2\0""A3\0""A4\0""FAS""Cel", "A1\0 ""A2\0 ""A3\0 ""A4\0 ""FAS\0 ""Cells\0 ") - -#define LEN_VARIOSRC "\005" -#if defined(TELEMETRY_FRSKY_SPORT) - #define TR_VARIOSRC "Vario""A1\0 ""A2\0" -#else - #define TR_VARIOSRC "Alti\0""Alti+""Vario""A1\0 ""A2\0" -#endif - #define LEN_VTELEMSCREENTYPE "\004" #define TR_VTELEMSCREENTYPE "Nums""Bars" diff --git a/radio/src/translations/fr.h.txt b/radio/src/translations/fr.h.txt index 96228acc2..227ca16e3 100644 --- a/radio/src/translations/fr.h.txt +++ b/radio/src/translations/fr.h.txt @@ -49,15 +49,9 @@ #define LEN_MMMINV "\003" #define TR_MMMINV "---""INV" -#define LEN_NCHANNELS "\004" -#define TR_NCHANNELS "\0014CH\0016CH\0018CH10CH12CH14CH16CH" - #define LEN_VBEEPMODE "\005" #define TR_VBEEPMODE "Aucun""Alarm""NoKey""Tout\0" -#define LEN_VBEEPLEN "\005" -#define TR_VBEEPLEN "0====""=0===""==0==""===0=""====0" - #define LEN_VRENAVIG "\003" #define TR_VRENAVIG "NonREaREb" @@ -86,9 +80,6 @@ #define LEN_SLIDERTYPES "\006" #define TR_SLIDERTYPES "Rien\0 ""Slider" -#define LEN_DATETIME "\005" -#define TR_DATETIME "DATE:""HEURE" - #define LEN_VLCD "\006" #define TR_VLCD "NormalOptrex" @@ -156,9 +147,6 @@ #define TR_VPROTOS "PPM\0 " TR_PXX TR_DSM2 -#define LEN_POSNEG "\003" -#define TR_POSNEG "POS""NEG" - #if defined(PCBSKY9X) && defined(REVX) #define LEN_VOUTPUT_TYPE "\011" #define TR_VOUTPUT_TYPE "OpenDrain""PushPull\0" @@ -319,35 +307,14 @@ #define LENGTH_UNIT_METR "m\0 " #define SPEED_UNIT_METR "kmh" - #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 ""mW\0""dB\0""rpm""g\0 ""@\0 ""rad""ml\0""fOz" +#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 ""mW\0""dB\0""rpm""g\0 ""@\0 ""rad""ml\0""fOz" #define STR_V (STR_VTELEMUNIT+1) #define STR_A (STR_VTELEMUNIT+4) -#define LEN_VALARM "\004" -#define TR_VALARM "----""Jaun""Oran""Roug" - -#define LEN_VALARMFN "\001" -#define TR_VALARMFN "<>" - -#define LEN_VTELPROTO "\007" -#define TR_VTELPROTO "Aucun ""Hub\0 ""WSHHigh" - - #define LEN_AMPSRC TR("\003", "\005") - #define TR_AMPSRC TR("---""A1\0""A2\0""A3\0""A4\0""FAS""Cel", "---\0 ""A1\0 ""A2\0 ""A3\0 ""A4\0 ""FAS\0 ""Elem.") - #define LEN_VOLTSRC TR("\003", "\005") - #define TR_VOLTSRC TR("A1\0""A2\0""A3\0""A4\0""FAS""Cel", "A1\0 ""A2\0 ""A3\0 ""A4\0 ""FAS\0 ""Elem.") - -#define LEN_VARIOSRC "\005" -#if defined(TELEMETRY_FRSKY_SPORT) - #define TR_VARIOSRC "Vario""A1\0 ""A2\0 ""dTE\0 " -#else - #define TR_VARIOSRC "Alti\0""Alti+""Vario""A1\0 ""A2\0" -#endif - #define LEN_VTELEMSCREENTYPE "\007" #define TR_VTELEMSCREENTYPE "Rien\0 ""Valeurs""Barres\0""Script\0" diff --git a/radio/src/translations/it.h.txt b/radio/src/translations/it.h.txt index a5812a04b..ab1064f99 100644 --- a/radio/src/translations/it.h.txt +++ b/radio/src/translations/it.h.txt @@ -49,15 +49,9 @@ #define LEN_MMMINV "\003" #define TR_MMMINV "---""INV" -#define LEN_NCHANNELS "\004" -#define TR_NCHANNELS "\0014CH\0016CH\0018CH10CH12CH14CH16CH" - #define LEN_VBEEPMODE TR("\005", "\010") #define TR_VBEEPMODE TR("Silen""Avvis""Notst""Tutti","Silente ""Avvisi\0 ""No Tasti""Tutti\0 ") -#define LEN_VBEEPLEN "\005" -#define TR_VBEEPLEN "+Cort""Corta""Media""Lunga""+Lung" - #define LEN_VRENAVIG "\003" #define TR_VRENAVIG "No REaREb" @@ -86,9 +80,6 @@ #define LEN_SLIDERTYPES "\006" #define TR_SLIDERTYPES "Niente""Slider" -#define LEN_DATETIME "\005" -#define TR_DATETIME "DATA:""ORA :" - #define LEN_VLCD "\006" #define TR_VLCD "NormalOptrex" @@ -156,9 +147,6 @@ #define TR_VPROTOS "PPM\0 " TR_PXX TR_DSM2 -#define LEN_POSNEG "\003" -#define TR_POSNEG "POS""NEG" - #if defined(PCBSKY9X) && defined(REVX) #define LEN_VOUTPUT_TYPE "\011" #define TR_VOUTPUT_TYPE "OpenDrain""PushPull\0" @@ -319,37 +307,16 @@ #define LENGTH_UNIT_METR "m\0 " #define SPEED_UNIT_METR "kmh" - #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 ""mW\0""dB\0""rpm""g\0 ""@\0 ""rad""ml\0""fOz" +#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 ""mW\0""dB\0""rpm""g\0 ""@\0 ""rad""ml\0""fOz" #define STR_V (STR_VTELEMUNIT+1) #define STR_A (STR_VTELEMUNIT+4) -#define LEN_VALARM "\003" -#define TR_VALARM "---""Gia""Ara""Ros" - -#define LEN_VALARMFN "\001" -#define TR_VALARMFN "<>" - -#define LEN_VTELPROTO "\007" -#define TR_VTELPROTO "---\0 ""Hub\0 ""WSHHigh" - - #define LEN_AMPSRC TR("\003", "\007") - #define TR_AMPSRC TR("---""A1\0""A2\0""A3\0""A4\0""FAS""Cel", "---\0 ""A1\0 ""A2\0 ""A3\0 ""A4\0 ""FAS\0 ""Celle\0 ") - #define LEN_VOLTSRC TR("\003", "\007") - #define TR_VOLTSRC TR("A1\0""A2\0""A3\0""A4\0""FAS""Cel", "A1\0 ""A2\0 ""A3\0 ""A4\0 ""FAS\0 ""Celle\0 ") - -#define LEN_VARIOSRC "\005" -#if defined(TELEMETRY_FRSKY_SPORT) - #define TR_VARIOSRC "Vario""A1\0 ""A2\0" -#else - #define TR_VARIOSRC "Alti\0""Alti+""Vario""A1\0 ""A2\0" -#endif - - #define LEN_VTELEMSCREENTYPE "\006" - #define TR_VTELEMSCREENTYPE "Niente""Valori""Barre\0""Script" +#define LEN_VTELEMSCREENTYPE "\006" +#define TR_VTELEMSCREENTYPE "Niente""Valori""Barre\0""Script" #define LEN_GPSFORMAT "\004" #define TR_GPSFORMAT "HMS NMEA" diff --git a/radio/src/translations/nl.h.txt b/radio/src/translations/nl.h.txt index cd94cc308..7a3f7b7ba 100644 --- a/radio/src/translations/nl.h.txt +++ b/radio/src/translations/nl.h.txt @@ -49,15 +49,9 @@ #define LEN_MMMINV "\003" #define TR_MMMINV "---""INV" -#define LEN_NCHANNELS "\004" -#define TR_NCHANNELS "\0014CH\0016CH\0018CH10CH12CH14CH16CH" - #define LEN_VBEEPMODE "\005" #define TR_VBEEPMODE "Stil\0""Alarm""NoKey""Alles" -#define LEN_VBEEPLEN "\005" -#define TR_VBEEPLEN "0====""=0===""==0==""===0=""====0" - #define LEN_VRENAVIG "\003" #define TR_VRENAVIG "UITREaREb" @@ -84,13 +78,9 @@ #define LEN_POTTYPES TR("\013","\021") #define TR_POTTYPES TR("None\0 ""Pot w. det\0""Multipos\0 ""Pot\0 ", "Geen\0 ""Pot met Klik\0 ""Standenschakelaar""Pot zonder Klik\0 ") - #define LEN_SLIDERTYPES "\006" #define TR_SLIDERTYPES "Geen\0 ""Schuif" -#define LEN_DATETIME "\006" -#define TR_DATETIME "DATUM:""TIJD: " - #define LEN_VLCD "\006" #define TR_VLCD "NormalOptrex" @@ -158,9 +148,6 @@ #define TR_VPROTOS "PPM\0 " TR_PXX TR_DSM2 -#define LEN_POSNEG "\003" -#define TR_POSNEG "POS""NEG" - #if defined(PCBSKY9X) && defined(REVX) #define LEN_VOUTPUT_TYPE "\011" #define TR_VOUTPUT_TYPE "OpenDrain""PushPull\0" @@ -304,37 +291,16 @@ #define LENGTH_UNIT_METR "m\0 " #define SPEED_UNIT_METR "kmh" - #define LEN_VUNITSSYSTEM TR("\006", "\010") - #define TR_VUNITSSYSTEM TR("Mtrsch""Engels", "Metrisch\0 ""Engels\0 ") - #define LEN_VTELEMUNIT "\003" +#define LEN_VUNITSSYSTEM TR("\006", "\010") +#define TR_VUNITSSYSTEM TR("Mtrsch""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 ""mW\0""dB\0""rpm""g\0 ""@\0 ""rad""ml\0""fOz" #define STR_V (STR_VTELEMUNIT+1) #define STR_A (STR_VTELEMUNIT+4) -#define LEN_VALARM "\003" -#define TR_VALARM "---""Gel""Ora""Rod" - -#define LEN_VALARMFN "\001" -#define TR_VALARMFN "<>" - -#define LEN_VTELPROTO "\007" -#define TR_VTELPROTO "Geen\0 ""Hub\0 ""WSHHigh" - - #define LEN_AMPSRC TR("\003", "\005") - #define TR_AMPSRC TR("---""A1\0""A2\0""A3\0""A4\0""FAS""Cel", "---\0 ""A1\0 ""A2\0 ""A3\0 ""A4\0 ""FAS\0 ""Cells") - #define LEN_VOLTSRC TR("\003", "\005") - #define TR_VOLTSRC TR("A1\0""A2\0""A3\0""A4\0""FAS""Cel", "A1\0 ""A2\0 ""A3\0 ""A4\0 ""FAS\0 ""Cells") - -#define LEN_VARIOSRC "\004" -#if defined(TELEMETRY_FRSKY_SPORT) - #define TR_VARIOSRC "VSpd""A1\0 ""A2\0 ""dTE\0" -#else - #define TR_VARIOSRC "Alt\0""Alt+""VSpd""A1\0 ""A2\0" -#endif - - #define LEN_VTELEMSCREENTYPE "\006" - #define TR_VTELEMSCREENTYPE "Geen\0 ""Nums\0 ""Balken""Script" +#define LEN_VTELEMSCREENTYPE "\006" +#define TR_VTELEMSCREENTYPE "Geen\0 ""Nums\0 ""Balken""Script" #define LEN_GPSFORMAT "\004" #define TR_GPSFORMAT "DMS\0""NMEA" diff --git a/radio/src/translations/pl.h.txt b/radio/src/translations/pl.h.txt index ac4009108..ba30aa762 100644 --- a/radio/src/translations/pl.h.txt +++ b/radio/src/translations/pl.h.txt @@ -49,15 +49,9 @@ #define LEN_MMMINV "\003" #define TR_MMMINV "---""REV" -#define LEN_NCHANNELS "\004" -#define TR_NCHANNELS "\0014KN\0016KN\0018KN10KN12KN14KN16KN" - #define LEN_VBEEPMODE "\005" #define TR_VBEEPMODE "Cichy""Alarm""BezPr""Wsz.\0" -#define LEN_VBEEPLEN "\005" -#define TR_VBEEPLEN "0====""=0===""==0==""===0=""====0" - #define LEN_VRENAVIG "\003" #define TR_VRENAVIG "No REaREb" @@ -86,9 +80,6 @@ #define LEN_SLIDERTYPES "\006" #define TR_SLIDERTYPES "Brak\0 ""Suwak " -#define LEN_DATETIME "\005" -#define TR_DATETIME "DATA:""CZAS:" - #define LEN_VLCD "\006" #define TR_VLCD "NormalOptrex" @@ -157,9 +148,6 @@ #define TR_VPROTOS "PPM\0 " TR_PXX TR_DSM2 -#define LEN_POSNEG "\003" -#define TR_POSNEG "POZ""NEG" - #if defined(PCBSKY9X) && defined(REVX) #define LEN_VOUTPUT_TYPE "\011" #define TR_VOUTPUT_TYPE "OpenDrain""PushPull\0" @@ -320,37 +308,16 @@ #define LENGTH_UNIT_METR "m\0 " #define SPEED_UNIT_METR "kmh" - #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 ""mW\0""dB\0""rpm""g\0 ""@\0 ""rad""ml\0""fOz" +#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 ""mW\0""dB\0""rpm""g\0 ""@\0 ""rad""ml\0""fOz" #define STR_V (STR_VTELEMUNIT+1) #define STR_A (STR_VTELEMUNIT+4) -#define LEN_VALARM "\003" -#define TR_VALARM "---""Żół""Pom""Cze" - -#define LEN_VALARMFN "\001" -#define TR_VALARMFN "<>" - -#define LEN_VTELPROTO "\007" -#define TR_VTELPROTO "None\0 ""Hub\0 ""WSHHigh" - - #define LEN_AMPSRC TR("\003", "\005") - #define TR_AMPSRC TR("---""A1\0""A2\0""A3\0""A4\0""FAS""Cel", "---\0 ""A1\0 ""A2\0 ""A3\0 ""A4\0 ""FAS\0 ""Cells") - #define LEN_VOLTSRC TR("\003", "\005") - #define TR_VOLTSRC TR("A1\0""A2\0""A3\0""A4\0""FAS""Cel", "A1\0 ""A2\0 ""A3\0 ""A4\0 ""FAS\0 ""Cells") - -#define LEN_VARIOSRC "\004" -#if defined(TELEMETRY_FRSKY_SPORT) - #define TR_VARIOSRC "VSpd""A1\0 ""A2\0 ""dTE\0" -#else - #define TR_VARIOSRC "Wys\0""Wys+""VSpd""A1\0 ""A2\0" -#endif - - #define LEN_VTELEMSCREENTYPE "\006" - #define TR_VTELEMSCREENTYPE "Brak\0 ""Liczb\0""Paski\0""Skrypt" +#define LEN_VTELEMSCREENTYPE "\006" +#define TR_VTELEMSCREENTYPE "Brak\0 ""Liczb\0""Paski\0""Skrypt" #define LEN_GPSFORMAT "\004" #define TR_GPSFORMAT "DMS\0""NMEA" diff --git a/radio/src/translations/pt.h.txt b/radio/src/translations/pt.h.txt index 92d1163d6..b0c5e50ab 100644 --- a/radio/src/translations/pt.h.txt +++ b/radio/src/translations/pt.h.txt @@ -49,15 +49,9 @@ #define LEN_MMMINV "\003" #define TR_MMMINV "---""INV" -#define LEN_NCHANNELS "\004" -#define TR_NCHANNELS "\0014CH\0016CH\0018CH10CH12CH14CH16CH" - #define LEN_VBEEPMODE "\005" #define TR_VBEEPMODE "Mudo ""Alarm""NoKey""Todo " -#define LEN_VBEEPLEN "\005" -#define TR_VBEEPLEN "0====""=0===""==0==""===0=""====0" - #define LEN_VRENAVIG "\003" #define TR_VRENAVIG "No REaREb" @@ -86,9 +80,6 @@ #define LEN_SLIDERTYPES "\006" #define TR_SLIDERTYPES "Rien\0 ""Slider" -#define LEN_DATETIME "\005" -#define TR_DATETIME "DATA:""HORA:" - #define LEN_VLCD "\006" #define TR_VLCD "NormalOptrex" @@ -155,9 +146,6 @@ #define TR_VPROTOS "PPM\0 " TR_PXX TR_DSM2 -#define LEN_POSNEG "\003" -#define TR_POSNEG "POS""NEG" - #if defined(PCBSKY9X) && defined(REVX) #define LEN_VOUTPUT_TYPE "\011" #define TR_VOUTPUT_TYPE "OpenDrain""PushPull\0" @@ -324,27 +312,6 @@ #define STR_V (STR_VTELEMUNIT+1) #define STR_A (STR_VTELEMUNIT+4) -#define LEN_VALARM "\003" -#define TR_VALARM "---""Ama""Lar""Ver" - -#define LEN_VALARMFN "\001" -#define TR_VALARMFN "<>" - -#define LEN_VTELPROTO "\007" -#define TR_VTELPROTO "Nada\0 ""Hub\0 ""WSHHigh" - - #define LEN_AMPSRC TR("\003", "\007") - #define TR_AMPSRC TR("---""A1\0""A2\0""A3\0""A4\0""FAS""Cel", "---\0 ""A1\0 ""A2\0 ""A3\0 ""A4\0 ""FAS\0 ""Cells\0 ") - #define LEN_VOLTSRC TR("\003", "\007") - #define TR_VOLTSRC TR("A1\0""A2\0""A3\0""A4\0""FAS""Cel", "A1\0 ""A2\0 ""A3\0 ""A4\0 ""FAS\0 ""Cells\0 ") - -#define LEN_VARIOSRC "\005" -#if defined(TELEMETRY_FRSKY_SPORT) - #define TR_VARIOSRC "Vario""A1\0 ""A2\0" -#else - #define TR_VARIOSRC "Alti\0""Alti+""Vario""A1\0 ""A2\0" -#endif - #define LEN_VTELEMSCREENTYPE "\004" #define TR_VTELEMSCREENTYPE "Nums""Bars" diff --git a/radio/src/translations/se.h.txt b/radio/src/translations/se.h.txt index d2d9cffb4..5426669de 100644 --- a/radio/src/translations/se.h.txt +++ b/radio/src/translations/se.h.txt @@ -49,15 +49,9 @@ #define LEN_MMMINV "\003" #define TR_MMMINV "---""INV" -#define LEN_NCHANNELS "\004" -#define TR_NCHANNELS "\0014KN\0016KN\0018KN10KN12KN14KN16KN" - #define LEN_VBEEPMODE "\005" #define TR_VBEEPMODE "Tyst\0""Alarm""EjKnp""Alla\0" -#define LEN_VBEEPLEN "\005" -#define TR_VBEEPLEN "0====""=0===""==0==""===0=""====0" - #define LEN_VRENAVIG "\003" #define TR_VRENAVIG "IngREaREb" @@ -86,9 +80,6 @@ #define LEN_SLIDERTYPES "\010" #define TR_SLIDERTYPES "Ingen\0 ""Skjutpot" -#define LEN_DATETIME "\005" -#define TR_DATETIME "DAG: ""TID: " - #define LEN_VLCD "\006" #define TR_VLCD "NormalOptrex" @@ -154,9 +145,6 @@ #define TR_VPROTOS "PPM\0 " TR_PXX TR_DSM2 -#define LEN_POSNEG "\003" -#define TR_POSNEG "Pos""Neg" - #if defined(PCBSKY9X) && defined(REVX) #define LEN_VOUTPUT_TYPE "\011" #define TR_VOUTPUT_TYPE "OpenDrain""PushPull\0" @@ -317,37 +305,16 @@ #define LENGTH_UNIT_METR "m\0 " #define SPEED_UNIT_METR "kmh" - #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 ""mW\0""dB\0""rpm""g\0 ""@\0 ""rad""ml\0""fOz" +#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 ""mW\0""dB\0""rpm""g\0 ""@\0 ""rad""ml\0""fOz" #define STR_V (STR_VTELEMUNIT+1) #define STR_A (STR_VTELEMUNIT+4) -#define LEN_VALARM "\003" -#define TR_VALARM "---""Gul""Ora""Röd" - -#define LEN_VALARMFN "\001" -#define TR_VALARMFN "<>" - -#define LEN_VTELPROTO "\007" -#define TR_VTELPROTO "---\0 ""Hub\0 ""WSHHög." - - #define LEN_AMPSRC TR("\003", "\007") - #define TR_AMPSRC TR("---""A1\0""A2\0""A3\0""A4\0""FAS""Cel", "---\0 ""A1\0 ""A2\0 ""A3\0 ""A4\0 ""FAS\0 ""Cells\0 ") - #define LEN_VOLTSRC TR("\003", "\007") - #define TR_VOLTSRC TR("A1\0""A2\0""A3\0""A4\0""FAS""Cel", "A1\0 ""A2\0 ""A3\0 ""A4\0 ""FAS\0 ""Cells\0 ") - -#define LEN_VARIOSRC "\005" -#if defined(TELEMETRY_FRSKY_SPORT) - #define TR_VARIOSRC "Vario""A1\0 ""A2\0" -#else - #define TR_VARIOSRC "Alti\0""Alti+""Vario""A1\0 ""A2\0" -#endif - - #define LEN_VTELEMSCREENTYPE "\007" - #define TR_VTELEMSCREENTYPE "Inget\0 ""Siffror""Staplar""Script\0" +#define LEN_VTELEMSCREENTYPE "\007" +#define TR_VTELEMSCREENTYPE "Inget\0 ""Siffror""Staplar""Script\0" #define LEN_GPSFORMAT "\004" #define TR_GPSFORMAT "HMS NMEA"