diff --git a/radio/src/gui/128x64/model_special_functions.cpp b/radio/src/gui/128x64/model_special_functions.cpp index 3f821ea0af9..16377d0f97d 100644 --- a/radio/src/gui/128x64/model_special_functions.cpp +++ b/radio/src/gui/128x64/model_special_functions.cpp @@ -32,6 +32,10 @@ #endif #if defined(SDCARD) +#define SD_LOGS_PERIOD_MIN 1 // 0.1s fastest period +#define SD_LOGS_PERIOD_MAX 255 // 25.5s slowest period +#define SD_LOGS_PERIOD_DEFAULT 10 // 1s default period for newly created SF + void onCustomFunctionsFileSelectionMenu(const char * result) { int sub = menuVerticalPosition - HEADER_LINE; @@ -352,13 +356,15 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF } #if defined(SDCARD) else if (func == FUNC_LOGS) { - if (val_displayed) { - lcdDrawNumber(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr|PREC1|LEFT); - lcdDrawChar(lcdLastRightPos, y, 's'); - } - else { - lcdDrawMMM(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, attr); + val_min = SD_LOGS_PERIOD_MIN; + val_max = SD_LOGS_PERIOD_MAX; + + if (!val_displayed) { + val_displayed = CFN_PARAM(cfn) = SD_LOGS_PERIOD_DEFAULT; } + + lcdDrawNumber(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr|PREC1|LEFT); + lcdDrawChar(lcdLastRightPos, y, 's'); } #endif #if defined(GVARS) diff --git a/radio/src/gui/212x64/model_special_functions.cpp b/radio/src/gui/212x64/model_special_functions.cpp index a12e61e3554..ab4e1eb006d 100644 --- a/radio/src/gui/212x64/model_special_functions.cpp +++ b/radio/src/gui/212x64/model_special_functions.cpp @@ -27,6 +27,10 @@ #define MODEL_SPECIAL_FUNC_4TH_COLUMN (33*FW-3) #define MODEL_SPECIAL_FUNC_4TH_COLUMN_ONOFF (34*FW-3) +#define SD_LOGS_PERIOD_MIN 1 // 0.1s fastest period +#define SD_LOGS_PERIOD_MAX 255 // 25.5s slowest period +#define SD_LOGS_PERIOD_DEFAULT 10 // 1s default period for newly created SF + void onCustomFunctionsFileSelectionMenu(const char * result) { int sub = menuVerticalPosition; @@ -334,13 +338,15 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF } } else if (func == FUNC_LOGS) { - if (val_displayed) { - lcdDrawNumber(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr|PREC1|LEFT); - lcdDrawChar(lcdLastRightPos, y, 's'); - } - else { - lcdDrawMMM(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, attr); + val_min = SD_LOGS_PERIOD_MIN; + val_max = SD_LOGS_PERIOD_MAX; + + if (!val_displayed) { + val_displayed = CFN_PARAM(cfn) = SD_LOGS_PERIOD_DEFAULT; } + + lcdDrawNumber(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr|PREC1|LEFT); + lcdDrawChar(lcdLastRightPos, y, 's'); } else if (func == FUNC_BACKLIGHT) { val_max = MIXSRC_LAST_CH; diff --git a/radio/src/gui/colorlcd/special_functions.cpp b/radio/src/gui/colorlcd/special_functions.cpp index 225db598137..f5ce80c1d8a 100644 --- a/radio/src/gui/colorlcd/special_functions.cpp +++ b/radio/src/gui/colorlcd/special_functions.cpp @@ -52,6 +52,7 @@ class SpecialFunctionEditPage : public Page uint8_t index; FormWindow *specialFunctionOneWindow = nullptr; StaticText *headerSF = nullptr; + StaticText *sfSwitchText = nullptr; bool active = false; bool isActive() const @@ -234,10 +235,13 @@ class SpecialFunctionEditPage : public Page break; case FUNC_LOGS: { - auto edit = addNumberEdit(line, STR_VALUE, cfn, 0, 255); + CFN_PARAM(cfn) = SD_LOGS_PERIOD_DEFAULT; // set default value + + auto edit = addNumberEdit(line, STR_INTERVAL, cfn, SD_LOGS_PERIOD_MIN, SD_LOGS_PERIOD_MAX); + edit->setDefault(SD_LOGS_PERIOD_DEFAULT); // set default period for DEF button edit->setDisplayHandler( [=](int32_t value) { - return formatNumberAsString(CFN_PARAM(cfn), PREC1, sizeof(CFN_PARAM(cfn)), nullptr, "s"); + return formatNumberAsString(CFN_PARAM(cfn), PREC1, 0, nullptr, "s"); }); break; } @@ -360,7 +364,7 @@ class SpecialFunctionEditPage : public Page // Switch auto line = window->newLine(&grid); - new StaticText(line, rect_t{}, STR_SWITCH, 0, COLOR_THEME_PRIMARY1); + sfSwitchText = new StaticText(line, rect_t{}, STR_SF_SWITCH, 0, COLOR_THEME_PRIMARY1); auto switchChoice = new SwitchChoice(line, rect_t{}, SWSRC_FIRST, SWSRC_LAST, GET_SET_DEFAULT(CFN_SWITCH(cfn))); diff --git a/radio/src/gui/colorlcd/special_functions.h b/radio/src/gui/colorlcd/special_functions.h index 5d144024bd8..f7eed507eae 100644 --- a/radio/src/gui/colorlcd/special_functions.h +++ b/radio/src/gui/colorlcd/special_functions.h @@ -22,6 +22,10 @@ #ifndef _SPECIAL_FUNCTIONS_H #define _SPECIAL_FUNCTIONS_H +#define SD_LOGS_PERIOD_MIN 1 // 0.1s fastest period +#define SD_LOGS_PERIOD_MAX 255 // 25.5s slowest period +#define SD_LOGS_PERIOD_DEFAULT 10 // 1s default period for newly created SF + #include "tabsgroup.h" struct CustomFunctionData; diff --git a/radio/src/translations.cpp b/radio/src/translations.cpp index 940aa626c78..ec905f2bd0d 100644 --- a/radio/src/translations.cpp +++ b/radio/src/translations.cpp @@ -153,6 +153,7 @@ const char STR_PPMFRAME[] = TR_PPMFRAME; const char STR_REFRESHRATE[] = TR_REFRESHRATE; const char STR_MS[] = TR_MS; const char STR_SWITCH[] = TR_SWITCH; +const char STR_SF_SWITCH[] = TR_SF_SWITCH; const char STR_TRIMS[] = TR_TRIMS; const char STR_MIRROR[] = TR_MIRROR; const char STR_FADEIN[] = TR_FADEIN; @@ -673,6 +674,8 @@ const char STR_DISABLE_ALARM[] = TR_DISABLE_ALARM; const char STR_TELEMETRY_TYPE[] = TR_TELEMETRY_TYPE; const char STR_TELEMETRY_SENSORS[] = TR_TELEMETRY_SENSORS; const char STR_VALUE[] = TR_VALUE; +const char STR_PERIOD[] = TR_PERIOD; +const char STR_INTERVAL[] = TR_INTERVAL; const char STR_REPEAT[] = TR_REPEAT; const char STR_ENABLE[] = TR_ENABLE; const char STR_TOPLCDTIMER[] = TR_TOPLCDTIMER; diff --git a/radio/src/translations.h b/radio/src/translations.h index 72b1d133424..390838eb493 100644 --- a/radio/src/translations.h +++ b/radio/src/translations.h @@ -280,6 +280,7 @@ extern const char STR_PPMFRAME[]; extern const char STR_REFRESHRATE[]; extern const char STR_MS[]; extern const char STR_SWITCH[]; +extern const char STR_SF_SWITCH[]; extern const char STR_TRIMS[]; extern const char STR_MIRROR[]; extern const char STR_FADEIN[]; @@ -894,7 +895,7 @@ extern const char STR_EXPONAME[]; #endif #define TR_LIMITS_HEADERS { HINT(TR_LIMITS_HEADERS_NAME), HINT(TR_LIMITS_HEADERS_SUBTRIM), HINT(TR_LIMITS_HEADERS_MIN), HINT(TR_LIMITS_HEADERS_MAX), HINT(TR_LIMITS_HEADERS_DIRECTION), HINT(TR_LIMITS_HEADERS_CURVE), HINT(TR_LIMITS_HEADERS_PPMCENTER), HINT(TR_LIMITS_HEADERS_SUBTRIMMODE) } -#define TR_LSW_HEADERS { HINT(TR_LSW_HEADERS_FUNCTION), HINT(TR_LSW_HEADERS_V1), HINT(TR_LSW_HEADERS_V2), HINT(TR_LSW_HEADERS_V2), HINT(TR_LSW_HEADERS_ANDSW), HINT(TR_LSW_HEADERS_DURATION), HINT(TR_LSW_HEADERS_DELAY) } +#define TR_LSW_HEADERS { HINT(TR_FUNC), HINT(TR_V1), HINT(TR_V2), HINT(TR_V2), HINT(TR_AND_SWITCH), HINT(TR_DURATION), HINT(TR_DELAY) } #define TR_GVAR_HEADERS { HINT(TR_GVAR_HEADERS_FM0), HINT(TR_GVAR_HEADERS_FM1), HINT(TR_GVAR_HEADERS_FM2), HINT(TR_GVAR_HEADERS_FM3), HINT(TR_GVAR_HEADERS_FM4), HINT(TR_GVAR_HEADERS_FM5), HINT(TR_GVAR_HEADERS_FM6), HINT(TR_GVAR_HEADERS_FM7), HINT(TR_GVAR_HEADERS_FM8) } #if LCD_W >= 212 @@ -1057,6 +1058,8 @@ extern const char STR_DISABLE_ALARM[]; extern const char STR_TELEMETRY_TYPE[]; extern const char STR_TELEMETRY_SENSORS[]; extern const char STR_VALUE[]; +extern const char STR_PERIOD[]; +extern const char STR_INTERVAL[]; extern const char STR_REPEAT[]; extern const char STR_ENABLE[]; extern const char STR_TOPLCDTIMER[]; diff --git a/radio/src/translations/cn.h b/radio/src/translations/cn.h index e02bca06fac..543e47557de 100644 --- a/radio/src/translations/cn.h +++ b/radio/src/translations/cn.h @@ -360,6 +360,7 @@ #define TR_MS "ms" #define TR_FREQUENCY INDENT "频率" #define TR_SWITCH "开关" +#define TR_SF_SWITCH "Trigger" #define TR_TRIMS "微调" #define TR_FADEIN "渐入" #define TR_FADEOUT "渐出" @@ -947,6 +948,8 @@ #define TR_TELEMETRY_TYPE TR("类型", "回传类型") #define TR_TELEMETRY_SENSORS "传感器" #define TR_VALUE "数值" +#define TR_PERIOD "Period" +#define TR_INTERVAL "Interval" #define TR_REPEAT "循环" #define TR_ENABLE "启用" #define TR_TOPLCDTIMER "Top LCD Timer" @@ -1038,13 +1041,6 @@ #define TR_LIMITS_HEADERS_SUBTRIMMODE "微调模式" #define TR_INVERTED "反向" -#define TR_LSW_HEADERS_FUNCTION "功能" -#define TR_LSW_HEADERS_V1 "V1" -#define TR_LSW_HEADERS_V2 "V2" -#define TR_LSW_HEADERS_ANDSW "与开关" -#define TR_LSW_HEADERS_DURATION "持续时间" -#define TR_LSW_HEADERS_DELAY "延时" - #define TR_GVAR_HEADERS_NAME "名称" #define TR_GVAR_HEADERS_FM0 "FM0值" #define TR_GVAR_HEADERS_FM1 "FM1值" diff --git a/radio/src/translations/cz.h b/radio/src/translations/cz.h index fc3f85af0cb..7535f371463 100644 --- a/radio/src/translations/cz.h +++ b/radio/src/translations/cz.h @@ -381,6 +381,7 @@ #define TR_MS "ms" #define TR_FREQUENCY INDENT "Frekvence" #define TR_SWITCH "Spínač" +#define TR_SF_SWITCH "Trigger" #define TR_TRIMS "Trimy" #define TR_FADEIN "Přechod Zap" #define TR_FADEOUT "Přechod Vyp" @@ -758,7 +759,7 @@ #define TR_CAPAWARNING INDENT "Nízká kapacita" #define TR_TEMPWARNING INDENT "Přehřátí" #define TR_TTL_WARNING "Varování: používat 3.3V hodnoty" -#define TR_FUNC "Fce." +#define TR_FUNC "Funkce" #define TR_V1 "V1" #define TR_V2 "V2" #define TR_DURATION "Trvání" @@ -965,6 +966,8 @@ #define TR_TELEMETRY_TYPE TR("Typ", "Typ telemetrie") #define TR_TELEMETRY_SENSORS "Senzory" #define TR_VALUE "Hodnota" +#define TR_PERIOD "Perioda" +#define TR_INTERVAL "Interval" #define TR_REPEAT "Opakovat" #define TR_ENABLE "Povoleno" #define TR_TOPLCDTIMER "Stopky horního LCD" @@ -1060,13 +1063,6 @@ #define TR_LIMITS_HEADERS_SUBTRIMMODE "Symetrické" #define TR_INVERTED "Invertováno" -#define TR_LSW_HEADERS_FUNCTION "Funkce" -#define TR_LSW_HEADERS_V1 "Hodnota 1" -#define TR_LSW_HEADERS_V2 "Hodnota 2" -#define TR_LSW_HEADERS_ANDSW "AND Spínač" -#define TR_LSW_HEADERS_DURATION "Trvání" -#define TR_LSW_HEADERS_DELAY "Zpoždění" - #define TR_GVAR_HEADERS_NAME "Název" #define TR_GVAR_HEADERS_FM0 "Hodnota v režimu LR0" #define TR_GVAR_HEADERS_FM1 "Hodnota v režimu LR1" diff --git a/radio/src/translations/da.h b/radio/src/translations/da.h index 26bd590ea7b..9dc64180408 100644 --- a/radio/src/translations/da.h +++ b/radio/src/translations/da.h @@ -364,6 +364,7 @@ #define TR_MS "ms" #define TR_FREQUENCY INDENT "Frekvens" #define TR_SWITCH "Kontakt" +#define TR_SF_SWITCH "Udløser" #define TR_TRIMS "Trim" #define TR_FADEIN "Tone ind" #define TR_FADEOUT "Tone ud" @@ -745,7 +746,7 @@ #define TR_CAPAWARNING INDENT "Kapacitet lav" #define TR_TEMPWARNING INDENT "For varm" #define TR_TTL_WARNING "Advarsel: brug 3.3V logisk niveau" -#define TR_FUNC "Funk" +#define TR_FUNC "Funktion" #define TR_V1 "V1" #define TR_V2 "V2" #define TR_DURATION "Varighed" @@ -953,6 +954,8 @@ #define TR_TELEMETRY_TYPE TR("Type", "Telemetri type") #define TR_TELEMETRY_SENSORS "Sensorer" #define TR_VALUE "Værdi" +#define TR_PERIOD "Periode" +#define TR_INTERVAL "Interval" #define TR_REPEAT "Gentag" #define TR_ENABLE "Aktiver" #define TR_TOPLCDTIMER "Top LCD ur" @@ -1044,13 +1047,6 @@ #define TR_LIMITS_HEADERS_SUBTRIMMODE "Subtrim tilstand" #define TR_INVERTED "Invers" -#define TR_LSW_HEADERS_FUNCTION "Funktion" -#define TR_LSW_HEADERS_V1 "V1" -#define TR_LSW_HEADERS_V2 "V2" -#define TR_LSW_HEADERS_ANDSW "OG kontakt" -#define TR_LSW_HEADERS_DURATION "Varighed" -#define TR_LSW_HEADERS_DELAY "Forsinkelse" - #define TR_GVAR_HEADERS_NAME "Navn" #define TR_GVAR_HEADERS_FM0 "Værdi ved FT0" #define TR_GVAR_HEADERS_FM1 "Værdi ved FT1" diff --git a/radio/src/translations/de.h b/radio/src/translations/de.h index 0d875b1b4de..333b4a58fb9 100644 --- a/radio/src/translations/de.h +++ b/radio/src/translations/de.h @@ -367,6 +367,7 @@ #define TR_MS "ms" #define TR_FREQUENCY INDENT "Frequenz" #define TR_SWITCH TR("Schalt.", "Schalter") +#define TR_SF_SWITCH "Trigger" #define TR_TRIMS "Trimmer" #define TR_FADEIN "Langs. Ein" #define TR_FADEOUT "Langs. Aus" @@ -948,6 +949,8 @@ #define TR_TELEMETRY_TYPE TR("Typ", "Telemetrietyp") #define TR_TELEMETRY_SENSORS "Sensoren" #define TR_VALUE "Wert" +#define TR_PERIOD "Periode" +#define TR_INTERVAL "Intervall" #define TR_REPEAT "Wiederholung" #define TR_ENABLE "Aktivieren" #define TR_TOPLCDTIMER "oberer LCD Timer" @@ -1067,13 +1070,6 @@ #define TR_LIMITS_HEADERS_SUBTRIMMODE "Subtrim Modus" #define TR_INVERTED "Invertiert" -#define TR_LSW_HEADERS_FUNCTION "Funktion" -#define TR_LSW_HEADERS_V1 "V1" -#define TR_LSW_HEADERS_V2 "V2" -#define TR_LSW_HEADERS_ANDSW "UND Schalter" -#define TR_LSW_HEADERS_DURATION "Dauer" -#define TR_LSW_HEADERS_DELAY "Verzögerung" - #define TR_GVAR_HEADERS_NAME "Name" #define TR_GVAR_HEADERS_FM0 "Wert im FM0" #define TR_GVAR_HEADERS_FM1 "Wert im FM1" diff --git a/radio/src/translations/en.h b/radio/src/translations/en.h index c6ef6bf6ed8..b86f980489d 100644 --- a/radio/src/translations/en.h +++ b/radio/src/translations/en.h @@ -359,6 +359,7 @@ #define TR_MS "ms" #define TR_FREQUENCY INDENT "Frequency" #define TR_SWITCH "Switch" +#define TR_SF_SWITCH "Trigger" #define TR_TRIMS "Trims" #define TR_FADEIN "Fade in" #define TR_FADEOUT "Fade out" @@ -738,7 +739,7 @@ #define TR_CAPAWARNING INDENT "Capacity low" #define TR_TEMPWARNING INDENT "Overheat" #define TR_TTL_WARNING "Warning: use 3.3V logic levels" -#define TR_FUNC "Func" +#define TR_FUNC "Function" #define TR_V1 "V1" #define TR_V2 "V2" #define TR_DURATION "Duration" @@ -946,6 +947,8 @@ #define TR_TELEMETRY_TYPE TR("Type", "Telemetry type") #define TR_TELEMETRY_SENSORS "Sensors" #define TR_VALUE "Value" +#define TR_PERIOD "Period" +#define TR_INTERVAL "Interval" #define TR_REPEAT "Repeat" #define TR_ENABLE "Enable" #define TR_TOPLCDTIMER "Top LCD Timer" @@ -1037,13 +1040,6 @@ #define TR_LIMITS_HEADERS_SUBTRIMMODE "Subtrim mode" #define TR_INVERTED "Inverted" -#define TR_LSW_HEADERS_FUNCTION "Function" -#define TR_LSW_HEADERS_V1 "V1" -#define TR_LSW_HEADERS_V2 "V2" -#define TR_LSW_HEADERS_ANDSW "AND Switch" -#define TR_LSW_HEADERS_DURATION "Duration" -#define TR_LSW_HEADERS_DELAY "Delay" - #define TR_GVAR_HEADERS_NAME "Name" #define TR_GVAR_HEADERS_FM0 "Value on FM0" #define TR_GVAR_HEADERS_FM1 "Value on FM1" diff --git a/radio/src/translations/es.h b/radio/src/translations/es.h index dee67f7effd..e4795197da2 100644 --- a/radio/src/translations/es.h +++ b/radio/src/translations/es.h @@ -361,6 +361,7 @@ #define TR_MS "ms" #define TR_FREQUENCY INDENT "Frequencia" #define TR_SWITCH TR("Interr.", "Interruptor") +#define TR_SF_SWITCH "Trigger" #define TR_TRIMS "Trims" #define TR_FADEIN "Inicio" #define TR_FADEOUT "Final" @@ -947,6 +948,8 @@ #define TR_TELEMETRY_TYPE TR("Tipo", "Tipo telemetría") #define TR_TELEMETRY_SENSORS "Sensores" #define TR_VALUE "Valor" +#define TR_PERIOD "Period" +#define TR_INTERVAL "Interval" #define TR_REPEAT "Repeat" #define TR_ENABLE "Enable" #define TR_TOPLCDTIMER "Timer LCD superior" @@ -1044,13 +1047,6 @@ #define TR_LIMITS_HEADERS_SUBTRIMMODE "Simétrica" #define TR_INVERTED "Inverted" -#define TR_LSW_HEADERS_FUNCTION "Función" -#define TR_LSW_HEADERS_V1 "V1" -#define TR_LSW_HEADERS_V2 "V2" -#define TR_LSW_HEADERS_ANDSW "Interrup. AND" -#define TR_LSW_HEADERS_DURATION "Duración" -#define TR_LSW_HEADERS_DELAY "Retardo" - #define TR_GVAR_HEADERS_NAME "Nombre" #define TR_GVAR_HEADERS_FM0 "Valor en FM0" #define TR_GVAR_HEADERS_FM1 "Valor en FM1" diff --git a/radio/src/translations/fi.h b/radio/src/translations/fi.h index 136bbd3f778..2bc45b26d11 100644 --- a/radio/src/translations/fi.h +++ b/radio/src/translations/fi.h @@ -389,6 +389,7 @@ #define TR_MS "ms" #define TR_FREQUENCY INDENT "Frequency" #define TR_SWITCH "Switch" +#define TR_SF_SWITCH "Trigger" #define TR_TRIMS "Trims" #define TR_FADEIN "Fade In" #define TR_FADEOUT "Fade Out" @@ -974,6 +975,8 @@ #define TR_TELEMETRY_TYPE TR("Type", "Telemetry Type") #define TR_TELEMETRY_SENSORS "Sensors" #define TR_VALUE "Value" +#define TR_PERIOD "Period" +#define TR_INTERVAL "Interval" #define TR_REPEAT "Repeat" #define TR_ENABLE "Enable" #define TR_TOPLCDTIMER "Top LCD Timer" @@ -1070,13 +1073,6 @@ #define TR_LIMITS_HEADERS_SUBTRIMMODE "Subtrim mode" #define TR_INVERTED "Inverted" -#define TR_LSW_HEADERS_FUNCTION "Function" -#define TR_LSW_HEADERS_V1 "V1" -#define TR_LSW_HEADERS_V2 "V2" -#define TR_LSW_HEADERS_ANDSW "AND Switch" -#define TR_LSW_HEADERS_DURATION "Duration" -#define TR_LSW_HEADERS_DELAY "Delay" - #define TR_GVAR_HEADERS_NAME "Name" #define TR_GVAR_HEADERS_FM0 "Value on FM0" #define TR_GVAR_HEADERS_FM1 "Value on FM1" diff --git a/radio/src/translations/fr.h b/radio/src/translations/fr.h index 444a88a67d7..71121b6b4aa 100644 --- a/radio/src/translations/fr.h +++ b/radio/src/translations/fr.h @@ -383,6 +383,7 @@ #define TR_MS "ms" #define TR_FREQUENCY INDENT "Fréquence" #define TR_SWITCH TR("Inter", "Interrupteur") +#define TR_SF_SWITCH "Trigger" #define TR_TRIMS "Trims" #define TR_FADEIN "Fondu ON" #define TR_FADEOUT "Fondu OFF" @@ -967,6 +968,8 @@ #define TR_TELEMETRY_TYPE TR("Type tél.", "Type télémétrie") #define TR_TELEMETRY_SENSORS "Capteurs" #define TR_VALUE "Valeur" +#define TR_PERIOD "Period" +#define TR_INTERVAL "Interval" #define TR_REPEAT "Repeat" #define TR_ENABLE "Enable" #define TR_TOPLCDTIMER "Timer LCD haut" @@ -1070,13 +1073,6 @@ #define TR_LIMITS_HEADERS_SUBTRIMMODE "Mode subtrim" #define TR_INVERTED "Inverted" -#define TR_LSW_HEADERS_FUNCTION "Fonction" -#define TR_LSW_HEADERS_V1 "V1" -#define TR_LSW_HEADERS_V2 "V2" -#define TR_LSW_HEADERS_ANDSW "ET suppl." -#define TR_LSW_HEADERS_DURATION "Durée" -#define TR_LSW_HEADERS_DELAY "Délai" - #define TR_GVAR_HEADERS_NAME "Nom" #define TR_GVAR_HEADERS_FM0 "Valeur FM0" #define TR_GVAR_HEADERS_FM1 "Valeur FM1" diff --git a/radio/src/translations/it.h b/radio/src/translations/it.h index f5af140b170..fa19e116f16 100644 --- a/radio/src/translations/it.h +++ b/radio/src/translations/it.h @@ -367,6 +367,7 @@ #define TR_MS "ms" #define TR_FREQUENCY INDENT "Frequenza" #define TR_SWITCH "Inter." +#define TR_SF_SWITCH "Trigger" #define TR_TRIMS "Trims" #define TR_FADEIN "Diss.In" #define TR_FADEOUT "Diss.Out" @@ -740,7 +741,7 @@ #define TR_CAPAWARNING INDENT "Capacità Bassa" #define TR_TEMPWARNING INDENT "Temp. Alta" #define TR_TTL_WARNING "Attenzione: usa livelli logici 3.3V" -#define TR_FUNC "Funz" +#define TR_FUNC "Funzione" #define TR_V1 "V1" #define TR_V2 "V2" #define TR_DURATION "Durata" @@ -948,6 +949,8 @@ #define TR_TELEMETRY_TYPE "Tipo Telemetria" #define TR_TELEMETRY_SENSORS "Sensori" #define TR_VALUE "Valore" +#define TR_PERIOD "Periodo" +#define TR_INTERVAL "Intervallo" #define TR_REPEAT "Ripeti" #define TR_ENABLE "Attivo" #define TR_TOPLCDTIMER "Timer LCD Sup." @@ -1044,13 +1047,6 @@ #define TR_LIMITS_HEADERS_SUBTRIMMODE "Simmetria" #define TR_INVERTED "Inverted" -#define TR_LSW_HEADERS_FUNCTION "Funzione" -#define TR_LSW_HEADERS_V1 "V1" -#define TR_LSW_HEADERS_V2 "V2" -#define TR_LSW_HEADERS_ANDSW "Inter. AND" -#define TR_LSW_HEADERS_DURATION "Durata" -#define TR_LSW_HEADERS_DELAY "Ritardo" - #define TR_GVAR_HEADERS_NAME "Nome" #define TR_GVAR_HEADERS_FM0 "Valore su FM0" #define TR_GVAR_HEADERS_FM1 "Valore su FM1" diff --git a/radio/src/translations/jp.h b/radio/src/translations/jp.h index e103b1fc829..ea8b37fbd4c 100644 --- a/radio/src/translations/jp.h +++ b/radio/src/translations/jp.h @@ -360,6 +360,7 @@ #define TR_MS "ms" #define TR_FREQUENCY INDENT "周波数" #define TR_SWITCH "スイッチ" +#define TR_SF_SWITCH "Trigger" #define TR_TRIMS "トリム" #define TR_FADEIN "フェードイン" #define TR_FADEOUT "フェードアウト" @@ -739,7 +740,7 @@ #define TR_CAPAWARNING INDENT "電流が低すぎます" #define TR_TEMPWARNING INDENT "オーバーヒートです" #define TR_TTL_WARNING "警告: 論理値3.3Vを使用します" -#define TR_FUNC "機能" +#define TR_FUNC TR("機能", "ファンクション") #define TR_V1 "V1" #define TR_V2 "V2" #define TR_DURATION "持続時間" @@ -947,6 +948,8 @@ #define TR_TELEMETRY_TYPE TR("Type", "テレメトリータイプ") #define TR_TELEMETRY_SENSORS "センサー" #define TR_VALUE "値" +#define TR_PERIOD "ピリオド" +#define TR_INTERVAL "インターバル" #define TR_REPEAT "リピート" #define TR_ENABLE "有効" #define TR_TOPLCDTIMER "上部LCDタイマー" @@ -1038,13 +1041,6 @@ #define TR_LIMITS_HEADERS_SUBTRIMMODE "サブトリムモード" #define TR_INVERTED "リバース" -#define TR_LSW_HEADERS_FUNCTION "ファンクション" -#define TR_LSW_HEADERS_V1 "V1" -#define TR_LSW_HEADERS_V2 "V2" -#define TR_LSW_HEADERS_ANDSW "スイッチ付" -#define TR_LSW_HEADERS_DURATION "持続時間" -#define TR_LSW_HEADERS_DELAY "遅延" - #define TR_GVAR_HEADERS_NAME "名称" #define TR_GVAR_HEADERS_FM0 "FM0 値" #define TR_GVAR_HEADERS_FM1 "FM1 値" diff --git a/radio/src/translations/nl.h b/radio/src/translations/nl.h index 858303c82b1..0461b7157fd 100644 --- a/radio/src/translations/nl.h +++ b/radio/src/translations/nl.h @@ -364,6 +364,7 @@ #define TR_MS "ms" #define TR_FREQUENCY INDENT "Frequency" #define TR_SWITCH TR("Schak.", "Schakelaar") +#define TR_SF_SWITCH "Trigger" #define TR_TRIMS "Trims" #define TR_FADEIN "Fade in" #define TR_FADEOUT "Fade out" @@ -951,6 +952,8 @@ #define TR_TELEMETRY_TYPE TR("Type", "Telemetrietype") #define TR_TELEMETRY_SENSORS "Sensoren" #define TR_VALUE "Waarde" +#define TR_PERIOD "Period" +#define TR_INTERVAL "Interval" #define TR_REPEAT "Repeat" #define TR_ENABLE "Enable" #define TR_TOPLCDTIMER "Top LCD Timer" @@ -1053,13 +1056,6 @@ #define TR_LIMITS_HEADERS_SUBTRIMMODE "Subtrim mode" #define TR_INVERTED "Inverted" -#define TR_LSW_HEADERS_FUNCTION "Funktie" -#define TR_LSW_HEADERS_V1 "Var1" -#define TR_LSW_HEADERS_V2 "Var2" -#define TR_LSW_HEADERS_ANDSW "EN-Schakelaar" -#define TR_LSW_HEADERS_DURATION "Duur" -#define TR_LSW_HEADERS_DELAY "Vertraging" - #define TR_GVAR_HEADERS_NAME "Name" #define TR_GVAR_HEADERS_FM0 "Waarde bij FM0" #define TR_GVAR_HEADERS_FM1 "Waarde bij FM1" diff --git a/radio/src/translations/pl.h b/radio/src/translations/pl.h index 2c5bf44a4e2..163eeb37900 100644 --- a/radio/src/translations/pl.h +++ b/radio/src/translations/pl.h @@ -362,6 +362,7 @@ #define TR_MS "ms" #define TR_FREQUENCY INDENT "Częstotl." #define TR_SWITCH "Przełą" +#define TR_SF_SWITCH "Trigger" #define TR_TRIMS "Trymy" #define TR_FADEIN "Pojawia" #define TR_FADEOUT "Zanik " @@ -736,7 +737,7 @@ #define TR_CAPAWARNING INDENT "Mała pojemność" #define TR_TEMPWARNING INDENT "Przegrzanie" #define TR_TTL_WARNING "Uwaga: use 3.3V logic levels" -#define TR_FUNC "Funkc" +#define TR_FUNC "Funkcja" #define TR_V1 "V1" #define TR_V2 "V2" #define TR_DURATION "Czas trwania" @@ -943,6 +944,8 @@ #define TR_TELEMETRY_TYPE TR("Typ ", "Typ telemetrii") #define TR_TELEMETRY_SENSORS "Czujniki" #define TR_VALUE "Wartość" +#define TR_PERIOD "Okres" +#define TR_INTERVAL "Interwał" #define TR_REPEAT "Powtórz" #define TR_ENABLE "Włącz" #define TR_TOPLCDTIMER "Top LCD Timer" @@ -1039,13 +1042,6 @@ #define TR_LIMITS_HEADERS_SUBTRIMMODE "Tryb subtrim" #define TR_INVERTED "Inverted" -#define TR_LSW_HEADERS_FUNCTION "Funkcja" -#define TR_LSW_HEADERS_V1 "V1" -#define TR_LSW_HEADERS_V2 "V2" -#define TR_LSW_HEADERS_ANDSW "Przeł. AND" -#define TR_LSW_HEADERS_DURATION "CzasTrwa" -#define TR_LSW_HEADERS_DELAY "Opóźn" - #define TR_GVAR_HEADERS_NAME "Nazwa" #define TR_GVAR_HEADERS_FM0 "Wartość w FM0" #define TR_GVAR_HEADERS_FM1 "Wartość w FM1" diff --git a/radio/src/translations/pt.h b/radio/src/translations/pt.h index f41a9d87ed3..9928ddd19b7 100644 --- a/radio/src/translations/pt.h +++ b/radio/src/translations/pt.h @@ -365,6 +365,7 @@ #define TR_MS "ms" #define TR_FREQUENCY INDENT "Frequency" #define TR_SWITCH "Chave" +#define TR_SF_SWITCH "Trigger" #define TR_TRIMS "Trims" #define TR_FADEIN "Aparecer" #define TR_FADEOUT "Ocultar" @@ -950,6 +951,8 @@ #define TR_TELEMETRY_TYPE TR("Type", "Telemetry Type") #define TR_TELEMETRY_SENSORS "Sensors" #define TR_VALUE "Value" +#define TR_PERIOD "Period" +#define TR_INTERVAL "Interval" #define TR_REPEAT "Repeat" #define TR_ENABLE "Enable" #define TR_TOPLCDTIMER "Top LCD Timer" @@ -1046,13 +1049,6 @@ #define TR_LIMITS_HEADERS_SUBTRIMMODE "Subtrim mode" #define TR_INVERTED "Inverted" -#define TR_LSW_HEADERS_FUNCTION "Function" -#define TR_LSW_HEADERS_V1 "V1" -#define TR_LSW_HEADERS_V2 "V2" -#define TR_LSW_HEADERS_ANDSW "AND Switch" -#define TR_LSW_HEADERS_DURATION "Duration" -#define TR_LSW_HEADERS_DELAY "Delay" - #define TR_GVAR_HEADERS_NAME "Name" #define TR_GVAR_HEADERS_FM0 "Value on FM0" #define TR_GVAR_HEADERS_FM1 "Value on FM1" diff --git a/radio/src/translations/se.h b/radio/src/translations/se.h index 9e85dbfd054..3bb48ade67d 100644 --- a/radio/src/translations/se.h +++ b/radio/src/translations/se.h @@ -391,6 +391,7 @@ #define TR_MS "ms" #define TR_FREQUENCY INDENT "Frekvens" #define TR_SWITCH "Brytare" +#define TR_SF_SWITCH "Trigger" #define TR_TRIMS "Trimmar" #define TR_FADEIN "Tona in" #define TR_FADEOUT "Tona ut" @@ -994,6 +995,8 @@ #define TR_TELEMETRY_TYPE "Telemetrityp" #define TR_TELEMETRY_SENSORS "Sensorer" #define TR_VALUE "Värde" +#define TR_PERIOD "Period" +#define TR_INTERVAL "Intervall" #define TR_REPEAT "Upprepa" #define TR_ENABLE "Aktivera" #define TR_TOPLCDTIMER "Översta LCD timer" @@ -1092,13 +1095,6 @@ #define TR_LIMITS_HEADERS_SUBTRIMMODE "Subtrim-läge" #define TR_INVERTED "Inverterad" -#define TR_LSW_HEADERS_FUNCTION "Funktion" -#define TR_LSW_HEADERS_V1 "V1" -#define TR_LSW_HEADERS_V2 "V2" -#define TR_LSW_HEADERS_ANDSW "AND-brytare" -#define TR_LSW_HEADERS_DURATION "Tidslängd" -#define TR_LSW_HEADERS_DELAY "Fördröj" - #define TR_GVAR_HEADERS_NAME "Namn" #define TR_GVAR_HEADERS_FM0 "Värde för FL0" #define TR_GVAR_HEADERS_FM1 "Värde för FL1" diff --git a/radio/src/translations/tw.h b/radio/src/translations/tw.h index 51fdfe3bd99..2191594066d 100644 --- a/radio/src/translations/tw.h +++ b/radio/src/translations/tw.h @@ -360,6 +360,7 @@ #define TR_MS "ms" #define TR_FREQUENCY INDENT "頻率" #define TR_SWITCH "開關" +#define TR_SF_SWITCH "Trigger" #define TR_TRIMS "微調" #define TR_FADEIN "漸入" #define TR_FADEOUT "漸出" @@ -947,6 +948,8 @@ #define TR_TELEMETRY_TYPE TR("類型", "回傳類型") #define TR_TELEMETRY_SENSORS "傳感器" #define TR_VALUE "數值" +#define TR_PERIOD "Period" +#define TR_INTERVAL "Interval" #define TR_REPEAT "循環" #define TR_ENABLE "啟用" #define TR_TOPLCDTIMER "Top LCD Timer" @@ -1038,13 +1041,6 @@ #define TR_LIMITS_HEADERS_SUBTRIMMODE "微調模式" #define TR_INVERTED "反向" -#define TR_LSW_HEADERS_FUNCTION "功能" -#define TR_LSW_HEADERS_V1 "V1" -#define TR_LSW_HEADERS_V2 "V2" -#define TR_LSW_HEADERS_ANDSW "與開關" -#define TR_LSW_HEADERS_DURATION "持續時間" -#define TR_LSW_HEADERS_DELAY "延時" - #define TR_GVAR_HEADERS_NAME "名稱" #define TR_GVAR_HEADERS_FM0 "FM0值" #define TR_GVAR_HEADERS_FM1 "FM1值"