beremiz: comparison etherlab/EtherCATManagementEditor.py

equal deleted inserted replaced

-:6d31ef14f396
+:9c7da6ff6a34
 self.SizerDic["SlaveInfosDetailsInnerSizer"].AddMany([self.StaticTextDic[statictext_name],
 self.TextCtrlDic[textctrl_name]])
 self.SizerDic["SlaveInfosDetailsBox"].AddSizer(self.SizerDic["SlaveInfosDetailsInnerSizer"])
-self.SyncManagersGrid = CustomGrid(self, size=wx.Size(605,155), style=wx.VSCROLL)
+self.SyncManagersGrid = CustomGrid(self, size=wx.Size(605, 155), style=wx.VSCROLL)
 self.SizerDic["SyncManagerInnerSizer"].Add(self.SyncManagersGrid)
 self.SizerDic["SyncManagerBox"].Add(self.SizerDic["SyncManagerInnerSizer"])
 for button_name, button_id, button_label, button_tooltipstring, event_method, sub_item in [
 ("PreOPButton",  1, "PREOP", "State Transition to \"PreOP\" State",   self.OnButtonClick, [
 ("TargetStateLabel", "Target State:" , "TargetState")]),
 ("SafeOPButton", 2, "SAFEOP", "State Transition to \"SafeOP\" State", self.OnButtonClick, []),
 ("OPButton",     3, "OP",  "State Transition to \"OP\" State",        self.OnButtonClick, [
 ("CurrentStateLabel", "Current State:", "CurrentState")])]:
-self.ButtonDic[button_name] = wx.Button(self, id=button_id ,label=_(button_label))
+self.ButtonDic[button_name] = wx.Button(self, id=button_id, label=_(button_label))
 self.ButtonDic[button_name].Bind(wx.EVT_BUTTON, event_method)
 self.ButtonDic[button_name].SetToolTipString(button_tooltipstring)
 self.SizerDic["SlaveState_up_sizer"].Add(self.ButtonDic[button_name])
 for statictext_name, statictext_label, textctrl_name in sub_item :
 self.StaticTextDic[statictext_name] = wx.StaticText(self, label=_(statictext_label))
 if type == "octet_string":
 hex_val = ' ---- '
 # SResult of SlaveSDO data parsing. (data type : dictionary)
-self.Data = {'idx':idx.strip(), 'subIdx':sub_idx.strip(), 'access':access.strip(),
+self.Data = {'idx': idx.strip(), 'subIdx': sub_idx.strip(), 'access': access.strip(),
-'type':type.strip(), 'size':size.strip(),  'name':name_after_check.strip("\""),
+'type': type.strip(), 'size': size.strip(),  'name': name_after_check.strip("\""),
-'value':hex_val.strip(), "category":title_name.strip("\"")}
+'value': hex_val.strip(), "category": title_name.strip("\"")}
 category_divide_value = [0x1000, 0x2000, 0x6000, 0xa000, 0xffff]
 for count in range(len(category_divide_value)) :
 if int(idx, 0) < category_divide_value[count]:
 """
 Constructor
 @param parent: Reference to the parent SDOPanelClass class
 @param controler: _EthercatSlaveCTN class in EthercatSlave.py
 """
-wx.Notebook.__init__(self, parent, id = -1, size=(850,500))
+wx.Notebook.__init__(self, parent, id = -1, size=(850, 500))
 self.Controler = controler
 self.parent = parent
 self.CreateNoteBook()
 """
 Constructor
 @param parent: Reference to the parent SDOPanelClass class
 @param data: SDO data after parsing "SDOParser" method
 """
-wx.grid.Grid.__init__(self, parent, -1, size=(830,490),
+wx.grid.Grid.__init__(self, parent, -1, size=(830, 490),
 style=wx.EXPAND|wx.ALIGN_CENTRE_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL)
 self.Controler = parent.Controler
 self.parent = parent
 self.SDOFlag = True
 # for SDO download
 self.Bind(gridlib.EVT_GRID_CELL_LEFT_DCLICK, self.SDOModifyDialog)
 for i in range(7):
-self.SetColAttr(i,attr)
+self.SetColAttr(i, attr)
 self.SetColLabelAlignment(wx.ALIGN_CENTER, wx.ALIGN_CENTER)
 self.SetTableValue()
 @param parent: Reference to the parent PDONoteBook class
 @param info : data structure including entry index, sub index, name, length, type
 @param entry : data structure including index, name, entry number
 @param count : page number
 """
-wx.grid.Grid.__init__(self, parent, -1, size=(500, 400), pos=wx.Point(0,0),
+wx.grid.Grid.__init__(self, parent, -1, size=(500, 400), pos=wx.Point(0, 0),
 style=wx.EXPAND|wx.ALIGN_CENTRE_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL)
 self.Controler = parent.Controler
 self.PDOInfo = info
 Constructor
 @param parent: Reference to the parent EtherCATManagementTreebook class
 @param controler: _EthercatSlaveCTN class in EthercatSlave.py
 """
 wx.Panel.__init__(self, parent, -1)
-sizer = wx.FlexGridSizer(cols=1, hgap=20,rows=3, vgap=20)
+sizer = wx.FlexGridSizer(cols=1, hgap=20, rows=3, vgap=20)
 line = wx.StaticText(self, -1, "\n  EEPROM Access is composed to SmartView and HexView. \
 \n\n   - SmartView shows Config Data, Device Identity, Mailbox settings, etc. \
 \n\n   - HexView shows EEPROM's contents.")
 """
 wx.Panel.__init__(self, parent, -1)
 self.parent = parent
 self.Controler = controler
-self.PDIType = {0  :['none', '00000000'],
+self.PDIType = {
-4  :['Digital I/O', '00000100'],
+0  : ['none', '00000000'],
-5  :['SPI Slave', '00000101'],
+4  : ['Digital I/O', '00000100'],
-7  :['EtherCAT Bridge (port3)', '00000111'],
+5  : ['SPI Slave', '00000101'],
-8  :['uC async. 16bit', '00001000'],
+7  : ['EtherCAT Bridge (port3)', '00000111'],
-9  :['uC async. 8bit', '00001001'],
+8  : ['uC async. 16bit', '00001000'],
-10 :['uC sync. 16bit', '00001010'],
+9  : ['uC async. 8bit', '00001001'],
-11 :['uC sync. 8bit', '00001011'],
+10 : ['uC sync. 16bit', '00001010'],
-16 :['32 Digtal Input and 0 Digital Output', '00010000'],
+11 : ['uC sync. 8bit', '00001011'],
-17 :['24 Digtal Input and 8 Digital Output', '00010001'],
+16 : ['32 Digtal Input and 0 Digital Output', '00010000'],
-18 :['16 Digtal Input and 16 Digital Output','00010010'],
+17 : ['24 Digtal Input and 8 Digital Output', '00010001'],
-19 :['8 Digtal Input and 24 Digital Output', '00010011'],
+18 : ['16 Digtal Input and 16 Digital Output', '00010010'],
-20 :['0 Digtal Input and 32 Digital Output', '00010100'],
+19 : ['8 Digtal Input and 24 Digital Output', '00010011'],
-128:['On-chip bus', '11111111']
+20 : ['0 Digtal Input and 32 Digital Output', '00010100'],
-}
+128: ['On-chip bus', '11111111']
+}
 sizer = wx.FlexGridSizer(cols=1, hgap=5, rows=2, vgap=5)
 button_sizer = wx.FlexGridSizer(cols=2, hgap=5, rows=1, vgap=5)
 for button, mapping_method in [("Write EEPROM", self.WriteToEEPROM),
 dialog = wx.FileDialog(self, _("Choose a binary file"), os.getcwd(), "",  _("bin files (*.bin)|*.bin"), wx.OPEN)
 if dialog.ShowModal() == wx.ID_OK:
 filepath = dialog.GetPath()
 try:
-binfile = open(filepath,"rb")
+binfile = open(filepath, "rb")
 self.SiiBinary = binfile.read()
 dialog.Destroy()
 self.Controler.CommonMethod.SiiWrite(self.SiiBinary)
 # refresh data structure kept by master
 "slave0.bin",  _("bin files (*.bin)|*.bin|All files|*.*"),
 wx.SAVE|wx.OVERWRITE_PROMPT)
 if dialog.ShowModal() == wx.ID_OK:
 filepath = dialog.GetPath()
-binfile = open(filepath,"wb")
+binfile = open(filepath, "wb")
 binfile.write(self.SiiBinary)
 binfile.close()
 dialog.Destroy()
 '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
-eeprom_size = str((int(self.GetWordAddressData( sii_dict.get('Size'),10 ))+1)/8*1024)
+eeprom_size = str((int(self.GetWordAddressData( sii_dict.get('Size'), 10 ))+1)/8*1024)
 # Find PDI Type in pdiType dictionary
-cnt_pdi_type = int(self.GetWordAddressData( sii_dict.get('PDIControl'),16 ).split('x')[1][2:4], 16)
+cnt_pdi_type = int(self.GetWordAddressData( sii_dict.get('PDIControl'), 16 ).split('x')[1][2:4], 16)
 for i in self.PDIType.keys():
 if cnt_pdi_type == i:
 cnt_pdi_type = self.PDIType[i][0]
 break
 #  Get Device Emulation
-device_emulation = str(bool(int("{:0>16b}".format(int(self.GetWordAddressData( sii_dict.get('PDIControl'),16 ), 16))[7])))
+device_emulation = str(bool(int("{:0>16b}".format(int(self.GetWordAddressData( sii_dict.get('PDIControl'), 16 ), 16))[7])))
 #  Set Config Data
 for treelist, data in [("EEPROM Size (Bytes)", eeprom_size),
 ("PDI Type", cnt_pdi_type),
 ("Device Emulation", device_emulation)]:
 self.TreeListCtrl.Tree.SetItemText(self.TreeListCtrl.ConfigData[treelist], data, 1)
 # Device Identity: Vendor ID, Product Code, Revision No., Serial No.
 #  Set Device Identity
-for treelist, data in [("Vendor ID", self.GetWordAddressData( sii_dict.get('VendorID'),16 )),
+for treelist, data in [
-("Product Code", self.GetWordAddressData( sii_dict.get('ProductCode'),16 )),
+("Vendor ID", self.GetWordAddressData( sii_dict.get('VendorID'), 16 )),
-("Revision No.", self.GetWordAddressData( sii_dict.get('RevisionNumber'),16 )),
+("Product Code", self.GetWordAddressData( sii_dict.get('ProductCode'), 16 )),
-("Serial No.", self.GetWordAddressData( sii_dict.get('SerialNumber'),16 ))]:
+("Revision No.", self.GetWordAddressData( sii_dict.get('RevisionNumber'), 16 )),
+("Serial No.", self.GetWordAddressData( sii_dict.get('SerialNumber'), 16 ))]:
 self.TreeListCtrl.Tree.SetItemText(self.TreeListCtrl.DeviceIdentity[treelist], data, 1)
 # Mailbox
 # EEORPOM's word address '1c' indicates supported mailbox protocol.
 # 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_data = "{:0>8b}".format(int(self.GetWordAddressData( sii_dict.get('MailboxProtocol'),16 ), 16))
+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':
 supported_mailbox += mailbox_protocol[protocol]
 supported_mailbox = supported_mailbox.strip(",  ")
 #  Set Mailbox
 for treelist, data in [("Supported Mailbox", supported_mailbox),
 ("Bootstrap Configuration", ""),
 ("Standard Configuration", "")]:
 self.TreeListCtrl.Tree.SetItemText(self.TreeListCtrl.Mailbox[treelist], data, 1)
 #  Set Bootstrap Configuration: Receive Offset, Receive Size, Send Offset, Send Size
-for treelist, data in [("Receive Offset", self.GetWordAddressData( sii_dict.get('BootstrapReceiveMailboxOffset'),10 )),
+for treelist, data in [
-("Receive Size", self.GetWordAddressData( sii_dict.get('BootstrapReceiveMailboxSize'),10 )),
+("Receive Offset", self.GetWordAddressData( sii_dict.get('BootstrapReceiveMailboxOffset'), 10 )),
-("Send Offset", self.GetWordAddressData( sii_dict.get('BootstrapSendMailboxOffset'),10 )),
+("Receive Size", self.GetWordAddressData( sii_dict.get('BootstrapReceiveMailboxSize'), 10 )),
-("Send Size", self.GetWordAddressData( sii_dict.get('BootstrapSendMailboxSize'),10 ))]:
+("Send Offset", self.GetWordAddressData( sii_dict.get('BootstrapSendMailboxOffset'), 10 )),
+("Send Size", self.GetWordAddressData( sii_dict.get('BootstrapSendMailboxSize'), 10 ))]:
 self.TreeListCtrl.Tree.SetItemText(self.TreeListCtrl.BootstrapConfig[treelist], data, 1)
 #  Set Standard Configuration: Receive Offset, Receive Size, Send Offset, Send Size
-for treelist, data in [("Receive Offset", self.GetWordAddressData( sii_dict.get('StandardReceiveMailboxOffset'),10 )),
+for treelist, data in [
-("Receive Size", self.GetWordAddressData( sii_dict.get('StandardReceiveMailboxSize'),10 )),
+("Receive Offset", self.GetWordAddressData( sii_dict.get('StandardReceiveMailboxOffset'), 10 )),
-("Send Offset", self.GetWordAddressData( sii_dict.get('StandardSendMailboxOffset'),10 )),
+("Receive Size", self.GetWordAddressData( sii_dict.get('StandardReceiveMailboxSize'), 10 )),
-("Send Size", self.GetWordAddressData( sii_dict.get('StandardSendMailboxSize'),10 ))]:
+("Send Offset", self.GetWordAddressData( sii_dict.get('StandardSendMailboxOffset'), 10 )),
+("Send Size", self.GetWordAddressData( sii_dict.get('StandardSendMailboxSize'), 10 ))]:
 self.TreeListCtrl.Tree.SetItemText(self.TreeListCtrl.StandardConfig[treelist], data, 1)
 def MakeStaticBoxSizer(self, boxlabel):
 """
 Make StaticBoxSizer
 dialog = wx.FileDialog(self, _("Save as..."), os.getcwd(), "slave0.bin",
 _("bin files (*.bin)|*.bin|All files|*.*"), wx.SAVE|wx.OVERWRITE_PROMPT)
 if dialog.ShowModal() == wx.ID_OK:
 filepath = dialog.GetPath()
-binfile = open(filepath,"wb")
+binfile = open(filepath, "wb")
 binfile.write(self.SiiBinary)
 binfile.close()
 dialog.Destroy()
 self.parent = parent
 self.Controler = controler
 self.Row = row
 self.Col = col
-wx.grid.Grid.__init__(self, parent, -1, size=(830,450),
+wx.grid.Grid.__init__(self, parent, -1, size=(830, 450),
 style=wx.ALIGN_CENTRE_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL)
 def SetValue(self, value):
 """
 Set data in the table
 for index in range(4):
 self.Controler.CommonMethod.RegData = self.Controler.CommonMethod.RegData + " " + self.Controler.CommonMethod.RegRead("0x"+"{:0>4x}".format(index*1024), "0x0400")
 # store previous value
 # (ESC type, port number of FMMU, port number of SM, and PDI type))
-for reg_spec in ["ESCType","FMMUNumber","SMNumber", "PDIType"]:
+for reg_spec in ["ESCType", "FMMUNumber", "SMNumber", "PDIType"]:
 self.PreRegSpec[reg_spec] = self.Controler.CommonMethod.CrtRegSpec[reg_spec]
 # update registers' description
 # (ESC type, port number of FMMU, port number of SM, and PDI type)
 for reg_spec, address in [("ESCType", "0x0000"),
 self.Row = row
 self.Col = col
 self.Controler = controler
 self.RegisterAccessPanel = self.parent.parent.parent
-wx.grid.Grid.__init__(self, parent, -1, size=(820,300),
+wx.grid.Grid.__init__(self, parent, -1, size=(820, 300),
 style=wx.EXPAND|wx.ALIGN_CENTRE_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL)
 for evt, mapping_method in [(gridlib.EVT_GRID_CELL_LEFT_CLICK, self.OnSelectCell),
 (gridlib.EVT_GRID_CELL_LEFT_CLICK, self.OnSelectCell),
 (gridlib.EVT_GRID_CELL_LEFT_DCLICK, self.OnRegModifyDialog)]:
 self.parent = parent
 self.Data = {}
 self.Row = row
 self.Col = col
-wx.grid.Grid.__init__(self, parent, -1, size=(820,150),
+wx.grid.Grid.__init__(self, parent, -1, size=(820, 150),
 style=wx.EXPAND|wx.ALIGN_CENTRE_HORIZONTAL|wx.ALIGN_CENTER_VERTICAL)
 def SetValue(self, parent, data):
 """
 	    Set the data into the subtable.

changeset 2363	9c7da6ff6a34
parent 2361	5d6ce74f7835
child 2364	4ea781f30555