beremiz

c9915bc620cd
Fix wrong code generation if EN/ENO are used in FBD/LD/SFC

This problem appears for example here

--------
------- | MOVE |
| MOVE1 |------|EN ENO|
------- | |
| |
------- | | -----------
| 23 |------|IN OUT|---| LocalVar0 |
------- -------- -----------


--------
------- | MOVE |
| MOVE2 |------|EN ENO|
------- | |
| |
------- | | -----------
| 15 |------|IN OUT|---| LocalVar0 |
------- -------- -----------

Before wrong code was generated for this case:

MOVE6_OUT := MOVE(EN := move1, IN := 23, ENO => MOVE6_ENO);
LocalVar0 := MOVE6_OUT;
MOVE4_OUT := MOVE(EN := move2, IN := 15, ENO => MOVE4_ENO);
LocalVar0 := MOVE4_OUT;

With this patch now following code is generated:

MOVE6_OUT := MOVE(EN := move1, IN := 23, ENO => MOVE6_ENO);
IF MOVE6_ENO THEN
LocalVar0 := MOVE6_OUT;
END_IF;
MOVE4_OUT := MOVE(EN := move2, IN := 15, ENO => MOVE4_ENO);
IF MOVE4_ENO THEN
LocalVar0 := MOVE4_OUT;
END_IF;


See discussion here:
https://sourceforge.net/p/beremiz/mailman/message/36378805/
<?xml version="1.0"?>
<!DOCTYPE PyObject SYSTEM "PyObjects.dtd">
<PyObject module="node" class="Node" id="173548044">
<attr name="Profile" type="dict" id="173547276" >
</attr>
<attr name="Description" type="string" value="" />
<attr name="Dictionary" type="dict" id="173547004" >
<entry>
<key type="numeric" value="4096" />
<val type="numeric" value="0" />
</entry>
<entry>
<key type="numeric" value="4097" />
<val type="numeric" value="0" />
</entry>
<entry>
<key type="numeric" value="4120" />
<val type="list" id="172243596" >
<item type="numeric" value="0" />
<item type="numeric" value="0" />
<item type="numeric" value="0" />
<item type="numeric" value="0" />
</val>
</entry>
</attr>
<attr name="SpecificMenu" type="list" id="172243852" >
</attr>
<attr name="ParamsDictionary" type="dict" id="173551796" >
</attr>
<attr name="UserMapping" type="dict" id="173551932" >
</attr>
<attr name="DS302" type="dict" id="172206524" >
<entry>
<key type="numeric" value="7968" />
<val type="dict" id="172959508" >
<entry>
<key type="string" value="need" />
<val type="False" value="" />
</entry>
<entry>
<key type="string" value="values" />
<val type="list" id="172244812" >
<item type="dict" id="173546596" >
<entry>
<key type="string" value="access" />
<val type="string" value="ro" />
</entry>
<entry>
<key type="string" value="pdo" />
<val type="False" value="" />
</entry>
<entry>
<key type="string" value="type" />
<val type="numeric" value="5" />
</entry>
<entry>
<key type="string" value="name" />
<val type="string" value="Number of Entries" />
</entry>
</item>
<item type="dict" id="173552204" >
<entry>
<key type="string" value="access" />
<val type="string" value="rw" />
</entry>
<entry>
<key type="string" value="pdo" />
<val type="False" value="" />
</entry>
<entry>
<key type="string" value="type" />
<val type="numeric" value="15" />
</entry>
<entry>
<key type="string" value="name" />
<val type="string" value="Store DCF for node %d[(sub)]" />
</entry>
<entry>
<key type="string" value="nbmax" />
<val type="numeric" value="127" />
</entry>
</item>
</val>
</entry>
<entry>
<key type="string" value="name" />
<val type="string" value="Store DCF" />
</entry>
<entry>
<key type="string" value="struct" />
<val type="numeric" value="7" />
</entry>
</val>
</entry>
<entry>
<key type="numeric" value="7969" />
<val type="dict" id="173546732" >
<entry>
<key type="string" value="need" />
<val type="False" value="" />
</entry>
<entry>
<key type="string" value="values" />
<val type="list" id="172253420" >
<item type="dict" id="173552612" >
<entry>
<key type="string" value="access" />
<val type="string" value="ro" />
</entry>
<entry>
<key type="string" value="pdo" />
<val type="False" value="" />
</entry>
<entry>
<key type="string" value="type" />
<val type="numeric" value="5" />
</entry>
<entry>
<key type="string" value="name" />
<val type="string" value="Number of Entries" />
</entry>
</item>
<item type="dict" id="173546324" >
<entry>
<key type="string" value="access" />
<val type="string" value="rw" />
</entry>
<entry>
<key type="string" value="pdo" />
<val type="False" value="" />
</entry>
<entry>
<key type="string" value="type" />
<val type="numeric" value="2" />
</entry>
<entry>
<key type="string" value="name" />
<val type="string" value="Storage Format for Node %d[(sub)]" />
</entry>
<entry>
<key type="string" value="nbmax" />
<val type="numeric" value="127" />
</entry>
</item>
</val>
</entry>
<entry>
<key type="string" value="name" />
<val type="string" value="Storage Format" />
</entry>
<entry>
<key type="string" value="struct" />
<val type="numeric" value="7" />
</entry>
</val>
</entry>
<entry>
<key type="numeric" value="7970" />
<val type="dict" id="173552476" >
<entry>
<key type="string" value="need" />
<val type="False" value="" />
</entry>
<entry>
<key type="string" value="values" />
<val type="list" id="172253484" >
<item type="dict" id="173552884" >
<entry>
<key type="string" value="access" />
<val type="string" value="ro" />
</entry>
<entry>
<key type="string" value="pdo" />
<val type="False" value="" />
</entry>
<entry>
<key type="string" value="type" />
<val type="numeric" value="5" />
</entry>
<entry>
<key type="string" value="name" />
<val type="string" value="Number of Entries" />
</entry>
</item>
<item type="dict" id="173552748" >
<entry>
<key type="string" value="access" />
<val type="string" value="rw" />
</entry>
<entry>
<key type="string" value="pdo" />
<val type="False" value="" />
</entry>
<entry>
<key type="string" value="type" />
<val type="numeric" value="15" />
</entry>
<entry>
<key type="string" value="name" />
<val type="string" value="Concise DCF for Node %d[(sub)]" />
</entry>
<entry>
<key type="string" value="nbmax" />
<val type="numeric" value="127" />
</entry>
</item>
</val>
</entry>
<entry>
<key type="string" value="name" />
<val type="string" value="Concise DCF" />
</entry>
<entry>
<key type="string" value="struct" />
<val type="numeric" value="7" />
</entry>
</val>
</entry>
</attr>
<attr name="ProfileName" type="string" value="None" />
<attr name="Type" type="string" value="master" />
<attr name="ID" type="numeric" value="0" />
<attr name="Name" type="string" value="MasterNode" />
</PyObject>