rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-19 04:52:12 +01:00
Code Issues Releases Activity

LP-104 Graupner Hott support for Wizard. Artwork and CC3D input

Browse Source
This commit is contained in:
Laurent Lalanne 2015-12-20 23:37:51 +01:00
parent 24c03378f0
commit 3cc34e6475
10 changed files with 2091 additions and 1625 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ground/gcs/src/plugins/setupwizard/connectiondiagram.cpp
View File

@ -201,6 +201,9 @@ void ConnectionDiagram::setupGraphicsScene()
case VehicleConfigurationSource::INPUT_DSM:
elementsToShow << QString("%1satellite").arg(prefix);
break;
case VehicleConfigurationSource::INPUT_HOTT:
elementsToShow << QString("%1hott").arg(prefix);
break;
default:
break;
}

1
ground/gcs/src/plugins/setupwizard/pages/airspeedpage.cpp
View File

@ -42,6 +42,7 @@ void AirSpeedPage::initializePage(VehicleConfigurationSource *settings)
if (settings->getInputType() == VehicleConfigurationSource::INPUT_SBUS ||
settings->getInputType() == VehicleConfigurationSource::INPUT_DSM ||
settings->getInputType() == VehicleConfigurationSource::INPUT_SRXL ||
settings->getInputType() == VehicleConfigurationSource::INPUT_HOTT ||
settings->getGpsType() == VehicleConfigurationSource::GPS_UBX_FLEXI_I2CMAG) {
// Disable non estimated sensors if ports are taken by receivers or I2C Mag
setItemDisabled(VehicleConfigurationSource::AIRSPEED_EAGLETREE, true);

1
ground/gcs/src/plugins/setupwizard/pages/gpspage.cpp
View File

@ -41,6 +41,7 @@ void GpsPage::initializePage(VehicleConfigurationSource *settings)
setItemDisabled(-1, false);
if (settings->getInputType() == VehicleConfigurationSource::INPUT_SBUS ||
settings->getInputType() == VehicleConfigurationSource::INPUT_DSM ||
settings->getInputType() == VehicleConfigurationSource::INPUT_HOTT ||
settings->getInputType() == VehicleConfigurationSource::INPUT_SRXL) {
// Disable GPS+I2C Mag
setItemDisabled(VehicleConfigurationSource::GPS_UBX_FLEXI_I2CMAG, true);

11
ground/gcs/src/plugins/setupwizard/pages/inputpage.cpp
View File

@ -53,6 +53,8 @@ bool InputPage::validatePage()
getWizard()->setInputType(SetupWizard::INPUT_PPM);
} else if (ui->sbusButton->isChecked()) {
getWizard()->setInputType(SetupWizard::INPUT_SBUS);
} else if (ui->graupnerButton->isChecked()) {
getWizard()->setInputType(SetupWizard::INPUT_HOTT);
} else if (ui->spectrumButton->isChecked()) {
getWizard()->setInputType(SetupWizard::INPUT_DSM);
} else if (ui->multiplexButton->isChecked()) {
@ -87,6 +89,12 @@ bool InputPage::restartNeeded(VehicleConfigurationSource::INPUT_TYPE selectedTyp
case VehicleConfigurationSource::INPUT_SBUS:
return data.CC_MainPort != HwSettings::CC_MAINPORT_SBUS;
case VehicleConfigurationSource::INPUT_SRXL:
return data.CC_FlexiPort != HwSettings::CC_FLEXIPORT_SRXL;
case VehicleConfigurationSource::INPUT_HOTT:
return data.CC_FlexiPort != HwSettings::CC_FLEXIPORT_HOTTSUMD;
case VehicleConfigurationSource::INPUT_DSM:
// TODO: Handle all of the DSM types ?? Which is most common?
return data.CC_MainPort != HwSettings::CC_MAINPORT_DSM;
@ -109,6 +117,9 @@ bool InputPage::restartNeeded(VehicleConfigurationSource::INPUT_TYPE selectedTyp
case VehicleConfigurationSource::INPUT_SBUS:
return data.RM_MainPort != HwSettings::RM_MAINPORT_SBUS;
//case VehicleConfigurationSource::INPUT_HOTT:
// return data.RM_FlexiPort != HwSettings::RM_FLEXIPORT_HOTTSUMD;
case VehicleConfigurationSource::INPUT_SRXL:
return data.RM_FlexiPort != HwSettings::RM_FLEXIPORT_SRXL;

48
ground/gcs/src/plugins/setupwizard/pages/inputpage.ui
View File

@ -6,8 +6,8 @@
<rect>
<x>0</x>
<y>0</y>
<width>600</width>
<height>400</height>
<width>738</width>
<height>494</height>
</rect>
</property>
<property name="windowTitle">
@ -51,6 +51,9 @@ p, li { white-space: pre-wrap; }
</item>
<item>
<layout class="QHBoxLayout" name="horizontalLayout">
<property name="spacing">
<number>2</number>
</property>
<item>
<widget class="QToolButton" name="pwmButton">
<property name="font">
@ -259,6 +262,47 @@ p, li { white-space: pre-wrap; }
</property>
</widget>
</item>
<item>
<widget class="QToolButton" name="graupnerButton">
<property name="font">
<font>
<pointsize>10</pointsize>
</font>
</property>
<property name="toolTip">
<string>Graupner HoTT</string>
</property>
<property name="styleSheet">
<string notr="true">QToolButton { border: none }</string>
</property>
<property name="text">
<string>HoTT</string>
</property>
<property name="icon">
<iconset resource="../wizardResources.qrc">
<normaloff>:/setupwizard/resources/bttn-hott-up.png</normaloff>
<normalon>:/setupwizard/resources/bttn-hott-down.png</normalon>:/setupwizard/resources/bttn-hott-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>

3636
ground/gcs/src/plugins/setupwizard/resources/connection-diagrams.svg
View File

File diff suppressed because one or more lines are too long
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.0 MiB

After

Width:  |  Height:  |  Size: 3.2 MiB

3
ground/gcs/src/plugins/setupwizard/setupwizard.cpp
View File

@ -380,6 +380,9 @@ QString SetupWizard::getSummaryText()
case INPUT_SRXL:
summary.append(tr("Multiplex SRXL"));
break;
case INPUT_HOTT:
summary.append(tr("Graupner HoTT"));
break;
default:
summary.append(tr("Unknown"));
}

9
ground/gcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
View File

@ -169,6 +169,9 @@ void VehicleConfigurationHelper::applyHardwareConfiguration()
case VehicleConfigurationSource::INPUT_SRXL:
data.CC_FlexiPort = HwSettings::CC_FLEXIPORT_SRXL;
break;
case VehicleConfigurationSource::INPUT_HOTT:
data.CC_FlexiPort = HwSettings::CC_FLEXIPORT_HOTTSUMD;
break;
default:
break;
}
@ -207,6 +210,9 @@ void VehicleConfigurationHelper::applyHardwareConfiguration()
case VehicleConfigurationSource::INPUT_SRXL:
data.RM_FlexiPort = HwSettings::RM_FLEXIPORT_SRXL;
break;
//case VehicleConfigurationSource::INPUT_HOTT:
// data.RM_FlexiPort = HwSettings::RM_FLEXIPORT_HOTTSUMD;
break;
default:
break;
}
@ -900,6 +906,9 @@ void VehicleConfigurationHelper::applyManualControlDefaults()
case VehicleConfigurationSource::INPUT_SRXL:
channelType = ManualControlSettings::CHANNELGROUPS_SRXL;
break;
case VehicleConfigurationSource::INPUT_HOTT:
channelType = ManualControlSettings::CHANNELGROUPS_HOTTFLEXIPORT;
break;
default:
break;
}

2
ground/gcs/src/plugins/setupwizard/vehicleconfigurationsource.h
View File

@ -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_SRXL, INPUT_UNKNOWN };
enum INPUT_TYPE { INPUT_PWM, INPUT_PPM, INPUT_SBUS, INPUT_DSM, INPUT_SRXL, INPUT_HOTT, INPUT_UNKNOWN };
enum AIRSPEED_TYPE { AIRSPEED_ESTIMATE, AIRSPEED_EAGLETREE, AIRSPEED_MS4525, AIRSPEED_DISABLED };
enum GPS_TYPE { GPS_PLATINUM, GPS_UBX_FLEXI_I2CMAG, GPS_UBX, GPS_NMEA, GPS_DISABLED };
enum RADIO_SETTING { RADIO_TELEMETRY, RADIO_DISABLED };

2
ground/gcs/src/plugins/setupwizard/wizardResources.qrc
View File

@ -56,5 +56,7 @@
<file>resources/bttn-oneshot-up.png</file>
<file>resources/bttn-srxl-down.png</file>
<file>resources/bttn-srxl-up.png</file>
<file>resources/bttn-hott-down.png</file>
<file>resources/bttn-hott-up.png</file>
</qresource>
</RCC>