# HG changeset patch # User etisserant # Date 1214576482 -7200 # Node ID 66a4dc7f534af6f98cd333722d14b6619400e9d6 # Parent 2390b409eb936418334fa927ccc51979cb8437e1 Added PLC tick alignement on external synchronization source feature. diff -r 2390b409eb93 -r 66a4dc7f534a tests/linux/test_slave/canopen@canfestival/slave@CanOpenSlave/plugin.xml --- a/tests/linux/test_slave/canopen@canfestival/slave@CanOpenSlave/plugin.xml Fri Jun 27 16:21:22 2008 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<CanFestivalSlaveNode CAN_Device="vcan0" CAN_Baudrate="125K" NodeId="3" Sync_Align="100"/> diff -r 2390b409eb93 -r 66a4dc7f534a tests/linux/test_slave/canopen@canfestival/slave@CanOpenSlave/slave.od --- a/tests/linux/test_slave/canopen@canfestival/slave@CanOpenSlave/slave.od Fri Jun 27 16:21:22 2008 +0200 +++ b/tests/linux/test_slave/canopen@canfestival/slave@CanOpenSlave/slave.od Fri Jun 27 16:21:22 2008 +0200 @@ -1,10 +1,10 @@ <?xml version="1.0"?> <!DOCTYPE PyObject SYSTEM "PyObjects.dtd"> -<PyObject module="node" class="Node" id="157207020"> -<attr name="Profile" type="dict" id="157233604" > +<PyObject module="node" class="Node" id="157308236"> +<attr name="Profile" type="dict" id="157312244" > </attr> <attr name="Description" type="string" value="" /> -<attr name="Dictionary" type="dict" id="157235916" > +<attr name="Dictionary" type="dict" id="157311972" > <entry> <key type="numeric" value="4096" /> <val type="numeric" value="0" /> @@ -15,7 +15,7 @@ </entry> <entry> <key type="numeric" value="5122" /> - <val type="list" id="156865228" > + <val type="list" id="155073324" > <item type="string" value="{True:"$NODEID+0x%X00"%(base+2),False:0x80000000}[base<4]" /> <item type="numeric" value="0" /> <item type="numeric" value="0" /> @@ -25,7 +25,7 @@ </entry> <entry> <key type="numeric" value="5123" /> - <val type="list" id="156844940" > + <val type="list" id="155064684" > <item type="string" value="{True:"$NODEID+0x%X00"%(base+2),False:0x80000000}[base<4]" /> <item type="numeric" value="0" /> <item type="numeric" value="0" /> @@ -43,7 +43,7 @@ </entry> <entry> <key type="numeric" value="5634" /> - <val type="list" id="157180748" > + <val type="list" id="155071340" > <item type="numeric" value="0" /> <item type="numeric" value="0" /> <item type="numeric" value="0" /> @@ -56,7 +56,7 @@ </entry> <entry> <key type="numeric" value="5635" /> - <val type="list" id="157182860" > + <val type="list" id="155052268" > <item type="numeric" value="0" /> <item type="numeric" value="0" /> <item type="numeric" value="0" /> @@ -69,7 +69,7 @@ </entry> <entry> <key type="numeric" value="6146" /> - <val type="list" id="157205228" > + <val type="list" id="155071116" > <item type="string" value="{True:"$NODEID+0x%X80"%(base+1),False:0x80000000}[base<4]" /> <item type="numeric" value="0" /> <item type="numeric" value="0" /> @@ -79,7 +79,7 @@ </entry> <entry> <key type="numeric" value="6658" /> - <val type="list" id="157180620" > + <val type="list" id="155226444" > <item type="numeric" value="0" /> <item type="numeric" value="0" /> <item type="numeric" value="0" /> @@ -92,7 +92,7 @@ </entry> <entry> <key type="numeric" value="6147" /> - <val type="list" id="156866540" > + <val type="list" id="155063820" > <item type="string" value="{True:"$NODEID+0x%X80"%(base+1),False:0x80000000}[base<4]" /> <item type="numeric" value="0" /> <item type="numeric" value="0" /> @@ -102,14 +102,14 @@ </entry> <entry> <key type="numeric" value="4608" /> - <val type="list" id="156868364" > + <val type="list" id="155053836" > <item type="string" value=""$NODEID+0x600"" /> <item type="string" value=""$NODEID+0x580"" /> </val> </entry> <entry> <key type="numeric" value="4120" /> - <val type="list" id="157181164" > + <val type="list" id="155065132" > <item type="numeric" value="0" /> <item type="numeric" value="0" /> <item type="numeric" value="0" /> @@ -118,7 +118,7 @@ </entry> <entry> <key type="numeric" value="5120" /> - <val type="list" id="157183052" > + <val type="list" id="152878604" > <item type="string" value="{True:"$NODEID+0x%X00"%(base+2),False:0x80000000}[base<4]" /> <item type="numeric" value="0" /> <item type="numeric" value="0" /> @@ -128,7 +128,7 @@ </entry> <entry> <key type="numeric" value="6659" /> - <val type="list" id="157180652" > + <val type="list" id="155064940" > <item type="numeric" value="0" /> <item type="numeric" value="0" /> <item type="numeric" value="0" /> @@ -141,7 +141,7 @@ </entry> <entry> <key type="numeric" value="5632" /> - <val type="list" id="157182380" > + <val type="list" id="155065196" > <item type="numeric" value="0" /> <item type="numeric" value="0" /> <item type="numeric" value="0" /> @@ -154,7 +154,7 @@ </entry> <entry> <key type="numeric" value="5121" /> - <val type="list" id="157182188" > + <val type="list" id="152878124" > <item type="string" value="{True:"$NODEID+0x%X00"%(base+2),False:0x80000000}[base<4]" /> <item type="numeric" value="0" /> <item type="numeric" value="0" /> @@ -164,7 +164,7 @@ </entry> <entry> <key type="numeric" value="6144" /> - <val type="list" id="156865740" > + <val type="list" id="152878060" > <item type="string" value="{True:"$NODEID+0x%X80"%(base+1),False:0x80000000}[base<4]" /> <item type="numeric" value="0" /> <item type="numeric" value="0" /> @@ -174,7 +174,7 @@ </entry> <entry> <key type="numeric" value="5633" /> - <val type="list" id="156867596" > + <val type="list" id="155072332" > <item type="numeric" value="0" /> <item type="numeric" value="0" /> <item type="numeric" value="0" /> @@ -187,7 +187,7 @@ </entry> <entry> <key type="numeric" value="6656" /> - <val type="list" id="157207340" > + <val type="list" id="155051788" > <item type="numeric" value="0" /> <item type="numeric" value="0" /> <item type="numeric" value="0" /> @@ -200,7 +200,7 @@ </entry> <entry> <key type="numeric" value="6145" /> - <val type="list" id="157205388" > + <val type="list" id="144466700" > <item type="string" value="{True:"$NODEID+0x%X80"%(base+1),False:0x80000000}[base<4]" /> <item type="numeric" value="0" /> <item type="numeric" value="0" /> @@ -210,34 +210,34 @@ </entry> <entry> <key type="numeric" value="6657" /> - <val type="list" id="157230668" > - <item type="numeric" value="0" /> - <item type="numeric" value="0" /> - <item type="numeric" value="0" /> - <item type="numeric" value="0" /> - <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="157206316" > -</attr> -<attr name="ParamsDictionary" type="dict" id="157212988" > -</attr> -<attr name="UserMapping" type="dict" id="157234828" > + <val type="list" id="155053772" > + <item type="numeric" value="0" /> + <item type="numeric" value="0" /> + <item type="numeric" value="0" /> + <item type="numeric" value="0" /> + <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="157308300" > +</attr> +<attr name="ParamsDictionary" type="dict" id="152844732" > +</attr> +<attr name="UserMapping" type="dict" id="155085108" > <entry> <key type="numeric" value="8192" /> - <val type="dict" id="157233468" > + <val type="dict" id="155060804" > <entry> <key type="string" value="need" /> <val type="False" value="" /> </entry> <entry> <key type="string" value="values" /> - <val type="list" id="157229260" > - <item type="dict" id="157236188" > + <val type="list" id="155052140" > + <item type="dict" id="152845684" > <entry> <key type="string" value="access" /> <val type="string" value="rw" /> @@ -269,15 +269,15 @@ </entry> <entry> <key type="numeric" value="8193" /> - <val type="dict" id="157234556" > + <val type="dict" id="155059852" > <entry> <key type="string" value="need" /> <val type="False" value="" /> </entry> <entry> <key type="string" value="values" /> - <val type="list" id="157231020" > - <item type="dict" id="157235780" > + <val type="list" id="155051180" > + <item type="dict" id="152782612" > <entry> <key type="string" value="access" /> <val type="string" value="rw" /> @@ -308,7 +308,7 @@ </val> </entry> </attr> -<attr name="DS302" type="dict" id="157233332" > +<attr name="DS302" type="dict" id="152843236" > </attr> <attr name="ProfileName" type="string" value="None" /> <attr name="Type" type="string" value="slave" /> diff -r 2390b409eb93 -r 66a4dc7f534a tests/linux/test_slave/plc.xml --- a/tests/linux/test_slave/plc.xml Fri Jun 27 16:21:22 2008 +0200 +++ b/tests/linux/test_slave/plc.xml Fri Jun 27 16:21:22 2008 +0200 @@ -8,7 +8,7 @@ productVersion="1" creationDateTime="2008-06-24 18:44:00"/> <contentHeader name="test_slave" - modificationDateTime="2008-06-25 16:43:20" + modificationDateTime="2008-06-27 16:19:26" language="en-US"> <coordinateInfo> <fbd> @@ -113,7 +113,7 @@ <configurations> <configuration name="conf"> <resource name="res"> - <task name="tache" interval="00:00:00.100000" priority="0"> + <task name="tache" interval="00:00:00.010000" priority="0"> <pouInstance name="toto" type="test_main"/> </task> </resource>