Skip to content

Commit

Permalink
Merge pull request #266 from kleinerm/eyelinktoolboxrc
Browse files Browse the repository at this point in the history
Big year 2024 Eyelinktoolbox update by SR-Research!

Tested by SR-Research on all supported operating system platforms.

Release of the new Eyelink toolbox. This is the biggest update of the
Eyelink toolbox for Eyelink gaze trackers from SR-Research since over
a decade! Most of the work was done by the team at SR-Research. Credits
to Brian Richardson, Marcus Johnson, and Kurt Debono. Additional 88
hours of my work time were sponsored by SR-Research, to provide code
review, feedback and advice on improving the integration while
maintaining backwards compatibility, and code improvements. Among
many other improvements, the new Eyelink toolbox can integrate better
with PsychPortAudio for playing feedback sounds during tracker calibration,
and it can use dynamic animated calibration targets by playing back
movies. Upload of backdrop images to the tracker host computer is possible.
Stereoscopic/Binocular display modes of Psychtoolbox are now supported
for use with the gazetracker. Many new functions have been added to improve
ease and efficiency of use. A new set of demos demonstrates efficient use
and best practices with the new toolbox. Legacy functions should be still
supported for backwards compatibility, but many legacy demos have been
removed. The toolbox has been carefully tested by SR-Research on all
supported operating systems, so we hope this major update will go without
major problems. Thanks to our partner SR-Research for this contribution
and the team at SR-Research for good collaboration!
  • Loading branch information
kleinerm authored May 18, 2024
2 parents 701b838 + bd6ebc8 commit 5d6d2fa
Show file tree
Hide file tree
Showing 104 changed files with 7,678 additions and 6,604 deletions.
40 changes: 18 additions & 22 deletions PsychSourceGL/Source/Common/Eyelink/EyelinkShutdown.c
Original file line number Diff line number Diff line change
@@ -1,37 +1,33 @@
/*
/osxptb/trunk/PsychSourceGL/Source/OSX/Eyelink/EyelinkShutdown.c
PROJECTS: Eyelink
/PsychSourceGL/Source/Common/Eyelink/EyelinkShutdown.c
PROJECTS: Eyelink
AUTHORS:
[email protected] cdb
[email protected] emp
[email protected] fwc
PLATFORMS: Currently only OS X
[email protected] cdb
[email protected] emp
[email protected] fwc
PLATFORMS: All.
HISTORY:
11/23/05 cdb Created.
TARGET LOCATION:
Eyelink.mexmac resides in:
EyelinkToolbox
*/

#include "PsychEyelink.h"

PsychError PsychEyelinkShutdown(void)
{
int iStatus = -1;
char strMsg[256];
int iStatus = -1;
char strMsg[256];

if (giSystemInitialized) {
// Zero-out return string:
memset(strMsg, 0, sizeof(strMsg));

// Disconnect if connected
if (eyelink_is_connected()) {
set_offline_mode();
Expand All @@ -41,16 +37,16 @@ PsychError PsychEyelinkShutdown(void)
PsychErrorExitMsg(PsychError_internal, strMsg);
}
}

// Detach all callback hook functions:
PsychEyelink_uninit_core_graphics();

// Close down eyelink and reset global flag
close_eyelink_system();
msec_delay(100);
giSystemInitialized = 0;
}

return(PsychError_none);
}

Expand All @@ -62,7 +58,7 @@ PsychError EyelinkShutdown(void)

// Add help strings
PsychPushHelp(useString, synopsisString, seeAlsoString);

// Output help if asked
if(PsychIsGiveHelp()) {
PsychGiveHelp();
Expand All @@ -73,7 +69,7 @@ PsychError EyelinkShutdown(void)
PsychErrorExit(PsychCapNumInputArgs(0));
PsychErrorExit(PsychRequireNumInputArgs(0));
PsychErrorExit(PsychCapNumOutputArgs(0));

// Call actual shutdown routine:
PsychEyelinkShutdown();

Expand Down
Loading

0 comments on commit 5d6d2fa

Please sign in to comment.