Browse Source

Remove a bunch of duplicate settings from artillery base

Jaime van Kessel 2 years ago
parent
commit
328b32ee6b
1 changed files with 9 additions and 19 deletions
  1. 9 19
      resources/definitions/artillery_base.def.json

+ 9 - 19
resources/definitions/artillery_base.def.json

@@ -106,35 +106,25 @@
         "jerk_enabled": { "value": false },
 
         "speed_print": { "value": 60.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" },
         "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.1" },
 
-        "optimize_wall_printing_order": { "value": "True" },
+        "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_none'" },
-        
-        "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 },
@@ -144,15 +134,18 @@
 
         "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
         },
@@ -172,7 +165,6 @@
         "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": "'none' if support_enable else 'skirt'" },
@@ -187,14 +179,13 @@
         "meshfix_maximum_travel_resolution": { "value": "meshfix_maximum_resolution" },
 
         "support_angle": { "value": "math.floor(math.degrees(math.atan(line_width / 2.0 / layer_height)))" },
-        "support_pattern": { "value": "'zigzag'" },
+
         "support_infill_rate": { "value": "0 if support_enable and support_structure == 'tree' else 20" },
         "support_use_towers": { "value": false },
         "support_xy_distance": { "value": "wall_line_width_0 * 2" },
         "support_xy_distance_overhang": { "value": "wall_line_width_0" },
         "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" },
         "support_xy_overrides_z": { "value": "'xy_overrides_z'" },
-        "support_wall_count": { "value": 1 },
         "support_brim_enable": { "value": true },
         "support_brim_width": { "value": 4 },
 
@@ -207,7 +198,6 @@
         "minimum_interface_area": { "value": 10 },
         "top_bottom_thickness": {"value":  "layer_height_0 + layer_height * 3" },
         "wall_thickness": {"value": "line_width * 2" }
-
     }
 }