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
e6ffde7c
Commit
e6ffde7c
authored
Feb 24, 2013
by
Lorenz Meier
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' of github.com:mavlink/qgroundcontrol
parents
1d1d3fdf
edd68abf
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
2 deletions
+9
-2
UAS.cc
src/uas/UAS.cc
+2
-1
QGCToolBar.cc
src/ui/QGCToolBar.cc
+1
-1
UASControlWidget.cc
src/ui/uas/UASControlWidget.cc
+6
-0
No files found.
src/uas/UAS.cc
View file @
e6ffde7c
...
...
@@ -1100,6 +1100,8 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
imageWidth
=
p
.
width
;
imageHeight
=
p
.
height
;
imageStart
=
QGC
::
groundTimeMilliseconds
();
imagePacketsArrived
=
0
;
}
break
;
...
...
@@ -1132,7 +1134,6 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
if
((
imagePacketsArrived
>=
imagePackets
))
{
// Restart statemachine
imagePacketsArrived
=
0
;
emit
imageReady
(
this
);
//qDebug() << "imageReady emitted. all packets arrived";
}
...
...
src/ui/QGCToolBar.cc
View file @
e6ffde7c
...
...
@@ -403,7 +403,7 @@ void QGCToolBar::setSystemType(UASInterface* uas, unsigned int systemType)
symbolButton
->
setIcon
(
QIcon
(
":/files/images/mavs/helicopter.svg"
));
break
;
case
MAV_TYPE_ANTENNA_TRACKER
:
symbolButton
->
setIcon
(
QIcon
(
":/files/images/mavs/antenn-tracker.svg"
));
symbolButton
->
setIcon
(
QIcon
(
":/files/images/mavs/antenn
a
-tracker.svg"
));
break
;
case
MAV_TYPE_GCS
:
symbolButton
->
setIcon
(
QIcon
(
":files/images/mavs/groundstation.svg"
));
...
...
src/ui/uas/UASControlWidget.cc
View file @
e6ffde7c
...
...
@@ -178,6 +178,12 @@ void UASControlWidget::transmitMode()
UASInterface
*
mav
=
UASManager
::
instance
()
->
getUASForId
(
this
->
uas
);
if
(
mav
)
{
// include armed state
if
(
engineOn
)
uasMode
|=
MAV_MODE_FLAG_SAFETY_ARMED
;
else
uasMode
&=
~
MAV_MODE_FLAG_SAFETY_ARMED
;
mav
->
setMode
(
uasMode
);
QString
mode
=
ui
.
modeComboBox
->
currentText
();
...
...
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