Merge remote-tracking branch 'origin/master' into skills/dev

source/RobotAPI/components/armem/client/ExampleMemoryClient/CMakeLists.txt

@@ -10,7 +10,8 @@ set(COMPONENT_LIBS
     RobotAPICore RobotAPIInterfaces
     armem
     aronopencvconverter aronjsonconverter
-
+    # ExampleMemory_aron
+    ExampleMemory # actually, the aron version is sufficient
     ${OpenCV_LIBRARIES}
 )
 

source/RobotAPI/libraries/RobotAPIComponentPlugins/HeartbeatComponentPlugin.cpp

@@ -109,11 +109,6 @@ namespace armarx::plugins
     void
     HeartbeatComponentPlugin::preOnInitComponent()
     {
-        // set default args
-        auto warn = armarx::core::time::Duration::MilliSeconds(p.maximumCycleTimeWarningMS);
-        auto err = armarx::core::time::Duration::MilliSeconds(p.maximumCycleTimeErrorMS);
-        armarx::core::time::toIce(defaultHeartbeatArgs.maximumCycleTimeWarning, warn);
-        armarx::core::time::toIce(defaultHeartbeatArgs.maximumCycleTimeError, err);
         // defaultHeartbeatArgs.requiredByDefault = true;
 
         //        if (topicName.empty())
@@ -126,6 +121,11 @@ namespace armarx::plugins
     void
     HeartbeatComponentPlugin::postOnInitComponent()
     {
+        // set default args
+        auto warn = armarx::core::time::Duration::MilliSeconds(p.maximumCycleTimeWarningMS);
+        auto err = armarx::core::time::Duration::MilliSeconds(p.maximumCycleTimeErrorMS);
+        armarx::core::time::toIce(defaultHeartbeatArgs.maximumCycleTimeWarning, warn);
+        armarx::core::time::toIce(defaultHeartbeatArgs.maximumCycleTimeError, err);
     }
 
     void