beremiz

Update test_master and test_slave examples for linux

2008-10-27, greg
06420c9fb656
Parents 0bc32427a459
Children f56ab7d25f06
Update test_master and test_slave examples for linux
13 files changed, 618 insertions(+), 47 deletions(-)
  • +2 -5
    tests/linux/test_master/beremiz.xml
  • +2 -0
    tests/linux/test_master/canopen@canfestival/baseplugin.xml
  • +2 -0
    tests/linux/test_master/canopen@canfestival/master@CanOpenNode/baseplugin.xml
  • +169 -0
    tests/linux/test_master/canopen@canfestival/master@CanOpenNode/eds/slave.eds
  • +224 -0
    tests/linux/test_master/canopen@canfestival/master@CanOpenNode/master.od
  • +7 -0
    tests/linux/test_master/canopen@canfestival/master@CanOpenNode/nodelist.cpj
  • +2 -0
    tests/linux/test_master/canopen@canfestival/master@CanOpenNode/plugin.xml
  • +2 -0
    tests/linux/test_master/canopen@canfestival/plugin.xml
  • +3 -3
    tests/linux/test_master/plc.xml
  • +2 -5
    tests/linux/test_slave/beremiz.xml
  • +169 -0
    tests/linux/test_slave/canopen@canfestival/slave@CanOpenSlave/slave.eds
  • +31 -31
    tests/linux/test_slave/canopen@canfestival/slave@CanOpenSlave/slave.od
  • +3 -3
    tests/linux/test_slave/plc.xml
    • --- a/tests/linux/test_master/beremiz.xml Fri Oct 24 14:36:52 2008 +0200
    +++ b/tests/linux/test_master/beremiz.xml Mon Oct 27 07:58:57 2008 +0100
    @@ -1,9 +1,6 @@
    <?xml version="1.0" encoding="UTF-8"?>
    -<BeremizRoot CFLAGS="-g" Linker="g++" LDFLAGS="">
    +<BeremizRoot URI_location="LOCAL://">
    <TargetType>
    - <Linux Nice="0"/>
    + <Linux CFLAGS="-g" LDFLAGS=""/>
    </TargetType>
    - <Connection>
    - <Local/>
    - </Connection>
    </BeremizRoot>
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/tests/linux/test_master/canopen@canfestival/baseplugin.xml Mon Oct 27 07:58:57 2008 +0100
    @@ -0,0 +1,2 @@
    +<?xml version="1.0" encoding="UTF-8"?>
    +<BaseParams Name="canopen" IEC_Channel="0"/>
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/tests/linux/test_master/canopen@canfestival/master@CanOpenNode/baseplugin.xml Mon Oct 27 07:58:57 2008 +0100
    @@ -0,0 +1,2 @@
    +<?xml version="1.0" encoding="UTF-8"?>
    +<BaseParams Name="master" IEC_Channel="0"/>
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/tests/linux/test_master/canopen@canfestival/master@CanOpenNode/eds/slave.eds Mon Oct 27 07:58:57 2008 +0100
    @@ -0,0 +1,169 @@
    +[FileInfo]
    +FileName=slave.eds
    +FileVersion=1
    +FileRevision=1
    +EDSVersion=4.0
    +Description=
    +CreationTime=09:10AM
    +CreationDate=10-27-2008
    +CreatedBy=CANFestival
    +ModificationTime=09:10AM
    +ModificationDate=10-27-2008
    +ModifiedBy=CANFestival
    +
    +[DeviceInfo]
    +VendorName=CANFestival
    +VendorNumber=0x00000000
    +ProductName=SlaveNode
    +ProductNumber=0x00000000
    +RevisionNumber=0x00000000
    +BaudRate_10=1
    +BaudRate_20=1
    +BaudRate_50=1
    +BaudRate_125=1
    +BaudRate_250=1
    +BaudRate_500=1
    +BaudRate_800=1
    +BaudRate_1000=1
    +SimpleBootUpMaster=0
    +SimpleBootUpSlave=1
    +Granularity=8
    +DynamicChannelsSupported=0
    +CompactPDO=0
    +GroupMessaging=0
    +NrOfRXPDO=4
    +NrOfTXPDO=4
    +LSS_Supported=0
    +
    +[DummyUsage]
    +Dummy0001=0
    +Dummy0002=1
    +Dummy0003=1
    +Dummy0004=1
    +Dummy0005=1
    +Dummy0006=1
    +Dummy0007=1
    +
    +[Comments]
    +Lines=0
    +
    +[MandatoryObjects]
    +SupportedObjects=3
    +1=0x1000
    +2=0x1001
    +3=0x1018
    +
    +[1000]
    +ParameterName=Device Type
    +ObjectType=0x7
    +DataType=0x0007
    +AccessType=ro
    +DefaultValue=0
    +PDOMapping=0
    +
    +[1001]
    +ParameterName=Error Register
    +ObjectType=0x7
    +DataType=0x0005
    +AccessType=ro
    +DefaultValue=0
    +PDOMapping=1
    +
    +[1018]
    +ParameterName=Identity
    +ObjectType=0x8
    +SubNumber=5
    +
    +[1018sub0]
    +ParameterName=Number of Entries
    +ObjectType=0x7
    +DataType=0x0005
    +AccessType=ro
    +DefaultValue=4
    +PDOMapping=0
    +
    +[1018sub1]
    +ParameterName=Vendor ID
    +ObjectType=0x7
    +DataType=0x0007
    +AccessType=ro
    +DefaultValue=0
    +PDOMapping=0
    +
    +[1018sub2]
    +ParameterName=Product Code
    +ObjectType=0x7
    +DataType=0x0007
    +AccessType=ro
    +DefaultValue=0
    +PDOMapping=0
    +
    +[1018sub3]
    +ParameterName=Revision Number
    +ObjectType=0x7
    +DataType=0x0007
    +AccessType=ro
    +DefaultValue=0
    +PDOMapping=0
    +
    +[1018sub4]
    +ParameterName=Serial Number
    +ObjectType=0x7
    +DataType=0x0007
    +AccessType=ro
    +DefaultValue=0
    +PDOMapping=0
    +
    +[OptionalObjects]
    +SupportedObjects=1
    +1=0x1200
    +
    +[1200]
    +ParameterName=Server SDO Parameter
    +ObjectType=0x8
    +SubNumber=3
    +
    +[1200sub0]
    +ParameterName=Number of Entries
    +ObjectType=0x7
    +DataType=0x0005
    +AccessType=ro
    +DefaultValue=2
    +PDOMapping=0
    +
    +[1200sub1]
    +ParameterName=COB ID Client to Server (Receive SDO)
    +ObjectType=0x7
    +DataType=0x0007
    +AccessType=ro
    +DefaultValue=$NODEID+0x600
    +PDOMapping=0
    +
    +[1200sub2]
    +ParameterName=COB ID Server to Client (Transmit SDO)
    +ObjectType=0x7
    +DataType=0x0007
    +AccessType=ro
    +DefaultValue=$NODEID+0x580
    +PDOMapping=0
    +
    +[ManufacturerObjects]
    +SupportedObjects=2
    +1=0x2000
    +2=0x2001
    +
    +[2000]
    +ParameterName=OutVar
    +ObjectType=0x7
    +DataType=0x0003
    +AccessType=rw
    +DefaultValue=0
    +PDOMapping=1
    +
    +[2001]
    +ParameterName=InVar
    +ObjectType=0x7
    +DataType=0x0003
    +AccessType=rw
    +DefaultValue=0
    +PDOMapping=1
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/tests/linux/test_master/canopen@canfestival/master@CanOpenNode/master.od Mon Oct 27 07:58:57 2008 +0100
    @@ -0,0 +1,224 @@
    +<?xml version="1.0"?>
    +<!DOCTYPE PyObject SYSTEM "PyObjects.dtd">
    +<PyObject module="node" class="Node" id="157919852">
    +<attr name="Profile" type="dict" id="157929924" >
    +</attr>
    +<attr name="Description" type="string" value="" />
    +<attr name="Dictionary" type="dict" id="157929652" >
    + <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="157521932" >
    + <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="157475884" >
    +</attr>
    +<attr name="ParamsDictionary" type="dict" id="157929092" >
    +</attr>
    +<attr name="UserMapping" type="dict" id="157928820" >
    +</attr>
    +<attr name="DS302" type="dict" id="157533972" >
    + <entry>
    + <key type="numeric" value="7968" />
    + <val type="dict" id="157534652" >
    + <entry>
    + <key type="string" value="need" />
    + <val type="False" value="" />
    + </entry>
    + <entry>
    + <key type="string" value="values" />
    + <val type="list" id="157521964" >
    + <item type="dict" id="157930468" >
    + <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="157928956" >
    + <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="157929516" >
    + <entry>
    + <key type="string" value="need" />
    + <val type="False" value="" />
    + </entry>
    + <entry>
    + <key type="string" value="values" />
    + <val type="list" id="157522956" >
    + <item type="dict" id="157930740" >
    + <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="157931012" >
    + <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="157931148" >
    + <entry>
    + <key type="string" value="need" />
    + <val type="False" value="" />
    + </entry>
    + <entry>
    + <key type="string" value="values" />
    + <val type="list" id="157522668" >
    + <item type="dict" id="157930060" >
    + <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="157931420" >
    + <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>
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/tests/linux/test_master/canopen@canfestival/master@CanOpenNode/nodelist.cpj Mon Oct 27 07:58:57 2008 +0100
    @@ -0,0 +1,7 @@
    +[TOPOLOGY]
    +NetName=None
    +Nodes=0x01
    +Node3Present=0x01
    +Node3Name=slave
    +Node3DCFName=slave.eds
    +EDSBaseName=eds
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/tests/linux/test_master/canopen@canfestival/master@CanOpenNode/plugin.xml Mon Oct 27 07:58:57 2008 +0100
    @@ -0,0 +1,2 @@
    +<?xml version="1.0" encoding="UTF-8"?>
    +<CanFestivalNode CAN_Device="vcan0" CAN_Baudrate="125K" NodeId="1"/>
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/tests/linux/test_master/canopen@canfestival/plugin.xml Mon Oct 27 07:58:57 2008 +0100
    @@ -0,0 +1,2 @@
    +<?xml version="1.0" encoding="UTF-8"?>
    +<CanFestivalInstance CAN_Driver="../CanFestival-3/drivers/can_socket/libcanfestival_can_socket.so"/>
    --- a/tests/linux/test_master/plc.xml Fri Oct 24 14:36:52 2008 +0200
    +++ b/tests/linux/test_master/plc.xml Mon Oct 27 07:58:57 2008 +0100
    @@ -2,13 +2,13 @@
    <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xmlns="http://www.plcopen.org/xml/tc6.xsd"
    xmlns:xhtml="http://www.w3.org/1999/xhtml"
    - xsi:schemaLocation="http://www.plcopen.org/xml/tc6.xsd http://www.plcopen.org/xml/tc6.xsd">
    + xsi:schemaLocation="http://www.plcopen.org/xml/tc6.xsd">
    <fileHeader companyName="lolitech"
    productName="beremiz"
    productVersion="1"
    - creationDateTime="2008-06-24 18:44:00"/>
    + creationDateTime="2008-06-24T18:44:00"/>
    <contentHeader name="test_slave"
    - modificationDateTime="2008-06-27 15:41:26"
    + modificationDateTime="2008-10-27T09:13:16"
    language="en-US">
    <coordinateInfo>
    <fbd>
    --- a/tests/linux/test_slave/beremiz.xml Fri Oct 24 14:36:52 2008 +0200
    +++ b/tests/linux/test_slave/beremiz.xml Mon Oct 27 07:58:57 2008 +0100
    @@ -1,9 +1,6 @@
    <?xml version="1.0" encoding="UTF-8"?>
    -<BeremizRoot CFLAGS="-g" Linker="g++" LDFLAGS="">
    +<BeremizRoot URI_location="LOCAL://">
    <TargetType>
    - <Linux Nice="0"/>
    + <Linux CFLAGS="-g" LDFLAGS=""/>
    </TargetType>
    - <Connection>
    - <Local/>
    - </Connection>
    </BeremizRoot>
    --- /dev/null Thu Jan 01 00:00:00 1970 +0000
    +++ b/tests/linux/test_slave/canopen@canfestival/slave@CanOpenSlave/slave.eds Mon Oct 27 07:58:57 2008 +0100
    @@ -0,0 +1,169 @@
    +[FileInfo]
    +FileName=slave.eds
    +FileVersion=1
    +FileRevision=1
    +EDSVersion=4.0
    +Description=
    +CreationTime=09:10AM
    +CreationDate=10-27-2008
    +CreatedBy=CANFestival
    +ModificationTime=09:10AM
    +ModificationDate=10-27-2008
    +ModifiedBy=CANFestival
    +
    +[DeviceInfo]
    +VendorName=CANFestival
    +VendorNumber=0x00000000
    +ProductName=SlaveNode
    +ProductNumber=0x00000000
    +RevisionNumber=0x00000000
    +BaudRate_10=1
    +BaudRate_20=1
    +BaudRate_50=1
    +BaudRate_125=1
    +BaudRate_250=1
    +BaudRate_500=1
    +BaudRate_800=1
    +BaudRate_1000=1
    +SimpleBootUpMaster=0
    +SimpleBootUpSlave=1
    +Granularity=8
    +DynamicChannelsSupported=0
    +CompactPDO=0
    +GroupMessaging=0
    +NrOfRXPDO=4
    +NrOfTXPDO=4
    +LSS_Supported=0
    +
    +[DummyUsage]
    +Dummy0001=0
    +Dummy0002=1
    +Dummy0003=1
    +Dummy0004=1
    +Dummy0005=1
    +Dummy0006=1
    +Dummy0007=1
    +
    +[Comments]
    +Lines=0
    +
    +[MandatoryObjects]
    +SupportedObjects=3
    +1=0x1000
    +2=0x1001
    +3=0x1018
    +
    +[1000]
    +ParameterName=Device Type
    +ObjectType=0x7
    +DataType=0x0007
    +AccessType=ro
    +DefaultValue=0
    +PDOMapping=0
    +
    +[1001]
    +ParameterName=Error Register
    +ObjectType=0x7
    +DataType=0x0005
    +AccessType=ro
    +DefaultValue=0
    +PDOMapping=1
    +
    +[1018]
    +ParameterName=Identity
    +ObjectType=0x8
    +SubNumber=5
    +
    +[1018sub0]
    +ParameterName=Number of Entries
    +ObjectType=0x7
    +DataType=0x0005
    +AccessType=ro
    +DefaultValue=4
    +PDOMapping=0
    +
    +[1018sub1]
    +ParameterName=Vendor ID
    +ObjectType=0x7
    +DataType=0x0007
    +AccessType=ro
    +DefaultValue=0
    +PDOMapping=0
    +
    +[1018sub2]
    +ParameterName=Product Code
    +ObjectType=0x7
    +DataType=0x0007
    +AccessType=ro
    +DefaultValue=0
    +PDOMapping=0
    +
    +[1018sub3]
    +ParameterName=Revision Number
    +ObjectType=0x7
    +DataType=0x0007
    +AccessType=ro
    +DefaultValue=0
    +PDOMapping=0
    +
    +[1018sub4]
    +ParameterName=Serial Number
    +ObjectType=0x7
    +DataType=0x0007
    +AccessType=ro
    +DefaultValue=0
    +PDOMapping=0
    +
    +[OptionalObjects]
    +SupportedObjects=1
    +1=0x1200
    +
    +[1200]
    +ParameterName=Server SDO Parameter
    +ObjectType=0x8
    +SubNumber=3
    +
    +[1200sub0]
    +ParameterName=Number of Entries
    +ObjectType=0x7
    +DataType=0x0005
    +AccessType=ro
    +DefaultValue=2
    +PDOMapping=0
    +
    +[1200sub1]
    +ParameterName=COB ID Client to Server (Receive SDO)
    +ObjectType=0x7
    +DataType=0x0007
    +AccessType=ro
    +DefaultValue=$NODEID+0x600
    +PDOMapping=0
    +
    +[1200sub2]
    +ParameterName=COB ID Server to Client (Transmit SDO)
    +ObjectType=0x7
    +DataType=0x0007
    +AccessType=ro
    +DefaultValue=$NODEID+0x580
    +PDOMapping=0
    +
    +[ManufacturerObjects]
    +SupportedObjects=2
    +1=0x2000
    +2=0x2001
    +
    +[2000]
    +ParameterName=OutVar
    +ObjectType=0x7
    +DataType=0x0003
    +AccessType=rw
    +DefaultValue=0
    +PDOMapping=1
    +
    +[2001]
    +ParameterName=InVar
    +ObjectType=0x7
    +DataType=0x0003
    +AccessType=rw
    +DefaultValue=0
    +PDOMapping=1
    --- a/tests/linux/test_slave/canopen@canfestival/slave@CanOpenSlave/slave.od Fri Oct 24 14:36:52 2008 +0200
    +++ b/tests/linux/test_slave/canopen@canfestival/slave@CanOpenSlave/slave.od Mon Oct 27 07:58:57 2008 +0100
    @@ -1,10 +1,10 @@
    <?xml version="1.0"?>
    <!DOCTYPE PyObject SYSTEM "PyObjects.dtd">
    -<PyObject module="node" class="Node" id="157308236">
    -<attr name="Profile" type="dict" id="157312244" >
    +<PyObject module="node" class="Node" id="157806348">
    +<attr name="Profile" type="dict" id="157588716" >
    </attr>
    <attr name="Description" type="string" value="" />
    -<attr name="Dictionary" type="dict" id="157311972" >
    +<attr name="Dictionary" type="dict" id="157588580" >
    <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="155073324" >
    + <val type="list" id="160478380" >
    <item type="string" value="{True:&quot;$NODEID+0x%X00&quot;%(base+2),False:0x80000000}[base&lt;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="155064684" >
    + <val type="list" id="158303244" >
    <item type="string" value="{True:&quot;$NODEID+0x%X00&quot;%(base+2),False:0x80000000}[base&lt;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="155071340" >
    + <val type="list" id="158305356" >
    <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="155052268" >
    + <val type="list" id="158305388" >
    <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="155071116" >
    + <val type="list" id="158305420" >
    <item type="string" value="{True:&quot;$NODEID+0x%X80&quot;%(base+1),False:0x80000000}[base&lt;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="155226444" >
    + <val type="list" id="158305932" >
    <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="155063820" >
    + <val type="list" id="158305516" >
    <item type="string" value="{True:&quot;$NODEID+0x%X80&quot;%(base+1),False:0x80000000}[base&lt;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="155053836" >
    + <val type="list" id="158305068" >
    <item type="string" value="&quot;$NODEID+0x600&quot;" />
    <item type="string" value="&quot;$NODEID+0x580&quot;" />
    </val>
    </entry>
    <entry>
    <key type="numeric" value="4120" />
    - <val type="list" id="155065132" >
    + <val type="list" id="158304940" >
    <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="152878604" >
    + <val type="list" id="158051500" >
    <item type="string" value="{True:&quot;$NODEID+0x%X00&quot;%(base+2),False:0x80000000}[base&lt;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="155064940" >
    + <val type="list" id="158052300" >
    <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="155065196" >
    + <val type="list" id="158049740" >
    <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="152878124" >
    + <val type="list" id="158048716" >
    <item type="string" value="{True:&quot;$NODEID+0x%X00&quot;%(base+2),False:0x80000000}[base&lt;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="152878060" >
    + <val type="list" id="158048428" >
    <item type="string" value="{True:&quot;$NODEID+0x%X80&quot;%(base+1),False:0x80000000}[base&lt;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="155072332" >
    + <val type="list" id="158052172" >
    <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="155051788" >
    + <val type="list" id="158052204" >
    <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="144466700" >
    + <val type="list" id="158052108" >
    <item type="string" value="{True:&quot;$NODEID+0x%X80&quot;%(base+1),False:0x80000000}[base&lt;4]" />
    <item type="numeric" value="0" />
    <item type="numeric" value="0" />
    @@ -210,7 +210,7 @@
    </entry>
    <entry>
    <key type="numeric" value="6657" />
    - <val type="list" id="155053772" >
    + <val type="list" id="158048588" >
    <item type="numeric" value="0" />
    <item type="numeric" value="0" />
    <item type="numeric" value="0" />
    @@ -222,22 +222,22 @@
    </val>
    </entry>
    </attr>
    -<attr name="SpecificMenu" type="list" id="157308300" >
    +<attr name="SpecificMenu" type="list" id="158048396" >
    </attr>
    -<attr name="ParamsDictionary" type="dict" id="152844732" >
    +<attr name="ParamsDictionary" type="dict" id="157588308" >
    </attr>
    -<attr name="UserMapping" type="dict" id="155085108" >
    +<attr name="UserMapping" type="dict" id="157588852" >
    <entry>
    <key type="numeric" value="8192" />
    - <val type="dict" id="155060804" >
    + <val type="dict" id="157602516" >
    <entry>
    <key type="string" value="need" />
    <val type="False" value="" />
    </entry>
    <entry>
    <key type="string" value="values" />
    - <val type="list" id="155052140" >
    - <item type="dict" id="152845684" >
    + <val type="list" id="158052332" >
    + <item type="dict" id="157586676" >
    <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="155059852" >
    + <val type="dict" id="157535468" >
    <entry>
    <key type="string" value="need" />
    <val type="False" value="" />
    </entry>
    <entry>
    <key type="string" value="values" />
    - <val type="list" id="155051180" >
    - <item type="dict" id="152782612" >
    + <val type="list" id="158305004" >
    + <item type="dict" id="158343620" >
    <entry>
    <key type="string" value="access" />
    <val type="string" value="rw" />
    @@ -308,7 +308,7 @@
    </val>
    </entry>
    </attr>
    -<attr name="DS302" type="dict" id="152843236" >
    +<attr name="DS302" type="dict" id="158328188" >
    </attr>
    <attr name="ProfileName" type="string" value="None" />
    <attr name="Type" type="string" value="slave" />
    --- a/tests/linux/test_slave/plc.xml Fri Oct 24 14:36:52 2008 +0200
    +++ b/tests/linux/test_slave/plc.xml Mon Oct 27 07:58:57 2008 +0100
    @@ -2,13 +2,13 @@
    <project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
    xmlns="http://www.plcopen.org/xml/tc6.xsd"
    xmlns:xhtml="http://www.w3.org/1999/xhtml"
    - xsi:schemaLocation="http://www.plcopen.org/xml/tc6.xsd http://www.plcopen.org/xml/tc6.xsd">
    + xsi:schemaLocation="http://www.plcopen.org/xml/tc6.xsd">
    <fileHeader companyName="lolitech"
    productName="beremiz"
    productVersion="1"
    - creationDateTime="2008-06-24 18:44:00"/>
    + creationDateTime="2008-06-24T18:44:00"/>
    <contentHeader name="test_slave"
    - modificationDateTime="2008-06-27 16:19:26"
    + modificationDateTime="2008-10-24T09:32:01"
    language="en-US">
    <coordinateInfo>
    <fbd>