Browse Source

Stop paying attention to heartbeats while downloading logs.

QGC4.4
dogmaphobic 9 years ago
parent
commit
bad14db17e
  1. 18
      src/ViewWidgets/LogDownloadController.cc
  2. 1
      src/ViewWidgets/LogDownloadController.h

18
src/ViewWidgets/LogDownloadController.cc

@ -326,8 +326,7 @@ LogDownloadController::_receivedAllData() @@ -326,8 +326,7 @@ LogDownloadController::_receivedAllData()
_requestLogData(_downloadData->ID, 0, _downloadData->entry->size());
} else {
_resetSelection();
_downloadingLogs = false;
emit downloadingLogsChanged();
_setDownloading(false);
}
}
@ -456,8 +455,7 @@ LogDownloadController::download(void) @@ -456,8 +455,7 @@ LogDownloadController::download(void)
}
}
//-- Start download process
_downloadingLogs = true;
emit downloadingLogsChanged();
_setDownloading(true);
_receivedAllData();
}
}
@ -547,6 +545,15 @@ LogDownloadController::_prepareLogDownload() @@ -547,6 +545,15 @@ LogDownloadController::_prepareLogDownload()
//----------------------------------------------------------------------------------------
void
LogDownloadController::_setDownloading(bool active)
{
_downloadingLogs = active;
_vehicle->setConnectionLostEnabled(!active);
emit downloadingLogsChanged();
}
//----------------------------------------------------------------------------------------
void
LogDownloadController::eraseAll(void)
{
if(_vehicle && _uas) {
@ -577,8 +584,7 @@ LogDownloadController::cancel(void) @@ -577,8 +584,7 @@ LogDownloadController::cancel(void)
_downloadData = 0;
}
_resetSelection(true);
_downloadingLogs = false;
emit downloadingLogsChanged();
_setDownloading(false);
}
//-----------------------------------------------------------------------------

1
src/ViewWidgets/LogDownloadController.h

@ -176,6 +176,7 @@ private: @@ -176,6 +176,7 @@ private:
void _requestLogList (uint32_t start = 0, uint32_t end = 0xFFFF);
void _requestLogData (uint8_t id, uint32_t offset = 0, uint32_t count = 0xFFFFFFFF);
bool _prepareLogDownload();
void _setDownloading (bool active);
QGCLogEntry* _getNextSelected();

Loading…
Cancel
Save