Skip to content

Commit 78719e3

Browse files
committed
refactoring for release
1 parent 3b39dc7 commit 78719e3

File tree

7 files changed

+11
-10
lines changed

7 files changed

+11
-10
lines changed

turtlebot3_follower/scripts/ploting.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
from sensor_msgs.msg import LaserScan
77
from sklearn.ensemble import RandomForestClassifier
88

9-
109
if __name__ == '__main__':
1110

1211
laser_data = pickle.load( open( "add_data", "rb"))

turtlebot3_panorama/CMakeLists.txt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ find_package(catkin REQUIRED COMPONENTS
2020
image_transport
2121
cmake_modules
2222
)
23+
2324
find_package(Boost REQUIRED COMPONENTS system)
2425
find_package(Eigen3 REQUIRED)
2526
find_package(OpenCV REQUIRED)
@@ -48,7 +49,7 @@ include_directories(
4849
include
4950
${catkin_INCLUDE_DIRS}
5051
${Boost_INCLUDE_DIRS}
51-
${EIGEN_INCLUDE_DIRS}
52+
${EIGEN3_INCLUDE_DIRS}
5253
)
5354

5455
add_executable(turtlebot3_panorama src/panorama.cpp)

turtlebot3_panorama/include/turtlebot_panorama/panorama.h renamed to turtlebot3_panorama/include/turtlebot3_panorama/panorama.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,14 +44,14 @@
4444
#define PANORAMA_H_
4545

4646
#include <ros/ros.h>
47-
#include <image_transport/image_transport.h>
48-
#include <sensor_msgs/Image.h>
4947
#include <std_msgs/Empty.h>
5048
#include <std_msgs/String.h>
51-
#include <nav_msgs/Odometry.h>
49+
#include <std_srvs/Empty.h>
50+
#include <sensor_msgs/Image.h>
5251
#include <geometry_msgs/Twist.h>
52+
#include <nav_msgs/Odometry.h>
53+
#include <image_transport/image_transport.h>
5354
#include <turtlebot3_msgs/TakePanorama.h>
54-
#include <std_srvs/Empty.h>
5555

5656
#include "geometry.h"
5757

turtlebot3_panorama/package.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
<depend>sensor_msgs</depend>
2323
<depend>geometry_msgs</depend>
2424
<depend>nav_msgs</depend>
25-
<depend>turtlebot3_msgs</depend>
25+
<depend>turtlebot3_msgs</depend>cv_bridge
26+
<depend>cv_bridge</depend>
2627
<depend>image_transport</depend>
2728
<depend>cmake_modules</depend>
2829
<depend>eigen</depend>

turtlebot3_panorama/scripts/loop.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#!/usr/bin/env python
2-
import roslib; roslib.load_manifest('turtlebot_panorama')
2+
import roslib; roslib.load_manifest('turtlebot3_panorama')
33
import rospy
44
from turtlebot_panorama.srv import *
55
from sensor_msgs.msg import Image

turtlebot3_panorama/src/panorama.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,9 @@
4141
#include <iostream>
4242
#include <eigen3/Eigen/Core>
4343
#include <eigen3/Eigen/Geometry>
44-
#include <turtlebot_panorama/panorama.h>
4544
#include <image_transport/image_transport.h>
4645
#include <cv_bridge/cv_bridge.h>
46+
#include <turtlebot3_panorama/panorama.h>
4747

4848
namespace turtlebot_panorama
4949
{
@@ -333,7 +333,7 @@ void PanoApp::log(std::string log)
333333

334334
int main(int argc, char **argv)
335335
{
336-
ros::init(argc, argv, "turtlebot_panorama");
336+
ros::init(argc, argv, "turtlebot3_panorama");
337337

338338
turtlebot_panorama::PanoApp pano;
339339
pano.log("Panorama app starting...");

0 commit comments

Comments
 (0)