diff --git a/source/RobotAPI/GraspingWithTorques/GraspingWithTorques.cpp b/source/RobotAPI/GraspingWithTorques/GraspingWithTorques.cpp index 9d5477b5501d5740ca34e3fdd6930c70f4b49a9d..c10bcd492fabb0c7db8aa33a9c8d776f76793e39 100644 --- a/source/RobotAPI/GraspingWithTorques/GraspingWithTorques.cpp +++ b/source/RobotAPI/GraspingWithTorques/GraspingWithTorques.cpp @@ -131,7 +131,7 @@ namespace armarx SingleTypeVariantList dataFields(VariantType::DatafieldRef); - for (int i=0; i<nodeSet->getSize(); i++) + for (size_t i=0; i<nodeSet->getSize(); i++) { jointNames.addVariant(nodeSet->getNode(i)->getName()); //nodes = joints dataFields.addVariant(context->getDatafieldRef(tempChannelRef, nodeSet->getNode(i)->getName())); @@ -369,7 +369,7 @@ namespace armarx //set joint velocities manually to zero (DEBUG) //--------- - RobotStatechartContext* rsContext = getContext<RobotStatechartContext>(); + //RobotStatechartContext* rsContext = getContext<RobotStatechartContext>(); SingleTypeVariantListPtr jointNames = getInput<SingleTypeVariantList>("jointNames"); //SingleTypeVariantListPtr jointTorquesGraspList = getInput<SingleTypeVariantList>("jointTorquesGrasp"); NameValueMap jointNamesAndValues; @@ -381,11 +381,7 @@ namespace armarx //rsContext->kinematicUnitPrx->setJointTorques(jointNamesAndValues); - //rsContext->kinematicUnitPrx->setJointVelocities(jointNamesAndValues); //Auskommentiert nach letztem Test MP 2014-02-20 - - - } } diff --git a/source/RobotAPI/OpenHand/OpenHand.cpp b/source/RobotAPI/OpenHand/OpenHand.cpp index e756c1b24f086bdb324245f0760ee39bdf9f3e22..a78a7cb41e6c2098a97830268bda2967ff5cb84b 100644 --- a/source/RobotAPI/OpenHand/OpenHand.cpp +++ b/source/RobotAPI/OpenHand/OpenHand.cpp @@ -88,7 +88,7 @@ namespace armarx SingleTypeVariantList dataFields(VariantType::DatafieldRef); - for (int i=0; i<nodeSet->getSize(); i++) + for (size_t i=0; i<nodeSet->getSize(); i++) { jointNames.addVariant(nodeSet->getNode(i)->getName()); //nodes = joints dataFields.addVariant(context->getDatafieldRef(tempChannelRef, nodeSet->getNode(i)->getName())); diff --git a/source/RobotAPI/motioncontrol/MotionControl.cpp b/source/RobotAPI/motioncontrol/MotionControl.cpp index b99a21ea97860b0b86f73564b8ddb3ec9c9939ff..644d0dcc4445cb3c6b2899e6dab34d9e6190f1e4 100644 --- a/source/RobotAPI/motioncontrol/MotionControl.cpp +++ b/source/RobotAPI/motioncontrol/MotionControl.cpp @@ -483,7 +483,7 @@ void CalculateJointAngleConfiguration::defineParameters() void CalculateJointAngleConfiguration::run() { - RobotStatechartContext* context = getContext<RobotStatechartContext>(); + //RobotStatechartContext* context = getContext<RobotStatechartContext>(); //VirtualRobot::RobotPtr robot(new RemoteRobot(context->robotStateComponent->getRobotSnapshot("CalculateTCPPoseTime"))); // TODO: with the following line, the IK doesn't find a solution, so this terrible hack must be used. Fix it!!! diff --git a/source/RobotAPI/motioncontrol/ZeroForceControl.cpp b/source/RobotAPI/motioncontrol/ZeroForceControl.cpp index 16f32e51b576b3e66a9f289ebf4fb6cf4cde8f00..f300daa87dc5631051d93c2f4a493b9754d9a946 100644 --- a/source/RobotAPI/motioncontrol/ZeroForceControl.cpp +++ b/source/RobotAPI/motioncontrol/ZeroForceControl.cpp @@ -125,7 +125,7 @@ namespace armarx { ARMARX_CHECK_EXPRESSION(vel->frame == curAcc->frame); ARMARX_CHECK_EXPRESSION(vel->frame == curForce->frame); float forceThreshold = 2.0f; - float maxSensitivity = 2.0f; + //float maxSensitivity = 2.0f; Eigen::Vector3f newVel(3); Eigen::Vector3f newAcc(3); diff --git a/source/RobotAPI/units/TCPControlUnit.cpp b/source/RobotAPI/units/TCPControlUnit.cpp index 2b8cfb88ff45b9065a04d389d50ab1b0a5145a18..9af0f7958f2e266d247a7b85eb01f49dd0c07a96 100644 --- a/source/RobotAPI/units/TCPControlUnit.cpp +++ b/source/RobotAPI/units/TCPControlUnit.cpp @@ -631,14 +631,12 @@ namespace armarx while (step<maxNStep); float bestJVError = std::numeric_limits<float>::max(); - int bestIndex = -1; for(unsigned int i=0; i < jointDeltaIterations.size(); i++) { if(jointDeltaIterations.at(i).first < bestJVError) { bestJVError = jointDeltaIterations.at(i).first; dThetaSum = jointDeltaIterations.at(i).second; - bestIndex = i; } } // ARMARX_INFO << "best try: " << bestIndex << " with error: " << bestJVError;