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
3d5c119d
Commit
3d5c119d
authored
Feb 17, 2014
by
Don Gagne
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Final Warnings fixed plus Warnings as Errors turned on
parent
db719606
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
24 deletions
+14
-24
qgroundcontrol.pro
qgroundcontrol.pro
+3
-5
MAVLinkSimulationLink.cc
src/comm/MAVLinkSimulationLink.cc
+1
-0
MAVLinkSimulationWaypointPlanner.cc
src/comm/MAVLinkSimulationWaypointPlanner.cc
+10
-19
No files found.
qgroundcontrol.pro
View file @
3d5c119d
...
...
@@ -123,15 +123,13 @@ WindowsBuild {
#
MacBuild
|
LinuxBuild
{
QMAKE_CXXFLAGS_WARN_ON
+=
-
Wall
}
MacBuild
{
QMAKE_CXXFLAGS_WARN_ON
+=
-
Werror
QMAKE_CXXFLAGS_WARN_ON
+=
-
Wall
\
-
Werror
}
WindowsBuild
{
QMAKE_CXXFLAGS_WARN_ON
+=
/
W3
\
/
WX
\
/
wd4996
\
#
silence
warnings
about
deprecated
strcpy
and
whatnot
/
wd4290
#
ignore
exception
specifications
}
...
...
src/comm/MAVLinkSimulationLink.cc
View file @
3d5c119d
...
...
@@ -483,6 +483,7 @@ void MAVLinkSimulationLink::mainloop()
#ifdef MAVLINK_ENABLED_PIXHAWK
mavlink_pattern_detected_t
detected
;
detected
.
confidence
=
5.0
f
;
detected
.
type
=
0
;
// compiler confused into thinking type is used unitialized, bogus init to silence
if
(
detectionCounter
==
10
)
{
char
fileName
[]
=
"patterns/face5.png"
;
...
...
src/comm/MAVLinkSimulationWaypointPlanner.cc
View file @
3d5c119d
...
...
@@ -523,38 +523,29 @@ void MAVLinkSimulationWaypointPlanner::send_setpoint(uint16_t seq)
if
(
seq
<
waypoints
->
size
())
{
mavlink_mission_item_t
*
cur
=
waypoints
->
at
(
seq
);
mavlink_message_t
msg
;
mavlink_set_local_position_setpoint_t
PControlSetPoint
;
// send new set point to local IMU
if
(
cur
->
frame
==
1
)
{
PControlSetPoint
.
target_system
=
systemid
;
PControlSetPoint
.
target_component
=
MAV_COMP_ID_IMU
;
PControlSetPoint
.
x
=
cur
->
x
;
PControlSetPoint
.
y
=
cur
->
y
;
PControlSetPoint
.
z
=
cur
->
z
;
PControlSetPoint
.
yaw
=
cur
->
param4
;
if
(
cur
->
frame
==
MAV_FRAME_LOCAL_NED
||
cur
->
frame
==
MAV_FRAME_LOCAL_ENU
)
{
mavlink_message_t
msg
;
mavlink_set_local_position_setpoint_t
PControlSetPoint
;
mavlink_msg_set_local_position_setpoint_encode
(
systemid
,
compid
,
&
msg
,
&
PControlSetPoint
);
link
->
sendMAVLinkMessage
(
&
msg
);
}
else
{
//if (verbose) qDebug("No new set point sent to IMU because the new waypoint %u had no local coordinates\n", cur->seq);
PControlSetPoint
.
target_system
=
systemid
;
PControlSetPoint
.
target_component
=
MAV_COMP_ID_IMU
;
PControlSetPoint
.
x
=
cur
->
x
;
PControlSetPoint
.
y
=
cur
->
y
;
PControlSetPoint
.
z
=
cur
->
z
;
PControlSetPoint
.
yaw
=
cur
->
param4
;
PControlSetPoint
.
coordinate_frame
=
cur
->
frame
;
mavlink_msg_set_local_position_setpoint_encode
(
systemid
,
compid
,
&
msg
,
&
PControlSetPoint
);
link
->
sendMAVLinkMessage
(
&
msg
);
emit
messageSent
(
msg
);
uint64_t
now
=
QGC
::
groundTimeMilliseconds
();
timestamp_last_send_setpoint
=
now
;
}
else
if
(
verbose
)
{
qDebug
(
"No new set point sent to IMU because the new waypoint %u had no local coordinates
\n
"
,
cur
->
seq
);
}
uint64_t
now
=
QGC
::
groundTimeMilliseconds
();
timestamp_last_send_setpoint
=
now
;
}
}
...
...
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