diff --git a/qgcresources.qrc b/qgcresources.qrc
index 52a88814a471f89efd37d2fcea09f71e680eb33d..630152fffd3affd7d394f6d0361ad8b0f73d83ef 100644
--- a/qgcresources.qrc
+++ b/qgcresources.qrc
@@ -36,10 +36,9 @@
src/VehicleSetup/VehicleSummaryIcon.png
src/AutoPilotPlugins/PX4/Images/VehicleTailDown.png
src/AutoPilotPlugins/PX4/Images/VehicleUpsideDown.png
-
src/FlightMap/Images/attitudeDial.svg
src/FlightMap/Images/attitudeInstrument.svg
- src//FlightMap/Images/attitudePointer.svg
+ src/FlightMap/Images/attitudePointer.svg
src/FlightMap/Images/buttonHome.svg
src/FlightMap/Images/buttonMore.svg
src/FlightMap/Images/compassInstrumentAirplane.svg
@@ -54,8 +53,6 @@
src/FlightMap/Images/airplaneOpaque.svg
src/FlightMap/Images/ZoomPlus.svg
src/FlightMap/Images/ZoomMinus.svg
-
-
src/FlightMap/Images/ArrowHead.svg
src/FlightMap/Images/Help.svg
src/FlightMap/Images/HelpBlack.svg
@@ -72,8 +69,6 @@
src/FlightMap/Images/MapTypeBlack.svg
src/FlightMap/Images/TrashDelete.svg
src/FlightMap/Images/TrashDeleteBlack.svg
-
-
src/ui/toolbar/Images/Armed.svg
src/ui/toolbar/Images/Battery.svg
src/ui/toolbar/Images/Connect.svg
@@ -95,11 +90,8 @@
src/ui/toolbar/Images/Signal100.svg
src/ui/toolbar/Images/TelemRSSI.svg
src/ui/toolbar/Images/Yield.svg
-
src/MissionManager/CogWheel.svg
-
-
resources/Antenna_RC.svg
resources/Antenna_T.svg
@@ -117,13 +109,11 @@
resources/XDelete.svg
resources/XDeleteBlack.svg
-
resources/firmware/px4.png
resources/firmware/apm.png
resources/firmware/3drradio.png
-
resources/mavs/helicopter.svg
resources/mavs/unknown.svg
@@ -145,7 +135,6 @@
resources/mavs/surface-boat.svg
resources/mavs/tricopter.svg
-
resources/calibration/accel_back.png
resources/calibration/accel_front.png
@@ -154,7 +143,6 @@
resources/calibration/accel_up.png
resources/calibration/accel_left.png
-
resources/calibration/mode1/radioCenter.png
resources/calibration/mode1/radioHome.png
@@ -168,7 +156,6 @@
resources/calibration/mode1/radioThrottleDown.png
resources/calibration/mode1/radioSwitchMinMax.png
-
resources/calibration/mode2/radioCenter.png
resources/calibration/mode2/radioHome.png
@@ -182,7 +169,6 @@
resources/calibration/mode2/radioThrottleDown.png
resources/calibration/mode2/radioSwitchMinMax.png
-
resources/calibration/joystick/joystickCenter.png
resources/calibration/joystick/joystickRollLeft.png
@@ -194,24 +180,20 @@
resources/calibration/joystick/joystickThrottleUp.png
resources/calibration/joystick/joystickThrottleDown.png
-
resources/styles/style-dark.css
resources/styles/style-light.css
-
resources/audio/alert.wav
-
src/AutoPilotPlugins/PX4/AirframeFactMetaData.xml
src/AutoPilotPlugins/PX4/ParameterFactMetaData.xml
- src/AutoPilotPlugins/APM/AirframeFactMetaData.xml
+ src/AutoPilotPlugins/APM/APMAirframeFactMetaData.xml
-
src/FirmwarePlugin/APM/apm.pdef.xml
diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponent.cc b/src/AutoPilotPlugins/APM/APMAirframeComponent.cc
index 12fb5df929072bbf60e279bde9c4e2e9b3c9ddd9..db71666b23e5a2e9b173b440bf1af6a40497fd44 100644
--- a/src/AutoPilotPlugins/APM/APMAirframeComponent.cc
+++ b/src/AutoPilotPlugins/APM/APMAirframeComponent.cc
@@ -29,10 +29,16 @@
APMAirframeComponent::APMAirframeComponent(Vehicle* vehicle, AutoPilotPlugin* autopilot, QObject* parent)
: APMComponent(vehicle, autopilot, parent)
- , _copterFirmware(false)
+ , _requiresFrameSetup(false)
, _name("Airframe")
{
- _copterFirmware = qobject_cast(_vehicle->firmwarePlugin()) != NULL;
+ if (qobject_cast(_vehicle->firmwarePlugin()) != NULL) {
+ _requiresFrameSetup = true;
+ MAV_TYPE vehicleType = vehicle->vehicleType();
+ if (vehicleType == MAV_TYPE_TRICOPTER || vehicleType == MAV_TYPE_HELICOPTER) {
+ _requiresFrameSetup = false;
+ }
+ }
}
QString APMAirframeComponent::name(void) const
@@ -53,12 +59,12 @@ QString APMAirframeComponent::iconResource(void) const
bool APMAirframeComponent::requiresSetup(void) const
{
- return _copterFirmware;
+ return _requiresFrameSetup;
}
bool APMAirframeComponent::setupComplete(void) const
{
- if (_copterFirmware) {
+ if (_requiresFrameSetup) {
return _autopilot->getParameterFact(FactSystem::defaultComponentId, "FRAME")->rawValue().toInt() >= 0;
} else {
return true;
@@ -69,7 +75,7 @@ QStringList APMAirframeComponent::setupCompleteChangedTriggerList(void) const
{
QStringList list;
- if (_copterFirmware) {
+ if (_requiresFrameSetup) {
list << "FRAME";
}
@@ -78,7 +84,7 @@ QStringList APMAirframeComponent::setupCompleteChangedTriggerList(void) const
QUrl APMAirframeComponent::setupSource(void) const
{
- if (_copterFirmware) {
+ if (_requiresFrameSetup) {
return QUrl::fromUserInput("qrc:/qml/APMAirframeComponent.qml");
} else {
return QUrl();
@@ -87,7 +93,7 @@ QUrl APMAirframeComponent::setupSource(void) const
QUrl APMAirframeComponent::summaryQmlSource(void) const
{
- if (_copterFirmware) {
+ if (_requiresFrameSetup) {
return QUrl::fromUserInput("qrc:/qml/APMAirframeComponentSummary.qml");
} else {
return QUrl();
diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponent.h b/src/AutoPilotPlugins/APM/APMAirframeComponent.h
index 774193815acdf969b3b168208bdd8b0231831d38..0fe59f75005018aa6258af90db3ed52990ffbfa6 100644
--- a/src/AutoPilotPlugins/APM/APMAirframeComponent.h
+++ b/src/AutoPilotPlugins/APM/APMAirframeComponent.h
@@ -47,7 +47,7 @@ public:
virtual QString prerequisiteSetup(void) const;
private:
- bool _copterFirmware;
+ bool _requiresFrameSetup; ///< true: FRAME parameter must be set
const QString _name;
};
diff --git a/src/AutoPilotPlugins/APM/APMAirframeComponentAirframes.cc b/src/AutoPilotPlugins/APM/APMAirframeComponentAirframes.cc
index ca356f2fc60427557a726918a2ba3063597433ea..40d5722a1ad1193b4cb120a867f92d2b2799ff44 100644
--- a/src/AutoPilotPlugins/APM/APMAirframeComponentAirframes.cc
+++ b/src/AutoPilotPlugins/APM/APMAirframeComponentAirframes.cc
@@ -40,7 +40,7 @@ void APMAirframeComponentAirframes::insert(const QString& group, int groupId, co
g = new AirframeType_t;
g->name = group;
g->type = groupId;
- g->imageResource = QString("qrc:/qmlimages/") + (!image.isEmpty() ? image : QString("AirframeStandardPlane.png"));
+ g->imageResource = image.isEmpty() ? "" : QString("qrc:/qmlimages/") + image;
rgAirframeTypes.insert(group, g);
} else {
g = rgAirframeTypes.value(group);
diff --git a/src/AutoPilotPlugins/APM/AirframeFactMetaData.xml b/src/AutoPilotPlugins/APM/APMAirframeFactMetaData.xml
similarity index 68%
rename from src/AutoPilotPlugins/APM/AirframeFactMetaData.xml
rename to src/AutoPilotPlugins/APM/APMAirframeFactMetaData.xml
index b41926c02ffa0d4dd09607997ee020d52ae42656..bfa1fed7fbe67079ebb50ab9411a1b17a7e37385 100644
--- a/src/AutoPilotPlugins/APM/AirframeFactMetaData.xml
+++ b/src/AutoPilotPlugins/APM/APMAirframeFactMetaData.xml
@@ -1,7 +1,7 @@
1
-
+
@@ -9,22 +9,26 @@
-
+
-
+
-
+
-
+
+
+
+
+
diff --git a/src/AutoPilotPlugins/APM/APMAirframeLoader.cc b/src/AutoPilotPlugins/APM/APMAirframeLoader.cc
index 1a189ebd2002ebf4161e1883c1c0ab30c525dc87..a9777e5ca9754d443efc7b6aaa988127be9aba76 100644
--- a/src/AutoPilotPlugins/APM/APMAirframeLoader.cc
+++ b/src/AutoPilotPlugins/APM/APMAirframeLoader.cc
@@ -57,7 +57,7 @@ void APMAirframeLoader::loadAirframeFactMetaData(void)
Q_ASSERT(APMAirframeComponentAirframes::get().count() == 0);
- QString airframeFilename = ":/AutoPilotPlugins/APM/AirframeFactMetaData.xml";
+ QString airframeFilename = ":/AutoPilotPlugins/APM/APMAirframeFactMetaData.xml";
qCDebug(APMAirframeLoaderLog) << "Loading meta data file:" << airframeFilename;