Skip to content

Q
qgroundcontrol
Commit d862ffce authored by Don Gagne's avatar Don Gagne Committed by GitHub
Browse files
Options

Merge pull request #5002 from jaxxzer/sub-update 

Sub update
parents d0d7c1b9 23b79012
Hide whitespace changes
Inline Side-by-side
Showing with 1051 additions and 674 deletions
src/AutoPilotPlugins/APM/APMAutoPilotPlugin.cc
View file @ d862ffce
......@@ -74,9 +74,12 @@ const QVariantList& APMAutoPilotPlugin::vehicleComponents(void)
_components.append(QVariant::fromValue((VehicleComponent*)_radioComponent));
}
_flightModesComponent = new APMFlightModesComponent(_vehicle, this);
_flightModesComponent->setupTriggerSignals();
_components.append(QVariant::fromValue((VehicleComponent*)_flightModesComponent));
// No flight modes component for Sub versions 3.5 and up
if (!_vehicle->sub() || (_vehicle->firmwareMajorVersion() == 3 && _vehicle->firmwareMinorVersion() <= 4)) {
_flightModesComponent = new APMFlightModesComponent(_vehicle, this);
_flightModesComponent->setupTriggerSignals();
_components.append(QVariant::fromValue((VehicleComponent*)_flightModesComponent));
}
_sensorsComponent = new APMSensorsComponent(_vehicle, this);
_sensorsComponent->setupTriggerSignals();
......
src/FirmwarePlugin/APM/APMParameterFactMetaData.Sub.3.5.xml
View file @ d862ffce
This source diff could not be displayed because it is too large. You can view the blob instead.
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