remove Message objects + rewrite server startup

Change-Id: Ide72fb915c3ca93c74edadd8952853508e677de7
Reviewed-on: https://forge.frm2.tum.de/review/19199
Tested-by: JenkinsCodeReview <bjoern_pedersen@frm2.tum.de>
Reviewed-by: Enrico Faulhaber <enrico.faulhaber@frm2.tum.de>
This commit is contained in:
Enrico Faulhaber
2018-10-15 14:24:34 +02:00
parent 9824b9216d
commit 87261382cf
30 changed files with 337 additions and 578 deletions

View File

@ -1,4 +1,4 @@
[equipment MLZ_amagnet(Garfield)]
[node MLZ_amagnet(Garfield)]
description=MLZ-Amagnet
.
Water cooled magnet from ANTARES@MLZ.
@ -14,12 +14,9 @@ visibility=expert
foo=bar
[interface tcp]
interface=tcp
type=tcp
bindto=0.0.0.0
bindport=10767
# protocol to use for this interface
framing=eol
encoding=secop
[module enable]
class=secop_mlz.entangle.NamedDigitalOutput

View File

@ -6,12 +6,9 @@ description = CCR12 box of MLZ Sample environment group
[interface tcp]
interface=tcp
type=tcp
bindto=0.0.0.0
bindport=10767
# protocol to use for this interface
framing=eol
encoding=secop
[module automatik]
class=secop_mlz.entangle.NamedDigitalOutput

View File

@ -1,4 +1,4 @@
[equipment cryo_7]
[node cryo_7]
# set SEC-node properties
description = short description
.
@ -6,12 +6,9 @@ description = short description
[interface tcp]
interface=tcp
type=tcp
bindto=0.0.0.0
bindport=10769
# protocol to use for this interface
framing=eol
encoding=secop
[module cryo]

View File

@ -1,13 +1,9 @@
[equipment Equipment_ID_for_demonstration]
[node Equipment_ID_for_demonstration]
description = virtual modules to play around with
[interface tcp]
interface=tcp
bindto=0.0.0.0
bindport=10767
# protocol to use for this interface
framing=eol
encoding=secop
[module heatswitch]
class=secop_demo.modules.Switch
@ -23,7 +19,7 @@ class=secop_demo.modules.SampleTemp
sensor = 'Q1329V7R3'
ramp = 4
target = 10
default = 10
value = 10
[module tc1]
class=secop_demo.modules.CoilTemp

View File

@ -1,20 +1,10 @@
[equipment see_demo_equipment]
[node see_demo_equipment]
description=Do not use, it needs to be rewritten....
[client]
connectto=0.0.0.0
port=10767
interface = tcp
framing=eol
encoding=secop
[interface testing]
interface=tcp
type=tcp
bindto=0.0.0.0
bindport=10767
# protocol to use for this interface
framing=eol
encoding=secop
[module tc1]
class=secop_demo.modules.CoilTemp

View File

@ -4,12 +4,9 @@ description=description of the simulation sec-node
Testing simulation dummy setup.
[interface tcp]
interface=tcp
type=tcp
bindto=0.0.0.0
bindport=10767
# protocol to use for this interface
framing=eol
encoding=secop
[module sim]

View File

@ -1,4 +1,4 @@
[equipment SIM_MLZ_amagnet(Garfield)]
[node SIM_MLZ_amagnet(Garfield)]
description=MLZ-Amagnet
.
Water cooled magnet from ANTARES@MLZ.
@ -14,12 +14,9 @@ visibility=expert
foo=bar
[interface tcp]
interface=tcp
type=tcp
bindto=0.0.0.0
bindport=10767
# protocol to use for this interface
framing=eol
encoding=secop
[module enable]
class=secop.simulation.SimWritable

View File

@ -7,12 +7,9 @@ description = [sim] cci3he box of MLZ Sample environment group
.meaning={'T_regulation':{'T_cci3he1':300}, 'T_sample':{'T_cci3he1_A':300, 'T_cci3he1_B':280}}
[interface tcp]
interface=tcp
type=tcp
bindto=0.0.0.0
bindport=10767
# protocol to use for this interface
framing=eol
encoding=secop
[module T_cci3he1]
class=secop.simulation.SimDrivable

View File

@ -7,12 +7,9 @@ description = [sim] ccidu box of MLZ Sample environment group
.meaning={'T_regulation':{'T_ccidu1':300}, 'T_sample':{'T_ccidu1_A':300, 'T_ccidu1_B':280}}
[interface tcp]
interface=tcp
type=tcp
bindto=0.0.0.0
bindport=10767
# protocol to use for this interface
framing=eol
encoding=secop
[module T_ccidu1]
class=secop.simulation.SimDrivable

View File

@ -9,12 +9,9 @@ description = [sim] CCR12 box of MLZ Sample environment group
.meaning={'T_regulation':{'T_ccr12':200, 'T_ccr12_stick':150, 'T_ccr12_tube':100}, 'T_sample':{'T_ccr12_B':100, 'T_ccr12_A':90, 'T_ccr12_D':20, 'T_ccr12_C':10}}
[interface tcp]
interface=tcp
type=tcp
bindto=0.0.0.0
bindport=10767
# protocol to use for this interface
framing=eol
encoding=secop
[module T_ccr12]
class=secop.simulation.SimDrivable

View File

@ -9,12 +9,9 @@ description = [sim] CCR12 box of MLZ Sample environment group
.meaning={'T_regulation':{'T_ccr12':200, 'T_ccr12_stick':150, 'T_ccr12_tube':100}, 'T_sample':{'T_ccr12_B':100, 'T_ccr12_A':90, 'T_ccr12_D':20, 'T_ccr12_C':10}}
[interface tcp]
interface=tcp
type=tcp
bindto=0.0.0.0
bindport=10767
# protocol to use for this interface
framing=eol
encoding=secop
[module T_ccr12]
class=secop.simulation.SimDrivable

View File

@ -6,12 +6,9 @@ description = [sim] htf02 box of MLZ Sample environment group
.meaning={'T_regulation':{'T_htf02':100}, 'T_sample':{'T_htf02':100}}
[interface tcp]
interface=tcp
type=tcp
bindto=0.0.0.0
bindport=10767
# protocol to use for this interface
framing=eol
encoding=secop
[module T_htf02]
class=secop.simulation.SimDrivable

View File

@ -6,12 +6,9 @@ description = [sim] Stressihtf2 box of MLZ Sample environment group
.meaning={'T_regulation':{'T_stressihtf2':100}, 'T_sample':{'T_stressihtf2':100}}
[interface tcp]
interface=tcp
type=tcp
bindto=0.0.0.0
bindport=10767
# protocol to use for this interface
framing=eol
encoding=secop
[module T_stressihtf2]
class=secop.simulation.SimDrivable

View File

@ -6,12 +6,9 @@ description = [sim] Stressihtf2 box of MLZ Sample environment group
meaning={'T_regulation':{'T':100}, 'T_sample':{'T_sample':100}}
[interface tcp]
interface=tcp
type=tcp
bindto=0.0.0.0
bindport=10767
# protocol to use for this interface
framing=eol
encoding=secop
[module T]
class=secop.simulation.SimDrivable

View File

@ -6,12 +6,9 @@ description = Stressihtf2 box of MLZ Sample environment group
meaning={'T_regulation':{'T':100}, 'T_sample':{'T_sample':100}}
[interface tcp]
interface=tcp
type=tcp
bindto=0.0.0.0
bindport=10767
# protocol to use for this interface
framing=eol
encoding=secop
[module T]
class=secop_mlz.entangle.TemperatureController

View File

@ -9,12 +9,9 @@ description=description of the testing sec-node
These texts are supposed to be possibly very long.
[interface tcp]
interface=tcp
type=tcp
bindto=0.0.0.0
bindport=10768
# protocol to use for this interface
framing=eol
encoding=secop
[module LN2]