Skip to content

Commit ba5fc8f

Browse files
committed
[jsk_fetch_startup/kitchen] Use notify-recognition in description
1 parent 1213188 commit ba5fc8f

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

jsk_fetch_robot/jsk_fetch_startup/euslisp/navigation-utils.l

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -387,7 +387,8 @@ Args:
387387
(notify-app "object recognition"
388388
(send msg :header :stamp)
389389
location
390-
(format nil "~A is found" label-names)))))
390+
(format nil "~A is found" label-names))
391+
label-names)))
391392

392393
(defun inspect-kitchen (&key (tweet t))
393394
(report-move-to-sink-front-success)
@@ -858,9 +859,11 @@ Args:
858859
success)))
859860
(:inspect-kitchen
860861
'(lambda (userdata)
861-
(inspect-kitchen :tweet (cdr (assoc 'tweet userdata)))
862-
(set-alist 'description "キッチンの様子を見たよ" userdata)
863-
(set-alist 'image (remove #\newline (base64encode (send *image* :serialize))) userdata)
862+
(let ((label-names (notify-recognition :location "kitchen"))
863+
(notify-text (if label-names (format nil "~Aがあったよ" label-names) "")))
864+
(inspect-kitchen :tweet (cdr (assoc 'tweet userdata)))
865+
(set-alist 'description (format nil "キッチンの様子を見たよ。~A" notify-text) userdata))
866+
(set-alist 'image (remove #\newline (base64encode (send *image* :serialize))) userdata)
864867
t))
865868
(:report-move-to-sink-front-failure
866869
'(lambda (userdata)

0 commit comments

Comments
 (0)