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' \ 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