Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 12 additions & 6 deletions radio/src/gui/128x64/model_special_functions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
Expand Down
18 changes: 12 additions & 6 deletions radio/src/gui/212x64/model_special_functions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
10 changes: 7 additions & 3 deletions radio/src/gui/colorlcd/special_functions.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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;
}
Expand Down Expand Up @@ -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)));
Expand Down
4 changes: 4 additions & 0 deletions radio/src/gui/colorlcd/special_functions.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
3 changes: 3 additions & 0 deletions radio/src/translations.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
5 changes: 4 additions & 1 deletion radio/src/translations.h
Original file line number Diff line number Diff line change
Expand Up @@ -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[];
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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[];
Expand Down
10 changes: 3 additions & 7 deletions radio/src/translations/cn.h
Original file line number Diff line number Diff line change
Expand Up @@ -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 "渐出"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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值"
Expand Down
12 changes: 4 additions & 8 deletions radio/src/translations/cz.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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í"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
12 changes: 4 additions & 8 deletions radio/src/translations/da.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
10 changes: 3 additions & 7 deletions radio/src/translations/de.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
12 changes: 4 additions & 8 deletions radio/src/translations/en.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
10 changes: 3 additions & 7 deletions radio/src/translations/es.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
10 changes: 3 additions & 7 deletions radio/src/translations/fi.h
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
Loading