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

Configtool: a few more apperance enhancements.

This commit is contained in:
jbernardis 2015-02-07 23:38:12 -05:00 committed by Markus Hitter
parent cbc87fc526
commit 2436ac2865
7 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configtool.py
View File

@ -391,9 +391,8 @@ class ConfigFrame(wx.Frame):
self.onSaveBoardConfig(None) self.onSaveBoardConfig(None)
if not self.verifyConfigLoaded(): if not self.verifyConfigLoaded():
dlg = wx.MessageDialog(self, "Loaded configuration does not match what " dlg = wx.MessageDialog(self, "Loaded configuration does not match the "
"the config.h file. Click Yes to load " "config.h file. Click Yes to load config.h.",
"config.h.",
"Incorrect data loaded", "Incorrect data loaded",
wx.YES_NO | wx.NO_DEFAULT | wx.ICON_INFORMATION) wx.YES_NO | wx.NO_DEFAULT | wx.ICON_INFORMATION)
rc = dlg.ShowModal() rc = dlg.ShowModal()

4
configtool/boardpanel.py
View File

@ -564,8 +564,8 @@ class BoardPanel(wx.Panel):
self.addNewDefine(fp, k, values[k]) self.addNewDefine(fp, k, values[k])
if newLabels != "": if newLabels != "":
dlg = wx.MessageDialog(self, "New Defines added to board config:\n" + dlg = wx.MessageDialog(self, "New defines added to board config:\n" +
newLabels, "New Defines", newLabels, "New defines",
wx.OK + wx.ICON_INFORMATION) wx.OK + wx.ICON_INFORMATION)
dlg.ShowModal() dlg.ShowModal()
dlg.Destroy() dlg.Destroy()

10
configtool/build.py
View File

@ -129,7 +129,7 @@ class Build(wx.Dialog):
builddir = join(self.root, "build") builddir = join(self.root, "build")
if not os.path.exists(builddir): if not os.path.exists(builddir):
os.makedirs(builddir) os.makedirs(builddir)
self.log.AppendText("Directory (%s) created.\n\n" % builddir) self.log.AppendText("Directory %s created.\n\n" % builddir)
self.compile() self.compile()
@ -265,8 +265,8 @@ class Build(wx.Dialog):
def formatReportLine(self, m, name, v168, v328, v644, v1280): def formatReportLine(self, m, name, v168, v328, v644, v1280):
t = m.groups() t = m.groups()
v = int(t[0], 16) v = int(t[0], 16)
self.log.AppendText(("%12s : %6d bytes %6.2f%% %6.2f%%" self.log.AppendText(("%12s: %6d bytes %6.2f%% %6.2f%%"
" %6.2f%% %6.2f%%\n") % " %6.2f%% %6.2f%%\n") %
(name, v, v / float(v168 * 1024) * 100.0, (name, v, v / float(v168 * 1024) * 100.0,
v / float(v328 * 1024) * 100.0, v / float(v328 * 1024) * 100.0,
v / float(v644 * 1024) * 100.0, v / float(v644 * 1024) * 100.0,
@ -277,8 +277,8 @@ class Build(wx.Dialog):
reBss = re.compile("\.bss\s+([0-9a-f]+)") reBss = re.compile("\.bss\s+([0-9a-f]+)")
reEEProm = re.compile("\.eeprom\s+([0-9a-f]+)") reEEProm = re.compile("\.eeprom\s+([0-9a-f]+)")
self.log.AppendText("\n ATmega... '168 '328(P)" self.log.AppendText("\n ATmega... '168 '328(P)"
" '644(P) '1280\n") " '644(P) '1280\n")
for l in self.reportLines: for l in self.reportLines:
m = reText.search(l) m = reText.search(l)
if m: if m:

2
configtool/calcbelt.py
View File

@ -214,7 +214,7 @@ class CalcBelt(wx.Dialog):
resultmm = steps / length resultmm = steps / length
self.result = int(resultmm * 1000.0) self.result = int(resultmm * 1000.0)
self.tcResult.SetLabel("%d steps/m (%.3f steps/mm)" % self.tcResult.SetLabel("%d steps/m (%.3f steps/mm)" %
(self.result, resultmm)) (self.result, resultmm))
self.tcResolution.SetLabel("%.3f micrometers" % (length / steps * 1000.0)) self.tcResolution.SetLabel("%.3f micrometers" % (length / steps * 1000.0))
self.enableUseButtons(True) self.enableUseButtons(True)

2
configtool/calcscrew.py
View File

@ -234,7 +234,7 @@ class CalcScrew(wx.Dialog):
resultmm = steps / sp / ratio resultmm = steps / sp / ratio
self.result = int(resultmm * 1000.0) self.result = int(resultmm * 1000.0)
self.tcResult.SetLabel("%d steps/m (%.3f steps/mm)" % self.tcResult.SetLabel("%d steps/m (%.3f steps/mm)" %
(self.result, resultmm)) (self.result, resultmm))
self.tcResolution.SetLabel("%.3f micrometers" % (1.0 / resultmm * 1000.0)) self.tcResolution.SetLabel("%.3f micrometers" % (1.0 / resultmm * 1000.0))
self.enableUseButtons(True) self.enableUseButtons(True)

2
configtool/data.py
View File

@ -14,7 +14,7 @@ sensorTypes = {'MAX6675': "TT_MAX6675", 'Thermistor': "TT_THERMISTOR",
'AD595': "TT_AD595", 'PT100': "TT_PT100", 'AD595': "TT_AD595", 'PT100': "TT_PT100",
'Intercom': "TT_INTERCOM"} 'Intercom': "TT_INTERCOM"}
BSIZE = (90, 60) BSIZE = (100, 60)
BSIZESMALL = (90, 30) BSIZESMALL = (90, 30)

8
configtool/miscellaneouspage.py
View File

@ -74,15 +74,15 @@ class MiscellaneousPage(wx.Panel, Page):
k = 'FAST_PWM' k = 'FAST_PWM'
cb = self.addCheckBox(k, self.onCheckBox) cb = self.addCheckBox(k, self.onCheckBox)
sz.Add(cb, pos = (6, 1)) sz.Add(cb, pos = (5, 1))
k = 'HEATER_SANITY_CHECK' k = 'HEATER_SANITY_CHECK'
cb = self.addCheckBox(k, self.onCheckBox) cb = self.addCheckBox(k, self.onCheckBox)
sz.Add(cb, pos = (7, 1)) sz.Add(cb, pos = (6, 1))
k = 'REPORT_TARGET_TEMPS' k = 'REPORT_TARGET_TEMPS'
cb = self.addCheckBox(k, self.onCheckBox) cb = self.addCheckBox(k, self.onCheckBox)
sz.Add(cb, pos = (8, 1)) sz.Add(cb, pos = (7, 1))
k = 'REFERENCE' k = 'REFERENCE'
ch = self.addChoice(k, self.references, ch = self.addChoice(k, self.references,
@ -129,7 +129,7 @@ class MiscellaneousPage(wx.Panel, Page):
sz.Add(sbox, pos = (8,3), flag = wx.ALIGN_CENTER_HORIZONTAL) sz.Add(sbox, pos = (8,3), flag = wx.ALIGN_CENTER_HORIZONTAL)
labelWidth = 180; labelWidth = 190;
k = 'MOVEBUFFER_SIZE' k = 'MOVEBUFFER_SIZE'
tc = self.addTextCtrl(k, labelWidth, self.onTextCtrlInteger) tc = self.addTextCtrl(k, labelWidth, self.onTextCtrlInteger)