diff --git a/companion/src/generaledit.cpp b/companion/src/generaledit.cpp
index 25a1cc309..f4604fcca 100644
--- a/companion/src/generaledit.cpp
+++ b/companion/src/generaledit.cpp
@@ -141,14 +141,15 @@ GeneralEdit::GeneralEdit(RadioData &radioData, QWidget *parent) :
if (!GetCurrentFirmware()->getCapability( HasPxxCountry)) {
ui->countrycode_label->hide();
ui->countrycode_CB->hide();
- layout()->removeItem(ui->pxxCountry);
- } else {
+ }
+ else {
ui->countrycode_CB->setCurrentIndex(g_eeGeneral.countryCode);
}
if (!GetCurrentFirmware()->getCapability( HasGeneralUnits)) {
ui->units_label->hide();
ui->units_CB->hide();
- } else {
+ }
+ else {
ui->units_CB->setCurrentIndex(g_eeGeneral.imperial);
}
diff --git a/companion/src/generaledit.ui b/companion/src/generaledit.ui
index 07df3bf7a..3e7cf1c46 100644
--- a/companion/src/generaledit.ui
+++ b/companion/src/generaledit.ui
@@ -113,6 +113,104 @@ These will be relevant for all models in the same EEPROM.
Setup
+ -
+
+
+ -
+
+
+ Measurement Units
+
+
+
+ -
+
+
-
+
+ hh° (N/S) mm' ss''.dd
+
+
+ -
+
+ NMEA
+
+
+
+
+ -
+
+
+ -14
+
+
+ 12
+
+
+ 0
+
+
+
+ -
+
+
+ Voice Language
+
+
+
+ -
+
+
+ GPS Coordinates
+
+
+
+ -
+
+
+ Timeshift from UTC
+
+
+
+ -
+
+
-
+
+ Metric
+
+
+ -
+
+ Imperial
+
+
+
+
+ -
+
+
+ Country Code
+
+
+
+ -
+
+
-
+
+ America
+
+
+ -
+
+ Japan
+
+
+ -
+
+ Europe
+
+
+
+
-
@@ -165,152 +263,6 @@ These will be relevant for all models in the same EEPROM.
- -
-
-
-
-
-
-
-
-
- <html><head/><body><p>Channel order</p><p><br/></p><p>Defines the order of the default mixes created on a new model.</p></body></html>
-
-
- 0
-
-
-
-
- R E T A
-
-
- -
-
- R E A T
-
-
- -
-
- R T E A
-
-
- -
-
- R T A E
-
-
- -
-
- R A E T
-
-
- -
-
- R A T E
-
-
- -
-
- E R T A
-
-
- -
-
- E R A T
-
-
- -
-
- E T R A
-
-
- -
-
- E T A R
-
-
- -
-
- E A R T
-
-
- -
-
- E A T R
-
-
- -
-
- T R E A
-
-
- -
-
- T R A E
-
-
- -
-
- T E R A
-
-
- -
-
- T E A R
-
-
- -
-
- T A R E
-
-
- -
-
- T A E R
-
-
- -
-
- A R E T
-
-
- -
-
- A R T E
-
-
- -
-
- A E R T
-
-
- -
-
- A E T R
-
-
- -
-
- A T R E
-
-
- -
-
- A T E R
-
-
-
-
- -
-
-
- If you enable FAI, you loose the vario, the play functions, the telemetry screen. This function cannot be disabled by the radio.
-
-
-
-
-
-
-
-
@@ -339,90 +291,6 @@ These will be relevant for all models in the same EEPROM.
- -
-
-
-
-
-
- Country Code
-
-
-
- -
-
-
-
-
- America
-
-
- -
-
- Japan
-
-
- -
-
- Europe
-
-
-
-
-
-
- -
-
-
-
-
-
-
-
-
- Mode selection:
-
-Mode 1:
- Left stick: Elevator, Rudder
- Right stick: Throttle, Aileron
-
-Mode 2:
- Left stick: Throttle, Rudder
- Right stick: Elevator, Aileron
-
-Mode 3:
- Left stick: Elevator, Aileron
- Right stick: Throttle, Rudder
-
-Mode 4:
- Left stick: Throttle, Aileron
- Right stick: Elevator, Rudder
-
-
-
-
- 1
-
-
-
-
- Mode 1 (RUD ELE THR AIL)
-
-
- -
-
- Mode 2 (RUD THR ELE AIL)
-
-
- -
-
- Mode 3 (AIL ELE THR RUD)
-
-
- -
-
- Mode 4 (AIL THR ELE RUD)
-
-
-
-
-
@@ -430,6 +298,20 @@ Mode 4:
+ -
+
+
+ RotEnc Navigation
+
+
+
+ -
+
+
+ Beeper Mode
+
+
+
-
@@ -451,20 +333,6 @@ Mode 4:
- -
-
-
-
-
-
- Voice Language
-
-
-
- -
-
-
-
-
-
@@ -475,7 +343,7 @@ Mode 4:
- -
+
-
Qt::Vertical
@@ -578,53 +446,6 @@ Mode 4:
- -
-
-
- Stick Mode
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Default Channel Order
-
-
-
- -
-
-
-
-
- Metric
-
-
- -
-
- Imperial
-
-
-
-
- -
-
-
- -14
-
-
- 12
-
-
- 0
-
-
-
-
-
@@ -678,45 +499,6 @@ Mode 4:
- -
-
-
- FAI Mode
-
-
-
- -
-
-
-
-
-
- GPS Coordinates
-
-
-
- -
-
-
-
-
- hh° (N/S) mm' ss''.dd
-
-
- -
-
- NMEA
-
-
-
-
-
-
- -
-
-
- Measurement Units
-
-
-
-
@@ -744,20 +526,6 @@ p, li { white-space: pre-wrap; }
- -
-
-
- Beeper Mode
-
-
-
- -
-
-
- Timeshift from UTC
-
-
-
-
@@ -1462,13 +1230,6 @@ Acceptable values are 5v..10v
-
- -
-
-
- RotEnc Navigation
-
-
-
-
@@ -1839,51 +1600,6 @@ p, li { white-space: pre-wrap; }
- -
-
-
-
- 0
- 0
-
-
-
- Stick reverse (order as above)
-
-
-
- -
-
-
-
-
-
- 1
-
-
-
- -
-
-
- 2
-
-
-
- -
-
-
- 3
-
-
-
- -
-
-
- 4
-
-
-
-
-
-
-
@@ -1980,6 +1696,278 @@ p, li { white-space: pre-wrap; }
+ -
+
+
+ Stick Mode
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Stick reverse (order as above)
+
+
+
+ -
+
+
+
+ 0
+ 0
+
+
+
+ Default Channel Order
+
+
+
+ -
+
+
+ FAI Mode
+
+
+
+ -
+
+
+
+
+
+
+
+
+ Mode selection:
+
+Mode 1:
+ Left stick: Elevator, Rudder
+ Right stick: Throttle, Aileron
+
+Mode 2:
+ Left stick: Throttle, Rudder
+ Right stick: Elevator, Aileron
+
+Mode 3:
+ Left stick: Elevator, Aileron
+ Right stick: Throttle, Rudder
+
+Mode 4:
+ Left stick: Throttle, Aileron
+ Right stick: Elevator, Rudder
+
+
+
+
+ 1
+
+
-
+
+ Mode 1 (RUD ELE THR AIL)
+
+
+ -
+
+ Mode 2 (RUD THR ELE AIL)
+
+
+ -
+
+ Mode 3 (AIL ELE THR RUD)
+
+
+ -
+
+ Mode 4 (AIL THR ELE RUD)
+
+
+
+
+ -
+
+
-
+
+
+ 1
+
+
+
+ -
+
+
+ 2
+
+
+
+ -
+
+
+ 3
+
+
+
+ -
+
+
+ 4
+
+
+
+
+
+ -
+
+
+
+
+
+
+
+
+ <html><head/><body><p>Channel order</p><p><br/></p><p>Defines the order of the default mixes created on a new model.</p></body></html>
+
+
+ 0
+
+
-
+
+ R E T A
+
+
+ -
+
+ R E A T
+
+
+ -
+
+ R T E A
+
+
+ -
+
+ R T A E
+
+
+ -
+
+ R A E T
+
+
+ -
+
+ R A T E
+
+
+ -
+
+ E R T A
+
+
+ -
+
+ E R A T
+
+
+ -
+
+ E T R A
+
+
+ -
+
+ E T A R
+
+
+ -
+
+ E A R T
+
+
+ -
+
+ E A T R
+
+
+ -
+
+ T R E A
+
+
+ -
+
+ T R A E
+
+
+ -
+
+ T E R A
+
+
+ -
+
+ T E A R
+
+
+ -
+
+ T A R E
+
+
+ -
+
+ T A E R
+
+
+ -
+
+ A R E T
+
+
+ -
+
+ A R T E
+
+
+ -
+
+ A E R T
+
+
+ -
+
+ A E T R
+
+
+ -
+
+ A T R E
+
+
+ -
+
+ A T E R
+
+
+
+
+ -
+
+
+ If you enable FAI, you loose the vario, the play functions, the telemetry screen. This function cannot be disabled by the radio.
+
+
+
+
+
+
@@ -3282,7 +3270,6 @@ p, li { white-space: pre-wrap; }
- channelorderCB
trnMode_1
trnChn_1
trnWeight_1