piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add ability to disable trainer warning on shutdown (#4831)

Browse Source 
Co-authored-by: philmoz <phil.a.mitchell@gmail.com>
Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
This commit is contained in:
3djc
2024-05-08 11:19:18 +10:00
committed by GitHub
co-authored by philmoz Peter Feerick
parent acd34e7fc9
commit 09d4066a23
41 changed files with 944 additions and 849 deletions
Download Patch File Download Diff File Expand all files Collapse all files
companion/src/firmwares/edgetx/yaml_generalsettings.cpp
+2
View File
@@ -206,6 +206,7 @@ Node convert<GeneralSettings>::encode(const GeneralSettings& rhs)
node["alarmsFlash"] = (int)rhs.alarmsFlash;
node["disableAlarmWarning"] = (int)rhs.disableAlarmWarning;
node["disableRssiPoweroffAlarm"] = (int)rhs.disableRssiPoweroffAlarm;
node["disableTrainerPoweroffAlarm"] = (int)rhs.disableTrainerPoweroffAlarm;
node["USBMode"] = rhs.usbMode;
node["hatsMode"] = hatsModeLut << rhs.hatsMode;
node["stickDeadZone"] = rhs.stickDeadZone;
@@ -450,6 +451,7 @@ bool convert<GeneralSettings>::decode(const Node& node, GeneralSettings& rhs)
node["alarmsFlash"] >> rhs.alarmsFlash;
node["disableAlarmWarning"] >> rhs.disableAlarmWarning;
node["disableRssiPoweroffAlarm"] >> rhs.disableRssiPoweroffAlarm;
node["disableTrainerPoweroffAlarm"] >> rhs.disableTrainerPoweroffAlarm;
node["USBMode"] >> rhs.usbMode;
node["hatsMode"] >> hatsModeLut >> rhs.hatsMode;
node["stickDeadZone"] >> rhs.stickDeadZone;
companion/src/firmwares/generalsettings.h
+1
View File
@@ -221,6 +221,7 @@ class GeneralSettings {
BeeperMode beeperMode;
bool disableAlarmWarning;
bool disableRssiPoweroffAlarm;
bool disableTrainerPoweroffAlarm;
unsigned int usbMode;
unsigned int hatsMode;
unsigned int stickDeadZone;
companion/src/generaledit/generalsetup.cpp
+7
View File
@@ -271,6 +271,7 @@ ui(new Ui::GeneralSetup)
ui->alarmwarnChkB->setChecked(!generalSettings.disableAlarmWarning); // Default is zero=checked
ui->rssiPowerOffWarnChkB->setChecked(!generalSettings.disableRssiPoweroffAlarm); // Default is zero=checked
ui->trainerPowerOffWarnChkB->setChecked(!generalSettings.disableTrainerPoweroffAlarm); // Default is zero=checked
ui->splashScreenDuration->setCurrentIndex(3-generalSettings.splashMode);
if (IS_FAMILY_HORUS_OR_T16(firmware->getBoard())) {
@@ -820,6 +821,12 @@ void GeneralSetupPanel::on_rssiPowerOffWarnChkB_stateChanged(int)
emit modified();
}
void GeneralSetupPanel::on_trainerPowerOffWarnChkB_stateChanged(int)
{
generalSettings.disableTrainerPoweroffAlarm = ui->trainerPowerOffWarnChkB->isChecked() ? 0 : 1;
emit modified();
}
void GeneralSetupPanel::on_beeperCB_currentIndexChanged(int index)
{
generalSettings.beeperMode = (GeneralSettings::BeeperMode)(index-2);
companion/src/generaledit/generalsetup.h
+1
View File
@@ -40,6 +40,7 @@ class GeneralSetupPanel : public GeneralPanel
void on_splashScreenDuration_currentIndexChanged(int index);
void on_alarmwarnChkB_stateChanged(int);
void on_rssiPowerOffWarnChkB_stateChanged(int);
void on_trainerPowerOffWarnChkB_stateChanged(int);
void on_gpsFormatCB_currentIndexChanged(int index);
void on_displayTypeCB_currentIndexChanged(int index);
void on_BLBright_SB_editingFinished();
companion/src/generaledit/generalsetup.ui
+834 -820
View File
File diff suppressed because it is too large Load Diff
radio/src/datastructs.h
+3 -3
View File
@@ -154,14 +154,14 @@ static inline void check_struct()
CHKSIZE(ModelData, 6706);
#elif defined(PCBHORUS)
#if defined(PCBX10)
CHKSIZE(RadioData, 836);
CHKSIZE(RadioData, 837);
CHKSIZE(ModelData, 15607);
#else
CHKSIZE(RadioData, 836);
CHKSIZE(RadioData, 837);
CHKSIZE(ModelData, 15607);
#endif
#elif defined(PCBNV14)
CHKSIZE(RadioData, 836);
CHKSIZE(RadioData, 837);
CHKSIZE(ModelData, 15463);
#endif
radio/src/datastructs_private.h
+9 -4
View File
@@ -955,8 +955,11 @@ PACK(struct RadioData {
NOBACKUP(char selectedTheme[SELECTED_THEME_NAME_LEN]);
#endif
// Radio level tabs control (global settings)
#if defined(COLORLCD)
NOBACKUP(uint8_t labelSingleSelect:1); // 0 = multi-select, 1 = single select labels
NOBACKUP(uint8_t labelMultiMode:1); // 0 = match all labels (AND), 1 = match any labels (OR)
NOBACKUP(uint8_t favMultiMode:1); // 0 = match all (AND), 1 = match any (OR)
// Radio level tabs control (global settings)
NOBACKUP(uint8_t modelSelectLayout:2);
NOBACKUP(uint8_t radioThemesDisabled:1);
#endif
@@ -972,10 +975,12 @@ PACK(struct RadioData {
NOBACKUP(uint8_t modelCustomScriptsDisabled:1);
NOBACKUP(uint8_t modelTelemetryDisabled:1);
NOBACKUP(uint8_t disableTrainerPoweroffAlarm:1);
#if defined(COLORLCD)
uint8_t labelSingleSelect:1; // 0 = multi-select, 1 = single select labels
uint8_t labelMultiMode:1; // 0 = match all labels (AND), 1 = match any labels (OR)
uint8_t favMultiMode:1; // 0 = match all (AND), 1 = match any (OR)
NOBACKUP(uint8_t space:7 SKIP);
#else
NOBACKUP(uint8_t space:5 SKIP);
#endif
NOBACKUP(uint8_t getBrightness() const
radio/src/gui/128x64/radio_setup.cpp
+10 -1
View File
@@ -82,6 +82,7 @@ enum {
ITEM_RADIO_SETUP_MEMORY_WARNING,
ITEM_RADIO_SETUP_ALARM_WARNING,
ITEM_RADIO_SETUP_RSSI_POWEROFF_ALARM,
ITEM_RADIO_SETUP_TRAINER_POWEROFF_ALARM,
CASE_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_LABEL)
CASE_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_MODE)
CASE_BACKLIGHT(ITEM_RADIO_SETUP_BACKLIGHT_DELAY)
@@ -179,7 +180,7 @@ void menuRadioSetup(event_t event)
CASE_IMU(0)
CASE_IMU(0)
LABEL(ALARMS), 0,
0, 0, 0, 0, /* ITEM_RADIO_SETUP_INACTIVITY_ALARM ITEM_RADIO_SETUP_MEMORY_WARNING ITEM_RADIO_SETUP_ALARM_WARNING ITEM_RADIO_SETUP_RSSI_POWEROFF_ALARM */
0, 0, 0, 0, 0,/* ITEM_RADIO_SETUP_INACTIVITY_ALARM ITEM_RADIO_SETUP_MEMORY_WARNING ITEM_RADIO_SETUP_ALARM_WARNING ITEM_RADIO_SETUP_RSSI_POWEROFF_ALARM ITEM_RADIO_SETUP_TRAINER_POWEROFF_ALARM*/
CASE_BACKLIGHT(LABEL(BACKLIGHT))
CASE_BACKLIGHT(0)
CASE_BACKLIGHT(0)
@@ -512,6 +513,14 @@ void menuRadioSetup(event_t event)
break;
}
case ITEM_RADIO_SETUP_TRAINER_POWEROFF_ALARM:
{
lcdDrawText(INDENT_WIDTH, y, STR_TRAINER_SHUTDOWN_ALARM);
uint8_t b = 1 - g_eeGeneral.disableTrainerPoweroffAlarm;
g_eeGeneral.disableTrainerPoweroffAlarm = 1 - editCheckBox(b, LCD_W-9, y, nullptr, attr, event);
break;
}
case ITEM_RADIO_SETUP_INACTIVITY_ALARM:
lcdDrawText(INDENT_WIDTH, y, STR_INACTIVITYALARM);
lcdDrawNumber(LCD_W-7, y, g_eeGeneral.inactivityTimer, attr|RIGHT);
radio/src/gui/212x64/radio_setup.cpp
+10
View File
@@ -71,6 +71,7 @@ enum MenuRadioSetupItems {
ITEM_RADIO_SETUP_MEMORY_WARNING,
ITEM_RADIO_SETUP_ALARM_WARNING,
ITEM_RADIO_SETUP_RSSI_POWEROFF_ALARM,
ITEM_RADIO_SETUP_TRAINER_POWEROFF_ALARM,
ITEM_RADIO_SETUP_BACKLIGHT_LABEL,
ITEM_RADIO_SETUP_BACKLIGHT_MODE,
ITEM_RADIO_SETUP_BACKLIGHT_DELAY,
@@ -182,6 +183,7 @@ void menuRadioSetup(event_t event)
0, // memory warning
0, // alarm warning
0, // RSSI power off alarm
0, // Trainer power off alarm
LABEL(BACKLIGHT),
0, // backlight mode
0, // backlight delay
@@ -475,6 +477,14 @@ void menuRadioSetup(event_t event)
break;
}
case ITEM_RADIO_SETUP_TRAINER_POWEROFF_ALARM:
{
lcdDrawText(INDENT_WIDTH, y, STR_TRAINER_SHUTDOWN_ALARM);
uint8_t b = 1 - g_eeGeneral.disableTrainerPoweroffAlarm;
g_eeGeneral.disableTrainerPoweroffAlarm = 1 - editCheckBox(b, RADIO_SETUP_2ND_COLUMN, y, nullptr, attr, event);
break;
}
case ITEM_RADIO_SETUP_INACTIVITY_ALARM:
lcdDrawText(INDENT_WIDTH, y, STR_INACTIVITYALARM);
lcdDrawNumber(RADIO_SETUP_2ND_COLUMN, y, g_eeGeneral.inactivityTimer, attr|LEFT);
radio/src/gui/colorlcd/radio_setup.cpp
+6
View File
@@ -441,6 +441,12 @@ class AlarmsPage : public SubPage
new ToggleSwitch(line, rect_t{},
GET_SET_INVERTED(g_eeGeneral.disableRssiPoweroffAlarm));
line = body->newLine(grid);
// Trainer shutdown alarm
new StaticText(line, rect_t{}, STR_TRAINER_SHUTDOWN_ALARM);
new ToggleSwitch(line, rect_t{},
GET_SET_INVERTED(g_eeGeneral.disableTrainerPoweroffAlarm));
line = body->newLine(grid);
}
};
radio/src/opentx.cpp
+3 -3
View File
@@ -1671,7 +1671,7 @@ uint32_t pwrCheck()
while (
(usbPlugged() && getSelectedUsbMode() != USB_UNSELECTED_MODE) ||
(TELEMETRY_STREAMING() && !g_eeGeneral.disableRssiPoweroffAlarm) ||
isTrainerConnected())
(isTrainerConnected() && !g_eeGeneral.disableTrainerPoweroffAlarm))
#endif
{
@@ -1688,7 +1688,7 @@ uint32_t pwrCheck()
msg = STR_USB_STILL_CONNECTED;
msg_len = sizeof(TR_USB_STILL_CONNECTED);
}
else if (isTrainerConnected()) {
else if (isTrainerConnected() && !g_eeGeneral.disableTrainerPoweroffAlarm) {
msg = STR_TRAINER_STILL_CONNECTED;
msg_len = sizeof(TR_TRAINER_STILL_CONNECTED);
}
@@ -1732,7 +1732,7 @@ uint32_t pwrCheck()
return !TELEMETRY_STREAMING() || g_eeGeneral.disableRssiPoweroffAlarm;
};
}
else if (!trainerConfirmed) {
else if (!trainerConfirmed && !g_eeGeneral.disableTrainerPoweroffAlarm) {
message = STR_TRAINER_STILL_CONNECTED;
closeCondition = [](){
return !isTrainerConnected();
radio/src/storage/yaml/yaml_datastructs_128x64.cpp
+2
View File
@@ -357,6 +357,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelSFDisabled", 1 ),
YAML_UNSIGNED( "modelCustomScriptsDisabled", 1 ),
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_PADDING( 5 ),
YAML_END
};
static const struct YamlNode struct_unsigned_8[] = {
radio/src/storage/yaml/yaml_datastructs_nv14.cpp
+5 -3
View File
@@ -367,6 +367,9 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "uartSampleMode", 2 ),
YAML_UNSIGNED( "stickDeadZone", 3 ),
YAML_STRING("selectedTheme", 26),
YAML_UNSIGNED( "labelSingleSelect", 1 ),
YAML_UNSIGNED( "labelMultiMode", 1 ),
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_UNSIGNED( "radioGFDisabled", 1 ),
@@ -379,9 +382,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelSFDisabled", 1 ),
YAML_UNSIGNED( "modelCustomScriptsDisabled", 1 ),
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "labelSingleSelect", 1 ),
YAML_UNSIGNED( "labelMultiMode", 1 ),
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_PADDING( 7 ),
YAML_END
};
static const struct YamlNode struct_unsigned_8[] = {
radio/src/storage/yaml/yaml_datastructs_pl18.cpp
+5 -3
View File
@@ -367,6 +367,9 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "uartSampleMode", 2 ),
YAML_UNSIGNED( "stickDeadZone", 3 ),
YAML_STRING("selectedTheme", 26),
YAML_UNSIGNED( "labelSingleSelect", 1 ),
YAML_UNSIGNED( "labelMultiMode", 1 ),
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_UNSIGNED( "radioGFDisabled", 1 ),
@@ -379,9 +382,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelSFDisabled", 1 ),
YAML_UNSIGNED( "modelCustomScriptsDisabled", 1 ),
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "labelSingleSelect", 1 ),
YAML_UNSIGNED( "labelMultiMode", 1 ),
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_PADDING( 7 ),
YAML_END
};
static const struct YamlNode struct_unsigned_8[] = {
radio/src/storage/yaml/yaml_datastructs_t20.cpp
+2
View File
@@ -357,6 +357,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelSFDisabled", 1 ),
YAML_UNSIGNED( "modelCustomScriptsDisabled", 1 ),
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_PADDING( 5 ),
YAML_END
};
static const struct YamlNode struct_unsigned_8[] = {
radio/src/storage/yaml/yaml_datastructs_tpro.cpp
+2
View File
@@ -357,6 +357,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelSFDisabled", 1 ),
YAML_UNSIGNED( "modelCustomScriptsDisabled", 1 ),
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_PADDING( 5 ),
YAML_END
};
static const struct YamlNode struct_unsigned_8[] = {
radio/src/storage/yaml/yaml_datastructs_x10.cpp
+5 -3
View File
@@ -369,6 +369,9 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "imuMax", 8 ),
YAML_SIGNED( "imuOffset", 8 ),
YAML_STRING("selectedTheme", 26),
YAML_UNSIGNED( "labelSingleSelect", 1 ),
YAML_UNSIGNED( "labelMultiMode", 1 ),
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_UNSIGNED( "radioGFDisabled", 1 ),
@@ -381,9 +384,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelSFDisabled", 1 ),
YAML_UNSIGNED( "modelCustomScriptsDisabled", 1 ),
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "labelSingleSelect", 1 ),
YAML_UNSIGNED( "labelMultiMode", 1 ),
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_PADDING( 7 ),
YAML_END
};
static const struct YamlNode struct_unsigned_8[] = {
radio/src/storage/yaml/yaml_datastructs_x12s.cpp
+5 -3
View File
@@ -369,6 +369,9 @@ static const struct YamlNode struct_RadioData[] = {
YAML_SIGNED( "imuMax", 8 ),
YAML_SIGNED( "imuOffset", 8 ),
YAML_STRING("selectedTheme", 26),
YAML_UNSIGNED( "labelSingleSelect", 1 ),
YAML_UNSIGNED( "labelMultiMode", 1 ),
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "modelSelectLayout", 2 ),
YAML_UNSIGNED( "radioThemesDisabled", 1 ),
YAML_UNSIGNED( "radioGFDisabled", 1 ),
@@ -381,9 +384,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelSFDisabled", 1 ),
YAML_UNSIGNED( "modelCustomScriptsDisabled", 1 ),
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "labelSingleSelect", 1 ),
YAML_UNSIGNED( "labelMultiMode", 1 ),
YAML_UNSIGNED( "favMultiMode", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_PADDING( 7 ),
YAML_END
};
static const struct YamlNode struct_unsigned_8[] = {
radio/src/storage/yaml/yaml_datastructs_x9d.cpp
+2
View File
@@ -356,6 +356,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelSFDisabled", 1 ),
YAML_UNSIGNED( "modelCustomScriptsDisabled", 1 ),
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_PADDING( 5 ),
YAML_END
};
static const struct YamlNode struct_unsigned_8[] = {
radio/src/storage/yaml/yaml_datastructs_x9e.cpp
+2
View File
@@ -357,6 +357,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelSFDisabled", 1 ),
YAML_UNSIGNED( "modelCustomScriptsDisabled", 1 ),
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_PADDING( 5 ),
YAML_END
};
static const struct YamlNode struct_unsigned_8[] = {
radio/src/storage/yaml/yaml_datastructs_xlites.cpp
+2
View File
@@ -360,6 +360,8 @@ static const struct YamlNode struct_RadioData[] = {
YAML_UNSIGNED( "modelSFDisabled", 1 ),
YAML_UNSIGNED( "modelCustomScriptsDisabled", 1 ),
YAML_UNSIGNED( "modelTelemetryDisabled", 1 ),
YAML_UNSIGNED( "disableTrainerPoweroffAlarm", 1 ),
YAML_PADDING( 5 ),
YAML_END
};
static const struct YamlNode struct_unsigned_8[] = {
radio/src/translations.cpp
+1
View File
@@ -241,6 +241,7 @@ const char STR_INACTIVITYALARM[] = TR_INACTIVITYALARM;
const char STR_MEMORYWARNING[] = TR_MEMORYWARNING;
const char STR_ALARMWARNING[] = TR_ALARMWARNING;
const char STR_RSSI_SHUTDOWN_ALARM[] = TR_RSSI_SHUTDOWN_ALARM;
const char STR_TRAINER_SHUTDOWN_ALARM[] = TR_TRAINER_SHUTDOWN_ALARM;
const char STR_MODEL_STILL_POWERED[] = TR_MODEL_STILL_POWERED;
const char STR_TRAINER_STILL_CONNECTED[] = TR_TRAINER_STILL_CONNECTED;
const char STR_USB_STILL_CONNECTED[] = TR_USB_STILL_CONNECTED;
radio/src/translations.h
+1
View File
@@ -403,6 +403,7 @@ extern const char STR_INACTIVITYALARM[];
extern const char STR_MEMORYWARNING[];
extern const char STR_ALARMWARNING[];
extern const char STR_RSSI_SHUTDOWN_ALARM[];
extern const char STR_TRAINER_SHUTDOWN_ALARM[];
extern const char STR_MODEL_STILL_POWERED[];
extern const char STR_USB_STILL_CONNECTED[];
extern const char STR_TRAINER_STILL_CONNECTED[];
radio/src/translations/cn.h
+1
View File
@@ -355,6 +355,7 @@
#define TR_MEMORYWARNING "内存不足"
#define TR_ALARMWARNING "静音"
#define TR_RSSI_SHUTDOWN_ALARM TR("关机检查RSSI", "关机时检查RSSI")
#define TR_TRAINER_SHUTDOWN_ALARM TR("Trainer alarm", "check trainer connection")
#define TR_MODEL_STILL_POWERED "模型未断电"
#define TR_TRAINER_STILL_CONNECTED "教练信号未断开"
#define TR_USB_STILL_CONNECTED "USB未断开"
radio/src/translations/cz.h
+1
View File
@@ -371,6 +371,7 @@
#define TR_ALARMWARNING TR3("Vypnutý zvuk", "Upozornit na vypnutý zvuk", "Upozornit na vyp. zvuk")
#define TR_RSSI_SHUTDOWN_ALARM TR("Rssi při vyp.", "Hlídat RSSI při vypnutí")
#define TR_FLYSKY_TELEMETRY TR("FlySky RSSI #", "Použít FlySky RSSI hodnotu bez škálování")
#define TR_TRAINER_SHUTDOWN_ALARM TR("Trenér vypnutí", "Kontrola trenéra při vypnutí")
#define TR_MODEL_STILL_POWERED "Model stále spuštěn"
#define TR_TRAINER_STILL_CONNECTED "Trenér stále připojen"
#define TR_USB_STILL_CONNECTED "USB stále připojeno"
radio/src/translations/da.h
+2 -1
View File
@@ -364,7 +364,8 @@
#define TR_INACTIVITYALARM "Inaktiv"
#define TR_MEMORYWARNING "Lav hukommelse"
#define TR_ALARMWARNING "Lyd fra"
#define TR_RSSI_SHUTDOWN_ALARM TR("RSSI nedluk", "Check RSSI ved nedluk")
#define TR_RSSI_SHUTDOWN_ALARM TR("RSSI alarm", "Kontroller RSSI forbindelse")
#define TR_TRAINER_SHUTDOWN_ALARM TR("Træner alarm", "Kontroller træner forbindelse")
#define TR_MODEL_STILL_POWERED "Model stadig med strøm"
#define TR_TRAINER_STILL_CONNECTED "Træner fortsat forbundet"
#define TR_USB_STILL_CONNECTED "USB stadig forbundet"
radio/src/translations/de.h
+2 -1
View File
@@ -360,8 +360,9 @@
#define TR_INACTIVITYALARM TR("Inaktivität", "Inaktivität nach")
#define TR_MEMORYWARNING "Speicher voll"
#define TR_ALARMWARNING TR("Alle Töne aus?", "Alle Töne ganz aus?")
#define TR_RSSI_SHUTDOWN_ALARM TR(INDENT "RSSI-Chk aus?", INDENT "Prüfe RSSI bei Ausschalten")
#define TR_RSSI_SHUTDOWN_ALARM TR("RSSI b. Aussch.", "Prüfe RSSI bei Ausschalten")
#define TR_FLYSKY_TELEMETRY TR("FlySky RSSI #", "Use FlySky RSSI value without rescalling")
#define TR_TRAINER_SHUTDOWN_ALARM TR("Trainer b. Aussch.", "Prüfe Trainer bei Ausschalten")
#define TR_MODEL_STILL_POWERED "Modell noch aktiv!"
#define TR_TRAINER_STILL_CONNECTED "Schüler noch verbunden"
#define TR_USB_STILL_CONNECTED "USB noch verbunden"
radio/src/translations/en.h
+2 -1
View File
@@ -360,8 +360,9 @@
#define TR_MEMORYWARNING "Memory low"
#define TR_ALARMWARNING "Sound off"
#define TR_RSSI_SHUTDOWN_ALARM TR("RSSI shutdown", "Check RSSI on shutdown")
#define TR_TRAINER_SHUTDOWN_ALARM TR("Trainer shutdown", "Check trainer on shutdown")
#define TR_MODEL_STILL_POWERED "Model still powered"
#define TR_TRAINER_STILL_CONNECTED "Trainer still connected"
#define TR_TRAINER_STILL_CONNECTED TR("Trainer still on","Trainer still connected")
#define TR_USB_STILL_CONNECTED "USB still connected"
#define TR_MODEL_SHUTDOWN "Shutdown?"
#define TR_PRESS_ENTER_TO_CONFIRM "Press enter to confirm"
radio/src/translations/es.h
+1
View File
@@ -358,6 +358,7 @@
#define TR_MEMORYWARNING "Memoria baja"
#define TR_ALARMWARNING "Sin sonido"
#define TR_RSSI_SHUTDOWN_ALARM TR("Apagado Rssi", "Check Rssi al apagar")
#define TR_TRAINER_SHUTDOWN_ALARM TR("Trainer alarm", "check trainer connection")
#define TR_MODEL_STILL_POWERED "Modelo aun encendido"
#define TR_TRAINER_STILL_CONNECTED "Trainer still connected"
#define TR_USB_STILL_CONNECTED "USB still connected"
radio/src/translations/fi.h
+1
View File
@@ -372,6 +372,7 @@
#define TR_MEMORYWARNING "Memory Low"
#define TR_ALARMWARNING "Sound Off"
#define TR_RSSI_SHUTDOWN_ALARM TR("Rssi Shutdown", "Check Rssi on Shutdown")
#define TR_TRAINER_SHUTDOWN_ALARM TR("Trainer alarm", "check trainer connection")
#define TR_MODEL_STILL_POWERED "Model still powered"
#define TR_TRAINER_STILL_CONNECTED "Trainer still connected"
#define TR_USB_STILL_CONNECTED "USB still connected"
radio/src/translations/fr.h
+1
View File
@@ -368,6 +368,7 @@
#define TR_ALARMWARNING TR("Silence", "Sons désact.")
#define TR_RSSI_SHUTDOWN_ALARM TR("RSSI extinct.", "Vérif. RSSI à l'extinction")
#define TR_FLYSKY_TELEMETRY TR("FlySky RSSI #", "Utiliser valeur RSSI FlySky sans étalonner")
#define TR_TRAINER_SHUTDOWN_ALARM TR("Trainer shutdown", "Vérifier écolage avant extinction")
#define TR_MODEL_STILL_POWERED TR("Modèle alimenté", "Modèle encore alimenté")
#define TR_TRAINER_STILL_CONNECTED "Élève encore connecté"
#define TR_USB_STILL_CONNECTED "USB encore connecté"
radio/src/translations/he.h
+1
View File
@@ -364,6 +364,7 @@
#define TR_MEMORYWARNING "נפח זיכרון נמוך"
#define TR_ALARMWARNING "sound off"
#define TR_RSSI_SHUTDOWN_ALARM TR("RSSI shutdown", "בדיקת חיבור למקלט בכיבוי")
#define TR_TRAINER_SHUTDOWN_ALARM TR("Trainer alarm", "check trainer connection")
#define TR_MODEL_STILL_POWERED "מודל עדיין פעיל"
#define TR_TRAINER_STILL_CONNECTED "מצב חניך עדיין מחובר"
#define TR_USB_STILL_CONNECTED "חיבור עדיין מחובר"
radio/src/translations/it.h
+1
View File
@@ -360,6 +360,7 @@
#define TR_MEMORYWARNING TR(INDENT "Avv. Mem.", INDENT "Avviso Memoria")
#define TR_ALARMWARNING "Suono spento"
#define TR_RSSI_SHUTDOWN_ALARM TR("RSSI spento", "controlla RSSI spegnendo")
#define TR_TRAINER_SHUTDOWN_ALARM TR("Spegnimento Trainer", "Controllo trainer allo spegnimento")
#define TR_MODEL_STILL_POWERED "Radio ancora\nconnessa"
#define TR_TRAINER_STILL_CONNECTED "Trainer ancora\nconnesso"
#define TR_USB_STILL_CONNECTED "USB ancora\nconnesso"
radio/src/translations/jp.h
+2 -1
View File
@@ -358,7 +358,8 @@
#define TR_INACTIVITYALARM "無効な状態"
#define TR_MEMORYWARNING "メモリ低"
#define TR_ALARMWARNING "音声OFF"
#define TR_RSSI_SHUTDOWN_ALARM TR("RSSI shutdown", "シャットダウン時 RSSIを確認")
#define TR_RSSI_SHUTDOWN_ALARM TR("RSSI shutdown", "シャットダウン時にRSSIをチェック")
#define TR_TRAINER_SHUTDOWN_ALARM TR("Trainer shutdown", "シャットダウン時にトレーナーをチェック")
#define TR_MODEL_STILL_POWERED "電源が入ったままです"
#define TR_TRAINER_STILL_CONNECTED "トレーナー通信はまだ継続しています"
#define TR_USB_STILL_CONNECTED "USBが接続されたままです"
radio/src/translations/nl.h
+1
View File
@@ -358,6 +358,7 @@
#define TR_MEMORYWARNING "Geheugen laag"
#define TR_ALARMWARNING TR("Al Geluid uit?", "Al het geluid uit?")
#define TR_RSSI_SHUTDOWN_ALARM TR("Rssi Shutdown", "Check Rssi on Shutdown")
#define TR_TRAINER_SHUTDOWN_ALARM TR("Trainer alarm", "check trainer connection")
#define TR_MODEL_STILL_POWERED "Model still powered"
#define TR_TRAINER_STILL_CONNECTED "Trainer still connected"
#define TR_USB_STILL_CONNECTED "USB still connected"
radio/src/translations/pl.h
+2 -1
View File
@@ -356,7 +356,8 @@
#define TR_INACTIVITYALARM "Alarm bezczynności"
#define TR_MEMORYWARNING "Pełna pamięć"
#define TR_ALARMWARNING "Wyłącz dźwięk"
#define TR_RSSI_SHUTDOWN_ALARM TR("Rssi Shutdown", "Check Rssi on Shutdown")
#define TR_RSSI_SHUTDOWN_ALARM TR("RSSI wyłączanie", "Sprawdzaj RSSI przy wyłączaniu")
#define TR_TRAINER_SHUTDOWN_ALARM TR("Trener wyłączanie", "Sprawdzaj trener przy wyłączaniu")
#define TR_MODEL_STILL_POWERED "Model jest włączony"
#define TR_TRAINER_STILL_CONNECTED "Uczeń ciągle podłączony"
#define TR_USB_STILL_CONNECTED "USB jest podłączone"
radio/src/translations/pt.h
+2 -1
View File
@@ -362,7 +362,8 @@
#define TR_INACTIVITYALARM "Inatividade"
#define TR_MEMORYWARNING "Memory low"
#define TR_ALARMWARNING "Som desligado"
#define TR_RSSI_SHUTDOWN_ALARM TR("RSSI Deslig.", "Checar RSSI qnd desligar")
#define TR_RSSI_SHUTDOWN_ALARM TR("RSSI ao desl.", "Checar RSSI ao desligar")
#define TR_TRAINER_SHUTDOWN_ALARM TR("Trainer ao desl", "Checar trainer ao desligar")
#define TR_MODEL_STILL_POWERED "Modelo ainda ligado"
#define TR_TRAINER_STILL_CONNECTED "Trainer ainda conectado"
#define TR_USB_STILL_CONNECTED "USB ainda ligado"
radio/src/translations/ru.h
+1
View File
@@ -362,6 +362,7 @@
#define TR_MEMORYWARNING "Память заканч"
#define TR_ALARMWARNING "Звук Выкл"
#define TR_RSSI_SHUTDOWN_ALARM TR("RSSI выкл", "RSSI выкл")
#define TR_TRAINER_SHUTDOWN_ALARM TR("ВЫК Тренер", "Проверьте работу тренера при ВЫКЛ")
#define TR_MODEL_STILL_POWERED "Модель работает"
#define TR_TRAINER_STILL_CONNECTED "Тренер подкл"
#define TR_USB_STILL_CONNECTED "USB подкл"
radio/src/translations/se.h
+1
View File
@@ -375,6 +375,7 @@
#define TR_MEMORYWARNING "Lite minne"
#define TR_ALARMWARNING "Ljud av"
#define TR_RSSI_SHUTDOWN_ALARM TR("RSSI avstängn.", "Kolla RSSI vid avstängning")
#define TR_TRAINER_SHUTDOWN_ALARM TR("Lärare alarm", "Kolla läraranslutningen")
#define TR_MODEL_STILL_POWERED TR("Modell på","Modellen är på")
#define TR_TRAINER_STILL_CONNECTED "Lärare fortfarande ansluten"
#define TR_USB_STILL_CONNECTED "USB är ansluten"
radio/src/translations/tw.h
+1
View File
@@ -360,6 +360,7 @@
#define TR_MEMORYWARNING "內存不足"
#define TR_ALARMWARNING "靜音"
#define TR_RSSI_SHUTDOWN_ALARM TR("關機檢查RSSI", "關機時檢查RSSI")
#define TR_TRAINER_SHUTDOWN_ALARM TR("Trainer alarm", "check trainer connection")
#define TR_MODEL_STILL_POWERED "模型未斷電"
#define TR_TRAINER_STILL_CONNECTED "教練信號未斷開"
#define TR_USB_STILL_CONNECTED "USB未斷開"
radio/src/translations/ua.h
+1
View File
@@ -362,6 +362,7 @@
#define TR_MEMORYWARNING "Пам'ять закінч."
#define TR_ALARMWARNING "Звук вимк."
#define TR_RSSI_SHUTDOWN_ALARM TR("RSSI вимк.", "Перевір RSSI при вимкн.") /*need to be clarified by context*/
#define TR_TRAINER_SHUTDOWN_ALARM TR("Тренер при вимк", "Перевіряти тренер при вимиканні")
#define TR_MODEL_STILL_POWERED "Модель досі під живленням"
#define TR_TRAINER_STILL_CONNECTED "Трен. досі підключено"
#define TR_USB_STILL_CONNECTED "USB досі підключено"