diff --git a/psConfig/tasks/whereIsThis/whereIsThis.conf b/psConfig/tasks/whereIsThis/whereIsThis.conf index 722f69a4d2003b93cd94264c756723d7db6cae3d..b85f25b95c853eccccc4e1f8719400c9c3848ccb 100644 --- a/psConfig/tasks/whereIsThis/whereIsThis.conf +++ b/psConfig/tasks/whereIsThis/whereIsThis.conf @@ -6,13 +6,6 @@ timeout=8; openDeviceDirectly=yes; alsadevice=sysdefault; -[pocketsphinxinstance] -name=getName; -jsgf=../../../psGrammar/tasks/receptionist/getName.jsgf; -rsbscope=/speechrec/psa/receptionist/getname; -bestpath=no; -autoload=yes; - [pocketsphinxinstance] name=getLocation; jsgf=../../../psGrammar/tasks/whereIsThis/getLocation.jsgf; diff --git a/psGrammar/tasks/whereIsThis/getLocation.jsgf b/psGrammar/tasks/whereIsThis/getLocation.jsgf index c627377262e3622c7c9ac58cb8c824ad7af33d1c..96309b1c54f4b8fe0dee1af3688693032bea4fe3 100644 --- a/psGrammar/tasks/whereIsThis/getLocation.jsgf +++ b/psGrammar/tasks/whereIsThis/getLocation.jsgf @@ -2,12 +2,16 @@ grammar getLocation; public <locationstring> = [<prefix>] <location> [<robot>]; -<prefix> = (<whereis> | <wherecan>); +<prefix> = (<whereis> | <wherecan> | <canyouguide> | <canyouhelp>); <whereis> = (where is [the]); <wherecan> = (where can i find [the]); +<canyouguide> = (can you guide me to [the]); + +<canyouhelp> = (can you help me find [the]); + <location> = ( (sofa) | (comfy chair) | (shelf) ); <robot> = (tobi) | (robot) | (biron) | (pepper);