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

7153 Commits

Author SHA1 Message Date
Lorenz Meier a490bd04ee Merge branch 'master' into paul_estimator_numeric 2014-03-23 16:58:07 +01:00
Lorenz Meier 57fdb40a4e mavlink: Hotfixed HIL battery status publication 2014-03-23 16:57:01 +01:00
Lorenz Meier 5113b4a365 mavlink: Hotfixed HIL battery status publication 2014-03-23 16:56:46 +01:00
Lorenz Meier 42bba67893 Move changes regarding the filtered airspeed consistently across sensors, use actual air temperature instead of board temperature 2014-03-23 16:56:07 +01:00
Lorenz Meier d1e2e855a3 Merged airspeed sensor use 2014-03-23 16:50:18 +01:00
Lorenz Meier e5b2281099 Merged airspeed filtering from Thomas Gubler 2014-03-23 16:47:56 +01:00
Anton Babushkin a7bb414817 Merge branch 'master' into mpc_local_pos 2014-03-23 18:11:12 +04:00
Lorenz Meier c93967f39d Merge branch 'hil_range_fix' into paul_estimator_numeric 2014-03-23 14:39:22 +01:00
Lorenz Meier 6c9a40b714 Fixed the HIL actuator range to what it should be 2014-03-23 14:34:15 +01:00
Lorenz Meier 15bab106b7 Merge branch 'master' of github.com:PX4/Firmware into paul_estimator_numeric 2014-03-23 13:42:27 +01:00
Lorenz Meier 87dfdef69b Merge branch 'beta' of github.com:PX4/Firmware 2014-03-23 09:25:58 +01:00
Lorenz Meier 4acfb15b76 Merge pull request #769 from jean-m-cyr/beta 
Remove uneccesary dependencies and update credits
 2014-03-23 09:25:27 +01:00
Jean Cyr debb4f7021 Coding style 
astyle according to http://pixhawk.org/dev/code_style
 2014-03-23 01:35:13 -04:00
Jean Cyr 17c18947a4 Remove uneccesary dependencies and update credits 2014-03-23 01:05:06 -04:00
James Goppert 2ce39a4afe Added youcompleteme config. 2014-03-22 13:32:33 -04:00
Thomas Gubler 7f1332c808 Merge pull request #767 from PX4/hotfix_wingwing_defaults 
wingwing startup: fix typo
 2014-03-22 17:47:26 +01:00
Julian Oes 2a178f9847 wingwing startup: fix typo 2014-03-22 17:09:32 +01:00
Lorenz Meier afa6d170ca Merge pull request #766 from PX4/param_tool 
Improvements to parameter documentation script
 2014-03-22 16:42:11 +01:00
Stefan Rado 1a98589f3a Merge remote-tracking branch 'remotes/origin/master' into param_tool 2014-03-22 11:13:54 +01:00
Lorenz Meier a1fad76f2b Merge branch 'master' of github.com:PX4/Firmware 2014-03-22 10:44:25 +01:00
Lorenz Meier 6b610dc1f8 Hotfix for comment: Removed syntax-breaking symbol 2014-03-22 10:44:14 +01:00
Lorenz Meier 6ce72f00cb Merge pull request #765 from sjwilks/master 
Add support for the SkyHunter 1800
 2014-03-22 10:33:19 +01:00
Simon Wilks 5f5a200f4a Add support for the SkyHunter 1800 2014-03-22 10:09:30 +01:00
Anton Babushkin 69700d774c Merge branch 'master' into mpc_local_pos 2014-03-22 11:22:58 +04:00
Lorenz Meier df11310994 Merge branch 'master' of github.com:PX4/Firmware into paul_estimator_numeric 2014-03-21 18:15:37 +01:00
Lorenz Meier 3270e2f428 Merge pull request #763 from PX4/beta_mavlink2 
Mavlink multi-stream support
 2014-03-21 18:14:08 +01:00
Lorenz Meier 69bc0c8e39 Reduced param rate - as long as we do not have proper QoS (= reducing all rates at once if link becomes lossy) we need to open-loop match the link 2014-03-21 18:12:02 +01:00
Thomas Gubler 4b8c3362cd Merge pull request #747 from PX4/wing_wing_defaults 
Defaults for Wing Wing
 2014-03-21 17:54:06 +01:00
Thomas Gubler 7fa6b48a36 wingwing startup script: add FW_THR_CRUISE param 2014-03-21 17:51:58 +01:00
Thomas Gubler 0cc7270b83 Merge pull request #764 from PX4/inav_nan_checks 
position_estimator_inav: added NaN checks
 2014-03-21 17:28:40 +01:00
Anton Babushkin 1c49d768fb mavlink: code style fixed 2014-03-21 20:06:34 +04:00
Anton Babushkin b1e59f37fe rc.usb: typo fixed 2014-03-21 19:48:53 +04:00
Anton Babushkin b2f8fcb9d9 position_estimator_inav: added NaN checks 2014-03-21 18:49:39 +04:00
Thomas Gubler 70b3a85194 Merge branch 'diff_press_filter' into diff_press_filter_use 
Conflicts:
	src/modules/sensors/sensors.cpp
 2014-03-21 13:35:01 +01:00
Thomas Gubler bc451eef4b Merge remote-tracking branch 'upstream/master' into diff_press_filter 
Conflicts:
	src/drivers/meas_airspeed/meas_airspeed.cpp
 2014-03-21 13:33:19 +01:00
Julian Oes 461557a689 Merge pull request #754 from julianoes/beta_mavlink2_camera 
Beta mavlink2: onboard camera capture
 2014-03-21 11:57:25 +01:00
Julian Oes 3d47ba14f3 Merge remote-tracking branch 'px4/beta_mavlink2' into beta_mavlink2_camera 
Conflicts:
	src/modules/mavlink/mavlink_messages.cpp
 2014-03-21 11:19:26 +01:00
Lorenz Meier ca2514b846 Merge branch 'beta_mavlink' of github.com:PX4/Firmware into beta_mavlink2 2014-03-21 10:53:18 +01:00
Lorenz Meier 193397b228 Merge branch 'master' of github.com:PX4/Firmware into beta_mavlink2 2014-03-21 10:47:36 +01:00
Lorenz Meier 057bcf3172 Changed RC scaling for fixed wing defaults 2014-03-21 10:45:12 +01:00
Lorenz Meier 2988136e7e Implemented last missing messages, added stream config for USB, made stream config fails for non-existing mavlink links non-fatal 2014-03-21 10:44:31 +01:00
Anton Babushkin 712c72d25b Optical flow fixes 2014-03-21 12:52:27 +04:00
Thomas Gubler 49bdfa8cfb Merge pull request #748 from jgoppert/tmpl_fix 
GCC 4.7 Template Use Fix
 2014-03-21 09:45:46 +01:00
Thomas Gubler 398da6a4d6 Merge pull request #719 from PX4/hotfix_fw_airspeed 
fw_att_control: airspeed is now used correctly
 2014-03-21 09:42:59 +01:00
Thomas Gubler b89c509231 Merge pull request #757 from PX4/ms4525_fix 
Fixed MS4525 error flag handling
 2014-03-21 08:59:58 +01:00
Lorenz Meier 055e459355 Remove unneeded headers 2014-03-21 08:33:49 +01:00
Lorenz Meier b8afcf5863 Ensure that the mavlink start call only returns once the new instance is fully initialized. This avoids race conditions in getopt() and it ensures that the mavlink debug fd is ready when other processes start 2014-03-21 08:32:54 +01:00
Lorenz Meier 3e525d0618 Merge branch 'ms4525_fix' of github.com:PX4/Firmware into paul_estimator_numeric 2014-03-21 08:12:36 +01:00
Lorenz Meier e0e6df6733 Merge branch 'master' of github.com:PX4/Firmware into paul_estimator_numeric 2014-03-21 08:12:20 +01:00
Lorenz Meier 8af83f7074 Make error message less dramatic, as its part of a scanning progress 2014-03-21 08:11:28 +01:00