Merge pull request #116 from marcobarilari/marco_waitForTrigger-update

waitForTrigerr, from KbPressWait to KbCheck

Author: marcobarilari

demos/CPP_waitForTriggerDemo.m

@@ -1,21 +1,19 @@
-addpath(genpath(fullfile(pwd, '..', 'src')));
+% add parent/src directory to the path (to make sure we can access the CPP_PTB functions)
 
-%%
-cfg.testingDevice = 'mri';
+addpath(genpath(fullfile(pwd, '..', 'src')));
 
-cfg.mri.triggerNb = 2;
+cfg.mri.triggerNb = 5;
 
-cfg.mri.triggerKey = 'space';
+cfg.mri.triggerKey = 't';
 
 KbName('UnifyKeyNames');
 
 %%
 % waitForTrigger(cfg);
 
 %%
-quietMode = true;
+quietMode = false;
 % waitForTrigger(cfg, [], quietMode);
 
 %%
-nbTriggersToWait = 1;
-waitForTrigger(cfg, [], quietMode, nbTriggersToWait);
+waitForTrigger(cfg, [], quietMode, cfg.mri.triggerNb);

src/waitForTrigger.m

@@ -19,14 +19,14 @@ function waitForTrigger(varargin)
     % triggers coming from the scanner in a real case scenario.
     %
     % INPUTS
-    %  - varargin{1} = cfg
+    % - varargin{1} = cfg
     %
     % - varargin{2} = deviceNumber
     %
     % - varargin{3} = quietMode: a boolean to make sure nothing is printed on the screen or
     % the prompt
     %
-    % - nbTriggersToWait
+    % - nvarargin{4} = nbTriggersToWait
 
     [cfg, nbTriggersToWait, deviceNumber, quietMode] = checkInputs(varargin);
 
@@ -43,7 +43,7 @@ function waitForTrigger(varargin)
 
             keyCode = []; %#ok<NASGU>
 
-            [~, keyCode] = KbPressWait(deviceNumber);
+            [~, ~, keyCode] = KbCheck(deviceNumber);
 
             if strcmp(KbName(keyCode), cfg.mri.triggerKey)