1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-01 09:24:10 +01:00
Commit Graph

64 Commits

Author SHA1 Message Date
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
cb34075d14 LP-60 - Fix Insteller and readmes
- Add a README.md
- Add a CONTRIBUTING.md
- Use README.md renamed to txt with Windows
- Use README.md for OSX package
2015-07-31 18:48:18 +02:00
Philippe Renon
727924ea85 LP-29 osgearth integration : added osgearth library (provides Qml items) 2015-07-17 22:55:25 +02:00
James Duley
fce0f0cfd0 Fixed OpenPilot dirs in Win installer 2015-07-17 10:31:47 +12:00
James Duley
e0895f783e Removed OpenPilot prefix for Win start menu links 2015-07-17 10:29:44 +12:00
James Duley
c475c7862f replace multiple share dir installs on Win with one 2015-07-17 10:26:47 +12:00
Laurent Lalanne
154e303bd8 LP-03 Better Win32 icons, OSX icon, Splash Screen text placement and colors 2015-07-13 12:39:20 +02:00
James Duley
144b0a3d10 changed OP_XXX_NAME to ORG_XXX_NAME 2015-07-13 04:15:53 +12:00
Alessio Morale
0e0e6a1a1c Merge branch 'laurent/LP-03_Artwork_rebranding' of git://github.com/f5soh/LibrePilot into f5soh-laurent/LP-03_Artwork_rebranding
Conflicts:
	package/winx86/openpilotgcs.nsi
2015-07-12 10:39:43 +02:00
James Duley
6dc7e84a98 OP-1879 remove openpilot hardcoding: remove DisplayVersion from win uninstaller to save manually updating it with each release 2015-07-09 22:01:53 +01:00
James Duley
37ba78fb23 OP-1879 remove openpilot hardcoding: update Windows packaging to use make GCS_X_NAME variables 2015-07-09 22:01:48 +01:00
Laurent Lalanne
7210eda66d LP-03 Installer img and icon - move SplashScreen text 2015-07-09 02:28:09 +02:00
abeck70
143f09d216 Merge remote-tracking branch 'origin/rel-15.02.02' into next
Conflicts:
	flight/modules/Actuator/actuator.c
2015-05-06 08:35:21 +10:00
Laurent Lalanne
5475b395e8 OP-1827 File encoding, "Ragin' Cajun" 2015-05-02 16:11:13 +02:00
Alessio Morale
ab36dcbdee Merge remote-tracking branch 'origin/rel-15.02.02' into next 2015-04-20 14:54:07 +02:00
David Ankers
6eb8ff4801 Change uninstaller display name 2015-04-13 19:57:57 +10:00
James Duley
ccdd8e2263 OP-1667 removed old firmware line from windows package 2015-04-09 13:01:23 +12:00
James Duley
170a5f9725 OP-1667 Remove firmware file from packages: removed leftover crap from old attempt 2015-01-04 12:44:58 +13:00
Laurent Lalanne
5e22a4d15b Copyright character issue, convert openpilotgcs.nsi to UTF-8 2014-11-23 12:35:57 +01:00
Fredrik Larsson
3362c84ec5 Add cloudconfig to installer 2014-11-22 03:51:36 +11:00
Laurent Lalanne
c0d9adb9a9 Missed head file changes 2014-10-23 11:03:56 +02:00
Laurent Lalanne
43e521e791 Copyright fix (encoding) 2014-10-23 10:58:33 +02:00
Fredrik Larsson
6774e82cc8 Copyrights 2014-10-23 04:09:59 +11:00
Fredrik Larsson
1c7d5c5693 Installer Name updated 2014-10-21 22:37:20 +11:00
Laurent Lalanne
05e7339ecc OP-1390 Copy only opengl32.dll 32bit version 2014-07-05 14:12:27 +02:00
Laurent Lalanne
99db0c5025 OP-1390 First commit - Need valid download link 2014-07-04 17:21:39 +02:00
Laurent Lalanne
63f7b840df OP-1187 Allow translations in Win32 system, includes openpilotgcs_fr.qm in package. Still need qt_fr.qm file to detect french translation.
Works automaticaly and display Gcs in french, at first start.
2014-01-22 13:44:24 +01:00
Laurent Lalanne
5112d465ad git merge next 2013-12-18 20:14:26 +01:00
David
c267d73b42 Update install script for new drivers 2013-08-17 04:12:09 +10:00
Oleg Semyonov
1b1bb04305 OP-1002: Windows Installer: update branding images 2013-06-22 04:14:23 +02:00
Oleg Semyonov
74272eea03 Windows installer: add GPLv3.txt to the list of files to copy 2013-06-03 16:45:43 +03:00
David Ankers
73f7243019 Change to next release name, this was likely to be forgotten so doing it
while I remember.
2013-06-02 20:22:46 +10:00
Philippe Renon
b0111c12d1 OP-981 fixed broken GCS clean configuration link created by installer 2013-06-02 10:55:34 +02:00
Oleg Semyonov
1c04bcae36 OP-910: update Windows installer 2013-06-01 23:26:43 +03:00
Oleg Semyonov
4c34695315 Windows installer: better web site name 2013-05-29 12:05:35 +03:00
Oleg Semyonov
b6d3b2ac22 OP-893: do not include *.opfw firmware files into package
Now GCS has all firmware embedded and available through the Vehicle Setup
Wizard or Auto-Update function. Hence it is not necessary to include
another copies of the same files. But the code to do this is kept because
later we will include sim targets as firmware. Linux version does include
it already, OSX and Windows should follow.
2013-05-26 22:47:43 +03:00
David Ankers
0bff51f79f Add uninstall information, Icon and other details
Keeping Unicode intact this time
2013-05-26 02:13:43 +10:00
Oleg Semyonov
3e815ca8d5 build: get rid of build/ground subdirectory, fix qt-creator builds
This changeset:
- moves all ground targets one level up, under build directory. The
  build/ground was created as a workaround, now unnecessary;
- fixes QtCreator builds, they are separated from command line builds;
- moves GCS autogenerated files into openpilotgcs-synthetics directory.

The resulting build subdirectory now looks like:

    build
        openpilotgcs             <- Qt-Creator build directory
        openpilotgcs-synthetics  <- version-info and opfw_resource
        openpilotgcs_debug
        openpilotgcs_release     <- Makefile build directory
        uavobject-synthetics
        uavobjgenerator

NOTE: you should update the shadow build path in QtCreator to build,
      not build/ground as before.

+review OPReview
2013-03-30 17:33:38 +02:00
Oleg Semyonov
8f977a4411 Final step: lot of small fixes, last commit in this commit series
This is the first cleanup pass through makefiles and pios.
Probably it is difficult to track changes due to the nature of them.
I would recommend to look at resulting files and compiled code instead.

NOTE: original branch was rebased and lot of conflicts were fixed on
the way. So do not expect that every commit in this series will be
buildable (unlike original branch). Only final result was tested.

The main goal was to remove as much duplication of code (and copy/paste
errors) as possible, moving common parts out of Makefiles. It still is
not perfect, and mostly no code changes made - Makefiles and #ifdefs only.
But please while testing make sure that all code works as before, and no
modules/options are missed by accident.

Brief list of changes:
- Moved common parts of Makefiles into the set of *.mk files.
- Changed method of passing common vars from top Makefile to lower ones.
- Some pios cleanup, mostly #ifdefs, and all pios_config.h files.
- Many obsolete files removed (for instance, AHRS files, op_config.h).
- Many obsolete or unused macros removed or fixed/renamed (ALL_DIGNOSTICS).
- Unified pios_config.h template. Please don't remove lines for board
  configs, only comment/uncomment them. Adding new PIOS options, please
  propagate them to all board files keeping the same order.
- Some formatting, spacing, indentation (no line endings change yet).
- Some cosmetic fixes (no more C:\X\Y\filename.c printings on Windows).
- Added some library.mk files to move libs into AR achives later.
- EntireFlash target now uses cross-platform python script to generate bin
  files. So it works on all supported platforms: Linux, OSX, Windows.
- Top level packaging is completely rewritten. Now it is a part of top
  Makefile. As such, all dependencies are checked and accounted, no
  more 'make -j' problems should occur.
- Default GCS_BUILD_CONF is release now, may be changed if necessary
  using 'make GCS_BUILD_CONF=debug gcs'.
- GCS build paths are separated into debug and release, so no more obj
  file clashes. Packaging system supports only release builds.
- New target is introduced: 'clean_package'. Now 'make package' does not
  clean build directory. Use clean_package instead for distributable builds.
- Targets like 'all', 'opfw_resource', etc now will print extra contex
  in parallel builds too.
- If any of 'package', 'clean_package', 'opfw_resource' targets are given
  on command line, GCS build will depend on the resource, so all fw_*.opfw
  targets will be built and embedded into GCS. By default GCS does not
  depend on resource, and will be built w/o firmware (unless the resource
  files already exist and the Qt resource file is generated).
- fw_simposix (ELF executable) is now packaged for linux. Run'n'play!
- Make help is refined and is now up to date.

Still broken:
- UnitTests, should be fixed
- SimPosix: buildable, but should be reworked.

Next planned passes to do:
- toolchain bootstrapping and packaging (including windows - WIP)
- CMSIS/StdPeriph lib cleanup
- more PIOS cleanup
- move libs into AR archives to save build time
- sim targets refactir and cleanup
- move android-related directories under <top>/android
- unit test targets fix
- source code line ending changes (there are many different, were not changed)
- coding style

Merging this, please use --no-ff git option to make it the real commit point

Conflicts:
	A lot of... :-)
2013-03-24 13:06:24 +02:00
Oleg Semyonov
105e7d95c9 Packaging: now should work for all 3 platforms 2013-03-24 13:06:20 +02:00
Alessio Morale
f293298118 Merge remote-tracking branch 'origin/revo-fixes' into amorale/revo-merge
Conflicts:
	flight/Modules/ManualControl/manualcontrol.c
	make/scripts/version-info.py
	package/Makefile.linux
2013-01-19 20:23:48 +01:00
Oleg Semyonov
58e62d4f86 [OP-703] Add default string as a source origin when using build servers
Bamboo does not preserve git repository origin when making builds, and
it is shown later in About dialog as "Built from None". This patch fixes
that providing more accurate source description.
2012-12-14 03:08:20 +02:00
Oleg Semyonov
e8f9a5b505 [OP-759] More installer renames
OpenPilot-20121211-15ef4d9f-win32.exe
OpenPilot-20121211-15ef4d9f-amd64.deb
OpenPilot-20121211-15ef4d9f-i386.deb
OpenPilot-20121211-15ef4d9f-osx.dmg
2012-12-13 15:34:13 +02:00
Oleg Semyonov
52b720a2e1 [OP-759] More installer renames
OpenPilot-20121211-15ef4d9f-win32.exe
OpenPilot-20121211-15ef4d9f-amd64.deb
OpenPilot-20121211-15ef4d9f-i386.deb
OpenPilot-20121211-15ef4d9f-osx.dmg
2012-12-12 20:26:11 +02:00
Oleg Semyonov
fc5381dc84 Windows installer: add Revo firmware 2012-12-11 19:55:15 +02:00
Oleg Semyonov
b7d5138c5a [OP-759] Rename all installers in the same style
Conflicts:

	package/Makefile.winx86
	package/winx86/openpilotgcs.tpl
2012-12-11 19:55:13 +02:00
Oleg Semyonov
757e72336c [OP-759] Rename all installers in the same style 2012-12-11 03:07:51 +02:00
Oleg Semyonov
5a66f64551 [OP-758] Move Windows installer package into the build directory 2012-12-10 19:29:57 +02:00
Oleg Semyonov
8050283118 [OP-758] Move Windows installer package into the build directory 2012-12-10 16:00:03 +02:00