Skip to content

Commit 5ec8ddc

Browse files
committed
output verbose log of osqp interface
Signed-off-by: Tomohito Ando <[email protected]>
1 parent 20a6a8f commit 5ec8ddc

File tree

2 files changed

+40
-4
lines changed

2 files changed

+40
-4
lines changed

control/mpc_lateral_controller/src/qp_solver/qp_solver_osqp.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,8 @@ namespace autoware::motion::control::mpc_lateral_controller
2121
{
2222
QPSolverOSQP::QPSolverOSQP(const rclcpp::Logger & logger) : logger_{logger}
2323
{
24+
osqpsolver_.updateMaxIter(20000);
25+
osqpsolver_.updateVerbose(true);
2426
}
2527
bool QPSolverOSQP::solve(
2628
const Eigen::MatrixXd & h_mat, const Eigen::MatrixXd & f_vec, const Eigen::MatrixXd & a,

launch/tier4_control_launch/launch/control.launch.py

+38-4
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
from launch_ros.actions import ComposableNodeContainer
2626
from launch_ros.actions import LoadComposableNodes
2727
from launch_ros.actions import PushRosNamespace
28+
from launch_ros.actions import Node
2829
from launch_ros.descriptions import ComposableNode
2930
from launch_ros.substitutions import FindPackageShare
3031
import yaml
@@ -64,11 +65,43 @@ def launch_setup(context, *args, **kwargs):
6465
with open(LaunchConfiguration("aeb_param_path").perform(context), "r") as f:
6566
aeb_param = yaml.safe_load(f)["/**"]["ros__parameters"]
6667

67-
controller_component = ComposableNode(
68+
# controller_component = ComposableNode(
69+
# package="trajectory_follower_node",
70+
# plugin="autoware::motion::control::trajectory_follower_node::Controller",
71+
# name="controller_node_exe",
72+
# namespace="trajectory_follower",
73+
# remappings=[
74+
# ("~/input/reference_trajectory", "/planning/scenario_planning/trajectory"),
75+
# ("~/input/current_odometry", "/localization/kinematic_state"),
76+
# ("~/input/current_steering", "/vehicle/status/steering_status"),
77+
# ("~/input/current_accel", "/localization/acceleration"),
78+
# ("~/input/current_operation_mode", "/system/operation_mode/state"),
79+
# ("~/output/predicted_trajectory", "lateral/predicted_trajectory"),
80+
# ("~/output/lateral_diagnostic", "lateral/diagnostic"),
81+
# ("~/output/slope_angle", "longitudinal/slope_angle"),
82+
# ("~/output/longitudinal_diagnostic", "longitudinal/diagnostic"),
83+
# ("~/output/control_cmd", "control_cmd"),
84+
# ],
85+
# parameters=[
86+
# {
87+
# "lateral_controller_mode": LaunchConfiguration("lateral_controller_mode"),
88+
# "longitudinal_controller_mode": LaunchConfiguration("longitudinal_controller_mode"),
89+
# },
90+
# nearest_search_param,
91+
# trajectory_follower_node_param,
92+
# lon_controller_param,
93+
# lat_controller_param,
94+
# vehicle_info_param,
95+
# ],
96+
# extra_arguments=[{"use_intra_process_comms": LaunchConfiguration("use_intra_process")}],
97+
# )
98+
99+
controller_node = Node(
68100
package="trajectory_follower_node",
69-
plugin="autoware::motion::control::trajectory_follower_node::Controller",
101+
executable="controller_node_exe",
70102
name="controller_node_exe",
71103
namespace="trajectory_follower",
104+
output="both",
72105
remappings=[
73106
("~/input/reference_trajectory", "/planning/scenario_planning/trajectory"),
74107
("~/input/current_odometry", "/localization/kinematic_state"),
@@ -92,7 +125,6 @@ def launch_setup(context, *args, **kwargs):
92125
lat_controller_param,
93126
vehicle_info_param,
94127
],
95-
extra_arguments=[{"use_intra_process_comms": LaunchConfiguration("use_intra_process")}],
96128
)
97129

98130
# lane departure checker
@@ -319,14 +351,15 @@ def launch_setup(context, *args, **kwargs):
319351
package="rclcpp_components",
320352
executable=LaunchConfiguration("container_executable"),
321353
composable_node_descriptions=[
322-
controller_component,
354+
# controller_component,
323355
control_validator_component,
324356
lane_departure_component,
325357
shift_decider_component,
326358
vehicle_cmd_gate_component,
327359
operation_mode_transition_manager_component,
328360
glog_component,
329361
],
362+
# emulate_tty=True, # TTYエミュレーションを有効化
330363
)
331364

332365
group = GroupAction(
@@ -337,6 +370,7 @@ def launch_setup(context, *args, **kwargs):
337370
external_cmd_converter_loader,
338371
obstacle_collision_checker_loader,
339372
autonomous_emergency_braking_loader,
373+
controller_node,
340374
]
341375
)
342376

0 commit comments

Comments
 (0)