Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

RF: Reconfigure project to be detected by ioHub #8

Merged
merged 1 commit into from
Sep 2, 2024
Merged

RF: Reconfigure project to be detected by ioHub #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions psychopy_eyetracker_pupil_labs/pupil_labs/neon/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,6 @@
# Distributed under the terms of the GNU General Public License (GPL).

from psychopy.iohub.devices.eyetracker.eye_events import BinocularEyeSampleEvent
from .eyetracker import NeonEyeTracker
from .eyetracker import EyeTracker

__all__ = ["NeonEyeTracker", "BinocularEyeSampleEvent"]
__all__ = ["EyeTracker", "BinocularEyeSampleEvent"]
2 changes: 1 addition & 1 deletion psychopy_eyetracker_pupil_labs/pupil_labs/neon/default_eyetracker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
eyetracker.hw.pupil_labs.neon.EyeTracker:
eyetracker.neon.EyeTracker:
# Indicates if the device should actually be loaded at experiment runtime.
enable: True

Expand Down
2 changes: 1 addition & 1 deletion psychopy_eyetracker_pupil_labs/pupil_labs/neon/eyetracker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
logger = logging.getLogger(__name__)


class NeonEyeTracker(EyeTrackerDevice):
class EyeTracker(EyeTrackerDevice):
"""
Implementation of the :py:class:`Common Eye Tracker Interface <.EyeTrackerDevice>`
for the Pupil Core headset.
Expand Down
4 changes: 2 additions & 2 deletions psychopy_eyetracker_pupil_labs/pupil_labs/pupil_core/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,6 @@
MonocularEyeSampleEvent,
BinocularEyeSampleEvent,
)
from .eyetracker import PupilCoreEyeTracker
from .eyetracker import EyeTracker

__all__ = ["PupilCoreEyeTracker", "MonocularEyeSampleEvent", "BinocularEyeSampleEvent"]
__all__ = ["EyeTracker", "MonocularEyeSampleEvent", "BinocularEyeSampleEvent"]
2 changes: 1 addition & 1 deletion psychopy_eyetracker_pupil_labs/pupil_labs/pupil_core/default_eyetracker.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
eyetracker.hw.pupil_labs.pupil_core.EyeTracker:
eyetracker.pupil_core.EyeTracker:
# Indicates if the device should actually be loaded at experiment runtime.
enable: True

Expand Down
2 changes: 1 addition & 1 deletion psychopy_eyetracker_pupil_labs/pupil_labs/pupil_core/eyetracker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
logger = logging.getLogger(__name__)


class PupilCoreEyeTracker(EyeTrackerDevice):
class EyeTracker(EyeTrackerDevice):
"""
Implementation of the :py:class:`Common Eye Tracker Interface <.EyeTrackerDevice>`
for the Pupil Core headset.
Expand Down
8 changes: 2 additions & 6 deletions pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,9 @@ where = ["", "psychopy_eyetracker_pupil_labs",]
[tool.setuptools.package-data]
"*" = ["*.yaml", "*.png"]

[project.entry-points."psychopy.iohub.devices"]
NeonEyeTracker = "psychopy_eyetracker_pupil_labs.pupil_labs.neon.eyetracker:NeonEyeTracker"
PupilCoreEyeTracker = "psychopy_eyetracker_pupil_labs.pupil_labs.pupil_core.eyetracker:PupilCoreEyeTracker"

[project.entry-points."psychopy.iohub.devices.eyetracker"]
NeonEyeTracker = "psychopy_eyetracker_pupil_labs.pupil_labs.neon.eyetracker:NeonEyeTracker"
PupilCoreEyeTracker = "psychopy_eyetracker_pupil_labs.pupil_labs.pupil_core.eyetracker:PupilCoreEyeTracker"
neon = "psychopy_eyetracker_pupil_labs.pupil_labs.neon"
pupil_core = "psychopy_eyetracker_pupil_labs.pupil_labs.pupil_core"

[project.entry-points."psychopy.experiment.components"]
AprilTagComponent = "psychopy_eyetracker_pupil_labs:AprilTagComponent"
Loading