Commit Graph

6802 Commits

Author SHA1 Message Date
Lorenz Meier eccbccb826 Merge branch 'master' of github.com:PX4/Firmware into beta_mavlink2 2014-03-16 13:22:01 +01:00
Lorenz Meier c256ba54a0 Merge branch 'master' of github.com:PX4/Firmware into paul_estimator_mavlink2 2014-03-16 12:12:33 +01:00
Lorenz Meier ed197b5b59 Merged beta_mavlink2 / master 2014-03-16 12:12:28 +01:00
Anton Babushkin 82389e9702 Merge branch 'beta_mavlink2' into mavlink2_hil 2014-03-16 11:08:54 +04:00
kroimon 39274f4bf3 Merge pull request #743 from PX4/rcS_hotfix
add missing $ in rcS script
2014-03-15 15:33:25 +01:00
Thomas Gubler 75c168f13f add missing $ in rcS script 2014-03-15 15:29:50 +01:00
Thomas Gubler f4c91b19e4 set phantom autoconfig parameters as provided by Andreas Antener 2014-03-15 13:46:09 +01:00
Thomas Gubler be349b989a sensors: use filtered diff pressure to calculate airspeed 2014-03-15 13:24:17 +01:00
Thomas Gubler d2a74dff67 fix logging of filtered diff pressure signal 2014-03-15 13:11:46 +01:00
Thomas Gubler 07cff8e0bd Merge remote-tracking branch 'upstream/master' into diff_press_filter
Conflicts:
	src/modules/sdlog2/sdlog2.c
2014-03-15 12:28:29 +01:00
Anton Babushkin 955bd402d2 Merge branch 'master' into beta_mavlink2 2014-03-15 09:47:02 +04:00
Lorenz Meier e590d96c0a Merge pull request #734 from thomasgubler/rcs_defaultappsflag
rcS: introduce flag that allows disabling startup of the default apps
2014-03-14 18:11:46 +01:00
Lorenz Meier 5d1eef17fa Merge pull request #733 from dominiho/master
added i2c px4flow driver
2014-03-14 18:11:13 +01:00
Lorenz Meier 3d766575cd Merge pull request #738 from PX4/beta_mavlink2_stream
mavlink stream: do not use getopt as it leads to problems with the global optarg variable
2014-03-14 18:10:27 +01:00
Lorenz Meier e3b80d6e9d Merge pull request #727 from PX4/beta_mavlink2_flow_control
UART flow control
2014-03-14 18:06:46 +01:00
Thomas Gubler 6b79f53338 mavlink stream: do not use getopt as it leads to problems with the global optarg variable 2014-03-14 14:42:35 +01:00
Thomas Gubler 0784ef9189 add low pass filter to meas airspeed driver including logging of filtered value 2014-03-14 01:13:22 +01:00
Lorenz Meier 15a2b35868 Merge pull request #735 from thomasgubler/ardrone_mavtype
set correct MAV_TYPE in ardrone startup script
2014-03-13 18:52:37 +01:00
Thomas Gubler 7d48941c02 set correct MAV_TYPE in ardrone startup script 2014-03-13 18:47:31 +01:00
dominiho 11f12b4dfe added i2c px4flow driver 2014-03-13 15:43:52 +01:00
Thomas Gubler bfe8d73560 rcS: introduce flag that allows disabling startup of the default apps in order to start a different set of apps in a autostart script 2014-03-13 15:43:19 +01:00
Lorenz Meier 05f07f68c7 Merge pull request #732 from thomasgubler/ardrone_autoconfig_batteryvoltage
ardrone startup: set battery V scale parameter
2014-03-13 15:30:06 +01:00
Thomas Gubler 7a97eb83f6 ardrone startup: set battery V scale parameter in autoconfig to the value given in sensors_params.c 2014-03-13 15:27:12 +01:00
Thomas Gubler 04ce3261ca Merge pull request #731 from PX4/ardrone_autoconfig_fix
Remove non-existent parameter from 4008_ardrone startup script.
2014-03-13 14:41:42 +01:00
Stefan Rado 5745233f80 Remove non-existent parameter from 4008_ardrone startup script. 2014-03-13 14:36:02 +01:00
Thomas Gubler b6ea38b91a sensors app: add timestamp in airspeed message 2014-03-13 13:32:24 +01:00
Lorenz Meier b9e8690c61 Merge pull request #703 from PX4/act_group_hotfix
Actuator group hotfix
2014-03-12 21:56:07 +01:00
Lorenz Meier 82e2619f1f Merge pull request #721 from PX4/laser_rangefinder
Laser rangefinder
2014-03-12 21:54:34 +01:00
Lorenz Meier 9153eee235 Merge pull request #729 from PX4/gpio_led_fmuv2
gpio_led: some more fixes
2014-03-12 21:53:43 +01:00
Anton Babushkin bbe9873f97 Merge branch 'master' into gpio_led_fmuv2 2014-03-13 00:29:14 +04:00
Anton Babushkin bc36b540a5 gpio_led: code style fixed 2014-03-13 00:25:00 +04:00
Anton Babushkin 6f55077541 gpio_led: bugs fixed 2014-03-13 00:24:28 +04:00
Lorenz Meier 072be2c730 Merge pull request #717 from PX4/iris_hotfix
Iris parameter hotfix: Dropped default gains
2014-03-12 20:44:04 +01:00
Lorenz Meier 4840d5fbcb merged master 2014-03-12 20:42:34 +01: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 f5b21fbcde Merge pull request #728 from PX4/gpio_led_fmuv2
Gpio led fmuv2
2014-03-12 20:37:19 +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 0cce688010 Merge pull request #711 from PX4/sdlog2_opt
sdlog2 optimization
2014-03-12 20:30:00 +01:00
Anton Babushkin 5d34e124fe Merge branch 'master' into gpio_led_fmuv2 2014-03-12 22:42:36 +04:00
Lorenz Meier 939b8464a2 Merge branch 'beta_mavlink2_flow_control' into paul_estimator_mavlink2 2014-03-12 17:54:04 +01:00
Lorenz Meier 45a18587fc Fine tuning for flow control disable to stop firing after change is effective 2014-03-12 17:53:25 +01:00
Lorenz Meier 23258edfa1 Merge branch 'beta_mavlink2_flow_control' of github.com:PX4/Firmware into paul_estimator_mavlink2 2014-03-12 17:31:50 +01:00
Lorenz Meier 204688b935 Merged 2014-03-12 17:31:01 +01:00
Lorenz Meier 7aa51935f8 Merge branch 'beta_mavlink2' of github.com:PX4/Firmware into paul_estimator_mavlink2 2014-03-12 17:29:15 +01:00
Lorenz Meier 7604518db4 Fixed HW flow control enable / disable scheme, console output cleanup on start 2014-03-12 10:29:39 +01:00
Thomas Gubler d9d0e60bd5 fw att ctrl: airspeed check: remove unnecessary cast 2014-03-12 10:02:39 +01:00
Lorenz Meier 069cba6338 Merge branch 'beta_mavlink2' into beta_mavlink2_flow_control 2014-03-12 10:02:22 +01:00
Lorenz Meier 2d2ecbad00 Fixed more wrong usages of encoding channel 2014-03-12 09:56:26 +01:00
Lorenz Meier 76af0970f5 Increased param rate, fixed wrong usage of MAVLink chan. 2014-03-12 09:46:02 +01:00