diff --git a/setups/vestibular chair/vPrime/core/experiment/block/trial/pb_vSetupTrial.m b/setups/vestibular chair/vPrime/core/experiment/block/trial/pb_vSetupTrial.m index 3f385858414ef946c45efc5f1fc744b2b605cbcd..8e3304051b36678fc0d48a4f1ee4a107b4ee658e 100644 --- a/setups/vestibular chair/vPrime/core/experiment/block/trial/pb_vSetupTrial.m +++ b/setups/vestibular chair/vPrime/core/experiment/block/trial/pb_vSetupTrial.m @@ -10,8 +10,6 @@ function [stim, cfg] = pb_vSetupTrial(stim,cfg) %% Set TDT parameters selled = strcmpi({stim.modality},'LED'); - selacq = strcmpi({stim.modality},'data acquisition'); - % seltrg = strcmpi({stim.modality},'trigger'); selsnd = strcmpi({stim.modality},'sound'); %% LED @@ -69,16 +67,18 @@ function [stim, cfg] = pb_vSetupTrial(stim,cfg) end %% Sound - % [RP2tag1,RP2tag2,~,MUXind,MUXbit1,SpeakerChanNo] = GvB_SoundSpeakerLookUp(azrnd(ii),elrnd(ii),RP2_1,RP2_2,LedLookUpTable); - % GvB_MUXSet(RP2tag1,RP2tag2,MUXind,MUXbit1,'set'); if any(selsnd) snd = stim(selsnd); - nsnd = numel(snd); + nsnd = numel(snd); for sndIdx = 1:nsnd - %% FOR NOW I LEAVE THIS OUT!! - %pb_vSetSound(snd(sndIdx),cfg,'RZ6_1'); - %% FOR NOW I LEAVE THIS OUT!! + sndsetup = cfg.lookup(snd(sndIdx).Z+1,2:4); + switch sndsetup(1) + case 1 + maxSamples = setSound(snd(sndIdx),cfg,'RP2_1'); + case 2 + maxSamples = setSound(snd(sndIdx),cfg,'RP2_2'); + end end end diff --git a/setups/vestibular chair/vPrime/core/experiment/pb_vRunExp.m b/setups/vestibular chair/vPrime/core/experiment/pb_vRunExp.m index a3154e2526a2bf233ee39883a3db125890d77cd0..f51426608367ce029f2c30a2a7c5cc8b5134f7fb 100644 --- a/setups/vestibular chair/vPrime/core/experiment/pb_vRunExp.m +++ b/setups/vestibular chair/vPrime/core/experiment/pb_vRunExp.m @@ -14,7 +14,7 @@ function pb_vRunExp(handles) % load & read experiment % set debug mode - debug = true; + debug = false; % set handles pb_setupShow(handles); diff --git a/utilities/fileio/backup/pb_mountserver.m b/utilities/fileio/backup/pb_mountserver.m index 16f4d212f2f356639745c429ce649fc5565b0d4f..5a68def7d38d56e1c8155b11a8c962baf3f6c483 100644 --- a/utilities/fileio/backup/pb_mountserver.m +++ b/utilities/fileio/backup/pb_mountserver.m @@ -26,7 +26,7 @@ end function auth = getcredentials(srv) % obtains authentication credentials for server - doi = [userpath '.credentials']; + doi = [userpath filesep '.credentials']; if ~isfolder(doi); mkdir(doi); end fn = [doi filesep srv '.crd'];