Skip to content

Commit 4de5d79

Browse files
committed
Remove small number noise from substraction
1 parent e788915 commit 4de5d79

File tree

1 file changed

+14
-2
lines changed

1 file changed

+14
-2
lines changed

admittance_controller/src/admittance_rule.cpp

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,11 @@ controller_interface::return_type AdmittanceRule::update(
242242
pose_error_vec[i] = angles::normalize_angle(current_pose_control_frame_arr_[i]) -
243243
angles::normalize_angle(target_pose_control_frame_arr_[i]);
244244
}
245+
if (pose_error_vec[i] < 1e-10) {
246+
pose_error_vec[i] = 0;
247+
}
248+
// RCLCPP_INFO(rclcpp::get_logger("AdmittanceRule"),
249+
// "Pose error [%zu]: %e", pose_error_vec[i]);
245250
}
246251

247252
process_force_measurements(measured_force);
@@ -321,6 +326,7 @@ controller_interface::return_type AdmittanceRule::update(
321326

322327
// Get the target pose
323328
geometry_msgs::msg::PoseStamped target_pose;
329+
target_pose.header.frame_id = ik_tip_frame_;
324330
target_pose.pose.position.x = target_ik_tip_deltas_vec.at(0);
325331
target_pose.pose.position.y = target_ik_tip_deltas_vec.at(1);
326332
target_pose.pose.position.z = target_ik_tip_deltas_vec.at(2);
@@ -331,7 +337,13 @@ controller_interface::return_type AdmittanceRule::update(
331337
target_pose.pose.orientation.x = q.x();
332338
target_pose.pose.orientation.y = q.y();
333339
target_pose.pose.orientation.z = q.z();
334-
target_pose.header.frame_id = ik_tip_frame_;
340+
341+
// RCLCPP_INFO(rclcpp::get_logger("AdmittanceRule"),
342+
// "IK-tip deltas: x: %e, y: %e, z: %e, rx: %e, ry: %e, rz: %e",
343+
// target_ik_tip_deltas_vec.at(0), target_ik_tip_deltas_vec.at(1),
344+
// target_ik_tip_deltas_vec.at(2), target_ik_tip_deltas_vec.at(3),
345+
// target_ik_tip_deltas_vec.at(4), target_ik_tip_deltas_vec.at(5)
346+
// );
335347

336348
return update(current_joint_state, measured_force, target_pose, period, desired_joint_state);
337349
}
@@ -460,7 +472,7 @@ void AdmittanceRule::calculate_admittance_rule(
460472
desired_acceleration_previous_arr_[i] = acceleration;
461473
desired_velocity_previous_arr_[i] = desired_velocity_arr_[i];
462474

463-
// RCLCPP_INFO(rclcpp::get_logger("AR"), "Pose error, acceleration, desired velocity, relative desired pose [%zu]: (%f - D*%f - S*%f = %f), %f, %f", i, measured_force_control_frame_arr_[i], desired_velocity_arr_[i], pose_error , acceleration, desired_velocity_arr_[i], relative_desired_pose_arr_[i]);
475+
RCLCPP_INFO(rclcpp::get_logger("AR"), "Pose error, acceleration, desired velocity, relative desired pose [%zu]: (%e - D*%e - S*%e = %e)", i, measured_force[i], desired_velocity_arr_[i], pose_error , acceleration);
464476
}
465477
}
466478
}

0 commit comments

Comments
 (0)