Skip to content

Commit dd4249a

Browse files
committed
add spin-once before image set-alist
1 parent 3752a9b commit dd4249a

File tree

1 file changed

+30
-0
lines changed

1 file changed

+30
-0
lines changed

jsk_fetch_robot/jsk_fetch_startup/euslisp/navigation-utils.l

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -760,6 +760,7 @@ Args:
760760
'(lambda (userdata)
761761
(let ((light-on (get-light-on)))
762762
(setf (cdr (assoc 'initial-light-on userdata)) light-on)
763+
(ros::spin-once)
763764
(if light-on
764765
(set-alist 'description "電気がついていたよ" userdata)
765766
(set-alist 'description "電気がついていなかったよ" userdata))
@@ -774,6 +775,7 @@ Args:
774775
(let ((control-switchbot (cdr (assoc 'control-switchbot userdata))))
775776
(report-light-off)
776777
(room-light-on :control-switchbot control-switchbot)
778+
(ros::spin-once)
777779
(set-alist 'description "電気をつけたよ" userdata)
778780
(set-alist 'image (remove #\newline (base64encode (send *image* :serialize))) userdata)
779781
t)))
@@ -782,6 +784,7 @@ Args:
782784
(let* ((n-trial (cdr (assoc 'n-dock-front-trial userdata)))
783785
(success (move-to-dock-front :n-trial n-trial)))
784786
(setf (cdr (assoc 'success-go-to-dock-front userdata)) success)
787+
(ros::spin-once)
785788
(if success
786789
(set-alist 'description "ドックの前に移動したよ" userdata)
787790
(set-alist 'description "ドックの前に移動しようとしたけど,迷子になっちゃった" userdata))
@@ -790,12 +793,14 @@ Args:
790793
(:inspect-dock-front
791794
'(lambda (userdata)
792795
(inspect-dock-front :tweet (cdr (assoc 'tweet userdata)))
796+
(ros::spin-once)
793797
(set-alist 'description "ドックの前の様子を見たよ" userdata)
794798
(set-alist 'image (remove #\newline (base64encode (send *image* :serialize))) userdata)
795799
t))
796800
(:report-move-to-dock-front-failure
797801
'(lambda (userdata)
798802
(report-move-to-dock-front-failure)
803+
(ros::spin-once)
799804
(set-alist 'description "ドックの前に移動できなかったよ" userdata)
800805
(set-alist 'image (remove #\newline (base64encode (send *image* :serialize))) userdata)
801806
t))
@@ -804,6 +809,7 @@ Args:
804809
(let* ((n-trial (cdr (assoc 'n-tv-front-trial userdata)))
805810
(success (move-to-tv-front :n-trial n-trial)))
806811
(setf (cdr (assoc 'success-go-to-tv-front userdata)) success)
812+
(ros::spin-once)
807813
(if success
808814
(set-alist 'description "テレビの前に移動したよ" userdata)
809815
(set-alist 'description "テレビの前に移動しようとしたけど,迷子になっちゃった" userdata))
@@ -812,12 +818,14 @@ Args:
812818
(:inspect-tv-front
813819
'(lambda (userdata)
814820
(inspect-tv-front :tweet (cdr (assoc 'tweet userdata)))
821+
(ros::spin-once)
815822
(set-alist 'description "テレビの前の様子を見たよ" userdata)
816823
(set-alist 'image (remove #\newline (base64encode (send *image* :serialize))) userdata)
817824
t))
818825
(:report-move-to-tv-front-failure
819826
'(lambda (userdata)
820827
(report-move-to-tv-front-failure)
828+
(ros::spin-once)
821829
(set-alist 'description "テレビの前に移動できなかったよ" userdata)
822830
(set-alist 'image (remove #\newline (base64encode (send *image* :serialize))) userdata)
823831
t))
@@ -826,6 +834,7 @@ Args:
826834
(let* ((n-trial (cdr (assoc 'n-tv-desk-trial userdata)))
827835
(success (move-to-tv-desk :n-trial n-trial)))
828836
(setf (cdr (assoc 'success-go-to-tv-desk userdata)) success)
837+
(ros::spin-once)
829838
(if success
830839
(set-alist 'description "机の前に移動したよ" userdata)
831840
(set-alist 'description "机の前に移動しようとしたけど,迷子になっちゃった" userdata))
@@ -834,12 +843,14 @@ Args:
834843
(:inspect-tv-desk
835844
'(lambda (userdata)
836845
(inspect-tv-desk :tweet (cdr (assoc 'tweet userdata)))
846+
(ros::spin-once)
837847
(set-alist 'description "机の様子を確認したよ" userdata)
838848
(set-alist 'image (remove #\newline (base64encode (send *image* :serialize))) userdata)
839849
t))
840850
(:report-move-to-tv-desk-failure
841851
'(lambda (userdata)
842852
(report-move-to-tv-desk-failure)
853+
(ros::spin-once)
843854
(set-alist 'description "机の前に移動できなかったよ" userdata)
844855
(set-alist 'image (remove #\newline (base64encode (send *image* :serialize))) userdata)
845856
t))
@@ -848,6 +859,7 @@ Args:
848859
(let* ((n-trial (cdr (assoc 'n-desk-back-trial userdata)))
849860
(success (move-to-desk-back :n-trial n-trial)))
850861
(setf (cdr (assoc 'success-go-to-desk-back userdata)) success)
862+
(ros::spin-once)
851863
(if success
852864
(set-alist 'description "部屋の後ろに移動したよ" userdata)
853865
(set-alist 'description "部屋の後ろに移動しようとしたけど,迷子になっちゃった" userdata))
@@ -856,12 +868,14 @@ Args:
856868
(:inspect-desk-back
857869
'(lambda (userdata)
858870
(inspect-desk-back :tweet (cdr (assoc 'tweet userdata)))
871+
(ros::spin-once)
859872
(set-alist 'description "部屋の後ろを確認したよ" userdata)
860873
(set-alist 'image (remove #\newline (base64encode (send *image* :serialize))) userdata)
861874
t))
862875
(:report-move-to-desk-back-failure
863876
'(lambda (userdata)
864877
(report-move-to-desk-back-failure)
878+
(ros::spin-once)
865879
(set-alist 'description "部屋の後ろに移動できなかったよ" userdata)
866880
(set-alist 'image (remove #\newline (base64encode (send *image* :serialize))) userdata)
867881
t))
@@ -870,6 +884,7 @@ Args:
870884
(let* ((n-trial (cdr (assoc 'n-desk-front-trial userdata)))
871885
(success (move-to-desk-front :n-trial n-trial)))
872886
(setf (cdr (assoc 'success-go-to-desk-front userdata)) success)
887+
(ros::spin-once)
873888
(if success
874889
(set-alist 'description "部屋の前に移動したよ" userdata)
875890
(set-alist 'description "部屋の前に移動しようとしたけど,迷子になっちゃった" userdata))
@@ -878,12 +893,14 @@ Args:
878893
(:inspect-desk-front
879894
'(lambda (userdata)
880895
(inspect-desk-front :tweet (cdr (assoc 'tweet userdata)))
896+
(ros::spin-once)
881897
(set-alist 'description "部屋の前を確認したよ" userdata)
882898
(set-alist 'image (remove #\newline (base64encode (send *image* :serialize))) userdata)
883899
t))
884900
(:report-move-to-desk-front-failure
885901
'(lambda (userdata)
886902
(report-move-to-desk-front-failure)
903+
(ros::spin-once)
887904
(set-alist 'description "部屋の前に移動できなかったよ" userdata)
888905
(set-alist 'image (remove #\newline (base64encode (send *image* :serialize))) userdata)
889906
t))
@@ -892,6 +909,7 @@ Args:
892909
(let* ((n-trial (cdr (assoc 'n-kitchen-door-front-trial userdata)))
893910
(success (move-to-kitchen-door-front :n-trial n-trial)))
894911
(setf (cdr (assoc 'success-go-to-tv-desk userdata)) success)
912+
(ros::spin-once)
895913
(if success
896914
(set-alist 'description "ドアの前に移動したよ" userdata)
897915
(set-alist 'description "ドアの前に移動しようとしたけど,迷子になっちゃった" userdata))
@@ -900,12 +918,14 @@ Args:
900918
(:inspect-kitchen-door-front
901919
'(lambda (userdata)
902920
(inspect-kitchen-door-front :tweet (cdr (assoc 'tweet userdata)))
921+
(ros::spin-once)
903922
(set-alist 'description "ドアの前からキッチンの様子を見たよ" userdata)
904923
(set-alist 'image (remove #\newline (base64encode (send *image* :serialize))) userdata)
905924
t))
906925
(:report-move-to-kitchen-door-front-failure
907926
'(lambda (userdata)
908927
(report-move-to-kitchen-door-front-failure)
928+
(ros::spin-once)
909929
(set-alist 'description "ドアの前に移動できなかったよ" userdata)
910930
(set-alist 'image (remove #\newline (base64encode (send *image* :serialize))) userdata)
911931
t))
@@ -914,6 +934,7 @@ Args:
914934
(let* ((n-trial (cdr (assoc 'n-kitchen-trial userdata)))
915935
(success (move-to-sink-front :n-trial n-trial)))
916936
(setf (cdr (assoc 'success-go-to-kitchen userdata)) success)
937+
(ros::spin-once)
917938
(if success
918939
(set-alist 'description "キッチンに移動したよ" userdata)
919940
(set-alist 'description "キッチンに移動しようとしたけど,迷子になっちゃった" userdata))
@@ -924,12 +945,14 @@ Args:
924945
(let* ((label-names (notify-recognition :location "kitchen"))
925946
(notify-text (if label-names (format nil "~Aがあったよ" label-names) "")))
926947
(inspect-kitchen :tweet (cdr (assoc 'tweet userdata)))
948+
(ros::spin-once)
927949
(set-alist 'description (format nil "キッチンの様子を見たよ。~A" notify-text) userdata))
928950
(set-alist 'image (remove #\newline (base64encode (send *image* :serialize))) userdata)
929951
t))
930952
(:report-move-to-sink-front-failure
931953
'(lambda (userdata)
932954
(report-move-to-sink-front-failure)
955+
(ros::spin-once)
933956
(set-alist 'description "キッチンに行けなかったよ" userdata)
934957
(set-alist 'image (remove #\newline (base64encode (send *image* :serialize))) userdata)
935958
t))
@@ -938,6 +961,7 @@ Args:
938961
(let* ((n-trial (cdr (assoc 'n-trashcan-trial userdata)))
939962
(success (move-to-trashcan-front :n-trial n-trial)))
940963
(setf (cdr (assoc 'success-go-to-trashcan userdata)) success)
964+
(ros::spin-once)
941965
(if success
942966
(set-alist 'description "ゴミ箱の前に移動したよ" userdata)
943967
(set-alist 'description "ゴミ箱の前に移動しようとしたけど,迷子になっちゃった" userdata))
@@ -946,12 +970,14 @@ Args:
946970
(:inspect-trashcan
947971
'(lambda (userdata)
948972
(inspect-trashcan :tweet (cdr (assoc 'tweet userdata)))
973+
(ros::spin-once)
949974
(set-alist 'description "ゴミ箱の様子を確認したよ" userdata)
950975
(set-alist 'image (remove #\newline (base64encode (send *image* :serialize))) userdata)
951976
t))
952977
(:report-move-to-trashcan-front-failure
953978
'(lambda (userdata)
954979
(report-move-to-trashcan-front-failure)
980+
(ros::spin-once)
955981
(set-alist 'description "ゴミ箱の前に行けなかったよ" userdata)
956982
(set-alist 'image (remove #\newline (base64encode (send *image* :serialize))) userdata)
957983
t))
@@ -961,6 +987,7 @@ Args:
961987
(let* ((n-trial (cdr (assoc 'n-dock-trial userdata)))
962988
(success (auto-dock :n-trial n-trial :clear-costmap nil)))
963989
(setf (cdr (assoc 'success-auto-dock userdata)) success)
990+
(ros::spin-once)
964991
(if success
965992
(set-alist 'description "帰ってきたよ" userdata)
966993
(set-alist 'description "帰ってこようとしたけど,迷子になっちゃった" userdata))
@@ -969,6 +996,7 @@ Args:
969996
(:auto-dock-failure
970997
'(lambda (userdata)
971998
(report-auto-dock-failure)
999+
(ros::spin-once)
9721000
(set-alist 'description "帰ってこられなかったよ" userdata)
9731001
(set-alist 'image (remove #\newline (base64encode (send *image* :serialize))) userdata)
9741002
t))
@@ -980,6 +1008,7 @@ Args:
9801008
(if (and success-auto-dock (not initial-light-on))
9811009
(progn
9821010
(room-light-off :control-switchbot control-switchbot)
1011+
(ros::spin-once)
9831012
(set-alist 'description "電気を消したよ" userdata)
9841013
(set-alist 'image "" userdata))))
9851014
t))
@@ -992,6 +1021,7 @@ Args:
9921021
(success-go-to-kitchen
9931022
(cdr (assoc 'success-go-to-kitchen userdata))))
9941023
(restore-params)
1024+
(ros::spin-once)
9951025
(set-alist 'description "キッチンデモを終えるよ" userdata)
9961026
(set-alist 'image "" userdata)
9971027
(and success-go-to-kitchen success-auto-dock success-battery-charging)))))

0 commit comments

Comments
 (0)