From 73e3a354659c4454d487727299323ec090409ca0 Mon Sep 17 00:00:00 2001 From: James Goppert Date: Sat, 25 Feb 2017 14:56:50 -0500 Subject: [PATCH 1/2] TF fixes. --- src/CLaserOdometry2D.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/CLaserOdometry2D.cpp b/src/CLaserOdometry2D.cpp index 7f6e0fb..c06446f 100644 --- a/src/CLaserOdometry2D.cpp +++ b/src/CLaserOdometry2D.cpp @@ -80,7 +80,7 @@ void CLaserOdometry2D::Init() tf::StampedTransform transform; try { - tf_listener.lookupTransform("/base_link", last_scan.header.frame_id, ros::Time(0), transform); + tf_listener.lookupTransform(base_frame_id, last_scan.header.frame_id, ros::Time(0), transform); } catch (tf::TransformException &ex) { @@ -918,7 +918,7 @@ void CLaserOdometry2D::PoseUpdate() tf::StampedTransform transform; try { - tf_listener.lookupTransform(last_scan.header.frame_id, "/base_link", ros::Time(0), transform); + tf_listener.lookupTransform(last_scan.header.frame_id, base_frame_id, ros::Time(0), transform); } catch (tf::TransformException &ex) { @@ -978,8 +978,8 @@ void CLaserOdometry2D::PoseUpdate() //--------------------------------------- geometry_msgs::TransformStamped odom_trans; odom_trans.header.stamp = ros::Time::now(); - odom_trans.header.frame_id = odom_frame_id; - odom_trans.child_frame_id = base_frame_id; + odom_trans.header.frame_id = base_frame_id; + odom_trans.child_frame_id = odom_frame_id; odom_trans.transform.translation.x = robot_pose.x(); odom_trans.transform.translation.y = robot_pose.y(); odom_trans.transform.translation.z = 0.0; From 2c715fd7a893cec2c8665ac71ae65e335155b527 Mon Sep 17 00:00:00 2001 From: James Goppert Date: Sat, 25 Feb 2017 16:58:04 -0500 Subject: [PATCH 2/2] Fixes for cmake. --- CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f8ccf1f..6f4bc7d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ find_package(catkin REQUIRED COMPONENTS ## System dependencies are found with CMake's conventions find_package(Boost REQUIRED COMPONENTS system) find_package(cmake_modules REQUIRED) -find_package(Eigen REQUIRED) +find_package(Eigen3 REQUIRED) find_package(MRPT REQUIRED base obs maps slam) #include_directories(${MRPT_INCLUDE_DIRS}) #MESSAGE( STATUS "MRPT_INCLUDE_DIRS: " ${MRPT_INCLUDE_DIRS}) @@ -38,7 +38,7 @@ catkin_package( INCLUDE_DIRS include LIBRARIES laser_odometry CATKIN_DEPENDS nav_msgs roscpp sensor_msgs std_msgs tf - DEPENDS system_lib + #DEPENDS system_lib ) ## Specify additional locations of header files