up to date with develop/mlz
Change-Id: I5ea71bc99a2f0dffc3dbe37e1119eb188ef8a3f0
This commit is contained in:
parent
532e4a7ab5
commit
e201e7dce9
@ -1,5 +1,3 @@
|
|||||||
#!/usr/bin/env python
|
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
# *****************************************************************************
|
# *****************************************************************************
|
||||||
# This program is free software; you can redistribute it and/or modify it under
|
# This program is free software; you can redistribute it and/or modify it under
|
||||||
# the terms of the GNU General Public License as published by the Free Software
|
# the terms of the GNU General Public License as published by the Free Software
|
||||||
@ -17,64 +15,13 @@
|
|||||||
#
|
#
|
||||||
# Module authors:
|
# Module authors:
|
||||||
# Oksana Shliakhtun <oksana.shliakhtun@psi.ch>
|
# Oksana Shliakhtun <oksana.shliakhtun@psi.ch>
|
||||||
|
# Markus Zolliker <markus.zolliker@psi.ch>
|
||||||
# *****************************************************************************
|
# *****************************************************************************
|
||||||
""" RUFS Command: Description of Bits
|
"""bath thermostat Thermo Scientific™ ARCTIC A10 Refrigerated Circulators"""
|
||||||
|
|
||||||
====== ======================================================== ==============================================
|
from frappy.core import Command, StringIO, Parameter, HasIO, \
|
||||||
Value Description
|
|
||||||
====== ======================================================== ==============================================
|
|
||||||
V1
|
|
||||||
B6: warning, rtd1 (internal temp. sensor) is shorted
|
|
||||||
B0 --> 1
|
|
||||||
B7: warning, rtd1 is open
|
|
||||||
B1 --> 2
|
|
||||||
V2
|
|
||||||
B0: error, HTC (high temperature cutout) fault B2 --> 4
|
|
||||||
|
|
||||||
B1: error, high RA (refrigeration) temperature fault B3 --> 8
|
|
||||||
|
|
||||||
V3 B4 --> 16
|
|
||||||
B0: warning, low level in the bath
|
|
||||||
B5 --> 32
|
|
||||||
B1: warning, low temperature
|
|
||||||
B6 --> 64
|
|
||||||
B2: warning, high temperature
|
|
||||||
B7 --> 128
|
|
||||||
B3: error, low level in the bath
|
|
||||||
|
|
||||||
B4: error, low temperature fault
|
|
||||||
|
|
||||||
B5: error, high temperature fault
|
|
||||||
|
|
||||||
B6: error, low temperature fixed* fault
|
|
||||||
|
|
||||||
B7: error, high temperature fixed** fault
|
|
||||||
|
|
||||||
V4
|
|
||||||
B3: idle, circulator** is running
|
|
||||||
|
|
||||||
B5: error, circulator** fault
|
|
||||||
|
|
||||||
V5
|
|
||||||
B0: error, pump speed fault
|
|
||||||
|
|
||||||
B1: error, motor overloaded
|
|
||||||
|
|
||||||
B2: error, high pressure cutout
|
|
||||||
|
|
||||||
B3: idle, maximum cooling
|
|
||||||
|
|
||||||
B4: idle, cooling
|
|
||||||
|
|
||||||
B5: idle, maximum heating
|
|
||||||
|
|
||||||
B6: idle, heating
|
|
||||||
====== ======================================================== ==============================================
|
|
||||||
|
|
||||||
"""
|
|
||||||
|
|
||||||
from frappy.core import StringIO, Parameter, HasIO, \
|
|
||||||
Drivable, FloatRange, IDLE, BUSY, ERROR, WARN, BoolType
|
Drivable, FloatRange, IDLE, BUSY, ERROR, WARN, BoolType
|
||||||
|
from frappy.structparam import StructParam
|
||||||
from frappy_psi.convergence import HasConvergence
|
from frappy_psi.convergence import HasConvergence
|
||||||
|
|
||||||
|
|
||||||
@ -85,17 +32,17 @@ class ThermFishIO(StringIO):
|
|||||||
|
|
||||||
class TemperatureLoopA10(HasConvergence, HasIO, Drivable):
|
class TemperatureLoopA10(HasConvergence, HasIO, Drivable):
|
||||||
ioClass = ThermFishIO
|
ioClass = ThermFishIO
|
||||||
value = Parameter('internal temperature', unit='degC')
|
|
||||||
value = Parameter('temperature', unit='degC')
|
value = Parameter('temperature', unit='degC')
|
||||||
target = Parameter('setpoint/target', datatype=FloatRange, unit='degC', default=0)
|
target = Parameter('setpoint/target', datatype=FloatRange, unit='degC', default=0)
|
||||||
circ_on = Parameter('is circulation running', BoolType(), readonly=False, default=False)
|
control_active = Parameter('circilation and control is on', BoolType(), default=False)
|
||||||
# pids
|
ctrlpars = StructParam('control parameters struct', dict(
|
||||||
p_heat = Parameter('proportional heat parameter', FloatRange(), readonly=False)
|
p_heat = Parameter('proportional heat parameter', FloatRange()),
|
||||||
i_heat = Parameter('integral heat parameter', FloatRange(), readonly=False)
|
i_heat = Parameter('integral heat parameter', FloatRange()),
|
||||||
d_heat = Parameter('derivative heat parameter', FloatRange(), readonly=False)
|
d_heat = Parameter('derivative heat parameter', FloatRange()),
|
||||||
p_cool = Parameter('proportional cool parameter', FloatRange(), readonly=False)
|
p_cool = Parameter('proportional cool parameter', FloatRange()),
|
||||||
i_cool = Parameter('integral cool parameter', FloatRange(), readonly=False)
|
i_cool = Parameter('integral cool parameter', FloatRange()),
|
||||||
d_cool = Parameter('derivative cool parameter', FloatRange(), readonly=False)
|
d_cool = Parameter('derivative cool parameter', FloatRange()),
|
||||||
|
), readonly=False)
|
||||||
|
|
||||||
status_messages = [
|
status_messages = [
|
||||||
(ERROR, 'high tempr. cutout fault', 2, 0),
|
(ERROR, 'high tempr. cutout fault', 2, 0),
|
||||||
@ -122,20 +69,22 @@ class TemperatureLoopA10(HasConvergence, HasIO, Drivable):
|
|||||||
]
|
]
|
||||||
|
|
||||||
def get_par(self, cmd):
|
def get_par(self, cmd):
|
||||||
"""
|
"""get parameter and convert to float
|
||||||
All the reading commands starts with 'R', in the source code all the commands are written without 'R' (except
|
|
||||||
'RUFS').The result of a reading command is a value in the format '20C', without spaces.
|
|
||||||
|
|
||||||
:param cmd: any hardware command
|
:param cmd: hardware command without the leading 'R'
|
||||||
|
|
||||||
:return: 'R'+cmd
|
:return: result converted to float
|
||||||
"""
|
"""
|
||||||
new_cmd = 'R' + cmd
|
new_cmd = 'R' + cmd
|
||||||
reply = self.communicate(new_cmd)
|
reply = self.communicate(new_cmd).strip()
|
||||||
if any(unit.isalpha() for unit in reply):
|
while reply[-1].isalpha():
|
||||||
reply = ''.join(unit for unit in reply if not unit.isalpha())
|
reply = reply[:-1]
|
||||||
return float(reply)
|
return float(reply)
|
||||||
|
|
||||||
|
def set_par(self, cmd, value):
|
||||||
|
self.communicate(f'S{cmd} {value}')
|
||||||
|
return self.get_par(cmd)
|
||||||
|
|
||||||
def read_value(self):
|
def read_value(self):
|
||||||
"""
|
"""
|
||||||
Reading internal temperature sensor value.
|
Reading internal temperature sensor value.
|
||||||
@ -143,6 +92,34 @@ class TemperatureLoopA10(HasConvergence, HasIO, Drivable):
|
|||||||
return self.get_par('T')
|
return self.get_par('T')
|
||||||
|
|
||||||
def read_status(self):
|
def read_status(self):
|
||||||
|
""" convert from RUFS Command: Description of Bits
|
||||||
|
|
||||||
|
====== ======================================================== ===============
|
||||||
|
Value Description
|
||||||
|
====== ======================================================== ===============
|
||||||
|
V1 B6: warning, rtd1 (internal temp. sensor) is shorted B0 --> 1
|
||||||
|
B7: warning, rtd1 is open B1 --> 2
|
||||||
|
V2 B0: error, HTC (high temperature cutout) fault B2 --> 4
|
||||||
|
B1: error, high RA (refrigeration) temperature fault B3 --> 8
|
||||||
|
V3 B0: warning, low level in the bath B5 --> 32
|
||||||
|
B1: warning, low temperature B6 --> 64
|
||||||
|
B2: warning, high temperature B7 --> 128
|
||||||
|
B3: error, low level in the bath
|
||||||
|
B4: error, low temperature fault
|
||||||
|
B5: error, high temperature fault
|
||||||
|
B6: error, low temperature fixed* fault
|
||||||
|
B7: error, high temperature fixed** fault
|
||||||
|
V4 B3: idle, circulator** is running
|
||||||
|
B5: error, circulator** fault
|
||||||
|
V5 B0: error, pump speed fault
|
||||||
|
B1: error, motor overloaded
|
||||||
|
B2: error, high pressure cutout
|
||||||
|
B3: idle, maximum cooling
|
||||||
|
B4: idle, cooling
|
||||||
|
B5: idle, maximum heating
|
||||||
|
B6: idle, heating
|
||||||
|
====== ======================================================== ===============
|
||||||
|
"""
|
||||||
result_str = self.communicate('RUFS') # read unit fault status
|
result_str = self.communicate('RUFS') # read unit fault status
|
||||||
values_str = result_str.strip().split()
|
values_str = result_str.strip().split()
|
||||||
values_int = [int(val) for val in values_str]
|
values_int = [int(val) for val in values_str]
|
||||||
@ -157,72 +134,55 @@ class TemperatureLoopA10(HasConvergence, HasIO, Drivable):
|
|||||||
return status_type, status_msg
|
return status_type, status_msg
|
||||||
return WARN, 'circulation off'
|
return WARN, 'circulation off'
|
||||||
|
|
||||||
def read_circ_on(self):
|
def read_control_active(self):
|
||||||
return self.communicate('RO')
|
return int(self.get_par('O'))
|
||||||
|
|
||||||
def write_circ_on(self, circ_on):
|
@Command
|
||||||
circ_on_str = '1' if circ_on else '0'
|
def control_off(self):
|
||||||
self.communicate(f'SO {circ_on_str}')
|
"""switch control and circulation off"""
|
||||||
return self.read_circ_on()
|
self.control_active = self.set_par('O', 0)
|
||||||
|
|
||||||
def read_target(self):
|
def read_target(self):
|
||||||
return self.get_par('S')
|
return self.get_par('S')
|
||||||
|
|
||||||
def write_target(self, target):
|
def write_target(self, target):
|
||||||
"""
|
self.control_active = self.set_par('O', 1)
|
||||||
:param target: here, it serves as an equivalent to a setpoint.
|
|
||||||
"""
|
|
||||||
self.write_circ_on('1')
|
|
||||||
self.communicate(f'SS {target}')
|
self.communicate(f'SS {target}')
|
||||||
self.convergence_start()
|
self.convergence_start()
|
||||||
return target
|
return target
|
||||||
|
|
||||||
## heat PID
|
|
||||||
def read_p_heat(self):
|
def read_p_heat(self):
|
||||||
p_heat = self.get_par('PH')
|
return self.get_par('PH')
|
||||||
return float(p_heat)
|
|
||||||
|
|
||||||
def write_p_heat(self, p_heat):
|
def write_p_heat(self, value):
|
||||||
self.communicate(f'SPH {p_heat}')
|
return self.set_par('PH', value)
|
||||||
return p_heat
|
|
||||||
|
|
||||||
def read_i_heat(self):
|
def read_i_heat(self):
|
||||||
i_heat = self.get_par('IH')
|
return self.get_par('IH')
|
||||||
return float(i_heat)
|
|
||||||
|
|
||||||
def write_i_heat(self, i_heat):
|
def write_i_heat(self, value):
|
||||||
self.communicate(f'SIH {i_heat}')
|
return self.set_par('IH', value)
|
||||||
return i_heat
|
|
||||||
|
|
||||||
def read_d_heat(self):
|
def read_d_heat(self):
|
||||||
d_heat = self.get_par('DH')
|
return self.get_par('DH')
|
||||||
return float(d_heat)
|
|
||||||
|
|
||||||
def write_d_heat(self, d_heat):
|
def write_d_heat(self, value):
|
||||||
self.communicate(f'SDH {d_heat}')
|
return self.set_par('DH', value)
|
||||||
return d_heat
|
|
||||||
|
|
||||||
## cool PID
|
|
||||||
def read_p_cool(self):
|
def read_p_cool(self):
|
||||||
p_cool = self.get_par('PC')
|
return self.get_par('PC')
|
||||||
return float(p_cool)
|
|
||||||
|
|
||||||
def write_p_cool(self, p_cool):
|
def write_p_cool(self, value):
|
||||||
self.communicate(f'SPC {p_cool}')
|
return self.set_par('PC', value)
|
||||||
return p_cool
|
|
||||||
|
|
||||||
def read_i_cool(self):
|
def read_i_cool(self):
|
||||||
i_cool = self.get_par('IC')
|
return self.get_par('IC')
|
||||||
return float(i_cool)
|
|
||||||
|
|
||||||
def write_i_cool(self, i_cool):
|
def write_i_cool(self, value):
|
||||||
self.communicate(f'SIC {i_cool}')
|
return self.set_par('IC', value)
|
||||||
return i_cool
|
|
||||||
|
|
||||||
def read_d_cool(self):
|
def read_d_cool(self):
|
||||||
d_cool = self.get_par('DC')
|
return self.get_par('DC')
|
||||||
return float(d_cool)
|
|
||||||
|
|
||||||
def write_d_cool(self, d_cool):
|
def write_d_cool(self, value):
|
||||||
self.communicate(f'SDC {d_cool}')
|
return self.set_par('DC', value)
|
||||||
return d_cool
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user