Philippe Renon
ab8a470580
LP-2 make osg use Qt 5.5.1
2015-12-14 22:14:22 +01:00
Philippe Renon
95ea26c396
Merge branch 'next' of bitbucket.org:librepilot/librepilot into filnet/LP-29_osgearth_integration
...
# Conflicts:
# ground/gcs/src/libs/osgearth/osgearth.pro
2015-12-10 00:17:10 +01:00
Philippe Renon
0efa0131e1
LP-30 fix minor compilation warning about copy constructor
2015-12-03 00:06:48 +01:00
Philippe Renon
060da52bd2
LP-2 remove unused QT_SDK_INSTALLER_DAT from top Makefile
2015-12-02 09:05:14 +01:00
Philippe Renon
69ee68ddfe
LP-2 move ARM SDK install to proper place (out of the middle of the Qt stuff)
2015-12-02 09:05:14 +01:00
Philippe Renon
11f851cdcf
LP-2 fix MAC_QT_INSTALL_TEMPLATE
2015-12-02 09:05:14 +01:00
Philippe Renon
d5e97fffe1
LP-2 fix MAC_QT_INSTALL_TEMPLATE
2015-12-02 09:05:14 +01:00
Philippe Renon
3d8493a38a
LP-2 remove LINUX_QT_INSTALL_TEMPLATE
2015-12-02 09:05:14 +01:00
Philippe Renon
90e81e6b5a
LP-2 install Qt using a silent install script
...
tested on windows and linux 64.
2015-12-02 09:05:14 +01:00
Philippe Renon
3131c59eb4
LP-2 attempt at installing qt 5.5.1 using QtIFW devtool utility
...
devtool can be used to extract components and run operations
unfortunately the QtPatch operation is not available
attempt still commited for future reference
2015-12-02 09:05:14 +01:00
Philippe Renon
e8816c86c8
LP-2 upgraded to Qt 5.5.1
2015-12-02 09:05:14 +01:00
Philippe Renon
067261ed3f
LP-2 upgraded to Qt 5.5.0 (excluding sdk installer)
2015-12-02 09:05:14 +01:00
Philippe Renon
396877238b
LP-29 osgearth does not need the OSG_WINDOWING_SYSTEM cmake build option
2015-11-30 22:23:43 +01:00
Philippe Renon
5acaffe93c
patch osg to fix mac compile error
2015-11-23 09:30:40 +01:00
Philippe Renon
ac76fc768f
Merged in filnet/librepilot/filnet/LP-30_3rdparty_build_scripts (pull request #50 )
...
LP-30 added build scripts for osg (including windows dependencies), osgearth and marble
2015-11-14 13:46:46 +01:00
Philippe Renon
8f2bebc4a2
LP-30 README.text cleanup
2015-11-05 08:43:31 +01:00
Philippe Renon
57e1122f4c
LP-30 disable compilation of osgWrappers/deprecated-dotosg
2015-11-03 01:50:52 +01:00
Philippe Renon
a3a7d55176
LP-30 fixed PATH issue on windows after switching to git for windows 2.6.2
...
apparently environment variables, like TOOLS_DIR, set in .bashrc are messed up now (/d/path becomes D:/path)
a workaround is to set them in the Makefile config file
2015-11-03 00:43:31 +01:00
Philippe Renon
73d15be2c1
LP-30 added short readme describing how to build osgEarth
2015-11-03 00:01:01 +01:00
James Duley
8834b66858
LP-82 define packaging info once in Makefile
2015-10-18 10:21:52 +01:00
Philippe Renon
a25b31b743
LP-30 upgraded google sat version via patch
2015-09-29 21:44:20 +02:00
Philippe Renon
3a5ba9ad58
LP-30 fixed marble
2015-09-25 23:41:25 +02:00
Philippe Renon
445ca8c5ae
LP-30 set marble version to 15.08.1 and added patch to fix windows compilation issue
2015-09-25 23:39:51 +02:00
Philippe Renon
8f868d9e35
LP-30 fixed some pathes
2015-09-25 23:39:50 +02:00
Alessio Morale
08e0a580ed
Merged in james-duley/librepilot/LP-113_tool_installer (pull request #49 )
...
LP-113_tool_installer
2015-09-18 20:40:08 +02:00
Philippe Renon
4891f7c5ab
LP-30 fixed DYLD_LIBRARY_PATH used when building osgearth on osx
2015-09-15 22:13:30 +02:00
Philippe Renon
e8f8a52600
LP-30 fixed list of unix dev libs required to build osg/osgearth
2015-09-15 22:12:30 +02:00
James Duley
b1f1c929d7
LP-113 new tool installer: Upgrade gcc-arm-none-eabi to 4.9 2015 q2 update
2015-09-15 00:06:09 +01:00
James Duley
4a3b222192
LP-113 new tool installer: added 7z for windows
2015-09-15 00:06:09 +01:00
James Duley
84880a0b80
LP-113: add new tool install framework
2015-09-15 00:06:09 +01:00
Philippe Renon
bed35a1d33
LP-30 osg : added proper win dependencies build script
2015-09-12 20:20:40 +02:00
Philippe Renon
c3fa476404
LP-30 unset OSG_NOTIFY_LEVEL to avoid warning if not set properly
2015-09-12 18:55:35 +02:00
Philippe Renon
3ca2634109
LP-30 don't copy now non existant googlesat/bicycle
2015-09-08 23:15:24 +02:00
Philippe Renon
6af2d6920d
LP-30 fixed lib path when building osgearth on osx
2015-09-08 23:06:42 +02:00
Philippe Renon
225097fbcb
LP-30 use .patch extension instead of .diff for patch files
2015-09-08 22:53:47 +02:00
Philippe Renon
7b443715ae
LP-30 don't package non existant LibrePilotReadme.txt with marble
2015-09-08 22:52:52 +02:00
Philippe Renon
59636cb2ec
LP-30 get marble maps from gitlab
2015-09-08 22:45:07 +02:00
Philippe Renon
9436bae7c8
LP-30 fixed linux 64 packaging issue
2015-09-08 09:12:30 +02:00
Philippe Renon
9b495456e2
LP-29 all_sdk_install will not install osg anymore, instead build_sdk_install will install if OS is windows
2015-09-06 17:10:52 +02:00
Philippe Renon
ca1fa5fe3e
LP-30 removed references to OP and other minor cleanups
2015-09-06 17:05:29 +02:00
Philippe Renon
9658ba3500
LP-30 removed old commented out scruff from osg win script
2015-09-06 16:50:45 +02:00
Philippe Renon
54edce6e1c
LP-30 added build scripts for osg (including windows dependencies), osgearth and marble
2015-09-05 19:10:54 +02:00
Alessio Morale
136d8af3a6
Merged in filnet/librepilot/filnet/LP-29_osgearth_integration (pull request #12 )
...
LP-29_osgearth_integration
2015-09-04 09:46:21 +02:00
James Duley
e308039206
LP-99 Decouple flight build
...
Moved flight make code into flight/Makefile. This should speed up
rebuilds for GCS and keeps the top level Makefile tidier.
Change-Id: I9d33cb5c223b6a8ed2821435a5d63ecf4b97c6b8
2015-09-02 19:34:58 +12:00
Philippe Renon
87c54e7f7e
LP-29 renamed OSG_PARENT_DIR to OSG_TOOLS_DIR
2015-08-31 14:16:52 +02:00
Philippe Renon
9f96c726e9
LP-29 upgraded to osg 3.4 release
2015-08-31 14:15:36 +02:00
Philippe Renon
7a45978815
LP-29 renamed OSG_DIR to OSG_PARENT_DIR as per review comment
2015-08-31 10:38:12 +02:00
Philippe Renon
35d831f778
LP-29 add missing OSG_DIR definition
2015-08-29 19:51:59 +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
Alessio Morale
19400dd6bb
Merged in paul_jewell/librepilot/unbrand_documentation2 (pull request #34 )
...
Replaced OpenPilot branding in doxygen configuration files (env version)
2015-08-21 13:35:52 +02:00
Roy Bekken
ad84547637
Update all changed files against GIT log with copyright headers consistency.
2015-08-19 16:15:58 +02:00
Paul Jewell
e6a4480adb
Replaced OpenPilot branding in doxygen configuration files (env version)
2015-08-15 09:41:05 +01:00
LibrePilot Packager
8500c38c3d
LP-1: moved openpilotgcs.pri to gcs.pri
...
Change-Id: I8d3f0a6b7420cef2988cb04b526ca81fc66c5d7c
2015-08-02 19:36:39 +01:00
James Duley
c14cacb043
LP-1 rebranding: move ground/{openpilotgcs => gcs}
...
and associated pro file.
Change-Id: Icc200217f2db27635c7aa2e5b182f9b273925647
2015-08-02 19:20:02 +01:00
James Duley
560d01dfd7
LP-61 more config options: split out make helper functions
...
Change-Id: I54b1ed3f42170c7ee0a3dbe816a5d0400881d9e2
2015-08-02 11:33:51 +01:00
alessio morale
c86f035d2e
Merged in amorale/LP-64_ccache_install (pull request #7 )
...
LP-64 ccache install
2015-07-31 14:36:10 +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
Roy Bekken
a968e7594d
LP-1 – Code Rebranding
...
Drop prefix for download and tools variables.
2015-07-30 21:47:13 +02:00
Roy Bekken
f6116d7349
LP-1 – Code Rebranding
...
Rename variables for local tools and installation directory.
2015-07-29 14:49:09 +02:00
Alessio Morale
ba1ab669e5
LP-64 - Add ccache install target
2015-07-28 07:30:45 +02:00
Alessio Morale
e01798d1ed
LP-41 - Add support for ccache
...
- explicitly define QMAKE_CC & CXX as "ccache <compiler>"
- use ccache for uavobjectgenerator
- Handle CCACHE setting with configuration options
To enable ccache you need to configure it like
make CCACHE=/path/to/ccache config_append
2015-07-22 20:40:43 +02:00
Philippe Renon
9d97cbad1c
LP-29 osgearth integration : upgrade to osg 3.4-rc5 and osgearth 2.7rc2
2015-07-20 23:05:41 +02:00
Philippe Renon
727924ea85
LP-29 osgearth integration : added osgearth library (provides Qml items)
2015-07-17 22:55:25 +02:00
paul Jewell
6b6461c8b4
Replaced OPENPILOT_IS_COOL by TOP_LEVEL_MAKEFILE
2015-07-15 08:06:21 +01:00
unknown
63afbb88fa
Move win_sdk_install tools storage to LibrePilot
2015-07-08 11:06:16 +02:00
a*morale
1174ec9161
moves sdk_install resources to LibrePilot systems
2015-07-07 23:19:02 +02:00
James Duley
b73dba5093
OP-1926: fixed the xxx+r0-g1234 on tags which shouldn't exist
...
I was erroneously comparing string to int
2015-06-20 22:19:28 +10:00
Mathieu Rondonneau
66b06e4c9a
REVONANO - Add MPU9250 support
2015-05-18 21:29:42 +02:00
Alessio Morale
764a15999f
REVONANO - Make FlashFS_Logfs optional, remove old onchip eeprom files
...
Conflicts:
flight/targets/boards/coptercontrol/firmware/Makefile
2015-05-18 18:55:21 +02:00
abeck70
ddefd11b7f
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
2015-05-07 11:28:24 +10:00
James Duley
9923803e59
Merge branch 'parched/OP-1806_version-info_escape_strings' into next
2015-05-06 17:11:17 +12:00
abeck70
21c54c3a37
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1848r-altvario
2015-05-01 22:59:36 +10:00
m_thread
b0b1a42aec
OP-1837 This change adds support for the Multiplex SRXL v1 and v2 protocols.
...
Protocol version is autodetected and 12 or 16 channels are supported.
SRXL is available on Flexiport of Revolution board.
2015-04-26 15:04:52 +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
5b660a1fe0
Merge remote-tracking branch 'origin/filnet/OP-1796_upgrade_gcs_to_qt_5_4_1' into next
...
Conflicts:
make/tools.mk
2015-04-25 17:21:33 +02:00
abeck70
955f314541
OP-1848 altvario rewrite - initial checkin
...
TODO: 1) update uavos 2) check dT
2015-04-23 15:46:47 +10:00
James Duley
b73c88b188
OP-1806 version info escape strings for C.
...
Added option "--escape" which uses json.dumps to do escaping
2015-04-23 13:40:03 +12:00
James Duley
580ae19983
Revert "OP-1792: make firmware_info.c depend on uavobjectdefition instead of FORCE so it isn't always updated"
...
This reverts commit 428bba0c09
.
On windows directory timestamps are not modified when a file is
modified.
2015-04-22 21:04:06 +12:00
Mike Carr
e0291fd969
OP-1844 - cleanup not needed items, based on code review suggestions
2015-04-20 14:38:55 +02:00
Mike Carr
a5556030de
OP-1844 - fix typo
2015-04-20 14:38:39 +02:00
Mike Carr
a80795b4dd
OP-1844 - vagrant dev workstation: initial push
2015-04-20 14:38:21 +02:00
Philippe Renon
33c569abf6
OP-1796 updated Qt download urls to new location
2015-04-17 08:38:10 +02:00
Philippe Renon
1ef5d644b8
OP-1818 applied review comments
2015-04-09 21:11:15 +02:00
Philippe Renon
bc3266d689
OP-1818 added missing MSYS_URL to tools.mk
2015-04-05 18:56:21 +02:00
Philippe Renon
8525ef1287
OP-1818 added MD5_GEN_TEMPLATE used to generate md5 signature files
2015-04-05 18:40:52 +02:00
Philippe Renon
e61aefdfee
OP-1818 define ZIP variable in make/tools.mk
2015-04-05 18:38:56 +02:00
Philippe Renon
2c2d50908f
OP-1818 added MSYS to toolchain (windows only) - needed to compile osg dependencies
2015-04-05 18:38:15 +02:00
Philippe Renon
7612b15213
OP-1818 added CMake to toolchain - use 'make cmake_install' (windows only)
2015-04-05 18:36:56 +02:00
James Duley
199ee15d84
OP-1792 makefile tidy: removed unneeded quotes for OPENSSL that break copydata makefile
2015-04-01 09:19:09 +13:00
James Duley
428bba0c09
OP-1792: make firmware_info.c depend on uavobjectdefition instead of FORCE so it isn't always updated
2015-03-30 11:41:35 +13:00
abeck70
88494e2745
OP-1696 PathFollower rewrite in C++ and Landing Squashed commit of the following:
...
commit 580cd8addafadc3109b90b1fd183130ea8add7f2
Author: abeck70 <abeck70@icloud.com>
Date: Fri Mar 20 21:32:33 2015 +1100
OP-1696 Cleanup and bug fix
1. Code review cleanup
2. Fixed gps assist braking - the thrust limits in piddown were not being set.
commit 31ac4494f6e2bc5859f49d1f76f19fe3a4d32862
Author: abeck70 <abeck70@icloud.com>
Date: Wed Mar 18 08:31:16 2015 +1100
OP-1696 fix initialisation of down pid control parameters
commit a7bd737459249530bde9546b8247dd45b40dced4
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 17 21:18:38 2015 +1100
OP-1769 Actuator fix from code review
commit 968172b8fb46c91b2611be4825e17faf2fa13411
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 17 21:01:11 2015 +1100
OP-1696 fixed ground pathfollower settings xml
commit 721c07b67a87911ed67d0b62aa658cfac6d3eb97
Merge: f556215 be9f4ae
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 17 20:52:01 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit f556215ddbd5a29b22c2e6124372d74a0d6b9a0f
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 17 20:51:22 2015 +1100
OP-1696 ground pathfollower fixes
commit 4584b22d6a2d33d3efb1cd11ac46804a5623a236
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 17 18:11:52 2015 +1100
OP-1696 Ground redesign
1. Move to new PID loop design
2. Prototype steering control
commit b70c3373646fa758ae30a59765b8a56df7d2fbeb
Author: abeck70 <abeck70@icloud.com>
Date: Sun Mar 15 18:42:06 2015 +1100
OP-1696 ground pathfollower added missing call to update velocity state
commit a282bfb14dffcd486466b60be3100d26c11649ef
Author: abeck70 <abeck70@icloud.com>
Date: Sun Mar 15 17:22:02 2015 +1100
OP-1696 ground pathfollower improvements
commit f56ea4f9b101415e32e4464e51e087ee350be969
Author: abeck70 <abeck70@icloud.com>
Date: Sun Mar 15 07:44:01 2015 +1100
OP-1696 remove unused PID controller in ground for vertical
commit 6424aa0a84c3718a5a7b51fab1c9e04587d325b8
Author: abeck70 <abeck70@icloud.com>
Date: Sat Mar 14 21:40:58 2015 +1100
OP-1696 Initialise vtolemergencyfallback variables
commit 5d6110499bb06fe9b397e09dea5aafe994f03d13
Author: abeck70 <abeck70@icloud.com>
Date: Sat Mar 14 21:30:21 2015 +1100
OP-1696 vtolflycontroller segv fixed and uncrustify
commit bef23ea3dc2b5aff5b9b8713802586719b8f68cf
Author: abeck70 <abeck70@icloud.com>
Date: Sat Mar 14 20:50:05 2015 +1100
OP-1783 PathPlanner
Instead of config alarm if no pathplan, simply continue to alarm pathplan, but allow normal arming and flight in other modes. If pathplan enabled, simply enter position hold.
commit 370f1747209cca7c01c071a43224ad83b04bdd55
Author: abeck70 <abeck70@icloud.com>
Date: Sat Mar 14 20:48:22 2015 +1100
OP-1769 Ground code review comment
1. Remove idx1 < 0 check not needed
2. Should return abs_input in the corner case that curve is "invalid".
commit 01973c656d783e035ad823c267d3387bf473eebe
Merge: be07d12 5c9b6fa
Author: abeck70 <abeck70@icloud.com>
Date: Sat Mar 14 12:17:31 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit be07d125f42b5ca1aabce0f5c0fcf592e8cddf98
Merge: 44afdc7 ad44b31
Author: abeck70 <abeck70@icloud.com>
Date: Thu Mar 12 21:55:52 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 44afdc77987049dc58cdf42e3be88b7eae38de02
Author: abeck70 <abeck70@icloud.com>
Date: Thu Mar 12 19:35:55 2015 +1100
OP-1696 fix startup
Fix initialisation and void use of pios_malloc at startup
commit 962f5f75756883cec6726c0347310d60264f6989
Author: abeck70 <abeck70@icloud.com>
Date: Thu Mar 12 18:48:04 2015 +1100
OP-1696 undo changes to make file
commit 7fa71d5c614d492cb4026312672068f92a4bcd3e
Merge: 672732e 5a9cfa6
Author: abeck70 <abeck70@icloud.com>
Date: Thu Mar 12 18:06:59 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 672732e95d555946300ef5093f687f3fa88bfd3a
Author: abeck70 <abeck70@icloud.com>
Date: Wed Mar 11 12:59:44 2015 +1100
OP-1696 code review comments
commit 73b295d6515f2489b3b3a61459c975b0c37afe3d
Author: abeck70 <abeck70@icloud.com>
Date: Wed Mar 11 12:47:24 2015 +1100
OP-1696 code review comments
commit 524b72f537fe922bf3c4385b418872f13819a5cf
Merge: 6beef01 ba5f395
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 10 23:19:06 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 6beef01476d06598652a10de4857e6ae55015417
Merge: 100cf33 8c31f96
Author: abeck70 <abeck70@icloud.com>
Date: Sat Mar 7 16:50:32 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 100cf335d187fe696d3678371b194fc3044a1c7e
Author: Alex Beck <abeck70@icloud.com>
Date: Thu Mar 5 22:32:30 2015 +1100
OP-1696 simposix c++ compilation fix
commit 9ebf846d1ec8fef30ffc1204546fc5dc648ec10b
Author: Alex Beck <abeck70@icloud.com>
Date: Thu Mar 5 21:35:39 2015 +1100
OP-1696 fix simposix c++ compile of pathfollower
commit a86b4b1db46dba569739587ee57b03460381ebab
Author: abeck70 <abeck70@icloud.com>
Date: Thu Mar 5 18:03:51 2015 +1100
OP-1696 resolve linux build issue
commit 1d7695f81293534bc17f69b0fcd9de3876867f6a
Author: abeck70 <abeck70@icloud.com>
Date: Wed Mar 4 18:10:09 2015 +1100
OP-1696 Return to Base & Land implemented
Enabled via FlightModeSettings ReturnToBaseNextCommand = LAND
commit 4e5ca807b18a40ea60c05c1b46f738462595a6b2
Author: abeck70 <abeck70@icloud.com>
Date: Wed Mar 4 16:38:06 2015 +1100
OP-1696 reduce memory footprint by only allocating controllers required for a particular frame type
commit 78e8f559cd25ffaeac68b563e25d1ad357205fd6
Author: abeck70 <abeck70@icloud.com>
Date: Wed Mar 4 13:51:05 2015 +1100
OP-1696 move fsm initialisation to controller implementations
commit 848c78a84e5c7e11b2da953c9d9549b11fc5b1d8
Author: abeck70 <abeck70@icloud.com>
Date: Wed Mar 4 13:27:11 2015 +1100
OP-1696 reduce memory through re-use of pointers to data objects in base class.
commit bc8794601142055942910ba9f938c03c8a3ca547
Merge: 24bc3de 843325d
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 3 22:06:01 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 24bc3de6155a74850b17ca7706f6b592923e027c
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 3 17:56:12 2015 +1100
OP-1696 update gcs path planner options to align to new modes
commit dc659891882ea0624a6436550425c54b347f4101
Author: abeck70 <abeck70@icloud.com>
Date: Tue Mar 3 13:51:55 2015 +1100
OP-1696 pathfollower class renaming and uncrustify
commit af19d114b8e0ff23159bdaca37e5f5bf1c1f8beb
Merge: b07c1fd 04f4cd9
Author: abeck70 <abeck70@icloud.com>
Date: Mon Mar 2 21:47:12 2015 +1100
Merge branch 'rel-15.02' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit b07c1fdd0544a555678bc7a8510cd92861f17e46
Author: abeck70 <abeck70@icloud.com>
Date: Mon Mar 2 21:27:27 2015 +1100
OP-1696 remainder of changes to integrate drive and fly objectives
commit c824c53cf30889a468ecb25ae3d705fa011b23ba
Merge: b89751c 1102243
Author: abeck70 <abeck70@icloud.com>
Date: Mon Mar 2 17:06:13 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit b89751caa5d6dc06e1e20391aa4e12b5484056d4
Author: abeck70 <abeck70@icloud.com>
Date: Mon Mar 2 17:04:27 2015 +1100
OP-1696 merge fly and drive pathdesired/action objectives
commit c463132cb7da5cdf9fc5395ae0650b081bc9fb55
Author: abeck70 <abeck70@icloud.com>
Date: Sun Mar 1 10:25:29 2015 +1100
OP-1696 merge ground pathfollower and refactored into C++
commit 6ed504b32f9e502e4f02d50b9e85ba91591417ba
Merge: bcf245e deafed6
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 27 18:12:32 2015 +1100
Merge branch 'next' into corvuscorax/OP-1642_tank-support
Conflicts:
flight/modules/PathFollower/pathfollower.c
shared/uavobjectdefinition/vtolpathfollowersettings.xml
commit bcf245e08c3348f2e6e5eddceee6d6cc268bdc23
Author: Corvus Corax <corvuscorax@cybertrench.com>
Date: Sat Dec 6 19:45:29 2014 +0100
OP-1642 added new uavobject to discovery target, too
commit 6b9e8a7d7dad0739b4ffd2ce7f2f78ed4f597077
Author: Corvus Corax <corvuscorax@cybertrench.com>
Date: Sat Dec 6 17:58:18 2014 +0100
OP-1642 added very simple path control for ground vehicles
commit e8d8440e049c06158e7fc542627fac6420abaf65
Author: Corvus Corax <corvuscorax@cybertrench.com>
Date: Sat Dec 6 17:17:09 2014 +0100
OP-1642 added new settings uavobject for tank path follower
commit 71dd726eb5b52614b417236c22e8a5cc3a487faf
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 27 18:05:10 2015 +1100
OP-1696 align pathaction to pathdesired
commit 8a88af83be457aafbb63e4f94fad3b1cd54264ca
Author: abeck70 <abeck70@icloud.com>
Date: Thu Feb 26 08:06:34 2015 +1100
OP-1696 fixed wing control refactored and compiling
commit fd9850b5e5680f5b422dbc468a94c5ec4b6dd518
Author: abeck70 <abeck70@icloud.com>
Date: Wed Feb 25 17:47:19 2015 +1100
OP-1696 Removed vtol stuff from pathfollower.cpp after having replaced it with class impl
commit 9127d8d6d8c345c5bbf8622ce4e5eb76b03d1356
Merge: 4054c73 93fb2d5
Author: abeck70 <abeck70@icloud.com>
Date: Wed Feb 25 13:09:06 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 4054c73ac98b54188a0a5367c5ca913b7fee6a89
Author: abeck70 <abeck70@icloud.com>
Date: Tue Feb 24 12:29:28 2015 +1100
OP-1696 fix compile errors
commit b398db3d4de8cd621a059da1f0dbb00868be0fb9
Merge: 94c795a 3e15cac
Author: abeck70 <abeck70@icloud.com>
Date: Tue Feb 24 12:06:35 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 94c795af386cf0f1072a88e99a80cb1080bf85e7
Merge: d2115de 57e0a8b
Author: abeck70 <abeck70@icloud.com>
Date: Mon Feb 23 17:54:33 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
Conflicts:
flight/modules/Sensors/sensors.c
make/common-defs.mk
commit d2115dee4e8e9b6a02f7b7700e4715480a56b18f
Author: abeck70 <abeck70@icloud.com>
Date: Mon Feb 23 14:35:02 2015 +1100
OP-1696 preliminary checkin for refactor of fly
TODO:
1. Finalise and test fly, brake
2. Remove patfhollower vtol fly
3. Rename all objects adding vtol in name
commit 95804b1d591d194cce3596187c74cdb2dd0d192f
Merge: 58cebb0 31c1385
Author: abeck70 <abeck70@icloud.com>
Date: Sat Feb 21 22:10:03 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 58cebb0658deaece1555cfa24e50f1b86fd68c96
Author: abeck70 <abeck70@icloud.com>
Date: Sat Feb 21 22:09:29 2015 +1100
OP-1696 refactor neutral thrust and add pos hold implementation
commit 2c3cadfef3de9e092bd66bbabc58ac7847aca7e4
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 20 18:32:11 2015 +1100
OP-1696 start of refactor of braking
commit 991c2124e834f3432f5e34c5c9f4966cb42a7be3
Merge: 1ab5798 db7d605
Author: abeck70 <abeck70@icloud.com>
Date: Thu Feb 19 12:17:54 2015 +1100
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1696
commit 1ab579865f04aeaa5899f5065a983de29074e025
Author: abeck70 <abeck70@icloud.com>
Date: Wed Feb 18 21:29:01 2015 +1100
OP-1696 Rewrote velocity roam into new C++ OO architecture
With use of new PID controller for NE.
commit 03edb049f06bf60054dce36a5b8b301a397284c4
Author: abeck70 <abeck70@icloud.com>
Date: Wed Feb 18 12:19:17 2015 +1100
OP-1696 Start of refactoring of VelocityRoam implementation in PathFollower
Also TODOs:
1. To support pathplanner, remove all references to FlightStatus object and add more fields to PathDesired
2. Refactor Braking to use C++
3. Test and optimise Velocity Roam
4. Add more config options to Landing. For example disable disarming. And add more setting objects.
5. Consider moving all landing settings to one object.
commit 1f5dba821d4535a9a14f333efdeec1af5afcc281
Author: abeck70 <abeck70@icloud.com>
Date: Mon Feb 16 22:51:31 2015 +1100
OP-1696 Landing tuning
commit 5133956c717fba871dd5700333806e298038a3d0
Author: abeck70 <abeck70@icloud.com>
Date: Mon Feb 16 21:05:06 2015 +1100
OP-1696 Landing
Multiple fixes
commit cf22055ecb8eb7304174c730f249a2332ebc599b
Author: abeck70 <abeck70@icloud.com>
Date: Sun Feb 15 20:52:29 2015 +1100
OP-1696 Add PIDStatus debug object
commit bc13d732601e7c7cb48db17f1a75b33cc96c0c34
Author: abeck70 <abeck70@icloud.com>
Date: Sat Feb 14 15:53:16 2015 +1100
OP-1696 Landing sanity tested
commit 6e913076c1dfcb8b90153e9eca8acf6c9e51f293
Author: abeck70 <abeck70@icloud.com>
Date: Sat Feb 14 11:16:06 2015 +1100
OP-1696 completed refactoring
1. Completed refactoring of NE and Thrust control
2. Fixed velocity roam
TODO Tuning and testing
commit 63b62fbd0ac105029e54163b98c3beebc2d73c3a
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 13 08:54:23 2015 +1100
OP-1696 New PID Controller and refactoring of PID implementation for thrust management
commit 7474331529477d0badd2ef0d609c84c556be9cec
Author: abeck70 <abeck70@icloud.com>
Date: Tue Feb 10 16:39:44 2015 +1100
OP-1696 Landing Refactor Thrust PID Loop for landing
commit 904ab2a9241e40c19da6a1508b4ce5243c75d7a3
Author: abeck70 <abeck70@icloud.com>
Date: Mon Feb 9 22:13:39 2015 +1100
OP-1696 Uncrustify
commit b3d30e298d8a0343782a29bc91be6677105b325e
Author: abeck70 <abeck70@icloud.com>
Date: Mon Feb 9 22:05:05 2015 +1100
OP-1696 Create new OO design
Added PathFollowerControl which has an Landing implementation. The landing implementation runs its own set of PIDs. And interfaces to the FSM for Landing.
commit 1ffd8d67cf7310c1c18c90f3ba18b08221d185a3
Author: abeck70 <abeck70@icloud.com>
Date: Sat Feb 7 18:04:42 2015 +1100
OP-1696 Upgrade arm tools
commit 3df01f97021d13694027b92ba0b13cc9fe70d437
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 6 21:52:38 2015 +1100
OP-1696 Landing uncrustify and start of refactoring landing to make more use of FSMLand
commit 7a753b65fb69d52c89875b9a182ef5210ee8ef2d
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 6 15:08:29 2015 +1100
OP-1696 Landing: fix compilation of all exes
commit 692459874acf2b7ae07aa3ab88a2c78a09f26ee6
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 6 14:45:06 2015 +1100
OP-1696 Landing startup fixes
commit 9851f29b9238a969efd0110f01a4fad6bdbc5a5d
Author: abeck70 <abeck70@icloud.com>
Date: Fri Feb 6 10:21:52 2015 +1100
OP-1696 Landing pathfollower CPP refactoring
commit 9b3a54d41f14f07cd0d78426026d12ae9ac4e5b5
Author: abeck70 <abeck70@icloud.com>
Date: Wed Feb 4 13:02:44 2015 +1100
OP-1696 Moved to FSMLand class and fixed CPP problems
1. Additional methods, compile options, and need to have main as a cpp to solve various link issues when using static constructors but to avoid adding unnecessary libs.
commit 7ebe739bfdb4e0f598f4408c1488f01bc033c044
Author: abeck70 <abeck70@icloud.com>
Date: Tue Feb 3 22:17:08 2015 +1100
OP-1696 Initial Landing prototype
Proof of concept. To be refactored into C++
commit 11d6754b9766efb76cc1cd57e9894badaf33ef2d
Author: abeck70 <abeck70@icloud.com>
Date: Tue Feb 3 22:13:10 2015 +1100
OP-1696 CPP Enablement
revo c++
Enable optional revo C++ support:
1. Set USE_CXX to enable compliation and linkage of C++ source code
2. Disables rtti and exceptions
3. operator new and delete call pios malloc/free
4. Static constructor invocation supported
2015-03-20 21:42:20 +11:00
Philippe Renon
f2ac9b2522
OP-1796 defined OPENSLL_CONF env variable so openssl stops complaining about a missing openssl.cfg file (not related to qt upgrade...)
2015-03-19 21:02:37 +01:00
Philippe Renon
2a02c974bc
OP-1796 isolate windows specific variables in tools.mk (minor cleanup in preparation of the osgearth merge)
2015-03-19 21:01:06 +01:00
Philippe Renon
db31c293c4
OP-1796 upgraded GCS to qt 5.4.1 (all OSes) - tested on win32 and linux64
2015-03-19 20:59:38 +01:00
Alessio Morale
5a9cfa64a8
OP-1778 - workaround cert issue with wget.
2015-03-11 12:23:31 +01:00
James Duley
655e907506
OP-1695 Ubuntu PPA: remove dirty from version-info.json
2015-03-03 17:51:43 +13:00
James Duley
54df9d1ea0
firmware-defs.mk: added '+' to replace_special_characters
2015-03-03 15:38:53 +13:00
James Duley
99c8290aa1
Merge branch 'parched/OP-1736_make_package_label_meaningful' into next
2015-03-03 11:36:15 +13:00
James Duley
f0cab73fdd
OP-1736 make package label meaningful
2015-02-26 09:56:55 +13:00
abeck70
57e0a8baf5
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into abeck/OP-1721
...
Conflicts:
flight/modules/Sensors/sensors.c
2015-02-23 14:40:55 +11:00