CreatBot/GeneralKlipperScreen
7
0
Fork 0
forked from CreatBot/CreatBotKlipperScreen
Code Pull Requests Activity

gcode_macros: Updates to fix bugs in visibility of macros

Browse Source
This commit is contained in:
Jordan Ruthe 2021-01-13 11:02:15 -05:00
parent da9570a925
commit 30ed648934
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
panels/gcode_macros.py
View File

@ -84,13 +84,16 @@ class MacroPanel(ScreenPanel):
def load_gcode_macros(self): def load_gcode_macros(self):
macros = self._screen.printer.get_gcode_macros() macros = self._screen.printer.get_gcode_macros()
for x in macros: for x in macros:
macro = x[12:] macro = x[12:].strip()
if macro in self.loaded_macros: if macro in self.loaded_macros:
continue continue
logger.debug("Evaluating '%s' value '%s'" % (macro.strip().lower(),
self._config.get_config().getboolean("displayed_macros", macro.lower(), fallback=True)))
if ("displayed_macros" not in self._config.get_config().sections() or if ("displayed_macros" not in self._config.get_config().sections() or
self._config.get_config().getboolean("displayed_macros", macro, fallback=True)): self._config.get_config().getboolean("displayed_macros", macro.lower(), fallback=True)):
self.add_gcode_macro(macro) self.add_gcode_macro(macro)
def run_gcode_macro(self, widget, macro): def run_gcode_macro(self, widget, macro):
@ -98,8 +101,10 @@ class MacroPanel(ScreenPanel):
def unload_gcode_macros(self): def unload_gcode_macros(self):
for macro in self.loaded_macros: for macro in self.loaded_macros:
logger.debug("Evaluating '%s' value '%s'" % (macro.strip().lower(),
self._config.get_config().getboolean("displayed_macros", macro.lower(), fallback=True)))
if ("displayed_macros" in self._config.get_config().sections() and if ("displayed_macros" in self._config.get_config().sections() and
not self._config.get_config().getboolean("displayed_macros", macro, fallback=True)): not self._config.get_config().getboolean("displayed_macros", macro.lower(), fallback=True)):
macros = sorted(self.macros) macros = sorted(self.macros)
pos = macros.index(macro) pos = macros.index(macro)
self.labels['macros'].remove_row(pos) self.labels['macros'].remove_row(pos)