Merge branch 'master' of gitlab.com:ArmarX/skills/Navigation into aron/dev

scenarios/PlatformNavigation/config/ObjectMemory.cfg

@@ -487,6 +487,31 @@
 # ArmarX.ObjectMemory.mem.inst.visu.oobbs = false
 
 
+# ArmarX.ObjectMemory.mem.inst.visu.predictions.linear.show:  Show arrows linearly predicting object positions.
+#  Attributes:
+#  - Default:            false
+#  - Case sensitivity:   yes
+#  - Required:           no
+#  - Possible values: {0, 1, false, no, true, yes}
+# ArmarX.ObjectMemory.mem.inst.visu.predictions.linear.show = false
+
+
+# ArmarX.ObjectMemory.mem.inst.visu.predictions.linear.timeOffset:  The offset (in seconds) to the current time to make predictions for.
+#  Attributes:
+#  - Default:            1
+#  - Case sensitivity:   yes
+#  - Required:           no
+# ArmarX.ObjectMemory.mem.inst.visu.predictions.linear.timeOffset = 1
+
+
+# ArmarX.ObjectMemory.mem.inst.visu.predictions.linear.timeWindow:  The time window (in seconds) into the past to perform the regression on.
+#  Attributes:
+#  - Default:            2
+#  - Case sensitivity:   yes
+#  - Required:           no
+# ArmarX.ObjectMemory.mem.inst.visu.predictions.linear.timeWindow = 2
+
+
 # ArmarX.ObjectMemory.mem.inst.visu.useArticulatedModels:  Prefer articulated object models if available.
 #  Attributes:
 #  - Default:            true
@@ -634,28 +659,20 @@
 # ArmarX.ObjectMemory.mns.MemoryNameSystemName = MemoryNameSystem
 
 
-# ArmarX.ObjectMemory.tpc.pub.DebugObserver:  Name of the `DebugObserver` topic to publish data to.
-#  Attributes:
-#  - Default:            DebugObserver
-#  - Case sensitivity:   yes
-#  - Required:           no
-# ArmarX.ObjectMemory.tpc.pub.DebugObserver = DebugObserver
-
-
-# ArmarX.ObjectMemory.tpc.pub.MemoryListener:  Name of the `MemoryListener` topic to publish data to.
+# ArmarX.ObjectMemory.prediction.TimeWindow:  Duration of time window into the past to use for predictions when requested via the PredictingMemoryInterface (in seconds).
 #  Attributes:
-#  - Default:            MemoryUpdates
+#  - Default:            2
 #  - Case sensitivity:   yes
 #  - Required:           no
-# ArmarX.ObjectMemory.tpc.pub.MemoryListener = MemoryUpdates
+# ArmarX.ObjectMemory.prediction.TimeWindow = 2
 
 
-# ArmarX.ObjectMemory.tpc.sub.MemoryListener:  Name of the `MemoryListener` topic to subscribe to.
+# ArmarX.ObjectMemory.tpc.pub.DebugObserver:  Name of the `DebugObserver` topic to publish data to.
 #  Attributes:
-#  - Default:            MemoryUpdates
+#  - Default:            DebugObserver
 #  - Case sensitivity:   yes
 #  - Required:           no
-# ArmarX.ObjectMemory.tpc.sub.MemoryListener = MemoryUpdates
+# ArmarX.ObjectMemory.tpc.pub.DebugObserver = DebugObserver
 
 
 # ArmarX.ObjectMemory.tpc.sub.ObjectPoseTopic:  Name of the `ObjectPoseTopic` topic to subscribe to.

scenarios/PlatformNavigation/config/example_client.cfg

@@ -154,7 +154,7 @@
 
 # ArmarX.ExampleClient.nav.NavigatorName:  Name of the Navigator
 #  Attributes:
-#  - Default:            Navigator
+#  - Default:            navigator
 #  - Case sensitivity:   yes
 #  - Required:           no
 ArmarX.ExampleClient.nav.NavigatorName = navigator
@@ -176,14 +176,6 @@ ArmarX.ExampleClient.nav.NavigatorName = navigator
 # ArmarX.ExampleClient.robotName = Armar6
 
 
-# ArmarX.ExampleClient.tpc.sub.MemoryListener:  Name of the `MemoryListener` topic to subscribe to.
-#  Attributes:
-#  - Default:            MemoryUpdates
-#  - Case sensitivity:   yes
-#  - Required:           no
-# ArmarX.ExampleClient.tpc.sub.MemoryListener = MemoryUpdates
-
-
 # ArmarX.LoadLibraries:  Libraries to load at start up of the application. Must be enabled by the Application with enableLibLoading(). Format: PackageName:LibraryName;... or /absolute/path/to/library;...
 #  Attributes:
 #  - Default:            ""

scenarios/PlatformNavigation/config/navigator.cfg

@@ -344,12 +344,12 @@ ArmarX.Navigator.mem.vision.occupancy_grid.Memory = Vision
 ArmarX.Navigator.p.occupancy_grid.occopied_threshold = 0.8
 
 
-# ArmarX.Navigator.tpc.sub.MemoryListener:  Name of the `MemoryListener` topic to subscribe to.
+# ArmarX.Navigator.p.robotName:  
 #  Attributes:
-#  - Default:            MemoryUpdates
+#  - Default:            Armar6
 #  - Case sensitivity:   yes
 #  - Required:           no
-# ArmarX.Navigator.tpc.sub.MemoryListener = MemoryUpdates
+# ArmarX.Navigator.p.robotName = Armar6
 
 
 # ArmarX.RedirectStdout:  Redirect std::cout and std::cerr to ArmarXLog