Skip to content
Snippets Groups Projects
Commit e1c7e4c9 authored by Sergi Hernandez's avatar Sergi Hernandez
Browse files

Leitat changes.

parent 839daca3
No related branches found
No related tags found
No related merge requests found
...@@ -12,6 +12,7 @@ find_package(catkin REQUIRED COMPONENTS ...@@ -12,6 +12,7 @@ find_package(catkin REQUIRED COMPONENTS
sensor_msgs sensor_msgs
actionlib_msgs actionlib_msgs
message_generation message_generation
audio_common_msgs
std_msgs std_msgs
) )
...@@ -72,6 +73,8 @@ add_service_files( ...@@ -72,6 +73,8 @@ add_service_files(
ScheduleActivity.srv ScheduleActivity.srv
SetAnswer.srv SetAnswer.srv
SetScreen.srv SetScreen.srv
TextToSpeech.srv
SaySpeech.srv
) )
## Generate actions in the 'action' folder ## Generate actions in the 'action' folder
...@@ -82,12 +85,17 @@ add_action_files( ...@@ -82,12 +85,17 @@ add_action_files(
ExecuteAction.action ExecuteAction.action
ExecuteActivity.action ExecuteActivity.action
Speak.action Speak.action
Listen.action
UserDetected.action
PostActivityResult.action
ScreenControl.action
RequestActivity.action
) )
## Generate added messages and services with any dependencies listed here ## Generate added messages and services with any dependencies listed here
generate_messages( generate_messages(
DEPENDENCIES DEPENDENCIES
geometry_msgs sensor_msgs actionlib_msgs std_msgs geometry_msgs sensor_msgs actionlib_msgs audio_common_msgs std_msgs
) )
################################################ ################################################
......
# Action to listen to user's speech
int32 duration # How long it should listen
---
string transcription # Transcribed text from captured audio
---
string feedback_status
# goal definition
string idactivity
bool result
string answer
string pose
string emotion
string location
string api_url
---
# result definition
bool result
int32 error_code
---
# feedback
string url
string user_id
string device_id
---
iri_raadical_msgs/Activity activity
---
string feedback_status
\ No newline at end of file
#goal definition
iri_raadical_msgs/Screen screen
---
#result definition
string answer
---
#feedback
string feedback
#goal definition
string userid
string api_url
---
#result definition
bool result
int32 error_code
---
#feedback
...@@ -62,6 +62,7 @@ ...@@ -62,6 +62,7 @@
<exec_depend>std_msgs</exec_depend> <exec_depend>std_msgs</exec_depend>
<exec_depend>sensor_msgs</exec_depend> <exec_depend>sensor_msgs</exec_depend>
<exec_depend>geometry_msgs</exec_depend> <exec_depend>geometry_msgs</exec_depend>
<depend>audio_common_msgs</depend>
<!-- The export tag contains other, unspecified, tags --> <!-- The export tag contains other, unspecified, tags -->
......
audio_common_msgs/AudioData data
bool blocking
# True: srv responds once the audio has finished playing
# False: responds as soon as possible (the audio is still playing)
---
bool success # Whether it has been played successfully
string text
bool blocking
# True: srv responds once the audio has finished playing
# False: responds as soon as possible (the audio is still playing)
int32 emotion
# 0: neutro
# 1: felicidad
# 2: tristeza
# 3: enfado
---
string result
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment