From bc5ff2335e9f90b7fffef0566854533b20293c83 Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Wed, 30 Sep 2020 20:58:59 +0200 Subject: [PATCH 1/6] change kbPressWait to KbCheck --- demos/CPP_waitForTriggerDemo.m | 6 +++--- src/waitForTrigger.m | 12 +++++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/demos/CPP_waitForTriggerDemo.m b/demos/CPP_waitForTriggerDemo.m index abbbcdc..ff6f1bb 100644 --- a/demos/CPP_waitForTriggerDemo.m +++ b/demos/CPP_waitForTriggerDemo.m @@ -5,7 +5,7 @@ cfg.mri.triggerNb = 2; -cfg.mri.triggerKey = 'space'; +cfg.mri.triggerKey = 't'; KbName('UnifyKeyNames'); @@ -13,9 +13,9 @@ % waitForTrigger(cfg); %% -quietMode = true; +quietMode = false; % waitForTrigger(cfg, [], quietMode); %% -nbTriggersToWait = 1; +nbTriggersToWait = 5; waitForTrigger(cfg, [], quietMode, nbTriggersToWait); diff --git a/src/waitForTrigger.m b/src/waitForTrigger.m index a93b4c4..83c8f82 100644 --- a/src/waitForTrigger.m +++ b/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{3} = bTriggersToWait [cfg, nbTriggersToWait, deviceNumber, quietMode] = checkInputs(varargin); @@ -43,7 +43,13 @@ function waitForTrigger(varargin) keyCode = []; %#ok - [~, keyCode] = KbPressWait(deviceNumber); + % Check that all buuton are released + % isDown = KbCheck; + % while isDown + % isDown = KbCheck; + % end + + [~, ~, keyCode] = KbCheck(deviceNumber); if strcmp(KbName(keyCode), cfg.mri.triggerKey) From a410e6f73e5a63f0d1ab18642eaf037999b7b04f Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Wed, 30 Sep 2020 23:02:55 +0200 Subject: [PATCH 2/6] modify the demo for best practice --- demos/CPP_waitForTriggerDemo.m | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/demos/CPP_waitForTriggerDemo.m b/demos/CPP_waitForTriggerDemo.m index ff6f1bb..a326d9a 100644 --- a/demos/CPP_waitForTriggerDemo.m +++ b/demos/CPP_waitForTriggerDemo.m @@ -1,9 +1,8 @@ -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 = 't'; @@ -17,5 +16,4 @@ % waitForTrigger(cfg, [], quietMode); %% -nbTriggersToWait = 5; -waitForTrigger(cfg, [], quietMode, nbTriggersToWait); +waitForTrigger(cfg, [], quietMode, cfg.mri.triggerNb); From 6dc954247ff417e9539e29203e9a8789ccc72f2f Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Wed, 30 Sep 2020 23:04:11 +0200 Subject: [PATCH 3/6] delete the check for all key released --- src/waitForTrigger.m | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/waitForTrigger.m b/src/waitForTrigger.m index 83c8f82..ddab060 100644 --- a/src/waitForTrigger.m +++ b/src/waitForTrigger.m @@ -43,12 +43,6 @@ function waitForTrigger(varargin) keyCode = []; %#ok - % Check that all buuton are released - % isDown = KbCheck; - % while isDown - % isDown = KbCheck; - % end - [~, ~, keyCode] = KbCheck(deviceNumber); if strcmp(KbName(keyCode), cfg.mri.triggerKey) From 29254b22b4763e7dfdedb7aa25394e4035145ee4 Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Wed, 30 Sep 2020 23:55:07 +0200 Subject: [PATCH 4/6] fix md dead link --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3a249e2..1e66b36 100644 --- a/README.md +++ b/README.md @@ -56,7 +56,7 @@ Tested: ## Documentation -All the documentation is accessible [here](./docs/00_index.md). +All the documentation is accessible [here](./docs/00-index.md). ## Content From eb34ca370261a30c84b58d3f84097769bf14a59c Mon Sep 17 00:00:00 2001 From: marcobarilari <38101692+marcobarilari@users.noreply.github.com> Date: Mon, 5 Oct 2020 18:01:55 +0200 Subject: [PATCH 5/6] Apply suggestions from code review Co-authored-by: Remi Gau --- src/waitForTrigger.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/waitForTrigger.m b/src/waitForTrigger.m index ddab060..d865581 100644 --- a/src/waitForTrigger.m +++ b/src/waitForTrigger.m @@ -26,7 +26,7 @@ function waitForTrigger(varargin) % - varargin{3} = quietMode: a boolean to make sure nothing is printed on the screen or % the prompt % - % - nvarargin{3} = bTriggersToWait + % - nvarargin{3} = nbTriggersToWait [cfg, nbTriggersToWait, deviceNumber, quietMode] = checkInputs(varargin); From dbf563be7b636d10780b2c0e6d4efa8efc1f8ce0 Mon Sep 17 00:00:00 2001 From: marcobarilari <38101692+marcobarilari@users.noreply.github.com> Date: Mon, 5 Oct 2020 18:02:31 +0200 Subject: [PATCH 6/6] Update src/waitForTrigger.m --- src/waitForTrigger.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/waitForTrigger.m b/src/waitForTrigger.m index d865581..74965f1 100644 --- a/src/waitForTrigger.m +++ b/src/waitForTrigger.m @@ -26,7 +26,7 @@ function waitForTrigger(varargin) % - varargin{3} = quietMode: a boolean to make sure nothing is printed on the screen or % the prompt % - % - nvarargin{3} = nbTriggersToWait + % - nvarargin{4} = nbTriggersToWait [cfg, nbTriggersToWait, deviceNumber, quietMode] = checkInputs(varargin);