Skip to content
Snippets Groups Projects
Commit 7250eae0 authored by ArmarX User's avatar ArmarX User
Browse files

control tweaks for armar6 head

parent 19adb1f2
No related branches found
No related tags found
No related merge requests found
......@@ -36,7 +36,7 @@ JointPWMPositionController::JointPWMPositionController(const std::string deviceN
posController.positionLimitHi = jointData->getSoftLimitHi();
// controller.positionLimitLoHard = dataPtr->getHardLimitLo();
posController.positionLimitLo = jointData->getSoftLimitLo();
posController.p = 2.0f;
posController.p = 3.0f;
this->isLimitless = jointData->isLimitless();
}
......
......@@ -22,7 +22,7 @@
* GNU General Public License
*/
#include "PWMVelocityController.h"
#include <ArmarXCore/observers/filters/rtfilters/AverageFilter.h>
namespace armarx
{
......@@ -36,6 +36,7 @@ namespace armarx
velocityControllerConfigDataPtr->i,
velocityControllerConfigDataPtr->d));
pid->maxIntegral = velocityControllerConfigDataPtr->maxIntegral;
pid->differentialFilter.reset(new rtfilters::AverageFilter(130));
pid->conditionalIntegralErrorTreshold = velocityControllerConfigDataPtr->conditionalIntegralErrorTreshold;
pid->threadSafe = false;
}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment