Resolved merge conflict in mne/io/__init__ and refactored code for ey…

…elink eyetracking functionality. Co-authored by: dominikwelke <[email protected]> [ci skip] [skip azp]
mne-tools · Sep 20, 2022 · c4fdf49 · c4fdf49
1 parent c87ed30
commit c4fdf49
Show file tree

Hide file tree

Showing 5 changed files with 584 additions and 0 deletions.
diff --git a/mne/io/__init__.py b/mne/io/__init__.py
@@ -58,6 +58,7 @@
                         read_evoked_fieldtrip)
 from .nihon import read_raw_nihon
 from ._read_raw import read_raw
+from .eyetracking import read_raw_eyelink
 
 # for backward compatibility
 from .fiff import Raw

diff --git a/mne/io/eyetracking/__init__.py b/mne/io/eyetracking/__init__.py
@@ -0,0 +1,7 @@
+"""Module for loading Eye-Tracker data"""
+
+# Author: Dominik Welke <[email protected]>
+#
+# License: BSD-3-Clause
+
+from .eyelink import read_raw_eyelink