diff --git a/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc b/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc index 932220124bad..d2863aae0163 100644 --- a/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc +++ b/src/FirmwarePlugin/APM/APMFirmwarePlugin.cc @@ -1102,7 +1102,7 @@ bool APMFirmwarePlugin::fixedWingAirSpeedLimitsAvailable(Vehicle* vehicle) vehicle->parameterManager()->parameterExists(FactSystem::defaultComponentId, "ARSPD_FBW_MAX"); } -void APMFirmwarePlugin::guidedModeChangeEquivalentAirspeed(Vehicle* vehicle, double airspeed_equiv) +void APMFirmwarePlugin::guidedModeChangeEquivalentAirspeedMetersSecond(Vehicle* vehicle, double airspeed_equiv) { vehicle->sendMavCommand( diff --git a/src/FirmwarePlugin/APM/APMFirmwarePlugin.h b/src/FirmwarePlugin/APM/APMFirmwarePlugin.h index 58c71b4d22e7..42ec7dab10c3 100644 --- a/src/FirmwarePlugin/APM/APMFirmwarePlugin.h +++ b/src/FirmwarePlugin/APM/APMFirmwarePlugin.h @@ -83,7 +83,7 @@ class APMFirmwarePlugin : public FirmwarePlugin double maximumEquivalentAirspeed (Vehicle* vehicle) override; double minimumEquivalentAirspeed (Vehicle* vehicle) override; bool fixedWingAirSpeedLimitsAvailable(Vehicle* vehicle) override; - void guidedModeChangeEquivalentAirspeed(Vehicle* vehicle, double airspeed_equiv) override; + void guidedModeChangeEquivalentAirspeedMetersSecond(Vehicle* vehicle, double airspeed_equiv) override; protected: /// All access to singleton is through stack specific implementation diff --git a/src/FirmwarePlugin/FirmwarePlugin.cc b/src/FirmwarePlugin/FirmwarePlugin.cc index 7f1f57602adc..d3c21186bdcc 100644 --- a/src/FirmwarePlugin/FirmwarePlugin.cc +++ b/src/FirmwarePlugin/FirmwarePlugin.cc @@ -276,14 +276,14 @@ void FirmwarePlugin::guidedModeChangeAltitude(Vehicle*, double, bool pauseVehicl } void -FirmwarePlugin::guidedModeChangeGroundSpeed(Vehicle*, double) +FirmwarePlugin::guidedModeChangeGroundSpeedMetersSecond(Vehicle*, double) { // Not supported by generic vehicle qgcApp()->showAppMessage(guided_mode_not_supported_by_vehicle); } void -FirmwarePlugin::guidedModeChangeEquivalentAirspeed(Vehicle*, double) +FirmwarePlugin::guidedModeChangeEquivalentAirspeedMetersSecond(Vehicle*, double) { // Not supported by generic vehicle qgcApp()->showAppMessage(guided_mode_not_supported_by_vehicle); diff --git a/src/FirmwarePlugin/FirmwarePlugin.h b/src/FirmwarePlugin/FirmwarePlugin.h index a39567472630..e667a5468213 100644 --- a/src/FirmwarePlugin/FirmwarePlugin.h +++ b/src/FirmwarePlugin/FirmwarePlugin.h @@ -184,11 +184,11 @@ class FirmwarePlugin : public QObject /// Command vehicle to change groundspeed /// @param groundspeed Groundspeed in m/s - virtual void guidedModeChangeGroundSpeed(Vehicle* vehicle, double groundspeed); + virtual void guidedModeChangeGroundSpeedMetersSecond(Vehicle* vehicle, double groundspeed); /// Command vehicle to change equivalent airspeed /// @param airspeed_equiv Equivalent airspeed in m/s - virtual void guidedModeChangeEquivalentAirspeed(Vehicle* vehicle, double airspeed_equiv); + virtual void guidedModeChangeEquivalentAirspeedMetersSecond(Vehicle* vehicle, double airspeed_equiv); /// Default tx mode to apply to joystick axes /// TX modes are as outlined here: http://www.rc-airplane-world.com/rc-transmitter-modes.html diff --git a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc index 1d75579c5c90..65a85fa79c41 100644 --- a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc +++ b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc @@ -571,7 +571,7 @@ void PX4FirmwarePlugin::guidedModeChangeAltitude(Vehicle* vehicle, double altitu } } -void PX4FirmwarePlugin::guidedModeChangeGroundSpeed(Vehicle* vehicle, double groundspeed) +void PX4FirmwarePlugin::guidedModeChangeGroundSpeedMetersSecond(Vehicle* vehicle, double groundspeed) { vehicle->sendMavCommand( @@ -585,7 +585,7 @@ void PX4FirmwarePlugin::guidedModeChangeGroundSpeed(Vehicle* vehicle, double gro NAN, NAN,NAN); // param 5-7 unused } -void PX4FirmwarePlugin::guidedModeChangeEquivalentAirspeed(Vehicle* vehicle, double airspeed_equiv) +void PX4FirmwarePlugin::guidedModeChangeEquivalentAirspeedMetersSecond(Vehicle* vehicle, double airspeed_equiv) { vehicle->sendMavCommand( diff --git a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h index ff8e9eb8c025..a0a8d62ad488 100644 --- a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h +++ b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h @@ -53,8 +53,8 @@ class PX4FirmwarePlugin : public FirmwarePlugin bool fixedWingAirSpeedLimitsAvailable(Vehicle* vehicle) override; void guidedModeGotoLocation (Vehicle* vehicle, const QGeoCoordinate& gotoCoord) override; void guidedModeChangeAltitude (Vehicle* vehicle, double altitudeRel, bool pauseVehicle) override; - void guidedModeChangeGroundSpeed (Vehicle* vehicle, double groundspeed) override; - void guidedModeChangeEquivalentAirspeed(Vehicle* vehicle, double airspeed_equiv) override; + void guidedModeChangeGroundSpeedMetersSecond(Vehicle* vehicle, double groundspeed) override; + void guidedModeChangeEquivalentAirspeedMetersSecond(Vehicle* vehicle, double airspeed_equiv) override; void startMission (Vehicle* vehicle) override; bool isGuidedMode (const Vehicle* vehicle) const override; void initializeVehicle (Vehicle* vehicle) override; diff --git a/src/FlightDisplay/GuidedActionsController.qml b/src/FlightDisplay/GuidedActionsController.qml index b434567f5b0d..26985353cb21 100644 --- a/src/FlightDisplay/GuidedActionsController.qml +++ b/src/FlightDisplay/GuidedActionsController.qml @@ -604,9 +604,9 @@ Item { // We need to convert back to m/s as that is what mavlink standard uses for MAV_CMD_DO_CHANGE_SPEED var metersSecondSpeed = QGroundControl.unitsConversion.appSettingsSpeedUnitsToMetersSecond(sliderOutputValue).toFixed(1) if (_activeVehicle.vtolInFwdFlight || _activeVehicle.fixedWing) { - _activeVehicle.guidedModeChangeEquivalentAirspeed(metersSecondSpeed) + _activeVehicle.guidedModeChangeEquivalentAirspeedMetersSecond(metersSecondSpeed) } else { - _activeVehicle.guidedModeChangeGroundSpeed(metersSecondSpeed) + _activeVehicle.guidedModeChangeGroundSpeedMetersSecond(metersSecondSpeed) } } break diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc index 8ae6b6b9d279..91bfda6f831c 100644 --- a/src/Vehicle/Vehicle.cc +++ b/src/Vehicle/Vehicle.cc @@ -2725,23 +2725,23 @@ void Vehicle::guidedModeChangeAltitude(double altitudeChange, bool pauseVehicle) } void -Vehicle::guidedModeChangeGroundSpeed(double groundspeed) +Vehicle::guidedModeChangeGroundSpeedMetersSecond(double groundspeed) { if (!guidedModeSupported()) { qgcApp()->showAppMessage(guided_mode_not_supported_by_vehicle); return; } - _firmwarePlugin->guidedModeChangeGroundSpeed(this, groundspeed); + _firmwarePlugin->guidedModeChangeGroundSpeedMetersSecond(this, groundspeed); } void -Vehicle::guidedModeChangeEquivalentAirspeed(double airspeed) +Vehicle::guidedModeChangeEquivalentAirspeedMetersSecond(double airspeed) { if (!guidedModeSupported()) { qgcApp()->showAppMessage(guided_mode_not_supported_by_vehicle); return; } - _firmwarePlugin->guidedModeChangeEquivalentAirspeed(this, airspeed); + _firmwarePlugin->guidedModeChangeEquivalentAirspeedMetersSecond(this, airspeed); } void Vehicle::guidedModeOrbit(const QGeoCoordinate& centerCoord, double radius, double amslAltitude) diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h index a2ebc5a26c92..15a28b25c6ea 100644 --- a/src/Vehicle/Vehicle.h +++ b/src/Vehicle/Vehicle.h @@ -379,10 +379,10 @@ class Vehicle : public FactGroup /// Command vehicle to change groundspeed /// @param groundspeed Target horizontal groundspeed - Q_INVOKABLE void guidedModeChangeGroundSpeed (double groundspeed); + Q_INVOKABLE void guidedModeChangeGroundSpeedMetersSecond(double groundspeed); /// Command vehicle to change equivalent airspeed /// @param airspeed Target equivalent airspeed - Q_INVOKABLE void guidedModeChangeEquivalentAirspeed (double airspeed); + Q_INVOKABLE void guidedModeChangeEquivalentAirspeedMetersSecond(double airspeed); /// Command vehicle to orbit given center point /// @param centerCoord Orit around this point