diff --git a/config/CreatBot_D1000/base.cfg b/config/CreatBot_D1000/base.cfg index 27667fcdc..ab110fdec 100644 --- a/config/CreatBot_D1000/base.cfg +++ b/config/CreatBot_D1000/base.cfg @@ -358,6 +358,7 @@ z_hop_speed: 10 gcode: SET_STEPPER_ENABLE STEPPER=stepper_x ENABLE=1 SET_STEPPER_ENABLE STEPPER=stepper_y ENABLE=1 + SET_STEPPER_ENABLE STEPPER=stepper_z ENABLE=1 SET_KINEMATIC_POSITION X=500 Y=500 Z=0 [gcode_macro T0] @@ -555,6 +556,7 @@ gcode: {% if not homing_cmd %} SET_STEPPER_ENABLE STEPPER=stepper_x ENABLE=1 SET_STEPPER_ENABLE STEPPER=stepper_y ENABLE=1 + SET_STEPPER_ENABLE STEPPER=stepper_z ENABLE=1 G4 P300 C28 _ACTIVATE_DEFAULT_EXTRUDER @@ -949,6 +951,8 @@ gcode: {% if hotend == "extruder1" %} {% set z_offset_total = z_offset_total + z_offset %} {% endif %} + SET_STEPPER_ENABLE STEPPER=stepper_z ENABLE=1 + G4 P300 M118 Recovery in progress, please wait RUN_SHELL_COMMAND CMD=_POWER_LOSS_RECOVERY PARAMS="{z_height} \"{last_file}\" \"{z_offset_total}\"" SDCARD_PRINT_FILE FILENAME=.plr/"{last_file}" diff --git a/config/CreatBot_D1000_V0/base.cfg b/config/CreatBot_D1000_V0/base.cfg index 16b944924..9146761ea 100644 --- a/config/CreatBot_D1000_V0/base.cfg +++ b/config/CreatBot_D1000_V0/base.cfg @@ -294,6 +294,7 @@ z_hop_speed: 10 gcode: SET_STEPPER_ENABLE STEPPER=stepper_x ENABLE=1 SET_STEPPER_ENABLE STEPPER=stepper_y ENABLE=1 + SET_STEPPER_ENABLE STEPPER=stepper_z ENABLE=1 SET_KINEMATIC_POSITION X=500 Y=500 Z=0 [gcode_macro T0] @@ -885,6 +886,8 @@ gcode: {% if hotend == "extruder1" %} {% set z_offset_total = z_offset_total + z_offset %} {% endif %} + SET_STEPPER_ENABLE STEPPER=stepper_z ENABLE=1 + G4 P300 M118 Recovery in progress, please wait RUN_SHELL_COMMAND CMD=_POWER_LOSS_RECOVERY PARAMS="{z_height} \"{last_file}\" \"{z_offset_total}\"" SDCARD_PRINT_FILE FILENAME=.plr/"{last_file}" diff --git a/config/CreatBot_D600Pro2/base.cfg b/config/CreatBot_D600Pro2/base.cfg index d7d171e09..940d8d522 100644 --- a/config/CreatBot_D600Pro2/base.cfg +++ b/config/CreatBot_D600Pro2/base.cfg @@ -358,6 +358,7 @@ z_hop_speed: 10 gcode: SET_STEPPER_ENABLE STEPPER=stepper_x ENABLE=1 SET_STEPPER_ENABLE STEPPER=stepper_y ENABLE=1 + SET_STEPPER_ENABLE STEPPER=stepper_z ENABLE=1 SET_KINEMATIC_POSITION X=300 Y=300 Z=0 [gcode_macro T0] @@ -660,7 +661,7 @@ gcode: {% set toolchange = client.change_runout|lower|default("") %} {% set extruder_filament = client.filament_state.extruder %} {% set extruder1_filament = client.filament_state.extruder1 %} - {% set resume_extruder = client.resume_extruder %} + {% set resume_extruder = client.resume_extruder|default("extruder") %} {% if autoshift_on == 'true' %} {% if extruder_filament and extruder1_filament %} @@ -772,7 +773,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 @@ -944,6 +944,8 @@ gcode: {% if hotend == "extruder1" %} {% set z_offset_total = z_offset_total + z_offset %} {% endif %} + SET_STEPPER_ENABLE STEPPER=stepper_z ENABLE=1 + G4 P300 M118 Recovery in progress, please wait RUN_SHELL_COMMAND CMD=_POWER_LOSS_RECOVERY PARAMS="{z_height} \"{last_file}\" \"{z_offset_total}\"" SDCARD_PRINT_FILE FILENAME=.plr/"{last_file}" diff --git a/config/CreatBot_D600Pro2_V0/base.cfg b/config/CreatBot_D600Pro2_V0/base.cfg index 190b5e731..3f84caf53 100644 --- a/config/CreatBot_D600Pro2_V0/base.cfg +++ b/config/CreatBot_D600Pro2_V0/base.cfg @@ -295,6 +295,7 @@ z_hop_speed: 10 gcode: SET_STEPPER_ENABLE STEPPER=stepper_x ENABLE=1 SET_STEPPER_ENABLE STEPPER=stepper_y ENABLE=1 + SET_STEPPER_ENABLE STEPPER=stepper_z ENABLE=1 SET_KINEMATIC_POSITION X=300 Y=300 Z=0 [gcode_macro T0] @@ -709,7 +710,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 @@ -881,6 +881,8 @@ gcode: {% if hotend == "extruder1" %} {% set z_offset_total = z_offset_total + z_offset %} {% endif %} + SET_STEPPER_ENABLE STEPPER=stepper_z ENABLE=1 + G4 P300 M118 Recovery in progress, please wait RUN_SHELL_COMMAND CMD=_POWER_LOSS_RECOVERY PARAMS="{z_height} \"{last_file}\" \"{z_offset_total}\"" SDCARD_PRINT_FILE FILENAME=.plr/"{last_file}" diff --git a/config/CreatBot_F430NX/base.cfg b/config/CreatBot_F430NX/base.cfg index 297eba912..22236143f 100644 --- a/config/CreatBot_F430NX/base.cfg +++ b/config/CreatBot_F430NX/base.cfg @@ -419,6 +419,7 @@ z_hop:5 gcode: SET_STEPPER_ENABLE STEPPER=stepper_x ENABLE=1 SET_STEPPER_ENABLE STEPPER=stepper_y ENABLE=1 + SET_STEPPER_ENABLE STEPPER=stepper_z ENABLE=1 SET_KINEMATIC_POSITION X=200 Y=150 Z=0 [gcode_macro _RESTORE_DEFAULT_EXTRUDER] @@ -1167,6 +1168,8 @@ gcode: {% if hotend == "extruder1" %} {% set z_offset_total = z_offset_total + z_offset %} {% endif %} + SET_STEPPER_ENABLE STEPPER=stepper_z ENABLE=1 + G4 P300 M118 Recovery in progress, please wait RUN_SHELL_COMMAND CMD=_POWER_LOSS_RECOVERY PARAMS="{z_height} \"{last_file}\" \"{z_offset_total}\"" SDCARD_PRINT_FILE FILENAME=.plr/"{last_file}"