Skip to content

Commit 7c78fb6

Browse files
committed
created launch and removed .py
1 parent ace737f commit 7c78fb6

File tree

6 files changed

+33
-13
lines changed

6 files changed

+33
-13
lines changed

turtlebot3_automatic_parking/CMakeLists.txt

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
################################################################################
2-
# CMake
2+
# Set minimum required version of cmake, project name and compile options
33
################################################################################
44
cmake_minimum_required(VERSION 2.8.3)
55
project(turtlebot3_automatic_parking)
66

77
################################################################################
8-
# Packages
8+
# Find catkin packages and libraries for catkin and system dependencies
99
################################################################################
1010
find_package(catkin REQUIRED COMPONENTS
1111
rospy
@@ -16,36 +16,39 @@ find_package(catkin REQUIRED COMPONENTS
1616
)
1717

1818
################################################################################
19-
# Declare ROS messages, services and actions
19+
# Setup for python modules and scripts
2020
################################################################################
21+
catkin_python_setup()
2122

2223
################################################################################
23-
# Declare ROS dynamic reconfigure parameters
24-
################################################################################
25-
26-
################################################################################
27-
# Catkin specific configuration
24+
# Declare catkin specific configuration to be passed to dependent projects
2825
################################################################################
2926
catkin_package(
30-
CATKIN_DEPENDS rospy std_msgs sensor_msgs geometry_msgs nav_msgs
27+
CATKIN_DEPENDS
28+
rospy
29+
std_msgs
30+
sensor_msgs
31+
geometry_msgs
32+
nav_msgs
3133
)
3234

3335
################################################################################
3436
# Build
3537
################################################################################
3638
include_directories(
39+
include
3740
${catkin_INCLUDE_DIRS}
3841
)
3942

4043
################################################################################
4144
# Install
4245
################################################################################
4346
catkin_install_python(PROGRAMS
44-
scripts/automatic_parking.py
45-
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
47+
nodes/automatic_parking
48+
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
4649
)
4750

48-
install(DIRECTORY rviz
51+
install(DIRECTORY launch rviz
4952
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
5053
)
5154

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<launch>
2+
<node pkg="turtlebot3_automatic_parking" type="automatic_parking" name="automatic_parking" output="screen">
3+
</node>
4+
</launch>

turtlebot3_automatic_parking/package.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0"?>
22
<package format="2">
33
<name>turtlebot3_automatic_parking</name>
4-
<version>0.2.0</version>
4+
<version>1.0.0</version>
55
<description>
66
Package for turtlebot3 automatic_parking. You need a reflective tape and real robots. You can see parking spot using this pacakge on rviz.
77
</description>
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
## ! DO NOT MANUALLY INVOKE THIS setup.py, USE CATKIN INSTEAD
2+
## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
3+
4+
from distutils.core import setup
5+
from catkin_pkg.python_setup import generate_distutils_setup
6+
7+
# fetch values from package.xml
8+
setup_args = generate_distutils_setup(
9+
packages=['turtlebot3_automatic_parking'],
10+
package_dir={'': 'src'}
11+
)
12+
13+
setup(**setup_args)

turtlebot3_automatic_parking/src/turtlebot3_automatic_parking/__init__.py

Whitespace-only changes.

0 commit comments

Comments
 (0)