--- a/tests/logging/plc.xml Tue Aug 21 13:05:23 2018 +0300
+++ b/tests/logging/plc.xml Fri Aug 24 13:25:05 2018 +0300
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='utf-8'?>
<project xmlns="http://www.plcopen.org/xml/tc6_0201" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xhtml="http://www.w3.org/1999/xhtml" xsi:schemaLocation="http://www.plcopen.org/xml/tc6_0201">
<fileHeader companyName="Unknown" productName="Generic PLC" productVersion="1" creationDateTime="2013-01-29T14:01:00" contentDescription="This example shows logging functionality in Beremiz. Here are shown two ways of logging: - from IEC PLC program; - from python extension. "/>
- <contentHeader name="Logging example" modificationDateTime="2016-09-09T17:54:15">
+ <contentHeader name="Logging example" modificationDateTime="2018-08-24T13:12:45">
<coordinateInfo>
<fbd>
<scaling x="0" y="0"/>
@@ -53,21 +53,21 @@
<body>
<FBD>
<inVariable localId="2" height="30" width="170" executionOrderId="0" negated="false">
- <position x="507" y="347"/>
+ <position x="507" y="365"/>
<connectionPointOut>
<relPosition x="170" y="15"/>
</connectionPointOut>
<expression>'IEC side logging: beat #'</expression>
</inVariable>
<block localId="3" width="59" height="40" typeName="NOT" executionOrderId="0">
- <position x="241" y="269"/>
+ <position x="241" y="287"/>
<inputVariables>
<variable formalParameter="IN">
<connectionPointIn>
<relPosition x="0" y="30"/>
<connection refLocalId="14" formalParameter="Q">
- <position x="241" y="299"/>
- <position x="195" y="299"/>
+ <position x="241" y="317"/>
+ <position x="197" y="317"/>
</connection>
</connectionPointIn>
</variable>
@@ -81,37 +81,37 @@
</variable>
</outputVariables>
</block>
- <inOutVariable localId="4" height="27" width="51" executionOrderId="0" negatedOut="false" negatedIn="false">
- <position x="66" y="286"/>
+ <inOutVariable localId="4" height="30" width="51" executionOrderId="0" negatedOut="false" negatedIn="false">
+ <position x="66" y="304"/>
<connectionPointIn>
- <relPosition x="0" y="13"/>
+ <relPosition x="0" y="15"/>
<connection refLocalId="3" formalParameter="OUT">
- <position x="66" y="299"/>
- <position x="37" y="299"/>
- <position x="37" y="372"/>
- <position x="314" y="372"/>
- <position x="314" y="299"/>
- <position x="300" y="299"/>
+ <position x="66" y="319"/>
+ <position x="37" y="319"/>
+ <position x="37" y="390"/>
+ <position x="314" y="390"/>
+ <position x="314" y="317"/>
+ <position x="300" y="317"/>
</connection>
</connectionPointIn>
<connectionPointOut>
- <relPosition x="51" y="13"/>
+ <relPosition x="51" y="15"/>
</connectionPointOut>
<expression>beat</expression>
</inOutVariable>
<block localId="5" width="68" height="98" typeName="ADD" executionOrderId="0">
- <position x="463" y="385"/>
+ <position x="463" y="403"/>
<inputVariables>
<variable formalParameter="IN1">
<connectionPointIn>
<relPosition x="0" y="39"/>
<connection refLocalId="10" formalParameter="OUT">
- <position x="463" y="424"/>
- <position x="452" y="424"/>
- <position x="452" y="424"/>
- <position x="454" y="424"/>
- <position x="454" y="424"/>
- <position x="444" y="424"/>
+ <position x="463" y="442"/>
+ <position x="452" y="442"/>
+ <position x="452" y="442"/>
+ <position x="455" y="442"/>
+ <position x="455" y="442"/>
+ <position x="445" y="442"/>
</connection>
</connectionPointIn>
</variable>
@@ -119,8 +119,12 @@
<connectionPointIn>
<relPosition x="0" y="78"/>
<connection refLocalId="6">
- <position x="463" y="463"/>
- <position x="444" y="463"/>
+ <position x="463" y="481"/>
+ <position x="453" y="481"/>
+ <position x="453" y="482"/>
+ <position x="454" y="482"/>
+ <position x="454" y="483"/>
+ <position x="444" y="483"/>
</connection>
</connectionPointIn>
</variable>
@@ -134,33 +138,33 @@
</variable>
</outputVariables>
</block>
- <inOutVariable localId="6" height="27" width="103" executionOrderId="0" negatedOut="false" negatedIn="false">
- <position x="341" y="450"/>
+ <inOutVariable localId="6" height="30" width="103" executionOrderId="0" negatedOut="false" negatedIn="false">
+ <position x="341" y="468"/>
<connectionPointIn>
- <relPosition x="0" y="13"/>
+ <relPosition x="0" y="15"/>
<connection refLocalId="5" formalParameter="OUT">
- <position x="341" y="463"/>
- <position x="320" y="463"/>
- <position x="320" y="500"/>
- <position x="544" y="500"/>
- <position x="544" y="424"/>
- <position x="531" y="424"/>
+ <position x="341" y="483"/>
+ <position x="320" y="483"/>
+ <position x="320" y="518"/>
+ <position x="544" y="518"/>
+ <position x="544" y="442"/>
+ <position x="531" y="442"/>
</connection>
</connectionPointIn>
<connectionPointOut>
- <relPosition x="103" y="13"/>
+ <relPosition x="103" y="15"/>
</connectionPointOut>
<expression>count</expression>
</inOutVariable>
<block localId="8" width="67" height="144" typeName="CONCAT" executionOrderId="0">
- <position x="727" y="311"/>
+ <position x="727" y="329"/>
<inputVariables>
<variable formalParameter="IN1">
<connectionPointIn>
<relPosition x="0" y="51"/>
<connection refLocalId="2">
- <position x="727" y="362"/>
- <position x="677" y="362"/>
+ <position x="727" y="380"/>
+ <position x="677" y="380"/>
</connection>
</connectionPointIn>
</variable>
@@ -168,8 +172,8 @@
<connectionPointIn>
<relPosition x="0" y="113"/>
<connection refLocalId="9" formalParameter="OUT">
- <position x="727" y="424"/>
- <position x="677" y="424"/>
+ <position x="727" y="442"/>
+ <position x="680" y="442"/>
</connection>
</connectionPointIn>
</variable>
@@ -183,70 +187,70 @@
</variable>
</outputVariables>
</block>
- <block localId="9" width="116" height="40" typeName="INT_TO_STRING" executionOrderId="0">
- <position x="561" y="394"/>
+ <block localId="9" width="119" height="40" typeName="INT_TO_STRING" executionOrderId="0">
+ <position x="561" y="412"/>
<inputVariables>
<variable formalParameter="IN">
<connectionPointIn>
<relPosition x="0" y="30"/>
<connection refLocalId="5" formalParameter="OUT">
- <position x="561" y="424"/>
- <position x="531" y="424"/>
- </connection>
- </connectionPointIn>
- </variable>
- </inputVariables>
- <inOutVariables/>
- <outputVariables>
- <variable formalParameter="OUT">
- <connectionPointOut>
- <relPosition x="116" y="30"/>
- </connectionPointOut>
- </variable>
- </outputVariables>
- </block>
- <block localId="10" width="105" height="40" typeName="BOOL_TO_INT" executionOrderId="0">
- <position x="339" y="394"/>
+ <position x="561" y="442"/>
+ <position x="531" y="442"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="OUT">
+ <connectionPointOut>
+ <relPosition x="119" y="30"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <block localId="10" width="106" height="40" typeName="BOOL_TO_INT" executionOrderId="0">
+ <position x="339" y="412"/>
<inputVariables>
<variable formalParameter="IN" edge="rising">
<connectionPointIn>
<relPosition x="0" y="30"/>
<connection refLocalId="3" formalParameter="OUT">
- <position x="339" y="424"/>
- <position x="314" y="424"/>
- <position x="314" y="299"/>
- <position x="300" y="299"/>
- </connection>
- </connectionPointIn>
- </variable>
- </inputVariables>
- <inOutVariables/>
- <outputVariables>
- <variable formalParameter="OUT">
- <connectionPointOut>
- <relPosition x="105" y="30"/>
+ <position x="339" y="442"/>
+ <position x="314" y="442"/>
+ <position x="314" y="317"/>
+ <position x="300" y="317"/>
+ </connection>
+ </connectionPointIn>
+ </variable>
+ </inputVariables>
+ <inOutVariables/>
+ <outputVariables>
+ <variable formalParameter="OUT">
+ <connectionPointOut>
+ <relPosition x="106" y="30"/>
</connectionPointOut>
</variable>
</outputVariables>
</block>
<block localId="11" width="65" height="209" typeName="LOGGER" instanceName="LOGGER0" executionOrderId="0">
- <position x="907" y="248"/>
+ <position x="907" y="266"/>
<inputVariables>
<variable formalParameter="TRIG">
<connectionPointIn>
- <relPosition x="0" y="52"/>
+ <relPosition x="0" y="51"/>
<connection refLocalId="3" formalParameter="OUT">
- <position x="907" y="300"/>
- <position x="300" y="300"/>
+ <position x="907" y="317"/>
+ <position x="300" y="317"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="MSG">
<connectionPointIn>
- <relPosition x="0" y="112"/>
+ <relPosition x="0" y="114"/>
<connection refLocalId="8" formalParameter="OUT">
- <position x="907" y="360"/>
- <position x="794" y="360"/>
+ <position x="907" y="380"/>
+ <position x="794" y="380"/>
</connection>
</connectionPointIn>
</variable>
@@ -254,8 +258,10 @@
<connectionPointIn>
<relPosition x="0" y="177"/>
<connection refLocalId="12">
- <position x="907" y="425"/>
- <position x="879" y="425"/>
+ <position x="907" y="443"/>
+ <position x="893" y="443"/>
+ <position x="893" y="445"/>
+ <position x="879" y="445"/>
</connection>
</connectionPointIn>
</variable>
@@ -263,22 +269,24 @@
<inOutVariables/>
<outputVariables/>
</block>
- <inVariable localId="12" height="27" width="79" executionOrderId="0" negated="false">
- <position x="800" y="412"/>
- <connectionPointOut>
- <relPosition x="79" y="13"/>
+ <inVariable localId="12" height="30" width="79" executionOrderId="0" negated="false">
+ <position x="800" y="430"/>
+ <connectionPointOut>
+ <relPosition x="79" y="15"/>
</connectionPointOut>
<expression>lvl</expression>
</inVariable>
- <block localId="14" typeName="TOF" instanceName="Timer" executionOrderId="0" height="98" width="45">
- <position x="150" y="260"/>
+ <block localId="14" typeName="TOF" instanceName="Timer" executionOrderId="0" height="98" width="47">
+ <position x="150" y="278"/>
<inputVariables>
<variable formalParameter="IN">
<connectionPointIn>
<relPosition x="0" y="39"/>
<connection refLocalId="4">
- <position x="150" y="299"/>
- <position x="117" y="299"/>
+ <position x="150" y="317"/>
+ <position x="133" y="317"/>
+ <position x="133" y="319"/>
+ <position x="117" y="319"/>
</connection>
</connectionPointIn>
</variable>
@@ -286,8 +294,10 @@
<connectionPointIn>
<relPosition x="0" y="78"/>
<connection refLocalId="1">
- <position x="150" y="338"/>
- <position x="117" y="338"/>
+ <position x="150" y="356"/>
+ <position x="133" y="356"/>
+ <position x="133" y="359"/>
+ <position x="117" y="359"/>
</connection>
</connectionPointIn>
</variable>
@@ -296,24 +306,24 @@
<outputVariables>
<variable formalParameter="Q">
<connectionPointOut>
- <relPosition x="45" y="39"/>
+ <relPosition x="47" y="39"/>
</connectionPointOut>
</variable>
<variable formalParameter="ET">
<connectionPointOut>
- <relPosition x="45" y="78"/>
- </connectionPointOut>
- </variable>
- </outputVariables>
- </block>
- <inVariable localId="1" executionOrderId="0" height="24" width="52" negated="false">
- <position x="65" y="326"/>
- <connectionPointOut>
- <relPosition x="52" y="12"/>
+ <relPosition x="47" y="78"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <inVariable localId="1" executionOrderId="0" height="30" width="52" negated="false">
+ <position x="65" y="344"/>
+ <connectionPointOut>
+ <relPosition x="52" y="15"/>
</connectionPointOut>
<expression>T#3s</expression>
</inVariable>
- <comment localId="15" height="212" width="675">
+ <comment localId="15" height="238" width="675">
<position x="27" y="16"/>
<content>
<xhtml:p><![CDATA[This example shows logging functionality in Beremiz.