Merge remote-tracking branch 'origin/master' into chore/rt-controller-and-simplification

scenarios/PlatformNavigation/config/ObjectMemory.cfg

@@ -691,14 +691,6 @@
 # ArmarX.ObjectMemory.prediction.TimeWindow = 2
 
 
-# ArmarX.ObjectMemory.robotName:  
-#  Attributes:
-#  - Default:            Armar6
-#  - Case sensitivity:   yes
-#  - Required:           no
-# ArmarX.ObjectMemory.robotName = Armar6
-
-
 # ArmarX.ObjectMemory.tpc.pub.DebugObserver:  Name of the `DebugObserver` topic to publish data to.
 #  Attributes:
 #  - Default:            DebugObserver
@@ -781,5 +773,3 @@
 #  - Required:           no
 #  - Possible values: {Debug, Error, Fatal, Important, Info, Undefined, Verbose, Warning}
 # ArmarX.Verbosity = Info
-
-

scenarios/PlatformNavigation/config/navigator.cfg

@@ -335,6 +335,14 @@ ArmarX.Navigator.cmp.PlatformUnit = Armar6PlatformUnit
 ArmarX.Navigator.p.occupancy_grid.occopied_threshold = 0.8
 
 
+# ArmarX.Navigator.p.robotName:  
+#  Attributes:
+#  - Default:            Armar6
+#  - Case sensitivity:   yes
+#  - Required:           no
+# ArmarX.Navigator.p.robotName = Armar6
+
+
 # ArmarX.RedirectStdout:  Redirect std::cout and std::cerr to ArmarXLog
 #  Attributes:
 #  - Default:            true
@@ -401,5 +409,3 @@ ArmarX.Navigator.p.occupancy_grid.occopied_threshold = 0.8
 #  - Required:           no
 #  - Possible values: {Debug, Error, Fatal, Important, Info, Undefined, Verbose, Warning}
 ArmarX.Verbosity = Verbose
-
-