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

Configtool: DEFINE_TEMP_SENSOR always wants four paramters. 

Compilation with something else than a thermistor still doesn't
work, because temp.c insists on a thermistor table, but we're a
step closer.
This commit is contained in:
Markus Hitter 2015-04-03 20:18:09 +02:00
parent 29dd85a129
commit 8408d8c294
3 changed files with 8 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
configtool/addsensordlg.py
View File

@ -84,7 +84,6 @@ class AddSensorDlg(wx.Dialog):
self.tcAddtl = wx.TextCtrl(self, wx.ID_ANY, "") self.tcAddtl = wx.TextCtrl(self, wx.ID_ANY, "")
self.tcAddtl.SetFont(font) self.tcAddtl.SetFont(font)
self.tcAddtl.Bind(wx.EVT_TEXT, self.onAddtlEntry) self.tcAddtl.Bind(wx.EVT_TEXT, self.onAddtlEntry)
self.selectSensorType(sl[0])
lsz.Add(self.tcAddtl) lsz.Add(self.tcAddtl)
self.tcAddtl.SetToolTipString("Enter additional information required " self.tcAddtl.SetToolTipString("Enter additional information required "
"by the sensor type.") "by the sensor type.")
@ -146,12 +145,6 @@ class AddSensorDlg(wx.Dialog):
def onAddtlEntry(self, evt): def onAddtlEntry(self, evt):
evt.Skip() evt.Skip()
def selectSensorType(self, lbl):
if lbl == 'Thermistor':
self.tcAddtl.Enable(True);
else:
self.tcAddtl.Enable(False);
def onChoice(self, evt): def onChoice(self, evt):
pass pass
@ -160,8 +153,6 @@ class AddSensorDlg(wx.Dialog):
s = ch.GetSelection() s = ch.GetSelection()
label = ch.GetString(s) label = ch.GetString(s)
self.selectSensorType(label)
evt.Skip() evt.Skip()
def getValues(self): def getValues(self):
@ -170,11 +161,10 @@ class AddSensorDlg(wx.Dialog):
addtl = self.tcAddtl.GetValue() addtl = self.tcAddtl.GetValue()
stype = self.chType.GetString(self.chType.GetSelection()) stype = self.chType.GetString(self.chType.GetSelection())
if stype in ['Thermistor']: if stype not in ['Thermistor']:
return (nm, sensorTypes[stype], pin, addtl) addtl = "NONE"
else:
return (nm, sensorTypes[stype], pin)
return (nm, sensorTypes[stype], pin, addtl)
def onSave(self, evt): def onSave(self, evt):
self.EndModal(wx.ID_OK) self.EndModal(wx.ID_OK)

16
configtool/boardpanel.py
View File

@ -11,7 +11,7 @@ from configtool.data import (defineValueFormat,
reCandProcessors, reCandCPUClocks, reFloatAttr, reCandProcessors, reCandCPUClocks, reFloatAttr,
reDefine, reDefineBL, reDefQS, reDefQSm, reDefine, reDefineBL, reDefQS, reDefQSm,
reDefQSm2, reDefBool, reDefBoolBL, reDefHT, reDefQSm2, reDefBool, reDefBoolBL, reDefHT,
reDefTS, reHeater, reSensor3, reSensor4) reDefTS, reSensor, reHeater)
from configtool.pinoutspage import PinoutsPage from configtool.pinoutspage import PinoutsPage
from configtool.sensorpage import SensorsPage from configtool.sensorpage import SensorsPage
from configtool.heaterspage import HeatersPage from configtool.heaterspage import HeatersPage
@ -369,16 +369,11 @@ class BoardPanel(wx.Panel):
return True return True
def parseSensor(self, s): def parseSensor(self, s):
m = reSensor4.search(s) m = reSensor.search(s)
if m: if m:
t = m.groups() t = m.groups()
if len(t) == 4: if len(t) == 4:
return t return t
m = reSensor3.search(s)
if m:
t = m.groups()
if len(t) == 3:
return t
return None return None
def parseHeater(self, s): def parseHeater(self, s):
@ -464,11 +459,8 @@ class BoardPanel(wx.Panel):
fp.write("// name type pin " fp.write("// name type pin "
"additional\n"); "additional\n");
for s in self.sensors: for s in self.sensors:
sstr = "%-10s%-15s" % ((s[0] + ","), (s[1] + ",")) sstr = "%-10s%-15s%-7s%s" % ((s[0] + ","), (s[1] + ","),
if len(s) == 3: (s[2] + ","), s[3])
sstr += "%s" % (s[2])
else: # len(s) == 4
sstr += "%-7s%s" % ((s[2] + ","), s[3])
fp.write("DEFINE_TEMP_SENSOR(%s)\n" % sstr) fp.write("DEFINE_TEMP_SENSOR(%s)\n" % sstr)
skipToSensorEnd = True skipToSensorEnd = True
continue continue

3
configtool/data.py
View File

@ -54,8 +54,7 @@ reCandCPUClocks = re.compile("^\s*//\s*#define\s+F_CPU_OPT\s+(\w+)")
reHelpTextStart = re.compile("^\s*/\*\*\s+\\\\def\s+(.*)") reHelpTextStart = re.compile("^\s*/\*\*\s+\\\\def\s+(.*)")
reHelpTextEnd = re.compile("^\s*\*/") reHelpTextEnd = re.compile("^\s*\*/")
reSensor3 = re.compile(".*\\(\s*(\w+)\s*,\s*(\w+)\s*,\s*(\w+)\s*\\)") reSensor = re.compile(".*\\(\s*(\w+)\s*,\s*(\w+)\s*,\s*(\w+)\s*,\s*(\w+)\s*\\)")
reSensor4 = re.compile(".*\\(\s*(\w+)\s*,\s*(\w+)\s*,\s*(\w+)\s*,\s*(\w+)\s*\\)")
reHeater = re.compile(".*\\(\s*(\w+)\s*,\s*(\w+)\s*,\s*(\w+)\s*\\)") reHeater = re.compile(".*\\(\s*(\w+)\s*,\s*(\w+)\s*,\s*(\w+)\s*\\)")
reInteger = re.compile("^\d+U?L?$") reInteger = re.compile("^\d+U?L?$")