Commit bad14db1 authored by dogmaphobic's avatar dogmaphobic

Stop paying attention to heartbeats while downloading logs.

parent 550bac9a
...@@ -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();
} }
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
......
...@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment