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

Revert "Configtool: attempt to fix broken pin definitions." 

This worked only when the GUI came up, so a better fix was found
with commit

  "Configtool: deal with missing #defines requiring a value."
This commit is contained in:
Markus Hitter 2016-06-05 18:23:30 +02:00
parent 5a28a62717
commit c80b4d4d28
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configtool/page.py
View File

@ -267,18 +267,11 @@ class Page:
print "Key " + k + " not found in config data." print "Key " + k + " not found in config data."
for k in self.choices.keys(): for k in self.choices.keys():
if k not in cfgValues.keys(): if k in cfgValues.keys():
self.choicesOriginal[k] = cfgValues[k]
self.setChoice(k, cfgValues, "-")
else:
print "Key " + k + " not found in config data." print "Key " + k + " not found in config data."
# Fix this.
cfgValues[k] = ("xxxx", False)
# Fix existing #define, but missing value.
if isinstance(cfgValues[k], bool):
print("Fixing %s from boolean to pin with value." % k);
cfgValues[k] = ("xxxx", False)
self.choicesOriginal[k] = cfgValues[k]
self.setChoice(k, cfgValues, "-")
for k in self.boolChoices.keys(): for k in self.boolChoices.keys():
choice = self.boolChoices[k] choice = self.boolChoices[k]