--- 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>