Browse Source

Fix display of Continue Mission/Change Alt after Pause

QGC4.4
DonLakeFlyer 5 years ago
parent
commit
5dabdd5d53
  1. 1
      ChangeLog.md
  2. 5
      src/FirmwarePlugin/APM/APMFirmwarePlugin.cc
  3. 3
      src/FlightDisplay/FlightDisplayView.qml
  4. 7
      src/FlightDisplay/GuidedActionsController.qml

1
ChangeLog.md

@ -7,6 +7,7 @@ Note: This file only contains high level features or important fixes.
### 4.0.6 - Not yet released ### 4.0.6 - Not yet released
* Analyze/Log Download - Fix download on mobile versions of QGC * Analyze/Log Download - Fix download on mobile versions of QGC
* Fly: Fix problems where Continue Mission and Change Altitude were not available after a Mission Pause.
### 4.0.5 - Stable ### 4.0.5 - Stable

5
src/FirmwarePlugin/APM/APMFirmwarePlugin.cc

@ -936,6 +936,11 @@ void APMFirmwarePlugin::guidedModeChangeAltitude(Vehicle* vehicle, double altitu
return; return;
} }
if (abs(altitudeChange) < 0.01) {
// This prevents unecessary changes to Guided mode when the users selects pause and doesn't really touch the altitude slider
return;
}
setGuidedMode(vehicle, true); setGuidedMode(vehicle, true);
mavlink_message_t msg; mavlink_message_t msg;

3
src/FlightDisplay/FlightDisplayView.qml

@ -639,8 +639,7 @@ Item {
{ {
name: qsTr("Action"), name: qsTr("Action"),
iconSource: "/res/action.svg", iconSource: "/res/action.svg",
buttonVisible: !_guidedController.showPause, buttonVisible: _anyActionAvailable,
buttonEnabled: _anyActionAvailable,
action: -1 action: -1
} }
] ]

7
src/FlightDisplay/GuidedActionsController.qml

@ -203,7 +203,12 @@ Item {
} }
_outputState() _outputState()
} }
// End of hack onShowChangeAltChanged: {
if (_corePlugin.guidedActionsControllerLogging()) {
console.log("showChangeAlt", showChangeAlt)
}
_outputState()
}
on_VehicleFlyingChanged: { on_VehicleFlyingChanged: {
_outputState() _outputState()

Loading…
Cancel
Save