From 91237876f0ebf3da5b50ece218e725f22b170cfb Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sun, 27 Oct 2024 17:56:22 +0100 Subject: [PATCH 1/4] Remove obsolete overrides --- resources/definitions/eazao_m500.def.json | 2 -- resources/definitions/eazao_m600.def.json | 2 -- resources/definitions/eazao_m700.def.json | 2 -- resources/definitions/eazao_potter.def.json | 2 -- resources/definitions/eazao_zero.def.json | 2 -- 5 files changed, 10 deletions(-) diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json index 70ab78a5a6..366ff92c29 100644 --- a/resources/definitions/eazao_m500.def.json +++ b/resources/definitions/eazao_m500.def.json @@ -9,7 +9,6 @@ "manufacturer": "Eazao", "file_formats": "text/x-gcode", "has_machine_quality": false, - "has_materials": false, "machine_extruder_trains": { "0": "eazao_m500_extruder_0" }, "preferred_quality_type": "normal" }, @@ -58,7 +57,6 @@ "retraction_amount": { "value": 7 }, "retraction_combing": { "value": "'noskin'" }, "retraction_count_max": { "value": 100 }, - "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, "speed_print": { "value": 20.0 }, diff --git a/resources/definitions/eazao_m600.def.json b/resources/definitions/eazao_m600.def.json index 35a946e25e..309888d302 100644 --- a/resources/definitions/eazao_m600.def.json +++ b/resources/definitions/eazao_m600.def.json @@ -9,7 +9,6 @@ "manufacturer": "Eazao", "file_formats": "text/x-gcode", "has_machine_quality": false, - "has_materials": false, "machine_extruder_trains": { "0": "eazao_m600_extruder_0" }, "preferred_quality_type": "normal" }, @@ -58,7 +57,6 @@ "retraction_amount": { "value": 7 }, "retraction_combing": { "value": "'noskin'" }, "retraction_count_max": { "value": 100 }, - "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, "speed_print": { "value": 20.0 }, diff --git a/resources/definitions/eazao_m700.def.json b/resources/definitions/eazao_m700.def.json index 8459b3625d..e4f165fe0b 100644 --- a/resources/definitions/eazao_m700.def.json +++ b/resources/definitions/eazao_m700.def.json @@ -9,7 +9,6 @@ "manufacturer": "Eazao", "file_formats": "text/x-gcode", "has_machine_quality": false, - "has_materials": false, "machine_extruder_trains": { "0": "eazao_m700_extruder_0" }, "preferred_quality_type": "normal" }, @@ -58,7 +57,6 @@ "retraction_amount": { "value": 7 }, "retraction_combing": { "value": "'noskin'" }, "retraction_count_max": { "value": 100 }, - "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, "speed_print": { "value": 20.0 }, diff --git a/resources/definitions/eazao_potter.def.json b/resources/definitions/eazao_potter.def.json index 0ff84ab429..ab704b1763 100644 --- a/resources/definitions/eazao_potter.def.json +++ b/resources/definitions/eazao_potter.def.json @@ -9,7 +9,6 @@ "manufacturer": "Eazao", "file_formats": "text/x-gcode", "has_machine_quality": false, - "has_materials": false, "machine_extruder_trains": { "0": "eazao_potter_extruder_0" }, "preferred_quality_type": "normal" }, @@ -58,7 +57,6 @@ "retraction_amount": { "value": 7 }, "retraction_combing": { "value": "'noskin'" }, "retraction_count_max": { "value": 100 }, - "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, "speed_print": { "value": 25.0 }, diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json index df6f4faa18..7ee8e24cee 100644 --- a/resources/definitions/eazao_zero.def.json +++ b/resources/definitions/eazao_zero.def.json @@ -9,7 +9,6 @@ "manufacturer": "Eazao", "file_formats": "text/x-gcode", "has_machine_quality": false, - "has_materials": false, "machine_extruder_trains": { "0": "eazao_zero_extruder_0" }, "preferred_quality_type": "normal" }, @@ -60,7 +59,6 @@ "retraction_combing": { "value": "'noskin'" }, "retraction_combing_max_distance": { "value": 0 }, "retraction_count_max": { "value": 100 }, - "retraction_enable": { "value": false }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, "speed_print": { "value": 25.0 }, From a18a25027481f0d087729082a28ba211187f50b4 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sun, 27 Oct 2024 18:04:35 +0100 Subject: [PATCH 2/4] Remove obsolete override for cool_fan_enabled Since the material has cool fan speed at 100. cool fan enabled set to false would make that setting redundant. --- resources/definitions/eazao_m500.def.json | 1 - resources/definitions/eazao_m600.def.json | 1 - resources/definitions/eazao_m700.def.json | 1 - resources/definitions/eazao_potter.def.json | 1 - resources/definitions/eazao_zero.def.json | 1 - 5 files changed, 5 deletions(-) diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json index 366ff92c29..965dc3b520 100644 --- a/resources/definitions/eazao_m500.def.json +++ b/resources/definitions/eazao_m500.def.json @@ -18,7 +18,6 @@ "acceleration_travel": { "value": 300 }, "adhesion_type": { "default_value": "'none'" }, "bottom_layers": { "value": 2 }, - "cool_fan_enabled": { "value": false }, "infill_sparse_density": { "value": 0 }, "initial_bottom_layers": { "value": 2 }, "jerk_print": { "value": 10 }, diff --git a/resources/definitions/eazao_m600.def.json b/resources/definitions/eazao_m600.def.json index 309888d302..ece6cdac68 100644 --- a/resources/definitions/eazao_m600.def.json +++ b/resources/definitions/eazao_m600.def.json @@ -18,7 +18,6 @@ "acceleration_travel": { "value": 300 }, "adhesion_type": { "default_value": "'none'" }, "bottom_layers": { "value": 2 }, - "cool_fan_enabled": { "value": false }, "infill_sparse_density": { "value": 0 }, "initial_bottom_layers": { "value": 2 }, "jerk_print": { "value": 10 }, diff --git a/resources/definitions/eazao_m700.def.json b/resources/definitions/eazao_m700.def.json index e4f165fe0b..37816843e3 100644 --- a/resources/definitions/eazao_m700.def.json +++ b/resources/definitions/eazao_m700.def.json @@ -18,7 +18,6 @@ "acceleration_travel": { "value": 300 }, "adhesion_type": { "default_value": "none" }, "bottom_layers": { "value": 2 }, - "cool_fan_enabled": { "value": false }, "infill_sparse_density": { "value": 0 }, "initial_bottom_layers": { "value": 2 }, "jerk_print": { "value": 10 }, diff --git a/resources/definitions/eazao_potter.def.json b/resources/definitions/eazao_potter.def.json index ab704b1763..7811014658 100644 --- a/resources/definitions/eazao_potter.def.json +++ b/resources/definitions/eazao_potter.def.json @@ -18,7 +18,6 @@ "acceleration_travel": { "value": 300 }, "adhesion_type": { "default_value": "'none'" }, "bottom_layers": { "value": 3 }, - "cool_fan_enabled": { "value": false }, "infill_sparse_density": { "value": 0 }, "initial_bottom_layers": { "value": 3 }, "jerk_print": { "value": 10 }, diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json index 7ee8e24cee..490a7cab9e 100644 --- a/resources/definitions/eazao_zero.def.json +++ b/resources/definitions/eazao_zero.def.json @@ -19,7 +19,6 @@ "acceleration_travel": { "value": 300 }, "adhesion_type": { "default_value": "none" }, "bottom_layers": { "value": 3 }, - "cool_fan_enabled": { "value": false }, "infill_sparse_density": { "value": 0 }, "initial_bottom_layers": { "value": 3 }, "jerk_print": { "value": 10 }, From aca2879a3e1deb63054b5199a7653980318614cb Mon Sep 17 00:00:00 2001 From: HellAholic Date: Sun, 27 Oct 2024 18:13:10 +0100 Subject: [PATCH 3/4] retraction_combing_max_distance override with same value as fdmprinter Remove obsolete override setting. --- resources/definitions/eazao_zero.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json index 490a7cab9e..cd572df924 100644 --- a/resources/definitions/eazao_zero.def.json +++ b/resources/definitions/eazao_zero.def.json @@ -56,7 +56,6 @@ "optimize_wall_printing_order": { "value": "True" }, "retraction_amount": { "value": 7 }, "retraction_combing": { "value": "'noskin'" }, - "retraction_combing_max_distance": { "value": 0 }, "retraction_count_max": { "value": 100 }, "retraction_extrusion_window": { "value": 10 }, "retraction_hop": { "value": 0.2 }, From 54a521eed653b597095b0ba2ba81d65942bfa366 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 1 Nov 2024 10:32:13 +0100 Subject: [PATCH 4/4] add preferred material eazao_clay to definitions --- resources/definitions/eazao_m500.def.json | 1 + resources/definitions/eazao_m600.def.json | 1 + resources/definitions/eazao_m700.def.json | 1 + resources/definitions/eazao_potter.def.json | 1 + resources/definitions/eazao_zero.def.json | 1 + 5 files changed, 5 insertions(+) diff --git a/resources/definitions/eazao_m500.def.json b/resources/definitions/eazao_m500.def.json index 965dc3b520..f4ad1dd03e 100644 --- a/resources/definitions/eazao_m500.def.json +++ b/resources/definitions/eazao_m500.def.json @@ -10,6 +10,7 @@ "file_formats": "text/x-gcode", "has_machine_quality": false, "machine_extruder_trains": { "0": "eazao_m500_extruder_0" }, + "preferred_material": "eazao_clay", "preferred_quality_type": "normal" }, "overrides": diff --git a/resources/definitions/eazao_m600.def.json b/resources/definitions/eazao_m600.def.json index ece6cdac68..e76d923909 100644 --- a/resources/definitions/eazao_m600.def.json +++ b/resources/definitions/eazao_m600.def.json @@ -10,6 +10,7 @@ "file_formats": "text/x-gcode", "has_machine_quality": false, "machine_extruder_trains": { "0": "eazao_m600_extruder_0" }, + "preferred_material": "eazao_clay", "preferred_quality_type": "normal" }, "overrides": diff --git a/resources/definitions/eazao_m700.def.json b/resources/definitions/eazao_m700.def.json index 37816843e3..98e35f46e1 100644 --- a/resources/definitions/eazao_m700.def.json +++ b/resources/definitions/eazao_m700.def.json @@ -10,6 +10,7 @@ "file_formats": "text/x-gcode", "has_machine_quality": false, "machine_extruder_trains": { "0": "eazao_m700_extruder_0" }, + "preferred_material": "eazao_clay", "preferred_quality_type": "normal" }, "overrides": diff --git a/resources/definitions/eazao_potter.def.json b/resources/definitions/eazao_potter.def.json index 7811014658..110ea1efb5 100644 --- a/resources/definitions/eazao_potter.def.json +++ b/resources/definitions/eazao_potter.def.json @@ -10,6 +10,7 @@ "file_formats": "text/x-gcode", "has_machine_quality": false, "machine_extruder_trains": { "0": "eazao_potter_extruder_0" }, + "preferred_material": "eazao_clay", "preferred_quality_type": "normal" }, "overrides": diff --git a/resources/definitions/eazao_zero.def.json b/resources/definitions/eazao_zero.def.json index cd572df924..d4ae902fa6 100644 --- a/resources/definitions/eazao_zero.def.json +++ b/resources/definitions/eazao_zero.def.json @@ -10,6 +10,7 @@ "file_formats": "text/x-gcode", "has_machine_quality": false, "machine_extruder_trains": { "0": "eazao_zero_extruder_0" }, + "preferred_material": "eazao_clay", "preferred_quality_type": "normal" }, "overrides":