Skip to content

Commit

Permalink
reset to autowarefoundation:main
Browse files Browse the repository at this point in the history
  • Loading branch information
mitukou1109 committed Jun 27, 2024
1 parent c58722a commit fdd4276
Show file tree
Hide file tree
Showing 10 changed files with 7 additions and 21 deletions.
4 changes: 2 additions & 2 deletions autoware_launch/config/planning/preset/default_preset.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ launch:
default: "true"
- arg:
name: launch_dynamic_obstacle_avoidance
default: "true"
default: "false"
- arg:
name: launch_sampling_planner_module
default: "false" # Warning, experimental module, use only in simulations
Expand Down Expand Up @@ -120,7 +120,7 @@ launch:

- arg:
name: launch_surround_obstacle_checker
default: "true"
default: "false"

# parking modules
- arg:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/**:
ros__parameters:
max_vel: 11.1 # max velocity limit [m/s]
max_vel: 4.17 # max velocity limit [m/s]

# constraints param for normal driving
normal:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -89,7 +89,7 @@
object_time_margin_to_collision_point: 4.0

occlusion:
enable: true
enable: false
occlusion_attention_area_length: 70.0
free_space_max: 43
occupied_min: 58
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
option:
enable_skip_optimization: false # skip elastic band and model predictive trajectory
enable_reset_prev_optimization: false # If true, optimization has no fix constraint to the previous result.
enable_outside_drivable_area_stop: false # stop if the ego's trajectory footprint is outside the drivable area
enable_outside_drivable_area_stop: true # stop if the ego's trajectory footprint is outside the drivable area
use_footprint_polygon_for_outside_drivable_area_check: false # If false, only the footprint's corner points are considered.

debug:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
idling_time: 2.0 # idling time to detect front vehicle starting deceleration [s]
min_ego_accel_for_rss: -1.0 # ego's acceleration to calculate RSS distance [m/ss]
min_object_accel_for_rss: -1.0 # front obstacle's acceleration to calculate RSS distance [m/ss]
safe_distance_margin : 5.0 # This is also used as a stop margin [m]
safe_distance_margin : 6.0 # This is also used as a stop margin [m]
terminal_safe_distance_margin : 3.0 # Stop margin at the goal. This value cannot exceed safe distance margin. [m]
hold_stop_velocity_threshold: 0.01 # The maximum ego velocity to hold stopping [m/s]
hold_stop_distance_threshold: 0.3 # The ego keeps stopping if the distance to stop changes within the threshold [m]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@ files:

edits:
- { type: remove, path: /autoware/system/duplicated_node_checker }
- { type: remove, path: /autoware/control/emergency_braking }
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
files:
- { path: $(find-pkg-share system_diagnostic_monitor)/config/autoware-main.yaml }

edits:
- { type: remove, path: /autoware/control/emergency_braking }
Original file line number Diff line number Diff line change
@@ -1,5 +1,2 @@
files:
- { path: $(find-pkg-share system_diagnostic_monitor)/config/autoware-psim.yaml }

edits:
- { type: remove, path: /autoware/control/emergency_braking }
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<arg name="lateral_controller_mode" default="mpc"/>
<arg name="longitudinal_controller_mode" default="pid"/>
<arg name="use_individual_control_param" default="false"/>
<arg name="enable_autonomous_emergency_braking" default="false"/>
<arg name="enable_autonomous_emergency_braking" default="true"/>
<arg name="enable_predicted_path_checker" default="false"/>

<let name="latlon_controller_param_path_dir" value="$(var vehicle_id)" if="$(var use_individual_control_param)"/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,4 @@
<arg name="diagnostic_graph_aggregator_param_path" value="$(var diagnostic_graph_aggregator_param_path)"/>
<arg name="diagnostic_graph_aggregator_graph_path" value="$(var diagnostic_graph_aggregator_graph_path)"/>
</include>

<!-- For logging of diagnostics_graph error -->
<include file="$(find-pkg-share diagnostic_graph_utils)/launch/logging.launch.xml">
<arg name="root_path" value="/autoware/modes/autonomous"/>
<arg name="max_depth" value="3"/>
<arg name="show_rate" value="0.2"/>
</include>
</launch>

0 comments on commit fdd4276

Please sign in to comment.