Skip to content

AnalyzeView: unify onboard-log download into single page with transport facade #14331

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
HTRamsey wants to merge 1 commit into
base: master
Choose a base branch
from
Open

AnalyzeView: unify onboard-log download into single page with transport facade #14331

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/API/QGCCorePlugin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,11 +75,6 @@ const QVariantList &QGCCorePlugin::analyzePages()
QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AnalyzeView/OnboardLogs/OnboardLogPage.qml")),
QUrl::fromUserInput(QStringLiteral("qrc:/qmlimages/OnboardLogIcon.svg")),
nullptr, true /* requiresVehicle */)),
QVariant::fromValue(new QmlComponentInfo(
tr("Onboard Logs (FTP)"),
QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AnalyzeView/OnboardLogsFtp/OnboardLogFtpPage.qml")),
QUrl::fromUserInput(QStringLiteral("qrc:/qmlimages/OnboardLogIcon.svg")),
nullptr, true /* requiresVehicle */)),
QVariant::fromValue(new QmlComponentInfo(
tr("GeoTag Images"),
QUrl::fromUserInput(QStringLiteral("qrc:/qml/QGroundControl/AnalyzeView/GeoTag/GeoTagPage.qml")),
Expand Down
7 changes: 1 addition & 6 deletions src/AnalyzeView/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@ add_subdirectory(GeoTag)
add_subdirectory(MAVLinkConsole)
add_subdirectory(MAVLinkInspector)
add_subdirectory(OnboardLogs)
add_subdirectory(OnboardLogsFtp)

target_sources(${CMAKE_PROJECT_NAME}
PRIVATE
)

target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})

Expand All @@ -32,7 +27,7 @@ qt_add_qml_module(AnalyzeViewModule
MAVLinkInspector/MAVLinkMessageButton.qml
MAVLinkInspector/MAVLinkInspectorPage.qml
OnboardLogs/OnboardLogPage.qml
OnboardLogsFtp/OnboardLogFtpPage.qml
OnboardLogs/OnboardLogTable.qml
Vibration/VibrationPage.qml
NO_PLUGIN
)
Expand Down
10 changes: 9 additions & 1 deletion src/AnalyzeView/OnboardLogs/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,22 @@
# ============================================================================
# Onboard Logs Module
# Onboard log list and download functionality
# Onboard log list and download (LOG protocol + MAVLink FTP)
# ============================================================================

target_sources(${CMAKE_PROJECT_NAME}
PRIVATE
FtpTransport.cc
FtpTransport.h
LogProtocolTransport.cc
LogProtocolTransport.h
OnboardLogController.cc
OnboardLogController.h
OnboardLogDownloadData.cc
OnboardLogDownloadData.h
OnboardLogEntry.cc
OnboardLogEntry.h
OnboardLogTransport.cc
OnboardLogTransport.h
)

target_include_directories(${CMAKE_PROJECT_NAME} PRIVATE ${CMAKE_CURRENT_SOURCE_DIR})
Loading
Loading