From 661c5369e5be7e3b8cd5b42622f146a242e46f48 Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Sat, 15 Aug 2020 08:45:59 +0200 Subject: [PATCH 1/4] add code to shut down connection with eye tracker --- cleanUp.m | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cleanUp.m b/cleanUp.m index 04fe5ce..fcb0026 100644 --- a/cleanUp.m +++ b/cleanUp.m @@ -16,13 +16,18 @@ function cleanUp() % Screen Close All sca; + % % Shut down connection with Eyelink + if cfg.eyeTracker.do + Eyelink('shutdown'); + end + % Close Psychportaudio if open if PsychPortAudio('GetOpenDeviceCount') ~= 0 PsychPortAudio('Close'); end if ~ismac - % remove PsychDebugWindowConfiguration + % Remove PsychDebugWindowConfiguration clear Screen; end From 6884badafd74e721bd0cce170709feb16cecdac3 Mon Sep 17 00:00:00 2001 From: marcobarilari Date: Sat, 15 Aug 2020 08:50:48 +0200 Subject: [PATCH 2/4] fix typo --- cleanUp.m | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cleanUp.m b/cleanUp.m index fcb0026..86b014f 100644 --- a/cleanUp.m +++ b/cleanUp.m @@ -16,7 +16,7 @@ function cleanUp() % Screen Close All sca; - % % Shut down connection with Eyelink + % Shut down connection with Eyelink if cfg.eyeTracker.do Eyelink('shutdown'); end From 3b9ad773a0ed8efc4801aa2405ada07efa43ecbc Mon Sep 17 00:00:00 2001 From: marcobarilari <38101692+marcobarilari@users.noreply.github.com> Date: Sat, 15 Aug 2020 10:20:38 +0200 Subject: [PATCH 3/4] Update cleanUp.m Co-authored-by: Remi Gau --- cleanUp.m | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/cleanUp.m b/cleanUp.m index 86b014f..6c99ce9 100644 --- a/cleanUp.m +++ b/cleanUp.m @@ -17,7 +17,10 @@ function cleanUp() sca; % Shut down connection with Eyelink - if cfg.eyeTracker.do +try + Eyelink('shutdown') +catch +end Eyelink('shutdown'); end From f0b70d17ea1fec75ef4b2a09dda892e0c50c2992 Mon Sep 17 00:00:00 2001 From: Remi Gau Date: Sat, 15 Aug 2020 10:26:25 +0200 Subject: [PATCH 4/4] Update cleanUp.m --- cleanUp.m | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cleanUp.m b/cleanUp.m index 6c99ce9..f60578b 100644 --- a/cleanUp.m +++ b/cleanUp.m @@ -17,11 +17,9 @@ function cleanUp() sca; % Shut down connection with Eyelink -try - Eyelink('shutdown') -catch -end - Eyelink('shutdown'); + try + Eyelink('shutdown') + catch end % Close Psychportaudio if open