Skip to content

Commit

Permalink
Contains an updated NIMH daqtoolbox which has an analog output check …
Browse files Browse the repository at this point in the history
…fix, among others.

Contains another logger bug fix that arises when ML tries to check for an updated version
Added redistributable files.
  • Loading branch information
ryklin committed May 24, 2016
1 parent a818cde commit 89e5a80
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 3 deletions.
Binary file not shown.
8 changes: 5 additions & 3 deletions MonkeyLogic/mlmenu.m
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ function mlmenu(varargin)
% Modified 3/20/14 -ER (started looking into modifying the DAQ toolbox function calls to handle 64 bit Windows/Matlab)
% Modified 10/01/15 -ER (added touchscreen/mouse controllers)

lastupdate = 'March 2016';
currentversion = '05-2-2016 build 1.1.84';
lastupdate = 'May 2016';
currentversion = '05-23-2016 build 1.1.85';

logger = log4m.getLogger('monkeylogic.log');
logger.setCommandWindowLevel(logger.ALL);
Expand Down Expand Up @@ -4239,7 +4239,9 @@ function savecfg(varargin)
rgb = z(:)';

function chknewupdates(lastupdate)

logger = log4m.getLogger('monkeylogic.log');
logger.setCommandWindowLevel(logger.ALL);
logger.setLogLevel(logger.ALL);
checkinterval = 30; %in days
if ~ispref('MonkeyLogic', 'LastUpdateCheck'),
lastchecknum = floor(now)-checkinterval-1;
Expand Down
3 changes: 3 additions & 0 deletions MonkeyLogic/monkeylogic.m
Original file line number Diff line number Diff line change
Expand Up @@ -2293,6 +2293,9 @@ function update_error_lists(trialerror, originalcond, cond, ScreenInfo)

%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
function ScreenInfo = close_video(ScreenInfo, varargin)
logger = log4m.getLogger('monkeylogic.log');
logger.setCommandWindowLevel(logger.ALL);
logger.setLogLevel(logger.ALL);

for i = 1:length(ScreenInfo.ActiveVideoBuffers),
mlvideo('releasebuffer', ScreenInfo.Device, ScreenInfo.ActiveVideoBuffers(i));
Expand Down
Binary file added vcredist_x64.exe
Binary file not shown.
Binary file added vcredist_x86.exe
Binary file not shown.

0 comments on commit 89e5a80

Please sign in to comment.