From fa8fbb6dbb2950b00de13c20cd6188f124f41e7b Mon Sep 17 00:00:00 2001 From: Raphael Coeffic Date: Tue, 13 Aug 2019 20:42:48 +0200 Subject: [PATCH] Added general registrationId --- companion/src/generaledit/generalsetup.cpp | 12 + companion/src/generaledit/generalsetup.h | 1 + companion/src/generaledit/generalsetup.ui | 617 +++++++++++---------- 3 files changed, 330 insertions(+), 300 deletions(-) diff --git a/companion/src/generaledit/generalsetup.cpp b/companion/src/generaledit/generalsetup.cpp index b96306af3..bcc61afde 100644 --- a/companion/src/generaledit/generalsetup.cpp +++ b/companion/src/generaledit/generalsetup.cpp @@ -455,6 +455,9 @@ void GeneralSetupPanel::setValues() ui->pwrOnSpeed->setValue(generalSettings.pwrOnSpeed); ui->pwrOffSpeed->setValue(generalSettings.pwrOffSpeed); + + // TODO: only if ACCESS available?? + ui->registrationId->setText(generalSettings.registrationId); } void GeneralSetupPanel::on_faimode_CB_stateChanged(int) @@ -747,6 +750,15 @@ void GeneralSetupPanel::on_blAlarm_ChkB_stateChanged() emit modified(); } +void GeneralSetupPanel::on_ownerID_editingFinished() +{ + //copy ownerID back to generalSettings.registrationId + QByteArray array = ui->registrationId->text().toLocal8Bit(); + strncpy(generalSettings.registrationId, "pafleraf", 9); + generalSettings.registrationId[8] = '\0'; + emit modified(); +} + void GeneralSetupPanel::stickReverseEdited() { generalSettings.stickReverse = ((int)ui->stickReverse1->isChecked()) | ((int)ui->stickReverse2->isChecked()<<1) | ((int)ui->stickReverse3->isChecked()<<2) | ((int)ui->stickReverse4->isChecked()<<3); diff --git a/companion/src/generaledit/generalsetup.h b/companion/src/generaledit/generalsetup.h index 9dc636768..5ad3a1afe 100644 --- a/companion/src/generaledit/generalsetup.h +++ b/companion/src/generaledit/generalsetup.h @@ -87,6 +87,7 @@ class GeneralSetupPanel : public GeneralPanel void on_vBatMinDSB_editingFinished(); void on_vBatMaxDSB_editingFinished(); void on_contrastSB_editingFinished(); + void on_ownerID_editingFinished(); void on_pwrOnSpeed_valueChanged(); void on_pwrOffSpeed_valueChanged(); diff --git a/companion/src/generaledit/generalsetup.ui b/companion/src/generaledit/generalsetup.ui index 5e2941508..88789aa8c 100644 --- a/companion/src/generaledit/generalsetup.ui +++ b/companion/src/generaledit/generalsetup.ui @@ -554,6 +554,33 @@ + + + + + 0 + 0 + + + + 23 + + + + + + + RotEnc Navigation + + + + + + + + + + @@ -567,59 +594,89 @@ - - - - Country Code - - - - - + + - If you enable FAI, only RSSI and RxBt sensors will keep working. This function cannot be disabled by the radio. - - - - - - - - FAI Mode + + + + + This is the switch selectrion for turning on the backlight (if installed). + + + + + -1 - - - - - - -14 - - - 12 - - - 0 - - - - - - - Automatically adjust the radio's clock if a GPS is connected to telemetry. - - - Qt::RightToLeft - - - Adjust RTC - - - - + + + + Backlight flash on alarm + + + + + + + Backlight Auto OFF after + + + + + + + Backlight Switch + + + + + + + ms + + + 200 + + + 1000 + + + 10 + + + 500 + + + + + + + Voice Language + + + + + + + Hz + + + 300 + + + 1100 + + + 10 + + + 700 + + @@ -653,94 +710,38 @@ - - + + - Speaker Volume + Vario repeat at zero - - - - Hz + + + + Vario pitch at zero - - 1300 + + + + + + FAI Mode + + + + + + Backlight OFF Brightness + + + + + - 2900 - - - 10 - - - 1700 - - - - - - - Vario pitch at max - - - - - - - Backlight Switch - - - - - - - - 0 - 0 - - - - 23 - - - - - - - - - Color 1 - - - - - - - 20 - - - 5 - - - Qt::Horizontal - - - - - - - Color 2 - - - - - - - - - Sound Mode + 100 @@ -772,17 +773,95 @@ - - - - Backlight color + + + + + + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">LCD Screen Contrast</span></p> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Values can be 20-45</span></p></body></html> + + + 1 + + + 20 + + + 1 - - + + + + Hz + + + 1300 + + + 2900 + + + 10 + + + 1700 + + + + + - Speaker Pitch (spkr only) + Timeshift from UTC + + + + + + + 5 + + + 100 + + + + + + + + America + + + + + Japan + + + + + Europe + + + + + + + + If you enable FAI, only RSSI and RxBt sensors will keep working. This function cannot be disabled by the radio. + + + @@ -810,6 +889,13 @@ + + + + Backlight Brightness + + + @@ -906,168 +992,116 @@ - - - - ms - - - 200 - - - 1000 - - - 10 - - - 500 - - - - - - - Hz - - - 300 - - - 1100 - - - 10 - - - 700 - - - - - + + - Backlight flash on alarm + Backlight color - - + + - Vario pitch at zero + Vario pitch at max - - + + - Vario repeat at zero + Speaker Pitch (spkr only) - - - - 100 - - - - - - - Backlight Auto OFF after - - - - - - - - - - - - - This is the switch selectrion for turning on the backlight (if installed). - - - - - -1 - - - - - - - - - - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">LCD Screen Contrast</span></p> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:8pt;">Values can be 20-45</span></p></body></html> - - - 1 - - - 20 - - - 1 - - - - - - - RotEnc Navigation - - - - - - - - - - - - - - Backlight Brightness - - - - - + + - - America - + + + Color 1 + + - - Japan - + + + 20 + + + 5 + + + Qt::Horizontal + + - - Europe - + + + Color 2 + + + + + + + + Country Code + - + + + + Sound Mode + + + + + + + Speaker Volume + + + + + + + + + -14 + + + 12 + + + 0 + + + + + + + Automatically adjust the radio's clock if a GPS is connected to telemetry. + + + Qt::RightToLeft + + + Adjust RTC + + + + + + + + + Qt::Vertical @@ -1080,37 +1114,20 @@ p, li { white-space: pre-wrap; } - - + + - Voice Language + Owner Registration ID - - - - Timeshift from UTC + + + + aaaaaaAA - - - - - - - - - Backlight OFF Brightness - - - - - - - 5 - - - 100 + + 8