From b8109122ed65dc798d9271aebdc67cbd729d353e Mon Sep 17 00:00:00 2001
From: "Y.Hisaki" <yhisaki31@gmail.com>
Date: Wed, 29 Jan 2025 17:57:34 +0900
Subject: [PATCH 1/3] add v2i to behavior_velocity_traffic_light

Signed-off-by: Y.Hisaki <yhisaki31@gmail.com>
---
 .../behavior_velocity_planner/traffic_light.param.yaml |  6 ++++++
 autoware_launch/launch/autoware.launch.xml             | 10 ++++++++++
 autoware_launch/launch/logging_simulator.launch.xml    |  2 ++
 autoware_launch/launch/planning_simulator.launch.xml   |  2 ++
 4 files changed, 20 insertions(+)

diff --git a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/traffic_light.param.yaml b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/traffic_light.param.yaml
index 23746a61b6..191af77522 100644
--- a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/traffic_light.param.yaml
+++ b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/traffic_light.param.yaml
@@ -7,3 +7,9 @@
       yellow_lamp_period: 2.75
       enable_pass_judge: true
       enable_rtc: false # If set to true, the scene modules require approval from the rtc (request to cooperate) function. If set to false, the modules can be executed without requiring rtc approval
+
+      v2i:
+        use_rest_time: true
+        last_time_allowed_to_pass: 2.0 # relative time against at the time of turn to red
+        velocity_threshold: 0.5 # change the decision logic whether the current velocity is faster or not
+        required_time_to_departure: 3.0 # prevent low speed pass
diff --git a/autoware_launch/launch/autoware.launch.xml b/autoware_launch/launch/autoware.launch.xml
index b29819a1aa..c22202e452 100644
--- a/autoware_launch/launch/autoware.launch.xml
+++ b/autoware_launch/launch/autoware.launch.xml
@@ -23,6 +23,7 @@
   <arg name="launch_planning" default="true" description="launch planning"/>
   <arg name="launch_control" default="true" description="launch control"/>
   <arg name="launch_api" default="true" description="launch api"/>
+  <arg name="launch_v2x" default="false" description="launch V2X"/>
   <!-- Global parameters -->
   <arg name="use_sim_time" default="false" description="use_sim_time"/>
   <!-- Vehicle -->
@@ -124,6 +125,15 @@
     <include file="$(find-pkg-share autoware_launch)/launch/components/tier4_autoware_api_component.launch.xml"/>
   </group>
 
+  <!-- V2X -->
+  <group if="$(var launch_v2x)">
+    <include file="$(find-pkg-share jpn_signal_launcher)/launch/jpn_signal.launch.xml">
+      <arg name="map_path" value="$(var map_path)"/>
+      <arg name="vehicle_model" value="$(var vehicle_model)"/>
+      <arg name="vehicle_id" value="1"/>
+    </include>
+  </group>
+
   <!-- Tools -->
   <group>
     <node
diff --git a/autoware_launch/launch/logging_simulator.launch.xml b/autoware_launch/launch/logging_simulator.launch.xml
index ad11e90bdf..087f8a2a5c 100644
--- a/autoware_launch/launch/logging_simulator.launch.xml
+++ b/autoware_launch/launch/logging_simulator.launch.xml
@@ -71,6 +71,8 @@
       <arg name="pointcloud_map_file" value="$(var pointcloud_map_file)"/>
       <!-- Sensing -->
       <arg name="launch_sensing_driver" value="false"/>
+      <!-- V2X -->
+      <arg name="launch_v2x" value="false"/>
     </include>
   </group>
 </launch>
diff --git a/autoware_launch/launch/planning_simulator.launch.xml b/autoware_launch/launch/planning_simulator.launch.xml
index 3e0ed8d20c..c7343c0d7a 100644
--- a/autoware_launch/launch/planning_simulator.launch.xml
+++ b/autoware_launch/launch/planning_simulator.launch.xml
@@ -78,6 +78,8 @@
       <arg name="rviz" value="$(var rviz)"/>
       <arg name="rviz_config" value="$(var rviz_config)"/>
       <arg name="rviz_respawn" value="$(var rviz_respawn)"/>
+      <!-- V2X -->
+      <arg name="launch_v2x" value="false"/>
       <!-- Auto mode setting-->
       <arg name="enable_all_modules_auto_mode" value="$(var enable_all_modules_auto_mode)"/>
       <arg name="is_simulation" value="true"/>

From e34f7664e3f8dd215b3a2bd2dee72184781a9489 Mon Sep 17 00:00:00 2001
From: "Y.Hisaki" <yhisaki31@gmail.com>
Date: Wed, 29 Jan 2025 17:57:34 +0900
Subject: [PATCH 2/3] launch_v2x as argument

Signed-off-by: Y.Hisaki <yhisaki31@gmail.com>
---
 autoware_launch/launch/logging_simulator.launch.xml  | 2 ++
 autoware_launch/launch/planning_simulator.launch.xml | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/autoware_launch/launch/logging_simulator.launch.xml b/autoware_launch/launch/logging_simulator.launch.xml
index 087f8a2a5c..065b69baf0 100644
--- a/autoware_launch/launch/logging_simulator.launch.xml
+++ b/autoware_launch/launch/logging_simulator.launch.xml
@@ -33,6 +33,8 @@
   <arg name="launch_dummy_diag_publisher" default="false" description="launch dummy diag publisher"/>
   <!-- Tools -->
   <arg name="rviz" default="true" description="launch rviz"/>
+  <!-- V2X-->
+  <arg name="launch_v2x" default="false" description="launch v2x modules"/>
   <!-- Scenario simulation -->
   <arg name="scenario_simulation" default="false" description="use scenario simulation"/>
 
diff --git a/autoware_launch/launch/planning_simulator.launch.xml b/autoware_launch/launch/planning_simulator.launch.xml
index c7343c0d7a..5d83346264 100644
--- a/autoware_launch/launch/planning_simulator.launch.xml
+++ b/autoware_launch/launch/planning_simulator.launch.xml
@@ -33,6 +33,8 @@
   <arg name="rviz_config" default="$(find-pkg-share autoware_launch)/rviz/$(var rviz_config_name)" description="rviz config path"/>
   <let name="rviz_respawn" value="false" if="$(var scenario_simulation)"/>
   <let name="rviz_respawn" value="true" unless="$(var scenario_simulation)"/>
+  <!-- V2X-->
+  <arg name="launch_v2x" default="false" description="launch v2x modules"/>
   <!-- Vcu emulation -->
   <arg name="vehicle_simulation" default="true" description="use vehicle simulation"/>
   <!-- Auto mode setting-->
@@ -79,7 +81,7 @@
       <arg name="rviz_config" value="$(var rviz_config)"/>
       <arg name="rviz_respawn" value="$(var rviz_respawn)"/>
       <!-- V2X -->
-      <arg name="launch_v2x" value="false"/>
+      <arg name="launch_v2x" value="$(var launch_v2x)"/>
       <!-- Auto mode setting-->
       <arg name="enable_all_modules_auto_mode" value="$(var enable_all_modules_auto_mode)"/>
       <arg name="is_simulation" value="true"/>

From 2d20eab2cde047c8f45675a4866df8ed40019985 Mon Sep 17 00:00:00 2001
From: "Y.Hisaki" <yhisaki31@gmail.com>
Date: Wed, 29 Jan 2025 17:57:34 +0900
Subject: [PATCH 3/3] change default parameter

Signed-off-by: Y.Hisaki <yhisaki31@gmail.com>
---
 .../behavior_velocity_planner/traffic_light.param.yaml          | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/traffic_light.param.yaml b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/traffic_light.param.yaml
index 191af77522..6aac965227 100644
--- a/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/traffic_light.param.yaml
+++ b/autoware_launch/config/planning/scenario_planning/lane_driving/behavior_planning/behavior_velocity_planner/traffic_light.param.yaml
@@ -9,7 +9,7 @@
       enable_rtc: false # If set to true, the scene modules require approval from the rtc (request to cooperate) function. If set to false, the modules can be executed without requiring rtc approval
 
       v2i:
-        use_rest_time: true
+        use_rest_time: false
         last_time_allowed_to_pass: 2.0 # relative time against at the time of turn to red
         velocity_threshold: 0.5 # change the decision logic whether the current velocity is faster or not
         required_time_to_departure: 3.0 # prevent low speed pass