diff --git a/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc b/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc index f5c1489e331e9727c40d31820c961296e976f635..12459a699b3bb668db7aaccde70e6204f910ddb8 100644 --- a/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc +++ b/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.cc @@ -111,8 +111,3 @@ bool ArduRoverFirmwarePlugin::supportsNegativeThrust(void) { return true; } - -bool ArduRoverFirmwarePlugin::supportsManualControl(void) -{ - return true; -} diff --git a/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h b/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h index 3b0c30b57166e95fdd4d125d0b6a30c9095fa289..21467655c444b8620a26fb7ef28afe9cda2c665e 100644 --- a/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h +++ b/src/FirmwarePlugin/APM/ArduRoverFirmwarePlugin.h @@ -56,7 +56,6 @@ public: int remapParamNameHigestMinorVersionNumber (int majorVersionNumber) const final; const FirmwarePlugin::remapParamNameMajorVersionMap_t& paramNameRemapMajorVersionMap(void) const final { return _remapParamName; } bool supportsNegativeThrust(void) final; - bool supportsManualControl(void) final; private: static bool _remapParamNameIntialized; diff --git a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc index a77106ada72bc470e07e6efb7ae67d221dc24eed..b06b53990a2157a8d29fee02c76589ddf0be3758 100644 --- a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc +++ b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.cc @@ -132,11 +132,6 @@ bool ArduSubFirmwarePlugin::supportsThrottleModeCenterZero(void) return false; } -bool ArduSubFirmwarePlugin::supportsManualControl(void) -{ - return true; -} - bool ArduSubFirmwarePlugin::supportsRadio(void) { return false; diff --git a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h index ecbbd9d9ff2097c7bb7da5d305ca755bba8ca112..c28ca691049e1303e490a88018ecb3edda7a76d4 100644 --- a/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h +++ b/src/FirmwarePlugin/APM/ArduSubFirmwarePlugin.h @@ -107,8 +107,6 @@ public: bool supportsThrottleModeCenterZero(void) final; - bool supportsManualControl(void) final; - bool supportsRadio(void) final; bool supportsJSButton(void) final; diff --git a/src/FirmwarePlugin/FirmwarePlugin.cc b/src/FirmwarePlugin/FirmwarePlugin.cc index f4ae09012a2cd702f2fa8983e59ff534fb44b974..4438e99dd60b8de91e7d1ef62ce6eda578261f57 100644 --- a/src/FirmwarePlugin/FirmwarePlugin.cc +++ b/src/FirmwarePlugin/FirmwarePlugin.cc @@ -135,11 +135,6 @@ bool FirmwarePlugin::supportsNegativeThrust(void) return false; } -bool FirmwarePlugin::supportsManualControl(void) -{ - return false; -} - bool FirmwarePlugin::supportsRadio(void) { return true; diff --git a/src/FirmwarePlugin/FirmwarePlugin.h b/src/FirmwarePlugin/FirmwarePlugin.h index 84604746ede1ed6f57d3c932412d20380a2cf096..f17b6ff0f536c6e7ebf39f123c1a18e398a69c51 100644 --- a/src/FirmwarePlugin/FirmwarePlugin.h +++ b/src/FirmwarePlugin/FirmwarePlugin.h @@ -163,10 +163,6 @@ public: /// Typically supported rover. virtual bool supportsNegativeThrust(void); - /// Returns true if the firmware supports the use of the MAVlink "MANUAL_CONTROL" message. - /// By default, this returns false unless overridden in the firmware plugin. - virtual bool supportsManualControl(void); - /// Returns true if the firmware supports the use of the RC radio and requires the RC radio /// setup page. Returns true by default. virtual bool supportsRadio(void); diff --git a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc index 4787087474b2413c6b123e3baec567618111f122..fb0b7f1ee97b8257d02ec097bb9117bce5b5118f 100644 --- a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc +++ b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.cc @@ -220,11 +220,6 @@ int PX4FirmwarePlugin::manualControlReservedButtonCount(void) return 0; // 0 buttons reserved for rc switch simulation } -bool PX4FirmwarePlugin::supportsManualControl(void) -{ - return true; -} - bool PX4FirmwarePlugin::isCapable(const Vehicle *vehicle, FirmwareCapabilities capabilities) { int available = MavCmdPreflightStorageCapability | SetFlightModeCapability | PauseVehicleCapability | GuidedModeCapability; diff --git a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h index 8e4a8de55f02039deb4a42b959b286948e61a7f9..b6d9a4dc6c144a73a08ec877c53c99cd51097b45 100644 --- a/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h +++ b/src/FirmwarePlugin/PX4/PX4FirmwarePlugin.h @@ -51,7 +51,6 @@ public: void startMission (Vehicle* vehicle) override; bool isGuidedMode (const Vehicle* vehicle) const override; int manualControlReservedButtonCount(void) override; - bool supportsManualControl (void) override; void initializeVehicle (Vehicle* vehicle) override; bool sendHomePositionToVehicle (void) override; void addMetaDataToFact (QObject* parameterMetaData, Fact* fact, MAV_TYPE vehicleType) override; diff --git a/src/FlightDisplay/FlightDisplayView.qml b/src/FlightDisplay/FlightDisplayView.qml index 4114f9e51c03fcf4911f68249257a6ff24cc7fd8..f2550dc66c0e7df54afa6481151ee204b915e9f7 100644 --- a/src/FlightDisplay/FlightDisplayView.qml +++ b/src/FlightDisplay/FlightDisplayView.qml @@ -92,12 +92,6 @@ QGCView { QGroundControl.saveBoolGlobalSetting(_PIPVisibleKey, state) } - function px4JoystickCheck() { - if ( _activeVehicle && !_activeVehicle.supportsManualControl && (QGroundControl.settingsManager.appSettings.virtualJoystick.value || _activeVehicle.joystickEnabled)) { - px4JoystickSupport.open() - } - } - PlanMasterController { id: masterController Component.onCompleted: start(false /* editMode */) @@ -109,28 +103,8 @@ QGCView { onResumeMissionUploadFail: guidedActionsController.confirmAction(guidedActionsController.actionResumeMissionUploadFail) } - MessageDialog { - id: px4JoystickSupport - text: qsTr("Joystick support requires MAVLink MANUAL_CONTROL support. ") + - qsTr("The firmware you are running does not normally support this. ") + - qsTr("It will only work if you have modified the firmware to add MANUAL_CONTROL support.") - } - - Connections { - target: QGroundControl.multiVehicleManager - onActiveVehicleChanged: px4JoystickCheck() - } - - Connections { - target: QGroundControl.settingsManager.appSettings.virtualJoystick - onValueChanged: px4JoystickCheck() - } - - onActiveVehicleJoystickEnabledChanged: px4JoystickCheck() - Component.onCompleted: { setStates() - px4JoystickCheck() if(QGroundControl.corePlugin.options.flyViewOverlay.toString().length) { flyViewOverlay.source = QGroundControl.corePlugin.options.flyViewOverlay } diff --git a/src/Vehicle/Vehicle.cc b/src/Vehicle/Vehicle.cc index c2c4d6c13c5b14f339f8c158de1640e5f8555cd9..4a33621ce2bee7ad941be7b84f815741238a4983 100644 --- a/src/Vehicle/Vehicle.cc +++ b/src/Vehicle/Vehicle.cc @@ -2097,11 +2097,6 @@ bool Vehicle::vtol(void) const return _firmwarePlugin->isVtol(this); } -bool Vehicle::supportsManualControl(void) const -{ - return _firmwarePlugin->supportsManualControl(); -} - bool Vehicle::supportsThrottleModeCenterZero(void) const { return _firmwarePlugin->supportsThrottleModeCenterZero(); diff --git a/src/Vehicle/Vehicle.h b/src/Vehicle/Vehicle.h index bbeb2d248ce30ef064bfe48fcda8cff9c2d95c9c..1538729ae7b5a03d380a6fe1b5df6a0674adf31f 100644 --- a/src/Vehicle/Vehicle.h +++ b/src/Vehicle/Vehicle.h @@ -282,7 +282,6 @@ public: Q_PROPERTY(bool vtol READ vtol NOTIFY vehicleTypeChanged) Q_PROPERTY(bool rover READ rover NOTIFY vehicleTypeChanged) Q_PROPERTY(bool sub READ sub NOTIFY vehicleTypeChanged) - Q_PROPERTY(bool supportsManualControl READ supportsManualControl CONSTANT) Q_PROPERTY(bool supportsThrottleModeCenterZero READ supportsThrottleModeCenterZero CONSTANT) Q_PROPERTY(bool supportsNegativeThrust READ supportsNegativeThrust CONSTANT) Q_PROPERTY(bool supportsJSButton READ supportsJSButton CONSTANT) @@ -515,7 +514,6 @@ public: bool rover(void) const; bool sub(void) const; - bool supportsManualControl(void) const; bool supportsThrottleModeCenterZero(void) const; bool supportsNegativeThrust(void) const; bool supportsRadio(void) const;