Merge branch 'master'
Conflicts: src/MissionManager/MissionController.h
No related branches found
No related tags found
Showing
- libs/mavlink/include/mavlink/v2.0 1 addition, 1 deletionlibs/mavlink/include/mavlink/v2.0
- qgroundcontrol.pro 0 additions, 1 deletionqgroundcontrol.pro
- qgroundcontrol.qrc 1 addition, 0 deletionsqgroundcontrol.qrc
- src/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml 52 additions, 6 deletionssrc/FirmwarePlugin/PX4/PX4ParameterFactMetaData.xml
- src/FlightMap/FlightMap.qml 0 additions, 1 deletionsrc/FlightMap/FlightMap.qml
- src/MissionManager/CorridorScanComplexItem.cc 5 additions, 2 deletionssrc/MissionManager/CorridorScanComplexItem.cc
- src/MissionManager/FWLandingPattern.FactMetaData.json 4 additions, 4 deletionssrc/MissionManager/FWLandingPattern.FactMetaData.json
- src/MissionManager/FixedWingLandingComplexItem.cc 90 additions, 25 deletionssrc/MissionManager/FixedWingLandingComplexItem.cc
- src/MissionManager/FixedWingLandingComplexItem.h 38 additions, 32 deletionssrc/MissionManager/FixedWingLandingComplexItem.h
- src/MissionManager/MissionCommandList.h 0 additions, 1 deletionsrc/MissionManager/MissionCommandList.h
- src/MissionManager/MissionController.cc 10 additions, 10 deletionssrc/MissionManager/MissionController.cc
- src/MissionManager/MissionController.h 1 addition, 1 deletionsrc/MissionManager/MissionController.h
- src/MissionManager/MissionControllerTest.cc 1 addition, 1 deletionsrc/MissionManager/MissionControllerTest.cc
- src/MissionManager/MissionItem.h 0 additions, 1 deletionsrc/MissionManager/MissionItem.h
- src/MissionManager/QGCMapPolygon.cc 5 additions, 1 deletionsrc/MissionManager/QGCMapPolygon.cc
- src/MissionManager/SimpleMissionItem.cc 6 additions, 6 deletionssrc/MissionManager/SimpleMissionItem.cc
- src/MissionManager/SimpleMissionItem.h 3 additions, 3 deletionssrc/MissionManager/SimpleMissionItem.h
- src/MissionManager/SimpleMissionItemTest.cc 2 additions, 2 deletionssrc/MissionManager/SimpleMissionItemTest.cc
- src/MissionManager/VisualMissionItem.h 0 additions, 1 deletionsrc/MissionManager/VisualMissionItem.h
- src/PlanView/CorridorScanEditor.qml 1 addition, 11 deletionssrc/PlanView/CorridorScanEditor.qml
Loading
Please register or sign in to comment