diff --git a/MonkeyLogic/NIMH-daqtoolbox/NIMH_daqtoolbox_(May-19-2016).zip b/MonkeyLogic/NIMH-daqtoolbox/NIMH_daqtoolbox_(May-19-2016).zip new file mode 100644 index 0000000..84adf02 Binary files /dev/null and b/MonkeyLogic/NIMH-daqtoolbox/NIMH_daqtoolbox_(May-19-2016).zip differ diff --git a/MonkeyLogic/mlmenu.m b/MonkeyLogic/mlmenu.m index 2ae0762..0f215b5 100644 --- a/MonkeyLogic/mlmenu.m +++ b/MonkeyLogic/mlmenu.m @@ -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); @@ -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; diff --git a/MonkeyLogic/monkeylogic.m b/MonkeyLogic/monkeylogic.m index 3052fd5..87e269d 100644 --- a/MonkeyLogic/monkeylogic.m +++ b/MonkeyLogic/monkeylogic.m @@ -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)); diff --git a/vcredist_x64.exe b/vcredist_x64.exe new file mode 100644 index 0000000..5473640 Binary files /dev/null and b/vcredist_x64.exe differ diff --git a/vcredist_x86.exe b/vcredist_x86.exe new file mode 100644 index 0000000..b795578 Binary files /dev/null and b/vcredist_x86.exe differ