From 839daca3149b8d676c2c6dadf8288a0853150264 Mon Sep 17 00:00:00 2001
From: Sergi Hernandez Juan <shernand@iri.upc.edu>
Date: Mon, 15 Apr 2024 11:23:47 +0200
Subject: [PATCH] Moved the get_answer flag out of the speech and screen
 messages and into the main action message.

---
 action/Speak.action    | 2 +-
 action/interact.action | 1 +
 msg/Action.msg         | 1 +
 msg/Screen.msg         | 1 -
 msg/Speech.msg         | 1 -
 5 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/action/Speak.action b/action/Speak.action
index c380894..598b85f 100755
--- a/action/Speak.action
+++ b/action/Speak.action
@@ -7,4 +7,4 @@ int32 speaking_mode
 int32 return_code # Code after finishing the activity.
 string return_msg # Optional returning msg to pass information to higher levels.
 ---
-string feedback_status
\ No newline at end of file
+string feedback_status
diff --git a/action/interact.action b/action/interact.action
index 7cd2137..7c7616d 100644
--- a/action/interact.action
+++ b/action/interact.action
@@ -2,6 +2,7 @@
 
 iri_raadical_msgs/Speech speech
 iri_raadical_msgs/Screen screen
+bool get_answer # Bool to wait for an answer
 ---
 bool afirmative_answer
 ---
diff --git a/msg/Action.msg b/msg/Action.msg
index e337cf6..3bfa1df 100755
--- a/msg/Action.msg
+++ b/msg/Action.msg
@@ -1,6 +1,7 @@
 iri_raadical_msgs/Movement movement
 iri_raadical_msgs/Speech speech
 iri_raadical_msgs/Screen screen
+bool get_answer # Bool to wait for an answer
 bool capture_emotion
 bool capture_location
 bool capture_pose
diff --git a/msg/Screen.msg b/msg/Screen.msg
index ed39cbb..1e8ebaa 100755
--- a/msg/Screen.msg
+++ b/msg/Screen.msg
@@ -1,5 +1,4 @@
 string text
 string image
 string game
-bool get_answer # Bool to wait for an answer
 string[] options
diff --git a/msg/Speech.msg b/msg/Speech.msg
index 6748d43..370f120 100755
--- a/msg/Speech.msg
+++ b/msg/Speech.msg
@@ -16,5 +16,4 @@ uint8 SURPRISE=6
 string speaking_text
 int32 language
 int32 speaking_mode
-bool get_answer # Bool to wait for an answer
 string[] options
-- 
GitLab