Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
7f81508f
Unverified
Commit
7f81508f
authored
Feb 22, 2020
by
Don Gagne
Committed by
GitHub
Feb 22, 2020
Browse files
Merge pull request #8383 from DonLakeFlyer/ROIAvailability
Drive Plan view ROI support from firmware capability bits
parents
dfd72eea
d80e89b1
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/FirmwarePlugin/FirmwarePlugin.h
View file @
7f81508f
...
...
@@ -48,7 +48,7 @@ public:
GuidedModeCapability
=
1
<<
2
,
///< Vehicle supports guided mode commands
OrbitModeCapability
=
1
<<
3
,
///< Vehicle supports orbit mode
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
;
/// Maps from on parameter name to another
...
...
src/PlanView/PlanView.qml
View file @
7f81508f
...
...
@@ -617,7 +617,7 @@ Item {
name
:
_missionController
.
isROIActive
?
qsTr
(
"
Cancel ROI
"
)
:
qsTr
(
"
ROI
"
),
iconSource
:
"
/qmlimages/MapAddMission.svg
"
,
buttonEnabled
:
true
,
buttonVisible
:
_isMissionLayer
,
buttonVisible
:
_isMissionLayer
&&
_planMasterController
.
controllerVehicle
.
roiModeSupported
,
toggle
:
!
_missionController
.
isROIActive
},
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment