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

Merge remote-tracking branch 'upstream/master' into dev_ros

Browse Source 
Conflicts:
	src/examples/subscriber/subscriber_params.c
	src/modules/mc_att_control/mc_att_control_main.cpp
	src/modules/uORB/topics/vehicle_attitude.h
	src/modules/uORB/topics/vehicle_attitude_setpoint.h
	src/platforms/px4_middleware.h
This commit is contained in:
Thomas Gubler
2014-12-18 12:11:05 +01:00
parent 4402d7106b 6e874bed50
commit 16618f1ada
34 changed files with 1609 additions and 334 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/uORB/uORB.h
+22 -3
View File
@@ -264,9 +264,28 @@ __END_DECLS
/* Diverse uORB header defines */ //XXX: move to better location
#define ORB_ID_VEHICLE_ATTITUDE_CONTROLS ORB_ID(actuator_controls_0)
ORB_DECLARE(actuator_controls_0);
ORB_DECLARE(actuator_controls_1);
ORB_DECLARE(actuator_controls_2);
ORB_DECLARE(actuator_controls_3);
typedef struct actuator_controls_s actuator_controls_0_s;
ORB_DECLARE(actuator_controls_1);
typedef struct actuator_controls_s actuator_controls_1_s;
ORB_DECLARE(actuator_controls_2);
typedef struct actuator_controls_s actuator_controls_2_s;
ORB_DECLARE(actuator_controls_3);
typedef struct actuator_controls_s actuator_controls_3_s;
ORB_DECLARE(actuator_controls_virtual_mc);
typedef struct actuator_controls_s actuator_controls_virtual_mc_s;
ORB_DECLARE(actuator_controls_virtual_fw);
typedef struct actuator_controls_s actuator_controls_virtual_fw_s;
ORB_DECLARE(mc_virtual_rates_setpoint);
typedef struct vehicle_rates_setpoint_s mc_virtual_rates_setpoint_s;
ORB_DECLARE(fw_virtual_rates_setpoint);
typedef struct vehicle_rates_setpoint_s fw_virtual_rates_setpoint_s;
ORB_DECLARE(mc_virtual_attitude_setpoint);
typedef struct vehicle_attitude_setpoint_s mc_virtual_attitude_setpoint_s;
ORB_DECLARE(fw_virtual_attitude_setpoint);
typedef struct vehicle_attitude_setpoint_s fw_virtual_attitude_setpoint_s;
typedef uint8_t arming_state_t;
typedef uint8_t main_state_t;
typedef uint8_t hil_state_t;
typedef uint8_t navigation_state_t;
#endif /* _UORB_UORB_H */