Skip to content

Commit d4968cc

Browse files
author
jaib1
committed
Merge branch 'TestPanelClasses' into dev
2 parents ccd828c + 6238fda commit d4968cc

File tree

5 files changed

+7
-5
lines changed

5 files changed

+7
-5
lines changed

+exp/SignalsExp.m

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -720,6 +720,8 @@ function mainLoop(obj)
720720
obj.Data.stimWindowRenderTimes(obj.StimWindowUpdateCount) = renderTime;
721721
obj.StimWindowInvalid = false;
722722
end
723+
% make sure some minimum time passes before updating signals, to
724+
% improve performance on MC
723725
if (obj.Clock.now - t) > 0.1 || obj.IsLooping == false
724726
sendSignalUpdates(obj);
725727
t = obj.Clock.now;

+hw/devices.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@
7070
devs = getOr(rig, 'audioDevices', PsychPortAudio('GetDevices'));
7171
% Sanitize the names
7272
names = matlab.lang.makeValidName({devs.DeviceName}, 'ReplacementStyle', 'delete');
73-
names = iff(ismember('defaut', names), names, @()[{'default'} names(2:end)]);
73+
names = iff(ismember('default', names), names, @()[{'default'} names(2:end)]);
7474
for i = 1:length(names); devs(i).DeviceName = names{i}; end
7575
rig.audioDevices = devs;
7676
end
@@ -93,4 +93,4 @@ function configure(deviceName, usedaq)
9393
end
9494
end
9595

96-
end
96+
end

alyx-matlab

cb-tools/burgbox/namedArg.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88

99
% 2014-02 CB created
1010

11-
defIdx = find(cellfun(@(a) isequal(a, name), args), 1);
11+
defIdx = find(cellfun(@(a) strcmpi(a, name), args), 1);
1212
if ~isempty(defIdx)
1313
present = true;
1414
value = args{defIdx + 1};

0 commit comments

Comments
 (0)