Skip to content

Commit 2386817

Browse files
authored
Merge pull request #44 from cpp-lln-lab/dev
[REL] new release
2 parents a6e8a2b + 1fbfea2 commit 2386817

19 files changed

+56
-43
lines changed

.all-contributorsrc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@
5656
"projectOwner": "cpp-lln-lab",
5757
"repoType": "github",
5858
"repoHost": "https://github.com",
59-
"skipCi": false,
59+
"skipCi": true,
6060
"contributorsSortAlphabetically": true
6161
}

audioLocTranslational.m

100644100755
Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545

4646
% Prepare for the output logfiles with all
4747
logFile.extraColumns = cfg.extraColumns;
48+
logFile = saveEventsFile('init', cfg, logFile);
4849
logFile = saveEventsFile('open', cfg, logFile);
4950

5051
% disp(cfg);
@@ -85,13 +86,15 @@
8586
thisEvent.fixationTarget = cfg.design.fixationTargets(iBlock, iEvent);
8687
thisEvent.soundTarget = cfg.design.soundTargets(iBlock, iEvent);
8788

89+
thisEvent.isStim = logFile.isStim;
90+
8891
% we wait for a trigger every 2 events
8992
if cfg.pacedByTriggers.do && mod(iEvent, 2) == 1
9093
waitForTrigger( ...
91-
cfg, ...
92-
cfg.keyboard.responseBox, ...
93-
cfg.pacedByTriggers.quietMode, ...
94-
cfg.pacedByTriggers.nbTriggers);
94+
cfg, ...
95+
cfg.keyboard.responseBox, ...
96+
cfg.pacedByTriggers.quietMode, ...
97+
cfg.pacedByTriggers.nbTriggers);
9598
end
9699

97100
% % % REFACTOR THIS FUNCTION % % %
@@ -116,7 +119,7 @@
116119
% collect the responses and appends to the event structure for
117120
% saving in the tsv file
118121
responseEvents = getResponse('check', cfg.keyboard.responseBox, cfg, ...
119-
getOnlyPress);
122+
getOnlyPress);
120123

121124
triggerString = ['trigger_' cfg.design.blockNames{iBlock}];
122125
saveResponsesAndTriggers(responseEvents, cfg, logFile, triggerString);
@@ -132,7 +135,7 @@
132135

133136
% trigger monitoring
134137
triggerEvents = getResponse('check', cfg.keyboard.responseBox, cfg, ...
135-
getOnlyPress);
138+
getOnlyPress);
136139

137140
triggerString = 'trigger_baseline';
138141
saveResponsesAndTriggers(triggerEvents, cfg, logFile, triggerString);
@@ -152,6 +155,8 @@
152155

153156
eyeTracker('Shutdown', cfg);
154157

158+
% remove the sound data from the cfg before saving it.
159+
cfg = rmfield(cfg, 'soundData');
155160
createJson(cfg, cfg);
156161

157162
farewellScreen(cfg);

initEnv.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656

5757
if numel(dir(libDirectory)) <= 2 % Means that the external is empty
5858
error(['Git submodules are not cloned!', ...
59-
'Try this in your terminal:', ...
60-
' git submodule update --recursive ']);
59+
'Try this in your terminal:', ...
60+
' git submodule update --recursive ']);
6161
else
6262
addDependencies();
6363
end
-604 KB
Binary file not shown.
-604 KB
Binary file not shown.
-8.95 KB
Binary file not shown.
-8.95 KB
Binary file not shown.
-604 KB
Binary file not shown.
-604 KB
Binary file not shown.
-8.95 KB
Binary file not shown.

0 commit comments

Comments
 (0)