# HG changeset patch # User Andrey Skvortsov <andrej.skvortzov@gmail.com> # Date 1535106305 -10800 # Node ID a2ab363f9e90a7481d3f57be60db1b49710e86b2 # Parent dda34e671700943c3e533595f4e9579117bdfa4a Make comment blocks in examples slightly bigger so text inside is always visible diff -r dda34e671700 -r a2ab363f9e90 tests/first_steps/plc.xml --- a/tests/first_steps/plc.xml Tue Aug 21 13:05:23 2018 +0300 +++ b/tests/first_steps/plc.xml Fri Aug 24 13:25:05 2018 +0300 @@ -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="Beremiz" productName="Beremiz" productVersion="1" creationDateTime="2016-10-24T18:09:22"/> - <contentHeader name="First Steps" modificationDateTime="2018-05-31T12:59:20"> + <contentHeader name="First Steps" modificationDateTime="2018-08-24T13:11:30"> <coordinateInfo> <fbd> <scaling x="0" y="0"/> @@ -191,7 +191,7 @@ </variable> </outputVariables> </block> - <comment localId="6" height="306" width="434"> + <comment localId="6" height="344" width="434"> <position x="620" y="130"/> <content> <xhtml:p><![CDATA[In this example function block with the same functionality @@ -528,41 +528,41 @@ </interface> <body> <FBD> - <inVariable localId="1" executionOrderId="0" height="24" width="61" negated="false"> + <inVariable localId="1" executionOrderId="0" height="30" width="61" negated="false"> <position x="321" y="58"/> <connectionPointOut> - <relPosition x="61" y="12"/> + <relPosition x="61" y="15"/> </connectionPointOut> <expression>Reset</expression> </inVariable> - <outVariable localId="2" executionOrderId="0" height="24" width="34" negated="false"> + <outVariable localId="2" executionOrderId="0" height="30" width="39" negated="false"> <position x="675" y="137"/> <connectionPointIn> - <relPosition x="0" y="12"/> + <relPosition x="0" y="15"/> <connection refLocalId="3"> - <position x="675" y="149"/> - <position x="586" y="149"/> + <position x="675" y="152"/> + <position x="589" y="152"/> </connection> </connectionPointIn> <expression>OUT</expression> </outVariable> - <inOutVariable localId="3" executionOrderId="0" height="24" width="29" negatedOut="false" negatedIn="false"> + <inOutVariable localId="3" executionOrderId="0" height="30" width="32" negatedOut="false" negatedIn="false"> <position x="557" y="137"/> <connectionPointIn> - <relPosition x="0" y="12"/> + <relPosition x="0" y="15"/> <connection refLocalId="7" formalParameter="OUT"> - <position x="557" y="149"/> - <position x="524" y="149"/> - <position x="524" y="130"/> - <position x="505" y="130"/> - </connection> - </connectionPointIn> - <connectionPointOut> - <relPosition x="29" y="12"/> + <position x="557" y="152"/> + <position x="525" y="152"/> + <position x="525" y="130"/> + <position x="515" y="130"/> + </connection> + </connectionPointIn> + <connectionPointOut> + <relPosition x="32" y="15"/> </connectionPointOut> <expression>Cnt</expression> </inOutVariable> - <block localId="4" typeName="ADD" executionOrderId="0" height="80" width="57"> + <block localId="4" typeName="ADD" executionOrderId="0" height="80" width="67"> <position x="328" y="115"/> <inputVariables> <variable formalParameter="IN1"> @@ -570,7 +570,9 @@ <relPosition x="0" y="35"/> <connection refLocalId="6"> <position x="328" y="150"/> - <position x="275" y="150"/> + <position x="301" y="150"/> + <position x="301" y="153"/> + <position x="275" y="153"/> </connection> </connectionPointIn> </variable> @@ -581,9 +583,9 @@ <position x="328" y="180"/> <position x="317" y="180"/> <position x="317" y="213"/> - <position x="596" y="213"/> - <position x="596" y="149"/> - <position x="586" y="149"/> + <position x="599" y="213"/> + <position x="599" y="152"/> + <position x="589" y="152"/> </connection> </connectionPointIn> </variable> @@ -592,26 +594,26 @@ <outputVariables> <variable formalParameter="OUT"> <connectionPointOut> - <relPosition x="57" y="35"/> + <relPosition x="67" y="35"/> </connectionPointOut> </variable> </outputVariables> </block> - <inVariable localId="5" executionOrderId="0" height="24" width="158" negated="false"> + <inVariable localId="5" executionOrderId="0" height="30" width="158" negated="false"> <position x="222" y="256"/> <connectionPointOut> - <relPosition x="158" y="12"/> + <relPosition x="158" y="15"/> </connectionPointOut> <expression>ResetCounterValue</expression> </inVariable> - <inVariable localId="6" executionOrderId="0" height="24" width="21" negated="false"> + <inVariable localId="6" executionOrderId="0" height="30" width="21" negated="false"> <position x="254" y="138"/> <connectionPointOut> - <relPosition x="21" y="12"/> + <relPosition x="21" y="15"/> </connectionPointOut> <expression>1</expression> </inVariable> - <block localId="7" typeName="SEL" executionOrderId="0" height="80" width="57"> + <block localId="7" typeName="SEL" executionOrderId="0" height="80" width="67"> <position x="448" y="100"/> <inputVariables> <variable formalParameter="G"> @@ -620,8 +622,8 @@ <connection refLocalId="1"> <position x="448" y="130"/> <position x="415" y="130"/> - <position x="415" y="70"/> - <position x="382" y="70"/> + <position x="415" y="73"/> + <position x="382" y="73"/> </connection> </connectionPointIn> </variable> @@ -630,7 +632,7 @@ <relPosition x="0" y="50"/> <connection refLocalId="4" formalParameter="OUT"> <position x="448" y="150"/> - <position x="385" y="150"/> + <position x="395" y="150"/> </connection> </connectionPointIn> </variable> @@ -640,8 +642,8 @@ <connection refLocalId="5"> <position x="448" y="170"/> <position x="414" y="170"/> - <position x="414" y="268"/> - <position x="380" y="268"/> + <position x="414" y="271"/> + <position x="380" y="271"/> </connection> </connectionPointIn> </variable> @@ -650,7 +652,7 @@ <outputVariables> <variable formalParameter="OUT"> <connectionPointOut> - <relPosition x="57" y="30"/> + <relPosition x="67" y="30"/> </connectionPointOut> </variable> </outputVariables> @@ -692,10 +694,10 @@ <actions/> <body> <SFC> - <step localId="1" name="Start" initialStep="true" height="28" width="90"> + <step localId="1" name="Start" initialStep="true" height="34" width="90"> <position x="241" y="14"/> <connectionPointOut formalParameter=""> - <relPosition x="45" y="28"/> + <relPosition x="45" y="34"/> </connectionPointOut> </step> <selectionDivergence localId="2" height="1" width="431"> @@ -754,7 +756,7 @@ </inline> </condition> </transition> - <step localId="5" name="ResetCounter" initialStep="false" height="24" width="104"> + <step localId="5" name="ResetCounter" initialStep="false" height="30" width="104"> <position x="449" y="190"/> <connectionPointIn> <relPosition x="52" y="0"/> @@ -764,10 +766,10 @@ </connection> </connectionPointIn> <connectionPointOut formalParameter=""> - <relPosition x="52" y="24"/> + <relPosition x="52" y="30"/> </connectionPointOut> <connectionPointOutAction formalParameter=""> - <relPosition x="104" y="12"/> + <relPosition x="104" y="15"/> </connectionPointOutAction> </step> <actionBlock localId="6" height="63" width="222"> @@ -796,7 +798,7 @@ </inline> </action> </actionBlock> - <step localId="7" name="Count" initialStep="false" height="24" width="85" executionOrderId="0"> + <step localId="7" name="Count" initialStep="false" height="30" width="85" executionOrderId="0"> <position x="28" y="191"/> <connectionPointIn> <relPosition x="42" y="0"/> @@ -806,10 +808,10 @@ </connection> </connectionPointIn> <connectionPointOut formalParameter=""> - <relPosition x="42" y="24"/> + <relPosition x="42" y="30"/> </connectionPointOut> <connectionPointOutAction formalParameter=""> - <relPosition x="85" y="12"/> + <relPosition x="85" y="15"/> </connectionPointOutAction> </step> <actionBlock localId="8" height="52" width="148" executionOrderId="0"> @@ -997,32 +999,34 @@ </interface> <body> <LD> - <outVariable localId="2" executionOrderId="0" height="24" width="34" negated="false"> + <outVariable localId="2" executionOrderId="0" height="30" width="34" negated="false"> <position x="527" y="90"/> <connectionPointIn> - <relPosition x="0" y="12"/> + <relPosition x="0" y="15"/> <connection refLocalId="3"> - <position x="527" y="102"/> - <position x="438" y="102"/> + <position x="527" y="105"/> + <position x="441" y="105"/> </connection> </connectionPointIn> <expression>Out</expression> </outVariable> - <inOutVariable localId="3" executionOrderId="0" height="24" width="29" negatedOut="false" negatedIn="false"> + <inOutVariable localId="3" executionOrderId="0" height="30" width="32" negatedOut="false" negatedIn="false"> <position x="409" y="90"/> <connectionPointIn> - <relPosition x="0" y="12"/> + <relPosition x="0" y="15"/> <connection refLocalId="7" formalParameter="OUT"> - <position x="409" y="102"/> - <position x="357" y="102"/> - </connection> - </connectionPointIn> - <connectionPointOut> - <relPosition x="29" y="12"/> + <position x="409" y="105"/> + <position x="388" y="105"/> + <position x="388" y="102"/> + <position x="367" y="102"/> + </connection> + </connectionPointIn> + <connectionPointOut> + <relPosition x="32" y="15"/> </connectionPointOut> <expression>Cnt</expression> </inOutVariable> - <block localId="4" typeName="ADD" executionOrderId="0" height="80" width="57"> + <block localId="4" typeName="ADD" executionOrderId="0" height="80" width="67"> <position x="180" y="87"/> <inputVariables> <variable formalParameter="IN1"> @@ -1030,7 +1034,9 @@ <relPosition x="0" y="35"/> <connection refLocalId="6"> <position x="180" y="122"/> - <position x="127" y="122"/> + <position x="153" y="122"/> + <position x="153" y="125"/> + <position x="127" y="125"/> </connection> </connectionPointIn> </variable> @@ -1041,9 +1047,9 @@ <position x="180" y="152"/> <position x="169" y="152"/> <position x="169" y="185"/> - <position x="448" y="185"/> - <position x="448" y="102"/> - <position x="438" y="102"/> + <position x="451" y="185"/> + <position x="451" y="105"/> + <position x="441" y="105"/> </connection> </connectionPointIn> </variable> @@ -1052,26 +1058,26 @@ <outputVariables> <variable formalParameter="OUT"> <connectionPointOut> - <relPosition x="57" y="35"/> + <relPosition x="67" y="35"/> </connectionPointOut> </variable> </outputVariables> </block> - <inVariable localId="5" executionOrderId="0" height="24" width="158" negated="false"> + <inVariable localId="5" executionOrderId="0" height="30" width="158" negated="false"> <position x="74" y="228"/> <connectionPointOut> - <relPosition x="158" y="12"/> + <relPosition x="158" y="15"/> </connectionPointOut> <expression>ResetCounterValue</expression> </inVariable> - <inVariable localId="6" executionOrderId="0" height="24" width="21" negated="false"> + <inVariable localId="6" executionOrderId="0" height="30" width="21" negated="false"> <position x="106" y="110"/> <connectionPointOut> - <relPosition x="21" y="12"/> + <relPosition x="21" y="15"/> </connectionPointOut> <expression>1</expression> </inVariable> - <block localId="7" typeName="SEL" executionOrderId="0" height="80" width="57"> + <block localId="7" typeName="SEL" executionOrderId="0" height="80" width="67"> <position x="300" y="72"/> <inputVariables> <variable formalParameter="G"> @@ -1090,7 +1096,7 @@ <relPosition x="0" y="50"/> <connection refLocalId="4" formalParameter="OUT"> <position x="300" y="122"/> - <position x="237" y="122"/> + <position x="247" y="122"/> </connection> </connectionPointIn> </variable> @@ -1100,8 +1106,8 @@ <connection refLocalId="5"> <position x="300" y="142"/> <position x="266" y="142"/> - <position x="266" y="240"/> - <position x="232" y="240"/> + <position x="266" y="243"/> + <position x="232" y="243"/> </connection> </connectionPointIn> </variable> @@ -1110,7 +1116,7 @@ <outputVariables> <variable formalParameter="OUT"> <connectionPointOut> - <relPosition x="57" y="30"/> + <relPosition x="67" y="30"/> </connectionPointOut> </variable> </outputVariables> diff -r dda34e671700 -r a2ab363f9e90 tests/genericmake/plc.xml --- a/tests/genericmake/plc.xml Tue Aug 21 13:05:23 2018 +0300 +++ b/tests/genericmake/plc.xml Fri Aug 24 13:25:05 2018 +0300 @@ -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="2014-01-19T11:14:47" contentDescription="This example shows how you can customize build process by using 'make'. "/> - <contentHeader name="Makefile Example" modificationDateTime="2016-10-14T14:00:01"> + <contentHeader name="Makefile Example" modificationDateTime="2018-08-24T13:12:10"> <coordinateInfo> <fbd> <scaling x="0" y="0"/> @@ -34,25 +34,25 @@ </interface> <body> <FBD> - <inVariable localId="1" executionOrderId="0" height="27" width="77" negated="false"> - <position x="52" y="368"/> + <inVariable localId="1" executionOrderId="0" height="30" width="77" negated="false"> + <position x="52" y="424"/> <connectionPointOut> - <relPosition x="77" y="13"/> + <relPosition x="77" y="15"/> </connectionPointOut> <expression>LocalVara</expression> </inVariable> - <outVariable localId="2" executionOrderId="0" height="27" width="77" negated="false"> - <position x="167" y="368"/> + <outVariable localId="2" executionOrderId="0" height="30" width="77" negated="false"> + <position x="167" y="424"/> <connectionPointIn> - <relPosition x="0" y="13"/> + <relPosition x="0" y="15"/> <connection refLocalId="1"> - <position x="167" y="381"/> - <position x="129" y="381"/> + <position x="167" y="439"/> + <position x="129" y="439"/> </connection> </connectionPointIn> <expression>LocalVarb</expression> </outVariable> - <comment localId="3" height="310" width="760"> + <comment localId="3" height="385" width="760"> <position x="32" y="23"/> <content> <xhtml:p><![CDATA[This example shows how you can customize build process by using 'make'. diff -r dda34e671700 -r a2ab363f9e90 tests/logging/plc.xml --- 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. diff -r dda34e671700 -r a2ab363f9e90 tests/python/plc.xml --- a/tests/python/plc.xml Tue Aug 21 13:05:23 2018 +0300 +++ b/tests/python/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="" productName="Beremiz" productVersion="0.0" creationDateTime="2008-12-14T16:21:19" contentDescription="This example shows many features in Beremiz: 1. How to implement python extensions. 2. How to implement basic C extension. 3. How to use C code in IEC POUs. 4. How to call C functions from python code. 5. How to avoid race conditions between IEC, C and python code. 6. How to convert betweet different IEC types. "/> - <contentHeader name="Beremiz Python Support Tests" modificationDateTime="2016-10-12T14:15:35"> + <contentHeader name="Beremiz Python Support Tests" modificationDateTime="2018-08-24T13:17:44"> <coordinateInfo> <pageSize x="1024" y="1024"/> <fbd> @@ -323,14 +323,14 @@ <expression>pytest_var2</expression> </inOutVariable> <block localId="8" width="125" height="80" typeName="python_eval" instanceName="Block1" executionOrderId="0"> - <position x="650" y="515"/> + <position x="650" y="545"/> <inputVariables> <variable formalParameter="TRIG"> <connectionPointIn> <relPosition x="0" y="35"/> <connection refLocalId="7" formalParameter="OUT"> - <position x="650" y="550"/> - <position x="285" y="550"/> + <position x="650" y="580"/> + <position x="285" y="580"/> <position x="285" y="480"/> <position x="250" y="480"/> </connection> @@ -340,8 +340,8 @@ <connectionPointIn> <relPosition x="0" y="65"/> <connection refLocalId="9"> - <position x="650" y="580"/> - <position x="585" y="580"/> + <position x="650" y="610"/> + <position x="585" y="610"/> </connection> </connectionPointIn> </variable> @@ -361,28 +361,28 @@ </outputVariables> </block> <inVariable localId="9" height="30" width="290" executionOrderId="0" negated="false"> - <position x="295" y="565"/> + <position x="295" y="595"/> <connectionPointOut> <relPosition x="290" y="15"/> </connectionPointOut> <expression>'sys.stdout.write("FBID :"+str(FBID)+"\n")'</expression> </inVariable> <inVariable localId="11" height="30" width="290" executionOrderId="0" negated="false"> - <position x="295" y="685"/> + <position x="295" y="735"/> <connectionPointOut> <relPosition x="290" y="15"/> </connectionPointOut> <expression>'PLCBinary.Simple_C_Call(5678)'</expression> </inVariable> <block localId="12" width="125" height="80" typeName="python_eval" instanceName="Block2" executionOrderId="0"> - <position x="650" y="637"/> + <position x="650" y="687"/> <inputVariables> <variable formalParameter="TRIG"> <connectionPointIn> <relPosition x="0" y="33"/> <connection refLocalId="7" formalParameter="OUT"> - <position x="650" y="670"/> - <position x="285" y="670"/> + <position x="650" y="720"/> + <position x="285" y="720"/> <position x="285" y="480"/> <position x="250" y="480"/> </connection> @@ -392,8 +392,8 @@ <connectionPointIn> <relPosition x="0" y="63"/> <connection refLocalId="11"> - <position x="650" y="700"/> - <position x="585" y="700"/> + <position x="650" y="750"/> + <position x="585" y="750"/> </connection> </connectionPointIn> </variable> @@ -413,21 +413,21 @@ </outputVariables> </block> <inVariable localId="14" height="30" width="290" executionOrderId="0" negated="false"> - <position x="290" y="810"/> + <position x="290" y="885"/> <connectionPointOut> <relPosition x="290" y="15"/> </connectionPointOut> <expression>'MyPythonFunc(42)'</expression> </inVariable> <block localId="15" width="125" height="80" typeName="python_eval" instanceName="Block3" executionOrderId="0"> - <position x="650" y="762"/> + <position x="650" y="837"/> <inputVariables> <variable formalParameter="TRIG"> <connectionPointIn> <relPosition x="0" y="33"/> <connection refLocalId="7" formalParameter="OUT"> - <position x="650" y="795"/> - <position x="285" y="795"/> + <position x="650" y="870"/> + <position x="285" y="870"/> <position x="285" y="480"/> <position x="250" y="480"/> </connection> @@ -437,8 +437,8 @@ <connectionPointIn> <relPosition x="0" y="63"/> <connection refLocalId="14"> - <position x="650" y="825"/> - <position x="580" y="825"/> + <position x="650" y="900"/> + <position x="580" y="900"/> </connection> </connectionPointIn> </variable> @@ -464,16 +464,16 @@ </content> </comment> <block localId="17" width="80" height="120" typeName="MUX" executionOrderId="0"> - <position x="1065" y="715"/> + <position x="1065" y="790"/> <inputVariables> <variable formalParameter="K"> <connectionPointIn> <relPosition x="0" y="30"/> <connection refLocalId="18"> - <position x="1065" y="745"/> - <position x="1040" y="745"/> - <position x="1040" y="735"/> - <position x="1015" y="735"/> + <position x="1065" y="820"/> + <position x="1040" y="820"/> + <position x="1040" y="810"/> + <position x="1022" y="810"/> </connection> </connectionPointIn> </variable> @@ -481,8 +481,8 @@ <connectionPointIn> <relPosition x="0" y="50"/> <connection refLocalId="5" formalParameter="RESULT"> - <position x="1065" y="765"/> - <position x="905" y="765"/> + <position x="1065" y="840"/> + <position x="905" y="840"/> <position x="905" y="465"/> <position x="775" y="465"/> </connection> @@ -492,10 +492,10 @@ <connectionPointIn> <relPosition x="0" y="70"/> <connection refLocalId="8" formalParameter="RESULT"> - <position x="1065" y="785"/> - <position x="890" y="785"/> - <position x="890" y="580"/> - <position x="775" y="580"/> + <position x="1065" y="860"/> + <position x="890" y="860"/> + <position x="890" y="610"/> + <position x="775" y="610"/> </connection> </connectionPointIn> </variable> @@ -503,10 +503,10 @@ <connectionPointIn> <relPosition x="0" y="90"/> <connection refLocalId="12" formalParameter="RESULT"> - <position x="1065" y="805"/> - <position x="875" y="805"/> - <position x="875" y="700"/> - <position x="775" y="700"/> + <position x="1065" y="880"/> + <position x="875" y="880"/> + <position x="875" y="750"/> + <position x="775" y="750"/> </connection> </connectionPointIn> </variable> @@ -514,8 +514,8 @@ <connectionPointIn> <relPosition x="0" y="110"/> <connection refLocalId="15" formalParameter="RESULT"> - <position x="1065" y="825"/> - <position x="775" y="825"/> + <position x="1065" y="900"/> + <position x="775" y="900"/> </connection> </connectionPointIn> </variable> @@ -530,12 +530,12 @@ </outputVariables> </block> <outVariable localId="19" height="35" width="125" executionOrderId="0" negated="false"> - <position x="1235" y="730"/> + <position x="1235" y="805"/> <connectionPointIn> <relPosition x="0" y="15"/> <connection refLocalId="17" formalParameter="OUT"> - <position x="1235" y="745"/> - <position x="1145" y="745"/> + <position x="1235" y="820"/> + <position x="1145" y="820"/> </connection> </connectionPointIn> <expression>pytest_var1</expression> @@ -550,7 +550,7 @@ <position x="1070" y="415"/> <position x="1040" y="415"/> <position x="1040" y="405"/> - <position x="1010" y="405"/> + <position x="1017" y="405"/> </connection> </connectionPointIn> </variable> @@ -569,8 +569,8 @@ <connection refLocalId="8" formalParameter="ACK"> <position x="1070" y="455"/> <position x="805" y="455"/> - <position x="805" y="550"/> - <position x="775" y="550"/> + <position x="805" y="580"/> + <position x="775" y="580"/> </connection> </connectionPointIn> </variable> @@ -580,8 +580,8 @@ <connection refLocalId="12" formalParameter="ACK"> <position x="1070" y="475"/> <position x="820" y="475"/> - <position x="820" y="670"/> - <position x="775" y="670"/> + <position x="820" y="720"/> + <position x="775" y="720"/> </connection> </connectionPointIn> </variable> @@ -591,8 +591,8 @@ <connection refLocalId="15" formalParameter="ACK"> <position x="1070" y="495"/> <position x="835" y="495"/> - <position x="835" y="795"/> - <position x="775" y="795"/> + <position x="835" y="870"/> + <position x="775" y="870"/> </connection> </connectionPointIn> </variable> @@ -606,10 +606,10 @@ </variable> </outputVariables> </block> - <inVariable localId="22" height="30" width="65" executionOrderId="0" negated="false"> + <inVariable localId="22" height="30" width="72" executionOrderId="0" negated="false"> <position x="945" y="390"/> <connectionPointOut> - <relPosition x="65" y="15"/> + <relPosition x="72" y="15"/> </connectionPointOut> <expression>mux1_sel</expression> </inVariable> @@ -700,44 +700,44 @@ </connectionPointOut> <expression>10</expression> </inVariable> - <comment localId="30" height="75" width="465"> - <position x="50" y="945"/> + <comment localId="30" height="105" width="465"> + <position x="50" y="925"/> <content> <xhtml:p><![CDATA[You will be ready to use beremiz with C and Python when you will understand why "FromInput" is equal to 75. Happy hacking! ]]></xhtml:p> </content> </comment> - <comment localId="31" height="60" width="345"> + <comment localId="31" height="90" width="345"> <position x="295" y="485"/> <content> <xhtml:p><![CDATA[Sleep here is bad. It blocks other py_eval instances. Whith a wxGlade GUI, GUI freeze for a second.]]></xhtml:p> </content> </comment> - <comment localId="6" height="60" width="345"> - <position x="295" y="600"/> + <comment localId="6" height="80" width="345"> + <position x="295" y="630"/> <content> <xhtml:p><![CDATA[Prints FBID to stdout of PLC runtime. FBID is a unique reference to py_eval instance.]]></xhtml:p> </content> </comment> - <comment localId="10" height="60" width="345"> - <position x="295" y="720"/> + <comment localId="10" height="85" width="345"> + <position x="295" y="770"/> <content> <xhtml:p><![CDATA[Simple_C_Call is declared in C_File "1.x:c_code". See python ctypes manual for details on typing.]]></xhtml:p> </content> </comment> - <comment localId="32" height="105" width="235"> + <comment localId="32" height="145" width="235"> <position x="25" y="505"/> <content> <xhtml:p><![CDATA[Fast clock, at least faster that sleep(1). See what happens when python takes time to answer : PLC continues.]]></xhtml:p> </content> </comment> - <outVariable localId="33" height="30" width="130" executionOrderId="0" negated="false"> + <outVariable localId="33" height="30" width="133" executionOrderId="0" negated="false"> <position x="580" y="1564"/> <connectionPointIn> <relPosition x="0" y="16"/> <connection refLocalId="35" formalParameter="OUT"> <position x="580" y="1580"/> - <position x="370" y="1580"/> + <position x="371" y="1580"/> </connection> </connectionPointIn> <expression>Test_BCD_RESULT</expression> @@ -749,7 +749,7 @@ </connectionPointOut> <expression>Test_BCD</expression> </inVariable> - <block localId="35" width="105" height="60" typeName="BCD_TO_UINT" executionOrderId="0"> + <block localId="35" width="106" height="60" typeName="BCD_TO_UINT" executionOrderId="0"> <position x="265" y="1539"/> <inputVariables> <variable formalParameter="IN"> @@ -766,7 +766,7 @@ <outputVariables> <variable formalParameter="OUT"> <connectionPointOut> - <relPosition x="105" y="41"/> + <relPosition x="106" y="41"/> </connectionPointOut> </variable> </outputVariables> @@ -1163,16 +1163,16 @@ </connectionPointIn> <expression>fefvsd</expression> </outVariable> - <comment localId="53" height="65" width="420"> + <comment localId="53" height="80" width="420"> <position x="75" y="2160"/> <content> <xhtml:p><![CDATA[Shows global variables access from resource configuration (res_pytest) and from project's configuration.]]></xhtml:p> </content> </comment> - <inVariable localId="18" height="30" width="65" executionOrderId="0" negated="false"> - <position x="950" y="720"/> - <connectionPointOut> - <relPosition x="65" y="15"/> + <inVariable localId="18" height="30" width="72" executionOrderId="0" negated="false"> + <position x="950" y="795"/> + <connectionPointOut> + <relPosition x="72" y="15"/> </connectionPointOut> <expression>mux2_sel</expression> </inVariable> @@ -1194,14 +1194,14 @@ <xhtml:p><![CDATA[Shows access variable defined in python extension. ]]></xhtml:p> </content> </comment> - <inVariable localId="66" height="30" width="130" executionOrderId="0" negated="false"> + <inVariable localId="66" height="30" width="137" executionOrderId="0" negated="false"> <position x="60" y="1685"/> <connectionPointOut> - <relPosition x="130" y="15"/> + <relPosition x="137" y="15"/> </connectionPointOut> <expression>Test_BCD_WRONG</expression> </inVariable> - <block localId="67" width="105" height="100" typeName="BCD_TO_UINT" executionOrderId="0"> + <block localId="67" width="106" height="100" typeName="BCD_TO_UINT" executionOrderId="0"> <position x="265" y="1620"/> <inputVariables> <variable formalParameter="EN"> @@ -1218,7 +1218,7 @@ <position x="255" y="1700"/> <position x="345" y="1700"/> <position x="345" y="1700"/> - <position x="190" y="1700"/> + <position x="197" y="1700"/> </connection> </connectionPointIn> </variable> @@ -1227,28 +1227,28 @@ <outputVariables> <variable formalParameter="ENO"> <connectionPointOut> - <relPosition x="105" y="40"/> + <relPosition x="106" y="40"/> </connectionPointOut> </variable> <variable formalParameter="OUT"> <connectionPointOut> - <relPosition x="105" y="80"/> - </connectionPointOut> - </variable> - </outputVariables> - </block> - <outVariable localId="68" height="30" width="185" executionOrderId="0" negated="false"> + <relPosition x="106" y="80"/> + </connectionPointOut> + </variable> + </outputVariables> + </block> + <outVariable localId="68" height="30" width="196" executionOrderId="0" negated="false"> <position x="580" y="1685"/> <connectionPointIn> <relPosition x="0" y="15"/> <connection refLocalId="67" formalParameter="OUT"> <position x="580" y="1700"/> - <position x="370" y="1700"/> + <position x="371" y="1700"/> </connection> </connectionPointIn> <expression>Test_BCD_WRONG_RESULT</expression> </outVariable> - <comment localId="69" height="135" width="375"> + <comment localId="69" height="165" width="375"> <position x="795" y="1590"/> <content> <xhtml:p><![CDATA[Incorrect BCD number is not converted to UINT. @@ -1273,7 +1273,7 @@ </connectionPointIn> <expression>Test_BCD_CONVERTED</expression> </outVariable> - <comment localId="71" height="170" width="680"> + <comment localId="71" height="215" width="680"> <position x="35" y="30"/> <content> <xhtml:p><![CDATA[This example shows many features in Beremiz: diff -r dda34e671700 -r a2ab363f9e90 tests/svgui/plc.xml --- a/tests/svgui/plc.xml Tue Aug 21 13:05:23 2018 +0300 +++ b/tests/svgui/plc.xml Fri Aug 24 13:25:05 2018 +0300 @@ -1,7 +1,7 @@ <?xml version='1.0' encoding='utf-8'?> <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://www.plcopen.org/xml/tc6_0201" xmlns:xhtml="http://www.w3.org/1999/xhtml" xsi:schemaLocation="http://www.plcopen.org/xml/tc6_0201"> <fileHeader companyName="beremiz" productName="Beremiz" productVersion="0.0" creationDateTime="2008-12-14T16:21:19"/> - <contentHeader name="Beremiz SVGUI Test" modificationDateTime="2016-10-20T12:38:31"> + <contentHeader name="Beremiz SVGUI Test" modificationDateTime="2018-08-24T13:19:27"> <coordinateInfo> <pageSize x="1024" y="1024"/> <fbd> @@ -264,7 +264,7 @@ <outputVariables/> </block> <inVariable localId="1" height="30" width="88" executionOrderId="0" negated="false"> - <position x="59" y="220"/> + <position x="59" y="228"/> <connectionPointOut> <relPosition x="88" y="15"/> </connectionPointOut> @@ -305,18 +305,18 @@ <outputVariables/> </block> <block localId="96" width="80" height="65" typeName="AND" executionOrderId="0"> - <position x="200" y="182"/> + <position x="200" y="190"/> <inputVariables> <variable formalParameter="IN1" negated="true"> <connectionPointIn> <relPosition x="0" y="31"/> <connection refLocalId="96" formalParameter="OUT"> - <position x="200" y="213"/> - <position x="175" y="213"/> - <position x="175" y="167"/> - <position x="305" y="167"/> - <position x="305" y="213"/> - <position x="280" y="213"/> + <position x="200" y="221"/> + <position x="175" y="221"/> + <position x="175" y="175"/> + <position x="305" y="175"/> + <position x="305" y="221"/> + <position x="280" y="221"/> </connection> </connectionPointIn> </variable> @@ -324,8 +324,8 @@ <connectionPointIn> <relPosition x="0" y="53"/> <connection refLocalId="1"> - <position x="200" y="235"/> - <position x="147" y="235"/> + <position x="200" y="243"/> + <position x="147" y="243"/> </connection> </connectionPointIn> </variable> @@ -340,12 +340,12 @@ </outputVariables> </block> <connector name="CLOCK" localId="97" height="30" width="90"> - <position x="345" y="198"/> + <position x="345" y="206"/> <connectionPointIn> <relPosition x="0" y="15"/> <connection refLocalId="96" formalParameter="OUT"> - <position x="345" y="213"/> - <position x="280" y="213"/> + <position x="345" y="221"/> + <position x="280" y="221"/> </connection> </connectionPointIn> </connector> @@ -443,7 +443,7 @@ <relPosition x="122" y="15"/> </connectionPointOut> </continuation> - <comment localId="101" height="152" width="816"> + <comment localId="101" height="164" width="977"> <position x="27" y="8"/> <content> <xhtml:p><![CDATA[This example shows how IEC program in PLC can interact with web interface. @@ -458,8 +458,8 @@ ]]></xhtml:p> </content> </comment> - <comment localId="102" height="101" width="544"> - <position x="17" y="409"/> + <comment localId="102" height="126" width="641"> + <position x="17" y="397"/> <content> <xhtml:p><![CDATA[In this example basic elements like 'Button', 'Led' and 'Text' are used. Back_id and sele_id inputs of these blocks are IDs of graphic primitives in SVG file. diff -r dda34e671700 -r a2ab363f9e90 tests/traffic_lights/plc.xml --- a/tests/traffic_lights/plc.xml Tue Aug 21 13:05:23 2018 +0300 +++ b/tests/traffic_lights/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="Beremiz" productName="Unnamed" productVersion="1" creationDateTime="2012-09-04T16:16:33"/> - <contentHeader name="traffic_lights" modificationDateTime="2016-10-20T13:08:53"> + <contentHeader name="traffic_lights" modificationDateTime="2018-08-24T13:21:35"> <coordinateInfo> <fbd> <scaling x="0" y="0"/> @@ -120,10 +120,10 @@ <action name="BLINK_ORANGE_LIGHT"> <body> <LD> - <leftPowerRail localId="1" height="40" width="2"> + <leftPowerRail localId="1" height="40" width="3"> <position x="54" y="123"/> <connectionPointOut formalParameter=""> - <relPosition x="2" y="20"/> + <relPosition x="3" y="20"/> </connectionPointOut> </leftPowerRail> <contact localId="2" height="15" width="21" negated="true"> @@ -176,10 +176,10 @@ </variable> </outputVariables> </block> - <inVariable localId="4" height="27" width="72"> + <inVariable localId="4" height="30" width="72" negated="false"> <position x="79" y="171"/> <connectionPointOut> - <relPosition x="72" y="13"/> + <relPosition x="72" y="15"/> </connectionPointOut> <expression>T#500ms</expression> </inVariable> @@ -233,7 +233,7 @@ </connectionPointOut> <variable>ORANGE_LIGHT</variable> </coil> - <rightPowerRail localId="7" height="40" width="2"> + <rightPowerRail localId="7" height="40" width="3"> <position x="598" y="123"/> <connectionPointIn> <relPosition x="0" y="20"/> @@ -257,13 +257,13 @@ </connectionPointOut> <variable>ORANGE_LIGHT</variable> </coil> - <comment localId="9" height="39" width="308"> - <position x="54" y="26"/> + <comment localId="9" height="52" width="318"> + <position x="51" y="11"/> <content> <xhtml:p><![CDATA[This action makes the orange light blink]]></xhtml:p> </content> </comment> - <block localId="10" width="57" height="40" typeName="R_TRIG" instanceName="R_TRIG0"> + <block localId="10" width="58" height="40" typeName="R_TRIG" instanceName="R_TRIG0"> <position x="370" y="262"/> <inputVariables> <variable formalParameter="CLK"> @@ -280,12 +280,12 @@ <outputVariables> <variable formalParameter="Q"> <connectionPointOut> - <relPosition x="57" y="30"/> + <relPosition x="58" y="30"/> </connectionPointOut> </variable> </outputVariables> </block> - <block localId="11" width="57" height="40" typeName="R_TRIG" instanceName="R_TRIG1"> + <block localId="11" width="58" height="40" typeName="R_TRIG" instanceName="R_TRIG1"> <position x="371" y="113"/> <inputVariables> <variable formalParameter="CLK"> @@ -302,12 +302,12 @@ <outputVariables> <variable formalParameter="Q"> <connectionPointOut> - <relPosition x="57" y="30"/> + <relPosition x="58" y="30"/> </connectionPointOut> </variable> </outputVariables> </block> - <rightPowerRail localId="12" height="40" width="2"> + <rightPowerRail localId="12" height="40" width="3"> <position x="597" y="272"/> <connectionPointIn> <relPosition x="0" y="20"/> @@ -317,10 +317,10 @@ </connection> </connectionPointIn> </rightPowerRail> - <leftPowerRail localId="13" height="40" width="2"> + <leftPowerRail localId="13" height="40" width="3"> <position x="67" y="272"/> <connectionPointOut formalParameter=""> - <relPosition x="2" y="20"/> + <relPosition x="3" y="20"/> </connectionPointOut> </leftPowerRail> <contact localId="14" height="15" width="21"> @@ -337,10 +337,10 @@ </connectionPointOut> <variable>ORANGE_LIGHT</variable> </contact> - <inVariable localId="15" height="27" width="72"> + <inVariable localId="15" height="30" width="72" negated="false"> <position x="90" y="322"/> <connectionPointOut> - <relPosition x="72" y="13"/> + <relPosition x="72" y="15"/> </connectionPointOut> <expression>T#500ms</expression> </inVariable> @@ -374,19 +374,21 @@ </variable> </outputVariables> </block> - <inVariable localId="43" height="27" width="156"> + <inVariable localId="43" height="30" width="156" executionOrderId="0" negated="false"> <position x="46" y="57"/> <connectionPointOut> - <relPosition x="156" y="13"/> + <relPosition x="156" y="15"/> </connectionPointOut> <expression>SWITCH_BUTTON</expression> </inVariable> - <outVariable localId="44" height="27" width="46"> + <outVariable localId="44" height="30" width="46" executionOrderId="0" negated="false"> <position x="351" y="57"/> <connectionPointIn> - <relPosition x="0" y="13"/> + <relPosition x="0" y="15"/> <connection refLocalId="42" formalParameter="OUT"> - <position x="351" y="70"/> + <position x="351" y="72"/> + <position x="320" y="72"/> + <position x="320" y="70"/> <position x="289" y="70"/> </connection> </connectionPointIn> @@ -438,7 +440,7 @@ </inline> </condition> </transition> - <step localId="3" height="27" width="69" name="ORANGE"> + <step localId="3" height="30" width="69" name="ORANGE"> <position x="535" y="252"/> <connectionPointIn> <relPosition x="34" y="0"/> @@ -448,10 +450,10 @@ </connection> </connectionPointIn> <connectionPointOut formalParameter=""> - <relPosition x="34" y="27"/> + <relPosition x="34" y="30"/> </connectionPointOut> <connectionPointOutAction formalParameter=""> - <relPosition x="69" y="13"/> + <relPosition x="69" y="15"/> </connectionPointOutAction> </step> <transition localId="6" height="2" width="20"> @@ -680,7 +682,7 @@ <relPosition x="159" y="1"/> </connectionPointOut> </selectionDivergence> - <step localId="18" height="27" width="148" name="PEDESTRIAN_GREEN"> + <step localId="18" height="30" width="148" name="PEDESTRIAN_GREEN"> <position x="495" y="575"/> <connectionPointIn> <relPosition x="74" y="0"/> @@ -690,19 +692,21 @@ </connection> </connectionPointIn> <connectionPointOut formalParameter=""> - <relPosition x="74" y="27"/> + <relPosition x="74" y="30"/> </connectionPointOut> <connectionPointOutAction formalParameter=""> - <relPosition x="148" y="13"/> + <relPosition x="148" y="15"/> </connectionPointOutAction> </step> - <actionBlock localId="19" width="236" height="110"> + <actionBlock localId="19" width="247" height="110"> <position x="708" y="573"/> <connectionPointIn> <relPosition x="0" y="15"/> <connection refLocalId="18"> <position x="708" y="588"/> - <position x="643" y="588"/> + <position x="675" y="588"/> + <position x="675" y="590"/> + <position x="643" y="590"/> </connection> </connectionPointIn> <action localId="0" qualifier="S"> @@ -784,7 +788,7 @@ </inline> </condition> </transition> - <step localId="24" height="27" width="148" name="PEDESTRIAN_RED"> + <step localId="24" height="30" width="148" name="PEDESTRIAN_RED"> <position x="495" y="750"/> <connectionPointIn> <relPosition x="74" y="0"/> @@ -794,19 +798,21 @@ </connection> </connectionPointIn> <connectionPointOut formalParameter=""> - <relPosition x="74" y="27"/> + <relPosition x="74" y="30"/> </connectionPointOut> <connectionPointOutAction formalParameter=""> - <relPosition x="148" y="13"/> + <relPosition x="148" y="15"/> </connectionPointOutAction> </step> - <actionBlock localId="25" width="233" height="110"> + <actionBlock localId="25" width="239" height="110"> <position x="708" y="748"/> <connectionPointIn> <relPosition x="0" y="15"/> <connection refLocalId="24"> <position x="708" y="763"/> - <position x="643" y="763"/> + <position x="675" y="763"/> + <position x="675" y="765"/> + <position x="643" y="765"/> </connection> </connectionPointIn> <action localId="0" qualifier="S"> @@ -889,7 +895,7 @@ </inline> </condition> </transition> - <step localId="30" height="27" width="56" name="GREEN"> + <step localId="30" height="30" width="56" name="GREEN"> <position x="541" y="933"/> <connectionPointIn> <relPosition x="28" y="0"/> @@ -899,10 +905,10 @@ </connection> </connectionPointIn> <connectionPointOut formalParameter=""> - <relPosition x="28" y="27"/> + <relPosition x="28" y="30"/> </connectionPointOut> <connectionPointOutAction formalParameter=""> - <relPosition x="56" y="13"/> + <relPosition x="56" y="15"/> </connectionPointOutAction> </step> <actionBlock localId="31" width="227" height="110"> @@ -965,17 +971,17 @@ </variable> </outputVariables> </block> - <inVariable localId="33" height="27" width="159"> + <inVariable localId="33" height="30" width="159" negated="false"> <position x="24" y="1052"/> <connectionPointOut> - <relPosition x="159" y="13"/> + <relPosition x="159" y="15"/> </connectionPointOut> <expression>PEDESTRIAN_BUTTON</expression> </inVariable> - <inVariable localId="34" height="27" width="43"> + <inVariable localId="34" height="30" width="43" negated="false"> <position x="227" y="1115"/> <connectionPointOut> - <relPosition x="43" y="13"/> + <relPosition x="43" y="15"/> </connectionPointOut> <expression>T#2s</expression> </inVariable> @@ -1012,10 +1018,10 @@ </variable> </outputVariables> </block> - <inVariable localId="36" height="27" width="97"> + <inVariable localId="36" height="30" width="97" negated="false"> <position x="163" y="1182"/> <connectionPointOut> - <relPosition x="97" y="13"/> + <relPosition x="97" y="15"/> </connectionPointOut> <expression>WARN_CARS</expression> </inVariable> @@ -1086,7 +1092,7 @@ </connection> </connectionPointIn> </jumpStep> - <block localId="44" width="50" height="60" typeName="SR" instanceName="SR0"> + <block localId="44" width="51" height="60" typeName="SR" instanceName="SR0"> <position x="224" y="1035"/> <inputVariables> <variable formalParameter="S1"> @@ -1094,7 +1100,9 @@ <relPosition x="0" y="30"/> <connection refLocalId="33"> <position x="224" y="1065"/> - <position x="183" y="1065"/> + <position x="203" y="1065"/> + <position x="203" y="1067"/> + <position x="183" y="1067"/> </connection> </connectionPointIn> </variable> @@ -1116,12 +1124,12 @@ <outputVariables> <variable formalParameter="Q1"> <connectionPointOut> - <relPosition x="50" y="30"/> + <relPosition x="51" y="30"/> </connectionPointOut> </variable> </outputVariables> </block> - <comment localId="45" height="681" width="645"> + <comment localId="45" height="907" width="645"> <position x="1021" y="21"/> <content> <xhtml:p><![CDATA[*** Description of SFC action qualifiers *** @@ -1168,7 +1176,7 @@ ]]></xhtml:p> </content> </comment> - <comment localId="46" height="160" width="375"> + <comment localId="46" height="224" width="375"> <position x="8" y="326"/> <content> <xhtml:p><![CDATA[Conditions can be written in any IEC 61131-3 language. @@ -1200,7 +1208,7 @@ </connectionPointOut> <variable>SWITCH_BUTTON</variable> </contact> - <comment localId="13" height="66" width="375"> + <comment localId="13" height="86" width="379"> <position x="9" y="28"/> <content> <xhtml:p><![CDATA[ @@ -1257,7 +1265,7 @@ </interface> <body> <FBD> - <block localId="1" width="349" height="836" typeName="traffic_light_sequence" instanceName="trafic_light_sequence0" executionOrderId="0"> + <block localId="1" width="350" height="836" typeName="traffic_light_sequence" instanceName="trafic_light_sequence0" executionOrderId="0"> <position x="470" y="406"/> <inputVariables> <variable formalParameter="SWITCH_BUTTON"> @@ -1285,27 +1293,27 @@ <outputVariables> <variable formalParameter="RED_LIGHT"> <connectionPointOut> - <relPosition x="349" y="101"/> + <relPosition x="350" y="101"/> </connectionPointOut> </variable> <variable formalParameter="ORANGE_LIGHT"> <connectionPointOut> - <relPosition x="349" y="264"/> + <relPosition x="350" y="264"/> </connectionPointOut> </variable> <variable formalParameter="GREEN_LIGHT"> <connectionPointOut> - <relPosition x="349" y="427"/> + <relPosition x="350" y="427"/> </connectionPointOut> </variable> <variable formalParameter="PEDESTRIAN_RED_LIGHT"> <connectionPointOut> - <relPosition x="349" y="590"/> + <relPosition x="350" y="590"/> </connectionPointOut> </variable> <variable formalParameter="PEDESTRIAN_GREEN_LIGHT"> <connectionPointOut> - <relPosition x="349" y="753"/> + <relPosition x="350" y="753"/> </connectionPointOut> </variable> </outputVariables> @@ -1406,38 +1414,38 @@ </variable> </outputVariables> </block> - <inVariable localId="4" height="27" width="18" executionOrderId="0" negated="false"> + <inVariable localId="4" height="30" width="18" executionOrderId="0" negated="false"> <position x="118" y="558"/> <connectionPointOut> - <relPosition x="18" y="13"/> + <relPosition x="18" y="15"/> </connectionPointOut> <expression>1</expression> </inVariable> - <inVariable localId="5" height="27" width="105" executionOrderId="0" negated="false"> + <inVariable localId="5" height="30" width="105" executionOrderId="0" negated="false"> <position x="31" y="494"/> <connectionPointOut> - <relPosition x="105" y="13"/> + <relPosition x="105" y="15"/> </connectionPointOut> <expression>'SWITCH_OFF'</expression> </inVariable> - <inVariable localId="6" height="27" width="105" executionOrderId="0" negated="false"> + <inVariable localId="6" height="30" width="105" executionOrderId="0" negated="false"> <position x="31" y="526"/> <connectionPointOut> - <relPosition x="105" y="13"/> + <relPosition x="105" y="15"/> </connectionPointOut> <expression>'SWITCH_ON'</expression> </inVariable> - <inVariable localId="7" height="27" width="137" executionOrderId="0" negated="false"> + <inVariable localId="7" height="30" width="137" executionOrderId="0" negated="false"> <position x="22" y="708"/> <connectionPointOut> - <relPosition x="137" y="13"/> + <relPosition x="137" y="15"/> </connectionPointOut> <expression>'PEDESTRIAN_OFF'</expression> </inVariable> - <inVariable localId="8" height="27" width="137" executionOrderId="0" negated="false"> + <inVariable localId="8" height="30" width="137" executionOrderId="0" negated="false"> <position x="22" y="743"/> <connectionPointOut> - <relPosition x="137" y="13"/> + <relPosition x="137" y="15"/> </connectionPointOut> <expression>'PEDESTRIAN_ON'</expression> </inVariable> @@ -1475,17 +1483,17 @@ <inOutVariables/> <outputVariables/> </block> - <inVariable localId="10" height="27" width="79" executionOrderId="0" negated="false"> + <inVariable localId="10" height="30" width="79" executionOrderId="0" negated="false"> <position x="931" y="420"/> <connectionPointOut> - <relPosition x="79" y="13"/> + <relPosition x="79" y="15"/> </connectionPointOut> <expression>'RED_OFF'</expression> </inVariable> - <inVariable localId="11" height="27" width="79" executionOrderId="0" negated="false"> + <inVariable localId="11" height="30" width="79" executionOrderId="0" negated="false"> <position x="931" y="457"/> <connectionPointOut> - <relPosition x="79" y="13"/> + <relPosition x="79" y="15"/> </connectionPointOut> <expression>'RED_ON'</expression> </inVariable> @@ -1523,17 +1531,17 @@ <inOutVariables/> <outputVariables/> </block> - <inVariable localId="13" height="27" width="111" executionOrderId="0" negated="false"> + <inVariable localId="13" height="30" width="111" executionOrderId="0" negated="false"> <position x="899" y="583"/> <connectionPointOut> - <relPosition x="111" y="13"/> + <relPosition x="111" y="15"/> </connectionPointOut> <expression>'ORANGE_OFF'</expression> </inVariable> - <inVariable localId="14" height="27" width="106" executionOrderId="0" negated="false"> + <inVariable localId="14" height="30" width="106" executionOrderId="0" negated="false"> <position x="904" y="620"/> <connectionPointOut> - <relPosition x="106" y="13"/> + <relPosition x="106" y="15"/> </connectionPointOut> <expression>'ORANGE_ON'</expression> </inVariable> @@ -1571,17 +1579,17 @@ <inOutVariables/> <outputVariables/> </block> - <inVariable localId="16" height="27" width="111" executionOrderId="0" negated="false"> + <inVariable localId="16" height="30" width="111" executionOrderId="0" negated="false"> <position x="899" y="746"/> <connectionPointOut> - <relPosition x="111" y="13"/> + <relPosition x="111" y="15"/> </connectionPointOut> <expression>'GREEN_OFF'</expression> </inVariable> - <inVariable localId="17" height="27" width="106" executionOrderId="0" negated="false"> + <inVariable localId="17" height="30" width="106" executionOrderId="0" negated="false"> <position x="904" y="783"/> <connectionPointOut> - <relPosition x="106" y="13"/> + <relPosition x="106" y="15"/> </connectionPointOut> <expression>'GREEN_ON'</expression> </inVariable> @@ -1619,17 +1627,17 @@ <inOutVariables/> <outputVariables/> </block> - <inVariable localId="19" height="27" width="171" executionOrderId="0" negated="false"> + <inVariable localId="19" height="30" width="171" executionOrderId="0" negated="false"> <position x="849" y="909"/> <connectionPointOut> - <relPosition x="171" y="13"/> + <relPosition x="171" y="15"/> </connectionPointOut> <expression>'PEDESTRIAN_RED_OFF'</expression> </inVariable> - <inVariable localId="20" height="27" width="166" executionOrderId="0" negated="false"> + <inVariable localId="20" height="30" width="166" executionOrderId="0" negated="false"> <position x="854" y="946"/> <connectionPointOut> - <relPosition x="166" y="13"/> + <relPosition x="166" y="15"/> </connectionPointOut> <expression>'PEDESTRIAN_RED_ON'</expression> </inVariable> @@ -1667,21 +1675,21 @@ <inOutVariables/> <outputVariables/> </block> - <inVariable localId="22" height="27" width="190" executionOrderId="0" negated="false"> + <inVariable localId="22" height="30" width="190" executionOrderId="0" negated="false"> <position x="845" y="1072"/> <connectionPointOut> - <relPosition x="190" y="13"/> + <relPosition x="190" y="15"/> </connectionPointOut> <expression>'PEDESTRIAN_GREEN_OFF'</expression> </inVariable> - <inVariable localId="23" height="27" width="185" executionOrderId="0" negated="false"> + <inVariable localId="23" height="30" width="185" executionOrderId="0" negated="false"> <position x="850" y="1109"/> <connectionPointOut> - <relPosition x="185" y="13"/> + <relPosition x="185" y="15"/> </connectionPointOut> <expression>'PEDESTRIAN_GREEN_ON'</expression> </inVariable> - <comment localId="24" height="262" width="804"> + <comment localId="24" height="287" width="1008"> <position x="22" y="13"/> <content> <xhtml:p><![CDATA[This example implements control of traffic lights. @@ -1703,8 +1711,8 @@ ]]></xhtml:p> </content> </comment> - <comment localId="102" height="126" width="411"> - <position x="20" y="319"/> + <comment localId="102" height="144" width="444"> + <position x="20" y="303"/> <content> <xhtml:p><![CDATA[In this example FB like 'Button', 'Led' and 'Text' are used. Back_id and sele_id inputs of these blocks are IDs of