Merge lp://staging/~guihome/sr-manipulation/manip-electric_corr2_cleaned into lp://staging/sr-manipulation
Proposed by
Guillaume W.
| Status: | Merged |
|---|---|
| Merged at revision: | 312 |
| Proposed branch: | lp://staging/~guihome/sr-manipulation/manip-electric_corr2_cleaned |
| Merge into: | lp://staging/sr-manipulation |
| Diff against target: |
31372 lines (+29785/-787) 81 files modified
.bzrignore (+7/-0) database/Copy_wine_grasp_to_coke.sql (+9/-2) database/full_db_backup (+0/-12) database/household_objects_electric_reworked.dia (+6010/-0) database/useful_queries.sql (+9/-0) doc/where_are_things (+2/-0) rviz_config/full_rviz_config.vcg (+307/-148) rviz_config/rename_display_config (+567/-0) shadow_arm_navigation/CMakeLists.txt (+30/-0) shadow_arm_navigation/Makefile (+1/-0) shadow_arm_navigation/config/joint_limits.yaml (+43/-0) shadow_arm_navigation/config/ompl_planning.yaml (+51/-0) shadow_arm_navigation/config/planning_components_visualizer.vcg (+55/-0) shadow_arm_navigation/config/planning_scene_warehouse_viewer.vcg (+62/-0) shadow_arm_navigation/config/shadow_planning_description.yaml (+1456/-0) shadow_arm_navigation/launch/constraint_aware_kinematics.launch (+10/-0) shadow_arm_navigation/launch/move_groups.launch (+3/-0) shadow_arm_navigation/launch/move_right_arm.launch (+8/-0) shadow_arm_navigation/launch/ompl_planning.launch (+8/-0) shadow_arm_navigation/launch/planning_components_visualizer.launch (+14/-0) shadow_arm_navigation/launch/planning_scene_warehouse_viewer_shadow.launch (+77/-0) shadow_arm_navigation/launch/shadow_arm_navigation.launch (+11/-0) shadow_arm_navigation/launch/shadow_planning_environment.launch (+10/-0) shadow_arm_navigation/launch/trajectory_filter_server.launch (+10/-0) shadow_arm_navigation/mainpage.dox (+26/-0) shadow_arm_navigation/manifest.xml (+20/-0) shadow_arm_navigation/pcl_one_point_fake_data.txt (+38/-0) sr_gui_manipulation/CMakeLists.txt (+30/-0) sr_gui_manipulation/Makefile (+1/-0) sr_gui_manipulation/config/positions.yaml (+16/-0) sr_gui_manipulation/lib/SrGuiManipulation.py (+657/-0) sr_gui_manipulation/mainpage.dox (+26/-0) sr_gui_manipulation/manifest.xml (+32/-0) sr_gui_manipulation/sr_gui_manipulation.xml (+13/-0) sr_gui_manipulation/ui/SrGuiManipulation.ui (+124/-0) sr_object_manipulation_launch/config/arms_chomp_config.yaml (+0/-2) sr_object_manipulation_launch/config/collision_map_sources.yaml (+2/-2) sr_object_manipulation_launch/config/environment_server_padding.yaml (+3/-3) sr_object_manipulation_launch/config/gazebo_tactile_thresholds.yaml (+19/-0) sr_object_manipulation_launch/config/hand_description.yaml (+4/-3) sr_object_manipulation_launch/config/household_object_server.yaml (+2/-2) sr_object_manipulation_launch/config/joint_limits.yaml (+0/-37) sr_object_manipulation_launch/config/kdl_sr_arm_kinematics.yaml (+0/-5) sr_object_manipulation_launch/config/multi_dof_joints.yaml (+0/-5) sr_object_manipulation_launch/config/planning_groups.yaml (+0/-69) sr_object_manipulation_launch/config/right_arm_ik_start_angles.yaml (+2/-2) sr_object_manipulation_launch/config/robot_padding.yaml (+2/-2) sr_object_manipulation_launch/config/self_filter.yaml (+33/-35) sr_object_manipulation_launch/config/tactile_thresholds.yaml (+19/-0) sr_object_manipulation_launch/launch/arm_and_hand_motor.launch (+79/-0) sr_object_manipulation_launch/launch/collision_map.launch (+23/-44) sr_object_manipulation_launch/launch/filters.launch (+1/-0) sr_object_manipulation_launch/launch/household_object.launch (+1/-1) sr_object_manipulation_launch/launch/kinect_setup.launch (+8/-0) sr_object_manipulation_launch/launch/kinect_static_transform.launch (+12/-0) sr_object_manipulation_launch/launch/manipulator.launch (+21/-100) sr_object_manipulation_launch/launch/point_cloud_filter.launch (+12/-12) sr_object_manipulation_launch/launch/self_filter.launch (+10/-27) sr_object_manipulation_launch/launch/sr_arm_motor_finger_ik.launch (+0/-244) sr_object_manipulation_launch/launch/sr_object_manipulation.launch (+39/-12) sr_object_manipulation_launch/launch/static_transform.launch (+6/-3) sr_object_manipulation_launch/launch/tabletop_node.launch (+11/-10) sr_object_manipulation_launch/machines/dataprocessing.machine (+3/-2) sr_object_manipulation_launch/machines/household_database.machine (+1/-1) sr_object_manipulation_launch/machines/threedsensor.machine (+2/-2) sr_worlds/CMakeLists.txt (+30/-0) sr_worlds/Makefile (+1/-0) sr_worlds/launch/calib_pattern.launch (+7/-0) sr_worlds/launch/can.launch (+11/-0) sr_worlds/launch/cube.launch (+11/-0) sr_worlds/mainpage.dox (+26/-0) sr_worlds/manifest.xml (+17/-0) sr_worlds/meshes/calib_pattern.dae (+205/-0) sr_worlds/meshes/can.dae (+125/-0) sr_worlds/meshes/can.material (+23/-0) sr_worlds/meshes/can.mesh.xml (+18838/-0) sr_worlds/meshes/cube.mesh.xml (+120/-0) sr_worlds/objects/calib_pattern.urdf (+35/-0) sr_worlds/objects/can.urdf (+40/-0) sr_worlds/objects/cube.urdf (+35/-0) sr_worlds/objects/table.urdf.xacro (+203/-0) |
| To merge this branch: | bzr merge lp://staging/~guihome/sr-manipulation/manip-electric_corr2_cleaned |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ugo | Approve | ||
|
Review via email:
|
|||
Description of the change
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.
To post a comment you must log in.
Revision history for this message
| Ugo (ugocupcic) wrote | # |
Revision history for this message
| Ugo (ugocupcic) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
* sr_object_
point defaults to public server? I have a database publicly available on my home server but it's small / not maintained and could get broken if people starts to do crazy things.
* shadow_
should we create a loader for arm and hand in sr_description? would be used for gazebo as well, and for sr_object_
* sr_gui_
why did you add rosgui_roscpp dep?