diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-08-22 08:56:33 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-08-22 08:56:33 +0200 |
| commit | 72979032e9bfef200809e97663c613b7b530b011 (patch) | |
| tree | dc47df0ecf27a101f520d6fc422a6d84f011f1ab /apps/mavlink/mavlink.c | |
| parent | d17bbc7a0bdc30302df0001ddad91733064d3d11 (diff) | |
| parent | 88f0080a0ffb299006950c0453eabddb7d17f078 (diff) | |
| download | px4-firmware-72979032e9bfef200809e97663c613b7b530b011.tar.gz px4-firmware-72979032e9bfef200809e97663c613b7b530b011.tar.bz2 px4-firmware-72979032e9bfef200809e97663c613b7b530b011.zip | |
Merge branch 'master' into px4dev_new_param
Diffstat (limited to 'apps/mavlink/mavlink.c')
| -rw-r--r-- | apps/mavlink/mavlink.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/apps/mavlink/mavlink.c b/apps/mavlink/mavlink.c index 653a41090..596953789 100644 --- a/apps/mavlink/mavlink.c +++ b/apps/mavlink/mavlink.c @@ -113,7 +113,7 @@ static struct vehicle_status_s v_status; static struct rc_channels_s rc; /* HIL publishers */ -static int pub_hil_attitude = -1; +static orb_advert_t pub_hil_attitude = -1; /** HIL attitude */ static struct vehicle_attitude_s hil_attitude; @@ -126,16 +126,16 @@ static struct ardrone_motors_setpoint_s ardrone_motors; static struct vehicle_command_s vcmd; -static int pub_hil_global_pos = -1; -static int ardrone_motors_pub = -1; -static int cmd_pub = -1; +static orb_advert_t pub_hil_global_pos = -1; +static orb_advert_t ardrone_motors_pub = -1; +static orb_advert_t cmd_pub = -1; static int sensor_sub = -1; static int att_sub = -1; static int global_pos_sub = -1; static int local_pos_sub = -1; -static int flow_pub = -1; -static int global_position_setpoint_pub = -1; -static int local_position_setpoint_pub = -1; +static orb_advert_t flow_pub = -1; +static orb_advert_t global_position_setpoint_pub = -1; +static orb_advert_t local_position_setpoint_pub = -1; static bool mavlink_hil_enabled = false; static char mavlink_message_string[51] = {0}; |