fixed heater level

- should be percent
- round to integer before writing to logo
This commit is contained in:
zolliker 2024-06-11 13:47:36 +02:00
parent 5e5f262472
commit 92a8dfac5d
2 changed files with 235 additions and 0 deletions

102
cfg/kapillarheizung_cfg.py Normal file
View File

@ -0,0 +1,102 @@
Node('Gas10kA.psi.ch',
'LOGO for 10kBar Gas pressure stick',
interface='tcp://5001',
)
Mod('io',
'frappy_psi.logo.IO',
'',
ip_address = "192.168.1.1",
tcap_client = 0x3000,
tsap_server = 0x2000
)
Mod('PT10000',
'frappy_psi.logo.TempSensor',
'sensor',
io = 'io',
vm_address ="VW0",
)
Mod('T_pt10k',
'frappy_psi.softcal.Sensor',
'?',
value=Param(unit='K'),
rawsensor='PT10000',
calib='pt10000e',
)
Mod('PT1000_oben',
'frappy_psi.logo.TempSensor',
'sensor',
io = 'io',
vm_address ="VW2",
)
Mod('T_top',
'frappy_psi.softcal.Sensor',
'?',
value=Param(unit='K'),
rawsensor='PT1000_oben',
calib='pt1000e',
)
Mod('PT1000_mitte',
'frappy_psi.logo.TempSensor',
'sensor',
io = 'io',
vm_address ="VW4",
)
Mod('T_mid',
'frappy_psi.softcal.Sensor',
'?',
value=Param(unit='K'),
rawsensor='PT1000_mitte',
calib='pt1000e',
)
Mod('PT1000_unten',
'frappy_psi.logo.TempSensor',
'sensor',
io = 'io',
vm_address ="VW6",
)
Mod('T_bot',
'frappy_psi.softcal.Sensor',
'?',
value=Param(unit='K'),
rawsensor='PT1000_unten',
calib='pt1000e',
)
Mod('Cernox',
'frappy_psi.logo.TempSensor',
'sensor',
io = 'io',
vm_address ="VW8",
)
Mod('T_cx',
'frappy_psi.softcal.Sensor',
'?',
value=Param(unit='K'),
rawsensor='Cernox',
calib='X174785',
)
Mod('HeaterLevelHigh',
'frappy_psi.logo.HeaterParam',
'heater param',
io = 'io',
vm_address = "VW10",
)
# currently unused:
#Mod('HeaterLevelLow',
# 'frappy_psi.logo.HeaterParam',
# 'heater param',
# io = 'io',
# vm_address = "VW12",
#)

133
frappy_psi/logo.py Normal file
View File

@ -0,0 +1,133 @@
# *****************************************************************************
#
# 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
# Foundation; either version 2 of the License, or (at your option) any later
# version.
#
# This program is distributed in the hope that it will be useful, but WITHOUT
# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
# FOR A PARTICULAR PURPOSE. See the GNU General Public License for more
# details.
#
# You should have received a copy of the GNU General Public License along with
# this program; if not, write to the Free Software Foundation, Inc.,
# 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
#
# Module authors:
# Andrea Plank <andrea.plank@psi.ch>
# Markus Zolliker <markus.zolliker@psi.ch>
#
# *****************************************************************************
from ast import literal_eval
from threading import RLock
import snap7
from frappy.core import Readable, Parameter, FloatRange, HasIO, StringIO, Property, StringType,IDLE, BUSY, WARN, ERROR,Writable, Drivable, BoolType, IntRange, Communicator
from frappy.errors import CommunicationFailedError
class IO(Communicator):
tcap_client = Property('tcap_client', IntRange())
tsap_server = Property('tcap_server', IntRange())
ip_address = Property('numeric ip address', StringType())
_plc = None
def _init(self):
if not self._plc:
self._lock = RLock()
self._plc = snap7.logo.Logo()
self._plc.connect(self.ip_address, self.tcap_client, self.tsap_server)
if not self._plc.get_connected():
raise CommunicationFailedError
def communicate(self, cmd):
self._init()
with self._lock:
cmd = cmd.split(maxsplit=1)
if len(cmd) == 2:
self._plc.write(cmd[0], literal_eval(cmd[1]))
return self._plc.read(cmd[0])
class Snap7Mixin(HasIO):
ioclass = IO
def get_vm_value(self, vm_address):
return self.io.communicate(vm_address)
def set_vm_value(self, vm_address, value):
return self.io.communicate(f'{vm_address} {value}')
class Pressure(Snap7Mixin, Readable):
vm_address = Property('VM address', datatype= StringType())
value = Parameter('pressure', datatype = FloatRange(unit = 'mbar'))
pollinterval = 0.5
def read_value(self):
return self.get_vm_value(self.vm_address)
def read_status(self):
return IDLE, ''
class Valve(Snap7Mixin, Drivable):
vm_address_input = Property('VM address input', datatype= StringType())
vm_address_output = Property('VM address output', datatype= StringType())
target = Parameter('Valve target', datatype = BoolType())
value = Parameter('Value state', datatype = BoolType())
def read_value(self):
return self.get_vm_value(self.vm_address_input)
def write_target(self, target):
return self.set_vm_value(self.vm_address_output, target)
def read_status(self):
return IDLE, ''
class FluidMachines(Snap7Mixin, Drivable):
vm_address_output = Property('VM address output', datatype= StringType())
target = Parameter('Valve target', datatype = BoolType())
value = Parameter('Value state', datatype = BoolType())
def read_value(self):
return self.get_vm_value(self.vm_address_output)
def write_target(self, target):
return self.set_vm_value(self.vm_address_output, target)
def read_status(self):
return IDLE, ''
class TempSensor(Snap7Mixin, Readable):
vm_address = Property('VM address', datatype= StringType())
value = Parameter('resistance', datatype = FloatRange(unit = 'Ohm'))
def read_value(self):
return self.get_vm_value(self.vm_address)
def read_status(self):
return IDLE, ''
class HeaterParam(Snap7Mixin, Writable):
vm_address = Property('VM address output', datatype= StringType())
target = Parameter('Heater target', datatype = FloatRange(unit='%'))
value = Parameter('Heater Param', datatype = FloatRange(unit='%'))
def read_value(self):
return self.get_vm_value(self.vm_address) * 0.1
def write_target(self, target):
return self.set_vm_value(self.vm_address, round(target * 10)) * 0.1
def read_status(self):
return IDLE, ''