Skip to content
Snippets Groups Projects
Commit d343ce1a authored by ARMAR-DE's avatar ARMAR-DE
Browse files

using armarx::rtNow instead of IceUtil::Time

parent de7ab43e
No related branches found
No related tags found
No related merge requests found
...@@ -29,6 +29,7 @@ ...@@ -29,6 +29,7 @@
#include <ArmarXCore/core/ArmarXManager.h> #include <ArmarXCore/core/ArmarXManager.h>
#include <ArmarXCore/core/util/FileSystemPathBuilder.h> #include <ArmarXCore/core/util/FileSystemPathBuilder.h>
#include <ArmarXCore/util/CPPUtility/trace.h> #include <ArmarXCore/util/CPPUtility/trace.h>
#include "RobotAPI/components/units/RobotUnit/util/NonRtTiming.h"
#include "../util/ControlThreadOutputBuffer.h" #include "../util/ControlThreadOutputBuffer.h"
#include "RobotUnitModuleControlThreadDataBuffer.h" #include "RobotUnitModuleControlThreadDataBuffer.h"
......
...@@ -34,6 +34,7 @@ ...@@ -34,6 +34,7 @@
#include "../Devices/SensorDevice.h" #include "../Devices/SensorDevice.h"
#include "../SensorValues/SensorValueBase.h" #include "../SensorValues/SensorValueBase.h"
#include "HeterogenousContinuousContainer.h" #include "HeterogenousContinuousContainer.h"
#include "RtTiming.h"
namespace armarx namespace armarx
{ {
...@@ -50,7 +51,7 @@ namespace armarx::detail ...@@ -50,7 +51,7 @@ namespace armarx::detail
{ {
struct RtMessageLogEntryBase struct RtMessageLogEntryBase
{ {
RtMessageLogEntryBase() : time{IceUtil::Time::now()} RtMessageLogEntryBase() : time{armarx::rtNow()}
{ {
} }
......
...@@ -59,7 +59,7 @@ namespace armarx ...@@ -59,7 +59,7 @@ namespace armarx
*/ */
// //
IceUtil::Time time_real_time = time_monotic_raw - now_monotonic_raw + now_real_time; IceUtil::Time time_real_time = time_monotic_raw - now_monotonic_raw + now_real_time;
ARMARX_DEBUG << VAROUT(time_monotic_raw) << " vs. " << VAROUT(time_real_time);
return time_real_time; return time_real_time;
} }
......
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