PX4-Autopilot

mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-04-14 10:07:39 +08:00

History

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

fixedwing_control

Merge branch 'master' into new_state_machine

2013-07-08 10:31:32 +02:00

flow_position_control

Merge branch 'master' into new_state_machine

2013-07-08 10:31:32 +02:00

flow_position_estimator

Adapted flow estimator, position and velocity control to new state machine

2013-06-24 09:49:46 +02:00

flow_speed_control

Adapted flow estimator, position and velocity control to new state machine