STEAPP-613: deleted old configs filament_control and filament_control…

…_second. (#161) * STEAPP-613: deleted old configs. * STEAPP-613: renamed configs. * STEAPP-613: new names have been added to configs. * STEAPP-613: changed naming config files for filament motion sensor --------- Co-authored-by: Ilya Gushchin <[email protected]>
stereotech · Aug 31, 2023 · 0042d43 · 0042d43
1 parent 8e2ffa7
commit 0042d43
Show file tree

Hide file tree

Showing 12 changed files with 153 additions and 349 deletions.
diff --git a/HTE530-5-4-22.cfg b/HTE530-5-4-22.cfg
@@ -22,8 +22,8 @@ path: /home/ste/uploads
 [include stereotech_config/second_extruder.cfg]
 [include stereotech_config/nozzle_offset.cfg]
 [include stereotech_config/extruder_macros.cfg]
-[include stereotech_config/filament_control_2.cfg]
-[include stereotech_config/filament_control_second_2.cfg]
+[include stereotech_config/filament_control.cfg]
+[include stereotech_config/filament_control_second.cfg]
 [include stereotech_config/power_control.cfg]
 
 [include stereotech_config/module_3d_300.cfg]

diff --git a/stereotech_config/HFE530-5-3-23.cfg b/stereotech_config/HFE530-5-3-23.cfg
@@ -22,7 +22,7 @@ path: /home/ste/uploads
 [include config/fiber_extruder_2.cfg]
 [include config/fiber_nozzle_offset.cfg]
 [include config/extruder_macros.cfg]
-[include config/filament_control_2.cfg]
+[include config/filament_control.cfg]
 [include config/power_control.cfg]
 
 [include config/module_3d_300.cfg]

diff --git a/stereotech_config/HFE530-5-4-22.cfg b/stereotech_config/HFE530-5-4-22.cfg
@@ -22,7 +22,7 @@ path: /home/ste/uploads
 [include config/fiber_extruder_2.cfg]
 [include config/fiber_nozzle_offset.cfg]
 [include config/extruder_macros.cfg]
-[include config/filament_control_2.cfg]
+[include config/filament_control.cfg]
 [include config/power_control.cfg]
 
 [include config/module_3d_300.cfg]

diff --git a/stereotech_config/HFE530-5-8-23.cfg b/stereotech_config/HFE530-5-8-23.cfg
@@ -22,7 +22,7 @@ path: /home/ste/uploads
 [include config/fiber_extruder_3.cfg]
 [include config/fiber_nozzle_offset.cfg]
 [include config/extruder_macros.cfg]
-[include config/filament_control_2.cfg]
+[include config/filament_control.cfg]
 [include config/power_control.cfg]
 
 [include config/module_3d_300.cfg]

diff --git a/stereotech_config/HFE530-5-C-22.cfg b/stereotech_config/HFE530-5-C-22.cfg
@@ -22,7 +22,7 @@ path: /home/ste/uploads
 [include config/fiber_extruder_2.cfg]
 [include config/fiber_nozzle_offset.cfg]
 [include config/extruder_macros.cfg]
-[include config/filament_control_2.cfg]
+[include config/filament_control.cfg]
 [include config/power_control.cfg]
 
 [include config/module_3d_300.cfg]

diff --git a/stereotech_config/HTE530-5-3-23.cfg b/stereotech_config/HTE530-5-3-23.cfg
@@ -22,8 +22,8 @@ path: /home/ste/uploads
 [include config/second_extruder.cfg]
 [include config/nozzle_offset.cfg]
 [include config/extruder_macros.cfg]
-[include config/filament_control_2.cfg]
-[include config/filament_control_second_2.cfg]
+[include config/filament_control.cfg]
+[include config/filament_control_second.cfg]
 [include config/power_control.cfg]
 
 [include config/module_3d_300.cfg]

diff --git a/stereotech_config/HTE530-5-4-22.cfg b/stereotech_config/HTE530-5-4-22.cfg
@@ -22,8 +22,8 @@ path: /home/ste/uploads
 [include config/second_extruder.cfg]
 [include config/nozzle_offset.cfg]
 [include config/extruder_macros.cfg]
-[include config/filament_control_2.cfg]
-[include config/filament_control_second_2.cfg]
+[include config/filament_control.cfg]
+[include config/filament_control_second.cfg]
 [include config/power_control.cfg]
 
 [include config/module_3d_300.cfg]

diff --git a/stereotech_config/HTE530-5-8-23.cfg b/stereotech_config/HTE530-5-8-23.cfg
@@ -22,8 +22,8 @@ path: /home/ste/uploads
 [include config/second_extruder.cfg]
 [include config/nozzle_offset.cfg]
 [include config/extruder_macros.cfg]
-[include config/filament_control_2.cfg]
-[include config/filament_control_second_2.cfg]
+[include config/filament_control.cfg]
+[include config/filament_control_second.cfg]
 [include config/power_control.cfg]
 
 [include config/module_3d_300.cfg]

diff --git a/stereotech_config/filament_control.cfg b/stereotech_config/filament_control.cfg
diff --git a/stereotech_config/filament_control_2.cfg b/stereotech_config/filament_control_2.cfg
diff --git a/stereotech_config/filament_control_second.cfg b/stereotech_config/filament_control_second.cfg
@@ -1,21 +1,14 @@
 [filament_motion_sensor extruder1_sensor]
 extruder: extruder1
 detection_length: 10.5
-event_delay: 60.0
+event_delay: 15.0
 switch_pin: PG15
 pause_on_runout: False
 runout_gcode:
     {% if printer.virtual_sdcard.is_active %}
         M117 trigered_filament_sensor1
         {action_respond_warning('411: The filament has run out or there is a problem with its supply at the Extruder2.')}
-        PAUSE TURN_OFF_EXTRUDERS=0 E=0
-        M400
-        SET_STATE_TRY_EXTRUDE_FILAMENT SENSOR='extruder1_sensor' ENABLE=1
-        UPDATE_STATE_FILAMENT_RUNOUT_POSITION SENSOR='extruder1_sensor'
-        G4 P1000
-        TRY_DO_EXTRUDE SENSOR='extruder1_sensor'
-        SET_STATE_TRY_EXTRUDE_FILAMENT SENSOR='extruder1_sensor' ENABLE=0
-        CHECK_FILAMENT_MOTION_SENSOR SENSOR='extruder1_sensor'
+        RECOVER_EXTRUSION SENSOR='extruder1_sensor'
     {% else %}
         FILAMENT_ERROR EXTRUDER=extruder1
     {% endif %}
diff --git a/stereotech_config/filament_control_second_2.cfg b/stereotech_config/filament_control_second_2.cfg