beremiz: comparison etherlab/etherlab.py

equal deleted inserted replaced

-:7147f20c23e3
+:c6f32810723e
 def ConfigureVariable(entry_infos, str_completion):
 data_type = DATATYPECONVERSION.get(entry_infos["var_type"], None)
 if data_type is None:
 raise ValueError, _("Type of location \"%s\" not yet supported!") % 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])
 if data_type == "BIT":
 ("    {%(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%(var_name)s = EC_READ_BIT(domain1_pd + " +
+("    beremiz%(var_name)s = EC_READ_%(data_type)s(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, " +
+("    EC_WRITE_%(data_type)s(domain1_pd + slave%(slave)d_%(index).4x_%(subindex).2x, " +
 "beremiz%(var_name)s);") % entry_infos)
 class _EthercatCFileGenerator:
 sync_manager_infos["watchdog"] = "EC_WD_DISABLE"
 sync_managers.append(sync_manager_infos)
 pdos_index = []
-for pdo, pdo_type in ([(pdo, "Inputs") for pdo in device.getTxPdo()] +
+for only_mandatory in [True, False]:
-[(pdo, "Outputs") for pdo in device.getRxPdo()]):
+for pdo, pdo_type in ([(pdo, "Inputs") for pdo in device.getTxPdo()] +
-entries = pdo.getEntry()
+[(pdo, "Outputs") for pdo in device.getRxPdo()]):
+entries = pdo.getEntry()
-pdo_needed = pdo.getMandatory()
-pdo_index = ExtractHexDecValue(pdo.getIndex().getcontent())
+pdo_needed = pdo.getMandatory()
-pdos_index.append(pdo_index)
+if only_mandatory != pdo_needed:
-entries_infos = []
+continue
-for entry in entries:
+pdo_index = ExtractHexDecValue(pdo.getIndex().getcontent())
-index = ExtractHexDecValue(entry.getIndex().getcontent())
+pdos_index.append(pdo_index)
-subindex = ExtractHexDecValue(entry.getSubIndex())
+entries_infos = []
-entry_infos = {
-"index": index,
+for entry in entries:
-"subindex": subindex,
+index = ExtractHexDecValue(entry.getIndex().getcontent())
-"name": ExtractName(entry.getName()),
+subindex = ExtractHexDecValue(entry.getSubIndex())
-"bitlen": entry.getBitLen(),
+entry_infos = {
-}
+"index": index,
-entry_infos.update(type_infos)
+"subindex": subindex,
-entries_infos.append("    {0x%(index).4x, 0x%(subindex).2x, %(bitlen)d}, /* %(name)s */" % entry_infos)
+"name": ExtractName(entry.getName()),
+"bitlen": entry.getBitLen(),
-entry_declaration = slave_variables.get((index, subindex), None)
+}
-if entry_declaration is not None:
+entry_infos.update(type_infos)
-pdo_needed = True
+entries_infos.append("    {0x%(index).4x, 0x%(subindex).2x, %(bitlen)d}, /* %(name)s */" % entry_infos)
-entry_infos.update(dict(zip(["var_type", "dir", "var_name"], entry_declaration["infos"])))
+entry_declaration = slave_variables.get((index, subindex), None)
-entry_declaration["mapped"] = True
+if entry_declaration is not None and not entry_declaration["mapped"]:
+pdo_needed = True
-if entry_infos["var_type"] != entry.getDataType().getcontent():
-raise ValueError, _("Wrong type for location \"%s\"!") % entry_infos["var_name"]
+entry_infos.update(dict(zip(["var_type", "dir", "var_name"], entry_declaration["infos"])))
+entry_declaration["mapped"] = True
-if (entry_infos["dir"] == "I" and pdo_type != "Inputs" or
-entry_infos["dir"] == "Q" and pdo_type != "Outputs"):
+if entry_infos["var_type"] != entry.getDataType().getcontent():
-raise ValueError, _("Wrong direction for location \"%s\"!") % entry_infos["var_name"]
+raise ValueError, _("Wrong type for location \"%s\"!") % entry_infos["var_name"]
-ConfigureVariable(entry_infos, str_completion)
+if (entry_infos["dir"] == "I" and pdo_type != "Inputs" or
+entry_infos["dir"] == "Q" and pdo_type != "Outputs"):
-if pdo_needed:
+raise ValueError, _("Wrong direction for location \"%s\"!") % entry_infos["var_name"]
-sm = pdo.getSm()
-if sm is None:
+ConfigureVariable(entry_infos, str_completion)
-for sm_idx, sync_manager in enumerate(sync_managers):
-if sync_manager["Name"] == pdo_type:
+if pdo_needed:
-sm = sm_idx
+sm = pdo.getSm()
 if sm is None:
-raise ValueError, _("No sync manager available for %s pdo!") % pdo_type
+for sm_idx, sync_manager in enumerate(sync_managers):
+if sync_manager["name"] == pdo_type:
-sync_managers[sm]["pdos_number"] += 1
+sm = sm_idx
-sync_managers[sm]["pdos"].append(
+if sm is None:
-{"slave": slave_idx,
+raise ValueError, _("No sync manager available for %s pdo!") % pdo_type
-"index": pdo_index,
-"name": ExtractName(pdo.getName()),
+sync_managers[sm]["pdos_number"] += 1
-"type": pdo_type,
+sync_managers[sm]["pdos"].append(
-"entries": entries_infos,
+{"slave": slave_idx,
-"entries_number": len(entries_infos),
+"index": pdo_index,
-"fixed": pdo.getFixed() == True})
+"name": ExtractName(pdo.getName()),
+"type": pdo_type,
+"entries": entries_infos,
+"entries_number": len(entries_infos),
+"fixed": pdo.getFixed() == True})
 dynamic_pdos = {}
 dynamic_pdos_number = 0
 for category, min_index, max_index in [("Inputs", 0x1600, 0x1800),
 ("Outputs", 0x1a00, 0x1C00)]:
 for profile in self.getProfile():
 profile_content = profile.getcontent()
 if profile_content is None:
-return None
+continue
 for content_element in profile_content["value"]:
 if content_element["name"] == "Dictionary":
 dictionaries.append(content_element["value"])
 elif content_element["name"] == "DictionaryFile":
 setattr(cls, "GetSyncManagers", GetSyncManagers)
 def GroupItemCompare(x, y):
 if x["type"] == y["type"]:
 if x["type"] == ETHERCAT_GROUP:
-return x["order"].__cmp__(y["order"])
+return cmp(x["order"], y["order"])
 else:
-return x["name"].__cmp__(y["name"])
+return cmp(x["name"], y["name"])
 elif x["type"] == ETHERCAT_GROUP:
 return -1
 return 1
 def SortGroupItems(group):
 if entry is not None:
 entry["PDO index"] = pdo_index
 entry["PDO name"] = pdo_name
 entry["PDO type"] = pdo_type
 else:
-if pdo_type == "Transmit":
+entry_type = pdo_entry.getDataType()
-access = "ro"
+if entry_type is not None:
-else:
+if pdo_type == "Transmit":
-access = "wo"
+access = "ro"
-entries[(index, subindex)] = {
+else:
-"Index": entry_index,
+access = "wo"
-"SubIndex": entry_subindex,
+entries[(index, subindex)] = {
-"Name": ExtractName(pdo_entry.getName()),
+"Index": entry_index,
-"Type": pdo_entry.getDataType().getcontent(),
+"SubIndex": entry_subindex,
-"Access": access,
+"Name": ExtractName(pdo_entry.getName()),
-"PDO index": pdo_index,
+"Type": entry_type.getcontent(),
-"PDO name": pdo_name,
+"Access": access,
-"PDO type": pdo_type}
+"PDO index": pdo_index,
+"PDO name": pdo_name,
+"PDO type": pdo_type}
 class RootClass:
 PlugChildsTypes = [("EthercatNode",_EthercatPlug,"Ethercat Master")]
 modules_infos.loadXMLTree(child, ["xmlns:xsi", "xsi:noNamespaceSchemaLocation"])
 if modules_infos is not None:
 vendor = modules_infos.getVendor()
-vendor_category = self.ModulesLibrary.setdefault(vendor.getId(), {"name": ExtractName(vendor.getName(), _("Miscellaneous")),
+vendor_category = self.ModulesLibrary.setdefault(ExtractHexDecValue(vendor.getId()),
-"groups": {}})
+{"name": ExtractName(vendor.getName(), _("Miscellaneous")),
+"groups": {}})
 for group in modules_infos.getDescriptions().getGroups().getGroup():
 group_type = group.getType()
 vendor_category["groups"].setdefault(group_type, {"name": ExtractName(group.getName(), group_type),
 device_type_occurrences.append(device_infos)
 for device_type_occurrences in device_dict.itervalues():
 if len(device_type_occurrences) > 1:
 for occurrence in device_type_occurrences:
 occurrence["name"] += _(" (rev. %s)") % occurrence["infos"]["revision_number"]
-library.sort(lambda x, y: x["name"].__cmp__(y["name"]))
+library.sort(lambda x, y: cmp(x["name"], y["name"]))
 return library
 def GetModuleInfos(self, type_infos):
-vendor = self.ModulesLibrary.get(type_infos["vendor"], None)
+vendor = self.ModulesLibrary.get(ExtractHexDecValue(type_infos["vendor"]), None)
 if vendor is not None:
 for group_name, group in vendor["groups"].iteritems():
 for device_type, device in group["devices"]:
 product_code = ExtractHexDecValue(device.getType().getProductCode())
 revision_number = ExtractHexDecValue(device.getType().getRevisionNo())

changeset 2031	c6f32810723e
parent 2030	7147f20c23e3
child 2032	766078d83e22