From b5a42e00f40b0284f9203d1fab75e1b535f27884 Mon Sep 17 00:00:00 2001
From: Alopez <alopez@iri.upc.edu>
Date: Mon, 10 Jul 2023 09:46:33 +0200
Subject: [PATCH] Added get_current_room and get_current_person_pose servcies.
 Removed pose and room from from feedback and result

---
 CMakeLists.txt                  |  2 ++
 action/ask_questionary.action   | 16 ++++------------
 action/ask_questions.action     |  6 +++---
 srv/get_current_person_pose.srv | 10 ++++++++++
 srv/get_current_room.srv        |  4 ++++
 5 files changed, 23 insertions(+), 15 deletions(-)
 create mode 100644 srv/get_current_person_pose.srv
 create mode 100644 srv/get_current_room.srv

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 159bb3f..d5ccfe2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -59,6 +59,8 @@ add_service_files(
   FILES
   get_rooms_to_search.srv
   upload_answers.srv
+  get_current_room.srv
+  get_current_person_pose.srv
 #   Service1.srv
 #   Service2.srv
 )
diff --git a/action/ask_questionary.action b/action/ask_questionary.action
index 8fb6b19..ed5a5c9 100644
--- a/action/ask_questionary.action
+++ b/action/ask_questionary.action
@@ -21,9 +21,10 @@ uint8 CATALAN=1
 uint8 SPANISH=2
 
 ##### Tone/Sentiment code
-uint8 HAPPY=0
-uint8 SAD=1
-uint8 NEUTRAL=2
+uint8 UNKNOWN=0
+uint8 HAPPY=1
+uint8 SAD=2
+uint8 NEUTRAL=3
 
 ##### Status code
 uint8 SEARCHING=0 # Searching the person
@@ -31,10 +32,6 @@ uint8 APPROACHING=1 #Person found. Approaching person.
 uint8 ASKING=2 # Asking the questionary
 uint8 RETURNING=3 # Returning home.
 
-##### Person pose code
-uint8 SIT=0
-uint8 STANDING=1
-uint8 LYING=2
 
 string questionary_id #Questionary name.
 string[] questions_id #Vector with the questions references to ask. If empty ask all.
@@ -51,11 +48,6 @@ bool get_pose # Bool to get person pose
 ---
 int32 result_code #Result code.
 string result_str # Result human readable string.
-int32 final_pose # person pose code
-int32 sentiment # person sentiment
-string room #
 ---
 int32 status_code #Status code.
 string status_str # Status human readable string.
-int32 pose # person pose code
-int32 sentiment # person sentiment
diff --git a/action/ask_questions.action b/action/ask_questions.action
index 3f10dd9..8ab044c 100644
--- a/action/ask_questions.action
+++ b/action/ask_questions.action
@@ -10,9 +10,9 @@ uint8 CATALAN=1
 uint8 SPANISH=2
 
 ##### Tone/Sentiment code
-uint8 HAPPY=0
-uint8 SAD=1
-uint8 NEUTRAL=2
+uint8 HAPPY=1
+uint8 SAD=2
+uint8 NEUTRAL=3
 
 string questionary_id #Questionary name.
 string[] questions_id #Vector with the questions references to ask. If empty ask all.
diff --git a/srv/get_current_person_pose.srv b/srv/get_current_person_pose.srv
new file mode 100644
index 0000000..5e44bea
--- /dev/null
+++ b/srv/get_current_person_pose.srv
@@ -0,0 +1,10 @@
+# Service to get the current person pose.
+
+##### Person pose code
+uint8 UNKNOWN=0 
+uint8 SIT=1
+uint8 STANDING=2
+uint8 LYING=3
+
+---
+int32 pose # person pose code
diff --git a/srv/get_current_room.srv b/srv/get_current_room.srv
new file mode 100644
index 0000000..4b7c318
--- /dev/null
+++ b/srv/get_current_room.srv
@@ -0,0 +1,4 @@
+# Service to get current room
+
+---
+string room # Current_room
-- 
GitLab