Subtree sync (#19)

Sync upstream changes
PickNikRobotics · Nov 25, 2024 · 9cfc575 · 9cfc575
1 parent 43db145
commit 9cfc575
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/src/moveit_pro_ur_configs/arm_on_rail_sim/config/config.yaml b/src/moveit_pro_ur_configs/arm_on_rail_sim/config/config.yaml
@@ -42,7 +42,6 @@ objectives:
       - "moveit_studio::behaviors::MTCCoreBehaviorsLoader"
       - "moveit_studio::behaviors::ServoBehaviorsLoader"
       - "moveit_studio::behaviors::VisionBehaviorsLoader"
-      - "picknik_registration::PicknikRegistrationBehaviorsLoader"
   # Specify source folder for objectives
   # [Required]
   objective_library_paths:

diff --git a/src/moveit_pro_ur_configs/arm_on_rail_sim/objectives/wrist_snap.xml b/src/moveit_pro_ur_configs/arm_on_rail_sim/objectives/wrist_snap.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<root BTCPP_format="4" main_tree_to_execute=" Take wrist camera snapshot">
+<root BTCPP_format="4" main_tree_to_execute="Take wrist camera snapshot">
   <!--//////////-->
   <BehaviorTree
     ID="Take wrist camera snapshot"

diff --git a/src/moveit_pro_ur_configs/arm_on_rail_sim/package.xml b/src/moveit_pro_ur_configs/arm_on_rail_sim/package.xml
@@ -1,8 +1,7 @@
 <?xml version="1.0" ?>
 <package format="3">
   <name>arm_on_rail_sim</name>
-  <version>6.0.0</version>
-
+  <version>6.5.0</version>
   <description>
     MuJoCo simulation configuration package for Picknik's UR robot on a linear
     rail

diff --git a/src/picknik_accessories b/src/picknik_accessories
diff --git a/sync_subtrees.sh b/sync_subtrees.sh
@@ -7,6 +7,6 @@ git subtree pull --prefix src/moveit_pro_kinova_configs https://github.com/PickN
 git subtree pull --prefix src/moveit_pro_mobile_manipulation https://github.com/PickNikRobotics/moveit_pro_mobile_manipulation main --squash
 git subtree pull --prefix src/fanuc_sim https://github.com/PickNikRobotics/fanuc_sim main --squash
 git subtree pull --prefix src/external_dependencies/ridgeback https://github.com/sjahr/ridgeback ros2 --squash
-git subtree pull --prefix src/external_dependencies/ros2_robotiq_gripper https://github.com/PickNikRobotics/ros2_robotiq_gripper main --squash
+git subtree pull --prefix src/external_dependencies/ros2_robotiq_gripper https://github.com/PickNikRobotics/ros2_robotiq_gripper humble --squash
 git subtree pull --prefix src/external_dependencies/serial https://github.com/tylerjw/serial.git ros2 --squash
-gis submodule update --recursive --init
+git submodule update --recursive --init
+4 −4		mujoco_assets/robotiq_2f85/robotiq2f85_globals.xml
+4 −32		mujoco_assets/ur5e/ur5e_globals.xml