--- a/examples/TestMasterSlave/TestSlave.od Fri Jun 29 19:51:39 2007 +0200
+++ b/examples/TestMasterSlave/TestSlave.od Mon Jul 02 18:22:58 2007 +0200
@@ -1,10 +1,10 @@
<?xml version="1.0"?>
<!DOCTYPE PyObject SYSTEM "PyObjects.dtd">
-<PyObject module="node" class="Node" id="16608648">
-<attr name="Profile" type="dict" id="19295616" >
+<PyObject module="node" class="Node" id="44190968">
+<attr name="Profile" type="dict" id="45532192" >
</attr>
-<attr name="Name" type="string" value="TestSlave" />
-<attr name="Dictionary" type="dict" id="16868496" >
+<attr name="Name" type="string">TestSlave</attr>
+<attr name="Dictionary" type="dict" id="46134672" >
<entry>
<key type="numeric" value="4096" />
<val type="numeric" value="301" />
@@ -54,8 +54,12 @@
<val type="numeric" value="0" />
</entry>
<entry>
+ <key type="numeric" value="8204" />
+ <val type="numeric" value="1234" />
+ </entry>
+ <entry>
<key type="numeric" value="6146" />
- <val type="list" id="18608784" >
+ <val type="list" id="44160208" >
<item type="string" value="{True:self.ID+(base+1)*0x100+0x80,False:0}[base<4]" />
<item type="numeric" value="255" />
<item type="numeric" value="5000" />
@@ -65,7 +69,7 @@
</entry>
<entry>
<key type="numeric" value="4112" />
- <val type="list" id="16609864" >
+ <val type="list" id="44204760" >
<item type="numeric" value="0" />
<item type="numeric" value="0" />
<item type="numeric" value="0" />
@@ -74,7 +78,7 @@
</entry>
<entry>
<key type="numeric" value="4113" />
- <val type="list" id="16609720" >
+ <val type="list" id="44204112" >
<item type="numeric" value="0" />
<item type="numeric" value="0" />
<item type="numeric" value="0" />
@@ -83,13 +87,23 @@
</entry>
<entry>
<key type="numeric" value="6658" />
- <val type="list" id="18609144" >
+ <val type="list" id="44159992" >
<item type="numeric" value="537591824" />
</val>
</entry>
<entry>
+ <key type="numeric" value="6147" />
+ <val type="list" id="44190680" >
+ <item type="string" value="{True:self.ID+(base+1)*0x100+0x80,False:0}[base<4]" />
+ <item type="numeric" value="252" />
+ <item type="numeric" value="0" />
+ <item type="numeric" value="0" />
+ <item type="numeric" value="0" />
+ </val>
+ </entry>
+ <entry>
<key type="numeric" value="4608" />
- <val type="list" id="16610080" >
+ <val type="list" id="44204472" >
<item type="numeric" value="1537" />
<item type="numeric" value="1409" />
</val>
@@ -100,8 +114,18 @@
</entry>
<entry>
<key type="numeric" value="4120" />
- <val type="list" id="16611376" >
- <item type="numeric" value="0" />
+ <val type="list" id="44204832" >
+ <item type="numeric" value="0" />
+ <item type="numeric" value="0" />
+ <item type="numeric" value="0" />
+ <item type="numeric" value="0" />
+ </val>
+ </entry>
+ <entry>
+ <key type="numeric" value="6148" />
+ <val type="list" id="44191688" >
+ <item type="numeric" value="1025" />
+ <item type="numeric" value="253" />
<item type="numeric" value="0" />
<item type="numeric" value="0" />
<item type="numeric" value="0" />
@@ -120,22 +144,34 @@
<val type="numeric" value="0" />
</entry>
<entry>
+ <key type="numeric" value="6659" />
+ <val type="list" id="44204976" >
+ <item type="numeric" value="537657360" />
+ </val>
+ </entry>
+ <entry>
<key type="numeric" value="4102" />
<val type="numeric" value="0" />
</entry>
<entry>
<key type="numeric" value="6144" />
- <val type="list" id="16611448" >
- <item type="numeric" value="386" />
- <item type="numeric" value="0" />
- <item type="numeric" value="0" />
- <item type="numeric" value="0" />
- <item type="numeric" value="0" />
+ <val type="list" id="44191616" >
+ <item type="string" value="{True:self.ID+(base+1)*0x100+0x80,False:0}[base<4]" />
+ <item type="numeric" value="0" />
+ <item type="numeric" value="0" />
+ <item type="numeric" value="0" />
+ <item type="numeric" value="0" />
+ </val>
+ </entry>
+ <entry>
+ <key type="numeric" value="6660" />
+ <val type="list" id="44191040" >
+ <item type="numeric" value="537657360" />
</val>
</entry>
<entry>
<key type="numeric" value="6656" />
- <val type="list" id="16609936" >
+ <val type="list" id="44205120" >
<item type="numeric" value="536870913" />
<item type="numeric" value="536936449" />
<item type="numeric" value="537001985" />
@@ -150,8 +186,8 @@
</entry>
<entry>
<key type="numeric" value="6145" />
- <val type="list" id="16609432" >
- <item type="numeric" value="0" />
+ <val type="list" id="44205048" >
+ <item type="string" value="{True:self.ID+(base+1)*0x100+0x80,False:0}[base<4]" />
<item type="numeric" value="0" />
<item type="numeric" value="0" />
<item type="numeric" value="0" />
@@ -160,17 +196,17 @@
</entry>
<entry>
<key type="numeric" value="6657" />
- <val type="list" id="16612384" >
+ <val type="list" id="44204904" >
<item type="numeric" value="537526288" />
</val>
</entry>
</attr>
-<attr name="SpecificMenu" type="list" id="16608288" >
+<attr name="SpecificMenu" type="list" id="44204688" >
</attr>
-<attr name="ParamsDictionary" type="dict" id="19297248" >
+<attr name="ParamsDictionary" type="dict" id="44502560" >
<entry>
<key type="numeric" value="8192" />
- <val type="dict" id="14729024" >
+ <val type="dict" id="46323360" >
<entry>
<key type="string" value="callback" />
<val type="False" value="" />
@@ -179,10 +215,10 @@
</entry>
<entry>
<key type="numeric" value="6144" />
- <val type="dict" id="17162800" >
+ <val type="dict" id="46134064" >
<entry>
<key type="numeric" value="2" />
- <val type="dict" id="19297824" >
+ <val type="dict" id="45517376" >
<entry>
<key type="string" value="save" />
<val type="True" value="" />
@@ -191,7 +227,7 @@
</entry>
<entry>
<key type="numeric" value="3" />
- <val type="dict" id="19605184" >
+ <val type="dict" id="45486528" >
<entry>
<key type="string" value="save" />
<val type="True" value="" />
@@ -202,10 +238,19 @@
</entry>
<entry>
<key type="numeric" value="6146" />
- <val type="dict" id="14214240" >
+ <val type="dict" id="45550400" >
+ <entry>
+ <key type="numeric" value="2" />
+ <val type="dict" id="45424304" >
+ <entry>
+ <key type="string" value="comment" />
+ <val type="string">EVENT</val>
+ </entry>
+ </val>
+ </entry>
<entry>
<key type="numeric" value="3" />
- <val type="dict" id="21063040" >
+ <val type="dict" id="44825120" >
<entry>
<key type="string" value="comment" />
<val type="string">5000*100 µC = 500 ms</val>
@@ -214,16 +259,16 @@
</entry>
<entry>
<key type="numeric" value="4" />
- <val type="dict" id="20146992" >
+ <val type="dict" id="45946192" >
<entry>
<key type="string" value="comment" />
- <val type="string"></val>
+ <val type="string" value="" />
</entry>
</val>
</entry>
<entry>
<key type="numeric" value="5" />
- <val type="dict" id="20159808" >
+ <val type="dict" id="45558240" >
<entry>
<key type="string" value="comment" />
<val type="string">1000 ms</val>
@@ -233,8 +278,36 @@
</val>
</entry>
<entry>
+ <key type="numeric" value="6147" />
+ <val type="dict" id="45381152" >
+ <entry>
+ <key type="numeric" value="2" />
+ <val type="dict" id="44869008" >
+ <entry>
+ <key type="string" value="comment" />
+ <val type="string">RTR_SYNC</val>
+ </entry>
+ </val>
+ </entry>
+ </val>
+ </entry>
+ <entry>
+ <key type="numeric" value="6148" />
+ <val type="dict" id="45645664" >
+ <entry>
+ <key type="numeric" value="2" />
+ <val type="dict" id="45619920" >
+ <entry>
+ <key type="string" value="comment" />
+ <val type="string">RTR</val>
+ </entry>
+ </val>
+ </entry>
+ </val>
+ </entry>
+ <entry>
<key type="numeric" value="4112" />
- <val type="dict" id="17144432" >
+ <val type="dict" id="45559424" >
<entry>
<key type="string" value="callback" />
<val type="True" value="" />
@@ -243,7 +316,7 @@
</entry>
<entry>
<key type="numeric" value="4113" />
- <val type="dict" id="17172352" >
+ <val type="dict" id="45758656" >
<entry>
<key type="string" value="callback" />
<val type="True" value="" />
@@ -252,7 +325,7 @@
</entry>
<entry>
<key type="numeric" value="4119" />
- <val type="dict" id="19297536" >
+ <val type="dict" id="45945616" >
<entry>
<key type="string" value="callback" />
<val type="True" value="" />
@@ -260,18 +333,18 @@
</val>
</entry>
</attr>
-<attr name="UserMapping" type="dict" id="16869072" >
+<attr name="UserMapping" type="dict" id="45618240" >
<entry>
<key type="numeric" value="8192" />
- <val type="dict" id="17170240" >
- <entry>
- <key type="string" value="need" />
- <val type="False" value="" />
- </entry>
- <entry>
- <key type="string" value="values" />
- <val type="list" id="16612600" >
- <item type="dict" id="19604864" >
+ <val type="dict" id="46144528" >
+ <entry>
+ <key type="string" value="need" />
+ <val type="False" value="" />
+ </entry>
+ <entry>
+ <key type="string" value="values" />
+ <val type="list" id="44204544" >
+ <item type="dict" id="46103712" >
<entry>
<key type="string" value="access" />
<val type="string" value="rw" />
@@ -303,15 +376,15 @@
</entry>
<entry>
<key type="numeric" value="8193" />
- <val type="dict" id="19607600" >
- <entry>
- <key type="string" value="need" />
- <val type="False" value="" />
- </entry>
- <entry>
- <key type="string" value="values" />
- <val type="list" id="16611232" >
- <item type="dict" id="17173712" >
+ <val type="dict" id="45619296" >
+ <entry>
+ <key type="string" value="need" />
+ <val type="False" value="" />
+ </entry>
+ <entry>
+ <key type="string" value="values" />
+ <val type="list" id="44204400" >
+ <item type="dict" id="46103424" >
<entry>
<key type="string" value="access" />
<val type="string" value="rw" />
@@ -343,15 +416,15 @@
</entry>
<entry>
<key type="numeric" value="8194" />
- <val type="dict" id="19605760" >
- <entry>
- <key type="string" value="need" />
- <val type="False" value="" />
- </entry>
- <entry>
- <key type="string" value="values" />
- <val type="list" id="16609008" >
- <item type="dict" id="16868784" >
+ <val type="dict" id="46142672" >
+ <entry>
+ <key type="string" value="need" />
+ <val type="False" value="" />
+ </entry>
+ <entry>
+ <key type="string" value="values" />
+ <val type="list" id="44204328" >
+ <item type="dict" id="45529040" >
<entry>
<key type="string" value="access" />
<val type="string" value="rw" />
@@ -383,15 +456,15 @@
</entry>
<entry>
<key type="numeric" value="8195" />
- <val type="dict" id="19606192" >
- <entry>
- <key type="string" value="need" />
- <val type="False" value="" />
- </entry>
- <entry>
- <key type="string" value="values" />
- <val type="list" id="16610872" >
- <item type="dict" id="17173424" >
+ <val type="dict" id="45620208" >
+ <entry>
+ <key type="string" value="need" />
+ <val type="False" value="" />
+ </entry>
+ <entry>
+ <key type="string" value="values" />
+ <val type="list" id="44204256" >
+ <item type="dict" id="46323648" >
<entry>
<key type="string" value="access" />
<val type="string" value="rw" />
@@ -423,15 +496,15 @@
</entry>
<entry>
<key type="numeric" value="8196" />
- <val type="dict" id="19716512" >
- <entry>
- <key type="string" value="need" />
- <val type="False" value="" />
- </entry>
- <entry>
- <key type="string" value="values" />
- <val type="list" id="16610584" >
- <item type="dict" id="19714784" >
+ <val type="dict" id="46100416" >
+ <entry>
+ <key type="string" value="need" />
+ <val type="False" value="" />
+ </entry>
+ <entry>
+ <key type="string" value="values" />
+ <val type="list" id="44204184" >
+ <item type="dict" id="45805232" >
<entry>
<key type="string" value="access" />
<val type="string" value="rw" />
@@ -463,15 +536,15 @@
</entry>
<entry>
<key type="numeric" value="8197" />
- <val type="dict" id="19717280" >
- <entry>
- <key type="string" value="need" />
- <val type="False" value="" />
- </entry>
- <entry>
- <key type="string" value="values" />
- <val type="list" id="16613176" >
- <item type="dict" id="19716992" >
+ <val type="dict" id="46092800" >
+ <entry>
+ <key type="string" value="need" />
+ <val type="False" value="" />
+ </entry>
+ <entry>
+ <key type="string" value="values" />
+ <val type="list" id="44191544" >
+ <item type="dict" id="45757584" >
<entry>
<key type="string" value="access" />
<val type="string" value="rw" />
@@ -503,15 +576,15 @@
</entry>
<entry>
<key type="numeric" value="8198" />
- <val type="dict" id="19717728" >
- <entry>
- <key type="string" value="need" />
- <val type="False" value="" />
- </entry>
- <entry>
- <key type="string" value="values" />
- <val type="list" id="16611520" >
- <item type="dict" id="19715136" >
+ <val type="dict" id="46132560" >
+ <entry>
+ <key type="string" value="need" />
+ <val type="False" value="" />
+ </entry>
+ <entry>
+ <key type="string" value="values" />
+ <val type="list" id="44191472" >
+ <item type="dict" id="45619008" >
<entry>
<key type="string" value="access" />
<val type="string" value="rw" />
@@ -543,15 +616,15 @@
</entry>
<entry>
<key type="numeric" value="8199" />
- <val type="dict" id="19715776" >
- <entry>
- <key type="string" value="need" />
- <val type="False" value="" />
- </entry>
- <entry>
- <key type="string" value="values" />
- <val type="list" id="16606056" >
- <item type="dict" id="19715488" >
+ <val type="dict" id="46093776" >
+ <entry>
+ <key type="string" value="need" />
+ <val type="False" value="" />
+ </entry>
+ <entry>
+ <key type="string" value="values" />
+ <val type="list" id="44191400" >
+ <item type="dict" id="46135248" >
<entry>
<key type="string" value="access" />
<val type="string" value="rw" />
@@ -583,15 +656,15 @@
</entry>
<entry>
<key type="numeric" value="8200" />
- <val type="dict" id="19716064" >
- <entry>
- <key type="string" value="need" />
- <val type="False" value="" />
- </entry>
- <entry>
- <key type="string" value="values" />
- <val type="list" id="16610368" >
- <item type="dict" id="19718208" >
+ <val type="dict" id="45524512" >
+ <entry>
+ <key type="string" value="need" />
+ <val type="False" value="" />
+ </entry>
+ <entry>
+ <key type="string" value="values" />
+ <val type="list" id="44190896" >
+ <item type="dict" id="46092448" >
<entry>
<key type="string" value="access" />
<val type="string" value="rw" />
@@ -623,15 +696,15 @@
</entry>
<entry>
<key type="numeric" value="8201" />
- <val type="dict" id="19721328" >
- <entry>
- <key type="string" value="need" />
- <val type="False" value="" />
- </entry>
- <entry>
- <key type="string" value="values" />
- <val type="list" id="16611088" >
- <item type="dict" id="19718608" >
+ <val type="dict" id="46139744" >
+ <entry>
+ <key type="string" value="need" />
+ <val type="False" value="" />
+ </entry>
+ <entry>
+ <key type="string" value="values" />
+ <val type="list" id="44191112" >
+ <item type="dict" id="46093376" >
<entry>
<key type="string" value="access" />
<val type="string" value="rw" />
@@ -663,15 +736,15 @@
</entry>
<entry>
<key type="numeric" value="8202" />
- <val type="dict" id="19721952" >
- <entry>
- <key type="string" value="need" />
- <val type="False" value="" />
- </entry>
- <entry>
- <key type="string" value="values" />
- <val type="list" id="16610656" >
- <item type="dict" id="19721664" >
+ <val type="dict" id="46140816" >
+ <entry>
+ <key type="string" value="need" />
+ <val type="False" value="" />
+ </entry>
+ <entry>
+ <key type="string" value="values" />
+ <val type="list" id="44191328" >
+ <item type="dict" id="46098560" >
<entry>
<key type="string" value="access" />
<val type="string" value="rw" />
@@ -703,15 +776,15 @@
</entry>
<entry>
<key type="numeric" value="8203" />
- <val type="dict" id="20272576" >
- <entry>
- <key type="string" value="need" />
- <val type="False" value="" />
- </entry>
- <entry>
- <key type="string" value="values" />
- <val type="list" id="18679784" >
- <item type="dict" id="20295280" >
+ <val type="dict" id="45438400" >
+ <entry>
+ <key type="string" value="need" />
+ <val type="False" value="" />
+ </entry>
+ <entry>
+ <key type="string" value="values" />
+ <val type="list" id="44191256" >
+ <item type="dict" id="43876288" >
<entry>
<key type="string" value="access" />
<val type="string" value="rw" />
@@ -741,10 +814,51 @@
</entry>
</val>
</entry>
+ <entry>
+ <key type="numeric" value="8204" />
+ <val type="dict" id="45591984" >
+ <entry>
+ <key type="string" value="need" />
+ <val type="False" value="" />
+ </entry>
+ <entry>
+ <key type="string" value="values" />
+ <val type="list" id="44128664" >
+ <item type="dict" id="45889536" >
+ <entry>
+ <key type="string" value="access" />
+ <val type="string" value="rw" />
+ </entry>
+ <entry>
+ <key type="string" value="pdo" />
+ <val type="True" value="" />
+ </entry>
+ <entry>
+ <key type="string" value="type" />
+ <val type="numeric" value="3" />
+ </entry>
+ <entry>
+ <key type="string" value="name" />
+ <val type="string">SlaveMap13</val>
+ </entry>
+ </item>
+ </val>
+ </entry>
+ <entry>
+ <key type="string" value="name" />
+ <val type="string">SlaveMap13</val>
+ </entry>
+ <entry>
+ <key type="string" value="struct" />
+ <val type="numeric" value="1" />
+ </entry>
+ </val>
+ </entry>
</attr>
-<attr name="DS302" type="dict" id="19720576" >
+<attr name="DS302" type="dict" id="45646224" >
</attr>
<attr name="ProfileName" type="string" value="DS-301" />
-<attr name="Type" type="string" value="slave" />
-<attr name="ID" type="numeric" value="0" />
+<attr name="Type" type="string">slave</attr>
+<attr name="ID" type="numeric" value="2" />
+<attr name="Description" type="string"></attr>
</PyObject>