# HG changeset patch # User greg # Date 1225090737 -3600 # Node ID 06420c9fb6566a47b6a4d8aa1b0fb34ad355ee2b # Parent 0bc32427a459565ca6fc889b4f3bab6e4f354b9d Update test_master and test_slave examples for linux diff -r 0bc32427a459 -r 06420c9fb656 tests/linux/test_master/beremiz.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 @@ - + - + - - - diff -r 0bc32427a459 -r 06420c9fb656 tests/linux/test_master/canopen@canfestival/baseplugin.xml --- /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 @@ + + diff -r 0bc32427a459 -r 06420c9fb656 tests/linux/test_master/canopen@canfestival/master@CanOpenNode/baseplugin.xml --- /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 @@ + + diff -r 0bc32427a459 -r 06420c9fb656 tests/linux/test_master/canopen@canfestival/master@CanOpenNode/eds/slave.eds --- /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 diff -r 0bc32427a459 -r 06420c9fb656 tests/linux/test_master/canopen@canfestival/master@CanOpenNode/master.od --- /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 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 0bc32427a459 -r 06420c9fb656 tests/linux/test_master/canopen@canfestival/master@CanOpenNode/nodelist.cpj --- /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 diff -r 0bc32427a459 -r 06420c9fb656 tests/linux/test_master/canopen@canfestival/master@CanOpenNode/plugin.xml --- /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 @@ + + diff -r 0bc32427a459 -r 06420c9fb656 tests/linux/test_master/canopen@canfestival/plugin.xml --- /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 @@ + + diff -r 0bc32427a459 -r 06420c9fb656 tests/linux/test_master/plc.xml --- 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 @@ + xsi:schemaLocation="http://www.plcopen.org/xml/tc6.xsd"> + creationDateTime="2008-06-24T18:44:00"/> diff -r 0bc32427a459 -r 06420c9fb656 tests/linux/test_slave/beremiz.xml --- 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 @@ - + - + - - - diff -r 0bc32427a459 -r 06420c9fb656 tests/linux/test_slave/canopen@canfestival/slave@CanOpenSlave/slave.eds --- /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 diff -r 0bc32427a459 -r 06420c9fb656 tests/linux/test_slave/canopen@canfestival/slave@CanOpenSlave/slave.od --- 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 @@ - - + + - + @@ -15,7 +15,7 @@ - + @@ -25,7 +25,7 @@ - + @@ -43,7 +43,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -69,7 +69,7 @@ - + @@ -79,7 +79,7 @@ - + @@ -92,7 +92,7 @@ - + @@ -102,14 +102,14 @@ - + - + @@ -118,7 +118,7 @@ - + @@ -128,7 +128,7 @@ - + @@ -141,7 +141,7 @@ - + @@ -154,7 +154,7 @@ - + @@ -164,7 +164,7 @@ - + @@ -174,7 +174,7 @@ - + @@ -187,7 +187,7 @@ - + @@ -200,7 +200,7 @@ - + @@ -210,34 +210,34 @@ - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + - + - - + + @@ -269,15 +269,15 @@ - + - - + + @@ -308,7 +308,7 @@ - + diff -r 0bc32427a459 -r 06420c9fb656 tests/linux/test_slave/plc.xml --- 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 @@ + xsi:schemaLocation="http://www.plcopen.org/xml/tc6.xsd"> + creationDateTime="2008-06-24T18:44:00"/>