demoDynamic command merge

psGrammar/demos/demoDynamic.jsgf

+#JSGF V1.0;
+grammar commands;
+
+public <command> = [<robot>] ( <save> | <wave> | <who> | <goTo> | <followMe> | <followHand> | <gravity> | <exit> | <trash> | <search>);
+
+<robot> = (tobi | robot | tiago);
+
+<save> = (save location);
+<wave> = (wait for me);
+<who> = (who are you);
+<goTo> = (go to location);
+<followHand> = (come with me) | (give me your hand);
+<gravity> = (gravity compensation) | (show me your gripper) | (switch to gravity mode);
+<exit> = (exit);
+
+<followMe> = (follow me);
+<handover> = handover;
+
+<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);
+
+<see> = (tell me what you see);
+<demo> = (end the (demonstration | demo));
+<grasp> = ((grasp | give ) [me] ( an | the ) object);
+
+<trash> = ([please] ((take out the trash) | (take out the garbage)));
+<search> = ([please] search for [a] [waving] person);
\ No newline at end of file

psGrammar/demos/learning.jsgf

@@ -7,7 +7,7 @@ public <command> = [tobi] (<save> | <stop> );
 
 <save> = <pre> <NP_location>;
 <pre> = ([please] save) | (here is) | memorize;
-<location> = (table <numberOfTable>) | (shelf) | (bar);
+<location> = (table <numberOfTable>) | (shelf) | (bar) | (bin);
 <numberOfTable> = (one | two | three | four | five | six | seven | eight | nine);
 
 <stop> = stop | (wait [here]);

psGrammar/tasks/dynamicdemo2019.jsgf

-#JSGF V1.0;
-grammar dynamic;
-public <string> = [<robot>] (<command>);
-
-<robot> = ((tobi) | (robot) | (tiago));
-
-<command> = ( <introduce> | <trash> | <search>);
-
-<introduce> = (introduce yourself);
-
-<trash> = ([please] ((take out the trash) | (take out the garbage)));
-
-<search> = ([please] search for [a] [waving] person);