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
70c8c4ab
Commit
70c8c4ab
authored
Apr 25, 2017
by
DonLakeFlyer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Better logging
parent
0b156cdd
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
8 additions
and
5 deletions
+8
-5
GeoFenceController.cc
src/MissionManager/GeoFenceController.cc
+3
-2
MissionController.cc
src/MissionManager/MissionController.cc
+2
-1
RallyPointController.cc
src/MissionManager/RallyPointController.cc
+3
-2
No files found.
src/MissionManager/GeoFenceController.cc
View file @
70c8c4ab
...
@@ -186,6 +186,7 @@ void GeoFenceController::sendToVehicle(void)
...
@@ -186,6 +186,7 @@ void GeoFenceController::sendToVehicle(void)
}
else
if
(
syncInProgress
())
{
}
else
if
(
syncInProgress
())
{
qCWarning
(
GeoFenceControllerLog
)
<<
"GeoFenceController::sendToVehicle called while syncInProgress"
;
qCWarning
(
GeoFenceControllerLog
)
<<
"GeoFenceController::sendToVehicle called while syncInProgress"
;
}
else
{
}
else
{
qCDebug
(
GeoFenceControllerLog
)
<<
"GeoFenceController::sendToVehicle"
;
_geoFenceManager
->
sendToVehicle
(
_breachReturnPoint
,
_mapPolygon
.
pathModel
());
_geoFenceManager
->
sendToVehicle
(
_breachReturnPoint
,
_mapPolygon
.
pathModel
());
_mapPolygon
.
setDirty
(
false
);
_mapPolygon
.
setDirty
(
false
);
setDirty
(
false
);
setDirty
(
false
);
...
@@ -316,14 +317,14 @@ void GeoFenceController::_updateContainsItems(void)
...
@@ -316,14 +317,14 @@ void GeoFenceController::_updateContainsItems(void)
bool
GeoFenceController
::
showPlanFromManagerVehicle
(
void
)
bool
GeoFenceController
::
showPlanFromManagerVehicle
(
void
)
{
{
qCDebug
(
GeoFenceControllerLog
)
<<
"showPlanFromManagerVehicle"
;
qCDebug
(
GeoFenceControllerLog
)
<<
"showPlanFromManagerVehicle"
<<
_editMode
;
if
(
_masterController
->
offline
())
{
if
(
_masterController
->
offline
())
{
qCWarning
(
GeoFenceControllerLog
)
<<
"GeoFenceController::showPlanFromManagerVehicle called while offline"
;
qCWarning
(
GeoFenceControllerLog
)
<<
"GeoFenceController::showPlanFromManagerVehicle called while offline"
;
return
true
;
// stops further propogation of showPlanFromManagerVehicle due to error
return
true
;
// stops further propogation of showPlanFromManagerVehicle due to error
}
else
{
}
else
{
_itemsRequested
=
true
;
_itemsRequested
=
true
;
if
(
!
_managerVehicle
->
initialPlanRequestComplete
())
{
if
(
!
_managerVehicle
->
initialPlanRequestComplete
())
{
// The vehicle hasn't completed initial load, we can just wait for
newMissionItemsAvailabl
e to be signalled automatically
// The vehicle hasn't completed initial load, we can just wait for
loadComplet
e to be signalled automatically
qCDebug
(
GeoFenceControllerLog
)
<<
"showPlanFromManagerVehicle: !initialPlanRequestComplete, wait for signal"
;
qCDebug
(
GeoFenceControllerLog
)
<<
"showPlanFromManagerVehicle: !initialPlanRequestComplete, wait for signal"
;
return
true
;
return
true
;
}
else
if
(
syncInProgress
())
{
}
else
if
(
syncInProgress
())
{
...
...
src/MissionManager/MissionController.cc
View file @
70c8c4ab
...
@@ -205,6 +205,7 @@ void MissionController::sendToVehicle(void)
...
@@ -205,6 +205,7 @@ void MissionController::sendToVehicle(void)
}
else
if
(
syncInProgress
())
{
}
else
if
(
syncInProgress
())
{
qCWarning
(
MissionControllerLog
)
<<
"MissionControllerLog::sendToVehicle called while syncInProgress"
;
qCWarning
(
MissionControllerLog
)
<<
"MissionControllerLog::sendToVehicle called while syncInProgress"
;
}
else
{
}
else
{
qCDebug
(
MissionControllerLog
)
<<
"MissionControllerLog::sendToVehicle"
;
if
(
_visualItems
->
count
()
==
1
)
{
if
(
_visualItems
->
count
()
==
1
)
{
// This prevents us from sending a possibly bogus home position to the vehicle
// This prevents us from sending a possibly bogus home position to the vehicle
QmlObjectListModel
emptyModel
;
QmlObjectListModel
emptyModel
;
...
@@ -1678,7 +1679,7 @@ void MissionController::_visualItemsDirtyChanged(bool dirty)
...
@@ -1678,7 +1679,7 @@ void MissionController::_visualItemsDirtyChanged(bool dirty)
bool
MissionController
::
showPlanFromManagerVehicle
(
void
)
bool
MissionController
::
showPlanFromManagerVehicle
(
void
)
{
{
qCDebug
(
MissionControllerLog
)
<<
"showPlanFromManagerVehicle"
;
qCDebug
(
MissionControllerLog
)
<<
"showPlanFromManagerVehicle"
<<
_editMode
;
if
(
_masterController
->
offline
())
{
if
(
_masterController
->
offline
())
{
qCWarning
(
MissionControllerLog
)
<<
"MissionController::showPlanFromManagerVehicle called while offline"
;
qCWarning
(
MissionControllerLog
)
<<
"MissionController::showPlanFromManagerVehicle called while offline"
;
return
true
;
// stops further propogation of showPlanFromManagerVehicle due to error
return
true
;
// stops further propogation of showPlanFromManagerVehicle due to error
...
...
src/MissionManager/RallyPointController.cc
View file @
70c8c4ab
...
@@ -157,6 +157,7 @@ void RallyPointController::sendToVehicle(void)
...
@@ -157,6 +157,7 @@ void RallyPointController::sendToVehicle(void)
}
else
if
(
syncInProgress
())
{
}
else
if
(
syncInProgress
())
{
qCWarning
(
RallyPointControllerLog
)
<<
"RallyPointController::sendToVehicle called while syncInProgress"
;
qCWarning
(
RallyPointControllerLog
)
<<
"RallyPointController::sendToVehicle called while syncInProgress"
;
}
else
{
}
else
{
qCDebug
(
RallyPointControllerLog
)
<<
"RallyPointController::sendToVehicle"
;
setDirty
(
false
);
setDirty
(
false
);
QList
<
QGeoCoordinate
>
rgPoints
;
QList
<
QGeoCoordinate
>
rgPoints
;
for
(
int
i
=
0
;
i
<
_points
.
count
();
i
++
)
{
for
(
int
i
=
0
;
i
<
_points
.
count
();
i
++
)
{
...
@@ -280,13 +281,13 @@ void RallyPointController::_updateContainsItems(void)
...
@@ -280,13 +281,13 @@ void RallyPointController::_updateContainsItems(void)
bool
RallyPointController
::
showPlanFromManagerVehicle
(
void
)
bool
RallyPointController
::
showPlanFromManagerVehicle
(
void
)
{
{
qCDebug
(
RallyPointControllerLog
)
<<
"showPlanFromManagerVehicle
"
;
qCDebug
(
RallyPointControllerLog
)
<<
"showPlanFromManagerVehicle
_editMode"
<<
_editMode
;
if
(
_masterController
->
offline
())
{
if
(
_masterController
->
offline
())
{
qCWarning
(
RallyPointControllerLog
)
<<
"RallyPointController::showPlanFromManagerVehicle called while offline"
;
qCWarning
(
RallyPointControllerLog
)
<<
"RallyPointController::showPlanFromManagerVehicle called while offline"
;
return
true
;
// stops further propogation of showPlanFromManagerVehicle due to error
return
true
;
// stops further propogation of showPlanFromManagerVehicle due to error
}
else
{
}
else
{
if
(
!
_managerVehicle
->
initialPlanRequestComplete
())
{
if
(
!
_managerVehicle
->
initialPlanRequestComplete
())
{
// The vehicle hasn't completed initial load, we can just wait for
newMissionItemsAvailabl
e to be signalled automatically
// The vehicle hasn't completed initial load, we can just wait for
loadComplet
e to be signalled automatically
qCDebug
(
RallyPointControllerLog
)
<<
"showPlanFromManagerVehicle: !initialPlanRequestComplete, wait for signal"
;
qCDebug
(
RallyPointControllerLog
)
<<
"showPlanFromManagerVehicle: !initialPlanRequestComplete, wait for signal"
;
return
true
;
return
true
;
}
else
if
(
syncInProgress
())
{
}
else
if
(
syncInProgress
())
{
...
...
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