add more variables and better start integration

Author: ehu-ti8m

config/hardware/filters/controllable_exhaust_filter.cfg

@@ -1,5 +1,4 @@
 [gcode_macro _USER_VARIABLES]
-variable_startprint_actions: "bed_soak", "extruder_preheating", "chamber_soak", "clean", "tilt_calib", "z_offset", "custom1", "bedmesh", "extruder_heating", "purge", "clean", "primeline"
 variable_exhaust_enabled: True
 variable_exhaust_name: "exhaust"
 gcode: # do not remove this line
@@ -16,15 +15,6 @@ gcode:
     {% set exhaust_name = printer["gcode_macro _USER_VARIABLES"].exhaust_name %}
     SET_FAN_SPEED FAN={exhaust_name} SPEED={SPEED}
 
-[gcode_macro _MODULE_CUSTOM1]
-gcode:
-    {% set verbose = printer["gcode_macro _USER_VARIABLES"].verbose %}
-    {% set exhaust_filter_speed = printer["gcode_macro _USER_VARIABLES"].exhaust_filter_speed|default(0.3)|float %}
-
-    {% if verbose %}
-      RESPOND MSG="Start exhaust fan."
-    {% endif %}
-    START_EXHAUST SPEED={exhaust_filter_speed}
 
 [gcode_macro STOP_EXHAUST]
 gcode:

macros/base/start_print.cfg

@@ -64,6 +64,8 @@ gcode:
     {% set bed_mesh_enabled = printer["gcode_macro _USER_VARIABLES"].bed_mesh_enabled %}
     {% set firmware_retraction_enabled = printer["gcode_macro _USER_VARIABLES"].firmware_retraction_enabled %}
     {% set filter_enabled = printer["gcode_macro _USER_VARIABLES"].filter_enabled %}
+    {% set exhaust_enabled = printer["gcode_macro _USER_VARIABLES"].exhaust_enabled %}
+    {% set exhaust_filter_speed = printer["gcode_macro _USER_VARIABLES"].exhaust_filter_speed|default(30)|int %}
     {% set filament_sensor_enabled = printer["gcode_macro _USER_VARIABLES"].filament_sensor_enabled %}
     {% set part_fan_tach_enabled = printer["gcode_macro _USER_VARIABLES"].part_fan_tach_enabled %}
     {% set hotend_fan_tach_enabled = printer["gcode_macro _USER_VARIABLES"].hotend_fan_tach_enabled %}
@@ -104,6 +106,14 @@ gcode:
         STOP_FILTER
     {% endif %}
 
+    # If a exhaust filter is enabled and already running due to a print that just finished, we stop
+    # it now and deactivate the pending delayed gcode that could be running. The filter
+    # could be restarted later in the START_PRINT sequence depending of the parameters
+    {% if exhaust_enabled %}
+        UPDATE_DELAYED_GCODE ID=_STOP_EXHAUST_DELAYED DURATION=0
+        STOP_EXHAUST
+    {% endif %}
+
     # If a tachometer is enabled on one of the fans, we check them:
     #   - It's done only once for the part fan to be sure nothing block it before starting the print
     #   - And as a safety feature, we start a monitoring loop for the hotend fan (that is automatically stopped at the end of a print)
@@ -208,6 +218,10 @@ gcode:
     {% if filter_enabled %}
         START_FILTER SPEED={material.filter_speed / 100}
     {% endif %}
+    {% if exhaust_enabled %}
+        {% set exhaust_speed = material.exhaust_speed|default(exhaust_filter_speed)|int %} 
+        START_EXHAUST SPEED={exhaust_speed / 100}
+    {% endif %}
 
     {% if filament_sensor_enabled %}
         SET_FILAMENT_SENSOR SENSOR="runout_sensor" ENABLE=0

user_templates/variables.cfg

@@ -221,7 +221,7 @@ variable_mmu_check_errors_on_start_print: False  # Set to True if you want an ea
 
 variable_filter_default_time_on_end_print: 600 # seconds
 variable_exhaust_filter_default_time_on_end_print: 600 # seconds
-variable_exhaust_filter_speed: 0.3 # percent
+variable_exhaust_filter_speed: 30 # percent
 
 ################################################
 # Other hardware options used in the macros