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 13, 2021
1 parent abca49f commit dc574b3
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 3 deletions.
6 changes: 5 additions & 1 deletion launch/vehicle_launch/launch/vehicle.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,11 @@
<arg name="simulation" default="false" />
<arg name ="vehicle_id" default="$(env VEHICLE_ID default)" />

<!-- vehicle info -->
<include file="$(find-pkg-share vehicle_info_param_server)/launch/vehicle_info_param_server.launch.xml">
<arg name="config_file" value="$(var vehicle_param_file)"/>
</include>

<!-- vehicle description -->
<group>
<include file="$(find-pkg-share vehicle_launch)/launch/vehicle_description.launch.xml">
Expand All @@ -22,7 +27,6 @@
<arg name="initial_engage_state" value="$(var initial_engage_state)"/>
<arg name="simulation" value="$(var simulation)"/>
<arg name="vehicle_model" value="$(var vehicle_model)"/>
<arg name="vehicle_param_file" value="$(var vehicle_param_file)"/>
<arg name="vehicle_id" value="$(var vehicle_id)"/>
</include>
</launch>
2 changes: 0 additions & 2 deletions launch/vehicle_launch/launch/vehicle_interface.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
<launch>
<arg name="simulation"/>
<arg name="vehicle_model"/>
<arg name="vehicle_param_file" />
<arg name="vehicle_id"/>
<arg name="initial_engage_state" default="true"/>

Expand All @@ -14,7 +13,6 @@
<arg name="simulator_model" default="$(var vehicle_model_pkg)/config/simulator_model.param.yaml" />
<include file="$(find-pkg-share simple_planning_simulator)/launch/simple_planning_simulator.launch.xml">
<arg name="simulator_model" value="$(var simulator_model)"/>
<arg name="vehicle_param_file" value="$(var vehicle_param_file)"/>
<arg name="initial_engage_state" value="$(var initial_engage_state)"/>
</include>
</group>
Expand Down

0 comments on commit dc574b3

Please sign in to comment.