fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-18 06:43:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a bunch of issues in the arming state machine for multirotors, arming / disarming works fine now. Porting of various processes needed

Browse Source
This commit is contained in:
Lorenz Meier
2012-08-22 14:35:22 +02:00
parent 44ff4d4ee2
commit fa9f145b08
7 changed files with 285 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/uORB/objects_common.cpp
+4 -4
View File
@@ -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);
apps/uORB/topics/actuator_outputs.h
+1 -1
View File
@@ -52,7 +52,7 @@
#define NUM_ACTUATOR_OUTPUTS 16
#define NUM_ACTUATOR_OUTPUT_GROUPS 4 /**< for sanity checking */
struct actuator_output_s {
struct actuator_outputs_s {
float output[NUM_ACTUATOR_OUTPUTS];
};