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

264 Commits

Author SHA1 Message Date
Anton Babushkin 63b7159cda Merge branch 'navigator_new' into navigator_new_vector 2014-01-17 14:37:48 +01:00
Thomas Gubler 73546b6645 Merge remote-tracking branch 'upstream/master' into navigator_new 
Conflicts:
	makefiles/config_px4fmu-v1_backside.mk
	src/modules/commander/commander.cpp
	src/modules/sdlog2/sdlog2.c
 2014-01-17 09:50:22 +01:00
Lorenz Meier 352dea6754 Remove outdated configs, clean up pwm limit compilation 2014-01-15 20:04:11 +01:00
Anton Babushkin 97e4522c76 Merge branch 'master' into navigator_new_vector 2014-01-14 15:45:49 +01:00
Lorenz Meier 1e0f292566 Disabling EEPROM and old RAMTRON driver 2014-01-14 08:57:32 +01:00
Anton Babushkin 7bcddd192f Merge branch 'navigator_new' into navigator_new_vector 2014-01-13 13:07:25 +01:00
Lorenz Meier 5a0c635369 Added mtd tool 2014-01-11 21:01:07 +01:00
Thomas Gubler f224374ed3 Merge remote-tracking branch 'upstream/master' into navigator_new 2014-01-11 00:49:30 +01:00
Anton Babushkin 8d7620c3cb Merge branch 'master' into navigator_new_vector 2014-01-08 15:44:24 +01:00
Lorenz Meier ab407a82ba Merge branch 'master' into mount_tests 2014-01-07 22:42:09 +01:00
Lorenz Meier 4f95ce3dc2 Merge branch 'mount_tests' of github.com:PX4/Firmware into mount_tests 2014-01-07 07:57:58 +01:00
Anton Babushkin 300d891d76 Merge branch 'navigator_new' into navigator_new_vector 2014-01-06 08:08:35 +01:00
Lorenz Meier 7b2f0d758c Merge pull request #578 from kroimon/frsky_telemetry 
Add FrSky telemetry support
 2014-01-05 09:05:14 -08:00
Lorenz Meier 018e42733a Merge branch 'master' of github.com:PX4/Firmware into navigator_new 2014-01-05 15:19:39 +01:00
Lorenz Meier ba4f881f80 Do not require suffixed constants 2014-01-05 01:49:54 +01:00
Lorenz Meier 64a22fc011 Merge branch 'mount_tests' of github.com:PX4/Firmware into mount_tests 2014-01-05 01:49:35 +01:00
Lorenz Meier 366af8da80 Do not require suffixed constants 2014-01-05 01:49:21 +01:00
Lorenz Meier 7590d91cf2 Improved mount test 2014-01-04 17:05:52 +01:00
Lorenz Meier 05649eb09c Create test config for FMUv1 2014-01-04 17:05:19 +01:00
Lorenz Meier 7fa36a22d7 Fixed tests config 2014-01-04 14:05:23 +01:00
Lorenz Meier 93a0c2de56 Trimming down number of apps to save flash space 2014-01-04 13:51:20 +01:00
Stefan Rado 0ce7886249 Merge branch 'master' into frsky_telemetry 2014-01-02 01:37:09 +01:00
Anton Babushkin 5dda4dc993 Merge branch 'master' into navigator_new_vector fix 2014-01-01 18:19:02 +04:00
Thomas Gubler 3000d08b05 Merge remote-tracking branch 'upstream/master' into navigator_new_fw 
Conflicts:
	makefiles/config_px4fmu-v2_logging.mk
 2014-01-01 12:36:42 +01:00
Anton Babushkin 35e62a13f8 Use new controllers in logging build 2013-12-30 14:05:38 +04:00
Lorenz Meier 9a54c7c64d Removed special logging config to cut down build times 2013-12-30 00:53:12 +01:00
Thomas Gubler cf33f2a627 Merge branch 'launchdetection' into navigator_new_fw 
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
 2013-12-29 19:50:30 +01:00
Stefan Rado 810f33c3f3 Merge branch 'master' into frsky_telemetry 2013-12-28 21:25:45 +01:00
Anton Babushkin 7b7539fbbd Merge branch 'navigator_new' into navigator_new_vector, WIP 2013-12-28 10:04:13 +04:00
Anton Babushkin e1f949163b makefiles and rc scripts fixed to use new attitude and position controllers 2013-12-26 23:06:36 +04:00
Anton Babushkin 26daae0b0a Merge branch 'mathlib_new' into vector_control2 2013-12-25 18:41:23 +04:00
Anton Babushkin 1e4bb764a6 Merge branch 'mathlib_new' into vector_control2 2013-12-25 18:31:12 +04:00
Anton Babushkin 5a2da77758 Merge branch 'master' into mathlib_new 2013-12-23 18:16:28 +04:00
Thomas Gubler 24e2676131 add dataman to config_px4fmu-v2_logging.mk 2013-12-23 12:13:25 +01:00
Thomas Gubler 68d8230e78 Merge remote-tracking branch 'upstream/control_groups' into fw_autoland_att_tecs_navigator_termination_controlgroups 
Conflicts:
	src/systemcmds/tests/module.mk
	src/systemcmds/tests/tests.h
 2013-12-23 11:13:42 +01:00
Lorenz Meier 8c518aa237 Useful bits for high-rate logging 2013-12-20 14:25:35 +01:00
Anton Babushkin a83e3cd222 New mathlib, WIP 2013-12-18 19:33:47 +04:00
Anton Babushkin 7cbb4cfdb8 Merge branch 'master' into vector_control2 2013-12-16 12:47:40 +04:00
Lorenz Meier b63d4809de Enabled MPU6K and updated startup script to start all sensors 2013-12-15 19:35:23 +01:00
Thomas Gubler c3cbaf5deb Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator_termination_controlgroups 
Conflicts:
	src/drivers/px4io/px4io.cpp
 2013-12-13 21:07:27 +01:00
Anton Babushkin deac4eefc6 Merge branch 'master' into vector_control2 2013-12-13 21:15:21 +04:00
Hyon Lim b3f1adc54b SO3 estimator code has been cleaned 2013-11-29 02:35:49 +09:00
Hyon Lim bcd745fb0d SO(3) estimator and quaternion receive by mavlink implemented 2013-11-29 02:05:15 +09:00
Stefan Rado 5f18ce506d Add FrSky telemetry application. 
This daemon emulates an FrSky sensor hub by periodically sending data packets to an attached FrSky receiver.
 2013-11-24 13:39:02 +01:00
Julian Oes bc583838b7 Navigator: only whitespace fixes 2013-11-18 15:59:14 +01:00
Julian Oes c8942d0b34 Makefiles: fix compilation for backside 2013-11-18 15:58:45 +01:00
Julian Oes 29578a5604 Merge remote-tracking branch 'jean-m-cyr/master' into navigator_wip 2013-11-18 13:00:09 +01:00
Anton Babushkin d736ed181f Merge branch 'master' into vector_control 2013-11-16 16:10:57 +04:00
Thomas Gubler ebbe4d2235 initial wip version of launchdetector 2013-11-15 22:43:07 +01:00
James Goppert ba3681d3a0 Updated backside controller/ added backside config. 2013-11-14 12:34:51 -05:00