mh autofix

Author: Remi-Gau

CPP_getResponseDemo.m

@@ -4,9 +4,10 @@
 %  (a wrapper around the KbQueue function from PTB)
 
 % start with a clean slate
-clear; clc;
+clear;
+clc;
 if IsOctave
-    more off % for a better display experience
+    more off; % for a better display experience
 end
 
 %% set parameters
@@ -32,41 +33,35 @@
 % We set which keys are "valid", any keys other than those will be ignored
 expParameters.responseKey = {};
 
-
 %% init
 
 % Keyboard
 %  Make sure keyboard mapping is the same on all supported operating systems
 %  Apple MacOS/X, MS-Windows and GNU/Linux:
 KbName('UnifyKeyNames');
 
-
 % we ask PTB to tell us which keyboard devices are connected to the computer
 [cfg.keyboardNumbers, cfg.keyboardNames] = GetKeyboardIndices;
 
-cfg.keyboardNumbers
-cfg.keyboardNames
-
+cfg.keyboardNumbers;
+cfg.keyboardNames;
 
 % Test that the keyboards are correctly configured
 testKeyboards(cfg);
 
 % Give the time to the test key to be released and not listened
 WaitSecs(1);
 
-
 fprintf('\nDuring the next 5 seconds we will collect responses on the following keys: \n\n');
 if isempty(expParameters.responseKey)
     fprintf('\nALL KEYS\n\n');
 else
-    for iKey=1:numel(expParameters.responseKey)
+    for iKey = 1:numel(expParameters.responseKey)
         fprintf('\n%s', expParameters.responseKey{iKey});
     end
     fprintf('\n\n');
 end
 
-
-
 %% Run demo
 
 % Create the keyboard queue to collect responses.
@@ -77,15 +72,11 @@
 startSecs = GetSecs();
 getResponse('start', cfg, expParameters, 1);
 
-
-
 % Here we wait for 5 seconds but are still collecting responses.
 %  So you could still be doing something else (presenting audio and visual stim) and
 %  still collect responses.
 WaitSecs(5);
 
-
-
 % Check what keys were pressed (all of them)
 responseEvents = getResponse('check', cfg, expParameters, 0);
 
@@ -98,9 +89,6 @@
 % If you wan to stop listening to key presses.
 getResponse('stop', cfg, expParameters, 1);
 
-
-
-
 %% Now we look what keys were pressed and when
 for iEvent = 1:size(responseEvents, 1)
 

checkAbort.m

@@ -1,36 +1,36 @@
 function checkAbort(cfg, deviceNumber)
-% Check for experiment abortion from operator
-% When no deviceNumber is set then it will check the default device
-% When an abort key s detected this will set a global variable and throw a
-% specific error that can then be catched.
-%
-% Maint script
-% try
-%     % Your awesome experiment
-% catch ME % when something goes wrong
-%     switch ME.identifier
-%         case 'checkAbort:abortRequested'
-%             % stuff to do when an abort is requested (save data...)
-%         otherwise
-%             % stuff to do otherwise
-%             rethrow(ME) % display the error
-%     end
-% end
+    % Check for experiment abortion from operator
+    % When no deviceNumber is set then it will check the default device
+    % When an abort key s detected this will set a global variable and throw a
+    % specific error that can then be catched.
+    %
+    % Maint script
+    % try
+    %     % Your awesome experiment
+    % catch ME % when something goes wrong
+    %     switch ME.identifier
+    %         case 'checkAbort:abortRequested'
+    %             % stuff to do when an abort is requested (save data...)
+    %         otherwise
+    %             % stuff to do otherwise
+    %             rethrow(ME) % display the error
+    %     end
+    % end
 
-if nargin < 1 || isempty(cfg)
-    error('I need at least one input.')
-end
+    if nargin < 1 || isempty(cfg)
+        error('I need at least one input.');
+    end
 
-if nargin < 2 || isempty(deviceNumber)
-    deviceNumber = -1;
-end
+    if nargin < 2 || isempty(deviceNumber)
+        deviceNumber = -1;
+    end
 
-[keyIsDown, ~, keyCode] = KbCheck(deviceNumber);
+    [keyIsDown, ~, keyCode] = KbCheck(deviceNumber);
 
-if keyIsDown && keyCode(KbName(cfg.keyboard.escapeKey))
-    
-    errorAbort();
-    
-end
+    if keyIsDown && keyCode(KbName(cfg.keyboard.escapeKey))
 
-end
+        errorAbort();
+
+    end
+
+end

checkDependencies.m

@@ -1,43 +1,42 @@
 function checkDependencies()
-% Checks that the right dependencies are installed.
-
-printCredits()
-
-PTB.major =  3;
-PTB.minor = 0;
-PTB.point =  14;
-
-fprintf('Checking dependencies\n')
-
-% check ptb version
-try
-    
-    [~, versionStruc] = PsychtoolboxVersion;
-    
-    fprintf(' Using PTB %i.%i.%i\n', ...
-        versionStruc.major, ...
-        versionStruc.minor, ...
-        versionStruc.point)
-    
-    if any( [...
-            versionStruc.major < PTB.major, ...
-            versionStruc.minor < PTB.minor, ...
-            versionStruc.point < PTB.point, ...
-            ])
-        
-        str = sprintf('%s %i.%i.%i %s.\n%s', ...
-            'The current version PTB version is not', ...
-            PTB.major, ...
-            PTB.minor, ...
-            PTB.point, ...
-            'In case of problems (e.g json file related) consider updating.');
-        warning(str); %#ok<*SPWRN>
-    end
-catch
-    error('Failed to check the PTB version: Are you sure that PTB is in the matlab path?')
-end
+    % Checks that the right dependencies are installed.
+
+    printCredits();
+
+    PTB.major =  3;
+    PTB.minor = 0;
+    PTB.point =  14;
+
+    fprintf('Checking dependencies\n');
 
+    % check ptb version
+    try
+
+        [~, versionStruc] = PsychtoolboxVersion;
+
+        fprintf(' Using PTB %i.%i.%i\n', ...
+            versionStruc.major, ...
+            versionStruc.minor, ...
+            versionStruc.point);
+
+        if any([ ...
+                versionStruc.major < PTB.major, ...
+                versionStruc.minor < PTB.minor, ...
+                versionStruc.point < PTB.point, ...
+                ])
+
+            str = sprintf('%s %i.%i.%i %s.\n%s', ...
+                'The current version PTB version is not', ...
+                PTB.major, ...
+                PTB.minor, ...
+                PTB.point, ...
+                'In case of problems (e.g json file related) consider updating.');
+            warning(str); %#ok<*SPWRN>
+        end
+    catch
+        error('Failed to check the PTB version: Are you sure that PTB is in the matlab path?');
+    end
 
-fprintf(' We got all we need. Let us get to work.\n')
+    fprintf(' We got all we need. Let us get to work.\n');
 
 end

cleanUp.m

@@ -1,30 +1,29 @@
 function cleanUp
-% A wrapper function to close all windows, ports, show mouse cursor, close keyboard queues
-% and give access back to the keyboards.
+    % A wrapper function to close all windows, ports, show mouse cursor, close keyboard queues
+    % and give access back to the keyboards.
 
-WaitSecs(0.5);
+    WaitSecs(0.5);
 
-Priority(0);
+    Priority(0);
 
-ListenChar(0);
-KbQueueRelease();
+    ListenChar(0);
+    KbQueueRelease();
 
-ShowCursor
+    ShowCursor;
 
-% Screen Close All
-sca;
+    % Screen Close All
+    sca;
 
-% Close Psychportaudio if open 
-if PsychPortAudio('GetOpenDeviceCount') ~= 0
-	PsychPortAudio('Close');
-end
-
-if ~ismac
-    % remove PsychDebugWindowConfiguration
-    clear Screen
-end
+    % Close Psychportaudio if open
+    if PsychPortAudio('GetOpenDeviceCount') ~= 0
+        PsychPortAudio('Close');
+    end
 
-close all
+    if ~ismac
+        % remove PsychDebugWindowConfiguration
+        clear Screen;
+    end
 
+    close all;
 
 end

demos/CPP_checkAbortDemo.m

@@ -1,31 +1,30 @@
 % add parent directory to the path (to make sure we can access the CPP_PTB
 % functions)
-addpath(fullfile(pwd, '..')) 
+addpath(fullfile(pwd, '..'));
 
 % set up
 cfg.keyboard.escapeKey = 'ESCAPE';
 
 % beginning of demo
 KbName('UnifyKeyNames');
 
-
 try
 
     % stay in the loop until the escape key is pressed
     while GetSecs < Inf
 
-        checkAbort(cfg)
+        checkAbort(cfg);
 
     end
 
 catch ME
-    
+
     switch ME.identifier
         case 'checkAbort:abortRequested'
-            warning('You pressed the escape key: will try to fail gracefully.')
-            fprintf('\nWe did catch your abort signal.\n')
+            warning('You pressed the escape key: will try to fail gracefully.');
+            fprintf('\nWe did catch your abort signal.\n');
         otherwise
-            rethrow(ME) % display other errors
+            rethrow(ME); % display other errors
     end
-    
-end
+
+end