Commit Graph

13526 Commits

Author SHA1 Message Date
Thomas Gubler 8dda05e001 Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator_termination_controlgroups 2013-12-23 22:48:26 +01:00
Anton Babushkin a26e46bede att_pos_estimator_ekf: fixes, mathlib: minor changes 2013-12-23 22:34:11 +04:00
Lorenz Meier 64ad3d7e0a Added channel count to log format 2013-12-23 18:44:07 +01:00
Thomas Gubler 94b68aa1cc add missing conversion from mission item to mavlink mission item after changes from b7652986d9 2013-12-23 16:58:27 +01:00
Anton Babushkin 5a2da77758 Merge branch 'master' into mathlib_new 2013-12-23 18:16:28 +04:00
Thomas Gubler 546964332d use minimal pitch field introduced in b7652986d9 for fw takeoff 2013-12-23 13:41:39 +01:00
Thomas Gubler b7652986d9 add minimal pitch field to mission item 2013-12-23 13:40:56 +01:00
Thomas Gubler 1450903fa9 Merge remote-tracking branch 'private_julian/fw_autoland_att_tecs_navigator' into fw_autoland_att_tecs_navigator_termination_controlgroups
Conflicts:
	src/modules/navigator/navigator_main.cpp
2013-12-23 11:47:17 +01:00
Thomas Gubler 68d8230e78 Merge remote-tracking branch 'upstream/control_groups' into fw_autoland_att_tecs_navigator_termination_controlgroups
Conflicts:
	src/systemcmds/tests/module.mk
	src/systemcmds/tests/tests.h
2013-12-23 11:13:42 +01:00
Anton Babushkin f36ffe0859 Partially merge branch 'inav_alt_gps' into vector_control2, only estimator part 2013-12-23 11:13:08 +04:00
Lorenz Meier f8134c9c67 Enable 18 channels on IO 2013-12-22 21:12:31 +01:00
Lorenz Meier 9abf31c2ba Support 18 channels correctly on FMU 2013-12-22 21:09:47 +01:00
Lorenz Meier 6c990d0a6e Fix usage of wrong constant for RC input channels 2013-12-22 20:44:51 +01:00
Anton Babushkin 4c6f6ed12c multirotor_pos_control: remove unused parameters, use ellipsoid for velocity setpoint limiting 2013-12-22 22:41:46 +04:00
Anton Babushkin fae6c69423 mc_att_control_vector, multirotor_pos_control: fixed 2013-12-22 12:20:06 +04:00
Lorenz Meier 999051546a Fixed compile error 2013-12-21 19:08:52 +01:00
Lorenz Meier b84c9f962b Merged master 2013-12-21 19:07:24 +01:00
Anton Babushkin ef5aa697c7 mc_att_control_vector: bugs fixed 2013-12-21 21:49:37 +04:00
Anton Babushkin 38e5d2b0fb multirotor_pos_control: tunable velocity feed forward for SEATBELT/EASY modes 2013-12-21 18:52:21 +04:00
Anton Babushkin 05e9a30573 multirotor_pos_control & mc_att_control_vector: singularities handling improved 2013-12-21 16:21:16 +04:00
Lorenz Meier 0f0dc5ba06 Allowed custom battery scaling on IO 2013-12-21 12:45:04 +01:00
Lorenz Meier f174ca3ce5 Added average as direct output 2013-12-20 21:52:10 +01:00
Anton Babushkin 53192b5f4d multirotor_pos_control: seatbelt mode fix 2013-12-20 22:20:07 +04:00
Anton Babushkin 948acd28cc Merge branch 'master' into vector_control2 2013-12-19 19:47:31 +04:00
Lorenz Meier b9a533acae Merge pull request #505 from PX4/rc_failsafe
Futaba RC failsafe support
2013-12-19 07:41:25 -08:00
Anton Babushkin a53af7e7b3 fw_pos_control_l1: use new mathlib 2013-12-19 17:57:37 +04:00
Anton Babushkin 2df2fd1d25 mathlib minor fixes 2013-12-19 16:58:25 +04:00
Anton Babushkin ba612c3ee8 mathlib fixes 2013-12-19 14:10:25 +04:00
Julian Oes b5fb5f9dbb Navigator: Moved mission stuff in separate class 2013-12-16 17:13:55 +01:00
Julian Oes 624ae85efa Navigator: Use state table for main FSM 2013-12-16 17:13:40 +01:00
Julian Oes 6a624abd7c Datamanager: Rename mavlink/offboard key 2013-12-16 17:13:17 +01:00
Julian Oes bed40c962e Navigator: handle onboard and mavlink missions 2013-12-16 17:12:46 +01:00
Julian Oes e8df08f139 Dataman: Also reserve space for onboard missions 2013-12-16 17:12:37 +01:00
Julian Oes 9d4ba6e4f6 Navigator: Moved mission stuff in separate class 2013-12-16 16:59:24 +01:00
Anton Babushkin 373888b16d multirotor_pos_control: default parameters updated 2013-12-16 12:53:38 +04:00
Anton Babushkin 7cbb4cfdb8 Merge branch 'master' into vector_control2 2013-12-16 12:47:40 +04:00
Anton Babushkin 72aa171ef9 mc_att_control_vector: attitude rate D component implemented 2013-12-15 22:52:05 +04:00
Anton Babushkin 69c4f6f5e4 mc_att_control_vector: code style fixed 2013-12-15 20:43:21 +04:00
Anton Babushkin 86d5f0808d mc_att_control_vector: fixes 2013-12-15 20:42:47 +04:00
Anton Babushkin badf146e19 mc_att_control_vector: independent thrust vector and attitude control 2013-12-15 16:24:45 +04:00
Anton Babushkin f5c24c6e71 pid library fix 2013-12-15 12:34:56 +04:00
Anton Babushkin faa3826de6 multirotor_pos_control: fixes and improvements 2013-12-15 11:47:26 +04:00
Julian Oes e685c65365 Navigator: Use state table for main FSM 2013-12-14 20:55:03 +01:00
Julian Oes 73907d1ac0 Datamanager: Rename mavlink/offboard key 2013-12-14 20:54:25 +01:00
Julian Oes d0444497ed Bottle_drop: Store WPs in datamanager 2013-12-14 20:52:25 +01:00
Lorenz Meier d6a6d59d2d Further improved S.Bus scaling 2013-12-14 15:09:20 +01:00
Lorenz Meier 00dc339d2e Improved S.Bus scaling based on scope measurements 2013-12-14 14:52:57 +01:00
Thomas Gubler 23d0c6f8dd temporary workaround to trigger failsafe with remote control 2013-12-14 11:03:02 +01:00
Thomas Gubler 367d5d0cf2 fix wrong usage of navigation state in flighttermination state machine 2013-12-14 11:02:16 +01:00
Thomas Gubler c3cbaf5deb Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator_termination_controlgroups
Conflicts:
	src/drivers/px4io/px4io.cpp
2013-12-13 21:07:27 +01:00