Skip to content

Commit 741228c

Browse files
committed
WIP trying to stop the shoulder inversion when moving to the stow waypoint, struggling with ctb placement in bench
1 parent 5dcb00e commit 741228c

File tree

2 files changed

+20
-8
lines changed

2 files changed

+20
-8
lines changed

clr_pick_and_place_demo/config/waypoints.yaml

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -53,19 +53,26 @@ waypoints:
5353
cartesian: false
5454

5555
stow:
56+
# config:
57+
# - 4.17133 # 238 deg
58+
# - -2.6529 # -152 deg
59+
# - 2.44346 # 140 deg
60+
# - 0.0
61+
# - 1.0821 # 62 deg
62+
# - 0.1222 # 7 deg
5663
config:
57-
- 4.17133 # 238 deg
58-
- -2.6529 # -152 deg
59-
- 2.44346 # 140 deg
60-
- 0.0
61-
- 1.0821 # 62 deg
62-
- 0.1222 # 7 deg
64+
- 1.5010 # 86 deg
65+
- -0.3316 # -19 deg
66+
- -2.2515 # -129 deg
67+
- -3.6477 # -209 deg
68+
- -1.5533 # -89 deg
69+
- 1.5708 # 90 deg
6370
planning_group: "ur_manipulator"
6471
cartesian: false
6572
planner: "RRTstarkConfigDefault"
6673
traverse_right:
6774
config:
68-
- 1.748
75+
- 1.200
6976
planning_group: "rail"
7077
cartesian: false
7178
ctb_offset:

clr_pick_and_place_demo/src/run_demo.cpp

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -292,6 +292,11 @@ class RunDemoNode : public rclcpp::Node
292292
RCLCPP_ERROR(LOGGER, "Failed to stow manipulator. Exiting.");
293293
return;
294294
}
295+
if (!this->demo_home())
296+
{
297+
RCLCPP_ERROR(LOGGER, "Failed to return to home position. Exiting.");
298+
return;
299+
}
295300
RCLCPP_INFO(LOGGER, "Demo succeeded!");
296301
}
297302

@@ -434,7 +439,7 @@ class RunDemoNode : public rclcpp::Node
434439
geometry_msgs::msg::Pose offset = wp_map.at("ctb_offset").pose;
435440
global_pose = this->relative_to_global(global_pose, offset);
436441

437-
Waypoint blob_wp = Waypoint(global_pose, "chonkur_grasp", true);
442+
Waypoint blob_wp = Waypoint(global_pose, "clr", true);
438443
return plan_and_execute(blob_wp);
439444
}
440445

0 commit comments

Comments
 (0)