Merge branch 'master' of https://github.com/mainsail-crew/mainsail-co…

…nfig
mainsail-crew · Jan 14, 2023 · 1d096a1 · 1d096a1
2 parents f39600a + 1a1f188
commit 1d096a1
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/mainsail.cfg b/mainsail.cfg
@@ -50,9 +50,11 @@ description: Cancel the actual running print
 rename_existing: CANCEL_PRINT_BASE
 gcode:
   ##### get user parameters or use default #####
-  {% set allow_park = False if printer['gcode_macro _CLIENT_VARIABLE'] is not defined
-                 else False if printer['gcode_macro _CLIENT_VARIABLE'].park_at_cancel is not defined
-                 else True  if printer['gcode_macro _CLIENT_VARIABLE'].park_at_cancel|lower == 'true' 
+  {% set macro_found = True if printer['gcode_macro _CLIENT_VARIABLE'] is defined else False %}
+  {% set client = printer['gcode_macro _CLIENT_VARIABLE'] %}
+  {% set allow_park = False if not macro_found
+                 else False if client.park_at_cancel is not defined
+                 else True  if client.park_at_cancel|lower == 'true'
                  else False %}
   {% set retract      = 5.0  if not macro_found else client.cancel_retract|default(5.0)|abs %}
   {% set sp_retract   = 2100 if not macro_found else client.speed_retract|default(35) * 60 %}