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

Jump to bottom

Use enum on aravis driver #412

Merged
merged 2 commits into from
Jun 26, 2024
Merged

Use enum on aravis driver #412

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f16552f
Use enum on aravis driver
callumforrester Jun 25, 2024
2dabf28
Update src/ophyd_async/epics/areadetector/drivers/aravis_driver.py
callumforrester Jun 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/ophyd_async/epics/areadetector/drivers/aravis_driver.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from enum import Enum
from typing import Literal

from ophyd_async.core import SubsetEnum
from ophyd_async.epics.areadetector.drivers import ADBase
from ophyd_async.epics.signal.signal import epics_signal_rw_rbv

Expand All @@ -19,7 +19,7 @@ class AravisTriggerMode(str, Enum):
To prevent requiring one Enum class per possible configuration, we set as this Enum
but read from the underlying signal as a str.
"""
AravisTriggerSource = Literal["Freerun", "Line1", "Line2", "Line3", "Line4"]
AravisTriggerSource = SubsetEnum["Freerun", "Line1"]


class AravisDriver(ADBase):
Expand All @@ -34,5 +34,7 @@ def __init__(self, prefix: str, name: str = "") -> None:
self.trigger_mode = epics_signal_rw_rbv(
AravisTriggerMode, prefix + "TriggerMode"
)
self.trigger_source = epics_signal_rw_rbv(str, prefix + "TriggerSource")
self.trigger_source = epics_signal_rw_rbv(
AravisTriggerSource, prefix + "TriggerSource"
)
super().__init__(prefix, name=name)