Commit Graph

6280 Commits

Author SHA1 Message Date
Julian Oes 32b9834c52 Merge remote-tracking branch 'px4/beta' into beta_mavlink 2014-03-01 11:11:11 +01:00
Julian Oes 2c337d9b45 Merge remote-tracking branch 'px4/master' into beta 2014-03-01 10:36:19 +01:00
julianoes 3dd3ba4637 Merge pull request #688 from PX4/sdlog2_fix
log corruption lseek workaround
2014-03-01 10:35:06 +01:00
Julian Oes 680f2dd417 Merge remote-tracking branch 'px4/master' into beta 2014-02-27 17:30:15 +01:00
julianoes 9b6f08dc7e Merge pull request #696 from PX4/top_fix
top: CPU % indication bug fixed
2014-02-27 17:29:01 +01:00
Anton Babushkin f818765008 top: CPU % indication bug fixed 2014-02-27 18:32:55 +04:00
Julian Oes adc4c90cff Merge remote-tracking branch 'px4/beta' into beta_mavlink 2014-02-25 14:08:10 +01:00
Anton Babushkin a79eef05bc perf_counter: added include 2014-02-24 23:48:00 +04:00
Julian Oes 5ed5e04cb2 sdlog2: code style fixes broke compilation 2014-02-24 15:43:23 +01:00
Thomas Gubler d975bf1f85 Merge pull request #691 from PX4/gitignore_pydev
gitignore: ignore pydev project file created in eclipse
2014-02-24 15:39:18 +01:00
Julian Oes ba0bf456b9 gitignore: ignore pydev project file created in eclipse 2014-02-24 15:37:35 +01:00
Julian Oes 926c4701c7 mavlink: set current WP working as expected, report current WP with 0.5 Hz 2014-02-24 15:17:13 +01:00
Julian Oes 9c5894239f Merge remote-tracking branch 'px4/fix_mission_dive' into beta_mavlink 2014-02-24 14:29:39 +01:00
Julian Oes 909e138182 l1_pos_control: fix stupid 'if not' mistake 2014-02-24 14:27:24 +01:00
Julian Oes 75c6706278 l1_pos_control: set gndspeed_undershoot to 0 in loiter 2014-02-24 14:19:57 +01:00
Julian Oes ab8ece3961 l1_pos_control: prevent NaNs for roll setpoint 2014-02-24 12:42:48 +01:00
Julian Oes 9bed1677bd Merge remote-tracking branch 'px4/beta' into fix_mission_dive
Conflicts:
	src/modules/navigator/navigator_main.cpp
2014-02-24 10:24:08 +01:00
Lorenz Meier e1f60e7709 Code style fixes (authors should be in the doxygen section), using lseek to attempt to work around log corruption 2014-02-23 12:53:20 -08:00
Lorenz Meier 20618a611b Fixed a number of compile warnings in mount tests. 2014-02-23 12:44:05 -08:00
Lorenz Meier b048eb5668 Merge pull request #686 from PX4/code_style
Replace single if lines with brackets in astyle
2014-02-23 11:48:06 -08:00
Thomas Gubler 17ec859758 Merge pull request #682 from thomasgubler/beta_fwautoland
Beta: fw autoland remove virtual waypoint
2014-02-23 20:29:21 +01:00
Lorenz Meier 99b376089f Replace single if lines with brackets in astyle 2014-02-23 07:26:23 -08:00
Lorenz Meier ff8f92af31 Remove Ubuntu code style script - people should use the reference one 2014-02-23 07:24:03 -08:00
Julian Oes 73edc02016 mavlink: fix verbose mode and actually publish mission 2014-02-23 13:42:15 +01:00
Julian Oes 3ae35d8c18 Merge remote-tracking branch 'px4/fix_mission_dive' into beta_mavlink 2014-02-23 12:28:29 +01:00
Julian Oes 1a6c53301b Merge remote-tracking branch 'px4/beta' into beta_mavlink 2014-02-23 12:28:11 +01:00
julianoes 9c02525e39 Merge pull request #664 from thomasgubler/beta_audio
navigator mavlink log info messages: add #audio tag
2014-02-23 12:10:06 +01:00
Thomas Gubler f4bac7e7e8 navigator: remove all but one [navigator] tag from mavlink audio messages 2014-02-21 20:22:05 +01:00
Lorenz Meier c659e0240b Merge branch 'master' of github.com:PX4/Firmware into beta 2014-02-21 13:16:23 +01:00
Lorenz Meier 983cff56b3 Added int cast to handle arithmetic correctly 2014-02-21 12:50:29 +01:00
Lorenz Meier 06b69b70a5 Scaling Spektrum inputs into normalized value same as the servo outputs do 2014-02-21 12:27:04 +01:00
Lorenz Meier 57216ac6fe Merge pull request #685 from PX4/dsm_pairing_fix
DSM pairing fix
2014-02-21 08:44:26 +01:00
Lorenz Meier a91b68d8a5 Fix DSM pairing error handling. 2014-02-21 08:37:12 +01:00
Lorenz Meier 603069f169 Code style 2014-02-21 08:36:51 +01:00
Lorenz Meier f1f1ecd096 Fix mavlink feedback FD handling 2014-02-21 08:36:45 +01:00
Lorenz Meier b58fa2dffc Change bit mask to allow for 10 channels. 2014-02-21 08:34:36 +01:00
Lorenz Meier cfb4f76bad Merge pull request #684 from PX4/dsm_fix
Dsm support for DX10t
2014-02-21 08:12:04 +01:00
Lorenz Meier 9828d5ede4 Fix copyright, do not return junk channel #13 that Spektrum gives us. 2014-02-21 08:07:49 +01:00
Lorenz Meier 2d97dff35c Added support for DX10t, which apparently outputs 13 channels 2014-02-21 08:07:42 +01:00
Thomas Gubler b7899056f5 fw autoland: add very short comment 2014-02-19 23:32:55 +01:00
Thomas Gubler 60de15ea9d fw autoland: remove old comments 2014-02-19 23:26:50 +01:00
Thomas Gubler ae3e625ce8 fw pos ctrl: initialize uorb structs in initialization list 2014-02-19 23:20:17 +01:00
Thomas Gubler 9830f668c5 fw autoland: fix warning 2014-02-19 22:55:40 +01:00
Thomas Gubler b7488da441 fw autoland: completely remove the virtual wp between the last wp and the landing wp. autoland starts now from the last normal wp. 2014-02-19 22:06:05 +01:00
Thomas Gubler 6480c6a2ce fw autoland: remove confusing slopelength parameter 2014-02-19 21:48:54 +01:00
Julian Oes b17cdb12b0 Merge branch 'beta' into beta_mavlink 2014-02-19 14:59:46 +01:00
Julian Oes 18f71e6bc4 fw_pos_control_l1: warning fixes 2014-02-19 10:49:03 +01:00
Julian Oes 84df8ee78d TECS: warning fixes 2014-02-19 10:48:46 +01:00
Julian Oes 79d2e5de6c TECS: use constant from geo 2014-02-19 10:48:31 +01:00
Anton Babushkin 84d9e3479f mc_pos_control: unused variables removed 2014-02-18 23:42:02 +04:00