diff options
author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-31 11:37:32 +0200 |
---|---|---|
committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-31 11:37:32 +0200 |
commit | 93a822fee4d1245bd74800781e2638efc147c4e8 (patch) | |
tree | 16cd8abca9691af516ff2a2b43cef60d31907865 /src/modules/fw_att_control/fw_att_control_main.cpp | |
parent | 1b3a775e1b8341cdc32e7c9a497acba9da5a9802 (diff) | |
parent | 75dfb0d84d73e56d624c062ba3f35b88505a2f93 (diff) | |
download | px4-firmware-93a822fee4d1245bd74800781e2638efc147c4e8.tar.gz px4-firmware-93a822fee4d1245bd74800781e2638efc147c4e8.tar.bz2 px4-firmware-93a822fee4d1245bd74800781e2638efc147c4e8.zip |
Merged master
Diffstat (limited to 'src/modules/fw_att_control/fw_att_control_main.cpp')
-rw-r--r-- | src/modules/fw_att_control/fw_att_control_main.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/fw_att_control/fw_att_control_main.cpp b/src/modules/fw_att_control/fw_att_control_main.cpp index 4cdba735a..0cea13cc4 100644 --- a/src/modules/fw_att_control/fw_att_control_main.cpp +++ b/src/modules/fw_att_control/fw_att_control_main.cpp @@ -529,7 +529,7 @@ FixedwingAttitudeControl::vehicle_accel_poll() orb_check(_accel_sub, &accel_updated); if (accel_updated) { - orb_copy(ORB_ID(sensor_accel), _accel_sub, &_accel); + orb_copy(ORB_ID(sensor_accel0), _accel_sub, &_accel); } } @@ -577,7 +577,7 @@ FixedwingAttitudeControl::task_main() */ _att_sp_sub = orb_subscribe(ORB_ID(vehicle_attitude_setpoint)); _att_sub = orb_subscribe(ORB_ID(vehicle_attitude)); - _accel_sub = orb_subscribe(ORB_ID(sensor_accel)); + _accel_sub = orb_subscribe(ORB_ID(sensor_accel0)); _airspeed_sub = orb_subscribe(ORB_ID(airspeed)); _vcontrol_mode_sub = orb_subscribe(ORB_ID(vehicle_control_mode)); _params_sub = orb_subscribe(ORB_ID(parameter_update)); |