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

Reproduce of PR2 Subway Fetch Demo. #1321

Open
wants to merge 422 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
422 commits
Select commit Hold shift + click to select a range
5010502
Call wait-interpolation after torso down
YutoUchimi Nov 11, 2019
8eb5afe
Fix sleep
YutoUchimi Nov 11, 2019
d7ebf40
Reset pose before looking at panel
YutoUchimi Nov 11, 2019
b822ae3
Unsafe go-pos during ready-to-outside
YutoUchimi Nov 11, 2019
bc58d41
Set line_buffer_length
YutoUchimi Nov 11, 2019
665d192
Do not reset head pose in each look-button loop
YutoUchimi Nov 11, 2019
76b9d77
Loosen tolerance before turning left in elevator
YutoUchimi Nov 11, 2019
287f456
Draw rectangle not with matplotlib but with cv2 in match_template.py
YutoUchimi Nov 12, 2019
404a29e
Do not show probability in debug image of match_template.py
YutoUchimi Nov 12, 2019
cad80ff
Move speak code to move-inside-elevator.l for check-elevator-open func
YutoUchimi Nov 12, 2019
a91b882
Look ahead as much as possible when moving base
YutoUchimi Nov 12, 2019
ee3e03d
Change push depth: 30mm -> 20mm
YutoUchimi Nov 12, 2019
2740986
Reset *change-pc* at the beginning of each calling check-elevator-open
YutoUchimi Nov 12, 2019
99df74c
Look front before checking if elevator open
YutoUchimi Nov 12, 2019
fe4be62
Reduce unnecessary multiple angle-vector and subscribing
YutoUchimi Nov 13, 2019
10bc332
Wait for interpolation of look-forward-in-nav.l
YutoUchimi Nov 13, 2019
45be6b8
Wait at most 6 min when receiving sandwich at subway
YutoUchimi Nov 13, 2019
846bb19
Subscribe more to get stable point cloud
YutoUchimi Nov 13, 2019
8975043
Show quarter and throttled point cloud in rviz
YutoUchimi Nov 13, 2019
d995963
Fix typo: row-info -> ros-info
YutoUchimi Nov 14, 2019
ab612fb
Set after-stamp to (ros::time-now) while checking if forum door is open
YutoUchimi Nov 14, 2019
87e978b
Push forum door button only 10mm
YutoUchimi Nov 14, 2019
4335782
Fix resetting pose before pushing forum door button
YutoUchimi Nov 14, 2019
5c8fef4
Update text visualization
YutoUchimi Nov 14, 2019
b37b46e
Fix state name
YutoUchimi Nov 14, 2019
1c61c9d
Fix unbound variable timeout while checking if forum door open
YutoUchimi Nov 14, 2019
d071b23
Fix too fast angle-vector
YutoUchimi Nov 15, 2019
82f0bb6
Send angle-vector of looking at button only when PR2 is not looking a…
YutoUchimi Nov 18, 2019
f277a67
Set after-stamp to 0.5sec later from request
YutoUchimi Nov 18, 2019
00eab56
Remove duplicated ros-info at elevator-smach-initial
YutoUchimi Nov 18, 2019
a3cc00d
Re-push elevator inside button when check-elevator-open failed
YutoUchimi Nov 18, 2019
3672a36
Refactor euslisp files
YutoUchimi Nov 19, 2019
134766c
fix tests
knorth55 Oct 5, 2022
b636038
Fix roseus-add-srvs for nav_msgs
YutoUchimi Nov 19, 2019
879b960
Fix for parsing :timeout in check-elevator-open
YutoUchimi Nov 19, 2019
516155d
Speed up check-elevator-open
YutoUchimi Nov 19, 2019
d1ef158
Move only head first, then move arms when looking at panel
YutoUchimi Nov 21, 2019
b540e3a
Speed up check-elevator-open
YutoUchimi Nov 21, 2019
62ae78c
Add Passthrough filter to fcn output in order to subscribe only when …
YutoUchimi Nov 22, 2019
b4aea6c
Move Passthrough to before FCN
YutoUchimi Nov 22, 2019
8801180
Fix typo in push-forum-door-button func
YutoUchimi Nov 22, 2019
6048f9e
Speed up check-elevator-open more
YutoUchimi Nov 22, 2019
3a8b82b
Fix for euslint
YutoUchimi Nov 23, 2019
b59f261
Set push offset to 20mm
YutoUchimi Nov 23, 2019
0c9328c
Remove unnecessary :angle-vector in push-elevator-button.l
YutoUchimi Nov 23, 2019
e018397
Remove unused add-msg-pgsql.l
YutoUchimi Nov 23, 2019
548e162
Fix scope for logging with mongo-logger
YutoUchimi Nov 23, 2019
8f2a70e
Remove unused visualization with *node-debug*
YutoUchimi Nov 23, 2019
1a325ca
Clean up loading elevator-buttons.l
YutoUchimi Nov 23, 2019
6d35e9f
Move args to the same line as function name
YutoUchimi Nov 24, 2019
138ab1f
Rename: elevator-buttons.l -> utils.l
YutoUchimi Nov 24, 2019
1051f43
Remove unused eng2-through-door-nav.l
YutoUchimi Nov 24, 2019
e57ccc5
Move call-service function to utils.l
YutoUchimi Nov 24, 2019
4cc3fd5
Modify loading roseus_smach
YutoUchimi Nov 24, 2019
cb87560
Add make-scene-by-tf func in utils.l
YutoUchimi Nov 24, 2019
66bf1fd
Do not use global variable in posedetectiondb-client.l
YutoUchimi Nov 24, 2019
90e59cd
Move tolerance functions to utils.l
YutoUchimi Nov 24, 2019
030893c
Move check-elevator-open func to check-elevator-open.l
YutoUchimi Nov 24, 2019
4cfcd69
Remove logf function since it can be achieved by ROSCONSOLE_FORMAT env
YutoUchimi Nov 24, 2019
b624c1d
Parse tfl and scene from upper level function
YutoUchimi Nov 24, 2019
2d6308a
Disable mongo logging
YutoUchimi Nov 24, 2019
8129e49
Move update-robot-position func to utils.l
YutoUchimi Nov 24, 2019
d3c6afb
Move functions for pushing elevator button to push-elevator-button.l
YutoUchimi Nov 24, 2019
e1641ef
Move coords->movebaseactiongoal to utils.l
YutoUchimi Nov 24, 2019
19ea264
Rename state machine
YutoUchimi Nov 24, 2019
327b6fc
Rename: elevator-move-base-main.l -> state-machine-main.l
YutoUchimi Nov 24, 2019
5b05cfa
Fix not to use defvar for global variable
YutoUchimi Nov 24, 2019
896fc70
Fix loading file for test-modules-insidepanel
YutoUchimi Nov 25, 2019
a24c650
Fix returning from look-button-state/check-button-state func
YutoUchimi Nov 26, 2019
53b4e3a
Do not launch 2 ros-callback-object for 1 subscriber
YutoUchimi Nov 26, 2019
9aaa34b
Use function of utils.l in fetch-sandwich.l
YutoUchimi Nov 27, 2019
0314e96
Avoid getting stuckon braille block on 2F
YutoUchimi Nov 27, 2019
67f5e52
Send via-av after target-av as well when pushing forum door button
YutoUchimi Nov 27, 2019
5eaf181
Enable checking if elevator is moving during check-target-floor-arrived
YutoUchimi Nov 27, 2019
e064333
Correct checking timeout in check-button-light-state
YutoUchimi Nov 27, 2019
a73890c
Implement after-stamp for subscriber of octree_change_publisher topic
YutoUchimi Nov 27, 2019
6fbc7de
Update parameter for point_pose_extractor
YutoUchimi Nov 28, 2019
c043c9f
Use nodelet for lightweight_throttle
YutoUchimi Nov 28, 2019
2c33f5e
Fix typo: ros:time+ -> ros::time+
YutoUchimi Nov 28, 2019
acee422
Fix posedetection callback for multiple detection by point_pose_extra…
YutoUchimi Nov 28, 2019
6a3befc
Use Passthrough for heavy detection (point_pose_extractor)
YutoUchimi Nov 28, 2019
e54575a
Increase timeout of check-target-floor-arrived a bit
YutoUchimi Nov 29, 2019
238b0f8
Add sanity-check.l
YutoUchimi Nov 29, 2019
4cee736
Start with sanity-check
YutoUchimi Nov 29, 2019
20b4d09
Fix missing parentheses
YutoUchimi Nov 29, 2019
9b28b8b
Fix timeout calculation: not sec but msec
YutoUchimi Nov 29, 2019
4996ec2
Update rviz config
YutoUchimi Nov 29, 2019
17b1426
Fix TF tree for elevator panels: parent is msg.header.frame_id
YutoUchimi Nov 29, 2019
6f26574
Update rviz config to use group
YutoUchimi Nov 29, 2019
b138332
Use PassThrough for template matching as well to reduce CPU load
YutoUchimi Nov 29, 2019
07d4360
Fix remapping since virtual_camera_mono uses image_transport::subscri…
YutoUchimi Nov 29, 2019
30b20f8
Fix argument of sanity-check
YutoUchimi Nov 29, 2019
247277d
Reset pose anyway even when arm is selected
YutoUchimi Nov 29, 2019
a51d5b5
Revert "Fix TF tree for elevator panels: parent is msg.header.frame_id"
YutoUchimi Nov 29, 2019
b4ed442
Pass through /wide_stereo/left/image_rect_color as well
YutoUchimi Nov 29, 2019
1c0b27f
Fix Passthrough filter so that virtual_camera_mono correctly gets TF …
YutoUchimi Nov 30, 2019
f162177
Fix test-panel-pose-detection for Passthrough
YutoUchimi Nov 30, 2019
e290e20
Fix test-modules-insidepanel
YutoUchimi Nov 30, 2019
ab21b8a
Set default change threshold of octree_change_publisher to 500
YutoUchimi Dec 2, 2019
de727ce
Add launch files for collecting data from cameras
YutoUchimi Dec 2, 2019
ef2cf54
Remove redundant dependency: image_view from test_depend
YutoUchimi Dec 2, 2019
666ff0d
Fix string comparison of panel-name
YutoUchimi Dec 2, 2019
0655d3b
Remove non relevant launch
YutoUchimi Dec 2, 2019
3bd86cb
Refactor arm selecting process
YutoUchimi Dec 2, 2019
fdabc25
Confirm panel-moved by 3 times, but remove wait-interpolation from mo…
YutoUchimi Dec 2, 2019
60d5d9a
Remove unused arg-keys ':cancel'
YutoUchimi Dec 2, 2019
47e339d
Print matched template result as loginfo
YutoUchimi Dec 2, 2019
68af2f0
Request Passthrough a bit faster for virtual_camera_mono
YutoUchimi Dec 2, 2019
f0b3035
Loosen error_threshold for inside panel since TF is rarely broadcasted
YutoUchimi Dec 2, 2019
3da6856
Update elevator_inside_panel position
YutoUchimi Dec 2, 2019
ea6b466
Wait 500 msec before starting subscribing result of octree_change_pub…
YutoUchimi Dec 2, 2019
12f1f27
Move to 20cm in front of subway register first not to hit PR2's arm t…
YutoUchimi Dec 2, 2019
35b52b5
Update mid-point to forum-door-inside to avoid braille block
YutoUchimi Dec 2, 2019
2bb673e
Force to move to in front of forum-door/subway-register by using :go-pos
YutoUchimi Dec 2, 2019
a18d363
Force to look at elevator_call_panel even after look-forward-in-nav.l…
YutoUchimi Dec 3, 2019
217fdca
Re-look at elevator_inside_panel during ready-to-outside
YutoUchimi Dec 3, 2019
ac1323c
Skip 0.5 sec even when octree change result is subscribed instead of …
YutoUchimi Dec 3, 2019
c6eb4c8
Add comment on handling sandwich in hand
YutoUchimi Dec 3, 2019
167a08d
Add look-at-human.l
YutoUchimi Dec 3, 2019
de9fff1
Fix 'array index out of range' error
YutoUchimi Dec 3, 2019
890796a
Start/stop look-at-human from service call
YutoUchimi Dec 3, 2019
ea26b2c
Look for clerk when ordering sandwich at subway
YutoUchimi Dec 3, 2019
036283f
Use go-pos-unsafe for approaching register
YutoUchimi Dec 3, 2019
1a3ef04
Use go-pos-unsafe for approaching forum-door-front without getting st…
YutoUchimi Dec 3, 2019
b95d2dc
Minor update of parameters
YutoUchimi Dec 3, 2019
9fba852
Do not end with :fail in push-state-machine
YutoUchimi Dec 4, 2019
b58b361
Check if look-person-idx and look-limb-idx are both set before settin…
YutoUchimi Dec 5, 2019
3c9b247
Update human tracking parameters
YutoUchimi Dec 5, 2019
5da0d8e
Try to find human when passing sandwich from PR2
YutoUchimi Dec 5, 2019
f997afb
Return nil when IK failed in push-forum-door-button
YutoUchimi Dec 5, 2019
d0337aa
Fix looking at human found before passing sandwich
YutoUchimi Dec 5, 2019
24ec6d4
Move state funcs to state/ dir
YutoUchimi Dec 6, 2019
b9342c8
Move match_template.py to node_scripts/
YutoUchimi Dec 6, 2019
98c39da
Add coral TPU output and FCN output to sanity check
YutoUchimi Dec 6, 2019
af6f68d
Publish debug images of 2 point_pose_extractor to the same topic for …
YutoUchimi Dec 6, 2019
e16bb0e
Update rviz config
YutoUchimi Dec 6, 2019
0c75191
Check if pushed button is still lit during ready-to-outside
YutoUchimi Dec 6, 2019
bf9dce8
Fix sanity checking type of coral output
YutoUchimi Dec 6, 2019
e4abcd1
Update inside panel each time during check-target-floor-arrived
YutoUchimi Dec 6, 2019
901808b
Remove unused local variable start-tm
YutoUchimi Dec 8, 2019
4c5590b
Show info of find_elevator_button on rviz as well
YutoUchimi Dec 9, 2019
90754cb
Remove unused arg-keys 'front-coords from push-state-machine
YutoUchimi Dec 9, 2019
cc3086e
Fix missing reference to 'button in check-target-floor-arrived
YutoUchimi Dec 9, 2019
22dd26a
Update ros-info in posedetectiondb-client
YutoUchimi Dec 9, 2019
34ef534
Test only if result of match_template is published in test-number-rec…
YutoUchimi Dec 9, 2019
513d624
Wait for service server (0.1sec) after ros::roseus for stable test-pa…
YutoUchimi Dec 9, 2019
9aa07dc
Remove unused and redundant button_state_marker.l
YutoUchimi Dec 9, 2019
966771f
Explicitly declare global variables
YutoUchimi Dec 9, 2019
8f37f12
Update mid-coords position to forum-door-inside
YutoUchimi Dec 9, 2019
d3da40e
Look a bit right before finding human at subway
YutoUchimi Dec 9, 2019
825b682
Fix initialization of look-at-human
YutoUchimi Dec 9, 2019
3d47cd9
Update parameters for speed up
YutoUchimi Dec 9, 2019
d49f8be
Update rviz config
YutoUchimi Dec 9, 2019
fea7d2d
Use filter-type: least-median
YutoUchimi Dec 9, 2019
6b72f0e
Wait until panel is found 3 times
YutoUchimi Dec 9, 2019
48a65b1
Check if elevator is needed before sanity check for faster execution …
YutoUchimi Dec 10, 2019
7a4378f
Decrease push offsets
YutoUchimi Dec 10, 2019
d036a67
Push with larm in default
YutoUchimi Dec 10, 2019
e21cc95
Define push-arm as userdata of state machine
YutoUchimi Dec 10, 2019
1dc837a
Wait only 0.1 sec for publisher to be ready in change-floor
YutoUchimi Dec 10, 2019
0d3505c
Earlier timeout of check-target-floor-arrived
YutoUchimi Dec 11, 2019
c180a58
Explicitly skip moving arm and torso during look-state when inside el…
YutoUchimi Dec 11, 2019
e338a36
Log result of sanity-check
YutoUchimi Dec 11, 2019
443fee6
Decrease offset from button: 60mm -> 50mm
YutoUchimi Dec 13, 2019
8aec877
Send angle-vectors together when pushing button
YutoUchimi Dec 13, 2019
48f3fa3
Fix to work sanity-check standalone
YutoUchimi Dec 13, 2019
04dd46f
Decrease timeout of look-button
YutoUchimi Dec 15, 2019
1b5a3b3
Send angle-vector softly
YutoUchimi Dec 15, 2019
bd324ce
Make sure to look at button
YutoUchimi Dec 15, 2019
b584741
Use until instead of while not
YutoUchimi Dec 15, 2019
3c37fcb
Pass through SIFT features just before update func
YutoUchimi Dec 16, 2019
ff6cea8
See 10 degrees more right at the beginning of find-clerk
YutoUchimi Dec 16, 2019
1926468
Store and restore parameters
YutoUchimi Dec 17, 2019
38e004c
Add find_human_in_mirror node and corresponding state
YutoUchimi Dec 10, 2019
26d8195
Add sanity check for find_human_in_mirror
YutoUchimi Dec 10, 2019
81ca9d1
Fix typo
YutoUchimi Dec 10, 2019
d0e3c8c
Update rviz config
YutoUchimi Dec 10, 2019
5a14b0d
Add debug info for find_human_in_mirror
YutoUchimi Dec 10, 2019
57d9ae4
Fix typo of parentheses in speak-to-human-behind
YutoUchimi Dec 10, 2019
4078c7e
Launch all nodes except 2 FCN on c2 machine
YutoUchimi Dec 11, 2019
a560ea2
Fix param name
YutoUchimi Dec 12, 2019
747c643
Show log for find_human_in_mirror in rviz as well
YutoUchimi Dec 12, 2019
d49df73
Speak another sentence when human outside mirror found
YutoUchimi Dec 12, 2019
347de33
Decrease queue_size for label_image_decomposer of door_button fcn
YutoUchimi Dec 12, 2019
d56b579
Fix topic names for inside/outside mirror
YutoUchimi Dec 12, 2019
ebfeb23
Refactor sanity-check
YutoUchimi Dec 13, 2019
e8cde7d
Use fcn_depth_prediction.py in jsk_perception
YutoUchimi Dec 16, 2019
0ac9524
Subscribe result of mirror recognition twice in speak-to-human-behind.l
YutoUchimi Dec 16, 2019
367aa7d
Avoid fastest angle-vector
YutoUchimi Dec 16, 2019
f20d843
Set shorter timeout during speak-to-human
YutoUchimi Dec 16, 2019
bccac50
Light weight throttle for coral output image
YutoUchimi Dec 16, 2019
0a62de0
Update rviz config
YutoUchimi Dec 16, 2019
ad6d9ec
Speak even when timeout reached
YutoUchimi Dec 17, 2019
801eb4c
Allow approximate_sync in find_human_in_mirror because input topics a…
YutoUchimi Dec 17, 2019
accc778
Wait more before moving into elevator
YutoUchimi Dec 17, 2019
a1b0ee0
Initialize torso height before starting subway demo
YutoUchimi Dec 17, 2019
47373e0
Wait 1.2sec before finding human
YutoUchimi Dec 17, 2019
5a46d8a
Use no_sync in find_human_in_mirror.py
YutoUchimi Dec 17, 2019
d234ce0
Reduce wait time
YutoUchimi Dec 18, 2019
ba01bd7
Reduce timeout of some state
YutoUchimi Dec 19, 2019
4cffe5f
Clear costmap before moving into elevator
YutoUchimi Dec 19, 2019
afcba25
Subscribe in/outside_mirror 3 times
YutoUchimi Dec 20, 2019
92d9f34
Use :move-to, not send goal directly to move_base
YutoUchimi Dec 20, 2019
7223a19
Stop look-forward-in-nav.l during take-elevator
YutoUchimi Dec 20, 2019
78bc2f6
Fix return value in ready-to-outside
YutoUchimi Dec 20, 2019
323d6e6
Decrease timeout of speak-to-human-behind
YutoUchimi Dec 21, 2019
57b89af
Wait for door opening before moving outside
YutoUchimi Dec 21, 2019
f67e4a7
Use move_base action in :go-to
YutoUchimi Dec 21, 2019
dac4744
Wait for door opening
YutoUchimi Dec 21, 2019
c0322b9
Wait for transform between target-frame and scene
YutoUchimi Dec 21, 2019
35a40c8
Show info at the beginning of check-elevator-needed
YutoUchimi Dec 22, 2019
7a3bb0f
Use latest data since old data is a result of closed elevator
YutoUchimi Dec 22, 2019
ce55f3e
Wait for transform during check-current-floor
YutoUchimi Dec 23, 2019
4125064
Show debug info earlier
YutoUchimi Dec 23, 2019
962ce04
Revert "Use move_base action in :go-to"
YutoUchimi Dec 23, 2019
891bf6e
Return to elevator_inside_panel-front when move-outside fails
YutoUchimi Dec 23, 2019
559b912
Fix success-state
YutoUchimi Dec 23, 2019
a5a0e7c
Update rviz config
YutoUchimi Dec 23, 2019
137422e
Decrease timeout of speak-to-human-behind
YutoUchimi Dec 23, 2019
18d300d
Fix return value in move-outside
YutoUchimi Dec 23, 2019
ca86674
Fix speaking word
YutoUchimi Dec 23, 2019
64556fc
Wait for transform after 'now'
YutoUchimi Dec 23, 2019
2e947b1
Disable correction during move-elevator-front and move-inside
YutoUchimi Dec 24, 2019
88104f5
Update sleep seconds before finding mirror
YutoUchimi Dec 24, 2019
c15787a
Update elevator-front-coords
YutoUchimi Dec 24, 2019
4513463
Update ordering sandwich
YutoUchimi Dec 24, 2019
7710155
Update rviz config
YutoUchimi Dec 24, 2019
6b95d4a
Add speaking 'leave it to the clerk' at the end of ordering
YutoUchimi Dec 24, 2019
841888e
Refactor wait-for-hand-over
YutoUchimi Dec 24, 2019
3c18620
Decrease timeout of speak-to-human-behind
YutoUchimi Dec 26, 2019
a616554
Update rviz config
YutoUchimi Dec 26, 2019
28857e3
Disable correction at the end of :go-to since this is a wrapper of mo…
YutoUchimi Dec 26, 2019
07fbeaf
Disable look_at_human while taking elevator
YutoUchimi Dec 26, 2019
e05365f
Refactor find_human_in_mirror.py
YutoUchimi Dec 27, 2019
13199e2
Look at human until order is finished
YutoUchimi Dec 27, 2019
319300e
Disable tilt_scan observation before moving elevator front
YutoUchimi Dec 27, 2019
f04f1d7
Update pick-bag-pose
YutoUchimi Dec 27, 2019
d21f871
Launch demo from app_manager
YutoUchimi Dec 28, 2019
94f18d9
Prepare for executing demo from dialogflow
YutoUchimi Dec 28, 2019
9f8e7e1
Update ordering saidwich for applying reduced comsumption tax
YutoUchimi Dec 28, 2019
7de3e30
Lookup price from sandwich name
YutoUchimi Dec 28, 2019
8c995f0
Fix for dialogflow
YutoUchimi Dec 30, 2019
038b656
Add mid-point while coming back to initial pose since previous point …
YutoUchimi Jan 6, 2020
c953368
Avoid buying 'nil'
YutoUchimi Jan 6, 2020
dc25a9c
Add .rosinstall for elevator_move_base_pr2
YutoUchimi Jan 27, 2020
67cad81
move look-at-human.l to node_scripts
knorth55 Dec 9, 2020
118e975
add launch_find_elevator_button arg
knorth55 Oct 5, 2022
b37012f
fix test-button-light test
knorth55 Oct 5, 2022
bc0dbe3
fix test-modules-callpanel test
knorth55 Oct 5, 2022
16741dc
enable all tests
knorth55 Oct 5, 2022
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
4 changes: 4 additions & 0 deletions elevator_move_base_pr2.rosinstall
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
- git:
local-name: knorth55/coral_usb_ros
uri: https://github.com/knorth55/coral_usb_ros.git
version: master
64 changes: 30 additions & 34 deletions elevator_move_base_pr2/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,54 +1,50 @@
cmake_minimum_required(VERSION 2.8.3)
project(elevator_move_base_pr2)

find_package(catkin REQUIRED roscpp image_transport cv_bridge image_geometry tf geometry_msgs std_msgs message_generation roseus)

add_message_files(
FILES Float32Stamped.msg)
find_package(catkin REQUIRED
cv_bridge
geometry_msgs
image_geometry
image_transport
roscpp
std_msgs
tf
)

generate_messages(
DEPENDENCIES std_msgs)
add_custom_target(
${PROJECT_NAME}_install_trained_model
ALL
COMMAND ${PROJECT_SOURCE_DIR}/scripts/install_trained_model.py
)

include_directories(${catkin_INCLUDE_DIRS})

catkin_package(
DEPENDS
CATKIN_DEPENDS
INCLUDE_DIRS
LIBRARIES
DEPENDS
CATKIN_DEPENDS
INCLUDE_DIRS
LIBRARIES
)

add_executable(color_point_detector src/color_point_detector.cpp)
target_link_libraries(color_point_detector ${catkin_LIBRARIES})

catkin_package(
DEPENDS #
CATKIN_DEPENDS # TODO
INCLUDE_DIRS # TODO include
LIBRARIES # TODO
)

if (CATKIN_ENABLE_TESTING)
find_package(rostest REQUIRED)
add_rostest(test/test-color-point-detector.launch)
find_package(jsk_perception)
if(EXISTS ${jsk_perception_DIR}/launch/eusmodel_detection_elevator-panels-eng2.launch OR
EXISTS ${jsk_perception_SOURCE_PREFIX}/launch/eusmodel_detection_elevator-panels-eng2.launch)
add_rostest(test/test-panel-pose-detection.launch ROBOT:=sim)
add_rostest(test/test-button-light.launch ROBOT:=sim)
else()
message(WARNING "${jsk_perception_DIR}/launch/eusmodel_detection_elevator-panels-eng2.launch or")
message(WARNING "${jsk_perception_SOURCE_PREFIX}/launch/eusmodel_detection_elevator-panels-eng2.launch is not found")
message(WARNING "You need to compile jsk_perception to run test-button-light.launch and test-panel-pose-detection.launch")
endif()
# 2 tests below are skipped now since they aren't actually used for testing purpose.
# add_rostest(test/test-modules-callpanel.launch ROBOT:=sim)
# add_rostest(test/test-modules-insidepanel.launch ROBOT:=sim)
add_rostest(test/test-panel-pose-detection.launch ROBOT:=sim)
add_rostest(test/test-button-light.launch ROBOT:=sim)
add_rostest(test/test-modules-callpanel.launch ROBOT:=sim)
add_rostest(test/test-modules-insidepanel.launch ROBOT:=sim)
endif()

install(DIRECTORY launch test scripts elevator_numbers
install(
DIRECTORY config elevator_numbers launch node_scripts sample scripts test
DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
USE_SOURCE_PERMISSIONS)
USE_SOURCE_PERMISSIONS
)

install(TARGETS color_point_detector
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION})
install(
TARGETS color_point_detector
DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
)
32 changes: 32 additions & 0 deletions elevator_move_base_pr2/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# elevator_move_base_pr2

A ROS package for moving around in the building with elevator by PR2 robot.

## Usage

### Go to subway, buy sandwich and come back

#### Step 1

Launch some common nodes on c1 machine to prepare for using elevator.

```bash
roslaunch elevator_move_base_pr2 elevator_move_base_eng2.launch
```

#### Step 2

Launch nodes for recognition on GPU machine.
This step will be meld into step 1 in the future.

```bash
roslaunch elevator_move_base_pr2 fcn_door_button_segmentation.launch
```

#### Step 3

Launch nodes for application on c1 machine to start demonstration.

```bash
roslaunch elevator_move_base_pr2 fetch_sandwich.launch
```
3 changes: 3 additions & 0 deletions elevator_move_base_pr2/apps/apps.installed
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
apps:
- app: elevator_move_base_pr2/pr2_subway_demo
display: PR2 fetches sandwich from SUBWAY
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
display: PR2 fetches sandwich from SUBWAY
description: PR2 fetches sandwich from SUBWAY
platform: pr2
launch: elevator_move_base_pr2/pr2_subway_demo.xml
interface: elevator_move_base_pr2/pr2_subway_demo.interface
icon: elevator_move_base_pr2/pr2_subway_demo.png
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
published_topics: {}
subscribed_topics: {}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<launch>
<include file="$(find elevator_move_base_pr2)/launch/elevator_move_base_eng2.launch"/>
<include file="$(find elevator_move_base_pr2)/sample/fetch_sandwich.launch"/>
</launch>
Loading