Skip to content

tiny changes on eyetracking #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Aug 11, 2020
Merged

tiny changes on eyetracking #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1cf1a6d
update eyetrackers
Remi-Gau Aug 11, 2020
6129415
update submodules
Remi-Gau Aug 11, 2020
117aabc
update PTB submodule for eyetracking changes
Remi-Gau Aug 11, 2020
f5e8700
remove eyelink command file and lint submodule
Remi-Gau Aug 11, 2020
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
*DS_Store

*.m~
*.asv
*octave-workspace

# exclude content of logfiles folders
Expand Down
6 changes: 3 additions & 3 deletions initEnv.m
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
function initEnv

octaveVersion = '4.0.3';
matlabVersion = '9.2.0';
matlabVersion = '9.1.0';

if isOctave

Expand Down Expand Up @@ -77,7 +77,7 @@
persistent cacheval % speeds up repeated calls

if isempty (cacheval)
cacheval = (exist ("OCTAVE_VERSION", "builtin") > 0);
cacheval = (exist ('OCTAVE_VERSION', 'builtin') > 0);
end

retval = cacheval;
Expand All @@ -86,7 +86,7 @@
function addDependencies()

pth = fileparts(mfilename('fullpath'));
addpath(fullfile(pth, 'lib', 'CPP_BIDS', 'src'));
addpath(genpath(fullfile(pth, 'lib', 'CPP_BIDS', 'src')));
addpath(fullfile(pth, 'lib', 'CPP_PTB'));
addpath(genpath(fullfile(pth, 'lib', 'CPP_PTB', 'src')));
addpath(fullfile(pth, 'subfun'));
Expand Down
2 changes: 1 addition & 1 deletion lib/CPP_PTB
Open in desktop
Submodule CPP_PTB updated 2 files
+11 −2 README.md
+124 −86 eyeTracker.m