Merge branch 'develop' of github.com:sccn/eeglab into develop

Author: arnodelorme

eeglab.prj

@@ -100,7 +100,7 @@ If it is defined, set it to the concatenation of these strings:
  <file>${PROJECT_ROOT}\plugins\ANTeepimport1.13</file>
  <file>${PROJECT_ROOT}\plugins\bids-matlab-tools6.1</file>
  <file>${PROJECT_ROOT}\plugins\bids-matlab-tools6.1\JSONIO</file>
- <file>${PROJECT_ROOT}\plugins\bva-io1.7</file>
+ <file>${PROJECT_ROOT}\plugins\bva-io1.71</file>
  <file>${PROJECT_ROOT}\plugins\clean_rawdata</file>
  <file>${PROJECT_ROOT}\plugins\dipfit</file>
  <file>${PROJECT_ROOT}\plugins\egilegacy1.0</file>
@@ -122,6 +122,7 @@ If it is defined, set it to the concatenation of these strings:
  <file>${PROJECT_ROOT}\plugins\scd1.0</file>
  <file>${PROJECT_ROOT}\plugins\snapmaster1.0</file>
  <file>${PROJECT_ROOT}\plugins\VisEd1.05</file>
+ <file>${PROJECT_ROOT}\plugins\xdfimport1.18</file>
  <file>${PROJECT_ROOT}\plugins\xdfimport1.18\xdf</file>
  <file>${PROJECT_ROOT}\plugins\MFFMatlabIO4.0</file>
  <file>${PROJECT_ROOT}\plugins\MFFMatlabIO4.0\MFF-1.2.2-jar-with-dependencies.jar</file>

functions/adminfunc/eeg_getversion.m

@@ -41,8 +41,8 @@
 
 function [vers, versnum, releaseDate] = eeg_getversion
 
-vers = '2022.0';
-releaseDate = '11-Feb-22 14:55:42'; % unix date -> date +"%d-%b-%y %T"
+vers = '2022.1';
+releaseDate = '1-Aug-22 14:55:42'; % unix date -> date +"%d-%b-%y %T"
 
 % get numerical version number
 tmpvers = vers;

functions/supportfiles/test_compiled_version.m

@@ -12,6 +12,18 @@ function test_compiled_version(varargin)
 end
 
 try
+ % test binary files
+ if isdeployed
+ TMP = pop_loadxdf( fullfile('sample_data', 'test_data', 'test.xdf') );
+ TMP = pop_loadbv( fullfile('sample_data', 'test_data'), 'testbva.vhdr' );
+ TMP = pop_loadcnt( fullfile('sample_data', 'test_data', 'test.cnt') );
+ TMP = pop_musemonitor( fullfile('sample_data', 'test_data', 'testmusemonitor.csv') );
+ TMP = pop_mffimport( fullfile(pwd, 'sample_data', 'test_data', 'testmff.mff'), 'code' );
+ TMP = pop_biosig( fullfile('sample_data', 'test_data', 'test.edf') );
+ TMP = pop_biosig( fullfile('sample_data', 'test_data', 'test.bdf') );
+ [TMP,TMP2] = pop_importbids( fullfile('sample_data', 'test_data', 'BIDS_test'), 'bidsevent', 'off' );
+ end
+
  % EEGLAB history file generated on the 08-Jul-2020
  % ------------------------------------------------
  EEG = pop_loadset( 'filename', 'eeglab_data.set', 'filepath', 'sample_data');