Merge branch '2.5' into 'master'

2.5 See merge request it/ARCADE!56
esi-neuroscience · Jun 7, 2019 · 86c9724 · 86c9724
2 parents cdb9065 + 7176938
commit 86c9724
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 3 deletions.
diff --git a/CHANGELOG → CHANGELOG.md b/CHANGELOG → CHANGELOG.md
@@ -1,5 +1,17 @@
 # Change Log of ARCADE
 
+## [2.5.1] - 2019-06-07
+### NEW
+*   EyeLinkServer v1.1.6.0: When both eyes are tracked, the eye used for
+    monitoring regions can be selected from the EyeLinkServer GUI. If only one
+    eye is tracked, the selected eye is displayed.
+
+### FIXED
+*   EyeLinkServer v1.1.6.0: For binocular tracking, the current position was
+    sometimes switching between the two eyes at runtime, causing small eye
+    position jumps. This was fixed.
+
+
 ## [2.5.0] - 2019-05-23
 ### NEW
 *   ARCADE sends a [0 1 0] eventmarker sequence at beginning and and of a
@@ -8,7 +20,7 @@
 
 ## [2.5.0b3] - 2019-05-17
 ### NEW
-*   NidaqServer 1.0.10.6: support for PCIe-6323
+*   NidaqServer v1.0.10.6: support for PCIe-6323
 *   For testing a task script, the `simulate_trial` function will create all
     editable variables from a _cfg.mat file in the MATLAB workspace as well as
     a valid TrialData struct.

diff --git a/README.txt → README.md b/README.txt → README.md
@@ -1,3 +1,6 @@
+![ARCADE Logo](/arcade/Docs/html/arcade.png)
+
+
 ARCADE
 ======
 
@@ -36,7 +39,8 @@ Currently ARCADE was only tested on
 * Windows 7 with Windows Platform Update and Windows 10 (v1803)
 * MATLAB 2014a (64-bit), MATLAB 2018b
 * Eyelink 1000/2000 eye tracker
-* National Instruments I/O devices PCI-6221, PCI-6503 and USB-6353
+* National Instruments I/O devices PCI-6221, PCI-6503, PCIe-6251, PCIe-6323,
+  PCIe-6321 and USB-6353
 
 
 Authors and contributors

diff --git a/arcade/Docs/html/helptoc.xml b/arcade/Docs/html/helptoc.xml
@@ -1,7 +1,7 @@
 <?xml version='1.0' encoding="utf-8"?>
 <toc version="2.0">
 
-    <tocitem target="ARCADE.html">ARCADE
+    <tocitem target="index.html">ARCADE
     	<tocitem target="DOCRunningArcade.html">Running ARCADE</tocitem>
 	    <tocitem target="DOCDesigningTaskFiles.html">Designing task scripts 
 		   <tocitem target="DOCExampleDetectTask.html">Example task script</tocitem>

diff --git a/arcade/Docs/html/ARCADE.html → arcade/Docs/html/index.html b/arcade/Docs/html/ARCADE.html → arcade/Docs/html/index.html
diff --git a/arcade/EyeServer/EyeLinkServer.exe b/arcade/EyeServer/EyeLinkServer.exe