Merge lp://staging/~shadowrobot/sr-ros-interface/F_biotacs into lp://staging/sr-ros-interface/fuerte
Proposed by
Ugo
| Status: | Merged |
|---|---|
| Approved by: | Toni Oliver |
| Approved revision: | 408 |
| Merged at revision: | 405 |
| Proposed branch: | lp://staging/~shadowrobot/sr-ros-interface/F_biotacs |
| Merge into: | lp://staging/sr-ros-interface/fuerte |
| Diff against target: |
1563 lines (+1215/-111) 22 files modified
.bzrignore (+7/-0) sr_description/hand/model/biotacs/biotac_decimated.dae (+211/-0) sr_description/hand/model/biotacs/biotac_thumb_adapter.dae (+211/-0) sr_description/hand/model/forearm_muscle.dae (+217/-0) sr_description/hand/xacro/finger/biotac/biotac.transmission.xacro (+24/-0) sr_description/hand/xacro/finger/biotac/biotac.urdf.xacro (+161/-0) sr_description/hand/xacro/finger/classic_finger_biotac.urdf.xacro (+3/-7) sr_description/hand/xacro/finger/little_finger_biotac.urdf.xacro (+4/-8) sr_description/hand/xacro/forearm/forearm_muscle.urdf.xacro (+3/-3) sr_description/hand/xacro/full_hand_muscle_biotac.urdf.xacro (+85/-0) sr_description/hand/xacro/thumb/thbiotac.urdf.xacro (+186/-0) sr_description/hand/xacro/thumb/thdistal_biotac.urdf.xacro (+0/-66) sr_description/hand/xacro/thumb/thumb_biotac.urdf.xacro (+3/-7) sr_description/loaders/load_arm_and_hand_model.launch (+4/-2) sr_description/loaders/load_hand_model.launch (+3/-2) sr_description/loaders/load_hand_model_robot_description.launch (+2/-1) sr_description/materials.urdf.xacro (+9/-5) sr_description/robots/arm_and_hand_motor_biotac.urdf.xacro (+27/-0) sr_description/robots/arm_and_hand_muscle_biotac.urdf.xacro (+27/-0) sr_description/robots/shadowhand_motor_biotac.urdf.xacro (+4/-0) sr_description/robots/shadowhand_muscle_biotac.urdf.xacro (+19/-0) sr_hand/launch/gazebo/loaders/empty_world.launch (+5/-10) |
| To merge this branch: | bzr merge lp://staging/~shadowrobot/sr-ros-interface/F_biotacs |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Toni Oliver | Pending | ||
|
Review via email:
|
|||
Description of the change
Added clean biotac model for motor and muscle hand.
To post a comment you must log in.
Revision history for this message
| markpitchless (markpitchless) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
http://