removed FirmwarePlugin message. Changed abortLanding() to abortLanding(double).

src/FirmwarePlugin/FirmwarePlugin.cc

@@ -16,7 +16,6 @@
 static FirmwarePluginFactoryRegister* _instance = NULL;
 
 const char* guided_mode_not_supported_by_vehicle = "Guided mode not supported by Vehicle.";
-const char* landing_aborted = "Landing aborted.";
 
 const char* FirmwarePlugin::px4FollowMeFlightMode = "Follow Me";
 
@@ -232,12 +231,6 @@ void FirmwarePlugin::pauseVehicle(Vehicle* vehicle)
     qgcApp()->showMessage(guided_mode_not_supported_by_vehicle);
 }
 
-void FirmwarePlugin::abortLanding(Vehicle* vehicle)
-{
-    Q_UNUSED(vehicle);
-    qgcApp()->showMessage(landing_aborted);
-}
-
 void FirmwarePlugin::guidedModeRTL(Vehicle* vehicle)
 {
     // Not supported by generic vehicle

src/FirmwarePlugin/FirmwarePlugin.h

@@ -105,9 +105,6 @@ public:
     /// If not, vehicle will be left in Loiter.
     virtual void pauseVehicle(Vehicle* vehicle);
 
-    /// Command vehicle to abort landing
-    virtual void abortLanding(Vehicle* vehicle);
-
     /// Command vehicle to return to launch
     virtual void guidedModeRTL(Vehicle* vehicle);
 

src/FlightDisplay/FlightDisplayViewWidgets.qml

@@ -240,7 +240,7 @@ Item {
                 //_activeVehicle.guidedModeOrbit(QGroundControl.flightMapPosition, 50.0)
                 break;
             case confirmAbort:
-                _activeVehicle.abortLanding()
+                _activeVehicle.abortLanding(50)     // hardcoded value for climbOutAltitude that is currently ignored
                 break;
             default:
                 console.warn(qsTr("Internal error: unknown confirmActionCode"), confirmActionCode)
@@ -366,7 +366,7 @@ Item {
                 QGCButton {
                     pointSize:  _guidedModeBar._fontPointSize
                     text:       qsTr("Abort")
-                    visible:    _activeVehicle && _activeVehicle.flying
+                    visible:    _activeVehicle && _activeVehicle.flying && _activeVehicle.fixedWing
                     onClicked:  _guidedModeBar.confirmAction(_guidedModeBar.confirmAbort)
                 }
 

src/Vehicle/Vehicle.cc

@@ -1838,14 +1838,12 @@ void Vehicle::pauseVehicle(void)
     _firmwarePlugin->pauseVehicle(this);
 }
 
-void Vehicle::abortLanding(void)
+void Vehicle::abortLanding(double climbOutAltitude)
 {
     sendMavCommand(defaultComponentId(),
                    MAV_CMD_DO_GO_AROUND,
                    true,        // show error if fails
-                   50);         // this is a dummy value that is currently ignored
+                   climbOutAltitude);
-
-    _firmwarePlugin->abortLanding(this);
 }
 
 bool Vehicle::guidedMode(void) const

src/Vehicle/Vehicle.h

@@ -356,7 +356,7 @@ public:
     Q_INVOKABLE void emergencyStop(void);
 
     /// Command vehicle to abort landing
-    Q_INVOKABLE void abortLanding(void);
+    Q_INVOKABLE void abortLanding(double climbOutAltitude);
 
     /// Alter the current mission item on the vehicle
     Q_INVOKABLE void setCurrentMissionSequence(int seq);