Skip to content

Commit 3dccdcb

Browse files
authored
Merge pull request #125 from Remi-Gau/remi-wait_for_trigger
make waitFortrigger return the time stamp of the last trigger
2 parents 8ef09d3 + b80f8e0 commit 3dccdcb

File tree

2 files changed

+9
-10
lines changed

2 files changed

+9
-10
lines changed

demos/CPP_waitForTriggerDemo.m

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,17 @@
33
% add parent/src directory to the path (to make sure we can access the CPP_PTB functions)
44
addpath(genpath(fullfile(pwd, '..', 'src')));
55

6-
cfg.mri.triggerNb = 5;
6+
cfg.testingDevice = 'mri';
77

8+
cfg.mri.triggerNb = 5;
89
cfg.mri.triggerKey = 't';
910

1011
KbName('UnifyKeyNames');
1112

12-
%%
13-
% waitForTrigger(cfg);
14-
15-
%%
1613
quietMode = false;
17-
% waitForTrigger(cfg, [], quietMode);
1814

19-
%%
20-
waitForTrigger(cfg, [], quietMode, cfg.mri.triggerNb);
15+
fprintf(1, 'Press the letter %s %i times, please.\n', cfg.mri.triggerKey, cfg.mri.triggerNb);
16+
17+
lastTriggerTimeStamp = waitForTrigger(cfg, [], quietMode, cfg.mri.triggerNb);
18+
19+
fprintf(1, 'Thank you. The time stamp of the last trigger was %f.\n', lastTriggerTimeStamp);

src/waitForTrigger.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
% (C) Copyright 2020 CPP_PTB developers
22

3-
function waitForTrigger(varargin)
3+
function lastTriggerTimeStamp = waitForTrigger(varargin)
44
% waitForTrigger(cfg, deviceNumber, quietMode, nbTriggersToWait)
55
%
66
% Counts a certain number of triggers coming from the scanner before returning.
@@ -45,7 +45,7 @@ function waitForTrigger(varargin)
4545

4646
keyCode = []; %#ok<NASGU>
4747

48-
[~, ~, keyCode] = KbCheck(deviceNumber);
48+
[~, lastTriggerTimeStamp, keyCode] = KbCheck(deviceNumber);
4949

5050
if strcmp(KbName(keyCode), cfg.mri.triggerKey)
5151

0 commit comments

Comments
 (0)