beremiz: comparison etherlab/CommonEtherCATFunction.py

equal deleted inserted replaced

-:43ab74687f45
+:6ea6d83e7280
 #Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 import os
 import wx
+mailbox_protocols =  ["AoE", "EoE", "CoE", "FoE", "SoE", "VoE"]
 def ExtractHexDecValue(value):
 """
 convert numerical value in string format into decimal or hex format.
 @param value : hex or decimal data
 type_infos = slave.getType()
 device, alignment = self.Controler.CTNParent.GetModuleInfos(type_infos)
 # 'device' represents current slave device selected by user
 if device is not None:
-for eeprom_element in device.getEeprom().getcontent()["value"]:
+for eeprom_element in device.getEeprom().getcontent():
 # get EEPROM size; <Device>-<Eeprom>-<ByteSize>
 if eeprom_element["name"] == "ByteSize":
-smartview_infos["eeprom_size"] = eeprom_element["value"]
+smartview_infos["eeprom_size"] = eeprom_element
 elif eeprom_element["name"] == "ConfigData":
-configData_data = self.DecimalToHex(eeprom_element["value"])
+configData_data = self.DecimalToHex(eeprom_element)
 # get PDI type; <Device>-<Eeprom>-<ConfigData> address 0x00
 smartview_infos["pdi_type"] = int(configData_data[0:2], 16)
 # get state of device emulation; <Device>-<Eeprom>-<ConfigData> address 0x01
 if "{:0>8b}".format(int(configData_data[2:4], 16))[7] == '1':
 smartview_infos["device_emulation"] = "True"
 elif eeprom_element["name"] == "BootStrap":
-bootstrap_data = "{:0>16x}".format(eeprom_element["value"])
+bootstrap_data = "{:0>16x}".format(eeprom_element)
 # get bootstrap configuration; <Device>-<Eeprom>-<BootStrap>
 for cfg, iter in [("mailbox_bootstrapconf_outstart", 0),
 ("mailbox_bootstrapconf_outlength", 1),
 ("mailbox_bootstrapconf_instart", 2),
 ("mailbox_bootstrapconf_inlength", 3)]:
 smartview_infos[cfg] = str(int(bootstrap_data[4*iter+2:4*(iter+1)]+bootstrap_data[4*iter:4*iter+2], 16))
 # get protocol (profile) types supported by mailbox; <Device>-<Mailbox>
-for mailbox_protocol in ["VoE", "SoE", "FoE", "CoE", "EoE", "AoE"]:
+mb = device.getMailbox()
-if eval("device.getMailbox().get%s()"%mailbox_protocol) is not None:
+if mb is not None:
-smartview_infos["supported_mailbox"] += "%s,  "%mailbox_protocol
+for mailbox_protocol in mailbox_protocols:
+if getattr(mb,"get%s"%mailbox_protocol)() is not None:
+smartview_infos["supported_mailbox"] += "%s,  "%mailbox_protocol
 smartview_infos["supported_mailbox"] = smartview_infos["supported_mailbox"].strip(",  ")
 # get standard configuration of mailbox; <Device>-<Sm>
 for sm_element in device.getSm():
 if sm_element.getcontent() == "MBoxOut":
 type_infos = slave.getType()
 device, alignment = self.Controler.CTNParent.GetModuleInfos(type_infos)
 if device is not None:
 # get ConfigData for EEPROM offset 0x0000-0x000d; <Device>-<Eeprom>-<ConfigData>
-for eeprom_element in device.getEeprom().getcontent()["value"]:
+for eeprom_element in device.getEeprom().getcontent():
 if eeprom_element["name"] == "ConfigData":
-data = self.DecimalToHex(eeprom_element["value"])
+data = self.DecimalToHex(eeprom_element)
 eeprom += self.GenerateEEPROMList(data, 0, 28)
 # calculate CRC for EEPROM offset 0x000e-0x000f
 crc = 0x48
 for segment in eeprom:
 eeprom.append("00")
 eeprom.append("00")
 # get BootStrap for EEPROM offset 0x0028-0x002e; <Device>-<Eeprom>-<BootStrap>
 data = ""
-for eeprom_element in device.getEeprom().getcontent()["value"]:
+for eeprom_element in device.getEeprom().getcontent():
 if eeprom_element["name"] == "BootStrap":
-data = "{:0>16x}".format(eeprom_element["value"])
+data = "{:0>16x}".format(eeprom_element)
 eeprom += self.GenerateEEPROMList(data, 0, 16)
 # get Standard Mailbox for EEPROM offset 0x0030-0x0037; <Device>-<sm>
 data = ""
+standard_send_mailbox_offset = None
+standard_send_mailbox_size = None
+standard_receive_mailbox_offset = None
+standard_receive_mailbox_size = None
 for sm_element in device.getSm():
 if sm_element.getcontent() == "MBoxOut":
 standard_receive_mailbox_offset = "{:0>4x}".format(ExtractHexDecValue(sm_element.getStartAddress()))
 standard_receive_mailbox_size = "{:0>4x}".format(ExtractHexDecValue(sm_element.getDefaultSize()))
 elif sm_element.getcontent() == "MBoxIn":
 eeprom.append(standard_send_mailbox_size[2:4])
 eeprom.append(standard_send_mailbox_size[0:2])
 # get supported mailbox protocols for EEPROM offset 0x0038-0x0039;
 data = 0
-for mbox, bit in [(device.getMailbox().getAoE(), 0),
+mb = device.getMailbox()
-(device.getMailbox().getEoE(), 1),
+if mb is not None :
-(device.getMailbox().getCoE(), 2),
+for bit,mbprot in enumerate(mailbox_protocols):
-(device.getMailbox().getFoE(), 3),
+if getattr(mb,"get%s"%mbprot)() is not None:
-(device.getMailbox().getSoE(), 4),
+data += 1<<bit
-(device.getMailbox().getVoE(), 5)]:
-if mbox is not None:
-data += 1<<bit
 data = "{:0>4x}".format(data)
 eeprom.append(data[2:4])
 eeprom.append(data[0:2])
 # resereved for EEPROM offset 0x003a-0x007b;
 for i in range(0x007b-0x003a+0x0001):
 eeprom.append("00")
 # get EEPROM size for EEPROM offset 0x007c-0x007d;
 data = ""
-for eeprom_element in device.getEeprom().getcontent()["value"]:
+for eeprom_element in device.getEeprom().getcontent():
 if eeprom_element["name"] == "ByteSize":
-eeprom_size = int(str(eeprom_element["value"]))
+eeprom_size = int(str(eeprom_element))
-data = "{:0>4x}".format(int(eeprom_element["value"])/1024*8-1)
+data = "{:0>4x}".format(int(eeprom_element)/1024*8-1)
 if data == "":
 eeprom.append("00")
 eeprom.append("00")
 else:
 vendor_specific_data += "{:0>2x}".format(ord(data[character]))
 data = ""
 #  element5-1; <EtherCATInfo>-<Descriptions>-<Devices>-<Device>-<Image16x14>
 if device.getcontent() is not None:
-data = device.getcontent()["value"]
+data = device.getcontent()
 if data is not None and type(data) == unicode:
 for vendor_spec_string in vendor_spec_strings:
 if data == vendor_spec_string:
 self.ImgIdx = vendor_spec_strings.index(data)+1
 imageflag = True
 if self.Controler.CTNParent.CTNParent.ModulesLibrary.Library is not None:
 for vendor_id, vendor in self.Controler.CTNParent.CTNParent.ModulesLibrary.Library.iteritems():
 for group_type, group_etc in vendor["groups"].iteritems():
 for device_item in group_etc["devices"]:
 if device == device_item[1]:
-data = group_etc["value"]
+data = group_etc
 if data is not None and type(data) == unicode:
 for vendor_spec_string in vendor_spec_strings:
 if data == vendor_spec_string:
 self.ImgIdx = vendor_spec_strings.index(data)+1
 imageflag = True
 # word 3 : Physical Layer Port info. and CoE Details
 eeprom.append("01") # Physical Layer Port info - assume 01
 #  CoE Details; <EtherCATInfo>-<Descriptions>-<Devices>-<Device>-<Mailbox>-<CoE>
 coe_details = 0
-if device.getMailbox().getCoE() is not None:
+mb = device.getMailbox()
 coe_details = 1 # sdo enabled
-for attr, bit in [(device.getMailbox().getCoE().getSdoInfo(), 1),
+if mb is not None :
-(device.getMailbox().getCoE().getPdoAssign(), 2),
+coe = mb.getCoE()
-(device.getMailbox().getCoE().getPdoConfig(), 3),
+if coe is not None:
-(device.getMailbox().getCoE().getPdoUpload(), 4),
+for bit,flag in enumerate(["SdoInfo", "PdoAssign", "PdoConfig",
-(device.getMailbox().getCoE().getCompleteAccess(), 5)]:
+"PdoUpload", "CompleteAccess"]):
-if attr==1 or attr==True:
+if getattr(coe,"get%s"%flag)() is not None:
 coe_details += 1<<bit
 eeprom.append("{:0>2x}".format(coe_details))
 # word 4 : FoE Details and EoE Details
 #  FoE Details; <EtherCATInfo>-<Descriptions>-<Devices>-<Device>-<Mailbox>-<FoE>
-if device.getMailbox().getFoE() is not None:
+if mb is not None and mb.getFoE() is not None:
 eeprom.append("01")
 else:
 eeprom.append("00")
 #  EoE Details; <EtherCATInfo>-<Descriptions>-<Devices>-<Device>-<Mailbox>-<EoE>
-if device.getMailbox().getEoE() is not None:
+if mb is not None and mb.getEoE() is not None:
 eeprom.append("01")
 else:
 eeprom.append("00")
 # word 5 : SoE Channels(reserved) and DS402 Channels
 #  SoE Details; <EtherCATInfo>-<Descriptions>-<Devices>-<Device>-<Mailbox>-<SoE>
-if device.getMailbox().getSoE() is not None:
+if mb is not None and mb.getSoE() is not None:
 eeprom.append("01")
 else:
 eeprom.append("00")
 #  DS402Channels; <EtherCATInfo>-<Descriptions>-<Devices>-<Device>-<Mailbox>-<CoE>: DS402Channels
-if device.getMailbox().getCoE().getDS402Channels() == True \
+ds402ch = False
-or device.getMailbox().getCoE().getDS402Channels() == 1:
+if mb is not None :
-eeprom.append("01")
+coe = mb.getCoE()
-else:
+if coe is not None :
-eeprom.append("00")
+ds402ch = coe.getDS402Channels()
+eeprom.append("01" if ds402ch in [True,1] else "00")
 # word 6 : SysmanClass(reserved) and Flags
 eeprom.append("00") # reserved
 #  Flags
 en_safeop = False

changeset 2163	6ea6d83e7280
parent 2152	e6946c298a42
child 2165	02a2b5dee5e3