Skip to content

Commit ff00c89

Browse files
committed
update defaults
1 parent 449f52c commit ff00c89

File tree

5 files changed

+21
-9
lines changed

5 files changed

+21
-9
lines changed

lib/utils/unfold.m

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -147,6 +147,13 @@ function unfold(input, varargin)
147147

148148
end
149149

150+
callStack = dbstack();
151+
if numel(callStack) > 1 && ~strcmp(callStack(2).name, mfilename())
152+
fprintf('\n');
153+
elseif numel(callStack) == 1 && strcmp(callStack(1).name, mfilename())
154+
fprintf('\n');
155+
end
156+
150157
end
151158

152159
function printKeyToScreen(input)

src/defaults/checkCppPtbCfg.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
%% checks
3737
if cfg.debug.do
3838
cfg.eyeTracker.do = false;
39-
cfg.skipSyncTests = 2;
39+
cfg.skipSyncTests = 1;
4040
end
4141

4242
if cfg.skipSyncTests == false

src/defaults/cppPtbDefaults.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,8 @@
1313
case 'all'
1414
value = struct('testingDevice', 'pc', ...
1515
'color', struct('background', [0 0 0]), ...
16-
'skipSyncTests', 0);
16+
'skipSyncTests', 0, ...
17+
'verbose', 1);
1718

1819
value.aperture.type = 'none';
1920

src/initPTB.m

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -137,6 +137,9 @@ function initDebug(cfg)
137137

138138
Screen('Preference', 'SkipSyncTests', cfg.skipSyncTests);
139139
Screen('Preference', 'Verbosity', 0);
140+
% disable all visual alerts
141+
Screen('Preference','VisualDebugLevel', 0);
142+
% disable all output to the command window
140143
Screen('Preference', 'SuppressAllWarnings', 1);
141144

142145
fprintf('\n\n\n\n');

tests/test_checkCppPtbCfg.m

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ function test_checkCppPtbCfg_basic()
1616
% test data
1717
expectedCfg = cppPtbDefaults('all');
1818
expectedCfg.eyeTracker.do = false;
19-
expectedCfg.skipSyncTests = 2;
19+
expectedCfg.skipSyncTests = 1;
2020

2121
% test
2222
assertEqual(expectedCfg, cfg);
@@ -26,12 +26,13 @@ function test_checkCppPtbCfg_basic()
2626
function test_setDefaultsPtb_no_debug()
2727

2828
% set up
29-
cfg = checkCppPtbCfg();
29+
cfg.debug.do = false;
30+
cfg = checkCppPtbCfg(cfg);
3031

3132
% test data
3233
expectedCfg = cppPtbDefaults('all');
33-
expectedCfg.eyeTracker.do = false;
34-
expectedCfg.skipSyncTests = 2;
34+
expectedCfg.debug.do = 0;
35+
expectedCfg.skipSyncTests = 0;
3536

3637
% test
3738
assertEqual(expectedCfg, cfg);
@@ -48,7 +49,7 @@ function test_setDefaultsPtb_overwrite()
4849
expectedCfg = cppPtbDefaults('all');
4950
expectedCfg.screen.monitorWidth = 36;
5051
expectedCfg.eyeTracker.do = false;
51-
expectedCfg.skipSyncTests = 2;
52+
expectedCfg.skipSyncTests = 1;
5253

5354
% test
5455
assertEqual(expectedCfg, cfg);
@@ -81,7 +82,7 @@ function test_setDefaultsPtb_audio()
8182
expectedCfg.audio.fs;
8283

8384
expectedCfg.eyeTracker.do = false;
84-
expectedCfg.skipSyncTests = 2;
85+
expectedCfg.skipSyncTests = 1;
8586

8687
% test
8788
assertEqual(expectedCfg, cfg);
@@ -100,7 +101,7 @@ function test_setDefaultsPtb_mri()
100101
expectedCfg.bids.mri.RepetitionTime = [];
101102
expectedCfg.pacedByTriggers.do = false;
102103
expectedCfg.eyeTracker.do = false;
103-
expectedCfg.skipSyncTests = 2;
104+
expectedCfg.skipSyncTests = 1;
104105

105106
% test
106107
assertEqual(expectedCfg, cfg);

0 commit comments

Comments
 (0)