Philippe Renon
e49144eaa8
LP-29 add more common files to .gitignore
2016-01-22 09:31:36 +01:00
Philippe Renon
4861f53339
LP-154 fix gitignore ignoring bare config dir
...
now ignores only config dir at root of checkout
2015-10-24 13:53:11 +02:00
Philippe Renon
955eecf33d
Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration
...
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
2015-08-29 17:03:48 +02:00
Roy Bekken
dcb81a4066
LP-1 - Rebranding
...
-Remove OP from GCS directory structure; additions.
2015-08-04 16:55:12 +02:00
Alessio Morale
c010d98f21
LP-64 - Configure ccache to have its storage within source tree, under .ccache directory. Add it to gitignore
2015-07-31 11:20:09 +02:00
James Duley
b18523d690
Added option for config file.
...
Things the can be added to config file are:
export PATH := /usr/lib/ccache/bin:$(PATH)
GCS_OPTS := XXX
etc
2015-07-19 02:19:20 +12:00
Philippe Renon
7b97bfdc28
LP-29 osgearth integration : added /workspace to .gitignore
2015-07-17 22:45:13 +02:00
Philippe Renon
38682f38f4
Merge remote-tracking branch 'origin/filnet/OP-1818_update_OP_toolchain_for_compiling_osgearth' into next
...
Conflicts:
make/tools.mk
2015-04-25 17:24:31 +02:00
Philippe Renon
bc108eb542
OP-1818 added /3rdparty to git ignores
2015-04-05 18:37:19 +02:00
Philippe Renon
c7f99216b3
OP-1796 added *~ files to git ignores (not related to qt upgrade...)
2015-03-19 21:04:08 +01:00
Fredrik Larsson
d04b8fecfb
Update gitignore to make sure we keep that pro.user out of git
2014-09-08 18:23:03 +10:00
Alessio Morale
9ea2cc95ff
Remove .pydevproject and add to gitignore
2014-06-22 18:57:06 +02:00
Philippe Renon
8caac790ef
ignore Eclipse project files ground/openpilotgcs
2014-05-14 22:32:47 +02:00
Alessio Morale
d429f3ec81
Add Eclipse .settings and 'core' files to git ignore list
2014-01-03 14:58:01 +01:00
Patrick Huebner
0833cd206c
OP-1103 Fix for build error on OSX 10.8 after Qt5.1.1 update
2013-11-04 00:13:14 +11:00
Oleg Semyonov
be0a386cf8
OP-821: ignore Eclipse data that git would like to track (fixed by Nigel)
2013-04-07 19:48:33 +03:00
Oleg Semyonov
8dae0ef65a
Minor cleanup of .gitignore file
2013-03-24 13:06:15 +02:00
Stacey Sheldon
127ca1e7e1
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
ground/openpilotgcs/src/plugins/hitl/plugin.pro
ground/openpilotgcs/src/plugins/hitlnew/fgsimulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitlconfiguration.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.cpp
ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/simulator.cpp
ground/openpilotgcs/src/plugins/hitlnew/simulator.h
ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
2012-10-20 13:56:18 -04:00
Stacey Sheldon
45676f9355
androidgcs: add ignores for command-line android builds
...
Unfortunately, the android command-line tools insist on
putting a few files under the source tree. Ideally, these
files would go into ./build/androidgcs somewhere.
Tell git to ignore them until someone figures out how to
force them into the right place.
2012-10-05 20:54:01 -04:00
Stacey Sheldon
754f58c33a
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
flight/Modules/ManualControl/inc/manualcontrol.h
flight/Revolution/Makefile.osx
ground/openpilotgcs/src/plugins/plugins.pro
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
shared/uavobjectdefinition/flightstatus.xml
shared/uavobjectdefinition/hwsettings.xml
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/taskinfo.xml
2012-09-16 09:56:35 -04:00
James Cotton
eed5705a6c
Trying to get eclipse project right
2012-08-06 16:54:17 -05:00
Stacey Sheldon
f5db83bd20
Merge remote-tracking branch 'op-public/next' into revo-next
...
Conflicts:
flight/Libraries/inc/NMEA.h
flight/Modules/GPS/GPS.c
flight/Modules/GPS/NMEA.c
flight/Modules/GPS/UBX.c
flight/Modules/GPS/inc/NMEA.h
flight/Modules/GPS/inc/UBX.h
flight/Modules/PathPlanner/inc/pathplanner.h
flight/PiOS/STM32F10x/link_STM32103CB_PIPXTREME_sections.ld
flight/Revolution/System/inc/pios_config.h
flight/Revolution/UAVObjects.inc
flight/SimPosix/UAVObjects.inc
ground/openpilotgcs/src/plugins/hitlv2/aerosimrc/src/qdebughandler.h
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/gpsvelocity.xml
2012-07-22 23:39:37 -04:00
Kenz Dale
622ea04a1f
Changed .gitignore the ignore build files from XCode project.
2012-07-09 18:09:57 +02:00
Laura Sebesta
bc5e428bfe
Several small changes to OSX simulator.
...
*Changed .gitignore to ignore OSXSIM build files
*Added SIMOSX define
*Changed tcp and udp ports to be consistent with SIMPOSIX.
2012-07-08 14:26:08 +02:00
Laurent Ribon
8e3dc0a4d8
Update ignoring file list (Eclipse project specific files)
2012-03-14 19:59:08 +01:00
LM
30b6ae90f3
Added UAVObject sorting to make UAVObj structs align to word-boundaries. Else copying to / from UAVObjects will fail on Cortex M4 with an alignment error, since the proper alignment is not visible to the compiler in a line like this: float* data = UAVObj.Roll; data[2] = yaw;
2011-11-22 23:48:11 -08:00
Stacey Sheldon
3171e27810
gitignore: ignore GNU global (gtags) tags files
2011-05-08 12:41:02 -04:00
stac
cfcc67aae1
git: Adjust all ignores to account for relocated source
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2532 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-22 17:41:56 +00:00
stac
7195862d77
build: Move openpilotgcs into its own subdirectory
...
This will allow us to build a parent project for
qt-creator that sits above both openpilotgcs and
uavobjgenerator so that we can build both projects
at the same time.
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2528 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-22 17:40:26 +00:00
stac
b3b98347ec
UAVObjects-matlab: Move generated files into build dir
...
Also note that the command line option to the uavobjectgenerator
binary for matlab has changed from "mathlab" to "matlab".
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2523 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-22 17:38:30 +00:00
stac
f7a3cfc475
UAVObjects-python: Move generated files into build dir
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2522 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-22 17:38:26 +00:00
stac
ce64ea17a0
UAVObjects-gcs: Move generated files into build dir
...
Also fixes the include paths in the plugins tree.
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2521 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-22 17:38:22 +00:00
stac
2d53902148
UAVObjects-flight: Move generated files into build dir
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2520 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-22 17:38:15 +00:00
ligi
23f0cab0c3
remove autogenerated header files + one forgotten cpp file & .gitignore them
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2437 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-16 01:45:37 +00:00
peabody124
940792db5c
OP-265 CopterControl: Fork main OpenPilot directory
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2416 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-14 01:38:24 +00:00
ligi
6eda470786
updating gitignore to ignore all autogenerated files
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2410 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-13 22:17:42 +00:00
ligi
5bf8adb12a
ignore autogenerated files - they should really go into special dirs to be ignored more easy
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2397 ebee16cc-31ac-478f-84a7-5cbb03baadba
2011-01-13 10:22:47 +00:00
ligi
fc4238b369
adding /tools /downloads /build to .gitignore
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@2009 ebee16cc-31ac-478f-84a7-5cbb03baadba
2010-10-26 12:47:07 +00:00
peabody124
a084d21804
Merge branch 'watchdog'
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@1281 ebee16cc-31ac-478f-84a7-5cbb03baadba
2010-08-13 05:18:17 +00:00
stac
dea006523f
gitignore: Ignore GNU Global (gtags) index files
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@651 ebee16cc-31ac-478f-84a7-5cbb03baadba
2010-05-24 16:33:24 +00:00
stac
e3d59b8c90
gitignore: ignore some of the GUI config directories
...
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@620 ebee16cc-31ac-478f-84a7-5cbb03baadba
2010-05-14 04:31:49 +00:00
stac
5275b794a0
Add top-level Makefile
...
- manages QT and ARM toolchain installation on Linux
- manages OpenOCD build and installation on Linux
- downloaded install packages are placed in <top>/downloads
- defaults tool installs to be under <top>/tools directory
- builds both the GCS and the openpilot firmware
- build targets to regenerate the UAVObjects synthetic files
- builds are placed in <top>/builds
git-svn-id: svn://svn.openpilot.org/OpenPilot/trunk@596 ebee16cc-31ac-478f-84a7-5cbb03baadba
2010-05-07 01:44:56 +00:00
