Commit Graph

7 Commits

Author SHA1 Message Date
Julian Oes 7f90ebf537 Merge remote-tracking branch 'upstream/master' into new_state_machine
Conflicts:
	src/examples/fixedwing_control/main.c
2013-06-12 12:24:52 +02:00
Lorenz Meier 1edc36bfd4 More documentation 2013-05-25 23:01:55 +02:00
Lorenz Meier bc7a7167ae Go only to RC failsafe if throttle was half once - to prevent failsafe when armed on ground 2013-05-25 18:21:39 +02:00
Lorenz Meier 214ddd6f1c Adjusted example params and extensively commented example 2013-05-25 18:16:15 +02:00
Lorenz Meier 81acd98997 Added limit to heading command 2013-05-23 08:54:08 +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 6ea204c813 Added fixed wing controller example 2013-05-12 20:08:09 +02:00