Skip to content

Commit

Permalink
Merge branch 'feature_plan_c_motion_uses_waypoints' into remove_plann…
Browse files Browse the repository at this point in the history
…er_call_magic
  • Loading branch information
yck011522 committed Jun 13, 2024
2 parents 93b7502 + ba32b90 commit c63a5f3
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 1 addition & 3 deletions src/compas_fab/robots/robot.py
Original file line number Diff line number Diff line change
Expand Up @@ -1415,9 +1415,7 @@ def plan_cartesian_motion(self, waypoints, start_configuration=None, group=None,
else:
cp.scale(1.0 / self.scale_factor)
path_constraints_WCF_scaled.append(cp)
else:
path_constraints_WCF_scaled = None
options["path_constraints"] = path_constraints_WCF_scaled
options["path_constraints"] = path_constraints_WCF_scaled

# =====================
# Attached CM and Tools
Expand Down
2 changes: 2 additions & 0 deletions tests/backends/kinematics/test_inverse_kinematics.py
Original file line number Diff line number Diff line change
Expand Up @@ -150,4 +150,6 @@ def test_kinematics_cartesian_with_tool_coordinate_frame(frame_waypoints):
# Assert that the trajectory is complete
assert trajectory.fraction == 1.0
# Assert that the trajectory has the correct number of points
# NOTE: At the moment the AnalyticalPyBulletClient does not perform any interpolation between frames
# NOTE: if future implementation fixes this, the following test will not be valid anymore
assert len(trajectory.points) == len(frame_waypoints.target_frames)

0 comments on commit c63a5f3

Please sign in to comment.