Merge branch 'dev' into 84-make-armarx-use-opencv3-from-source-instead-of-system-packages

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": {}
   }
 }

resources/axii.svg

+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="210mm"
+   height="297mm"
+   viewBox="0 0 210 297"
+   version="1.1"
+   id="svg5"
+   inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
+   sodipodi:docname="drawing.svg"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <sodipodi:namedview
+     id="namedview7"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:document-units="mm"
+     showgrid="false"
+     showguides="false"
+     inkscape:guide-bbox="true"
+     inkscape:zoom="4"
+     inkscape:cx="315.625"
+     inkscape:cy="349.25"
+     inkscape:window-width="2560"
+     inkscape:window-height="1372"
+     inkscape:window-x="0"
+     inkscape:window-y="32"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="layer1">
+    <sodipodi:guide
+       position="84.711796,221.893"
+       orientation="0.8660254,0.5"
+       id="guide1064"
+       inkscape:label=""
+       inkscape:locked="false"
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="123.29086,221.893"
+       orientation="-0.8660254,0.5"
+       id="guide1066"
+       inkscape:label=""
+       inkscape:locked="false"
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="104.00132,188.48256"
+       orientation="1,0"
+       id="guide1068" />
+    <sodipodi:guide
+       position="84.711794,221.89301"
+       orientation="0,-1"
+       id="guide1146" />
+    <sodipodi:guide
+       position="120.71568,216.93701"
+       orientation="0,-1"
+       id="guide1148" />
+    <sodipodi:guide
+       position="112.79579,213.97301"
+       orientation="0,-1"
+       id="guide1150" />
+    <sodipodi:guide
+       position="112.79579,213.973"
+       orientation="-0.8660254,0.5"
+       id="guide1344"
+       inkscape:label=""
+       inkscape:locked="false"
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="93.506267,216.937"
+       orientation="0.8660254,0.5"
+       id="guide1346"
+       inkscape:label=""
+       inkscape:locked="false"
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="104.00132,188.48254"
+       orientation="0.70710678,0.70710678"
+       id="guide7470"
+       inkscape:label=""
+       inkscape:locked="false"
+       inkscape:color="rgb(0,0,255)" />
+    <sodipodi:guide
+       position="123.29087,221.89301"
+       orientation="0.70710678,0.70710678"
+       id="guide7472"
+       inkscape:label=""
+       inkscape:locked="false"
+       inkscape:color="rgb(0,0,255)" />
+  </sodipodi:namedview>
+  <defs
+     id="defs2">
+    <linearGradient
+       id="linearGradient15505"
+       inkscape:swatch="solid">
+      <stop
+         style="stop-color:#00c700;stop-opacity:1;"
+         offset="0"
+         id="stop15503" />
+    </linearGradient>
+  </defs>
+  <g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1">
+    <path
+       style="fill:#00c300;fill-opacity:1;stroke:none;stroke-width:0.664433;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       d="m 76.438732,67.94231 55.125188,1.3e-5 -4.08854,7.081558 H 89.00505 l 14.99627,25.974299 12.56633,-21.739074 h 8.46252 l -21.02885,36.423034 z"
+       id="path16821"
+       sodipodi:nodetypes="ccccccccc"
+       inkscape:export-filename="/home/chris/tmp/axii/path16821.png"
+       inkscape:export-xdpi="230.37788"
+       inkscape:export-ydpi="230.37788" />
+    <rect
+       style="fill:#464646;fill-opacity:1;stroke:none;stroke-width:0.465;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+       id="rect7496"
+       width="148.9034"
+       height="107.48945"
+       x="35.351868"
+       y="39.868008"
+       inkscape:transform-center-x="36.401456"
+       inkscape:transform-center-y="24.603351" />
+    <path
+       style="fill:#343434;stroke:none;stroke-width:0.264583px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;fill-opacity:1"
+       d="M 123.29086,75.106989 H 84.711788 l 19.289532,33.410471 38.84451,38.84451 11.29936,-0.0573 -0.0353,-41.37861 z"
+       id="path8775" />
+    <path
+       style="fill:#00e200;stroke:none;stroke-width:0.465;stroke-linecap:butt;stroke-linejoin:round;stroke-opacity:1;stroke-miterlimit:4;stroke-dasharray:none;fill-opacity:1"
+       d="m 84.71179,75.106991 38.57907,9e-6 -2.86134,4.955991 -26.923259,0 10.495059,18.177974 8.79448,-15.213974 h 5.92245 l -14.71693,25.490469 z"
+       id="path89"
+       sodipodi:nodetypes="ccccccccc" />
+  </g>
+</svg>