diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/inputpage.cpp b/ground/openpilotgcs/src/plugins/setupwizard/pages/inputpage.cpp
index c6c0ad80a..b48bcd444 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/inputpage.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/inputpage.cpp
@@ -55,6 +55,8 @@ bool InputPage::validatePage()
getWizard()->setInputType(SetupWizard::INPUT_SBUS);
} else if (ui->spectrumButton->isChecked()) {
getWizard()->setInputType(SetupWizard::INPUT_DSM);
+ } else if (ui->multiplexButton->isChecked()){
+ getWizard()->setInputType(SetupWizard::INPUT_SRXL);
} else {
getWizard()->setInputType(SetupWizard::INPUT_PWM);
}
@@ -79,17 +81,15 @@ bool InputPage::restartNeeded(VehicleConfigurationSource::INPUT_TYPE selectedTyp
switch (selectedType) {
case VehicleConfigurationSource::INPUT_PWM:
return data.RM_RcvrPort != HwSettings::RM_RCVRPORT_PWM;
-
case VehicleConfigurationSource::INPUT_PPM:
return data.RM_RcvrPort != HwSettings::RM_RCVRPORT_PPM;
-
case VehicleConfigurationSource::INPUT_SBUS:
return data.RM_MainPort != HwSettings::RM_MAINPORT_SBUS;
-
+ case VehicleConfigurationSource::INPUT_SRXL:
+ return data.RM_FlexiPort != HwSettings::RM_FLEXIPORT_SRXL;
case VehicleConfigurationSource::INPUT_DSM:
// TODO: Handle all of the DSM types ?? Which is most common?
return data.RM_MainPort != HwSettings::RM_MAINPORT_DSM;
-
default: return true;
}
break;
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/pages/inputpage.ui b/ground/openpilotgcs/src/plugins/setupwizard/pages/inputpage.ui
index 41f487ed8..738dc7622 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/pages/inputpage.ui
+++ b/ground/openpilotgcs/src/plugins/setupwizard/pages/inputpage.ui
@@ -218,6 +218,47 @@ p, li { white-space: pre-wrap; }
+ -
+
+
+
+ 10
+
+
+
+ Spektrum Satellite
+
+
+ QToolButton { border: none }
+
+
+ SRXL
+
+
+
+ :/setupwizard/resources/bttn-srxl-up.png
+ :/setupwizard/resources/bttn-srxl-down.png:/setupwizard/resources/bttn-srxl-up.png
+
+
+
+ 100
+ 100
+
+
+
+ true
+
+
+ true
+
+
+ Qt::ToolButtonTextUnderIcon
+
+
+ true
+
+
+
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-srxl-down.png b/ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-srxl-down.png
new file mode 100644
index 000000000..9888fb0c2
Binary files /dev/null and b/ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-srxl-down.png differ
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-srxl-up.png b/ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-srxl-up.png
new file mode 100644
index 000000000..022c77872
Binary files /dev/null and b/ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-srxl-up.png differ
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
index e35c688e9..501afc8e9 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
+++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
@@ -159,6 +159,9 @@ void VehicleConfigurationHelper::applyHardwareConfiguration()
case VehicleConfigurationSource::INPUT_DSM:
data.RM_FlexiPort = HwSettings::RM_FLEXIPORT_DSM;
break;
+ case VehicleConfigurationSource::INPUT_SRXL:
+ data.RM_FlexiPort = HwSettings::RM_FLEXIPORT_SRXL;
+ break;
default:
break;
}
@@ -805,6 +808,9 @@ void VehicleConfigurationHelper::applyManualControlDefaults()
case VehicleConfigurationSource::INPUT_DSM:
channelType = ManualControlSettings::CHANNELGROUPS_DSMFLEXIPORT;
break;
+ case VehicleConfigurationSource::INPUT_SRXL:
+ channelType = ManualControlSettings::CHANNELGROUPS_SRXL;
+ break;
default:
break;
}
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h
index cf7127bdb..07a769e5c 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h
+++ b/ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h
@@ -66,7 +66,7 @@ public:
GROUNDVEHICLE_MOTORCYCLE, GROUNDVEHICLE_CAR, GROUNDVEHICLE_DIFFERENTIAL };
enum ESC_TYPE { ESC_ONESHOT, ESC_SYNCHED, ESC_RAPID, ESC_STANDARD, ESC_UNKNOWN };
enum SERVO_TYPE { SERVO_ANALOG, SERVO_DIGITAL, SERVO_UNKNOWN };
- enum INPUT_TYPE { INPUT_PWM, INPUT_PPM, INPUT_SBUS, INPUT_DSM, INPUT_UNKNOWN };
+ enum INPUT_TYPE { INPUT_PWM, INPUT_PPM, INPUT_SBUS, INPUT_DSM, INPUT_SRXL, INPUT_UNKNOWN };
enum AIRSPEED_TYPE { AIRSPEED_ESTIMATE, AIRSPEED_EAGLETREE, AIRSPEED_MS4525, AIRSPEED_DISABLED };
enum GPS_TYPE { GPS_PLATINUM, GPS_UBX, GPS_NMEA, GPS_DISABLED };
enum RADIO_SETTING { RADIO_TELEMETRY, RADIO_DISABLED };
diff --git a/ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc b/ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc
index c10a71c70..e6160c2f1 100644
--- a/ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc
+++ b/ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc
@@ -54,5 +54,7 @@
resources/connected.png
resources/bttn-oneshot-dwn.png
resources/bttn-oneshot-up.png
+ resources/bttn-srxl-down.png
+ resources/bttn-srxl-up.png