demoDynamic changes

ps-config/demos/demoDynamic.conf

@@ -6,43 +6,58 @@ timeout=8;
 openDeviceDirectly=yes;
 
 [pocketsphinxinstance]
-name=person;
-jsgf=../../psGrammar/demos/person.jsgf;
-rsbscope=/speechrec/psa/person;
+name=confirm;
+jsgf=../../psGrammar/confirm/confirm.jsgf;
+rsbscope=/speechrec/psa/confirm;
 bestpath=no;
 autoload=yes;
 
+
+
 [pocketsphinxinstance]
-name=drinks;
-jsgf=../../psGrammar/object/drinks.jsgf;
-rsbscope=/speechrec/psa/object;
+name=commands;
+rsbscope=/speechrec/psa/commands;
+jsgf=../../psGrammar/demos/commands.jsgf;
 bestpath=no;
 autoload=yes;
 
 [pocketsphinxinstance]
-name=confirm;
-jsgf=../../psGrammar/confirm/confirm.jsgf;
-rsbscope=/speechrec/psa/confirm;
+name=learning;
+rsbscope=/speechrec/psa/learning;
+jsgf=../../psGrammar/demos/learning.jsgf;
 bestpath=no;
 autoload=yes;
 
 [pocketsphinxinstance]
-name=ordering;
-jsgf=../../psGrammar/demos/ordering.jsgf;
-rsbscope=/speechrec/psa/ordering;
+name=locations;
+rsbscope=/speechrec/psa/locations;
+jsgf=../../psGrammar/demos/locations.jsgf;
+bestpath=no;
+autoload=yes;
+
+
+
+
+
+
+[pocketsphinxinstance]
+name=person;
+jsgf=../../psGrammar/demos/person.jsgf;
+rsbscope=/speechrec/psa/person;
 bestpath=no;
 autoload=yes;
 
 [pocketsphinxinstance]
-name=commands;
-rsbscope=/speechrec/psa/commands;
-jsgf=../../psGrammar/demos/commands.jsgf;
+name=drinks;
+jsgf=../../psGrammar/object/drinks.jsgf;
+rsbscope=/speechrec/psa/object;
 bestpath=no;
 autoload=yes;
 
 [pocketsphinxinstance]
-name=learning;
-rsbscope=/speechrec/psa/learning;
-jsgf=../../psGrammar/demos/learning.jsgf;
+name=ordering;
+jsgf=../../psGrammar/demos/ordering.jsgf;
+rsbscope=/speechrec/psa/ordering;
 bestpath=no;
 autoload=yes;
+

ps-grammar/demos/commands.jsgf

 #JSGF V1.0;
 grammar commands;
 
-public <command> = [tobi] ( <followMe> | <ordering> | <test> );
+public <command> = [tobi] ( <followMe> | <ordering> | <test> | <stack>);
 
 <followMe> = (follow me);
 
@@ -9,4 +9,6 @@ public <command> = [tobi] ( <followMe> | <ordering> | <test> );
 
 <ordering> = (start ordering);
 
+<stack> = (stack cubes) | (play a game);
+
 

ps-grammar/demos/locations.jsgf

+#JSGF V1.0;
+grammar location;
+
+public <command> = <location>;
+
+<location> = (table <numberOfTable>) | shelf | drinks | snacks;
+<numberOfTable> = (one | two | three | four | five | six | seven | eight | nine);
+