diff --git a/src/audio_arm.cpp b/src/audio_arm.cpp index dc5d861c8..ceaa92ec9 100644 --- a/src/audio_arm.cpp +++ b/src/audio_arm.cpp @@ -843,22 +843,22 @@ void audioEvent(uint8_t e, uint8_t f) break; #if defined(PCBTARANIS) case AU_A1_ORANGE: - audioQueue.play(BEEP_DEFAULT_FREQ+40, 30, 6, PLAY_NOW); + audioQueue.play(BEEP_DEFAULT_FREQ+40, 50, 6, PLAY_NOW); break; case AU_A1_RED: - audioQueue.play(BEEP_DEFAULT_FREQ+40, 30, 6, PLAY_REPEAT(1)|PLAY_NOW); + audioQueue.play(BEEP_DEFAULT_FREQ+40, 50, 6, PLAY_REPEAT(1)|PLAY_NOW); break; case AU_A2_ORANGE: - audioQueue.play(BEEP_DEFAULT_FREQ+80, 30, 6, PLAY_NOW); + audioQueue.play(BEEP_DEFAULT_FREQ+100, 50, 6, PLAY_NOW); break; case AU_A2_RED: - audioQueue.play(BEEP_DEFAULT_FREQ+80, 30, 6, PLAY_REPEAT(1)|PLAY_NOW); + audioQueue.play(BEEP_DEFAULT_FREQ+100, 50, 6, PLAY_REPEAT(1)|PLAY_NOW); break; case AU_RSSI_ORANGE: - audioQueue.play(BEEP_DEFAULT_FREQ+120, 30, 6, PLAY_NOW); + audioQueue.play(BEEP_DEFAULT_FREQ+120, 200, 6, PLAY_NOW); break; case AU_RSSI_RED: - audioQueue.play(BEEP_DEFAULT_FREQ+120, 30, 6, PLAY_REPEAT(1)|PLAY_NOW); + audioQueue.play(BEEP_DEFAULT_FREQ+120, 200, 6, PLAY_REPEAT(1)|PLAY_NOW); break; case AU_SWR_RED: // siren diff --git a/src/translations.cpp b/src/translations.cpp index 96c7c4748..a61f4cbc9 100644 --- a/src/translations.cpp +++ b/src/translations.cpp @@ -103,6 +103,7 @@ const pm_char STR_OPEN9X[] PROGMEM = #endif #if defined(PXX) ISTR(COUNTRYCODES) + ISTR(VFAILSAFE) #endif #if defined(PCBTARANIS) ISTR(VTRAINERMODES) @@ -313,7 +314,6 @@ const pm_char STR_INTERNALRF[] PROGMEM = TR_INTERNALRF; const pm_char STR_EXTERNALRF[] PROGMEM = TR_EXTERNALRF; const pm_char STR_COUNTRYCODE[] PROGMEM = TR_COUNTRYCODE; const pm_char STR_FAILSAFE[] PROGMEM = TR_FAILSAFE; -const pm_char STR_VFAILSAFE[] PROGMEM = "\011""Hold\0 ""Custom\0 ""No pulses"; // TODO non-zero terminated const pm_char STR_FAILSAFESET[] PROGMEM = TR_FAILSAFESET; #endif @@ -439,9 +439,9 @@ const pm_char STR_CHANNELS_MONITOR[] PROGMEM = TR_CHANNELS_MONITOR; #endif #if LCD_W >= 212 - const char * STR_PHASES_HEADERS[] = { " Name ", " Switch ", " Trims ", " Fade In ", " Fade Out " }; - const char * STR_LIMITS_HEADERS[] = { " Name ", " Offset ", " Min ", " Max ", " Direction ", " PPM Center ", " Symmetrical " }; - const char * STR_CSW_HEADERS[] = { " Function ", " V1 ", " V2 ", " AND Switch ", " Duration ", " Delay " }; + const char * STR_PHASES_HEADERS[] = TR_PHASES_HEADERS; + const char * STR_LIMITS_HEADERS[] = TR_LIMITS_HEADERS; + const char * STR_CSW_HEADERS[] = TR_CSW_HEADERS; #endif #if defined(PCBTARANIS) diff --git a/src/translations.h b/src/translations.h index 9143dcccd..237f8ddee 100644 --- a/src/translations.h +++ b/src/translations.h @@ -147,18 +147,18 @@ extern const pm_char STR_OPEN9X[]; #define OFS_VLCD (OFS_DATETIME + sizeof(TR_DATETIME)) #define OFS_VUNITSSYSTEM (OFS_VLCD + sizeof(TR_VLCD)) #else - #define OFS_VLCD (OFS_DATETIME) #define OFS_VUNITSSYSTEM (OFS_DATETIME) #endif #if defined(CPUARM) #define OFS_COUNTRYCODES (OFS_VUNITSSYSTEM + sizeof(TR_VUNITSSYSTEM)) + #define OFS_VFAILSAFE (OFS_COUNTRYCODES + sizeof(TR_COUNTRYCODES)) #else - #define OFS_COUNTRYCODES (OFS_VUNITSSYSTEM) + #define OFS_VFAILSAFE (OFS_VUNITSSYSTEM) #endif #if defined(PXX) - #define OFS_VTRAINERMODES (OFS_COUNTRYCODES + sizeof(TR_COUNTRYCODES)) + #define OFS_VTRAINERMODES (OFS_VFAILSAFE + sizeof(TR_VFAILSAFE)) #else - #define OFS_VTRAINERMODES (OFS_COUNTRYCODES) + #define OFS_VTRAINERMODES (OFS_VFAILSAFE) #endif #if defined(PCBTARANIS) #define OFS_SPARE (OFS_VTRAINERMODES + sizeof(TR_VTRAINERMODES)) @@ -240,6 +240,7 @@ extern const pm_char STR_OPEN9X[]; #if defined(PXX) #define STR_COUNTRYCODES (STR_OPEN9X + OFS_COUNTRYCODES) + #define STR_VFAILSAFE (STR_OPEN9X + OFS_VFAILSAFE) #endif #if defined(PCBTARANIS) @@ -434,7 +435,6 @@ extern const pm_char STR_INTERNALRF[]; extern const pm_char STR_EXTERNALRF[]; extern const pm_char STR_FAILSAFE[]; extern const pm_char STR_FAILSAFESET[]; -extern const pm_char STR_VFAILSAFE[]; // TODO non-zero terminated extern const pm_char STR_COUNTRYCODE[]; #endif diff --git a/src/translations/cz.h b/src/translations/cz.h index 7a52e2050..62d139ef6 100644 --- a/src/translations/cz.h +++ b/src/translations/cz.h @@ -236,7 +236,7 @@ #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") - #define TR_VUNITSSYSTEM TR("MetricImper.", "Metric\0 Imperial") + #define TR_VUNITSSYSTEM TR("Metric""Imper.", "Metric\0 ""Imperial") #define LEN_VTELEMUNIT_NORM "\003" #define TR_VTELEMUNIT_NORM "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 " #define LEN_VTELEMUNIT_IMP "\003" @@ -341,10 +341,11 @@ #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "VYP""ABS""THs""TH%""THt" -#if defined (PCBTARANIS) - #define LEN_VTRAINERMODES "\006" - #define TR_VTRAINERMODES "MasterSlave\0" -#endif +#define LEN_VTRAINERMODES "\006" +#define TR_VTRAINERMODES "Master""Slave\0" + +#define LEN_VFAILSAFE "\011" +#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses" // ZERO TERMINATED STRINGS #define INDENT "\001" @@ -640,6 +641,11 @@ #define TR_LOWALARM INDENT "Low Alarm" #define TR_CRITICALALARM INDENT "Critical Alarm" +// Taranis column headers +#define TR_PHASES_HEADERS { " Name ", " Switch ", " Trims ", " Fade In ", " Fade Out " } +#define TR_LIMITS_HEADERS { " Name ", " Offset ", " Min ", " Max ", " Direction ", " PPM Center ", " Symmetrical " } +#define TR_CSW_HEADERS { " Function ", " V1 ", " V2 ", " AND Switch ", " Duration ", " Delay " } + #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' diff --git a/src/translations/de.h b/src/translations/de.h index ca05b9643..201cb1988 100644 --- a/src/translations/de.h +++ b/src/translations/de.h @@ -236,7 +236,7 @@ #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") - #define TR_VUNITSSYSTEM TR("MetricImper.", "Metric\0 Imperial") + #define TR_VUNITSSYSTEM TR("Metric""Imper.", "Metric\0 ""Imperial") #define LEN_VTELEMUNIT_NORM "\003" #define TR_VTELEMUNIT_NORM "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 " #define LEN_VTELEMUNIT_IMP "\003" @@ -341,10 +341,11 @@ #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "AUS""ABS""GSs""GS%""GSt" -#if defined (PCBTARANIS) - #define LEN_VTRAINERMODES "\006" - #define TR_VTRAINERMODES "MasterSlave\0" -#endif +#define LEN_VTRAINERMODES "\006" +#define TR_VTRAINERMODES "Master""Slave\0" + +#define LEN_VFAILSAFE "\011" +#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses" // ZERO TERMINATED STRINGS #define INDENT "\001" @@ -640,6 +641,11 @@ #define TR_LOWALARM INDENT "Low Alarm" #define TR_CRITICALALARM INDENT "Critical Alarm" +// Taranis column headers +#define TR_PHASES_HEADERS { " Name ", " Switch ", " Trims ", " Fade In ", " Fade Out " } +#define TR_LIMITS_HEADERS { " Name ", " Offset ", " Min ", " Max ", " Direction ", " PPM Center ", " Symmetrical " } +#define TR_CSW_HEADERS { " Function ", " V1 ", " V2 ", " AND Switch ", " Duration ", " Delay " } + #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' diff --git a/src/translations/en.h b/src/translations/en.h index e95ad30c9..7be397382 100644 --- a/src/translations/en.h +++ b/src/translations/en.h @@ -236,7 +236,7 @@ #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") - #define TR_VUNITSSYSTEM TR("MetricImper.", "Metric\0 Imperial") + #define TR_VUNITSSYSTEM TR("Metric""Imper.", "Metric\0 ""Imperial") #define LEN_VTELEMUNIT_NORM "\003" #define TR_VTELEMUNIT_NORM "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 " #define LEN_VTELEMUNIT_IMP "\003" @@ -341,10 +341,11 @@ #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "OFF""ABS""THs""TH%""THt" -#if defined (PCBTARANIS) - #define LEN_VTRAINERMODES "\006" - #define TR_VTRAINERMODES "MasterSlave\0" -#endif +#define LEN_VTRAINERMODES "\006" +#define TR_VTRAINERMODES "Master""Slave\0" + +#define LEN_VFAILSAFE "\011" +#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses" // ZERO TERMINATED STRINGS #define INDENT "\001" @@ -640,6 +641,11 @@ #define TR_LOWALARM INDENT "Low Alarm" #define TR_CRITICALALARM INDENT "Critical Alarm" +// Taranis column headers +#define TR_PHASES_HEADERS { " Name ", " Switch ", " Trims ", " Fade In ", " Fade Out " } +#define TR_LIMITS_HEADERS { " Name ", " Subtrim ", " Min ", " Max ", " Direction ", " PPM Center ", " Subtrim mode " } +#define TR_CSW_HEADERS { " Function ", " V1 ", " V2 ", " AND Switch ", " Duration ", " Delay " } + #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' diff --git a/src/translations/es.h b/src/translations/es.h index 8966aa45a..e4174ae29 100644 --- a/src/translations/es.h +++ b/src/translations/es.h @@ -236,7 +236,7 @@ #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") - #define TR_VUNITSSYSTEM TR("MetricImper.", "Metric\0 Imperial") + #define TR_VUNITSSYSTEM TR("Metric""Imper.", "Metric\0 ""Imperial") #define LEN_VTELEMUNIT_NORM "\003" #define TR_VTELEMUNIT_NORM "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 " #define LEN_VTELEMUNIT_IMP "\003" @@ -341,10 +341,11 @@ #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "OFF""ABS""THs""TH%""THt" -#if defined (PCBTARANIS) - #define LEN_VTRAINERMODES "\006" - #define TR_VTRAINERMODES "MasterSlave\0" -#endif +#define LEN_VTRAINERMODES "\006" +#define TR_VTRAINERMODES "Master""Slave\0" + +#define LEN_VFAILSAFE "\011" +#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses" // ZERO TERMINATED STRINGS #define INDENT "\001" @@ -640,6 +641,11 @@ #define TR_LOWALARM INDENT "Low Alarm" #define TR_CRITICALALARM INDENT "Critical Alarm" +// Taranis column headers +#define TR_PHASES_HEADERS { " Name ", " Switch ", " Trims ", " Fade In ", " Fade Out " } +#define TR_LIMITS_HEADERS { " Name ", " Offset ", " Min ", " Max ", " Direction ", " PPM Center ", " Symmetrical " } +#define TR_CSW_HEADERS { " Function ", " V1 ", " V2 ", " AND Switch ", " Duration ", " Delay " } + #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' diff --git a/src/translations/fr.h b/src/translations/fr.h index e01a81162..0e1765af5 100644 --- a/src/translations/fr.h +++ b/src/translations/fr.h @@ -236,7 +236,7 @@ #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\012") - #define TR_VUNITSSYSTEM TR("M\200tr.\0Imp\200r.", "M\200triques\0Imp\200riales") + #define TR_VUNITSSYSTEM TR("M\200tr.\0""Imp\200r.", "M\200triques\0""Imp\200riales") #define LEN_VTELEMUNIT_NORM "\003" #define TR_VTELEMUNIT_NORM "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 " #define LEN_VTELEMUNIT_IMP "\003" @@ -341,10 +341,11 @@ #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "OFF""ABS""GZs""GZ%""GZt" -#if defined (PCBTARANIS) - #define LEN_VTRAINERMODES "\006" - #define TR_VTRAINERMODES "Ma\203treEl\201ve\0" -#endif +#define LEN_VTRAINERMODES "\006" +#define TR_VTRAINERMODES "Ma\203tre""El\201ve\0" + +#define LEN_VFAILSAFE "\011" +#define TR_VFAILSAFE "Maintien\0""Pr\200d\200fini""Pas d'imp" // ZERO TERMINATED STRINGS #define INDENT "\001" @@ -640,6 +641,11 @@ #define TR_LOWALARM INDENT "Alarme basse" #define TR_CRITICALALARM INDENT "Alarme critique" +// Taranis column headers +#define TR_PHASES_HEADERS { " Nom ", " Inter ", " Trims ", " Fondu ON ", " Fondu OFF " } +#define TR_LIMITS_HEADERS { " Nom ", " Subtrim ", " Min ", " Max ", " Direction ", " Neutre PPM ", " Mode subtrim " } +#define TR_CSW_HEADERS { " Fonction ", " V1 ", " V2 ", " ET suppl. ", " Dur\200e ", " D\200lai " } + #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' diff --git a/src/translations/it.h b/src/translations/it.h index 519e67049..d8ae6ea11 100644 --- a/src/translations/it.h +++ b/src/translations/it.h @@ -236,7 +236,7 @@ #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") - #define TR_VUNITSSYSTEM TR("MetricImper.", "Metric\0 Imperial") + #define TR_VUNITSSYSTEM TR("Metric""Imper.", "Metric\0 ""Imperial") #define LEN_VTELEMUNIT_NORM "\003" #define TR_VTELEMUNIT_NORM "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 " #define LEN_VTELEMUNIT_IMP "\003" @@ -341,10 +341,11 @@ #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "OFF""ABS""THs""TH%""THt" -#if defined (PCBTARANIS) - #define LEN_VTRAINERMODES "\006" - #define TR_VTRAINERMODES "MasterSlave\0" -#endif +#define LEN_VTRAINERMODES "\006" +#define TR_VTRAINERMODES "Master""Slave\0" + +#define LEN_VFAILSAFE "\011" +#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses" // ZERO TERMINATED STRINGS #define INDENT "\001" @@ -640,6 +641,11 @@ #define TR_LOWALARM INDENT "Low Alarm" #define TR_CRITICALALARM INDENT "Critical Alarm" +// Taranis column headers +#define TR_PHASES_HEADERS { " Name ", " Switch ", " Trims ", " Fade In ", " Fade Out " } +#define TR_LIMITS_HEADERS { " Name ", " Offset ", " Min ", " Max ", " Direction ", " PPM Center ", " Symmetrical " } +#define TR_CSW_HEADERS { " Function ", " V1 ", " V2 ", " AND Switch ", " Duration ", " Delay " } + #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' diff --git a/src/translations/pt.h b/src/translations/pt.h index b7ee21bcb..972ad32ba 100644 --- a/src/translations/pt.h +++ b/src/translations/pt.h @@ -236,7 +236,7 @@ Padding for row alignment #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") - #define TR_VUNITSSYSTEM TR("MetricImper.", "Metric\0 Imperial") + #define TR_VUNITSSYSTEM TR("Metric""Imper.", "Metric\0 ""Imperial") #define LEN_VTELEMUNIT_NORM "\003" #define TR_VTELEMUNIT_NORM "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 " #define LEN_VTELEMUNIT_IMP "\003" @@ -341,10 +341,11 @@ Padding for row alignment #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "OFF""ABS""MTs""MT%""MTt" -#if defined (PCBTARANIS) - #define LEN_VTRAINERMODES "\006" - #define TR_VTRAINERMODES "MasterSlave\0" -#endif +#define LEN_VTRAINERMODES "\006" +#define TR_VTRAINERMODES "Master""Slave\0" + +#define LEN_VFAILSAFE "\011" +#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses" // ZERO TERMINATED STRINGS #define INDENT "\001" @@ -640,6 +641,11 @@ Padding for row alignment #define TR_LOWALARM INDENT "Low Alarm" #define TR_CRITICALALARM INDENT "Critical Alarm" +// Taranis column headers +#define TR_PHASES_HEADERS { " Name ", " Switch ", " Trims ", " Fade In ", " Fade Out " } +#define TR_LIMITS_HEADERS { " Name ", " Offset ", " Min ", " Max ", " Direction ", " PPM Center ", " Symmetrical " } +#define TR_CSW_HEADERS { " Function ", " V1 ", " V2 ", " AND Switch ", " Duration ", " Delay " } + #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't' diff --git a/src/translations/se.h b/src/translations/se.h index 63da50947..1ebd1b180 100644 --- a/src/translations/se.h +++ b/src/translations/se.h @@ -236,7 +236,7 @@ #if defined(CPUARM) #define LEN_VUNITSSYSTEM TR("\006", "\010") - #define TR_VUNITSSYSTEM TR("MetricImper.", "Metric\0 Imperial") + #define TR_VUNITSSYSTEM TR("Metric""Imper.", "Metric\0 ""Imperial") #define LEN_VTELEMUNIT_NORM "\003" #define TR_VTELEMUNIT_NORM "v\0 ""A\0 ""m/s""-\0 ""kmh""m\0 ""@\0 ""%\0 ""mA\0""mAh""W\0 " #define LEN_VTELEMUNIT_IMP "\003" @@ -341,10 +341,11 @@ #define LEN_VTMRMODES "\003" #define TR_VTMRMODES "AV ""ABS""GAs""GA%""GAt" -#if defined (PCBTARANIS) - #define LEN_VTRAINERMODES "\006" - #define TR_VTRAINERMODES "MasterSlave\0" -#endif +#define LEN_VTRAINERMODES "\006" +#define TR_VTRAINERMODES "Master""Slave\0" + +#define LEN_VFAILSAFE "\011" +#define TR_VFAILSAFE "Hold\0 ""Custom\0 ""No pulses" // ZERO TERMINATED STRINGS #define INDENT "\001" @@ -640,6 +641,11 @@ #define TR_LOWALARM INDENT "Low Alarm" #define TR_CRITICALALARM INDENT "Critical Alarm" +// Taranis column headers +#define TR_PHASES_HEADERS { " Name ", " Switch ", " Trims ", " Fade In ", " Fade Out " } +#define TR_LIMITS_HEADERS { " Name ", " Offset ", " Min ", " Max ", " Direction ", " PPM Center ", " Symmetrical " } +#define TR_CSW_HEADERS { " Function ", " V1 ", " V2 ", " AND Switch ", " Duration ", " Delay " } + #define TR_CHR_SHORT 's' #define TR_CHR_LONG 'l' #define TR_CHR_TOGGLE 't'