merged master with work

Change-Id: Iedfb2bf7f28bfe45201adacec0645cc13abffe59
This commit is contained in:
2021-03-03 09:00:45 +01:00
parent fee7c4904b
commit 12b0549cc0
365 changed files with 36809 additions and 11 deletions

View File

@ -1,20 +1,24 @@
[node LscSIM.psi.ch]
[NODE]
id = ls370res.psi.ch
description = Lsc370 Test
[interface tcp]
type = tcp
bindto = 0.0.0.0
bindport = 5000
[INTERFACE]
uri = tcp://5000
[module lsmain]
class = secop_psi.ls370res.Main
description = main control of Lsc controller
[lsmain_iodev]
description = the communication device
class = secop_psi.ls370res.StringIO
uri = localhost:4567
[module res]
[lsmain]
class = secop_psi.ls370res.Main
description = main control of Lsc controller
iodev = lsmain_iodev
[res]
class = secop_psi.ls370res.ResChannel
vexc = '2mV'
channel = 3
iexc = '1mA'
channel = 5
description = resistivity
main = lsmain
# the auto created iodev from lsmain: