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
a04426b2
Commit
a04426b2
authored
Jul 22, 2019
by
Jonathan Zaturensky
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix client initialization issue with AirMap flight planning
parent
95626cf8
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
1 deletion
+7
-1
PlanMasterController.cc
src/MissionManager/PlanMasterController.cc
+6
-1
PlanMasterController.h
src/MissionManager/PlanMasterController.h
+1
-0
No files found.
src/MissionManager/PlanMasterController.cc
View file @
a04426b2
...
@@ -82,7 +82,8 @@ void PlanMasterController::start(bool flyView)
...
@@ -82,7 +82,8 @@ void PlanMasterController::start(bool flyView)
#if defined(QGC_AIRMAP_ENABLED)
#if defined(QGC_AIRMAP_ENABLED)
//-- This assumes there is one single instance of PlanMasterController in edit mode.
//-- This assumes there is one single instance of PlanMasterController in edit mode.
if
(
!
flyView
)
{
if
(
!
flyView
)
{
qgcApp
()
->
toolbox
()
->
airspaceManager
()
->
flightPlan
()
->
startFlightPlanning
(
this
);
// Wait for signal confirming AirMap client connection before starting flight planning
connect
(
qgcApp
()
->
toolbox
()
->
airspaceManager
(),
&
AirspaceManager
::
connectStatusChanged
,
this
,
&
PlanMasterController
::
_startFlightPlanning
);
}
}
#endif
#endif
}
}
...
@@ -271,6 +272,10 @@ void PlanMasterController::_sendRallyPointsComplete(void)
...
@@ -271,6 +272,10 @@ void PlanMasterController::_sendRallyPointsComplete(void)
}
}
}
}
void
PlanMasterController
::
_startFlightPlanning
(
void
)
{
qgcApp
()
->
toolbox
()
->
airspaceManager
()
->
flightPlan
()
->
startFlightPlanning
(
this
);
}
void
PlanMasterController
::
sendToVehicle
(
void
)
void
PlanMasterController
::
sendToVehicle
(
void
)
{
{
if
(
_managerVehicle
->
highLatencyLink
())
{
if
(
_managerVehicle
->
highLatencyLink
())
{
...
...
src/MissionManager/PlanMasterController.h
View file @
a04426b2
...
@@ -111,6 +111,7 @@ private slots:
...
@@ -111,6 +111,7 @@ private slots:
void
_sendMissionComplete
(
void
);
void
_sendMissionComplete
(
void
);
void
_sendGeoFenceComplete
(
void
);
void
_sendGeoFenceComplete
(
void
);
void
_sendRallyPointsComplete
(
void
);
void
_sendRallyPointsComplete
(
void
);
void
_startFlightPlanning
(
void
);
private:
private:
void
_showPlanFromManagerVehicle
(
void
);
void
_showPlanFromManagerVehicle
(
void
);
...
...
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