Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merges in recent changes from "Node cleanup" branch #18

Open
wants to merge 7 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
MIT License
===========
Binary file removed circle_screenshot.png
Binary file not shown.
35 changes: 0 additions & 35 deletions image_converter.py

This file was deleted.

2 changes: 1 addition & 1 deletion launch/car_simulation.launch
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@


<!-- Controller node -->
<node name="controller" pkg="carla_circle" type="controller.py" output="screen">
<node name="controller" pkg="carla_circle" type="ackermann_controller.py" output="screen">
<param name="rolename" value="$(arg rolename)" />
<param name="time_step" value="$(arg time_step)" />
<param name="ctrl_freq" value="100" />
Expand Down
44 changes: 0 additions & 44 deletions launch/event5_stage_one.launch

This file was deleted.

55 changes: 0 additions & 55 deletions launch/event5_stage_two.launch

This file was deleted.

14 changes: 0 additions & 14 deletions launch/main_control.launch

This file was deleted.

9 changes: 0 additions & 9 deletions launch/main_control_one.launch

This file was deleted.

35 changes: 0 additions & 35 deletions launch/main_game.launch

This file was deleted.

36 changes: 0 additions & 36 deletions launch/main_sim.launch

This file was deleted.

21 changes: 0 additions & 21 deletions launch/main_simulation.launch

This file was deleted.

3 changes: 2 additions & 1 deletion launch/mcity_event1.launch
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
<include file="$(find carla_ros_bridge)/launch/carla_ros_bridge.launch">
<arg name="host" value="$(arg host)" />
<arg name="port" value="$(arg port)" />
<arg name="fixed_delta_seconds" value="false" />
<arg name="fixed_delta_seconds" value="0.02" />
<arg name="synchronous_mode" value="true" />
</include>

<include file="$(find carla_circle)/launch/car_simulation.launch">
Expand Down
11 changes: 0 additions & 11 deletions launch/msl_ego_vehicle.launch

This file was deleted.

Loading