From 25c502d68b8a3753101cb486280dec106e96614d Mon Sep 17 00:00:00 2001 From: Markus Hitter Date: Tue, 14 Jul 2015 18:37:02 +0200 Subject: [PATCH] Configtool: save target candidate pins, not the metadata ones. Previously, all the cancicates were replaced with the ones from board.metadata, messing things up. Appears to work fine now, candidates are preserved. --- configtool/boardpanel.py | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/configtool/boardpanel.py b/configtool/boardpanel.py index 96f84b8..ed1bc9e 100644 --- a/configtool/boardpanel.py +++ b/configtool/boardpanel.py @@ -532,6 +532,10 @@ class BoardPanel(wx.Panel): skipToSensorEnd = False skipToHeaterEnd = False tempTables = {} + candThermPinsWritten = False + candHeatPinsWritten = False + candProcessorsWritten = False + candCPUClocksWritten = False for ln in self.cfgBuffer: m = reStartSensors.match(ln) if m: @@ -590,6 +594,34 @@ class BoardPanel(wx.Panel): skipToHeaterEnd = False continue + if reCandThermPins.match(ln): + if not candThermPinsWritten: + for pin in self.candThermPins: + fp.write("//#define TEMP_SENSOR_PIN " + pin + "\n") + candThermPinsWritten = True + continue + + if reCandHeatPins.match(ln): + if not candHeatPinsWritten: + for pin in self.candHeatPins: + fp.write("//#define HEATER_PIN " + pin + "\n") + candHeatPinsWritten = True + continue + + if reCandProcessors.match(ln): + if not candProcessorsWritten: + for pin in self.candProcessors: + fp.write("//#define CPU_TYPE " + pin + "\n") + candProcessorsWritten = True + continue + + if reCandCPUClocks.match(ln): + if not candCPUClocksWritten: + for pin in self.candClocks: + fp.write("//#define F_CPU_OPT " + pin + "\n") + candCPUClocksWritten = True + continue + m = reDefBoolBL.match(ln) if m: t = m.groups()