dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity
11,249 Commits 514 Branches 136 Tags 234 MiB
Commit Graph

49 Commits

Author SHA1 Message Date
Thomas Gubler e547176ba1 Merge pull request #1734 from PX4/ros_messagelayer_merge_attctrl_posctrl 
Ros messagelayer merge attctrl posctrl
 2015-02-01 11:58:37 +01:00
Andreas Antener 2d65e8cb3b initial commit for vagrant/docker based ros setup 2015-01-24 12:39:14 +01:00
Thomas Gubler d7e57061c9 generate message wrapper headers on ros 2015-01-23 11:58:24 +01:00
Thomas Gubler 738f65a705 generate wrapper headers for uorb 2015-01-23 10:34:04 +01:00
Thomas Gubler 462a5fae90 Merge remote-tracking branch 'upstream/master' into dev_ros 2015-01-06 08:56:39 +01:00
Anton Matosov 59fa170e54 Automated updates of the C++ code generated by the multi_tables script, now it is placed into the mixer_multirotor.generated.h file which is generated by makefile 2015-01-05 12:02:31 +02:00
Thomas Gubler 16b9f666e7 Merge remote-tracking branch 'upstream/master' into dev_ros 
Conflicts:
	src/lib/mathlib/math/Matrix.hpp
	src/modules/mc_att_control/mc_att_control_main.cpp
	src/modules/uORB/topics/vehicle_status.h
	src/platforms/px4_includes.h
 2015-01-05 10:02:07 +01:00
Daniel Agar c520119129 unittests Makefile call new cmake based unittests 2015-01-02 23:05:47 -05:00
Thomas Gubler 25af4b266c Merge remote-tracking branch 'upstream/master' into dev_ros 
Conflicts:
	.gitignore
	src/lib/uavcan
 2014-12-25 09:48:15 +01:00
Lorenz Meier 032b25c81b Creating Firmware ZIP file and ignoring it in GIT 2014-12-21 12:09:16 +01:00
Thomas Gubler 8b5bc703a1 initial version of msg to uorb script 
Standard and embedded types work, may need small refinements for some
types
 2014-12-01 16:39:27 +01:00
Thomas Gubler 1e36de6157 ignore build folder 2014-11-24 15:57:48 +01:00
Lorenz Meier b74d4e2ba7 Added NuttX submodule 2014-07-07 16:59:44 +02:00
Thomas Gubler 58ae1edc84 ignore .orig files 2014-05-05 17:10:33 +02:00
Thomas Gubler b607933ded add .ropeproject to .gitignore 2014-05-02 14:24:55 +02:00
Thomas Gubler 496cba0855 add tags file to .gitignore 2014-04-24 16:03:36 +02:00
Julian Oes ba0bf456b9 gitignore: ignore pydev project file created in eclipse 2014-02-24 15:37:35 +01:00
Lorenz Meier 5fe3c49ba0 Merged multirotor branch 2013-08-28 08:14:13 +02:00
Julian Oes 75a6e09567 Ignore files for ctags (used with SublimeText3) 2013-08-20 13:20:34 +02:00
Lorenz Meier 52d15ac7b1 Merged public master 2013-08-16 16:22:38 +02:00
Lorenz Meier 74d519d9d0 Hotfix: Fixed Doxygen tags for uORB topics 2013-08-15 13:38:59 +02:00
Lorenz Meier a1e0581fac Hotfix: More Doxygen fixes 2013-08-15 12:55:16 +02:00
Andrew Tridgell 910cf4e5ba dot.gdbinit should not be ignored 2013-08-11 01:47:59 +02:00
Lorenz Meier 2f76c81147 More compile fixes 2013-07-16 09:08:05 +02:00
Lorenz Meier 5375bb5b86 Cleanup, WIP, needs a NuttX checkout to Firmware/NuttX now 2013-06-01 01:04:32 +02:00
px4dev 05fe7779a9 Fix .gitignore to avoid ignoring prebuilt libraries. 
Also, generally clean-up the .gitignores and farm off separate versions for the NuttX/Apps directories to keep things tidy.
 2013-05-20 20:33:18 +02:00
px4dev 01e427b17c Merge working changes into export-build branch. 2013-04-26 16:14:32 -07:00
px4dev eece05a287 We need a stub ROMFS header so that the client can supply their own bits. 2013-02-23 22:00:59 -08:00
px4dev 0695135105 Ignore NuttX export archives and anything in the Build directory. 2013-02-23 22:00:59 -08:00
Lorenz Meier beb4638748 Merge branch 'master' of github.com:PX4/Firmware into statemachine_docs 2013-01-26 12:07:01 +01:00
Lorenz Meier 3a80ac5938 Merged 2013-01-20 10:58:30 +01:00
px4dev 8685f63c72 Some gentle massaging to get things building again. 2013-01-17 01:18:18 -08:00
px4dev 854c6436b4 Pull NuttX up to the 6.24 release. 
Merge branch 'nuttx-merge-5447'
 2013-01-14 21:01:58 -08:00
px4dev 6d138a845a Let's let folks have their own .gdbinit 2013-01-14 20:40:38 -08:00
James Goppert 464c5245f2 Rebase of changes to sensor_hil_fixedwing branch. 2013-01-13 17:25:45 -05:00
px4dev 5b07efdbeb Automatically generate depdencies for source files as they are compiled, rather than using the NuttX dependency generator tool. 2013-01-12 12:10:06 -08:00
px4dev b5d3d8e436 We can ignore this too. 2013-01-11 02:43:22 -08:00
px4dev 76277ec622 Ignore more. 2013-01-05 22:37:26 -08:00
Lorenz Meier 5ba54cd921 Added rc mode docs 2012-12-31 02:22:57 +01:00
daregger b50bc7798a Wip on inner rate loop 2012-10-16 16:49:45 +02:00
Lorenz Meier 87b00c96e8 Merge branch 'master' of github.com:PX4/Firmware 2012-10-16 11:10:23 +02:00
Lorenz Meier fef4362e79 Merged new EKF version 2012-10-16 11:10:09 +02:00
px4dev 3292ea24a1 Switch to the standard 'verbose' build option. Use a better way of passing options to the linker that is closer to friendly with 'make export'. 2012-10-15 21:08:26 -07:00
px4dev f7949a904b Merge branch 'master' of https://github.com/PX4/Firmware 2012-09-16 15:01:42 -07:00
Lorenz Meier c30e21fed6 Removed stupid Eclipse project, as its of course generating conflicts 2012-09-16 14:04:14 +02:00
px4dev 561bea65a2 Ignore a turd that the kconfig stuff generates 2012-09-15 17:22:47 -07:00
px4dev 165105bd93 More ignorance. 2012-08-13 23:52:48 -07:00
px4dev 6976fe4b19 We should ignore the ROMFS image file. 2012-08-05 16:32:47 -07:00
px4dev 310d055e44 Missed this in the initial import. 2012-08-04 15:55:55 -07:00