# HG changeset patch # User laurent # Date 1254994000 -7200 # Node ID 8261c8f1e3658c260e8dca20fd1368fa30c85480 # Parent 092e33606e51f0ca3a0c97c0e110ef5b72e6d596 Bug on Debug trying to start (and stop) before PLC started fixed. Adding support for detecting platform default settings for target type and canfestival node. Clear tests folder, leaving only multi-platform tests. diff -r 092e33606e51 -r 8261c8f1e365 Beremiz_service.py --- a/Beremiz_service.py Thu Oct 08 11:09:01 2009 +0200 +++ b/Beremiz_service.py Thu Oct 08 11:26:40 2009 +0200 @@ -415,7 +415,7 @@ def UpdateIcon(self, plcstatus): if plcstatus is "Started" : currenticon = self.MakeIcon(starticon.GetImage()) - elif plcstatus is "Stopped": + elif plcstatus is "Stopped" or plcstatus is "Starting": currenticon = self.MakeIcon(stopicon.GetImage()) else: currenticon = self.MakeIcon(defaulticon.GetImage()) diff -r 092e33606e51 -r 8261c8f1e365 connectors/PYRO/__init__.py --- a/connectors/PYRO/__init__.py Thu Oct 08 11:09:01 2009 +0200 +++ b/connectors/PYRO/__init__.py Thu Oct 08 11:26:40 2009 +0200 @@ -118,6 +118,13 @@ return None,None GetTraceVariables = PyroCatcher(_PyroGetTraceVariables,(None,None)) + def _PyroPLCIsStarting(self): + """ + for safe use in from debug thread, must use the copy + """ + return self.RemotePLCObjectProxyCopy is not None and self.RemotePLCObjectProxyCopy.GetPLCstatus() == "Starting" + PLCIsStarting = PyroCatcher(_PyroPLCIsStarting,False) + def __getattr__(self, attrName): member = self.__dict__.get(attrName, None) if member is None: diff -r 092e33606e51 -r 8261c8f1e365 plugger.py --- a/plugger.py Thu Oct 08 11:09:01 2009 +0200 +++ b/plugger.py Thu Oct 08 11:26:40 2009 +0200 @@ -3,6 +3,7 @@ """ import os,sys,traceback +import time import plugins import types import shutil @@ -88,8 +89,8 @@ def _AddParamsMembers(self): self.PlugParams = None if self.XSD: - Classes = GenerateClassesFromXSDstring(self.XSD) - Classes = [(name, XSDclass) for name, XSDclass in Classes.items() if XSDclass.IsBaseClass] + self.Classes = GenerateClassesFromXSDstring(self.XSD) + Classes = [(name, XSDclass) for name, XSDclass in self.Classes.items() if XSDclass.IsBaseClass] if len(Classes) == 1: name, XSDclass = Classes[0] obj = XSDclass() @@ -724,7 +725,7 @@ - + """+targets.targetchoices+""" @@ -813,6 +814,27 @@ for child in self.IterChilds(): childs.append(child.GetPlugInfos()) return {"name" : "PLC (%s)"%self.GetProjectName(), "type" : None, "values" : childs} + + def GetDefaultTarget(self): + target = self.Classes["BeremizRoot_TargetType"]() + if wx.Platform == '__WXMSW__': + target.setcontent({"name": "Win32", "value": self.Classes["TargetType_Win32"]()}) + else: + target.setcontent({"name": "Linux", "value": self.Classes["TargetType_Linux"]()}) + return target + + def GetParamsAttributes(self, path = None): + params = PlugTemplate.GetParamsAttributes(self, path) + if params[0]["name"] == "BeremizRoot": + for child in params[0]["children"]: + if child["name"] == "TargetType" and child["value"] == '': + child.update(self.GetDefaultTarget().getElementInfos("TargetType")) + return params + + def SetParamsAttribute(self, path, value): + if path.startswith("BeremizRoot.TargetType.") and self.BeremizRoot.getTargetType().getcontent() is None: + self.BeremizRoot.setTargetType(self.GetDefaultTarget()) + return PlugTemplate.SetParamsAttribute(self, path, value) def NewProject(self, ProjectPath, BuildPath=None): """ @@ -907,7 +929,18 @@ self.AppFrame.RefreshEditor() def GetVariableLocationTree(self): - return PlugTemplate.GetVariableLocationTree(self) + ''' + This function is meant to be overridden by plugins. + + It should returns an list of dictionaries + + - IEC_type is an IEC type like BOOL/BYTE/SINT/... + - location is a string of this variable's location, like "%IX0.0.0" + ''' + children = [] + for child in self.IECSortedChilds(): + children.append(child.GetVariableLocationTree()) + return children def PluginPath(self): return os.path.join(os.path.split(__file__)[0], "plugins") @@ -1067,7 +1100,10 @@ Return a Builder (compile C code into machine code) """ # Get target, module and class name - targetname = self.BeremizRoot.getTargetType().getcontent()["name"] + target = self.BeremizRoot.getTargetType() + if target.getcontent() is None: + target = self.GetDefaultTarget() + targetname = target.getcontent()["name"] modulename = "targets." + targetname classname = targetname + "_target" @@ -1247,8 +1283,11 @@ "init_calls":"\n", "cleanup_calls":"\n" } - - target_name = self.BeremizRoot.getTargetType().getcontent()["name"] + + target = self.BeremizRoot.getTargetType() + if target.getcontent() is None: + target = self.GetDefaultTarget() + target_name = target.getcontent()["name"] plc_main_code += targets.targetcode(target_name) return plc_main_code @@ -1407,6 +1446,9 @@ status = "Disconnected" _ = lambda x : x for args in { + _("Starting"): [("_Run", True), + ("_Debug", True), + ("_Stop", False)], _("Started"): [("_Run", False), ("_Debug", False), ("_Stop", True)], @@ -1575,7 +1617,10 @@ pass else: wx.CallAfter(self.logger.write, _("Debugger disabled\n")) - self.debug_break = True + if self._connector.PLCIsStarting(): + time.sleep(0.01) + else: + self.debug_break = True self.IECdebug_lock.release() def KillDebugThread(self): diff -r 092e33606e51 -r 8261c8f1e365 plugins/canfestival/canfestival.py --- a/plugins/canfestival/canfestival.py Thu Oct 08 11:09:01 2009 +0200 +++ b/plugins/canfestival/canfestival.py Thu Oct 08 11:26:40 2009 +0200 @@ -17,6 +17,23 @@ from gnosis.xml.pickle.util import setParanoia setParanoia(0) +if wx.Platform == '__WXMSW__': + DEFAULT_SETTINGS = { + "CAN_Driver": "can_tcp_win32", + "CAN_Device": "127.0.0.1", + "CAN_Baudrate": "125K", + "Slave_NodeId": 2, + "Master_NodeId": 1, + } +else: + DEFAULT_SETTINGS = { + "CAN_Driver": "../CanFestival-3/drivers/can_socket/libcanfestival_can_socket.so", + "CAN_Device": "vcan0", + "CAN_Baudrate": "125K", + "Slave_NodeId": 2, + "Master_NodeId": 1, + } + #-------------------------------------------------- # SLAVE #-------------------------------------------------- @@ -26,9 +43,9 @@ - - - + + + @@ -41,7 +58,7 @@ - """ + """ % DEFAULT_SETTINGS def GetSlaveODPath(self): return os.path.join(self.PlugPath(), 'slave.od') @@ -150,14 +167,14 @@ - - - + + + - """ + """ % DEFAULT_SETTINGS def __init__(self): manager = NodeManager() @@ -254,12 +271,13 @@ - + - """ + """ % DEFAULT_SETTINGS + PlugChildsTypes = [("CanOpenNode",_NodeListPlug, "CanOpen Master"), ("CanOpenSlave",_SlavePlug, "CanOpen Slave")] def GetParamsAttributes(self, path = None): diff -r 092e33606e51 -r 8261c8f1e365 runtime/PLCObject.py --- a/runtime/PLCObject.py Thu Oct 08 11:09:01 2009 +0200 +++ b/runtime/PLCObject.py Thu Oct 08 11:26:40 2009 +0200 @@ -256,6 +256,7 @@ def StartPLC(self, debug=False): PLCprint("StartPLC") if self.CurrentPLCFilename is not None: + self.PLCStatus = "Starting" self.PythonThread = Thread(target=self.PythonThreadProc, args=[debug]) self.PythonThread.start() diff -r 092e33606e51 -r 8261c8f1e365 targets/Xenomai/__init__.py --- a/targets/Xenomai/__init__.py Thu Oct 08 11:09:01 2009 +0200 +++ b/targets/Xenomai/__init__.py Thu Oct 08 11:26:40 2009 +0200 @@ -5,7 +5,7 @@ extension = ".so" def getXenoConfig(self): """ Get xeno-config from target parameters """ - return self.PluginsRootInstance.BeremizRoot.getTargetType().getcontent()["value"].getXenoConfig() + return self.getTarget().getcontent()["value"].getXenoConfig() def getBuilderLDFLAGS(self): # get xeno-config from target parameters diff -r 092e33606e51 -r 8261c8f1e365 targets/toolchain_gcc.py --- a/targets/toolchain_gcc.py Thu Oct 08 11:09:01 2009 +0200 +++ b/targets/toolchain_gcc.py Thu Oct 08 11:26:40 2009 +0200 @@ -19,18 +19,24 @@ self.md5key = None self.srcmd5 = {} + def getTarget(self): + target = self.PluginsRootInstance.BeremizRoot.getTargetType() + if target.getcontent() is None: + target = self.PluginsRootInstance.GetDefaultTarget() + return target + def getBuilderCFLAGS(self): """ Returns list of builder specific CFLAGS """ - return [self.PluginsRootInstance.BeremizRoot.getTargetType().getcontent()["value"].getCFLAGS()] + return [self.getTarget().getcontent()["value"].getCFLAGS()] def getBuilderLDFLAGS(self): """ Returns list of builder specific LDFLAGS """ return self.PluginsRootInstance.LDFLAGS + \ - [self.PluginsRootInstance.BeremizRoot.getTargetType().getcontent()["value"].getLDFLAGS()] + [self.getTarget().getcontent()["value"].getLDFLAGS()] def GetBinaryCode(self): try: @@ -78,7 +84,7 @@ def build(self): # Retrieve toolchain user parameters - toolchain_params = self.PluginsRootInstance.BeremizRoot.getTargetType().getcontent()["value"] + toolchain_params = self.getTarget().getcontent()["value"] self.compiler = toolchain_params.getCompiler() self.linker = toolchain_params.getLinker() diff -r 092e33606e51 -r 8261c8f1e365 tests/canopen_master/beremiz.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/canopen_master/beremiz.xml Thu Oct 08 11:26:40 2009 +0200 @@ -0,0 +1,6 @@ + + + + + + diff -r 092e33606e51 -r 8261c8f1e365 tests/canopen_master/canopen@canfestival/baseplugin.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/canopen_master/canopen@canfestival/baseplugin.xml Thu Oct 08 11:26:40 2009 +0200 @@ -0,0 +1,2 @@ + + diff -r 092e33606e51 -r 8261c8f1e365 tests/canopen_master/canopen@canfestival/master@CanOpenNode/baseplugin.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/canopen_master/canopen@canfestival/master@CanOpenNode/baseplugin.xml Thu Oct 08 11:26:40 2009 +0200 @@ -0,0 +1,2 @@ + + diff -r 092e33606e51 -r 8261c8f1e365 tests/canopen_master/canopen@canfestival/master@CanOpenNode/eds/Slave_0_0.eds --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/canopen_master/canopen@canfestival/master@CanOpenNode/eds/Slave_0_0.eds Thu Oct 08 11:26:40 2009 +0200 @@ -0,0 +1,1161 @@ +[FileInfo] +FileName=Slave_0_0.eds +FileVersion=1 +FileRevision=1 +EDSVersion=4.0 +Description= +CreationTime=06:35PM +CreationDate=10-07-2009 +CreatedBy=CANFestival +ModificationTime=06:35PM +ModificationDate=10-07-2009 +ModifiedBy=CANFestival + +[DeviceInfo] +VendorName=CANFestival +VendorNumber=0x00000000 +ProductName=OD_0_0 +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=17 +1=0x1200 +2=0x1400 +3=0x1401 +4=0x1402 +5=0x1403 +6=0x1600 +7=0x1601 +8=0x1602 +9=0x1603 +10=0x1800 +11=0x1801 +12=0x1802 +13=0x1803 +14=0x1A00 +15=0x1A01 +16=0x1A02 +17=0x1A03 + +[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 + +[1400] +ParameterName=Receive PDO 1 Parameter +ObjectType=0x8 +SubNumber=5 + +[1400sub0] +ParameterName=Highest SubIndex Supported +ObjectType=0x7 +DataType=0x0005 +AccessType=ro +DefaultValue=5 +PDOMapping=0 + +[1400sub1] +ParameterName=COB ID used by PDO +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=$NODEID+0x200 +PDOMapping=0 + +[1400sub2] +ParameterName=Transmission Type +ObjectType=0x7 +DataType=0x0005 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1400sub3] +ParameterName=Inhibit Time +ObjectType=0x7 +DataType=0x0006 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1400sub5] +ParameterName=Event Timer +ObjectType=0x7 +DataType=0x0006 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1401] +ParameterName=Receive PDO 2 Parameter +ObjectType=0x8 +SubNumber=5 + +[1401sub0] +ParameterName=Highest SubIndex Supported +ObjectType=0x7 +DataType=0x0005 +AccessType=ro +DefaultValue=5 +PDOMapping=0 + +[1401sub1] +ParameterName=COB ID used by PDO +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=$NODEID+0x300 +PDOMapping=0 + +[1401sub2] +ParameterName=Transmission Type +ObjectType=0x7 +DataType=0x0005 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1401sub3] +ParameterName=Inhibit Time +ObjectType=0x7 +DataType=0x0006 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1401sub5] +ParameterName=Event Timer +ObjectType=0x7 +DataType=0x0006 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1402] +ParameterName=Receive PDO 3 Parameter +ObjectType=0x8 +SubNumber=5 + +[1402sub0] +ParameterName=Highest SubIndex Supported +ObjectType=0x7 +DataType=0x0005 +AccessType=ro +DefaultValue=5 +PDOMapping=0 + +[1402sub1] +ParameterName=COB ID used by PDO +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=$NODEID+0x400 +PDOMapping=0 + +[1402sub2] +ParameterName=Transmission Type +ObjectType=0x7 +DataType=0x0005 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1402sub3] +ParameterName=Inhibit Time +ObjectType=0x7 +DataType=0x0006 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1402sub5] +ParameterName=Event Timer +ObjectType=0x7 +DataType=0x0006 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1403] +ParameterName=Receive PDO 4 Parameter +ObjectType=0x8 +SubNumber=5 + +[1403sub0] +ParameterName=Highest SubIndex Supported +ObjectType=0x7 +DataType=0x0005 +AccessType=ro +DefaultValue=5 +PDOMapping=0 + +[1403sub1] +ParameterName=COB ID used by PDO +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=$NODEID+0x500 +PDOMapping=0 + +[1403sub2] +ParameterName=Transmission Type +ObjectType=0x7 +DataType=0x0005 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1403sub3] +ParameterName=Inhibit Time +ObjectType=0x7 +DataType=0x0006 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1403sub5] +ParameterName=Event Timer +ObjectType=0x7 +DataType=0x0006 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1600] +ParameterName=Receive PDO 1 Mapping +ObjectType=0x9 +SubNumber=9 + +[1600sub0] +ParameterName=Number of Entries +ObjectType=0x7 +DataType=0x0005 +AccessType=rw +DefaultValue=8 +PDOMapping=0 + +[1600sub1] +ParameterName=PDO 1 Mapping for an application object 1 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1600sub2] +ParameterName=PDO 1 Mapping for an application object 2 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1600sub3] +ParameterName=PDO 1 Mapping for an application object 3 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1600sub4] +ParameterName=PDO 1 Mapping for an application object 4 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1600sub5] +ParameterName=PDO 1 Mapping for an application object 5 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1600sub6] +ParameterName=PDO 1 Mapping for an application object 6 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1600sub7] +ParameterName=PDO 1 Mapping for an application object 7 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1600sub8] +ParameterName=PDO 1 Mapping for an application object 8 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1601] +ParameterName=Receive PDO 2 Mapping +ObjectType=0x9 +SubNumber=9 + +[1601sub0] +ParameterName=Number of Entries +ObjectType=0x7 +DataType=0x0005 +AccessType=rw +DefaultValue=8 +PDOMapping=0 + +[1601sub1] +ParameterName=PDO 2 Mapping for an application object 1 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1601sub2] +ParameterName=PDO 2 Mapping for an application object 2 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1601sub3] +ParameterName=PDO 2 Mapping for an application object 3 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1601sub4] +ParameterName=PDO 2 Mapping for an application object 4 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1601sub5] +ParameterName=PDO 2 Mapping for an application object 5 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1601sub6] +ParameterName=PDO 2 Mapping for an application object 6 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1601sub7] +ParameterName=PDO 2 Mapping for an application object 7 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1601sub8] +ParameterName=PDO 2 Mapping for an application object 8 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1602] +ParameterName=Receive PDO 3 Mapping +ObjectType=0x9 +SubNumber=9 + +[1602sub0] +ParameterName=Number of Entries +ObjectType=0x7 +DataType=0x0005 +AccessType=rw +DefaultValue=8 +PDOMapping=0 + +[1602sub1] +ParameterName=PDO 3 Mapping for an application object 1 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1602sub2] +ParameterName=PDO 3 Mapping for an application object 2 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1602sub3] +ParameterName=PDO 3 Mapping for an application object 3 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1602sub4] +ParameterName=PDO 3 Mapping for an application object 4 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1602sub5] +ParameterName=PDO 3 Mapping for an application object 5 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1602sub6] +ParameterName=PDO 3 Mapping for an application object 6 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1602sub7] +ParameterName=PDO 3 Mapping for an application object 7 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1602sub8] +ParameterName=PDO 3 Mapping for an application object 8 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1603] +ParameterName=Receive PDO 4 Mapping +ObjectType=0x9 +SubNumber=9 + +[1603sub0] +ParameterName=Number of Entries +ObjectType=0x7 +DataType=0x0005 +AccessType=rw +DefaultValue=8 +PDOMapping=0 + +[1603sub1] +ParameterName=PDO 4 Mapping for an application object 1 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1603sub2] +ParameterName=PDO 4 Mapping for an application object 2 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1603sub3] +ParameterName=PDO 4 Mapping for an application object 3 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1603sub4] +ParameterName=PDO 4 Mapping for an application object 4 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1603sub5] +ParameterName=PDO 4 Mapping for an application object 5 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1603sub6] +ParameterName=PDO 4 Mapping for an application object 6 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1603sub7] +ParameterName=PDO 4 Mapping for an application object 7 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1603sub8] +ParameterName=PDO 4 Mapping for an application object 8 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1800] +ParameterName=Transmit PDO 1 Parameter +ObjectType=0x8 +SubNumber=5 + +[1800sub0] +ParameterName=Highest SubIndex Supported +ObjectType=0x7 +DataType=0x0005 +AccessType=ro +DefaultValue=5 +PDOMapping=0 + +[1800sub1] +ParameterName=COB ID used by PDO +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=$NODEID+0x180 +PDOMapping=0 + +[1800sub2] +ParameterName=Transmission Type +ObjectType=0x7 +DataType=0x0005 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1800sub3] +ParameterName=Inhibit Time +ObjectType=0x7 +DataType=0x0006 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1800sub5] +ParameterName=Event Timer +ObjectType=0x7 +DataType=0x0006 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1801] +ParameterName=Transmit PDO 2 Parameter +ObjectType=0x8 +SubNumber=5 + +[1801sub0] +ParameterName=Highest SubIndex Supported +ObjectType=0x7 +DataType=0x0005 +AccessType=ro +DefaultValue=5 +PDOMapping=0 + +[1801sub1] +ParameterName=COB ID used by PDO +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=$NODEID+0x280 +PDOMapping=0 + +[1801sub2] +ParameterName=Transmission Type +ObjectType=0x7 +DataType=0x0005 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1801sub3] +ParameterName=Inhibit Time +ObjectType=0x7 +DataType=0x0006 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1801sub5] +ParameterName=Event Timer +ObjectType=0x7 +DataType=0x0006 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1802] +ParameterName=Transmit PDO 3 Parameter +ObjectType=0x8 +SubNumber=5 + +[1802sub0] +ParameterName=Highest SubIndex Supported +ObjectType=0x7 +DataType=0x0005 +AccessType=ro +DefaultValue=5 +PDOMapping=0 + +[1802sub1] +ParameterName=COB ID used by PDO +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=$NODEID+0x380 +PDOMapping=0 + +[1802sub2] +ParameterName=Transmission Type +ObjectType=0x7 +DataType=0x0005 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1802sub3] +ParameterName=Inhibit Time +ObjectType=0x7 +DataType=0x0006 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1802sub5] +ParameterName=Event Timer +ObjectType=0x7 +DataType=0x0006 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1803] +ParameterName=Transmit PDO 4 Parameter +ObjectType=0x8 +SubNumber=5 + +[1803sub0] +ParameterName=Highest SubIndex Supported +ObjectType=0x7 +DataType=0x0005 +AccessType=ro +DefaultValue=5 +PDOMapping=0 + +[1803sub1] +ParameterName=COB ID used by PDO +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=$NODEID+0x480 +PDOMapping=0 + +[1803sub2] +ParameterName=Transmission Type +ObjectType=0x7 +DataType=0x0005 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1803sub3] +ParameterName=Inhibit Time +ObjectType=0x7 +DataType=0x0006 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1803sub5] +ParameterName=Event Timer +ObjectType=0x7 +DataType=0x0006 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A00] +ParameterName=Transmit PDO 1 Mapping +ObjectType=0x9 +SubNumber=9 + +[1A00sub0] +ParameterName=Number of Entries +ObjectType=0x7 +DataType=0x0005 +AccessType=rw +DefaultValue=8 +PDOMapping=0 + +[1A00sub1] +ParameterName=PDO 1 Mapping for a process data variable 1 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A00sub2] +ParameterName=PDO 1 Mapping for a process data variable 2 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A00sub3] +ParameterName=PDO 1 Mapping for a process data variable 3 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A00sub4] +ParameterName=PDO 1 Mapping for a process data variable 4 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A00sub5] +ParameterName=PDO 1 Mapping for a process data variable 5 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A00sub6] +ParameterName=PDO 1 Mapping for a process data variable 6 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A00sub7] +ParameterName=PDO 1 Mapping for a process data variable 7 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A00sub8] +ParameterName=PDO 1 Mapping for a process data variable 8 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A01] +ParameterName=Transmit PDO 2 Mapping +ObjectType=0x9 +SubNumber=9 + +[1A01sub0] +ParameterName=Number of Entries +ObjectType=0x7 +DataType=0x0005 +AccessType=rw +DefaultValue=8 +PDOMapping=0 + +[1A01sub1] +ParameterName=PDO 2 Mapping for a process data variable 1 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A01sub2] +ParameterName=PDO 2 Mapping for a process data variable 2 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A01sub3] +ParameterName=PDO 2 Mapping for a process data variable 3 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A01sub4] +ParameterName=PDO 2 Mapping for a process data variable 4 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A01sub5] +ParameterName=PDO 2 Mapping for a process data variable 5 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A01sub6] +ParameterName=PDO 2 Mapping for a process data variable 6 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A01sub7] +ParameterName=PDO 2 Mapping for a process data variable 7 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A01sub8] +ParameterName=PDO 2 Mapping for a process data variable 8 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A02] +ParameterName=Transmit PDO 3 Mapping +ObjectType=0x9 +SubNumber=9 + +[1A02sub0] +ParameterName=Number of Entries +ObjectType=0x7 +DataType=0x0005 +AccessType=rw +DefaultValue=8 +PDOMapping=0 + +[1A02sub1] +ParameterName=PDO 3 Mapping for a process data variable 1 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A02sub2] +ParameterName=PDO 3 Mapping for a process data variable 2 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A02sub3] +ParameterName=PDO 3 Mapping for a process data variable 3 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A02sub4] +ParameterName=PDO 3 Mapping for a process data variable 4 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A02sub5] +ParameterName=PDO 3 Mapping for a process data variable 5 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A02sub6] +ParameterName=PDO 3 Mapping for a process data variable 6 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A02sub7] +ParameterName=PDO 3 Mapping for a process data variable 7 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A02sub8] +ParameterName=PDO 3 Mapping for a process data variable 8 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A03] +ParameterName=Transmit PDO 4 Mapping +ObjectType=0x9 +SubNumber=9 + +[1A03sub0] +ParameterName=Number of Entries +ObjectType=0x7 +DataType=0x0005 +AccessType=rw +DefaultValue=8 +PDOMapping=0 + +[1A03sub1] +ParameterName=PDO 4 Mapping for a process data variable 1 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A03sub2] +ParameterName=PDO 4 Mapping for a process data variable 2 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A03sub3] +ParameterName=PDO 4 Mapping for a process data variable 3 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A03sub4] +ParameterName=PDO 4 Mapping for a process data variable 4 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A03sub5] +ParameterName=PDO 4 Mapping for a process data variable 5 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A03sub6] +ParameterName=PDO 4 Mapping for a process data variable 6 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A03sub7] +ParameterName=PDO 4 Mapping for a process data variable 7 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +PDOMapping=0 + +[1A03sub8] +ParameterName=PDO 4 Mapping for a process data variable 8 +ObjectType=0x7 +DataType=0x0007 +AccessType=rw +DefaultValue=0 +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 092e33606e51 -r 8261c8f1e365 tests/canopen_master/canopen@canfestival/master@CanOpenNode/master.od --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/canopen_master/canopen@canfestival/master@CanOpenNode/master.od Thu Oct 08 11:26:40 2009 +0200 @@ -0,0 +1,224 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff -r 092e33606e51 -r 8261c8f1e365 tests/canopen_master/canopen@canfestival/master@CanOpenNode/nodelist.cpj --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/canopen_master/canopen@canfestival/master@CanOpenNode/nodelist.cpj Thu Oct 08 11:26:40 2009 +0200 @@ -0,0 +1,7 @@ +[TOPOLOGY] +NetName=None +Nodes=0x01 +Node2Present=0x01 +Node2Name=SlaveNode +Node2DCFName=Slave_0_0.eds +EDSBaseName=eds diff -r 092e33606e51 -r 8261c8f1e365 tests/canopen_master/canopen@canfestival/master@CanOpenNode/plugin.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/canopen_master/canopen@canfestival/master@CanOpenNode/plugin.xml Thu Oct 08 11:26:40 2009 +0200 @@ -0,0 +1,2 @@ + + diff -r 092e33606e51 -r 8261c8f1e365 tests/canopen_master/canopen@canfestival/plugin.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/canopen_master/canopen@canfestival/plugin.xml Thu Oct 08 11:26:40 2009 +0200 @@ -0,0 +1,2 @@ + + diff -r 092e33606e51 -r 8261c8f1e365 tests/canopen_master/plc.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/canopen_master/plc.xml Thu Oct 08 11:26:40 2009 +0200 @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLC_OUT + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PLC_IN + + + + + + + + + + + + + + + + + + diff -r 092e33606e51 -r 8261c8f1e365 tests/canopen_slave/beremiz.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/canopen_slave/beremiz.xml Thu Oct 08 11:26:40 2009 +0200 @@ -0,0 +1,6 @@ + + + + + + diff -r 092e33606e51 -r 8261c8f1e365 tests/canopen_slave/canopen@canfestival/baseplugin.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/canopen_slave/canopen@canfestival/baseplugin.xml Thu Oct 08 11:26:40 2009 +0200 @@ -0,0 +1,2 @@ + + diff -r 092e33606e51 -r 8261c8f1e365 tests/canopen_slave/canopen@canfestival/plugin.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/canopen_slave/canopen@canfestival/plugin.xml Thu Oct 08 11:26:40 2009 +0200 @@ -0,0 +1,2 @@ + + diff -r 092e33606e51 -r 8261c8f1e365 tests/canopen_slave/canopen@canfestival/slave@CanOpenSlave/baseplugin.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/canopen_slave/canopen@canfestival/slave@CanOpenSlave/baseplugin.xml Thu Oct 08 11:26:40 2009 +0200 @@ -0,0 +1,2 @@ + + diff -r 092e33606e51 -r 8261c8f1e365 tests/canopen_slave/canopen@canfestival/slave@CanOpenSlave/plugin.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/canopen_slave/canopen@canfestival/slave@CanOpenSlave/plugin.xml Thu Oct 08 11:26:40 2009 +0200 @@ -0,0 +1,2 @@ + + diff -r 092e33606e51 -r 8261c8f1e365 tests/canopen_slave/canopen@canfestival/slave@CanOpenSlave/slave.eds --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/canopen_slave/canopen@canfestival/slave@CanOpenSlave/slave.eds Thu Oct 08 11:26:40 2009 +0200 @@ -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 092e33606e51 -r 8261c8f1e365 tests/canopen_slave/canopen@canfestival/slave@CanOpenSlave/slave.od --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/canopen_slave/canopen@canfestival/slave@CanOpenSlave/slave.od Thu Oct 08 11:26:40 2009 +0200 @@ -0,0 +1,317 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + OutVar + + + + + + + OutVar + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + InVar + + + + + + + InVar + + + + + + + + + + + + + + + diff -r 092e33606e51 -r 8261c8f1e365 tests/canopen_slave/plc.xml --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/canopen_slave/plc.xml Thu Oct 08 11:26:40 2009 +0200 @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + outvar + + + + + + + 1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + invar + + + + + + + + + + + + + + + + + + diff -r 092e33606e51 -r 8261c8f1e365 tests/linux/autom_ihm_rmll/.cvsignore --- a/tests/linux/autom_ihm_rmll/.cvsignore Thu Oct 08 11:09:01 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,1 +0,0 @@ -build diff -r 092e33606e51 -r 8261c8f1e365 tests/linux/autom_ihm_rmll/CFileTest@c_ext/File1@C_File/baseplugin.xml --- a/tests/linux/autom_ihm_rmll/CFileTest@c_ext/File1@C_File/baseplugin.xml Thu Oct 08 11:09:01 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ - - diff -r 092e33606e51 -r 8261c8f1e365 tests/linux/autom_ihm_rmll/CFileTest@c_ext/File1@C_File/cfile.xml --- a/tests/linux/autom_ihm_rmll/CFileTest@c_ext/File1@C_File/cfile.xml Thu Oct 08 11:09:01 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,22 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - diff -r 092e33606e51 -r 8261c8f1e365 tests/linux/autom_ihm_rmll/CFileTest@c_ext/File1@C_File/plugin.xml --- a/tests/linux/autom_ihm_rmll/CFileTest@c_ext/File1@C_File/plugin.xml Thu Oct 08 11:09:01 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ - - diff -r 092e33606e51 -r 8261c8f1e365 tests/linux/autom_ihm_rmll/CFileTest@c_ext/baseplugin.xml --- a/tests/linux/autom_ihm_rmll/CFileTest@c_ext/baseplugin.xml Thu Oct 08 11:09:01 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ - - diff -r 092e33606e51 -r 8261c8f1e365 tests/linux/autom_ihm_rmll/beremiz.xml --- a/tests/linux/autom_ihm_rmll/beremiz.xml Thu Oct 08 11:09:01 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - - - - - diff -r 092e33606e51 -r 8261c8f1e365 tests/linux/autom_ihm_rmll/canopen@canfestival/baseplugin.xml --- a/tests/linux/autom_ihm_rmll/canopen@canfestival/baseplugin.xml Thu Oct 08 11:09:01 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ - - diff -r 092e33606e51 -r 8261c8f1e365 tests/linux/autom_ihm_rmll/canopen@canfestival/master@CanOpenNode/baseplugin.xml --- a/tests/linux/autom_ihm_rmll/canopen@canfestival/master@CanOpenNode/baseplugin.xml Thu Oct 08 11:09:01 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ - - diff -r 092e33606e51 -r 8261c8f1e365 tests/linux/autom_ihm_rmll/canopen@canfestival/master@CanOpenNode/eds/Slave_2_0.eds --- a/tests/linux/autom_ihm_rmll/canopen@canfestival/master@CanOpenNode/eds/Slave_2_0.eds Thu Oct 08 11:09:01 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,214 +0,0 @@ -[FileInfo] -FileName=Slave_2_0.eds -FileVersion=1 -FileRevision=1 -EDSVersion=4.0 -Description= -CreationTime=04:36PM -CreationDate=07-25-2008 -CreatedBy=CANFestival -ModificationTime=04:36PM -ModificationDate=07-25-2008 -ModifiedBy=CANFestival - -[DeviceInfo] -VendorName=CANFestival -VendorNumber=0x00000000 -ProductName=OD_2_0 -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=2 -1=0x1017 -2=0x1200 - -[1017] -ParameterName=Producer Heartbeat Time -ObjectType=0x7 -DataType=0x0006 -AccessType=rw -DefaultValue=0 -PDOMapping=0 - -[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=6 -1=0x2000 -2=0x2001 -3=0x2002 -4=0x2003 -5=0x2004 -6=0x2005 - -[2000] -ParameterName=pump -ObjectType=0x7 -DataType=0x0001 -AccessType=rw -DefaultValue=0 -PDOMapping=1 - -[2001] -ParameterName=sink -ObjectType=0x7 -DataType=0x0001 -AccessType=rw -DefaultValue=0 -PDOMapping=1 - -[2002] -ParameterName=full -ObjectType=0x7 -DataType=0x0001 -AccessType=rw -DefaultValue=0 -PDOMapping=1 - -[2003] -ParameterName=empty -ObjectType=0x7 -DataType=0x0001 -AccessType=rw -DefaultValue=0 -PDOMapping=1 - -[2004] -ParameterName=gauge -ObjectType=0x7 -DataType=0x0003 -AccessType=rw -DefaultValue=0 -PDOMapping=1 - -[2005] -ParameterName=test64 -ObjectType=0x7 -DataType=0x0015 -AccessType=rw -DefaultValue=0 -PDOMapping=1 diff -r 092e33606e51 -r 8261c8f1e365 tests/linux/autom_ihm_rmll/canopen@canfestival/master@CanOpenNode/master.od --- a/tests/linux/autom_ihm_rmll/canopen@canfestival/master@CanOpenNode/master.od Thu Oct 08 11:09:01 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,224 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff -r 092e33606e51 -r 8261c8f1e365 tests/linux/autom_ihm_rmll/canopen@canfestival/master@CanOpenNode/nodelist.cpj --- a/tests/linux/autom_ihm_rmll/canopen@canfestival/master@CanOpenNode/nodelist.cpj Thu Oct 08 11:09:01 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,7 +0,0 @@ -[TOPOLOGY] -NetName=None -Nodes=0x01 -Node3Present=0x01 -Node3Name=MySlave -Node3DCFName=Slave_2_0.eds -EDSBaseName=eds diff -r 092e33606e51 -r 8261c8f1e365 tests/linux/autom_ihm_rmll/canopen@canfestival/master@CanOpenNode/plugin.xml --- a/tests/linux/autom_ihm_rmll/canopen@canfestival/master@CanOpenNode/plugin.xml Thu Oct 08 11:09:01 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ - - diff -r 092e33606e51 -r 8261c8f1e365 tests/linux/autom_ihm_rmll/canopen@canfestival/plugin.xml --- a/tests/linux/autom_ihm_rmll/canopen@canfestival/plugin.xml Thu Oct 08 11:09:01 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ - - diff -r 092e33606e51 -r 8261c8f1e365 tests/linux/autom_ihm_rmll/ihm@svgui/baseplugin.xml --- a/tests/linux/autom_ihm_rmll/ihm@svgui/baseplugin.xml Thu Oct 08 11:09:01 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,2 +0,0 @@ - - diff -r 092e33606e51 -r 8261c8f1e365 tests/linux/autom_ihm_rmll/ihm@svgui/gui.svg --- a/tests/linux/autom_ihm_rmll/ihm@svgui/gui.svg Thu Oct 08 11:09:01 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,805 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - Remplir - Remplir - - - - Vider - Vider - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - IHM - 0 - 50 - 100 - - - - - - diff -r 092e33606e51 -r 8261c8f1e365 tests/linux/autom_ihm_rmll/ihm@svgui/gui.xml --- a/tests/linux/autom_ihm_rmll/ihm@svgui/gui.xml Thu Oct 08 11:09:01 2009 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,6 +0,0 @@ - - -