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

Release v.1.4.1 #154

Merged
merged 122 commits into from
May 24, 2019
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
122 commits
Select commit Hold shift + click to select a range
3a61d7c
Implemented a ros wrapper prototype for rasa nlu
henrikschnor Nov 16, 2018
8d8f03d
[perceive_plane_client] Fixed an incorrect call to 'delete_named' of …
alex-mitrevski Nov 22, 2018
6b44a88
[rosplan_interface] Added a script for clearing the message store on …
alex-mitrevski Nov 22, 2018
ce78732
[perceive_plane_client] Objects are now also deleted from the rosplan…
alex-mitrevski Nov 23, 2018
8e7cd49
Remove outdated question matching approach.
Nov 28, 2018
fb778a7
Merge pull request #88 from PatrickNa/cleanup/mdr_speech
PatrickNa Nov 29, 2018
741d794
[pickup_action] Implemented a top grasp strategy (implementation stil…
alex-mitrevski Dec 2, 2018
829eeee
Merge branch 'devel' of github.com:b-it-bots/mas_domestic_robotics in…
alex-mitrevski Dec 2, 2018
4a794dd
Moved training to a ROS independent bash script
henrikschnor Dec 5, 2018
5456fa8
Added cocktail party model and moved parsing to own function
henrikschnor Dec 21, 2018
d5fc1fb
Mbot interface implemented to process the interpreted output from mbo…
ErickKramer Dec 21, 2018
93b8977
Merge pull request #92 from ErickKramer/devel
alex-mitrevski Dec 21, 2018
3bca24a
[knowledge_base] Started working on an ontology for domestic environm…
alex-mitrevski Aug 17, 2018
860c8dd
[knowledge_base] Started working on a component that interacts with a…
alex-mitrevski Aug 17, 2018
51af960
[knowledge_base_manager.py] Added methods for getting the parent and …
alex-mitrevski Aug 17, 2018
56e54e9
[knowledge_base/ontology] Added some generic subclass definitions
alex-mitrevski Oct 28, 2018
4a1f0b6
[knowledge_base/ontology] Added a few simple geometric properties
alex-mitrevski Oct 28, 2018
6564581
[knowledge_base/ontology] Added a drawer class
alex-mitrevski Dec 23, 2018
d5623df
[knowledge_base] Moved the ontology query manager to a ROS-independen…
alex-mitrevski Dec 23, 2018
98a53b3
[knowledge_base] mv ontology_query_manager -> ontology_query_interface
alex-mitrevski Dec 23, 2018
5574e43
[knowledge_base] Added an interface for interacting with the KB
alex-mitrevski Dec 24, 2018
56973ad
Modified the action clients so that they use the KB interface
alex-mitrevski Dec 24, 2018
2c21ecf
[knowledge_base] Moved the ontology and KB interfaces to a dedicated …
alex-mitrevski Dec 24, 2018
d8d4059
Added a behaviours package and some common behaviours
alex-mitrevski Dec 25, 2018
0cf04fd
[store_groceries] Most of the states are now reused from mdr_behaviours
alex-mitrevski Dec 25, 2018
da9dac4
[demo_patrol] The move_base state from mdr_navigation_behaviours is n…
alex-mitrevski Dec 25, 2018
ba4a341
[demo_simple_pick_and_place] The states from mdr_behaviours are now r…
alex-mitrevski Dec 25, 2018
9e66664
[demo_throw_table_objects] The states from mdr_behaviours are now reused
alex-mitrevski Dec 25, 2018
e99ad80
Added mas_knowledge_base and mongodb_store to the rosinstall file
alex-mitrevski Dec 25, 2018
e0659be
[mdr_behaviours] Added a README
alex-mitrevski Dec 26, 2018
40db0f5
Removed the knowledge retrieval parameters from the action client lau…
alex-mitrevski Dec 27, 2018
9177218
[rosplan_interface] Added a default PDDL domain
alex-mitrevski Dec 28, 2018
e0e7038
Added an initial implementation of an object finding action
alex-mitrevski Dec 28, 2018
72932fa
Added the action execution library to the rosinstall file
alex-mitrevski Dec 29, 2018
e8e39a9
Added a dependency diagram to the README and made various small chang…
alex-mitrevski Dec 29, 2018
8b8bfc4
[find_object] Implemented the basic code for finding objects of a giv…
alex-mitrevski Dec 31, 2018
87c569f
[rosplan_interface] Adapted the rosplan launcher to the newest versio…
alex-mitrevski Jan 11, 2019
085731d
[rosplan_interface] An additional param had to be passed to the rospl…
alex-mitrevski Jan 11, 2019
3bd40bf
[rosplan_interface] Added a class for interacting with the planner (g…
alex-mitrevski Jan 12, 2019
6c77f98
Merge branch 'devel' into feature/speech/rasa_wrapper
henrikschnor Jan 18, 2019
5307d76
[rosplan_interface] Added subscribers for action dispatch and feedback
alex-mitrevski Jan 18, 2019
162e7ef
[behaviours] Added states for interacting with the planner
alex-mitrevski Jan 18, 2019
3ab4ae3
[pickup_acion] Fixed an import in the client
alex-mitrevski Jan 18, 2019
f0e05c5
[perceive_plane_action] Fixed some errors in the KB update
alex-mitrevski Jan 18, 2019
3fd1b51
[manip_behaviours/place_based_on_category] Fixed an incorrect action …
alex-mitrevski Jan 18, 2019
2973354
add planning flowchart (#93)
minhnh Jan 18, 2019
4713c20
Fixed possible race condition
henrikschnor Jan 24, 2019
a06e042
The pickup action is now implemented using a fault-tolerant state mac…
alex-mitrevski Jan 24, 2019
88ebc18
The place action is now implemented using a fault-tolerant state machine
alex-mitrevski Jan 24, 2019
d038e9b
The move base action is now implemented using a fault-tolerant state …
alex-mitrevski Jan 24, 2019
5955052
The navigation actions are now implemented using a fault-tolerant sta…
alex-mitrevski Jan 24, 2019
d047b58
[.rosinstall] Changed the FTSM url to the b-it-bots fork
alex-mitrevski Jan 25, 2019
7b9ba69
The perception actions are now implemented using a fault-tolerant sta…
alex-mitrevski Jan 25, 2019
3f3412b
The find object action is now also implemented using a fault-tolerant…
alex-mitrevski Jan 25, 2019
879afea
[perceive_plane_action] I'd not renamed one instance of a member vari…
alex-mitrevski Jan 26, 2019
ead467e
[actions] Fixed the handling of new goals to avoid race conditions
alex-mitrevski Jan 26, 2019
b3e1638
[actions] Fixed a few faulty print statements
alex-mitrevski Jan 26, 2019
b390dee
[travis-ci] Fixing travis builds (#94)
argenos Jan 28, 2019
6a35538
[manipulation_behaviours/pick_closest] The state is now failing if it…
alex-mitrevski Feb 8, 2019
bd42504
[docs] Added FTSM to the repo dependency diagram
alex-mitrevski Feb 23, 2019
a8d1ba0
* Adds store groceries README for instructions to run the task
robertocaiwu Feb 27, 2019
1a00d10
Update store groceries readme
robertocaiwu Feb 27, 2019
0daa8d9
Remove Lucy specific instructions
robertocaiwu Feb 27, 2019
6177c33
[monitoring_msgs] Added an event message
alex-mitrevski Mar 8, 2019
21e9ca6
[move_arm_action] A DMP is now also used for top grasps
alex-mitrevski Mar 8, 2019
bb50588
[move_base_action] Changed the name of the server in the client test …
alex-mitrevski Mar 8, 2019
14e21d3
Creating folder for new task: take out garbage
robertocaiwu Mar 8, 2019
83005d6
State machine definition for take out garbage task
robertocaiwu Mar 8, 2019
db9611c
Update path to renamed file
henrikschnor Mar 9, 2019
01d4bc8
Add package build files for take out garbage task
robertocaiwu Mar 10, 2019
caf9b11
Merge branch 'devel' of github.com:b-it-bots/mas_domestic_robotics in…
robertocaiwu Mar 10, 2019
14d8701
rename all ImageRecognition usages to RecognizeImage
minhnh Mar 11, 2019
38d399d
[mdr_listen_action] Removed reference to nonexistent python package a…
henrikschnor Mar 12, 2019
b09107d
Created a state machine for the "serving drinks" scenario
henrikschnor Mar 8, 2019
dfe9b68
[mdr_listen_action] Simplified setup.py
henrikschnor Mar 12, 2019
83bb5c6
[mdr_listen_action] Added missing dependencies
henrikschnor Mar 12, 2019
1111507
Merge branch 'devel' into devel
minhnh Mar 12, 2019
e30cd0d
Merge branch 'devel' into fix/mdr_listen_action/pkg_ref
henrikschnor Mar 12, 2019
ea4c33a
Merge branch 'devel' of github.com:b-it-bots/mas_domestic_robotics in…
robertocaiwu Mar 13, 2019
8b5e74a
Add states for perceiving collection_zone
robertocaiwu Mar 13, 2019
f0f10ba
Fix typos and state names for state machine
robertocaiwu Mar 13, 2019
528fb21
Merge pull request #125 from henrikschnor/fix/mdr_listen_action/pkg_ref
argenos Mar 13, 2019
727024f
Merge branch 'devel' of github.com:b-it-bots/mas_domestic_robotics in…
robertocaiwu Mar 13, 2019
9c1b7a6
Merge branch 'devel' into devel
minhnh Mar 14, 2019
79f7d7d
Merge pull request #124 from minhnh/devel
argenos Mar 15, 2019
851dae4
Merge branch 'devel' into feature/mdr_take_out_garbage/state_machine_…
robertocaiwu Mar 15, 2019
5b825f7
Add python package configuration files
robertocaiwu Mar 15, 2019
f40fb6c
Merge branch 'devel' of github.com:b-it-bots/mas_domestic_robotics in…
robertocaiwu Mar 15, 2019
bb37315
Merge branch 'feature/mdr_take_out_garbage/state_machine_definition' …
robertocaiwu Mar 15, 2019
6d08022
Add launch file for take out garbage task
robertocaiwu Mar 15, 2019
52758ad
Merge pull request #121 from robertocaiwu/feature/mdr_take_out_garbag…
argenos Mar 18, 2019
94effc6
Merge branch 'devel' into feature/speech/rasa_wrapper
PatrickNa Apr 5, 2019
a9970b3
Merge pull request #85 from henrikschnor/feature/speech/rasa_wrapper
PatrickNa Apr 5, 2019
b59f9b1
[rosplan_interface] Added an 'in' predicate to the default domain
alex-mitrevski Apr 12, 2019
8af10be
Merge branch 'devel' of github.com:b-it-bots/mas_domestic_robotics in…
alex-mitrevski Apr 12, 2019
a7b559c
[pickup/place] Updated the table manipulation DMP
alex-mitrevski Apr 26, 2019
de016ea
[move_arm_action] Added a dummy recovering state that sleeps for 5s
alex-mitrevski Apr 26, 2019
65bc912
[move_arm/dmp] Adding Abhishek's changes to the DMP API
alex-mitrevski Apr 26, 2019
2c34e80
[move_arm/dmp] Bug fixes
alex-mitrevski Apr 26, 2019
7a6fd92
[mbot_interface] Unknown actions are now not dispatched
alex-mitrevski Apr 26, 2019
e416032
[mdr_speech_recognition] Add kaldi support for offline recognition
robertocaiwu Apr 26, 2019
84b9e09
[mdr_speech_recognition] Parametrize launch file
robertocaiwu Apr 26, 2019
130ae0c
[mdr_speech_recognition] Update model directory
robertocaiwu Apr 26, 2019
48c31c5
remove legacy dependencies
minhnh May 14, 2019
643787a
remove exec dep on mean_circle
minhnh May 14, 2019
f25a1bd
Remove dependency from mas_navigation
argenos May 20, 2019
d1c75b6
remove old plane perceive package
minhnh May 20, 2019
838f4a9
[mdr_navigation] Update dependency to mas_navigation_tools
argenos May 20, 2019
8f9f58f
Merge pull request #148 from minhnh/refactor/perception/remove_mcr_dep
argenos May 20, 2019
d2535b5
Add mdr_door_status from mas_perception
argenos May 20, 2019
4a61c95
Update dependencies to mdr_door_status
argenos May 20, 2019
7700b5d
Update dependencies to mas_perception_msgs
argenos May 20, 2019
0be940b
Merge branch 'devel' into refactor/mdr_navigation
argenos May 20, 2019
704ba7d
[rosinstall] Update dependencies
argenos May 20, 2019
490b30e
Merge pull request #147 from argenos/refactor/mdr_navigation
argenos May 20, 2019
aa4a124
Merge branch 'devel' into refactor/perception-dependencies
argenos May 20, 2019
e1deb9f
remove unused launch file
minhnh May 20, 2019
ae58c46
Merge pull request #149 from b-it-bots/refactor/perception-dependencies
argenos May 20, 2019
3b9b180
[travis] Add sonarcloud addon
argenos May 20, 2019
b07019f
Merge pull request #150 from b-it-bots/feature/sonarcloud
argenos May 22, 2019
6960b2b
Add @PatrickNa as code owner
argenos May 22, 2019
c912519
Merge branch 'kinetic' into devel
argenos May 23, 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
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ The following arguments may be passed when launching the action server:
* ``detection_action_name``: name of the action server used for object detection.
Action file: `mcr_perception_msgs/DetectScene.action`.
* ``recognition_service_name``: the name of the image recognition service for classifying object.
Service file: `mcr_perception_msgs/ImageRecognition.srv`.
Service file: `mcr_perception_msgs/RecognizeImage.srv`.
* ``recognition_model_name``: the name of the image classification model located in the `mdr_object_recognition`
package.
* ``preprocess_input_module``: the name of the module containing the image preprocessing function to be executed on
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from pyftsm.ftsm import FTSMTransitions
from mas_execution.action_sm_base import ActionSMBase
from mcr_perception_msgs.msg import PlaneList
from mas_perception_libs import ObjectDetector, ImageRecognitionServiceProxy
from mas_perception_libs import ObjectDetector, RecognizeImageServiceProxy
from mdr_perceive_plane_action.msg import PerceivePlaneResult, PerceivePlaneFeedback

class PerceivePlaneSM(ActionSMBase):
Expand All @@ -17,9 +17,8 @@ def __init__(self, detection_service_proxy,
max_recovery_attempts=1):
super(PerceivePlaneSM, self).__init__('PerceivePlane', [], max_recovery_attempts)
self._detector = ObjectDetector(detection_service_proxy)
self._recog_service_proxy = ImageRecognitionServiceProxy(recog_service_name,
recog_model_name,
preprocess_input_module)
self._recog_service_proxy = RecognizeImageServiceProxy(recog_service_name, recog_model_name,
preprocess_input_module)
self._image_pub = rospy.Publisher('/first_recognized_image',
sensor_msgs.msg.Image,
queue_size=1)
Expand Down