diff --git a/ps-config/demos/demoDynamic.conf b/ps-config/demos/demoDynamic.conf index e4f677848ee6006eedb4c451f4abfa6edbc96cda..e7c3353c2d5479b6235a9b92466cb5a4bb4ae84e 100644 --- a/ps-config/demos/demoDynamic.conf +++ b/ps-config/demos/demoDynamic.conf @@ -9,9 +9,6 @@ openDeviceDirectly=yes; name=person; jsgf=../../psGrammar/demos/person.jsgf; rsbscope=/speechrec/psa/person; - -hmm=../../../pocketsphinx/model/en-us/en-us; -dict=../../psGrammar/dictionary/tobiDic.dic; bestpath=no; autoload=yes; @@ -19,9 +16,6 @@ autoload=yes; name=drinks; jsgf=../../psGrammar/object/drinks.jsgf; rsbscope=/speechrec/psa/object; - -hmm=../../../pocketsphinx/model/en-us/en-us; -dict=../../psGrammar/dictionary/tobiDic.dic; bestpath=no; autoload=yes; @@ -29,9 +23,6 @@ autoload=yes; name=confirm; jsgf=../../psGrammar/confirm/confirm.jsgf; rsbscope=/speechrec/psa/confirm; - -hmm=../../../pocketsphinx/model/en-us/en-us; -dict=../../psGrammar/dictionary/tobiDic.dic; bestpath=no; autoload=yes; @@ -39,9 +30,6 @@ autoload=yes; name=ordering; jsgf=../../psGrammar/demos/ordering.jsgf; rsbscope=/speechrec/psa/ordering; - -hmm=../../../pocketsphinx/model/en-us/en-us; -dict=../../psGrammar/dictionary/tobiDic.dic; bestpath=no; autoload=yes; @@ -49,28 +37,12 @@ autoload=yes; name=saveCommand; rsbscope=/speechrec/psa/saveCommand; jsgf=../../psGrammar/demos/saveCommand.jsgf; - -hmm=../../../pocketsphinx/model/en-us/en-us; -dict=../../psGrammar/dictionary/tobiDic.dic; bestpath=no; autoload=yes; [pocketsphinxinstance] name=controlExecution; -rsbscope=/speechrec/psa/controlExecution; -jsgf=../../psGrammar/commands/controlExecution.jsgf; - -hmm=../../../pocketsphinx/model/en-us/en-us; -dict=../../psGrammar/dictionary/tobiDic.dic; -bestpath=no; -autoload=yes; - -[pocketsphinxinstance] -name=saveLocation; -rsbscope=/speechrec/psa/saveLocation; -jsgf=../../psGrammar/demos/saveLocation.jsgf; - -hmm=../../../pocketsphinx/model/en-us/en-us; -dict=../../psGrammar/dictionary/tobiDic.dic; +rsbscope=/speechrec/psa/learning; +jsgf=../../psGrammar/demos/learning.jsgf; bestpath=no; autoload=yes; diff --git a/ps-grammar/demos/learning.jsgf b/ps-grammar/demos/learning.jsgf new file mode 100644 index 0000000000000000000000000000000000000000..1aa4a9e9bad5bb47fece085c1188ed124d03cfe8 --- /dev/null +++ b/ps-grammar/demos/learning.jsgf @@ -0,0 +1,11 @@ +#JSGF V1.0; +grammar saveLocation; + +public <command> = [tobi] (<save> | <stop> ); + +<save> = <pre> <location>; +<pre> = ([please] save) | (here is) | memorize; +<location> = (table <numberOfTable>) | shelf | drinks | snacks; +<numberOfTable> = (one | two | three | four | five | six | seven | eight | nine); + +<stop> = stop;