Skip to content

Commit cc76ed9

Browse files
SS47816SS47816
committed
feat: moved goal_publisher_node to me5413_world
1 parent d450db8 commit cc76ed9

File tree

6 files changed

+19
-197
lines changed

6 files changed

+19
-197
lines changed

‎src/interactive_tools/CMakeLists.txt‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,6 @@ find_package(catkin REQUIRED COMPONENTS
1515
rviz
1616
pluginlib
1717
std_msgs
18-
nav_msgs
19-
geometry_msgs
20-
tf2
21-
tf2_ros
22-
tf2_eigen
23-
tf2_geometry_msgs
2418
)
2519

2620
catkin_package(
@@ -94,8 +88,3 @@ target_link_libraries(simple_panel
9488
${catkin_LIBRARIES}
9589
${QT_LIBRARIES}
9690
)
97-
98-
# Add Nodes
99-
add_executable(goal_publisher_node src/goal_publisher_node.cpp)
100-
target_link_libraries(goal_publisher_node ${catkin_LIBRARIES})
101-
add_dependencies(goal_publisher_node ${catkin_EXPORTED_TARGETS} ${${PROJECT_NAME}_EXPORTED_TARGETS})

‎src/me5413_world/CMakeLists.txt‎

Lines changed: 15 additions & 185 deletions
Original file line numberDiff line numberDiff line change
@@ -2,208 +2,38 @@ cmake_minimum_required(VERSION 3.0.2)
22
project(me5413_world)
33

44
## Compile as C++11, supported in ROS Kinetic and newer
5-
# add_compile_options(-std=c++11)
5+
add_compile_options(-std=c++11)
66

77
## Find catkin macros and libraries
88
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
99
## is used, also find other catkin packages
1010
find_package(catkin REQUIRED COMPONENTS
11-
geometry_msgs
12-
nav_msgs
1311
roscpp
1412
rospy
1513
std_msgs
14+
nav_msgs
15+
geometry_msgs
1616
visualization_msgs
17+
tf2
18+
tf2_ros
19+
tf2_eigen
20+
tf2_geometry_msgs
1721
)
1822

19-
## System dependencies are found with CMake's conventions
20-
# find_package(Boost REQUIRED COMPONENTS system)
21-
22-
23-
## Uncomment this if the package has a setup.py. This macro ensures
24-
## modules and global scripts declared therein get installed
25-
## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
26-
# catkin_python_setup()
27-
28-
################################################
29-
## Declare ROS messages, services and actions ##
30-
################################################
31-
32-
## To declare and build messages, services or actions from within this
33-
## package, follow these steps:
34-
## * Let MSG_DEP_SET be the set of packages whose message types you use in
35-
## your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...).
36-
## * In the file package.xml:
37-
## * add a build_depend tag for "message_generation"
38-
## * add a build_depend and a exec_depend tag for each package in MSG_DEP_SET
39-
## * If MSG_DEP_SET isn't empty the following dependency has been pulled in
40-
## but can be declared for certainty nonetheless:
41-
## * add a exec_depend tag for "message_runtime"
42-
## * In this file (CMakeLists.txt):
43-
## * add "message_generation" and every package in MSG_DEP_SET to
44-
## find_package(catkin REQUIRED COMPONENTS ...)
45-
## * add "message_runtime" and every package in MSG_DEP_SET to
46-
## catkin_package(CATKIN_DEPENDS ...)
47-
## * uncomment the add_*_files sections below as needed
48-
## and list every .msg/.srv/.action file to be processed
49-
## * uncomment the generate_messages entry below
50-
## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...)
51-
52-
## Generate messages in the 'msg' folder
53-
# add_message_files(
54-
# FILES
55-
# Message1.msg
56-
# Message2.msg
57-
# )
58-
59-
## Generate services in the 'srv' folder
60-
# add_service_files(
61-
# FILES
62-
# Service1.srv
63-
# Service2.srv
64-
# )
65-
66-
## Generate actions in the 'action' folder
67-
# add_action_files(
68-
# FILES
69-
# Action1.action
70-
# Action2.action
71-
# )
72-
73-
## Generate added messages and services with any dependencies listed here
74-
# generate_messages(
75-
# DEPENDENCIES
76-
# geometry_msgs# nav_msgs# std_msgs# visualization_msgs
77-
# )
78-
79-
################################################
80-
## Declare ROS dynamic reconfigure parameters ##
81-
################################################
82-
83-
## To declare and build dynamic reconfigure parameters within this
84-
## package, follow these steps:
85-
## * In the file package.xml:
86-
## * add a build_depend and a exec_depend tag for "dynamic_reconfigure"
87-
## * In this file (CMakeLists.txt):
88-
## * add "dynamic_reconfigure" to
89-
## find_package(catkin REQUIRED COMPONENTS ...)
90-
## * uncomment the "generate_dynamic_reconfigure_options" section below
91-
## and list every .cfg file to be processed
92-
93-
## Generate dynamic reconfigure parameters in the 'cfg' folder
94-
# generate_dynamic_reconfigure_options(
95-
# cfg/DynReconf1.cfg
96-
# cfg/DynReconf2.cfg
97-
# )
98-
99-
###################################
100-
## catkin specific configuration ##
101-
###################################
102-
## The catkin_package macro generates cmake config files for your package
103-
## Declare things to be passed to dependent projects
104-
## INCLUDE_DIRS: uncomment this if your package contains header files
105-
## LIBRARIES: libraries you create in this project that dependent projects also need
106-
## CATKIN_DEPENDS: catkin_packages dependent projects also need
107-
## DEPENDS: system dependencies of this project that dependent projects also need
10823
catkin_package(
109-
# INCLUDE_DIRS include
110-
# LIBRARIES me5413_world
111-
# CATKIN_DEPENDS geometry_msgs nav_msgs roscpp rospy std_msgs visualization_msgs
112-
# DEPENDS system_lib
24+
INCLUDE_DIRS include
25+
# LIBRARIES me5413_world
26+
# CATKIN_DEPENDS geometry_msgs nav_msgs roscpp rospy std_msgs visualization_msgs
27+
# DEPENDS system_lib
11328
)
11429

115-
###########
116-
## Build ##
117-
###########
118-
119-
## Specify additional locations of header files
120-
## Your package locations should be listed before other locations
12130
include_directories(
12231
# include
12332
${catkin_INCLUDE_DIRS}
12433
)
12534

126-
## Declare a C++ library
127-
# add_library(${PROJECT_NAME}
128-
# src/${PROJECT_NAME}/me5413_world.cpp
129-
# )
130-
131-
## Add cmake target dependencies of the library
132-
## as an example, code may need to be generated before libraries
133-
## either from message generation or dynamic reconfigure
134-
# add_dependencies(${PROJECT_NAME} ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
135-
136-
## Declare a C++ executable
137-
## With catkin_make all packages are built within a single CMake context
138-
## The recommended prefix ensures that target names across packages don't collide
139-
# add_executable(${PROJECT_NAME}_node src/me5413_world_node.cpp)
140-
141-
## Rename C++ executable without prefix
142-
## The above recommended prefix causes long target names, the following renames the
143-
## target back to the shorter version for ease of user use
144-
## e.g. "rosrun someones_pkg node" instead of "rosrun someones_pkg someones_pkg_node"
145-
# set_target_properties(${PROJECT_NAME}_node PROPERTIES OUTPUT_NAME node PREFIX "")
146-
147-
## Add cmake target dependencies of the executable
148-
## same as for the library above
149-
# add_dependencies(${PROJECT_NAME}_node ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
150-
151-
## Specify libraries to link a library or executable target against
152-
# target_link_libraries(${PROJECT_NAME}_node
153-
# ${catkin_LIBRARIES}
154-
# )
155-
156-
#############
157-
## Install ##
158-
#############
159-
160-
# all install targets should use catkin DESTINATION variables
161-
# See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html
162-
163-
## Mark executable scripts (Python etc.) for installation
164-
## in contrast to setup.py, you can choose the destination
165-
# catkin_install_python(PROGRAMS
166-
# scripts/my_python_script
167-
# DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
168-
# )
169-
170-
## Mark executables for installation
171-
## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_executables.html
172-
# install(TARGETS ${PROJECT_NAME}_node
173-
# RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
174-
# )
175-
176-
## Mark libraries for installation
177-
## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_libraries.html
178-
# install(TARGETS ${PROJECT_NAME}
179-
# ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
180-
# LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
181-
# RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
182-
# )
183-
184-
## Mark cpp header files for installation
185-
# install(DIRECTORY include/${PROJECT_NAME}/
186-
# DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
187-
# FILES_MATCHING PATTERN "*.h"
188-
# PATTERN ".svn" EXCLUDE
189-
# )
190-
191-
## Mark other files for installation (e.g. launch and bag files, etc.)
192-
# install(FILES
193-
# # myfile1
194-
# # myfile2
195-
# DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
196-
# )
197-
198-
#############
199-
## Testing ##
200-
#############
201-
202-
## Add gtest based cpp test target and link libraries
203-
# catkin_add_gtest(${PROJECT_NAME}-test test/test_me5413_world.cpp)
204-
# if(TARGET ${PROJECT_NAME}-test)
205-
# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
206-
# endif()
35+
# Add Nodes
36+
add_executable(goal_publisher_node src/goal_publisher_node.cpp)
37+
target_link_libraries(goal_publisher_node ${catkin_LIBRARIES})
38+
add_dependencies(goal_publisher_node ${catkin_EXPORTED_TARGETS} ${${PROJECT_NAME}_EXPORTED_TARGETS})
20739

208-
## Add folders to be run by python nosetests
209-
# catkin_add_nosetests(test)

‎src/interactive_tools/config/config.yaml‎ renamed to ‎src/me5413_world/config/config.yaml‎

File renamed without changes.

‎src/me5413_world/launch/navigation.launch‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,6 @@
1616
<!-- Launch Rviz with our settings -->
1717
<node type="rviz" name="rviz" pkg="rviz" args="-d $(find me5413_world)/rviz/navigation.rviz" output="log" respawn="true"/>
1818

19-
<node ns="interactive_tools" pkg="interactive_tools" type="goal_publisher_node" name="goal_publisher_node" output="screen" />
19+
<node ns="me5413_world" pkg="me5413_world" type="goal_publisher_node" name="goal_publisher_node" output="screen" />
2020

2121
</launch>

‎src/me5413_world/launch/world.launch‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,4 +15,7 @@
1515
<!-- Add our jackal robot into the simulation -->
1616
<include file="$(find me5413_world)/launch/include/spawn_jackal.launch"/>
1717

18+
<!-- Load the destination configuration -->
19+
<rosparam command="load" file="$(find me5413_world)/config/config.yaml" />
20+
1821
</launch>

‎src/interactive_tools/src/goal_publisher_node.cpp‎ renamed to ‎src/me5413_world/src/goal_publisher_node.cpp‎

File renamed without changes.

0 commit comments

Comments
 (0)