From 40418051caf8d6b80e4282ddabb13065a6a5dacc Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 8 Mar 2024 20:22:09 -0500 Subject: [PATCH 1/5] Update rpi_temp.cfg Format with _ so a space is in the name, like other temps --- config/hardware/temperature_sensors/rpi_temp.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/hardware/temperature_sensors/rpi_temp.cfg b/config/hardware/temperature_sensors/rpi_temp.cfg index 68bfcb90e..f2f44f476 100644 --- a/config/hardware/temperature_sensors/rpi_temp.cfg +++ b/config/hardware/temperature_sensors/rpi_temp.cfg @@ -1,2 +1,2 @@ -[temperature_sensor RaspberryPi] +[temperature_sensor Raspberry_Pi] sensor_type: temperature_host From a2e6ca8f04bf5a6e3549a827c075f1f2b74f39e3 Mon Sep 17 00:00:00 2001 From: Eric Date: Fri, 8 Mar 2024 20:22:37 -0500 Subject: [PATCH 2/5] Update cabinet_temp.cfg --- config/hardware/temperature_sensors/cabinet_temp.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/hardware/temperature_sensors/cabinet_temp.cfg b/config/hardware/temperature_sensors/cabinet_temp.cfg index 6237ad4b7..9addc0606 100644 --- a/config/hardware/temperature_sensors/cabinet_temp.cfg +++ b/config/hardware/temperature_sensors/cabinet_temp.cfg @@ -1,3 +1,3 @@ -[temperature_sensor ElectricalCabinet] +[temperature_sensor Electrical_Cabinet] sensor_type: ATC Semitec 104GT-2 sensor_pin: ELECTRICAL_CABINET_TEMPERATURE From f0873e1381abb5215602ce97d5c60e070741811c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Boisselier?= Date: Thu, 14 Mar 2024 13:30:12 +0000 Subject: [PATCH 3/5] switched to the new minimum_cruise_ratio Klipper parameter --- config/kinematics/cartesian.cfg | 1 + config/kinematics/corexy.cfg | 1 + config/kinematics/corexz.cfg | 1 + macros/base/homing/homing_override.cfg | 3 +-- macros/base/probing/dockable_probe.cfg | 6 ++---- macros/base/probing/overrides/qgl.cfg | 3 +-- macros/base/probing/overrides/z_tilt.cfg | 3 +-- macros/calibration/test_speed.cfg | 6 +++--- macros/helpers/nozzle_cleaning.cfg | 3 +-- macros/miscs/compatibility.cfg | 6 ++---- user_templates/variables.cfg | 3 --- 11 files changed, 14 insertions(+), 22 deletions(-) diff --git a/config/kinematics/cartesian.cfg b/config/kinematics/cartesian.cfg index 6537b5726..4314fd3d7 100644 --- a/config/kinematics/cartesian.cfg +++ b/config/kinematics/cartesian.cfg @@ -4,6 +4,7 @@ max_velocity: 200 max_accel: 3000 max_z_velocity: 30 max_z_accel: 500 +minimum_cruise_ratio: 0.5 square_corner_velocity: 5.0 # And add directly all the machines standard includes here diff --git a/config/kinematics/corexy.cfg b/config/kinematics/corexy.cfg index 80cf0e099..0f7cba4dd 100644 --- a/config/kinematics/corexy.cfg +++ b/config/kinematics/corexy.cfg @@ -4,6 +4,7 @@ max_velocity: 400 max_accel: 8000 max_z_velocity: 30 max_z_accel: 500 +minimum_cruise_ratio: 0.5 square_corner_velocity: 5.0 # And add directly all the machines standard includes here diff --git a/config/kinematics/corexz.cfg b/config/kinematics/corexz.cfg index 8ed2a919f..e2be6ebf9 100644 --- a/config/kinematics/corexz.cfg +++ b/config/kinematics/corexz.cfg @@ -4,6 +4,7 @@ max_velocity: 400 max_accel: 1000 max_z_velocity: 200 max_z_accel: 1000 +minimum_cruise_ratio: 0.5 square_corner_velocity: 5.0 # And add directly all the machines standard includes here diff --git a/macros/base/homing/homing_override.cfg b/macros/base/homing/homing_override.cfg index 94544779c..02f605d9b 100644 --- a/macros/base/homing/homing_override.cfg +++ b/macros/base/homing/homing_override.cfg @@ -73,7 +73,6 @@ gcode: # Set the homing acceleration prior to any movement {% set saved_accel = printer.toolhead.max_accel %} - {% set saved_decel = printer.toolhead.max_accel_to_decel %} M204 S{homing_travel_accel} {% if bed_mesh_enabled %} @@ -340,7 +339,7 @@ gcode: {% endif %} # Reset acceleration values to what it was before - SET_VELOCITY_LIMIT ACCEL={saved_accel} ACCEL_TO_DECEL={saved_decel} + SET_VELOCITY_LIMIT ACCEL={saved_accel} {% if probe_type_enabled == "dockable" or probe_type_enabled == "dockable_virtual" %} _EXIT_POINT FUNCTION=homing_override diff --git a/macros/base/probing/dockable_probe.cfg b/macros/base/probing/dockable_probe.cfg index 42659ca21..5d3b68782 100644 --- a/macros/base/probing/dockable_probe.cfg +++ b/macros/base/probing/dockable_probe.cfg @@ -138,7 +138,6 @@ gcode: # Set the dock/undock acceleration prior to any movement {% set saved_accel = printer.toolhead.max_accel %} - {% set saved_decel = printer.toolhead.max_accel_to_decel %} M204 S{probe_dock_accel} # Probe entry location @@ -161,7 +160,7 @@ gcode: {% endif %} # Reset acceleration values to what it was before - SET_VELOCITY_LIMIT ACCEL={saved_accel} ACCEL_TO_DECEL={saved_decel} + SET_VELOCITY_LIMIT ACCEL={saved_accel} _CHECK_PROBE action=attach @@ -247,7 +246,6 @@ gcode: # Set the dock/undock acceleration prior to any movement {% set saved_accel = printer.toolhead.max_accel %} - {% set saved_decel = printer.toolhead.max_accel_to_decel %} M204 S{probe_dock_accel} # Move to probe entry location @@ -275,7 +273,7 @@ gcode: {% endif %} # Reset acceleration values to what it was before - SET_VELOCITY_LIMIT ACCEL={saved_accel} ACCEL_TO_DECEL={saved_decel} + SET_VELOCITY_LIMIT ACCEL={saved_accel} G4 P500 _CHECK_PROBE action=dock diff --git a/macros/base/probing/overrides/qgl.cfg b/macros/base/probing/overrides/qgl.cfg index 6b5d6b953..872b5f332 100644 --- a/macros/base/probing/overrides/qgl.cfg +++ b/macros/base/probing/overrides/qgl.cfg @@ -25,13 +25,12 @@ gcode: # Set the tilting acceleration prior to any movement {% set saved_accel = printer.toolhead.max_accel %} - {% set saved_decel = printer.toolhead.max_accel_to_decel %} M204 S{tilting_travel_accel} _BASE_QUAD_GANTRY_LEVEL {% for p in params %}{'%s=%s ' % (p, params[p])}{% endfor %} # Reset acceleration values to what it was before - SET_VELOCITY_LIMIT ACCEL={saved_accel} ACCEL_TO_DECEL={saved_decel} + SET_VELOCITY_LIMIT ACCEL={saved_accel} DEACTIVATE_PROBE diff --git a/macros/base/probing/overrides/z_tilt.cfg b/macros/base/probing/overrides/z_tilt.cfg index 548b40ce3..28b75b68a 100644 --- a/macros/base/probing/overrides/z_tilt.cfg +++ b/macros/base/probing/overrides/z_tilt.cfg @@ -26,13 +26,12 @@ gcode: # Set the tilting acceleration prior to any movement {% set saved_accel = printer.toolhead.max_accel %} - {% set saved_decel = printer.toolhead.max_accel_to_decel %} M204 S{tilting_travel_accel} _BASE_Z_TILT_ADJUST {% for p in params %}{'%s=%s ' % (p, params[p])}{% endfor %} # Reset acceleration values to what it was before - SET_VELOCITY_LIMIT ACCEL={saved_accel} ACCEL_TO_DECEL={saved_decel} + SET_VELOCITY_LIMIT ACCEL={saved_accel} DEACTIVATE_PROBE diff --git a/macros/calibration/test_speed.cfg b/macros/calibration/test_speed.cfg index 4ba6d9075..51e5f32c6 100644 --- a/macros/calibration/test_speed.cfg +++ b/macros/calibration/test_speed.cfg @@ -63,7 +63,7 @@ gcode: G0 X{x_min} Y{y_min} Z{bound + 10} F{speed*60} # Set new limits - SET_VELOCITY_LIMIT VELOCITY={speed} ACCEL={accel} ACCEL_TO_DECEL={accel / 2} + SET_VELOCITY_LIMIT VELOCITY={speed} ACCEL={accel} {% for i in range(iterations) %} # Large pattern diagonals @@ -95,8 +95,8 @@ gcode: G0 X{x_center_max} Y{y_center_min} F{speed*60} {% endfor %} - # Restore max speed/accel/accel_to_decel to their configured values - SET_VELOCITY_LIMIT VELOCITY={printer.configfile.settings.printer.max_velocity} ACCEL={printer.configfile.settings.printer.max_accel} ACCEL_TO_DECEL={printer.configfile.settings.printer.max_accel_to_decel} + # Restore max speed/accel to their configured values + SET_VELOCITY_LIMIT VELOCITY={printer.configfile.settings.printer.max_velocity} ACCEL={printer.configfile.settings.printer.max_accel} # Re-home and get position again for comparison: M400 # Finish moves - https://github.com/AndrewEllis93/Print-Tuning-Guide/issues/66 diff --git a/macros/helpers/nozzle_cleaning.cfg b/macros/helpers/nozzle_cleaning.cfg index 8cb799f28..e2869681e 100644 --- a/macros/helpers/nozzle_cleaning.cfg +++ b/macros/helpers/nozzle_cleaning.cfg @@ -25,7 +25,6 @@ gcode: # Set the cleaning acceleration prior to any movement {% set saved_accel = printer.toolhead.max_accel %} - {% set saved_decel = printer.toolhead.max_accel_to_decel %} M204 S{brush_clean_accel} # Move to purge zone (left side) @@ -53,7 +52,7 @@ gcode: G90 # Reset acceleration values to what it was before - SET_VELOCITY_LIMIT ACCEL={saved_accel} ACCEL_TO_DECEL={saved_decel} + SET_VELOCITY_LIMIT ACCEL={saved_accel} {% if purgeclean_servo_enabled %} _SERVO_RETRACT ITEM="clean" diff --git a/macros/miscs/compatibility.cfg b/macros/miscs/compatibility.cfg index 3a1c9b665..5f3bbc73c 100644 --- a/macros/miscs/compatibility.cfg +++ b/macros/miscs/compatibility.cfg @@ -30,14 +30,12 @@ gcode: {% endif %} [gcode_macro M204] -description: Map M204 to SET_VELOCITY_LIMIT for ACCEL and ACCEL_TO_DECEL +description: Map M204 to SET_VELOCITY_LIMIT for ACCEL rename_existing: M204.1 gcode: - {% set F = params.F|default(printer["gcode_macro _USER_VARIABLES"].accel_to_decel_factor)|float %} - {% if 'S' in params %} {% set S = params.S|float %} - SET_VELOCITY_LIMIT ACCEL={S} ACCEL_TO_DECEL={S * F} + SET_VELOCITY_LIMIT ACCEL={S} {% endif %} [gcode_macro M205] diff --git a/user_templates/variables.cfg b/user_templates/variables.cfg index 63c9b1390..f2e62f2e9 100644 --- a/user_templates/variables.cfg +++ b/user_templates/variables.cfg @@ -20,9 +20,6 @@ variable_tilting_travel_accel: 3000 variable_brush_clean_accel: 1500 variable_probe_dock_accel: 2000 -## Accel to decel scale factor (default is 75% of the accel) -variable_accel_to_decel_factor: 0.75 - ################################################# # Homing, start_print and end_print variables From 1c5c6623d711aa88dc78d0d87bce0d958c680dcc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A9lix=20Boisselier?= Date: Thu, 14 Mar 2024 13:33:51 +0000 Subject: [PATCH 4/5] commented the default minimum_cruise_ratio to not break older Klipper versions --- config/kinematics/cartesian.cfg | 2 +- config/kinematics/corexy.cfg | 2 +- config/kinematics/corexz.cfg | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/config/kinematics/cartesian.cfg b/config/kinematics/cartesian.cfg index 4314fd3d7..344afcb08 100644 --- a/config/kinematics/cartesian.cfg +++ b/config/kinematics/cartesian.cfg @@ -4,7 +4,7 @@ max_velocity: 200 max_accel: 3000 max_z_velocity: 30 max_z_accel: 500 -minimum_cruise_ratio: 0.5 +# minimum_cruise_ratio: 0.5 # This left commented to not break older Klipper versions square_corner_velocity: 5.0 # And add directly all the machines standard includes here diff --git a/config/kinematics/corexy.cfg b/config/kinematics/corexy.cfg index 0f7cba4dd..b7573a2f1 100644 --- a/config/kinematics/corexy.cfg +++ b/config/kinematics/corexy.cfg @@ -4,7 +4,7 @@ max_velocity: 400 max_accel: 8000 max_z_velocity: 30 max_z_accel: 500 -minimum_cruise_ratio: 0.5 +# minimum_cruise_ratio: 0.5 # This left commented to not break older Klipper versions square_corner_velocity: 5.0 # And add directly all the machines standard includes here diff --git a/config/kinematics/corexz.cfg b/config/kinematics/corexz.cfg index e2be6ebf9..a11c6bfdf 100644 --- a/config/kinematics/corexz.cfg +++ b/config/kinematics/corexz.cfg @@ -4,7 +4,7 @@ max_velocity: 400 max_accel: 1000 max_z_velocity: 200 max_z_accel: 1000 -minimum_cruise_ratio: 0.5 +# minimum_cruise_ratio: 0.5 # This left commented to not break older Klipper versions square_corner_velocity: 5.0 # And add directly all the machines standard includes here From 20e968b9cc223b4a914407e998cf612f4c32f49d Mon Sep 17 00:00:00 2001 From: Colten Edwards Date: Thu, 14 Mar 2024 09:41:40 -0600 Subject: [PATCH 5/5] Update qgl.cfg Replace M204 with SET_VELOCITY_LIMIT --- macros/base/probing/overrides/qgl.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/macros/base/probing/overrides/qgl.cfg b/macros/base/probing/overrides/qgl.cfg index 872b5f332..770a7cb31 100644 --- a/macros/base/probing/overrides/qgl.cfg +++ b/macros/base/probing/overrides/qgl.cfg @@ -25,7 +25,7 @@ gcode: # Set the tilting acceleration prior to any movement {% set saved_accel = printer.toolhead.max_accel %} - M204 S{tilting_travel_accel} + SET_VELOCTITY_LIMIT ACCEL={tilting_travel_accel} _BASE_QUAD_GANTRY_LEVEL {% for p in params %}{'%s=%s ' % (p, params[p])}{% endfor %}