Skip to content

Commit

Permalink
fix: rename use_external_emergency_stop to check_external_emergency_h…
Browse files Browse the repository at this point in the history
…eartbeat (autowarefoundation#592)

* fix: rename use_external_emergency_stop to check_external_emergency_heartbeat

Signed-off-by: Shumpei Wakabayashi <[email protected]>

* ci(pre-commit): autofix

Signed-off-by: Shumpei Wakabayashi <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
shmpwk and pre-commit-ci[bot] authored Dec 15, 2022
1 parent 85d0c88 commit 4be7fca
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 5 deletions.
2 changes: 1 addition & 1 deletion autoware_launch/launch/planning_simulator.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
<!-- options for longitudinal_controller_mode: pid -->
<arg name="longitudinal_controller_mode" value="pid" />
<!-- Options for external emergency stop module. Heartbeat topic is required if this is true. -->
<arg name="use_external_emergency_stop" value="false" />
<arg name="check_external_emergency_heartbeat" value="false" />
</include>
</group>

Expand Down
6 changes: 4 additions & 2 deletions control_launch/launch/control.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,9 @@ def launch_setup(context, *args, **kwargs):
vehicle_cmd_gate_param,
{
"use_emergency_handling": LaunchConfiguration("use_emergency_handling"),
"use_external_emergency_stop": LaunchConfiguration("use_external_emergency_stop"),
"check_external_emergency_heartbeat": LaunchConfiguration(
"check_external_emergency_heartbeat"
),
"use_start_request": LaunchConfiguration("use_start_request"),
},
],
Expand Down Expand Up @@ -325,7 +327,7 @@ def add_launch_arg(name: str, default_value=None, description=None):

# vehicle cmd gate
add_launch_arg("use_emergency_handling", "false", "use emergency handling")
add_launch_arg("use_external_emergency_stop", "true", "use external emergency stop")
add_launch_arg("check_external_emergency_heartbeat", "true", "use external emergency stop")
add_launch_arg("use_start_request", "false", "use start request service")

# external cmd selector
Expand Down
4 changes: 2 additions & 2 deletions control_launch/launch/control.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<arg name="operation_mode_transition_manager_param_path" default="$(find-pkg-share control_launch)/config/operation_mode_transition_manager/operation_mode_transition_manager.param.yaml"/>
<arg name="shift_decider_param_path" default="$(find-pkg-share control_launch)/config/shift_decider/shift_decider.param.yaml"/>
<arg name="initial_selector_mode" default="remote"/>
<arg name="use_external_emergency_stop" default="true"/>
<arg name="check_external_emergency_heartbeat" default="true"/>

<include file="$(find-pkg-share control_launch)/launch/control.launch.py">
<arg name="lateral_controller_mode" value="$(var lateral_controller_mode)" />
Expand All @@ -17,7 +17,7 @@
<arg name="operation_mode_transition_manager_param_path" value="$(var operation_mode_transition_manager_param_path)"/>
<arg name="shift_decider_param_path" value="$(var shift_decider_param_path)"/>
<arg name="initial_selector_mode" value="$(var initial_selector_mode)"/>
<arg name="use_external_emergency_stop" value="$(var use_external_emergency_stop)"/>
<arg name="check_external_emergency_heartbeat" value="$(var check_external_emergency_heartbeat)"/>
</include>

</launch>

0 comments on commit 4be7fca

Please sign in to comment.