Fix bug when generate od cfile with a table of visible_string

[CanFestival-3.git] / objdictgen / gen_cfile.py

diff --git a/objdictgen/gen_cfile.py b/objdictgen/gen_cfile.py
index cefc3fb6ae8f4fbfcf7ce94b6541178dbb586260..e87ccd8a6f7d64d71cbfebb0999dec236deda8bb 100644 (file)
--- a/objdictgen/gen_cfile.py
+++ b/objdictgen/gen_cfile.py
@@ -67,15 +67,16 @@ def GetValidTypeInfos(typename, items=[]):
                     size = max(size, int(values[1]))
                 typeinfos = ("UNS8", size, "visible_string", False)
             elif values[0] == "DOMAIN":
-                size = 0
+                size = default_string_size
                 for item in items:
                     size = max(size, len(item))
-                typeinfos = ("UNS8*", size, "domain", False)
+                typeinfos = ("UNS8", size, "domain", False)
             elif values[0] == "BOOLEAN":
                 typeinfos = ("UNS8", None, "boolean", False)
             else:
                 raise ValueError, """!!! %s isn't a valid type for CanFestival."""%typename
-            internal_types[typename] = typeinfos
+            if typeinfos[2] not in ["visible_string", "domain"]:
+                internal_types[typename] = typeinfos
         else:
             raise ValueError, """!!! %s isn't a valid type for CanFestival."""%typename
     return typeinfos
@@ -95,7 +96,10 @@ def WriteFile(filepath, content):
     cfile.write(content)
     cfile.close()
 
-def GenerateFileContent(Node, headerfilepath):
+def GenerateFileContent(Node, headerfilepath, pointers_dict = {}):
+    """
+    pointers_dict = {(Idx,Sidx):"VariableName",...}
+    """
     global type
     global internal_types
     global default_string_size
@@ -162,6 +166,7 @@ def GenerateFileContent(Node, headerfilepath):
 #-------------------------------------------------------------------------------
 
     mappedVariableContent = ""
+    pointedVariableContent = ""
     strDeclareHeader = ""
     strDeclareCallback = ""
     indexContents = {}
@@ -179,7 +184,7 @@ def GenerateFileContent(Node, headerfilepath):
             strIndex += "\n/* index 0x%(index)04X :   %(EntryName)s. */\n"%texts
         
         # Entry type is VAR
-        if type(values) != ListType:
+        if not isinstance(values, ListType):
             subentry_infos = Node.GetSubentryInfos(index, 0)
             typename = Node.GetTypeName(subentry_infos["type"])
             typeinfos = GetValidTypeInfos(typename, [values])
@@ -215,13 +220,15 @@ def GenerateFileContent(Node, headerfilepath):
                 texts["subIndexType"] = typeinfos[0]
                 if typeinfos[1] is not None:
                     texts["suffixe"] = "[%d]"%typeinfos[1]
+                    texts["type_suffixe"] = "*"
                 else:
                     texts["suffixe"] = ""
+                    texts["type_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
-                    mappedVariableContent += "%(subIndexType)s %(name)s[] =\t\t/* Mapped at index 0x%(index)04X, subindex 0x01 - 0x%(length)02X */\n  {\n"%texts
+                    strDeclareHeader += "extern %(subIndexType)s%(type_suffixe)s %(name)s[];\t\t/* Mapped at index 0x%(index)04X, subindex 0x01 - 0x%(length)02X */\n"%texts
+                    mappedVariableContent += "%(subIndexType)s%(type_suffixe)s %(name)s[] =\t\t/* Mapped at index 0x%(index)04X, subindex 0x01 - 0x%(length)02X */\n  {\n"%texts
                     for subIndex, value in enumerate(values):
                         sep = ","
                         if subIndex > 0:
@@ -231,7 +238,7 @@ def GenerateFileContent(Node, headerfilepath):
                             mappedVariableContent += "    %s%s%s\n"%(value, sep, comment)
                     mappedVariableContent += "  };\n"
                 else:
-                    strIndex += "                    %(subIndexType)s %(NodeName)s_obj%(index)04X[] = \n                    {\n"%texts
+                    strIndex += "                    %(subIndexType)s%(type_suffixe)s %(NodeName)s_obj%(index)04X[] = \n                    {\n"%texts
                     for subIndex, value in enumerate(values):
                         sep = ","
                         if subIndex > 0:
@@ -285,7 +292,7 @@ def GenerateFileContent(Node, headerfilepath):
                 sep = ""
             typename = Node.GetTypeName(subentry_infos["type"])
             if entry_infos["struct"] & OD_IdenticalSubindexes:
-                typeinfos = GetValidTypeInfos(typename, values)
+                typeinfos = GetValidTypeInfos(typename, values[1:])
             else:
                 typeinfos = GetValidTypeInfos(typename, [values[subIndex]])
             if subIndex == 0:
@@ -319,9 +326,12 @@ def GenerateFileContent(Node, headerfilepath):
             else:
                 save = ""
             strIndex += "                       { %s%s, %s, %s, (void*)&%s }%s\n"%(subentry_infos["access"].upper(),save,typeinfos[2],sizeof,name,sep)
+            pointer_name = pointers_dict.get((index, subIndex), None)
+            if pointer_name is not None:
+                pointedVariableContent += "%s* %s = &%s;\n"%(typeinfos[0], pointer_name, name)
         strIndex += "                     };\n"
         indexContents[index] = strIndex
-
+        
 #-------------------------------------------------------------------------------
 #                     Declaration of Particular Parameters
 #-------------------------------------------------------------------------------
@@ -365,7 +375,7 @@ def GenerateFileContent(Node, headerfilepath):
         entry_infos = Node.GetEntryInfos(0x1014)
         texts["EntryName"] = entry_infos["name"]
         indexContents[0x1014] = """\n/* index 0x1014 :   %(EntryName)s */
-                    UNS32 %(NodeName)s_obj1014 = 0x0;   /* 0 */
+                    UNS32 %(NodeName)s_obj1014 = 0x80 + 0x%(NodeID)02X;   /* 128 + NodeID */
 """%texts
 
     if 0x1016 in communicationlist:
@@ -430,13 +440,13 @@ def GenerateFileContent(Node, headerfilepath):
 
     fileContent += """
 /**************************************************************************/
-/* Declaration of the mapped variables                                    */
+/* Declaration of mapped variables                                        */
 /**************************************************************************/
 """ + mappedVariableContent
 
     fileContent += """
 /**************************************************************************/
-/* Declaration of the value range types                                   */
+/* Declaration of value range types                                       */
 /**************************************************************************/
 """ + valueRangeContent
 
@@ -474,6 +484,12 @@ $$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$$
     for index in contentlist:
         fileContent += indexContents[index]
 
+    fileContent += """
+/**************************************************************************/
+/* Declaration of pointed variables                                       */
+/**************************************************************************/
+""" + pointedVariableContent
+
     fileContent += """
 const indextable %(NodeName)s_objdict[] = 
 {
@@ -542,10 +558,10 @@ extern CO_Data %(NodeName)s_Data;
 #                             Main Function
 #-------------------------------------------------------------------------------
 
-def GenerateFile(filepath, node):
+def GenerateFile(filepath, node, pointers_dict = {}):
     try:
         headerfilepath = os.path.splitext(filepath)[0]+".h"
-        content, header = GenerateFileContent(node, os.path.split(headerfilepath)[1])
+        content, header = GenerateFileContent(node, os.path.split(headerfilepath)[1], pointers_dict)
         WriteFile(filepath, content)
         WriteFile(headerfilepath, header)
         return None