Skip to content

Q
qgroundcontrol
Commit 14d9765c authored by Don Gagne's avatar Don Gagne
Browse files
Options

Merge pull request #1505 from DonLakeFlyer/SYS_AUTOSTART 

Fix SYS_AUTOSTART=0 issue
parents b5d86976 1cc531ac
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 4 deletions
src/AutoPilotPlugins/PX4/AirframeComponentController.cc
View file @ 14d9765c
...@@ -40,7 +40,9 @@ bool AirframeComponentController::_typesRegistered = false; ...@@ -40,7 +40,9 @@ bool AirframeComponentController::_typesRegistered = false;
AirframeComponentController::AirframeComponentController(QObject* parent) : AirframeComponentController::AirframeComponentController(QObject* parent) :
QObject(parent), QObject(parent),
_uas(NULL), _uas(NULL),
_autoPilotPlugin(NULL) _autoPilotPlugin(NULL),
_currentVehicleIndex(0),
_autostartId(0)
{ {
_uas = UASManager::instance()->getActiveUAS(); _uas = UASManager::instance()->getActiveUAS();
Q_ASSERT(_uas); Q_ASSERT(_uas);
...@@ -80,9 +82,11 @@ AirframeComponentController::AirframeComponentController(QObject* parent) : ...@@ -80,9 +82,11 @@ AirframeComponentController::AirframeComponentController(QObject* parent) :
_airframeTypes.append(QVariant::fromValue(airframeType)); _airframeTypes.append(QVariant::fromValue(airframeType));
} }
// FIXME: Should be a user error if (_autostartId != 0) {
Q_UNUSED(autostartFound); // FIXME: Should be a user error
Q_ASSERT(autostartFound); Q_UNUSED(autostartFound);
Q_ASSERT(autostartFound);
}
} }
AirframeComponentController::~AirframeComponentController() AirframeComponentController::~AirframeComponentController()
......
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