Skip to content

Commit

Permalink
[panda_eus] Re-use panda-robot-interface in fr3-robot-interface
Browse files Browse the repository at this point in the history
  • Loading branch information
pazeshun committed Nov 2, 2023
1 parent ca18d81 commit 04940de
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 19 deletions.
19 changes: 2 additions & 17 deletions jsk_panda_robot/panda_eus/euslisp/fr3-interface.l
Original file line number Diff line number Diff line change
@@ -1,30 +1,15 @@
(require :franka-common-interface "package://panda_eus/euslisp/franka-common-interface.l")
(require :panda-interface "package://panda_eus/euslisp/panda-interface.l")
(require :fr3-utils "package://panda_eus/euslisp/fr3-utils.l")

(defclass fr3-robot-interface
:super franka-common-interface
:super panda-robot-interface
:slots ())

(defmethod fr3-robot-interface
(:init
(&rest args)
(send-super* :init :robot fr3-robot
:joint-states-topic "joint_states"
:all-arms (list :rarm)
:all-arm-aliases (list :arm)
:error-topics (list "/franka_state_controller/franka_states")
:error-topic-types (list franka_msgs::FrankaState)
:error-recovery-action "/franka_control/error_recovery"
:gripper-action-prefixes (list "")
args))
(:default-controller
()
(list
(list
(cons :controller-action "/position_joint_trajectory_controller/follow_joint_trajectory")
(cons :controller-state "/position_joint_trajectory_controller/state")
(cons :action-type control_msgs::FollowJointTrajectoryAction)
(cons :joint-names (send-all (send robot :joint-list) :name)))))
)

(defun fr3-init ()
Expand Down
4 changes: 2 additions & 2 deletions jsk_panda_robot/panda_eus/euslisp/panda-interface.l
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

(defmethod panda-robot-interface
(:init
(&rest args)
(send-super* :init :robot panda-robot
(&rest args &key (robot panda-robot))
(send-super* :init :robot robot
:joint-states-topic "joint_states"
:all-arms (list :rarm)
:all-arm-aliases (list :arm)
Expand Down

0 comments on commit 04940de

Please sign in to comment.