Browse Source

Merge pull request #8383 from DonLakeFlyer/ROIAvailability

Drive Plan view ROI support from firmware capability bits
QGC4.4
Don Gagne 5 years ago committed by GitHub
parent
commit
7f81508fe5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/FirmwarePlugin/FirmwarePlugin.h
  2. 2
      src/PlanView/PlanView.qml

2
src/FirmwarePlugin/FirmwarePlugin.h

@ -48,7 +48,7 @@ public:
GuidedModeCapability = 1 << 2, ///< Vehicle supports guided mode commands GuidedModeCapability = 1 << 2, ///< Vehicle supports guided mode commands
OrbitModeCapability = 1 << 3, ///< Vehicle supports orbit mode OrbitModeCapability = 1 << 3, ///< Vehicle supports orbit mode
TakeoffVehicleCapability = 1 << 4, ///< Vehicle supports guided takeoff TakeoffVehicleCapability = 1 << 4, ///< Vehicle supports guided takeoff
ROIModeCapability = 1 << 5, ///< Vehicle supports ROI ROIModeCapability = 1 << 5, ///< Vehicle supports ROI (both in Fly guided mode and from Plan creation)
} FirmwareCapabilities; } FirmwareCapabilities;
/// Maps from on parameter name to another /// Maps from on parameter name to another

2
src/PlanView/PlanView.qml

@ -617,7 +617,7 @@ Item {
name: _missionController.isROIActive ? qsTr("Cancel ROI") : qsTr("ROI"), name: _missionController.isROIActive ? qsTr("Cancel ROI") : qsTr("ROI"),
iconSource: "/qmlimages/MapAddMission.svg", iconSource: "/qmlimages/MapAddMission.svg",
buttonEnabled: true, buttonEnabled: true,
buttonVisible: _isMissionLayer, buttonVisible: _isMissionLayer && _planMasterController.controllerVehicle.roiModeSupported,
toggle: !_missionController.isROIActive toggle: !_missionController.isROIActive
}, },
{ {

Loading…
Cancel
Save