 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 |
|
|
Julian Oes
|
90f5e30f2a
|
Introduced new actuator_safety topic
|
2013-06-14 13:53:26 +02:00 |
|
|
px4dev
|
23a6234235
|
Rename our 'task_spawn' to 'task_spawn_cmd' since NuttX now has its own version of task_spawn that's different.
|
2013-06-01 23:31:53 +02:00 |
|
|
Andrew Tridgell
|
fa816d0fd6
|
arming: added PWM_SERVO_SET_ARM_OK and PWM_SERVO_CLEAR_ARM_OK
these new ioctls allow for the flight code to tell the IO board that
arming can proceed
|
2013-05-16 08:39:24 +02:00 |
|
|
Lorenz Meier
|
44df8db984
|
Merge branch 'master' of github.com:PX4/Firmware into export-build
|
2013-05-06 23:50:23 +02:00 |
|
|
px4dev
|
01e427b17c
|
Merge working changes into export-build branch.
|
2013-04-26 16:14:32 -07:00 |
|