diff --git a/CMakeLists.txt b/CMakeLists.txt index 1fa0ddb..986ff95 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ cmake_minimum_required(VERSION 2.8.3) -project(rosbridge_GUI_example) +project(rosbridge_gui_example) ## Find catkin macros and libraries ## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz) @@ -82,7 +82,7 @@ find_package(catkin REQUIRED COMPONENTS ## DEPENDS: system dependencies of this project that dependent projects also need catkin_package( # INCLUDE_DIRS include -# LIBRARIES rosbridge_GUI_example +# LIBRARIES rosbridge_gui_example # CATKIN_DEPENDS roscpp rospy std_msgs # DEPENDS system_lib ) @@ -99,8 +99,8 @@ include_directories( ) ## Declare a cpp library -# add_library(rosbridge_GUI_example -# src/${PROJECT_NAME}/rosbridge_GUI_example.cpp +# add_library(rosbridge_gui_example +# src/${PROJECT_NAME}/rosbridge_gui_example.cpp # ) ## Declare a cpp executable @@ -108,7 +108,7 @@ include_directories( ## Add cmake target dependencies of the executable/library ## as an example, message headers may need to be generated before nodes -# add_dependencies(rosbridge_GUI_example_node rosbridge_GUI_example_generate_messages_cpp) +# add_dependencies(rosbridge_gui_example_node rosbridge_gui_example_generate_messages_cpp) ## Specify libraries to link a library or executable target against @@ -127,7 +127,7 @@ include_directories( # ) ## Mark executables and/or libraries for installation -# install(TARGETS rosbridge_GUI_example rosbridge_GUI_example_node +# install(TARGETS rosbridge_gui_example rosbridge_gui_example_node # ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} # LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION} # RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION} @@ -152,7 +152,7 @@ include_directories( ############# ## Add gtest based cpp test target and link libraries -# catkin_add_gtest(${PROJECT_NAME}-test test/test_rosbridge_GUI_example.cpp) +# catkin_add_gtest(${PROJECT_NAME}-test test/test_rosbridge_gui_example.cpp) # if(TARGET ${PROJECT_NAME}-test) # target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME}) # endif() diff --git a/launch/all.launch b/launch/all.launch index 2424b89..b995f9e 100644 --- a/launch/all.launch +++ b/launch/all.launch @@ -1,5 +1,5 @@ - - + + \ No newline at end of file diff --git a/launch/bagger.launch b/launch/bagger.launch index c2207ba..371dd4a 100644 --- a/launch/bagger.launch +++ b/launch/bagger.launch @@ -1,3 +1,3 @@ - + diff --git a/launch/talker.launch b/launch/talker.launch index c39f905..d1c7241 100644 --- a/launch/talker.launch +++ b/launch/talker.launch @@ -1,3 +1,3 @@ - + diff --git a/package.xml b/package.xml index 1801835..2f1e587 100644 --- a/package.xml +++ b/package.xml @@ -1,8 +1,8 @@ - rosbridge_GUI_example + rosbridge_gui_example 0.0.0 - The rosbridge_GUI_example package + The rosbridge_gui_example package diff --git a/src/bagger.py b/src/bagger.py index 58acc4d..dfa4d44 100755 --- a/src/bagger.py +++ b/src/bagger.py @@ -14,7 +14,7 @@ class Bagger(object): self.pub = rospy.Publisher("bag_notifier", String, queue_size=10) self.proc = None rospack = rospkg.RosPack() - self.data_path = os.path.join(rospack.get_path("rosbridge_GUI_example"), "data") + self.data_path = os.path.join(rospack.get_path("rosbridge_gui_example"), "data") def callback(self, msg): if msg.data == "STOP" and self.proc is not None: