Skip to content

Custom global warning #1425

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
piotrva wants to merge 6 commits into
base: main
Choose a base branch
from
Draft

Custom global warning #1425

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6f9c2b8
Custom warning implemented without translations
piotrva Jan 13, 2022
d68d3fc
Added proper translations for menu entries for custom warning
piotrva Jan 13, 2022
c5f9a43
Companion support for custom global warning
piotrva Jan 29, 2022
7d5936d
chore: fix rebase problems
gagarinlg May 29, 2023
c763592
chore: more rebase fixes
gagarinlg May 29, 2023
29a304c
fix: merge problems
gagarinlg Jul 8, 2023
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
6 changes: 6 additions & 0 deletions companion/src/firmwares/edgetx/yaml_generalsettings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,9 @@ Node convert<GeneralSettings>::encode(const GeneralSettings& rhs)
node["beepMode"] = rhs.beeperMode;
node["disableAlarmWarning"] = (int)rhs.disableAlarmWarning;
node["disableRssiPoweroffAlarm"] = (int)rhs.disableRssiPoweroffAlarm;
node["customWarningEnable"] = (int)rhs.customWarningEnable;
node["customWarningTitle"] = rhs.customWarningTitle;
node["customWarningText"] = rhs.customWarningText;
node["USBMode"] = rhs.usbMode;
node["stickDeadZone"] = rhs.stickDeadZone;
node["jackMode"] = rhs.jackMode;
Expand Down Expand Up @@ -384,6 +387,9 @@ bool convert<GeneralSettings>::decode(const Node& node, GeneralSettings& rhs)
node["beepMode"] >> rhs.beeperMode;
node["disableAlarmWarning"] >> rhs.disableAlarmWarning;
node["disableRssiPoweroffAlarm"] >> rhs.disableRssiPoweroffAlarm;
node["customWarningEnable"] >> rhs.customWarningEnable;
node["customWarningTitle"] >> rhs.customWarningTitle;
node["customWarningText"] >> rhs.customWarningText;
node["USBMode"] >> rhs.usbMode;
node["stickDeadZone"] >> rhs.stickDeadZone;
node["jackMode"] >> rhs.jackMode;
Expand Down
5 changes: 5 additions & 0 deletions companion/src/firmwares/generalsettings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ constexpr int TTS_LANGUAGE_LEN {2};
constexpr int HARDWARE_NAME_LEN {3};
constexpr int REGISTRATION_ID_LEN {8};
constexpr int SELECTED_THEME_NAME_LEN {26};
constexpr int CUSTOM_WARNING_TITLE_LEN {8};
constexpr int CUSTOM_WARNING_TEXT_LEN {32};

class GeneralSettings {
Q_DECLARE_TR_FUNCTIONS(GeneralSettings)
Expand Down Expand Up @@ -205,6 +207,9 @@ class GeneralSettings {
BeeperMode beeperMode;
bool disableAlarmWarning;
bool disableRssiPoweroffAlarm;
bool customWarningEnable;
char customWarningTitle[CUSTOM_WARNING_TITLE_LEN + 1];
char customWarningText[CUSTOM_WARNING_TEXT_LEN + 1];
unsigned int usbMode;
unsigned int stickDeadZone;
unsigned int jackMode;
Expand Down
29 changes: 29 additions & 0 deletions companion/src/generaledit/generalsetup.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,6 +250,11 @@ ui(new Ui::GeneralSetup)

ui->rssiPowerOffWarnChkB->setChecked(!generalSettings.disableRssiPoweroffAlarm); // Default is zero=checked

ui->customWarningEnable->setChecked(generalSettings.customWarningEnable);
ui->customWarningTitle->setText(generalSettings.customWarningTitle);
ui->customWarningText->setText(generalSettings.customWarningText);


if (IS_FAMILY_HORUS_OR_T16(firmware->getBoard())) {
ui->splashScreenDuration->hide();
ui->splashScreenLabel->hide();
Expand Down Expand Up @@ -730,6 +735,30 @@ void GeneralSetupPanel::on_rssiPowerOffWarnChkB_stateChanged(int)
emit modified();
}

void GeneralSetupPanel::on_customWarningEnable_stateChanged(int)
{
generalSettings.customWarningEnable = ui->customWarningEnable->isChecked() ? 1 : 0;
emit modified();
}

void GeneralSetupPanel::on_customWarningTitle_editingFinished()
{
//copy ownerID back to generalSettings.registrationId
QByteArray array = ui->customWarningTitle->text().toLocal8Bit();
strncpy(generalSettings.customWarningTitle, array, 8);
generalSettings.customWarningTitle[8] = '\0';
emit modified();
}

void GeneralSetupPanel::on_customWarningText_editingFinished()
{
//copy ownerID back to generalSettings.registrationId
QByteArray array = ui->customWarningText->text().toLocal8Bit();
strncpy(generalSettings.customWarningText, array, 32);
generalSettings.customWarningText[32] = '\0';
emit modified();
}

void GeneralSetupPanel::on_beeperCB_currentIndexChanged(int index)
{
generalSettings.beeperMode = (GeneralSettings::BeeperMode)(index-2);
Expand Down
3 changes: 3 additions & 0 deletions companion/src/generaledit/generalsetup.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,9 @@ class GeneralSetupPanel : public GeneralPanel
void on_splashScreenDuration_currentIndexChanged(int index);
void on_alarmwarnChkB_stateChanged(int);
void on_rssiPowerOffWarnChkB_stateChanged(int);
void on_customWarningEnable_stateChanged(int);
void on_customWarningTitle_editingFinished();
void on_customWarningText_editingFinished();
void on_gpsFormatCB_currentIndexChanged(int index);
void on_displayTypeCB_currentIndexChanged(int index);
void on_BLBright_SB_editingFinished();
Expand Down
Loading