Browse Source

PX4 don't require sensors setup in HIL mode

-closes #3274
QGC4.4
Daniel Agar 9 years ago
parent
commit
17fcb294a3
  1. 2
      src/AutoPilotPlugins/PX4/FlightModesComponent.cc
  2. 8
      src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc

2
src/AutoPilotPlugins/PX4/FlightModesComponent.cc

@ -107,7 +107,7 @@ QString FlightModesComponent::prerequisiteSetup(void) const @@ -107,7 +107,7 @@ QString FlightModesComponent::prerequisiteSetup(void) const
return plugin->airframeComponent()->name();
} else if (!plugin->radioComponent()->setupComplete()) {
return plugin->radioComponent()->name();
} else if (!plugin->sensorsComponent()->setupComplete()) {
} else if (!plugin->vehicle()->hilMode() && !plugin->sensorsComponent()->setupComplete()) {
return plugin->sensorsComponent()->name();
}
}

8
src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc

@ -73,9 +73,11 @@ const QVariantList& PX4AutoPilotPlugin::vehicleComponents(void) @@ -73,9 +73,11 @@ const QVariantList& PX4AutoPilotPlugin::vehicleComponents(void)
_radioComponent->setupTriggerSignals();
_components.append(QVariant::fromValue((VehicleComponent*)_radioComponent));
_sensorsComponent = new SensorsComponent(_vehicle, this);
_sensorsComponent->setupTriggerSignals();
_components.append(QVariant::fromValue((VehicleComponent*)_sensorsComponent));
if (!_vehicle->hilMode()) {
_sensorsComponent = new SensorsComponent(_vehicle, this);
_sensorsComponent->setupTriggerSignals();
_components.append(QVariant::fromValue((VehicleComponent*)_sensorsComponent));
}
_flightModesComponent = new FlightModesComponent(_vehicle, this);
_flightModesComponent->setupTriggerSignals();

Loading…
Cancel
Save