Skip to content

Commit

Permalink
Revert "[jsk_spot_startup][head_lead_demo] use :move-arm-impedance-co…
Browse files Browse the repository at this point in the history
…mmand instead of :set-imperance-param"

This reverts commit 3c837f9.
  • Loading branch information
sktometometo committed Nov 22, 2023
1 parent a417afb commit 5fdb90a
Showing 1 changed file with 4 additions and 6 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
(spot-init)
(if (eq (send *ri* :state :power-state-shore-power-state) 'on-shore-power)
(send *ri* :undock))
;; (send *ri* :move-arm-impedance-command (send (send *spot* :arm :endcoords) :copy-worldcoords) :linear-stiffness #f(250 250 250) :rotational-stiffness #f(30 30 30) :linear-damping #f(1.5 1.5 1.5) :rotational-damping #f(0.5 0.5 0.5))
;; (send *ri* :move-arm-impedance-command (send (send *spot* :arm :endcoords) :copy-worldcoords) :linear-stiffness #f(250 25 25) :rotational-stiffness #f(30 5 5) :linear-damping #f(1.5 1.5 1.5) :rotational-damping #f(0.5 0.5 0.5))
;; (send *ri* :set-impedance-param :linear-stiffness #f(250 250 250) :rotational-stiffness #f(30 30 30) :linear-damping #f(1.5 1.5 1.5) :rotational-damping #f(0.5 0.5 0.5))
;; (send *ri* :set-impedance-param :linear-stiffness #f(250 25 25) :rotational-stiffness #f(30 5 5) :linear-damping #f(1.5 1.5 1.5) :rotational-damping #f(0.5 0.5 0.5))

(setq *default-av* #f(0.0 -130.0 120.0 0.0 10.0 0.0))

Expand Down Expand Up @@ -67,9 +67,7 @@
(send *ri* :angle-vector (send *spot* :angle-vector) 1000 :default-controller)
(send *ri* :stop-grasp)
(send *ri* :wait-interpolation)
(send *spot* :angle-vector (send *ri* :state :potentio-vector))
(send *ri* :move-arm-impedance-command
(send (send *spot* :arm :endcoords) :copy-worldcoords)
(send *ri* :set-impedance-param
:linear-stiffness #f(250 25 75) ;; z(up) y(side) x(front)
:rotational-stiffness #f(3 30 30)
:linear-damping #f(1.5 1.0 1.0)
Expand Down Expand Up @@ -281,7 +279,7 @@
(setq *continue* nil))
(unix:signal unix::sigint 'ros::roseus-sigint-handler)

;; send start-func (move-arm-impedance-command) when R Stick button is pressed
;; send start-func (set-impedance) when R Stick button is pressed
(ros::subscribe "/joy_dualsense" sensor_msgs::Joy
#'(lambda (msg)
(if (and (> (length (send msg :buttons)) 11)
Expand Down

0 comments on commit 5fdb90a

Please sign in to comment.