Browse Source

Merge pull request #7515 from DonLakeFlyer/Fixes

Crash and typo fixes
QGC4.4
Don Gagne 6 years ago committed by GitHub
parent
commit
a2fca7b2b6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 6
      src/MissionManager/MissionCommandTree.cc
  2. 2
      src/QmlControls/ParameterEditorDialog.qml

6
src/MissionManager/MissionCommandTree.cc

@ -223,11 +223,15 @@ QVariantList MissionCommandTree::getCommandsForCategory(Vehicle* vehicle, const @@ -223,11 +223,15 @@ QVariantList MissionCommandTree::getCommandsForCategory(Vehicle* vehicle, const
{
MAV_AUTOPILOT baseFirmwareType;
MAV_TYPE baseVehicleType;
QList<MAV_CMD> supportedCommands = vehicle->firmwarePlugin()->supportedMissionCommands();
_baseVehicleInfo(vehicle, baseFirmwareType, baseVehicleType);
_buildAllCommands(vehicle);
// vehicle can be null in which case _baseVehicleInfo will tell of the firmware/vehicle type for the offline editing vehicle.
// We then use that to get a firmware plugin so we can get the list of supported commands.
FirmwarePlugin* firmwarePlugin = qgcApp()->toolbox()->firmwarePluginManager()->firmwarePluginForAutopilot(baseFirmwareType, baseVehicleType);
QList<MAV_CMD> supportedCommands = firmwarePlugin->supportedMissionCommands();
QVariantList list;
QMap<MAV_CMD, MissionCommandUIInfo*> commandMap = _allCommands[baseFirmwareType][baseVehicleType];
for (MAV_CMD command: commandMap.keys()) {

2
src/QmlControls/ParameterEditorDialog.qml

@ -232,7 +232,7 @@ QGCViewDialog { @@ -232,7 +232,7 @@ QGCViewDialog {
QGCLabel {
visible: fact.qgcRebootRequired
text: "Appliction restart required after change"
text: "Application restart required after change"
}
QGCLabel {

Loading…
Cancel
Save