1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-12 20:08:48 +01:00
Commit Graph

14212 Commits

Author SHA1 Message Date
James Duley
72560638c8 Rework osg config options 2016-01-15 23:41:09 +00:00
Philippe Renon
0bdb37dcf5 LP-29 hotfix: fix osgearth build on linux 2016-01-16 00:20:36 +01:00
James Duley
eb2e64b880 Add GCS_EXTRA_CONF variable 2016-01-15 23:12:26 +00:00
James Duley
d9ebaaf2c3 remove unused uavo collect stuff 2016-01-15 23:04:05 +00:00
James Duley
6dd13bc698 fix some pfd paths 2016-01-15 23:00:03 +00:00
Philippe Renon
0deb1c88b8 Merged in filnet/librepilot/filnet/LP-29_osgearth_integration (pull request #51)
LP-29_osgearth_integration
2016-01-15 21:52:21 +01:00
Philippe Renon
38d1472f94 LP-29 changed PFD Panels animation type from Easing.InOutExpo and Easing.OutExpo 2016-01-15 21:28:12 +01:00
Philippe Renon
f5a1498b36 LP-29 make dependency on osgQt and osgearthQt optional 2016-01-15 08:55:46 +01:00
Philippe Renon
3cc581a002 LP-29 clean white spaces in PFDWorldView 2016-01-15 08:54:34 +01:00
Philippe Renon
9acb3d6595 LP-29 fix PFD pitch alignement on behalf of Laurent
introduce a scale factor so pitch aligns on dash and not on text
2016-01-15 08:51:32 +01:00
Philippe Renon
30fb84c9b4 LP-29 remove cmake and msys
affects windows only
added CMAKE make variable set to system cmake
2016-01-14 03:02:38 +01:00
Philippe Renon
2d59530f6e LP-29 further adaptations to msys2
fix list of mingw provided dependencies
fix path handling
other related cleanups
2016-01-14 03:02:17 +01:00
Philippe Renon
b4f4cd48f0 LP-29 fixed typos 2016-01-12 02:37:13 +01:00
Philippe Renon
c0613fe6d0 Adapted osgearth branch to msys2
Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration

# Conflicts:
#	Makefile
#	ground/gcs/src/libs/osgearth/copydata.pro
#	make/tools.mk
2016-01-12 02:32:16 +01:00
Philippe Renon
48a665c78a LP-29 remove unused font 2016-01-10 22:34:03 +01:00
Philippe Renon
3d7558c28b LP-29 split osg and osgearth SDKs and make osgearth optional 2016-01-10 22:33:57 +01:00
James Duley
c25d98b85c Merged in james-duley/librepilot/qrc_hotfix (pull request #156)
hotfix: bad space in fw qrc
2016-01-10 18:25:53 +00:00
James Duley
047792a357 hotfix: bad space in fw qrc 2016-01-10 18:15:41 +00:00
James Duley
294f22d422 Merged in james-duley/librepilot/LP-187_use_Msys2 (pull request #132)
LP-187 Use MSYS2
2016-01-10 17:17:33 +00:00
Brian Webb
25a8a35ed5 LP-187 Msys2: Removes unnecessary targets from Windows SDK targets and updates CONTRIBUTING.md 2016-01-10 17:11:46 +00:00
James Duley
672749d0d7 LP-187 MSYS2: add arch to installer filename 2016-01-10 17:11:46 +00:00
James Duley
9c0b8d3f71 Add Make function to get architecture 2016-01-10 17:11:46 +00:00
James Duley
86c262d708 nsis packaging remove extra template layer
And make required fixes which include an extra
function in version-info.py:
${VERSION_FOR_NUM} e.g. 15.09.1.12344
2016-01-10 17:11:46 +00:00
James Duley
cc45b5a6f3 LP-187 MSYS2: fix windows package
because osg isn't yet part of build
2016-01-10 17:11:46 +00:00
James Duley
98d75433e2 LP-187 MSYS2: fix unzip for msys2 2016-01-10 17:11:46 +00:00
James Duley
0f33a036c8 LP-187 MSYS2: fix paths for msys2 2016-01-10 17:11:46 +00:00
James Duley
0020ab7a12 LP-187 MSYS2: add system_path make function 2016-01-10 17:11:46 +00:00
James Duley
02e03259d3 LP-187 MSYS2: dont't explicitly specifiy qt spec 2016-01-10 17:11:46 +00:00
James Duley
df04a87831 LP-187 MSYS2: correct copy data dlls for msys2 2016-01-10 17:11:46 +00:00
Lalanne Laurent
cca06318e0 Merged in f5soh/librepilot/LP-194_Hidde_Attitude_Yaw (pull request #155)
LP-194 Still Yaw attitude slider, remove.
2016-01-10 14:14:29 +01:00
Laurent Lalanne
3579e89af3 LP-194 Still Yaw attitude slider, remove. 2016-01-10 13:37:17 +01:00
Laurent Lalanne
f8e651fc3f Merge branch 'next' into LP-194_Hidde_Attitude_Yaw 2016-01-10 13:08:29 +01:00
Fredrik Arvidsson
ddf7adb80e Merge remote-tracking branch 'laurent/LP-104_LP-196_Hott_EXBus_Wizard_support' into thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support 2016-01-10 11:47:20 +01:00
Fredrik Arvidsson
c06fb0249f LP-104 LP-196 Uncrustify and some other formatting issues fixed. 2016-01-10 10:12:54 +01:00
Laurent Lalanne
2b3d5d6ee0 LP-104 LP-196 Wizard Input page: change layout 2016-01-09 22:33:11 +01:00
Laurent Lalanne
9f947ca9a4 LP-196 SetupWizard : Add Jeti EX.Bus support 2016-01-09 21:44:50 +01:00
Laurent Lalanne
bb8fdd3d62 Merge remote-tracking branch 'bitbucket_mthread/thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support' into LP-104_HoTT_wizard_next 2016-01-09 20:39:08 +01:00
Fredrik Arvidsson
d32cc0e7fb Merge branch 'thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support_15.09' into thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support 2016-01-09 19:18:48 +01:00
Fredrik Arvidsson
41b95231db LP-104 LP-196 Updated some constants after refactoring. 2016-01-09 19:13:17 +01:00
Fredrik Arvidsson
02c981388a Merge branch 'thread/LP-196_Jeti_Ex_Bus_15.09' into thread/LP-104_LP-196_HoTT_and_Ex.Bus_Support_15.09
# Conflicts:
#	flight/targets/boards/coptercontrol/board_hw_defs.c
#	flight/targets/boards/coptercontrol/firmware/pios_board.c
#	flight/targets/boards/revolution/board_hw_defs.c
#	flight/targets/boards/revolution/firmware/inc/pios_config.h
#	flight/targets/boards/revolution/firmware/pios_board.c
#	flight/targets/boards/revonano/firmware/inc/pios_config.h
#	flight/targets/boards/revonano/firmware/pios_board.c
#	shared/uavobjectdefinition/hwsettings.xml
#	shared/uavobjectdefinition/manualcontrolsettings.xml
#	shared/uavobjectdefinition/receiveractivity.xml
2016-01-09 16:59:24 +01:00
Fredrik Arvidsson
c48c46b8ef LP-196 Cleaned up some configuration. Ex.Bus only available on Flexiport. 2016-01-09 16:07:13 +01:00
Fredrik Arvidsson
6a3a822c87 LP-104 Cleaned up configuration. Only Allow HoTT on flexi port. 2016-01-09 15:50:52 +01:00
Lalanne Laurent
4fabce011a Merged in f5soh/librepilot/LP-204_Fast_invsqrtf_issue (pull request #147)
LP-204 Replace fast_invsqrtf() with invsqrtf() : 1.0f / sqrtf()
2016-01-09 12:59:47 +01:00
Lalanne Laurent
f86152b723 Merged in f5soh/librepilot/LP-194_Hidde_Attitude_Yaw (pull request #144)
LP-194 Stabilization tab: Remove Attitude Yaw, Cleanup/rename
2016-01-09 12:58:57 +01:00
Lalanne Laurent
33c87b86f4 Merged in f5soh/librepilot/LP-201_Y6_mixer (pull request #146)
LP-201 Set new default mixer values for Y6
2016-01-09 12:57:52 +01:00
Lalanne Laurent
8fe6ba2e2e Merged in f5soh/librepilot/LP-198_Detect_ppm_signal_lost (pull request #139)
LP-198 Detect ppm signal lost
2016-01-09 12:56:51 +01:00
Laurent Lalanne
93a6b99dab Merge remote-tracking branch 'origin/next' into LP-201_Y6_mixer 2016-01-09 12:48:01 +01:00
Fredrik Arvidsson
bc80c66c2b LP-196 Removed some leftover code and definitions. 2016-01-07 14:22:52 +01:00
Fredrik Arvidsson
359266ab7a LP-104 Removed support for HoTT on Main port on coptercontrol target since it does not work. 2016-01-07 13:01:46 +01:00
Philippe Renon
72c7623a1b Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration
# Conflicts:
#	ground/gcs/src/libs/osgearth/osgearth.pro
2016-01-06 22:16:32 +01:00