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

Adding new robocup scenarios #145

Merged
merged 175 commits into from
May 24, 2019
Merged
Show file tree
Hide file tree
Changes from 124 commits
Commits
Show all changes
175 commits
Select commit Hold shift + click to select a range
7b1adee
[mdr_listen_action] Add kaldi functionality
robertocaiwu May 1, 2019
d8ae417
[mdr_listen_action] Set kaldi as default SR engine
robertocaiwu May 1, 2019
ac49555
[mdr_listen_action] Remove duplicate code
robertocaiwu May 1, 2019
7b0b9d8
add classify image as an optional param
minhnh May 1, 2019
80a2d6f
Add GO 2019 map
argenos May 2, 2019
b72aab7
Merge branch 'go-2019' of https://github.com/b-it-bots/mas_domestic_r…
minhnh May 2, 2019
a2c0bf5
[mdr_environments] Added a GO 2019 testing map (close to tables)
alex-mitrevski May 2, 2019
e637896
[mdr_environments] Add navigation goals to test map
argenos May 2, 2019
d5bc499
[mdr_environments/go-small-2019] Cleaned the map a bit
alex-mitrevski May 2, 2019
b44d8c7
Merge branch 'go-2019' of github.com:b-it-bots/mas_domestic_robotics …
alex-mitrevski May 2, 2019
934adc8
Add the "find_my_mates" scenario and "interview action".
May 2, 2019
37fa0a9
Merge pull request #129 from PatrickNa/mdr_robocup_tasks/find_my_mates
PatrickNa May 2, 2019
998726b
Merge pull request #128 from minhnh/go-2019
alex-mitrevski May 2, 2019
2357dc3
[mdr_listen_action] Move ros param to listen client
robertocaiwu May 2, 2019
23bd0e2
Fix merge conflic comments.
May 2, 2019
2aa01a2
Merge pull request #131 from PatrickNa/mdr_robocup_tasks/find_my_mates
PatrickNa May 2, 2019
a0640f6
[mdr_listen_action] Change default model_directory in launch file
robertocaiwu May 2, 2019
adb6181
Merge pull request #132 from robertocaiwu/feature/Kaldi_listen_action
PatrickNa May 2, 2019
88b8468
[mdr_environments] Add find my mates pose
argenos May 2, 2019
dfe8289
Update the "Find my mates" state machine.
May 2, 2019
670d506
Add HRI behaviours that are needed in "find my mate" scenario among o…
May 2, 2019
d9a8e6e
Merge pull request #133 from PatrickNa/mdr_robocup_tasks/find_my_mates
PatrickNa May 2, 2019
06c3190
Added mdr_find_people action
henrikschnor May 2, 2019
979528a
[rosplan.launch] Added ontology params
alex-mitrevski May 2, 2019
9ee493a
[mdr_listen_action] Fix namespace issue in launch file
robertocaiwu May 2, 2019
e92d99d
[mdr_listen_action] Send ros params to smach state userdata
robertocaiwu May 2, 2019
f4eab9f
Merge branch 'go-2019' of github.com:b-it-bots/mas_domestic_robotics …
robertocaiwu May 2, 2019
9f14adb
[default_domain.pddl] Added a person type and known/unknown predicates
alex-mitrevski May 2, 2019
73608a6
[find_people_client] The KB is now updated after finding people
alex-mitrevski May 2, 2019
919d9ec
Merge pull request #134 from robertocaiwu/feature/Kaldi_listen_action
argenos May 2, 2019
f84a7ee
[find_my_mates] Added states for moving to a person and checking if t…
alex-mitrevski May 2, 2019
3857fd5
Merge branch 'go-2019' of github.com:b-it-bots/mas_domestic_robotics …
alex-mitrevski May 2, 2019
f26b2eb
[find_my_mates/move_to_person] The robot is now going to the pose spe…
alex-mitrevski May 2, 2019
74b5fc0
[find_my_mates/config] GO_TO_OPERATOR now goes back to the FIND_PEOPL…
alex-mitrevski May 3, 2019
8faa607
Add "Interview Person" behaviours.
May 3, 2019
c6f69b9
Merge pull request #135 from PatrickNa/mdr_robocup_tasks/find_my_mates
PatrickNa May 3, 2019
e1cecff
[perception_msgs] Added a PersonInfo msg
alex-mitrevski May 3, 2019
a70848b
Added arena bounds check and a safe pose to mdr_find_people
henrikschnor May 3, 2019
35d4159
[mdr_find_my_mates] Add report information behavior
robertocaiwu May 3, 2019
deeb473
Add a RASA NLU model for the "Find My Mate" Scenario.
May 3, 2019
2e530f5
Merge pull request #137 from PatrickNa/mdr_robocup_tasks/find_my_mates
PatrickNa May 3, 2019
0a6e354
Merge pull request #136 from robertocaiwu/feature/mdr_find_my_mates/r…
PatrickNa May 3, 2019
b201688
add describe person behavior
minhnh May 3, 2019
a2ea555
Included an image of detected people in the result of mdr_find_people
henrikschnor May 3, 2019
f09e6e8
[find_my_mates] Moved states to the scenario package; added interacti…
alex-mitrevski May 3, 2019
25c878a
[perception_behaviours] Added a find_people behaviour
alex-mitrevski May 3, 2019
fd9e4a0
[find_my_mates] Various error fixes
alex-mitrevski May 3, 2019
fc588ce
[mdr_find_my_mates] Add retrieve_information behavior
robertocaiwu May 3, 2019
986830f
[find_my_mates/interview] Fixed an incorrect elif condition
alex-mitrevski May 3, 2019
c9a9ff3
[hri_behaviours/retrieve] Fixed various errors
alex-mitrevski May 3, 2019
ed11201
Various fixes to the find_my_mates scenario
mas-hsr May 3, 2019
a348c3a
[mdr_robocup_tasks] Add where is this pkg
argenos May 3, 2019
e51cf4f
[mdr_robocup_tasks] Add where is this pkg
argenos May 3, 2019
91fef3a
[mdr_robocup_tasks] Remove scanning state
argenos May 3, 2019
f7039d4
[mdr_perception_msgs] Add initial ObjectInfo msg
argenos May 3, 2019
a811f79
Merge branch 'go-2019' of github.com:b-it-bots/mas_domestic_robotics …
May 3, 2019
842cf56
Add the state machine for the "where is this" scenario of the RoboCup…
May 3, 2019
bee05a1
Add the scenario states/ actions to the state machine of "where is th…
May 3, 2019
2a7c387
Add remaining states (without proper functioning yet).
May 3, 2019
0355585
Update the where is this launch file.
May 3, 2019
c76d1f4
[mdr_simple_listen_action] Make new listen action based on FTSM
robertocaiwu May 3, 2019
1f03570
Merge branch 'go-2019' of github.com:b-it-bots/mas_domestic_robotics …
robertocaiwu May 3, 2019
d90855d
[mdr_listen_action] Refactor mdr_simple_listen_action to mdr_listen_a…
robertocaiwu May 3, 2019
62ec345
fix errors in SM mdr_where_is_this
mas-hsr May 3, 2019
27709a5
Added trained model of rasa nlu
ErickKramer May 3, 2019
33f9b7e
Merge branch 'go-2019' of https://github.com/b-it-bots/mas_domestic_r…
ErickKramer May 3, 2019
4375485
Added receive_information state
henrikschnor May 3, 2019
8c2a01d
fix issues with speech recog in receive info state
mas-hsr May 3, 2019
9c9cfdf
Merge pull request #139 from robertocaiwu/feature/mdr_simple_listen_a…
minhnh May 4, 2019
508f087
[where_is_this] Removed unnecessary states from the state machine
alex-mitrevski May 4, 2019
4eb5164
Merge branch 'go-2019' of github.com:b-it-bots/mas_domestic_robotics …
alex-mitrevski May 4, 2019
9658201
Added more sentences for the model
ErickKramer May 4, 2019
0141dfd
Merge branch 'go-2019' of https://github.com/b-it-bots/mas_domestic_r…
ErickKramer May 4, 2019
5b6bc42
Added entities text file for question matchin
ErickKramer May 4, 2019
995a6ea
Updated rasa nlu model
ErickKramer May 4, 2019
e3b5790
Added locations and objects text files
ErickKramer May 4, 2019
ddd825d
Add the speech matching component to receive information state
May 4, 2019
fcb9971
Fix bugs regarding the speech matching changes in receive information.
mas-hsr May 4, 2019
64c9198
Added logging node for speech recognition and nlu
mas-hsr May 4, 2019
24d743e
[mdr_robocup_tasks] Add topological map launch file to where_is_this
argenos May 4, 2019
f3f1fd6
[mdr_where_is_this] Added detect_person state
henrikschnor May 4, 2019
f09ebcb
[where_is_this] Initial draft of the describe_location state
alex-mitrevski May 4, 2019
a40529b
[where_is_this/describe_location] Skipping detailed description if no…
alex-mitrevski May 4, 2019
e62e5b0
[mdr_where_is_this] Small fixes in detect_person state
mas-hsr May 4, 2019
9dc2a7b
[where_is_this] Fixed incorrect import of topological_map
alex-mitrevski May 4, 2019
ffff171
Merge branch 'go-2019' of github.com:b-it-bots/mas_domestic_robotics …
alex-mitrevski May 4, 2019
98ac087
[where_is_this/describe_location] Added timeout for pose
alex-mitrevski May 4, 2019
656d68a
[where_is_this/describe_location] Fixed an incorrect parameter name
alex-mitrevski May 4, 2019
8a03ebb
[where_is_this/describe_location] Fixed userdata inconsistencies
alex-mitrevski May 4, 2019
d15c49c
[where_is_this/describe_location] Location entities are now processse…
alex-mitrevski May 4, 2019
f45d18d
[where_is_this/describe_location] Incorrect object was passed to the …
alex-mitrevski May 4, 2019
052ce8b
[where_is_this/describe_location] Changed the pose topic name
alex-mitrevski May 4, 2019
ddc1ac2
Added locations and objects relevant for the competition, removed unu…
ErickKramer May 4, 2019
d832a3f
Added locations and objects relevant for the competition, removed unu…
ErickKramer May 4, 2019
413cf62
Fixed merge issue
ErickKramer May 4, 2019
e0e9216
Added sentences to the nlu model
ErickKramer May 4, 2019
30ab2eb
Merge branch 'devel' into go-2019
argenos May 17, 2019
6b0b683
Merge branch 'go-2019' of github.com:b-it-bots/mas_domestic_robotics …
argenos May 17, 2019
99ac4e7
Remove go-small-2019 map
argenos May 19, 2019
338407b
Add BRSU rheinbach map
argenos May 19, 2019
7a87bfe
Add launcher to visualize map in rviz
argenos May 19, 2019
00d159a
[rosinstall] Add the topological_map repo
argenos May 19, 2019
0923e50
Merge branch 'devel' into go-2019
argenos May 21, 2019
7076bf0
Update dependencies to mas_perception_msgs
argenos May 21, 2019
daf6aed
[where_is_this] Clean up comments
argenos May 22, 2019
7b348b9
[where_is_this] Add missing dependencies
argenos May 22, 2019
7aeeb6e
Merge branch 'devel' into go-2019
argenos May 22, 2019
6812189
Merge branch 'devel' into go-2019
argenos May 23, 2019
236ffd3
fix parameter type, remove TODO
minhnh May 23, 2019
855673f
[mdr_mbot_interface] remove package.xml comments
minhnh May 24, 2019
519c92a
[mdr_mbot_interface] change maintainer name
minhnh May 24, 2019
5d2c316
[speech_matching/objects] Added bookshelf to the list
mas-hsr May 24, 2019
2bd8a6c
Merge branch 'go-2019' of https://github.com/b-it-bots/mas_domestic_r…
mas-hsr May 24, 2019
8cce786
[speech_matching/locations] Added hallway, entrance, and exit to the …
mas-hsr May 24, 2019
bdc74ac
[where_is_this/describe_location] Bug fixed and improvements in the d…
mas-hsr May 24, 2019
b9317e7
[where_is_this_sm] Changed the transitions so that the SM doesn't ter…
mas-hsr May 24, 2019
3ad67fd
[perceive_plane_action/client_test] Corrected the name of the action …
mas-hsr May 24, 2019
67fe539
[rosplan.launch] Specified a default path for problem and plan files
mas-hsr May 24, 2019
a813696
[mbot_logger] Removed a log file
mas-hsr May 24, 2019
ee28be1
Removed unnecessary comments
ErickKramer May 24, 2019
204e7b4
Added comments about what it is being included inside the launch file.
ErickKramer May 24, 2019
02db18f
[pickup_action] Added params for low pregrasp
mas-hsr May 24, 2019
ed8dd96
[place_action] Added params for low surface placing
mas-hsr May 24, 2019
9507dd3
Removed unused import String
Vanargh May 24, 2019
9558dc2
Removed used imported sys, yaml, actionlib, ListenFeedback
divindevaiah May 24, 2019
9b3d0bc
Deleted spaces and unused packages
ZuhaKarim May 24, 2019
004d95d
Codacy fixes
agrija9 May 24, 2019
690a2e7
codacy fixes in interview_person.py
rkutty1 May 24, 2019
4fed2d7
removed line 5 (from std_msg.msg import String) removed line 7 (from …
IshanChaks91 May 24, 2019
ec01e88
indented
ZuhaKarim May 24, 2019
652bac5
Removed unused String library
divindevaiah May 24, 2019
5de0a5b
Removed unused TurnBaseToFeedback package
Vanargh May 24, 2019
5dbdb44
codacy fix action_states
agrija9 May 24, 2019
fad65f5
Removed unused copy, rospkg, String, ActionSlot Library
divindevaiah May 24, 2019
d663f56
Merge pull request #157 from b-it-bots/refactor/clean_mdr_mbot_logger
argenos May 24, 2019
1b4b512
Removed Unused RecognizeEmotionFeedback package
Vanargh May 24, 2019
526fb85
Removed copy, rospkg,ActionSlot and Whitespace.
divindevaiah May 24, 2019
d28bb5e
Unused PlaceGoal imported from mdr_place_action.msg
agrija9 May 24, 2019
62f5045
unused CVBridgerror, GenderRecognitonFeedback,number_of_faces, rgb_cvs
ZuhaKarim May 24, 2019
be44fca
Removed unused sys Library.
divindevaiah May 24, 2019
e881a4f
removed line 5 (from std_msg.msg import String) removed line 7 (from …
IshanChaks91 May 24, 2019
50865d9
Removed Unused packages rospy tf PointCloud2 transform_cloud_with_li…
Vanargh May 24, 2019
fb4d8a8
codacy fix
rkutty1 May 24, 2019
df068d8
Merge pull request #161 from rkutty1/go-2019
argenos May 24, 2019
781133d
Removed unused EnterDoorFeedback Library.
divindevaiah May 24, 2019
4258734
Fixed Unused import smach_ros
agrija9 May 24, 2019
a8318fc
Removed unused MoveBaseFeedback Library.
divindevaiah May 24, 2019
97b3aed
Removed unused config in retrieve_information and load_data in interv…
Vanargh May 24, 2019
44dd7c2
removed line 4 (import geometry_msgs.msg) removed whitespace betwee l…
IshanChaks91 May 24, 2019
e08738b
Fixed unused import actionlib
agrija9 May 24, 2019
8d50aa6
Removed unused PickupFeedback.
divindevaiah May 24, 2019
65a8c7a
Removed unused MoveForwardFeedback.
divindevaiah May 24, 2019
0d79838
Fixed unused import sys
agrija9 May 24, 2019
6f81182
removed MoveArmFeedback from line 9 (from mdr_move_arm_action.msg imp…
IshanChaks91 May 24, 2019
a3986b1
Merge branch 'go-2019' of https://github.com/b-it-bots/mas_domestic_r…
Vanargh May 24, 2019
d565ea7
Removed unused PerceivePlaneFeedback.
divindevaiah May 24, 2019
621ac7b
[environments/brsu-c069] Updated navigation goals
mas-hsr May 24, 2019
b88b79d
Merge branch 'go-2019' of https://github.com/b-it-bots/mas_domestic_r…
mas-hsr May 24, 2019
fd2c51f
[demo_patrol_sm] Updated the pose names
mas-hsr May 24, 2019
fe7b350
Removed unused randint.
divindevaiah May 24, 2019
b53eed1
codacy review
ZuhaKarim May 24, 2019
924d28d
Merge pull request #165 from rkutty1/go-2019
argenos May 24, 2019
1f4f144
Merge pull request #160 from Vanargh/go-2019
argenos May 24, 2019
1981574
[store_groceries] Added a minimal SM specification for running lab tests
mas-hsr May 24, 2019
042b824
Merge branch 'go-2019' of https://github.com/b-it-bots/mas_domestic_r…
mas-hsr May 24, 2019
2f96bbf
[where_is_this] Added a minimal SM for lab testing
mas-hsr May 24, 2019
84a4e35
[robot_inspection_sm] Removed unnecessary states
mas-hsr May 24, 2019
345165f
[robot_inspection] Added an SM for lab testing
mas-hsr May 24, 2019
d4fe39f
Merge pull request #164 from divindevaiah/go-2019
argenos May 24, 2019
03e821d
Merge pull request #166 from ZuhaKarim/go-2019
argenos May 24, 2019
3970b8c
Update mdr_hri/mdr_mbot_logger/ros/src/mdr_mbot_logger/mbot_logger.py
argenos May 24, 2019
e1acaa7
Update mdr_hri/mdr_mbot_logger/ros/src/mdr_mbot_logger/mbot_logger.py
argenos May 24, 2019
92f77e7
Merge pull request #162 from agrija9/go-2019
argenos May 24, 2019
a945d31
Merge branch 'go-2019' into go-2019
alex-mitrevski May 24, 2019
9359ae5
Merge pull request #163 from IshanChaks91/go-2019
alex-mitrevski May 24, 2019
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 mas-domestic.rosinstall
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,10 @@
local-name: ftsm
uri: https://github.com/b-it-bots/ftsm.git
version: master
- git:
local-name: topological_map
uri: https://github.com/b-it-bots/topological_map.git
version: master

- git:
local-name: zbar_ros
Expand Down
6 changes: 6 additions & 0 deletions mdr_environments/go-2019/map.pgm

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions mdr_environments/go-2019/map.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
image: map.pgm
resolution: 0.050000
origin: [-51.224998, -51.224998, 0.000000]
negate: 0
occupied_thresh: 0.65
free_thresh: 0.196

120 changes: 120 additions & 0 deletions mdr_environments/go-2019/navigation_goals.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,120 @@
BED:
- 4.30513
- -4.279185
- -1.051442
INSIDE_ARENA:
- 4.019433
- -2.043573
- -2.651636
KITCHEN:
- -1.652011
- -6.342187
- -1.099025
OUTSIDE_ARENA:
- -4.457571
- -0.05934405
- 2.034444
KITCHEN_TABLE_RIGHT:
- -0.9037232
- -8.641444
- 2.065464
KITCHEN_TABLE_FRONT:
- 0.2742174
- -6.80092
- -2.604696
KITCHEN_CABINET:
- 0.7235541
- -7.542412
- -1.104489
FIND_PEOPLE:
- -0.320346
- -3.460586
- 3.00374
RIGHT_ARMCHAIR:
- -3.789047
- -3.360115
- -2.616891
TV_TABLE:
- -2.29401
- -0.5987632
- 0.4856576
BAR_TABLE:
- 0.1259053
- 0.3225024
- 2.626839
DESK:
- 3.031386
- -6.142125
- -1.065139
HIGH_TABLE:
- -3.612018
- -5.00376
- -1.828644
BAR:
- 1.054396
- -0.9377503
- 1.585289
INSPECTION_AREA:
- -1.536159
- -3.74556
- 2.088064
LIVINGROOM:
- -1.745905
- -3.594855
- 2.841857
SIDE_TABLE:
- 4.682122
- -4.174587
- 0.4781403
KITCHEN_TABLE_BACK:
- -2.715386
- -8.625648
- 0.5247045
BEDROOM:
- 2.38169
- -5.25634
- -0.1241464
LEFT_ARMCHAIR:
- -3.458107
- -3.187092
- 1.841441
COFFEE_TABLE_LEFT:
- -4.295843
- -1.556026
- -1.716217
COFFEE_TABLE_FRONT:
- -4.00686
- -3.047848
- 2.429445
BOOKCASE:
- 0.04338479
- -3.72513
- -1.065139
SIDEBOARD:
- -1.365344
- -2.700144
- 0.471772
SECOND_DOOR:
- -4.023154
- -1.022106
- 2.03444
ENTRY:
- 4.786344
- -1.606301
- -2.590502
Sofa:
- 1.3452
- 0.7607408
- 0.9141445
CUPBOARD:
- 2.426733
- -0.4882817
- 0.4856612
HALLWAY:
- 2.075034
- -2.545136
- -2.684174
KITCHEN_TABLE_LEFT:
- -1.9157
- -6.802622
- -1.058688
16 changes: 16 additions & 0 deletions mdr_environments/launch/rviz.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
<?xml version="1.0"?>
<launch>
<arg name="robot_env" default="$(optenv ROBOT_ENV !!NO_ROBOT_ENV_SET!!)" />
<arg name="map" default="$(find mdr_environments)/$(arg robot_env)/map.yaml" />

<!-- map server -->
<node name="map_server" pkg="map_server" type="map_server" args="$(arg map)"/>

<!-- Visualize the navigation goals -->
<node pkg="mcr_navigation_tools" name="pose_visualiser" type="pose_visualiser" output="screen">
<param name="pose_frame" value="map" />
<param name="pose_description_file" value="$(find mdr_environments)/$(arg robot_env)/navigation_goals.yaml" />
</node>


</launch>
5 changes: 5 additions & 0 deletions mdr_environments/rheinbach/map.pgm

Large diffs are not rendered by default.

7 changes: 7 additions & 0 deletions mdr_environments/rheinbach/map.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
image: map.pgm
resolution: 0.050000
origin: [-51.224998, -51.224998, 0.000000]
negate: 0
occupied_thresh: 0.65
free_thresh: 0.196

36 changes: 36 additions & 0 deletions mdr_environments/rheinbach/navigation_goals.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
ENTRANCE:
- -5.580067
- 17.33464
- 2.9797
BOOTH:
- 3.073195
- 1.848558
- 1.575188
PLACING_TABLE:
- -0.2367148
- -0.4022798
- -2.471963
STAIRCASE:
- -0.7695603
- 12.30903
- 2.609567
H1:
- 5.497872
- 9.701932
- 0.09035287
TEST:
- -3.402089
- 10.79771
- -1.947286
PICKING_TABLE:
- 0.1512768
- 0.3486245
- -0.07875043
H5:
- 0.02695501
- 7.02618
- -3.125391
CATERING:
- 4.951392
- 4.348834
- 0.1132986
51 changes: 3 additions & 48 deletions mdr_hri/mdr_mbot_interface/package.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,50 +4,10 @@
<version>0.0.0</version>
<description>The mdr_mbot_interface package</description>

<!-- One maintainer tag required, multiple allowed, one person per tag -->
<!-- Example: -->
<!-- <maintainer email="jane.doe@example.com">Jane Doe</maintainer> -->
<maintainer email="lucy@todo.todo">lucy</maintainer>
<maintainer email="robotics@inf.h-brs.de">MAS robotics</maintainer>

<license>GPLv3</license>

<!-- One license tag required, multiple allowed, one license per tag -->
<!-- Commonly used license strings: -->
<!-- BSD, MIT, Boost Software License, GPLv2, GPLv3, LGPLv2.1, LGPLv3 -->
<license>TODO</license>


<!-- Url tags are optional, but multiple are allowed, one per tag -->
<!-- Optional attribute type can be: website, bugtracker, or repository -->
<!-- Example: -->
<!-- <url type="website">http://wiki.ros.org/mdr_mbot_interface</url> -->


<!-- Author tags are optional, multiple are allowed, one per tag -->
<!-- Authors do not have to be maintainers, but could be -->
<!-- Example: -->
<!-- <author email="jane.doe@example.com">Jane Doe</author> -->


<!-- The *depend tags are used to specify dependencies -->
<!-- Dependencies can be catkin packages or system dependencies -->
<!-- Examples: -->
<!-- Use depend as a shortcut for packages that are both build and exec dependencies -->
<!-- <depend>roscpp</depend> -->
<!-- Note that this is equivalent to the following: -->
<!-- <build_depend>roscpp</build_depend> -->
<!-- <exec_depend>roscpp</exec_depend> -->
<!-- Use build_depend for packages you need at compile time: -->
<!-- <build_depend>message_generation</build_depend> -->
<!-- Use build_export_depend for packages you need in order to build against this package: -->
<!-- <build_export_depend>message_generation</build_export_depend> -->
<!-- Use buildtool_depend for build tool packages: -->
<!-- <buildtool_depend>catkin</buildtool_depend> -->
<!-- Use exec_depend for packages you need at runtime: -->
<!-- <exec_depend>message_runtime</exec_depend> -->
<!-- Use test_depend for packages you need only for testing: -->
<!-- <test_depend>gtest</test_depend> -->
<!-- Use doc_depend for packages you need only for building documentation: -->
<!-- <doc_depend>doxygen</doc_depend> -->
<buildtool_depend>catkin</buildtool_depend>
<build_depend>rospy</build_depend>
<build_depend>std_msgs</build_depend>
Expand All @@ -56,10 +16,5 @@
<exec_depend>rospy</exec_depend>
<exec_depend>std_msgs</exec_depend>


<!-- The export tag contains other, unspecified, tags -->
<export>
<!-- Other tools can request additional information be placed here -->

</export>
<export></export>
</package>
14 changes: 14 additions & 0 deletions mdr_hri/mdr_mbot_logger/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
cmake_minimum_required(VERSION 2.8.3)
project(mdr_mbot_logger)

find_package(catkin REQUIRED COMPONENTS
rospy
std_msgs
)

catkin_python_setup()

catkin_package(
CATKIN_DEPENDS
)

20 changes: 20 additions & 0 deletions mdr_hri/mdr_mbot_logger/package.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0"?>
<package format="2">
<name>mdr_mbot_logger</name>
<version>0.0.0</version>
<description>The mdr_mbot_logger package</description>

<maintainer email="robotics@inf.h-brs.de">MAS robotics</maintainer>

<license>GPLv3</license>

<buildtool_depend>catkin</buildtool_depend>
<build_depend>rospy</build_depend>
<build_depend>std_msgs</build_depend>
<build_export_depend>rospy</build_export_depend>
<build_export_depend>std_msgs</build_export_depend>
<exec_depend>rospy</exec_depend>
<exec_depend>std_msgs</exec_depend>

<export></export>
</package>
14 changes: 14 additions & 0 deletions mdr_hri/mdr_mbot_logger/ros/launch/house_keeper_logger.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0"?>
argenos marked this conversation as resolved.
Show resolved Hide resolved
<launch>

<!--Launch mbot_logger -->
<include file="$(find mdr_mbot_logger)/ros/launch/mbot_logger.launch"> </include>

<!--Launch speech recognition -->
<include file="$(find mdr_speech_recognition)/ros/launch/speech_recognition.launch"> </include>

<!--Launch mbot -->
<include file="$(find mbot_nlu)/ros/launch/mbot_nlu.launch">
<arg name="nlu_classifier" value="erick_gpsr" />
</include>
</launch>
20 changes: 20 additions & 0 deletions mdr_hri/mdr_mbot_logger/ros/launch/mbot_logger.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?xml version="1.0"?>
<launch>
<!-- NLU : Natural Language understanding -->
<arg name="ns" default="hri"/>

<!-- the string containing the sentence from which the intention and args will get extracted -->
<arg name="intention_input" default="/understood_intention" />

<arg name="recognized_sentence" default="/speech_recognizer" />

<!-- mbot natural language understanding, inputs text, outputs intention and arguments -->
<node ns="$(arg ns)" pkg="mdr_mbot_logger" type="mbot_logger" name="mdr_mbot_logger" respawn="true" output="screen">
<remap from="~input_interpretation" to="$(arg intention_input)" />
<remap from="~input_sentence" to="$(arg recognized_sentence)" />
<param name="log_file" type="str" value='$(find mdr_mbot_logger)/ros/logs/nlu_logger.txt' />
</node>

</launch>


10 changes: 10 additions & 0 deletions mdr_hri/mdr_mbot_logger/ros/scripts/mbot_logger
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/usr/bin/env python

import rospy
from mdr_mbot_logger.mbot_logger import MbotLogger

if __name__ == '__main__':
rospy.init_node('mbot_logger', anonymous=False)
logger = MbotLogger()
logger.wait_for_information()

Loading