Skip to content

FIX: Two critical fixes to Eurotherm #58

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

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

FIX: Two critical fixes to Eurotherm #58

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
8e76616
Move timer start out of callback.
danielballan Apr 15, 2019
c490048
FIX: stop() method must access `success` parameter.
danielballan Apr 15, 2019
1ad4156
Try adding netifaces for caproto.
danielballan Apr 16, 2019
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
8 changes: 3 additions & 5 deletions nslsii/temperature_controllers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,13 +63,11 @@ def timer_cleanup():
self.readback.clear_sub(status_indicator)
status._finished(success=False)

# Add a Timer to ensure that timeout occurs.
self._cb_timer = threading.Timer(self.timeout.get(), timer_cleanup)

self._cb_timer.start()
# set up the done moving indicator logic
def status_indicator(value, timestamp, **kwargs):
# add a Timer to ensure that timeout occurs.
if not self._cb_timer.is_alive():
self._cb_timer.start()

nonlocal initial_timestamp
if abs(value - set_value) < tolerance:
Expand All @@ -93,7 +91,7 @@ def status_indicator(value, timestamp, **kwargs):
# hand the status object back to the RE
return status

def stop(self):
def stop(self, success=False):
# overide the lock, cancel the timer and remove the subscription on any
# in progress sets
self._set_lock.release()
Expand Down
1 change: 1 addition & 0 deletions requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ databroker
ipython
ipywidgets
matplotlib
netifaces
numpy
ophyd
psutil
Expand Down