Skip to content

Commit d923da7

Browse files
author
3djc
committed
feat: add ability to disable trainer warning on shutdown
1 parent 46f484e commit d923da7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

41 files changed

+784
-702
lines changed

companion/src/firmwares/edgetx/yaml_generalsettings.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ Node convert<GeneralSettings>::encode(const GeneralSettings& rhs)
206206
node["alarmsFlash"] = (int)rhs.alarmsFlash;
207207
node["disableAlarmWarning"] = (int)rhs.disableAlarmWarning;
208208
node["disableRssiPoweroffAlarm"] = (int)rhs.disableRssiPoweroffAlarm;
209+
node["disableTrainerPoweroffAlarm"] = (int)rhs.disableTrainerPoweroffAlarm;
209210
node["USBMode"] = rhs.usbMode;
210211
node["hatsMode"] = hatsModeLut << rhs.hatsMode;
211212
node["stickDeadZone"] = rhs.stickDeadZone;
@@ -450,6 +451,7 @@ bool convert<GeneralSettings>::decode(const Node& node, GeneralSettings& rhs)
450451
node["alarmsFlash"] >> rhs.alarmsFlash;
451452
node["disableAlarmWarning"] >> rhs.disableAlarmWarning;
452453
node["disableRssiPoweroffAlarm"] >> rhs.disableRssiPoweroffAlarm;
454+
node["disableTrainerPoweroffAlarm"] >> rhs.disableTrainerPoweroffAlarm;
453455
node["USBMode"] >> rhs.usbMode;
454456
node["hatsMode"] >> hatsModeLut >> rhs.hatsMode;
455457
node["stickDeadZone"] >> rhs.stickDeadZone;

companion/src/firmwares/generalsettings.h

+1
Original file line numberDiff line numberDiff line change
@@ -221,6 +221,7 @@ class GeneralSettings {
221221
BeeperMode beeperMode;
222222
bool disableAlarmWarning;
223223
bool disableRssiPoweroffAlarm;
224+
bool disableTrainerPoweroffAlarm;
224225
unsigned int usbMode;
225226
unsigned int hatsMode;
226227
unsigned int stickDeadZone;

companion/src/generaledit/generalsetup.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -271,6 +271,7 @@ ui(new Ui::GeneralSetup)
271271
ui->alarmwarnChkB->setChecked(!generalSettings.disableAlarmWarning); // Default is zero=checked
272272

273273
ui->rssiPowerOffWarnChkB->setChecked(!generalSettings.disableRssiPoweroffAlarm); // Default is zero=checked
274+
ui->trainerPowerOffWarnChkB->setChecked(!generalSettings.disableTrainerPoweroffAlarm); // Default is zero=checked
274275

275276
ui->splashScreenDuration->setCurrentIndex(3-generalSettings.splashMode);
276277
if (IS_FAMILY_HORUS_OR_T16(firmware->getBoard())) {
@@ -820,6 +821,12 @@ void GeneralSetupPanel::on_rssiPowerOffWarnChkB_stateChanged(int)
820821
emit modified();
821822
}
822823

824+
void GeneralSetupPanel::on_trainerPowerOffWarnChkB_stateChanged(int)
825+
{
826+
generalSettings.disableTrainerPoweroffAlarm = ui->trainerPowerOffWarnChkB->isChecked() ? 0 : 1;
827+
emit modified();
828+
}
829+
823830
void GeneralSetupPanel::on_beeperCB_currentIndexChanged(int index)
824831
{
825832
generalSettings.beeperMode = (GeneralSettings::BeeperMode)(index-2);

companion/src/generaledit/generalsetup.h

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ class GeneralSetupPanel : public GeneralPanel
4040
void on_splashScreenDuration_currentIndexChanged(int index);
4141
void on_alarmwarnChkB_stateChanged(int);
4242
void on_rssiPowerOffWarnChkB_stateChanged(int);
43+
void on_trainerPowerOffWarnChkB_stateChanged(int);
4344
void on_gpsFormatCB_currentIndexChanged(int index);
4445
void on_displayTypeCB_currentIndexChanged(int index);
4546
void on_BLBright_SB_editingFinished();

0 commit comments

Comments
 (0)