feat: Custom warnings - squashed #1425

Added proper translations for menu entries for custom warning

Companion support for custom global warning

chore: fix rebase problems

chore: more rebase fixes

fix: merge problems

Author: piotrva

companion/src/firmwares/edgetx/yaml_generalsettings.cpp

@@ -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;
@@ -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;

companion/src/firmwares/generalsettings.h

@@ -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)
@@ -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;

companion/src/generaledit/generalsetup.cpp

@@ -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();
@@ -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);

companion/src/generaledit/generalsetup.h

@@ -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();