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
1178728f
Unverified
Commit
1178728f
authored
Oct 25, 2019
by
Gus Grubba
Committed by
GitHub
Oct 25, 2019
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #7947 from mavlink/pr-rally-fence-fix
Fix test for rally and geofence support.
parents
ccde1899
521201d2
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
4 additions
and
0 deletions
+4
-0
GeoFenceController.cc
src/MissionManager/GeoFenceController.cc
+2
-0
RallyPointController.cc
src/MissionManager/RallyPointController.cc
+2
-0
No files found.
src/MissionManager/GeoFenceController.cc
View file @
1178728f
...
@@ -117,7 +117,9 @@ void GeoFenceController::managerVehicleChanged(Vehicle* managerVehicle)
...
@@ -117,7 +117,9 @@ void GeoFenceController::managerVehicleChanged(Vehicle* managerVehicle)
connect
(
_geoFenceManager
,
&
GeoFenceManager
::
removeAllComplete
,
this
,
&
GeoFenceController
::
_managerRemoveAllComplete
);
connect
(
_geoFenceManager
,
&
GeoFenceManager
::
removeAllComplete
,
this
,
&
GeoFenceController
::
_managerRemoveAllComplete
);
connect
(
_geoFenceManager
,
&
GeoFenceManager
::
inProgressChanged
,
this
,
&
GeoFenceController
::
syncInProgressChanged
);
connect
(
_geoFenceManager
,
&
GeoFenceManager
::
inProgressChanged
,
this
,
&
GeoFenceController
::
syncInProgressChanged
);
//-- GeoFenceController::supported() tests both the capability bit AND the protocol version.
connect
(
_managerVehicle
,
&
Vehicle
::
capabilityBitsChanged
,
this
,
&
GeoFenceController
::
supportedChanged
);
connect
(
_managerVehicle
,
&
Vehicle
::
capabilityBitsChanged
,
this
,
&
GeoFenceController
::
supportedChanged
);
connect
(
_managerVehicle
,
&
Vehicle
::
requestProtocolVersion
,
this
,
&
GeoFenceController
::
supportedChanged
);
connect
(
_managerVehicle
->
parameterManager
(),
&
ParameterManager
::
parametersReadyChanged
,
this
,
&
GeoFenceController
::
_parametersReady
);
connect
(
_managerVehicle
->
parameterManager
(),
&
ParameterManager
::
parametersReadyChanged
,
this
,
&
GeoFenceController
::
_parametersReady
);
_parametersReady
();
_parametersReady
();
...
...
src/MissionManager/RallyPointController.cc
View file @
1178728f
...
@@ -71,7 +71,9 @@ void RallyPointController::managerVehicleChanged(Vehicle* managerVehicle)
...
@@ -71,7 +71,9 @@ void RallyPointController::managerVehicleChanged(Vehicle* managerVehicle)
connect
(
_rallyPointManager
,
&
RallyPointManager
::
removeAllComplete
,
this
,
&
RallyPointController
::
_managerRemoveAllComplete
);
connect
(
_rallyPointManager
,
&
RallyPointManager
::
removeAllComplete
,
this
,
&
RallyPointController
::
_managerRemoveAllComplete
);
connect
(
_rallyPointManager
,
&
RallyPointManager
::
inProgressChanged
,
this
,
&
RallyPointController
::
syncInProgressChanged
);
connect
(
_rallyPointManager
,
&
RallyPointManager
::
inProgressChanged
,
this
,
&
RallyPointController
::
syncInProgressChanged
);
//-- RallyPointController::supported() tests both the capability bit AND the protocol version.
connect
(
_managerVehicle
,
&
Vehicle
::
capabilityBitsChanged
,
this
,
&
RallyPointController
::
supportedChanged
);
connect
(
_managerVehicle
,
&
Vehicle
::
capabilityBitsChanged
,
this
,
&
RallyPointController
::
supportedChanged
);
connect
(
_managerVehicle
,
&
Vehicle
::
requestProtocolVersion
,
this
,
&
RallyPointController
::
supportedChanged
);
emit
supportedChanged
(
supported
());
emit
supportedChanged
(
supported
());
}
}
...
...
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