lp:~guihome/sr-manipulation/manip-electric_corr3
Created by
Guillaume W.
and last modified
- Get this branch:
- bzr branch lp:~guihome/sr-manipulation/manip-electric_corr3
Only
Guillaume W.
can upload to this branch. If you are
Guillaume W.
please log in for upload directions.
Branch merges
Propose for merging
No branches
dependent on this one.
- Shadow Robot: Pending requested
-
Diff: 4232 lines (+2424/-1366)23 files modifiedshadow_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)
Branch information
Recent revisions
- 316. By Ugo
-
Mainly added sr_pick_and_place
and cleaned some unused stuff (frames, platform, collision pairs etc...) + updated some others for this new object_manipulator_ node to work nicely (should be paired with an update in sr-ros-interface) - 312. By Ugo
-
Code is now adapted for electric and latest branch of sr-ros-interface (385)
Has been tested in real and simulation. Can perform pick (grasp) in real, fails a bit in simulation on slow machines. Cannot perform place. Only works on a coke can. Requires latest database with coke can grasp inside.See logs for more detail on improvements.
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:sr-manipulation