importing single_lwr_example packages, moving lwr_launch -> single_lw…

…r_launch, deleting lwr_moveit it will become single_lwr_moveit, cleaning some license headers, package.xml, CMakeLists.txt, etc

kuka_lwr/package.xml

@@ -1,6 +1,6 @@
 <package>
   <name>kuka_lwr</name>
-  <version>0.0.0</version>
+  <version>0.1.0</version>
   <description>
     ROS meta-package containing kuka lwr packages.
   </description>
@@ -11,24 +11,16 @@
   <buildtool_depend>catkin</buildtool_depend>
 
   <!-- PACKAGES -->
+
   <!-- Model -->
   <run_depend> lwr_description </run_depend>
 
   <!-- ROSControl-based controllers -->
   <run_depend> lwr_controllers </run_depend>
 
-  <!-- Real hardware interface -->
+  <!--  Hardware interfaces real/sim -->
   <run_depend> lwr_hw </run_depend>
 
-  <!-- Simulated hardware interface -->
-  <run_depend> lwr_hw_sim </run_depend>
-
-  <!-- Launch files -->
-  <run_depend> lwr_launch </run_depend>
-
-  <!-- The kinematics (ToDo) -->
-  <!-- run_depend> lwr_kinematics </run_depend -->
-
   <export>
     <metapackage/>
   </export>

lwr_controllers/CMakeLists.txt

@@ -1,7 +1,6 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(lwr_controllers)
 
-# Load catkin and all dependencies required for this package
 find_package(orocos_kdl REQUIRED)
 find_package(catkin REQUIRED COMPONENTS
   controller_interface
@@ -38,8 +37,6 @@ generate_messages(
   geometry_msgs
 )
 
-
-# Declare catkin package
 catkin_package(
   DEPENDS orocos_kdl
   CATKIN_DEPENDS
@@ -73,7 +70,7 @@ add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_gencpp)
 
 target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} kdl_parser ${orocos_kdl_LIBRARIES})
 
-# Install
+
 install(DIRECTORY include/${PROJECT_NAME}/
   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})
 

lwr_controllers/package.xml

@@ -1,12 +1,12 @@
 <package>
   <name>lwr_controllers</name>
-  <version>0.8.0</version>
+  <version>0.1.0</version>
   <description>lwr_controllers</description>
-  <maintainer email="[email protected]">MAnuel Bonilla</maintainer>
+  <maintainer email="[email protected]">Manuel Bonilla</maintainer>
 
   <license>BSD</license>
 
-    <author>Manuel Bonilla</author>
+  <author>Manuel Bonilla</author>
 
   <buildtool_depend>catkin</buildtool_depend>
 
@@ -37,7 +37,6 @@
   <run_depend>kdl_parser</run_depend>
   <run_depend>message_runtime</run_depend>
 
-
   <export>
     <controller_interface plugin="${prefix}/lwr_controllers_plugins.xml"/>
   </export>

lwr_description/CMakeLists.txt

@@ -1,129 +1,6 @@
 cmake_minimum_required(VERSION 2.8.3)
 project(lwr_description)
 
-## Find catkin macros and libraries
-## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
-## is used, also find other catkin packages
 find_package(catkin REQUIRED)
 
-## System dependencies are found with CMake's conventions
-# find_package(Boost REQUIRED COMPONENTS system)
-
-
-## Uncomment this if the package has a setup.py. This macro ensures
-## modules and global scripts declared therein get installed
-## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
-# catkin_python_setup()
-
-#######################################
-## Declare ROS messages and services ##
-#######################################
-
-## Generate messages in the 'msg' folder
-# add_message_files(
-#   FILES
-#   Message1.msg
-#   Message2.msg
-# )
-
-## Generate services in the 'srv' folder
-# add_service_files(
-#   FILES
-#   Service1.srv
-#   Service2.srv
-# )
-
-## Generate added messages and services with any dependencies listed here
-# generate_messages(
-#   DEPENDENCIES
-#   std_msgs  # Or other packages containing msgs
-# )
-
-###################################
-## catkin specific configuration ##
-###################################
-## The catkin_package macro generates cmake config files for your package
-## Declare things to be passed to dependent projects
-## INCLUDE_DIRS: uncomment this if you package contains header files
-## LIBRARIES: libraries you create in this project that dependent projects also need
-## CATKIN_DEPENDS: catkin_packages dependent projects also need
-## DEPENDS: system dependencies of this project that dependent projects also need
-catkin_package(
-  #INCLUDE_DIRS 
-  #LIBRARIES #lwr_test
-  #CATKIN_DEPENDS #other_catkin_pkg
-  #DEPENDS #system_lib
-)
-
-###########
-## Build ##
-###########
-
-## Specify additional locations of header files
-## Your package locations should be listed before other locations
-# include_directories(include)
-
-## Declare a cpp library
-# add_library(lwr_test
-#   src/${PROJECT_NAME}/lwr_test.cpp
-# )
-
-## Declare a cpp executable
-# add_executable(lwr_test_node src/lwr_test_node.cpp)
-
-## Add cmake target dependencies of the executable/library
-## as an example, message headers may need to be generated before nodes
-# add_dependencies(lwr_test_node lwr_test_generate_messages_cpp)
-
-## Specify libraries to link a library or executable target against
-# target_link_libraries(lwr_test_node
-#   ${catkin_LIBRARIES}
-# )
-
-#############
-## Install ##
-#############
-
-# all install targets should use catkin DESTINATION variables
-# See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html
-
-## Mark executable scripts (Python etc.) for installation
-## in contrast to setup.py, you can choose the destination
-# install(PROGRAMS
-#   scripts/my_python_script
-#   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
-# )
-
-## Mark executables and/or libraries for installation
-# install(TARGETS lwr_test lwr_test_node
-#   ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-#   LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-#   RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
-# )
-
-## Mark cpp header files for installation
-# install(DIRECTORY include/${PROJECT_NAME}/
-#   DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
-#   FILES_MATCHING PATTERN "*.h"
-#   PATTERN ".svn" EXCLUDE
-# )
-
-## Mark other files for installation (e.g. launch and bag files, etc.)
-# install(FILES
-#   # myfile1
-#   # myfile2
-#   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
-# )
-
-#############
-## Testing ##
-#############
-
-## Add gtest based cpp test target and link libraries
-# catkin_add_gtest(${PROJECT_NAME}-test test/test_lwr_test.cpp)
-# if(TARGET ${PROJECT_NAME}-test)
-#   target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
-# endif()
-
-## Add folders to be run by python nosetests
-# catkin_add_nosetests(test)
+catkin_package()