Skip to content

Commit 3076806

Browse files
author
Thibault Poignonec
committed
minor fixes
1 parent b8bc1d0 commit 3076806

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

cartesian_vic_controller/include/cartesian_vic_controller/cartesian_vic_state.hpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,10 @@ class VicInputData
5858
nullspace_joint_stiffness = Eigen::VectorXd::Zero(num_joints);
5959
nullspace_joint_damping = Eigen::VectorXd::Zero(num_joints);
6060

61-
// Allocate cartesian state
61+
// Reset cartesian state
62+
robot_current_velocity.setZero();
63+
robot_estimated_acceleration.setZero();
64+
robot_current_wrench_at_ft_frame_.setZero();
6265
/*
6366
natural_joint_space_inertia = \
6467
Eigen::Matrix<double, Eigen::Dynamic, Eigen::Dynamic>::Zero(num_joints, num_joints);
@@ -150,6 +153,7 @@ class VicInputData
150153
// Cartesian state (control frame w.r.t. robot base frame)
151154
Eigen::Isometry3d robot_current_pose;
152155
Eigen::Matrix<double, 6, 1> robot_current_velocity;
156+
Eigen::Matrix<double, 6, 1> robot_estimated_acceleration;
153157

154158
/// Natural inertia matrix (from dynamic model)
155159
// Eigen::Matrix<double, 6, 6> natural_cartesian_inertia;

cartesian_vic_controller/src/cartesian_vic_state.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,7 @@ VicState::to_msg(cartesian_control_msgs::msg::VicControllerState & vic_state_msg
7171
if (input_data.has_ft_sensor()) {
7272
vic_state_msg.wrench = WrenchToMsg(input_data.get_ft_sensor_wrench());
7373
} else {
74+
// TODO(tpoignonec): add flag to say if the ft sensor is available!
7475
vic_state_msg.wrench.force.x = 0.0;
7576
vic_state_msg.wrench.force.y = 0.0;
7677
vic_state_msg.wrench.force.z = 0.0;

0 commit comments

Comments
 (0)