Merge branch 'increase_o3r_set_timeout' into 'main'

Increase O3R::Set timeout to 15 seconds See merge request syntron/support/csr/ifm3d/ifm3d!360
ifm · Feb 6, 2024 · 0939603 · 0939603
2 parents 4a8b728 + 28fb40a
commit 0939603
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -14,6 +14,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ### Changes
 - Use .deb files in Dockerfile instead of building from sources
+- Increase timeout for O3R set calls up to 15s
 
 ### Fixed
 - Fix installation prefix [issue](https://github.com/ifm/ifm3d/issues/434) from tools

diff --git a/modules/device/include/ifm3d/device/o3r.h b/modules/device/include/ifm3d/device/o3r.h
@@ -10,7 +10,10 @@
 
 namespace ifm3d
 {
-  static const int NET_WAIT_O3R_SET = 10000;
+  static const int NET_WAIT_O3R_SET =
+    std::getenv("IFM3D_NET_WAIT_O3R_SET") == nullptr ?
+      15000 :
+      std::stoi(std::getenv("IFM3D_NET_WAIT_O3R_SET"));
 
   /** @ingroup Device */
   struct IFM3D_DEVICE_EXPORT PortInfo

diff --git a/modules/device/src/libifm3d_device/xmlrpc_wrapper.hpp b/modules/device/src/libifm3d_device/xmlrpc_wrapper.hpp
@@ -24,7 +24,9 @@
 
 namespace ifm3d
 {
-  const int NET_WAIT = 3000; // millis
+  const int NET_WAIT = std::getenv("IFM3D_NET_WAIT") == nullptr ?
+                         3000 :
+                         std::stoi(std::getenv("IFM3D_NET_WAIT")); // millis
 
   const std::string XMLRPC_MAIN = "/api/rpc/v1/com.ifm.efector/";