Skip to content

Commit 05219b0

Browse files
committed
Auto stash before rebase of "cpp-lln-lab/master"
1 parent 6109ffc commit 05219b0

File tree

1 file changed

+13
-9
lines changed

1 file changed

+13
-9
lines changed

eyeTracker.m

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
return
8282
end
8383

84-
%
84+
% Last check that the EL is up to work
8585
if ~EyelinkInit(0, 1)
8686
fprintf('Eyelink Init aborted.\n');
8787
return
@@ -97,20 +97,24 @@
9797
% make sure that we get gaze data from the Eyelink
9898
Eyelink('Command', 'link_sample_data = LEFT,RIGHT,GAZE,AREA');
9999

100-
% STEP 4
100+
%% STEP 4
101101
% SET UP TRACKER CONFIGURATION
102+
102103
% Setting the proper recording resolution, proper calibration type,
103104
% as well as the data file content;
104-
% Eyelink('command', 'add_file_preamble_text ''Recorded by
105-
% EyelinkToolbox demo-experiment''');
105+
106+
Eyelink('command', 'add_file_preamble_text', 'Recorded by EyelinkToolbox demo-experiment');
106107

107108
% This command is crucial to map the gaze positions from the tracker to
108109
% screen pixel positions to determine fixation
109110
Eyelink('command', 'screen_pixel_coords = %ld %ld %ld %ld', 0, 0, 0, 0);
110111
Eyelink('message', 'DISPLAY_COORDS %ld %ld %ld %ld', 0, 0, 0, 0);
111112

112-
% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
113-
% DEFAULT CALIBRATION
113+
if cfg.eyeTracker.defaultCalibration
114+
115+
end
116+
117+
% Set default calibration parameters
114118
% set calibration type.
115119
Eyelink('command', 'calibration_type = HV5');
116120

@@ -119,15 +123,15 @@
119123
Eyelink('command', 'generate_default_targets = YES');
120124

121125
% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
122-
%
126+
%
123127
% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
124128
% % CUSTOM CALIBRATION
125129
% % (SET MANUALLY THE DOTS COORDINATES, HERE FOR 6 DOTS)
126130
% Eyelink('command', 'calibration_type = HV5');
127131
% % you must send this command with value NO for custom calibration
128132
% % you must also reset it to YES for subsequent experiments
129133
% Eyelink('command', 'generate_default_targets = NO');
130-
%
134+
%
131135
% % calibration and validation target locations
132136
% [width, height]=Screen('WindowSize', screenNumber);
133137
% Eyelink('command','calibration_samples = 6');
@@ -138,7 +142,7 @@
138142
% 640,614, ... %width/2,height*0.6
139143
% 128,341, ... %width*0.1,height*1/3
140144
% 1152,341 ); %width-width*0.1,height*1/3
141-
%
145+
%
142146
% Eyelink('command','validation_samples = 5');
143147
% Eyelink('command','validation_sequence = 0,1,2,3,4,5');
144148
% Eyelink('command','validation_targets = %d,%d %d,%d %d,%d %d,%d %d,%d',...

0 commit comments

Comments
 (0)