diff --git a/source/RobotAPI/interface/armem/commit.ice b/source/RobotAPI/interface/armem/commit.ice index 526188ecf649745cb52e1fd00212d48c602cfcee..17260a2136d2cc4c24d1ecd06f5f77ecbcb7f8c0 100644 --- a/source/RobotAPI/interface/armem/commit.ice +++ b/source/RobotAPI/interface/armem/commit.ice @@ -34,10 +34,10 @@ module armarx { armem::data::MemoryID entityID; aron::data::dto::AronDictSeq instancesData; - long timeCreatedMicroSeconds; + armarx::core::time::dto::DateTime timeCreated; float confidence = 1.0; - long timeSentMicroSeconds = -1; + armarx::core::time::dto::DateTime timeSent; }; sequence<EntityUpdate> EntityUpdateList; @@ -46,7 +46,7 @@ module armarx bool success = false; armem::data::MemoryID snapshotID; - long timeArrivedMicroSeconds; + armarx::core::time::dto::DateTime timeArrived; string errorMessage; }; diff --git a/source/RobotAPI/interface/armem/memory.ice b/source/RobotAPI/interface/armem/memory.ice index a4cdd0cde1de4f553fd4181f6515e1fd4255ae01..617f7043f76019a2c474f588127dbcbd9c4f3991 100644 --- a/source/RobotAPI/interface/armem/memory.ice +++ b/source/RobotAPI/interface/armem/memory.ice @@ -1,5 +1,7 @@ #pragma once +#include <ArmarXCore/interface/core/time.ice> + #include <RobotAPI/interface/aron.ice> @@ -15,7 +17,7 @@ module armarx string coreSegmentName = ""; string providerSegmentName = ""; string entityName = ""; - long timestampMicroSeconds = -1; + armarx::core::time::dto::DateTime timestamp; int instanceIndex = -1; } @@ -36,9 +38,9 @@ module armarx /// Ice Twin of `armarx::armem::EntityInstanceMetadata`. class EntityInstanceMetadata { - long timeCreatedMicroSeconds; - long timeSentMicroSeconds; - long timeArrivedMicroSeconds; + armarx::core::time::dto::DateTime timeCreated; + armarx::core::time::dto::DateTime timeSent; + armarx::core::time::dto::DateTime timeArrived; float confidence = 1.0; }; @@ -57,7 +59,7 @@ module armarx { EntityInstanceSeq instances; }; - dictionary<long, EntitySnapshot> EntityHistory; + dictionary<armarx::core::time::dto::DateTime, EntitySnapshot> EntityHistory; /// Ice Twin of `armarx::armem::Entity`.