From 3653d64b31c95daf8ea3a2f8cf7f58376e2431cf Mon Sep 17 00:00:00 2001 From: Kabir Mohammed Date: Fri, 16 Dec 2016 23:13:26 +0530 Subject: [PATCH] att_ekf : move to new vision topics --- .../attitude_estimator_ekf/attitude_estimator_ekf_main.cpp | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/examples/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp b/src/examples/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp index eddff9e82d..1ff585412e 100755 --- a/src/examples/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp +++ b/src/examples/attitude_estimator_ekf/attitude_estimator_ekf_main.cpp @@ -63,7 +63,6 @@ #include #include #include -#include #include #include @@ -298,7 +297,7 @@ int attitude_estimator_ekf_thread_main(int argc, char *argv[]) int sub_control_mode = orb_subscribe(ORB_ID(vehicle_control_mode)); /* subscribe to vision estimate */ - int vision_sub = orb_subscribe(ORB_ID(vision_position_estimate)); + int vision_sub = orb_subscribe(ORB_ID(vehicle_vision_attitude)); /* subscribe to mocap data */ int mocap_sub = orb_subscribe(ORB_ID(att_pos_mocap)); @@ -332,7 +331,7 @@ int attitude_estimator_ekf_thread_main(int argc, char *argv[]) math::Matrix<3, 3> R_decl; R_decl.identity(); - struct vision_position_estimate_s vision {}; + struct vehicle_attitude_s vision {}; struct att_pos_mocap_s mocap {}; /* register the perf counter */ @@ -492,7 +491,7 @@ int attitude_estimator_ekf_thread_main(int argc, char *argv[]) orb_check(mocap_sub, &mocap_updated); if (vision_updated) { - orb_copy(ORB_ID(vision_position_estimate), vision_sub, &vision); + orb_copy(ORB_ID(vehicle_vision_attitude), vision_sub, &vision); } if (mocap_updated) {