Browse Source

Merge pull request #1505 from DonLakeFlyer/SYS_AUTOSTART

Fix SYS_AUTOSTART=0 issue
QGC4.4
Don Gagne 10 years ago
parent
commit
14d9765cc0
  1. 12
      src/AutoPilotPlugins/PX4/AirframeComponentController.cc

12
src/AutoPilotPlugins/PX4/AirframeComponentController.cc

@ -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) :
_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()

Loading…
Cancel
Save