Browse Source

modify definition & quality

1.move cool_fan to definition from quality
2.use parameter to replace actual value when value equal
AnnaKang0219 3 years ago
parent
commit
32137f1e56

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

@@ -32,7 +32,11 @@
         "machine_acceleration": { "value": 500 },
         "machine_max_jerk_xy": { "value": 10 },
         "machine_max_jerk_z": { "value": 0.4 },
-        "machine_max_jerk_e": { "value": 5 }
+        "machine_max_jerk_e": { "value": 5 },
+		"adhesion_type": { "value": "'none' if support_enable else 'brim'" },
+		"brim_width": { "value": 10.0 },
+		"cool_fan_speed": { "value": 100 },
+		"cool_fan_speed_0": { "value": 0 }
         },
 
 

+ 6 - 6
resources/quality/xyzprinting/abs/xyzprinting_0.40_copper_abs_coarse.inst.cfg

@@ -11,13 +11,13 @@ material = generic_abs
 variant = Copper 0.4mm Nozzle
 
 [values]
-cool_fan_speed = 100
-cool_fan_speed_0 = 0
 material_bed_temperature = 90
-material_bed_temperature_layer_0 = 90
+material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = 240
-material_print_temperature_layer_0 = 240
-speed_infill = 30
+material_print_temperature_layer_0 = =material_print_temperature
+material_initial_print_temperature = =material_print_temperature
+material_final_print_temperature = =material_print_temperature
 speed_print = 30
-speed_support = 30
+speed_infill = =speed_print
+speed_support = =speed_print
 speed_travel = 120

+ 5 - 5
resources/quality/xyzprinting/abs/xyzprinting_0.40_copper_abs_draft.inst.cfg

@@ -11,13 +11,13 @@ material = generic_abs
 variant = Copper 0.4mm Nozzle
 
 [values]
-cool_fan_speed = 100
-cool_fan_speed_0 = 0
 material_bed_temperature = 90
-material_bed_temperature_layer_0 = 90
+material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = 240
-material_print_temperature_layer_0 = 240
-speed_infill = 30
+material_print_temperature_layer_0 = =material_print_temperature
+material_initial_print_temperature = =material_print_temperature
+material_final_print_temperature = =material_print_temperature
 speed_print = 30
+speed_infill = =speed_print
 speed_support = 30
 speed_travel = 120

+ 5 - 5
resources/quality/xyzprinting/abs/xyzprinting_0.40_copper_abs_fine.inst.cfg

@@ -11,13 +11,13 @@ material = generic_abs
 variant = Copper 0.4mm Nozzle
 
 [values]
-cool_fan_speed = 100
-cool_fan_speed_0 = 0
 material_bed_temperature = 90
-material_bed_temperature_layer_0 = 90
+material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = 240
-material_print_temperature_layer_0 = 240
-speed_infill = 30
+material_print_temperature_layer_0 = =material_print_temperature
+material_initial_print_temperature = =material_print_temperature
+material_final_print_temperature = =material_print_temperature
 speed_print = 30
+speed_infill = =speed_print
 speed_support = 30
 speed_travel = 120

+ 6 - 6
resources/quality/xyzprinting/abs/xyzprinting_0.40_copper_abs_normal.inst.cfg

@@ -11,13 +11,13 @@ material = generic_abs
 variant = Copper 0.4mm Nozzle
 
 [values]
-cool_fan_speed = 100
-cool_fan_speed_0 = 0
 material_bed_temperature = 90
-material_bed_temperature_layer_0 = 90
+material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = 240
-material_print_temperature_layer_0 = 240
-speed_infill = 30
+material_print_temperature_layer_0 = =material_print_temperature
+material_initial_print_temperature = =material_print_temperature
+material_final_print_temperature = =material_print_temperature
 speed_print = 30
-speed_support = 30
+speed_infill = =speed_print
+speed_support = =speed_print
 speed_travel = 120

+ 5 - 7
resources/quality/xyzprinting/abs/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_abs_coarse.inst.cfg

@@ -11,19 +11,17 @@ material = generic_abs
 variant = Copper 0.4mm Nozzle
 
 [values]
-cool_fan_speed = 100
-cool_fan_speed_0 = 0
 material_bed_temperature = 70
-material_bed_temperature_layer_0 = 70
+material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = 240
-material_print_temperature_layer_0 = 240
-material_initial_print_temperature = 240
-material_final_print_temperature = 240
+material_print_temperature_layer_0 = =material_print_temperature
+material_initial_print_temperature = =material_print_temperature
+material_final_print_temperature = =material_print_temperature
 speed_wall = 20
 speed_print = 60
 speed_topbottom = 10 
 speed_roofing = 20
-speed_infill = 60
+speed_infill = =speed_print
 speed_support = 30
 speed_travel = 120
 retraction_amount = 3.0

+ 5 - 7
resources/quality/xyzprinting/abs/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_abs_draft.inst.cfg

@@ -11,19 +11,17 @@ material = generic_abs
 variant = Copper 0.4mm Nozzle
 
 [values]
-cool_fan_speed = 100
-cool_fan_speed_0 = 0
 material_bed_temperature = 70
-material_bed_temperature_layer_0 = 70
+material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = 240
-material_print_temperature_layer_0 = 240
-material_initial_print_temperature = 240
-material_final_print_temperature = 240
+material_print_temperature_layer_0 = =material_print_temperature
+material_initial_print_temperature = =material_print_temperature
+material_final_print_temperature = =material_print_temperature
 speed_wall = 20
 speed_print = 60
 speed_topbottom = 10 
 speed_roofing = 20
-speed_infill = 60
+speed_infill = =speed_print
 speed_support = 30
 speed_travel = 120
 retraction_amount = 3.0

+ 5 - 7
resources/quality/xyzprinting/abs/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_abs_fine.inst.cfg

@@ -11,19 +11,17 @@ material = generic_abs
 variant = Copper 0.4mm Nozzle
 
 [values]
-cool_fan_speed = 100
-cool_fan_speed_0 = 0
 material_bed_temperature = 70
-material_bed_temperature_layer_0 = 70
+material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = 240
-material_print_temperature_layer_0 = 240
-material_initial_print_temperature = 240
-material_final_print_temperature = 240
+material_print_temperature_layer_0 = =material_print_temperature
+material_initial_print_temperature = =material_print_temperature
+material_final_print_temperature = =material_print_temperature
 speed_wall = 20
 speed_print = 60
 speed_topbottom = 10 
 speed_roofing = 20
-speed_infill = 60
+speed_infill = =speed_print
 speed_support = 30
 speed_travel = 120
 retraction_amount = 3.0

+ 5 - 7
resources/quality/xyzprinting/abs/xyzprinting_da_vinci_jr_pro_xplus_copper_0.40_abs_normal.inst.cfg

@@ -11,19 +11,17 @@ material = generic_abs
 variant = Copper 0.4mm Nozzle
 
 [values]
-cool_fan_speed = 100
-cool_fan_speed_0 = 0
 material_bed_temperature = 70
-material_bed_temperature_layer_0 = 70
+material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = 240
-material_print_temperature_layer_0 = 240
-material_initial_print_temperature = 240
-material_final_print_temperature = 240
+material_print_temperature_layer_0 = =material_print_temperature
+material_initial_print_temperature = =material_print_temperature
+material_final_print_temperature = =material_print_temperature
 speed_wall = 20
 speed_print = 60
 speed_topbottom = 10 
 speed_roofing = 20
-speed_infill = 60
+speed_infill = =speed_print
 speed_support = 30
 speed_travel = 120
 retraction_amount = 3.0

+ 7 - 9
resources/quality/xyzprinting/abs/xyzprinting_da_vinci_super_copper_0.40_abs_coarse.inst.cfg

@@ -11,18 +11,16 @@ material = generic_abs
 variant = Copper 0.4mm Nozzle
 
 [values]
-cool_fan_speed = 100
-cool_fan_speed_0 = 0
 material_bed_temperature = 90
-material_bed_temperature_layer_0 = 90
+material_bed_temperature_layer_0 = =material_bed_temperature
 material_print_temperature = 240
-material_print_temperature_layer_0 = 240
-material_initial_print_temperature = 240
-material_final_print_temperature = 240
-speed_infill = 30
+material_print_temperature_layer_0 = =material_print_temperature
+material_initial_print_temperature = =material_print_temperature
+material_final_print_temperature = =material_print_temperature
 speed_print = 30
-speed_support = 30
+speed_infill = =speed_print
+speed_support = =speed_print
 speed_travel = 120
 retraction_amount = 5.0
 retraction_speed = 40
-skirt_brim_speed = 30
+skirt_brim_speed = =speed_print

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