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
18ab0fef
Commit
18ab0fef
authored
Jul 24, 2016
by
dogmaphobic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Log Download Fixes
parent
0e6ddf08
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
9 deletions
+18
-9
LogDownloadController.cc
src/ViewWidgets/LogDownloadController.cc
+16
-8
LogDownloadController.h
src/ViewWidgets/LogDownloadController.h
+2
-1
No files found.
src/ViewWidgets/LogDownloadController.cc
View file @
18ab0fef
...
...
@@ -26,7 +26,7 @@
#define kTimeOutMilliseconds 500
#define kGUIRateMilliseconds 17
#define kTableBins
128
#define kTableBins
512
#define kChunkSize (kTableBins * MAVLINK_MSG_LOG_DATA_FIELD_DATA_LEN)
QGC_LOGGING_CATEGORY
(
LogDownloadLog
,
"LogDownloadLog"
)
...
...
@@ -234,8 +234,7 @@ void
LogDownloadController
::
_receivedAllEntries
()
{
_timer
.
stop
();
_requestingLogEntries
=
false
;
emit
requestingListChanged
();
_setListing
(
false
);
}
//----------------------------------------------------------------------------------------
...
...
@@ -458,7 +457,8 @@ void
LogDownloadController
::
refresh
(
void
)
{
_logEntriesModel
.
clear
();
_requestLogList
();
//-- Get first 50 entries
_requestLogList
(
0
,
49
);
}
//----------------------------------------------------------------------------------------
...
...
@@ -467,8 +467,7 @@ LogDownloadController::_requestLogList(uint32_t start, uint32_t end)
{
if
(
_vehicle
&&
_uas
)
{
qCDebug
(
LogDownloadLog
)
<<
"Request log entry list ("
<<
start
<<
"through"
<<
end
<<
")"
;
_requestingLogEntries
=
true
;
emit
requestingListChanged
();
_setListing
(
true
);
mavlink_message_t
msg
;
mavlink_msg_log_request_list_pack
(
qgcApp
()
->
toolbox
()
->
mavlinkProtocol
()
->
getSystemId
(),
...
...
@@ -479,8 +478,8 @@ LogDownloadController::_requestLogList(uint32_t start, uint32_t end)
start
,
end
);
_vehicle
->
sendMessageOnLink
(
_vehicle
->
priorityLink
(),
msg
);
//-- Wait
2
seconds before bitching about not getting anything
_timer
.
start
(
2
000
);
//-- Wait
5
seconds before bitching about not getting anything
_timer
.
start
(
5
000
);
}
}
...
...
@@ -610,6 +609,15 @@ LogDownloadController::_setDownloading(bool active)
emit
downloadingLogsChanged
();
}
//----------------------------------------------------------------------------------------
void
LogDownloadController
::
_setListing
(
bool
active
)
{
_requestingLogEntries
=
active
;
_vehicle
->
setConnectionLostEnabled
(
!
active
);
emit
requestingListChanged
();
}
//----------------------------------------------------------------------------------------
void
LogDownloadController
::
eraseAll
(
void
)
...
...
src/ViewWidgets/LogDownloadController.h
View file @
18ab0fef
...
...
@@ -152,10 +152,11 @@ private:
void
_receivedAllData
();
void
_resetSelection
(
bool
canceled
=
false
);
void
_findMissingData
();
void
_requestLogList
(
uint32_t
start
=
0
,
uint32_t
end
=
0xFFFF
);
void
_requestLogList
(
uint32_t
start
,
uint32_t
end
);
void
_requestLogData
(
uint8_t
id
,
uint32_t
offset
=
0
,
uint32_t
count
=
0xFFFFFFFF
);
bool
_prepareLogDownload
();
void
_setDownloading
(
bool
active
);
void
_setListing
(
bool
active
);
QGCLogEntry
*
_getNextSelected
();
...
...
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