Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Q
qgroundcontrol
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Valentin Platzgummer
qgroundcontrol
Commits
f6c22144
Commit
f6c22144
authored
Oct 18, 2020
by
Daniel Agar
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cmake updates
parent
3123eb56
Changes
17
Show whitespace changes
Inline
Side-by-side
Showing
17 changed files
with
159 additions
and
83 deletions
+159
-83
CMakeLists.txt
CMakeLists.txt
+1
-1
CMakeLists.txt
src/AnalyzeView/CMakeLists.txt
+11
-1
CMakeLists.txt
src/AutoPilotPlugins/CMakeLists.txt
+17
-1
CMakeLists.txt
src/AutoPilotPlugins/PX4/CMakeLists.txt
+23
-22
CMakeLists.txt
src/CMakeLists.txt
+4
-4
CMakeLists.txt
src/FactSystem/CMakeLists.txt
+13
-0
CMakeLists.txt
src/FactSystem/FactControls/CMakeLists.txt
+13
-12
CMakeLists.txt
src/FlightDisplay/CMakeLists.txt
+2
-0
CMakeLists.txt
src/FlightMap/CMakeLists.txt
+1
-1
CMakeLists.txt
src/FlightMap/MapItems/CMakeLists.txt
+13
-11
CMakeLists.txt
src/MissionManager/CMakeLists.txt
+12
-5
CMakeLists.txt
src/PlanView/CMakeLists.txt
+6
-0
CMakeLists.txt
src/QmlControls/CMakeLists.txt
+6
-6
CMakeLists.txt
src/Vehicle/CMakeLists.txt
+2
-2
CMakeLists.txt
src/VehicleSetup/CMakeLists.txt
+17
-11
MockLink.cc
src/comm/MockLink.cc
+7
-2
CMakeLists.txt
src/qgcunittest/CMakeLists.txt
+11
-4
No files found.
CMakeLists.txt
View file @
f6c22144
...
@@ -13,7 +13,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
...
@@ -13,7 +13,7 @@ set(CMAKE_INCLUDE_CURRENT_DIR ON)
include
(
FeatureSummary
)
include
(
FeatureSummary
)
if
(
"
${
CMAKE_CXX_COMPILER_ID
}
"
STREQUAL
"Clang"
OR
"
${
CMAKE_CXX_COMPILER_ID
}
"
STREQUAL
"GNU"
)
if
(
"
${
CMAKE_CXX_COMPILER_ID
}
"
STREQUAL
"Clang"
OR
"
${
CMAKE_CXX_COMPILER_ID
}
"
STREQUAL
"GNU"
)
add_compile_options
(
-Wall -Wextra -Wno-address-of-packed-member
)
add_compile_options
(
-Wall -Wextra
)
endif
()
endif
()
# CMake build type
# CMake build type
...
...
src/AnalyzeView/CMakeLists.txt
View file @
f6c22144
...
@@ -3,17 +3,26 @@ set(EXTRA_SRC)
...
@@ -3,17 +3,26 @@ set(EXTRA_SRC)
if
(
BUILD_TESTING
)
if
(
BUILD_TESTING
)
list
(
APPEND EXTRA_SRC
list
(
APPEND EXTRA_SRC
LogDownloadTest.cc
LogDownloadTest.cc
LogDownloadTest.h
)
)
endif
()
endif
()
add_library
(
AnalyzeView
add_library
(
AnalyzeView
ExifParser.cc
ExifParser.cc
ExifParser.h
GeoTagController.cc
GeoTagController.cc
MAVLinkInspectorController.cc
GeoTagController.h
LogDownloadController.cc
LogDownloadController.cc
LogDownloadController.h
MavlinkConsoleController.cc
MavlinkConsoleController.cc
MavlinkConsoleController.h
MAVLinkInspectorController.cc
MAVLinkInspectorController.h
PX4LogParser.cc
PX4LogParser.cc
PX4LogParser.h
ULogParser.cc
ULogParser.cc
ULogParser.h
${
EXTRA_SRC
}
${
EXTRA_SRC
}
)
)
...
@@ -25,6 +34,7 @@ add_custom_target(AnalyzeViewQml
...
@@ -25,6 +34,7 @@ add_custom_target(AnalyzeViewQml
LogDownloadPage.qml
LogDownloadPage.qml
MavlinkConsolePage.qml
MavlinkConsolePage.qml
MAVLinkInspectorPage.qml
MAVLinkInspectorPage.qml
VibrationPage.qml
)
)
target_link_libraries
(
AnalyzeView
target_link_libraries
(
AnalyzeView
...
...
src/AutoPilotPlugins/CMakeLists.txt
View file @
f6c22144
...
@@ -34,22 +34,38 @@ add_library(AutoPilotPlugins
...
@@ -34,22 +34,38 @@ add_library(AutoPilotPlugins
Generic/GenericAutoPilotPlugin.cc
Generic/GenericAutoPilotPlugin.cc
PX4/AirframeComponent.cc
PX4/AirframeComponentAirframes.cc
PX4/AirframeComponentAirframes.cc
PX4/AirframeComponentAirframes.h
PX4/AirframeComponent.cc
PX4/AirframeComponentController.cc
PX4/AirframeComponentController.cc
PX4/AirframeComponentController.h
PX4/AirframeComponent.h
PX4/CameraComponent.cc
PX4/CameraComponent.cc
PX4/CameraComponent.h
PX4/FlightModesComponent.cc
PX4/FlightModesComponent.cc
PX4/FlightModesComponent.h
PX4/PowerComponent.cc
PX4/PowerComponent.cc
PX4/PowerComponentController.cc
PX4/PowerComponentController.cc
PX4/PowerComponentController.h
PX4/PowerComponent.h
PX4/PX4AdvancedFlightModesController.cc
PX4/PX4AdvancedFlightModesController.cc
PX4/PX4AdvancedFlightModesController.h
PX4/PX4AirframeLoader.cc
PX4/PX4AirframeLoader.cc
PX4/PX4AirframeLoader.h
PX4/PX4AutoPilotPlugin.cc
PX4/PX4AutoPilotPlugin.cc
PX4/PX4AutoPilotPlugin.h
PX4/PX4RadioComponent.cc
PX4/PX4RadioComponent.cc
PX4/PX4RadioComponent.h
PX4/PX4SimpleFlightModesController.cc
PX4/PX4SimpleFlightModesController.cc
PX4/PX4SimpleFlightModesController.h
PX4/PX4TuningComponent.cc
PX4/PX4TuningComponent.cc
PX4/PX4TuningComponent.h
PX4/SafetyComponent.cc
PX4/SafetyComponent.cc
PX4/SafetyComponent.h
PX4/SensorsComponent.cc
PX4/SensorsComponent.cc
PX4/SensorsComponentController.cc
PX4/SensorsComponentController.cc
PX4/SensorsComponentController.h
PX4/SensorsComponent.h
AutoPilotPlugin.cc
AutoPilotPlugin.cc
)
)
...
...
src/AutoPilotPlugins/PX4/CMakeLists.txt
View file @
f6c22144
add_custom_target
(
PX4AutoPilotPluginQml
add_custom_target
(
PX4AutoPilotPluginQml
SOURCES
SOURCES
AirframeComponent.qml
AirframeComponent.qml
AirframeComponentSummary.qml
AirframeComponentSummary.qml
BatteryParams.qml
CameraComponent.qml
CameraComponent.qml
CameraComponentSummary.qml
CameraComponentSummary.qml
FlightModesComponentSummary.qml
FlightModesComponentSummary.qml
PowerComponent.qml
PowerComponentSummary.qml
PX4AdvancedFlightModes.qml
PX4AdvancedFlightModes.qml
PX4FlightModes.qml
PX4FlightModes.qml
PX4RadioComponentSummary.qml
PX4RadioComponentSummary.qml
...
@@ -12,12 +15,10 @@ SOURCES
...
@@ -12,12 +15,10 @@ SOURCES
PX4TuningComponentCopter.qml
PX4TuningComponentCopter.qml
PX4TuningComponentPlane.qml
PX4TuningComponentPlane.qml
PX4TuningComponentVTOL.qml
PX4TuningComponentVTOL.qml
PowerComponent.qml
PowerComponentSummary.qml
SafetyComponent.qml
SafetyComponent.qml
SafetyComponentSummary.qml
SafetyComponentSummary.qml
SensorsComponent.qml
SensorsComponent.qml
SensorsComponentSummary.qml
SensorsComponentSummaryFixedWing.qml
SensorsComponentSummaryFixedWing.qml
SensorsComponentSummary.qml
SensorsSetup.qml
SensorsSetup.qml
)
)
src/CMakeLists.txt
View file @
f6c22144
...
@@ -54,13 +54,13 @@ if(BUILD_TESTING)
...
@@ -54,13 +54,13 @@ if(BUILD_TESTING)
add_qgc_test
(
CorridorScanComplexItemTest
)
add_qgc_test
(
CorridorScanComplexItemTest
)
add_qgc_test
(
FactSystemTestGeneric
)
add_qgc_test
(
FactSystemTestGeneric
)
add_qgc_test
(
FactSystemTestPX4
)
add_qgc_test
(
FactSystemTestPX4
)
add_qgc_test
(
FileDialogTest
)
#
add_qgc_test(FileDialogTest)
add_qgc_test
(
FileManagerTest
)
#
add_qgc_test(FileManagerTest)
add_qgc_test
(
FlightGearUnitTest
)
add_qgc_test
(
FlightGearUnitTest
)
add_qgc_test
(
GeoTest
)
add_qgc_test
(
GeoTest
)
add_qgc_test
(
LinkManagerTest
)
add_qgc_test
(
LinkManagerTest
)
add_qgc_test
(
LogDownloadTest
)
add_qgc_test
(
LogDownloadTest
)
add_qgc_test
(
MessageBoxTest
)
#
add_qgc_test(MessageBoxTest)
add_qgc_test
(
MissionCommandTreeTest
)
add_qgc_test
(
MissionCommandTreeTest
)
add_qgc_test
(
MissionControllerTest
)
add_qgc_test
(
MissionControllerTest
)
add_qgc_test
(
MissionItemTest
)
add_qgc_test
(
MissionItemTest
)
...
@@ -70,7 +70,7 @@ if(BUILD_TESTING)
...
@@ -70,7 +70,7 @@ if(BUILD_TESTING)
add_qgc_test
(
PlanMasterControllerTest
)
add_qgc_test
(
PlanMasterControllerTest
)
add_qgc_test
(
QGCMapPolygonTest
)
add_qgc_test
(
QGCMapPolygonTest
)
add_qgc_test
(
QGCMapPolylineTest
)
add_qgc_test
(
QGCMapPolylineTest
)
add_qgc_test
(
RadioConfigTest
)
#
add_qgc_test(RadioConfigTest)
add_qgc_test
(
SendMavCommandTest
)
add_qgc_test
(
SendMavCommandTest
)
add_qgc_test
(
SimpleMissionItemTest
)
add_qgc_test
(
SimpleMissionItemTest
)
add_qgc_test
(
SpeedSectionTest
)
add_qgc_test
(
SpeedSectionTest
)
...
...
src/FactSystem/CMakeLists.txt
View file @
f6c22144
...
@@ -5,20 +5,33 @@ set(EXTRA_SRC)
...
@@ -5,20 +5,33 @@ set(EXTRA_SRC)
if
(
BUILD_TESTING
)
if
(
BUILD_TESTING
)
list
(
APPEND EXTRA_SRC
list
(
APPEND EXTRA_SRC
FactSystemTestBase.cc
FactSystemTestBase.cc
FactSystemTestBase.h
FactSystemTestGeneric.cc
FactSystemTestGeneric.cc
FactSystemTestGeneric.h
FactSystemTestPX4.cc
FactSystemTestPX4.cc
FactSystemTestPX4.h
ParameterManagerTest.cc
ParameterManagerTest.cc
ParameterManagerTest.h
)
)
endif
()
endif
()
add_library
(
FactSystem
add_library
(
FactSystem
Fact.cc
Fact.cc
FactGroup.cc
FactGroup.cc
FactGroup.h
Fact.h
FactMetaData.cc
FactMetaData.cc
FactMetaData.h
FactSystem.cc
FactSystem.cc
FactSystem.h
FactValueSliderListModel.cc
FactValueSliderListModel.cc
FactValueSliderListModel.h
ParameterManager.cc
ParameterManager.cc
ParameterManager.h
SettingsFact.cc
SettingsFact.cc
SettingsFact.h
FactSystemTest.qml
${
EXTRA_SRC
}
${
EXTRA_SRC
}
)
)
...
...
src/FactSystem/FactControls/CMakeLists.txt
View file @
f6c22144
...
@@ -4,15 +4,16 @@ add_library(FactControls
...
@@ -4,15 +4,16 @@ add_library(FactControls
add_custom_target
(
FactControlsQml
add_custom_target
(
FactControlsQml
SOURCES
SOURCES
FactPanelController.h
AltitudeFactTextField.qml
AltitudeFactTextField.qml
FactCheckBox.qml
FactLabel.qml
FactTextField.qml
FactTextFieldSlider.qml
FactBitmask.qml
FactBitmask.qml
FactCheckBox.qml
FactComboBox.qml
FactComboBox.qml
FactLabel.qml
FactTextFieldGrid.qml
FactTextFieldGrid.qml
FactTextField.qml
FactTextFieldRow.qml
FactTextFieldRow.qml
FactTextFieldSlider.qml
FactValueSlider.qml
FactValueSlider.qml
)
)
...
...
src/FlightDisplay/CMakeLists.txt
View file @
f6c22144
...
@@ -37,6 +37,8 @@ add_custom_target(FligthDisplayQml
...
@@ -37,6 +37,8 @@ add_custom_target(FligthDisplayQml
PreFlightRCCheck.qml
PreFlightRCCheck.qml
PreFlightSensorsHealthCheck.qml
PreFlightSensorsHealthCheck.qml
PreFlightSoundCheck.qml
PreFlightSoundCheck.qml
ProximityRadarValues.qml
ProximityRadarVideoView.qml
RoverChecklist.qml
RoverChecklist.qml
SubChecklist.qml
SubChecklist.qml
TelemetryValuesBar.qml
TelemetryValuesBar.qml
...
...
src/FlightMap/CMakeLists.txt
View file @
f6c22144
...
@@ -19,7 +19,7 @@ target_include_directories(FlightMap
...
@@ -19,7 +19,7 @@ target_include_directories(FlightMap
)
)
add_custom_target
(
FligthMapQml
add_custom_target
(
FligthMapQml
QGCVideoBackground.qml
FlightMap.qml
FlightMap.qml
MapScale.qml
MapScale.qml
QGCVideoBackground.qml
)
)
src/FlightMap/MapItems/CMakeLists.txt
View file @
f6c22144
add_custom_target
(
FligthMapItemsQml
add_custom_target
(
FligthMapItemsQml
SOURCES
SOURCES
PolygonEditor.qml
CameraTriggerIndicator.qml
CustomMapItems.qml
MissionItemIndicatorDrag.qml
MissionItemIndicator.qml
MissionItemIndicator.qml
MissionItemView.qml
MissionItemView.qml
VehicleMapItem.qml
MissionItemIndicatorDrag.qml
CustomMapItems.qml
PlanMapItems.qml
MissionLineView.qml
MissionLineView.qml
CameraTriggerIndicator.qml
PlanMapItems.qml
PolygonEditor.qml
ProximityRadarMapView.qml
SplitIndicator.qml
VehicleMapItem.qml
)
)
src/MissionManager/CMakeLists.txt
View file @
f6c22144
...
@@ -10,6 +10,10 @@ if(BUILD_TESTING)
...
@@ -10,6 +10,10 @@ if(BUILD_TESTING)
CorridorScanComplexItemTest.h
CorridorScanComplexItemTest.h
FWLandingPatternTest.cc
FWLandingPatternTest.cc
FWLandingPatternTest.h
FWLandingPatternTest.h
LandingComplexItemTest.cc
LandingComplexItemTest.h
MissionCommandTreeEditorTest.cc
MissionCommandTreeEditorTest.h
MissionCommandTreeTest.cc
MissionCommandTreeTest.cc
MissionCommandTreeTest.h
MissionCommandTreeTest.h
MissionControllerManagerTest.cc
MissionControllerManagerTest.cc
...
@@ -38,10 +42,10 @@ if(BUILD_TESTING)
...
@@ -38,10 +42,10 @@ if(BUILD_TESTING)
StructureScanComplexItemTest.h
StructureScanComplexItemTest.h
SurveyComplexItemTest.cc
SurveyComplexItemTest.cc
SurveyComplexItemTest.h
SurveyComplexItemTest.h
TransectStyleComplexItemTest.cc
TransectStyleComplexItemTest.h
TransectStyleComplexItemTestBase.cc
TransectStyleComplexItemTestBase.cc
TransectStyleComplexItemTestBase.h
TransectStyleComplexItemTestBase.h
TransectStyleComplexItemTest.cc
TransectStyleComplexItemTest.h
VisualMissionItemTest.cc
VisualMissionItemTest.cc
VisualMissionItemTest.h
VisualMissionItemTest.h
)
)
...
@@ -105,11 +109,12 @@ add_library(MissionManager
...
@@ -105,11 +109,12 @@ add_library(MissionManager
QGCMapPolyline.cc
QGCMapPolyline.cc
QGCMapPolyline.h
QGCMapPolyline.h
RallyPoint.cc
RallyPoint.cc
RallyPoint.h
RallyPointController.cc
RallyPointController.cc
RallyPointController.h
RallyPointController.h
RallyPoint.h
RallyPointManager.cc
RallyPointManager.cc
RallyPointManager.h
RallyPointManager.h
Section.h
SimpleMissionItem.cc
SimpleMissionItem.cc
SimpleMissionItem.h
SimpleMissionItem.h
SpeedSection.cc
SpeedSection.cc
...
@@ -138,6 +143,8 @@ add_library(MissionManager
...
@@ -138,6 +143,8 @@ add_library(MissionManager
add_custom_Target
(
MisionManagerQml
add_custom_Target
(
MisionManagerQml
SOURCES
SOURCES
MapLineArrow.qml
MissionCommandTreeEditorTestWindow.qml
QGCMapCircleVisuals.qml
QGCMapCircleVisuals.qml
QGCMapPolygonVisuals.qml
QGCMapPolygonVisuals.qml
QGCMapPolylineVisuals.qml
QGCMapPolylineVisuals.qml
...
...
src/PlanView/CMakeLists.txt
View file @
f6c22144
...
@@ -26,7 +26,13 @@ add_custom_target(PlanViewQml
...
@@ -26,7 +26,13 @@ add_custom_target(PlanViewQml
StructureScanMapVisual.qml
StructureScanMapVisual.qml
SurveyItemEditor.qml
SurveyItemEditor.qml
SurveyMapVisual.qml
SurveyMapVisual.qml
TakeoffItemMapVisual.qml
TerrainStatus.qml
TransectStyleComplexItemStats.qml
TransectStyleComplexItemStats.qml
TransectStyleComplexItemTabBar.qml
TransectStyleComplexItemTerrainFollow.qml
TransectStyleMapVisuals.qml
TransectStyleMapVisuals.qml
VTOLLandingPatternEditor.qml
VTOLLandingPatternMapVisual.qml
)
)
src/QmlControls/CMakeLists.txt
View file @
f6c22144
...
@@ -55,7 +55,6 @@ add_custom_target(QmlControlsQml
...
@@ -55,7 +55,6 @@ add_custom_target(QmlControlsQml
FlightModeDropdown.qml
FlightModeDropdown.qml
FlightModeMenu.qml
FlightModeMenu.qml
HackAndroidFileDialog.qml
HackAndroidFileDialog.qml
HackFileDialog.qml
HeightIndicator.qml
HeightIndicator.qml
HorizontalFactValueGrid.qml
HorizontalFactValueGrid.qml
IndicatorButton.qml
IndicatorButton.qml
...
@@ -74,8 +73,9 @@ add_custom_target(QmlControlsQml
...
@@ -74,8 +73,9 @@ add_custom_target(QmlControlsQml
ModeSwitchDisplay.qml
ModeSwitchDisplay.qml
MultiRotorMotorDisplay.qml
MultiRotorMotorDisplay.qml
OfflineMapButton.qml
OfflineMapButton.qml
Parameter
Editor
.qml
Parameter
DiffDialog
.qml
ParameterEditorDialog.qml
ParameterEditorDialog.qml
ParameterEditor.qml
PIDTuning.qml
PIDTuning.qml
PreFlightCheckButton.qml
PreFlightCheckButton.qml
PreFlightCheckGroup.qml
PreFlightCheckGroup.qml
...
@@ -88,24 +88,24 @@ add_custom_target(QmlControlsQml
...
@@ -88,24 +88,24 @@ add_custom_target(QmlControlsQml
QGCControlDebug.qml
QGCControlDebug.qml
QGCDynamicObjectManager.qml
QGCDynamicObjectManager.qml
QGCFileDialog.qml
QGCFileDialog.qml
QGCFlickable.qml
QGCFlickableHorizontalIndicator.qml
QGCFlickableHorizontalIndicator.qml
QGCFlickable.qml
QGCFlickableVerticalIndicator.qml
QGCFlickableVerticalIndicator.qml
QGCGroupBox.qml
QGCGroupBox.qml
QGCHoverButton.qml
QGCHoverButton.qml
QGCLabel.qml
QGCLabel.qml
QGCListView.qml
QGCListView.qml
QGCMapLabel.qml
QGCMapLabel.qml
QGCMenu.qml
QGCMenuItem.qml
QGCMenuItem.qml
QGCMenu.qml
QGCMenuSeparator.qml
QGCMenuSeparator.qml
QGCMouseArea.qml
QGCMouseArea.qml
QGCMovableItem.qml
QGCMovableItem.qml
QGCOptionsComboBox.qml
QGCOptionsComboBox.qml
QGCPipOverlay.qml
QGCPipOverlay.qml
QGCPipState.qml
QGCPipState.qml
QGCPopupDialog.qml
QGCPopupDialogContainer.qml
QGCPopupDialogContainer.qml
QGCPopupDialog.qml
QGCRadioButton.qml
QGCRadioButton.qml
QGCSlider.qml
QGCSlider.qml
QGCSwitch.qml
QGCSwitch.qml
...
@@ -114,8 +114,8 @@ add_custom_target(QmlControlsQml
...
@@ -114,8 +114,8 @@ add_custom_target(QmlControlsQml
QGCTextField.qml
QGCTextField.qml
QGCToolBarButton.qml
QGCToolBarButton.qml
QGCToolInsets.qml
QGCToolInsets.qml
QGCViewDialog.qml
QGCViewDialogContainer.qml
QGCViewDialogContainer.qml
QGCViewDialog.qml
QGCViewMessage.qml
QGCViewMessage.qml
QmlTest.qml
QmlTest.qml
RCChannelMonitor.qml
RCChannelMonitor.qml
...
...
src/Vehicle/CMakeLists.txt
View file @
f6c22144
...
@@ -4,14 +4,14 @@ if(BUILD_TESTING)
...
@@ -4,14 +4,14 @@ if(BUILD_TESTING)
list
(
APPEND EXTRA_SRC
list
(
APPEND EXTRA_SRC
FTPManagerTest.cc
FTPManagerTest.cc
FTPManagerTest.h
FTPManagerTest.h
InitialConnectTest.cc
InitialConnectTest.h
RequestMessageTest.cc
RequestMessageTest.cc
RequestMessageTest.h
RequestMessageTest.h
SendMavCommandWithHandlerTest.cc
SendMavCommandWithHandlerTest.cc
SendMavCommandWithHandlerTest.h
SendMavCommandWithHandlerTest.h
SendMavCommandWithSignallingTest.cc
SendMavCommandWithSignallingTest.cc
SendMavCommandWithSignallingTest.h
SendMavCommandWithSignallingTest.h
VehicleLinkManagerTest.cc
VehicleLinkManagerTest.h
)
)
endif
()
endif
()
...
...
src/VehicleSetup/CMakeLists.txt
View file @
f6c22144
add_library
(
VehicleSetup
add_library
(
VehicleSetup
Bootloader.cc
Bootloader.cc
Bootloader.h
FirmwareImage.cc
FirmwareImage.cc
FirmwareImage.h
FirmwareUpgradeController.cc
FirmwareUpgradeController.cc
FirmwareUpgradeController.h
JoystickConfigController.cc
JoystickConfigController.cc
JoystickConfigController.h
PX4FirmwareUpgradeThread.cc
PX4FirmwareUpgradeThread.cc
PX4FirmwareUpgradeThread.h
VehicleComponent.cc
VehicleComponent.cc
VehicleComponent.h
)
)
add_custom_target
(
VehicleSetupQml
add_custom_target
(
VehicleSetupQml
SOURCES
SOURCES
FirmwareUpgrade.qml
JoystickConfigAdvanced.qml
JoystickConfigButtons.qml
JoystickConfigCalibration.qml
JoystickConfigCalibration.qml
JoystickConfigGeneral.qml
JoystickConfigGeneral.qml
SetupParameterEditor.qml
VehicleSummary.qml
JoystickConfigButtons.qml
PX4FlowSensor.qml
FirmwareUpgrade.qml
JoystickConfig.qml
JoystickConfig.qml
JoystickConfigAdvanced.qml
PX4FlowSensor.qml
SetupParameterEditor.qml
SetupView.qml
SetupView.qml
VehicleSummary.qml
)
)
target_link_libraries
(
VehicleSetup
target_link_libraries
(
VehicleSetup
...
...
src/comm/MockLink.cc
View file @
f6c22144
...
@@ -436,7 +436,9 @@ void MockLink::_sendBatteryStatus(void)
...
@@ -436,7 +436,9 @@ void MockLink::_sendBatteryStatus(void)
_battery1PctRemaining
,
_battery1PctRemaining
,
_battery1TimeRemaining
,
_battery1TimeRemaining
,
_battery1ChargeState
,
_battery1ChargeState
,
rgVoltagesExtNone
);
rgVoltagesExtNone
,
0
,
// MAV_BATTERY_MODE
0
);
// MAV_BATTERY_FAULT
respondWithMavlinkMessage
(
msg
);
respondWithMavlinkMessage
(
msg
);
mavlink_msg_battery_status_pack_chan
(
mavlink_msg_battery_status_pack_chan
(
...
@@ -455,7 +457,10 @@ void MockLink::_sendBatteryStatus(void)
...
@@ -455,7 +457,10 @@ void MockLink::_sendBatteryStatus(void)
_battery2PctRemaining
,
_battery2PctRemaining
,
_battery2TimeRemaining
,
_battery2TimeRemaining
,
_battery2ChargeState
,
_battery2ChargeState
,
rgVoltagesExtNone
);
rgVoltagesExtNone
,
0
,
// MAV_BATTERY_MODE
0
);
// MAV_BATTERY_FAULT
respondWithMavlinkMessage
(
msg
);
respondWithMavlinkMessage
(
msg
);
}
}
...
...
src/qgcunittest/CMakeLists.txt
View file @
f6c22144
add_library
(
qgcunittest
add_library
(
qgcunittest
#FileDialogTest.cc
#FileDialogTest.cc
#FileDialogTest.h
#FileManagerTest.cc
#FileManagerTest.cc
#F
lightGearTest.cc
#F
ileManagerTest.h
GeoTest.cc
GeoTest.cc
LinkManagerTest.cc
GeoTest.h
#MainWindowTest.cc
#MainWindowTest.cc
#MainWindowTest.h
MavlinkLogTest.cc
MavlinkLogTest.cc
MavlinkLogTest.h
#MessageBoxTest.cc
#MessageBoxTest.cc
#MessageBoxTest.h
MultiSignalSpy.cc
MultiSignalSpy.cc
MultiSignalSpy.h
MultiSignalSpyV2.cc
MultiSignalSpyV2.h
#RadioConfigTest.cc
#RadioConfigTest.cc
TCPLinkTest.cc
#RadioConfigTest.h
TCPLoopBackServer.cc
UnitTest.cc
UnitTest.cc
UnitTest.h
UnitTestList.cc
UnitTestList.cc
)
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment