Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
62 commits
Select commit Hold shift + click to select a range
27cc602
updated signals submodule
Jul 19, 2019
e52f99d
updated signals submodule (eb71b1f)
Jul 25, 2019
763d2f8
Added test for ensureCell
k1o0 Jul 29, 2019
bfaf31f
Fix'd typo in ensureCell_test
k1o0 Jul 29, 2019
dd23037
Future-proofing runall to ignore tests with specific hardware require…
k1o0 Jul 29, 2019
4d00e56
Added tests for nop, iff and emptyElems
k1o0 Jul 31, 2019
bb5c3f7
Added tests for cellsprintf and num2cellstr; bug fix in num2cellstr
k1o0 Jul 31, 2019
c725f69
Merge from master
k1o0 Jul 31, 2019
d01b06d
Submodule update
k1o0 Jul 31, 2019
5b11a8f
mapToCell test
k1o0 Aug 1, 2019
4076450
Removed complete todos
k1o0 Aug 1, 2019
bb6144d
Added test for dat.expExists
k1o0 Aug 1, 2019
2932a3c
Restore changes made in commit
k1o0 Aug 1, 2019
ff938a2
Expanded test for dispWaterReq
k1o0 Aug 1, 2019
d9a9768
assert -> verifyMatches
k1o0 Aug 1, 2019
325f95f
Added catStructs test
k1o0 Aug 5, 2019
82ad7af
Added tabulateArgs test
k1o0 Aug 5, 2019
1fe7039
superSave test added
k1o0 Aug 6, 2019
a492bd2
added an informative error message in the case that dat.paths is missing
kevin-j-miller Aug 6, 2019
c3e863a
Attempting to construct a branch that doesn't differ from dev in its …
kevin-j-miller Aug 6, 2019
a7f86fd
Revert "Attempting to construct a branch that doesn't differ from dev…
kevin-j-miller Aug 6, 2019
046cb82
Revert "added an informative error message in the case that dat.paths…
kevin-j-miller Aug 6, 2019
cf3c384
Added file package test
k1o0 Aug 7, 2019
9be0796
Added test for pick
k1o0 Aug 8, 2019
efa7414
Added test for namedArg
k1o0 Aug 8, 2019
abd24c1
Added varName test
k1o0 Aug 8, 2019
6206e9e
Added back tolerance change
k1o0 Aug 8, 2019
3263b85
Dev kevin (#192)
kevin-j-miller Aug 8, 2019
18021cb
Bug fix in namedArg test
k1o0 Aug 8, 2019
3eff565
Merge branch 'master' into dev
Aug 8, 2019
4d501ed
Removed old function -> now a method of Alyx
k1o0 Aug 8, 2019
c6c8e06
Started +fun package test; added fileFunction test
k1o0 Aug 9, 2019
c4022dc
No longer using 'which' to assert function existence
k1o0 Aug 9, 2019
c85ba50
Bug fixes for tests
k1o0 Aug 9, 2019
fdfe728
Bug fix for wiringInfo method
k1o0 Aug 11, 2019
de0dc92
Added KeyedSeq test
k1o0 Aug 11, 2019
6614508
Added docs for apply and applyForce
k1o0 Aug 11, 2019
1dfdc74
Added loadVar test
k1o0 Aug 12, 2019
0580014
Issue #168
k1o0 Aug 12, 2019
2982722
Added mergeStructs test
k1o0 Aug 12, 2019
a2918d9
Added performance tests; reorganized tests; updated changelog
k1o0 Aug 13, 2019
af88623
Added parameters walkthrough
k1o0 Aug 13, 2019
405f0ed
Merge branch 'dev' into tests
k1o0 Aug 13, 2019
4b7def2
Added timeline walkthrough; bug fix for wiringInfo in Timeline
k1o0 Aug 14, 2019
dd0adb7
added informative error messages to calibration code
kevin-j-miller Aug 14, 2019
aa71984
Added documentation for setting up Window; documentation for Window c…
k1o0 Aug 14, 2019
b3526ba
Added a few examples to hardware docs
k1o0 Aug 15, 2019
bd3b472
Added Viewing model walkthrough and expanded FAQ
k1o0 Aug 15, 2019
81c9b1d
Updated changelog
k1o0 Aug 15, 2019
0356894
Merge pull request #197 from cortex-lab/dev_errormessages
k1o0 Aug 15, 2019
6b37aa9
Updates to docs
k1o0 Aug 15, 2019
c32995d
Merge from dev
k1o0 Aug 15, 2019
0f1311e
Added test for +hw/calibrate.m
k1o0 Aug 16, 2019
a9b3d4c
deleted exp.construct
Jul 8, 2019
f509afe
Added documentation for calibration test
k1o0 Aug 16, 2019
72a39b1
Updated docs; added services guide
k1o0 Aug 20, 2019
9d750fd
Updates docs
k1o0 Aug 21, 2019
9b07dfe
Fix for Communicator WTF mode; increased test coverage for iff
k1o0 Aug 21, 2019
7c04e15
Update to changelog and signals
k1o0 Sep 4, 2019
31538f9
Merge pull request #188 from cortex-lab/tests
k1o0 Sep 4, 2019
d26aabc
HOTFIX changed Alyx Panel login timer to 90 mins
Sep 10, 2019
3852a4f
Removed readthedocs, updated submodules
k1o0 Sep 16, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
42 changes: 0 additions & 42 deletions +dat/parseAlyxInstance.m

This file was deleted.

2 changes: 1 addition & 1 deletion +eui/AlyxPanel.m
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ function login(obj, varargin)
% Start log in timer, to automatically log out after 30
% minutes of 'inactivity' (defined as not calling
% dispWaterReq)
obj.LoginTimer = timer('StartDelay', 30*60, 'TimerFcn',...
obj.LoginTimer = timer('StartDelay', 90*60, 'TimerFcn',...
@(~,~)obj.login, 'BusyMode', 'queue', 'Name', 'Login Timer');
start(obj.LoginTimer)
% Enable all buttons
Expand Down
2 changes: 2 additions & 0 deletions +eui/ExpPanel.m
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,8 @@
params = exp.Parameters(paramsStruct); % Get parameters
% Can define your own experiment panel
if isfield(params.Struct, 'expPanelFun')&&~isempty(params.Struct.expPanelFun)
% FIXME This should be done with fileFunction and this use of which
% may not work on newer versions of MATLAB
if isempty(which(params.Struct.expPanelFun)); addpath(fileparts(params.Struct.defFunction)); end
p = feval(params.Struct.expPanelFun, parent, ref, params, logEntry);
else % otherwise use the default
Expand Down
2 changes: 1 addition & 1 deletion +exp/Parameters.m
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ function makeGlobal(obj, name, newValue)
end

function str = indivDescrip(obj, name)
assert(isfield(obj.Struct, name));
assert(isfield(obj.Struct, name), 'Parameter ''%s'' not found', name);
% add the units details, if any
descripName = [name 'Description'];
if isfield(obj.Struct, descripName)
Expand Down
255 changes: 0 additions & 255 deletions +exp/construct.m

This file was deleted.

Loading