Skip to content

Commit

Permalink
ci(pre-commit): update pre-commit-hooks-ros (tier4#625)
Browse files Browse the repository at this point in the history
* ci(pre-commit): update pre-commit-hooks-ros

Signed-off-by: Kenji Miyake <kenji.miyake@tier4.jp>

* ci(pre-commit): autofix

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
  • Loading branch information
2 people authored and boyali committed Oct 3, 2022
1 parent 5826633 commit ec4cb93
Show file tree
Hide file tree
Showing 111 changed files with 1,059 additions and 1,140 deletions.
4 changes: 3 additions & 1 deletion .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,10 @@ repos:
- id: yamllint

- repo: https://github.com/tier4/pre-commit-hooks-ros
rev: v0.5.1
rev: v0.6.0
hooks:
- id: prettier-xacro
- id: prettier-launch-xml
- id: prettier-package-xml
- id: sort-package-xml
- id: ros-include-guard
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<launch>
<arg name="oneshot" default="false" />
<arg name="config_file" default="$(find-pkg-share goal_distance_calculator)/config/goal_distance_calculator.param.yaml" />
<arg name="oneshot" default="false"/>
<arg name="config_file" default="$(find-pkg-share goal_distance_calculator)/config/goal_distance_calculator.param.yaml"/>
<node pkg="goal_distance_calculator" exec="goal_distance_calculator_node" name="goal_distance_calculator" output="screen">
<param from="$(var config_file)"/>
<param name="oneshot" value="$(var oneshot)"/>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<launch>
<arg name="path" default="/planning/scenario_planning/lane_driving/behavior_planning/path" />
<arg name="distance" default="~/distance" />
<arg name="path" default="/planning/scenario_planning/lane_driving/behavior_planning/path"/>
<arg name="distance" default="~/distance"/>
<node pkg="path_distance_calculator" exec="path_distance_calculator_node" name="path_distance_calculator">
<remap from="~/input/path" to="$(var path)" />
<remap from="~/output/distance" to="$(var distance)" />
<remap from="~/input/path" to="$(var path)"/>
<remap from="~/output/distance" to="$(var distance)"/>
</node>
</launch>
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<launch>

<arg name="lateral_error_publisher_param_path" default="$(find-pkg-share tier4_debug_tools)/config/lateral_error_publisher.param.yaml"/>
<arg name="lateral_error_publisher_param_path" default="$(find-pkg-share tier4_debug_tools)/config/lateral_error_publisher.param.yaml"/>

<!-- mpc for trajectory following -->
<node pkg="tier4_debug_tools" exec="lateral_error_publisher_node" name="lateral_error_publisher" output="screen">
Expand All @@ -9,5 +8,4 @@
<remap from="~/input/vehicle_pose_with_covariance" to="/localization/pose_with_covariance"/>
<remap from="~/input/ground_truth_pose_with_covariance" to="/localization/pose_with_covariance"/>
</node>

</launch>
Original file line number Diff line number Diff line change
@@ -1,23 +1,22 @@
<launch>

<arg name="control_performance_analysis_param_path" default="$(find-pkg-share control_performance_analysis)/config/control_performance_analysis.param.yaml" />
<arg name="input/reference_trajectory" default="/planning/scenario_planning/trajectory" />
<arg name="input/control_raw" default="/control/trajectory_follower/lateral/control_cmd" />
<arg name="input/measured_steering" default="/vehicle/status/steering_status" />
<arg name="input/current_odometry" default="/localization/kinematic_state" />
<arg name="output/error_stamped" default="/control_performance/performance_vars" />
<arg name="control_performance_analysis_param_path" default="$(find-pkg-share control_performance_analysis)/config/control_performance_analysis.param.yaml"/>
<arg name="input/reference_trajectory" default="/planning/scenario_planning/trajectory"/>
<arg name="input/control_raw" default="/control/trajectory_follower/lateral/control_cmd"/>
<arg name="input/measured_steering" default="/vehicle/status/steering_status"/>
<arg name="input/current_odometry" default="/localization/kinematic_state"/>
<arg name="output/error_stamped" default="/control_performance/performance_vars"/>

<!-- vehicle info -->
<arg name="vehicle_info_param_file" default="$(find-pkg-share vehicle_info_util)/config/vehicle_info.param.yaml" />
<arg name="vehicle_info_param_file" default="$(find-pkg-share vehicle_info_util)/config/vehicle_info.param.yaml"/>

<node pkg="control_performance_analysis" exec="control_performance_analysis" name="control_performance_analysis" output="screen">
<param from="$(var control_performance_analysis_param_path)" />
<param from="$(var vehicle_info_param_file)" />
<param from="$(var control_performance_analysis_param_path)"/>
<param from="$(var vehicle_info_param_file)"/>

<remap from="~/input/reference_trajectory" to="$(var input/reference_trajectory)" />
<remap from="~/input/control_raw" to="$(var input/control_raw)" />
<remap from="~/input/measured_steering" to="$(var input/measured_steering)" />
<remap from="~/input/current_odometry" to="$(var input/current_odometry)" />
<remap from="~/output/error_stamped" to="$(var output/error_stamped)" />
<remap from="~/input/reference_trajectory" to="$(var input/reference_trajectory)"/>
<remap from="~/input/control_raw" to="$(var input/control_raw)"/>
<remap from="~/input/measured_steering" to="$(var input/measured_steering)"/>
<remap from="~/input/current_odometry" to="$(var input/current_odometry)"/>
<remap from="~/output/error_stamped" to="$(var output/error_stamped)"/>
</node>
</launch>
Original file line number Diff line number Diff line change
@@ -1,49 +1,47 @@
<launch>

<!-- settings -->
<arg name="initial_selector_mode" default="local" description="local, remote" />
<arg name="initial_selector_mode" default="local" description="local, remote"/>

<!-- service -->
<arg name="service/select_external_command" default="~/select_external_command" />
<arg name="service/select_external_command" default="~/select_external_command"/>

<!-- input local -->
<arg name="input/local/control_cmd" default="/api/external/set/command/local/control" />
<arg name="input/local/shift_cmd" default="/api/external/set/command/local/shift" />
<arg name="input/local/turn_signal_cmd" default="/api/external/set/command/local/turn_signal" />
<arg name="input/local/heartbeat" default="/api/external/set/command/local/heartbeat" />
<arg name="input/local/control_cmd" default="/api/external/set/command/local/control"/>
<arg name="input/local/shift_cmd" default="/api/external/set/command/local/shift"/>
<arg name="input/local/turn_signal_cmd" default="/api/external/set/command/local/turn_signal"/>
<arg name="input/local/heartbeat" default="/api/external/set/command/local/heartbeat"/>

<!-- input remote -->
<arg name="input/remote/control_cmd" default="/api/external/set/command/remote/control" />
<arg name="input/remote/shift_cmd" default="/api/external/set/command/remote/shift" />
<arg name="input/remote/turn_signal_cmd" default="/api/external/set/command/remote/turn_signal" />
<arg name="input/remote/heartbeat" default="/api/external/set/command/remote/heartbeat" />
<arg name="input/remote/control_cmd" default="/api/external/set/command/remote/control"/>
<arg name="input/remote/shift_cmd" default="/api/external/set/command/remote/shift"/>
<arg name="input/remote/turn_signal_cmd" default="/api/external/set/command/remote/turn_signal"/>
<arg name="input/remote/heartbeat" default="/api/external/set/command/remote/heartbeat"/>

<!-- output -->
<arg name="output/control_cmd" default="/external/selected/external_control_cmd" />
<arg name="output/gear_cmd" default="/external/selected/gear_cmd" />
<arg name="output/turn_indicators_cmd" default="/external/selected/turn_indicators_cmd" />
<arg name="output/hazard_lights_cmd" default="/external/selected/hazard_lights_cmd" />
<arg name="output/heartbeat" default="/external/selected/heartbeat" />
<arg name="output/current_selector_mode" default="~/current_selector_mode" />
<arg name="output/control_cmd" default="/external/selected/external_control_cmd"/>
<arg name="output/gear_cmd" default="/external/selected/gear_cmd"/>
<arg name="output/turn_indicators_cmd" default="/external/selected/turn_indicators_cmd"/>
<arg name="output/hazard_lights_cmd" default="/external/selected/hazard_lights_cmd"/>
<arg name="output/heartbeat" default="/external/selected/heartbeat"/>
<arg name="output/current_selector_mode" default="~/current_selector_mode"/>

<!-- node -->
<node pkg="external_cmd_selector" exec="external_cmd_selector" name="external_cmd_selector" output="screen">
<remap from="~/service/select_external_command" to="$(var service/select_external_command)" />
<remap from="~/input/local/control_cmd" to="$(var input/local/control_cmd)" />
<remap from="~/input/local/shift_cmd" to="$(var input/local/shift_cmd)" />
<remap from="~/input/local/turn_signal_cmd" to="$(var input/local/turn_signal_cmd)" />
<remap from="~/input/local/heartbeat" to="$(var input/local/heartbeat)" />
<remap from="~/input/remote/control_cmd" to="$(var input/remote/control_cmd)" />
<remap from="~/input/remote/shift_cmd" to="$(var input/remote/shift_cmd)" />
<remap from="~/input/remote/turn_signal_cmd" to="$(var input/remote/turn_signal_cmd)" />
<remap from="~/input/remote/heartbeat" to="$(var input/remote/heartbeat)" />
<remap from="~/output/control_cmd" to="$(var output/control_cmd)" />
<remap from="~/output/gear_cmd" to="$(var output/gear_cmd)" />
<remap from="~/output/turn_indicators_cmd" to="$(var output/turn_indicators_cmd)" />
<remap from="~/output/hazard_lights_cmd" to="$(var output/hazard_lights_cmd)" />
<remap from="~/output/heartbeat" to="$(var output/heartbeat)" />
<remap from="~/output/current_selector_mode" to="$(var output/current_selector_mode)" />
<param name="initial_selector_mode" value="$(var initial_selector_mode)" />
<remap from="~/service/select_external_command" to="$(var service/select_external_command)"/>
<remap from="~/input/local/control_cmd" to="$(var input/local/control_cmd)"/>
<remap from="~/input/local/shift_cmd" to="$(var input/local/shift_cmd)"/>
<remap from="~/input/local/turn_signal_cmd" to="$(var input/local/turn_signal_cmd)"/>
<remap from="~/input/local/heartbeat" to="$(var input/local/heartbeat)"/>
<remap from="~/input/remote/control_cmd" to="$(var input/remote/control_cmd)"/>
<remap from="~/input/remote/shift_cmd" to="$(var input/remote/shift_cmd)"/>
<remap from="~/input/remote/turn_signal_cmd" to="$(var input/remote/turn_signal_cmd)"/>
<remap from="~/input/remote/heartbeat" to="$(var input/remote/heartbeat)"/>
<remap from="~/output/control_cmd" to="$(var output/control_cmd)"/>
<remap from="~/output/gear_cmd" to="$(var output/gear_cmd)"/>
<remap from="~/output/turn_indicators_cmd" to="$(var output/turn_indicators_cmd)"/>
<remap from="~/output/hazard_lights_cmd" to="$(var output/hazard_lights_cmd)"/>
<remap from="~/output/heartbeat" to="$(var output/heartbeat)"/>
<remap from="~/output/current_selector_mode" to="$(var output/current_selector_mode)"/>
<param name="initial_selector_mode" value="$(var initial_selector_mode)"/>
</node>

</launch>
28 changes: 14 additions & 14 deletions control/joy_controller/launch/joy_controller.launch.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,18 @@
<arg name="joy_type" default="DS4" description="options: DS4, G29"/>
<arg name="external_cmd_source" default="remote" description="options: local, remote"/>

<arg name="input_joy" default="/joy" />
<arg name="input_odometry" default="/localization/kinematic_state" />
<arg name="input_joy" default="/joy"/>
<arg name="input_odometry" default="/localization/kinematic_state"/>

<arg name="output_control_command" default="/external/$(var external_cmd_source)/joy/control_cmd" />
<arg name="output_external_control_command" default="/api/external/set/command/$(var external_cmd_source)/control" />
<arg name="output_shift" default="/api/external/set/command/$(var external_cmd_source)/shift" />
<arg name="output_turn_signal" default="/api/external/set/command/$(var external_cmd_source)/turn_signal" />
<arg name="output_heartbeat" default="/api/external/set/command/$(var external_cmd_source)/heartbeat" />
<arg name="output_gate_mode" default="/control/gate_mode_cmd" />
<arg name="output_vehicle_engage" default="/vehicle/engage" />
<arg name="output_control_command" default="/external/$(var external_cmd_source)/joy/control_cmd"/>
<arg name="output_external_control_command" default="/api/external/set/command/$(var external_cmd_source)/control"/>
<arg name="output_shift" default="/api/external/set/command/$(var external_cmd_source)/shift"/>
<arg name="output_turn_signal" default="/api/external/set/command/$(var external_cmd_source)/turn_signal"/>
<arg name="output_heartbeat" default="/api/external/set/command/$(var external_cmd_source)/heartbeat"/>
<arg name="output_gate_mode" default="/control/gate_mode_cmd"/>
<arg name="output_vehicle_engage" default="/vehicle/engage"/>

<arg name="config_file" default="$(find-pkg-share joy_controller)/config/joy_controller.param.yaml" />
<arg name="config_file" default="$(find-pkg-share joy_controller)/config/joy_controller.param.yaml"/>

<node pkg="joy_controller" exec="joy_controller" name="joy_controller" output="screen">
<remap from="input/joy" to="$(var input_joy)"/>
Expand All @@ -30,12 +30,12 @@
<remap from="service/emergency_stop" to="/api/autoware/set/emergency"/>
<remap from="service/autoware_engage" to="/api/external/set/engage"/>

<param from="$(var config_file)" />
<param name="joy_type" value="$(var joy_type)" />
<param from="$(var config_file)"/>
<param name="joy_type" value="$(var joy_type)"/>
</node>

<node pkg="joy" exec="joy_node" name="joy_node" output="screen">
<param name="autorepeat_rate" value="1.0" />
<param name="deadzone" value="0.0" />
<param name="autorepeat_rate" value="1.0"/>
<param name="deadzone" value="0.0"/>
</node>
</launch>
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
<launch>
<arg name="input/odometry" default="/localization/kinematic_state" />
<arg name="input/lanelet_map_bin" default="/map/vector_map" />
<arg name="input/route" default="/planning/mission_planning/route" />
<arg name="input/reference_trajectory" default="/planning/scenario_planning/trajectory" />
<arg name="input/predicted_trajectory" default="/control/trajectory_follower/predicted_trajectory" />
<arg name="config_file" default="$(find-pkg-share lane_departure_checker)/config/lane_departure_checker.param.yaml" />
<arg name="input/odometry" default="/localization/kinematic_state"/>
<arg name="input/lanelet_map_bin" default="/map/vector_map"/>
<arg name="input/route" default="/planning/mission_planning/route"/>
<arg name="input/reference_trajectory" default="/planning/scenario_planning/trajectory"/>
<arg name="input/predicted_trajectory" default="/control/trajectory_follower/predicted_trajectory"/>
<arg name="config_file" default="$(find-pkg-share lane_departure_checker)/config/lane_departure_checker.param.yaml"/>

<!-- vehicle info -->
<arg name="vehicle_info_param_file" default="$(find-pkg-share vehicle_info_util)/config/vehicle_info.param.yaml" />
<arg name="vehicle_info_param_file" default="$(find-pkg-share vehicle_info_util)/config/vehicle_info.param.yaml"/>

<node pkg="lane_departure_checker" exec="lane_departure_checker_node" name="lane_departure_checker_node" output="screen">
<remap from="~/input/odometry" to="$(var input/odometry)"/>
<remap from="~/input/lanelet_map_bin" to="$(var input/lanelet_map_bin)"/>
<remap from="~/input/route" to="$(var input/route)"/>
<remap from="~/input/reference_trajectory" to="$(var input/reference_trajectory)"/>
<remap from="~/input/predicted_trajectory" to="$(var input/predicted_trajectory)"/>
<param from="$(var config_file)" />
<param from="$(var vehicle_info_param_file)" />
<param from="$(var config_file)"/>
<param from="$(var vehicle_info_param_file)"/>
</node>
</launch>
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<launch>
<arg name="input/lanelet_map_bin" default="/map/vector_map" />
<arg name="input/obstacle_pointcloud" default="/perception/obstacle_segmentation/pointcloud" />
<arg name="input/reference_trajectory" default="/planning/scenario_planning/trajectory" />
<arg name="input/predicted_trajectory" default="/control/trajectory_follower/predicted_trajectory" />
<arg name="input/odometry" default="/localization/kinematic_state" />
<arg name="config_file" default="$(find-pkg-share obstacle_collision_checker)/config/obstacle_collision_checker.param.yaml" />
<arg name="input/lanelet_map_bin" default="/map/vector_map"/>
<arg name="input/obstacle_pointcloud" default="/perception/obstacle_segmentation/pointcloud"/>
<arg name="input/reference_trajectory" default="/planning/scenario_planning/trajectory"/>
<arg name="input/predicted_trajectory" default="/control/trajectory_follower/predicted_trajectory"/>
<arg name="input/odometry" default="/localization/kinematic_state"/>
<arg name="config_file" default="$(find-pkg-share obstacle_collision_checker)/config/obstacle_collision_checker.param.yaml"/>
<!-- vehicle info -->
<arg name="vehicle_info_param_file" default="$(find-pkg-share vehicle_info_util)/config/vehicle_info.param.yaml" />
<arg name="vehicle_info_param_file" default="$(find-pkg-share vehicle_info_util)/config/vehicle_info.param.yaml"/>

<node pkg="obstacle_collision_checker" exec="obstacle_collision_checker_node" name="obstacle_collision_checker_node" output="screen">
<param from="$(var config_file)" />
<param from="$(var vehicle_info_param_file)" />
<param from="$(var config_file)"/>
<param from="$(var vehicle_info_param_file)"/>
<remap from="input/lanelet_map_bin" to="$(var input/lanelet_map_bin)"/>
<remap from="input/obstacle_pointcloud" to="$(var input/obstacle_pointcloud)"/>
<remap from="input/reference_trajectory" to="$(var input/reference_trajectory)"/>
Expand Down
1 change: 0 additions & 1 deletion control/pure_pursuit/launch/pure_pursuit.launch.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
<launch>

<arg name="pure_pursuit_param_path" default="$(find-pkg-share pure_pursuit)/config/pure_pursuit.param.yaml"/>

<arg name="input/reference_trajectory" default="/planning/scenario_planning/trajectory"/>
Expand Down
4 changes: 2 additions & 2 deletions control/shift_decider/launch/shift_decider.launch.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<launch>
<node pkg="shift_decider" exec="shift_decider" name="shift_decider" output="screen">
<remap from="input/control_cmd" to="/control/trajectory_follower/control_cmd" />
<remap from="output/gear_cmd" to="/control/shift_decider/gear_cmd" />
<remap from="input/control_cmd" to="/control/trajectory_follower/control_cmd"/>
<remap from="output/gear_cmd" to="/control/shift_decider/gear_cmd"/>
</node>
</launch>
21 changes: 10 additions & 11 deletions control/vehicle_cmd_gate/launch/vehicle_cmd_gate.launch.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<launch>
<arg name="config_file" default="$(find-pkg-share vehicle_cmd_gate)/config/vehicle_cmd_gate.param.yaml" />
<arg name="use_emergency_handling" default="false" />
<arg name="use_external_emergency_stop" default="true" />
<arg name="use_start_request" default="false" />
<arg name="config_file" default="$(find-pkg-share vehicle_cmd_gate)/config/vehicle_cmd_gate.param.yaml"/>
<arg name="use_emergency_handling" default="false"/>
<arg name="use_external_emergency_stop" default="true"/>
<arg name="use_start_request" default="false"/>

<!-- vehicle info -->
<arg name="vehicle_info_param_file" default="$(find-pkg-share vehicle_info_util)/config/vehicle_info.param.yaml" />
<arg name="vehicle_info_param_file" default="$(find-pkg-share vehicle_info_util)/config/vehicle_info.param.yaml"/>

<node pkg="vehicle_cmd_gate" exec="vehicle_cmd_gate" name="vehicle_cmd_gate" output="screen">
<remap from="input/steering" to="/vehicle/status/steering_status"/>
Expand Down Expand Up @@ -44,11 +44,10 @@
<remap from="~/service/external_emergency_stop" to="~/external_emergency_stop"/>
<remap from="~/service/clear_external_emergency_stop" to="~/clear_external_emergency_stop"/>

<param from="$(var config_file)" />
<param from="$(var vehicle_info_param_file)" />
<param name="use_emergency_handling" value="$(var use_emergency_handling)" />
<param name="use_external_emergency_stop" value="$(var use_external_emergency_stop)" />
<param name="use_start_request" value="$(var use_start_request)" />
<param from="$(var config_file)"/>
<param from="$(var vehicle_info_param_file)"/>
<param name="use_emergency_handling" value="$(var use_emergency_handling)"/>
<param name="use_external_emergency_stop" value="$(var use_external_emergency_stop)"/>
<param name="use_start_request" value="$(var use_start_request)"/>
</node>

</launch>
Loading

0 comments on commit ec4cb93

Please sign in to comment.