Skip to content

Commit 07704cc

Browse files
committed
WIP
1 parent 47d7301 commit 07704cc

File tree

2 files changed

+203
-185
lines changed

2 files changed

+203
-185
lines changed

cartesian_compliance_controller/include/cartesian_compliance_controller/cartesian_compliance_controller.hpp

+14-14
Original file line numberDiff line numberDiff line change
@@ -216,19 +216,19 @@ CartesianComplianceController<HardwareInterface>::computeComplianceError() {
216216
// bool powder_grounding_flag = true;
217217
bool powder_grounding_flag = false;
218218

219-
Eigen::Matrix<double, 6, 6> jnt_jacobian_eigen;
220-
jnt_jacobian_eigen << Base::m_ik_solver->m_jnt_jacobian.data;
221-
std::cout << "jnt_jacobian_eigen: " << std::endl;
222-
std::cout << jnt_jacobian_eigen << std::endl;
223-
Eigen::Matrix<double, 6, 6> jnt_jacobian_eigen_t_pinv;
224-
jnt_jacobian_eigen_t_pinv = jnt_jacobian_eigen.transpose()
225-
.completeOrthogonalDecomposition()
226-
.pseudoInverse();
227-
228-
Eigen::Matrix<double, 6, 1> jnt_coriolis_eigen;
229-
jnt_coriolis_eigen << Base::m_ik_solver->m_jnt_coriolis.data;
230-
std::cout << "jnt_coriolis_eigen: " << std::endl;
231-
std::cout << jnt_coriolis_eigen << std::endl;
219+
// Eigen::Matrix<double, 6, 6> jnt_jacobian_eigen;
220+
// jnt_jacobian_eigen << Base::m_ik_solver->m_jnt_jacobian.data;
221+
// std::cout << "jnt_jacobian_eigen: " << std::endl;
222+
// std::cout << jnt_jacobian_eigen << std::endl;
223+
// Eigen::Matrix<double, 6, 6> jnt_jacobian_eigen_t_pinv;
224+
// jnt_jacobian_eigen_t_pinv = jnt_jacobian_eigen.transpose()
225+
// .completeOrthogonalDecomposition()
226+
// .pseudoInverse();
227+
228+
// Eigen::Matrix<double, 6, 1> jnt_coriolis_eigen;
229+
// jnt_coriolis_eigen << Base::m_ik_solver->m_jnt_coriolis.data;
230+
// std::cout << "jnt_coriolis_eigen: " << std::endl;
231+
// std::cout << jnt_coriolis_eigen << std::endl;
232232

233233
ctrl::Vector6D net_force;
234234
if (!m_use_parallel_force_position_control)
@@ -367,7 +367,7 @@ CartesianComplianceController<HardwareInterface>::computeComplianceError() {
367367
// Sensor and target force in base orientation
368368
+ ((ctrl::Matrix6D::Identity() - m_selection_matrix) *
369369
ForceBase::computeForceError()
370-
- jnt_jacobian_eigen_t_pinv * jnt_coriolis_eigen
370+
// - jnt_jacobian_eigen_t_pinv * jnt_coriolis_eigen
371371
);
372372
}
373373

0 commit comments

Comments
 (0)