Skip to content

Commit

Permalink
fix &rest args position
Browse files Browse the repository at this point in the history
  • Loading branch information
knorth55 committed Dec 15, 2022
1 parent b862fbf commit 09c3861
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions jsk_baxter_robot/baxtereus/baxter-softhand-interface.l
Original file line number Diff line number Diff line change
Expand Up @@ -42,29 +42,29 @@
((equal arm :arms)
(list lgripper-interface rgripper-interface))
(t nil)))
(:start-grasp (&optional (arm :arms) &key (rotate-angle nil) &rest args &allow-other-keys)
(:start-grasp (&optional (arm :arms) &rest args &key (rotate-angle nil) &allow-other-keys)
(cond
((equal arm :arms)
(let ((larm-start-grasp-p (send* self :start-grasp-step :larm :rotate-angle rotate-angle args))
(rarm-start-grasp-p (send* self :start-grasp-step :rarm :rotate-angle rotate-angle args)))
(and larm-start-grasp-p rarm-start-grasp-p)))
(t (send* self :start-grasp-step arm :rotate-angle rotate-angle args))))
(:start-grasp-step (arm &key (rotate-angle nil) &rest args &allow-other-keys)
(:start-grasp-step (arm &rest args &key (rotate-angle nil) &allow-other-keys)
(cond
((equal (send self :get-gripper-type arm) :parallel)
(send-super* :start-grasp arm args))
((or (equal (send self :get-gripper-type arm) :softhand)
(equal (send self :get-gripper-type arm) :softhand-v2))
(send (send self :get-gripper-interface arm) :start-grasp :rotate-angle rotate-angle))
(t nil)))
(:stop-grasp (&optional (arm :arms) &key (rotate-angle nil) &rest args &allow-other-keys)
(:stop-grasp (&optional (arm :arms) &rest args &key (rotate-angle nil) &allow-other-keys)
(cond
((equal arm :arms)
(let ((larm-stop-grasp-p (send* self :stop-grasp-step :larm :rotate-angle rotate-angle args))
(rarm-stop-grasp-p (send* self :stop-grasp-step :rarm :rotate-angle rotate-angle args)))
(and larm-stop-grasp-p rarm-stop-grasp-p)))
(t (send* self :stop-grasp-step arm args))))
(:stop-grasp-step (arm &key (rotate-angle nil) &rest args &allow-other-keys)
(:stop-grasp-step (arm &rest args &key (rotate-angle nil) &allow-other-keys)
(cond
((equal (send self :get-gripper-type arm) :parallel)
(send-super* :stop-grasp arm args))
Expand Down

0 comments on commit 09c3861

Please sign in to comment.