Skip to content

Commit

Permalink
Squashed 'src/moveit_pro_mobile_manipulation/' changes from e5367b79.…
Browse files Browse the repository at this point in the history
….df62035c

df62035c Merge pull request #3 from PickNikRobotics/x-sync
6b022ef0 wip
37a58422 removing ur5e.xml
11434c62 refine mobile configs
5dcc2c84 Merge commit 'f3e4a69cf5ec2315d0757e7e82d62f6af19c9280' as 'src/moveit_pro_mobile_manipulation'
372b3837 aligning subtrees
9316de06 Merge pull request #1 from PickNikRobotics/sync
9c104e4d removed external dependency
46199374 Merge commit '0476c0556c7c845d77deebb0311a10e96aa2a143' as 'src/moveit_pro_mobile_manipulation'
3c38aef moving files for merge
3c742bb Added arm_on_rail (#17)
a128e755 moving configs for subtree sync (#402)
792bb71 Merge pull request #15 from PickNikRobotics/objective-fixes
4591c5a added descriptions
d275f6f removed erroneous objective
c6ac354 Removes visualization pane changes in teleoperation
dd4d494 Updating objectives
9093cfb Merge pull request #10 from PickNikRobotics/pr-update-to-make-ports-explicit
23d20c4 formatting
b090cff more fixes
cb35f90 Merge branch 'main' into pr-update-to-make-ports-explicit
636ce5c Merge pull request #13 from PickNikRobotics/pr-update-submodule-picknik_accessories
ad79604 update submodule
41dd3ea Merge pull request #11 from PickNikRobotics/fix-example-behaviors-package-depend
d43221b Merge pull request #12 from PickNikRobotics/fix-pick-apriTag-object
9b97cd4 Fix pick ApriTag object
15baa7f Update ports explicitly
6f581ce Fix depend of moveit_studio_behavior
16c66361 Fix register cad part objective (#396)
c99eeb4 bumping accessories version
4d3bdd2 version bump
350c75b Merge pull request #7 from PickNikRobotics/xacro-update
1a6d0be9 Merge pull request #395 from PickNikRobotics/subcategory-ws
f68f9be Updating xacro and favourites
669c5a27 fix: subcategories for arm_on_rail and base picknik behaviors
4a7aa99 Merge pull request #5 from PickNikRobotics/pre-commit-formatting
217a42e removed accidental objectives
75ef8e3 formatting
8e66984 formatting
454dcac Merge pull request #4 from PickNikRobotics/formatting
4f1bec3 formatting
6118d12 pre-commit formatting
8023df2 Merge pull request #3 from PickNikRobotics/registration
05e796e Moving registration behaviors
7669d52 Updated README
4b7b987 inore .vscode/
da2e3277 Merge pull request #392 from PickNikRobotics/document-imarker-joint-jog-config
ca4a3f5 Merge pull request #1 from PickNikRobotics/add-custom-pick-and-place-example
4f6deedf Update srdfs.
0a553e9 Add pick and place example using custom MTC example behavior
1e42730 Added mtc to jtc converter
44eed6f Merge commit 'd0dad846098656d674ed23e4706ef933136561cc' as 'src/example_behaviors'
d0dad84 Squashed 'src/example_behaviors/' content from commit d1451e3
3ff1db7 Merge commit '223d75d81b631439cd1200139786061f3f66a8ef' as 'src/picknik_registration'
223d75d Squashed 'src/picknik_registration/' content from commit 220e5c9
393838e Merge commit '0304f331642e13973942e39a38c44c9e4e3ccec3' into subtree
0304f33 Squashed 'src/external_dependencies/ros2_robotiq_gripper/' changes from 77e6092..2ff8545
9942dd2 Merge commit '771a78eb7050677f38e927cec6109daaa96276a5' as 'src/external_dependencies/serial'
771a78e Squashed 'src/external_dependencies/serial/' content from commit d8d1606
001ffeb Merge commit '6fe6aeb8c19009b66ad614e9d3e1cc113ae96e58' as 'src/external_dependencies/ridgeback'
6fe6aeb Squashed 'src/external_dependencies/ridgeback/' content from commit 3db6acb
8d29872 Squashed 'src/external_dependencies/ros2_robotiq_gripper/' content from commit 77e6092
8907cf0 Merge commit '8d2987287e9b1c4a7e64593f59e414aaafe8c448' as 'src/external_dependencies/ros2_robotiq_gripper'
0f778d6 rearranging external dependencies
723e978 Merge commit '7d3d6e355f22068b04008623d8a6dd4347c65a5f' as 'src/ros2_robotiq_gripper'
7d3d6e3 Squashed 'src/ros2_robotiq_gripper/' content from commit 77e6092
7a89a31 updating subtrees
6d9a7333 Merge commit '6638821a659458a0a20042b7bd95aff025b495ff' as 'src/moveit_pro_mobile_manipulation/ridgeback'
ecf4b44 Merge commit '6638821a659458a0a20042b7bd95aff025b495ff' as 'src/moveit_pro_mobile_manipulation/ridgeback'
6638821 Squashed 'src/moveit_pro_mobile_manipulation/ridgeback/' content from commit 3db6acb
99a14a8 added pstop manager to ur_configs
4a4d6dc removed external dependecies from kinova config package
f228848 Merge commit 'a72a9cc5bef9d30dc5139481e5be0bb9ec4539d0' as 'src/moveit_pro_ur_configs'
a72a9cc Squashed 'src/moveit_pro_ur_configs/' content from commit fe3c9a7
700d7b8 Merge commit '3ca0158f8b0b00fc6c3797983a3f77d368bf338e' as 'src/moveit_pro_mobile_manipulation'
3ca0158 Squashed 'src/moveit_pro_mobile_manipulation/' content from commit e5367b7
d2a7dc2 Merge commit '744c9cdd9dd2b4b1fb712454ea4f59ed4a5f8349' as 'src/moveit_pro_kinova_configs'
744c9cd Squashed 'src/moveit_pro_kinova_configs/' content from commit 178a37c
09f2746 Merge commit '36da3ca121681609d43ab49c75afab511dfe5abe' as 'src/lab_sim'
36da3ca Squashed 'src/lab_sim/' content from commit 2ee0461
3eda42b added accessories submodule
108c114 Merge commit '52f447d32f01e5bb4ca9a5c93dfee66b31246927' as 'src/fanuc_sim'
52f447d Squashed 'src/fanuc_sim/' content from commit 0b1e054
7bed0975 Update multi arm and gazebo srdfs to use chains for gripper groups.
27a4a658 Merge branch 'main' into document-imarker-joint-jog-config
f4be1bf4 Clean some ARGS in Dockerfile (#391)
865257f added required files
8250d60 Initial commit
5639f347 Merge pull request #381 from PickNikRobotics/removing-primary-view-switch-in-Teleop-Joint-Jog
9e8be7cf Merge branch 'main' into removing-primary-view-switch-in-Teleop-Joint-Jog
86a92932 Refactor gripper move groups to use chains instead of links.
6facf496 Update Submodules (#390)
859061b7 Update Dockerfile (#386)
bd2bd59f Fix conflicting behavior IDs in ur_site_config (#389)
80204ac0 Merge pull request #388 from PickNikRobotics/merge-v6.2-into-main-fix
616f2c4b Merge branch 'v6.2' into main (no squash)
6ce19351 Revert "Merge v6.2 into main (#387)"
00920dd0 Merge v6.2 into main (#387)
6f8afdaa Update  dynamic parameters (#384)
3c87731c Fix typo in docker-compose.yaml (#303)
58a5fd20 removed switch primary view from joint slider controls to allow multi pane fluidity
5e88e49a update teleop 1 to not alter primary view
bd6bb7ae removed switch primary view on teleop joint jog
18d42cee Use CMake macro for behavior test configuration (#379)
e8400ee1 Reduce build time and chance of OOM by removing unnecessary sources dependencies (#380)
6bd5ca55 Remove duplicate REST API launch (#375)
5b75ad9e Update UR hardware configs (#377)
204888bc Fix picknik_registration gcov linking issue (#376)
b99e72bd Added default inputs to 'Request Teleoperation' behavior to match required inputs (#374)
6171225b Merge pull request #370 from PickNikRobotics/pr-remove-lms-and-gz-source-checkouts
115a85a9 Merge branch 'main' into pr-remove-lms-and-gz-source-checkouts
c90c5543 Fix non unique cgroup validation error (#372)
f4e6416d Reduce build time and chance of OOM by removing unnecessary sources dependencies
03ff8a92 Add `picknik_registration` submodule (#369)
a900a6bd Add airfoil to mobile_manipulation config (#368)
0e51d012 Correct the FTS broadcaster frame (which we don't directly use) and remove names from the mujoco force and torque tags as they are not used (#362)
bd0ea65c Merge pull request #363 from PickNikRobotics/linter-fix
2ca82127 fixed gazebo configs
b411f17a Merge pull request #361 from PickNikRobotics/pr-add-dockerfile-with-nvidia-drivers
b9a6bb4f Merge pull request #359 from PickNikRobotics/subtree-only
a44106e1 Merge pull request #360 from PickNikRobotics/remove-cycle-between-waypoints
8e972348 Update Dockerfile
678cb665 Add instructions to Dockerfile for manual Nvidia driver installation until we figure out the X11 forwarding issue
0d516b3d remove Cycle Between Waypoints from base config
02d91a58 add subtree_only to a couple of objectives
d855da0a Add placeholder filer for example Dockerfile with nvidia drivers
b7b7f1a7 Copy example Objectives from Mimic Sim to Arm On Rail Sim (#357)
713ce333 Merge pull request #356 from PickNikRobotics/merge-6.0.1-to-main
f200ecb9 Run the linter
dfc572d5 Add the formatter back
8cb35147 Merge branch 'main' into merge-6.0.1-to-main
4ceec070 Revert "Add an XML linter to pre-commit (#353)"
bd91f5ff Add an XML linter to pre-commit (#353)
8d577841 update tip_offset in MoveAlongPath (#350)
f4684bb8 Fix several 6.0 issues (#346)
38b61aad Initial ocmmit (#349)
be4bd5bc Update `Pick Object` and `Place Object` in the `arm_on_rail_sim` to remove supervised autonomy Behaviors (#348)
eb0e4ef0 Mujoco 6.0 (#347)
bb83ab52 Add training behaviors (#331)
2ed27a57 Fixes to mobile manipulation config (#345)
0f2b3dcb replace rail stl by boxes and tweak model (#344)
97941266 Extend base realsense rs_launch.py file (#341)
7d9d249c Mujoco 6.0 (#343)
61cc6fad Teleop objective refactor (#314)
69ea0c7a Mujoco scene cosmetic improvements (#337)
5238d464 Update deprecated param (#336)
ae6030f3 Merge pull request #340 from PickNikRobotics/merge-main-to-v6.0
407c6beb Revert "Add VFC helper subtrees and examples to mujoco config (#330)"
1ff12385 Use keyframe to initialize state (#323)
eb278e44 Add mobile manipulation config (#339)
20360fd2 Update mobile base config (#338)
da436875 Add VFC helper subtrees and examples to mujoco config (#330)
33e76dfe Changed ur types (#310)
30de75ae Update SendPointCloudToUI ports following PR#7567 (#325)
ca4d394e Merge pull request #333 from PickNikRobotics/v6.0
a8c46907 Segment and Pick Anything (#268)
b13c7512 Update Cycle Between Waypoints example to use Pro RRT (#324)
cef07c4e Make robot IP launch argument (#327)
0cc90f58 Add reset behavior for UR (#320)
130fdde1 Fix type of paths in launch file (#322)
4b596bd8 bump to 6.0.0 (#321)
a44ee0ae add VFC example to mujoco config (#319)
fbaff1ab Fix Gazebo Scan and Plan Config (#317)
a64689ac Remove deprecated config param (#318)
38a79fb3 Get Gazebo Config working (#316)
40976e1d Remove usage of YAML variable interpolators (#300)
19341272 remap ports for move to waypoint (#312)
21ae103f Merge pull request #307 from PickNikRobotics/davetcoleman-patch-3
c4754332 Merge pull request #305 from PickNikRobotics/davetcoleman-patch-1
97c0fc3b Merge pull request #306 from PickNikRobotics/davetcoleman-patch-2
e229a87b Merge pull request #308 from PickNikRobotics/davetcoleman-patch-4
d9858fd3 fix ridgeback dep (#311)
b2e68720 Merge branch 'main' into davetcoleman-patch-1
985fa3fa Merge branch 'main' into davetcoleman-patch-2
0a32d912 Merge branch 'main' into davetcoleman-patch-3
d1c39046 Merge branch 'main' into davetcoleman-patch-4
cf6d254b Add mobile ur config (#304)
506d4d15 Add inline documentation to move_along_path (#309)
9c3dcd32 Update src/picknik_ur_mock_hw_config/objectives/constrained_pick_place.xml
72e4deb8 Update cycle_between_waypoints.xml
7f1b0868 Update src/picknik_ur_mock_hw_config/objectives/joint_diagnostic.xml
e6bc7a62 Update src/picknik_ur_mock_hw_config/objectives/joint_diagnostic.xml
689d0636 Add comments and explanation to joint_diagnostic
de7abe6f Add useful description to cycle_between_waypoints.xml
b8294cf6 Improve inline documentation for constrained_pick_place
544c2a7f Update 3_waypoint_pick_and_place.xml
d404b0fe Improve inline documentation for 3_waypoint_pick_and_place
41e0c327 Add Get Imarker Pose from Mesh Visualization Objective
e76d2a35 PickNik ur mujoco base config (#284)
d82234ba Base config clean-up (#302)
020b58a1 update use_all_planners -> planner_interface (#296)
870aa4d4 Add CI job to ensure no SSH URLs in .gitmodules (#299)
32ca76d8 Point to http address of gz_ros2_control (#298)
f3b2b427 Match casing of 'as' and 'FROM' in Dockerfile (#295)
a07e5b3d Add gz_ros2_control submodule (#288)
bd793a15 add rrt-connect test Objective (#289)
8f56fb0e Fix robotiq activation controllers in multi-arm config (#278)
1d92f80f Add velocity force controller (#279)
1b771026 corrected port names (#283)
8634bd1e Changes for 5.1 release (#276)
3af390d4 Set realsense QoS to sensor data (#273)
a46b9ccb update JTAC plugin name (#274)
356d1ef1 Merge pull request #272 from PickNikRobotics/stephanie-eng-patch-1
3ec5c69d Remove moveit_pro_controllers as a dependency
77942c18 Picknik ur multi arm gazebo config update (#270)
d7267f7d Fix angle brackets in the value of an xml file for octomap (#269)
5d1a44b2 Move the agent_bridge launch file out of the gazebo config sim folder so it works (#267)
abb57298 Gazebo config for multi UR arm (#251)
7c2fabb9 Remove point_cloud_uuid port from SendPointCloudToUI Behavior (#266)
68099656 update UR5 JTAC configs (#265)
f960d837 Merge pull request #253 from PickNikRobotics/refactor-existing-objectives-adjust-pose
ee07fa00 move all MTC stage initializating into ForEach block
4dbd5743 Revert "revise Pick Object to use new vector composition behaviors"
58cfec44 Merge branch 'main' into refactor-existing-objectives-adjust-pose
5021b3a8 Use updated YAML-free version of SetupMTCUpdateGroupCollisionRule (#256)
964ee949 Disable TestPickObject (#262)
a31912f1 Update camera launch logic (#252)
6d81e45a revise Pick Object to use new vector composition behaviors
244b8814 Merge branch 'main' into refactor-existing-objectives-adjust-pose
5a4d5bac Merge pull request #255 from PickNikRobotics/remove-getstringfromuser
1293fdc1 Merge branch 'main' into remove-getstringfromuser
0261acda remove transformation of point cloud into camera optical frame
a925f20a Merge pull request #261 from PickNikRobotics/merge-v5.0-into-main
d1556ae3 Merge branch 'main' into merge-v5.0-into-main
a25efe36 Merge pull request #260 from PickNikRobotics/revert-259-merge-v5.0-to-main
c2914348 Revert "Merge v5.0 to main (#259)"
f04ccbbb Merge v5.0 to main (#259)
10661849 Extend multi-arm example to use 4 arms (#241)
c80fa09b Add JTAC to ur configs (#258)
b5475f81 disable TestPickObject
320bb114 Merge branch 'main' into refactor-existing-objectives-adjust-pose
acf4205b Merge pull request #257 from PickNikRobotics/pr-sync-4.0.2-to-main
08f56d04 Merge branch 'v4.0' into pr-sync-4.0.2-to-main
bf390fe3 transform point cloud to
c18a35e5 Updates to ML Objectives and MTC Parameters (#205)
c4e2c113 Remove GetStringFromUser from Take Snapshot
342700a6 Include ExecuteMTCTask with soltuion_grasp in forEachPoseStamped decorator.
9e2c2d5d Pre-commit bs...
b93aa38f Pre-commit bs...
373d1d2c Extrapolate adjusted_poses using forEachPoseStamped decorators to produce cuboid objects for later use in behavior.
63267d29 Fix trailing spaces issue. Change input vector of poseStamped decorator to take in adjusted_poses.
c59e0e01 Revert unintended changes to apriltag1_grasp_offset yaml file.
50c269ec Revert unintended changes to apriltag1_grasp_offset yaml file.
36bd8293 Remove getPoseFromUser from remainging objectives, replace with new sequence including getPointsFromUser to AdjustPose. pick_and_place_object still a WIP.
6241cbf7 Update camera sync behavior names (#219)
880a2f60 Merge pull request #250 from PickNikRobotics/5.0-to-main-dont-squash
bda5ddae Point docker compose to new base dockercompose.yaml file with deb changes (#244)
cbbec5e4 Remove obsolete 'version' tag from docker-compose file (#246)
8fd249b0 This PR contains the needed changes to bump the version to the next minor release to main (#243)
d6e89e64 Update planning scene topic and octomap collision check servo parameters (#240)
7c27ae15 Add colcon-defaults.yaml entries for coverage to avoid gcov build errors
fe1026f2 Add dual arm configuration (#231)
23283912 Remove the use of MoveToX Behaviors (#237)
bce91adf Add coverage mixins to colcon defaults file (#238)
5a1ba199 Replace moveit_studio_test_utils with moveit_studio_common (#239)
863fa2f0 Fix UR location for Mock HW (#236)
cdbcb9d3 Replace "MoveToWaypoint" behavior with "Move to Named Pose" objective (#225)
0e73275e Add request teleoperation for mock hw config (#235)
6fcbef14 Fix timeout value (#233)
b68b9664 Add some SwitchUIPrimaryView Behaviors (#232)
c7980e9d Merge pull request #230 from PickNikRobotics/4.0.2-rc1
dca53a2d Bump package versions to 4.0.2
1278e3ba Set colcon defaults for user overlay image (#224)
194eb205 Remove old Teleoperate Objectives (#222)
4b544be3 Merge pull request #223 from PickNikRobotics/pr-remove-ur-descriptions-duplication
94bed019 find gazebo_renderer tag
fdccd247 Reusable action for integration test (#213)
8b0e3608 Move UR P-stop manager test to integration testing package (#228)
f1c4305a Revert "Add launch testing"
f3cc6614 Add launch testing
91844d3a Increase delays for p-stop test (#227)
97eda655 Set colcon defaults for user overlay image (#224)
65c3c4c9 remove extra comments, move gazebo tags to top level, and remove logic from ur macro
c9eab156 Merge pull request #220 from PickNikRobotics/fix-schedule
46ad7fcd Top level launchfile (#209)
bc5071f7 Revert "use gazebo_renderer to set use_mesh"
d041f47b use gazebo_renderer to set use_mesh
1dfc6b6f disable mesh if using gazebo
93e19bfb update submodules
b8ff6f94 disable pinch links in gazebo
65c6d74a add missing $
5d491160 use yaml substitution instead of xacro logic
7f244a36 fix fake hardware gazebo issue
7ac4f728 Remove old Teleoperate Objectives (#222)
6047f532 convert gazebo
4a232d17 convert base config
d617d8bb add base ur macro
01d441f4 update submodule
6a55a190 Fix Behavior loaders (#221)
82a877a1 Fix schedule problem
828203b8 use macro with mock config
5311a91a Merge pull request #218 from PickNikRobotics/merge-4.0.1-to-main
532211fb Merge remote-tracking branch 'origin/v4.0' into merge-4.0.1-to-main
3226f3df Bump package versions to 4.0.1 (#217)
c80a35ef Fix dev containers for user overlays (#216)
0c63efea Remove unintended favorited Objectives (#214)
c9400c59 Remove unused kinematics.yaml file (#212)
8b1419fa Fix grasp link parents and add to gripper SRDF group (#208)
b3223871 Merge pull request #211 from PickNikRobotics/pr-update-DetectApriltags-name
27e95a85 update name
d2e7d6cd Merge pull request #207 from PickNikRobotics/merge-4.0.0-to-main
859ad449 Merge remote-tracking branch 'origin/v4.0' into merge-4.0.0-to-main
4eb3eca2 update paths in scan_and_plan objective (#204)
716efce6 Start Teleoperate Objective in Waypoint mode (#203)
8f2fc3ce Merge pull request #199 from PickNikRobotics/ur5-visual-servo
afd2886f Add ML tutorial Objectives (#202)
7a32dc91 Update tag_id to match the one used in gz
b99d31cf Update visual_servo_to_reference.xml
68cfd07f Remove hack to get around double-counted serial package installs (#201)
099f0b92 Add visual servo teach / move Objectives (#197)
cdaac90b apply averaging in common frame
d4520fa2 add visual servo Objective to ur_site_configs
674c57b3 Do not use all planners except for constrained planning (#198)
eb102421 Fixes to overlay Docker for new workflow (#196)
f878373b Add UR Pstop Manager (#192)
56165c67 Bump versions to 4.0.0 (#188)
09ff3904 Bring in thicker space station ceiling collision (#195)
cdd856ae Port ML Objectives to new internal ML Stack (#132)
6f5d9bd3 Fix warning in Constrained planning Objective (#190)
8a408afe Re-add streaming controller for Gazebo configuration (#189)
296d5742 Fix Gazebo package dependencies (#185)
2fc10c2e Rebrand to MoveIt Pro (#182)
dc413823 Remove pinch link tests (#184)
dfc64d58 Update `Take Snapshot` to work as Subtree (#183)
14649e8f Add cohesive Teleoperate Objective (#160)
22b10d18 Fix 3D object registration Objectives (#181)
84ca121d Merge pull request #173 from PickNikRobotics/pr-update-servo-parameters
e712c902 move_group_name rename planning_group_name and change param name
c8777a1f use units  m/s and rad/s
89fe3f3c rename streaming_controller to servo_controller
7ae82983 update controller name
fbe07a21 add hard joint limits config
61de776f use JTC and acceleration filter
57e4fc7f Remove `manual_grasp_link` (#178)
26dfbd6d Add April tag support to picknik_ur_site_config (#179)
d8466a2b "Move along Path" -> "Move Along Path" (#180)
a547b64a Use space station closed ceiling collision (#177)
2242923a fixup typo from PR #174 (#175)
28903b48 Read .env to get studio tag (#174)
c6e6c5a8 Remove Gibson and Visual Servo.  (#171)
85b5f788 Merge pull request #172 from PickNikRobotics/merge-3.0.0-to-main
eb8c0f2d Update Apriltag Grasp Offsets (#170)
0ddbb3ce Update behavior names for Open Door objectives (#169)
e097515b Remove unused import (#168)
a531af6f Update SetupMTCMoveAlongFrameAxis parameters (#164)
4c74fe64 WritePoseToYAML->SavePoseToYaml (#167)
60de0268 Fix integration tests to use new parameter storage (#166)
27aa5946 Update README to show scan and plan config (#165)
b9c87e59 3.0.0 (#163)
07fb2992 Update Sample April Tag objective to fix bug (#162)
fc8e88d7 Bump Robotiq Gripper Driver Version (#134)
88bb7ce6 Make UR Studio Integration Testing public (#158)
80887150 Add pilz planning config (#161)
60ceaefb Change Objectives due to reworked UI parameters (#154)
dca3be93 Merge pull request #159 from PickNikRobotics/fix-trajectory-format
81ba84ac Fix indentation.
b78298e5 Fix formatting of PoseStamped messages in trajectory yaml.
6f5790b9 Merge pull request #153 from PickNikRobotics/pr-update-sample-apriltag
e3d12d5c Add OMPL and pilz configs (#155)
f092f336 get STUDIO_LICENSE_KEY from github secrets (#157)
78aa9336 Use CYCLONE DDS else bad things happen (#156)
2c644a73 Add trajectory preview subtree for convenience (#151)
6214f692 Update sample_april_tag behavior
d71b3372 Update Servo Joint Limit Params to Per-Joint (#152)
5a14e426 Remove Deps and Configs for  pick_ik (#150)
ce01115d Initial CI Job (#149)
dbb807b5 Merge v2.11 to main (#148)
ecea30a6 Update stomp planning config.yaml (#147)
f6ed587c Remove duplicate Objective (#142)
35a24558 Enable UR e-Series tool comms through wrist serial port (#141)
99ee4da0 Replace IsForceWithinThreshold with ForceExceedsThreshold (#136)
7733e10b Scan and plan objective (#139)
42e25a61 Merge pull request #138 from PickNikRobotics/head-farther
1247b77c Reposition table.
611592e0 Head is farther.
94f850bc Remove unused import in launch file (#137)
39a54aee Cleanup user overlay Docker example (#133)
51a5ca8f Merge pull request #135 from PickNikRobotics/scan-and-plan-world
c3750580 Rotate and center model.
71620264 Fixed READMEs.
be28fc79 Update submodule.
b901b192 Updated world name and package info.
045d649e Update src/picknik_ur_gazebo_config/README.md
c2487ca3 lint.
3ba10a2b Do not show gazebo UI.
42554fe9 Remove scale.
b73d0330 Adjust models scale and diffusion parameters.
c0a2e5ad Put statue on table.
2579e2f3 Update description.
f6e8d6eb Pass world path instead of name.
b965c951 New scan and plan config based on gazebo config with different world.
c26bc4f2 Add submodule to tyler's ros2 serial branch (#130)
f86cffcb Use public URLs for submodules (#128) (#129)
606cabaa Merge pull request #127 from PickNikRobotics/version-bump-2.11
076cd6a1 Version bump to 2.11.0
dc00835d Merge pull request #126 from PickNikRobotics/pr-remove-servo-params
b3996550 remove servo params no longer needed
ffaf6158 Update paths for our 2f_85 gripper URDF (#124)
221000b8 Remove local PickObject subtree (#125)
6718a4b5 Create reset_plannning_scene.xml (#123)
0bce7a59 Add comment for moveit_params.joint_group_name config parameter (#122)
2d8331a6 Change Gazebo SRDF to be a xacro for parser coverage purposes (#121)
a879ec85 Include hardware dependencies (#119)
746fe608 Fix pick and place object objective in gazebo (#120)
9189f2fc Merge pull request #117 from PickNikRobotics/version-bump-2.10
83b42a02 Update main to 2.10.0
3527d82c Merge pull request #115 from PickNikRobotics/validate-trajectory
646a08d7 Add ValidateTrajectory step to MoveAlongPath objective
5c32de00 Add 'Move along Path' objective (#112)
9756287c Fix IsForceWithinThreshold usage in XMLs (#114)
c7f582ca Bump main to 2.8 (#111)
2244671d Merge pull request #106 from PickNikRobotics/pr-teach_and_pick_from_apriltag
0ef2dc78 cleanup and add defaults for tags 2 & 3
c372d810 Refactor to April Tag expect where Apriltag is requied
5dfa28c0 update objectives to work with tutorial
6f2188e5 pre-commit
916c7b23 update behavior names
65eb863c Add objectives to teach and pick objects relitive to AprilTag pose observations
9a56330c Add TRAC_IK configuration (#109)
a2e9e395 Updates for new MoveIt Servo (#98)
714279d3 Update Objectives that use IsForceWithinThreshold (#107)
ee46c0ba Changes to loop ConstrainedPickandPlace objective (#105)
5d0ceecf Merge pull request #104 from PickNikRobotics/pr-teach_april_grasp
1d0fa125 missed one AprilTag
d5455179 AprilTag
332a7558 pre-commit
0a8cec1c clean up pick april objective
4716301f Add pose averaging to Pick Apriltag Labeled Object
59fb32eb Add Re-Zero FTS objective and use in configs (#101)
a4628020 change is force within threshold to a condition (#100)
1c4fe0bf Merge pull request #95 from PickNikRobotics/pr-rename-move-to-jointstate
8b2a9863 Rename MoveToJointState to MoveToWaypoint in configs
7b4157b0 Merge pull request #94 from PickNikRobotics/pr-add-use-all-planners-port
389789d0 Add use_all_planners to SetupMTCMoveToPose behavior in XML
77f97a2e Merge pull request #93 from PickNikRobotics/update-service-commands
28c01c49 Replace shell commands with application shortcuts
aa8a0bbc Merge pull request #90 from PickNikRobotics/constrained_move_demo
28be3385 Merge remote-tracking branch 'origin/main' into constrained_move_demo
f144b348 Merge pull request #91 from PickNikRobotics/pr-unify-agent-bridge-containers
ea73d824 Merge pull request #92 from PickNikRobotics/update-pinch-mock
fcdbef47 Add restart policy
cd99f503 Update mock hardware config to use new pinch links.
0655fb79 Consolidate agent and bridge containers
a8b9b3c9 fix formatting in waypoints yaml file
7c8371d1 Add a Constrained Pick and Place Behavior
c5b8d688 Update Pinch Link (#45)
97b2e2ec Add base frame parameter to admittance controller config (#87)
defdeace Merge pull request #89 from PickNikRobotics/v2.5
3b67ba22 Add the 2f_85 gripper urdf to the base configuration description (#88)
c126b428 Re-add user Docker overlay example (#86)
5b0ca04a Merge pull request #85 from PickNikRobotics/merge-v2.5-to-main
222a4209 Revert "Revert #62 (#80)"
1a55d0a8 Merge branch 'main' into merge-v2.5-to-main
2d668668 Favorite the AprilTag Pick Objective in GZ Sim (#83)
a0f54f22 Mock Hardware Scene v2.5 Cleanup (#82)
7428fda1 Bump package versions to 2.6.0 (#81)
6ae17d9b Revert #62 (#80)
d8cd6bf1 Merge pull request #79 from PickNikRobotics/pr-move-collision-mesh-for-cnc
5f06f404 fix offset between CNC mesh and CNC collision mesh
12aba062 Simplify CNC collision to fix motion planning failures when moving between `Grasp Left` and `Grasp Right` (#77)
baef76e5 Add Admittance Control to Open Lever Handle Door (#22)
c2bcffc7 Merge pull request #76 from PickNikRobotics/pr-cnc-textures
27dc7482 Disabled pre-commit checks on SVG, STL and DAE files.
cc0e12f6 Updated CNC scene textures.
39568b80 Revert "Revert "New Pick Cuboids Objectives (#73)"" (#75)
28220827 Revert "New Pick Cuboids Objectives (#73)"
85b5be92 New Pick Cuboids Objectives (#73)
76655663 replace use of ForEachCollisionObject with ForEachGraspableObject (#74)
f4d0f163 Gazebo Objective to pick an AprilTag labeled object (#71)
85ab61a3 Add Machine Tending Mock Hardware Configuration (#72)
d71ab7ab remove moveit_studio_agent_examples in favor of the moveit_studio_sdk repo (#62)
58440927 Add missing dependency on moveit_planners_stomp package (#70)
94e93ff6 Merge pull request #69 from PickNikRobotics/merge-2.4.0-to-main
c5773492 Merge remote-tracking branch 'origin/v2.4'
f7f9774c Change name of visual servo Behavior (#67)
4a073278 Gazebo config: Unfavorite Objectives, tweak favorited Waypoints (#68)
bc446880 Camera scene zoomed out and rotated (#65)
8bc35114 Fixes for the Mock Sim and Gazebo Simulated Configurations (#66)
dc93acf3 Bump package versions to 2.4.0 (#64)
6e3adefb Reorganize for generic config package inheritance (#58)
f53b85d5 Merge v2.3 to Main (#61)
7e0b7209 Require CMake 3.22 (#54)
9c366294 Make UR base config work with any UR arm (#53)
297396bf Add "Joint Diagnostic" Objective (#48)
523ffcbd Add Stomp and AnytimePathShortening (#47)
7d4bcfb2 Update Gazebo simulation world (#50)
799014a4 Fix broken objectives  (#49)
354392f9 Update `prefix` argument to `tf_prefix` in UR xacro (#46)
1ae02ce5 Cherry-Pick Fixes from v2.2 into Main (#44)
65b14d7f Update gripper description file name (#34)
ab609799 Remove dependencies on deprecated UpdatePlanningScene behavior (#35)
67649704 increase UR5e wrist3 joint position limits to use full mechanical range (#33)
532de413 Clean up config and launch files to reduce duplication (#32)
4dc6581a Better error messages for standalone objectives target v2.3 (#31)
74740308 Bump package version for upcoming moveit studio release (#30)
78c85fb3 Revert "Modify objectives to use Get String/Pose/JointState From User behavior (#25)" (#28)
06e5cac8 Modify objectives to use Get String/Pose/JointState From User behavior (#25)
3dfcdf39 Reduce table block size in mock sim (#27)
3b685029 Add formatting GitHub action (#26)
05aef756 Add wood texture and blocks to mock sim (#24)
beccab0c Update MoveIt Servo parameters (#23)
738e9373 Add Waypoint Cycling Objective (#21)
c4481005 Add Objectives and Configuration for PickNik UR Robots (#18)
c43e0d53 Bump version to 2.1.1 (#20)
501bc7c5 Fix Copyright Statements for Ament Test (#19)
9ffea4a6 Create move_to_pose.xml (#17)
35994634 Add Example Agent call_do_objective.py Scripts (#16)
0f664a19 Update standard tree nodes model for BT v4 (#7)
08084e72 Add task id port to InitializeMTCTask action in XML (#14)
ebdfba46 Add Interpolate to Joint State objective XML (#15)
87f3e6c3 Ensure we do not launch camera nodes if there are no supported cameras (#13)
549c9156 Servo settings to avoid collision (#11)
f3cf2084 Fix name of base config package in xacro file (#12)
f88c638d Use KDL instead of pick_ik for servo (#10)
2af0e819 added xacro property (#9)
7fd2a735 Add Gazebo site config package (#8)
e06e2fc5 Move Pick and Place to Site Config, Remove Sample Objectives (#6)
f7633ca1 Update to BehaviorTree.CPP 4.1.1 (#5)
8d0c3d33 Add MoveIt Studio site configs for UR robots
637879ed Initial commit

git-subtree-dir: src/moveit_pro_mobile_manipulation
git-subtree-split: df62035c292b10fe1543654883d8f0a561841d56
  • Loading branch information
MikeWrock committed Nov 25, 2024
1 parent 3ca0158 commit 7e1da38
Show file tree
Hide file tree
Showing 10 changed files with 40 additions and 24 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1 @@
# moveit_pro_mobile_manipulation
# moveit_pro_mobile_manipulation
18 changes: 18 additions & 0 deletions mobile_manipulation_config/description/scene.xml
Original file line number Diff line number Diff line change
Expand Up @@ -39,4 +39,22 @@
</body>
<include file="ridgeback/ridgeback.xml" />
</worldbody>
<keyframe>
<!-- qpos -->
<!-- front_rocker, front_left_wheel, front_right_wheel, rear_left_wheel, rear_right_wheel -->
<!-- linear_x_joint, linear_y_joint, rotational_yaw_joint, shoulder_pan, shoulder_lift, elbow, wrist_1, wrist_2, wrist_3 -->
<!-- right_knuckle, right_finger, right_inner_knuckle, right_finger_tip, left_knuckle, left_finger, left_inner_knuckle, left_finger_tip -->
<!-- ctrl -->
<!-- linear_x_joint, linear_y_joint, rotational_yaw_joint, shoulder_pan, shoulder_lift, elbow, wrist_1, wrist_2, wrist_3, robotiq_85_left_knuckle_joint -->
<key
qpos="
0 0 0 0 0
0 0 0 0 -1.534 0.8197 -2.2686 -1.57076 0
0 0 0 0 0 0 0 0
"
ctrl="
0 0 0 0 -1.534 0.8197 -2.2686 -1.57076 0 0
"
/>
</keyframe>
</mujoco>
2 changes: 1 addition & 1 deletion mobile_manipulation_config/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<package format="3">
<name>mobile_manipulation_config</name>
<version>6.1.1</version>
<version>6.5.0</version>

<description>
MuJoCo simulation configuration package for scan and spray application
Expand Down
14 changes: 3 additions & 11 deletions picknik_ur_mobile_config/config/moveit/picknik_ur.srdf
Original file line number Diff line number Diff line change
Expand Up @@ -19,17 +19,9 @@
<group name="linear_actuator" />
</group>
<group name="gripper">
<link name="robotiq_85_base_link"/>
<link name="robotiq_85_left_inner_knuckle_link"/>
<link name="robotiq_85_left_finger_tip_link"/>
<link name="robotiq_85_left_knuckle_link"/>
<link name="robotiq_85_left_finger_link"/>
<link name="robotiq_85_right_inner_knuckle_link"/>
<link name="robotiq_85_right_finger_tip_link"/>
<link name="robotiq_85_right_knuckle_link"/>
<link name="robotiq_85_right_finger_link"/>
<link name="grasp_link"/>
<joint name="robotiq_85_left_knuckle_joint"/>
<chain base_link="robotiq_85_base_link" tip_link="robotiq_85_left_finger_link"/>
<chain base_link="robotiq_85_base_link" tip_link="robotiq_85_right_finger_link"/>
<chain base_link="robotiq_85_base_link" tip_link="grasp_link"/>
</group>
<!--GROUP STATES: Purpose: Define a named state for a particular group, in terms of joint values. This is useful to define states like 'folded arms'-->
<group_state name="open" group="gripper">
Expand Down
2 changes: 0 additions & 2 deletions picknik_ur_mobile_config/description/scene.xml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@
<include file="ridgeback/ridgeback_globals.xml" />

<compiler angle="radian" autolimits="true" />

<option integrator="implicitfast" />
<statistic center="0.3 0 0.4" extent="0.8" />

<worldbody>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
_favorite="true"
>
<Control ID="Sequence" name="TopLevelSequence">
<SubTree ID="Wrist camera snapshot" _collapsed="true" />
<SubTree ID="Take wrist camera snapshot" _collapsed="true" />
<Control ID="Sequence" name="Setup">
<SubTree ID="Open Gripper" />
</Control>
Expand Down
2 changes: 1 addition & 1 deletion picknik_ur_mobile_config/objectives/pick_up_cube.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<BehaviorTree ID="Pick up Cube" _description="" _favorite="true">
<Control ID="Sequence" name="TopLevelSequence">
<!--Take a snapshot so we have a visualization of the cubes to use in grasp pose correction-->
<SubTree ID="Wrist camera snapshot" _collapsed="true" />
<SubTree ID="Take wrist camera snapshot" _collapsed="true" />
<SubTree ID="Pick object" _collapsed="false" />
</Control>
</BehaviorTree>
Expand Down
10 changes: 7 additions & 3 deletions picknik_ur_mobile_config/objectives/take_snap.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
<?xml version="1.0" encoding="UTF-8" ?>
<root BTCPP_format="4" main_tree_to_execute="Scene camera snapshot">
<root BTCPP_format="4" main_tree_to_execute="Take scene camera snapshot">
<!--//////////-->
<BehaviorTree ID="Scene camera snapshot" _description="" _favorite="true">
<BehaviorTree
ID="Take scene camera snapshot"
_description=""
_favorite="true"
>
<Control ID="Sequence" name="TopLevelSequence">
<!-- Clear out old snapshot data -->
<Action ID="ClearSnapshot" />
Expand All @@ -10,6 +14,6 @@
</Control>
</BehaviorTree>
<TreeNodesModel>
<SubTree ID="Scene camera snapshot" />
<SubTree ID="Take scene camera snapshot" />
</TreeNodesModel>
</root>
10 changes: 7 additions & 3 deletions picknik_ur_mobile_config/objectives/wrist_snap.xml
Original file line number Diff line number Diff line change
@@ -1,14 +1,18 @@
<?xml version="1.0" encoding="UTF-8" ?>
<root BTCPP_format="4" main_tree_to_execute="Wrist camera snapshot">
<root BTCPP_format="4" main_tree_to_execute="Take wrist camera snapshot">
<!--//////////-->
<BehaviorTree ID="Wrist camera snapshot" _description="" _favorite="true">
<BehaviorTree
ID="Take wrist camera snapshot"
_description=""
_favorite="true"
>
<Control ID="Sequence" name="TopLevelSequence">
<!-- Do not clear snapshots first, so we can take multiple snapshots from different angles -->
<Action ID="GetPointCloud" topic_name="/wrist_camera/points" />
<Action ID="SendPointCloudToUI" />
</Control>
</BehaviorTree>
<TreeNodesModel>
<SubTree ID="Wrist camera snapshot" />
<SubTree ID="Take wrist camera snapshot" />
</TreeNodesModel>
</root>
2 changes: 1 addition & 1 deletion picknik_ur_mobile_config/package.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" ?>
<package format="3">
<name>picknik_ur_mobile_config</name>
<version>6.0.0</version>
<version>6.5.0</version>

<description>
MuJoCo simulation configuration package for Picknik's UR robot on a mobile
Expand Down

0 comments on commit 7e1da38

Please sign in to comment.