Commit Graph
12 Commits
Author SHA1 Message Date
Tobias Naegeli 80ac43e21d Fine tuning of manual control 2012-11-01 16:50:52 +01:00
tnaegeli ec018e7b64 Merge branch 'master' of https://github.com/PX4/Firmware
Conflicts:
	apps/commander/state_machine_helper.c
	apps/multirotor_att_control/multirotor_att_control_main.c
	apps/multirotor_att_control/multirotor_rate_control.c
solved
2012-10-10 09:52:37 +02:00
tnaegeli 613e12fcac working offboard 2012-10-09 16:31:04 +02:00
tnaegeli f292b03772 Merge branch 'master' of https://github.com/PX4/Firmware 2012-10-04 16:04:49 +02:00
tnaegeli 8dfa66cb97 Merge branch 'master' of https://github.com/PX4/Firmware
Conflicts:
	apps/commander/commander.c
	apps/multirotor_att_control/multirotor_att_control_main.c
	apps/multirotor_att_control/multirotor_rate_control.c
2012-10-04 16:01:42 +02:00
tnaegeli b9de72a8c9 Merge branch 'master' of https://github.com/PX4/Firmware 2012-10-04 09:29:46 +02:00
tnaegeli 733975ed2d fixed Rate controller 2012-10-04 09:28:04 +02:00
tnaegeli 147c5bb664 Merge branch 'master' of https://github.com/PX4/Firmware
Conflicts:
	apps/multirotor_att_control/multirotor_att_control_main.c
2012-10-03 15:15:05 +02:00
tnaegeli f3cb2cf8a3 rate controller update 2012-10-03 15:05:50 +02:00
tnaegeli e42655e7c6 EKF 2012-10-01 17:21:59 +02:00
tnaegeli c9f27cbdc9 f 2012-09-24 18:23:00 +02:00
tnaegeli df03433034 g
Signed-off-by: tnaegeli <naegelit@student.ethz.ch>
2012-09-18 13:49:18 +02:00