Commit Graph

108 Commits

Author SHA1 Message Date
Lorenz Meier 290ca1f9bf Reworked airspeed driver to keep most of it abstract 2013-07-10 21:45:59 +02:00
Simon Wilks a18c6cea18 Merge remote-tracking branch 'upstream/master' into hott-esc 2013-07-09 08:04:07 +02: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 320a5b7579 Merge branch 'master' into seatbelt_multirotor 2013-07-08 12:18:32 +04:00
Lorenz Meier 92e0687022 Merge branch 'master' of github.com:PX4/Firmware into integration 2013-06-17 08:44:07 +02:00
Lorenz Meier 6015809d89 Merged 2013-06-06 17:37:41 +02:00
Lorenz Meier 198df9c82e All apps compiling and linked (listed in NSH help), but not executing yet 2013-06-01 15:14:53 +02:00
Lorenz Meier 5375bb5b86 Cleanup, WIP, needs a NuttX checkout to Firmware/NuttX now 2013-06-01 01:04:32 +02:00