beremiz: comparison etherlab/CommonEtherCATFunction.py

equal deleted inserted replaced

-:aed3ca79a10a
+:cfa68a06a24d
 # exectute "ethercat master" command
 error, return_val = self.Controler.RemoteExec(MASTER_STATE, return_val=None)
 master_state = {}
 # parse the reslut
 for each_line in return_val.splitlines():
-if len(each_line) > 0 :
+if len(each_line) > 0:
 chunks = each_line.strip().split(':', 1)
 key = chunks[0]
 value = []
-if len(chunks) > 1 :
+if len(chunks) > 1:
 value = chunks[1].split()
 if '(attached)' in value:
 value.remove('(attached)')
 master_state[key] = value
 device, alignment = self.Controler.CTNParent.GetModuleInfos(type_infos)
 # Initialize PDO data set
 self.ClearDataSet()
 # if 'device' object is valid, call SavePDOData() to parse PDO data
-if device is not None :
+if device is not None:
 self.SavePDOData(device)
 def SavePDOData(self, device):
 """
 Parse PDO data and store the results in TXPDOCategory and RXPDOCategory
 for entry in entries:
 # Save index and subindex
 index = ExtractHexDecValue(entry.getIndex().getcontent())
 subindex = ExtractHexDecValue(entry.getSubIndex())
 # if entry name exists, save entry data
-if ExtractName(entry.getName()) is not None :
+if ExtractName(entry.getName()) is not None:
 entry_infos = {
-"entry_index" : index,
+"entry_index": index,
-"subindex" : subindex,
+"subindex": subindex,
-"name" : ExtractName(entry.getName()),
+"name": ExtractName(entry.getName()),
-"bitlen" : entry.getBitLen(),
+"bitlen": entry.getBitLen(),
-"type" : entry.getDataType().getcontent()
+"type": entry.getDataType().getcontent()
 }
 self.TxPDOInfo.append(entry_infos)
 count += 1
-categorys = {"pdo_index" : pdo_index, "name" : pdo_name, "number_of_entry" : count}
+categorys = {"pdo_index": pdo_index, "name": pdo_name, "number_of_entry": count}
 self.TxPDOCategory.append(categorys)
 # Parsing RxPDO entries
 for pdo, pdo_info in ([(pdo, "Outputs") for pdo in device.getRxPdo()]):
 # Save pdo_index, entry, and name of each entry
 for entry in entries:
 # Save index and subindex
 index = ExtractHexDecValue(entry.getIndex().getcontent())
 subindex = ExtractHexDecValue(entry.getSubIndex())
 # if entry name exists, save entry data
-if ExtractName(entry.getName()) is not None :
+if ExtractName(entry.getName()) is not None:
 entry_infos = {
-"entry_index" : index,
+"entry_index": index,
-"subindex" : subindex,
+"subindex": subindex,
-"name" : ExtractName(entry.getName()),
+"name": ExtractName(entry.getName()),
-"bitlen" : str(entry.getBitLen()),
+"bitlen": str(entry.getBitLen()),
-"type" : entry.getDataType().getcontent()
+"type": entry.getDataType().getcontent()
 }
 self.RxPDOInfo.append(entry_infos)
 count += 1
-categorys = {"pdo_index" : pdo_index, "name" : pdo_name, "number_of_entry" : count}
+categorys = {"pdo_index": pdo_index, "name": pdo_name, "number_of_entry": count}
 self.RxPDOCategory.append(categorys)
 def GetTxPDOCategory(self):
 """
 Get TxPDOCategory data structure (Meta informaton of TxPDO).
 row = 0
 hex_code = []
 hexview_table_col = 17
-for index in range(0, len(binary)) :
+for index in range(0, len(binary)):
 if len(binary[index]) != 1:
 break
 else:
 digithexstr = hex(ord(binary[index]))
 if int(digithexstr, 16) >= 32 and int(digithexstr, 16) <= 126:
 row_text = row_text + chr(int(digithexstr, 16))
 else:
 row_text = row_text + "."
-if index != 0 :
+if index != 0:
 if len(row_code) == (hexview_table_col - 1):
 row_code.append(row_text)
 hex_code.append(row_code)
 row_text = ""
 row_code = []
 eeprom.append(standard_send_mailbox_size[0:2])
 # get supported mailbox protocols for EEPROM offset 0x0038-0x0039;
 data = 0
 mb = device.getMailbox()
-if mb is not None :
+if mb is not None:
 for bit, mbprot in enumerate(mailbox_protocols):
 if getattr(mb, "get%s" % mbprot)() is not None:
 data += 1 << bit
 data = "{:0>4x}".format(data)
 eeprom.append(data[2:4])
 eeprom.append("01")  # Physical Layer Port info - assume 01
 #  CoE Details; <EtherCATInfo>-<Descriptions>-<Devices>-<Device>-<Mailbox>-<CoE>
 coe_details = 0
 mb = device.getMailbox()
 coe_details = 1  # sdo enabled
-if mb is not None :
+if mb is not None:
 coe = mb.getCoE()
 if coe is not None:
 for bit, flag in enumerate(["SdoInfo", "PdoAssign", "PdoConfig",
 "PdoUpload", "CompleteAccess"]):
 if getattr(coe, "get%s" % flag)() is not None:
 eeprom.append("01")
 else:
 eeprom.append("00")
 #  DS402Channels; <EtherCATInfo>-<Descriptions>-<Devices>-<Device>-<Mailbox>-<CoE>: DS402Channels
 ds402ch = False
-if mb is not None :
+if mb is not None:
 coe = mb.getCoE()
-if coe is not None :
+if coe is not None:
 ds402ch = coe.getDS402Channels()
 eeprom.append("01" if ds402ch in [True, 1] else "00")
 # word 6 : SysmanClass(reserved) and Flags
 eeprom.append("00")  # reserved
 if self.Controler.GetCTRoot()._connector is not None:
 # Check connection between the master and the slave.
 # Command example : "ethercat xml -p 0"
 error, return_val = self.Controler.RemoteExec(SLAVE_XML % (self.Controler.GetSlavePos()), return_val=None)
 number_of_lines = return_val.split("\n")
-if len(number_of_lines) <= 2 :  # No slave connected to the master controller
+if len(number_of_lines) <= 2:  # No slave connected to the master controller
-if not cyclic_flag :
+if not cyclic_flag:
 self.CreateErrorDialog('No connected slaves')
 return False
-elif len(number_of_lines) > 2 :
+elif len(number_of_lines) > 2:
 return True
 else:
 # The master controller is not connected to Beremiz host
-if not cyclic_flag :
+if not cyclic_flag:
 self.CreateErrorDialog('PLC not connected!')
 return False
 def CreateErrorDialog(self, mention):
 """

changeset 2375	cfa68a06a24d
parent 2374	aed3ca79a10a
child 2378	7aa47c09f8f5