beremiz: comparison tests/wxHMI/plc.xml

equal deleted inserted replaced

-:a56362c818a3
+:ac16bad593cf
 <?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>
 <scaling x="5" y="5"/>
 </fbd>
 <relPosition x="100" y="45"/>
 </connectionPointOut>
 </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"/>
 <connection refLocalId="297" formalParameter="Out">
 <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>
 </outVariable>
 <inVariable localId="1" executionOrderId="0" height="30" width="50" negated="false">
 <connectionPointOut>
 <relPosition x="50" y="15"/>
 </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>
 <inVariable localId="300" executionOrderId="0" height="35" width="85" negated="false">
 <position x="25" y="845"/>
 <relPosition x="100" y="45"/>
 </connectionPointOut>
 </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"/>
 <connection refLocalId="5" formalParameter="Out">
 <position x="955" y="810"/>
 <position x="930" y="810"/>
 </connection>
 </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>
 <inVariable localId="8" executionOrderId="0" height="35" width="85" negated="false">
 <position x="560" y="840"/>
 <relPosition x="100" y="45"/>
 </connectionPointOut>
 </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"/>
 <connection refLocalId="13" formalParameter="Out">
 <position x="960" y="1050"/>
 <relPosition x="100" y="45"/>
 </connectionPointOut>
 </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"/>
 <connection refLocalId="17" formalParameter="Out">
 <position x="435" y="1055"/>
 <position x="400" y="1055"/>
 </connection>
 </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>
 <inVariable localId="20" executionOrderId="0" height="35" width="85" negated="false">
 <position x="25" y="1090"/>
 <relPosition x="70" y="30"/>
 </connectionPointOut>
 </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>
 <inVariable localId="24" executionOrderId="0" height="35" width="115" negated="false">
 <position x="25" y="1000"/>
 <relPosition x="70" y="35"/>
 </connectionPointOut>
 </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>
 <block localId="33" typeName="OR" executionOrderId="0" height="85" width="70">
 <position x="160" y="525"/>
 </localVars>
 </interface>
 <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>
 </variable>
 <variable formalParameter="CODE">
 <connectionPointIn>
 <relPosition x="0" y="70"/>
 <connection refLocalId="222">
-<position x="295" y="200"/>
+<position x="338" y="200"/>
-<position x="271" y="200"/>
+<position x="296" y="200"/>
 </connection>
 </connectionPointIn>
 </variable>
 </inputVariables>
 <inOutVariables/>
 <connectionPointOut>
 <relPosition x="93" y="15"/>
 </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>
 <comment localId="296" height="55" width="445">
 <position x="35" y="25"/>
 </variable>
 </localVars>
 </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.
 See task configuration in config.resource1.]]></xhtml:p>
 </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="380" y="325"/>
-<position x="350" y="380"/>
+<position x="380" y="380"/>
-<position x="335" y="380"/>
+<position x="365" y="380"/>
 </connection>
 </connectionPointIn>
 </variable>
 <variable formalParameter="IN2">
 <connectionPointIn>
 <relPosition x="0" y="75"/>
 <connection refLocalId="1">
-<position x="135" y="415"/>
+<position x="160" y="415"/>
-<position x="130" y="415"/>
-<position x="130" y="415"/>
 <position x="120" y="415"/>
 </connection>
 </connectionPointIn>
 </variable>
 </inputVariables>
 <connectionPointOut>
 <relPosition x="60" y="15"/>
 </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.
 Check counter value in debugger.]]></xhtml:p>
 </content>
 <variable formalParameter="IN">
 <connectionPointIn>
 <relPosition x="0" y="40"/>
 <connection refLocalId="2" formalParameter="Q">
 <position x="260" y="110"/>
-<position x="245" y="110"/>
+<position x="225" y="110"/>
-<position x="245" y="10"/>
+<position x="225" y="10"/>
-<position x="520" y="10"/>
+<position x="550" y="10"/>
-<position x="520" y="110"/>
+<position x="550" y="110"/>
 <position x="510" y="110"/>
 </connection>
 </connectionPointIn>
 </variable>
 <variable formalParameter="PT">
 <connectionPointIn>
 <relPosition x="0" y="80"/>
 <connection refLocalId="16" formalParameter="OUT">
 <position x="260" y="150"/>
 <position x="225" y="150"/>
-<position x="225" y="250"/>
+<position x="225" y="255"/>
-<position x="190" y="250"/>
+<position x="190" y="255"/>
 </connection>
 </connectionPointIn>
 </variable>
 </inputVariables>
 <inOutVariables/>
 <connectionPointIn>
 <relPosition x="0" y="80"/>
 <connection refLocalId="16" formalParameter="OUT">
 <position x="460" y="150"/>
 <position x="350" y="150"/>
-<position x="350" y="250"/>
+<position x="350" y="255"/>
-<position x="190" y="250"/>
+<position x="190" y="255"/>
 </connection>
 </connectionPointIn>
 </variable>
 </inputVariables>
 <inOutVariables/>
 <position x="310" y="110"/>
 </connection>
 </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="120" y="255"/>
-<position x="75" y="250"/>
+<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="120" y="290"/>
-<position x="75" y="280"/>
+<position x="75" y="290"/>
 </connection>
 </connectionPointIn>
 </variable>
 </inputVariables>
 <inOutVariables/>
 <outputVariables>
 <variable formalParameter="OUT">
 <connectionPointOut>
-<relPosition x="70" y="35"/>
+<relPosition x="70" y="40"/>
 </connectionPointOut>
 </variable>
 </outputVariables>
 </block>
-<inVariable localId="1" executionOrderId="0" height="30" width="55" negated="false">
+<inVariable localId="1" executionOrderId="0" height="30" width="58" negated="false">
-<position x="20" y="235"/>
+<position x="20" y="240"/>
 <connectionPointOut>
-<relPosition x="55" y="15"/>
+<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>
 <expression>2</expression>
 </inVariable>
 <position x="715" y="195"/>
 </connection>
 </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">
 <connectionPointIn>
 <relPosition x="0" y="45"/>
 </inputVariables>
 <inOutVariables/>
 <outputVariables>
 <variable formalParameter="Out">
 <connectionPointOut>
-<relPosition x="85" y="45"/>
+<relPosition x="87" y="45"/>
 </connectionPointOut>
 </variable>
 </outputVariables>
 </block>
 <inVariable localId="300" executionOrderId="0" height="35" width="55" negated="false">

changeset 2346	ac16bad593cf
parent 1691	9a42f12a973e