diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-26 09:49:42 +0100 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2015-01-29 16:33:54 +0100 |
| commit | 455f6abfcf25e48edd4d707fdf9b278e02a81772 (patch) | |
| tree | 412f1360b2a3b856e39a79dd4dfa2715f6065194 /src | |
| parent | cbe3783d5eeeb6597b1f02f38abf16737f6d4d64 (diff) | |
| download | px4-firmware-455f6abfcf25e48edd4d707fdf9b278e02a81772.tar.gz px4-firmware-455f6abfcf25e48edd4d707fdf9b278e02a81772.tar.bz2 px4-firmware-455f6abfcf25e48edd4d707fdf9b278e02a81772.zip | |
Support topic groups in sdlog2
Diffstat (limited to 'src')
| -rw-r--r-- | src/modules/sdlog2/sdlog2.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/sdlog2/sdlog2.c b/src/modules/sdlog2/sdlog2.c index a3407e42c..99632ef0b 100644 --- a/src/modules/sdlog2/sdlog2.c +++ b/src/modules/sdlog2/sdlog2.c @@ -1096,7 +1096,7 @@ int sdlog2_thread_main(int argc, char *argv[]) subs.att_sub = orb_subscribe(ORB_ID(vehicle_attitude)); subs.att_sp_sub = orb_subscribe(ORB_ID(vehicle_attitude_setpoint)); subs.rates_sp_sub = orb_subscribe(ORB_ID(vehicle_rates_setpoint)); - subs.act_outputs_sub = orb_subscribe(ORB_ID_VEHICLE_CONTROLS); + subs.act_outputs_sub = orb_subscribe(ORB_ID(actuator_outputs)); subs.act_controls_sub = orb_subscribe(ORB_ID_VEHICLE_ATTITUDE_CONTROLS); subs.act_controls_1_sub = orb_subscribe(ORB_ID(actuator_controls_1)); subs.local_pos_sub = orb_subscribe(ORB_ID(vehicle_local_position)); @@ -1473,7 +1473,7 @@ int sdlog2_thread_main(int argc, char *argv[]) } /* --- ACTUATOR OUTPUTS --- */ - if (copy_if_updated(ORB_ID(actuator_outputs_0), subs.act_outputs_sub, &buf.act_outputs)) { + if (copy_if_updated(ORB_ID(actuator_outputs), subs.act_outputs_sub, &buf.act_outputs)) { log_msg.msg_type = LOG_OUT0_MSG; memcpy(log_msg.body.log_OUT0.output, buf.act_outputs.output, sizeof(log_msg.body.log_OUT0.output)); LOGBUFFER_WRITE_AND_COUNT(OUT0); |