diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index 716b2e2ec4..a291747976 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -8,91 +8,6 @@ "author": "Mehmet SUTA\u015e", "manufacturer": "Rigid3D", "file_formats": "text/x-gcode", - "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_bvoh", - "emotiontech_asax", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eSUN_PETG_Black", - "eSUN_PETG_Grey", - "eSUN_PETG_Purple", - "eSUN_PLA_PRO_Black", - "eSUN_PLA_PRO_Grey", - "eSUN_PLA_PRO_Purple", - "eSUN_PLA_PRO_White", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_abs", - "generic_bam", - "generic_cffcpe", - "generic_cffpa", - "generic_cpe", - "generic_cpe_plus", - "generic_gffcpe", - "generic_gffpa", - "generic_hips", - "generic_nylon", - "generic_pc", - "generic_petg", - "generic_pla", - "generic_pp", - "generic_pva", - "generic_tough_pla", - "generic_tpu", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], "first_start_actions": [ "MachineSettingsAction" ], "has_machine_quality": true, "has_materials": true, @@ -105,13 +20,13 @@ "acceleration_enabled": { "value": "False" }, "acceleration_print": { "value": 600 }, "acceleration_travel": { "value": 600 }, - "acceleration_travel_layer_0": { "value": "acceleration_travel" }, "adaptive_layer_height_variation": { "value": 0.16 }, "adaptive_layer_height_variation_step": { "value": 0.04 }, "adhesion_type": { "value": "'skirt'" }, - "infill_before_walls": { "value": "False" }, - "infill_sparse_density": { "value": 16 }, - "infill_wipe_dist": { "value": 0 }, + "expand_skins_expand_distance": { "value": 0.3 }, + "infill_pattern": { "value": "'zigzag'" }, + "infill_sparse_density": { "value": 10 }, + "inset_direction": { "value": "'outside_in'" }, "jerk_enabled": { "value": "False" }, "jerk_print": { "value": 10 }, "jerk_travel": { "value": "jerk_print" }, @@ -120,12 +35,11 @@ "machine_max_acceleration_e": { "value": 1000 }, "machine_max_acceleration_x": { "value": 600 }, "machine_max_acceleration_y": { "value": 600 }, - "machine_max_acceleration_z": { "value": 10 }, - "machine_max_feedrate_e": { "value": 25 }, + "machine_max_acceleration_z": { "value": 300 }, + "machine_max_feedrate_e": { "value": 40 }, "machine_max_feedrate_x": { "value": 100 }, "machine_max_feedrate_y": { "value": 100 }, "machine_max_feedrate_z": { "value": 8 }, - "machine_max_jerk_e": { "value": 5 }, "machine_max_jerk_xy": { "value": 10.0 }, "machine_max_jerk_z": { "value": 0.3 }, "machine_name": { "default_value": "Rigid3D Base Printer" }, @@ -133,34 +47,36 @@ "material_diameter": { "default_value": 1.75 }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, - "meshfix_maximum_deviation": { "value": 0.01 }, "minimum_interface_area": { "value": 5.0 }, "minimum_support_area": { "value": 5 }, "optimize_wall_printing_order": { "value": "True" }, "retraction_amount": { "value": 1.5 }, - "retraction_combing": { "value": "'noskin'" }, - "retraction_count_max": { "value": 5 }, - "retraction_prime_speed": { "value": 7 }, + "retraction_combing": { "value": "'all'" }, + "retraction_combing_max_distance": { "value": 30 }, + + "skin_monotonic": { "value": "True" }, "skirt_gap": { "value": 5.0 }, "skirt_line_count": { "value": 2 }, - "speed_layer_0": { "value": 25.0 }, - "speed_print": { "value": 40.0 }, "speed_support_interface": { "value": "speed_support" }, "speed_topbottom": { "value": "speed_print" }, "speed_travel": { "value": 80.0 }, - "speed_z_hop": { "default_value": 8 }, + "speed_z_hop": { "default_value": 8.0 }, + "support_bottom_stair_step_height": { "value": 0.4 }, "support_brim_enable": { "value": "True" }, "support_brim_width": { "value": 4 }, + "support_infill_rate": { "value": 20 }, "support_interface_density": { "value": 70 }, "support_interface_enable": { "value": true }, "support_xy_distance": { "value": "wall_line_width_0 * 2" }, "support_xy_distance_overhang": { "value": "wall_line_width_0" }, "support_xy_overrides_z": { "value": "'xy_overrides_z'" }, "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height * 2" }, + "top_bottom_pattern": { "value": "'zigzag'" }, "top_bottom_thickness": { "value": "layer_height_0 + layer_height * 3" }, - "travel_avoid_other_parts": { "value": "False" }, - "wall_0_material_flow": { "value": 95 }, - "wall_0_wipe_dist": { "value": 0.05 }, - "wall_thickness": { "value": "line_width * 2" } + "travel_retract_before_outer_wall": { "value": "True" }, + "wall_thickness": { "value": "line_width * 2" }, + "xy_offset_layer_0": { "value": -0.2 }, + "z_seam_position": { "value": "'backleft'" }, + "z_seam_type": { "value": "'back'" } } } \ No newline at end of file diff --git a/resources/definitions/rigid3d_hobby.def.json b/resources/definitions/rigid3d_hobby.def.json index f625417b0b..3191f32d0d 100644 --- a/resources/definitions/rigid3d_hobby.def.json +++ b/resources/definitions/rigid3d_hobby.def.json @@ -5,82 +5,6 @@ "metadata": { "visible": true, - "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_asax", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_abs", - "generic_abs_175", - "generic_bam", - "generic_cffcpe", - "generic_cffpa", - "generic_cpe", - "generic_cpe_175", - "generic_cpe_plus", - "generic_gffcpe", - "generic_gffpa", - "generic_hips", - "generic_hips_175", - "generic_nylon", - "generic_nylon_175", - "generic_pc", - "generic_pc_175", - "generic_petg", - "generic_petg_175", - "generic_pla", - "generic_pp", - "generic_pva", - "generic_pva_175", - "generic_tough_pla", - "generic_tpu", - "generic_tpu_175", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], "preferred_material": "generic_pla_175", "preferred_quality_type": "standard", "quality_definition": "rigid3d_base" diff --git a/resources/definitions/rigid3d_mucit.def.json b/resources/definitions/rigid3d_mucit.def.json index 64c419e77d..a6db954046 100644 --- a/resources/definitions/rigid3d_mucit.def.json +++ b/resources/definitions/rigid3d_mucit.def.json @@ -6,82 +6,6 @@ { "visible": true, "platform": "rigid3d_mucit_platform.3mf", - "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_asax", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_abs", - "generic_abs_175", - "generic_bam", - "generic_cffcpe", - "generic_cffpa", - "generic_cpe", - "generic_cpe_175", - "generic_cpe_plus", - "generic_gffcpe", - "generic_gffpa", - "generic_hips", - "generic_hips_175", - "generic_nylon", - "generic_nylon_175", - "generic_pc", - "generic_pc_175", - "generic_petg", - "generic_petg_175", - "generic_pla", - "generic_pp", - "generic_pva", - "generic_pva_175", - "generic_tough_pla", - "generic_tpu", - "generic_tpu_175", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], "platform_offset": [ 0, -19, diff --git a/resources/definitions/rigid3d_mucit2.def.json b/resources/definitions/rigid3d_mucit2.def.json index 85f2e202c8..040c4a2946 100644 --- a/resources/definitions/rigid3d_mucit2.def.json +++ b/resources/definitions/rigid3d_mucit2.def.json @@ -18,9 +18,10 @@ "overrides": { "gantry_height": { "value": 30 }, + "machine_acceleration": { "value": 500 }, "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 150 }, - "machine_end_gcode": { "default_value": "G92 E0\nT0\nG1 F1800 E-2\nG27 P2\nM107\nM104 T0 S0\nM140 S0\nG90\nG92 E0\nM84\n" }, + "machine_end_gcode": { "default_value": "G92 E0\nT0\nG1 F1800 E-2\nG27 P2\nM107\nM104 T0 S0\nM140 S0\nG90\nG92 E0\nM18\n" }, "machine_head_with_fans_polygon": { "default_value": [ @@ -32,8 +33,11 @@ }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 150 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, "machine_name": { "default_value": "Rigid3D Mucit2" }, - "machine_start_gcode": { "default_value": "G21\nG28\nM420 S1\nM107\nG90\nM82\nG92 E0\n" }, + "machine_start_gcode": { "default_value": "G21\nG92 E0\nG28\nM420 S1\nM107\nG90\nG1 X10.0 Y0.1 Z0.3 F3000.0\nG1 X140.0 Y0.1 Z0.3 F1500.0 E10\nG1 X140 Y0.4 Z0.3 F3000.0\nG1 X10.0 Y0.4 Z0.3 F1500.0 E20\nG1 Z2.0 F1500.0\nG92 E0\n" }, "machine_width": { "default_value": 150 } } } \ No newline at end of file diff --git a/resources/definitions/rigid3d_zero.def.json b/resources/definitions/rigid3d_zero.def.json index 887643450a..6f9f90fe31 100644 --- a/resources/definitions/rigid3d_zero.def.json +++ b/resources/definitions/rigid3d_zero.def.json @@ -5,82 +5,6 @@ "metadata": { "visible": true, - "exclude_materials": [ - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "emotiontech_abs", - "emotiontech_asax", - "emotiontech_hips", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pva-m", - "emotiontech_pva-oks", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "generic_abs", - "generic_abs_175", - "generic_bam", - "generic_cffcpe", - "generic_cffpa", - "generic_cpe", - "generic_cpe_175", - "generic_cpe_plus", - "generic_gffcpe", - "generic_gffpa", - "generic_hips", - "generic_hips_175", - "generic_nylon", - "generic_nylon_175", - "generic_pc", - "generic_pc_175", - "generic_petg", - "generic_petg_175", - "generic_pla", - "generic_pp", - "generic_pva", - "generic_pva_175", - "generic_tough_pla", - "generic_tpu", - "generic_tpu_175", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "structur3d_dap100silicone", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla", - "tizyx_pla_bois", - "tizyx_pva", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_TPU", - "zyyx_pro_flex", - "zyyx_pro_pla" - ], "preferred_material": "generic_pla_175", "preferred_quality_type": "standard", "quality_definition": "rigid3d_base" diff --git a/resources/definitions/rigid3d_zero3.def.json b/resources/definitions/rigid3d_zero3.def.json new file mode 100644 index 0000000000..712db7bf99 --- /dev/null +++ b/resources/definitions/rigid3d_zero3.def.json @@ -0,0 +1,44 @@ +{ + "version": 2, + "name": "Rigid3D Zero3", + "inherits": "rigid3d_base", + "metadata": + { + "visible": true, + "platform": "rigid3d_zero3_platform.3mf", + "platform_offset": [ + 0, + 0, + 0 + ], + "preferred_material": "generic_pla_175", + "preferred_quality_type": "standard", + "quality_definition": "rigid3d_base" + }, + "overrides": + { + "adhesion_type": { "value": "'none'" }, + "gantry_height": { "value": 30 }, + "machine_acceleration": { "value": 500 }, + "machine_center_is_zero": { "default_value": false }, + "machine_depth": { "default_value": 200 }, + "machine_end_gcode": { "default_value": "G92 E0\nT0\nG1 F1800 E-2\nG27 P2\nM107\nM104 T0 S0\nM140 S0\nG90\nG92 E0\nM18\n" }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-20, 40], + [-20, -65], + [40, -65], + [40, 40] + ] + }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 200 }, + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_name": { "default_value": "Rigid3D Zero3" }, + "machine_start_gcode": { "default_value": "G21\nG92 E0\nG28\nM420 S1\nM107\nG90\nG1 X10.0 Y0.1 Z0.3 F3000.0\nG1 X190.0 Y0.1 Z0.3 F1500.0 E15\nG1 X190 Y0.4 Z0.3 F3000.0\nG1 X10.0 Y0.4 Z0.3 F1500.0 E30\nG1 Z2.0 F1500.0\nG92 E0\n" }, + "machine_width": { "default_value": 200 } + } +} \ No newline at end of file diff --git a/resources/meshes/rigid3d_zero3_platform.3mf b/resources/meshes/rigid3d_zero3_platform.3mf new file mode 100644 index 0000000000..56ae35d72c Binary files /dev/null and b/resources/meshes/rigid3d_zero3_platform.3mf differ diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg index 16fadf3eb4..942c76c7ae 100644 --- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg @@ -11,6 +11,6 @@ type = quality [values] cool_fan_enabled = False -default_material_bed_temperature = 100 -default_material_print_temperature = 240 +material_bed_temperature = =default_material_bed_temperature + 20 +material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg index e160c683e7..7c41531d38 100644 --- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg @@ -12,6 +12,5 @@ variant = 0.4mm Nozzle [values] cool_fan_enabled = False -default_material_bed_temperature = 100 -default_material_print_temperature = 235 +material_bed_temperature = =default_material_bed_temperature + 20 diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg index 528953db9c..2402975e7a 100644 --- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg @@ -12,6 +12,6 @@ variant = 0.4mm Nozzle [values] cool_fan_enabled = False -default_material_bed_temperature = 100 -default_material_print_temperature = 240 +material_bed_temperature = =default_material_bed_temperature + 20 +material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg index c78e59a850..4e42907819 100644 --- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg @@ -11,6 +11,5 @@ type = quality [values] cool_fan_enabled = False -default_material_bed_temperature = 100 -default_material_print_temperature = 235 +material_bed_temperature = =default_material_bed_temperature + 20 diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg index 1d234d88bf..2b55a0e296 100644 --- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg @@ -11,6 +11,5 @@ type = quality [values] cool_fan_enabled = False -default_material_bed_temperature = 100 -default_material_print_temperature = 235 +material_bed_temperature = =default_material_bed_temperature + 20 diff --git a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg index 55223b424f..5a97df71ea 100644 --- a/resources/quality/rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg +++ b/resources/quality/rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg @@ -11,6 +11,5 @@ type = quality [values] cool_fan_enabled = False -default_material_bed_temperature = 100 -default_material_print_temperature = 235 +material_bed_temperature = =default_material_bed_temperature + 20 diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg index 8465bdbd22..3220a0b7ff 100644 --- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg @@ -11,8 +11,6 @@ type = quality [values] cool_fan_enabled = False -default_material_bed_temperature = 90 -default_material_print_temperature = 250 -retraction_amount = 3 -retraction_speed = 40 +material_bed_temperature = =default_material_bed_temperature + 40 +material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg index 4b0c3da5a7..c367090f57 100644 --- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg @@ -11,8 +11,5 @@ type = quality [values] cool_fan_enabled = False -default_material_bed_temperature = 90 -default_material_print_temperature = 245 -retraction_amount = 3 -retraction_speed = 40 +material_bed_temperature = =default_material_bed_temperature + 40 diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg index 664f5e2e51..96b67f58be 100644 --- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg @@ -11,8 +11,6 @@ type = quality [values] cool_fan_enabled = False -default_material_bed_temperature = 90 -default_material_print_temperature = 250 -retraction_amount = 3 -retraction_speed = 40 +material_bed_temperature = =default_material_bed_temperature + 40 +material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg index 6d4d99be81..0e862c5465 100644 --- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg @@ -11,8 +11,5 @@ type = quality [values] cool_fan_enabled = False -default_material_bed_temperature = 90 -default_material_print_temperature = 245 -retraction_amount = 3 -retraction_speed = 40 +material_bed_temperature = =default_material_bed_temperature + 40 diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg index 0ebe089855..bb4bfa57a6 100644 --- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg @@ -11,8 +11,5 @@ type = quality [values] cool_fan_enabled = False -default_material_bed_temperature = 90 -default_material_print_temperature = 245 -retraction_amount = 3 -retraction_speed = 40 +material_bed_temperature = =default_material_bed_temperature + 40 diff --git a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg index c77de14dfd..ef47fc7456 100644 --- a/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg +++ b/resources/quality/rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg @@ -11,8 +11,5 @@ type = quality [values] cool_fan_enabled = False -default_material_bed_temperature = 90 -default_material_print_temperature = 245 -retraction_amount = 3 -retraction_speed = 40 +material_bed_temperature = =default_material_bed_temperature + 40 diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg index c46ccf0b37..33caa87769 100644 --- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg @@ -10,7 +10,5 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 85 -default_material_print_temperature = 250 -retraction_amount = 2 +material_print_temperature = =default_material_print_temperature + 30 diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg index b8f6424d66..60f42af1c2 100644 --- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg @@ -10,7 +10,5 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 85 -default_material_print_temperature = 245 -retraction_amount = 2 +material_print_temperature = =default_material_print_temperature + 25 diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg index dc926ed484..dfbce28eba 100644 --- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg @@ -10,7 +10,5 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 85 -default_material_print_temperature = 250 -retraction_amount = 2 +material_print_temperature = =default_material_print_temperature + 30 diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg index 1c75948842..d401858ace 100644 --- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg @@ -10,7 +10,5 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 85 -default_material_print_temperature = 245 -retraction_amount = 2 +material_print_temperature = =default_material_print_temperature + 25 diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg index 90c3ea0968..7b0cc18899 100644 --- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg @@ -10,7 +10,5 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 85 -default_material_print_temperature = 245 -retraction_amount = 2 +material_print_temperature = =default_material_print_temperature + 25 diff --git a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg index 52c1b3e990..786c48fe54 100644 --- a/resources/quality/rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg +++ b/resources/quality/rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg @@ -10,7 +10,5 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 85 -default_material_print_temperature = 245 -retraction_amount = 2 +material_print_temperature = =default_material_print_temperature + 25 diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg index c1f7c9051a..eac99f70d8 100644 --- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg @@ -10,6 +10,5 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 55 -default_material_print_temperature = 210 +material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg index 092801063d..47769bc257 100644 --- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg @@ -10,6 +10,5 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 55 -default_material_print_temperature = 205 +material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg index 8b67c8c276..1308442779 100644 --- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg @@ -10,6 +10,5 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 55 -default_material_print_temperature = 210 +material_print_temperature = =default_material_print_temperature + 10 diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg index 6aa1939aa0..8f6aef0dc3 100644 --- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg @@ -10,6 +10,5 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 55 -default_material_print_temperature = 205 +material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg index 47f71d0ec2..45f78269b7 100644 --- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg @@ -10,6 +10,5 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 55 -default_material_print_temperature = 205 +material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg index 00061cb90f..854cc1efd3 100644 --- a/resources/quality/rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg +++ b/resources/quality/rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg @@ -10,6 +10,5 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 55 -default_material_print_temperature = 205 +material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg index d754ca5415..d6bc0c2a07 100644 --- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg @@ -10,9 +10,7 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 70 -default_material_print_temperature = 250 -retraction_amount = 3 +material_bed_temperature = =default_material_bed_temperature + 60 retraction_speed = 20 speed_print = 20 diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg index 5cceadf18f..5ff9f712bd 100644 --- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg @@ -10,9 +10,7 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 70 -default_material_print_temperature = 245 -retraction_amount = 3 +material_bed_temperature = =default_material_bed_temperature + 60 retraction_speed = 20 speed_print = 20 diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg index afc6c21ac7..4286138403 100644 --- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg @@ -10,9 +10,7 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 70 -default_material_print_temperature = 250 -retraction_amount = 3 +material_bed_temperature = =default_material_bed_temperature + 60 retraction_speed = 20 speed_print = 20 diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg index 0af35bdc37..975d064e38 100644 --- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg @@ -10,9 +10,7 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 70 -default_material_print_temperature = 245 -retraction_amount = 3 +material_bed_temperature = =default_material_bed_temperature + 60 retraction_speed = 20 speed_print = 20 diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg index d379c53494..3894fd16ba 100644 --- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg @@ -10,9 +10,7 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 70 -default_material_print_temperature = 245 -retraction_amount = 3 +material_bed_temperature = =default_material_bed_temperature + 60 retraction_speed = 20 speed_print = 20 diff --git a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg index 85256877ad..89809909f0 100644 --- a/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg +++ b/resources/quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg @@ -10,9 +10,7 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 70 -default_material_print_temperature = 245 -retraction_amount = 3 +material_bed_temperature = =default_material_bed_temperature + 60 retraction_speed = 20 speed_print = 20