josh
/
Teacup_Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Configtool: let the parsing method decide what a candidate is. 

This is mostly for code robustness.
This commit is contained in:
Markus Hitter 2015-07-15 22:03:16 +02:00
parent 7acbf30e22
commit eeee384ed6
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
configtool/boardpanel.py
View File

@ -288,8 +288,8 @@ class BoardPanel(wx.Panel):
ln = prevLines + ln ln = prevLines + ln
prevLines = "" prevLines = ""
if ln.lstrip().startswith("//"): if self.parseCandidateValues(ln):
self.parseCandidateValues(ln) continue
elif ln.lstrip().startswith("#define"): elif ln.lstrip().startswith("#define"):
self.parseDefineName(ln) self.parseDefineName(ln)
@ -311,8 +311,8 @@ class BoardPanel(wx.Panel):
ln = prevLines + ln ln = prevLines + ln
prevLines = "" prevLines = ""
if ln.lstrip().startswith("//"): if self.parseCandidateValues(ln):
self.parseCandidateValues(ln) continue
elif ln.lstrip().startswith("#define"): elif ln.lstrip().startswith("#define"):
self.parseDefineValue(ln) self.parseDefineValue(ln)
@ -407,28 +407,28 @@ class BoardPanel(wx.Panel):
t = m.groups() t = m.groups()
if len(t) == 1: if len(t) == 1:
self.candThermPins.append(t[0]) self.candThermPins.append(t[0])
return return True
m = reCandHeatPins.match(ln) m = reCandHeatPins.match(ln)
if m: if m:
t = m.groups() t = m.groups()
if len(t) == 1: if len(t) == 1:
self.candHeatPins.append(t[0]) self.candHeatPins.append(t[0])
return return True
m = reCandProcessors.match(ln) m = reCandProcessors.match(ln)
if m: if m:
t = m.groups() t = m.groups()
if len(t) == 1: if len(t) == 1:
self.candProcessors.append(t[0]) self.candProcessors.append(t[0])
return return True
m = reCandCPUClocks.match(ln) m = reCandCPUClocks.match(ln)
if m: if m:
t = m.groups() t = m.groups()
if len(t) == 1: if len(t) == 1:
self.candClocks.append(t[0]) self.candClocks.append(t[0])
return return True
m = reDefTT.match(ln) m = reDefTT.match(ln)
if m: if m:
@ -437,7 +437,9 @@ class BoardPanel(wx.Panel):
s = self.parseTempTable(t[1]) s = self.parseTempTable(t[1])
if s: if s:
self.tempTables[t[0]] = s self.tempTables[t[0]] = s
return return True
return False
def parseSensor(self, s): def parseSensor(self, s):
m = reSensor.search(s) m = reSensor.search(s)