Skip to content

Add a Valve class #245

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

Draft
Jennefer Maldonado (jennmald) wants to merge 4 commits into
base: main
Choose a base branch
from
Draft

Add a Valve class #245

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
453560b
draft: value using two button shutter
jennmald Feb 27, 2026
5c03a81
move valve class
jennmald Mar 3, 2026
1b04422
better naming conventions
jennmald Mar 4, 2026
62cbe30
move stop functions
jennmald Mar 6, 2026
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
34 changes: 19 additions & 15 deletions nslsii/devices.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,7 @@

_time_fmtstr = '%Y-%m-%d %H:%M:%S'


class TwoButtonShutter(Device):
# TODO: this needs to be fixed in EPICS as these names make no sense
# the value coming out of the PV does not match what is shown in CSS
class TwoButtonActuator(Device):
RETRY_PERIOD = 0.5
MAX_ATTEMPTS = 10
open_cmd = Cpt(EpicsSignal, 'Cmd:Opn-Cmd', string=True)
Expand Down Expand Up @@ -97,17 +94,6 @@ def cmd_retry_cb(value, timestamp, **kwargs):

return st

def stop(self, *, success=False):
import time
prev_st = self._set_st
if prev_st is not None:
while not prev_st.done:
time.sleep(.1)
self._was_open = (self.open_val == self.status.get())
st = self.set('Close')
while not st.done:
time.sleep(.5)

def resume(self):
import time
prev_st = self._set_st
Expand All @@ -128,3 +114,21 @@ def __init__(self, *args, **kwargs):
super().__init__(*args, **kwargs)
self._set_st = None
self.read_attrs = ['status']


class TwoButtonActuatorAutoClose(TwoButtonActuator):
def stop(self, *, success=False):
Copy link
Copy Markdown
Contributor

@tacaswell Thomas A Caswell (tacaswell) Mar 4, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This now does not close despite the name.

The default stop method is a no-op so we should move the stop from the other class to this one.

Copy link
Copy Markdown
Contributor Author

@jennmald Jennefer Maldonado (jennmald) Mar 6, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not sure if I just made it worse.

import time
prev_st = self._set_st
if prev_st is not None:
while not prev_st.done:
time.sleep(.1)
self._was_open = (self.open_val == self.status.get())
st = self.set('Close')
while not st.done:
time.sleep(.5)

class TwoButtonShutter(TwoButtonActuatorAutoClose):
def stop(self, *, success=False):
# overide the stop method to always close the shutter
...