equal
deleted
inserted
replaced
309 if vendor_infos is not None: |
309 if vendor_infos is not None: |
310 for group_name, group_infos in vendor_infos["groups"].iteritems(): |
310 for group_name, group_infos in vendor_infos["groups"].iteritems(): |
311 for device_type, device_infos in group_infos["devices"]: |
311 for device_type, device_infos in group_infos["devices"]: |
312 product_code = ExtractHexDecValue(device_infos.getType().getProductCode()) |
312 product_code = ExtractHexDecValue(device_infos.getType().getProductCode()) |
313 revision_number = ExtractHexDecValue(device_infos.getType().getRevisionNo()) |
313 revision_number = ExtractHexDecValue(device_infos.getType().getRevisionNo()) |
314 if (product_code == ExtractHexDecValue(module_infos["product_code"]) and |
314 if product_code == ExtractHexDecValue(module_infos["product_code"]) and \ |
315 revision_number == ExtractHexDecValue(module_infos["revision_number"])): |
315 revision_number == ExtractHexDecValue(module_infos["revision_number"]): |
316 self.cntdevice = device_infos |
316 self.cntdevice = device_infos |
317 self.cntdeviceType = device_type |
317 self.cntdeviceType = device_type |
318 return device_infos, self.GetModuleExtraParams(vendor, product_code, revision_number) |
318 return device_infos, self.GetModuleExtraParams(vendor, product_code, revision_number) |
319 return None, None |
319 return None, None |
320 |
320 |
340 if has_header: |
340 if has_header: |
341 has_header = False |
341 has_header = False |
342 else: |
342 else: |
343 params_values = {} |
343 params_values = {} |
344 for (param, param_infos), value in zip( |
344 for (param, param_infos), value in zip( |
345 self.MODULES_EXTRA_PARAMS, row[3:]): |
345 self.MODULES_EXTRA_PARAMS, row[3:]): |
346 if value != "": |
346 if value != "": |
347 params_values[param] = int(value) |
347 params_values[param] = int(value) |
348 self.ModulesExtraParams[ |
348 self.ModulesExtraParams[ |
349 tuple(map(int, row[:3]))] = params_values |
349 tuple(map(int, row[:3]))] = params_values |
350 csvfile.close() |
350 csvfile.close() |