restaurant speech stuff

ps-config/restaurant/restaurant.conf

@@ -20,21 +20,21 @@ bestpath=no;
 autoload=yes;
 
 [pocketsphinxinstance]
-name=ordering;
+name=goTable;
 jsgf=../../psGrammar/restaurant/goTable.jsgf;
 rsbscope=/speechrec/psa/goTable;
 bestpath=no;
 autoload=yes;
 
 [pocketsphinxinstance]
-name=saveCommand;
+name=saveTable;
 jsgf=../../psGrammar/restaurant/saveTable.jsgf;
 rsbscope=/speechrec/psa/saveTable;
 bestpath=no;
 autoload=yes;
 
 [pocketsphinxinstance]
-name=otherCommand;
+name=commands;
 jsgf=../../psGrammar/restaurant/commands.jsgf;
 rsbscope=/speechrec/psa/commands;
 bestpath=no;

ps-grammar/restaurant/commands.jsgf

 #JSGF V1.0;
 grammar restaurant_save_command;
 
-public <restaurant> = [tobi] [please] (<followMe> | <stop>);
+public <restaurant> = [tobi] [please] (<followMe> | <stop> | <place>);
 <followMe> = (follow me) | (come [(with me) | here]) | (keep up);
 <stop> = stop [this];
-
-<junk> = save ( <deliveryLocations> | <kitchenCategory> ) [[to | on] [the | my]] ( <savePlaceLeft> | <savePlaceRight> | <savePlaceFront> | <savePlaceBack> );
-<savePlaceFront> = front;
-<savePlaceBack> = back;
-<savePlaceLeft> = left;
-<savePlaceRight> = right;
-<deliveryLocations> = table <numberOfTable>;
-<numberOfTable> = one | two | three;
-<kitchenCategory> = kitchen | bar;
\ No newline at end of file
+<place> = save (place | location);