Merge pull request #188 from Rat-OS/development

Development
Rat-OS · Mar 22, 2024 · 9bf911f · 9bf911f
2 parents 95a1c28 + ba08f15
commit 9bf911f
Show file tree

Hide file tree

Showing 23 changed files with 43 additions and 38 deletions.
diff --git a/boards/board-definition.schema.json b/boards/board-definition.schema.json
@@ -147,7 +147,7 @@
 						}
 					},
 					"additionalProperties": false,
-					"required": ["step_pin", "dir_pin", "enable_pin", "title", "diag_pin", "endstop_pin", "uart_pin", "cs_pin"]
+					"required": ["step_pin", "dir_pin", "enable_pin", "title", "uart_pin", "cs_pin"]
 				}
 			}
 		},

diff --git a/boards/btt-skrat-10/config.cfg b/boards/btt-skrat-10/config.cfg
@@ -11,7 +11,7 @@ aliases:
   x_step_pin=PF9,   x_dir_pin=PD7,   x_enable_pin=PD6,   x_uart_pin=PF10,   x_diag_pin=PB5,   x_endstop_pin=PB5,
   y_step_pin=PD3,   y_dir_pin=PD2,    y_enable_pin=PD5,   y_uart_pin=PD4,   y_diag_pin=PC1,   y_endstop_pin=PC1,
   z0_step_pin=PA15,   z0_dir_pin=PF8,   z0_enable_pin=PC9,   z0_uart_pin=PC8,  z0_diag_pin=PC0,  z_endstop_pin=PC0,
-  z1_step_pin=null,  z1_dir_pin=null,  z1_enable_pin=null,  z1_uart_pin=null,  z1_diag_pin=null,
+  z1_step_pin=PC7,  z1_dir_pin=PC6,  z1_enable_pin=PD9,  z1_uart_pin=PD8,  z1_diag_pin=PF4,
   z2_step_pin=null,  z2_dir_pin=null,  z2_enable_pin=null,  z2_uart_pin=null,  z2_diag_pin=null,
   e_step_pin=PB10,    e_dir_pin=PE15,    e_enable_pin=PA8,    e_uart_pin=PB11,   e_diag_pin=PF5,  e_endstop_pin=PF5,
 # Extrusion

diff --git a/klippy/resonance_generator.py b/klippy/resonance_generator.py
@@ -32,16 +32,16 @@ def run_test(self, axis, gcmd):
         X, Y, Z, E = toolhead.get_position()
         sign = 1.
         freq = self.freq
-        # Override maximum acceleration and acceleration to
-        # deceleration based on the maximum test frequency
+        # Override maximum acceleration and min cruise ratio 
+        # based on the maximum test frequency
         systime = self.printer.get_reactor().monotonic()
         toolhead_info = toolhead.get_status(systime)
         old_max_accel = toolhead_info['max_accel']
-        old_max_accel_to_decel = toolhead_info['max_accel_to_decel']
+        old_minimum_cruise_ratio = toolhead_info['minimum_cruise_ratio']
         max_accel = self.freq * self.accel_per_hz
         self.gcode.run_script_from_command(
-                "SET_VELOCITY_LIMIT ACCEL=%.3f ACCEL_TO_DECEL=%.3f" % (
-                    max_accel, max_accel))
+                "SET_VELOCITY_LIMIT ACCEL=%.3f MINIMUM_CRUISE_RATIO=0" % (
+                    max_accel))
 
         input_shaper = self.printer.lookup_object('input_shaper', None)
         if input_shaper is not None and not gcmd.get_int('INPUT_SHAPING', 0):
@@ -69,8 +69,8 @@ def run_test(self, axis, gcmd):
 
         # Restore the original acceleration values
         self.gcode.run_script_from_command(
-                "SET_VELOCITY_LIMIT ACCEL=%.3f ACCEL_TO_DECEL=%.3f" % (
-                    old_max_accel, old_max_accel_to_decel))
+                "SET_VELOCITY_LIMIT ACCEL=%.3f MINIMUM_CRUISE_RATIO=%.3f" % (
+                    old_max_accel, old_minimum_cruise_ratio))
 
         # Restore input shaper if it was disabled for resonance testing
         if input_shaper is not None:

diff --git a/printers/caramba-chonk/caramba.cfg b/printers/caramba-chonk/caramba.cfg
@@ -29,7 +29,7 @@ pin: fan_controller_board_pin
 kinematics: corexy
 max_velocity: 300
 max_accel: 1500
-max_accel_to_decel: 750
+minimum_cruise_ratio: 0.5
 max_z_velocity: 15
 max_z_accel: 20
 
@@ -48,8 +48,8 @@ position_max: 180
 
 [bed_mesh]
 horizontal_move_z: 5
-mesh_min: 20,30
-mesh_max:145,140
+mesh_min: 7,7
+mesh_max:145,150
 probe_count: 7,7
 fade_start: 1.0
 fade_end: 10.0

diff --git a/printers/caramba-chonk/printer-definition.json b/printers/caramba-chonk/printer-definition.json
@@ -6,7 +6,7 @@
 	"documentationLink": "https://www.youtube.com/watch?v=dQw4w9WgXcQ",
 	"image": "caramba.webp",
 	"template": "caramba-chonk-printer.template.cfg",
-	"driverCountRequired": 4,
+	"driverCountRequired": 5,
 	"bedMargin": {
 		"x": [0, 0],
 		"y": [15, 0]
@@ -67,7 +67,7 @@
 			},
 			{
 				"axis": "y",
-				"axisDescription": "The left Y motor used for cartesian Y control in Hybrid CoreXY, located at the rear left of the printer",
+				"axisDescription": "The B axis motor for the toolhead, located at the rear right of the printer",
 				"current": 1.1,
 				"driver": "BTT-TMC2209-13",
 				"stepper": "LDO-42STH48-2504AC",
@@ -79,16 +79,21 @@
 			},
 			{
 				"axis": "z",
-				"axisDescription": "The left Z motor for the kinematic bed",
-				"current": 0.8,
-				"performanceMode": {
-					"current": 1.188
-				},
+				"axisDescription": "The front right and left Z motors for the kinematic bed",
+				"current": 0.85,
 				"driver": "BTT-TMC2209-13",
-				"stepper": "LDO-42STH40-1684AC",
+				"stepper": "LDO-42STH25-1404MAC",
 				"rotationDistance": 4,
 				"homingSpeed": 10
 			},
+			{
+				"axis": "z1",
+				"axisDescription": "The rear Z motor for the kinematic bed",
+				"current": 0.85,
+				"driver": "BTT-TMC2209-13",
+				"stepper": "LDO-42STH25-1404MAC",
+				"rotationDistance": 4
+			},
 			{
 				"axis": "extruder",
 				"axisDescription": "The extruder motor used for pushing filament through the toolhead",

diff --git a/printers/caramba-hybrid/caramba.cfg b/printers/caramba-hybrid/caramba.cfg
@@ -29,7 +29,7 @@ pin: fan_controller_board_pin
 kinematics: ratos_hybrid_corexy
 max_velocity: 300
 max_accel: 1500
-max_accel_to_decel: 750
+minimum_cruise_ratio: 0.5
 max_z_velocity: 15
 max_z_accel: 20
 

diff --git a/printers/caramba-idex/caramba.cfg b/printers/caramba-idex/caramba.cfg
@@ -29,7 +29,7 @@ pin: fan_controller_board_pin
 kinematics: ratos_hybrid_corexy
 max_velocity: 300
 max_accel: 1500
-max_accel_to_decel: 750
+minimum_cruise_ratio: 0.5
 max_z_velocity: 15
 max_z_accel: 20
 

diff --git a/printers/caramba/caramba.cfg b/printers/caramba/caramba.cfg
@@ -29,6 +29,6 @@ pin: fan_controller_board_pin
 kinematics: corexy
 max_velocity: 300
 max_accel: 1500
-max_accel_to_decel: 750
+minimum_cruise_ratio: 0.5
 max_z_velocity: 15
 max_z_accel: 20
diff --git a/printers/prusa-mini/speed-limits-basic.cfg b/printers/prusa-mini/speed-limits-basic.cfg
@@ -5,7 +5,7 @@
 [printer]
 max_velocity: 165
 max_accel: 3000
-max_accel_to_decel: 1500
+minimum_cruise_ratio: 0.5
 max_z_velocity: 15
 max_z_accel: 200
 square_corner_velocity: 5

diff --git a/printers/prusa-mini/speed-limits-performance.cfg b/printers/prusa-mini/speed-limits-performance.cfg
@@ -10,7 +10,7 @@
 [printer]
 max_velocity: 400
 max_accel: 15000
-max_accel_to_decel: 7500
+minimum_cruise_ratio: 0.50
 max_z_velocity: 15
 max_z_accel: 600
 square_corner_velocity: 5

diff --git a/printers/prusa-mk3s/speed-limits-basic.cfg b/printers/prusa-mk3s/speed-limits-basic.cfg
@@ -5,7 +5,7 @@
 [printer]
 max_velocity: 240
 max_accel: 4000
-max_accel_to_decel: 2000
+minimum_cruise_ratio: 0.5
 max_z_velocity: 15
 max_z_accel: 200
 square_corner_velocity: 5

diff --git a/printers/v-core-3-idex/v-core-3.cfg b/printers/v-core-3-idex/v-core-3.cfg
@@ -29,7 +29,7 @@ pin: fan_controller_board_pin
 kinematics: ratos_hybrid_corexy
 max_velocity: 300
 max_accel: 1500
-max_accel_to_decel: 750
+minimum_cruise_ratio: 0.5
 max_z_velocity: 15
 max_z_accel: 20
 

diff --git a/printers/v-core-3/speed-limits-basic.cfg b/printers/v-core-3/speed-limits-basic.cfg
@@ -12,7 +12,7 @@ speed: 200
 [printer]
 max_velocity: 200
 max_accel: 1500
-max_accel_to_decel: 750
+minimum_cruise_ratio: 0.5
 max_z_velocity: 15
 max_z_accel: 30
 square_corner_velocity: 5
diff --git a/printers/v-core-3/speed-limits-performance.cfg b/printers/v-core-3/speed-limits-performance.cfg
@@ -8,7 +8,7 @@
 [printer]
 max_velocity: 1000
 max_accel: 15000
-max_accel_to_decel: 7500
+minimum_cruise_ratio: 0.50
 max_z_velocity: 20
 max_z_accel: 150
 square_corner_velocity: 5

diff --git a/printers/v-core-3/speed-limits-stealth.cfg b/printers/v-core-3/speed-limits-stealth.cfg
@@ -11,7 +11,7 @@ speed: 135
 [printer]
 max_velocity: 135
 max_accel: 1500
-max_accel_to_decel: 750
+minimum_cruise_ratio: 0.5
 max_z_velocity: 15
 max_z_accel: 30
 square_corner_velocity: 5
diff --git a/printers/v-core-3/v-core-3.cfg b/printers/v-core-3/v-core-3.cfg
@@ -29,6 +29,6 @@ pin: fan_controller_board_pin
 kinematics: corexy
 max_velocity: 300
 max_accel: 1500
-max_accel_to_decel: 750
+minimum_cruise_ratio: 0.5
 max_z_velocity: 15
 max_z_accel: 20
diff --git a/printers/v-core-pro/speed-limits-basic.cfg b/printers/v-core-pro/speed-limits-basic.cfg
@@ -10,7 +10,7 @@
 [printer]
 max_velocity: 200
 max_accel: 1500
-max_accel_to_decel: 750
+minimum_cruise_ratio: 0.5
 max_z_velocity: 15
 max_z_accel: 30
 square_corner_velocity: 5

diff --git a/printers/v-core-pro/speed-limits-performance.cfg b/printers/v-core-pro/speed-limits-performance.cfg
@@ -11,7 +11,7 @@
 [printer]
 max_velocity: 1000
 max_accel: 15000
-max_accel_to_decel: 7500
+minimum_cruise_ratio: 0.50
 max_z_velocity: 20
 max_z_accel: 150
 square_corner_velocity: 5

diff --git a/printers/v-core-pro/speed-limits-stealth.cfg b/printers/v-core-pro/speed-limits-stealth.cfg
@@ -11,7 +11,7 @@ speed: 135
 [printer]
 max_velocity: 135
 max_accel: 1500
-max_accel_to_decel: 750
+minimum_cruise_ratio: 0.5
 max_z_velocity: 15
 max_z_accel: 30
 square_corner_velocity: 5
diff --git a/printers/v-core-pro/v-core-pro.cfg b/printers/v-core-pro/v-core-pro.cfg
@@ -29,6 +29,6 @@ pin: fan_controller_board_pin
 kinematics: corexy
 max_velocity: 300
 max_accel: 1500
-max_accel_to_decel: 750
+minimum_cruise_ratio: 0.5
 max_z_velocity: 15
 max_z_accel: 20
diff --git a/printers/v-minion/speed-limits-basic.cfg b/printers/v-minion/speed-limits-basic.cfg
@@ -5,7 +5,7 @@
 [printer]
 max_velocity: 200
 max_accel: 3000
-max_accel_to_decel: 1500
+minimum_cruise_ratio: 0.5
 max_z_velocity: 15
 max_z_accel: 200
 square_corner_velocity: 5

diff --git a/printers/v-minion/speed-limits-performance.cfg b/printers/v-minion/speed-limits-performance.cfg
@@ -9,7 +9,7 @@
 [printer]
 max_velocity: 400
 max_accel: 15000
-max_accel_to_decel: 7500
+minimum_cruise_ratio: 0.50
 max_z_velocity: 15
 max_z_accel: 600
 square_corner_velocity: 5

diff --git a/printers/v-minion/speed-limits-stealth.cfg b/printers/v-minion/speed-limits-stealth.cfg
@@ -5,7 +5,7 @@
 [printer]
 max_velocity: 135
 max_accel: 2500
-max_accel_to_decel: 1250
+minimum_cruise_ratio: 0.5
 max_z_velocity: 15
 max_z_accel: 200
 square_corner_velocity: 5
-Original file line number
+Diff line change
@@ Expand Up / @@ -147,7 +147,7 @@ @@
     						}
     					},
     					"additionalProperties": false,
-    					"required": ["step_pin", "dir_pin", "enable_pin", "title", "diag_pin", "endstop_pin", "uart_pin", "cs_pin"]
+    					"required": ["step_pin", "dir_pin", "enable_pin", "title", "uart_pin", "cs_pin"]
     				}
     			}
     		},
@@ Expand Down @@