Merge branch 'master' into traj

rm-controls · Jul 19, 2024 · a5db247 · a5db247
2 parents 9670317 + 167cde0
commit a5db247
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/rm_chassis_controllers/src/chassis_base.cpp b/rm_chassis_controllers/src/chassis_base.cpp
@@ -198,7 +198,7 @@ void ChassisBase<T...>::follow(const ros::Time& time, const ros::Duration& perio
               roll, pitch, yaw);
     double follow_error = angles::shortest_angular_distance(yaw, 0);
     pid_follow_.computeCommand(-follow_error, period);
-    vel_cmd_.z = pid_follow_.getCurrentCmd();
+    vel_cmd_.z = pid_follow_.getCurrentCmd() + cmd_rt_buffer_.readFromRT()->cmd_chassis_.follow_vel_des;
   }
   catch (tf2::TransformException& ex)
   {