From d072c71621b1b123786f5882d43e6443ed4b8758 Mon Sep 17 00:00:00 2001 From: WinstonMao Date: Sun, 28 Apr 2024 10:05:31 +0800 Subject: [PATCH 1/2] Sync with main branch --- resources/definitions/weedo_base.def.json | 10 +++++++--- resources/extruders/weedo_x40v3_extruder_left.def.json | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index 22f2085659..04549e6768 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -196,6 +196,10 @@ "machine_nozzle_heat_up_speed": { "default_value": 1.8 }, "machine_nozzle_tip_outer_diameter": { "default_value": 0.8 }, "machine_start_gcode": { "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_steps_per_mm_e": { "default_value": 96 }, + "machine_steps_per_mm_x": { "default_value": 94 }, + "machine_steps_per_mm_y": { "default_value": 94 }, + "machine_steps_per_mm_z": { "default_value": 400 }, "material_bed_temp_wait": { "default_value": false }, "material_bed_temperature": { "maximum_value_warning": "96" }, "material_diameter": { "default_value": 1.75 }, @@ -210,15 +214,15 @@ "prime_tower_min_volume": { "default_value": 10.0 }, "prime_tower_size": { "default_value": 15.0 }, "raft_airgap": { "default_value": 0.19 }, + "raft_base_fan_speed": { "value": 0.0 }, "raft_base_speed": { "value": 20.0 }, + "raft_base_thickness": { "value": 0.3 }, "raft_interface_speed": { "value": 33.0 }, - "raft_interface_thickness": { "value": 0.27 }, "raft_margin": { "default_value": 8.0 }, - "raft_surface_fan_speed": { "value": "100.0 if cool_fan_enabled else 0.0" }, "raft_surface_speed": { "value": 40.0 }, "raft_surface_thickness": { "value": 0.25 }, "retraction_amount": { "default_value": 3 }, - "retraction_combing": { "value": "off" }, + "retraction_combing": { "value": "'off'" }, "retraction_extrusion_window": { "value": 1.0 }, "retraction_hop_after_extruder_switch": { "default_value": false }, "retraction_min_travel": { "value": 0.8 }, diff --git a/resources/extruders/weedo_x40v3_extruder_left.def.json b/resources/extruders/weedo_x40v3_extruder_left.def.json index 8126207c88..26967d71d9 100644 --- a/resources/extruders/weedo_x40v3_extruder_left.def.json +++ b/resources/extruders/weedo_x40v3_extruder_left.def.json @@ -14,6 +14,6 @@ }, "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code":{ "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, - "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X-47 F3000\n"} + "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X-49 F3000\n"} } } From 2c4859d4bf622396af64a13efbc3ec1cdc24986f Mon Sep 17 00:00:00 2001 From: WinstonMao Date: Sun, 28 Apr 2024 02:06:19 +0000 Subject: [PATCH 2/2] Applied printer-linter format --- .../weedo_x40v3_extruder_left.def.json | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/resources/extruders/weedo_x40v3_extruder_left.def.json b/resources/extruders/weedo_x40v3_extruder_left.def.json index 26967d71d9..eac3309fc0 100644 --- a/resources/extruders/weedo_x40v3_extruder_left.def.json +++ b/resources/extruders/weedo_x40v3_extruder_left.def.json @@ -2,18 +2,20 @@ "version": 2, "name": "Extruder Left", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "weedo_x40v3", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_start_code":{ "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, - "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X-49 F3000\n"} + "machine_extruder_end_code": { "default_value": "M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X-49 F3000\n" }, + "machine_extruder_start_code": { "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file