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
1b29384e
Commit
1b29384e
authored
Nov 23, 2016
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
RallyPoint support should be optional
parent
d1cc23a2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
APMRallyPointManager.cc
src/FirmwarePlugin/APM/APMRallyPointManager.cc
+7
-2
APMRallyPointManager.h
src/FirmwarePlugin/APM/APMRallyPointManager.h
+1
-1
No files found.
src/FirmwarePlugin/APM/APMRallyPointManager.cc
View file @
1b29384e
...
@@ -31,7 +31,7 @@ APMRallyPointManager::~APMRallyPointManager()
...
@@ -31,7 +31,7 @@ APMRallyPointManager::~APMRallyPointManager()
void
APMRallyPointManager
::
sendToVehicle
(
const
QList
<
QGeoCoordinate
>&
rgPoints
)
void
APMRallyPointManager
::
sendToVehicle
(
const
QList
<
QGeoCoordinate
>&
rgPoints
)
{
{
if
(
_vehicle
->
isOfflineEditingVehicle
())
{
if
(
_vehicle
->
isOfflineEditingVehicle
()
||
!
rallyPointsSupported
()
)
{
return
;
return
;
}
}
...
@@ -53,7 +53,7 @@ void APMRallyPointManager::sendToVehicle(const QList<QGeoCoordinate>& rgPoints)
...
@@ -53,7 +53,7 @@ void APMRallyPointManager::sendToVehicle(const QList<QGeoCoordinate>& rgPoints)
void
APMRallyPointManager
::
loadFromVehicle
(
void
)
void
APMRallyPointManager
::
loadFromVehicle
(
void
)
{
{
if
(
_vehicle
->
isOfflineEditingVehicle
()
||
_readTransactionInProgress
)
{
if
(
_vehicle
->
isOfflineEditingVehicle
()
||
!
rallyPointsSupported
()
||
_readTransactionInProgress
)
{
return
;
return
;
}
}
...
@@ -144,3 +144,8 @@ bool APMRallyPointManager::inProgress(void) const
...
@@ -144,3 +144,8 @@ bool APMRallyPointManager::inProgress(void) const
{
{
return
_readTransactionInProgress
||
_writeTransactionInProgress
;
return
_readTransactionInProgress
||
_writeTransactionInProgress
;
}
}
bool
APMRallyPointManager
::
rallyPointsSupported
(
void
)
const
{
return
_vehicle
->
parameterManager
()
->
parameterExists
(
_vehicle
->
defaultComponentId
(),
_rallyTotalParam
);
}
src/FirmwarePlugin/APM/APMRallyPointManager.h
View file @
1b29384e
...
@@ -25,7 +25,7 @@ public:
...
@@ -25,7 +25,7 @@ public:
bool
inProgress
(
void
)
const
final
;
bool
inProgress
(
void
)
const
final
;
void
loadFromVehicle
(
void
)
final
;
void
loadFromVehicle
(
void
)
final
;
void
sendToVehicle
(
const
QList
<
QGeoCoordinate
>&
rgPoints
)
final
;
void
sendToVehicle
(
const
QList
<
QGeoCoordinate
>&
rgPoints
)
final
;
bool
rallyPointsSupported
(
void
)
const
final
{
return
true
;
}
bool
rallyPointsSupported
(
void
)
const
final
;
QString
editorQml
(
void
)
const
final
{
return
QStringLiteral
(
"qrc:/FirmwarePlugin/APM/APMRallyPointEditor.qml"
);
}
QString
editorQml
(
void
)
const
final
{
return
QStringLiteral
(
"qrc:/FirmwarePlugin/APM/APMRallyPointEditor.qml"
);
}
...
...
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