Use alias name for the configuration parameters and store the constants defined by...

git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2396 38d2e660-2303-0410-9eaa-f027e97ec537

diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py
index 3e8f36ba6ec4850085e974560eff052e86db835f..ac424f727516ed56b53667e56d9bb26a8c31946c 100644 (file)
--- a/wizard/bertos_utils.py
+++ b/wizard/bertos_utils.py
@@ -240,20 +240,26 @@ def loadModuleDefinition(first_comment):
             moduleDefinition["module_description"] = line[line.find("\\brief") + len("\\brief "):]
     moduleDict = {}
     if "module_name" in moduleDefinition.keys():
-        moduleDict[moduleDefinition[const.MODULE_DEFINITION["module_name"]]] = {}
-        if "module_depends" in moduleDefinition.keys():
+        moduleName = moduleDefinition[const.MODULE_DEFINITION["module_name"]]
+        del moduleDefinition[const.MODULE_DEFINITION["module_name"]]
+        moduleDict[moduleName] = {}
+        if const.MODULE_DEFINITION["module_depends"] in moduleDefinition.keys():
             if type(moduleDefinition[const.MODULE_DEFINITION["module_depends"]]) == str:
                 moduleDefinition[const.MODULE_DEFINITION["module_depends"]] = (moduleDefinition[const.MODULE_DEFINITION["module_depends"]],)
-            moduleDict[moduleDefinition[const.MODULE_DEFINITION["module_name"]]]["depends"] = moduleDefinition[const.MODULE_DEFINITION["module_depends"]]
+            moduleDict[moduleName]["depends"] = moduleDefinition[const.MODULE_DEFINITION["module_depends"]]
+            del moduleDefinition[const.MODULE_DEFINITION["module_depends"]]
         else:
-            moduleDict[moduleDefinition[const.MODULE_DEFINITION["module_name"]]]["depends"] = ()
-        if "module_configuration" in moduleDefinition.keys():
-            moduleDict[moduleDefinition[const.MODULE_DEFINITION["module_name"]]]["configuration"] = moduleDefinition[const.MODULE_DEFINITION["module_configuration"]]
+            moduleDict[moduleName]["depends"] = ()
+        if const.MODULE_DEFINITION["module_configuration"] in moduleDefinition.keys():
+            moduleDict[moduleName]["configuration"] = moduleDefinition[const.MODULE_DEFINITION["module_configuration"]]
+            del moduleDefinition[const.MODULE_DEFINITION["module_configuration"]]
         else:
-            moduleDict[moduleDefinition[const.MODULE_DEFINITION["module_name"]]]["configuration"] = ""
+            moduleDict[moduleName]["configuration"] = ""
         if "module_description" in moduleDefinition.keys():
-            moduleDict[moduleDefinition[const.MODULE_DEFINITION["module_name"]]]["description"] = moduleDefinition["module_description"]
-        moduleDict[moduleDefinition[const.MODULE_DEFINITION["module_name"]]]["enabled"] = False
+            moduleDict[moduleName]["description"] = moduleDefinition["module_description"]
+            del moduleDefinition["module_description"]
+        moduleDict[moduleName]["consts"] = moduleDefinition
+        moduleDict[moduleName]["enabled"] = False
     return toBeParsed, moduleDict
 
 def loadDefineLists(commentList):

diff --git a/wizard/mktemplates/template.mk b/wizard/mktemplates/template.mk
index dc2d3ea0b89e347bc3872f0aee10c4ecee31628e..863bc13a4bda48048a51b378d077ccd6ebef7676 100644 (file)
--- a/wizard/mktemplates/template.mk
+++ b/wizard/mktemplates/template.mk
@@ -24,6 +24,7 @@ $pname_MCU = $cpuname
 
 $pname_CSRC = \
        $csrc
+       $main \
        #
 
 $pname_PCSRC += $pcsrc