Merge branch 'master' of rcs:/home/git/robocup-speechrec

ps-config/demoChallenge/demoChallenge.conf

+[main]
+startdb=30;
+uttdb=35;
+silence=400;
+timeout=8;
+openDeviceDirectly=yes;
+
+[pocketsphinxinstance]
+name=confirm;
+hmm=/vol/robocup/2013/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
+dict=/vol/robocup/2013/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2013/share/SpeechRec/psGrammar/confirm/confirm.jsgf;
+rsbscope=/speechrec/psa/confirm;
+bestpath=no;
+autoload=yes;
+
+[pocketsphinxinstance]
+name=commands;
+hmm=/vol/robocup/2013/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
+dict=/vol/robocup/2013/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2013/share/SpeechRec/psGrammar/demoChallenge/commands.jsgf;
+rsbscope=/speechrec/psa/commands;
+bestpath=no;
+autoload=yes;

ps-config/robotZoo/roboZoo.conf

@@ -22,3 +22,12 @@ jsgf=/vol/robocup/2013/share/SpeechRec/psGrammar/robotZoo/roboZoo.jsgf;
 rsbscope=/speechrec/psa/roboZoo;
 bestpath=no;
 autoload=yes;
+
+[pocketsphinxinstance]
+name=person;
+hmm=/vol/robocup/2013/share/pocketsphinx/model/hmm/en_US/hub4wsj_sc_8k;
+dict=/vol/robocup/2013/share/SpeechRec/psGrammar/dictionary/tobiDic.dic;
+jsgf=/vol/robocup/2013/share/SpeechRec/psGrammar/person/person.jsgf;
+rsbscope=/speechrec/psa/person;
+bestpath=no;
+autoload=yes;

ps-grammar/demoChallenge/commands.jsgf

+#JSGF V1.0;
+grammar bebot_demo;
+public <statement> = [tobi] [please] <command> [please] [tobi];
+
+<command> = <clean>;
+<clean> = clean up | start cleaning;
+

ps-grammar/robotZoo/roboZoo.jsgf

 #JSGF V1.0;
 grammar ToBI_roboZoo;
 
-public <statement> = [tobi] (<biron> | <andi> | <leon> | <kai> | <martin> | <christian> | <leroy> | <suchit> | <niksa> | <sven> | <sebastian> | <timo> ) [tobi];
+public <statement> = [tobi] (<biron> | <andi> | <leon> | <kai> | <martin> | <christian> | <leroy> | <suchit> | <niksa> | <sven> | <sebastian> | <timo> | <team>) [tobi];
 
 <biron> =  biron;
 <andi> = andreas; 
@@ -15,3 +15,4 @@ public <statement> = [tobi] (<biron> | <andi> | <leon> | <kai> | <martin> | <chr
 <niksa> = niksa;
 <sven> = sven;
 <timo> = timo;
+<team> = team | whole;