Merge branch 'main' into dev

data/modules/armarx/skills/control.json

@@ -23,7 +23,6 @@
   "required_modules": {
     "apt/gxx-8": {},
 
-    "armarx/RobotAPI": {},
-    "armarx/MemoryX": {}
+    "armarx/RobotAPI": {}
   }
 }

data/modules/armarx_integration/robots/armar6/armar6a-0.json

 {
 
   "required_modules": {
-    "h2t/software/etherkitten": {},
+    "h2t/etherkitten": {},
     "mplib": {},
     "simox": {},
     "armarx/ArmarXCore": {},

data/modules/armarx_integration/robots/armar6/armar6a-3.json

@@ -5,6 +5,8 @@
     "simox": {},
     "armarx": {},
     "armarx_integration/robots/armar6": {},
+    "armarx_integration/object_localization/ivt_armarx": {},
+    "deps/manif": {},
     "h2t/PriorKnowledgeData": {},
     "# armarx_integration/SimTrackArmarX": {}
   }

data/modules/deps/azure-kinect/install-udev-rules.sh

@@ -3,8 +3,16 @@
 source_url="https://raw.githubusercontent.com/microsoft/Azure-Kinect-Sensor-SDK/v1.4.1/scripts/99-k4a.rules"
 destination_path="/etc/udev/rules.d/99-k4a.rules"
 
+host="$(hostname)"
+
+if [[ "$host" == "armar6a-3" ]]; then
+  echo "Skip installing Azure Kinect udev rules for ARMAR-6 vision PC."
+  exit
+fi
+
 if [[ ! -f "$destination_path" ]]; then
   echo "Installing needed udev rules for the Azure Kinect. Running:"
   echo "sudo wget \"$source_url\" -O \"$destination_path\""
   sudo wget "$source_url" -O "$destination_path"
 fi
+

data/modules/deps/hokuyo_laserscanner_driver.json

@@ -12,7 +12,13 @@
   },
   "prepare": {
     "cmake": {
-      "project_name": "HokuyoLaserScannerDriver"
+      "project_name": "HokuyoLaserScannerDriver",
+      "definitions": {
+        "CMAKE_C_COMPILER": "$GCC_8",
+        "CMAKE_CXX_COMPILER": "$GXX_8",
+        "CMAKE_C_COMPILER_LAUNCHER": "",
+        "CMAKE_CXX_COMPILER_LAUNCHER": ""
+      }
     }
   },
   "build": "cmake"

data/modules/h2t/PriorKnowledgeData.json

@@ -27,6 +27,6 @@
     "apt/git-lfs": {},
 
     "armarx/ArmarXCore": {},
-    "armarx/VisionX": {}
+    "# armarx/VisionX": {}
   }
 }