Merge remote-tracking branch 'origin/beta/v0.42.0.0' into feat/cherry…

…-picks-for-beta-v0.42.1.0
tier4 · Jun 20, 2023 · e9e9aae · e9e9aae
2 parents e9c6ab8 + a132ff3
commit e9e9aae
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/.../lane_driving/behavior_planning/behavior_path_planner/scene_module_manager_foa.param.yaml b/.../lane_driving/behavior_planning/behavior_path_planner/scene_module_manager_foa.param.yaml
@@ -4,14 +4,14 @@
 /**:
   ros__parameters:
     external_request_lane_change_left:
-      enable_module: true
+      enable_module: false
       enable_simultaneous_execution_as_approved_module: false
       enable_simultaneous_execution_as_candidate_module: true
       priority: 6
       max_module_size: 1
 
     external_request_lane_change_right:
-      enable_module: true
+      enable_module: false
       enable_simultaneous_execution_as_approved_module: false
       enable_simultaneous_execution_as_candidate_module: true
       priority: 6

diff --git a/...lane_driving/behavior_planning/rtc_auto_mode_manager/rtc_auto_mode_manager_foa.param.yaml b/...lane_driving/behavior_planning/rtc_auto_mode_manager/rtc_auto_mode_manager_foa.param.yaml
@@ -6,8 +6,6 @@
       - "detection_area"
       - "intersection"
       - "traffic_light"
-      - "external_request_lane_change_left"
-      - "external_request_lane_change_right"
       - "lane_change_left"
       - "lane_change_right"
       - "avoidance_left"