diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-10 16:54:28 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2012-11-10 16:54:28 +0100 |
| commit | 84a0261278d4015d2638043d116a6e591d1867f7 (patch) | |
| tree | 00801155c8baa7f3cb810b8c177d6eb6b69644ac /apps/mavlink/orb_listener.c | |
| parent | e8eb887515def14775c70289dcba67e789a96659 (diff) | |
| download | px4-firmware-84a0261278d4015d2638043d116a6e591d1867f7.tar.gz px4-firmware-84a0261278d4015d2638043d116a6e591d1867f7.tar.bz2 px4-firmware-84a0261278d4015d2638043d116a6e591d1867f7.zip | |
Outputting mixed actuators instead of raw control output
Diffstat (limited to 'apps/mavlink/orb_listener.c')
| -rw-r--r-- | apps/mavlink/orb_listener.c | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/apps/mavlink/orb_listener.c b/apps/mavlink/orb_listener.c index fafc8f79c..8c38692b7 100644 --- a/apps/mavlink/orb_listener.c +++ b/apps/mavlink/orb_listener.c @@ -421,7 +421,7 @@ l_actuator_outputs(struct listener *l) /* copy actuator data into local buffer */ orb_copy(ids[l->arg], *l->subp, &act_outputs); - if (gcs_link) + if (gcs_link) { mavlink_msg_servo_output_raw_send(MAVLINK_COMM_0, last_sensor_timestamp / 1000, l->arg /* port number */, act_outputs.output[0], @@ -432,6 +432,30 @@ l_actuator_outputs(struct listener *l) act_outputs.output[5], act_outputs.output[6], act_outputs.output[7]); + + /* only send in HIL mode */ + if (mavlink_hil_enabled) { + + /* translate the current syste state to mavlink state and mode */ + uint8_t mavlink_state = 0; + uint8_t mavlink_mode = 0; + get_mavlink_mode_and_state(&mavlink_state, &mavlink_mode); + + /* HIL message as per MAVLink spec */ + mavlink_msg_hil_controls_send(chan, + hrt_absolute_time(), + act_outputs.output[0], + act_outputs.output[1], + act_outputs.output[2], + act_outputs.output[3], + act_outputs.output[4], + act_outputs.output[5], + act_outputs.output[6], + act_outputs.output[7], + mavlink_mode, + 0); + } + } } void @@ -484,29 +508,6 @@ l_vehicle_attitude_controls(struct listener *l) "ctrl3 ", actuators.control[3]); } - - /* Only send in HIL mode */ - if (mavlink_hil_enabled) { - - /* translate the current syste state to mavlink state and mode */ - uint8_t mavlink_state = 0; - uint8_t mavlink_mode = 0; - get_mavlink_mode_and_state(&mavlink_state, &mavlink_mode); - - /* HIL message as per MAVLink spec */ - mavlink_msg_hil_controls_send(chan, - hrt_absolute_time(), - actuators.control[0], - actuators.control[1], - actuators.control[2], - actuators.control[3], - 0, - 0, - 0, - 0, - mavlink_mode, - 0); - } } void |