Skip to content

Commit d6602e9

Browse files
committed
Addons in paths_conflicts
1 parent bc93cc6 commit d6602e9

File tree

3 files changed

+9
-5
lines changed

3 files changed

+9
-5
lines changed

docs/scripts/paths_conflicts.m

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@
7979
% Another way to avoid these conflicts occuring over time is to reset your
8080
% paths each time MATLAB starts up. You can do this by adding the
8181
% following to <https://uk.mathworks.com/help/matlab/ref/startup.html
82-
% MATLAB's startup script>:
82+
% MATLAB's startup script> (make sure the path locations are correct):
8383

8484
disp 'Resetting paths...'
8585
restoredefaultpath % Restore all paths to factory state
@@ -91,6 +91,7 @@
9191
% Change these paths to your install locations
9292
rigbox_path = fullfile(userDir, 'Github', 'rigbox');
9393
ptb_path = fullfile(userDir, 'PTB', 'Psychtoolbox');
94+
add_ons = genpath(fullfile(userDir, 'MATLAB', 'Add-Ons'));
9495

9596
% Add Psychtoolbox paths
9697
disp '...'
@@ -105,6 +106,9 @@
105106
cd(rigbox_path)
106107
addRigboxPaths('Strict', false)
107108

109+
% Add Add-Ons folder
110+
addpath(add_ons)
111+
108112
% Return to default working directory
109113
cd(userpath)
110114
clear variables
@@ -113,6 +117,6 @@
113117
%% Etc.
114118
% Author: Miles Wells
115119
%
116-
% v1.0.0
120+
% v1.0.1
117121
%
118122
% <index.html Home> > <./troubleshooting.html Troubleshooting> > Paths Conflicts

docs/scripts/release_notes_v260.m

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,15 +242,15 @@
242242
%
243243
% *Bug fixes*
244244
%
245-
% *
245+
% * Fix for multiple base sessions getting created
246246
%
247247
% *Enhancements*
248248
%
249249
% *
250250
%
251251
% *Tests*
252252
%
253-
% *
253+
% * Explicit test for correct base session creation
254254

255255
%% wheelAnalysis
256256
%

0 commit comments

Comments
 (0)