Skip to content

Commit

Permalink
Merge branch 'feature-collision-handling' of github.com:qcr/armer int…
Browse files Browse the repository at this point in the history
…o feature-collision-handling
  • Loading branch information
DasGuna committed Dec 12, 2023
2 parents a8e424e + 492fb6b commit 13d74c8
Showing 1 changed file with 3 additions and 8 deletions.
11 changes: 3 additions & 8 deletions armer/robots/ROSRobot.py
Original file line number Diff line number Diff line change
Expand Up @@ -791,15 +791,10 @@ def joint_pose_cb(self, goal: MoveToJointPoseGoal) -> None:
self.preempt()

with self.lock:

# Check for singularity on end solution:
# TODO: prevent motion on this bool? Needs to be thought about
if self.check_singularity(goal.joints):
rospy.logwarn(f"IK solution within singularity threshold [{self.singularity_thresh}] -> ill-advised motion")

# NOTE: checks for collisions and workspace violations
# NOTE: can continue if workspace is not defined
if self.general_executor(q=goal.joints):
# NOTE: checks for singularity violations
# NOTE: can continue if workspace is not defined (ignored as no pose is defined)
if self.general_executor(q=goal.joints, workspace_ignore=True):
self.joint_pose_server.set_succeeded(MoveToJointPoseResult(success=True))
else:
self.joint_pose_server.set_aborted(MoveToJointPoseResult(success=False))
Expand Down

0 comments on commit 13d74c8

Please sign in to comment.