lp:~shadowrobot/sr-ros-interface/F_biotacs

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:sr-ros-interface/fuerte at revision 405

Toni Oliver: Pending requested 2012-12-19

Diff: 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)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

408. By Ugo on 2012-12-19

readded the gui to be started by default in gazebo

407. By Ugo on 2012-12-14

fixed forearm muscle offset

406. By Ugo on 2012-12-14

added models for biotacs + muscle hand and arm + biotacs hands also created dae for the muscle forearm as it is not possible to load a mesh in gazebo anymore

405. By Ugo on 2012-12-14

better material for the thumb

404. By Ugo on 2012-12-14

added green material and exported to dae instead of meshes to appear correctly in gazebo

403. By Ugo on 2012-12-12

adding biotac models

402. By Ugo on 2012-12-12

fixing joint state order in joint spline trajectory controller

401. By Ugo on 2012-11-23

updated rosdep to work for ubuntu

400. By Ugo on 2012-11-20

desactivating tests for sr_mechanism_controllers, weird errors but the controllers are working

399. By Ugo on 2012-11-20

fixed test (failing due to taking too long)