From: duplo Date: Fri, 19 Dec 2008 09:43:30 +0000 (+0000) Subject: Add the cpus in the cpu list X-Git-Tag: 2.1.0~584 X-Git-Url: https://codewiz.org/gitweb?a=commitdiff_plain;h=0676a7451f0fd727af3c17350f6abbde825b4e3b;p=bertos.git Add the cpus in the cpu list git-svn-id: https://src.develer.com/svnoss/bertos/trunk@2098 38d2e660-2303-0410-9eaa-f027e97ec537 --- diff --git a/wizard/BCpuPage.py b/wizard/BCpuPage.py index 03ef2cc0..3a526f9c 100644 --- a/wizard/BCpuPage.py +++ b/wizard/BCpuPage.py @@ -20,9 +20,9 @@ class BCpuPage(BWizardPage): self.setTitle(self.tr("Select the CPU")) def _populateCpuList(self): - cpus = bertos_utils.findDefinitions("cdef", self._projectInfoRetrieve("SOURCES_PATH")) - for cpu in cpus.keys(): - self.pageContent.cpuList.addItem(QListWidgetItem(cpu)) + infos = bertos_utils.loadCpuInfos(self._projectInfoRetrieve("SOURCES_PATH")) + for cpu in infos: + self.pageContent.cpuList.addItem(QListWidgetItem(cpu["CORE_CPU"])) def reloadData(self): self._populateCpuList() diff --git a/wizard/bertos_utils.py b/wizard/bertos_utils.py index fd199632..b927ec48 100644 --- a/wizard/bertos_utils.py +++ b/wizard/bertos_utils.py @@ -36,7 +36,7 @@ def loadCpuInfos(path): D = {} def include(filename, dict = D, directory=definition[1]): execfile(directory + "/" + filename, {}, D) - d["include"] = include + D["include"] = include include(definition[0], D) cpuInfos.append(D) return cpuInfos