Commit Graph

12 Commits

Author SHA1 Message Date
Anton Babushkin f78666e0c8 Merge branch 'seatbelt_multirotor' into seatbelt_multirotor_new
WIP, TODO fixedwing
2013-08-16 13:23:33 +02:00
Anton Babushkin 8778230050 multirotor_pos_control fixes, systemlib/pid now accepts limit = 0.0, means no limit 2013-07-12 21:59:49 +04:00
Julian Oes 88389ea255 Merge branch 'master' into new_state_machine
compiling again
Conflicts:
	src/modules/fixedwing_att_control/fixedwing_att_control_att.c
	src/modules/fixedwing_att_control/fixedwing_att_control_rate.c
	src/modules/fixedwing_pos_control/fixedwing_pos_control_main.c
	src/modules/mavlink/orb_listener.c
	src/modules/multirotor_att_control/multirotor_attitude_control.c
	src/modules/multirotor_att_control/multirotor_rate_control.c
	src/modules/systemlib/pid/pid.c
	src/modules/systemlib/pid/pid.h
	src/modules/uORB/objects_common.cpp
2013-07-08 10:31:32 +02:00
Anton Babushkin 72694825de Copyright fixes 2013-06-22 11:28:21 +04:00
Anton Babushkin 5cb1f4662f multirotor_attitude_control performance improved, tested in flight. PID library new functionality and bugfixes. 2013-06-20 19:25:37 +04:00
Anton Babushkin bf0de77532 Critical bugfix in PID 2013-06-20 12:33:35 +04:00
Anton Babushkin 3bfc4ed517 Att rate PID fix 2013-06-20 11:38:19 +04:00
Julian Oes c189ac1c85 Added possibility to log pid control values
Conflicts:
	apps/multirotor_pos_control/multirotor_pos_control.c
	src/drivers/ardrone_interface/ardrone_interface.c
2013-06-16 15:22:20 +02:00
Julian Oes 303694f5f7 Fixed pid bug, attitude was not controlled 2013-06-16 15:22:10 +02:00
Julian Oes 8559315f4f Added a filter parameter to the pid function
Conflicts:
	apps/multirotor_pos_control/multirotor_pos_control.c
2013-06-15 20:06:13 +02:00
Julian Oes 2b9fa731ef Use the pid library in the rate controller and change de implementation of the D part
Conflicts:
	src/modules/multirotor_att_control/multirotor_rate_control.c
	src/modules/systemlib/pid/pid.c
	src/modules/systemlib/pid/pid.h
2013-06-15 20:05:03 +02:00
Lorenz Meier 13fc670386 Moved last libs, drivers and headers, cleaned up IO build 2013-04-28 09:54:11 +02:00