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

Configtool: on configuration mismatch, save instead of load. 

Loading led to building a firmware which didn't match what was
visible in the dialogs when the build was started. Very
misleading.
This commit is contained in:
Markus Hitter 2015-02-25 20:33:16 +01:00
parent 6a93cbac64
commit 2b5e28a4c8
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configtool.py
View File

@ -395,15 +395,15 @@ class ConfigFrame(wx.Frame):
if not self.verifyConfigLoaded(): if not self.verifyConfigLoaded():
dlg = wx.MessageDialog(self, "Loaded configuration does not match the " dlg = wx.MessageDialog(self, "Loaded configuration does not match the "
"config.h file. Click Yes to load config.h.", "config.h file. Click Yes to save config.h.",
"Incorrect data loaded", "Configuration changed",
wx.YES_NO | wx.NO_DEFAULT | wx.ICON_INFORMATION) wx.YES_NO | wx.NO_DEFAULT | wx.ICON_INFORMATION)
rc = dlg.ShowModal() rc = dlg.ShowModal()
dlg.Destroy() dlg.Destroy()
if rc != wx.ID_YES: if rc != wx.ID_YES:
return return
self.loadConfigFile("config.h") self.onSaveConfig(None)
f_cpu, cpu, baud = self.pgBoard.getCPUInfo() f_cpu, cpu, baud = self.pgBoard.getCPUInfo()
if not cpu: if not cpu: