Merge pull request #7521 from mavlink/px4Rover

Initial support for PX4 Rover

ChangeLog.md

@@ -6,6 +6,7 @@ Note: This file only contains high level features or important fixes.
 
 ### 3.6.0 - Daily Build
 
+* For text to speech engine on Linux to English (all messages are in English)
 * Automated the ingestion of localization from Crowdin
 * Automated the generation of language resources into the application
 * Added all languages that come from Crowdin, even if empty.

src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc

@@ -74,7 +74,7 @@ void ArduRoverFirmwarePlugin::guidedModeChangeAltitude(Vehicle* vehicle, double
     qgcApp()->showMessage(QStringLiteral("Change altitude not supported."));
 }
 
-bool ArduRoverFirmwarePlugin::supportsNegativeThrust(void)
+bool ArduRoverFirmwarePlugin::supportsNegativeThrust(Vehicle* /*vehicle*/)
 {
     return true;
 }

src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h

@@ -50,7 +50,7 @@ public:
     void    guidedModeChangeAltitude                (Vehicle* vehicle, double altitudeChange) final;
     int     remapParamNameHigestMinorVersionNumber  (int majorVersionNumber) const final;
     const   FirmwarePlugin::remapParamNameMajorVersionMap_t& paramNameRemapMajorVersionMap(void) const final { return _remapParamName; }
-    bool    supportsNegativeThrust                  (void) final;
+    bool    supportsNegativeThrust                  (Vehicle *) final;
     bool    supportsSmartRTL                        (void) const override { return true; }
     QString offlineEditingParamFile                 (Vehicle* vehicle) override { Q_UNUSED(vehicle); return QStringLiteral(":/FirmwarePlugin/APM/Rover.OfflineEditing.params"); }
 

src/FirmwarePlugin/FirmwarePlugin.cc

@@ -127,7 +127,7 @@ bool FirmwarePlugin::supportsThrottleModeCenterZero(void)
     return true;
 }
 
-bool FirmwarePlugin::supportsNegativeThrust(void)
+bool FirmwarePlugin::supportsNegativeThrust(Vehicle* /*vehicle*/)
 {
     // By default, this is not supported
     return false;

src/FirmwarePlugin/FirmwarePlugin.h

@@ -162,7 +162,7 @@ public:
 
     /// Returns true if the vehicle and firmware supports the use of negative thrust
     /// Typically supported rover.
-    virtual bool supportsNegativeThrust(void);
+    virtual bool supportsNegativeThrust(Vehicle *);
 
     /// Returns true if the firmware supports the use of the RC radio and requires the RC radio
     /// setup page. Returns true by default.

src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc

@@ -35,7 +35,7 @@ PX4FirmwarePluginInstanceData::PX4FirmwarePluginInstanceData(QObject* parent)
 
 }
 
-PX4FirmwarePlugin::PX4FirmwarePlugin(void)
+PX4FirmwarePlugin::PX4FirmwarePlugin()
     : _manualFlightMode     (tr("Manual"))
     , _acroFlightMode       (tr("Acro"))
     , _stabilizedFlightMode (tr("Stabilized"))
@@ -257,7 +257,7 @@ FactMetaData* PX4FirmwarePlugin::getMetaDataForFact(QObject* parameterMetaData,
         qWarning() << "Internal error: pointer passed to PX4FirmwarePlugin::getMetaDataForFact not PX4ParameterMetaData";
     }
 
-    return NULL;
+    return nullptr;
 }
 
 void PX4FirmwarePlugin::addMetaDataToFact(QObject* parameterMetaData, Fact* fact, MAV_TYPE vehicleType)
@@ -306,22 +306,16 @@ QString PX4FirmwarePlugin::missionCommandOverrides(MAV_TYPE vehicleType) const
     switch (vehicleType) {
     case MAV_TYPE_GENERIC:
         return QStringLiteral(":/json/PX4/MavCmdInfoCommon.json");
-        break;
     case MAV_TYPE_FIXED_WING:
         return QStringLiteral(":/json/PX4/MavCmdInfoFixedWing.json");
-        break;
     case MAV_TYPE_QUADROTOR:
         return QStringLiteral(":/json/PX4/MavCmdInfoMultiRotor.json");
-        break;
     case MAV_TYPE_VTOL_QUADROTOR:
         return QStringLiteral(":/json/PX4/MavCmdInfoVTOL.json");
-        break;
     case MAV_TYPE_SUBMARINE:
         return QStringLiteral(":/json/PX4/MavCmdInfoSub.json");
-        break;
     case MAV_TYPE_GROUND_ROVER:
         return QStringLiteral(":/json/PX4/MavCmdInfoRover.json");
-        break;
     default:
         qWarning() << "PX4FirmwarePlugin::missionCommandOverrides called with bad MAV_TYPE:" << vehicleType;
         return QString();
@@ -410,13 +404,14 @@ void PX4FirmwarePlugin::guidedModeTakeoff(Vehicle* vehicle, double takeoffAltRel
     qDebug() << takeoffAltRel << takeoffAltRelFromVehicle << takeoffAltAMSL << vehicleAltitudeAMSL;
 
     connect(vehicle, &Vehicle::mavCommandResult, this, &PX4FirmwarePlugin::_mavCommandResult);
-    vehicle->sendMavCommand(vehicle->defaultComponentId(),
+    vehicle->sendMavCommand(
+        vehicle->defaultComponentId(),
         MAV_CMD_NAV_TAKEOFF,
         true,                                   // show error is fails
         -1,                                     // No pitch requested
         0, 0,                                   // param 2-4 unused
         NAN, NAN, NAN,                          // No yaw, lat, lon
-                            takeoffAltAMSL);                // AMSL altitude
+        static_cast<float>(takeoffAltAMSL));    // AMSL altitude
 }
 
 void PX4FirmwarePlugin::guidedModeGotoLocation(Vehicle* vehicle, const QGeoCoordinate& gotoCoord)
@@ -446,8 +441,8 @@ void PX4FirmwarePlugin::guidedModeGotoLocation(Vehicle* vehicle, const QGeoCoord
                                 MAV_DO_REPOSITION_FLAGS_CHANGE_MODE,
                                 0.0f,
                                 NAN,
-                                gotoCoord.latitude(),
+                                static_cast<float>(gotoCoord.latitude()),
-                                gotoCoord.longitude(),
+                                static_cast<float>(gotoCoord.longitude()),
                                 vehicle->altitudeAMSL()->rawValue().toFloat());
     }
 }
@@ -475,7 +470,7 @@ void PX4FirmwarePlugin::guidedModeChangeAltitude(Vehicle* vehicle, double altitu
                             NAN,
                             NAN,
                             NAN,
-                            vehicle->homePosition().altitude() + newAltRel);
+                            static_cast<float>(vehicle->homePosition().altitude() + newAltRel));
 }
 
 void PX4FirmwarePlugin::startMission(Vehicle* vehicle)
@@ -594,3 +589,8 @@ QString PX4FirmwarePlugin::_getLatestVersionFileUrl(Vehicle* vehicle){
 QString PX4FirmwarePlugin::_versionRegex() {
     return QStringLiteral("v([0-9,\\.]*) Stable");
 }
+
+bool PX4FirmwarePlugin::supportsNegativeThrust(Vehicle* vehicle)
+{
+    return vehicle->vehicleType() == MAV_TYPE_GROUND_ROVER;
+}

src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h

@@ -23,8 +23,8 @@ class PX4FirmwarePlugin : public FirmwarePlugin
     Q_OBJECT
 
 public:
-    PX4FirmwarePlugin(void);
+    PX4FirmwarePlugin   ();
-    ~PX4FirmwarePlugin();
+    ~PX4FirmwarePlugin  () override;
 
     // Overrides from FirmwarePlugin
 
@@ -69,6 +69,7 @@ public:
     QString             autoDisarmParameter             (Vehicle* vehicle) override { Q_UNUSED(vehicle); return QStringLiteral("COM_DISARM_LAND"); }
     uint32_t            highLatencyCustomModeTo32Bits   (uint16_t hlCustomMode) override;
     bool                supportsTerrainFrame            (void) const override { return false; }
+    bool                supportsNegativeThrust          (Vehicle *vehicle) override;
 
 protected:
     typedef struct {
@@ -122,7 +123,7 @@ class PX4FirmwarePluginInstanceData : public QObject
     Q_OBJECT
 
 public:
-    PX4FirmwarePluginInstanceData(QObject* parent = NULL);
+    PX4FirmwarePluginInstanceData(QObject* parent = nullptr);
 
     bool versionNotified;  ///< true: user notified over version issue
 };

src/FirmwarePlugin/PX4/PX4FirmwarePluginFactory.cc

@@ -13,6 +13,7 @@
 
 #include "PX4FirmwarePluginFactory.h"
 #include "PX4/PX4FirmwarePlugin.h"
+
 PX4FirmwarePluginFactory PX4FirmwarePluginFactory;
 
 PX4FirmwarePluginFactory::PX4FirmwarePluginFactory(void)
@@ -24,21 +25,17 @@ PX4FirmwarePluginFactory::PX4FirmwarePluginFactory(void)
 QList<MAV_AUTOPILOT> PX4FirmwarePluginFactory::supportedFirmwareTypes(void) const
 {
     QList<MAV_AUTOPILOT> list;
-
     list.append(MAV_AUTOPILOT_PX4);
     return list;
 }
 
-FirmwarePlugin* PX4FirmwarePluginFactory::firmwarePluginForAutopilot(MAV_AUTOPILOT autopilotType, MAV_TYPE vehicleType)
+FirmwarePlugin* PX4FirmwarePluginFactory::firmwarePluginForAutopilot(MAV_AUTOPILOT autopilotType, MAV_TYPE /*vehicleType*/)
 {
-    Q_UNUSED(vehicleType);
-
     if (autopilotType == MAV_AUTOPILOT_PX4) {
         if (!_pluginInstance) {
-            _pluginInstance = new PX4FirmwarePlugin;
+            _pluginInstance = new PX4FirmwarePlugin();
         }
         return _pluginInstance;
     }
-
     return nullptr;
 }

src/Vehicle/Vehicle.cc

@@ -2871,9 +2871,9 @@ bool Vehicle::supportsThrottleModeCenterZero(void) const
     return _firmwarePlugin->supportsThrottleModeCenterZero();
 }
 
-bool Vehicle::supportsNegativeThrust(void) const
+bool Vehicle::supportsNegativeThrust(void)
 {
-    return _firmwarePlugin->supportsNegativeThrust();
+    return _firmwarePlugin->supportsNegativeThrust(this);
 }
 
 bool Vehicle::supportsRadio(void) const

src/Vehicle/Vehicle.h

@@ -854,7 +854,7 @@ public:
     bool sub(void) const;
 
     bool supportsThrottleModeCenterZero (void) const;
-    bool supportsNegativeThrust         (void) const;
+    bool supportsNegativeThrust         (void);
     bool supportsRadio                  (void) const;
     bool supportsJSButton               (void) const;
     bool supportsMotorInterference      (void) const;