equal
deleted
inserted
replaced
237 if var_class == LOCATION_VAR_INPUT: |
237 if var_class == LOCATION_VAR_INPUT: |
238 var_dir = "%I" |
238 var_dir = "%I" |
239 else: |
239 else: |
240 var_dir = "%Q" |
240 var_dir = "%Q" |
241 |
241 |
242 vars.append({"name": "%s - %s" % (ExtractName(pdo.getName()), ExtractName(entry.getName())), |
242 pdo_name = ExtractName(pdo.getName()) |
|
243 entry_name = ExtractName(entry.getName()) |
|
244 vars.append({"name": "%s - %s" % (pdo_name, entry_name), |
243 "type": var_class, |
245 "type": var_class, |
244 "size": var_size, |
246 "size": var_size, |
245 "IEC_type": var_type, |
247 "IEC_type": var_type, |
|
248 "var_name": "%s_%s" % (type_infos["device_type"], "_".join(pdo_name.split())), |
246 "location": "%s%s%s"%(var_dir, var_size, ".".join(map(str, current_location + |
249 "location": "%s%s%s"%(var_dir, var_size, ".".join(map(str, current_location + |
247 slave_pos + |
250 slave_pos + |
248 (index, subindex)))), |
251 (index, subindex)))), |
249 "description": "", |
252 "description": "", |
250 "children": []}) |
253 "children": []}) |