Commit 7256ebd9 authored by Jesse Heckman's avatar Jesse Heckman
Browse files

minor fixes

parent b542aa5d
......@@ -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
......
......@@ -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)
......
......@@ -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
% % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment