diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2012-08-22 14:35:22 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-08-22 14:35:22 +0200 |
commit | fa9f145b08cace0f48c808cf307daf6cd43d9bd6 (patch) | |
tree | 06e8e7482f12ac072aaf8b2573632eee44118bcb /apps/uORB/objects_common.cpp | |
parent | 44ff4d4ee29f3da53f64b2f24b822f2f2f7032c0 (diff) | |
download | px4-firmware-fa9f145b08cace0f48c808cf307daf6cd43d9bd6.tar.gz px4-firmware-fa9f145b08cace0f48c808cf307daf6cd43d9bd6.tar.bz2 px4-firmware-fa9f145b08cace0f48c808cf307daf6cd43d9bd6.zip |
Fixed a bunch of issues in the arming state machine for multirotors, arming / disarming works fine now. Porting of various processes needed
Diffstat (limited to 'apps/uORB/objects_common.cpp')
-rw-r--r-- | apps/uORB/objects_common.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/apps/uORB/objects_common.cpp b/apps/uORB/objects_common.cpp index 6ff66fceb..d6c00f996 100644 --- a/apps/uORB/objects_common.cpp +++ b/apps/uORB/objects_common.cpp @@ -116,7 +116,7 @@ ORB_DEFINE(actuator_controls_3, struct actuator_controls_s); ORB_DEFINE(actuator_armed, struct actuator_armed_s); #include "topics/actuator_outputs.h" -ORB_DEFINE(actuator_outputs_0, struct actuator_output_s); -ORB_DEFINE(actuator_outputs_1, struct actuator_output_s); -ORB_DEFINE(actuator_outputs_2, struct actuator_output_s); -ORB_DEFINE(actuator_outputs_3, struct actuator_output_s); +ORB_DEFINE(actuator_outputs_0, struct actuator_outputs_s); +ORB_DEFINE(actuator_outputs_1, struct actuator_outputs_s); +ORB_DEFINE(actuator_outputs_2, struct actuator_outputs_s); +ORB_DEFINE(actuator_outputs_3, struct actuator_outputs_s); |