linse/frappy
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

frappy_psi.magfield: bug in progress check

Browse Source 
must check for self.current (not self.value)

+ fix in mercury: __ramping must be initialized
This commit is contained in:
zolliker 2023-05-31 08:42:17 +02:00
parent db94def694
commit 004533655f
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frappy_psi/magfield.py
View File

@ -392,7 +392,7 @@ class Magfield(SimpleMagfield):
if sm.init: if sm.init:
self.init_progress(sm, self.current) self.init_progress(sm, self.current)
if abs(self.current) > self.tolerance: if abs(self.current) > self.tolerance:
if self.get_progress(sm, self.value) > self.leads_ramp_tmo: if self.get_progress(sm, self.current) > self.leads_ramp_tmo:
raise HardwareError('no progress') raise HardwareError('no progress')
return Retry return Retry
if sm.mode == Mode.DISABLED and abs(self.value) < self.tolerance: if sm.mode == Mode.DISABLED and abs(self.value) < self.tolerance:

1
frappy_psi/mercury.py
View File

@ -362,6 +362,7 @@ class TemperatureLoop(TemperatureSensor, ConvLoop):
tolerance = Parameter(default=0.1) tolerance = Parameter(default=0.1)
_last_setpoint_change = None _last_setpoint_change = None
__status = IDLE, '' __status = IDLE, ''
__ramping = False
# overridden in subclass frappy_psi.triton.TemperatureLoop # overridden in subclass frappy_psi.triton.TemperatureLoop
ENABLE = 'TEMP:LOOP:ENAB' ENABLE = 'TEMP:LOOP:ENAB'
ENABLE_RAMP = 'TEMP:LOOP:RENA' ENABLE_RAMP = 'TEMP:LOOP:RENA'