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
bad14db1
Commit
bad14db1
authored
Jan 17, 2016
by
dogmaphobic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Stop paying attention to heartbeats while downloading logs.
parent
550bac9a
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
13 additions
and
6 deletions
+13
-6
LogDownloadController.cc
src/ViewWidgets/LogDownloadController.cc
+12
-6
LogDownloadController.h
src/ViewWidgets/LogDownloadController.h
+1
-0
No files found.
src/ViewWidgets/LogDownloadController.cc
View file @
bad14db1
...
@@ -326,8 +326,7 @@ LogDownloadController::_receivedAllData()
...
@@ -326,8 +326,7 @@ LogDownloadController::_receivedAllData()
_requestLogData
(
_downloadData
->
ID
,
0
,
_downloadData
->
entry
->
size
());
_requestLogData
(
_downloadData
->
ID
,
0
,
_downloadData
->
entry
->
size
());
}
else
{
}
else
{
_resetSelection
();
_resetSelection
();
_downloadingLogs
=
false
;
_setDownloading
(
false
);
emit
downloadingLogsChanged
();
}
}
}
}
...
@@ -456,8 +455,7 @@ LogDownloadController::download(void)
...
@@ -456,8 +455,7 @@ LogDownloadController::download(void)
}
}
}
}
//-- Start download process
//-- Start download process
_downloadingLogs
=
true
;
_setDownloading
(
true
);
emit
downloadingLogsChanged
();
_receivedAllData
();
_receivedAllData
();
}
}
}
}
...
@@ -545,6 +543,15 @@ LogDownloadController::_prepareLogDownload()
...
@@ -545,6 +543,15 @@ LogDownloadController::_prepareLogDownload()
return
result
;
return
result
;
}
}
//----------------------------------------------------------------------------------------
void
LogDownloadController
::
_setDownloading
(
bool
active
)
{
_downloadingLogs
=
active
;
_vehicle
->
setConnectionLostEnabled
(
!
active
);
emit
downloadingLogsChanged
();
}
//----------------------------------------------------------------------------------------
//----------------------------------------------------------------------------------------
void
void
LogDownloadController
::
eraseAll
(
void
)
LogDownloadController
::
eraseAll
(
void
)
...
@@ -577,8 +584,7 @@ LogDownloadController::cancel(void)
...
@@ -577,8 +584,7 @@ LogDownloadController::cancel(void)
_downloadData
=
0
;
_downloadData
=
0
;
}
}
_resetSelection
(
true
);
_resetSelection
(
true
);
_downloadingLogs
=
false
;
_setDownloading
(
false
);
emit
downloadingLogsChanged
();
}
}
//-----------------------------------------------------------------------------
//-----------------------------------------------------------------------------
...
...
src/ViewWidgets/LogDownloadController.h
View file @
bad14db1
...
@@ -176,6 +176,7 @@ private:
...
@@ -176,6 +176,7 @@ private:
void
_requestLogList
(
uint32_t
start
=
0
,
uint32_t
end
=
0xFFFF
);
void
_requestLogList
(
uint32_t
start
=
0
,
uint32_t
end
=
0xFFFF
);
void
_requestLogData
(
uint8_t
id
,
uint32_t
offset
=
0
,
uint32_t
count
=
0xFFFFFFFF
);
void
_requestLogData
(
uint8_t
id
,
uint32_t
offset
=
0
,
uint32_t
count
=
0xFFFFFFFF
);
bool
_prepareLogDownload
();
bool
_prepareLogDownload
();
void
_setDownloading
(
bool
active
);
QGCLogEntry
*
_getNextSelected
();
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