Absolem: fix bad merge #957
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Not sure what happened during the merge of new Absolem configs in #860 and #859, but definitely the .xacro file got somehow half-edited. This PR just brings the changes introduced by #860 back. Compare with the file on the branch that was to be merged in #860: https://github.com/ctu-vras/subt/blob/submitted_models/ctu_cras_norlab_absolem/clone/submitted_models/ctu_cras_norlab_absolem_sensor_config_1/urdf/nifti_robot.xacro .
This PR doesn't change/add any functionality, it's just pure fixing of the Xacro files. No SDF got changed. This PR also fixes the URDF model of sensor configs 6, 7 and 8 for ROS/Rviz (they did not contain any RGB cameras and the model was missing a link, so it was impossible to parse it).