Skip to content

Commit

Permalink
Merge pull request #1164 from iory/pr2-cable
Browse files Browse the repository at this point in the history
[jsk_pr2_startup/cable_warning.l] Add moving is OK voice
  • Loading branch information
k-okada authored Nov 2, 2019
2 parents 67a7458 + a50a3f0 commit b72d890
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions jsk_pr2_robot/jsk_pr2_startup/jsk_pr2_warning/cable_warning.l
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,8 @@
(a (send msg :ac_present))
(tm (ros::time-now)))
(ros::ros-debug "power-state pc:~A cap:~A" p a)
(when (and *ac* (<= a 0))
(speak-jp (format nil "PR2、移動可能です。") :wait nil))
(setq *ac* (> a 0))
(if (or *ac*
(> 180.0 (send (ros::time- tm *ac-tm*) :to-sec)))
Expand Down

0 comments on commit b72d890

Please sign in to comment.