Skip to content

Commit

Permalink
Sync public repo (autowarefoundation#185)
Browse files Browse the repository at this point in the history
* add tier4 usbcam (autowarefoundation#104)

* add tier4 usbcam

* change version

* tier4/ros2

* Ros2 vehicle info param server (autowarefoundation#96)

* add vehicle info param server

* delete vehicle param file

Co-authored-by: taikitanaka <ttatcoder@outlook.jp>

* Ros2 fix topic name part2 (autowarefoundation#89)

* Fix topic name for traffic_light_classifier

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* Fix topic name for traffic_light_visualization

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

* Fix topic name for traffic_light_ssd_fine_detector

Signed-off-by: Takagi, Isamu <isamu.takagi@tier4.jp>

Co-authored-by: taikitanaka3 <65527974+taikitanaka3@users.noreply.github.com>
Co-authored-by: tkimura4 <tomoya.kimura@tier4.jp>
Co-authored-by: taikitanaka <ttatcoder@outlook.jp>
Co-authored-by: Takagi, Isamu <43976882+isamu-takagi@users.noreply.github.com>
  • Loading branch information
5 people committed Dec 10, 2021
1 parent cdf04b9 commit ea1a105
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions launch/control_launch/launch/control.launch.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
<?xml version="1.0"?>

<launch>
<arg name="vehicle_param_file" />

<!-- common parameters -->
<arg name="lateral_controller_mode" default="mpc_follower" description="options: mpc_follower, pure_pursuit"/>
Expand All @@ -24,21 +23,18 @@
<group if="$(eval &quot;'$(var lateral_controller_mode)'=='mpc_follower'&quot;)">
<include file="$(find-pkg-share mpc_follower)/launch/mpc_follower.launch.xml">
<arg name="mpc_follower_param_path" value="$(var mpc_follower_param_path)" />
<arg name="vehicle_param_file" value="$(var vehicle_param_file)" />
</include>
</group>

<group if="$(eval &quot;'$(var lateral_controller_mode)'=='pure_pursuit'&quot;)">
<include file="$(find-pkg-share pure_pursuit)/launch/pure_pursuit.launch.xml">
<arg name="pure_pursuit_param_path" value="$(var pure_pursuit_param_path)" />
<arg name="vehicle_param_file" value="$(var vehicle_param_file)" />
</include>
</group>

<!-- longitudinal controller -->
<include file="$(find-pkg-share velocity_controller)/launch/velocity_controller.launch.xml">
<arg name="velocity_controller_param_path" value="$(var velocity_controller_param_path)"/>
<arg name="vehicle_param_file" value="$(var vehicle_param_file)" />
</include>

<!-- latlon coupler -->
Expand All @@ -51,7 +47,6 @@

<!-- lane departure checker -->
<include file="$(find-pkg-share lane_departure_checker)/launch/lane_departure_checker.launch.xml">
<arg name="vehicle_param_file" value="$(var vehicle_param_file)" />
</include>
</group>

Expand All @@ -61,7 +56,6 @@

<!-- vehicle cmd gate -->
<include file="$(find-pkg-share vehicle_cmd_gate)/launch/vehicle_cmd_gate.launch.xml">
<arg name="vehicle_param_file" value="$(var vehicle_param_file)" />
<arg name="config_file" value="$(var vehicle_cmd_gate_param_path)"/>
<arg name="use_emergency_handling" value="false"/>
<arg name="use_external_emergency_stop" value="true"/>
Expand Down

0 comments on commit ea1a105

Please sign in to comment.