--- a/tests/logging/plc.xml Wed Sep 26 14:15:22 2018 +0300
+++ b/tests/logging/plc.xml Wed Sep 26 14:20:51 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="2018-08-24T13:12:45">
+ <contentHeader name="Logging example" modificationDateTime="2018-09-26T13:10:14">
<coordinateInfo>
<fbd>
<scaling x="0" y="0"/>
@@ -52,10 +52,10 @@
</interface>
<body>
<FBD>
- <inVariable localId="2" height="30" width="170" executionOrderId="0" negated="false">
- <position x="507" y="365"/>
- <connectionPointOut>
- <relPosition x="170" y="15"/>
+ <inVariable localId="2" height="30" width="218" executionOrderId="0" negated="false">
+ <position x="459" y="365"/>
+ <connectionPointOut>
+ <relPosition x="218" y="15"/>
</connectionPointOut>
<expression>'IEC side logging: beat #'</expression>
</inVariable>
@@ -81,13 +81,13 @@
</variable>
</outputVariables>
</block>
- <inOutVariable localId="4" height="30" width="51" executionOrderId="0" negatedOut="false" negatedIn="false">
- <position x="66" y="304"/>
+ <inOutVariable localId="4" height="30" width="60" executionOrderId="0" negatedOut="false" negatedIn="false">
+ <position x="57" y="302"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="3" formalParameter="OUT">
- <position x="66" y="319"/>
- <position x="37" y="319"/>
+ <position x="57" y="317"/>
+ <position x="37" y="317"/>
<position x="37" y="390"/>
<position x="314" y="390"/>
<position x="314" y="317"/>
@@ -95,7 +95,7 @@
</connection>
</connectionPointIn>
<connectionPointOut>
- <relPosition x="51" y="15"/>
+ <relPosition x="60" y="15"/>
</connectionPointOut>
<expression>beat</expression>
</inOutVariable>
@@ -111,7 +111,7 @@
<position x="452" y="442"/>
<position x="455" y="442"/>
<position x="455" y="442"/>
- <position x="445" y="442"/>
+ <position x="439" y="442"/>
</connection>
</connectionPointIn>
</variable>
@@ -120,11 +120,7 @@
<relPosition x="0" y="78"/>
<connection refLocalId="6">
<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"/>
+ <position x="438" y="481"/>
</connection>
</connectionPointIn>
</variable>
@@ -139,12 +135,12 @@
</outputVariables>
</block>
<inOutVariable localId="6" height="30" width="103" executionOrderId="0" negatedOut="false" negatedIn="false">
- <position x="341" y="468"/>
+ <position x="335" y="466"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="5" formalParameter="OUT">
- <position x="341" y="483"/>
- <position x="320" y="483"/>
+ <position x="335" y="481"/>
+ <position x="320" y="481"/>
<position x="320" y="518"/>
<position x="544" y="518"/>
<position x="544" y="442"/>
@@ -164,6 +160,8 @@
<relPosition x="0" y="51"/>
<connection refLocalId="2">
<position x="727" y="380"/>
+ <position x="717" y="380"/>
+ <position x="717" y="380"/>
<position x="677" y="380"/>
</connection>
</connectionPointIn>
@@ -210,13 +208,13 @@
</outputVariables>
</block>
<block localId="10" width="106" height="40" typeName="BOOL_TO_INT" executionOrderId="0">
- <position x="339" y="412"/>
+ <position x="333" y="412"/>
<inputVariables>
<variable formalParameter="IN" edge="rising">
<connectionPointIn>
<relPosition x="0" y="30"/>
<connection refLocalId="3" formalParameter="OUT">
- <position x="339" y="442"/>
+ <position x="333" y="442"/>
<position x="314" y="442"/>
<position x="314" y="317"/>
<position x="300" y="317"/>
@@ -259,9 +257,7 @@
<relPosition x="0" y="177"/>
<connection refLocalId="12">
<position x="907" y="443"/>
- <position x="893" y="443"/>
- <position x="893" y="445"/>
- <position x="879" y="445"/>
+ <position x="880" y="443"/>
</connection>
</connectionPointIn>
</variable>
@@ -270,7 +266,7 @@
<outputVariables/>
</block>
<inVariable localId="12" height="30" width="79" executionOrderId="0" negated="false">
- <position x="800" y="430"/>
+ <position x="801" y="428"/>
<connectionPointOut>
<relPosition x="79" y="15"/>
</connectionPointOut>
@@ -284,9 +280,7 @@
<relPosition x="0" y="39"/>
<connection refLocalId="4">
<position x="150" y="317"/>
- <position x="133" y="317"/>
- <position x="133" y="319"/>
- <position x="117" y="319"/>
+ <position x="117" y="317"/>
</connection>
</connectionPointIn>
</variable>
@@ -295,9 +289,7 @@
<relPosition x="0" y="78"/>
<connection refLocalId="1">
<position x="150" y="356"/>
- <position x="133" y="356"/>
- <position x="133" y="359"/>
- <position x="117" y="359"/>
+ <position x="117" y="356"/>
</connection>
</connectionPointIn>
</variable>
@@ -316,15 +308,15 @@
</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"/>
+ <inVariable localId="1" executionOrderId="0" height="30" width="61" negated="false">
+ <position x="56" y="341"/>
+ <connectionPointOut>
+ <relPosition x="61" y="15"/>
</connectionPointOut>
<expression>T#3s</expression>
</inVariable>
- <comment localId="15" height="238" width="675">
- <position x="27" y="16"/>
+ <comment localId="15" height="249" width="682">
+ <position x="19" y="8"/>
<content>
<xhtml:p><![CDATA[This example shows logging functionality in Beremiz.
Here are shown two ways of logging: