Commit Graph

301 Commits

Author SHA1 Message Date
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 db04e00060 Merge pull request #712 from PX4/fetch_log
Log fetcher utility
2014-03-12 20:32:58 +01:00
Lorenz Meier 5a39a4cbd4 Merged mavlink_beta2 2014-03-11 17:53:42 +01:00
Lorenz Meier 4d8524f508 Merge branch 'master' of github.com:PX4/Firmware into paul_estimator 2014-03-11 12:51:34 +01:00
Lorenz Meier a6d9b7e864 Merged stack size changes 2014-03-10 19:06:54 +01:00
Lorenz Meier 368c2390cf Merge pull request #673 from PX4/romfs_prune
ROMFS: ignore comments and newlines in startup files, text in mixer files
2014-03-10 19:01:23 +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
Julian Oes a61a89f339 ROMFS: ignore comments and newlines in startup files, text in mixer files 2014-02-17 00:25:30 +01: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 4d9f0ccac4 Merge branch 'master' into paul_estimator 2014-02-11 09:55:29 +01:00
Lorenz Meier 1b978293d9 Merged master into beta 2014-02-11 08:24:18 +01:00
Lorenz Meier 773f70a9df Merged origin/master into pubsub_cleanup 2014-02-09 16:04:32 +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 2908ffb092 Trim down FMUv1 config, remove not commonly used modules from default set 2014-02-01 15:46:51 +01:00
Lorenz Meier d2b183c05b merge master 2014-01-31 09:51:59 +01:00
Anton Babushkin 55f845888b px4fmu-v2_test makefile fixed, CMSIS added 2014-01-23 22:41:56 +01:00
Anton Babushkin 6c07a5c2cf makefile for backside removed 2014-01-23 11:49:23 +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
Lorenz Meier 352dea6754 Remove outdated configs, clean up pwm limit compilation 2014-01-15 20:04:11 +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 58d78e57b7 Build the sensors as part of the test binary 2014-01-14 15:41:12 +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 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 f5501a0508 Merge branch 'master' into autostart_cleanup 2014-01-10 16:23:51 +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
Anton Babushkin 255d91d8d4 hw_ver app added for hardware version checking 2014-01-07 21:56:35 +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