Commit Graph

12 Commits

Author SHA1 Message Date
Julian Oes 202792294a Merge remote-tracking branch 'upstream/io_fixes' into new_state_machine
Conflicts:
	src/drivers/px4io/px4io.cpp
	src/modules/commander/commander.c
	src/modules/commander/state_machine_helper.c
	src/modules/commander/state_machine_helper.h
	src/modules/px4iofirmware/mixer.cpp
	src/modules/uORB/topics/actuator_controls.h
	src/modules/uORB/topics/vehicle_status.h
2013-06-18 15:35:26 +02:00
Julian Oes b52d561b11 Added ctrl debugging values 2013-06-16 12:59:50 +02:00
Julian Oes 3230f22446 Merge branch 'pid_fixes' into new_state_machine 2013-06-15 20:06:30 +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
samuezih b789e01a0f Add PX4Flow board modules and corresponding ORB msgs. 2013-06-14 17:31:46 +02:00
Julian Oes 90f5e30f2a Introduced new actuator_safety topic 2013-06-14 13:53:26 +02:00
Lorenz Meier 1deced7629 Added safety status feedback, disallow arming of a rotary wing with engaged safety 2013-06-09 14:09:09 +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 79f9b61aff Fixed led patterns to be up to the latest specs 2013-05-12 20:05:20 +02:00
Lorenz Meier 614bbb1510 Merged ETS airspeed driver 2013-05-09 15:58:23 +02:00
px4dev 8d3a738b70 Remove some trash files. 2013-04-28 13:00:32 -07:00
Lorenz Meier 13fc670386 Moved last libs, drivers and headers, cleaned up IO build 2013-04-28 09:54:11 +02:00