diff options
| author | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-18 12:08:39 +0100 |
|---|---|---|
| committer | Thomas Gubler <thomasgubler@gmail.com> | 2014-12-18 12:11:05 +0100 |
| commit | 16618f1adac7f33817fb968b285288beb360b012 (patch) | |
| tree | b6181cbd01cb923023810b735c4bc6cb40c58b8e /src/modules/uORB/uORB.h | |
| parent | 4402d7106bc63b2a02a1e4c22f54e072b3c48fc7 (diff) | |
| parent | 6e874bed50d6d8a13a3b7f9b883697cb2718d27b (diff) | |
| download | px4-firmware-16618f1adac7f33817fb968b285288beb360b012.tar.gz px4-firmware-16618f1adac7f33817fb968b285288beb360b012.tar.bz2 px4-firmware-16618f1adac7f33817fb968b285288beb360b012.zip | |
Merge remote-tracking branch 'upstream/master' into dev_ros
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
Diffstat (limited to 'src/modules/uORB/uORB.h')
| -rw-r--r-- | src/modules/uORB/uORB.h | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/src/modules/uORB/uORB.h b/src/modules/uORB/uORB.h index 0a99cce77..a6e9171ed 100644 --- a/src/modules/uORB/uORB.h +++ b/src/modules/uORB/uORB.h @@ -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); +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_0_s; +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 */ |