aboutsummaryrefslogtreecommitdiff
path: root/apps/mavlink
diff options
context:
space:
mode:
authorLorenz Meier <lm@inf.ethz.ch>2012-10-02 22:28:14 +0200
committerLorenz Meier <lm@inf.ethz.ch>2012-10-02 22:28:14 +0200
commit7ef4655b0e1a186f55c41375bd34133a6f8cde58 (patch)
treea872984278619156528a9bc84f215e254d4fc68a /apps/mavlink
parent6005077d54e6b96a5284752eedbd026ef7952341 (diff)
downloadpx4-firmware-7ef4655b0e1a186f55c41375bd34133a6f8cde58.tar.gz
px4-firmware-7ef4655b0e1a186f55c41375bd34133a6f8cde58.tar.bz2
px4-firmware-7ef4655b0e1a186f55c41375bd34133a6f8cde58.zip
Fixed HIL joystick support
Diffstat (limited to 'apps/mavlink')
-rw-r--r--apps/mavlink/mavlink.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/apps/mavlink/mavlink.c b/apps/mavlink/mavlink.c
index ea1c511f9..cf6fb077f 100644
--- a/apps/mavlink/mavlink.c
+++ b/apps/mavlink/mavlink.c
@@ -1416,6 +1416,8 @@ void handleMessage(mavlink_message_t *msg)
memset(&rc_hil, 0, sizeof(rc_hil));
static orb_advert_t rc_pub = 0;
+ rc_hil.timestamp = hrt_absolute_time();
+ rc_hil.chan_count = 4;
rc_hil.chan[0].raw = 1500 + man.x / 2;
rc_hil.chan[1].raw = 1500 + man.y / 2;
rc_hil.chan[2].raw = 1500 + man.r / 2;
@@ -1429,6 +1431,7 @@ void handleMessage(mavlink_message_t *msg)
struct manual_control_setpoint_s mc;
static orb_advert_t mc_pub = 0;
+ mc.timestamp = rc_hil.timestamp;
mc.roll = man.x / 1000.0f;
mc.pitch = man.y / 1000.0f;
mc.yaw = man.r / 1000.0f;