Skip to content

APM: Add Remaining QMLs to Module #12952

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

Merged
HTRamsey merged 1 commit into from
May 31, 2025
Merged

APM: Add Remaining QMLs to Module #12952

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
0 ...FirmwarePlugin/APM/APMSensorIdDecoder.qml → ...toPilotPlugins/APM/APMSensorIdDecoder.qml
View file
Open in desktop
File renamed without changes.
0 src/FirmwarePlugin/APM/APMSensorParams.qml → src/AutoPilotPlugins/APM/APMSensorParams.qml
View file
Open in desktop
File renamed without changes.
1 change: 0 additions & 1 deletion src/AutoPilotPlugins/APM/APMSensorsComponent.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import QGroundControl.Palette
import QGroundControl.Controls
import QGroundControl.ScreenTools
import QGroundControl.Controllers
import QGroundControl.ArduPilot
import QGroundControl.QGCPositionManager
import MAVLink

Expand Down
1 change: 0 additions & 1 deletion src/AutoPilotPlugins/APM/APMSensorsComponentSummary.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@ import QGroundControl.FactControls
import QGroundControl.Controls
import QGroundControl.Palette
import QGroundControl.Controllers
import QGroundControl.ArduPilot
/*
IMPORTANT NOTE: Any changes made here must also be made to SensorsComponentSummary.qml
*/
Expand Down
2 changes: 2 additions & 0 deletions src/AutoPilotPlugins/APM/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,8 @@ qt_add_qml_module(AutoPilotPluginsAPMModule
APMSafetyComponentSummarySub.qml
APMSensorsComponent.qml
APMSensorsComponentSummary.qml
APMSensorIdDecoder.qml
APMSensorParams.qml
APMSubFrameComponent.qml
APMSubFrameComponentSummary.qml
APMSubMotorComponent.qml
Expand Down
6 changes: 3 additions & 3 deletions src/FirmwarePlugin/APM/APMFirmwarePlugin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -637,15 +637,15 @@ const QVariantList &APMFirmwarePlugin::toolIndicators(const Vehicle *vehicle)
// Find the generic flight mode indicator and replace with the custom one
for (int i = 0; i < _toolIndicatorList.size(); i++) {
if (_toolIndicatorList.at(i).toUrl().toString().contains("FlightModeIndicator.qml")) {
_toolIndicatorList[i] = QVariant::fromValue(QUrl::fromUserInput("qrc:/APM/Indicators/APMFlightModeIndicator.qml"));
_toolIndicatorList[i] = QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/APMFlightModeIndicator.qml"));
break;
}
}

// Find the generic battery indicator and replace with the custom one
for (int i = 0; i < _toolIndicatorList.size(); i++) {
if (_toolIndicatorList.at(i).toUrl().toString().contains("BatteryIndicator.qml")) {
_toolIndicatorList[i] = QVariant::fromValue(QUrl::fromUserInput("qrc:/APM/Indicators/APMBatteryIndicator.qml"));
_toolIndicatorList[i] = QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/APMBatteryIndicator.qml"));
break;
}
}
Expand Down Expand Up @@ -1255,7 +1255,7 @@ void APMFirmwarePlugin::guidedModeChangeEquivalentAirspeedMetersSecond(Vehicle *

QVariant APMFirmwarePlugin::mainStatusIndicatorContentItem(const Vehicle*) const
{
return QVariant::fromValue(QUrl::fromUserInput("qrc:/APM/Indicators/APMMainStatusIndicatorContentItem.qml"));
return QVariant::fromValue(QUrl::fromUserInput("qrc:/qml/QGroundControl/Toolbar/APMMainStatusIndicatorContentItem.qml"));
}

void APMFirmwarePlugin::_setBaroGndTemp(Vehicle* vehicle, qreal temp)
Expand Down
13 changes: 3 additions & 10 deletions src/FirmwarePlugin/APM/APMResources.qrc
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,4 @@
<RCC>
<qresource prefix="/qml">
<file alias="QGroundControl/ArduPilot/APMSensorParams.qml">APMSensorParams.qml</file>
<file alias="QGroundControl/ArduPilot/APMSensorIdDecoder.qml">APMSensorIdDecoder.qml</file>
<file alias="QGroundControl/ArduPilot/qmldir">QGroundControl.ArduPilot.qmldir</file>
</qresource>
<qresource prefix="/APM/Indicators">
<file alias="APMBatteryIndicator.qml">APMBatteryIndicator.qml</file>
<file alias="APMFlightModeIndicator.qml">APMFlightModeIndicator.qml</file>
<file alias="APMMainStatusIndicatorContentItem.qml">APMMainStatusIndicatorContentItem.qml</file>
</qresource>
<qresource prefix="/json">
<file alias="APM-MavCmdInfoCommon.json">APM-MavCmdInfoCommon.json</file>
<file alias="APM-MavCmdInfoFixedWing.json">APM-MavCmdInfoFixedWing.json</file>
Expand All @@ -28,6 +18,7 @@
<file alias="APMParameterFactMetaData.Plane.4.3.xml">ArduPilot-Parameter-Repository/Plane-4.3/apm.pdef.xml</file>
<file alias="APMParameterFactMetaData.Plane.4.4.xml">ArduPilot-Parameter-Repository/Plane-4.4/apm.pdef.xml</file>
<file alias="APMParameterFactMetaData.Plane.4.5.xml">ArduPilot-Parameter-Repository/Plane-4.5/apm.pdef.xml</file>
<file alias="APMParameterFactMetaData.Plane.4.6.xml">ArduPilot-Parameter-Repository/Plane-4.6/apm.pdef.xml</file>
<file alias="APMParameterFactMetaData.Copter.3.5.xml">ArduPilot-Parameter-Repository/Copter-3.5/apm.pdef.xml</file>
<file alias="APMParameterFactMetaData.Copter.3.6.xml">ArduPilot-Parameter-Repository/Copter-3.6/apm.pdef.xml</file>
<file alias="APMParameterFactMetaData.Copter.3.7.xml">ArduPilot-Parameter-Repository/Copter-3.7/apm.pdef.xml</file>
Expand All @@ -37,6 +28,7 @@
<file alias="APMParameterFactMetaData.Copter.4.3.xml">ArduPilot-Parameter-Repository/Copter-4.3/apm.pdef.xml</file>
<file alias="APMParameterFactMetaData.Copter.4.4.xml">ArduPilot-Parameter-Repository/Copter-4.4/apm.pdef.xml</file>
<file alias="APMParameterFactMetaData.Copter.4.5.xml">ArduPilot-Parameter-Repository/Copter-4.5/apm.pdef.xml</file>
<file alias="APMParameterFactMetaData.Copter.4.6.xml">ArduPilot-Parameter-Repository/Copter-4.6/apm.pdef.xml</file>
<file alias="APMParameterFactMetaData.Rover.3.4.xml">ArduPilot-Parameter-Repository/Rover-3.4/apm.pdef.xml</file>
<file alias="APMParameterFactMetaData.Rover.3.5.xml">ArduPilot-Parameter-Repository/Rover-3.5/apm.pdef.xml</file>
<file alias="APMParameterFactMetaData.Rover.3.6.xml">ArduPilot-Parameter-Repository/Rover-3.6/apm.pdef.xml</file>
Expand All @@ -45,6 +37,7 @@
<file alias="APMParameterFactMetaData.Rover.4.2.xml">ArduPilot-Parameter-Repository/Rover-4.2/apm.pdef.xml</file>
<file alias="APMParameterFactMetaData.Rover.4.4.xml">ArduPilot-Parameter-Repository/Rover-4.4/apm.pdef.xml</file>
<file alias="APMParameterFactMetaData.Rover.4.5.xml">ArduPilot-Parameter-Repository/Rover-4.5/apm.pdef.xml</file>
<file alias="APMParameterFactMetaData.Rover.4.6.xml">ArduPilot-Parameter-Repository/Rover-4.6/apm.pdef.xml</file>
<file alias="APMParameterFactMetaData.Sub.3.4.xml">ArduPilot-Parameter-Repository/Sub-3.4/apm.pdef.xml</file>
<file alias="APMParameterFactMetaData.Sub.3.5.xml">ArduPilot-Parameter-Repository/Sub-3.5/apm.pdef.xml</file>
<file alias="APMParameterFactMetaData.Sub.3.6.xml">ArduPilot-Parameter-Repository/Sub-3.6/apm.pdef.xml</file>
Expand Down
2 changes: 1 addition & 1 deletion src/FirmwarePlugin/APM/ArduPilot-Parameter-Repository
Open in desktop
Submodule ArduPilot-Parameter-Repository updated from 0503ee to a458e8
27 changes: 0 additions & 27 deletions src/FirmwarePlugin/APM/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,6 @@ if(NOT QGC_DISABLE_APM_PLUGIN_FACTORY)
endif()

if(NOT QGC_DISABLE_APM_PLUGIN)
# set(APM_RESOURCES)
# qt_add_resources(APM_RESOURCES APMResources.qrc)

target_sources(${CMAKE_PROJECT_NAME}
PRIVATE
APM.h
Expand All @@ -25,7 +22,6 @@ if(NOT QGC_DISABLE_APM_PLUGIN)
ArduRoverFirmwarePlugin.h
ArduSubFirmwarePlugin.cc
ArduSubFirmwarePlugin.h
# ${APM_RESOURCES}
)
endif()

Expand All @@ -40,26 +36,3 @@ endif()
# GITHUB_REPOSITORY ArduPilot/ParameterRepository
# GIT_TAG main
# )

# file(GLOB QML_SOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/*.qml)
# # file(GLOB QML_RESOURCES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}/res/*/*.*)
# qt_add_qml_module(QGC
# URI QGroundControl.APMFirmwarePlugin
# VERSION 1.0
# # RESOURCES ${QML_RESOURCES}
# QML_FILES ${QML_SOURCES}
# OUTPUT_TARGETS APMFirmwarePlugin_targets
# IMPORT_PATH ${QT_QML_OUTPUT_DIRECTORY}
# IMPORTS
# QtQuick
# QtQuick.Layouts

# QGroundControl
# QGroundControl.Controls
# QGroundControl.MultiVehicleManager
# QGroundControl.ScreenTools
# QGroundControl.Palette
# QGroundControl.FactSystem
# QGroundControl.FactControls
# MAVLink
# )
4 changes: 0 additions & 4 deletions src/FirmwarePlugin/APM/QGroundControl.ArduPilot.qmldir
View file
Open in desktop

This file was deleted.

0 ...irmwarePlugin/APM/APMBatteryIndicator.qml → src/UI/toolbar/APMBatteryIndicator.qml
View file
Open in desktop
File renamed without changes.
0 ...warePlugin/APM/APMFlightModeIndicator.qml → src/UI/toolbar/APMFlightModeIndicator.qml
View file
Open in desktop
File renamed without changes.
0 ...APM/APMMainStatusIndicatorContentItem.qml → ...bar/APMMainStatusIndicatorContentItem.qml
View file
Open in desktop
File renamed without changes.
3 changes: 3 additions & 0 deletions src/UI/toolbar/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ qt_add_qml_module(ToolbarModule
VERSION 1.0
RESOURCE_PREFIX /qml
QML_FILES
APMBatteryIndicator.qml
APMFlightModeIndicator.qml
APMMainStatusIndicatorContentItem.qml
APMSupportForwardingIndicator.qml
ArmedIndicator.qml
GCSControlIndicator.qml
Expand Down
Loading