Skip to content
Snippets Groups Projects
Commit 78803028 authored by Fabian Tërnava's avatar Fabian Tërnava
Browse files

Merge remote-tracking branch 'origin/armem/readd_time_created' into fabianpk

# Conflicts:
#	source/RobotAPI/libraries/armem/core/base/EntityInstanceBase.h
parents 8bdeb379 79726473
No related branches found
No related tags found
No related merge requests found
...@@ -44,7 +44,9 @@ namespace armarx::armem::base ...@@ -44,7 +44,9 @@ namespace armarx::armem::base
*/ */
struct EntityInstanceMetadata : public Metadata struct EntityInstanceMetadata : public Metadata
{ {
/// /// Time when this value was created.
Time createdTime;
/** /**
* @brief Time this instance refers to. * @brief Time this instance refers to.
* *
...@@ -56,6 +58,7 @@ namespace armarx::armem::base ...@@ -56,6 +58,7 @@ namespace armarx::armem::base
/// Time when this value was sent to the memory. /// Time when this value was sent to the memory.
Time sentTime = Time::Invalid(); Time sentTime = Time::Invalid();
/// Time when this value has arrived at the memory. /// Time when this value has arrived at the memory.
Time arrivedTime = Time::Invalid(); Time arrivedTime = Time::Invalid();
......
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