Skip to content
Snippets Groups Projects
Commit 46db7efd authored by Christoph Pohl's avatar Christoph Pohl Committed by armar-user
Browse files

Fix inconsistent timestamps in RobotStateComponent

parent bf73ac0c
No related branches found
No related tags found
No related merge requests found
......@@ -37,6 +37,8 @@
#include <ArmarXCore/core/rapidxml/wrapper/RapidXmlReader.h>
#include <ArmarXCore/core/system/ArmarXDataPath.h>
#include <ArmarXCore/core/time/TimeUtil.h>
#include <RobotAPI/components/units/RobotUnit/util/RtTiming.h>
#include <RobotAPI/components/units/RobotUnit/util/NonRtTiming.h>
using namespace Eigen;
......@@ -296,10 +298,10 @@ namespace armarx
{
if (timestamp <= 0)
{
timestamp = IceUtil::Time::now().toMicroSeconds();
timestamp = armarx::rtNow().toMicroSeconds();
}
IceUtil::Time time = IceUtil::Time::microSeconds(timestamp);
IceUtil::Time time = mapRtTimestampToNonRtTimestamp(IceUtil::Time::microSeconds(timestamp));
ARMARX_DEBUG << deactivateSpam(1) << "Got new jointangles: " << jointAngles
<< " from timestamp " << time.toDateTime()
......
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