ros_automobile now copied from webots install

Autonomous-Vehicles · Sep 2, 2020 · b466c7bc6a4e675dc299111cc4491d38a73ae68a · b466c7b
1 parent d830835
commit b466c7bc6a4e675dc299111cc4491d38a73ae68a
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 1,069 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,8 @@
+__pycache__/
+
+CMakeCache.txt
+CMakeLists.txt
+Makefile
+
+controllers/ros_automobile
+
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -14,6 +14,7 @@ find_package(catkin REQUIRED COMPONENTS
   std_msgs
   nav_msgs
   tf
+  webots_ros
 )
 
 ## System dependencies are found with CMake's conventions
@@ -107,9 +108,9 @@ find_package(catkin REQUIRED COMPONENTS
 ## DEPENDS: system dependencies of this project that dependent projects also need
 catkin_package(
 #  INCLUDE_DIRS include
-#  LIBRARIES beginner_tutorials
-#  CATKIN_DEPENDS roscpp rospy std_msgs
-#  DEPENDS system_lib
+  LIBRARIES ${PROJECT_NAME}
+  CATKIN_DEPENDS roscpp rospy std_msgs 
+  DEPENDS
 )
 
 ###########
@@ -141,9 +142,6 @@ include_directories(
 add_executable( twist_to_service src/twist_to_service.cpp )
 target_link_libraries( twist_to_service ${catkin_LIBRARIES} )
 
-#add_executable( encoder_to_odom src/encoder_to_odom.cpp )
-#target_link_libraries( encoder_to_odom ${catkin_LIBRARIES} )
-
 add_executable( supervisor_to_odom src/supervisor_to_odom.cpp )
 target_link_libraries( supervisor_to_odom ${catkin_LIBRARIES} )
 
@@ -204,6 +202,9 @@ target_link_libraries( supervisor_to_odom ${catkin_LIBRARIES} )
 #   DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
 # )
 
+## copy ros_automobile controller
+file( COPY $ENV{WEBOTS_HOME}/projects/vehicles/controllers/ros_automobile DESTINATION ${PROJECT_SOURCE_DIR}/controllers)
+
 #############
 ## Testing ##
 #############

diff --git a/controllers/ros_automobile/RosAutomobile.cpp b/controllers/ros_automobile/RosAutomobile.cpp
diff --git a/controllers/ros_automobile/RosAutomobile.hpp b/controllers/ros_automobile/RosAutomobile.hpp
diff --git a/controllers/ros_automobile/include/srv/automobile_get_dimensions.srv b/controllers/ros_automobile/include/srv/automobile_get_dimensions.srv
diff --git a/controllers/ros_automobile/include/webots_ros/automobile_get_dimensions.h b/controllers/ros_automobile/include/webots_ros/automobile_get_dimensions.h