CreatBot/CreatBotKlipper
CreatBot/CreatBotKlipper
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into release

Browse Source
This commit is contained in:
张开科 2024-11-29 10:21:01 +08:00
commit 349f8f7a24
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/CreatBot_D1000/base.cfg
View File

@ -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 %}

4
config/CreatBot_D600Pro2/base.cfg
View File

@ -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 %}

4
config/CreatBot_F430NX/base.cfg
View File

@ -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 %}

2
klippy/extras/spi_temperature.py
View File

@ -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):