--- a/tests/svghmi/plc.xml Thu Oct 24 11:20:04 2019 +0200
+++ b/tests/svghmi/plc.xml Sun Oct 27 21:38:10 2019 +0100
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<project xmlns:ns1="http://www.plcopen.org/xml/tc6_0201" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.plcopen.org/xml/tc6_0201">
<fileHeader companyName="Unknown" productName="Unnamed" productVersion="1" creationDateTime="2019-08-06T14:23:42"/>
- <contentHeader name="Unnamed" modificationDateTime="2019-09-11T11:54:14">
+ <contentHeader name="Unnamed" modificationDateTime="2019-10-23T11:12:09">
<coordinateInfo>
<fbd>
<scaling x="5" y="5"/>
@@ -34,64 +34,6 @@
</interface>
<body>
<FBD>
- <block localId="2" typeName="ADD" executionOrderId="0" height="60" width="63">
- <position x="255" y="175"/>
- <inputVariables>
- <variable formalParameter="IN1">
- <connectionPointIn>
- <relPosition x="0" y="30"/>
- <connection refLocalId="1">
- <position x="255" y="205"/>
- <position x="202" y="205"/>
- </connection>
- </connectionPointIn>
- </variable>
- <variable formalParameter="IN2">
- <connectionPointIn>
- <relPosition x="0" y="50"/>
- <connection refLocalId="3">
- <position x="255" y="225"/>
- <position x="235" y="225"/>
- <position x="235" y="235"/>
- <position x="190" y="235"/>
- </connection>
- </connectionPointIn>
- </variable>
- </inputVariables>
- <inOutVariables/>
- <outputVariables>
- <variable formalParameter="OUT">
- <connectionPointOut>
- <relPosition x="63" y="30"/>
- </connectionPointOut>
- </variable>
- </outputVariables>
- </block>
- <inOutVariable localId="1" executionOrderId="0" height="26" width="122" negatedOut="false" negatedIn="false">
- <position x="120" y="190"/>
- <connectionPointIn>
- <relPosition x="0" y="15"/>
- <connection refLocalId="2" formalParameter="OUT">
- <position x="120" y="205"/>
- <position x="100" y="205"/>
- <position x="100" y="140"/>
- <position x="328" y="140"/>
- <position x="328" y="205"/>
- <position x="318" y="205"/>
- </connection>
- </connectionPointIn>
- <connectionPointOut>
- <relPosition x="122" y="15"/>
- </connectionPointOut>
- <expression>TargetPressure</expression>
- </inOutVariable>
- <inVariable localId="3" executionOrderId="0" height="25" width="60" negated="false">
- <position x="130" y="225"/>
- <connectionPointOut>
- <relPosition x="60" y="10"/>
- </connectionPointOut>
- <expression>1</expression>
- </inVariable>
<block localId="4" typeName="PumpControl" instanceName="Pump0" executionOrderId="0" height="40" width="127">
<position x="595" y="50"/>
<inputVariables>
@@ -140,7 +82,7 @@
</variable>
</inputVars>
<localVars>
- <variable name="AddOut">
+ <variable name="Sloth">
<type>
<derived name="HMI_INT"/>
</type>
@@ -149,59 +91,6 @@
</interface>
<body>
<FBD>
- <inOutVariable localId="1" executionOrderId="0" height="30" width="75" negatedOut="false" negatedIn="false">
- <position x="285" y="105"/>
- <connectionPointIn>
- <relPosition x="0" y="15"/>
- <connection refLocalId="2" formalParameter="OUT">
- <position x="285" y="120"/>
- <position x="275" y="120"/>
- <position x="275" y="95"/>
- <position x="550" y="95"/>
- <position x="550" y="135"/>
- <position x="540" y="135"/>
- </connection>
- </connectionPointIn>
- <connectionPointOut>
- <relPosition x="75" y="15"/>
- </connectionPointOut>
- <expression>Pressure</expression>
- </inOutVariable>
- <block localId="2" typeName="ADD" executionOrderId="0" height="60" width="65">
- <position x="475" y="105"/>
- <inputVariables>
- <variable formalParameter="IN1">
- <connectionPointIn>
- <relPosition x="0" y="30"/>
- <connection refLocalId="1">
- <position x="475" y="135"/>
- <position x="417" y="135"/>
- <position x="417" y="120"/>
- <position x="360" y="120"/>
- </connection>
- </connectionPointIn>
- </variable>
- <variable formalParameter="IN2">
- <connectionPointIn>
- <relPosition x="0" y="50"/>
- <connection refLocalId="3">
- <position x="475" y="155"/>
- <position x="432" y="155"/>
- <position x="432" y="150"/>
- <position x="410" y="150"/>
- </connection>
- </connectionPointIn>
- </variable>
- </inputVariables>
- <inOutVariables/>
- <outputVariables>
- <variable formalParameter="OUT">
- <connectionPointOut>
- <relPosition x="65" y="30"/>
- </connectionPointOut>
- </variable>
- </outputVariables>
- </block>
<inVariable localId="3" executionOrderId="0" height="25" width="30" negated="false">
<position x="380" y="140"/>
<connectionPointOut>
@@ -213,15 +102,33 @@
<position x="640" y="135"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
- <connection refLocalId="2" formalParameter="OUT">
+ <connection refLocalId="3">
<position x="640" y="150"/>
- <position x="590" y="150"/>
- <position x="590" y="135"/>
- <position x="540" y="135"/>
+ <position x="410" y="150"/>
</connection>
</connectionPointIn>
- <expression>AddOut</expression>
+ <expression>Sloth</expression>
</outVariable>
+ <outVariable localId="1" executionOrderId="0" height="30" width="75" negated="false">
+ <position x="285" y="105"/>
+ <connectionPointIn>
+ <relPosition x="0" y="15"/>
+ <connection refLocalId="5">
+ <position x="285" y="120"/>
+ <position x="240" y="120"/>
+ <position x="240" y="115"/>
+ <position x="195" y="115"/>
+ </connection>
+ </connectionPointIn>
+ <expression>Pressure</expression>
+ </outVariable>
+ <inVariable localId="5" executionOrderId="0" height="30" width="125" negated="false">
+ <position x="70" y="100"/>
+ <connectionPointOut>
+ <relPosition x="125" y="15"/>
+ </connectionPointOut>
+ <expression>TargetPressure</expression>
+ </inVariable>
</FBD>
</body>
</pou>