Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
993f5251
Commit
993f5251
authored
Dec 27, 2016
by
Don Gagne
Committed by
GitHub
Dec 27, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #4353 from DonLakeFlyer/APM3.2GeoFence
Correct handling of no GeoFence support
parents
97251f4d
35603b4b
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
12 additions
and
7 deletions
+12
-7
qgroundcontrol.qrc
qgroundcontrol.qrc
+1
-1
APMGeoFenceManager.cc
src/FirmwarePlugin/APM/APMGeoFenceManager.cc
+10
-5
NoGeoFenceEditor.qml
src/FirmwarePlugin/NoGeoFenceEditor.qml
+0
-0
GeoFenceManager.h
src/MissionManager/GeoFenceManager.h
+1
-1
No files found.
qgroundcontrol.qrc
View file @
993f5251
...
...
@@ -168,6 +168,6 @@
<file alias="PX4MockLink.params">src/comm/PX4MockLink.params</file>
</qresource>
<qresource prefix="/FirmwarePlugin">
<file alias="
GeoFenceEditor.qml">src/FirmwarePlugin/
GeoFenceEditor.qml</file>
<file alias="
NoGeoFenceEditor.qml">src/FirmwarePlugin/No
GeoFenceEditor.qml</file>
</qresource>
</RCC>
src/FirmwarePlugin/APM/APMGeoFenceManager.cc
View file @
993f5251
...
...
@@ -251,8 +251,9 @@ void APMGeoFenceManager::_parametersReady(void)
if
(
!
_firstParamLoadComplete
)
{
_firstParamLoadComplete
=
true
;
_fenceSupported
=
_vehicle
->
parameterManager
()
->
parameterExists
(
FactSystem
::
defaultComponentId
,
QStringLiteral
(
"FENCE_ACTION"
))
&&
!
qgcApp
()
->
runningUnitTests
();
_fenceSupported
=
_vehicle
->
parameterManager
()
->
parameterExists
(
FactSystem
::
defaultComponentId
,
_fenceTotalParam
)
&&
_vehicle
->
parameterManager
()
->
parameterExists
(
FactSystem
::
defaultComponentId
,
_fenceActionParam
)
&&
!
qgcApp
()
->
runningUnitTests
();
if
(
_fenceSupported
)
{
QStringList
paramNames
;
...
...
@@ -319,7 +320,11 @@ void APMGeoFenceManager::_circleRadiusRawValueChanged(QVariant value)
QString
APMGeoFenceManager
::
editorQml
(
void
)
const
{
return
_vehicle
->
multiRotor
()
?
QStringLiteral
(
"qrc:/FirmwarePlugin/APM/CopterGeoFenceEditor.qml"
)
:
QStringLiteral
(
"qrc:/FirmwarePlugin/APM/PlaneGeoFenceEditor.qml"
);
if
(
_fenceSupported
)
{
return
_vehicle
->
multiRotor
()
?
QStringLiteral
(
"qrc:/FirmwarePlugin/APM/CopterGeoFenceEditor.qml"
)
:
QStringLiteral
(
"qrc:/FirmwarePlugin/APM/PlaneGeoFenceEditor.qml"
);
}
else
{
return
QStringLiteral
(
"qrc:/FirmwarePlugin/NoGeoFenceEditor.qml"
);
}
}
src/FirmwarePlugin/GeoFenceEditor.qml
→
src/FirmwarePlugin/
No
GeoFenceEditor.qml
View file @
993f5251
File moved
src/MissionManager/GeoFenceManager.h
View file @
993f5251
...
...
@@ -49,7 +49,7 @@ public:
virtual
QVariantList
params
(
void
)
const
{
return
QVariantList
();
}
virtual
QStringList
paramLabels
(
void
)
const
{
return
QStringList
();
}
virtual
QString
editorQml
(
void
)
const
{
return
QStringLiteral
(
"qrc:/FirmwarePlugin/GeoFenceEditor.qml"
);
}
virtual
QString
editorQml
(
void
)
const
{
return
QStringLiteral
(
"qrc:/FirmwarePlugin/
No
GeoFenceEditor.qml"
);
}
/// Error codes returned in error signal
typedef
enum
{
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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