Commit Graph

9 Commits

Author SHA1 Message Date
Julian Oes 68fb200f0b Fixed pid bug, attitude was not controlled 2013-06-16 09:55:28 +02:00
Julian Oes 3230f22446 Merge branch 'pid_fixes' into new_state_machine 2013-06-15 20:06:30 +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
Julian Oes 9f5565de32 Controllers should not access state machine anymore but access the vehicle_control_mode flags 2013-06-15 19:41:54 +02:00
Julian Oes 90f5e30f2a Introduced new actuator_safety topic 2013-06-14 13:53:26 +02:00
Julian Oes f5c157e74d Merge remote-tracking branch 'upstream/master' into new_state_machine
Conflicts:
	src/drivers/px4io/px4io.cpp
	src/modules/commander/commander.c
	src/modules/commander/state_machine_helper.c
2013-05-17 11:24:02 +02:00
Lorenz Meier 7ac617242d docs fix 2013-04-27 19:27:24 +02:00
Lorenz Meier 7ca82801bd Moved multirotor controllers 2013-04-27 14:42:12 +02:00