From 675c2caaba9dd9a36c71c93be13909dd5bd10279 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 25 Jun 2024 11:33:07 +0200 Subject: [PATCH 1/3] Default layer start position to machine_extruder start position CURA-11937 --- resources/definitions/fdmprinter.def.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index a124145314..ef0631ac36 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4372,6 +4372,7 @@ "unit": "mm", "type": "float", "default_value": 0.0, + "value": "machine_extruder_start_pos_x", "minimum_value": "machine_width / -2 if machine_center_is_zero else 0", "settable_per_mesh": false, "settable_per_extruder": true, @@ -4384,6 +4385,7 @@ "unit": "mm", "type": "float", "default_value": 0.0, + "value": "machine_extruder_start_pos_y", "minimum_value": "machine_depth / -2 if machine_center_is_zero else 0", "settable_per_mesh": false, "settable_per_extruder": true, From 0d805df7110f8f043aa997980fd70948b7a0fd25 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 25 Jun 2024 17:09:51 +0200 Subject: [PATCH 2/3] Set layer_start_x/y to a safer value Also remove all the definitions that had exactly this value as an override. CURA-11947 --- resources/definitions/fdmprinter.def.json | 4 ++-- resources/definitions/strateo3d.def.json | 2 -- resources/definitions/ultimaker3.def.json | 2 -- resources/definitions/ultimaker_factor4.def.json | 2 -- resources/definitions/ultimaker_method_base.def.json | 2 -- resources/definitions/ultimaker_s3.def.json | 2 -- resources/definitions/ultimaker_s5.def.json | 3 +-- resources/definitions/ultimaker_sketch.def.json | 2 -- 8 files changed, 3 insertions(+), 16 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index ef0631ac36..89dde70354 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4372,7 +4372,7 @@ "unit": "mm", "type": "float", "default_value": 0.0, - "value": "machine_extruder_start_pos_x", + "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))", "minimum_value": "machine_width / -2 if machine_center_is_zero else 0", "settable_per_mesh": false, "settable_per_extruder": true, @@ -4385,7 +4385,7 @@ "unit": "mm", "type": "float", "default_value": 0.0, - "value": "machine_extruder_start_pos_y", + "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))", "minimum_value": "machine_depth / -2 if machine_center_is_zero else 0", "settable_per_mesh": false, "settable_per_extruder": true, diff --git a/resources/definitions/strateo3d.def.json b/resources/definitions/strateo3d.def.json index f21a13ca86..39ac818e6a 100644 --- a/resources/definitions/strateo3d.def.json +++ b/resources/definitions/strateo3d.def.json @@ -157,8 +157,6 @@ "value": "jerk_wall * 5 / 10" }, "jerk_wall_x": { "maximum_value_warning": "0.01" }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_acceleration": { "default_value": 1500 }, "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 420 }, diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 173fbdb524..9b732aa421 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -70,8 +70,6 @@ "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_acceleration": { "default_value": 3000 }, "machine_depth": { "default_value": 215 }, "machine_disallowed_areas": diff --git a/resources/definitions/ultimaker_factor4.def.json b/resources/definitions/ultimaker_factor4.def.json index 5501148967..3fed9b2388 100644 --- a/resources/definitions/ultimaker_factor4.def.json +++ b/resources/definitions/ultimaker_factor4.def.json @@ -103,8 +103,6 @@ }, "jerk_travel_enabled": { "value": "True" }, "layer_height": { "value": "min(min(extruderValues('machine_nozzle_size')) / 2, 0.2)" }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_acceleration": { "default_value": 3000 }, "machine_depth": { "default_value": 240 }, "machine_end_gcode": { "default_value": "" }, diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 22d25f92c7..c5a1f522cb 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -315,8 +315,6 @@ "enabled": false, "value": "jerk_print" }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_acceleration": { "default_value": 3000 }, "machine_center_is_zero": { "value": true }, "machine_end_gcode": { "default_value": "" }, diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 3750b83553..82776bd62e 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -70,8 +70,6 @@ "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_acceleration": { "default_value": 3000 }, "machine_depth": { "default_value": 190 }, "machine_end_gcode": { "default_value": "" }, diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index eb3984510e..42e26225c5 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -74,8 +74,7 @@ "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, + "machine_acceleration": { "default_value": 3000 }, "machine_depth": { "default_value": 240 }, "machine_end_gcode": { "default_value": "" }, diff --git a/resources/definitions/ultimaker_sketch.def.json b/resources/definitions/ultimaker_sketch.def.json index 05e506c3b6..cac14b07d4 100644 --- a/resources/definitions/ultimaker_sketch.def.json +++ b/resources/definitions/ultimaker_sketch.def.json @@ -208,8 +208,6 @@ "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_sparse_density": { "value": 15 }, "jerk_enabled": { "value": false }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, "machine_center_is_zero": { "default_value": true }, "machine_depth": { "default_value": 150 }, "machine_end_gcode": { "default_value": "M107; Disable Fan; \n; End of print; \n; End GCode\nM104 S0 T0; Set Toolhead Temp to 0\nM140 S0 T0; Set Platform Temp to 0\nG162 Z F1800; Move to max axes position\nG28 X Y; Home\nM652; Turn off back fan\nM132 X Y Z A B; Set Home Position\nG91; Use Relative Positioning\nM18; Disable Axes\n\n" }, From 6b0e492dffd060bb468bdc36fc986f6aaaa90c3b Mon Sep 17 00:00:00 2001 From: wawanbreton Date: Tue, 25 Jun 2024 15:12:08 +0000 Subject: [PATCH 3/3] Applied printer-linter format --- resources/definitions/ultimaker_s5.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 42e26225c5..3c35c84a00 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -74,7 +74,6 @@ "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, - "machine_acceleration": { "default_value": 3000 }, "machine_depth": { "default_value": 240 }, "machine_end_gcode": { "default_value": "" },