 Thomas Gubler
|
981d616268
|
ardrone interface: reduce stack size
Conflicts:
src/drivers/ardrone_interface/ardrone_interface.c
|
2014-05-21 12:30:05 +02:00 |
|
|
Julian Oes
|
1b38cf715d
|
Renamed actuator_safety back to actuator_armed, compiling but untested
|
2013-07-15 22:15:15 +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 |
|
|
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 |
|
|
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 |
|
|
px4dev
|
01e427b17c
|
Merge working changes into export-build branch.
|
2013-04-26 16:14:32 -07:00 |
|