canfestival: comparison objdictgen/gen

equal deleted inserted replaced

-:ae068232859c
+:64a8c24b61a5
 index_categories = ["firstIndex", "lastIndex"]
 generated_tag = """\n/* File generated by gen_cfile.py. Should not be modified. */\n"""
 internal_types = {}
+default_string_size = 10
 # Format a string for making a C++ variable
 def FormatName(name):
 wordlist = [word for word in word_model.findall(name) if word != '']
 return "_".join(wordlist)
 # Extract the informations from a given type name
-def GetValidTypeInfos(typename):
+def GetValidTypeInfos(typename, items=[]):
 if typename in internal_types:
 return internal_types[typename]
 else:
 result = type_model.match(typename)
 if result:
 values = result.groups()
 if values[0] == "UNSIGNED" and int(values[1]) in [i * 8 for i in xrange(1, 9)]:
-typeinfos = ("UNS%s"%values[1], "", "uint%s"%values[1], True)
+typeinfos = ("UNS%s"%values[1], None, "uint%s"%values[1], True)
 elif values[0] == "INTEGER" and int(values[1]) in [i * 8 for i in xrange(1, 9)]:
-typeinfos = ("INTEGER%s"%values[1], "", "int%s"%values[1], False)
+typeinfos = ("INTEGER%s"%values[1], None, "int%s"%values[1], False)
 elif values[0] == "REAL" and int(values[1]) in (32, 64):
-typeinfos = ("%s%s"%(values[0], values[1]), "", "real%s"%values[1], False)
+typeinfos = ("%s%s"%(values[0], values[1]), None, "real%s"%values[1], False)
 elif values[0] == "VISIBLE_STRING":
-if values[1] == "":
+size = default_string_size
-typeinfos = ("UNS8", "[10]", "visible_string", False)
+for item in items:
-else:
+size = max(size, len(item))
-typeinfos = ("UNS8", "[%s]"%values[1], "visible_string", False)
+if values[1] != "":
+size = max(size, int(values[1]))
+typeinfos = ("UNS8", size, "visible_string", False)
 elif values[0] == "DOMAIN":
-typeinfos = ("UNS8*", "", "domain", True)
+typeinfos = ("UNS8*", None, "domain", False)
 elif values[0] == "BOOLEAN":
-typeinfos = ("UNS8", "", "boolean", True)
+typeinfos = ("UNS8", None, "boolean", False)
 else:
 raise ValueError, """!!! %s isn't a valid type for CanFestival."""%typename
 internal_types[typename] = typeinfos
 else:
 raise ValueError, """!!! %s isn't a valid type for CanFestival."""%typename
 cfile.close()
 def GenerateFileContent(Node, headerfilepath):
 global type
 global internal_types
+global default_string_size
 texts = {}
 texts["maxPDOtransmit"] = 0
 texts["NodeName"] = Node.GetNodeName()
 texts["NodeID"] = Node.GetNodeID()
 texts["NodeType"] = Node.GetNodeType()
 texts["Description"] = Node.GetNodeDescription()
 texts["iam_a_slave"] = 0
 if (texts["NodeType"] == "slave"):
 texts["iam_a_slave"] = 1
+default_string_size = Node.GetDefaultStringSize()
 # Compiling lists of indexes
 rangelist = [idx for idx in Node.GetIndexes() if 0 <= idx <= 0x260]
 listIndex = [idx for idx in Node.GetIndexes() if 0x1000 <= idx <= 0xFFFF]
 communicationlist = [idx for idx in Node.GetIndexes() if 0x1000 <= idx <= 0x11FF]
 # Entry type is VAR
 if type(values) != ListType:
 subentry_infos = Node.GetSubentryInfos(index, 0)
 typename = Node.GetTypeName(subentry_infos["type"])
-typeinfos = GetValidTypeInfos(typename)
+typeinfos = GetValidTypeInfos(typename, [values])
 texts["subIndexType"] = typeinfos[0]
-texts["suffixe"] = typeinfos[1]
+if typeinfos[1] is not None:
+texts["suffixe"] = "[%d]"%typeinfos[1]
+else:
+texts["suffixe"] = ""
 if typeinfos[2] == "visible_string":
 texts["value"] = "\"%s\""%values
 texts["comment"] = ""
 elif typeinfos[2] == "domain":
 texts["value"] = "\"%s\""%''.join(["\\x%2.2x"%ord(char) for char in value])
 # Entry type is RECORD
 if entry_infos["struct"] & OD_IdenticalSubindexes:
 subentry_infos = Node.GetSubentryInfos(index, 1)
 typename = Node.GetTypeName(subentry_infos["type"])
-typeinfos = GetValidTypeInfos(typename)
+typeinfos = GetValidTypeInfos(typename, values[1:])
 texts["subIndexType"] = typeinfos[0]
-texts["suffixe"] = typeinfos[1]
+if typeinfos[1] is not None:
+texts["suffixe"] = "[%d]"%typeinfos[1]
+else:
+texts["suffixe"] = ""
 texts["length"] = values[0]
 if index in variablelist:
 texts["name"] = FormatName(entry_infos["name"])
 strDeclareHeader += "extern %(subIndexType)s %(name)s[%(length)d]%(suffixe)s;\t\t/* Mapped at index 0x%(index)04X, subindex 0x01 - 0x%(length)02X */\n"%texts
 if callbacks:
 for subIndex, value in enumerate(values):
 texts["subIndex"] = subIndex
 if subIndex > 0:
 subentry_infos = Node.GetSubentryInfos(index, subIndex)
 typename = Node.GetTypeName(subentry_infos["type"])
-typeinfos = GetValidTypeInfos(typename)
+typeinfos = GetValidTypeInfos(typename, [values[subIndex]])
 texts["subIndexType"] = typeinfos[0]
-texts["suffixe"] = typeinfos[1]
+if typeinfos[1] is not None:
+texts["suffixe"] = "[%d]"%typeinfos[1]
+else:
+texts["suffixe"] = ""
 if typeinfos[2] == "visible_string":
 texts["value"] = "\"%s\""%value
 texts["comment"] = ""
 elif typeinfos[2] == "domain":
 texts["value"] = "\"%s\""%''.join(["\\x%2.2x"%ord(char) for char in value])
 if subIndex < len(values) - 1:
 sep = ","
 else:
 sep = ""
 typename = Node.GetTypeName(subentry_infos["type"])
-typeinfos = GetValidTypeInfos(typename)
+if entry_infos["struct"] & OD_IdenticalSubindexes:
+typeinfos = GetValidTypeInfos(typename, values)
+else:
+typeinfos = GetValidTypeInfos(typename, [values[subIndex]])
 if subIndex == 0:
 if index == 0x1003:
 typeinfos = GetValidTypeInfos("valueRange_EMC")
 if entry_infos["struct"] & OD_MultipleSubindexes:
 name = "%(NodeName)s_highestSubIndex_obj%(index)04X"%texts
 if index in variablelist:
 name = FormatName("%s_%s"%(entry_infos["name"],subentry_infos["name"]))
 else:
 name = "%s_obj%04X_%s"%(texts["NodeName"], texts["index"], FormatName(subentry_infos["name"]))
 if typeinfos[2] in ["visible_string", "domain"]:
-sizeof = str(len(values[subIndex]))
+sizeof = typeinfos[1]
 else:
 sizeof = "sizeof (%s)"%typeinfos[0]
 params = Node.GetParamsEntry(index, subIndex)
 if params["save"]:
 save = "|TO_BE_SAVE"

changeset 418	64a8c24b61a5
parent 366	47763dd15e00
child 420	a42335b39bf4