Merge lp://staging/~guihome/sr-manipulation/manip-electric_corr3 into lp://staging/sr-manipulation
Proposed by
Guillaume W.
| Status: | Merged |
|---|---|
| Merged at revision: | 316 |
| Proposed branch: | lp://staging/~guihome/sr-manipulation/manip-electric_corr3 |
| Merge into: | lp://staging/sr-manipulation |
| Diff against target: |
4232 lines (+2424/-1366) 23 files modified
shadow_arm_navigation/config/joint_limits.yaml (+12/-12) shadow_arm_navigation/config/ompl_planning.yaml (+9/-9) shadow_arm_navigation/config/shadow_planning_description.yaml (+1092/-1253) shadow_arm_navigation/launch/constraint_aware_kinematics.launch (+1/-1) shadow_arm_navigation/launch/shadow_arm_navigation.launch (+1/-1) sr_gui_manipulation/lib/SrGuiManipulation.py (+177/-63) sr_gui_manipulation/manifest.xml (+1/-0) sr_object_manipulation_launch/config/gazebo_tactile_thresholds.yaml (+10/-10) sr_object_manipulation_launch/config/hand_description.yaml (+1/-1) sr_object_manipulation_launch/config/household_object_server.yaml (+2/-2) sr_object_manipulation_launch/config/self_filter.yaml (+1/-1) sr_object_manipulation_launch/launch/arm_and_hand_motor.launch (+1/-1) sr_object_manipulation_launch/launch/collision_map.launch (+1/-1) sr_object_manipulation_launch/launch/kinect_static_transform.launch (+4/-2) sr_object_manipulation_launch/launch/manipulator.launch (+4/-4) sr_object_manipulation_launch/launch/static_transform.launch (+2/-4) sr_object_manipulation_launch/launch/tabletop_node.launch (+1/-1) sr_pick_and_place/CMakeLists.txt (+30/-0) sr_pick_and_place/Makefile (+1/-0) sr_pick_and_place/mainpage.dox (+14/-0) sr_pick_and_place/manifest.xml (+21/-0) sr_pick_and_place/src/execution.py (+601/-0) sr_pick_and_place/src/planification.py (+437/-0) |
| To merge this branch: | bzr merge lp://staging/~guihome/sr-manipulation/manip-electric_corr3 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Shadow Robot | Pending | ||
|
Review via email:
|
|||
Description of the change
Mainly added sr_pick_and_place
and cleaned some unused stuff (frames, platform, collision pairs etc...) + updated some others for this new object_
To post a comment you must log in.
Revision history for this message
| Ugo (ugocupcic) wrote | # |
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
I fixed some indentation