From c80b4d4d286a5020b45de588352e8bf40a997410 Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Sun, 5 Jun 2016 18:23:30 +0200 Subject: [PATCH] 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." --- configtool/page.py | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/configtool/page.py b/configtool/page.py index 8837bb5..0af2603 100644 --- a/configtool/page.py +++ b/configtool/page.py @@ -267,18 +267,11 @@ class Page: print "Key " + k + " not found in config data." 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." - # 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(): choice = self.boolChoices[k]