Merge branch 'master' into skr-mini-e3-v3

.vscode/settings.json

@@ -25,6 +25,7 @@
 		"normalsize",
 		"octahedroflake",
 		"osskc",
+		"Painis",
 		"PARKBED",
 		"PARKCENTER",
 		"PARKFRONT",

README.md

@@ -308,6 +308,12 @@ If enabled, cancelling, or resuming a print from pause, could lead to collisions
 
 In PrusaSlicer, please see Printer Settings > Notes, for extruder clearances.
 
+### Renamed GCODE Commands
+
+#### BED_MESH_CALIBRATE
+
+Renamed to `_BED_MESH_CALIBRATE`.
+
 [🔼 Back to top](#outline)
 
 ## FAQ
@@ -320,11 +326,11 @@ Edit the relevant file according to your needs.
 | ---------------------- | ------------------------ |
 | `cfgs/misc-macros.cfg` | `[gcode_macro _globals]` |
 
-| Variable                           | Disable       | Enable        | Notes                                                               |
+| Variable                           | Disable       | Enable        | Notes                                          |
-| ---------------------------------- | ------------- | ------------- | ------------------------------------------------------------------- |
+| ---------------------------------- | ------------- | ------------- | ---------------------------------------------- |
 | `variable_beeping_enabled`         | `0`           | `1` (default) |
 | `variable_filament_sensor_enabled` | `0` (default) | `1`           |
-| `variable_kamp_enable`             | `0` (default) | `1`           | See [here](#how-do-i-enable-kamp-klipper-adaptive-meshing--purging) |
+| `variable_kamp_enable`             | `0` (default) | `1`           | See [here](#what-do-i-need-to-know-about-kamp) |
 
 ### How do I import a configuration bundle into SuperSlicer/PrusaSlicer?
 

cfgs/TEST_SPEED.cfg

@@ -1,10 +1,12 @@
 # NOTE Find how to use instructions here: https://ellis3dp.com/Print-Tuning-Guide/articles/determining_max_speeds_accels.html
+[gcode_macro TEST_SPEED]
 # Home, get position, throw around toolhead, home again.
 # If MCU stepper positions (first line in GET_POSITION) are greater than a full step different (your number of microsteps), then skipping occured.
 # We only measure to a full step to accomodate for endstop variance.
 # Example: TEST_SPEED SPEED=300 ACCEL=5000 ITERATIONS=10
 
-[gcode_macro TEST_SPEED]
+description: Test for max speed and acceleration parameters for the printer. Procedure: Home -> ReadPositionFromMCU -> MovesToolhead@Vel&Accel -> Home -> ReadPositionfromMCU
+
 gcode:
     # Speed
     {% set speed  = params.SPEED|default(printer.configfile.settings.printer.max_velocity)|int %}
@@ -12,6 +14,8 @@ gcode:
     {% set iterations = params.ITERATIONS|default(5)|int %}
     # Acceleration
     {% set accel  = params.ACCEL|default(printer.configfile.settings.printer.max_accel)|int %}
+    # Minimum Cruise Ratio
+    {% set min_cruise_ratio = params.MIN_CRUISE_RATIO|default(0.5)|float %}
     # Bounding inset for large pattern (helps prevent slamming the toolhead into the sides after small skips, and helps to account for machines with imperfectly set dimensions)
     {% set bound = params.BOUND|default(20)|int %}
     # Size for small pattern box
@@ -64,7 +68,11 @@ 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}
+    {% if printer.configfile.settings.printer.minimum_cruise_ratio is defined %}
+        SET_VELOCITY_LIMIT VELOCITY={speed} ACCEL={accel} MINIMUM_CRUISE_RATIO={min_cruise_ratio}
+    {% else %}
+        SET_VELOCITY_LIMIT VELOCITY={speed} ACCEL={accel} ACCEL_TO_DECEL={accel / 2}
+    {% endif %}
 
     {% for i in range(iterations) %}
         # Large pattern diagonals
@@ -80,7 +88,7 @@ gcode:
         G0 X{x_min} Y{y_max} F{speed*60}
         G0 X{x_max} Y{y_max} F{speed*60}
         G0 X{x_max} Y{y_min} F{speed*60}
-        
+    
         # Small pattern diagonals
         G0 X{x_center_min} Y{y_center_min} F{speed*60}
         G0 X{x_center_max} Y{y_center_max} F{speed*60}
@@ -89,7 +97,7 @@ gcode:
         G0 X{x_center_min} Y{y_center_max} F{speed*60}
         G0 X{x_center_max} Y{y_center_min} F{speed*60}
         
-        # Small patternbox
+        # Small pattern box
         G0 X{x_center_min} Y{y_center_min} F{speed*60}
         G0 X{x_center_min} Y{y_center_max} F{speed*60}
         G0 X{x_center_max} Y{y_center_max} F{speed*60}
@@ -97,7 +105,11 @@ gcode:
     {% 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} 
+    {% if printer.configfile.settings.printer.minimum_cruise_ratio is defined %}
+        SET_VELOCITY_LIMIT VELOCITY={printer.configfile.settings.printer.max_velocity} ACCEL={printer.configfile.settings.printer.max_accel} MINIMUM_CRUISE_RATIO={printer.configfile.settings.printer.minimum_cruise_ratio} 
+    {% else %}
+        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}
+    {% endif %}
 
     # Re-home and get position again for comparison:
         M400 # Finish moves - https://github.com/AndrewEllis93/Print-Tuning-Guide/issues/66
@@ -109,4 +121,5 @@ gcode:
         GET_POSITION
 
     # Restore previous gcode state (absolute/relative, etc)
-    RESTORE_GCODE_STATE NAME=TEST_SPEED
+    RESTORE_GCODE_STATE NAME=TEST_SPEED
+