Skip to content

Commit 9cfc575

Browse files
authored
Subtree sync (#19)
Sync upstream changes
1 parent 43db145 commit 9cfc575

File tree

5 files changed

+5
-7
lines changed

5 files changed

+5
-7
lines changed

src/moveit_pro_ur_configs/arm_on_rail_sim/config/config.yaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ objectives:
4242
- "moveit_studio::behaviors::MTCCoreBehaviorsLoader"
4343
- "moveit_studio::behaviors::ServoBehaviorsLoader"
4444
- "moveit_studio::behaviors::VisionBehaviorsLoader"
45-
- "picknik_registration::PicknikRegistrationBehaviorsLoader"
4645
# Specify source folder for objectives
4746
# [Required]
4847
objective_library_paths:

src/moveit_pro_ur_configs/arm_on_rail_sim/objectives/wrist_snap.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version="1.0" encoding="UTF-8" ?>
2-
<root BTCPP_format="4" main_tree_to_execute=" Take wrist camera snapshot">
2+
<root BTCPP_format="4" main_tree_to_execute="Take wrist camera snapshot">
33
<!--//////////-->
44
<BehaviorTree
55
ID="Take wrist camera snapshot"

src/moveit_pro_ur_configs/arm_on_rail_sim/package.xml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?xml version="1.0" ?>
22
<package format="3">
33
<name>arm_on_rail_sim</name>
4-
<version>6.0.0</version>
5-
4+
<version>6.5.0</version>
65
<description>
76
MuJoCo simulation configuration package for Picknik's UR robot on a linear
87
rail

sync_subtrees.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ git subtree pull --prefix src/moveit_pro_kinova_configs https://github.com/PickN
77
git subtree pull --prefix src/moveit_pro_mobile_manipulation https://github.com/PickNikRobotics/moveit_pro_mobile_manipulation main --squash
88
git subtree pull --prefix src/fanuc_sim https://github.com/PickNikRobotics/fanuc_sim main --squash
99
git subtree pull --prefix src/external_dependencies/ridgeback https://github.com/sjahr/ridgeback ros2 --squash
10-
git subtree pull --prefix src/external_dependencies/ros2_robotiq_gripper https://github.com/PickNikRobotics/ros2_robotiq_gripper main --squash
10+
git subtree pull --prefix src/external_dependencies/ros2_robotiq_gripper https://github.com/PickNikRobotics/ros2_robotiq_gripper humble --squash
1111
git subtree pull --prefix src/external_dependencies/serial https://github.com/tylerjw/serial.git ros2 --squash
12-
gis submodule update --recursive --init
12+
git submodule update --recursive --init

0 commit comments

Comments
 (0)