diff --git a/src/FootTrajectoryGeneration/LeftAndRightFootTrajectoryGenerationMultiple.cpp b/src/FootTrajectoryGeneration/LeftAndRightFootTrajectoryGenerationMultiple.cpp index 26bb64b95a5881326b534b05b6095d20205666ab..f3e414b1d2c6c8892602ca1654d48b580cf2c20b 100644 --- a/src/FootTrajectoryGeneration/LeftAndRightFootTrajectoryGenerationMultiple.cpp +++ b/src/FootTrajectoryGeneration/LeftAndRightFootTrajectoryGenerationMultiple.cpp @@ -148,13 +148,6 @@ void LeftAndRightFootTrajectoryGenerationMultiple::SetAnInterval(unsigned int In FootInitialPosition.dtheta); // Omega - static int cunt = 1 ; - cout << "m_omega" << m_Omega << endl ; - cout << "Init omega = " << FootInitialPosition.omega << endl ; - cout << "Final omega = " << FootFinalPosition.omega << endl ; - cout << "set plynoome : " << cunt << endl; - cout << "####" << endl ; - cunt++; aFTGM->SetParametersWithInitPosInitSpeed(IntervalIndex, FootTrajectoryGenerationStandard::OMEGA_AXIS, m_DeltaTj[IntervalIndex], diff --git a/src/ZMPRefTrajectoryGeneration/DynamicFilter.hh b/src/ZMPRefTrajectoryGeneration/DynamicFilter.hh index 94f672c77637ee8f97fc4a2115ab592092ba86b4..e909b571de568908627589f54be1b4901b0fb92a 100644 --- a/src/ZMPRefTrajectoryGeneration/DynamicFilter.hh +++ b/src/ZMPRefTrajectoryGeneration/DynamicFilter.hh @@ -130,6 +130,9 @@ namespace PatternGeneratorJRL void InverseDynamics(deque<ZMPPosition> inputZMPTraj_deq); metapod::Vector3dTpl< LocalFloatType >::Type computeCoM(); + + void computeWaist(const FootAbsolutePosition & inputLeftFoot) ; + // ------------------------------------------------------------------- public: // The accessors diff --git a/src/ZMPRefTrajectoryGeneration/OrientationsPreview.cpp b/src/ZMPRefTrajectoryGeneration/OrientationsPreview.cpp index b07c0e8474893c3f63dcacdac3b8e55dc2fcbf2d..bb1f2c4ca6c8052b9ccd216ea5f4868dd93a9775 100644 --- a/src/ZMPRefTrajectoryGeneration/OrientationsPreview.cpp +++ b/src/ZMPRefTrajectoryGeneration/OrientationsPreview.cpp @@ -62,15 +62,8 @@ OrientationsPreview::OrientationsPreview(CjrlHumanoidDynamicRobot *aHS) uLimitRightHipYaw_ = 45.0/180.0*M_PI; } - cout << "lLimitLeftHipYaw_ = " << lLimitLeftHipYaw_ * 180/M_PI << endl - << "uLimitLeftHipYaw_ = " << uLimitLeftHipYaw_ * 180/M_PI << endl - << "lLimitRightHipYaw_ = " << lLimitRightHipYaw_ * 180/M_PI << endl - << "uLimitRightHipYaw_ = " << uLimitRightHipYaw_ * 180/M_PI << endl ; - uvLimitFoot_ = fabs(leftHip->upperVelocityBound(0)); - cout << "upper velocity Limit Foot_ = " << uvLimitFoot_ << endl ; - //Acceleration limit not given by HRP2JRLmain.wrl uaLimitHipYaw_ = 0.1; //Maximal cross angle between the feet