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
17650954
Commit
17650954
authored
Apr 04, 2018
by
DonLakeFlyer
Browse files
Fix parsing order
parent
ff44b56a
Changes
1
Hide whitespace changes
Inline
Side-by-side
src/AnalyzeView/ULogParser.cc
View file @
17650954
...
@@ -139,15 +139,10 @@ bool ULogParser::getTagsFromLog(QByteArray& log, QList<GeoTagWorker::cameraFeedb
...
@@ -139,15 +139,10 @@ bool ULogParser::getTagsFromLog(QByteArray& log, QList<GeoTagWorker::cameraFeedb
case
(
int
)
ULogMessageType
::
DATA
:
case
(
int
)
ULogMessageType
::
DATA
:
{
{
if
(
!
geotagFound
)
{
qWarning
()
<<
"Could not detect geotag packets in ULog"
;
return
false
;
}
uint16_t
msgID
=
-
1
;
uint16_t
msgID
=
-
1
;
memcpy
(
&
msgID
,
log
.
data
()
+
index
+
ULOG_MSG_HEADER_LEN
,
2
);
memcpy
(
&
msgID
,
log
.
data
()
+
index
+
ULOG_MSG_HEADER_LEN
,
2
);
if
(
msgID
==
_cameraCaptureMsgID
)
{
if
(
geotagFound
&&
msgID
==
_cameraCaptureMsgID
)
{
// Completely dynamic parsing, so that changing/reordering the message format will not break the parser
// Completely dynamic parsing, so that changing/reordering the message format will not break the parser
GeoTagWorker
::
cameraFeedbackPacket
feedback
;
GeoTagWorker
::
cameraFeedbackPacket
feedback
;
...
@@ -179,5 +174,10 @@ bool ULogParser::getTagsFromLog(QByteArray& log, QList<GeoTagWorker::cameraFeedb
...
@@ -179,5 +174,10 @@ bool ULogParser::getTagsFromLog(QByteArray& log, QList<GeoTagWorker::cameraFeedb
}
}
if
(
cameraFeedback
.
count
()
==
0
)
{
qWarning
()
<<
"Could not detect camera_capture packets in ULog"
;
return
false
;
}
return
true
;
return
true
;
}
}
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