Skip to content

Commit 85ac33c

Browse files
author
Fabian Oboril
authored
Merge pull request #9 from carla-simulator/feature/ackermann_drive
Feature/ackermann drive
2 parents 4d125d5 + 8b74f0e commit 85ac33c

18 files changed

Lines changed: 2136 additions & 45 deletions

CMakeLists.txt

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,22 +6,31 @@ find_package(catkin REQUIRED COMPONENTS
66
rospy
77
sensor_msgs
88
tf
9+
dynamic_reconfigure
910
)
1011

1112
catkin_python_setup()
1213

1314
add_message_files(
1415
FILES
1516
CarlaVehicleControl.msg
17+
EgoVehicleControlCurrent.msg
18+
EgoVehicleControlInfo.msg
19+
EgoVehicleControlMaxima.msg
20+
EgoVehicleControlState.msg
21+
EgoVehicleControlTarget.msg
1622
)
1723

1824
generate_messages(
1925
DEPENDENCIES
20-
sensor_msgs
26+
std_msgs
2127
)
2228

23-
catkin_package()
29+
generate_dynamic_reconfigure_options(
30+
config/EgoVehicleControlParameter.cfg
31+
)
2432

33+
catkin_package()
2534

2635

2736
include_directories(

client_with_rqt.launch

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<launch>
2+
<include file="$(find carla_ros_bridge)/client.launch" pass_all_args="True"/>
3+
<node pkg="rqt_gui" type="rqt_gui" name="rqt_gui" args="--perspective-file $(find carla_ros_bridge)/config/EgoVehicleControlInfo.perspective"/>
4+
</launch>

0 commit comments

Comments
 (0)