Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
Jesse Heckman
pbtoolbox
Commits
1b1046fa
Commit
1b1046fa
authored
Oct 22, 2018
by
Jesse Heckman
Browse files
stuff it
parent
2a2a3a9a
Changes
2
Show whitespace changes
Inline
Side-by-side
setups/vestibular chair/vPrime/core/pb_vRunExp.m
View file @
1b1046fa
...
...
@@ -25,10 +25,9 @@ function pb_vRunExp(handles)
bDat
(
nblocks
)
=
struct
(
'v'
,[],
'h'
,[]);
rc
=
pb_runPupil
;
pb_startPupil
(
rc
);
[
ses
,
str
]
=
pb_runLSL
(
'ot'
,
false
);
%% CORE BODY
% iterate experiment
...
...
@@ -36,6 +35,8 @@ function pb_vRunExp(handles)
% Runs blocks of trials with a vestibular condition
ses
.
start
;
pb_startPupil
(
rc
);
nTrials
=
length
(
block
(
iBlck
)
.
trial
);
handles
=
updateCount
(
handles
,
'trial'
,
'reset'
);
...
...
@@ -85,6 +86,7 @@ function pb_vRunExp(handles)
end
handles
=
updateCount
(
handles
,
'block'
,
'count'
);
pb_stopPupil
(
rc
);
% STOP LSL
ses
.
stop
;
...
...
@@ -100,7 +102,7 @@ function pb_vRunExp(handles)
end
%% CHECK OUT
pb_stopPupil
(
rc
);
pb_vEndExp
(
handles
.
cfg
);
pb_vInitialize
(
handles
,
false
);
...
...
subtools/lsl/pb_runLSL.m
View file @
1b1046fa
...
...
@@ -54,17 +54,17 @@ end
function
ev_listener
(
~
,
event
)
disp
(
'ev_listener called'
)
disp
(
event
);
%
disp(event);
end
function
pl_listener
(
~
,
event
)
disp
(
'pl_listener called'
);
disp
(
event
);
%
disp(event);
end
function
ot_listener
(
~
,
event
)
disp
(
'ot_listener called'
);
disp
(
event
);
%
disp(event);
end
% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment