Merge pull request #9 from carla-simulator/feature/ackermann_drive

Feature/ackermann drive
carla-simulator · Dec 18, 2018 · 85ac33c · 85ac33c
2 parents 4d125d5 + 8b74f0e
commit 85ac33c
Show file tree

Hide file tree

Showing 18 changed files with 2,136 additions and 45 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -6,22 +6,31 @@ find_package(catkin REQUIRED COMPONENTS
   rospy
   sensor_msgs
   tf
+  dynamic_reconfigure
 )
 
 catkin_python_setup()
 
 add_message_files(
   FILES
   CarlaVehicleControl.msg
+  EgoVehicleControlCurrent.msg
+  EgoVehicleControlInfo.msg
+  EgoVehicleControlMaxima.msg
+  EgoVehicleControlState.msg
+  EgoVehicleControlTarget.msg
 )
 
 generate_messages(
   DEPENDENCIES
-  sensor_msgs
+  std_msgs
 )
 
-catkin_package()
+generate_dynamic_reconfigure_options(
+   config/EgoVehicleControlParameter.cfg
+)
 
+catkin_package()
 
 
 include_directories(

diff --git a/client_with_rqt.launch b/client_with_rqt.launch
@@ -0,0 +1,4 @@
+<launch>
+<include file="$(find carla_ros_bridge)/client.launch"  pass_all_args="True"/>
+<node pkg="rqt_gui" type="rqt_gui" name="rqt_gui" args="--perspective-file $(find carla_ros_bridge)/config/EgoVehicleControlInfo.perspective"/>
+</launch>