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
2021535f
Commit
2021535f
authored
Mar 19, 2011
by
lm
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixed all SLUGS issues, fixed 2D map
parent
fe00cbb2
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
12 additions
and
5 deletions
+12
-5
SlugsDataSensorView.cc
src/ui/SlugsDataSensorView.cc
+2
-1
UASControlParameters.cpp
src/ui/uas/UASControlParameters.cpp
+8
-4
UASControlParameters.h
src/ui/uas/UASControlParameters.h
+2
-0
No files found.
src/ui/SlugsDataSensorView.cc
View file @
2021535f
...
...
@@ -86,7 +86,7 @@ void SlugsDataSensorView::slugRawDataChanged(int uasId, const mavlink_raw_imu_t
}
#ifdef MAVLINK_ENABLED_SLUGS
void
SlugsDataSensorView
::
slugsRCRawChannels
(
int
systemId
,
const
mavlink_rc_channels_raw_t
&
gpsDateTime
)
{
Q_UNUSED
(
systemId
);
...
...
@@ -109,6 +109,7 @@ void SlugsDataSensorView::slugsRCServo(int systemId, const mavlink_servo_output_
ui
->
m_pwmRuddTrim
->
setText
(
QString
::
number
(
gpsDateTime
.
servo7_raw
));
ui
->
m_pwmElevTrim
->
setText
(
QString
::
number
(
gpsDateTime
.
servo8_raw
));
}
#endif
void
SlugsDataSensorView
::
setActiveUAS
(
UASInterface
*
uas
){
activeUAS
=
uas
;
...
...
src/ui/uas/UASControlParameters.cpp
View file @
2021535f
...
...
@@ -75,17 +75,17 @@ void UASControlParameters::changedMode(int mode)
break
;
#else
case
(
uint8_t
)
MAV_MODE_AUTO
:
mode
=
"AUTO MODE"
;
mode
Temp
=
"AUTO MODE"
;
break
;
case
(
uint8_t
)
MAV_MODE_GUIDED
:
mode
=
"GUIDED MODE"
;
mode
Temp
=
"GUIDED MODE"
;
break
;
case
(
uint8_t
)
MAV_MODE_TEST1
:
mode
=
"TEST1 MODE"
;
mode
Temp
=
"TEST1 MODE"
;
break
;
case
(
uint8_t
)
MAV_MODE_TEST2
:
mode
=
"TEST2 MODE"
;
mode
Temp
=
"TEST2 MODE"
;
break
;
#endif
case
(
uint8_t
)
MAV_MODE_READY
:
...
...
@@ -157,6 +157,7 @@ void UASControlParameters::updateAttitude(UASInterface *uas, double roll, double
void
UASControlParameters
::
setCommands
()
{
#ifdef MAVLINK_ENABLED_SLUGS
if
(
this
->
activeUAS
)
{
UAS
*
myUas
=
static_cast
<
UAS
*>
(
this
->
activeUAS
);
...
...
@@ -170,6 +171,7 @@ void UASControlParameters::setCommands()
mavlink_msg_mid_lvl_cmds_encode
(
MG
::
SYSTEM
::
ID
,
MG
::
SYSTEM
::
COMPID
,
&
msg
,
&
this
->
tempCmds
);
myUas
->
sendMessage
(
msg
);
}
#endif
}
void
UASControlParameters
::
getCommands
()
...
...
@@ -181,6 +183,7 @@ void UASControlParameters::getCommands()
void
UASControlParameters
::
setPassthrough
()
{
#ifdef MAVLINK_ENABLED_SLUGS
if
(
this
->
activeUAS
)
{
UAS
*
myUas
=
static_cast
<
UAS
*>
(
this
->
activeUAS
);
...
...
@@ -218,6 +221,7 @@ void UASControlParameters::setPassthrough()
myUas
->
sendMessage
(
msg
);
//qDebug()<<tempCtrl.bitfieldPt;
}
#endif
}
void
UASControlParameters
::
updateMode
(
int
uas
,
QString
mode
,
QString
description
)
...
...
src/ui/uas/UASControlParameters.h
View file @
2021535f
...
...
@@ -44,8 +44,10 @@ private:
QString
REDcolorStyle
;
QPointer
<
RadioCalibrationData
>
radio
;
LinkInterface
*
hilLink
;
#ifdef MAVLINK_ENABLED_SLUGS
mavlink_mid_lvl_cmds_t
tempCmds
;
mavlink_ctrl_srfc_pt_t
tempCtrl
;
#endif
};
#endif // UASCONTROLPARAMETERS_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