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

Configtool: let the parsing method decide about values. 

Shouldn't cause functional change.

So far, values commented out are still ignored, which is why the
used regexp changed. This will hopefully change in the future,
so a configuration can remember disabled values, too.
This commit is contained in:
Markus Hitter 2015-07-14 22:32:41 +02:00
parent d9e4cd1086
commit a48d9edf67
2 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configtool/boardpanel.py
View File

@ -314,8 +314,8 @@ class BoardPanel(wx.Panel):
if self.parseCandidateValues(ln): if self.parseCandidateValues(ln):
continue continue
elif ln.lstrip().startswith("#define"): elif self.parseDefineValue(ln):
self.parseDefineValue(ln) continue
else: else:
m = reDefTS.search(ln) m = reDefTS.search(ln)
@ -385,24 +385,26 @@ class BoardPanel(wx.Panel):
tt = re.findall(reDefQSm2, t[1]) tt = re.findall(reDefQSm2, t[1])
if len(tt) == 1: if len(tt) == 1:
self.cfgValues[t[0]] = tt[0] self.cfgValues[t[0]] = tt[0]
return return True
elif len(tt) > 1: elif len(tt) > 1:
self.cfgValues[t[0]] = tt self.cfgValues[t[0]] = tt
return return True
m = reDefine.search(ln) m = reDefineBL.search(ln)
if m: if m:
t = m.groups() t = m.groups()
if len(t) == 2: if len(t) == 2:
self.cfgValues[t[0]] = t[1] self.cfgValues[t[0]] = t[1]
return return True
m = reDefBool.search(ln) m = reDefBoolBL.search(ln)
if m: if m:
t = m.groups() t = m.groups()
if len(t) == 1: if len(t) == 1:
self.cfgValues[t[0]] = True self.cfgValues[t[0]] = True
return return True
return False
def parseCandidateValues(self, ln): def parseCandidateValues(self, ln):
m = reCandThermPins.match(ln) m = reCandThermPins.match(ln)

58
configtool/printerpanel.py
View File

@ -255,7 +255,8 @@ class PrinterPanel(wx.Panel):
ln = prevLines + ln ln = prevLines + ln
prevLines = "" prevLines = ""
self.parseDefineValue(ln) if self.parseDefineValue(ln):
continue
if os.path.basename(fn) in protectedFiles: if os.path.basename(fn) in protectedFiles:
self.parent.enableSavePrinter(False, True) self.parent.enableSavePrinter(False, True)
@ -288,35 +289,36 @@ class PrinterPanel(wx.Panel):
return False return False
def parseDefineValue(self, ln): def parseDefineValue(self, ln):
if ln.lstrip().startswith("#define"): m = reDefQS.search(ln)
m = reDefQS.search(ln) if m:
if m: t = m.groups()
t = m.groups() if len(t) == 2:
if len(t) == 2: m = reDefQSm.search(ln)
m = reDefQSm.search(ln) if m:
if m: t = m.groups()
t = m.groups() tt = re.findall(reDefQSm2, t[1])
tt = re.findall(reDefQSm2, t[1]) if len(tt) == 1:
if len(tt) == 1: self.cfgValues[t[0]] = tt[0]
self.cfgValues[t[0]] = tt[0] return True
return elif len(tt) > 1:
elif len(tt) > 1: self.cfgValues[t[0]] = tt
self.cfgValues[t[0]] = tt return True
return
m = reDefine.search(ln) m = reDefineBL.search(ln)
if m: if m:
t = m.groups() t = m.groups()
if len(t) == 2: if len(t) == 2:
self.cfgValues[t[0]] = t[1] self.cfgValues[t[0]] = t[1]
return return True
m = reDefBool.search(ln) m = reDefBoolBL.search(ln)
if m: if m:
t = m.groups() t = m.groups()
if len(t) == 1: if len(t) == 1:
self.cfgValues[t[0]] = True self.cfgValues[t[0]] = True
return return True
return False
def onSaveConfig(self, evt): def onSaveConfig(self, evt):
path = self.configFile path = self.configFile