QGCCameraControl: allow to read camera information xml via ftp #10094
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
src/Camera/QGCCameraControl.cc
Outdated
| @@ -2020,6 +2036,26 @@ QGCCameraControl::_downloadFinished() | |||
| //reply->deleteLater(); | |||
| } | |||
|
|
|||
| void QGCCameraControl::_ftpDownloadComplete(const QString& fileName, const QString& errorMsg) | |||
| { | |||
| qCDebug(CameraControlLog) << "QGCCameraControl::_ftpDownloadComplete fileName:errorMsg" << fileName << errorMsg; | |||
There was a problem hiding this comment.
You don't need to set class and function name, that can be configured via environment variable:
https://doc.qt.io/qt-5/debug.html
patrickelectric
requested changes
Jan 11, 2022
src/Vehicle/FTPManager.cc
Outdated
| @@ -72,7 +72,11 @@ bool FTPManager::download(const QString& fromURI, const QString& toDir) | |||
| } | |||
| lastDirSlashIndex++; // move past slash | |||
|
|
|||
| _downloadState.fileName = _downloadState.fullPathOnVehicle.right(_downloadState.fullPathOnVehicle.size() - lastDirSlashIndex); | |||
| if (fileName.size() == 0) { | |||
src/Vehicle/FTPManager.cc
Outdated
| @@ -641,6 +645,8 @@ bool FTPManager::_parseURI(const QString& uri, QString& parsedURI, uint8_t& comp | |||
| if (!ok) { | |||
| qCWarning(FTPManagerLog) << "Incorrect format for component id" << uri; | |||
| return false; | |||
| } else { | |||
There was a problem hiding this comment.
Dont need else after return.
src/Vehicle/FTPManager.cc
Outdated
| @@ -641,6 +645,8 @@ bool FTPManager::_parseURI(const QString& uri, QString& parsedURI, uint8_t& comp | |||
| if (!ok) { | |||
| qCWarning(FTPManagerLog) << "Incorrect format for component id" << uri; | |||
| return false; | |||
| } else { | |||
| qCDebug(FTPManagerLog) << "Found compId:" << (int)compId; | |||
There was a problem hiding this comment.
There is no need to cast it to int.
|
@patrickelectric Thanks for your review. I applied your suggested changes. |
patrickelectric
approved these changes
Jan 14, 2022
|
thanks for the contribution @dayjaby |
mrpollo
requested changes
Feb 8, 2022
mrpollo
approved these changes
Aug 17, 2022
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR heavily reuses the MAVLink FTP capabilities already present in QGroundControl and allows to specify camera definition URLs in
CAMERA_INFORMATIONwith the mftp prefix, likemftp://[;comp=100]infos/camera_info.xml.Tested it against the MAVSDK camera manager example PR: mavlink/MAVSDK#1655
TODO:
mftp://infos/camera_info.xml