diff --git a/config/CreatBot_D1000/base.cfg b/config/CreatBot_D1000/base.cfg index 36818fc88..81445271b 100644 --- a/config/CreatBot_D1000/base.cfg +++ b/config/CreatBot_D1000/base.cfg @@ -41,7 +41,7 @@ canbus_interface: can0 kinematics: cartesian max_velocity: 300 max_accel: 5000 -max_z_velocity: 10 +max_z_velocity: 7 max_z_accel: 100 square_corner_velocity: 2.5 @@ -619,7 +619,7 @@ variable_idle_timeout : 600 variable_runout_sensor : "" variable_filament_sensor : "filament_switch_sensor extruder" variable_filament_sensor1 : "filament_switch_sensor extruder1" -variable_user_temp_resume : "_USER_TEMP_RESUME" +variable_user_temp_macro : "_USER_TEMP_RESUME" variable_user_pause_macro : "_USER_PAUSE" variable_user_resume_macro: "" variable_user_cancel_macro: "_USER_CANCEL" @@ -692,7 +692,7 @@ gcode: {% 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 RESPOND TYPE=echo MSG='{"Restoring \"%s\" temperature to %3.1f\u00B0C, this may take some time" % (printer.toolhead.extruder, last_extruder_temp.temp) }' - {client.user_temputer_macro|default("")} + {client.user_temp_macro|default("")} {% set do_resume = True %} {% elif can_extrude %} {% set do_resume = True %} diff --git a/config/CreatBot_D600Pro2/base.cfg b/config/CreatBot_D600Pro2/base.cfg index 7b51d60d7..dcc307df5 100644 --- a/config/CreatBot_D600Pro2/base.cfg +++ b/config/CreatBot_D600Pro2/base.cfg @@ -612,7 +612,7 @@ variable_idle_timeout : 600 variable_runout_sensor : "" variable_filament_sensor : "filament_switch_sensor extruder" variable_filament_sensor1 : "filament_switch_sensor extruder1" -variable_user_temp_resume : "_USER_TEMP_RESUME" +variable_user_temp_macro : "_USER_TEMP_RESUME" variable_user_pause_macro : "_USER_PAUSE" variable_user_resume_macro: "" variable_user_cancel_macro: "_USER_CANCEL" @@ -685,7 +685,7 @@ gcode: {% 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 RESPOND TYPE=echo MSG='{"Restoring \"%s\" temperature to %3.1f\u00B0C, this may take some time" % (printer.toolhead.extruder, last_extruder_temp.temp) }' - {client.user_temputer_macro|default("")} + {client.user_temp_macro|default("")} {% set do_resume = True %} {% elif can_extrude %} {% set do_resume = True %} diff --git a/config/CreatBot_F430NX/base.cfg b/config/CreatBot_F430NX/base.cfg index 5d52940ce..545ce4dd2 100644 --- a/config/CreatBot_F430NX/base.cfg +++ b/config/CreatBot_F430NX/base.cfg @@ -754,7 +754,7 @@ variable_idle_timeout : 600 variable_runout_sensor : "" variable_filament_sensor : "filament_switch_sensor extruder" variable_filament_sensor1 : "filament_switch_sensor extruder1" -variable_user_temp_resume : "_USER_TEMP_RESUME" +variable_user_temp_macro : "_USER_TEMP_RESUME" variable_user_pause_macro : "_USER_PAUSE" variable_user_resume_macro: "" variable_user_cancel_macro: "_USER_CANCEL" @@ -847,7 +847,7 @@ gcode: {% 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 RESPOND TYPE=echo MSG='{"Restoring \"%s\" temperature to %3.1f\u00B0C, this may take some time" % (printer.toolhead.extruder, last_extruder_temp.temp) }' - {client.user_temputer_macro|default("")} + {client.user_temp_macro|default("")} {% set do_resume = True %} {% elif can_extrude %} {% set do_resume = True %} diff --git a/klippy/extras/spi_temperature.py b/klippy/extras/spi_temperature.py index 92d1b385f..056abbe99 100644 --- a/klippy/extras/spi_temperature.py +++ b/klippy/extras/spi_temperature.py @@ -13,7 +13,7 @@ from . import bus ###################################################################### REPORT_TIME = 0.300 -MAX_INVALID_COUNT = 3 +MAX_INVALID_COUNT = 15 class SensorBase: def __init__(self, config, chip_type, config_cmd=None, spi_mode=1):