Merge commit 'dda0962b986d0c9d6a1a442f5c5ef63d151f5ef2' into release

2025-01-07 17:21:40 +08:00 · 2025-01-07 17:21:40 +08:00 · 3024b76663
commit 3024b76663
parent 03d11a16b3 dda0962b98
5 changed files with 45 additions and 22 deletions
--- a/config/CreatBot_D1000/base.cfg
+++ b/config/CreatBot_D1000/base.cfg
@ -423,6 +423,11 @@ gcode:
    _CLEAR_LAST_FILE
    _RUNOUT_HANDLE

+[gcode_macro _CANCEL_PRINT_BASE]
+description: Call when cancelled to print
+gcode:
+    # Nothing
+
 [gcode_macro START_PRINT]
 gcode:
    {% set BED_TEMP = params.BED|default(0)|float %}
--- a/config/CreatBot_D1000_V0/base.cfg
+++ b/config/CreatBot_D1000_V0/base.cfg
@ -359,6 +359,11 @@ gcode:
    _CLEAR_LAST_FILE
    _RUNOUT_HANDLE

+[gcode_macro _CANCEL_PRINT_BASE]
+description: Call when cancelled to print
+gcode:
+    # Nothing
+
 [gcode_macro START_PRINT]
 gcode:
    {% set BED_TEMP = params.BED|default(0)|float %}
--- a/config/CreatBot_D600Pro2/base.cfg
+++ b/config/CreatBot_D600Pro2/base.cfg
@ -423,6 +423,11 @@ gcode:
    _CLEAR_LAST_FILE
    _RUNOUT_HANDLE

+[gcode_macro _CANCEL_PRINT_BASE]
+description: Call when cancelled to print
+gcode:
+    # Nothing
+
 [gcode_macro START_PRINT]
 gcode:
    {% set BED_TEMP = params.BED|default(0)|float %}
--- a/config/CreatBot_D600Pro2_V0/base.cfg
+++ b/config/CreatBot_D600Pro2_V0/base.cfg
@ -359,6 +359,11 @@ gcode:
    _CLEAR_LAST_FILE
    _RUNOUT_HANDLE

+[gcode_macro _CANCEL_PRINT_BASE]
+description: Call when cancelled to print
+gcode:
+    # Nothing
+
 [gcode_macro START_PRINT]
 gcode:
    {% set BED_TEMP = params.BED|default(0)|float %}
--- a/config/CreatBot_F430NX/base.cfg
+++ b/config/CreatBot_F430NX/base.cfg
@ -47,7 +47,7 @@ square_corner_velocity: 5.0

 [bed_mesh]
 speed: 100
-horizontal_move_z: 5
+horizontal_move_z: 7
 mesh_min: 34.6,17.4
 mesh_max: 420, 300
 probe_count: 5,4
@ -202,7 +202,10 @@ kick_start_time: 1.0

 [controller_fan _controller_fan]
 pin: PC6
-fan_speed: 1
+max_power: 0.8
+heater:
+stepper: stepper_x, stepper_z, dual_carriage 
+idle_speed: 0.5

 [delayed_gcode INIT_LIGHT]
 initial_duration:0.01
@ -430,7 +433,10 @@ gcode:
 gcode:
    ACTIVATE_EXTRUDER EXTRUDER=extruder
    SET_DUAL_CARRIAGE CARRIAGE=0
+    SAVE_GCODE_STATE NAME=park_extruder
+    G90
    G1 X-20 F6000
+    RESTORE_GCODE_STATE NAME=park_extruder

 [gcode_macro T0]
 gcode:
@ -465,16 +471,21 @@ gcode:

 [gcode_macro _PARK_extruder1]
 gcode:
+    {% set svv = printer.save_variables.variables %}
+    {% set x_offset = svv.nozzle_x_offset_val|default(0)|float %}
    ACTIVATE_EXTRUDER EXTRUDER=extruder1
    SET_DUAL_CARRIAGE CARRIAGE=1
-    G1 X475 F6000
+    SAVE_GCODE_STATE NAME=park_extruder1
+    G90
+    G1 X{475 - (x_offset if x_offset >= 0 else -x_offset)} F6000
+    RESTORE_GCODE_STATE NAME=park_extruder1

 [gcode_macro T1]
 gcode:
    {% set svv = printer.save_variables.variables %}
-    {% set x_offset = svv.dual_x_offset|default(0)|float %}
-    {% set y_offset = svv.dual_y_offset|default(0)|float %}
-    {% set z_offset = svv.dual_z_offset|default(0)|float %}
+    {% set x_offset = svv.nozzle_x_offset_val|default(0)|float %}
+    {% set y_offset = svv.nozzle_y_offset_val|default(0)|float %}
+    {% set z_offset = svv.nozzle_z_offset_val|default(0)|float %}

    {% set filament_insert = printer["filament_switch_sensor extruder1"].filament_detected|default(False) %}
    {% set printing = (printer.print_stats.state == "printing") %}
@ -490,7 +501,7 @@ gcode:
            SET_DUAL_CARRIAGE CARRIAGE=1
            SAVE_GCODE_STATE NAME=park1
            G90
-            G1 X455 F6000
+            G1 X{455 + (x_offset if x_offset >= 0 else -x_offset)} F6000
            RESTORE_GCODE_STATE NAME=park1
            {% if "z" in printer.toolhead.homed_axes | lower %}
                SET_GCODE_OFFSET Z={z_offset} MOVE=1
@ -846,10 +857,6 @@ gcode:
        {'index': 1, 'name': 'last_extruder1_temp'}] %}
    {% set temperature = "last_extruder_temp" if printer.toolhead.extruder == "extruder" else "last_extruder1_temp" %}
    {% set value = printer["gcode_macro RESUME"][temperature].temp %}
-    {% if printer[printer.toolhead.extruder].temperature < value-3 %}
-        {% set msg = "Left" if printer.toolhead.extruder == "extruder" else "Right" %}
-        RESPOND TYPE=echo MSG='{"Restoring %s extruder temperature, this may take some time." % msg}'
-    {% endif %}
    {% for info in extruder_info %}
        {% set variable = printer["gcode_macro RESUME"][info.name] %}
        {% if variable.restore %}
@ -862,8 +869,9 @@ gcode:
            {% set tool = "extruder" if info.index == 0 else "extruder1" %}
            {% set needwait = True if printer[tool].temperature < variable.temp else False %}
            {% if needwait %}
+                RESPOND TYPE=echo MSG='{"Restoring activated extruder temperature, this may take some time."}'
                M109 T{info.index} S{variable.temp}
-                {% endif %}
+            {% endif %}
        {% endif %}
    {% endfor %}

@ -959,7 +967,6 @@ gcode:
    {% set autoshift = printer.save_variables.variables.auto_change_nozzle|default(False) %}
    {% set client = printer['gcode_macro _CLIENT_VARIABLE']|default({}) %}
    {% set do_resume = False %}
-    {% set prompt_txt = [] %}
    {% set runout = True %}
    ##### end of definitions #####
    _FILAMENT_UPDATE
@ -976,16 +983,12 @@ gcode:
    {% set can_extrude = True if printer.toolhead.extruder == ''           # no extruder defined in config
                    else printer[printer.toolhead.extruder].can_extrude %} # status of active extruder
    #### Printer comming from timeout idle state ####
-    {% if printer.idle_timeout.state|upper == "IDLE" or idle_state or autoshift %}
+    {% if printer.idle_timeout.state|upper == "IDLE" or idle_state %}
        SET_GCODE_VARIABLE MACRO=RESUME VARIABLE=idle_state VALUE=False
-        {% if last_extruder_temp.restore or last_extruder1_temp.restore %}
-            # we need to use the unicode (\u00B0) for the ¡ã as py2 env's would throw an error otherwise
-            {client.user_temp_macro|default("")}
-            {% set do_resume = True %}
-        {% elif can_extrude %}
-            {% set do_resume = True %}
-        {% endif %}
-    #### Printer comming out of regular PAUSE state ####
+    {% endif %}
+    {% if last_extruder_temp.restore or last_extruder1_temp.restore %}
+        {client.user_temp_macro|default("")}
+        {% set do_resume = True %}
    {% elif can_extrude %}
        {% set do_resume = True %}
    {% endif %}