Skip to content

Commit 4aab9ae

Browse files
committed
Merge remote-tracking branch 'origin/main' into joint_jog
2 parents 4b79c59 + 7557719 commit 4aab9ae

File tree

5 files changed

+0
-187
lines changed

5 files changed

+0
-187
lines changed

src/lab_sim/config/moveit/ompl_planning.yaml

Lines changed: 0 additions & 32 deletions
This file was deleted.

src/lab_sim/config/moveit/stomp_planning.yaml

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/moveit_pro_ur_configs/picknik_ur_base_config/config/config.yaml

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,12 +91,6 @@ moveit_params:
9191
# Used by the Waypoint Manager to save joint states from this joint group.
9292
joint_group_name: "manipulator"
9393

94-
ompl_planning:
95-
package: "picknik_ur_base_config"
96-
path: "config/moveit/ompl_planning.yaml"
97-
stomp_planning:
98-
package: "picknik_ur_base_config"
99-
path: "config/moveit/stomp_planning.yaml"
10094
kinematics:
10195
package: "picknik_ur_base_config"
10296
path: "config/moveit/pose_ik_distance.yaml"

src/moveit_pro_ur_configs/picknik_ur_base_config/config/moveit/ompl_planning.yaml

Lines changed: 0 additions & 106 deletions
This file was deleted.

src/moveit_pro_ur_configs/picknik_ur_base_config/config/moveit/stomp_planning.yaml

Lines changed: 0 additions & 22 deletions
This file was deleted.

0 commit comments

Comments
 (0)