- Removed support for state machine communication via PsychToolbox IOPort (though support is retained in ArCOM for user code). IOPort was not used on r2019b, which is now the minimum version supported.

Author: JSNeuroDev

Bpod.m

@@ -28,9 +28,6 @@
 % It is necessary to connect separate instances of MATLAB to separate machines.
 % Note: To launch directly into emulator mode, use port name EMU.
 %
-% Java: On MATLAB pre-r2019a, adding a second argument 'Java' forces usage 
-% of MATLAB's legacy Java serial interface, even with PsychToolbox installed.
-%
 % Example usage
 % Bpod();       % Start Bpod and auto-detect the state machine serial port
 % Bpod('COM3'); % Start Bpod with a state machine on port COM3
@@ -86,12 +83,7 @@ function Bpod(varargin)
     if strcmp(varargin{1}, 'EMU')
         emulator_setup;
     else
-        if nargin > 1
-            forceJava = varargin{2};
-            BpodSystem.Connect2BpodSM(varargin{1}, forceJava);
-        else
-            BpodSystem.Connect2BpodSM(varargin{1});
-        end
+        BpodSystem.Connect2BpodSM(varargin{1});
         bpod_setup;
     end
 else

Functions/@BpodObject/Connect2BpodSM.m

@@ -25,8 +25,9 @@
 % portString: the name of the USB serial port as known to the operating system.
 %             On Windows this looks like 'COM3' and on Linux '/dev/ttyACM0'
 %             use 'AUTO' to auto-discover the Bpod State Machine's port
-% forceJava:  (optional, char array) if supplied, Bpod uses MATLAB's native
-%             serial interface instead of PsychToolbox IOPort if installed
+% forceJava:  (optional, char array) depricated argument that forced use of MATLAB's
+% built-in serial interface if Psychtoolbox IOPort was installed. IOPort is
+% no longer supported so the forceJava argument is ignored if provided by the user.
 
 function obj = Connect2BpodSM(obj, portString, varargin)
 
@@ -52,27 +53,15 @@
 portsTried = [];
 found = 0;
 iPort = 1;
-if nargin > 2
-    forceJava = 1;
-else
-    forceJava = 0;
-end
+forceJava = 0;
 while (found == 0) && (iPort <= nPorts)
     thisPort = Ports{iPort};
     portsTried = [portsTried thisPort ' '];
     connected = 0;
-    if forceJava
-        try
-            obj.SerialPort = ArCOMObject_Bpod(thisPort, 12000000, 'Java');
-            connected = 1;
-        catch
-        end
-    else
-        try
-            obj.SerialPort = ArCOMObject_Bpod(thisPort, 12000000);
-            connected = 1;
-        catch
-        end
+    try
+        obj.SerialPort = ArCOMObject_Bpod(thisPort, 12000000);
+        connected = 1;
+    catch
     end
     if connected
         if skipDiscovery
@@ -131,15 +120,6 @@
     end
 end
 
-% For MATLAB predating the builtin serialport() class (2019b), recommend PsychToolbox
-if obj.SerialPort.UsePsychToolbox == 0 && verLessThan('matlab', '9.7')
-    disp('###########################################################################')
-    disp('# NOTICE: Bpod is running without Psychtoolbox installed.                 #')
-    disp('# PsychToolbox integration greatly improves USB transfer speed + latency. #')
-    disp('# See http://psychtoolbox.org/download.html for installation instructions.#')
-    disp('###########################################################################')
-end
-
 % Finish setup
 % obj.SystemSettings.LastCOMPort = Ports{thisPortIndex};
 % obj.SaveSettings;

Functions/Internal Functions/ArCOM/ArCOMObject_Bpod.m

@@ -36,7 +36,7 @@
 % To avoid time-costly arg parsing, all arguments must be provided, up to the highest one needed.
 % baudRate is in bps. This is ignored for microcontrollers with native USB support 
 % (e.g. 32-bit Arduino, Teensy 3.X-4.X).
-% Interface can be either [], 'Java', 'PsychToolbox'. [] defaults to Java for r2019b or newer, 
+% Interface can be either [], 'Builtin' or 'PsychToolbox'. [] defaults to Builtin for r2019b or newer, 
 % and Psychtoolbox on older versions.
 % TCPPort can be [], or a port on a remote computer if using the Ethernet interface.
 % InputBufferSize and OutputBufferSize must be in range 0-10M bytes
@@ -104,7 +104,10 @@
             if nargin > 2
                 if ~isempty(varargin{2})
                     switch lower(varargin{2})
-                        case 'java'
+                        case 'builtin'
+                            obj.UsePsychToolbox = 0;
+                            obj.Interface = 0;
+                        case 'java' % For compatibility with old code
                             obj.UsePsychToolbox = 0;
                             obj.Interface = 0;
                         case 'psychtoolbox'