From 9085fcd9aef3f645fb36a050d9f9fa16c16bb809 Mon Sep 17 00:00:00 2001
From: tmarkmann <tmarkmann@techfak.uni-bielefeld.de>
Date: Tue, 5 Oct 2021 11:38:12 +0200
Subject: [PATCH] Update/Add ersti demo grammars and config

---
 psConfig/demos/ersti_demo.conf      | 30 ++++-------------------------
 psGrammar/demos/ersti/actions.jsgf  | 17 ++++++++++++++++
 psGrammar/demos/ersti/commands.jsgf | 26 +++++++++++++++++++++++++
 3 files changed, 47 insertions(+), 26 deletions(-)
 create mode 100644 psGrammar/demos/ersti/actions.jsgf
 create mode 100644 psGrammar/demos/ersti/commands.jsgf

diff --git a/psConfig/demos/ersti_demo.conf b/psConfig/demos/ersti_demo.conf
index f550b6ba..a0edeef7 100644
--- a/psConfig/demos/ersti_demo.conf
+++ b/psConfig/demos/ersti_demo.conf
@@ -13,38 +13,16 @@ rsbscope=/speechrec/psa/confirm;
 bestpath=no;
 autoload=yes;
 
-[pocketsphinxinstance]
-name=stop;
-rsbscope=/speechrec/psa/stop;
-jsgf=../../psGrammar/confirm/stop.jsgf;
-bestpath=no;
-autoload=yes;
-
-[pocketsphinxinstance]
-name=learning;
-rsbscope=/speechrec/psa/learning;
-jsgf=../../psGrammar/demos/learning.jsgf;
-bestpath=no;
-autoload=yes;
-
-[pocketsphinxinstance]
-name=listen;
-rsbscope=/speechrec/psa/listen;
-jsgf=../../psGrammar/demos/listen.jsgf;
-bestpath=no;
-autoload=yes;
-
 [pocketsphinxinstance]
 name=commands;
 rsbscope=/speechrec/psa/commands;
-jsgf=../../psGrammar/demos/cupro/commands.jsgf;
+jsgf=../../psGrammar/demos/ersti/commands.jsgf;
 bestpath=no;
 autoload=yes;
 
 [pocketsphinxinstance]
-name=kitchen_demo;
-rsbscope=/speechrec/psa/kitchen_demo;
-jsgf=../../psGrammar/demos/cupro/kitchen_demo.jsgf;
+name=commands;
+rsbscope=/speechrec/psa/actions;
+jsgf=../../psGrammar/demos/ersti/actions.jsgf;
 bestpath=no;
 autoload=yes;
-
diff --git a/psGrammar/demos/ersti/actions.jsgf b/psGrammar/demos/ersti/actions.jsgf
new file mode 100644
index 00000000..3c1f7133
--- /dev/null
+++ b/psGrammar/demos/ersti/actions.jsgf
@@ -0,0 +1,17 @@
+#JSGF V1.0;
+grammar actions;
+
+public <action> = [<robot>] ( <demo> | <goto> | <introduction> | <setTable>);
+
+<robot> = (robot | tiago | tobi);
+
+<demo> = (tell me about the kitchen);
+
+<goto> = ([go to the] <location>);
+<location> = (table) | (kitchen);
+
+<introduction> = (introduce yourself);
+
+<setTable> = (set the table for <guestNumber>);
+
+<guestNumber> = (one guest) | (two guests);
diff --git a/psGrammar/demos/ersti/commands.jsgf b/psGrammar/demos/ersti/commands.jsgf
new file mode 100644
index 00000000..1807ef71
--- /dev/null
+++ b/psGrammar/demos/ersti/commands.jsgf
@@ -0,0 +1,26 @@
+#JSGF V1.0;
+grammar commands;
+
+public <command> = [<robot>] ( <followMe> | <stop> | <ordering> | <learn> | <rec> | <count> | <explain> | <goto> | <hand> | <see> | <save> | <who> | <gripper> | <demo> | <grasp> | <kitchenDrawer> | <cleanup> | <setTable> | <lookAt> );
+
+<robot> = (tiago | robot | tobi);
+
+<followMe> = (follow me);
+<stop> = (stop);
+<ordering> = (start taking orders) | (take my order);
+<learn> = (learn a person);
+<rec> = (recognize me);
+<count> = (count the people);
+<explain> = (what can you do) | (explain your skills);
+<goto> = (go to location);
+<hand> = (wait for waving);
+<see> = (tell me what you see);
+<save> = (save location);
+<who> = (who are you);
+<gripper> = (show me your gripper);
+<demo> = (end the (demonstration | demo));
+<grasp> = ((grasp | give ) [me] ( an | the ) object);
+<kitchenDrawer> = (tell me about the kitchen);
+<cleanup> = (clean up the table);
+<setTable> = (set the table);
+<lookAt> = (look at camera one | look at the camera);
-- 
GitLab