diff --git a/configtool/boardpanel.py b/configtool/boardpanel.py index 7c3c29a..dbe0377 100644 --- a/configtool/boardpanel.py +++ b/configtool/boardpanel.py @@ -6,8 +6,8 @@ import re from sys import platform from configtool.decoration import Decoration from configtool.data import (defineValueFormat, - defineBoolFormat, defineHeaterFormat, reCommDefBL, - reCommDefBoolBL, reHelpTextStart, reHelpTextEnd, + defineBoolFormat, defineHeaterFormat, + reHelpTextStart, reHelpTextEnd, reStartSensors, reEndSensors, reStartHeaters, reEndHeaters, reCandHeatPins, reCandThermPins, reCandProcessors, reCandCPUClocks, reFloatAttr, diff --git a/configtool/data.py b/configtool/data.py index 67294cf..4eb6217 100644 --- a/configtool/data.py +++ b/configtool/data.py @@ -35,14 +35,12 @@ reInclude = re.compile("^\s*#include\s+\"([^\"]*)") reFloatAttr = re.compile("/\*\s*float\s*\*/") reDefine = re.compile("\s*#define\s+(\w+)\s+(\S+)") reDefineBL = re.compile("^\s*#define\s+(\w+)\s+(\S+)") -reCommDefBL = re.compile("^\s*//\s*#define\s+(\w+)\s+(\S+)") reDefQS = re.compile("\s*#define\s+(\w+)\s+(\"[^\"]*\")") reDefTS = re.compile("\s*(DEFINE_TEMP_SENSOR\\([^)]*\\))") reDefHT = re.compile("\s*(DEFINE_HEATER\\([^)]*\\))") reDefTT = re.compile("^\s*//\s*TEMP_TABLE\s+(\S+)\s+(\\(.*\\))") reDefBool = re.compile("\s*#define\s+(\w+)\s+") reDefBoolBL = re.compile("^\s*#define\s+(\w+)\s+") -reCommDefBoolBL = re.compile("^\s*//\s*#define\s+(\S+)\s+") reStartSensors = re.compile("^\s*//\s*DEFINE_TEMP_SENSORS_START") reEndSensors = re.compile("^\s*//\s*DEFINE_TEMP_SENSORS_END") reStartHeaters = re.compile("^\s*//\s*DEFINE_HEATERS_START") diff --git a/configtool/printerpanel.py b/configtool/printerpanel.py index bc8f520..aa1e891 100644 --- a/configtool/printerpanel.py +++ b/configtool/printerpanel.py @@ -5,8 +5,8 @@ import re from sys import platform from configtool.decoration import Decoration -from configtool.data import (defineValueFormat, defineBoolFormat, reCommDefBL, - reCommDefBoolBL, reHelpTextStart, reHelpTextEnd, +from configtool.data import (defineValueFormat, defineBoolFormat, + reHelpTextStart, reHelpTextEnd, reDefine, reDefineBL, reDefQS, reDefQSm, reDefQSm2, reDefBool, reDefBoolBL) from configtool.mechanicalpage import MechanicalPage