Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
855c376d
Commit
855c376d
authored
Feb 08, 2012
by
LM
Browse files
Minor fixes
parent
ddd6934a
Changes
5
Hide whitespace changes
Inline
Side-by-side
src/comm/MAVLinkProtocol.cc
View file @
855c376d
...
...
@@ -198,6 +198,7 @@ void MAVLinkProtocol::receiveBytes(LinkInterface* link, QByteArray b)
// }
//#endif
#ifdef QGC_PROTOBUF_ENABLED
if
(
message
.
msgid
==
MAVLINK_MSG_ID_EXTENDED_MESSAGE
)
{
mavlink_extended_message_t
extended_message
;
...
...
src/uas/UAS.cc
View file @
855c376d
...
...
@@ -977,7 +977,10 @@ void UAS::receiveMessage(LinkInterface* link, mavlink_message_t message)
#ifdef QGC_PROTOBUF_ENABLED
void
UAS
::
receiveExtendedMessage
(
LinkInterface
*
link
,
std
::
tr1
::
shared_ptr
<
google
::
protobuf
::
Message
>
message
)
{
if
(
!
link
)
return
;
if
(
!
link
)
{
return
;
}
if
(
!
links
->
contains
(
link
))
{
addLink
(
link
);
...
...
src/uas/UASWaypointManager.cc
View file @
855c376d
...
...
@@ -61,6 +61,11 @@ UASWaypointManager::UASWaypointManager(UAS* _uas)
}
}
UASWaypointManager
::~
UASWaypointManager
()
{
}
void
UASWaypointManager
::
timeout
()
{
if
(
current_retries
>
0
)
{
...
...
src/uas/UASWaypointManager.h
View file @
855c376d
...
...
@@ -65,6 +65,7 @@ private:
public:
UASWaypointManager
(
UAS
*
uas
=
NULL
);
///< Standard constructor
~
UASWaypointManager
();
/** @name Received message handlers */
/*@{*/
...
...
src/ui/WaypointList.cc
View file @
855c376d
...
...
@@ -155,7 +155,10 @@ void WaypointList::updateAttitude(UASInterface* uas, double roll, double pitch,
void
WaypointList
::
setUAS
(
UASInterface
*
uas
)
{
//if (this->uas == NULL && uas != NULL)
if
(
this
->
uas
==
NULL
&&
uas
!=
NULL
)
{
WPM
=
uas
->
getWaypointManager
();
}
if
(
this
->
uas
==
NULL
)
{
this
->
uas
=
uas
;
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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