beremiz: comparison etherlab/CommonEtherCATFunction.py

equal deleted inserted replaced

-:2a70d5240300
+:21164625b393
 # Copyright (C) 2013: Real-Time & Embedded Systems (RTES) Lab. University of Seoul, Korea
 #
 # See COPYING file for copyrights details.
 from __future__ import absolute_import
+from __future__ import division
+from builtins import str as text
+import codecs
 import wx
 mailbox_protocols = ["AoE", "EoE", "CoE", "FoE", "SoE", "VoE"]
 def ExtractHexDecValue(value):
 """
 Constructor
 @param controler: _EthercatSlaveCTN class in EthercatSlave.py
 """
 self.Controler = controler
+self.HexDecode = codecs.getdecoder("hex_codec")
 self.ClearSDODataSet()
 # -------------------------------------------------------------------------------
 #                        Used Master State
 # -------------------------------------------------------------------------------
 value = "%x" % decnum
 value_len = len(value)
 if (value_len % 2) == 0:
 hex_len = value_len
 else:
-hex_len = (value_len / 2) * 2 + 2
+hex_len = (value_len // 2) * 2 + 2
 hex_data = ("{:0>"+str(hex_len)+"x}").format(decnum)
 return hex_data
 self.BinaryCode = return_val
 self.Controler.SiiData = self.BinaryCode
 # append zero-filled padding data up to EEPROM size
 for dummy in range(self.SmartViewInfosFromXML["eeprom_size"] - len(self.BinaryCode)):
-self.BinaryCode = self.BinaryCode + 'ff'.decode('hex')
+self.BinaryCode = self.BinaryCode + self.HexDecode('ff')[0]
 return self.BinaryCode
 def HexRead(self, binary):
 """
 @return eeprom_list : reconstructed list data structure
 """
 eeprom_list = []
 if direction is 0 or 1:
-for dummy in range(length/2):
+for dummy in range(length//2):
 if data == "":
 eeprom_list.append("00")
 else:
 eeprom_list.append(data[direction*(length-2):direction*(length-2)+2])
 data = data[(1-direction)*2:length-direction*2]
 # get EEPROM size for EEPROM offset 0x007c-0x007d;
 data = ""
 for eeprom_element in device.getEeprom().getcontent():
 if eeprom_element["name"] == "ByteSize":
 eeprom_size = int(str(eeprom_element))
-data = "{:0>4x}".format(int(eeprom_element)/1024*8-1)
+data = "{:0>4x}".format(int(eeprom_element)//1024*8-1)
 if data == "":
 eeprom.append("00")
 eeprom.append("00")
 else:
 for i in range(padding):
 eeprom.append("ff")
 # convert binary code
 for index in range(eeprom_size):
-eeprom_binary = eeprom_binary + eeprom[index].decode('hex')
+eeprom_binary = eeprom_binary + self.HexDecode(eeprom[index])[0]
 return eeprom_binary
 def ExtractEEPROMStringCategory(self, device):
 """
 vendor_specific_data = ""
 #   vendor_spec_strings : list of vendor specific "strings" for preventing duplicated strings
 vendor_spec_strings = []
 for element in device.getType().getcontent():
 data += element
-if data != "" and isinstance(data, unicode):
+if data != "" and isinstance(data, text):
 for vendor_spec_string in vendor_spec_strings:
 if data == vendor_spec_string:
 self.OrderIdx = vendor_spec_strings.index(data)+1
 typeflag = True
 break
 vendor_specific_data += "{:0>2x}".format(ord(data[character]))
 data = ""
 #  element2-1; <EtherCATInfo>-<Descriptions>-<Devices>-<Device>-<GroupType>
 data = device.getGroupType()
-if data is not None and isinstance(data, unicode):
+if data is not None and isinstance(data, text):
 for vendor_spec_string in vendor_spec_strings:
 if data == vendor_spec_string:
 self.GroupIdx = vendor_spec_strings.index(data)+1
 grouptypeflag = True
 break
 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_type
-if data is not None and isinstance(data, unicode):
+if data is not None and isinstance(data, text):
 for vendor_spec_string in vendor_spec_strings:
 if data == vendor_spec_string:
 self.GroupIdx = vendor_spec_strings.index(data)+1
 grouptypeflag = True
 break
 for _vendorId, 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["name"]
-if data != "" and isinstance(data, unicode):
+if data != "" and isinstance(data, text):
 for vendor_spec_string in vendor_spec_strings:
 if data == vendor_spec_string:
 groupnameflag = True
 break
 if groupnameflag is False:
 #  element4; <EtherCATInfo>-<Descriptions>-<Devices>-<Device>-<Name(LcId is "1033" or "1"?)>
 for element in device.getName():
 if element.getLcId() == 1 or element.getLcId() == 1033:
 data = element.getcontent()
-if data != "" and isinstance(data, unicode):
+if data != "" and isinstance(data, text):
 for vendor_spec_string in vendor_spec_strings:
 if data == vendor_spec_string:
 self.NameIdx = vendor_spec_strings.index(data)+1
 devnameflag = True
 break
 data = ""
 #  element5-1; <EtherCATInfo>-<Descriptions>-<Devices>-<Device>-<Image16x14>
 if device.getcontent() is not None:
 data = device.getcontent()
-if data is not None and isinstance(data, unicode):
+if data is not None and isinstance(data, text):
 for vendor_spec_string in vendor_spec_strings:
 if data == vendor_spec_string:
 self.ImgIdx = vendor_spec_strings.index(data)+1
 imageflag = True
 break
 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
-if data is not None and isinstance(data, unicode):
+if data is not None and isinstance(data, text):
 for vendor_spec_string in vendor_spec_strings:
 if data == vendor_spec_string:
 self.ImgIdx = vendor_spec_strings.index(data)+1
 imageflag = True
 break
 if length % 4 == 0:
 pass
 else:
 length += length % 4
 padflag = True
-eeprom.append("{:0>4x}".format(length/4)[2:4])
+eeprom.append("{:0>4x}".format(length//4)[2:4])
-eeprom.append("{:0>4x}".format(length/4)[0:2])
+eeprom.append("{:0>4x}".format(length//4)[0:2])
 #  total numbers of strings
 eeprom.append("{:0>2x}".format(count))
 for element in [vendor_specific_data,
 dc_related_elements,
 input_elements,
 output_elements]:
-for dummy in range(len(element)/2):
+for dummy in range(len(element)//2):
 if element == "":
 eeprom.append("00")
 else:
 eeprom.append(element[0:2])
 element = element[2:len(element)]
 eeprom.append("28")
 eeprom.append("00")
 #  category length
 if count % 2 == 1:
 padflag = True
-eeprom.append("{:0>4x}".format((count+1)/2)[2:4])
+eeprom.append("{:0>4x}".format((count+1)//2)[2:4])
-eeprom.append("{:0>4x}".format((count+1)/2)[0:2])
+eeprom.append("{:0>4x}".format((count+1)//2)[0:2])
 else:
-eeprom.append("{:0>4x}".format((count)/2)[2:4])
+eeprom.append("{:0>4x}".format((count)//2)[2:4])
-eeprom.append("{:0>4x}".format((count)/2)[0:2])
+eeprom.append("{:0>4x}".format((count)//2)[0:2])
 for dummy in range(count):
 if data == "":
 eeprom.append("00")
 else:
 eeprom.append(data[0:2])
 if data != "":
 #  category header
 eeprom.append("29")
 eeprom.append("00")
 #  category length
-eeprom.append("{:0>4x}".format(len(data)/4)[2:4])
+eeprom.append("{:0>4x}".format(len(data)//4)[2:4])
-eeprom.append("{:0>4x}".format(len(data)/4)[0:2])
+eeprom.append("{:0>4x}".format(len(data)//4)[0:2])
-for dummy in range(len(data)/2):
+for dummy in range(len(data)//2):
 if data == "":
 eeprom.append("00")
 else:
 eeprom.append(data[0:2])
 data = data[2:len(data)]
 eeprom.append("33")
 else:
 eeprom.append("00")
 eeprom.append("00")
 #  category length
-eeprom.append("{:0>4x}".format(len(data)/4)[2:4])
+eeprom.append("{:0>4x}".format(len(data)//4)[2:4])
-eeprom.append("{:0>4x}".format(len(data)/4)[0:2])
+eeprom.append("{:0>4x}".format(len(data)//4)[0:2])
 data = str(data.lower())
-for dummy in range(len(data)/2):
+for dummy in range(len(data)//2):
 if data == "":
 eeprom.append("00")
 else:
 eeprom.append(data[0:2])
 data = data[2:len(data)]
 if data != "":
 #  category header
 eeprom.append("3c")
 eeprom.append("00")
 #  category length
-eeprom.append("{:0>4x}".format(len(data)/4)[2:4])
+eeprom.append("{:0>4x}".format(len(data)//4)[2:4])
-eeprom.append("{:0>4x}".format(len(data)/4)[0:2])
+eeprom.append("{:0>4x}".format(len(data)//4)[0:2])
 data = str(data.lower())
-for dummy in range(len(data)/2):
+for dummy in range(len(data)//2):
 if data == "":
 eeprom.append("00")
 else:
 eeprom.append(data[0:2])
 data = data[2:len(data)]

changeset 2459	21164625b393
parent 2446	922f0d84f869
child 2643	b98d9e08231f