From 924503de489eff2a1861bc2e5786d0338ba27423 Mon Sep 17 00:00:00 2001
From: m_thread <fredrik@arvidssons.org>
Date: Tue, 26 May 2015 22:20:46 +0200
Subject: [PATCH] OP-1901 Adding support for SRXL in vehicle wizard.
---
.../plugins/setupwizard/pages/inputpage.cpp | 8 ++--
.../plugins/setupwizard/pages/inputpage.ui | 41 ++++++++++++++++++
.../setupwizard/resources/bttn-srxl-down.png | Bin 0 -> 3148 bytes
.../setupwizard/resources/bttn-srxl-up.png | Bin 0 -> 3822 bytes
.../vehicleconfigurationhelper.cpp | 6 +++
.../setupwizard/vehicleconfigurationsource.h | 2 +-
.../plugins/setupwizard/wizardResources.qrc | 2 +
7 files changed, 54 insertions(+), 5 deletions(-)
create mode 100644 ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-srxl-down.png
create mode 100644 ground/openpilotgcs/src/plugins/setupwizard/resources/bttn-srxl-up.png
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; }
</property>
</widget>
</item>
+ <item>
+ <widget class="QToolButton" name="multiplexButton">
+ <property name="font">
+ <font>
+ <pointsize>10</pointsize>
+ </font>
+ </property>
+ <property name="toolTip">
+ <string>Spektrum Satellite</string>
+ </property>
+ <property name="styleSheet">
+ <string notr="true">QToolButton { border: none }</string>
+ </property>
+ <property name="text">
+ <string>SRXL</string>
+ </property>
+ <property name="icon">
+ <iconset resource="../wizardResources.qrc">
+ <normaloff>:/setupwizard/resources/bttn-srxl-up.png</normaloff>
+ <normalon>:/setupwizard/resources/bttn-srxl-down.png</normalon>:/setupwizard/resources/bttn-srxl-up.png</iconset>
+ </property>
+ <property name="iconSize">
+ <size>
+ <width>100</width>
+ <height>100</height>
+ </size>
+ </property>
+ <property name="checkable">
+ <bool>true</bool>
+ </property>
+ <property name="autoExclusive">
+ <bool>true</bool>
+ </property>
+ <property name="toolButtonStyle">
+ <enum>Qt::ToolButtonTextUnderIcon</enum>
+ </property>
+ <property name="autoRaise">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
</layout>
</item>
</layout>
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 0000000000000000000000000000000000000000..9888fb0c2b37878ff531dc833c8e3a75ffd4ff07
GIT binary patch
literal 3148
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
literal 0
HcmV?d00001
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 0000000000000000000000000000000000000000..022c778729149b48215e6b75735c6a2c826d7de6
GIT binary patch
literal 3822
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
literal 0
HcmV?d00001
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 @@
<file>resources/connected.png</file>
<file>resources/bttn-oneshot-dwn.png</file>
<file>resources/bttn-oneshot-up.png</file>
+ <file>resources/bttn-srxl-down.png</file>
+ <file>resources/bttn-srxl-up.png</file>
</qresource>
</RCC>