Skip to content
Snippets Groups Projects
Commit c4389a53 authored by Clemens Wallrath's avatar Clemens Wallrath
Browse files

Adapts PIDController to virtual time

parent 8feefb66
No related branches found
No related tags found
No related merge requests found
......@@ -23,6 +23,7 @@
*/
#include "PIDController.h"
#include <ArmarXCore/core/time/TimeUtil.h>
#include <RobotAPI/libraries/core/math/MathUtils.h>
using namespace armarx;
......@@ -50,17 +51,17 @@ void PIDController::reset()
firstRun = true;
previousError = 0;
integral = 0;
lastUpdateTime = IceUtil::Time::now();
lastUpdateTime = TimeUtil::GetTime();
}
void PIDController::update(double measuredValue, double targetValue)
{
ScopedRecursiveLock lock(mutex);
IceUtil::Time now = IceUtil::Time::now();
IceUtil::Time now = TimeUtil::GetTime();
if (firstRun)
{
lastUpdateTime = IceUtil::Time::now();
lastUpdateTime = TimeUtil::GetTime();
}
double dt = (now - lastUpdateTime).toSecondsDouble();
......@@ -219,11 +220,11 @@ void MultiDimPIDController::update(const double deltaSec, const Eigen::VectorXf&
void MultiDimPIDController::update(const Eigen::VectorXf& measuredValue, const Eigen::VectorXf& targetValue)
{
ScopedRecursiveLock lock(mutex);
IceUtil::Time now = IceUtil::Time::now();
IceUtil::Time now = TimeUtil::GetTime();
if (firstRun)
{
lastUpdateTime = IceUtil::Time::now();
lastUpdateTime = TimeUtil::GetTime();
}
double dt = (now - lastUpdateTime).toSecondsDouble();
......@@ -242,7 +243,7 @@ void MultiDimPIDController::reset()
firstRun = true;
previousError = 0;
integral = 0;
lastUpdateTime = IceUtil::Time::now();
lastUpdateTime = TimeUtil::GetTime();
// controlValue.setZero();
// processValue.setZero();
// target.setZero();
......
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