restaurant additions

ps-config/restaurant/restaurant.conf

@@ -19,6 +19,13 @@ rsbscope=/speechrec/psa/ordering;
 bestpath=no;
 autoload=yes;
 
+[pocketsphinxinstance]
+name=ordering;
+jsgf=../../psGrammar/restaurant/goTable.jsgf;
+rsbscope=/speechrec/psa/goTable;
+bestpath=no;
+autoload=yes;
+
 [pocketsphinxinstance]
 name=saveCommand;
 jsgf=../../psGrammar/restaurant/saveTable.jsgf;

ps-grammar/restaurant/goTable.jsgf

+#JSGF V1.0;
+grammar restaurant_save_command;
+
+public <restaurant> = [tobi] [please] [(take a oder from) | (go to)] <deliveryLocations> [please]);
+<deliveryLocations> = table <numberOfTable>;
+<numberOfTable> = one | two | three;
\ No newline at end of file

ps-grammar/restaurant/order.jsgf

 #JSGF V1.0;
 grammar restaurant_ordering;
 
-public <restaurant> = [tobi] [please] bring <objects> to <deliveryLocations>;
+public <restaurant> = [tobi] [one | a ] <objects> [please];
 
-<deliveryLocations> = table <numberOfTable>;
+<objects> = <drinks> | <combo>;
 
-<numberOfTable> = one | two | three;
-
-<objects> = <drinks> | <snacks>;
-
-<drinks> = (orange juice) | beer | cola | (chocolate milk) | (energy drink) | (grape juice) | milk | water;
-<snacks> = (chocolate cookies) | chips | biscuits | bread | pringles | (strawberry cookies);
+<drinks> = coke;
+<combo> = steak;