From f2d88d8f86a55eecf5f1067879bdc3e602f5fa5c Mon Sep 17 00:00:00 2001 From: Remi Gau Date: Wed, 14 Oct 2020 11:10:50 +0200 Subject: [PATCH 1/2] make waitFortrigger return the time stamp of the last trigger --- demos/CPP_waitForTriggerDemo.m | 15 +++++++-------- src/waitForTrigger.m | 4 ++-- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/demos/CPP_waitForTriggerDemo.m b/demos/CPP_waitForTriggerDemo.m index 158e4b0..89ea41d 100644 --- a/demos/CPP_waitForTriggerDemo.m +++ b/demos/CPP_waitForTriggerDemo.m @@ -3,18 +3,17 @@ % add parent/src directory to the path (to make sure we can access the CPP_PTB functions) addpath(genpath(fullfile(pwd, '..', 'src'))); -cfg.mri.triggerNb = 5; +cfg.testingDevice = 'mri'; +cfg.mri.triggerNb = 5; cfg.mri.triggerKey = 't'; KbName('UnifyKeyNames'); -%% -% waitForTrigger(cfg); - -%% quietMode = false; -% waitForTrigger(cfg, [], quietMode); -%% -waitForTrigger(cfg, [], quietMode, cfg.mri.triggerNb); +fprintf(1, 'Press the letter %s %i times, please.\n', cfg.mri.triggerKey, cfg.mri.triggerNb); + +lastTriggerTimeStamp = waitForTrigger(cfg, [], quietMode, cfg.mri.triggerNb); + +fprintf(1, 'Thank you. The time stamp of the last trigger was %f.\n', lastTriggerTimeStamp) diff --git a/src/waitForTrigger.m b/src/waitForTrigger.m index a686e6c..a8c8bac 100644 --- a/src/waitForTrigger.m +++ b/src/waitForTrigger.m @@ -1,6 +1,6 @@ % (C) Copyright 2020 CPP_PTB developers -function waitForTrigger(varargin) +function lastTriggerTimeStamp = waitForTrigger(varargin) % waitForTrigger(cfg, deviceNumber, quietMode, nbTriggersToWait) % % Counts a certain number of triggers coming from the scanner before returning. @@ -45,7 +45,7 @@ function waitForTrigger(varargin) keyCode = []; %#ok - [~, ~, keyCode] = KbCheck(deviceNumber); + [~, lastTriggerTimeStamp, keyCode] = KbCheck(deviceNumber); if strcmp(KbName(keyCode), cfg.mri.triggerKey) From b80f8e0b831492a2d5668c69b523821139618e97 Mon Sep 17 00:00:00 2001 From: Remi Gau Date: Wed, 14 Oct 2020 11:15:05 +0200 Subject: [PATCH 2/2] mh fix --- demos/CPP_waitForTriggerDemo.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/demos/CPP_waitForTriggerDemo.m b/demos/CPP_waitForTriggerDemo.m index 89ea41d..a7db9b2 100644 --- a/demos/CPP_waitForTriggerDemo.m +++ b/demos/CPP_waitForTriggerDemo.m @@ -12,8 +12,8 @@ quietMode = false; -fprintf(1, 'Press the letter %s %i times, please.\n', cfg.mri.triggerKey, cfg.mri.triggerNb); +fprintf(1, 'Press the letter %s %i times, please.\n', cfg.mri.triggerKey, cfg.mri.triggerNb); lastTriggerTimeStamp = waitForTrigger(cfg, [], quietMode, cfg.mri.triggerNb); -fprintf(1, 'Thank you. The time stamp of the last trigger was %f.\n', lastTriggerTimeStamp) +fprintf(1, 'Thank you. The time stamp of the last trigger was %f.\n', lastTriggerTimeStamp);