beremiz

Adding support for not configuring pdos when not mandatory and not needed by locations defined in PLC program. Adding support for displaying locations tree in Topology panel and BrowseLocationsDialog. Merging pdos grid and variables grid into one single grid in slave infos panel.

2011-12-20, laurent
f9f884cf3033
Parents c2295d311402
Children 87f428326f9b65ecbfe9a6f9
Adding support for not configuring pdos when not mandatory and not needed by locations defined in PLC program. Adding support for displaying locations tree in Topology panel and BrowseLocationsDialog. Merging pdos grid and variables grid into one single grid in slave infos panel.
2 files changed, 140 insertions(+), 83 deletions(-)
  • +17 -45
    etherlab/ConfigEditor.py
  • +123 -38
    etherlab/etherlab.py
    • --- a/etherlab/ConfigEditor.py Sun Dec 18 19:42:13 2011 +0100
    +++ b/etherlab/ConfigEditor.py Tue Dec 20 23:43:27 2011 +0100
    @@ -96,13 +96,9 @@
    self.EndModal(wx.ID_OK)
    -def GetPDOsTableColnames():
    - _ = lambda x : x
    - return ["#", _("Index"), _("Name"), _("Type")]
    -
    def GetVariablesTableColnames():
    _ = lambda x : x
    - return ["#", _("Index"), _("SubIndex"), _("Name"), _("Type"), _("PDO")]
    + return ["#", _("Index"), _("SubIndex"), _("Name"), _("Type"), _("PDO index"), _("PDO name"), _("PDO type")]
    class PDOsTable(CustomTable):
    @@ -177,16 +173,13 @@
    def _init_coll_SlaveInfosSizer_Items(self, parent):
    parent.AddSizer(self.SlaveInfosDetailsSizer, 0, border=0, flag=wx.GROW)
    - parent.AddWindow(self.PDOsLabel, 0, border=0, flag=wx.GROW)
    - parent.AddWindow(self.PDOsGrid, 0, border=0, flag=wx.GROW)
    parent.AddWindow(self.VariablesLabel, 0, border=0, flag=wx.GROW)
    parent.AddWindow(self.VariablesGrid, 0, border=0, flag=wx.GROW)
    def _init_coll_SlaveInfosSizer_Growables(self, parent):
    parent.AddGrowableCol(0)
    parent.AddGrowableRow(2)
    - parent.AddGrowableRow(4)
    -
    +
    def _init_coll_SlaveInfosDetailsSizer_Items(self, parent):
    parent.AddWindow(self.VendorLabel, 0, border=0, flag=wx.ALIGN_CENTER_VERTICAL|wx.GROW)
    parent.AddWindow(self.Vendor, 0, border=0, flag=wx.GROW)
    @@ -206,7 +199,7 @@
    self.PositionSizer = wx.FlexGridSizer(cols=6, hgap=5, rows=1, vgap=0)
    self.TypeSizer = wx.BoxSizer(wx.HORIZONTAL)
    self.SlaveInfosBoxSizer = wx.StaticBoxSizer(self.SlaveInfosStaticBox, wx.VERTICAL)
    - self.SlaveInfosSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=5, vgap=5)
    + self.SlaveInfosSizer = wx.FlexGridSizer(cols=1, hgap=0, rows=3, vgap=5)
    self.SlaveInfosDetailsSizer = wx.FlexGridSizer(cols=4, hgap=5, rows=2, vgap=5)
    self._init_coll_MainSizer_Growables(self.MainSizer)
    @@ -293,14 +286,6 @@
    name='Physics', parent=self, pos=wx.Point(0, 0),
    size=wx.Size(0, 24), style=wx.TE_READONLY)
    - self.PDOsLabel = wx.StaticText(id=ID_SLAVEPANELPDOSLABEL,
    - label=_('PDO entries:'), name='PDOsLabel', parent=self,
    - pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
    -
    - self.PDOsGrid = CustomGrid(id=ID_SLAVEPANELPDOSGRID,
    - name='PDOsGrid', parent=self, pos=wx.Point(0, 0),
    - size=wx.Size(0, 0), style=wx.VSCROLL)
    -
    self.VariablesLabel = wx.StaticText(id=ID_SLAVEPANELVARIABLESLABEL,
    label=_('Variable entries:'), name='VariablesLabel', parent=self,
    pos=wx.Point(0, 0), size=wx.DefaultSize, style=0)
    @@ -322,22 +307,12 @@
    self.ParentWindow = window
    self.Slave = slave
    - self.PDOsTable = PDOsTable(self, [], GetPDOsTableColnames())
    - self.PDOsGrid.SetTable(self.PDOsTable)
    - self.PDOsGridColAlignements = [wx.ALIGN_RIGHT, wx.ALIGN_RIGHT, wx.ALIGN_LEFT, wx.ALIGN_LEFT]
    - self.PDOsGridColSizes = [40, 100, 150, 150]
    - self.PDOsGrid.SetRowLabelSize(0)
    - for col in range(self.PDOsTable.GetNumberCols()):
    - attr = wx.grid.GridCellAttr()
    - attr.SetAlignment(self.PDOsGridColAlignements[col], wx.ALIGN_CENTRE)
    - self.PDOsGrid.SetColAttr(col, attr)
    - self.PDOsGrid.SetColMinimalWidth(col, self.PDOsGridColSizes[col])
    - self.PDOsGrid.AutoSizeColumn(col, False)
    -
    self.VariablesTable = VariablesTable(self, [], GetVariablesTableColnames())
    self.VariablesGrid.SetTable(self.VariablesTable)
    - self.VariablesGridColAlignements = [wx.ALIGN_RIGHT, wx.ALIGN_RIGHT, wx.ALIGN_RIGHT, wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_RIGHT]
    - self.VariablesGridColSizes = [40, 100, 100, 150, 150, 100]
    + self.VariablesGridColAlignements = [wx.ALIGN_RIGHT, wx.ALIGN_RIGHT, wx.ALIGN_RIGHT,
    + wx.ALIGN_LEFT, wx.ALIGN_LEFT, wx.ALIGN_RIGHT,
    + wx.ALIGN_LEFT, wx.ALIGN_LEFT]
    + self.VariablesGridColSizes = [40, 100, 100, 150, 150, 100, 150, 100]
    self.VariablesGrid.SetRowLabelSize(0)
    for col in range(self.VariablesTable.GetNumberCols()):
    attr = wx.grid.GridCellAttr()
    @@ -348,6 +323,9 @@
    self.RefreshView()
    + def __del__(self):
    + self.Controler.OnCloseEditor()
    +
    def GetSlaveTitle(self):
    type_infos = self.Controler.GetSlaveType(self.Slave)
    return "%s (%d:%d)" % (type_infos["device_type"], self.Slave[0], self.Slave[1])
    @@ -370,8 +348,6 @@
    self.ProductCode.SetValue(slave_infos["product_code"])
    self.RevisionNumber.SetValue(slave_infos["revision_number"])
    self.Physics.SetValue(slave_infos["physics"])
    - self.PDOsTable.SetData(slave_infos["pdos"])
    - self.PDOsTable.ResetView(self.PDOsGrid)
    self.VariablesTable.SetData(slave_infos["variables"])
    self.VariablesTable.ResetView(self.VariablesGrid)
    else:
    @@ -426,14 +402,10 @@
    var_name = self.VariablesTable.GetValueByName(row, "Name")
    entry_index = self.Controler.ExtractHexDecValue(self.VariablesTable.GetValueByName(row, "Index"))
    entry_subindex = self.VariablesTable.GetValueByName(row, "SubIndex")
    - pdo_index = self.VariablesTable.GetValueByName(row, "PDO")
    - for pdo_row in xrange(self.PDOsTable.GetNumberRows()):
    - if self.PDOsTable.GetValueByName(row, "Index") == pdo_index:
    - if self.PDOsTable.GetValueByName(row, "Type") == "Transmit":
    - dir = "%I"
    - else:
    - dir = "%Q"
    - break
    + if self.VariablesTable.GetValueByName(row, "PDO type") == "Transmit":
    + dir = "%I"
    + else:
    + dir = "%Q"
    location = "%s%s" % (dir, self.Controler.GetSizeOfType(data_type)) + \
    ".".join(map(lambda x:str(x), self.Controler.GetCurrentLocation() + self.Slave + (entry_index, entry_subindex)))
    data = wx.TextDataObject(str((location, "location", data_type, var_name, "")))
    @@ -499,10 +471,10 @@
    self.SetIcon(wx.BitmapFromImage(img.Rescale(16, 16)))
    def GetTitle(self):
    - filename = self.Controler.GetFilename()
    + fullname = self.Controler.PlugFullName()
    if not self.Controler.ConfigIsSaved():
    - return "~%s~" % filename
    - return filename
    + return "~%s~" % fullname
    + return fullname
    def GetBufferState(self):
    return self.Controler.GetBufferState()
    --- a/etherlab/etherlab.py Sun Dec 18 19:42:13 2011 +0100
    +++ b/etherlab/etherlab.py Tue Dec 20 23:43:27 2011 +0100
    @@ -5,7 +5,7 @@
    import wx
    from xmlclass import *
    -from PLCControler import UndoBuffer
    +from PLCControler import UndoBuffer, LOCATION_PLUGIN, LOCATION_MODULE, LOCATION_GROUP, LOCATION_VAR_INPUT, LOCATION_VAR_OUTPUT, LOCATION_VAR_MEMORY
    from ConfigEditor import ConfigEditor, ETHERCAT_VENDOR, ETHERCAT_GROUP, ETHERCAT_DEVICE
    TYPECONVERSION = {"BOOL" : "X", "SINT" : "B", "INT" : "W", "DINT" : "D", "LINT" : "L",
    @@ -82,6 +82,7 @@
    </xsd:element>
    </xsd:schema>
    """
    + EditorType = ConfigEditor
    def __init__(self):
    filepath = self.ConfigFileName()
    @@ -186,7 +187,6 @@
    if device is not None:
    infos = type_infos.copy()
    infos.update({"physics": device.getPhysics(),
    - "pdos": [],
    "variables": []})
    for TxPdo in device.getTxPdo():
    ExtractPdoInfos(TxPdo, "Transmit", infos)
    @@ -201,13 +201,64 @@
    def GetSlaveTypesLibrary(self):
    return self.PlugParent.GetModulesLibrary()
    - def _OpenView(self):
    - app_frame = self.GetPlugRoot().AppFrame
    + def GetVariableLocationTree(self):
    + '''See PlugTemplate.GetVariableLocationTree() for a description.'''
    +
    + current_location = self.GetCurrentLocation()
    - configeditor = ConfigEditor(app_frame.TabsOpened, self, app_frame)
    -
    - app_frame.EditProjectElement(configeditor, self.GetFilename())
    + groups = []
    + for slave_pos in self.GetSlaves():
    +
    + slave = self.GetSlave(slave_pos)
    + if slave is not None:
    + type_infos = slave.getType()
    + device = self.GetModuleInfos(type_infos)
    + if device is not None:
    + vars = []
    +
    + sync_managers = []
    + for sync_manager in device.getSm():
    + sync_manager_control_byte = ExtractHexDecValue(sync_manager.getControlByte())
    + sync_manager_direction = sync_manager_control_byte & 0x0c
    + if sync_manager_direction:
    + sync_managers.append(LOCATION_VAR_OUTPUT)
    + else:
    + sync_managers.append(LOCATION_VAR_INPUT)
    +
    + for pdo in device.getTxPdo() + device.getRxPdo():
    + var_class = sync_managers[pdo.getSm()]
    +
    + for entry in pdo.getEntry():
    + index = ExtractHexDecValue(entry.getIndex().getcontent())
    + subindex = ExtractHexDecValue(entry.getSubIndex())
    + var_type = entry.getDataType().getcontent()
    + var_size = self.GetSizeOfType(var_type)
    + if var_class == LOCATION_VAR_INPUT:
    + var_dir = "%I"
    + else:
    + var_dir = "%Q"
    +
    + vars.append({"name": "%s - %s" % (ExtractName(pdo.getName()), ExtractName(entry.getName())),
    + "type": var_class,
    + "size": var_size,
    + "IEC_type": var_type,
    + "location": "%s%s%s"%(var_dir, var_size, ".".join(map(str, current_location +
    + slave_pos +
    + (index, subindex)))),
    + "description": "",
    + "children": []})
    +
    + groups.append({"name": "%s (%d,%d)" % ((type_infos["device_type"],) + slave_pos),
    + "type": LOCATION_GROUP,
    + "location": ".".join(map(str, current_location + slave_pos)) + ".x",
    + "children": vars})
    +
    + return {"name": self.BaseParams.getName(),
    + "type": LOCATION_PLUGIN,
    + "location": self.GetFullIEC_Channel(),
    + "children": groups}
    +
    PluginMethods = [
    {"bitmap" : os.path.join("images", "EditCfile"),
    "name" : _("Edit Config"),
    @@ -381,7 +432,7 @@
    type_infos = slave.getType()
    device = self.Controler.GetModuleInfos(type_infos)
    - if device is not None:
    + if device is not None:
    pdos = device.getTxPdo() + device.getRxPdo()
    if len(pdos) > 0:
    @@ -425,20 +476,12 @@
    entry_offset = 0
    for pdo in pdos:
    - sync_managers[pdo.getSm()]["pdos_number"] += 1
    entries = pdo.getEntry()
    - pdo_infos = {
    - "slave": slave_idx,
    - "index": ExtractHexDecValue(pdo.getIndex().getcontent()),
    - "name": ExtractName(pdo.getName()),
    - "offset": entry_offset,
    - "entries_number": len(entries)
    - }
    - pdos_infos["pdos_infos"].append(" {0x%(index).4x, %(entries_number)d, slave_%(slave)d_pdo_entries + %(offset)d}, /* %(name)s */" % pdo_infos)
    - entry_offset += len(entries)
    + pdo_needed = pdo.getMandatory()
    + entries_infos = []
    - for entry in pdo.getEntry():
    + for entry in entries:
    index = ExtractHexDecValue(entry.getIndex().getcontent())
    subindex = ExtractHexDecValue(entry.getSubIndex())
    entry_infos = {
    @@ -448,10 +491,11 @@
    "bitlen": entry.getBitLen(),
    }
    entry_infos.update(type_infos)
    - pdos_infos["pdos_entries_infos"].append(" {0x%(index).4x, 0x%(subindex).2x, %(bitlen)d}, /* %(name)s */" % entry_infos)
    + entries_infos.append(" {0x%(index).4x, 0x%(subindex).2x, %(bitlen)d}, /* %(name)s */" % entry_infos)
    entry_declaration = slave_variables.get((index, subindex), None)
    if entry_declaration is not None:
    + pdo_needed = True
    entry_infos.update(dict(zip(["var_type", "dir", "var_name"], entry_declaration)))
    if entry_infos["var_type"] != entry.getDataType().getcontent():
    @@ -465,35 +509,70 @@
    entry_infos["dir"] == "Q" and sync_managers[pdo.getSm()]["sync_manager_type"] != "EC_DIR_OUTPUT"):
    raise ValueError, _("Wrong direction for location \"%s\"!") % entry_infos["var_name"]
    - str_completion["located_variables_declaration"].extend(["IEC_%(var_type)s beremiz%(var_name)s;" % entry_infos,
    - "IEC_%(var_type)s *%(var_name)s = &beremiz%(var_name)s;" % entry_infos])
    + str_completion["located_variables_declaration"].extend(
    + ["IEC_%(var_type)s beremiz%(var_name)s;" % entry_infos,
    + "IEC_%(var_type)s *%(var_name)s = &beremiz%(var_name)s;" % entry_infos])
    +
    if data_type == "BIT":
    - str_completion["used_pdo_entry_offset_variables_declaration"].extend(["static unsigned int slave%(slave)d_%(index).4x_%(subindex).2x;" % entry_infos,
    - "static unsigned int slave%(slave)d_%(index).4x_%(subindex).2x_bit;" % entry_infos])
    + str_completion["used_pdo_entry_offset_variables_declaration"].extend(
    + ["static unsigned int slave%(slave)d_%(index).4x_%(subindex).2x;" % entry_infos,
    + "static unsigned int slave%(slave)d_%(index).4x_%(subindex).2x_bit;" % entry_infos])
    - str_completion["used_pdo_entry_configuration"].append(" {%(alias)d, %(position)d, 0x%(vendor).8x, 0x%(product_code).8x, 0x%(index).4x, %(subindex)d, &slave%(slave)d_%(index).4x_%(subindex).2x, &slave%(slave)d_%(index).4x_%(subindex).2x_bit}," % entry_infos)
    + str_completion["used_pdo_entry_configuration"].append(
    + (" {%(alias)d, %(position)d, 0x%(vendor).8x, 0x%(product_code).8x, " +
    + "0x%(index).4x, %(subindex)d, &slave%(slave)d_%(index).4x_%(subindex).2x, " +
    + "&slave%(slave)d_%(index).4x_%(subindex).2x_bit},") % entry_infos)
    if entry_infos["dir"] == "I":
    - str_completion["retrieve_variables"].append(" beremiz%(name)s = EC_READ_BIT(domain1_pd + slave%(slave)d_%(index).4x_%(subindex).2x, slave%(slave)d_%(index).4x_%(subindex).2x_bit);" % entry_infos)
    + str_completion["retrieve_variables"].append(
    + (" beremiz%(name)s = EC_READ_BIT(domain1_pd + slave%(slave)d_%(index).4x_%(subindex).2x, " +
    + "slave%(slave)d_%(index).4x_%(subindex).2x_bit);") % entry_infos)
    elif entry_infos["dir"] == "Q":
    - str_completion["publish_variables"].append(" EC_WRITE_BIT(domain1_pd + slave%(slave)d_%(index).4x_%(subindex).2x, slave%(slave)d_%(index).4x_%(subindex).2x_bit, beremiz%(var_name)s);" % entry_infos)
    + str_completion["publish_variables"].append(
    + (" EC_WRITE_BIT(domain1_pd + slave%(slave)d_%(index).4x_%(subindex).2x, " +
    + "slave%(slave)d_%(index).4x_%(subindex).2x_bit, beremiz%(var_name)s);") % entry_infos)
    else:
    entry_infos["data_type"] = data_type
    - str_completion["used_pdo_entry_offset_variables_declaration"].append("static unsigned int slave%(slave)d_%(index).4x_%(subindex).2x;" % entry_infos)
    + str_completion["used_pdo_entry_offset_variables_declaration"].append(
    + "static unsigned int slave%(slave)d_%(index).4x_%(subindex).2x;" % entry_infos)
    - str_completion["used_pdo_entry_configuration"].append(" {%(alias)d, %(position)d, 0x%(vendor).8x, 0x%(product_code).8x, 0x%(index).4x, %(subindex)d, &slave%(slave)d_%(index).4x_%(subindex).2x}," % entry_infos)
    + str_completion["used_pdo_entry_configuration"].append(
    + (" {%(alias)d, %(position)d, 0x%(vendor).8x, 0x%(product_code).8x, 0x%(index).4x, " +
    + "%(subindex)d, &slave%(slave)d_%(index).4x_%(subindex).2x},") % entry_infos)
    if entry_infos["dir"] == "I":
    - str_completion["retrieve_variables"].append(" beremiz%(name)s = EC_READ_BIT(domain1_pd + slave%(slave)d_%(index).4x_%(subindex).2x);" % entry_infos)
    + str_completion["retrieve_variables"].append(
    + (" beremiz%(name)s = EC_READ_BIT(domain1_pd + " +
    + "slave%(slave)d_%(index).4x_%(subindex).2x);") % entry_infos)
    elif entry_infos["dir"] == "Q":
    - str_completion["publish_variables"].append(" EC_WRITE_BIT(domain1_pd + slave%(slave)d_%(index).4x_%(subindex).2x, beremiz%(var_name)s);" % entry_infos)
    -
    + str_completion["publish_variables"].append(
    + (" EC_WRITE_BIT(domain1_pd + slave%(slave)d_%(index).4x_%(subindex).2x, " +
    + "beremiz%(var_name)s);") % entry_infos)
    +
    + if pdo_needed:
    + sync_managers[pdo.getSm()]["pdos_number"] += 1
    + pdo_infos = {
    + "slave": slave_idx,
    + "index": ExtractHexDecValue(pdo.getIndex().getcontent()),
    + "name": ExtractName(pdo.getName()),
    + "offset": entry_offset,
    + "entries_number": len(entries)
    + }
    + pdos_infos["pdos_infos"].append(
    + (" {0x%(index).4x, %(entries_number)d, " +
    + "slave_%(slave)d_pdo_entries + %(offset)d}, /* %(name)s */") % pdo_infos)
    + entry_offset += len(entries)
    + pdos_infos["pdos_entries_infos"].extend(entries_infos)
    +
    +
    pdo_offset = 0
    for sync_manager_infos in sync_managers:
    sync_manager_infos["offset"] = pdo_offset
    - pdos_infos["pdos_sync_infos"].append(" {%(index)d, %(sync_manager_type)s, %(pdos_number)d, slave_%(slave)d_pdos + %(offset)d, %(watchdog)s}," % sync_manager_infos)
    + pdos_infos["pdos_sync_infos"].append(
    + (" {%(index)d, %(sync_manager_type)s, %(pdos_number)d, " +
    + "slave_%(slave)d_pdos + %(offset)d, %(watchdog)s},") % sync_manager_infos)
    pdo_offset += sync_manager_infos["pdos_number"]
    for element in ["pdos_entries_infos", "pdos_infos", "pdos_sync_infos"]:
    @@ -501,7 +580,11 @@
    str_completion["pdos_configuration_declaration"] += SLAVE_PDOS_CONFIGURATION_DECLARATION % pdos_infos
    - for element in ["used_pdo_entry_offset_variables_declaration", "used_pdo_entry_configuration", "located_variables_declaration", "retrieve_variables", "publish_variables"]:
    + for element in ["used_pdo_entry_offset_variables_declaration",
    + "used_pdo_entry_configuration",
    + "located_variables_declaration",
    + "retrieve_variables",
    + "publish_variables"]:
    str_completion[element] = "\n".join(str_completion[element])
    etherlabfile = open(self.FilePath,'w')
    @@ -541,15 +624,14 @@
    def ExtractPdoInfos(pdo, pdo_type, infos):
    pdo_index = pdo.getIndex().getcontent()
    - infos["pdos"].append({"Index": pdo_index,
    - "Name": ExtractName(pdo.getName()),
    - "Type": pdo_type})
    for entry in pdo.getEntry():
    infos["variables"].append({"Index": entry.getIndex().getcontent(),
    "SubIndex": entry.getSubIndex(),
    "Name": ExtractName(entry.getName()),
    "Type": entry.getDataType().getcontent(),
    - "PDO": pdo_index})
    + "PDO index": pdo_index,
    + "PDO name": ExtractName(pdo.getName()),
    + "PDO type": pdo_type})
    class RootClass:
    @@ -582,6 +664,9 @@
    "method" : "_ImportModuleLibrary"},
    ]
    + def PlugGenerate_C(self, buildpath, locations):
    + return [],"",False
    +
    def LoadModulesLibrary(self):
    self.ModulesLibrary = {}