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
5e22d5a8
Commit
5e22d5a8
authored
Sep 22, 2010
by
lm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed boost dependency
parent
c885971c
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
6 deletions
+6
-6
UAS.cc
src/uas/UAS.cc
+3
-3
QMap3DWidget.cc
src/ui/map3D/QMap3DWidget.cc
+1
-1
QMap3DWidget.h
src/ui/map3D/QMap3DWidget.h
+2
-2
No files found.
src/uas/UAS.cc
View file @
5e22d5a8
...
...
@@ -1132,8 +1132,8 @@ void UAS::setManualControlCommands(double roll, double pitch, double yaw, double
manualYawAngle
=
yaw
*
yawScaling
;
manualThrust
=
thrust
*
thrustScaling
;
if
(
mode
==
(
int
)
MAV_MODE_MANUAL
)
{
//
if(mode == (int)MAV_MODE_MANUAL)
//
{
#ifdef MAVLINK_ENABLED_PIXHAWK_MESSAGES
mavlink_message_t
message
;
mavlink_msg_manual_control_pack
(
MG
::
SYSTEM
::
ID
,
MG
::
SYSTEM
::
COMPID
,
&
message
,
this
->
uasId
,
(
float
)
manualRollAngle
,
(
float
)
manualPitchAngle
,
(
float
)
manualYawAngle
,
(
float
)
manualThrust
,
controlRollManual
,
controlPitchManual
,
controlYawManual
,
controlThrustManual
);
...
...
@@ -1142,7 +1142,7 @@ void UAS::setManualControlCommands(double roll, double pitch, double yaw, double
emit
attitudeThrustSetPointChanged
(
this
,
roll
,
pitch
,
yaw
,
thrust
,
MG
::
TIME
::
getGroundTimeNow
());
#endif
}
//
}
}
int
UAS
::
getSystemType
()
...
...
src/ui/map3D/QMap3DWidget.cc
View file @
5e22d5a8
...
...
@@ -64,7 +64,7 @@ QMap3DWidget::display(void* clientData)
void
QMap3DWidget
::
displayHandler
(
void
)
{
if
(
cheetahModel
.
get
()
==
0
)
if
(
cheetahModel
.
data
()
==
0
)
{
cheetahModel
.
reset
(
new
CheetahModel
);
cheetahModel
->
init
(
1.0
f
,
1.0
f
,
1.0
f
);
...
...
src/ui/map3D/QMap3DWidget.h
View file @
5e22d5a8
...
...
@@ -34,8 +34,8 @@ protected:
private:
double
lastRedrawTime
;
boost
::
scoped_pt
r
<
CheetahModel
>
cheetahModel
;
boost
::
scoped_pt
r
<
FTTextureFont
>
font
;
QScopedPointe
r
<
CheetahModel
>
cheetahModel
;
QScopedPointe
r
<
FTTextureFont
>
font
;
};
#endif // QMAP3DWIDGET_H
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