Skip to content

Commit 1f5d521

Browse files
committed
follow the name convention
Signed-off-by: Zhe Shen <lucidshenzhe@gmail.com>
1 parent 523bdfd commit 1f5d521

File tree

2 files changed

+5
-5
lines changed
  • control/mpc_lateral_controller

2 files changed

+5
-5
lines changed

control/mpc_lateral_controller/include/mpc_lateral_controller/mpc.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ class MPC
407407

408408
public:
409409
MPCTrajectory m_reference_trajectory; // Reference trajectory to be followed.
410-
MPCTrajectory mpc_traj_raw; // The raw trajectory from the planner.
410+
MPCTrajectory m_mpc_traj_raw; // The raw trajectory from the planner.
411411
MPCParam m_param; // MPC design parameters.
412412
std::deque<double> m_input_buffer; // MPC output buffer for delay time compensation.
413413
double m_raw_steer_cmd_prev = 0.0; // Previous MPC raw output.

control/mpc_lateral_controller/src/mpc.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ bool MPC::calculateMPC(
8282

8383
// get the diagnostic data w.r.t. the original trajectory
8484
const auto [success_data_traj_raw, mpc_data_traj_raw] =
85-
getData(mpc_traj_raw, current_steer, current_kinematics);
85+
getData(m_mpc_traj_raw, current_steer, current_kinematics);
8686
if (!success_data_traj_raw) {
8787
return fail_warn_throttle("fail to get MPC Data for the raw trajectory. Stop MPC.");
8888
}
@@ -192,11 +192,11 @@ void MPC::setReferenceTrajectory(
192192
const double ego_offset_to_segment = motion_utils::calcLongitudinalOffsetToSegment(
193193
trajectory_msg.points, nearest_seg_idx, current_kinematics.pose.pose.position);
194194

195-
mpc_traj_raw = MPCUtils::convertToMPCTrajectory(trajectory_msg);
195+
m_mpc_traj_raw = MPCUtils::convertToMPCTrajectory(trajectory_msg);
196196

197197
// resampling
198198
const auto [success_resample, mpc_traj_resampled] = MPCUtils::resampleMPCTrajectoryByDistance(
199-
mpc_traj_raw, param.traj_resample_dist, nearest_seg_idx, ego_offset_to_segment);
199+
m_mpc_traj_raw, param.traj_resample_dist, nearest_seg_idx, ego_offset_to_segment);
200200
if (!success_resample) {
201201
warn_throttle("[setReferenceTrajectory] spline error when resampling by distance");
202202
return;
@@ -233,7 +233,7 @@ void MPC::setReferenceTrajectory(
233233
*/
234234
if (param.extend_trajectory_for_end_yaw_control) {
235235
MPCUtils::extendTrajectoryInYawDirection(
236-
mpc_traj_raw.yaw.back(), param.traj_resample_dist, m_is_forward_shift, mpc_traj_smoothed);
236+
m_mpc_traj_raw.yaw.back(), param.traj_resample_dist, m_is_forward_shift, mpc_traj_smoothed);
237237
}
238238

239239
// calculate yaw angle

0 commit comments

Comments
 (0)