beremiz: comparison etherlab/etherlab.py

equal deleted inserted replaced

-:71fdfd4a12a3
+:b65abacdbdf9
 "Name": ExtractName(pdo_entry.getName()),
 "Type": entry_type.getcontent(),
 "Access": access,
 "PDOMapping": pdomapping}
-DEFAULT_ALIGNMENT = 8
 class ModulesLibrary:
+MODULES_EXTRA_PARAMS = [
+("pdo_alignment", {
+"column_label": _("PDO alignment (bits)"),
+"default": 8}),
+("max_pdo_size", {
+"column_label": _("Max entries by PDO (-1=unbounded)"),
+"default": -1}),
+("add_pdo", {
+"column_label": _("Creating new PDO (1=possible)"),
+"default": 0})
+]
 def __init__(self, path, parent_library=None):
 self.Path = path
 if not os.path.exists(self.Path):
 os.makedirs(self.Path)
 if parent_library is not None:
 self.LoadModules()
 else:
 self.Library = None
-self.LoadAlignments()
+self.LoadModulesExtraParams()
 def GetPath(self):
 return self.Path
-def GetAlignmentFilePath(self):
+def GetModulesExtraParamsFilePath(self):
-return os.path.join(self.Path, "alignments.cfg")
+return os.path.join(self.Path, "modules_extra_params.cfg")
 def LoadModules(self):
 self.Library = {}
 files = os.listdir(self.Path)
 device_dict = {}
 for device_type, device in group["devices"]:
 if profile_filter is None or profile_filter in device.GetProfileNumbers():
 product_code = device.getType().getProductCode()
 revision_number = device.getType().getRevisionNo()
-alignment = self.GetAlignment(vendor_id, product_code, revision_number)
+module_infos = {"device_type": device_type,
+"vendor": vendor_id,
+"product_code": product_code,
+"revision_number": revision_number}
+module_infos.update(self.GetModuleExtraParams(vendor_id, product_code, revision_number))
 device_infos = {"name": ExtractName(device.getName()),
 "type": ETHERCAT_DEVICE,
-"infos": {"device_type": device_type,
+"infos": module_infos,
-"vendor": vendor_id,
-"product_code": product_code,
-"revision_number": revision_number,
-"alignment": alignment},
 "children": []}
 group_infos["children"].append(device_infos)
 device_type_occurrences = device_dict.setdefault(device_type, [])
 device_type_occurrences.append(device_infos)
 for device_type_occurrences in device_dict.itervalues():
 for device_type, device_infos in group_infos["devices"]:
 product_code = ExtractHexDecValue(device_infos.getType().getProductCode())
 revision_number = ExtractHexDecValue(device_infos.getType().getRevisionNo())
 if (product_code == ExtractHexDecValue(module_infos["product_code"]) and
 revision_number == ExtractHexDecValue(module_infos["revision_number"])):
-return device_infos, self.GetAlignment(vendor, product_code, revision_number)
+return device_infos, self.GetModuleExtraParams(vendor, product_code, revision_number)
 return None, None
 def ImportModuleLibrary(self, filepath):
 if os.path.isfile(filepath):
 shutil.copy(filepath, self.Path)
 self.LoadModules()
 return True
 return False
-def LoadAlignments(self):
+def LoadModulesExtraParams(self):
-self.Alignments = {}
+self.ModulesExtraParams = {}
-csvfile_path = self.GetAlignmentFilePath()
+csvfile_path = self.GetModulesExtraParamsFilePath()
 if os.path.exists(csvfile_path):
 csvfile = open(csvfile_path, "rb")
 sample = csvfile.read(1024)
 csvfile.seek(0)
 dialect = csv.Sniffer().sniff(sample)
 for row in reader:
 if has_header:
 has_header = False
 else:
 try:
-self.Alignments[tuple(map(int, row[:3]))] = int(row[3])
+self.ModulesExtraParams[tuple(map(int, row[:3]))] = dict(
+zip([param for param, params_infos in self.MODULES_EXTRA_PARAMS],
+int(row[3])))
 except:
 pass
 csvfile.close()
-def SaveAlignments(self):
+def SaveModulesExtraParams(self):
-csvfile = open(self.GetAlignmentFilePath(), "wb")
+csvfile = open(self.GetModulesExtraParamsFilePath(), "wb")
+extra_params = [param for param, params_infos in self.MODULES_EXTRA_PARAMS]
 writer = csv.writer(csvfile, delimiter=';')
-writer.writerow(['Vendor', 'product_code', 'revision_number', 'alignment'])
+writer.writerow(['Vendor', 'product_code', 'revision_number'] + extra_params)
-for (vendor, product_code, revision_number), alignment in self.Alignments.iteritems():
+for (vendor, product_code, revision_number), module_extra_params in self.ModulesExtraParams.iteritems():
-writer.writerow([vendor, product_code, revision_number, alignment])
+writer.writerow([vendor, product_code, revision_number] +
+[module_extra_params.get(param, '')
+for param in extra_params])
 csvfile.close()
-def SetAlignment(self, vendor, product_code, revision_number, alignment):
+def SetModuleExtraParam(self, vendor, product_code, revision_number, param, value):
 vendor = ExtractHexDecValue(vendor)
 product_code = ExtractHexDecValue(product_code)
 revision_number = ExtractHexDecValue(revision_number)
-self.Alignments[tuple([vendor, product_code, revision_number])] = alignment
+self.ModulesExtraParams[tuple([vendor, product_code, revision_number])][param] = value
-self.SaveAlignments()
+self.SaveModulesExtraParams()
-def GetAlignment(self, vendor, product_code, revision_number):
+def GetModuleExtraParams(self, vendor, product_code, revision_number):
 vendor = ExtractHexDecValue(vendor)
 product_code = ExtractHexDecValue(product_code)
 revision_number = ExtractHexDecValue(revision_number)
-alignment = self.Alignments.get(tuple([vendor, product_code, revision_number]))
-if alignment is not None:
-return alignment
 if self.ParentLibrary is not None:
-return self.ParentLibrary.GetAlignment(vendor, product_code, revision_number)
+extra_params = self.ParentLibrary.GetModuleExtraParams(vendor, product_code, revision_number)
-return DEFAULT_ALIGNMENT
+else:
+extra_params = {}
+extra_params.update(self.ModulesExtraParams.get(tuple([vendor, product_code, revision_number]), {}))
+for param, param_infos in self.MODULES_EXTRA_PARAMS:
+extra_params.setdefault(param, param_infos["default"])
+return extra_params
 USERDATA_DIR = wx.StandardPaths.Get().GetUserDataDir()
 if wx.Platform != '__WXMSW__':
 USERDATA_DIR += '_files'

changeset 2137	b65abacdbdf9
parent 2133	ba0b2ca7db26
child 2138	79dc2d15c580