From 7f00a372443a0e3724d0ee22dfc14e2b826d29cc Mon Sep 17 00:00:00 2001 From: alfrix Date: Sat, 26 Aug 2023 12:20:13 -0300 Subject: [PATCH] macros: hide load and unload (use them in the extrude panel) --- panels/gcode_macros.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/panels/gcode_macros.py b/panels/gcode_macros.py index e7725d48..f37a6708 100644 --- a/panels/gcode_macros.py +++ b/panels/gcode_macros.py @@ -49,9 +49,6 @@ class Panel(ScreenPanel): self.reload_macros() def add_gcode_macro(self, macro): - # Support for hiding macros by name - if macro.startswith("_"): - return section = self._printer.get_macro(macro) if section: if "rename_existing" in section: @@ -134,7 +131,9 @@ class Panel(ScreenPanel): def load_gcode_macros(self): for macro in self._printer.get_gcode_macros(): macro = macro[12:].strip() - if macro.startswith("_"): # Support for hiding macros by name + # Support for hiding macros by _ + if macro.startswith("_") or macro.upper() in ('LOAD_FILAMENT', 'UNLOAD_FILAMENT'): + logging.info(f"Skipping macro {macro}") continue self.options[macro] = { "name": macro,