Merge pull request #8634 from mavlink/GuidedPause

Fly: Fix display of Continue Mission/Change Alt after Pause

ChangeLog.md

@@ -7,6 +7,7 @@ Note: This file only contains high level features or important fixes.
 ### 4.0.6 - Not yet released
 
 * 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
 

src/FirmwarePlugin/APM/APMFirmwarePlugin.cc

@@ -936,6 +936,11 @@ void APMFirmwarePlugin::guidedModeChangeAltitude(Vehicle* vehicle, double altitu
         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);
 
     mavlink_message_t msg;

src/FlightDisplay/FlightDisplayView.qml

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

src/FlightDisplay/GuidedActionsController.qml

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