Skip to content

Q
qgroundcontrol
Commit 17fcb294 authored by Daniel Agar's avatar Daniel Agar
Browse files
Options

PX4 don't require sensors setup in HIL mode 

-closes #3274
parent 851b73ba
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 4 deletions
src/AutoPilotPlugins/PX4/FlightModesComponent.cc
View file @ 17fcb294
...@@ -107,7 +107,7 @@ QString FlightModesComponent::prerequisiteSetup(void) const ...@@ -107,7 +107,7 @@ QString FlightModesComponent::prerequisiteSetup(void) const
return plugin->airframeComponent()->name(); return plugin->airframeComponent()->name();
} else if (!plugin->radioComponent()->setupComplete()) { } else if (!plugin->radioComponent()->setupComplete()) {
return plugin->radioComponent()->name(); return plugin->radioComponent()->name();
} else if (!plugin->sensorsComponent()->setupComplete()) { } else if (!plugin->vehicle()->hilMode() && !plugin->sensorsComponent()->setupComplete()) {
return plugin->sensorsComponent()->name(); return plugin->sensorsComponent()->name();
} }
} }
......
src/AutoPilotPlugins/PX4/PX4AutoPilotPlugin.cc
View file @ 17fcb294
...@@ -73,9 +73,11 @@ const QVariantList& PX4AutoPilotPlugin::vehicleComponents(void) ...@@ -73,9 +73,11 @@ const QVariantList& PX4AutoPilotPlugin::vehicleComponents(void)
_radioComponent->setupTriggerSignals(); _radioComponent->setupTriggerSignals();
_components.append(QVariant::fromValue((VehicleComponent*)_radioComponent)); _components.append(QVariant::fromValue((VehicleComponent*)_radioComponent));
_sensorsComponent = new SensorsComponent(_vehicle, this); if (!_vehicle->hilMode()) {
_sensorsComponent->setupTriggerSignals(); _sensorsComponent = new SensorsComponent(_vehicle, this);
_components.append(QVariant::fromValue((VehicleComponent*)_sensorsComponent)); _sensorsComponent->setupTriggerSignals();
_components.append(QVariant::fromValue((VehicleComponent*)_sensorsComponent));
}
_flightModesComponent = new FlightModesComponent(_vehicle, this); _flightModesComponent = new FlightModesComponent(_vehicle, this);
_flightModesComponent->setupTriggerSignals(); _flightModesComponent->setupTriggerSignals();
......
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