mirror of
https://bitbucket.org/librepilot/librepilot.git
synced 2024-12-01 09:24:10 +01:00
955eecf33d
Conflicts: ground/gcs/gcs.pri ground/gcs/gcs.pro ground/gcs/openpilotgcs.pri ground/gcs/openpilotgcs.pro ground/gcs/src/app/gcs.icns ground/gcs/src/app/gcs.ico ground/gcs/src/app/librepilotgcs.icns ground/gcs/src/app/librepilotgcs.ico ground/gcs/src/app/librepilotgcs.rc ground/gcs/src/app/openpilotgcs.icns ground/gcs/src/library.pri ground/gcs/src/openpilotgcslibrary.pri ground/gcs/src/openpilotgcsplugin.pri ground/gcs/src/plugin.pri ground/gcs/src/plugins/config/airframe.ui ground/gcs/src/plugins/config/images/calibration/board-dwn.png ground/gcs/src/plugins/config/images/calibration/board-enu.png ground/gcs/src/plugins/config/images/calibration/board-ned.png ground/gcs/src/plugins/config/images/calibration/board-suw.png ground/gcs/src/plugins/config/images/calibration/board-swd.png ground/gcs/src/plugins/config/images/calibration/board-use.png ground/gcs/src/plugins/config/images/calibration/board-wds.png ground/gcs/src/plugins/config/images/calibration/empty.png ground/gcs/src/plugins/config/images/calibration/plane-dwn.png ground/gcs/src/plugins/config/images/calibration/plane-enu.png ground/gcs/src/plugins/config/images/calibration/plane-horizontal-rotated.png ground/gcs/src/plugins/config/images/calibration/plane-ned.png ground/gcs/src/plugins/config/images/calibration/plane-suw.png ground/gcs/src/plugins/config/images/calibration/plane-swd.png ground/gcs/src/plugins/config/images/calibration/plane-use.png ground/gcs/src/plugins/config/images/calibration/plane-wds.png ground/gcs/src/plugins/setupwizard/vehicletemplateselectorwidget.ui ground/gcs/src/plugins/systemhealth/html/GPS-Error.html ground/gcs/src/plugins/systemhealth/html/fr/GPS-Error.html ground/gcs/src/share/cloudconfig/custom/whats_this.txt ground/gcs/src/share/cloudconfig/fixedwing/SoniModelMako-FixedWing-Elevon-7134e8ae5ce.optmpl ground/gcs/src/share/cloudconfig/fixedwing/Toro900-VoilureFixe-Elevon-d4a58d2cd50.optmpl ground/gcs/src/share/cloudconfig/fixedwing/whats_this.txt ground/gcs/src/share/cloudconfig/helicopter/whats_this.txt ground/gcs/src/share/cloudconfig/multirotor/(RACE)FPV260HobbyKin-Multirotor-QuadrocopterX-0482b7a25f7.optmpl ground/gcs/src/share/cloudconfig/multirotor/(STOCK)HobbyKingFPV2-Multirotor-QuadrocopterX-0bb44b68883.optmpl ground/gcs/src/share/cloudconfig/multirotor/ARRISX-SPEEDFPV250-Unsupported-2cbaaa14a01.optmpl ground/gcs/src/share/cloudconfig/multirotor/BlackOutB330-Multirotor-QuadrocopterX-e9980c55302.optmpl ground/gcs/src/share/cloudconfig/multirotor/BlackOutMiniH-Multirotor-QuadrocopterX-d415c242154.optmpl ground/gcs/src/share/cloudconfig/multirotor/DJIF450-Multirotor-QuadrocopterX-cfa8ec67993.optmpl ground/gcs/src/share/cloudconfig/multirotor/DroneframesDRQ250-cf-rc5 Multirotor-QuadrocopterX-425b90123f1.optmpl ground/gcs/src/share/cloudconfig/multirotor/DroneframesDRQ430G-revo-rc5Multirotor-QuadrocopterX-fae90503b3f.optmpl ground/gcs/src/share/cloudconfig/multirotor/EmaxNighthawk-Multirotor-QuadrocopterX-9a3aa9d9726.optmpl ground/gcs/src/share/cloudconfig/multirotor/FlipFPVPro-Multirotor-QuadrocopterX-9eb7b719244.optmpl ground/gcs/src/share/cloudconfig/multirotor/FlipFpvPro-Multirotor-QuadrocopterX-c117d151f95.optmpl ground/gcs/src/share/cloudconfig/multirotor/FlipSport-Multirotor-QuadrocopterX-c27ae7b79ca.optmpl ground/gcs/src/share/cloudconfig/multirotor/FlyingCinemaCinetan-Multirotor-QuadrocopterX-2c3f9181872.optmpl ground/gcs/src/share/cloudconfig/multirotor/FlyingCinemaTankitoM-Multirotor-QuadrocopterX-385d9ac9ae1.optmpl ground/gcs/src/share/cloudconfig/multirotor/GenericHexa-Multirotor-Hexacopter+-c50a904f4a3.optmpl ground/gcs/src/share/cloudconfig/multirotor/GenericHexaH-Multirotor-HexacopterH-6cc3fed9073.optmpl ground/gcs/src/share/cloudconfig/multirotor/GenericHexaX-Multirotor-HexacopterX-b3b8c1d2f3c.optmpl ground/gcs/src/share/cloudconfig/multirotor/GenericHexaY6-Multirotor-HexacopterY6-0b5dc6bae4f.optmpl ground/gcs/src/share/cloudconfig/multirotor/GenericQuad+-Multirotor-Quadrocopter+-a87a4226820.optmpl ground/gcs/src/share/cloudconfig/multirotor/GenericQuadX-Multirotor-QuadrocopterX-5fce7315a5b.optmpl ground/gcs/src/share/cloudconfig/multirotor/GenericTricopter-Multirotor-Tricopter-5f46bc37c31.optmpl ground/gcs/src/share/cloudconfig/multirotor/GuerrillaDronesToadQ-Multirotor-QuadrocopterX-8f838e43432.optmpl ground/gcs/src/share/cloudconfig/multirotor/HKingDYS250CarbonFib-Multirotor-QuadrocopterX-969354c51c1.optmpl ground/gcs/src/share/cloudconfig/multirotor/HKingDYS320CarbonFib-Multirotor-QuadrocopterX-0b41edda68f.optmpl ground/gcs/src/share/cloudconfig/multirotor/HoverThingsFLIPFPV-Multirotor-QuadrocopterX-32bf14a10fc.optmpl ground/gcs/src/share/cloudconfig/multirotor/InventorsSparrowRace-Multirotor-QuadrocopterX-314fff867fd.optmpl ground/gcs/src/share/cloudconfig/multirotor/QAV250-Multirotor-QuadrocopterX-181dab0df01.optmpl ground/gcs/src/share/cloudconfig/multirotor/QAV400-Multirotor-QuadrocopterX-90a90b9fb50.optmpl ground/gcs/src/share/cloudconfig/multirotor/QAV500-Multirotor-QuadrocopterX-6da440c4d7c.optmpl ground/gcs/src/share/cloudconfig/multirotor/QUADI250-Multirotor-QuadrocopterX-c6c6cfc4cf9.optmpl ground/gcs/src/share/cloudconfig/multirotor/RCExplorerV3Tricopte-Multirotor-Tricopter-dcbce3f069c.optmpl ground/gcs/src/share/cloudconfig/multirotor/RD290MiniHexfpv-Multirotor-HexacopterX-6587232be1a.optmpl ground/gcs/src/share/cloudconfig/multirotor/XhoverMXP230Elite-Multirotor-QuadrocopterX-3b169a4fd1b.optmpl ground/gcs/src/share/cloudconfig/multirotor/ZMR250( Attitude mode)-ChineseQAV250-Multirotor-QuadrocopterX-5d318c0526c (1).optmpl ground/gcs/src/share/cloudconfig/multirotor/ZMR250(4s race)-Multirotor-QuadrocopterX-fac61e7adb8.optmpl ground/gcs/src/share/cloudconfig/multirotor/ZMR250(Race acro +)-Multirotor-QuadrocopterX-895b222d670.optmpl ground/gcs/src/share/cloudconfig/multirotor/whats_this.txt ground/gcs/src/share/cloudconfig/surface/whats_this.txt ground/gcs/src/share/translations/gcs_de.ts ground/gcs/src/share/translations/gcs_es.ts ground/gcs/src/share/translations/gcs_fr.ts ground/gcs/src/share/translations/gcs_ru.ts ground/gcs/src/share/translations/gcs_zh_CN.ts ground/gcs/src/share/translations/openpilotgcs_de.ts ground/gcs/src/share/translations/openpilotgcs_es.ts ground/gcs/src/share/translations/openpilotgcs_fr.ts ground/gcs/src/share/translations/openpilotgcs_ru.ts ground/gcs/src/share/translations/openpilotgcs_zh_CN.ts ground/gcs/src/share/vehicletemplates/custom/whats_this.txt ground/gcs/src/share/vehicletemplates/fixedwing/SoniModelMako-FixedWing-Elevon-7134e8ae5ce.optmpl ground/gcs/src/share/vehicletemplates/fixedwing/Toro900-VoilureFixe-Elevon-d4a58d2cd50.optmpl ground/gcs/src/share/vehicletemplates/fixedwing/whats_this.txt ground/gcs/src/share/vehicletemplates/helicopter/whats_this.txt ground/gcs/src/share/vehicletemplates/multirotor/(RACE)FPV260HobbyKin-Multirotor-QuadrocopterX-0482b7a25f7.optmpl ground/gcs/src/share/vehicletemplates/multirotor/(STOCK)HobbyKingFPV2-Multirotor-QuadrocopterX-0bb44b68883.optmpl ground/gcs/src/share/vehicletemplates/multirotor/ARRISX-SPEEDFPV250-Unsupported-2cbaaa14a01.optmpl ground/gcs/src/share/vehicletemplates/multirotor/BlackOutB330-Multirotor-QuadrocopterX-e9980c55302.optmpl ground/gcs/src/share/vehicletemplates/multirotor/BlackOutMiniH-Multirotor-QuadrocopterX-d415c242154.optmpl ground/gcs/src/share/vehicletemplates/multirotor/DJIF450-Multirotor-QuadrocopterX-cfa8ec67993.optmpl ground/gcs/src/share/vehicletemplates/multirotor/DroneframesDRQ250-cf-rc5 Multirotor-QuadrocopterX-425b90123f1.optmpl ground/gcs/src/share/vehicletemplates/multirotor/DroneframesDRQ430G-revo-rc5Multirotor-QuadrocopterX-fae90503b3f.optmpl ground/gcs/src/share/vehicletemplates/multirotor/EmaxNighthawk-Multirotor-QuadrocopterX-9a3aa9d9726.optmpl ground/gcs/src/share/vehicletemplates/multirotor/FlipFPVPro-Multirotor-QuadrocopterX-9eb7b719244.optmpl ground/gcs/src/share/vehicletemplates/multirotor/FlipFpvPro-Multirotor-QuadrocopterX-c117d151f95.optmpl ground/gcs/src/share/vehicletemplates/multirotor/FlipSport-Multirotor-QuadrocopterX-c27ae7b79ca.optmpl ground/gcs/src/share/vehicletemplates/multirotor/FlyingCinemaCinetan-Multirotor-QuadrocopterX-2c3f9181872.optmpl ground/gcs/src/share/vehicletemplates/multirotor/FlyingCinemaTankitoM-Multirotor-QuadrocopterX-385d9ac9ae1.optmpl ground/gcs/src/share/vehicletemplates/multirotor/GenericHexa-Multirotor-Hexacopter+-c50a904f4a3.optmpl ground/gcs/src/share/vehicletemplates/multirotor/GenericHexaH-Multirotor-HexacopterH-6cc3fed9073.optmpl ground/gcs/src/share/vehicletemplates/multirotor/GenericHexaX-Multirotor-HexacopterX-b3b8c1d2f3c.optmpl ground/gcs/src/share/vehicletemplates/multirotor/GenericHexaY6-Multirotor-HexacopterY6-0b5dc6bae4f.optmpl ground/gcs/src/share/vehicletemplates/multirotor/GenericQuad+-Multirotor-Quadrocopter+-a87a4226820.optmpl ground/gcs/src/share/vehicletemplates/multirotor/GenericQuadX-Multirotor-QuadrocopterX-5fce7315a5b.optmpl ground/gcs/src/share/vehicletemplates/multirotor/GenericTricopter-Multirotor-Tricopter-5f46bc37c31.optmpl ground/gcs/src/share/vehicletemplates/multirotor/GuerrillaDronesToadQ-Multirotor-QuadrocopterX-8f838e43432.optmpl ground/gcs/src/share/vehicletemplates/multirotor/HKingDYS250CarbonFib-Multirotor-QuadrocopterX-969354c51c1.optmpl ground/gcs/src/share/vehicletemplates/multirotor/HKingDYS320CarbonFib-Multirotor-QuadrocopterX-0b41edda68f.optmpl ground/gcs/src/share/vehicletemplates/multirotor/HoverThingsFLIPFPV-Multirotor-QuadrocopterX-32bf14a10fc.optmpl ground/gcs/src/share/vehicletemplates/multirotor/InventorsSparrowRace-Multirotor-QuadrocopterX-314fff867fd.optmpl ground/gcs/src/share/vehicletemplates/multirotor/QAV250-Multirotor-QuadrocopterX-181dab0df01.optmpl ground/gcs/src/share/vehicletemplates/multirotor/QAV400-Multirotor-QuadrocopterX-90a90b9fb50.optmpl ground/gcs/src/share/vehicletemplates/multirotor/QAV500-Multirotor-QuadrocopterX-6da440c4d7c.optmpl ground/gcs/src/share/vehicletemplates/multirotor/QUADI250-Multirotor-QuadrocopterX-c6c6cfc4cf9.optmpl ground/gcs/src/share/vehicletemplates/multirotor/RCExplorerV3Tricopte-Multirotor-Tricopter-dcbce3f069c.optmpl ground/gcs/src/share/vehicletemplates/multirotor/RD290MiniHexfpv-Multirotor-HexacopterX-6587232be1a.optmpl ground/gcs/src/share/vehicletemplates/multirotor/XhoverMXP230Elite-Multirotor-QuadrocopterX-3b169a4fd1b.optmpl ground/gcs/src/share/vehicletemplates/multirotor/ZMR250( Attitude mode)-ChineseQAV250-Multirotor-QuadrocopterX-5d318c0526c (1).optmpl ground/gcs/src/share/vehicletemplates/multirotor/ZMR250(4s race)-Multirotor-QuadrocopterX-fac61e7adb8.optmpl ground/gcs/src/share/vehicletemplates/multirotor/ZMR250(Race acro +)-Multirotor-QuadrocopterX-895b222d670.optmpl ground/gcs/src/share/vehicletemplates/multirotor/whats_this.txt ground/openpilotgcs/openpilotgcs.pri ground/openpilotgcs/openpilotgcs.pro ground/openpilotgcs/src/app/librepilotgcs.icns ground/openpilotgcs/src/app/librepilotgcs.ico ground/openpilotgcs/src/openpilotgcslibrary.pri ground/openpilotgcs/src/openpilotgcsplugin.pri ground/openpilotgcs/src/share/cloudconfig/custom/whats_this.txt ground/openpilotgcs/src/share/cloudconfig/fixedwing/SoniModelMako-FixedWing-Elevon-7134e8ae5ce.optmpl ground/openpilotgcs/src/share/cloudconfig/fixedwing/Toro900-VoilureFixe-Elevon-d4a58d2cd50.optmpl ground/openpilotgcs/src/share/cloudconfig/fixedwing/whats_this.txt ground/openpilotgcs/src/share/cloudconfig/helicopter/whats_this.txt ground/openpilotgcs/src/share/cloudconfig/multirotor/(RACE)FPV260HobbyKin-Multirotor-QuadrocopterX-0482b7a25f7.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/(STOCK)HobbyKingFPV2-Multirotor-QuadrocopterX-0bb44b68883.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/ARRISX-SPEEDFPV250-Unsupported-2cbaaa14a01.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/BlackOutB330-Multirotor-QuadrocopterX-e9980c55302.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/BlackOutMiniH-Multirotor-QuadrocopterX-d415c242154.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/DJIF450-Multirotor-QuadrocopterX-cfa8ec67993.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/DroneframesDRQ250-cf-rc5 Multirotor-QuadrocopterX-425b90123f1.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/DroneframesDRQ430G-revo-rc5Multirotor-QuadrocopterX-fae90503b3f.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/EmaxNighthawk-Multirotor-QuadrocopterX-9a3aa9d9726.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/FlipFPVPro-Multirotor-QuadrocopterX-9eb7b719244.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/FlipFpvPro-Multirotor-QuadrocopterX-c117d151f95.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/FlipSport-Multirotor-QuadrocopterX-c27ae7b79ca.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/FlyingCinemaCinetan-Multirotor-QuadrocopterX-2c3f9181872.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/FlyingCinemaTankitoM-Multirotor-QuadrocopterX-385d9ac9ae1.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/GenericHexa-Multirotor-Hexacopter+-c50a904f4a3.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/GenericHexaH-Multirotor-HexacopterH-6cc3fed9073.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/GenericHexaX-Multirotor-HexacopterX-b3b8c1d2f3c.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/GenericHexaY6-Multirotor-HexacopterY6-0b5dc6bae4f.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/GenericQuad+-Multirotor-Quadrocopter+-a87a4226820.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/GenericQuadX-Multirotor-QuadrocopterX-5fce7315a5b.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/GenericTricopter-Multirotor-Tricopter-5f46bc37c31.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/GuerrillaDronesToadQ-Multirotor-QuadrocopterX-8f838e43432.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/HKingDYS250CarbonFib-Multirotor-QuadrocopterX-969354c51c1.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/HKingDYS320CarbonFib-Multirotor-QuadrocopterX-0b41edda68f.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/HoverThingsFLIPFPV-Multirotor-QuadrocopterX-32bf14a10fc.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/InventorsSparrowRace-Multirotor-QuadrocopterX-314fff867fd.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/QAV250-Multirotor-QuadrocopterX-181dab0df01.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/QAV400-Multirotor-QuadrocopterX-90a90b9fb50.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/QAV500-Multirotor-QuadrocopterX-6da440c4d7c.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/QUADI250-Multirotor-QuadrocopterX-c6c6cfc4cf9.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/RCExplorerV3Tricopte-Multirotor-Tricopter-dcbce3f069c.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/RD290MiniHexfpv-Multirotor-HexacopterX-6587232be1a.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/XhoverMXP230Elite-Multirotor-QuadrocopterX-3b169a4fd1b.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/ZMR250( Attitude mode)-ChineseQAV250-Multirotor-QuadrocopterX-5d318c0526c (1).optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/ZMR250(4s race)-Multirotor-QuadrocopterX-fac61e7adb8.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/ZMR250(Race acro +)-Multirotor-QuadrocopterX-895b222d670.optmpl ground/openpilotgcs/src/share/cloudconfig/multirotor/whats_this.txt ground/openpilotgcs/src/share/translations/openpilotgcs_de.ts ground/openpilotgcs/src/share/translations/openpilotgcs_es.ts ground/openpilotgcs/src/share/translations/openpilotgcs_fr.ts ground/openpilotgcs/src/share/translations/openpilotgcs_ru.ts ground/openpilotgcs/src/share/translations/openpilotgcs_zh_CN.ts make/tools.mk
79 lines
1.5 KiB
Plaintext
79 lines
1.5 KiB
Plaintext
# Ignore artifacts of top-level Makefile
|
|
/downloads
|
|
/tools
|
|
/build
|
|
/3rdparty
|
|
|
|
# Ignore user config
|
|
config
|
|
|
|
|
|
# Exclude temporary and system files
|
|
Thumbs.db
|
|
.DS_Store
|
|
GPATH
|
|
GRTAGS
|
|
GSYMS
|
|
GTAGS
|
|
core
|
|
*~
|
|
|
|
# flight
|
|
/flight/*.pnproj
|
|
/flight/*.pnps
|
|
/flight/.cproject
|
|
/flight/.metadata
|
|
/flight/.project
|
|
/flight/.settings
|
|
/flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/*.mode1v3
|
|
/flight/Project/OpenPilotOSX/OpenPilotOSX.xcodeproj/*.pbxuser
|
|
|
|
# ground
|
|
gcs-build-desktop
|
|
ground/gcs/.cproject
|
|
ground/gcs/.project
|
|
ground/gcs/.settings
|
|
|
|
# Ignore .pro.user files
|
|
*.pro.user
|
|
|
|
|
|
# Misc artifacts
|
|
*.exe
|
|
/ground/gcs/share/translations/extract-mimetypes.xq
|
|
/ground/gcs/src/experimental/tools/DocumentationHelper/ui_mainwindow.h
|
|
/ground/gcs/src/libs/qextserialport/.hg
|
|
/ground/gcs/src/libs/qextserialport/.hgtags
|
|
/ground/gcs/src/libs/qwt/qwt.prf
|
|
/ground/gcs/src/libs/qwt/designer
|
|
/ground/gcs/src/plugins/ipconnection/ui_ipconnectionoptionspage.h
|
|
|
|
# Ignore intermediate files generated by command-line android builds
|
|
# Couldn't figure out how to force these files into the ./build directory
|
|
/androidgcs/build.xml
|
|
/androidgcs/local.properties
|
|
/androidgcs/proguard-project.txt
|
|
|
|
# Ignore build output from Eclipse android builds
|
|
/androidgcs/bin/
|
|
/androidgcs/gen/
|
|
|
|
# Ignore Eclipse Projects and Metadata
|
|
/.cproject
|
|
/.project
|
|
/.metadata
|
|
/.settings
|
|
/.pydevproject
|
|
/workspace
|
|
|
|
# Ignore Eclipse temp folder, git plugin based?
|
|
RemoteSystemsTempFiles
|
|
|
|
# Ignore patch-related files
|
|
*.rej
|
|
*.orig
|
|
*.diff~
|
|
|
|
# ignore ccache storage
|
|
.ccache
|