From c7cb4b97c26c14806b1bbc131510f792ab15b66a Mon Sep 17 00:00:00 2001 From: ruipeng <1041589370@qq.com> Date: Thu, 2 Jan 2025 17:57:20 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E5=85=A8=E7=B3=BB=E6=B7=BB=E5=8A=A0=5FCANC?= =?UTF-8?q?EL=5FPRINT=5FBASE=E5=AE=8F=E6=94=AF=E6=8C=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/CreatBot_D1000/base.cfg | 5 +++++ config/CreatBot_D1000_V0/base.cfg | 5 +++++ config/CreatBot_D600Pro2/base.cfg | 5 +++++ config/CreatBot_D600Pro2_V0/base.cfg | 5 +++++ 4 files changed, 20 insertions(+) diff --git a/config/CreatBot_D1000/base.cfg b/config/CreatBot_D1000/base.cfg index 7d456b0e1..e5308dfbe 100644 --- 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 %} diff --git a/config/CreatBot_D1000_V0/base.cfg b/config/CreatBot_D1000_V0/base.cfg index 22e05218d..a9a85bf55 100644 --- 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 %} diff --git a/config/CreatBot_D600Pro2/base.cfg b/config/CreatBot_D600Pro2/base.cfg index 8f30de32e..c9cae1170 100644 --- 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 %} diff --git a/config/CreatBot_D600Pro2_V0/base.cfg b/config/CreatBot_D600Pro2_V0/base.cfg index 143b989ea..b93483986 100644 --- 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 %} From 3e5c530975dfa058be7db31c15116d46e6aaad84 Mon Sep 17 00:00:00 2001 From: ruipeng <1041589370@qq.com> Date: Tue, 7 Jan 2025 13:56:48 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E6=95=B4F30NX=E7=BD=91=E5=BA=8A?= =?UTF-8?q?=E8=B0=83=E5=B9=B3=E6=97=B6=E6=8E=A2=E9=92=88=E6=8F=90=E5=8D=87?= =?UTF-8?q?=E7=9A=84=E9=AB=98=E5=BA=A6=20=E8=A7=84=E9=81=BFoffset=E8=BF=87?= =?UTF-8?q?=E5=A4=A7=E6=97=B6=E6=9C=AA=E7=A7=BB=E5=8A=A8=E5=BA=8A=E5=8D=B3?= =?UTF-8?q?=E8=A7=A6=E5=8F=91=E7=9A=84=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/CreatBot_F430NX/base.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/CreatBot_F430NX/base.cfg b/config/CreatBot_F430NX/base.cfg index ea4693638..423facd70 100644 --- 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 From 2c2d0c7be12d6c497a1a479ec3aa08499f6bba0f Mon Sep 17 00:00:00 2001 From: ruipeng <1041589370@qq.com> Date: Tue, 7 Jan 2025 16:33:31 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E4=BC=98=E5=8C=96F430NX=E9=A9=B1=E5=8A=A8?= =?UTF-8?q?=E6=95=A3=E7=83=AD=E9=A3=8E=E6=89=87=E5=90=AF=E5=81=9C=E9=80=BB?= =?UTF-8?q?=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/CreatBot_F430NX/base.cfg | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/config/CreatBot_F430NX/base.cfg b/config/CreatBot_F430NX/base.cfg index 423facd70..489591f64 100644 --- a/config/CreatBot_F430NX/base.cfg +++ b/config/CreatBot_F430NX/base.cfg @@ -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 From 95d20c9b6357a444871ea9dce5f5ad35d74c1990 Mon Sep 17 00:00:00 2001 From: ruipeng <1041589370@qq.com> Date: Tue, 7 Jan 2025 16:33:54 +0800 Subject: [PATCH 4/5] =?UTF-8?q?1=E3=80=81=E4=BF=AE=E5=A4=8DF430NX=E8=A7=A6?= =?UTF-8?q?=E5=8F=91=E8=80=97=E6=9D=90=E6=A3=80=E6=B5=8B=EF=BC=8C=E5=96=B7?= =?UTF-8?q?=E5=A4=B4=E8=B6=85=E6=97=B6=E5=86=B7=E5=8D=B4=EF=BC=8C=E6=89=8B?= =?UTF-8?q?=E5=8A=A8=E8=AE=BE=E7=BD=AE=E6=B8=A9=E5=BA=A6=E5=B9=B6=E8=A3=85?= =?UTF-8?q?=E8=BD=BD=E8=80=97=E6=9D=90=E5=90=8E=EF=BC=8C=E6=81=A2=E5=A4=8D?= =?UTF-8?q?=E6=89=93=E5=8D=B0=E6=97=B6=E4=BA=8C=E5=A4=B4=E6=B8=A9=E5=BA=A6?= =?UTF-8?q?=E4=B8=8D=E6=81=A2=E5=A4=8D=E7=9A=84=E9=97=AE=E9=A2=98=E3=80=82?= =?UTF-8?q?=202=E3=80=81=E4=BF=AE=E6=94=B9=E7=AD=89=E5=BE=85=E6=B8=A9?= =?UTF-8?q?=E5=BA=A6=E6=81=A2=E5=A4=8D=E7=9A=84=E6=8F=90=E7=A4=BA=E5=86=85?= =?UTF-8?q?=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/CreatBot_F430NX/base.cfg | 22 +++++++--------------- 1 file changed, 7 insertions(+), 15 deletions(-) diff --git a/config/CreatBot_F430NX/base.cfg b/config/CreatBot_F430NX/base.cfg index 489591f64..2aa5a66d9 100644 --- a/config/CreatBot_F430NX/base.cfg +++ b/config/CreatBot_F430NX/base.cfg @@ -849,10 +849,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 %} @@ -865,8 +861,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 %} @@ -962,7 +959,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 @@ -979,16 +975,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 %} From dda0962b986d0c9d6a1a442f5c5ef63d151f5ef2 Mon Sep 17 00:00:00 2001 From: ruipeng <1041589370@qq.com> Date: Tue, 7 Jan 2025 16:40:43 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E4=BF=AE=E5=A4=8DF430NX=E5=9B=9E=E9=9B=B6?= =?UTF-8?q?=E5=90=8E=EF=BC=8C=E5=88=87=E6=8D=A2=E5=96=B7=E5=A4=B4=E4=BC=9A?= =?UTF-8?q?=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- config/CreatBot_F430NX/base.cfg | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/config/CreatBot_F430NX/base.cfg b/config/CreatBot_F430NX/base.cfg index 2aa5a66d9..1c5b869ef 100644 --- a/config/CreatBot_F430NX/base.cfg +++ b/config/CreatBot_F430NX/base.cfg @@ -433,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: @@ -468,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") %} @@ -493,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