Browse Source

Clean up a lot of duplicate settings from machine profiles

These were errors that were copy pasted from other definitions. So leaving them as is would
continue to decrease the quality of third party profiles.
Jaime van Kessel 2 years ago
parent
commit
2c331604e8

+ 0 - 3
resources/definitions/Mark2_for_Ultimaker2.def.json

@@ -63,9 +63,6 @@
         "machine_heated_bed": {
             "default_value": true
         },
-        "speed_infill": {
-            "value": "speed_print"
-        },
         "speed_wall_x": {
             "value": "speed_wall"
         },

+ 1 - 5
resources/definitions/SV01.def.json

@@ -45,16 +45,12 @@
         "acceleration_enabled": { "value": false },
         "jerk_enabled": { "value": false },
         "speed_print": { "value": 50.0 } ,
-        "speed_infill": { "value": "speed_print" },
         "skirt_brim_speed": { "value": "speed_layer_0" },
-        "line_width": { "value": "machine_nozzle_size" },
         "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_type": { "value": "'back'" },
-        "z_seam_corner": { "value": "'z_seam_corner_weighted'" },       
-        "infill_sparse_density": { "value": "20" },
+        "z_seam_corner": { "value": "'z_seam_corner_weighted'" },
         "infill_pattern": { "value": "'lines'" },
         "infill_before_walls": { "value": false },
         "infill_overlap": { "value": 30.0 },

+ 1 - 5
resources/definitions/SV03.def.json

@@ -45,16 +45,12 @@
         "acceleration_enabled": { "value": false },
         "jerk_enabled": { "value": false },
         "speed_print": { "value": 50.0 } ,
-        "speed_infill": { "value": "speed_print" },
         "skirt_brim_speed": { "value": "speed_layer_0" },
-        "line_width": { "value": "machine_nozzle_size" },
         "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_type": { "value": "'back'" },
-        "z_seam_corner": { "value": "'z_seam_corner_weighted'" },       
-        "infill_sparse_density": { "value": "20" },
+        "z_seam_corner": { "value": "'z_seam_corner_weighted'" }, ,
         "infill_pattern": { "value": "'lines'" },
         "infill_before_walls": { "value": false },
         "infill_overlap": { "value": 30.0 },

+ 13 - 24
resources/definitions/anet3d.def.json

@@ -51,14 +51,11 @@
 
         "speed_print": { "value": 50.0 } ,
         "speed_infill": { "value": "speed_print * 2" },
-        "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 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
         "speed_layer_0": { "value": "speed_print / 2" },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
         "speed_prime_tower": { "value": "speed_print" },
         "speed_support": { "value": "speed_print" },
@@ -67,18 +64,14 @@
 
         "skirt_brim_speed": { "value": "speed_layer_0" },
 
-        "line_width": { "value": "machine_nozzle_size" },
-
         "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_type": { "value": "'back'" },
         "z_seam_corner": { "value": "'z_seam_corner_weighted'" },
-        
-        "infill_sparse_density": { "value": "20" },
+
         "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
         "infill_before_walls": { "value": true },
         "infill_overlap": { "value": 30.0 },
@@ -88,34 +81,34 @@
 
         "fill_outline_gaps": { "value": false },
 
-        "retraction_speed": {
+        "retraction_speed":
+        {
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
             "maximum_value": 200
         },
-        "retraction_retract_speed": {
+        "retraction_retract_speed":
+        {
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
             "maximum_value": 200
         },
-        "retraction_prime_speed": {
+        "retraction_prime_speed":
+        {
             "maximum_value_warning": "machine_max_feedrate_e if retraction_enable else float('inf')",
             "maximum_value": 200
         },
-        
-        "retraction_hop_enabled": { "value": "False" },
+
         "retraction_hop": { "value": 1 },
         "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
         "retraction_combing_max_distance": { "value": 30 },
         "travel_avoid_other_parts": { "value": true },
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
-        
-        "retraction_enable": { "value": true },
+
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 10 },
         "retraction_min_travel": { "value": 1.5 },
 
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
 
         "adaptive_layer_height_variation": { "value": 0.04 },
@@ -133,16 +126,12 @@
         
         "extruder_prime_pos_y":{"minimum_value": "0","maximum_value": "machine_depth"},
         "extruder_prime_pos_x":{"minimum_value": "0","maximum_value": "machine_width"},
-        "relative_extrusion":{"value": false,"enabled": false},
+        "relative_extrusion":{"value": false, "enabled": false},
         
         "machine_use_extruder_offset_to_offset_coords": {"default_value": true},
         "machine_gcode_flavor": {"default_value": "RepRap (Marlin/Sprinter)"},
         
-        "machine_center_is_zero": {
-            "default_value": false
-        },
-        "gantry_height": {
-            "value": "0"
-        }
+        "machine_center_is_zero": { "default_value": false },
+        "gantry_height": { "value": "0"}
     }
 }

+ 0 - 1
resources/definitions/anycubic_4max.def.json

@@ -51,7 +51,6 @@
         "gantry_height": { "value": "25.0" },
         "skin_overlap": { "value": "10" },
 
-        "acceleration_enabled": { "value": "True" },
         "acceleration_layer_0": { "value": "acceleration_topbottom" },
         "acceleration_prime_tower": { "value": "math.ceil(acceleration_print * 2000 / 4000)" },
         "acceleration_print": { "value": "900" },

+ 2 - 9
resources/definitions/anycubic_i3_mega_s.def.json

@@ -53,8 +53,6 @@
         "material_bed_temperature": { "maximum_value_warning": 110 },
         "material_bed_temperature_layer_0": { "maximum_value_warning": 110 },
 
-        "material_flow": { "value": 100 },
-
         "top_bottom_thickness": { "value":  "layer_height_0 + layer_height * math.floor(1.2 / layer_height)" },
         "wall_thickness": { "value": "line_width * 3 if line_width < 0.6 else line_width * 2" },
 
@@ -70,15 +68,11 @@
         "jerk_enabled": { "value": true },
 
         "speed_print": { "value": 50.0 } ,
-        "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": 100.0, "maximum_value_warning": 150.0, "maximum_value": 200.0 },
         "speed_layer_0": { "value": "speed_topbottom if speed_topbottom < 20 else 20" },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": "speed_travel" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
@@ -101,7 +95,7 @@
         "retraction_hop": { "value": 0.075 },
         "retraction_hop_only_when_collides": { "value": true },
         "retraction_amount": { "value": 6 },
-        "retraction_enable": { "value": true },
+
         "retraction_min_travel": { "value": 1.5 },
         "retraction_combing": { "value": "'off'" },
         "retraction_combing_max_distance": { "value": 30 },
@@ -114,7 +108,6 @@
         "cool_fan_speed": { "value": 100 },
         "cool_fan_speed_0": { "value": 30 },
 
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
 
         "adhesion_type": { "value": "'none' if support_enable else 'skirt'" },

+ 0 - 1
resources/definitions/anycubic_mega_zero.def.json

@@ -99,7 +99,6 @@
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
 
-        "retraction_enable": { "value": true },
         "retraction_speed": { "value": 30 },
         "retraction_amount": { "value": 7 },
         "retraction_count_max": { "value": 100 },

+ 1 - 1
resources/definitions/artillery_base.def.json

@@ -159,7 +159,7 @@
         "travel_retract_before_outer_wall": { "value": true },
         
 		"retraction_amount": { "value": 2 },
-        "retraction_enable": { "value": true },
+
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 10 },
         "retraction_min_travel": { "value": 1.5 },

+ 1 - 11
resources/definitions/biqu_base.def.json

@@ -59,15 +59,11 @@
         "jerk_enabled": { "value": false },
 
         "speed_print": { "value": 50.0 } ,
-        "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 if speed_print < 60 else 250.0 if speed_print > 100 else speed_print * 2.5" },
         "speed_layer_0": { "value": 20.0 },
-        "speed_print_layer_0": { "value": "speed_layer_0" },
         "speed_travel_layer_0": { "value": "100 if speed_layer_0 < 20 else 150 if speed_layer_0 > 30 else speed_layer_0 * 5" },
         "speed_prime_tower": { "value": "speed_topbottom" },
         "speed_support": { "value": "speed_wall_0" },
@@ -76,19 +72,16 @@
 
         "skirt_brim_speed": { "value": "speed_layer_0" },
 
-        "line_width": { "value": "machine_nozzle_size" },
 
         "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_type": { "value": "'sharpest_corner'" },
         "z_seam_corner": { "value": "'z_seam_corner_inner'" },
 
         "infill_line_width": { "value": "line_width * 1.2" },
-        "infill_sparse_density": { "value": "20" },
         "infill_pattern": { "value": "'lines' if infill_sparse_density > 50 else 'cubic'" },
         "infill_before_walls": { "value": false },
         "infill_overlap": { "value": 30.0 },
@@ -111,7 +104,6 @@
             "maximum_value": 200
         },
 
-        "retraction_hop_enabled": { "value": "False" },
         "retraction_hop": { "value": 0.2 },
         "retraction_combing": { "value": "'off' if retraction_hop_enabled else 'noskin'" },
         "retraction_combing_max_distance": { "value": 30 },
@@ -119,13 +111,11 @@
         "travel_avoid_supports": { "value": true },
         "travel_retract_before_outer_wall": { "value": true },
 
-        "retraction_enable": { "value": true },
         "retraction_count_max": { "value": 100 },
         "retraction_extrusion_window": { "value": 10 },
         "retraction_min_travel": { "value": 1.5 },
 
         "cool_fan_full_at_height": { "value": "layer_height_0 + 2 * layer_height" },
-        "cool_fan_enabled": { "value": true },
         "cool_min_layer_time": { "value": 10 },
 
         "adhesion_type": { "value": "'skirt'" },

+ 0 - 3
resources/definitions/blv_mgn_cube_base.def.json

@@ -165,9 +165,6 @@
     "skin_overlap": {
       "value": 10.0
     },
-    "speed_infill": {
-      "value": "speed_print"
-    },
     "speed_travel_layer_0": {
       "value": "math.ceil(speed_travel * 0.4)"
     },

Some files were not shown because too many files changed in this diff