Skip to content
This repository has been archived by the owner on Mar 27, 2023. It is now read-only.

twist -> odometry #109

Merged
merged 1 commit into from
Nov 10, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions control_launch/launch/control.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def launch_setup(context, *args, **kwargs):
namespace="trajectory_follower",
remappings=[
("~/input/reference_trajectory", "/planning/scenario_planning/trajectory"),
("~/input/current_velocity", "/localization/twist"),
("~/input/current_velocity", "/localization/kinematic_state"),
("~/input/current_steering", "/vehicle/status/steering"),
("~/output/control_raw", "lateral/control_cmd"),
("~/output/predicted_trajectory", "predicted_trajectory"),
Expand All @@ -79,7 +79,7 @@ def launch_setup(context, *args, **kwargs):
namespace="trajectory_follower",
remappings=[
("input/reference_trajectory", "/planning/scenario_planning/trajectory"),
("input/current_velocity", "/localization/twist"),
("input/current_velocity", "/localization/kinematic_state"),
("output/control_raw", "lateral/control_cmd"),
],
parameters=[
Expand All @@ -95,7 +95,7 @@ def launch_setup(context, *args, **kwargs):
name="velocity_controller",
namespace="trajectory_follower",
remappings=[
("~/current_velocity", "/localization/twist"),
("~/current_velocity", "/localization/kinematic_state"),
("~/control_cmd", "longitudinal/control_cmd"),
("~/current_trajectory", "/planning/scenario_planning/trajectory"),
],
Expand Down Expand Up @@ -132,7 +132,7 @@ def launch_setup(context, *args, **kwargs):
name="lane_departure_checker_node",
namespace="trajectory_follower",
remappings=[
("~/input/twist", "/localization/twist"),
("~/input/odometry", "/localization/kinematic_state"),
("~/input/lanelet_map_bin", "/map/vector_map"),
("~/input/route", "/planning/mission_planning/route"),
("~/input/reference_trajectory", "/planning/scenario_planning/trajectory"),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def generate_launch_description():
("~/input/route", LaunchConfiguration("input_route_topic_name")),
("~/input/vector_map", LaunchConfiguration("map_topic_name")),
("~/input/perception", "/perception/object_recognition/objects"),
("~/input/velocity", "/localization/twist"),
("~/input/odometry", "/localization/kinematic_state"),
(
"~/input/external_approval",
"/planning/scenario_planning/lane_driving/behavior_planning/"
Expand Down Expand Up @@ -250,7 +250,7 @@ def generate_launch_description():
remappings=[
("~/input/path_with_lane_id", "path_with_lane_id"),
("~/input/vector_map", "/map/vector_map"),
("~/input/vehicle_velocity", "/localization/twist"),
("~/input/odometry", "/localization/kinematic_state"),
("~/input/dynamic_objects", "/perception/object_recognition/objects"),
("~/input/no_ground_pointcloud", "/sensing/lidar/no_ground/pointcloud"),
(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<remap from="~/input/route" to="$(var input_route_topic_name)" />
<remap from="~/input/vector_map" to="$(var map_topic_name)" />
<remap from="~/input/perception" to="/perception/object_recognition/objects" />
<remap from="~/input/velocity" to="/localization/twist" />
<remap from="~/input/odometry" to="/localization/kinematic_state" />
<remap from="~/input/external_approval" to="/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/path_change_approval" />
<remap from="~/input/force_approval" to="/planning/scenario_planning/lane_driving/behavior_planning/behavior_path_planner/path_change_force" />
<remap from="~/output/path" to="path_with_lane_id" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def generate_launch_description():
("~/output/trajectory", "surround_obstacle_checker/trajectory"),
("~/input/pointcloud", "/sensing/lidar/no_ground/pointcloud"),
("~/input/objects", "/perception/object_recognition/objects"),
("~/input/twist", "/localization/twist"),
("~/input/odometry", "/localization/kinematic_state"),
("~/input/trajectory", "obstacle_avoidance_planner/trajectory"),
],
parameters=[
Expand Down Expand Up @@ -156,7 +156,7 @@ def generate_launch_description():
("~/output/trajectory", "/planning/scenario_planning/lane_driving/trajectory"),
("~/input/pointcloud", "/sensing/lidar/no_ground/pointcloud"),
("~/input/objects", "/perception/object_recognition/objects"),
("~/input/twist", "/localization/twist"),
("~/input/odometry", "/localization/kinematic_state"),
("~/input/trajectory", "surround_obstacle_checker/trajectory"),
],
parameters=[
Expand Down
2 changes: 1 addition & 1 deletion planning_launch/launch/scenario_planning/parking.launch.py
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ def generate_launch_description():
("~/input/route", "/planning/mission_planning/route"),
("~/input/occupancy_grid", "costmap_generator/occupancy_grid"),
("~/input/scenario", "/planning/scenario_planning/scenario"),
("~/input/twist", "/localization/twist"),
("~/input/odometry", "/localization/kinematic_state"),
("~/output/trajectory", "/planning/scenario_planning/parking/trajectory"),
("is_completed", "/planning/scenario_planning/parking/is_completed"),
],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
<arg name="input_route" value="/planning/mission_planning/route" />
<arg name="input_occupancy_grid" value="costmap_generator/occupancy_grid" />
<arg name="input_scenario" value="/planning/scenario_planning/scenario" />
<arg name="input_twist" value="/localization/twist" />
<arg name="input_odometry" value="/localization/kinematic_state" />
<arg name="output_trajectory" value="/planning/scenario_planning/parking/trajectory" />
<arg name="is_completed" value="/planning/scenario_planning/parking/is_completed" />
<arg name="param_file" value="$(find-pkg-share planning_launch)/config/scenario_planning/parking/freespace_planner/freespace_planner.param.yaml" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<arg name="input_parking_trajectory" value="/planning/scenario_planning/parking/trajectory"/>
<arg name="input_lanelet_map" value="/map/vector_map"/>
<arg name="input_route" value="/planning/mission_planning/route"/>
<arg name="input_twist" value="/localization/twist"/>
<arg name="input_odometry" value="/localization/kinematic_state"/>
<arg name="output_scenario" value="/planning/scenario_planning/scenario"/>
<arg name="output_trajectory" value="/planning/scenario_planning/scenario_selector/trajectory"/>
<arg name="is_parking_completed" value="/planning/scenario_planning/parking/is_completed"/>
Expand Down