From c4262cb03d7a2d2175f0065e32f0103df05a9bc7 Mon Sep 17 00:00:00 2001 From: Martin Pecka Date: Mon, 29 Mar 2021 20:33:12 +0200 Subject: [PATCH 1/3] Absolem: Sync Xacro: Change IMU and friction parameters in Xacro to correspond to the desired values in SDF. --- .../urdf/nifti_robot.xacro | 74 ++++++++++--------- 1 file changed, 40 insertions(+), 34 deletions(-) diff --git a/submitted_models/ctu_cras_norlab_absolem_sensor_config_1/urdf/nifti_robot.xacro b/submitted_models/ctu_cras_norlab_absolem_sensor_config_1/urdf/nifti_robot.xacro index 18ed7c6b..7c6164d3 100644 --- a/submitted_models/ctu_cras_norlab_absolem_sensor_config_1/urdf/nifti_robot.xacro +++ b/submitted_models/ctu_cras_norlab_absolem_sensor_config_1/urdf/nifti_robot.xacro @@ -1185,9 +1185,9 @@ - 1 + 0.5 1 - 0.035 + 0.00092 0 0 0 1 @@ -1205,9 +1205,9 @@ - 1 + 0.5 1 - 0.035 + 0.00092 0 0 0 1 @@ -1572,31 +1572,34 @@ 0 - 2e-4 - 0.0000075 - 0.0000008 - 0.0000004 - 1000.0 + 0.009 + 0.00075 + 0.005 + 0.00002 + 400.0 + 0.00025 0 - 2e-4 - 0.0000075 - 0.0000008 - 0.0000004 - 1000.0 + 0.009 + 0.00075 + 0.005 + 0.00002 + 400.0 + 0.00025 0 - 2e-4 - 0.0000075 - 0.0000008 - 0.0000004 - 1000.0 + 0.009 + 0.00075 + 0.005 + 0.00002 + 400.0 + 0.00025 @@ -1604,31 +1607,34 @@ 0 - 1e-2 - 0.1 - 0.001 - 0.002 - 300.0 + 0.021 + 0.05 + 0.0075 + 0.000375 + 175.0 + 0.005 0 - 1e-2 - 0.1 - 0.001 - 0.002 - 300.0 + 0.021 + 0.05 + 0.0075 + 0.000375 + 175.0 + 0.005 0 - 1e-2 - 0.1 - 0.001 - 0.002 - 300.0 + 0.021 + 0.05 + 0.0075 + 0.000375 + 175.0 + 0.005 From a325360cd0b4fa857bc39fa02045cb79d14102e7 Mon Sep 17 00:00:00 2001 From: Martin Pecka Date: Sun, 4 Apr 2021 22:52:56 +0200 Subject: [PATCH 2/3] Absolem: Sync Xacro: Re-generate model.sdf using libsdformat 8.9.1 . This commit makes no real change to the geometry of the model, it just represents some numbers and rotations differently. --- .../model.sdf | 164 +++++++++--------- .../scripts/update_robot_sdf | 6 +- 2 files changed, 87 insertions(+), 83 deletions(-) diff --git a/submitted_models/ctu_cras_norlab_absolem_sensor_config_1/model.sdf b/submitted_models/ctu_cras_norlab_absolem_sensor_config_1/model.sdf index 795fd5d6..6e67f63c 100644 --- a/submitted_models/ctu_cras_norlab_absolem_sensor_config_1/model.sdf +++ b/submitted_models/ctu_cras_norlab_absolem_sensor_config_1/model.sdf @@ -79,7 +79,7 @@ - -0.39064 0.0789 0.1551 3.1415926535897931 1.5707963267948966 3.1415926535897931 + -0.39064 0.0789 0.1551 0 1.5707963267948966 0 0.03718 @@ -235,7 +235,7 @@ - 0 0 0.15 -3.1415926535897931 -0 0 + 0 0 0.15 -3.1415926535897931 0 0 0.005 0.005 0.005 @@ -341,7 +341,7 @@ - -0.01735 -0.055429 0.314721 -1.5725 0.00415 1.56975 + -0.01735 -0.055429 0.314721 -1.5725 0.00415 1.56974 0.005 0.005 0.005 @@ -349,7 +349,7 @@ - -0.01735 -0.055429 0.314721 -0.001705 0.00415 1.56975 + -0.01735 -0.055429 0.314721 -0.001705 0.00415 1.56974 0.005 0.005 0.005 @@ -397,7 +397,7 @@ - 0.024083 -0.058382 0.376328 3.1415926535897931 -1.5707963267948966 0.945143 + 0.024083 -0.058382 0.376328 -2.19645 -1.5707963267948966 0 0.005 0.005 0.005 @@ -474,7 +474,7 @@ - 0.133719 -0.010853 0.422031 2.07031 -0.013168 1.56329 + 0.133719 -0.010853 0.422031 2.07031 -0.013167 1.56329 meshes/realsense_d435.dae @@ -639,77 +639,77 @@ 1 50 - - - - 0 - 0.009 - 0.00075 - 0.005 - 0.00002 - 400.0 - 0.00025 - - - - - 0 - 0.009 - 0.00075 - 0.005 - 0.00002 - 400.0 - 0.00025 - - - - - 0 - 0.009 - 0.00075 - 0.005 - 0.00002 - 400.0 - 0.00025 - - - - - - - 0 - 0.021 - 0.05 - 0.0075 - 0.000375 - 175.0 - 0.005 - - - - - 0 - 0.021 - 0.05 - 0.0075 - 0.000375 - 175.0 - 0.005 - - - - - 0 - 0.021 - 0.05 - 0.0075 - 0.000375 - 175.0 - 0.005 - - - - + + + + 0 + 0.009 + 0.00075 + 0.005 + 2e-05 + 400 + 0.00025 + + + + + 0 + 0.009 + 0.00075 + 0.005 + 2e-05 + 400 + 0.00025 + + + + + 0 + 0.009 + 0.00075 + 0.005 + 2e-05 + 400 + 0.00025 + + + + + + + 0 + 0.021 + 0.05 + 0.0075 + 0.000375 + 175 + 0.005 + + + + + 0 + 0.021 + 0.05 + 0.0075 + 0.000375 + 175 + 0.005 + + + + + 0 + 0.021 + 0.05 + 0.0075 + 0.000375 + 175 + 0.005 + + + + 0 0 0.15 -3.1415926535897931 -0 0 @@ -996,7 +996,7 @@ - 0.2502 0 0.1407 -3.1415926535897931 -0 0 + 0.2502 0 0.1407 -3.1415926535897931 0 0 0 0 -0.04 0 -0 0 1.1 @@ -1179,7 +1179,7 @@ - 0 0 0 -2.95744 0 1.5707963267948966 + 0 0 0 -2.95743 -0 1.5707963267948966 meshes/flipper.dae @@ -1986,7 +1986,7 @@ - 0 0 0 -2.95744 0 1.5707963267948966 + 0 0 0 -2.95743 -0 1.5707963267948966 meshes/flipper.dae @@ -2408,7 +2408,7 @@ - 0 0 0 -2.95744 -0 -1.5707963267948966 + 0 0 0 -2.95743 -0 -1.5707963267948966 meshes/flipper.dae @@ -2759,7 +2759,7 @@ - 0 0 0 -2.95744 -0 -1.5707963267948966 + 0 0 0 -2.95743 -0 -1.5707963267948966 meshes/flipper.dae diff --git a/submitted_models/ctu_cras_norlab_absolem_sensor_config_1/scripts/update_robot_sdf b/submitted_models/ctu_cras_norlab_absolem_sensor_config_1/scripts/update_robot_sdf index 1af4597a..b653f31b 100755 --- a/submitted_models/ctu_cras_norlab_absolem_sensor_config_1/scripts/update_robot_sdf +++ b/submitted_models/ctu_cras_norlab_absolem_sensor_config_1/scripts/update_robot_sdf @@ -7,8 +7,12 @@ MODEL_DIR="${DIR}/.." source "${MODEL_DIR}/config/common.sh" source "${MODEL_DIR}/config/sdf.sh" +sdf8_version="$(ign sdf --versions | grep '^8')" || true +[ -z "$sdf8_version" ] && echo "libsdformat8 not found. It is required to update this robot's SDF. Please install libsdformat8-dev and try again." >&2 && exit 1 +echo "Found libsdformat ${sdf8_version}" >&2 + rosrun xacro xacro "${MODEL_DIR}/urdf/nifti_robot.xacro" ${config} > "${MODEL_DIR}/nifti_robot.sdf.urdf" -ign sdf -p "${MODEL_DIR}/nifti_robot.sdf.urdf" | "${DIR}/high_precision_constants.py" - > "${MODEL_DIR}/model.sdf" +ign sdf --force-version "$sdf8_version" -p "${MODEL_DIR}/nifti_robot.sdf.urdf" | "${DIR}/high_precision_constants.py" - > "${MODEL_DIR}/model.sdf" sed -i -e 's#model://ctu_cras_norlab_absolem_sensor_config_1/##g' \ -e '//{:a;N;/<\/surface>/!ba};/\n\s*\n\s*\n\s*<\/contact>\n\s*\n\s*\n\s*<\/friction>\n\s*<\/surface>/d' \ -e '/\(-\?0 \?\)\{6\}<\/pose>/d' \ From 1654c182ccc94a3cd71a3131cd3d87e4e76f0c50 Mon Sep 17 00:00:00 2001 From: Martin Pecka Date: Tue, 30 Mar 2021 13:34:39 +0200 Subject: [PATCH 3/3] Absolem: Removed empty link visuals as they obstructed the omnicam and were not good for anything else. --- .../model.sdf | 250 +----------------- .../urdf/utils.xacro | 9 - 2 files changed, 9 insertions(+), 250 deletions(-) diff --git a/submitted_models/ctu_cras_norlab_absolem_sensor_config_1/model.sdf b/submitted_models/ctu_cras_norlab_absolem_sensor_config_1/model.sdf index 6e67f63c..8d310c36 100644 --- a/submitted_models/ctu_cras_norlab_absolem_sensor_config_1/model.sdf +++ b/submitted_models/ctu_cras_norlab_absolem_sensor_config_1/model.sdf @@ -234,23 +234,7 @@ - - 0 0 0.15 -3.1415926535897931 0 0 - - - 0.005 0.005 0.005 - - - - - 0.2502 0 0.1407 0 -0 0 - - - 0.005 0.005 0.005 - - - - + 0.136 0.0435 0.2125 0 -0 0 @@ -258,7 +242,7 @@ - + -0.295 -0.1065 0.36 0 -0 0 @@ -266,7 +250,7 @@ - + -0.275459 -0.078002 0.407765 -1.56579 -0.858407 -7.3e-05 @@ -274,7 +258,7 @@ - + -0.139117 -0.02338 0.465445 -1.29704 -0.418237 -1.17028 @@ -283,7 +267,7 @@ - + -0.193116 -0.064558 0.541453 -0.7124 0.007057 -1.5707963267948966 @@ -292,7 +276,7 @@ - + 0.022 -0.0557 0.185 0 -0 0 @@ -300,7 +284,7 @@ - + 0.0243 -0.0574 0.3142 0 0 -0.628319 @@ -308,135 +292,7 @@ - - 0.057346 -0.083518 0.313841 -1.5707963267948966 -0.000784 -2.19802 - - - 0.005 0.005 0.005 - - - - - 0.057346 -0.083518 0.313841 -0.000948 -0.000784 -2.19802 - - - 0.005 0.005 0.005 - - - - - 0.009992 -0.096606 0.314114 -1.57187 0.000853 2.82791 - - - 0.005 0.005 0.005 - - - - - 0.009992 -0.096606 0.314114 -0.001069 0.000853 2.82791 - - - 0.005 0.005 0.005 - - - - - -0.01735 -0.055429 0.314721 -1.5725 0.00415 1.56974 - - - 0.005 0.005 0.005 - - - - - -0.01735 -0.055429 0.314721 -0.001705 0.00415 1.56974 - - - 0.005 0.005 0.005 - - - - - 0.012561 -0.017068 0.314417 -1.5707963267948966 0.005611 0.313689 - - - 0.005 0.005 0.005 - - - - - 0.012561 -0.017068 0.314417 -0.000579 0.005611 0.313689 - - - 0.005 0.005 0.005 - - - - - 0.058951 -0.03438 0.313899 -1.58161 0.001034 -0.943109 - - - 0.005 0.005 0.005 - - - - - 0.058951 -0.03438 0.313899 -0.010815 0.001034 -0.943109 - - - 0.005 0.005 0.005 - - - - - 0.024083 -0.058382 0.376328 0.003778 0.000786 -2.20023 - - - 0.005 0.005 0.005 - - - - - 0.024083 -0.058382 0.376328 -2.19645 -1.5707963267948966 0 - - - 0.005 0.005 0.005 - - - - - 0.0243 -0.0574 0.3142 0 0 -0.000319 - - - 0.005 0.005 0.005 - - - - - 0.0243 -0.0574 0.2482 0 0 -0.000319 - - - 0.005 0.005 0.005 - - - - - 0.0243 -0.0574 0.3882 0 0 -0.000319 - - - 0.005 0.005 0.005 - - - - - 0.0243 -0.0574 0.3882 0 0 -0.000319 - - - 0.005 0.005 0.005 - - - - + 0.088136 -0.07392 0.386942 -5e-06 -0.002418 1.57486 @@ -449,31 +305,7 @@ 0.1 0.1 0.1 1 - - 0.115312 -0.018929 0.4382 0.015 0.499467 -0.000319 - - - 0.005 0.005 0.005 - - - - - 0.119362 -0.010781 0.424738 0.015 0.499467 -0.000319 - - - 0.005 0.005 0.005 - - - - - 0.119362 -0.010781 0.424738 0.015 0.499467 -0.000319 - - - 0.005 0.005 0.005 - - - - + 0.133719 -0.010853 0.422031 2.07031 -0.013167 1.56329 @@ -485,70 +317,6 @@ 0.1 0.1 0.1 1 - - 0.125479 0.006527 0.435941 0.015 0.499467 -0.000319 - - - 0.005 0.005 0.005 - - - - - 0.125592 0.021526 0.436138 0.015 0.499467 -0.000319 - - - 0.005 0.005 0.005 - - - - - 0.125592 0.021526 0.436138 -2.07031 0.013167 -1.5783 - - - 0.005 0.005 0.005 - - - - - 0.125479 0.006527 0.435941 -2.07031 0.013167 -1.5783 - - - 0.005 0.005 0.005 - - - - - 0.125479 0.006527 0.435941 0.015 0.499467 -0.000319 - - - 0.005 0.005 0.005 - - - - - 0.125479 0.006527 0.435941 -2.07031 0.013167 -1.5783 - - - 0.005 0.005 0.005 - - - - - 0.125104 -0.043467 0.435282 0.015 0.499467 -0.000319 - - - 0.005 0.005 0.005 - - - - - 0.125104 -0.043467 0.435282 -2.07031 0.013167 -1.5783 - - - 0.005 0.005 0.005 - - - 0 0.13 0.2 1.5707963267948966 1.5707963267948966 0 diff --git a/submitted_models/ctu_cras_norlab_absolem_sensor_config_1/urdf/utils.xacro b/submitted_models/ctu_cras_norlab_absolem_sensor_config_1/urdf/utils.xacro index 0c92dc2b..aa68a0de 100644 --- a/submitted_models/ctu_cras_norlab_absolem_sensor_config_1/urdf/utils.xacro +++ b/submitted_models/ctu_cras_norlab_absolem_sensor_config_1/urdf/utils.xacro @@ -49,15 +49,6 @@ - - - - - - - - -