Skip to content
GitLab
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
7256ebd9
Commit
7256ebd9
authored
Nov 28, 2018
by
Jesse Heckman
Browse files
minor fixes
parent
b542aa5d
Changes
3
Hide whitespace changes
Inline
Side-by-side
setups/vestibular chair/vPrime/core/pb_vRunExp.m
View file @
7256ebd9
...
...
@@ -53,9 +53,10 @@ function pb_vRunExp(handles)
% start vestibular chair
if
~
ismac
&&
~
debug
vs
=
pb_sendServo
(
profile
);
vs
=
pb_sendServo
(
profile
);
blockTime
=
tic
;
pb_startServo
(
vs
);
pause
(
6
);
blockTime
=
tic
;
% allow vestibular chair to get in sync with input signal
pause
(
6
);
% allow vestibular chair to get in sync with input signal
end
%% RUN TRIALS
...
...
@@ -68,7 +69,7 @@ function pb_vRunExp(handles)
updateTrial
(
handles
);
stim
=
handles
.
block
(
iBlck
)
.
trial
(
iTrl
)
.
stim
;
handles
.
cfg
=
pb_vClearTrial
(
stim
,
handles
.
cfg
);
[
stim
,
handles
.
cfg
]
=
pb_vSetupTrial
(
stim
,
handles
.
cfg
);
[
~
,
handles
.
cfg
]
=
pb_vSetupTrial
(
stim
,
handles
.
cfg
);
trialTime
=
tic
;
pb_vRunTrial
(
handles
.
cfg
.
zBus
,
handles
.
cfg
.
trialdur
);
...
...
@@ -76,7 +77,7 @@ function pb_vRunExp(handles)
handles
=
pb_vStoreData
(
handles
,
sig
);
handles
.
cfg
=
updateCount
(
handles
.
cfg
,
'trial'
,
'count'
);
toc
(
trialTime
)
toc
(
trialTime
)
;
end
%% END BLOCK
...
...
utilities/fileio/backup/pb_mountserver.m
View file @
7256ebd9
...
...
@@ -9,14 +9,15 @@ function [sn] = pb_mountserver(varargin)
% PBToolbox (2018): JJH: j.heckman@donders.ru.nl
srv
=
pb_keyval
(
'server'
,
varargin
,
'mbaudit5'
);
force
=
pb_keyval
(
'force'
,
varargin
,
false
);
prfx
=
''
;
cin
=
[
'mount -t smbfs //'
getcredentials
(
srv
)
'@'
srv
'-srv.science.ru.nl/'
srv
'/ ~/sharename/'
];
[
s
,
cout
]
=
system
(
cin
);
if
s
>
0
&&
s
~=
64
;
disp
(
cout
);
end
if
s
==
64
;
system
(
'umount ~/sharename/'
);
prfx
=
'un'
;
end
disp
([
newline
srv
' is '
prfx
'mounted.'
newline
])
if
s
==
64
&&
~
force
;
system
(
'umount ~/sharename/'
);
prfx
=
'un'
;
end
disp
([
srv
' is '
prfx
'mounted.'
newline
])
end
function
auth
=
getcredentials
(
srv
)
...
...
utilities/housekeeping/pb_clean.m
View file @
7256ebd9
...
...
@@ -12,9 +12,17 @@ function pb_clean(varargin)
empty
=
pb_keyval
(
'clc'
,
varargin
,
true
);
clr
=
pb_keyval
(
'clr'
,
varargin
,
true
);
if
~
islogical
(
clr
)
disp
(
'hi'
)
end
if
fig
;
close
all
;
end
if
empty
;
clc
;
end
if
clr
;
pb_clear
;
end
if
islogical
(
clr
)
if
clr
;
pb_clear
();
end
else
pb_clear
(
clr
);
end
end
% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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