1417 Commits

Author SHA1 Message Date
Thomas Gubler
935362b7a3 launchdetection: better integration of Blocks class 2014-03-08 19:00:49 +01:00
Thomas Gubler
b086bdf21e Merge remote-tracking branch 'upstream/master' into launchdetector
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
2014-03-06 21:53:51 +01:00
Anton Babushkin
36ba60d63c mc_att_control: hotfix, memset all structs to zeroes on start, fixes garbage in actuator controls 4..8 2014-03-05 20:03:21 +04:00
Lorenz Meier
fabef6c889 Revert "Fixed warning"
This reverts commit 3639c7ae91f5226b71cdba8d8cc98eae4bba7e07.
2014-03-04 22:52:34 +01:00
Lorenz Meier
3639c7ae91 Fixed warning 2014-03-04 21:36:09 +01:00
Anton Babushkin
b76e26c5e5 commander: allow arming with safety enabled in HIL mode 2014-03-03 21:24:59 +04:00
Anton Babushkin
3674aae4a7 commander: ignore battery voltage in HIL mode 2014-03-03 21:19:56 +04:00
Thomas Gubler
eb32c7198e Merge pull request #700 from PX4/fix_mission_dive
Fix mission dive
2014-03-03 15:28:49 +01:00
julianoes
49fe131019 Merge pull request #674 from PX4/safety_disarm
commander: disarm system when safety enabled
2014-03-03 10:59:51 +01:00
julianoes
72ae4a6dc7 Merge pull request #653 from PX4/fs_beep
Beeps and LED blinks cleanup, beep on RC failsafe added
2014-03-03 10:11:33 +01:00
julianoes
8b99062e66 Merge pull request #660 from PX4/rtl_heading
navigator: use bearing to home for RTL
2014-03-03 09:14:38 +01:00
julianoes
85247e3fdd Merge pull request #680 from PX4/ready_rtl_fix
navigator: forbid READY -> RTL transition
2014-03-02 21:22:16 +01:00
Anton Babushkin
db157b68c2 mc_pos_control: remove some debug logs 2014-03-02 19:42:10 +04:00
Anton Babushkin
f79aea89bc Merge branch 'inav_fs' into rtl_heading 2014-03-01 23:43:21 +04:00
Anton Babushkin
d11235585c position_estimator_inav: log writing on NaN estimate fixed 2014-03-01 22:56:02 +04:00
Anton Babushkin
e06263f76f position_estimator_inav: failsafe against NaN estimate 2014-03-01 22:43:56 +04:00
Julian Oes
eac00a71ea navigator: don't enter AUTO_READY for fixedwing because we don't have a land detector yet 2014-03-01 11:05:07 +01:00
Julian Oes
2c337d9b45 Merge remote-tracking branch 'px4/master' into beta 2014-03-01 10:36:19 +01:00
Thomas Gubler
f2b46389ee fw: reset landing and takeoff state if switched to manual 2014-02-28 21:42:41 +01:00
Anton Babushkin
4912a4af99 Merge branch 'beta' into ready_rtl_fix 2014-02-28 20:04:43 +04: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
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
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
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
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
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
18f71e6bc4 fw_pos_control_l1: warning fixes 2014-02-19 10:49:03 +01:00
Anton Babushkin
84d9e3479f mc_pos_control: unused variables removed 2014-02-18 23:42:02 +04:00
Anton Babushkin
1eecc73483 Merge branch 'beta' into ready_rtl_fix 2014-02-18 19:09:33 +04:00
Anton Babushkin
7d8f08ad9a navigator: check if yaw reached only when position reached 2014-02-18 19:05:32 +04:00
Anton Babushkin
a43c7c488e navigator: "reached" flags reset fixed 2014-02-18 18:54:58 +04:00
Anton Babushkin
b28b0d0fce Merge branch 'beta' into rtl_heading 2014-02-18 18:19:12 +04:00
Julian Oes
83f66e4599 fw_pos_control_l1: use double everywhere for lat and lon 2014-02-18 14:40:11 +01:00
Julian Oes
3eaa892ee4 fw_pos_control_l1: indentation only 2014-02-18 14:35:41 +01:00