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

Configtool: some code prettifications. 

Pure whitespace changes.
This commit is contained in:
jbernardis 2015-02-07 23:38:12 -05:00 committed by Markus Hitter
parent 2436ac2865
commit ee8f5f9170
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
configtool.py
View File

@ -245,6 +245,7 @@ class ConfigFrame(wx.Frame):
def loadConfigFile(self, fn): def loadConfigFile(self, fn):
if not self.pgPrinter.confirmLoseChanges("load config"): if not self.pgPrinter.confirmLoseChanges("load config"):
return return
if not self.pgBoard.confirmLoseChanges("load config"): if not self.pgBoard.confirmLoseChanges("load config"):
return return
@ -377,6 +378,7 @@ class ConfigFrame(wx.Frame):
dlg.Destroy() dlg.Destroy()
if rc != wx.ID_YES: if rc != wx.ID_YES:
return return
self.onSavePrinterConfig(None) self.onSavePrinterConfig(None)
if self.pgBoard.isModified(): if self.pgBoard.isModified():
@ -388,6 +390,7 @@ class ConfigFrame(wx.Frame):
dlg.Destroy() dlg.Destroy()
if rc != wx.ID_YES: if rc != wx.ID_YES:
return return
self.onSaveBoardConfig(None) self.onSaveBoardConfig(None)
if not self.verifyConfigLoaded(): if not self.verifyConfigLoaded():
@ -409,12 +412,14 @@ class ConfigFrame(wx.Frame):
dlg.ShowModal() dlg.ShowModal()
dlg.Destroy() dlg.Destroy()
return return
if not f_cpu: if not f_cpu:
dlg = wx.MessageDialog(self, "Unable to determine CPU clock rate.", dlg = wx.MessageDialog(self, "Unable to determine CPU clock rate.",
"CPU clock rate error", wx.OK | wx.ICON_ERROR) "CPU clock rate error", wx.OK | wx.ICON_ERROR)
dlg.ShowModal() dlg.ShowModal()
dlg.Destroy() dlg.Destroy()
return return
if not baud: if not baud:
# TODO: It looks like serial port baud rate is confused with bootloader # TODO: It looks like serial port baud rate is confused with bootloader
# baud rate here. These two can be the same, but don't have to. # baud rate here. These two can be the same, but don't have to.