Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion src/eyeTracker.m
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,10 @@
% coordinates, here for 6 dots.

% [width, height]=Screen('WindowSize', screenNumber);

% TODO - update those values with the content set up by
% CPP_PTB in the cfg
% fieldsToSet.eyeTracker.CalibrationPosition = '';

Eyelink('Command', 'calibration_samples = 6');
Eyelink('Command', 'calibration_sequence = 0,1,2,3,4,5');
Expand Down Expand Up @@ -129,7 +133,16 @@

% Enter Eyetracker camera setup mode, calibration and validation.
EyelinkDoTrackerSetup(el);


% TODO - update content of cfg after initializing and
% calibration
% fieldsToSet.eyeTracker.SamplingFrequency = [];
% fieldsToSet.eyeTracker.Manufacturer = '';
% fieldsToSet.eyeTracker.ManufacturersModelName = '';
% fieldsToSet.eyeTracker.SoftwareVersions = '';
% fieldsToSet.eyeTracker.MaximalCalibrationError = [];
% fieldsToSet.eyeTracker.AverageCalibrationError = [];

% Go back to default screen background color.
Screen('FillRect', cfg.screen.win, cfg.color.background);
Screen('Flip', cfg.screen.win);
Expand Down
4 changes: 2 additions & 2 deletions src/utils/setDefaultsPTB.m
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@

end

if isfield(cfg, 'eyeTracker')

if isfield(cfg, 'eyeTracker') && cfg.eyeTracker.do
% Calibration environment
fieldsToSet.eyeTracker.defaultCalibration = true;
fieldsToSet.eyeTracker.backgroundColor = [192 192 192];
Expand Down