Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Xacros refactored #133

Merged
merged 9 commits into from
Feb 24, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
41 changes: 0 additions & 41 deletions sr_description/CHANGELOG.rst

This file was deleted.

9 changes: 2 additions & 7 deletions sr_description/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,8 @@ if (CATKIN_ENABLE_TESTING)
include_directories(${urdf_INCLUDE_DIRS})
catkin_add_gtest(test_sr_description_urdf test/test_sr_description_urdf.cpp)
target_link_libraries(test_sr_description_urdf ${urdf_LIBRARIES})
endif()

install(DIRECTORY arm/
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/arm)
endif()

install(DIRECTORY hand/
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/hand)
Expand All @@ -30,11 +28,8 @@ install(DIRECTORY meshes/
install(DIRECTORY loaders/
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/loaders)

install(DIRECTORY other/
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/other)

install(DIRECTORY robots/
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}/robots)

install(FILES materials.urdf.xacro
install(FILES other/xacro/materials.urdf.xacro
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION})
11 changes: 2 additions & 9 deletions sr_description/README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
This package contains the description for Shadow Robot's Hand and Arm, as well as some additional models used in our robot (kinect, etc...).
This package contains the description for Shadow Robot's Hands.

You can find the different complete models in [robots](robots).

You can also find more information about the computation of the [arm kinematics](doc/ArmInertia.md) and of the [hand kinematics](doc/HandInertia.md).


*Tips: To automatically reformat the different xacro files you can use the following command:*

```bash
find . -name "*.urdf.xacro" -type f -exec tidy -xml -i -m -q "{}" \;
```
You can also find more information about the computation of the [hand kinematics](doc/HandInertia.md).
48 changes: 0 additions & 48 deletions sr_description/arm/config/arm_controller.yaml

This file was deleted.

115 changes: 0 additions & 115 deletions sr_description/arm/model/arm_base.dae

This file was deleted.

Binary file removed sr_description/arm/model/arm_base.mesh
Binary file not shown.
219 changes: 0 additions & 219 deletions sr_description/arm/model/arm_trunk.dae

This file was deleted.

Binary file removed sr_description/arm/model/arm_trunk.mesh
Binary file not shown.
125 changes: 0 additions & 125 deletions sr_description/arm/model/elbow_flex.dae

This file was deleted.

Binary file removed sr_description/arm/model/elbow_flex.mesh
Binary file not shown.
125 changes: 0 additions & 125 deletions sr_description/arm/model/elbow_rotate_motor.dae

This file was deleted.

Binary file removed sr_description/arm/model/elbow_rotate_motor.mesh
Binary file not shown.
Loading