# HG changeset patch # User Andrey Skvortsov # Date 1538151146 -10800 # Node ID bc07b9910cdb429c043b60466d3306ec13c6968f # Parent 4ea781f305558282d4ea075af16eb72e2907784d cleanup etherlab: pep8, E225 missing whitespace around operator diff -r 4ea781f30555 -r bc07b9910cdb etherlab/CommonEtherCATFunction.py --- a/etherlab/CommonEtherCATFunction.py Fri Sep 28 19:06:28 2018 +0300 +++ b/etherlab/CommonEtherCATFunction.py Fri Sep 28 19:12:26 2018 +0300 @@ -582,7 +582,7 @@ # append zero-filled padding data up to EEPROM size for index in range(self.SmartViewInfosFromXML["eeprom_size"] - len(self.BinaryCode)): - self.BinaryCode = self.BinaryCode +'ff'.decode('hex') + self.BinaryCode = self.BinaryCode + 'ff'.decode('hex') return self.BinaryCode @@ -611,7 +611,7 @@ tempvar2 = "0" + tempvar2 row_code.append(tempvar2) - if int(digithexstr, 16)>=32 and int(digithexstr, 16)<=126: + if int(digithexstr, 16) >= 32 and int(digithexstr, 16) <= 126: row_text = row_text + chr(int(digithexstr, 16)) else: row_text = row_text + "." @@ -973,7 +973,7 @@ # element4; ---- for element in device.getName(): - if element.getLcId() == 1 or element.getLcId()==1033: + if element.getLcId() == 1 or element.getLcId() == 1033: data = element.getcontent() if data is not "" and type(data) == unicode: for vendor_spec_string in vendor_spec_strings: @@ -1125,7 +1125,7 @@ if length % 4 == 0: pass else: - length +=length % 4 + length += length % 4 padflag = True eeprom.append("{:0>4x}".format(length/4)[2:4]) eeprom.append("{:0>4x}".format(length/4)[0:2]) diff -r 4ea781f30555 -r bc07b9910cdb etherlab/EtherCATManagementEditor.py --- a/etherlab/EtherCATManagementEditor.py Fri Sep 28 19:06:28 2018 +0300 +++ b/etherlab/EtherCATManagementEditor.py Fri Sep 28 19:12:26 2018 +0300 @@ -604,7 +604,7 @@ if check[3:4] == 'w' : self.Controler.CommonMethod.Check_SAFEOP = True write_flag = True - if check[5:] =='w' : + if check[5:] == 'w' : self.Controler.CommonMethod.Check_OP = True write_flag = True @@ -1050,34 +1050,35 @@ Set data based on slave EEPROM. """ # sii_dict = { Parameter : (WordAddress, WordSize) } - sii_dict= { 'PDIControl' : ( '0', 1), - 'PDIConfiguration' : ( '1', 1), - 'PulseLengthOfSYNCSignals' : ( '2', 1), - 'ExtendedPDIConfiguration' : ( '3', 1), - 'ConfiguredStationAlias' : ( '4', 1), - 'Checksum' : ( '7', 1), - 'VendorID' : ( '8', 2), - 'ProductCode' : ( 'a', 2), - 'RevisionNumber' : ( 'c', 2), - 'SerialNumber' : ( 'e', 2), - 'Execution Delay' : ('10', 1), - 'Port0Delay' : ('11', 1), - 'Port1Delay' : ('12', 1), - 'BootstrapReceiveMailboxOffset' : ('14', 1), - 'BootstrapReceiveMailboxSize' : ('15', 1), - 'BootstrapSendMailboxOffset' : ('16', 1), - 'BootstrapSendMailboxSize' : ('17', 1), - 'StandardReceiveMailboxOffset' : ('18', 1), - 'StandardReceiveMailboxSize' : ('19', 1), - 'StandardSendMailboxOffset' : ('1a', 1), - 'StandardSendMailboxSize' : ('1b', 1), - 'MailboxProtocol' : ('1c', 1), - 'Size' : ('3e', 1), - 'Version' : ('3f', 1), - 'First Category Type/Vendor Specific' : ('40', 1), - 'Following Category Word Size' : ('41', 1), - 'Category Data' : ('42', 1), - } + sii_dict = { + 'PDIControl' : ( '0', 1), + 'PDIConfiguration' : ( '1', 1), + 'PulseLengthOfSYNCSignals' : ( '2', 1), + 'ExtendedPDIConfiguration' : ( '3', 1), + 'ConfiguredStationAlias' : ( '4', 1), + 'Checksum' : ( '7', 1), + 'VendorID' : ( '8', 2), + 'ProductCode' : ( 'a', 2), + 'RevisionNumber' : ( 'c', 2), + 'SerialNumber' : ( 'e', 2), + 'Execution Delay' : ('10', 1), + 'Port0Delay' : ('11', 1), + 'Port1Delay' : ('12', 1), + 'BootstrapReceiveMailboxOffset' : ('14', 1), + 'BootstrapReceiveMailboxSize' : ('15', 1), + 'BootstrapSendMailboxOffset' : ('16', 1), + 'BootstrapSendMailboxSize' : ('17', 1), + 'StandardReceiveMailboxOffset' : ('18', 1), + 'StandardReceiveMailboxSize' : ('19', 1), + 'StandardSendMailboxOffset' : ('1a', 1), + 'StandardSendMailboxSize' : ('1b', 1), + 'MailboxProtocol' : ('1c', 1), + 'Size' : ('3e', 1), + 'Version' : ('3f', 1), + 'First Category Type/Vendor Specific' : ('40', 1), + 'Following Category Word Size' : ('41', 1), + 'Category Data' : ('42', 1), + } # Config Data: EEPROM Size, PDI Type, Device Emulation # EEPROM's data in address '0x003f' is Size of EEPROM in KBit-1 @@ -1110,7 +1111,7 @@ # each value of mailbox protocol : # VoE(0x0020), SoE(0x0010), FoE(0x0008), CoE(0x0004), EoE(0x0002), AoE(0x0001) supported_mailbox = "" - mailbox_protocol=["VoE, ", "SoE, ", "FoE, ", "CoE, ", "EoE, ", "AoE, "] + mailbox_protocol = ["VoE, ", "SoE, ", "FoE, ", "CoE, ", "EoE, ", "AoE, "] mailbox_data = "{:0>8b}".format(int(self.GetWordAddressData( sii_dict.get('MailboxProtocol'), 16 ), 16)) for protocol in range(6): if mailbox_data[protocol+2] == '1': @@ -1188,10 +1189,10 @@ self.Tree = wx.gizmos.TreeListCtrl(self, -1, size=(350, 500), style=wx.TR_DEFAULT_STYLE - |wx.TR_FULL_ROW_HIGHLIGHT - |wx.TR_HIDE_ROOT - |wx.TR_COLUMN_LINES - |wx.TR_ROW_LINES) + | wx.TR_FULL_ROW_HIGHLIGHT + | wx.TR_HIDE_ROOT + | wx.TR_COLUMN_LINES + | wx.TR_ROW_LINES) self.Tree.AddColumn("Description", width=200) self.Tree.AddColumn("Value", width=140) @@ -1702,7 +1703,7 @@ # append ASCII value char_data = "" for iter in range(2): - if int(reg_word[iter*2:iter*2+2], 16)>=32 and int(reg_word[iter*2:iter*2+2], 16)<=126: + if int(reg_word[iter*2:iter*2+2], 16) >= 32 and int(reg_word[iter*2:iter*2+2], 16) <= 126: char_data = char_data + chr(int(reg_word[iter*2:iter*2+2], 16)) else: char_data = char_data + "." @@ -1743,7 +1744,7 @@ # If "Compact View" Checkbox is True ## 'event' is argument of this method or event of checkbox. - if event==True or event.GetEventObject().GetValue(): + if event == True or event.GetEventObject().GetValue(): self.CompactFlag = True reg_compact_data = [] @@ -1988,7 +1989,7 @@ # and create data structure for the detail description table ; sub grid if address in self.RegisterAccessPanel.RegisterSubGridDict: for element in self.RegisterAccessPanel.RegisterSubGridDict[address]: - row_data =[] + row_data = [] row_data.append(element[BIT_RANGE]) row_data.append(element[NAME]) bin_data = "{:0>16b}".format(int(self.GetCellValue(event.GetRow(), 1))) @@ -2031,7 +2032,7 @@ # ex) ethercat reg_write -p 0 -t uint16 0x0000 0x0000 return_val = self.Controler.CommonMethod.RegWrite('0x'+self.GetRowLabelValue(event.GetRow()), dlg.GetValue()) - if len(return_val)==0: + if len(return_val) == 0: # set dec self.SetCellValue(event.GetRow(), 1, str(int(dlg.GetValue(), 0))) # set hex @@ -2041,7 +2042,7 @@ char_data = "" # If hex_data is been able to convert to ascii code, append ascii code. for iter in range(2): - if int(hex_data[(iter+1)*2:(iter+2)*2], 16)>=32 and int(hex_data[(iter+1)*2:(iter+2)*2], 16)<=126: + if int(hex_data[(iter+1)*2:(iter+2)*2], 16) >= 32 and int(hex_data[(iter+1)*2:(iter+2)*2], 16) <= 126: char_data = char_data + chr(int(hex_data[(iter+1)*2:(iter+2)*2], 16)) else: char_data = char_data + "." diff -r 4ea781f30555 -r bc07b9910cdb etherlab/etherlab.py --- a/etherlab/etherlab.py Fri Sep 28 19:06:28 2018 +0300 +++ b/etherlab/etherlab.py Fri Sep 28 19:12:26 2018 +0300 @@ -125,7 +125,7 @@ ("Control Byte", sync_manager.getControlByte()), ("Enable", sync_manager.getEnable())]: if value is None: - value ="" + value = "" sync_manager_infos[name] = value sync_managers.append(sync_manager_infos) return sync_managers diff -r 4ea781f30555 -r bc07b9910cdb etherlab/runtime_etherlab.py --- a/etherlab/runtime_etherlab.py Fri Sep 28 19:06:28 2018 +0300 +++ b/etherlab/runtime_etherlab.py Fri Sep 28 19:12:26 2018 +0300 @@ -66,8 +66,8 @@ global Result return Result -KMSGPollThread=None -StopKMSGThread=False +KMSGPollThread = None +StopKMSGThread = False def KMSGPollThreadProc(): @@ -78,11 +78,11 @@ captured line to detect new lines """ global StopKMSGThread - libc=ctypes.CDLL("libc.so.6") + libc = ctypes.CDLL("libc.so.6") klog = libc.klogctl klog.argtypes = [ctypes.c_int, ctypes.c_char_p, ctypes.c_int] klog.restype = ctypes.c_int - s=ctypes.create_string_buffer(4*1024) + s = ctypes.create_string_buffer(4*1024) last = None while not StopKMSGThread: l = klog(3, s, len(s)-1)