Skip to content

Commit

Permalink
rename ROS parameter files
Browse files Browse the repository at this point in the history
Signed-off-by: Kenji Miyake <[email protected]>
  • Loading branch information
Kenji Miyake committed Apr 15, 2022
1 parent a6cd1d6 commit f730b17
Show file tree
Hide file tree
Showing 9 changed files with 10 additions and 9 deletions.
6 changes: 3 additions & 3 deletions control/trajectory_follower_nodes/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -79,9 +79,9 @@ if(BUILD_TESTING)
target_link_libraries(${TRAJECTORY_FOLLOWER_NODES_TEST} ${LATLON_MUXER_NODE} ${LATERAL_CONTROLLER_NODE} ${LONGITUDINAL_CONTROLLER_NODE})

#find_package(autoware_testing REQUIRED)
#add_smoke_test(${PROJECT_NAME} ${LATLON_MUXER_NODE}_exe PARAM_FILENAME latlon_muxer_defaults.yaml)
#add_smoke_test(${PROJECT_NAME} ${LATERAL_CONTROLLER_NODE}_exe PARAM_FILENAME lateral_controller_defaults.yaml)
#add_smoke_test(${PROJECT_NAME} ${LONGITUDINAL_CONTROLLER_NODE}_exe PARAM_FILENAME longitudinal_controller_defaults.yaml)
#add_smoke_test(${PROJECT_NAME} ${LATLON_MUXER_NODE}_exe PARAM_FILENAME latlon_muxer_defaults.param.yaml)
#add_smoke_test(${PROJECT_NAME} ${LATERAL_CONTROLLER_NODE}_exe PARAM_FILENAME lateral_controller_defaults.param.yaml)
#add_smoke_test(${PROJECT_NAME} ${LONGITUDINAL_CONTROLLER_NODE}_exe PARAM_FILENAME longitudinal_controller_defaults.param.yaml)
endif()

ament_auto_package(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ Inputs

### Parameter description

The default parameters defined in `param/lateral_controller_defaults.yaml` are adjusted to the
The default parameters defined in `param/lateral_controller_defaults.param.yaml` are adjusted to the
AutonomouStuff Lexus RX 450h for under 40 km/h driving.

| Name | Type | Description | Default value |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ In this controller, the predicted ego-velocity and the target velocity after the

### Parameter description

The default parameters defined in `param/lateral_controller_defaults.yaml` are adjusted to the
The default parameters defined in `param/lateral_controller_defaults.param.yaml` are adjusted to the
AutonomouStuff Lexus RX 450h for under 40 km/h driving.

| Name | Type | Description | Default value |
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ std::shared_ptr<LateralController> makeLateralNode()
const auto share_dir = ament_index_cpp::get_package_share_directory("trajectory_follower_nodes");
rclcpp::NodeOptions node_options;
node_options.arguments(
{"--ros-args", "--params-file", share_dir + "/param/lateral_controller_defaults.yaml",
"--params-file", share_dir + "/param/test_vehicle_info.yaml"});
{"--ros-args", "--params-file", share_dir + "/param/lateral_controller_defaults.param.yaml",
"--params-file", share_dir + "/param/test_vehicle_info.param.yaml"});
std::shared_ptr<LateralController> node = std::make_shared<LateralController>(node_options);

// Enable all logging in the node
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -46,8 +46,9 @@ std::shared_ptr<LongitudinalController> makeLongitudinalNode()
const auto share_dir = ament_index_cpp::get_package_share_directory("trajectory_follower_nodes");
rclcpp::NodeOptions node_options;
node_options.arguments(
{"--ros-args", "--params-file", share_dir + "/param/longitudinal_controller_defaults.yaml",
"--params-file", share_dir + "/param/test_vehicle_info.yaml"});
{"--ros-args", "--params-file",
share_dir + "/param/longitudinal_controller_defaults.param.yaml", "--params-file",
share_dir + "/param/test_vehicle_info.param.yaml"});
std::shared_ptr<LongitudinalController> node =
std::make_shared<LongitudinalController>(node_options);

Expand Down

0 comments on commit f730b17

Please sign in to comment.