Commit 303050ed authored by Don Gagne's avatar Don Gagne

Merge branch 'FixSetupView' of https://github.com/DonLakeFlyer/qgroundcontrol into FixSetupView

Conflicts:
	src/AutoPilotPlugins/PX4/AirframeComponent.cc
parents 0c1ca1ed 581a026f
...@@ -30,6 +30,9 @@ ...@@ -30,6 +30,9 @@
/// @brief Parameters which signal a change in setupComplete state /// @brief Parameters which signal a change in setupComplete state
static const char* triggerParams[] = { "SYS_AUTOSTART", NULL }; static const char* triggerParams[] = { "SYS_AUTOSTART", NULL };
#if 0
// Broken by latest mavlink module changes. Not used yet. Comment out for now.
// Discussing mavlink fix.
struct mavType { struct mavType {
int type; int type;
const char* description; const char* description;
...@@ -66,11 +69,15 @@ static const struct mavType mavTypeInfo[] = { ...@@ -66,11 +69,15 @@ static const struct mavType mavTypeInfo[] = {
{ MAV_TYPE_GIMBAL, "Gimbal" }, { MAV_TYPE_GIMBAL, "Gimbal" },
}; };
static size_t cMavTypes = sizeof(mavTypeInfo) / sizeof(mavTypeInfo[0]); static size_t cMavTypes = sizeof(mavTypeInfo) / sizeof(mavTypeInfo[0]);
#endif
AirframeComponent::AirframeComponent(UASInterface* uas, AutoPilotPlugin* autopilot, QObject* parent) : AirframeComponent::AirframeComponent(UASInterface* uas, AutoPilotPlugin* autopilot, QObject* parent) :
PX4Component(uas, autopilot, parent), PX4Component(uas, autopilot, parent),
_name(tr("Airframe")) _name(tr("Airframe"))
{ {
#if 0
// Broken by latest mavlink module changes. Not used yet. Comment out for now.
// Discussing mavlink fix.
Q_UNUSED(mavTypeInfo); // Keeping this around for later use Q_UNUSED(mavTypeInfo); // Keeping this around for later use
// Validate that our mavTypeInfo array hasn't gotten out of sync // Validate that our mavTypeInfo array hasn't gotten out of sync
...@@ -112,6 +119,7 @@ AirframeComponent::AirframeComponent(UASInterface* uas, AutoPilotPlugin* autopil ...@@ -112,6 +119,7 @@ AirframeComponent::AirframeComponent(UASInterface* uas, AutoPilotPlugin* autopil
for (size_t i=0; i<cMavTypes; i++) { for (size_t i=0; i<cMavTypes; i++) {
Q_ASSERT(mavTypeInfo[i].type == mavTypes[i]); Q_ASSERT(mavTypeInfo[i].type == mavTypes[i]);
} }
#endif
} }
QString AirframeComponent::name(void) const QString AirframeComponent::name(void) const
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment