Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[WIP] [DO NOT MERGE] Add all demonstations tsukamoto has made #1392

Open
wants to merge 503 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
503 commits
Select commit Hold shift + click to select a range
4e2a954
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 1, 2021
304d25a
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 1, 2021
41defd1
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 2, 2021
c7e30db
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 2, 2021
690360e
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 2, 2021
b54d2fe
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 2, 2021
f831a4b
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 2, 2021
f90b313
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 2, 2021
6b7abb8
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 2, 2021
8b31eff
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 2, 2021
8ad4f90
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 2, 2021
4c9bf31
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 2, 2021
1d66e90
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 2, 2021
e7810cd
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 2, 2021
a2fa99c
[jsk_spot_delivery_demo] update demo
sktometometo Oct 2, 2021
bc9cc9c
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 2, 2021
40c2a18
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 2, 2021
def85cc
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 2, 2021
57179ed
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 2, 2021
4f1bbcd
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 2, 2021
dd5a9f4
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 2, 2021
940b191
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 2, 2021
6c3e58f
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 2, 2021
79e4784
[jsk_spot_delivery_demo] fix bugs
sktometometo Oct 2, 2021
91db228
temporary change spot-init
tkmtnt7000 Oct 4, 2021
ad3070b
add pr2 trashbag rviz conf
tkmtnt7000 Oct 5, 2021
9081659
add pr2 trashbag detect file
tkmtnt7000 Oct 5, 2021
9bcf098
add moving trashcan to spot
tkmtnt7000 Oct 5, 2021
8a0e2aa
[jsk_spot_delivery_demo] temporaly disable approach
sktometometo Oct 5, 2021
c66b989
add moving
tkmtnt7000 Oct 5, 2021
d2e87f0
Merge remote-tracking branch 'origin/PR/spot/person_lead_demo' into d…
sktometometo Oct 6, 2021
e6f9406
[spot_person_lead_demo] add interaction node
sktometometo Oct 6, 2021
aa06d76
[spot_person_lead_demo] bugfix
sktometometo Oct 6, 2021
01fb376
[spot_person_lead_demo] bugfix
sktometometo Oct 6, 2021
295b3d0
[spot_person_lead_demo] bugfix
sktometometo Oct 6, 2021
9d1a7ea
[spot_person_lead_demo] bugfix
sktometometo Oct 6, 2021
051beb0
[spot_person_lead_demo] bugfix
sktometometo Oct 6, 2021
06db2c6
[spot_person_leader] move packages to jsk_spot_robot
sktometometo Oct 6, 2021
ec4a909
add detection of trash bag with rope
tkmtnt7000 Oct 8, 2021
aabe896
revise indent
tkmtnt7000 Oct 13, 2021
3b8d0e8
fix import file name
tkmtnt7000 Oct 15, 2021
ac3bedd
add basic function of fetch
tkmtnt7000 Oct 15, 2021
f5a725b
add go-to-spot function
tkmtnt7000 Oct 15, 2021
656ce55
add offset variable
tkmtnt7000 Oct 15, 2021
68267da
add move-to-trashcan-front function
tkmtnt7000 Oct 15, 2021
2e618ec
add memo-of fetch lift-pose
tkmtnt7000 Oct 17, 2021
5395d1d
update go-pos-unsafe
tkmtnt7000 Oct 19, 2021
70e8015
add hole-rope-hold
tkmtnt7000 Oct 19, 2021
0816d23
update trashcan parameter
tkmtnt7000 Oct 19, 2021
b3f087c
[jsk_spot_delivery_demo] update
sktometometo Oct 20, 2021
e24cda7
[jsk_spot_watch_dog] update
sktometometo Oct 20, 2021
11f8aa4
update indent
tkmtnt7000 Oct 20, 2021
211dafa
fix bugs
k-okada Oct 20, 2021
9af34b1
temp-threshold -> temp-threshold-sit
k-okada Oct 21, 2021
a3ee210
[jsk_spot_go_to_spot] fix action name
sktometometo Oct 25, 2021
e06ae9f
[jsk_spot_take_envelop_to_mech_office] fix action name
sktometometo Oct 25, 2021
abca13a
Merge branch 'develop/spot' of https://github.com/sktometometo/jsk_de…
k-okada Oct 25, 2021
453e9b1
Merge remote-tracking branch 'origin/shinjo-temp' into develop/spot
sktometometo Oct 25, 2021
84d31e7
add hole-main function and change indent
tkmtnt7000 Oct 27, 2021
c9c307c
add 73b2-door-front
tkmtnt7000 Oct 27, 2021
64b3ed9
add fetch door-opening
tkmtnt7000 Oct 27, 2021
3e00d6f
add angle-vector-sequence
tkmtnt7000 Oct 27, 2021
ce615f6
[jsk_spot_delivery_demo] update demo
sktometometo Oct 27, 2021
92a179c
add interpolation of door-opening
tkmtnt7000 Oct 27, 2021
37d4527
[jsk_spot_delivery_demo] update
sktometometo Oct 28, 2021
b9bbce7
[jsk_spot_delivery_demo] update
sktometometo Oct 28, 2021
540caf1
[jsk_spot_deliery_demo] update
sktometometo Oct 28, 2021
39567f9
[jsk_spot_delivery_demo] update
sktometometo Oct 28, 2021
b3b2bc1
[jsk_spot_delivery_demo] update
sktometometo Oct 28, 2021
e9c85d7
[jsk_spot_delivery_demo] update
sktometometo Oct 28, 2021
a32e331
[jsk_spot_delivery_demo] update
sktometometo Oct 28, 2021
6691e66
[jsk_spot_delivery_demo] update
sktometometo Oct 28, 2021
adc4cf6
[jsk_spot_delivery_demo] update
sktometometo Oct 28, 2021
5045a4c
[jsk_spot_delivery_demo] update
sktometometo Oct 28, 2021
e04265f
[jsk_spot_delivery_demo] update
sktometometo Oct 28, 2021
dc41e41
[jsk_spot_delivery_demo] update
sktometometo Oct 28, 2021
8d93d06
[jsk_spot_delivery_demo] update
sktometometo Oct 28, 2021
5bbe52a
[jsk_spot_delivery_demo] update
sktometometo Oct 28, 2021
42e2269
[jsk_spot_delivery_demo] update
sktometometo Oct 28, 2021
76cf569
[jsk_spot_delivery_demo] update
sktometometo Oct 28, 2021
dbff22b
[jsk_spot_delivery_demo] update
sktometometo Oct 28, 2021
81abfd6
[jsk_spot_delivery_demo] update
sktometometo Oct 28, 2021
e4b92c6
add arm servo on and off switcher
tkmtnt7000 Oct 28, 2021
3bc6fe5
add test script of arm_controller_switcher
tkmtnt7000 Oct 28, 2021
a0e5843
change end-effector angle when holding door-knob
tkmtnt7000 Oct 28, 2021
3c7ab6c
[jsk_spot_delivery_demo] update
sktometometo Oct 28, 2021
af60801
[jsk_spot_delivery_demo] update
sktometometo Oct 28, 2021
e16148f
[jsk_spot_delivery_demo] update
sktometometo Oct 29, 2021
53da072
[jsk_spot_delivery_demo] update
sktometometo Oct 29, 2021
bd09f1b
[jsk_spot_delivery_demo] update
sktometometo Oct 29, 2021
3755a07
Merge branch 'develop/spot' of github.com:sktometometo/jsk_demos into…
sktometometo Oct 29, 2021
ef48b34
[jsk_spot_delivery_demo] update
sktometometo Oct 29, 2021
0b21250
[jsk_spot_delivery_demo] update
sktometometo Oct 29, 2021
85bda93
[jsk_spot_delivery_demo] update
sktometometo Oct 29, 2021
1576c35
[jsk_spot_delivery_demo] update
sktometometo Oct 29, 2021
1d9a311
[jsk_spot_delivery_demo] update
sktometometo Oct 29, 2021
469ffd7
[jsk_spot_delivery_demo] update
sktometometo Oct 29, 2021
fa26b36
[jsk_spot_delivery_demo] update
sktometometo Oct 29, 2021
c6c6df0
[jsk_spot_delivery_demo] update
sktometometo Oct 29, 2021
1f5fdfa
[jsk_spot_delivery_demo] update
sktometometo Oct 29, 2021
3dea3d5
fix indent to correct right format
tkmtnt7000 Oct 30, 2021
a687736
add euslisp version of arm-controller
tkmtnt7000 Oct 30, 2021
38822cb
[jsk_fetch_plug_power_spot] add package
sktometometo Jul 30, 2021
f59bf69
[jsk_fetch_plug_power_spot] remove unused script
sktometometo Oct 19, 2021
691ae06
[jsk_fetch_plug_power_spot] remove comments
sktometometo Oct 19, 2021
dcffb4e
[jsk_fetch_plug_power_spot] update
sktometometo Oct 19, 2021
0549e2d
[jsk_fetch_plug_power_spot] fix typo
sktometometo Oct 19, 2021
244a0e6
[jsk_fetch_plug_power_spot] fix typo
sktometometo Oct 19, 2021
4210749
[jsk_fetch_plug_power_spot] update
sktometometo Oct 19, 2021
d56c450
[jsk_fetch_plug_power_spot] update
sktometometo Oct 19, 2021
7bee228
[jsk_fetch_plug_power_spot] update
sktometometo Oct 19, 2021
edc02a2
[jsk_maps] update plugging-place position
sktometometo Oct 19, 2021
fe1d40e
[jsk_fetch_plug_power_spot] update
sktometometo Oct 19, 2021
e1a4eec
initial commit
tkmtnt7000 Nov 1, 2021
e7c9bf0
add door-open-with-recog
tkmtnt7000 Nov 1, 2021
9745c8b
obj-pos --> *obj-pos*
tkmtnt7000 Nov 2, 2021
7a6011d
add servo-off
tkmtnt7000 Nov 2, 2021
f2b88d7
add door closing
tkmtnt7000 Nov 2, 2021
4c4e8b3
add dependency in package.xml
tkmtnt7000 Nov 2, 2021
13aa590
[jsk_spot_delivery_demo] update
sktometometo Nov 4, 2021
1bdb5e0
[jsk_spot_delivery_demo] update
sktometometo Nov 4, 2021
8de2198
[jsk_spot_delivery_demo] update
sktometometo Nov 4, 2021
24a327f
[jsk_spot_delivery_demo] update
sktometometo Nov 4, 2021
1dada97
[jsk_spot_watch_dog] add image capture server to jsk_spot_watch_dog
sktometometo Nov 9, 2021
b692123
add test code of voice recognition
tkmtnt7000 Nov 10, 2021
5aba3e6
Merge branch 'trashcan-demo' of https://github.com/tkmtnt7000/jsk_dem…
tkmtnt7000 Nov 10, 2021
4dc6c09
[jsk_spot_watch_dog] fix module names and add upload capability
sktometometo Nov 10, 2021
77efcba
[jsk_spot_watch_dog] fix bugs
sktometometo Nov 11, 2021
a002262
[jsk_spot_watch_dog] fix bugs
sktometometo Nov 11, 2021
cf49a10
[jsk_spot_watch_dog] add mail report
sktometometo Nov 11, 2021
3387a75
[jsk_spot_watch_dog] bugfix
sktometometo Nov 11, 2021
7827de9
[jsk_spot_watch_dog] upload when dark
sktometometo Nov 11, 2021
b67b587
[jsk_spot_watch_dog] add log
sktometometo Nov 11, 2021
d2ca432
[jsk_spot_watch_dog] fix mail body
sktometometo Nov 12, 2021
e357a47
[jsk_spot_watch_dog] send mail only when there are images to send
sktometometo Nov 12, 2021
48d9e16
send* -> send in body-pose func
mqcmd196 Nov 16, 2021
3ec76f6
initial commit of jsk_spot_call_person
tkmtnt7000 Nov 17, 2021
369517c
initial commit of patrol demo
tkmtnt7000 Nov 17, 2021
fbe2f3f
add navigation
tkmtnt7000 Nov 17, 2021
3f6d8ee
add speaking patrol status
tkmtnt7000 Nov 18, 2021
f246a81
add speak in 81C1
tkmtnt7000 Nov 19, 2021
0aaf627
add 8ftrashcan front
tkmtnt7000 Nov 19, 2021
eb53763
[jsk_spot_patrol] add package description
tkmtnt7000 Nov 24, 2021
cf0120c
[jsk_spot_patrol_and_greeting] add demo
sktometometo Nov 25, 2021
3ba4259
[jsk_spot_patrol_and_greeting] update
sktometometo Nov 25, 2021
e7d6ef2
[jsk_spot_patrol_and_greeting] update
sktometometo Nov 25, 2021
e2fbf3f
[jsk_spot_patrol_and_greeting] update
sktometometo Nov 26, 2021
eba4b2f
add mailbox checking
tkmtnt7000 Nov 26, 2021
f5bb71a
add mailbox checking and image capture server
tkmtnt7000 Nov 26, 2021
9ec59e3
[jsk_spot_patrol_and_greeting] remove iamge_capture_server
sktometometo Nov 28, 2021
66ef8ff
[jsk_spot_patrol_and_greeting] update demo
sktometometo Nov 28, 2021
ded7c5c
[jsk_spot_patrol_and_greeting] fix bugs
sktometometo Nov 28, 2021
bfc6b65
[jsk_spot_patrol_and_greeting] fix bugs
sktometometo Nov 28, 2021
7bb5a3f
[jsk_spot_patrol_and_greeting] fix bugs
sktometometo Nov 28, 2021
94cfc83
[jsk_spot_patrol_and_greeting] fix bugs
sktometometo Nov 28, 2021
38f5a78
[jsk_spot_patrol_and_greeting] fix bugs
sktometometo Nov 28, 2021
5aaa7a6
[jsk_spot_patrol_and_greeting] fix bugs
sktometometo Nov 28, 2021
2ca0762
[jsk_spot_patrol_and_greeting] fix bugs
sktometometo Nov 28, 2021
aedaafe
[jsk_spot_patrol_and_greeting] fix bugs
sktometometo Nov 28, 2021
3cc74aa
[jsk_spot_patrol_and_greeting] fix bugs
sktometometo Nov 28, 2021
f8a0d71
[jsk_spot_patrol_and_greeting] update
sktometometo Nov 29, 2021
26f22f2
[jsk_spot_patrol_and_greeting] update
sktometometo Nov 29, 2021
b2b9638
[jsk_spot_go_back_home] add jsk_spot_go_back_home demo
sktometometo Nov 29, 2021
b6d1402
[jsk_spot_go_back_home] allow argument
sktometometo Nov 29, 2021
fe0aa4b
[jsk_spot_go_back_home] update
sktometometo Nov 29, 2021
b25c146
[jsk_spot_go_back_home] update
sktometometo Nov 29, 2021
24113bb
add mechoffice behavior
tkmtnt7000 Nov 29, 2021
757da8c
add speech-recognition
tkmtnt7000 Nov 29, 2021
44b43f7
add kinova-camera-position memo
tkmtnt7000 Nov 30, 2021
892ba70
add kinova-pose-candidate
tkmtnt7000 Dec 1, 2021
7be9187
add video recording
tkmtnt7000 Dec 1, 2021
e1db8f5
add speech_recognition with ros_speech_recognition
tkmtnt7000 Dec 1, 2021
4fc6b82
using ros_speech_recognition
tkmtnt7000 Dec 2, 2021
f1cbdab
update mailbox.l
tkmtnt7000 Dec 2, 2021
47e4757
[jsk_spot_patrol_and_greeting] add greeting
sktometometo Dec 3, 2021
beb8db3
[jsk_spot_patrol_and_greeting] remove video recording inside the demo
sktometometo Dec 3, 2021
0baa4d8
[jsk_spot_patrol_and_greeting] fix bug
sktometometo Dec 3, 2021
9f2765d
[jsk_spot_patrol_and_greeting] fix title
sktometometo Dec 3, 2021
06a5c43
add mosaic.py
tkmtnt7000 Dec 7, 2021
3fe558b
add using gaussian_blur to blur the corner
tkmtnt7000 Dec 7, 2021
a4527e6
update mosaic
tkmtnt7000 Dec 7, 2021
b3165dc
update param name
tkmtnt7000 Dec 7, 2021
31387d1
add class version
tkmtnt7000 Dec 8, 2021
a3b6ede
[jsk_spot_delivery_demo] add mail sending
sktometometo Nov 15, 2021
a0c0b46
[jsk_spot_delivery_demo] fix format
sktometometo Nov 15, 2021
d828682
[jsk_spot_delivery_demo] fix bugs
sktometometo Dec 10, 2021
ddaa119
[jsk_spot_delivery_demo] add initial undocking
sktometometo Dec 10, 2021
dadadae
[jsk_spot_delivery_demo] add pring
sktometometo Dec 10, 2021
824c111
[jsk_spot_delivery_demo] add pring
sktometometo Dec 10, 2021
f963b6e
[jsk_spot_delivery_demo] fix
sktometometo Dec 10, 2021
fbcefc5
[jsk_spot_delivery_demo] fix
sktometometo Dec 10, 2021
5ef0005
[jsk_spot_delivery_demo] fix bugs
sktometometo Dec 10, 2021
1fdec06
[jsk_spot_delivery_demo] fix bugs
sktometometo Dec 10, 2021
5dcf37c
[jsk_spot_delivery_demo] fix bugs
sktometometo Dec 10, 2021
a81fe07
add spot take out trash demo
tkmtnt7000 Oct 8, 2021
4b79e54
add spot go to trashcan front
tkmtnt7000 Oct 11, 2021
69f34df
add human-recognition of spot
tkmtnt7000 Oct 11, 2021
d7018b9
add person-follow function
tkmtnt7000 Oct 13, 2021
b4882d2
add go-to-garbagecollection-area function
tkmtnt7000 Oct 13, 2021
96338bd
fix shebang in person-follow.l
tkmtnt7000 Oct 14, 2021
ca36560
add main function in person-follow.l
tkmtnt7000 Oct 14, 2021
6a38058
update indent in take-out-trash.l
tkmtnt7000 Oct 20, 2021
6f0f2fc
add trash-collect.l
tkmtnt7000 Oct 20, 2021
aa98b0e
add voice-recognition
tkmtnt7000 Nov 16, 2021
a8bc8cb
add package description
tkmtnt7000 Dec 16, 2021
31833ed
add template matching scripts
tkmtnt7000 Dec 16, 2021
b2c1fb7
add monitor_image_viewer
tkmtnt7000 Dec 17, 2021
f80753c
add script for waiting task
tkmtnt7000 Dec 17, 2021
53fa621
fix parameter name
tkmtnt7000 Dec 17, 2021
58d6954
Add trashmark matching
tkmtnt7000 Jan 18, 2022
55d8b80
Merge remote-tracking branch 'knorth55/fetch15' into trashcan-demo
tkmtnt7000 Jan 18, 2022
e4533ad
Support multiple place of trashcan
tkmtnt7000 Jan 18, 2022
52b10bf
Add lift pose
tkmtnt7000 Jan 19, 2022
d1b5950
Update picture size
tkmtnt7000 Jan 19, 2022
5aaad61
Update trashcan detection hsi
tkmtnt7000 Jan 19, 2022
bf60a24
Make sequence
tkmtnt7000 Jan 19, 2022
9b27246
Update variable name to avoid conflict
tkmtnt7000 Jan 19, 2022
42435c2
Add spot back recognition
tkmtnt7000 Jan 20, 2022
304522e
Add demo.launch
tkmtnt7000 Jan 20, 2022
1728b9d
Update 0120
tkmtnt7000 Jan 20, 2022
f5a7e70
Update cooperation
tkmtnt7000 Jan 21, 2022
61b78c8
Update take-out-trash.l
tkmtnt7000 Jan 21, 2022
4a681f7
Update 8 o'clock
tkmtnt7000 Jan 21, 2022
f722e7b
update
tkmtnt7000 Jan 21, 2022
5ab0d7d
update
tkmtnt7000 Jan 21, 2022
fc45df0
Update version 0122 cooperation demo
tkmtnt7000 Jan 21, 2022
b43f5fa
Update 0122 version demo
tkmtnt7000 Jan 21, 2022
4e318b3
Update 0122 version
tkmtnt7000 Jan 22, 2022
32954f9
stash variable
tkmtnt7000 Feb 1, 2022
b286dd9
Add maintainer for catkin build
tkmtnt7000 Jan 17, 2022
aecbc68
Update 0206
tkmtnt7000 Feb 14, 2022
a14c0b4
Add fast version
tkmtnt7000 Feb 14, 2022
910d57d
Add small demonstration
tkmtnt7000 Feb 14, 2022
ce30ce1
Add change direction demo
tkmtnt7000 Feb 25, 2022
353ed66
add jsk_cooperate_demo
tkmtnt7000 May 19, 2023
6d5f2f6
add jsk_interactive_demo
tkmtnt7000 May 19, 2023
6e19493
add .gitignore
tkmtnt7000 May 19, 2023
494a400
tmp file
tkmtnt7000 May 19, 2023
a03ab5c
update
tkmtnt7000 May 19, 2023
ae1cfae
add package script
tkmtnt7000 May 19, 2023
4d026a4
add template demo file
tkmtnt7000 May 19, 2023
7f51375
more readability
tkmtnt7000 May 19, 2023
cc8cff2
20230616 change
tkmtnt7000 Jun 16, 2023
ee44426
Merge remote-tracking branch 'tkmtnt7000/fetch-door-open' into tsukam…
tkmtnt7000 Oct 31, 2023
7967ede
Merge remote-tracking branch 'tkmtnt7000/trashcan-demo' into tsukamot…
tkmtnt7000 Oct 31, 2023
332e177
Merge remote-tracking branch 'tkmtnt7000/spot-taking-out-trash' into …
tkmtnt7000 Oct 31, 2023
87e4398
Merge remote-tracking branch 'tkmtnt7000/spot-patrol' into tsukamoto-…
tkmtnt7000 Oct 31, 2023
8c52230
Merge remote-tracking branch 'tkmtnt7000/spot-call-person' into tsuka…
tkmtnt7000 Oct 31, 2023
da60d34
Merge remote-tracking branch 'tkmtnt7000/spot-delivery-post' into tsu…
tkmtnt7000 Oct 31, 2023
99c5baa
Merge remote-tracking branch 'tkmtnt7000/jsk_2020_10_semi' into tsuka…
tkmtnt7000 Oct 31, 2023
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions jsk_2020_10_semi/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
cmake_minimum_required(VERSION 2.8.3)
project(jsk_2020_10_semi)

find_package(catkin REQUIRED COMPONENTS)

catkin_package()

install(DIRECTORY euslisp
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
)

2 changes: 2 additions & 0 deletions jsk_2020_10_semi/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# jsk_2020_10_semi

11 changes: 11 additions & 0 deletions jsk_2020_10_semi/euslisp/arduino.l
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/usr/bin/env roseus

(ros::roseus-add-msgs "std_msgs")

(ros::roseus "arduino_client")

(defun arduino-cb (msg) (print (list 'cb (send msg :data))))
(ros::subscribe "arduino" std_msgs::Int16 #'arduino-cb)

(ros::spin)
(exit)
84 changes: 84 additions & 0 deletions jsk_2020_10_semi/euslisp/delivery.l
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
#!/usr/bin/env roseus

;; load robot and scene model
(require "package://fetcheus/fetch-utils.l")
(require "package://fetcheus/fetch-interface.l")
(require "package://jsk_maps/src/eng2-scene.l")

(unless (boundp '*scene*)
(setq *scene* (make-eng2-7f-scene)))
(unless (boundp '*ri*)
(fetch-init)) ;; fetch-init instantiate *fetch* and *ri*

;; show in irtviewer
(objects (list *fetch* *scene*))
;; show in "fetch Kinematics Simulator"
(send *ri* :objects (send *scene* :objects))
(defun move-dock-front ()
(setq *dock-front* (send (send *scene* :spot "/eng2/7f/room73B2-fetch-dock-front") :copy-worldcoords))
(send *fetch* :move-to *dock-front* :world))

(send *irtviewer* :look-all
(send (geo::make-bounding-box
(flatten (send-all (send *fetch* :bodies) :vertices)))
:grow 2.0))

(defun move-73-A2-front ()
(setq *room73A2-front* (send (send *scene* :spot "/eng2/7f/room73A2-front") :copy-worldcoords))
(send *fetch* :move-to *room73A2-front* :world)
;;(send *ri* :move-to *room73A2-front* :world)
)
;;(send *fetch* :locate #f(300 0 0))
(
;;(send *ri* :move-to *room73A2-front* :world)
#|
(setq *room73A3-front* (send (send *scene* :spot "/eng2/7f/room73A3-front") :copy-worldcoords))
(send *fetch* :move-to *room73A3-front* :world)



|#

(defun pose-of-give ()
(send *fetch* :rarm :inverse-kinematics (send (send *fetch* :copy-worldcoords) :transform (make-coords :pos #f(600 300 1000))) :debug-view t))

#|
(defun raise-hand ()
(send *fetch* :angle-vector #f(5.0000 88.0000 -42.0000 0 -60 1 -77.0000 7.000 0 2.0000)))
|#
#|
(defun catch ()
(send *fetch* :angle-vector #f(5 52 3 77 -59 10 -78 74 0 2)))
|#

#| 顔を検知してそこに描かれた長方形の面積を求める |#
(defclass face_area
:slots (*rect*)
)
(defmethod face_area
(:init ()
(ros::roseus "face_recognized_client")
(ros::subscribe "edgetpu_face_detector/output/rects" jsk_recognition_msgs::RectArray #'send self :cb)
(setq *rect* nil)
(ros::ros-info "init")
self)
(:cb (msg)
(setq *rect* (send msg :rects))
)
(:loop ()
(ros::rate 10)
(while (ros::ok)
(if *rect*
(progn
(setq w (send (elt *rect* 0) :width))
(setq h (send (elt *rect* 0) :height))
(setq *area* (* w h))
(ros::ros-info "area : ~A" *area*)
)
)
(ros::spin-once)
(ros::sleep)
)
(exit)
)
)
25 changes: 25 additions & 0 deletions jsk_2020_10_semi/euslisp/error_1202.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
24.E1-irteusgl$ (send *ri* :angle-vector (send *fetch* :angle-vector) 5000 :use-torso nil)
[ WARN] [1606921302.638850734]: continuous joint (upperarm_roll_joint) moves 360.0 degree, commanded joint differs from original trajectory to avoid unintentional 360 rotation
Call Stack (max depth: 20):
0: at (apply #'send-message self (class . super) :angle-vector-sequence args)
1: at (apply #'send-message self (class . super) :angle-vector-sequence args)
2: at (apply #'send-message self (class . super) :angle-vector-sequence args)
3: at (send-super* :angle-vector-sequence args)
4: at (apply #'send self :angle-vector-sequence-raw avs (make-list div :initial-element (/ tm div)) args)
5: at (apply #'send self :angle-vector-sequence-raw avs (make-list div :initial-element (/ tm div)) args)
6: at (send* self :angle-vector-sequence-raw avs (make-list div :initial-element (/ tm div)) args)
7: at (let* (avs (minjerk (instance minjerk-interpolator :init)) (scale-av (send self :sub-angle-vector av prev-av)) dist div) (setq dist (abs (find-extream (coerce diff-av cons) #'abs #'>=))) (setq div (round (/ dist 120.0))) (send minjerk :reset :position-list (list prev-av (v+ prev-av scale-av)) :time-list (list tm)) (send minjerk :start-interpolation) (send minjerk :pass-time (/ tm div)) (dotimes (i div) (setq avs (append avs (list (send minjerk :pass-time (/ tm div)))))) (send* self :angle-vector-sequence-raw avs (make-list div :initial-element (/ tm div)) args) (return-from :angle-vector-raw (car (last avs))))
8: at (progn (let* (avs (minjerk (instance minjerk-interpolator :init)) (scale-av (send self :sub-angle-vector av prev-av)) dist div) (setq dist (abs (find-extream (coerce diff-av cons) #'abs #'>=))) (setq div (round (/ dist 120.0))) (send minjerk :reset :position-list (list prev-av (v+ prev-av scale-av)) :time-list (list tm)) (send minjerk :start-interpolation) (send minjerk :pass-time (/ tm div)) (dotimes (i div) (setq avs (append avs (list (send minjerk :pass-time (/ tm div)))))) (send* self :angle-vector-sequence-raw avs (make-list div :initial-element (/ tm div)) args) (return-from :angle-vector-raw (car (last avs)))))
9: at (if (send self :check-continuous-joint-move-over-180 diff-av) (progn (let* (avs (minjerk (instance minjerk-interpolator :init)) (scale-av (send self :sub-angle-vector av prev-av)) dist div) (setq dist (abs (find-extream (coerce diff-av cons) #'abs #'>=))) (setq div (round (/ dist 120.0))) (send minjerk :reset :position-list (list prev-av (v+ prev-av scale-av)) :time-list (list tm)) (send minjerk :start-interpolation) (send minjerk :pass-time (/ tm div)) (dotimes (i div) (setq avs (append avs (list (send minjerk :pass-time (/ tm div)))))) (send* self :angle-vector-sequence-raw avs (make-list div :initial-element (/ tm div)) args) (return-from :angle-vector-raw (car (last avs))))))
10: at (when (send self :check-continuous-joint-move-over-180 diff-av) (let* (avs (minjerk (instance minjerk-interpolator :init)) (scale-av (send self :sub-angle-vector av prev-av)) dist div) (setq dist (abs (find-extream (coerce diff-av cons) #'abs #'>=))) (setq div (round (/ dist 120.0))) (send minjerk :reset :position-list (list prev-av (v+ prev-av scale-av)) :time-list (list tm)) (send minjerk :start-interpolation) (send minjerk :pass-time (/ tm div)) (dotimes (i div) (setq avs (append avs (list (send minjerk :pass-time (/ tm div)))))) (send* self :angle-vector-sequence-raw avs (make-list div :initial-element (/ tm div)) args) (return-from :angle-vector-raw (car (last avs)))))
11: at (let* ((prev-av (send self :state :potentio-vector :wait-until-update t)) (diff-av (v- av prev-av))) (when (send self :check-continuous-joint-move-over-180 diff-av) (let* (avs (minjerk (instance minjerk-interpolator :init)) (scale-av (send self :sub-angle-vector av prev-av)) dist div) (setq dist (abs (find-extream (coerce diff-av cons) #'abs #'>=))) (setq div (round (/ dist 120.0))) (send minjerk :reset :position-list (list prev-av (v+ prev-av scale-av)) :time-list (list tm)) (send minjerk :start-interpolation) (send minjerk :pass-time (/ tm div)) (dotimes (i div) (setq avs (append avs (list (send minjerk :pass-time (/ tm div)))))) (send* self :angle-vector-sequence-raw avs (make-list div :initial-element (/ tm div)) args) (return-from :angle-vector-raw (car (last avs))))) (send-super* :angle-vector av tm args))
12: at (apply #'send self :angle-vector-raw av tm ctype start-time args)
13: at (apply #'send self :angle-vector-raw av tm ctype start-time args)
14: at (send* self :angle-vector-raw av tm ctype start-time args)
15: at (return-from :angle-vector (send* self :angle-vector-raw av tm ctype start-time args))
16: at (progn (return-from :angle-vector (send* self :angle-vector-raw av tm ctype start-time args)))
17: at (if (send self :simulation-modep) (progn (return-from :angle-vector (send* self :angle-vector-raw av tm ctype start-time args))))
18: at (when (send self :simulation-modep) (return-from :angle-vector (send* self :angle-vector-raw av tm ctype start-time args)))
19: at (let ((ctype controller-type) (start-time 0) (start-offset-time nil) (use-torso t) (clear-velocities t)) (if (= (length args) 1) (setq ctype (car args) args (cdr args))) (if (and (>= (length args) 2) (null (member (car args) '(:use-torso :start-time :clear-velocities)))) (setq ctype (car args) start-time (cadr args) args (cddr args))) (if (member :use-torso args) (setq use-torso (cadr (member :use-torso args)))) (if (member :start-time args) (setq start-time (cadr (member :start-time args)))) (if (member :start-offset-time args) (setq start-offset-time (cadr (member :start-offset-time args)))) (if (member :clear-velocities args) (setq clear-velocities (cadr (member :clear-velocities args)))) (when (send self :simulation-modep) (return-from :angle-vector (send* self :angle-vector-raw av tm ctype start-time args))) (when (not (numberp tm)) (warn ":angle-vector tm is not a number, use :angle-vector av tm args")) (send* self :angle-vector-motion-plan av :ctype ctype :move-arm :rarm :total-time tm :start-offset-time (if start-offset-time start-offset-time start-time) :clear-velocities clear-velocities :use-torso use-torso args))
And more...
/opt/ros/melodic/share/euslisp/jskeus/eus/Linux64/bin/irteusgl 0 error: no such keyword :use-torso in (apply #'send-message self (class . super) :angle-vector-sequence args)
38 changes: 38 additions & 0 deletions jsk_2020_10_semi/euslisp/face_area_subscribe.l
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
#!/usr/bin/env roseus

(ros::roseus-add-msgs "jsk_recognition_msgs")
(ros::roseus-add-msgs "geometry_msgs")

(defclass face_area
:slots (*rect*))
(defmethod face_area
(:init ()
(ros::roseus "face_recognized_client")
(ros::subscribe "/edgetpu_face_detector/output/rects" jsk_recognition_msgs::RectArray #'send self :cb)
(setq *rect* nil)
(ros::ros-info "init")
self)
(:cb (msg)
(setq *rect* (send msg :rects))
)
(:loop ()
(ros::rate 10)
;;(setq alpha 0.001)
(ros::rate 10)
(while (ros::ok)
;;(setq alpha 0.001)
(if *rect*
(progn
(ros::ros-info "hello")
(ros::ros-info "width: ~A" (send (car *rect*) :width))
)
)
(ros::spin-once)
(ros::sleep)
)
(exit)
)
)

(setq *ri* (instance face_area :init))
(send *ri* :loop)
52 changes: 52 additions & 0 deletions jsk_2020_10_semi/euslisp/face_rect_subscribe.l
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
#!/usr/bin/env roseus

(ros::roseus-add-msgs "jsk_recognition_msgs")
;;(ros::roseus-add-msgs "geometry_msgs")
#|
;; これはpublish
;;(ros::advertise "/edgetpu_face_detector/output/rects" jsk_recognition_msgs:;;:RectArray 1)

;;(unix::sleep 1)
;;(ros::duration-sleep 1)
;;(print (ros::get-num-subscribers "/edgetpu_face_detector/output/rects"))
|#

;; 大域変数として定義

;;(setq *rect* (instance jsk_recognition_msgs::RectArray :init))
(setq *rect* nil)


(defun cb (msg)
(if msg
(setq *rect* (send msg :rects))
)
)
;;main
(ros::roseus "face_rect_client")
(ros::subscribe "/edgetpu_face_detector/output/rects" jsk_recognition_msgs::RectArray #'cb)

(ros::rate 10)
(while (ros::ok)
(if *rect*
(progn
;;(ros::ros-info "hello")
;;(ros::ros-info "~A" (send (car *rect*))
(ros::ros-info "x: ~A" (send (car *rect*) :x))
(ros::ros-info "y: ~A" (send (car *rect*) :y))
(ros::ros-info "width: ~A" (send (car *rect*) :width))
(ros::ros-info "height: ~A" (send (car *rect*) :height))

;; これらは見慣れない書き方らしい
;;(setq w (send (car *rect*) :width))
;;(setq h (send (car *rect*) :height))

;; 良い書き方
(setq w (send (elt *rect* 0) :width))
(setq h (send (elt *rect* 0) :height))
(ros::ros-info "area : ~A" (* w h))
)
)
(ros::spin-once)
(ros::sleep)
)
34 changes: 34 additions & 0 deletions jsk_2020_10_semi/euslisp/face_rect_subscribe_class.l
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
#!/usr/bin/env roseus

#| 顔に描かれた四角形の面積を表示させる |#
(ros::roseus-add-msgs "jsk_recognition_msgs")

(defclass face_area
:slots (*rect*)
)
(defmethod face_area
(:init ()
(ros::roseus "face_recognized_client")
(ros::subscribe "/edgetpu_face_detector/output/rects" jsk_recognition_msgs::RectArray #'send self :cb)
(setq *rect* nil)
(ros::ros-info "init")
self)
(:cb (msg)
(setq *rect* (send msg :rects))
)
(:loop ()
(ros::rate 10)
(while (ros::ok)
(if *rect*
(progn
(setq w (send (elt *rect* 0) :width))
(setq h (send (elt *rect* 0) :height))
(ros::ros-info "area: ~A" (* w h))
)
)
(ros::spin-once)
(ros::sleep)
)
(exit)
)
)
12 changes: 12 additions & 0 deletions jsk_2020_10_semi/euslisp/map.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
7.irteusgl$ (mapcar #'(lambda (x) (send x :name)) (send *scene* :spots))
("/eng2/7f/room73B2-front-of-kitchenboard" "/eng2/7f/room73B2-sink-front" "/eng2/7f/room73B2-beside-chair" "/eng2/7f/room73B2-far-chair-back" "/eng2/7f/room73B2-tmp-chair-back" "/eng2/7f/room73B2-chair-back" "/eng2/7f/room73B2-table-front" "/eng2/7f/room73B2-table-back" "/eng2/7f/room73B2-table-side" "/eng2/7f/room73B2-front-kitchen-table" "/eng2/7f/room73B2-front-of-tv" "door-spot" "coe-spot" "broom-spot" "table-spot" "cook-spot" "fridge-front-spot" "init-spot" "door-spot" "table-spot" "cook-spot" "init-spot" "/eng2/7f/elevator_inside_panel" "/eng2/7f/elevator_call_panel" "/eng2/7f/room73B2-fetch-dock-front" "/eng2/7f/room73A3-front1" "/eng2/7f/room73B2-trashbox-front" "/eng2/7f/room73B2-counter-side" "/eng2/7f/room73B2-center" "/eng2/7f/room73B2-door-front" "/eng2/7f/room73B2-microwave-front" "/eng2/7f/room73B2-sink-front0" "/eng2/7f/room73B2-sink-front1" "/eng2/7f/room73B2-table-front1" "/eng2/7f/room73B2-table-side1" "/eng2/7f/room73B2-fridge-front" "/eng2/7f/room73A3-printer-front" "/eng2/7f/room73B1-kurotobi" "/eng2/7f/mini-kitchen-A-inside" "/eng2/7f/room73B1-nakanishi" "/eng2/7f/non-combustible-trashbox-front" "/eng2/7f/combustible-trashbox-front" "/eng2/7f/room73A1-front" "/eng2/7f/room73A2-front" "/eng2/7f/room73A3-base" "/eng2/7f/room73A3-front" "/eng2/7f/room73A4-front" "/eng2/7f/before-elevator" "/eng2/7f/elevator-outside" "/eng2/7f/elevator_inside_panel-front" "/eng2/7f/elevator_call_panel-front")

3.irteusgl$ (send *fetch* :joint-list)
(#<linear-joint #X55e397f31e20 torso_lift_joint> #<rotational-joint #X55e397f2de68 shoulder_pan_joint> #<rotational-joint #X55e397f14fc0 shoulder_lift_joint> #<rotational-joint #X55e397f60658 upperarm_roll_joint> #<rotational-joint #X55e399d8d2c0 elbow_flex_joint> #<rotational-joint #X55e399d8d530 forearm_roll_joint> #<rotational-joint #X55e397f7f078 wrist_flex_joint> #<rotational-joint #X55e397f7ea18 wrist_roll_joint> #<rotational-joint #X55e397ee4898 head_pan_joint> #<rotational-joint #X55e397ef23f0 head_tilt_joint>)

32.E1-irteusgl$ (send *fetch* :rarm)
(#<bodyset-link #X55e397588458 shoulder_pan_link 5500.0 6228.65 807.616 / 3.142 0.0 0.0> #<bodyset-link #X55e3975871b0 shoulder_lift_link 5383.0 6228.65 867.616 / 3.142 1.4 -1.207e-16> #<bodyset-link #X55e3975d40d8 upperarm_roll_link 5345.777 6228.65 651.803 / 3.142 1.4 -0.2> #<bodyset-link #X55e3975e3cd0 elbow_flex_link 5323.172 6228.65 520.738 / 0.198 0.018 -3.108> #<bodyset-link #X55e3975e3148 forearm_roll_link 5516.299 6267.353 517.145 / 0.198 0.018 -3.108> #<bodyset-link #X55e3975e08c8 wrist_flex_link 5638.351 6291.813 514.874 / -2.501 -1.492 -0.445> #<bodyset-link #X55e3975e0070 wrist_roll_link 5629.637 6285.315 652.946 / -2.501 -1.492 -0.445>)

関節名リスト
10.irteusgl$ (send *fetch* :methods :rarm)
(:upperarm_roll_joint :upperarm_roll_link_lk :rarm-shoulder-y :rarm-shoulder-p :rarm-shoulder-r :rarm-elbow-p :rarm-elbow-r :rarm-wrist-p :rarm-wrist-r :_make_instance_upperarm_roll_link_geom0 :rarm-end-coords :rarm-root-link :rarm)
49 changes: 49 additions & 0 deletions jsk_2020_10_semi/euslisp/sample.l
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
#!/usr/bin/env roseus~/semi_ws/src/jsk_demos/jsk_2020_10_semi/euslisp

;; load robot and scene model
(require "package://fetcheus/fetch-utils.l")
(require "package://fetcheus/fetch-interface.l")
(require "package://jsk_maps/src/eng2-scene.l")

(unless (boundp '*scene*)
(setq *scene* (make-eng2-7f-scene)))
(unless (boundp '*ri*)
(fetch-init)) ;; fetch-init instantiate *fetch* and *ri*

;; show in irtviewer
(objects (list *fetch* *scene*))
;; show in "fetch Kinematics Simulator"
(send *ri* :objects (send *scene* :objects))

;; use (mapcar #'(lambda (x) (send x :name)) (send *scene* :spots)) to get list of spots
(send *fetch* :move-to (send *scene* :spot "/eng2/7f/room73B2-fetch-dock-front") :world)

;; check 20201026-soft3-model, the code to focus on the robot model
(send *irtviewer* :look-all
(send (geo::make-bounding-box
(flatten (send-all (send *fetch* :bodies) :vertices)))
:grow 2.0))


;; start to move
(setq *shelf-front* (send (send (send *scene* :spot "/eng2/7f/room73B2-table-side") :copy-worldcoords) :rotate pi/2 :z))
(send *fetch* :move-to *shelf-front* :world) ;; moved in irtviewer
(send *irtviewer* :draw-objects) ;; update viewer
(send *ri* :move-to *shelf-front*) ;; moved real robot

;; move arms
(send *fetch* :rarm :angle-vector #f(-55 80 -45 -110 0 30 15))
(send *irtviewer* :draw-objects) ;; update viewer
(send *ri* :angle-vector (send *fetch* :angle-vector) 5000)
(send *ri* :wait-interpolation t)


;; back to original position
(send *fetch* :reset-pose)
(send *ri* :angle-vector (send *fetch* :angle-vector) 5000)
(send *ri* :wait-interpolation t)
(send *irtviewer* :draw-objects) ;; update viewer

(send *fetch* :move-to (send *scene* :spot "/eng2/7f/room73B2-fetch-dock-front") :world)
(send *irtviewer* :draw-objects) ;; update viewer
(send *ri* :move-to (send *scene* :spot "/eng2/7f/room73B2-fetch-dock-front"))
Loading