-
- Downloads
Merge remote-tracking branch 'upstream/master' into mavlinksubmodule_joystickinput
Conflicts: src/uas/UAS.h
Showing
- QGCExternalLibs.pri 8 additions, 8 deletionsQGCExternalLibs.pri
- files/styles/style-dark.css 2 additions, 1 deletionfiles/styles/style-dark.css
- qgroundcontrol.pro 16 additions, 3 deletionsqgroundcontrol.pro
- qgroundcontrol.qrc 1 addition, 0 deletionsqgroundcontrol.qrc
- src/qgcunittest/MockMavlinkFileServer.cc 286 additions, 0 deletionssrc/qgcunittest/MockMavlinkFileServer.cc
- src/qgcunittest/MockMavlinkFileServer.h 78 additions, 0 deletionssrc/qgcunittest/MockMavlinkFileServer.h
- src/qgcunittest/MockMavlinkInterface.cc 9 additions, 0 deletionssrc/qgcunittest/MockMavlinkInterface.cc
- src/qgcunittest/MockMavlinkInterface.h 44 additions, 0 deletionssrc/qgcunittest/MockMavlinkInterface.h
- src/qgcunittest/MockUAS.cc 11 additions, 1 deletionsrc/qgcunittest/MockUAS.cc
- src/qgcunittest/MockUAS.h 14 additions, 1 deletionsrc/qgcunittest/MockUAS.h
- src/qgcunittest/QGCUASFileManagerTest.cc 221 additions, 0 deletionssrc/qgcunittest/QGCUASFileManagerTest.cc
- src/qgcunittest/QGCUASFileManagerTest.h 95 additions, 0 deletionssrc/qgcunittest/QGCUASFileManagerTest.h
- src/uas/QGCMAVLinkUASFactory.cc 1 addition, 0 deletionssrc/uas/QGCMAVLinkUASFactory.cc
- src/uas/QGCUASFileManager.cc 523 additions, 0 deletionssrc/uas/QGCUASFileManager.cc
- src/uas/QGCUASFileManager.h 164 additions, 0 deletionssrc/uas/QGCUASFileManager.h
- src/uas/UAS.cc 15 additions, 5 deletionssrc/uas/UAS.cc
- src/uas/UAS.h 7 additions, 0 deletionssrc/uas/UAS.h
- src/uas/UASInterface.h 9 additions, 0 deletionssrc/uas/UASInterface.h
- src/ui/HUD.cc 5 additions, 2 deletionssrc/ui/HUD.cc
- src/ui/MainWindow.cc 19 additions, 2 deletionssrc/ui/MainWindow.cc
Loading
Please register or sign in to comment