Commit Graph

82 Commits

Author SHA1 Message Date
Thomas Gubler 7b15a424f0 Merge remote-tracking branch 'upstream/master' into mtecs 2014-06-28 16:52:27 +02:00
Lorenz Meier e78d496e92 Enable new lookup lib 2014-06-28 12:51:22 +02:00
Lorenz Meier 503ded0539 Remove old TECS implementation - we can really only decently flight-test and support one. 2014-06-28 12:35:04 +02:00
Lorenz Meier 6341737384 Merge branch 'master' of github.com:PX4/Firmware into pca8574 2014-05-29 11:26:18 +02:00
Lorenz Meier 6a6feaf96c Merged master 2014-05-07 14:14:31 +02:00
Lorenz Meier af1af1e22d Port expander driver first hacky version 2014-04-29 18:38:30 +02:00
ufoncz bd5a0cef1a ver command ready including hwcmp which replaces hw_ver, removed hw_ver
updated all scripts to use new ver hwcmp command
q
2014-04-27 17:42:45 +02:00
ufoncz 5ea1105451 changed dir from version to ver to keep it shorter
added "hw_ver compare" as command option so we can replace hw_ver in future
2014-04-27 15:12:05 +02:00
ufoncz 08e5ed5a1d added version nsh command, it can replace hw_ver
sss
2014-04-25 21:14:12 +02:00
Lorenz Meier 7b61c927f0 Renamed FW filter to EKF to express its generic properties, switched multicopters over to this filter for first tests. 2014-04-19 16:13:13 +02:00
Lorenz Meier ed197b5b59 Merged beta_mavlink2 / master 2014-03-16 12:12:28 +01:00
Anton Babushkin 955bd402d2 Merge branch 'master' into beta_mavlink2 2014-03-15 09:47:02 +04:00
Lorenz Meier 89e6b3f606 Merge branch 'master' of github.com:PX4/Firmware into laser_rangefinder 2014-03-12 20:38:39 +01:00
Lorenz Meier caef8d115c Merge branch 'master' of github.com:PX4/Firmware into gpio_led_fmuv2 2014-03-12 20:35:20 +01:00
Lorenz Meier 5a39a4cbd4 Merged mavlink_beta2 2014-03-11 17:53:42 +01:00
Lorenz Meier 008efff42e Added support for driver rangefinder 2014-03-08 20:00:06 +01:00
Anton Babushkin cb8bd1a3ad dumpfile command and fetch_log.py tool implemented to fetch logs via nsh console on USB 2014-03-08 21:05:13 +04:00
Anton Babushkin 967f81bfab mavlink_onboard removed 2014-02-28 23:43:52 +04:00
Lorenz Meier 8016032a40 Merged beta into paul_estimator 2014-02-16 17:07:02 +01:00
Anton Babushkin 4b567ef631 gpio_led: bugs fixed, PX4FMUv2 support added 2014-02-11 23:59:02 +01:00
Lorenz Meier 1b978293d9 Merged master into beta 2014-02-11 08:24:18 +01:00
Lorenz Meier a0e691fa49 Merge branch 'master' into paul_estimator 2014-02-05 14:48:59 +01:00
marco 9defc6cb23 mkblctrl fmuv2 support added 2014-02-02 14:26:17 +01:00
Lorenz Meier d2b183c05b merge master 2014-01-31 09:51:59 +01:00
Lorenz Meier f8c5a6cc50 Merged master into logging 2014-01-20 13:19:49 +01:00
Anton Babushkin 42f4f45979 mc_att_control_vector renamed to mc_att_control 2014-01-19 10:44:57 +01:00
Anton Babushkin a863b07f8c Merge branch 'autostart_cleanup' into navigator_new_vector 2014-01-17 23:14:24 +01:00
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
Anton Babushkin 7b60761bf5 Merge branch 'master' into autostart_cleanup 2014-01-14 15:52:46 +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
Lorenz Meier 0d3a743f75 Merge branch 'master' into paul_estimator
ssage aborts
2014-01-12 12:27:17 +01:00
Lorenz Meier 0bcdfa18c7 Merge branch 'master' of github.com:PX4/Firmware into paul_estimator 2014-01-12 12:27:12 +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
Anton Babushkin 255d91d8d4 hw_ver app added for hardware version checking 2014-01-07 21:56:35 +01:00
Anton Babushkin 300d891d76 Merge branch 'navigator_new' into navigator_new_vector 2014-01-06 08:08:35 +01:00
Lorenz Meier ffe5c88d98 Added new estimator framework, actual estimation code not yet present 2014-01-01 13:18:21 +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
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
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