# HG changeset patch
# User Andrey Skvortsov <andrej.skvortzov@gmail.com>
# Date 1537960851 -10800
# Node ID ac16bad593cf5ad0c7d0a3d28869404784ced1c4
# Parent a56362c818a3986c2da4f487458dbbe4f7054497
Cleanup examples so they look clean, nice and almost the same on Windows and GNU/Linux
diff -r a56362c818a3 -r ac16bad593cf tests/BACnet/plc.xml
--- a/tests/BACnet/plc.xml Wed Sep 26 14:15:22 2018 +0300
+++ b/tests/BACnet/plc.xml Wed Sep 26 14:20:51 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="2018-07-28T02:24:08"/>
- <contentHeader name="BACnet" modificationDateTime="2018-07-29T01:54:59">
+ <contentHeader name="BACnet" modificationDateTime="2018-09-26T14:00:21">
<coordinateInfo>
<fbd>
<scaling x="0" y="0"/>
@@ -73,14 +73,14 @@
</interface>
<body>
<FBD>
- <inVariable localId="1" executionOrderId="0" height="30" width="105" negated="false">
+ <inVariable localId="1" executionOrderId="0" height="30" width="114" negated="false">
<position x="299" y="521"/>
<connectionPointOut>
- <relPosition x="105" y="15"/>
+ <relPosition x="114" y="15"/>
</connectionPointOut>
<expression>EnergyCounter</expression>
</inVariable>
- <outVariable localId="2" executionOrderId="0" height="30" width="105" negated="false">
+ <outVariable localId="2" executionOrderId="0" height="30" width="114" negated="false">
<position x="654" y="521"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
@@ -137,30 +137,30 @@
<xhtml:p><![CDATA[Always consume some energy]]></xhtml:p>
</content>
</comment>
- <block localId="6" typeName="Simulator" instanceName="TempSimulation" executionOrderId="0" height="115" width="134">
- <position x="188" y="661"/>
+ <block localId="6" typeName="Simulator" instanceName="TempSimulation" executionOrderId="0" height="128" width="143">
+ <position x="188" y="648"/>
<inputVariables>
<variable formalParameter="MinVal">
<connectionPointIn>
- <relPosition x="0" y="35"/>
+ <relPosition x="0" y="38"/>
<connection refLocalId="8">
- <position x="188" y="696"/>
- <position x="138" y="696"/>
+ <position x="188" y="686"/>
+ <position x="138" y="686"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="MaxVal">
<connectionPointIn>
- <relPosition x="0" y="66"/>
+ <relPosition x="0" y="74"/>
<connection refLocalId="9">
- <position x="188" y="727"/>
- <position x="138" y="727"/>
+ <position x="188" y="722"/>
+ <position x="138" y="722"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="PeriodSeconds">
<connectionPointIn>
- <relPosition x="0" y="97"/>
+ <relPosition x="0" y="110"/>
<connection refLocalId="10">
<position x="188" y="758"/>
<position x="138" y="758"/>
@@ -172,31 +172,31 @@
<outputVariables>
<variable formalParameter="Out">
<connectionPointOut>
- <relPosition x="134" y="35"/>
+ <relPosition x="143" y="38"/>
</connectionPointOut>
</variable>
</outputVariables>
</block>
- <outVariable localId="7" executionOrderId="0" height="30" width="92" negated="false">
- <position x="421" y="681"/>
+ <outVariable localId="7" executionOrderId="0" height="30" width="98" negated="false">
+ <position x="421" y="671"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="6" formalParameter="Out">
- <position x="421" y="696"/>
- <position x="322" y="696"/>
+ <position x="421" y="686"/>
+ <position x="331" y="686"/>
</connection>
</connectionPointIn>
<expression>Temperature</expression>
</outVariable>
<inVariable localId="8" executionOrderId="0" height="30" width="105" negated="false">
- <position x="33" y="681"/>
+ <position x="33" y="671"/>
<connectionPointOut>
<relPosition x="105" y="15"/>
</connectionPointOut>
<expression>18.0</expression>
</inVariable>
<inVariable localId="9" executionOrderId="0" height="30" width="105" negated="false">
- <position x="33" y="712"/>
+ <position x="33" y="707"/>
<connectionPointOut>
<relPosition x="105" y="15"/>
</connectionPointOut>
@@ -209,33 +209,33 @@
</connectionPointOut>
<expression>120</expression>
</inVariable>
- <block localId="11" typeName="Simulator" instanceName="HumiditySimulation" executionOrderId="0" height="115" width="134">
+ <block localId="11" typeName="Simulator" instanceName="HumiditySimulation" executionOrderId="0" height="137" width="143">
<position x="185" y="803"/>
<inputVariables>
<variable formalParameter="MinVal">
<connectionPointIn>
- <relPosition x="0" y="35"/>
+ <relPosition x="0" y="39"/>
<connection refLocalId="13">
- <position x="185" y="838"/>
- <position x="135" y="838"/>
+ <position x="185" y="842"/>
+ <position x="135" y="842"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="MaxVal">
<connectionPointIn>
- <relPosition x="0" y="66"/>
+ <relPosition x="0" y="78"/>
<connection refLocalId="14">
- <position x="185" y="869"/>
- <position x="135" y="869"/>
+ <position x="185" y="881"/>
+ <position x="135" y="881"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="PeriodSeconds">
<connectionPointIn>
- <relPosition x="0" y="97"/>
+ <relPosition x="0" y="117"/>
<connection refLocalId="15">
- <position x="185" y="900"/>
- <position x="135" y="900"/>
+ <position x="185" y="920"/>
+ <position x="135" y="920"/>
</connection>
</connectionPointIn>
</variable>
@@ -244,38 +244,38 @@
<outputVariables>
<variable formalParameter="Out">
<connectionPointOut>
- <relPosition x="134" y="35"/>
+ <relPosition x="143" y="39"/>
</connectionPointOut>
</variable>
</outputVariables>
</block>
- <outVariable localId="12" executionOrderId="0" height="30" width="92" negated="false">
- <position x="418" y="823"/>
+ <outVariable localId="12" executionOrderId="0" height="30" width="111" negated="false">
+ <position x="418" y="827"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="11" formalParameter="Out">
- <position x="418" y="838"/>
- <position x="319" y="838"/>
+ <position x="418" y="842"/>
+ <position x="328" y="842"/>
</connection>
</connectionPointIn>
<expression>Humidity</expression>
</outVariable>
<inVariable localId="13" executionOrderId="0" height="30" width="105" negated="false">
- <position x="30" y="823"/>
+ <position x="30" y="827"/>
<connectionPointOut>
<relPosition x="105" y="15"/>
</connectionPointOut>
<expression>55.0</expression>
</inVariable>
<inVariable localId="14" executionOrderId="0" height="30" width="105" negated="false">
- <position x="30" y="854"/>
+ <position x="30" y="866"/>
<connectionPointOut>
<relPosition x="105" y="15"/>
</connectionPointOut>
<expression>78.0</expression>
</inVariable>
<inVariable localId="15" executionOrderId="0" height="30" width="105" negated="false">
- <position x="30" y="885"/>
+ <position x="30" y="905"/>
<connectionPointOut>
<relPosition x="105" y="15"/>
</connectionPointOut>
@@ -314,10 +314,10 @@
</variable>
</outputVariables>
</block>
- <inVariable localId="18" executionOrderId="0" height="30" width="92" negated="false">
+ <inVariable localId="18" executionOrderId="0" height="30" width="98" negated="false">
<position x="40" y="1118"/>
<connectionPointOut>
- <relPosition x="92" y="15"/>
+ <relPosition x="98" y="15"/>
</connectionPointOut>
<expression>Temperature</expression>
</inVariable>
@@ -356,10 +356,10 @@
</variable>
</outputVariables>
</block>
- <inVariable localId="20" executionOrderId="0" height="30" width="104" negated="false">
+ <inVariable localId="20" executionOrderId="0" height="30" width="122" negated="false">
<position x="41" y="1059"/>
<connectionPointOut>
- <relPosition x="104" y="15"/>
+ <relPosition x="122" y="15"/>
</connectionPointOut>
<expression>ControlDisable</expression>
</inVariable>
@@ -374,10 +374,10 @@
</connectionPointIn>
<expression>Cooler</expression>
</outVariable>
- <inVariable localId="22" executionOrderId="0" height="30" width="146" negated="false">
+ <inVariable localId="22" executionOrderId="0" height="30" width="162" negated="false">
<position x="39" y="1154"/>
<connectionPointOut>
- <relPosition x="146" y="15"/>
+ <relPosition x="162" y="15"/>
</connectionPointOut>
<expression>TemperatureSetPoint</expression>
</inVariable>
@@ -414,10 +414,10 @@
</variable>
</outputVariables>
</block>
- <inVariable localId="23" executionOrderId="0" height="30" width="92" negated="false">
+ <inVariable localId="23" executionOrderId="0" height="30" width="98" negated="false">
<position x="37" y="1293"/>
<connectionPointOut>
- <relPosition x="92" y="15"/>
+ <relPosition x="98" y="15"/>
</connectionPointOut>
<expression>Temperature</expression>
</inVariable>
@@ -456,10 +456,10 @@
</variable>
</outputVariables>
</block>
- <inVariable localId="25" executionOrderId="0" height="30" width="104" negated="false">
+ <inVariable localId="25" executionOrderId="0" height="30" width="122" negated="false">
<position x="38" y="1234"/>
<connectionPointOut>
- <relPosition x="104" y="15"/>
+ <relPosition x="122" y="15"/>
</connectionPointOut>
<expression>ControlDisable</expression>
</inVariable>
@@ -474,10 +474,10 @@
</connectionPointIn>
<expression>Heater</expression>
</outVariable>
- <inVariable localId="27" executionOrderId="0" height="30" width="146" negated="false">
+ <inVariable localId="27" executionOrderId="0" height="30" width="162" negated="false">
<position x="36" y="1329"/>
<connectionPointOut>
- <relPosition x="146" y="15"/>
+ <relPosition x="162" y="15"/>
</connectionPointOut>
<expression>TemperatureSetPoint</expression>
</inVariable>
diff -r a56362c818a3 -r ac16bad593cf tests/canopen_master/plc.xml
--- a/tests/canopen_master/plc.xml Wed Sep 26 14:15:22 2018 +0300
+++ b/tests/canopen_master/plc.xml Wed Sep 26 14:20:51 2018 +0300
@@ -1,15 +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.xsd"
- xmlns:xhtml="http://www.w3.org/1999/xhtml"
- xsi:schemaLocation="http://www.plcopen.org/xml/tc6.xsd">
- <fileHeader companyName="beremiz"
- productName="beremiz"
- productVersion="1"
- creationDateTime="2008-06-24T18:44:00"/>
- <contentHeader name="canopen_master"
- modificationDateTime="2009-10-07T18:45:11"
- language="en-US">
+<?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="1" creationDateTime="2008-06-24T18:44:00"/>
+ <contentHeader name="canopen_master" modificationDateTime="2018-09-26T13:31:52" language="en-US">
<coordinateInfo>
<fbd>
<scaling x="0" y="0"/>
@@ -42,14 +34,12 @@
</interface>
<body>
<FBD>
- <outVariable localId="1" height="29" width="80">
- <position x="362" y="140"/>
+ <outVariable localId="1" height="29" width="80" executionOrderId="0" negated="false">
+ <position x="362" y="139"/>
<connectionPointIn>
<relPosition x="0" y="14"/>
<connection refLocalId="4" formalParameter="OUT">
- <position x="362" y="154"/>
- <position x="330" y="154"/>
- <position x="330" y="153"/>
+ <position x="362" y="153"/>
<position x="299" y="153"/>
</connection>
</connectionPointIn>
diff -r a56362c818a3 -r ac16bad593cf tests/canopen_slave/plc.xml
--- a/tests/canopen_slave/plc.xml Wed Sep 26 14:15:22 2018 +0300
+++ b/tests/canopen_slave/plc.xml Wed Sep 26 14:20:51 2018 +0300
@@ -1,15 +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.xsd"
- xmlns:xhtml="http://www.w3.org/1999/xhtml"
- xsi:schemaLocation="http://www.plcopen.org/xml/tc6.xsd">
- <fileHeader companyName="beremiz"
- productName="beremiz"
- productVersion="1"
- creationDateTime="2008-06-24T18:44:00"/>
- <contentHeader name="canopen_slave"
- modificationDateTime="2008-10-24T09:32:01"
- language="en-US">
+<?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="1" creationDateTime="2008-06-24T18:44:00"/>
+ <contentHeader name="canopen_slave" modificationDateTime="2018-09-26T13:32:23" language="en-US">
<coordinateInfo>
<fbd>
<scaling x="0" y="0"/>
@@ -42,14 +34,12 @@
</interface>
<body>
<FBD>
- <outVariable localId="1" height="29" width="80">
- <position x="362" y="140"/>
+ <outVariable localId="1" height="29" width="80" executionOrderId="0" negated="false">
+ <position x="362" y="139"/>
<connectionPointIn>
<relPosition x="0" y="14"/>
<connection refLocalId="4" formalParameter="OUT">
- <position x="362" y="154"/>
- <position x="330" y="154"/>
- <position x="330" y="153"/>
+ <position x="362" y="153"/>
<position x="299" y="153"/>
</connection>
</connectionPointIn>
@@ -113,8 +103,8 @@
<configurations>
<configuration name="conf">
<resource name="res">
- <task name="tache" interval="00:00:00.010000" priority="0">
- <pouInstance name="toto" type="test_main"/>
+ <task name="tache" interval="T#10ms" priority="0">
+ <pouInstance name="toto" typeName="test_main"/>
</task>
</resource>
</configuration>
diff -r a56362c818a3 -r ac16bad593cf tests/first_steps/plc.xml
--- a/tests/first_steps/plc.xml Wed Sep 26 14:15:22 2018 +0300
+++ b/tests/first_steps/plc.xml Wed Sep 26 14:20:51 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-08-24T13:11:30">
+ <contentHeader name="First Steps" modificationDateTime="2018-09-26T12:52:51">
<coordinateInfo>
<fbd>
<scaling x="0" y="0"/>
@@ -163,21 +163,21 @@
</outputVariables>
</block>
<inVariable localId="2" executionOrderId="0" height="30" width="79" negated="false">
- <position x="35" y="81"/>
+ <position x="35" y="78"/>
<connectionPointOut>
<relPosition x="79" y="15"/>
</connectionPointOut>
<expression>Reset</expression>
</inVariable>
<block localId="4" typeName="CounterFBD" instanceName="CounterFBD0" executionOrderId="0" height="54" width="121">
- <position x="211" y="145"/>
+ <position x="211" y="146"/>
<inputVariables>
<variable formalParameter="Reset">
<connectionPointIn>
<relPosition x="0" y="37"/>
<connection refLocalId="13">
- <position x="211" y="182"/>
- <position x="115" y="182"/>
+ <position x="211" y="183"/>
+ <position x="115" y="183"/>
</connection>
</connectionPointIn>
</variable>
@@ -191,7 +191,7 @@
</variable>
</outputVariables>
</block>
- <comment localId="6" height="344" width="434">
+ <comment localId="6" height="365" width="569">
<position x="620" y="130"/>
<content>
<xhtml:p><![CDATA[In this example function block with the same functionality
@@ -257,35 +257,35 @@
</outputVariables>
</block>
<inVariable localId="10" executionOrderId="0" height="30" width="67" negated="false">
- <position x="34" y="351"/>
+ <position x="34" y="348"/>
<connectionPointOut>
<relPosition x="67" y="15"/>
</connectionPointOut>
<expression>Reset</expression>
</inVariable>
<inVariable localId="12" executionOrderId="0" height="30" width="67" negated="false">
- <position x="36" y="261"/>
+ <position x="36" y="258"/>
<connectionPointOut>
<relPosition x="67" y="15"/>
</connectionPointOut>
<expression>Reset</expression>
</inVariable>
<inVariable localId="13" executionOrderId="0" height="30" width="79" negated="false">
- <position x="36" y="170"/>
+ <position x="36" y="168"/>
<connectionPointOut>
<relPosition x="79" y="15"/>
</connectionPointOut>
<expression>Reset</expression>
</inVariable>
<block localId="14" typeName="CounterLD" instanceName="CounterLD0" executionOrderId="0" height="62" width="124">
- <position x="210" y="411"/>
+ <position x="210" y="412"/>
<inputVariables>
<variable formalParameter="Reset">
<connectionPointIn>
<relPosition x="0" y="41"/>
<connection refLocalId="16">
- <position x="210" y="452"/>
- <position x="100" y="452"/>
+ <position x="210" y="453"/>
+ <position x="100" y="453"/>
</connection>
</connectionPointIn>
</variable>
@@ -300,13 +300,13 @@
</outputVariables>
</block>
<inVariable localId="16" executionOrderId="0" height="30" width="64" negated="false">
- <position x="36" y="440"/>
+ <position x="36" y="438"/>
<connectionPointOut>
<relPosition x="64" y="15"/>
</connectionPointOut>
<expression>Reset</expression>
</inVariable>
- <block localId="17" typeName="AverageVal" executionOrderId="0" height="470" width="90">
+ <block localId="17" typeName="AverageVal" executionOrderId="0" height="470" width="100">
<position x="514" y="28"/>
<inputVariables>
<variable formalParameter="Cnt1">
@@ -323,9 +323,7 @@
<relPosition x="0" y="155"/>
<connection refLocalId="5">
<position x="514" y="183"/>
- <position x="497" y="183"/>
- <position x="497" y="182"/>
- <position x="473" y="182"/>
+ <position x="473" y="183"/>
</connection>
</connectionPointIn>
</variable>
@@ -352,9 +350,7 @@
<relPosition x="0" y="425"/>
<connection refLocalId="15">
<position x="514" y="453"/>
- <position x="495" y="453"/>
- <position x="495" y="452"/>
- <position x="469" y="452"/>
+ <position x="469" y="453"/>
</connection>
</connectionPointIn>
</variable>
@@ -363,18 +359,18 @@
<outputVariables>
<variable formalParameter="OUT">
<connectionPointOut>
- <relPosition x="90" y="65"/>
+ <relPosition x="100" y="65"/>
</connectionPointOut>
</variable>
</outputVariables>
</block>
- <outVariable localId="18" executionOrderId="0" height="30" width="50" negated="false">
+ <outVariable localId="18" executionOrderId="0" height="30" width="55" negated="false">
<position x="649" y="78"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="17" formalParameter="OUT">
<position x="649" y="93"/>
- <position x="604" y="93"/>
+ <position x="614" y="93"/>
</connection>
</connectionPointIn>
<expression>AVCnt</expression>
@@ -394,12 +390,12 @@
<expression>Cnt1</expression>
</inOutVariable>
<inOutVariable localId="5" executionOrderId="0" height="30" width="103" negatedOut="false" negatedIn="false">
- <position x="370" y="167"/>
+ <position x="370" y="168"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="4" formalParameter="OUT">
- <position x="370" y="182"/>
- <position x="332" y="182"/>
+ <position x="370" y="183"/>
+ <position x="332" y="183"/>
</connection>
</connectionPointIn>
<connectionPointOut>
@@ -436,12 +432,12 @@
<expression>Cnt4</expression>
</inOutVariable>
<inOutVariable localId="15" executionOrderId="0" height="30" width="88" negatedOut="false" negatedIn="false">
- <position x="381" y="437"/>
+ <position x="381" y="438"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="14" formalParameter="Out">
- <position x="381" y="452"/>
- <position x="334" y="452"/>
+ <position x="381" y="453"/>
+ <position x="334" y="453"/>
</connection>
</connectionPointIn>
<connectionPointOut>
@@ -546,23 +542,23 @@
</connectionPointIn>
<expression>OUT</expression>
</outVariable>
- <inOutVariable localId="3" executionOrderId="0" height="30" width="32" negatedOut="false" negatedIn="false">
+ <inOutVariable localId="3" executionOrderId="0" height="30" width="37" negatedOut="false" negatedIn="false">
<position x="557" y="137"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="7" formalParameter="OUT">
<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"/>
+ <position x="527" y="152"/>
+ <position x="527" y="130"/>
+ <position x="517" y="130"/>
+ </connection>
+ </connectionPointIn>
+ <connectionPointOut>
+ <relPosition x="37" y="15"/>
</connectionPointOut>
<expression>Cnt</expression>
</inOutVariable>
- <block localId="4" typeName="ADD" executionOrderId="0" height="80" width="67">
+ <block localId="4" typeName="ADD" executionOrderId="0" height="80" width="69">
<position x="328" y="115"/>
<inputVariables>
<variable formalParameter="IN1">
@@ -570,9 +566,7 @@
<relPosition x="0" y="35"/>
<connection refLocalId="6">
<position x="328" y="150"/>
- <position x="301" y="150"/>
- <position x="301" y="153"/>
- <position x="275" y="153"/>
+ <position x="275" y="150"/>
</connection>
</connectionPointIn>
</variable>
@@ -583,9 +577,9 @@
<position x="328" y="180"/>
<position x="317" y="180"/>
<position x="317" y="213"/>
- <position x="599" y="213"/>
- <position x="599" y="152"/>
- <position x="589" y="152"/>
+ <position x="604" y="213"/>
+ <position x="604" y="152"/>
+ <position x="594" y="152"/>
</connection>
</connectionPointIn>
</variable>
@@ -594,26 +588,26 @@
<outputVariables>
<variable formalParameter="OUT">
<connectionPointOut>
- <relPosition x="67" y="35"/>
+ <relPosition x="69" y="35"/>
</connectionPointOut>
</variable>
</outputVariables>
</block>
- <inVariable localId="5" executionOrderId="0" height="30" width="158" negated="false">
+ <inVariable localId="5" executionOrderId="0" height="30" width="163" negated="false">
<position x="222" y="256"/>
<connectionPointOut>
- <relPosition x="158" y="15"/>
+ <relPosition x="163" y="15"/>
</connectionPointOut>
<expression>ResetCounterValue</expression>
</inVariable>
<inVariable localId="6" executionOrderId="0" height="30" width="21" negated="false">
- <position x="254" y="138"/>
+ <position x="254" y="135"/>
<connectionPointOut>
<relPosition x="21" y="15"/>
</connectionPointOut>
<expression>1</expression>
</inVariable>
- <block localId="7" typeName="SEL" executionOrderId="0" height="80" width="67">
+ <block localId="7" typeName="SEL" executionOrderId="0" height="80" width="69">
<position x="448" y="100"/>
<inputVariables>
<variable formalParameter="G">
@@ -632,7 +626,7 @@
<relPosition x="0" y="50"/>
<connection refLocalId="4" formalParameter="OUT">
<position x="448" y="150"/>
- <position x="395" y="150"/>
+ <position x="397" y="150"/>
</connection>
</connectionPointIn>
</variable>
@@ -643,7 +637,7 @@
<position x="448" y="170"/>
<position x="414" y="170"/>
<position x="414" y="271"/>
- <position x="380" y="271"/>
+ <position x="385" y="271"/>
</connection>
</connectionPointIn>
</variable>
@@ -652,7 +646,7 @@
<outputVariables>
<variable formalParameter="OUT">
<connectionPointOut>
- <relPosition x="67" y="30"/>
+ <relPosition x="69" y="30"/>
</connectionPointOut>
</variable>
</outputVariables>
@@ -756,29 +750,29 @@
</inline>
</condition>
</transition>
- <step localId="5" name="ResetCounter" initialStep="false" height="30" width="104">
- <position x="449" y="190"/>
- <connectionPointIn>
- <relPosition x="52" y="0"/>
+ <step localId="5" name="ResetCounter" initialStep="false" height="30" width="134">
+ <position x="434" y="190"/>
+ <connectionPointIn>
+ <relPosition x="67" y="0"/>
<connection refLocalId="3">
<position x="501" y="190"/>
<position x="501" y="134"/>
</connection>
</connectionPointIn>
<connectionPointOut formalParameter="">
- <relPosition x="52" y="30"/>
+ <relPosition x="67" y="30"/>
</connectionPointOut>
<connectionPointOutAction formalParameter="">
- <relPosition x="104" y="15"/>
+ <relPosition x="134" y="15"/>
</connectionPointOutAction>
</step>
- <actionBlock localId="6" height="63" width="222">
- <position x="600" y="187"/>
+ <actionBlock localId="6" height="63" width="254">
+ <position x="641" y="190"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="5">
- <position x="600" y="202"/>
- <position x="553" y="202"/>
+ <position x="641" y="205"/>
+ <position x="568" y="205"/>
</connection>
</connectionPointIn>
<action localId="0">
@@ -814,13 +808,13 @@
<relPosition x="85" y="15"/>
</connectionPointOutAction>
</step>
- <actionBlock localId="8" height="52" width="148" executionOrderId="0">
- <position x="135" y="188"/>
+ <actionBlock localId="8" height="52" width="164" executionOrderId="0">
+ <position x="154" y="191"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="7">
- <position x="135" y="203"/>
- <position x="113" y="203"/>
+ <position x="154" y="206"/>
+ <position x="113" y="206"/>
</connection>
</connectionPointIn>
<action localId="0">
@@ -896,7 +890,7 @@
<relPosition x="10" y="0"/>
<connection refLocalId="5">
<position x="501" y="248"/>
- <position x="501" y="214"/>
+ <position x="501" y="220"/>
</connection>
</connectionPointIn>
<connectionPointOut>
@@ -1000,29 +994,27 @@
<body>
<LD>
<outVariable localId="2" executionOrderId="0" height="30" width="34" negated="false">
- <position x="527" y="90"/>
+ <position x="527" y="87"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="3">
- <position x="527" y="105"/>
- <position x="441" y="105"/>
+ <position x="527" y="102"/>
+ <position x="443" y="102"/>
</connection>
</connectionPointIn>
<expression>Out</expression>
</outVariable>
- <inOutVariable localId="3" executionOrderId="0" height="30" width="32" negatedOut="false" negatedIn="false">
- <position x="409" y="90"/>
+ <inOutVariable localId="3" executionOrderId="0" height="30" width="34" negatedOut="false" negatedIn="false">
+ <position x="409" y="87"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="7" formalParameter="OUT">
- <position x="409" y="105"/>
- <position x="388" y="105"/>
- <position x="388" y="102"/>
+ <position x="409" y="102"/>
<position x="367" y="102"/>
</connection>
</connectionPointIn>
<connectionPointOut>
- <relPosition x="32" y="15"/>
+ <relPosition x="34" y="15"/>
</connectionPointOut>
<expression>Cnt</expression>
</inOutVariable>
@@ -1034,9 +1026,7 @@
<relPosition x="0" y="35"/>
<connection refLocalId="6">
<position x="180" y="122"/>
- <position x="153" y="122"/>
- <position x="153" y="125"/>
- <position x="127" y="125"/>
+ <position x="127" y="122"/>
</connection>
</connectionPointIn>
</variable>
@@ -1047,9 +1037,9 @@
<position x="180" y="152"/>
<position x="169" y="152"/>
<position x="169" y="185"/>
- <position x="451" y="185"/>
- <position x="451" y="105"/>
- <position x="441" y="105"/>
+ <position x="453" y="185"/>
+ <position x="453" y="102"/>
+ <position x="443" y="102"/>
</connection>
</connectionPointIn>
</variable>
@@ -1071,7 +1061,7 @@
<expression>ResetCounterValue</expression>
</inVariable>
<inVariable localId="6" executionOrderId="0" height="30" width="21" negated="false">
- <position x="106" y="110"/>
+ <position x="106" y="107"/>
<connectionPointOut>
<relPosition x="21" y="15"/>
</connectionPointOut>
diff -r a56362c818a3 -r ac16bad593cf tests/logging/plc.xml
--- 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:
diff -r a56362c818a3 -r ac16bad593cf tests/python/plc.xml
--- a/tests/python/plc.xml Wed Sep 26 14:15:22 2018 +0300
+++ b/tests/python/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="" 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="2018-08-24T13:17:44">
+ <contentHeader name="Beremiz Python Support Tests" modificationDateTime="2018-09-26T13:15:28">
<coordinateInfo>
<pageSize x="1024" y="1024"/>
<fbd>
@@ -245,13 +245,13 @@
<expression>'time.sleep(1)'</expression>
</inVariable>
<block localId="5" width="125" height="80" typeName="python_eval" instanceName="py1" executionOrderId="0">
- <position x="650" y="400"/>
+ <position x="686" y="400"/>
<inputVariables>
<variable formalParameter="TRIG">
<connectionPointIn>
<relPosition x="0" y="35"/>
<connection refLocalId="7" formalParameter="OUT">
- <position x="650" y="435"/>
+ <position x="686" y="435"/>
<position x="285" y="435"/>
<position x="285" y="480"/>
<position x="250" y="480"/>
@@ -262,7 +262,7 @@
<connectionPointIn>
<relPosition x="0" y="65"/>
<connection refLocalId="4">
- <position x="650" y="465"/>
+ <position x="686" y="465"/>
<position x="455" y="465"/>
</connection>
</connectionPointIn>
@@ -323,13 +323,13 @@
<expression>pytest_var2</expression>
</inOutVariable>
<block localId="8" width="125" height="80" typeName="python_eval" instanceName="Block1" executionOrderId="0">
- <position x="650" y="545"/>
+ <position x="686" y="545"/>
<inputVariables>
<variable formalParameter="TRIG">
<connectionPointIn>
<relPosition x="0" y="35"/>
<connection refLocalId="7" formalParameter="OUT">
- <position x="650" y="580"/>
+ <position x="686" y="580"/>
<position x="285" y="580"/>
<position x="285" y="480"/>
<position x="250" y="480"/>
@@ -340,8 +340,8 @@
<connectionPointIn>
<relPosition x="0" y="65"/>
<connection refLocalId="9">
- <position x="650" y="610"/>
- <position x="585" y="610"/>
+ <position x="686" y="610"/>
+ <position x="665" y="610"/>
</connection>
</connectionPointIn>
</variable>
@@ -360,10 +360,10 @@
</variable>
</outputVariables>
</block>
- <inVariable localId="9" height="30" width="290" executionOrderId="0" negated="false">
+ <inVariable localId="9" height="30" width="370" executionOrderId="0" negated="false">
<position x="295" y="595"/>
<connectionPointOut>
- <relPosition x="290" y="15"/>
+ <relPosition x="370" y="15"/>
</connectionPointOut>
<expression>'sys.stdout.write("FBID :"+str(FBID)+"\n")'</expression>
</inVariable>
@@ -375,13 +375,13 @@
<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="687"/>
+ <position x="686" y="687"/>
<inputVariables>
<variable formalParameter="TRIG">
<connectionPointIn>
<relPosition x="0" y="33"/>
<connection refLocalId="7" formalParameter="OUT">
- <position x="650" y="720"/>
+ <position x="686" y="720"/>
<position x="285" y="720"/>
<position x="285" y="480"/>
<position x="250" y="480"/>
@@ -392,7 +392,7 @@
<connectionPointIn>
<relPosition x="0" y="63"/>
<connection refLocalId="11">
- <position x="650" y="750"/>
+ <position x="686" y="750"/>
<position x="585" y="750"/>
</connection>
</connectionPointIn>
@@ -420,13 +420,13 @@
<expression>'MyPythonFunc(42)'</expression>
</inVariable>
<block localId="15" width="125" height="80" typeName="python_eval" instanceName="Block3" executionOrderId="0">
- <position x="650" y="837"/>
+ <position x="686" y="837"/>
<inputVariables>
<variable formalParameter="TRIG">
<connectionPointIn>
<relPosition x="0" y="33"/>
<connection refLocalId="7" formalParameter="OUT">
- <position x="650" y="870"/>
+ <position x="686" y="870"/>
<position x="285" y="870"/>
<position x="285" y="480"/>
<position x="250" y="480"/>
@@ -437,7 +437,7 @@
<connectionPointIn>
<relPosition x="0" y="63"/>
<connection refLocalId="14">
- <position x="650" y="900"/>
+ <position x="686" y="900"/>
<position x="580" y="900"/>
</connection>
</connectionPointIn>
@@ -464,16 +464,16 @@
</content>
</comment>
<block localId="17" width="80" height="120" typeName="MUX" executionOrderId="0">
- <position x="1065" y="790"/>
+ <position x="1101" y="790"/>
<inputVariables>
<variable formalParameter="K">
<connectionPointIn>
<relPosition x="0" y="30"/>
<connection refLocalId="18">
- <position x="1065" y="820"/>
- <position x="1040" y="820"/>
- <position x="1040" y="810"/>
- <position x="1022" y="810"/>
+ <position x="1101" y="820"/>
+ <position x="1076" y="820"/>
+ <position x="1076" y="810"/>
+ <position x="1060" y="810"/>
</connection>
</connectionPointIn>
</variable>
@@ -481,10 +481,10 @@
<connectionPointIn>
<relPosition x="0" y="50"/>
<connection refLocalId="5" formalParameter="RESULT">
- <position x="1065" y="840"/>
- <position x="905" y="840"/>
- <position x="905" y="465"/>
- <position x="775" y="465"/>
+ <position x="1101" y="840"/>
+ <position x="941" y="840"/>
+ <position x="941" y="465"/>
+ <position x="811" y="465"/>
</connection>
</connectionPointIn>
</variable>
@@ -492,10 +492,10 @@
<connectionPointIn>
<relPosition x="0" y="70"/>
<connection refLocalId="8" formalParameter="RESULT">
- <position x="1065" y="860"/>
- <position x="890" y="860"/>
- <position x="890" y="610"/>
- <position x="775" y="610"/>
+ <position x="1101" y="860"/>
+ <position x="926" y="860"/>
+ <position x="926" y="610"/>
+ <position x="811" y="610"/>
</connection>
</connectionPointIn>
</variable>
@@ -503,10 +503,10 @@
<connectionPointIn>
<relPosition x="0" y="90"/>
<connection refLocalId="12" formalParameter="RESULT">
- <position x="1065" y="880"/>
- <position x="875" y="880"/>
- <position x="875" y="750"/>
- <position x="775" y="750"/>
+ <position x="1101" y="880"/>
+ <position x="911" y="880"/>
+ <position x="911" y="750"/>
+ <position x="811" y="750"/>
</connection>
</connectionPointIn>
</variable>
@@ -514,8 +514,8 @@
<connectionPointIn>
<relPosition x="0" y="110"/>
<connection refLocalId="15" formalParameter="RESULT">
- <position x="1065" y="900"/>
- <position x="775" y="900"/>
+ <position x="1101" y="900"/>
+ <position x="811" y="900"/>
</connection>
</connectionPointIn>
</variable>
@@ -530,27 +530,27 @@
</outputVariables>
</block>
<outVariable localId="19" height="35" width="125" executionOrderId="0" negated="false">
- <position x="1235" y="805"/>
+ <position x="1271" y="805"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="17" formalParameter="OUT">
- <position x="1235" y="820"/>
- <position x="1145" y="820"/>
+ <position x="1271" y="820"/>
+ <position x="1181" y="820"/>
</connection>
</connectionPointIn>
<expression>pytest_var1</expression>
</outVariable>
<block localId="21" width="80" height="120" typeName="MUX" executionOrderId="0">
- <position x="1070" y="385"/>
+ <position x="1106" y="385"/>
<inputVariables>
<variable formalParameter="K">
<connectionPointIn>
<relPosition x="0" y="30"/>
<connection refLocalId="22">
- <position x="1070" y="415"/>
- <position x="1040" y="415"/>
- <position x="1040" y="405"/>
- <position x="1017" y="405"/>
+ <position x="1106" y="415"/>
+ <position x="1076" y="415"/>
+ <position x="1076" y="405"/>
+ <position x="1055" y="405"/>
</connection>
</connectionPointIn>
</variable>
@@ -558,8 +558,8 @@
<connectionPointIn>
<relPosition x="0" y="50"/>
<connection refLocalId="5" formalParameter="ACK">
- <position x="1070" y="435"/>
- <position x="775" y="435"/>
+ <position x="1106" y="435"/>
+ <position x="811" y="435"/>
</connection>
</connectionPointIn>
</variable>
@@ -567,10 +567,10 @@
<connectionPointIn>
<relPosition x="0" y="70"/>
<connection refLocalId="8" formalParameter="ACK">
- <position x="1070" y="455"/>
- <position x="805" y="455"/>
- <position x="805" y="580"/>
- <position x="775" y="580"/>
+ <position x="1106" y="455"/>
+ <position x="841" y="455"/>
+ <position x="841" y="580"/>
+ <position x="811" y="580"/>
</connection>
</connectionPointIn>
</variable>
@@ -578,10 +578,10 @@
<connectionPointIn>
<relPosition x="0" y="90"/>
<connection refLocalId="12" formalParameter="ACK">
- <position x="1070" y="475"/>
- <position x="820" y="475"/>
- <position x="820" y="720"/>
- <position x="775" y="720"/>
+ <position x="1106" y="475"/>
+ <position x="856" y="475"/>
+ <position x="856" y="720"/>
+ <position x="811" y="720"/>
</connection>
</connectionPointIn>
</variable>
@@ -589,10 +589,10 @@
<connectionPointIn>
<relPosition x="0" y="110"/>
<connection refLocalId="15" formalParameter="ACK">
- <position x="1070" y="495"/>
- <position x="835" y="495"/>
- <position x="835" y="870"/>
- <position x="775" y="870"/>
+ <position x="1106" y="495"/>
+ <position x="871" y="495"/>
+ <position x="871" y="870"/>
+ <position x="811" y="870"/>
</connection>
</connectionPointIn>
</variable>
@@ -606,20 +606,20 @@
</variable>
</outputVariables>
</block>
- <inVariable localId="22" height="30" width="72" executionOrderId="0" negated="false">
- <position x="945" y="390"/>
- <connectionPointOut>
- <relPosition x="72" y="15"/>
+ <inVariable localId="22" height="30" width="74" executionOrderId="0" negated="false">
+ <position x="981" y="390"/>
+ <connectionPointOut>
+ <relPosition x="74" y="15"/>
</connectionPointOut>
<expression>mux1_sel</expression>
</inVariable>
<outVariable localId="23" height="35" width="125" executionOrderId="0" negated="false">
- <position x="1235" y="400"/>
+ <position x="1271" y="400"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="21" formalParameter="OUT">
- <position x="1235" y="415"/>
- <position x="1150" y="415"/>
+ <position x="1271" y="415"/>
+ <position x="1186" y="415"/>
</connection>
</connectionPointIn>
<expression>pytest_var3</expression>
@@ -771,10 +771,10 @@
</variable>
</outputVariables>
</block>
- <inVariable localId="36" height="30" width="65" executionOrderId="0" negated="false">
+ <inVariable localId="36" height="30" width="66" executionOrderId="0" negated="false">
<position x="60" y="1774"/>
<connectionPointOut>
- <relPosition x="65" y="16"/>
+ <relPosition x="66" y="16"/>
</connectionPointOut>
<expression>Test_DT</expression>
</inVariable>
@@ -824,7 +824,7 @@
</variable>
</outputVariables>
</block>
- <outVariable localId="40" height="30" width="80" executionOrderId="0" negated="false">
+ <outVariable localId="40" height="30" width="82" executionOrderId="0" negated="false">
<position x="580" y="1849"/>
<connectionPointIn>
<relPosition x="0" y="16"/>
@@ -835,7 +835,7 @@
</connectionPointIn>
<expression>Test_Date</expression>
</outVariable>
- <outVariable localId="42" height="30" width="90" executionOrderId="0" negated="false">
+ <outVariable localId="42" height="30" width="98" executionOrderId="0" negated="false">
<position x="465" y="1944"/>
<connectionPointIn>
<relPosition x="0" y="16"/>
@@ -846,7 +846,7 @@
</connectionPointIn>
<expression>Test_String</expression>
</outVariable>
- <outVariable localId="43" height="30" width="80" executionOrderId="0" negated="false">
+ <outVariable localId="43" height="30" width="82" executionOrderId="0" negated="false">
<position x="465" y="2014"/>
<connectionPointIn>
<relPosition x="0" y="16"/>
@@ -879,10 +879,10 @@
</variable>
</outputVariables>
</block>
- <inVariable localId="45" height="30" width="55" executionOrderId="0" negated="false">
+ <inVariable localId="45" height="30" width="58" executionOrderId="0" negated="false">
<position x="60" y="2014"/>
<connectionPointOut>
- <relPosition x="55" y="16"/>
+ <relPosition x="58" y="16"/>
</connectionPointOut>
<expression>'True'</expression>
</inVariable>
@@ -908,10 +908,10 @@
</variable>
</outputVariables>
</block>
- <inVariable localId="50" height="30" width="105" executionOrderId="0" negated="false">
+ <inVariable localId="50" height="30" width="106" executionOrderId="0" negated="false">
<position x="75" y="2275"/>
<connectionPointOut>
- <relPosition x="105" y="15"/>
+ <relPosition x="106" y="15"/>
</connectionPointOut>
<expression>Global_RS.Q1</expression>
</inVariable>
@@ -964,7 +964,7 @@
</connectionPointIn>
<expression>Global_RS.S</expression>
</outVariable>
- <outVariable localId="20" height="30" width="105" executionOrderId="0" negated="false">
+ <outVariable localId="20" height="30" width="106" executionOrderId="0" negated="false">
<position x="385" y="2390"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
@@ -975,10 +975,10 @@
</connectionPointIn>
<expression>Global_RS.R1</expression>
</outVariable>
- <inVariable localId="24" height="30" width="105" executionOrderId="0" negated="false">
+ <inVariable localId="24" height="30" width="106" executionOrderId="0" negated="false">
<position x="75" y="2390"/>
<connectionPointOut>
- <relPosition x="105" y="15"/>
+ <relPosition x="106" y="15"/>
</connectionPointOut>
<expression>Global_RS.Q1</expression>
</inVariable>
@@ -1098,14 +1098,14 @@
</connectionPointIn>
<expression>TUTU</expression>
</outVariable>
- <inVariable localId="58" height="30" width="145" executionOrderId="0" negated="false">
+ <inVariable localId="58" height="30" width="146" executionOrderId="0" negated="false">
<position x="60" y="1944"/>
<connectionPointOut>
- <relPosition x="145" y="16"/>
+ <relPosition x="146" y="16"/>
</connectionPointOut>
<expression>Second_Python_Var</expression>
</inVariable>
- <outVariable localId="47" height="30" width="125" executionOrderId="0" negated="false">
+ <outVariable localId="47" height="30" width="130" executionOrderId="0" negated="false">
<position x="200" y="1385"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
@@ -1123,7 +1123,7 @@
</connectionPointOut>
<expression>23</expression>
</inVariable>
- <block localId="61" typeName="function0" executionOrderId="0" height="45" width="110">
+ <block localId="61" typeName="function0" executionOrderId="0" height="45" width="111">
<position x="760" y="1170"/>
<inputVariables>
<variable formalParameter="LocalVar0">
@@ -1131,7 +1131,7 @@
<relPosition x="0" y="30"/>
<connection refLocalId="62">
<position x="760" y="1200"/>
- <position x="720" y="1200"/>
+ <position x="723" y="1200"/>
</connection>
</connectionPointIn>
</variable>
@@ -1140,25 +1140,25 @@
<outputVariables>
<variable formalParameter="OUT">
<connectionPointOut>
- <relPosition x="110" y="30"/>
- </connectionPointOut>
- </variable>
- </outputVariables>
- </block>
- <inVariable localId="62" executionOrderId="0" height="30" width="55" negated="false">
+ <relPosition x="111" y="30"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <inVariable localId="62" executionOrderId="0" height="30" width="58" negated="false">
<position x="665" y="1185"/>
<connectionPointOut>
- <relPosition x="55" y="15"/>
+ <relPosition x="58" y="15"/>
</connectionPointOut>
<expression>fefvsd</expression>
</inVariable>
- <outVariable localId="63" executionOrderId="0" height="30" width="55" negated="false">
+ <outVariable localId="63" executionOrderId="0" height="30" width="58" negated="false">
<position x="905" y="1185"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="61" formalParameter="OUT">
<position x="905" y="1200"/>
- <position x="870" y="1200"/>
+ <position x="871" y="1200"/>
</connection>
</connectionPointIn>
<expression>fefvsd</expression>
@@ -1169,10 +1169,10 @@
<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="72" executionOrderId="0" negated="false">
- <position x="950" y="795"/>
- <connectionPointOut>
- <relPosition x="72" y="15"/>
+ <inVariable localId="18" height="30" width="74" executionOrderId="0" negated="false">
+ <position x="986" y="795"/>
+ <connectionPointOut>
+ <relPosition x="74" y="15"/>
</connectionPointOut>
<expression>mux2_sel</expression>
</inVariable>
diff -r a56362c818a3 -r ac16bad593cf tests/svgui/plc.xml
--- a/tests/svgui/plc.xml Wed Sep 26 14:15:22 2018 +0300
+++ b/tests/svgui/plc.xml Wed Sep 26 14:20:51 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="2018-08-24T13:19:27">
+ <contentHeader name="Beremiz SVGUI Test" modificationDateTime="2018-09-26T13:18:53">
<coordinateInfo>
<pageSize x="1024" y="1024"/>
<fbd>
@@ -46,14 +46,14 @@
<body>
<FBD>
<block localId="32" width="80" height="110" typeName="ADD" executionOrderId="0">
- <position x="649" y="241"/>
+ <position x="649" y="285"/>
<inputVariables>
<variable formalParameter="EN">
<connectionPointIn>
<relPosition x="0" y="35"/>
<connection refLocalId="5">
- <position x="649" y="276"/>
- <position x="594" y="276"/>
+ <position x="649" y="320"/>
+ <position x="594" y="320"/>
</connection>
</connectionPointIn>
</variable>
@@ -61,8 +61,8 @@
<connectionPointIn>
<relPosition x="0" y="65"/>
<connection refLocalId="100" formalParameter="OUT">
- <position x="649" y="306"/>
- <position x="474" y="306"/>
+ <position x="649" y="350"/>
+ <position x="474" y="350"/>
</connection>
</connectionPointIn>
</variable>
@@ -70,12 +70,12 @@
<connectionPointIn>
<relPosition x="0" y="95"/>
<connection refLocalId="33">
- <position x="649" y="336"/>
- <position x="629" y="336"/>
- <position x="629" y="374"/>
- <position x="854" y="374"/>
- <position x="854" y="306"/>
- <position x="839" y="306"/>
+ <position x="649" y="380"/>
+ <position x="629" y="380"/>
+ <position x="629" y="418"/>
+ <position x="854" y="418"/>
+ <position x="854" y="350"/>
+ <position x="839" y="350"/>
</connection>
</connectionPointIn>
</variable>
@@ -95,12 +95,12 @@
</outputVariables>
</block>
<inOutVariable localId="33" height="35" width="85" executionOrderId="0" negatedOut="false" negatedIn="false">
- <position x="754" y="289"/>
+ <position x="754" y="333"/>
<connectionPointIn>
<relPosition x="0" y="17"/>
<connection refLocalId="32" formalParameter="OUT">
- <position x="754" y="306"/>
- <position x="729" y="306"/>
+ <position x="754" y="350"/>
+ <position x="729" y="350"/>
</connection>
</connectionPointIn>
<connectionPointOut>
@@ -109,56 +109,56 @@
<expression>counter</expression>
</inOutVariable>
<inVariable localId="39" height="35" width="89" executionOrderId="0" negated="false">
- <position x="55" y="289"/>
+ <position x="55" y="333"/>
<connectionPointOut>
<relPosition x="89" y="17"/>
</connectionPointOut>
<expression>BOOL#1</expression>
</inVariable>
<inVariable localId="41" height="30" width="120" executionOrderId="0" negated="false">
- <position x="21" y="575"/>
+ <position x="21" y="619"/>
<connectionPointOut>
<relPosition x="120" y="15"/>
</connectionPointOut>
<expression>'stop_back'</expression>
</inVariable>
<inVariable localId="42" height="30" width="120" executionOrderId="0" negated="false">
- <position x="21" y="617"/>
+ <position x="21" y="661"/>
<connectionPointOut>
<relPosition x="120" y="15"/>
</connectionPointOut>
<expression>'stop_sele'</expression>
</inVariable>
- <inVariable localId="46" height="30" width="121" executionOrderId="0" negated="false">
- <position x="694" y="755"/>
- <connectionPointOut>
- <relPosition x="121" y="15"/>
+ <inVariable localId="46" height="30" width="122" executionOrderId="0" negated="false">
+ <position x="694" y="799"/>
+ <connectionPointOut>
+ <relPosition x="122" y="15"/>
</connectionPointOut>
<expression>'text_counter'</expression>
</inVariable>
<inVariable localId="51" height="30" width="119" executionOrderId="0" negated="false">
- <position x="692" y="568"/>
+ <position x="692" y="612"/>
<connectionPointOut>
<relPosition x="119" y="15"/>
</connectionPointOut>
<expression>'led_stop'</expression>
</inVariable>
<inVariable localId="52" height="30" width="120" executionOrderId="0" negated="false">
- <position x="691" y="604"/>
+ <position x="691" y="648"/>
<connectionPointOut>
<relPosition x="120" y="15"/>
</connectionPointOut>
<expression>'led_start'</expression>
</inVariable>
<block localId="83" width="145" height="60" typeName="INT_TO_STRING" executionOrderId="0">
- <position x="537" y="812"/>
+ <position x="537" y="856"/>
<inputVariables>
<variable formalParameter="IN">
<connectionPointIn>
<relPosition x="0" y="40"/>
<connection refLocalId="4">
- <position x="537" y="852"/>
- <position x="504" y="852"/>
+ <position x="537" y="896"/>
+ <position x="504" y="896"/>
</connection>
</connectionPointIn>
</variable>
@@ -173,14 +173,14 @@
</outputVariables>
</block>
<block localId="92" width="187" height="230" typeName="Button" instanceName="Start_Stop" executionOrderId="0">
- <position x="201" y="549"/>
+ <position x="201" y="593"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
<relPosition x="0" y="41"/>
<connection refLocalId="41">
- <position x="201" y="590"/>
- <position x="141" y="590"/>
+ <position x="201" y="634"/>
+ <position x="141" y="634"/>
</connection>
</connectionPointIn>
</variable>
@@ -188,8 +188,8 @@
<connectionPointIn>
<relPosition x="0" y="83"/>
<connection refLocalId="42">
- <position x="201" y="632"/>
- <position x="141" y="632"/>
+ <position x="201" y="676"/>
+ <position x="141" y="676"/>
</connection>
</connectionPointIn>
</variable>
@@ -197,8 +197,8 @@
<connectionPointIn>
<relPosition x="0" y="125"/>
<connection refLocalId="93">
- <position x="201" y="674"/>
- <position x="141" y="674"/>
+ <position x="201" y="718"/>
+ <position x="141" y="718"/>
</connection>
</connectionPointIn>
</variable>
@@ -223,21 +223,21 @@
</outputVariables>
</block>
<inVariable localId="93" height="30" width="120" executionOrderId="0" negated="false">
- <position x="21" y="659"/>
+ <position x="21" y="703"/>
<connectionPointOut>
<relPosition x="120" y="15"/>
</connectionPointOut>
<expression>BOOL#1</expression>
</inVariable>
<block localId="94" width="100" height="145" typeName="TextCtrl" instanceName="Counter_TextCtrl" executionOrderId="0">
- <position x="876" y="730"/>
+ <position x="876" y="774"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
<relPosition x="0" y="40"/>
<connection refLocalId="46">
- <position x="876" y="770"/>
- <position x="815" y="770"/>
+ <position x="876" y="814"/>
+ <position x="816" y="814"/>
</connection>
</connectionPointIn>
</variable>
@@ -245,8 +245,8 @@
<connectionPointIn>
<relPosition x="0" y="81"/>
<connection refLocalId="3">
- <position x="876" y="811"/>
- <position x="815" y="811"/>
+ <position x="876" y="855"/>
+ <position x="815" y="855"/>
</connection>
</connectionPointIn>
</variable>
@@ -254,8 +254,8 @@
<connectionPointIn>
<relPosition x="0" y="122"/>
<connection refLocalId="83" formalParameter="OUT">
- <position x="876" y="852"/>
- <position x="682" y="852"/>
+ <position x="876" y="896"/>
+ <position x="682" y="896"/>
</connection>
</connectionPointIn>
</variable>
@@ -264,21 +264,21 @@
<outputVariables/>
</block>
<inVariable localId="1" height="30" width="88" executionOrderId="0" negated="false">
- <position x="59" y="228"/>
+ <position x="59" y="272"/>
<connectionPointOut>
<relPosition x="88" y="15"/>
</connectionPointOut>
<expression>BOOL#1</expression>
</inVariable>
<block localId="95" width="100" height="130" typeName="Led" instanceName="State_LedCtrl" executionOrderId="0">
- <position x="876" y="545"/>
+ <position x="876" y="589"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
<relPosition x="0" y="38"/>
<connection refLocalId="51">
- <position x="876" y="583"/>
- <position x="811" y="583"/>
+ <position x="876" y="627"/>
+ <position x="811" y="627"/>
</connection>
</connectionPointIn>
</variable>
@@ -286,8 +286,8 @@
<connectionPointIn>
<relPosition x="0" y="74"/>
<connection refLocalId="52">
- <position x="876" y="619"/>
- <position x="811" y="619"/>
+ <position x="876" y="663"/>
+ <position x="811" y="663"/>
</connection>
</connectionPointIn>
</variable>
@@ -295,8 +295,8 @@
<connectionPointIn>
<relPosition x="0" y="110"/>
<connection refLocalId="2">
- <position x="876" y="655"/>
- <position x="811" y="655"/>
+ <position x="876" y="699"/>
+ <position x="811" y="699"/>
</connection>
</connectionPointIn>
</variable>
@@ -305,18 +305,18 @@
<outputVariables/>
</block>
<block localId="96" width="80" height="65" typeName="AND" executionOrderId="0">
- <position x="200" y="190"/>
+ <position x="200" y="234"/>
<inputVariables>
<variable formalParameter="IN1" negated="true">
<connectionPointIn>
<relPosition x="0" y="31"/>
<connection refLocalId="96" formalParameter="OUT">
- <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"/>
+ <position x="200" y="265"/>
+ <position x="175" y="265"/>
+ <position x="175" y="219"/>
+ <position x="305" y="219"/>
+ <position x="305" y="265"/>
+ <position x="280" y="265"/>
</connection>
</connectionPointIn>
</variable>
@@ -324,8 +324,8 @@
<connectionPointIn>
<relPosition x="0" y="53"/>
<connection refLocalId="1">
- <position x="200" y="243"/>
- <position x="147" y="243"/>
+ <position x="200" y="287"/>
+ <position x="147" y="287"/>
</connection>
</connectionPointIn>
</variable>
@@ -340,53 +340,53 @@
</outputVariables>
</block>
<connector name="CLOCK" localId="97" height="30" width="90">
- <position x="345" y="206"/>
+ <position x="345" y="250"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="96" formalParameter="OUT">
- <position x="345" y="221"/>
- <position x="280" y="221"/>
+ <position x="345" y="265"/>
+ <position x="280" y="265"/>
</connection>
</connectionPointIn>
</connector>
<connector name="COUNT" localId="98" height="30" width="90">
- <position x="461" y="575"/>
+ <position x="461" y="619"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="92" formalParameter="state_out">
- <position x="461" y="590"/>
- <position x="388" y="590"/>
+ <position x="461" y="634"/>
+ <position x="388" y="634"/>
</connection>
</connectionPointIn>
</connector>
<continuation name="COUNT" localId="2" height="30" width="120">
- <position x="691" y="640"/>
+ <position x="691" y="684"/>
<connectionPointOut>
<relPosition x="120" y="15"/>
</connectionPointOut>
</continuation>
<inVariable localId="4" height="35" width="85" executionOrderId="0" negated="false">
- <position x="419" y="835"/>
+ <position x="419" y="879"/>
<connectionPointOut>
<relPosition x="85" y="17"/>
</connectionPointOut>
<expression>counter</expression>
</inVariable>
<continuation name="COUNT" localId="5" height="30" width="90">
- <position x="504" y="261"/>
+ <position x="504" y="305"/>
<connectionPointOut>
<relPosition x="90" y="15"/>
</connectionPointOut>
</continuation>
<block localId="99" width="80" height="110" typeName="AND" executionOrderId="0">
- <position x="199" y="264"/>
+ <position x="199" y="308"/>
<inputVariables>
<variable formalParameter="IN1">
<connectionPointIn>
<relPosition x="0" y="42"/>
<connection refLocalId="39">
- <position x="199" y="306"/>
- <position x="144" y="306"/>
+ <position x="199" y="350"/>
+ <position x="144" y="350"/>
</connection>
</connectionPointIn>
</variable>
@@ -394,8 +394,8 @@
<connectionPointIn>
<relPosition x="0" y="87"/>
<connection refLocalId="6">
- <position x="199" y="351"/>
- <position x="144" y="351"/>
+ <position x="199" y="395"/>
+ <position x="144" y="395"/>
</connection>
</connectionPointIn>
</variable>
@@ -410,20 +410,20 @@
</outputVariables>
</block>
<continuation name="CLOCK" localId="6" height="30" width="90">
- <position x="54" y="336"/>
+ <position x="54" y="380"/>
<connectionPointOut>
<relPosition x="90" y="15"/>
</connectionPointOut>
</continuation>
<block localId="100" width="125" height="45" typeName="BOOL_TO_INT" executionOrderId="0">
- <position x="349" y="274"/>
+ <position x="349" y="318"/>
<inputVariables>
<variable formalParameter="IN">
<connectionPointIn>
<relPosition x="0" y="32"/>
<connection refLocalId="99" formalParameter="OUT">
- <position x="349" y="306"/>
- <position x="279" y="306"/>
+ <position x="349" y="350"/>
+ <position x="279" y="350"/>
</connection>
</connectionPointIn>
</variable>
@@ -438,13 +438,13 @@
</outputVariables>
</block>
<continuation name="CLOCK" localId="3" height="30" width="122">
- <position x="693" y="796"/>
+ <position x="693" y="840"/>
<connectionPointOut>
<relPosition x="122" y="15"/>
</connectionPointOut>
</continuation>
- <comment localId="101" height="164" width="977">
- <position x="27" y="8"/>
+ <comment localId="101" height="197" width="1001">
+ <position x="11" y="12"/>
<content>
<xhtml:p><![CDATA[This example shows how IEC program in PLC can interact with web interface.
@@ -459,7 +459,7 @@
</content>
</comment>
<comment localId="102" height="126" width="641">
- <position x="17" y="397"/>
+ <position x="17" y="441"/>
<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 a56362c818a3 -r ac16bad593cf tests/traffic_lights/plc.xml
--- a/tests/traffic_lights/plc.xml Wed Sep 26 14:15:22 2018 +0300
+++ b/tests/traffic_lights/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="Beremiz" productName="Unnamed" productVersion="1" creationDateTime="2012-09-04T16:16:33"/>
- <contentHeader name="traffic_lights" modificationDateTime="2018-08-24T13:21:35">
+ <contentHeader name="traffic_lights" modificationDateTime="2018-09-26T17:49:02">
<coordinateInfo>
<fbd>
<scaling x="0" y="0"/>
@@ -176,10 +176,10 @@
</variable>
</outputVariables>
</block>
- <inVariable localId="4" height="30" width="72" negated="false">
- <position x="79" y="171"/>
+ <inVariable localId="4" height="37" width="76" negated="false">
+ <position x="75" y="166"/>
<connectionPointOut>
- <relPosition x="72" y="15"/>
+ <relPosition x="76" y="18"/>
</connectionPointOut>
<expression>T#500ms</expression>
</inVariable>
@@ -337,10 +337,10 @@
</connectionPointOut>
<variable>ORANGE_LIGHT</variable>
</contact>
- <inVariable localId="15" height="30" width="72" negated="false">
- <position x="90" y="322"/>
+ <inVariable localId="15" height="36" width="77" negated="false">
+ <position x="85" y="317"/>
<connectionPointOut>
- <relPosition x="72" y="15"/>
+ <relPosition x="77" y="18"/>
</connectionPointOut>
<expression>T#500ms</expression>
</inVariable>
@@ -352,15 +352,15 @@
<transition name="STOP">
<body>
<FBD>
- <block localId="42" width="59" height="40" typeName="NOT">
- <position x="230" y="40"/>
+ <block localId="42" width="59" height="53" typeName="NOT" executionOrderId="0">
+ <position x="237" y="31"/>
<inputVariables>
<variable formalParameter="IN">
<connectionPointIn>
- <relPosition x="0" y="30"/>
+ <relPosition x="0" y="36"/>
<connection refLocalId="43">
- <position x="230" y="70"/>
- <position x="202" y="70"/>
+ <position x="237" y="67"/>
+ <position x="202" y="67"/>
</connection>
</connectionPointIn>
</variable>
@@ -369,27 +369,25 @@
<outputVariables>
<variable formalParameter="OUT">
<connectionPointOut>
- <relPosition x="59" y="30"/>
+ <relPosition x="59" y="36"/>
</connectionPointOut>
</variable>
</outputVariables>
</block>
- <inVariable localId="43" height="30" width="156" executionOrderId="0" negated="false">
- <position x="46" y="57"/>
+ <inVariable localId="43" height="39" width="164" executionOrderId="0" negated="false">
+ <position x="38" y="48"/>
<connectionPointOut>
- <relPosition x="156" y="15"/>
+ <relPosition x="164" y="19"/>
</connectionPointOut>
<expression>SWITCH_BUTTON</expression>
</inVariable>
- <outVariable localId="44" height="30" width="46" executionOrderId="0" negated="false">
- <position x="351" y="57"/>
- <connectionPointIn>
- <relPosition x="0" y="15"/>
+ <outVariable localId="44" height="40" width="46" executionOrderId="0" negated="false">
+ <position x="351" y="47"/>
+ <connectionPointIn>
+ <relPosition x="0" y="20"/>
<connection refLocalId="42" formalParameter="OUT">
- <position x="351" y="72"/>
- <position x="320" y="72"/>
- <position x="320" y="70"/>
- <position x="289" y="70"/>
+ <position x="351" y="67"/>
+ <position x="296" y="67"/>
</connection>
</connectionPointIn>
<expression>STOP</expression>
@@ -400,32 +398,32 @@
</transitions>
<body>
<SFC>
- <step localId="1" height="37" width="78" name="Standstill" initialStep="true">
- <position x="530" y="31"/>
- <connectionPointIn>
- <relPosition x="39" y="0"/>
+ <step localId="1" height="37" width="121" name="Standstill" initialStep="true">
+ <position x="509" y="31"/>
+ <connectionPointIn>
+ <relPosition x="60" y="0"/>
<connection refLocalId="39">
<position x="569" y="31"/>
<position x="569" y="11"/>
- <position x="980" y="11"/>
- <position x="980" y="1151"/>
+ <position x="963" y="11"/>
+ <position x="963" y="1151"/>
<position x="776" y="1151"/>
<position x="776" y="1097"/>
</connection>
</connectionPointIn>
<connectionPointOut formalParameter="">
- <relPosition x="39" y="37"/>
+ <relPosition x="60" y="37"/>
</connectionPointOut>
<connectionPointOutAction formalParameter="">
- <relPosition x="78" y="18"/>
+ <relPosition x="121" y="18"/>
</connectionPointOutAction>
</step>
<transition localId="2" height="2" width="20">
- <position x="559" y="225"/>
+ <position x="559" y="222"/>
<connectionPointIn>
<relPosition x="10" y="0"/>
<connection refLocalId="1">
- <position x="569" y="225"/>
+ <position x="569" y="222"/>
<position x="569" y="68"/>
</connection>
</connectionPointIn>
@@ -440,20 +438,20 @@
</inline>
</condition>
</transition>
- <step localId="3" height="30" width="69" name="ORANGE">
- <position x="535" y="252"/>
- <connectionPointIn>
- <relPosition x="34" y="0"/>
+ <step localId="3" height="30" width="118" name="ORANGE">
+ <position x="510" y="250"/>
+ <connectionPointIn>
+ <relPosition x="59" y="0"/>
<connection refLocalId="2">
- <position x="569" y="252"/>
- <position x="569" y="227"/>
+ <position x="569" y="250"/>
+ <position x="569" y="224"/>
</connection>
</connectionPointIn>
<connectionPointOut formalParameter="">
- <relPosition x="34" y="30"/>
+ <relPosition x="59" y="30"/>
</connectionPointOut>
<connectionPointOutAction formalParameter="">
- <relPosition x="69" y="15"/>
+ <relPosition x="118" y="15"/>
</connectionPointOutAction>
</step>
<transition localId="6" height="2" width="20">
@@ -482,7 +480,7 @@
<relPosition x="0" y="15"/>
<connection refLocalId="1">
<position x="711" y="49"/>
- <position x="608" y="49"/>
+ <position x="630" y="49"/>
</connection>
</connectionPointIn>
<action localId="0" qualifier="P">
@@ -520,7 +518,7 @@
<relPosition x="0" y="15"/>
<connection refLocalId="3">
<position x="711" y="265"/>
- <position x="604" y="265"/>
+ <position x="628" y="265"/>
</connection>
</connectionPointIn>
<action localId="0" qualifier="R">
@@ -540,20 +538,20 @@
<reference name="STOP_CARS"/>
</action>
</actionBlock>
- <step localId="10" height="34" width="37" name="RED">
- <position x="551" y="411"/>
- <connectionPointIn>
- <relPosition x="18" y="0"/>
+ <step localId="10" height="34" width="92" name="RED">
+ <position x="523" y="411"/>
+ <connectionPointIn>
+ <relPosition x="46" y="0"/>
<connection refLocalId="6">
<position x="569" y="411"/>
<position x="569" y="378"/>
</connection>
</connectionPointIn>
<connectionPointOut formalParameter="">
- <relPosition x="18" y="34"/>
+ <relPosition x="46" y="34"/>
</connectionPointOut>
<connectionPointOutAction formalParameter="">
- <relPosition x="37" y="17"/>
+ <relPosition x="92" y="17"/>
</connectionPointOutAction>
</step>
<actionBlock localId="11" width="235" height="103">
@@ -562,7 +560,7 @@
<relPosition x="0" y="15"/>
<connection refLocalId="10">
<position x="710" y="428"/>
- <position x="588" y="428"/>
+ <position x="615" y="428"/>
</connection>
</connectionPointIn>
<action localId="0" qualifier="R">
@@ -604,7 +602,7 @@
<relPosition x="154" y="0"/>
<connection refLocalId="3">
<position x="569" y="335"/>
- <position x="569" y="279"/>
+ <position x="569" y="280"/>
</connection>
</connectionPointIn>
<connectionPointOut formalParameter="">
@@ -657,11 +655,11 @@
</condition>
</transition>
<jumpStep localId="5" height="13" width="12" targetName="Standstill">
- <position x="404" y="569"/>
+ <position x="404" y="553"/>
<connectionPointIn>
<relPosition x="6" y="0"/>
<connection refLocalId="4">
- <position x="410" y="569"/>
+ <position x="410" y="553"/>
<position x="410" y="530"/>
</connection>
</connectionPointIn>
@@ -682,20 +680,20 @@
<relPosition x="159" y="1"/>
</connectionPointOut>
</selectionDivergence>
- <step localId="18" height="30" width="148" name="PEDESTRIAN_GREEN">
- <position x="495" y="575"/>
- <connectionPointIn>
- <relPosition x="74" y="0"/>
+ <step localId="18" height="32" width="177" name="PEDESTRIAN_GREEN">
+ <position x="481" y="572"/>
+ <connectionPointIn>
+ <relPosition x="88" y="0"/>
<connection refLocalId="12">
- <position x="569" y="575"/>
+ <position x="569" y="572"/>
<position x="569" y="535"/>
</connection>
</connectionPointIn>
<connectionPointOut formalParameter="">
- <relPosition x="74" y="30"/>
+ <relPosition x="88" y="32"/>
</connectionPointOut>
<connectionPointOutAction formalParameter="">
- <relPosition x="148" y="15"/>
+ <relPosition x="177" y="16"/>
</connectionPointOutAction>
</step>
<actionBlock localId="19" width="247" height="110">
@@ -704,9 +702,7 @@
<relPosition x="0" y="15"/>
<connection refLocalId="18">
<position x="708" y="588"/>
- <position x="675" y="588"/>
- <position x="675" y="590"/>
- <position x="643" y="590"/>
+ <position x="658" y="588"/>
</connection>
</connectionPointIn>
<action localId="0" qualifier="S">
@@ -758,7 +754,9 @@
<relPosition x="159" y="0"/>
<connection refLocalId="18">
<position x="569" y="625"/>
- <position x="569" y="602"/>
+ <position x="569" y="615"/>
+ <position x="569" y="615"/>
+ <position x="569" y="604"/>
</connection>
</connectionPointIn>
<connectionPointOut formalParameter="">
@@ -789,11 +787,11 @@
</condition>
</transition>
<step localId="24" height="30" width="148" name="PEDESTRIAN_RED">
- <position x="495" y="750"/>
+ <position x="495" y="748"/>
<connectionPointIn>
<relPosition x="74" y="0"/>
<connection refLocalId="23">
- <position x="569" y="750"/>
+ <position x="569" y="748"/>
<position x="569" y="711"/>
</connection>
</connectionPointIn>
@@ -810,9 +808,7 @@
<relPosition x="0" y="15"/>
<connection refLocalId="24">
<position x="708" y="763"/>
- <position x="675" y="763"/>
- <position x="675" y="765"/>
- <position x="643" y="765"/>
+ <position x="643" y="763"/>
</connection>
</connectionPointIn>
<action localId="0" qualifier="S">
@@ -865,7 +861,7 @@
<relPosition x="159" y="0"/>
<connection refLocalId="24">
<position x="569" y="815"/>
- <position x="569" y="777"/>
+ <position x="569" y="778"/>
</connection>
</connectionPointIn>
<connectionPointOut formalParameter="">
@@ -895,20 +891,20 @@
</inline>
</condition>
</transition>
- <step localId="30" height="30" width="56" name="GREEN">
- <position x="541" y="933"/>
- <connectionPointIn>
- <relPosition x="28" y="0"/>
+ <step localId="30" height="33" width="92" name="GREEN">
+ <position x="523" y="930"/>
+ <connectionPointIn>
+ <relPosition x="46" y="0"/>
<connection refLocalId="29">
- <position x="569" y="933"/>
+ <position x="569" y="930"/>
<position x="569" y="881"/>
</connection>
</connectionPointIn>
<connectionPointOut formalParameter="">
- <relPosition x="28" y="30"/>
+ <relPosition x="46" y="33"/>
</connectionPointOut>
<connectionPointOutAction formalParameter="">
- <relPosition x="56" y="15"/>
+ <relPosition x="92" y="16"/>
</connectionPointOutAction>
</step>
<actionBlock localId="31" width="227" height="110">
@@ -917,7 +913,7 @@
<relPosition x="0" y="15"/>
<connection refLocalId="30">
<position x="709" y="946"/>
- <position x="597" y="946"/>
+ <position x="615" y="946"/>
</connection>
</connectionPointIn>
<action localId="0" qualifier="S">
@@ -943,7 +939,7 @@
<position x="308" y="1091"/>
<position x="291" y="1091"/>
<position x="291" y="1065"/>
- <position x="274" y="1065"/>
+ <position x="275" y="1065"/>
</connection>
</connectionPointIn>
</variable>
@@ -971,17 +967,17 @@
</variable>
</outputVariables>
</block>
- <inVariable localId="33" height="30" width="159" negated="false">
- <position x="24" y="1052"/>
- <connectionPointOut>
- <relPosition x="159" y="15"/>
+ <inVariable localId="33" height="36" width="168" negated="false">
+ <position x="15" y="1047"/>
+ <connectionPointOut>
+ <relPosition x="168" y="18"/>
</connectionPointOut>
<expression>PEDESTRIAN_BUTTON</expression>
</inVariable>
- <inVariable localId="34" height="30" width="43" negated="false">
- <position x="227" y="1115"/>
- <connectionPointOut>
- <relPosition x="43" y="15"/>
+ <inVariable localId="34" height="33" width="53" negated="false">
+ <position x="217" y="1112"/>
+ <connectionPointOut>
+ <relPosition x="53" y="16"/>
</connectionPointOut>
<expression>T#2s</expression>
</inVariable>
@@ -1052,7 +1048,7 @@
<relPosition x="0" y="0"/>
<connection refLocalId="30">
<position x="569" y="1059"/>
- <position x="569" y="960"/>
+ <position x="569" y="963"/>
</connection>
</connectionPointIn>
<connectionPointOut formalParameter="">
@@ -1100,9 +1096,7 @@
<relPosition x="0" y="30"/>
<connection refLocalId="33">
<position x="224" y="1065"/>
- <position x="203" y="1065"/>
- <position x="203" y="1067"/>
- <position x="183" y="1067"/>
+ <position x="183" y="1065"/>
</connection>
</connectionPointIn>
</variable>
@@ -1129,8 +1123,8 @@
</variable>
</outputVariables>
</block>
- <comment localId="45" height="907" width="645">
- <position x="1021" y="21"/>
+ <comment localId="45" height="767" width="753">
+ <position x="973" y="21"/>
<content>
<xhtml:p><![CDATA[*** Description of SFC action qualifiers ***
@@ -1211,8 +1205,7 @@
<comment localId="13" height="86" width="379">
<position x="9" y="28"/>
<content>
- <xhtml:p><![CDATA[
-Sequential function chart (SFC) is commonly used to describe state machines.]]></xhtml:p>
+ <xhtml:p><![CDATA[Sequential function chart (SFC) is commonly used to describe state machines.]]></xhtml:p>
</content>
</comment>
</SFC>
@@ -1266,14 +1259,14 @@
<body>
<FBD>
<block localId="1" width="350" height="836" typeName="traffic_light_sequence" instanceName="trafic_light_sequence0" executionOrderId="0">
- <position x="470" y="406"/>
+ <position x="494" y="462"/>
<inputVariables>
<variable formalParameter="SWITCH_BUTTON">
<connectionPointIn>
<relPosition x="0" y="101"/>
<connection refLocalId="2" formalParameter="state_out">
- <position x="470" y="507"/>
- <position x="333" y="507"/>
+ <position x="494" y="563"/>
+ <position x="349" y="563"/>
</connection>
</connectionPointIn>
</variable>
@@ -1281,10 +1274,10 @@
<connectionPointIn>
<relPosition x="0" y="264"/>
<connection refLocalId="3" formalParameter="state_out">
- <position x="470" y="670"/>
- <position x="402" y="670"/>
- <position x="402" y="721"/>
- <position x="335" y="721"/>
+ <position x="494" y="726"/>
+ <position x="402" y="726"/>
+ <position x="402" y="777"/>
+ <position x="351" y="777"/>
</connection>
</connectionPointIn>
</variable>
@@ -1318,15 +1311,15 @@
</variable>
</outputVariables>
</block>
- <block localId="2" width="143" height="183" typeName="Button" instanceName="SwitchButton" executionOrderId="0">
- <position x="190" y="471"/>
+ <block localId="2" width="159" height="183" typeName="Button" instanceName="SwitchButton" executionOrderId="0">
+ <position x="190" y="527"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
<relPosition x="0" y="36"/>
<connection refLocalId="5">
- <position x="190" y="507"/>
- <position x="136" y="507"/>
+ <position x="190" y="563"/>
+ <position x="137" y="563"/>
</connection>
</connectionPointIn>
</variable>
@@ -1334,8 +1327,8 @@
<connectionPointIn>
<relPosition x="0" y="68"/>
<connection refLocalId="6">
- <position x="190" y="539"/>
- <position x="136" y="539"/>
+ <position x="190" y="595"/>
+ <position x="136" y="595"/>
</connection>
</connectionPointIn>
</variable>
@@ -1343,8 +1336,8 @@
<connectionPointIn>
<relPosition x="0" y="100"/>
<connection refLocalId="4">
- <position x="190" y="571"/>
- <position x="136" y="571"/>
+ <position x="190" y="627"/>
+ <position x="136" y="627"/>
</connection>
</connectionPointIn>
</variable>
@@ -1363,20 +1356,20 @@
<outputVariables>
<variable formalParameter="state_out">
<connectionPointOut>
- <relPosition x="143" y="36"/>
+ <relPosition x="159" y="36"/>
</connectionPointOut>
</variable>
</outputVariables>
</block>
- <block localId="3" width="143" height="198" typeName="Button" instanceName="PedestrianButton" executionOrderId="0">
- <position x="192" y="684"/>
+ <block localId="3" width="159" height="198" typeName="Button" instanceName="PedestrianButton" executionOrderId="0">
+ <position x="192" y="740"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
<relPosition x="0" y="37"/>
<connection refLocalId="7">
- <position x="192" y="721"/>
- <position x="159" y="721"/>
+ <position x="192" y="777"/>
+ <position x="160" y="777"/>
</connection>
</connectionPointIn>
</variable>
@@ -1384,8 +1377,8 @@
<connectionPointIn>
<relPosition x="0" y="72"/>
<connection refLocalId="8">
- <position x="192" y="756"/>
- <position x="159" y="756"/>
+ <position x="192" y="812"/>
+ <position x="159" y="812"/>
</connection>
</connectionPointIn>
</variable>
@@ -1409,55 +1402,55 @@
<outputVariables>
<variable formalParameter="state_out">
<connectionPointOut>
- <relPosition x="143" y="37"/>
+ <relPosition x="159" y="37"/>
</connectionPointOut>
</variable>
</outputVariables>
</block>
<inVariable localId="4" height="30" width="18" executionOrderId="0" negated="false">
- <position x="118" y="558"/>
+ <position x="118" y="612"/>
<connectionPointOut>
<relPosition x="18" y="15"/>
</connectionPointOut>
<expression>1</expression>
</inVariable>
- <inVariable localId="5" height="30" width="105" executionOrderId="0" negated="false">
- <position x="31" y="494"/>
- <connectionPointOut>
- <relPosition x="105" y="15"/>
+ <inVariable localId="5" height="30" width="106" executionOrderId="0" negated="false">
+ <position x="31" y="548"/>
+ <connectionPointOut>
+ <relPosition x="106" y="15"/>
</connectionPointOut>
<expression>'SWITCH_OFF'</expression>
</inVariable>
<inVariable localId="6" height="30" width="105" executionOrderId="0" negated="false">
- <position x="31" y="526"/>
+ <position x="31" y="580"/>
<connectionPointOut>
<relPosition x="105" y="15"/>
</connectionPointOut>
<expression>'SWITCH_ON'</expression>
</inVariable>
- <inVariable localId="7" height="30" width="137" executionOrderId="0" negated="false">
- <position x="22" y="708"/>
- <connectionPointOut>
- <relPosition x="137" y="15"/>
+ <inVariable localId="7" height="30" width="138" executionOrderId="0" negated="false">
+ <position x="22" y="762"/>
+ <connectionPointOut>
+ <relPosition x="138" y="15"/>
</connectionPointOut>
<expression>'PEDESTRIAN_OFF'</expression>
</inVariable>
<inVariable localId="8" height="30" width="137" executionOrderId="0" negated="false">
- <position x="22" y="743"/>
+ <position x="22" y="797"/>
<connectionPointOut>
<relPosition x="137" y="15"/>
</connectionPointOut>
<expression>'PEDESTRIAN_ON'</expression>
</inVariable>
<block localId="9" width="115" height="133" typeName="Led" instanceName="RedLight" executionOrderId="0">
- <position x="1057" y="395"/>
+ <position x="1057" y="451"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
<relPosition x="0" y="38"/>
<connection refLocalId="10">
- <position x="1057" y="433"/>
- <position x="1010" y="433"/>
+ <position x="1057" y="489"/>
+ <position x="1013" y="489"/>
</connection>
</connectionPointIn>
</variable>
@@ -1465,8 +1458,8 @@
<connectionPointIn>
<relPosition x="0" y="75"/>
<connection refLocalId="11">
- <position x="1057" y="470"/>
- <position x="1010" y="470"/>
+ <position x="1057" y="526"/>
+ <position x="1010" y="526"/>
</connection>
</connectionPointIn>
</variable>
@@ -1474,8 +1467,8 @@
<connectionPointIn>
<relPosition x="0" y="112"/>
<connection refLocalId="1" formalParameter="RED_LIGHT">
- <position x="1057" y="507"/>
- <position x="819" y="507"/>
+ <position x="1057" y="563"/>
+ <position x="844" y="563"/>
</connection>
</connectionPointIn>
</variable>
@@ -1483,29 +1476,29 @@
<inOutVariables/>
<outputVariables/>
</block>
- <inVariable localId="10" height="30" width="79" executionOrderId="0" negated="false">
- <position x="931" y="420"/>
- <connectionPointOut>
- <relPosition x="79" y="15"/>
+ <inVariable localId="10" height="30" width="82" executionOrderId="0" negated="false">
+ <position x="931" y="474"/>
+ <connectionPointOut>
+ <relPosition x="82" y="15"/>
</connectionPointOut>
<expression>'RED_OFF'</expression>
</inVariable>
<inVariable localId="11" height="30" width="79" executionOrderId="0" negated="false">
- <position x="931" y="457"/>
+ <position x="931" y="511"/>
<connectionPointOut>
<relPosition x="79" y="15"/>
</connectionPointOut>
<expression>'RED_ON'</expression>
</inVariable>
<block localId="12" width="115" height="133" typeName="Led" instanceName="OrangeLight" executionOrderId="0">
- <position x="1058" y="558"/>
+ <position x="1058" y="614"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
<relPosition x="0" y="38"/>
<connection refLocalId="13">
- <position x="1058" y="596"/>
- <position x="1010" y="596"/>
+ <position x="1058" y="652"/>
+ <position x="1010" y="652"/>
</connection>
</connectionPointIn>
</variable>
@@ -1513,8 +1506,8 @@
<connectionPointIn>
<relPosition x="0" y="75"/>
<connection refLocalId="14">
- <position x="1058" y="633"/>
- <position x="1010" y="633"/>
+ <position x="1058" y="689"/>
+ <position x="1010" y="689"/>
</connection>
</connectionPointIn>
</variable>
@@ -1522,8 +1515,8 @@
<connectionPointIn>
<relPosition x="0" y="112"/>
<connection refLocalId="1" formalParameter="ORANGE_LIGHT">
- <position x="1058" y="670"/>
- <position x="819" y="670"/>
+ <position x="1058" y="726"/>
+ <position x="844" y="726"/>
</connection>
</connectionPointIn>
</variable>
@@ -1532,28 +1525,28 @@
<outputVariables/>
</block>
<inVariable localId="13" height="30" width="111" executionOrderId="0" negated="false">
- <position x="899" y="583"/>
+ <position x="899" y="637"/>
<connectionPointOut>
<relPosition x="111" y="15"/>
</connectionPointOut>
<expression>'ORANGE_OFF'</expression>
</inVariable>
<inVariable localId="14" height="30" width="106" executionOrderId="0" negated="false">
- <position x="904" y="620"/>
+ <position x="904" y="674"/>
<connectionPointOut>
<relPosition x="106" y="15"/>
</connectionPointOut>
<expression>'ORANGE_ON'</expression>
</inVariable>
<block localId="15" width="115" height="133" typeName="Led" instanceName="GreenLight" executionOrderId="0">
- <position x="1058" y="721"/>
+ <position x="1058" y="777"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
<relPosition x="0" y="38"/>
<connection refLocalId="16">
- <position x="1058" y="759"/>
- <position x="1010" y="759"/>
+ <position x="1058" y="815"/>
+ <position x="1010" y="815"/>
</connection>
</connectionPointIn>
</variable>
@@ -1561,8 +1554,8 @@
<connectionPointIn>
<relPosition x="0" y="75"/>
<connection refLocalId="17">
- <position x="1058" y="796"/>
- <position x="1010" y="796"/>
+ <position x="1058" y="852"/>
+ <position x="1010" y="852"/>
</connection>
</connectionPointIn>
</variable>
@@ -1570,8 +1563,8 @@
<connectionPointIn>
<relPosition x="0" y="112"/>
<connection refLocalId="1" formalParameter="GREEN_LIGHT">
- <position x="1058" y="833"/>
- <position x="819" y="833"/>
+ <position x="1058" y="889"/>
+ <position x="844" y="889"/>
</connection>
</connectionPointIn>
</variable>
@@ -1580,28 +1573,28 @@
<outputVariables/>
</block>
<inVariable localId="16" height="30" width="111" executionOrderId="0" negated="false">
- <position x="899" y="746"/>
+ <position x="899" y="800"/>
<connectionPointOut>
<relPosition x="111" y="15"/>
</connectionPointOut>
<expression>'GREEN_OFF'</expression>
</inVariable>
<inVariable localId="17" height="30" width="106" executionOrderId="0" negated="false">
- <position x="904" y="783"/>
+ <position x="904" y="837"/>
<connectionPointOut>
<relPosition x="106" y="15"/>
</connectionPointOut>
<expression>'GREEN_ON'</expression>
</inVariable>
<block localId="18" width="115" height="133" typeName="Led" instanceName="PedestrianRedLight" executionOrderId="0">
- <position x="1059" y="884"/>
+ <position x="1059" y="940"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
<relPosition x="0" y="38"/>
<connection refLocalId="19">
- <position x="1059" y="922"/>
- <position x="1020" y="922"/>
+ <position x="1059" y="978"/>
+ <position x="1020" y="978"/>
</connection>
</connectionPointIn>
</variable>
@@ -1609,8 +1602,8 @@
<connectionPointIn>
<relPosition x="0" y="75"/>
<connection refLocalId="20">
- <position x="1059" y="959"/>
- <position x="1020" y="959"/>
+ <position x="1059" y="1015"/>
+ <position x="1020" y="1015"/>
</connection>
</connectionPointIn>
</variable>
@@ -1618,8 +1611,8 @@
<connectionPointIn>
<relPosition x="0" y="112"/>
<connection refLocalId="1" formalParameter="PEDESTRIAN_RED_LIGHT">
- <position x="1059" y="996"/>
- <position x="819" y="996"/>
+ <position x="1059" y="1052"/>
+ <position x="844" y="1052"/>
</connection>
</connectionPointIn>
</variable>
@@ -1628,28 +1621,28 @@
<outputVariables/>
</block>
<inVariable localId="19" height="30" width="171" executionOrderId="0" negated="false">
- <position x="849" y="909"/>
+ <position x="849" y="963"/>
<connectionPointOut>
<relPosition x="171" y="15"/>
</connectionPointOut>
<expression>'PEDESTRIAN_RED_OFF'</expression>
</inVariable>
<inVariable localId="20" height="30" width="166" executionOrderId="0" negated="false">
- <position x="854" y="946"/>
+ <position x="854" y="1000"/>
<connectionPointOut>
<relPosition x="166" y="15"/>
</connectionPointOut>
<expression>'PEDESTRIAN_RED_ON'</expression>
</inVariable>
<block localId="21" width="115" height="133" typeName="Led" instanceName="PedestrianGreenLight" executionOrderId="0">
- <position x="1059" y="1047"/>
+ <position x="1059" y="1103"/>
<inputVariables>
<variable formalParameter="back_id">
<connectionPointIn>
<relPosition x="0" y="38"/>
<connection refLocalId="22">
- <position x="1059" y="1085"/>
- <position x="1035" y="1085"/>
+ <position x="1059" y="1141"/>
+ <position x="1035" y="1141"/>
</connection>
</connectionPointIn>
</variable>
@@ -1657,8 +1650,8 @@
<connectionPointIn>
<relPosition x="0" y="75"/>
<connection refLocalId="23">
- <position x="1059" y="1122"/>
- <position x="1035" y="1122"/>
+ <position x="1059" y="1178"/>
+ <position x="1035" y="1178"/>
</connection>
</connectionPointIn>
</variable>
@@ -1666,8 +1659,8 @@
<connectionPointIn>
<relPosition x="0" y="112"/>
<connection refLocalId="1" formalParameter="PEDESTRIAN_GREEN_LIGHT">
- <position x="1059" y="1159"/>
- <position x="819" y="1159"/>
+ <position x="1059" y="1215"/>
+ <position x="844" y="1215"/>
</connection>
</connectionPointIn>
</variable>
@@ -1676,14 +1669,14 @@
<outputVariables/>
</block>
<inVariable localId="22" height="30" width="190" executionOrderId="0" negated="false">
- <position x="845" y="1072"/>
+ <position x="845" y="1126"/>
<connectionPointOut>
<relPosition x="190" y="15"/>
</connectionPointOut>
<expression>'PEDESTRIAN_GREEN_OFF'</expression>
</inVariable>
<inVariable localId="23" height="30" width="185" executionOrderId="0" negated="false">
- <position x="850" y="1109"/>
+ <position x="850" y="1163"/>
<connectionPointOut>
<relPosition x="185" y="15"/>
</connectionPointOut>
@@ -1711,14 +1704,13 @@
]]></xhtml:p>
</content>
</comment>
- <comment localId="102" height="144" width="444">
- <position x="20" y="303"/>
+ <comment localId="102" height="134" width="734">
+ <position x="21" 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
-graphic primitives in SVG file.
-This is the way how elements in SVG are bound to elements
-in PLC program. You can find out or edit these IDs in Inkscape.]]></xhtml:p>
+Back_id and sele_id inputs of these blocks are IDs of graphic primitives in SVG file.
+This is the way how elements in SVG are bound to elements in PLC program.
+You can find out or edit these IDs in Inkscape.]]></xhtml:p>
</content>
</comment>
</FBD>
diff -r a56362c818a3 -r ac16bad593cf tests/wxHMI/plc.xml
--- a/tests/wxHMI/plc.xml Wed Sep 26 14:15:22 2018 +0300
+++ b/tests/wxHMI/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="Beremiz" productVersion="1" creationDateTime="2012-09-12T23:30:19"/>
- <contentHeader name="extended wxHMI example" modificationDateTime="2017-06-06T13:13:18">
+ <contentHeader name="extended wxHMI example" modificationDateTime="2018-09-26T14:07:02">
<coordinateInfo>
<pageSize x="1050" y="1485"/>
<fbd>
@@ -280,7 +280,7 @@
</variable>
</outputVariables>
</block>
- <outVariable localId="298" executionOrderId="0" height="35" width="70" negated="false">
+ <outVariable localId="298" executionOrderId="0" height="35" width="74" negated="false">
<position x="435" y="800"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
@@ -288,7 +288,7 @@
<position x="435" y="815"/>
<position x="375" y="815"/>
<position x="375" y="815"/>
- <position x="400" y="815"/>
+ <position x="416" y="815"/>
</connection>
</connectionPointIn>
<expression>XaxisPos</expression>
@@ -300,10 +300,10 @@
</connectionPointOut>
<expression>power</expression>
</inVariable>
- <inVariable localId="299" executionOrderId="0" height="35" width="85" negated="false">
+ <inVariable localId="299" executionOrderId="0" height="35" width="90" negated="false">
<position x="25" y="890"/>
<connectionPointOut>
- <relPosition x="85" y="15"/>
+ <relPosition x="90" y="15"/>
</connectionPointOut>
<expression>XAxisMinus</expression>
</inVariable>
@@ -412,7 +412,7 @@
</variable>
</outputVariables>
</block>
- <outVariable localId="6" executionOrderId="0" height="35" width="70" negated="false">
+ <outVariable localId="6" executionOrderId="0" height="35" width="74" negated="false">
<position x="955" y="795"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
@@ -423,10 +423,10 @@
</connectionPointIn>
<expression>YaxisPos</expression>
</outVariable>
- <inVariable localId="7" executionOrderId="0" height="35" width="85" negated="false">
+ <inVariable localId="7" executionOrderId="0" height="35" width="90" negated="false">
<position x="560" y="885"/>
<connectionPointOut>
- <relPosition x="85" y="15"/>
+ <relPosition x="90" y="15"/>
</connectionPointOut>
<expression>YAxisMinus</expression>
</inVariable>
@@ -535,7 +535,7 @@
</variable>
</outputVariables>
</block>
- <outVariable localId="14" executionOrderId="0" height="35" width="70" negated="false">
+ <outVariable localId="14" executionOrderId="0" height="35" width="74" negated="false">
<position x="960" y="1035"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
@@ -604,7 +604,7 @@
</variable>
</outputVariables>
</block>
- <outVariable localId="18" executionOrderId="0" height="35" width="70" negated="false">
+ <outVariable localId="18" executionOrderId="0" height="35" width="74" negated="false">
<position x="435" y="1040"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
@@ -615,10 +615,10 @@
</connectionPointIn>
<expression>ZaxisPos</expression>
</outVariable>
- <inVariable localId="19" executionOrderId="0" height="35" width="85" negated="false">
+ <inVariable localId="19" executionOrderId="0" height="35" width="90" negated="false">
<position x="25" y="1130"/>
<connectionPointOut>
- <relPosition x="85" y="15"/>
+ <relPosition x="90" y="15"/>
</connectionPointOut>
<expression>ZAxisMinus</expression>
</inVariable>
@@ -706,10 +706,10 @@
</variable>
</outputVariables>
</block>
- <inVariable localId="23" executionOrderId="0" height="35" width="85" negated="false">
+ <inVariable localId="23" executionOrderId="0" height="35" width="90" negated="false">
<position x="560" y="1125"/>
<connectionPointOut>
- <relPosition x="85" y="15"/>
+ <relPosition x="90" y="15"/>
</connectionPointOut>
<expression>TAxisMinus</expression>
</inVariable>
@@ -800,10 +800,10 @@
</variable>
</outputVariables>
</block>
- <inVariable localId="29" executionOrderId="0" height="30" width="95" negated="false">
+ <inVariable localId="29" executionOrderId="0" height="30" width="98" negated="false">
<position x="40" y="485"/>
<connectionPointOut>
- <relPosition x="95" y="15"/>
+ <relPosition x="98" y="15"/>
</connectionPointOut>
<expression>DrawTestBtn</expression>
</inVariable>
@@ -967,13 +967,13 @@
<body>
<FBD>
<block localId="220" typeName="python_poll" instanceName="python_poll0" executionOrderId="0" height="85" width="104">
- <position x="295" y="130"/>
+ <position x="338" y="130"/>
<inputVariables>
<variable formalParameter="TRIG">
<connectionPointIn>
<relPosition x="0" y="35"/>
<connection refLocalId="221">
- <position x="295" y="165"/>
+ <position x="338" y="165"/>
<position x="268" y="165"/>
</connection>
</connectionPointIn>
@@ -982,8 +982,8 @@
<connectionPointIn>
<relPosition x="0" y="70"/>
<connection refLocalId="222">
- <position x="295" y="200"/>
- <position x="271" y="200"/>
+ <position x="338" y="200"/>
+ <position x="296" y="200"/>
</connection>
</connectionPointIn>
</variable>
@@ -1009,10 +1009,10 @@
</connectionPointOut>
<expression>BOOL#TRUE</expression>
</inVariable>
- <inVariable localId="222" executionOrderId="0" height="30" width="161" negated="false">
+ <inVariable localId="222" executionOrderId="0" height="30" width="186" negated="false">
<position x="110" y="185"/>
<connectionPointOut>
- <relPosition x="161" y="15"/>
+ <relPosition x="186" y="15"/>
</connectionPointOut>
<expression>'wxglade_hmi.UpdPos()'</expression>
</inVariable>
@@ -1053,25 +1053,25 @@
</interface>
<body>
<FBD>
- <inVariable localId="127" executionOrderId="0" height="30" width="72" negated="false">
+ <inVariable localId="127" executionOrderId="0" height="30" width="82" negated="false">
<position x="60" y="180"/>
<connectionPointOut>
- <relPosition x="72" y="15"/>
+ <relPosition x="82" y="15"/>
</connectionPointOut>
<expression>InitValue</expression>
</inVariable>
- <outVariable localId="128" executionOrderId="0" height="30" width="145" negated="false">
+ <outVariable localId="128" executionOrderId="0" height="30" width="235" negated="false">
<position x="180" y="180"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="127">
<position x="180" y="195"/>
- <position x="132" y="195"/>
+ <position x="142" y="195"/>
</connection>
</connectionPointIn>
<expression>NotInitializedVariable</expression>
</outVariable>
- <comment localId="129" height="90" width="360">
+ <comment localId="129" height="90" width="395">
<position x="65" y="40"/>
<content>
<xhtml:p><![CDATA[This program called only once at start.
@@ -1079,18 +1079,18 @@
</content>
</comment>
<block localId="131" typeName="ADD" executionOrderId="0" height="95" width="70">
- <position x="135" y="340"/>
+ <position x="160" y="340"/>
<inputVariables>
<variable formalParameter="IN1">
<connectionPointIn>
<relPosition x="0" y="40"/>
<connection refLocalId="130">
- <position x="135" y="380"/>
+ <position x="160" y="380"/>
<position x="125" y="380"/>
<position x="125" y="325"/>
- <position x="350" y="325"/>
- <position x="350" y="380"/>
- <position x="335" y="380"/>
+ <position x="380" y="325"/>
+ <position x="380" y="380"/>
+ <position x="365" y="380"/>
</connection>
</connectionPointIn>
</variable>
@@ -1098,9 +1098,7 @@
<connectionPointIn>
<relPosition x="0" y="75"/>
<connection refLocalId="1">
- <position x="135" y="415"/>
- <position x="130" y="415"/>
- <position x="130" y="415"/>
+ <position x="160" y="415"/>
<position x="120" y="415"/>
</connection>
</connectionPointIn>
@@ -1122,21 +1120,21 @@
</connectionPointOut>
<expression>1</expression>
</inVariable>
- <inOutVariable localId="130" executionOrderId="0" height="35" width="60" negatedOut="false" negatedIn="false">
+ <inOutVariable localId="130" executionOrderId="0" height="35" width="90" negatedOut="false" negatedIn="false">
<position x="275" y="365"/>
<connectionPointIn>
<relPosition x="0" y="15"/>
<connection refLocalId="131" formalParameter="OUT">
<position x="275" y="380"/>
- <position x="205" y="380"/>
+ <position x="230" y="380"/>
</connection>
</connectionPointIn>
<connectionPointOut>
- <relPosition x="60" y="15"/>
+ <relPosition x="90" y="15"/>
</connectionPointOut>
<expression>counter</expression>
</inOutVariable>
- <comment localId="2" height="75" width="355">
+ <comment localId="2" height="75" width="390">
<position x="70" y="240"/>
<content>
<xhtml:p><![CDATA[Counts how many times the program is called.
@@ -1193,10 +1191,10 @@
<relPosition x="0" y="40"/>
<connection refLocalId="2" formalParameter="Q">
<position x="260" y="110"/>
- <position x="245" y="110"/>
- <position x="245" y="10"/>
- <position x="520" y="10"/>
- <position x="520" y="110"/>
+ <position x="225" y="110"/>
+ <position x="225" y="10"/>
+ <position x="550" y="10"/>
+ <position x="550" y="110"/>
<position x="510" y="110"/>
</connection>
</connectionPointIn>
@@ -1207,8 +1205,8 @@
<connection refLocalId="16" formalParameter="OUT">
<position x="260" y="150"/>
<position x="225" y="150"/>
- <position x="225" y="250"/>
- <position x="190" y="250"/>
+ <position x="225" y="255"/>
+ <position x="190" y="255"/>
</connection>
</connectionPointIn>
</variable>
@@ -1245,8 +1243,8 @@
<connection refLocalId="16" formalParameter="OUT">
<position x="460" y="150"/>
<position x="350" y="150"/>
- <position x="350" y="250"/>
- <position x="190" y="250"/>
+ <position x="350" y="255"/>
+ <position x="190" y="255"/>
</connection>
</connectionPointIn>
</variable>
@@ -1278,24 +1276,24 @@
</connectionPointIn>
<expression>Out</expression>
</outVariable>
- <block localId="16" typeName="DIV" executionOrderId="0" height="80" width="70">
+ <block localId="16" typeName="DIV" executionOrderId="0" height="95" width="70">
<position x="120" y="215"/>
<inputVariables>
<variable formalParameter="IN1">
<connectionPointIn>
- <relPosition x="0" y="35"/>
+ <relPosition x="0" y="40"/>
<connection refLocalId="1">
- <position x="120" y="250"/>
- <position x="75" y="250"/>
+ <position x="120" y="255"/>
+ <position x="78" y="255"/>
</connection>
</connectionPointIn>
</variable>
<variable formalParameter="IN2">
<connectionPointIn>
- <relPosition x="0" y="65"/>
+ <relPosition x="0" y="75"/>
<connection refLocalId="4">
- <position x="120" y="280"/>
- <position x="75" y="280"/>
+ <position x="120" y="290"/>
+ <position x="75" y="290"/>
</connection>
</connectionPointIn>
</variable>
@@ -1304,20 +1302,20 @@
<outputVariables>
<variable formalParameter="OUT">
<connectionPointOut>
- <relPosition x="70" y="35"/>
- </connectionPointOut>
- </variable>
- </outputVariables>
- </block>
- <inVariable localId="1" executionOrderId="0" height="30" width="55" negated="false">
- <position x="20" y="235"/>
- <connectionPointOut>
- <relPosition x="55" y="15"/>
+ <relPosition x="70" y="40"/>
+ </connectionPointOut>
+ </variable>
+ </outputVariables>
+ </block>
+ <inVariable localId="1" executionOrderId="0" height="30" width="58" negated="false">
+ <position x="20" y="240"/>
+ <connectionPointOut>
+ <relPosition x="58" y="15"/>
</connectionPointOut>
<expression>Period</expression>
</inVariable>
<inVariable localId="4" executionOrderId="0" height="30" width="55" negated="false">
- <position x="20" y="265"/>
+ <position x="20" y="275"/>
<connectionPointOut>
<relPosition x="55" y="15"/>
</connectionPointOut>
@@ -1450,7 +1448,7 @@
</connectionPointIn>
<expression>Out</expression>
</outVariable>
- <block localId="299" typeName="clock" instanceName="clock0" executionOrderId="0" height="70" width="85">
+ <block localId="299" typeName="clock" instanceName="clock0" executionOrderId="0" height="70" width="87">
<position x="165" y="270"/>
<inputVariables>
<variable formalParameter="Period">
@@ -1467,7 +1465,7 @@
<outputVariables>
<variable formalParameter="Out">
<connectionPointOut>
- <relPosition x="85" y="45"/>
+ <relPosition x="87" y="45"/>
</connectionPointOut>
</variable>
</outputVariables>