From 13dab34ad2814fde860c7f5ef4c9a88c3dc670aa Mon Sep 17 00:00:00 2001 From: Modix-Lazar Date: Mon, 5 Dec 2022 15:55:28 +0100 Subject: [PATCH] Removed pre-defined values from the files --- resources/definitions/modix_v3_base.def.json | 13 +------------ resources/definitions/modix_v3_big120X.def.json | 2 +- resources/definitions/modix_v3_big120Z.def.json | 2 +- resources/definitions/modix_v3_big180X.def.json | 2 +- resources/definitions/modix_v3_big40.def.json | 2 +- resources/definitions/modix_v3_big60.def.json | 2 +- resources/definitions/modix_v3_big_meter.def.json | 2 +- resources/definitions/modix_v4_base.def.json | 13 +------------ resources/definitions/modix_v4_big120X.def.json | 2 +- resources/definitions/modix_v4_big120Z.def.json | 2 +- resources/definitions/modix_v4_big180X.def.json | 2 +- resources/definitions/modix_v4_big60.def.json | 2 +- resources/definitions/modix_v4_big_meter.def.json | 2 +- resources/extruders/modix_v3_extruder_0.def.json | 1 - resources/extruders/modix_v3_extruder_1.def.json | 1 - resources/extruders/modix_v4_extruder_0.def.json | 1 - resources/extruders/modix_v4_extruder_1.def.json | 1 - 17 files changed, 13 insertions(+), 39 deletions(-) diff --git a/resources/definitions/modix_v3_base.def.json b/resources/definitions/modix_v3_base.def.json index 9451c25655..4fa3866464 100644 --- a/resources/definitions/modix_v3_base.def.json +++ b/resources/definitions/modix_v3_base.def.json @@ -29,30 +29,20 @@ "layer_height_0": {"value": "round(machine_nozzle_size / 2, 1)" }, - "speed_infill": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, "speed_wall_x": { "value": "speed_wall" }, - "speed_topbottom": { "value": "speed_print / 2" }, - "speed_roofing": { "value": "speed_topbottom" }, - "speed_travel": { "value": 150.0 }, + "speed_travel": { "value": 110.0 }, "speed_layer_0": { "value": 20.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, - "speed_travel_layer_0": { "value": "speed_layer_0 * speed_travel / speed_print" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, "speed_support_interface": { "value": "speed_topbottom" }, "speed_z_hop": { "value": 5 }, - "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size * 1.05" }, "optimize_wall_printing_order": { "value": "True" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "z_seam_corner": { "value": "z_seam_corner_weighted" }, @@ -78,7 +68,6 @@ "retraction_amount": { "value": 1 }, "retraction_count_max": { "value": 50 }, "retraction_extrusion_window": { "value": 1 }, - "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, diff --git a/resources/definitions/modix_v3_big120X.def.json b/resources/definitions/modix_v3_big120X.def.json index db3acb913a..29f4418cf7 100644 --- a/resources/definitions/modix_v3_big120X.def.json +++ b/resources/definitions/modix_v3_big120X.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "modix_v3_base", "overrides": { - "machine_name": { "default_value": "Modix V3 BIG-120X" }, + "machine_name": { "default_value": "Modix BIG-120X V3" }, "machine_width": { "default_value": 1200 }, "machine_depth": { "default_value": 600 }, "machine_height": { "default_value": 640 } diff --git a/resources/definitions/modix_v3_big120Z.def.json b/resources/definitions/modix_v3_big120Z.def.json index 2e6a9c26ce..08f3e87d2b 100644 --- a/resources/definitions/modix_v3_big120Z.def.json +++ b/resources/definitions/modix_v3_big120Z.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "modix_v3_base", "overrides": { - "machine_name": { "default_value": "Modix V3 BIG-120Z" }, + "machine_name": { "default_value": "Modix BIG-120Z V3" }, "machine_width": { "default_value": 600 }, "machine_depth": { "default_value": 600 }, "machine_height": { "default_value": 1200 } diff --git a/resources/definitions/modix_v3_big180X.def.json b/resources/definitions/modix_v3_big180X.def.json index 24b714ab28..b68902aa8c 100644 --- a/resources/definitions/modix_v3_big180X.def.json +++ b/resources/definitions/modix_v3_big180X.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "modix_v3_base", "overrides": { - "machine_name": { "default_value": "Modix V3 BIG-180X" }, + "machine_name": { "default_value": "Modix BIG-180X V3" }, "machine_width": { "default_value": 1800 }, "machine_depth": { "default_value": 600 }, "machine_height": { "default_value": 600 } diff --git a/resources/definitions/modix_v3_big40.def.json b/resources/definitions/modix_v3_big40.def.json index 1207dcc244..8202ae49b6 100644 --- a/resources/definitions/modix_v3_big40.def.json +++ b/resources/definitions/modix_v3_big40.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "modix_v3_base", "overrides": { - "machine_name": { "default_value": "Modix V3 BIG-40" }, + "machine_name": { "default_value": "Modix BIG-40 V3" }, "machine_width": { "default_value": 400 }, "machine_depth": { "default_value": 400 }, "machine_height": { "default_value": 800 } diff --git a/resources/definitions/modix_v3_big60.def.json b/resources/definitions/modix_v3_big60.def.json index 4e35f259f9..b5586429f8 100644 --- a/resources/definitions/modix_v3_big60.def.json +++ b/resources/definitions/modix_v3_big60.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "modix_v3_base", "overrides": { - "machine_name": { "default_value": "Modix V3 BIG-60" }, + "machine_name": { "default_value": "Modix BIG-60 V3" }, "machine_width": { "default_value": 600 }, "machine_depth": { "default_value": 600 }, "machine_height": { "default_value": 660 } diff --git a/resources/definitions/modix_v3_big_meter.def.json b/resources/definitions/modix_v3_big_meter.def.json index 3e1150f317..bc8b986b93 100644 --- a/resources/definitions/modix_v3_big_meter.def.json +++ b/resources/definitions/modix_v3_big_meter.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "modix_v3_base", "overrides": { - "machine_name": { "default_value": "Modix V3 BIG-Meter" }, + "machine_name": { "default_value": "Modix BIG-METER V3" }, "machine_width": { "default_value": 1000 }, "machine_depth": { "default_value": 1000 }, "machine_height": { "default_value": 1000 } diff --git a/resources/definitions/modix_v4_base.def.json b/resources/definitions/modix_v4_base.def.json index 34a87d048d..6b2236942b 100644 --- a/resources/definitions/modix_v4_base.def.json +++ b/resources/definitions/modix_v4_base.def.json @@ -29,30 +29,20 @@ "layer_height_0": {"value": "round(machine_nozzle_size / 2, 1)" }, - "speed_infill": { "value": "speed_print" }, - "speed_wall": { "value": "speed_print / 2" }, - "speed_wall_0": { "value": "speed_wall" }, "speed_wall_x": { "value": "speed_wall" }, - "speed_topbottom": { "value": "speed_print / 2" }, - "speed_roofing": { "value": "speed_topbottom" }, - "speed_travel": { "value": 350.0 }, + "speed_travel": { "value": 250.0 }, "speed_layer_0": { "value": 20.0 }, - "speed_print_layer_0": { "value": "speed_layer_0" }, - "speed_travel_layer_0": { "value": "speed_layer_0 * speed_travel / speed_print" }, "speed_prime_tower": { "value": "speed_topbottom" }, "speed_support": { "value": "speed_wall_0" }, "speed_support_interface": { "value": "speed_topbottom" }, "speed_z_hop": { "value": 5 }, - "skirt_brim_speed": { "value": "speed_layer_0" }, - "line_width": { "value": "machine_nozzle_size * 1.05" }, "optimize_wall_printing_order": { "value": "True" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "value": 100 }, "z_seam_corner": { "value": "z_seam_corner_weighted" }, @@ -78,7 +68,6 @@ "retraction_amount": { "value": 1 }, "retraction_count_max": { "value": 50 }, "retraction_extrusion_window": { "value": 1 }, - "retraction_min_travel": { "value": 1.5 }, "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" }, diff --git a/resources/definitions/modix_v4_big120X.def.json b/resources/definitions/modix_v4_big120X.def.json index e691c30d7e..46e602c123 100644 --- a/resources/definitions/modix_v4_big120X.def.json +++ b/resources/definitions/modix_v4_big120X.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "modix_v4_base", "overrides": { - "machine_name": { "default_value": "Modix V4 BIG-120X" }, + "machine_name": { "default_value": "Modix BIG-120X V4" }, "machine_width": { "default_value": 1200 }, "machine_depth": { "default_value": 600 }, "machine_height": { "default_value": 640 } diff --git a/resources/definitions/modix_v4_big120Z.def.json b/resources/definitions/modix_v4_big120Z.def.json index 372d48ff78..3eb1ec08e4 100644 --- a/resources/definitions/modix_v4_big120Z.def.json +++ b/resources/definitions/modix_v4_big120Z.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "modix_v4_base", "overrides": { - "machine_name": { "default_value": "Modix V4 BIG-120Z" }, + "machine_name": { "default_value": "Modix BIG-120Z V4" }, "machine_width": { "default_value": 600 }, "machine_depth": { "default_value": 600 }, "machine_height": { "default_value": 1200 } diff --git a/resources/definitions/modix_v4_big180X.def.json b/resources/definitions/modix_v4_big180X.def.json index 43ce042dd5..f8bd7113d2 100644 --- a/resources/definitions/modix_v4_big180X.def.json +++ b/resources/definitions/modix_v4_big180X.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "modix_v4_base", "overrides": { - "machine_name": { "default_value": "Modix V4 BIG-180X" }, + "machine_name": { "default_value": "Modix BIG-180X V4" }, "machine_width": { "default_value": 1800 }, "machine_depth": { "default_value": 600 }, "machine_height": { "default_value": 600 } diff --git a/resources/definitions/modix_v4_big60.def.json b/resources/definitions/modix_v4_big60.def.json index b16486ca07..35327728e3 100644 --- a/resources/definitions/modix_v4_big60.def.json +++ b/resources/definitions/modix_v4_big60.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "modix_v4_base", "overrides": { - "machine_name": { "default_value": "Modix V4 BIG-60" }, + "machine_name": { "default_value": "Modix BIG-60 V4" }, "machine_width": { "default_value": 600 }, "machine_depth": { "default_value": 600 }, "machine_height": { "default_value": 660 } diff --git a/resources/definitions/modix_v4_big_meter.def.json b/resources/definitions/modix_v4_big_meter.def.json index 8adbef1f80..ff2a1fde19 100644 --- a/resources/definitions/modix_v4_big_meter.def.json +++ b/resources/definitions/modix_v4_big_meter.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "modix_v4_base", "overrides": { - "machine_name": { "default_value": "Modix V4 BIG-Meter" }, + "machine_name": { "default_value": "Modix BIG-METER V4" }, "machine_width": { "default_value": 1000 }, "machine_depth": { "default_value": 1000 }, "machine_height": { "default_value": 1000 } diff --git a/resources/extruders/modix_v3_extruder_0.def.json b/resources/extruders/modix_v3_extruder_0.def.json index 101d8217d7..d681db29b6 100644 --- a/resources/extruders/modix_v3_extruder_0.def.json +++ b/resources/extruders/modix_v3_extruder_0.def.json @@ -11,7 +11,6 @@ "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/modix_v3_extruder_1.def.json b/resources/extruders/modix_v3_extruder_1.def.json index b5fdef2233..4cd534f2f4 100644 --- a/resources/extruders/modix_v3_extruder_1.def.json +++ b/resources/extruders/modix_v3_extruder_1.def.json @@ -11,7 +11,6 @@ "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/modix_v4_extruder_0.def.json b/resources/extruders/modix_v4_extruder_0.def.json index 4cce57b57b..5aaf18d995 100644 --- a/resources/extruders/modix_v4_extruder_0.def.json +++ b/resources/extruders/modix_v4_extruder_0.def.json @@ -11,7 +11,6 @@ "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file diff --git a/resources/extruders/modix_v4_extruder_1.def.json b/resources/extruders/modix_v4_extruder_1.def.json index 7e52173586..fc5426df94 100644 --- a/resources/extruders/modix_v4_extruder_1.def.json +++ b/resources/extruders/modix_v4_extruder_1.def.json @@ -11,7 +11,6 @@ "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } } \ No newline at end of file