Browse Source

Merge pull request #6323 from DonLakeFlyer/LogDownload

Log download changes
QGC4.4
Don Gagne 7 years ago committed by GitHub
parent
commit
cd1955e4fb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/AnalyzeView/LogDownloadController.cc
  2. 2
      src/AnalyzeView/LogDownloadPage.qml

2
src/AnalyzeView/LogDownloadController.cc

@ -320,7 +320,7 @@ LogDownloadController::_logData(UASInterface* uas, uint32_t ofs, uint16_t id, ui @@ -320,7 +320,7 @@ LogDownloadController::_logData(UASInterface* uas, uint32_t ofs, uint16_t id, ui
if(ofs <= _downloadData->entry->size()) {
const uint32_t chunk = ofs / kChunkSize;
if (chunk != _downloadData->current_chunk) {
qWarning() << "Ignored packet for out of order chunk" << chunk;
qWarning() << "Ignored packet for out of order chunk actual:expected" << chunk << _downloadData->current_chunk;
return;
}
const uint16_t bin = (ofs - chunk*kChunkSize) / MAVLINK_MSG_LOG_DATA_FIELD_DATA_LEN;

2
src/AnalyzeView/LogDownloadPage.qml

@ -155,7 +155,7 @@ AnalyzePage { @@ -155,7 +155,7 @@ AnalyzePage {
fileDialog.qgcView = logDownloadPage
fileDialog.title = qsTr("Select save directory")
fileDialog.selectExisting = true
fileDialog.folder = QGroundControl.settingsManager.appSettings.telemetrySavePath
fileDialog.folder = QGroundControl.settingsManager.appSettings.logSavePath
fileDialog.selectFolder = true
fileDialog.openForLoad()
}

Loading…
Cancel
Save