Merge remote-tracking branch 'origin/armem/dev' into armem/dev

scenarios/ArMemObjectMemory/config/ObjectMemory.cfg

@@ -215,6 +215,22 @@ ArmarX.AdditionalPackages = ArmarXObjects
 # ArmarX.ObjectMemory.mem.articulated.inst.MaxHistorySize = -1
 
 
+# ArmarX.ObjectMemory.mem.attachments.CoreSegmentName:  Name of the object instance core segment.
+#  Attributes:
+#  - Default:            Attachments
+#  - Case sensitivity:   yes
+#  - Required:           no
+# ArmarX.ObjectMemory.mem.attachments.CoreSegmentName = Attachments
+
+
+# ArmarX.ObjectMemory.mem.attachments.MaxHistorySize:  Maximal size of object poses history (-1 for infinite).
+#  Attributes:
+#  - Default:            -1
+#  - Case sensitivity:   yes
+#  - Required:           no
+# ArmarX.ObjectMemory.mem.attachments.MaxHistorySize = -1
+
+
 # ArmarX.ObjectMemory.mem.cls.CoreSegmentName:  Name of the object clazz core segment.
 #  Attributes:
 #  - Default:            Class
@@ -303,10 +319,10 @@ ArmarX.AdditionalPackages = ArmarXObjects
 
 # ArmarX.ObjectMemory.mem.inst.MaxHistorySize:  Maximal size of object poses history (-1 for infinite).
 #  Attributes:
-#  - Default:            -1
+#  - Default:            25
 #  - Case sensitivity:   yes
 #  - Required:           no
-# ArmarX.ObjectMemory.mem.inst.MaxHistorySize = -1
+# ArmarX.ObjectMemory.mem.inst.MaxHistorySize = 25
 
 
 # ArmarX.ObjectMemory.mem.inst.calibration.offset:  Offset for the node to be calibrated.

source/RobotAPI/libraries/armem_objects/server/instance/Segment.h

@@ -159,7 +159,8 @@ namespace armarx::armem::server::obj::instance
         struct Properties
         {
             std::string coreSegmentName = "Instance";
-            long maxHistorySize = -1;
+            // -1 would be infinite, but this can let the RAM grow quickly.
+            long maxHistorySize = 25;
             bool discardSnapshotsWhileAttached = true;
         };
         Properties p;