From b41c65bf1f6c66d066116f2b60e55ea49c52e988 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Sun, 8 Aug 2021 15:41:19 +0300 Subject: [PATCH 01/27] Update rigid3d_base.def.json --- resources/definitions/rigid3d_base.def.json | 95 ++++++++++++--------- 1 file changed, 53 insertions(+), 42 deletions(-) diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index de6365c415..e3b384ca0b 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -18,50 +18,52 @@ "preferred_material": "generic_pla_175", "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", "bestfilament_petg_orange", "bestfilament_pla_green", "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", + "emotiontech_abs", "emotiontech_absx", "emotiontech_acetate", "emotiontech_bvoh", "emotiontech_asax", + "emotiontech_bvoh", "emotiontech_copa", "emotiontech_hips", "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", "emotiontech_nylon_1070","emotiontech_pc", "emotiontech_petg", + "emotiontech_pla", "emotiontech_pla_hr_870", "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", + "fdplast_pla_olive", "fdplast_abs_tomato", "fdplast_petg_gray", "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", + "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", + "layer_one_white_pla", "layer_one_black_pla", "layer_one_dark_gray_pla", "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", - "ultimaker_abs_black", "ultimaker_abs_blue", "ultimaker_abs_green", "ultimaker_abs_grey", "ultimaker_abs_orange", "ultimaker_abs_pearl-gold", "ultimaker_abs_red", "ultimaker_abs_silver-metallic", "ultimaker_abs_white", "ultimaker_abs_yellow", - "ultimaker_bam", - "ultimaker_cpe_black", "ultimaker_cpe_blue", "ultimaker_cpe_dark-grey", "ultimaker_cpe_green", "ultimaker_cpe_light-grey", "ultimaker_cpe_plus_black", "ultimaker_cpe_plus_transparent", "ultimaker_cpe_plus_white", "ultimaker_cpe_red", "ultimaker_cpe_transparent", "ultimaker_cpe_white", "ultimaker_cpe_yellow", - "ultimaker_nylon_black", "ultimaker_nylon_transparent", - "ultimaker_pc_black", "ultimaker_pc_transparent", "ultimaker_pc_white", - "ultimaker_pla_black", "ultimaker_pla_blue", "ultimaker_pla_green", "ultimaker_pla_magenta", "ultimaker_pla_orange", "ultimaker_pla_pearl-white", "ultimaker_pla_red", "ultimaker_pla_silver-metallic", "ultimaker_pla_transparent", "ultimaker_pla_white", "ultimaker_pla_yellow", - "ultimaker_pp_transparent", - "ultimaker_pva", - "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", - "ultimaker_tpu_black", "ultimaker_tpu_blue", "ultimaker_tpu_red", "ultimaker_tpu_white", + "ultimaker_abs_black", "ultimaker_abs_blue", "ultimaker_abs_green", "ultimaker_abs_grey", + "ultimaker_abs_orange", "ultimaker_abs_pearl-gold", "ultimaker_abs_red", "ultimaker_abs_silver-metallic", + "ultimaker_abs_white", "ultimaker_abs_yellow", "ultimaker_bam", "ultimaker_cpe_black", + "ultimaker_cpe_blue", "ultimaker_cpe_dark-grey", "ultimaker_cpe_green", "ultimaker_cpe_light-grey", + "ultimaker_cpe_plus_black", "ultimaker_cpe_plus_transparent", "ultimaker_cpe_plus_white", + "ultimaker_cpe_red", "ultimaker_cpe_transparent", "ultimaker_cpe_white", "ultimaker_cpe_yellow", + "ultimaker_nylon_black", "ultimaker_nylon_transparent", "ultimaker_pc_black", "ultimaker_pc_transparent", + "ultimaker_pc_white", "ultimaker_pla_black", "ultimaker_pla_blue", "ultimaker_pla_green", + "ultimaker_pla_magenta", "ultimaker_pla_orange", "ultimaker_pla_pearl-white", "ultimaker_pla_red", + "ultimaker_pla_silver-metallic", "ultimaker_pla_transparent", "ultimaker_pla_white", "ultimaker_pla_yellow", + "ultimaker_pp_transparent", "ultimaker_pva", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "ultimaker_tpu_black", "ultimaker_tpu_blue", + "ultimaker_tpu_red", "ultimaker_tpu_white", "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", + "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", + "volumic_support_ultra", "volumic_abs_ultra", "volumic_arma_ultra", "volumic_asa_ultra", "volumic_br80_ultra", + "volumic_bumper_ultra", "volumic_cu80_ultra", "volumic_flex93_ultra", "volumic_medical_ultra", + "volumic_nylon_ultra", "volumic_pekk_carbone", "volumic_petg_ultra", "volumic_petgcarbone_ultra", + "volumic_pla_ultra", "volumic_pp_ultra", "volumic_strong_ultra", "zyyx_pro_flex", "zyyx_pro_pla" ] }, @@ -72,8 +74,8 @@ "machine_max_feedrate_x": { "value": 100 }, "machine_max_feedrate_y": { "value": 100 }, - "machine_max_feedrate_z": { "value": 8 }, - "machine_max_feedrate_e": { "value": 25 }, + "machine_max_feedrate_z": { "value": 12 }, + "machine_max_feedrate_e": { "value": 40 }, "machine_max_acceleration_x": { "value": 600 }, "machine_max_acceleration_y": { "value": 600 }, @@ -86,22 +88,27 @@ "machine_max_jerk_e": { "value": 5 }, - "wall_0_wipe_dist": { "value": 0.05 }, + "wall_0_wipe_dist": { "value": 0.00 }, "optimize_wall_printing_order": { "value": "True" }, - "travel_compensate_overlapping_walls_enabled": { "value": "False" }, + "travel_compensate_overlapping_walls_enabled": { "value": "True" }, "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, - "travel_compensate_overlapping_walls_x_enabled": { "value": "False" }, - + "travel_compensate_overlapping_walls_x_enabled": { "value": "True" }, + "filter_out_tiny_gaps": { "value": "False" }, + "z_seam_type": { "value": "'back'" }, + "z_seam_position": { "value": "'backleft'" }, + + "skin_overlap": { "value": 10 }, + "infill_sparse_density": { "value": 16 }, "infill_wipe_dist": { "value": 0 }, "infill_before_walls": { "value": "False" }, + "infill_pattern": { "value": "'cubic'" }, + "infill_overlap": { "value": 30 }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, - "wall_0_material_flow": { "value": 95 }, - "speed_print": { "value": 40.0 } , "speed_topbottom": { "value": "speed_print" }, "speed_support_interface": { "value": "speed_support" }, @@ -119,12 +126,16 @@ "acceleration_enabled": { "value": "False" }, "jerk_enabled": { "value": "False" }, - "retraction_amount": { "value": 1.50 }, - "retraction_prime_speed": { "value": 7 }, - "retraction_count_max": { "value": 5 }, + "retraction_amount": { "value": 3 }, "retraction_combing": { "value": "'noskin'" }, - "travel_avoid_other_parts": { "value": "False" }, - + "retraction_combing_max_distance": { "value": 30 }, + "travel_retract_before_outer_wall": { "value": "True" }, + "travel_avoid_other_parts": { "value": "True" }, + "travel_avoid_supports": { "value": "True" }, + + "support_wall_count": { "value": 1 }, + "support_infill_rate": { "value": 20 }, + "support_bottom_stair_step_height": { "value": 0.4 }, "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, "support_interface_enable": { "value": "True" }, "support_interface_density": { "value": 70 }, From d2903d2171231b1cca7f16379d6bb74ac58de7f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Wed, 9 Mar 2022 20:19:24 +0300 Subject: [PATCH 02/27] Update rigid3d mucit2 and base definition --- resources/definitions/rigid3d_base.def.json | 52 ++++++++----------- resources/definitions/rigid3d_mucit2.def.json | 12 ++++- 2 files changed, 32 insertions(+), 32 deletions(-) diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index e3b384ca0b..abf0067ff4 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -74,49 +74,44 @@ "machine_max_feedrate_x": { "value": 100 }, "machine_max_feedrate_y": { "value": 100 }, - "machine_max_feedrate_z": { "value": 12 }, + "machine_max_feedrate_z": { "value": 8 }, "machine_max_feedrate_e": { "value": 40 }, - "machine_max_acceleration_x": { "value": 600 }, - "machine_max_acceleration_y": { "value": 600 }, + "machine_max_acceleration_x": { "value": 1000 }, + "machine_max_acceleration_y": { "value": 1000 }, "machine_max_acceleration_z": { "value": 10 }, "machine_max_acceleration_e": { "value": 1000 }, - "machine_acceleration": { "value": 600 }, + "machine_acceleration": { "value": 1000 }, "machine_max_jerk_xy": { "value": 10.0 }, "machine_max_jerk_z": { "value": 0.3 }, "machine_max_jerk_e": { "value": 5 }, - "wall_0_wipe_dist": { "value": 0.00 }, "optimize_wall_printing_order": { "value": "True" }, - "travel_compensate_overlapping_walls_enabled": { "value": "True" }, - "travel_compensate_overlapping_walls_0_enabled": { "value": "False" }, - "travel_compensate_overlapping_walls_x_enabled": { "value": "True" }, - "filter_out_tiny_gaps": { "value": "False" }, + "outer_inset_first": { "value": "True" }, + "travel_compensate_overlapping_walls_enabled": { "value": "False" }, + "fill_perimeter_gaps": { "value": "'nowhere'" }, "z_seam_type": { "value": "'back'" }, "z_seam_position": { "value": "'backleft'" }, - "skin_overlap": { "value": 10 }, - - "infill_sparse_density": { "value": 16 }, - "infill_wipe_dist": { "value": 0 }, - "infill_before_walls": { "value": "False" }, - "infill_pattern": { "value": "'cubic'" }, - "infill_overlap": { "value": 30 }, + "top_bottom_pattern": { "value": "'zigzag'" }, + "expand_skins_expand_distance": { "value": 0.3 }, + "infill_sparse_density": { "value": 10 }, + "infill_pattern": { "value": "'zigzag'" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, - "speed_print": { "value": 40.0 } , + "speed_print": { "value": 60.0 } , "speed_topbottom": { "value": "speed_print" }, "speed_support_interface": { "value": "speed_support" }, - "speed_travel": { "value": 80.0 }, - "speed_layer_0": { "value": 25.0 }, + "speed_travel": { "value": 100.0 }, + "speed_z_hop": { "value": 8.0 }, - "acceleration_print": { "value": 600 }, - "acceleration_travel": { "value": 600 }, + "acceleration_print": { "value": 1000 }, + "acceleration_travel": { "value": 1000 }, "acceleration_travel_layer_0": { "value": "acceleration_travel" }, "jerk_print": { "value": 10 }, @@ -126,12 +121,12 @@ "acceleration_enabled": { "value": "False" }, "jerk_enabled": { "value": "False" }, - "retraction_amount": { "value": 3 }, - "retraction_combing": { "value": "'noskin'" }, - "retraction_combing_max_distance": { "value": 30 }, + "retraction_amount": { "value": 1.5 }, + "retraction_min_travel": { "value": 1.5 }, "travel_retract_before_outer_wall": { "value": "True" }, - "travel_avoid_other_parts": { "value": "True" }, - "travel_avoid_supports": { "value": "True" }, + "retract_at_layer_change": { "value": "True" }, + "retraction_combing": { "value": "'all'" }, + "retraction_combing_max_distance": { "value": 30 }, "support_wall_count": { "value": 1 }, "support_infill_rate": { "value": 20 }, @@ -150,15 +145,12 @@ "adhesion_type": { "value": "'skirt'" }, "skirt_gap": { "value": 5.0 }, "skirt_line_count": { "value": 2 }, - - "meshfix_maximum_deviation": { "value": 0.01 }, "adaptive_layer_height_variation": { "value": 0.16 }, "adaptive_layer_height_variation_step": { "value": 0.04 }, "top_bottom_thickness": {"value": "layer_height_0 + layer_height * 3" }, - "wall_thickness": {"value": "line_width * 2" }, - "speed_z_hop": {"default_value": 8} + "wall_thickness": {"value": "line_width * 2" } } } \ No newline at end of file diff --git a/resources/definitions/rigid3d_mucit2.def.json b/resources/definitions/rigid3d_mucit2.def.json index 42499ba5e1..27a59dac83 100644 --- a/resources/definitions/rigid3d_mucit2.def.json +++ b/resources/definitions/rigid3d_mucit2.def.json @@ -19,12 +19,20 @@ "machine_width": { "default_value": 150 }, "machine_depth": { "default_value": 150 }, "machine_height": { "default_value": 150 }, + + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_acceleration_e": { "value": 1000 }, + "machine_acceleration": { "value": 500 }, "machine_center_is_zero": { "default_value": false }, - "machine_start_gcode": {"default_value": "G21\nG28\nM420 S1\nM107\nG90\nM82\nG92 E0\n"}, - "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_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_end_gcode": {"default_value": "G92 E0\nT0\nG1 F1800 E-2\nG27 P2\nM107\nM104 T0 S0\nM140 S0\nG90\nG92 E0\nM18\n"}, + "adhesion_type": { "value": "'none'" }, + "machine_head_with_fans_polygon": { "default_value": [ [ -20, 40], [ -20, -65], [ 40, -65], [ 40, 40]] From b4157b24c94b574878e538e2d9be15ad93b8224d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Thu, 10 Mar 2022 18:10:45 +0300 Subject: [PATCH 03/27] Zero3 Definitions --- resources/definitions/rigid3d_base.def.json | 14 ++++-- resources/definitions/rigid3d_zero3.def.json | 43 +++++++++++++++++++ resources/meshes/rigid3d_zero3_platform.3mf | Bin 0 -> 42046 bytes 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 resources/definitions/rigid3d_zero3.def.json create mode 100644 resources/meshes/rigid3d_zero3_platform.3mf diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index abf0067ff4..5078410d42 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -26,8 +26,11 @@ "emotiontech_bvoh", "emotiontech_copa", "emotiontech_hips", "emotiontech_nylon_1030", "emotiontech_nylon_1030cf", "emotiontech_nylon_1070","emotiontech_pc", "emotiontech_petg", "emotiontech_pla", "emotiontech_pla_hr_870", "emotiontech_pva-m", "emotiontech_pva-oks", - "emotiontech_pva-s", "emotiontech_tpu98a", + "emotiontech_pva-s", "emotiontech_tpu98a", "emotiontech_pekk", + "eryone_petg", "eryone_pla", "eryone_pla_glow", "eryone_pla_matte", "eryone_pla_wood", "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", + "Extrudr_GreenTECPro_Anthracite_175", "Extrudr_GreenTECPro_Black_175", "Extrudr_GreenTECPro_Blue_175", "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", "Extrudr_GreenTECPro_Silver_175", "Extrudr_GreenTECPro_White_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", "fdplast_pla_olive", "fdplast_abs_tomato", "fdplast_petg_gray", "fiberlogy_hd_pla", @@ -35,6 +38,8 @@ "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", + "goofoo_abs", "goofoo_asa", "goofoo_bronze_pla", "goofoo_emarble_pla", "goofoo_esilk_pla", "goofoo_hips", "goofoo_pa", "goofoo_pa_cf", "goofoo_pc", + "goofoo_peek", "goofoo_petg", "goofoo_pla", "goofoo_pva", "goofoo_tpe_83a", "goofoo_tpu_87a", "goofoo_tpu_95a", "goofoo_wood_pla", "imade3d_petg_175", "imade3d_pla_175", "innofill_innoflex60_175", "layer_one_white_pla", "layer_one_black_pla", "layer_one_dark_gray_pla", @@ -64,6 +69,8 @@ "volumic_bumper_ultra", "volumic_cu80_ultra", "volumic_flex93_ultra", "volumic_medical_ultra", "volumic_nylon_ultra", "volumic_pekk_carbone", "volumic_petg_ultra", "volumic_petgcarbone_ultra", "volumic_pla_ultra", "volumic_pp_ultra", "volumic_strong_ultra", + "xyzprinting_abs", "xyzprinting_antibact_pla", "xyzprinting_carbon_fiber", "xyzprinting_colorinkjet_pla", "xyzprinting_flexible", "xyzprinting_metallic_pla", + "xyzprinting_nylon", "xyzprinting_petg", "xyzprinting_pla", "xyzprinting_tough_pla", "xyzprinting_tpu", "zyyx_pro_flex", "zyyx_pro_pla" ] }, @@ -110,9 +117,8 @@ "speed_travel": { "value": 100.0 }, "speed_z_hop": { "value": 8.0 }, - "acceleration_print": { "value": 1000 }, - "acceleration_travel": { "value": 1000 }, - "acceleration_travel_layer_0": { "value": "acceleration_travel" }, + "acceleration_print": { "value": 500 }, + "acceleration_travel": { "value": 500 }, "jerk_print": { "value": 10 }, "jerk_travel": { "value": "jerk_print" }, diff --git a/resources/definitions/rigid3d_zero3.def.json b/resources/definitions/rigid3d_zero3.def.json new file mode 100644 index 0000000000..764628a85d --- /dev/null +++ b/resources/definitions/rigid3d_zero3.def.json @@ -0,0 +1,43 @@ +{ + "name": "Rigid3D Zero3", + "version": 2, + "inherits": "rigid3d_base", + "metadata": { + "visible": true, + "quality_definition": "rigid3d_base", + "preferred_quality_type": "standard", + "platform": "rigid3d_zero3_platform.3mf", + "platform_offset": [ 0, 0, 0], + + "preferred_material": "generic_pla_175" + }, + "overrides": { + "machine_name": { "default_value": "Rigid3D Zero3" }, + + "machine_heated_bed": { "default_value": true }, + + "machine_width": { "default_value": 200 }, + "machine_depth": { "default_value": 200 }, + "machine_height": { "default_value": 200 }, + + "machine_max_acceleration_x": { "value": 500 }, + "machine_max_acceleration_y": { "value": 500 }, + "machine_max_acceleration_z": { "value": 100 }, + "machine_max_acceleration_e": { "value": 1000 }, + "machine_acceleration": { "value": 500 }, + + "machine_center_is_zero": { "default_value": false }, + + "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_end_gcode": {"default_value": "G92 E0\nT0\nG1 F1800 E-2\nG27 P2\nM107\nM104 T0 S0\nM140 S0\nG90\nG92 E0\nM18\n"}, + + "adhesion_type": { "value": "'none'" }, + + "machine_head_with_fans_polygon": { + "default_value": [ + [ -20, 40], [ -20, -65], [ 40, -65], [ 40, 40]] + }, + + "gantry_height": { "value": 30 } + } +} diff --git a/resources/meshes/rigid3d_zero3_platform.3mf b/resources/meshes/rigid3d_zero3_platform.3mf new file mode 100644 index 0000000000000000000000000000000000000000..56ae35d72c5a35f5c1ff07b29f017f570f8ec594 GIT binary patch literal 42046 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 Date: Thu, 10 Mar 2022 18:39:08 +0300 Subject: [PATCH 04/27] Update rigid3d_base.def.json --- resources/definitions/rigid3d_base.def.json | 98 ++++++++++----------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index 5078410d42..ec3a0a993a 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -3,13 +3,13 @@ "version": 2, "inherits": "fdmprinter", "metadata": { - "visible": false, - "author": "Mehmet SUTAŞ", - "manufacturer": "Rigid3D", + "visible": false, + "author": "Mehmet SUTAŞ", + "manufacturer": "Rigid3D", "file_formats": "text/x-gcode", - "has_materials": true, - "has_machine_quality": true, - + "has_materials": true, + "has_machine_quality": true, + "machine_extruder_trains":{ "0": "rigid3d_base_extruder_0" }, @@ -18,21 +18,21 @@ "preferred_material": "generic_pla_175", "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", "bestfilament_petg_orange", "bestfilament_pla_green", - "chromatik_pla", + "3D-Fuel_PLA_PRO_Black", "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", "bestfilament_petg_orange", "bestfilament_pla_green", + "chromatik_pla", "dsm_arnitel2045_175", "dsm_novamid1070_175", "emotiontech_abs", "emotiontech_absx", "emotiontech_acetate", "emotiontech_bvoh", "emotiontech_asax", - "emotiontech_bvoh", "emotiontech_copa", "emotiontech_hips", "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", "emotiontech_nylon_1070","emotiontech_pc", "emotiontech_petg", - "emotiontech_pla", "emotiontech_pla_hr_870", "emotiontech_pva-m", "emotiontech_pva-oks", - "emotiontech_pva-s", "emotiontech_tpu98a", "emotiontech_pekk", + "emotiontech_bvoh", "emotiontech_copa", "emotiontech_hips", "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", "emotiontech_nylon_1070","emotiontech_pc", "emotiontech_petg", + "emotiontech_pla", "emotiontech_pla_hr_870", "emotiontech_pva-m", "emotiontech_pva-oks", + "emotiontech_pva-s", "emotiontech_tpu98a", "emotiontech_pekk", "eryone_petg", "eryone_pla", "eryone_pla_glow", "eryone_pla_matte", "eryone_pla_wood", "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", "Extrudr_GreenTECPro_Anthracite_175", "Extrudr_GreenTECPro_Black_175", "Extrudr_GreenTECPro_Blue_175", "Extrudr_GreenTECPro_Nature_175", "Extrudr_GreenTECPro_Red_175", "Extrudr_GreenTECPro_Silver_175", "Extrudr_GreenTECPro_White_175", "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", - "fdplast_pla_olive", "fdplast_abs_tomato", "fdplast_petg_gray", + "fdplast_pla_olive", "fdplast_abs_tomato", "fdplast_petg_gray", "fiberlogy_hd_pla", "filo3d_pla", "filo3d_pla_green", "filo3d_pla_red", "generic_abs", "generic_bam", "generic_cffcpe", "generic_cffpa", "generic_cpe", "generic_cpe_plus", @@ -42,30 +42,30 @@ "goofoo_peek", "goofoo_petg", "goofoo_pla", "goofoo_pva", "goofoo_tpe_83a", "goofoo_tpu_87a", "goofoo_tpu_95a", "goofoo_wood_pla", "imade3d_petg_175", "imade3d_pla_175", "innofill_innoflex60_175", - "layer_one_white_pla", "layer_one_black_pla", "layer_one_dark_gray_pla", - "leapfrog_abs_natural", "leapfrog_epla_natural", "leapfrog_pva_natural", + "layer_one_white_pla", "layer_one_black_pla", "layer_one_dark_gray_pla", + "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", "ultimaker_abs_black", "ultimaker_abs_blue", "ultimaker_abs_green", "ultimaker_abs_grey", - "ultimaker_abs_orange", "ultimaker_abs_pearl-gold", "ultimaker_abs_red", "ultimaker_abs_silver-metallic", - "ultimaker_abs_white", "ultimaker_abs_yellow", "ultimaker_bam", "ultimaker_cpe_black", - "ultimaker_cpe_blue", "ultimaker_cpe_dark-grey", "ultimaker_cpe_green", "ultimaker_cpe_light-grey", - "ultimaker_cpe_plus_black", "ultimaker_cpe_plus_transparent", "ultimaker_cpe_plus_white", - "ultimaker_cpe_red", "ultimaker_cpe_transparent", "ultimaker_cpe_white", "ultimaker_cpe_yellow", + "ultimaker_abs_orange", "ultimaker_abs_pearl-gold", "ultimaker_abs_red", "ultimaker_abs_silver-metallic", + "ultimaker_abs_white", "ultimaker_abs_yellow", "ultimaker_bam", "ultimaker_cpe_black", + "ultimaker_cpe_blue", "ultimaker_cpe_dark-grey", "ultimaker_cpe_green", "ultimaker_cpe_light-grey", + "ultimaker_cpe_plus_black", "ultimaker_cpe_plus_transparent", "ultimaker_cpe_plus_white", + "ultimaker_cpe_red", "ultimaker_cpe_transparent", "ultimaker_cpe_white", "ultimaker_cpe_yellow", "ultimaker_nylon_black", "ultimaker_nylon_transparent", "ultimaker_pc_black", "ultimaker_pc_transparent", - "ultimaker_pc_white", "ultimaker_pla_black", "ultimaker_pla_blue", "ultimaker_pla_green", - "ultimaker_pla_magenta", "ultimaker_pla_orange", "ultimaker_pla_pearl-white", "ultimaker_pla_red", - "ultimaker_pla_silver-metallic", "ultimaker_pla_transparent", "ultimaker_pla_white", "ultimaker_pla_yellow", + "ultimaker_pc_white", "ultimaker_pla_black", "ultimaker_pla_blue", "ultimaker_pla_green", + "ultimaker_pla_magenta", "ultimaker_pla_orange", "ultimaker_pla_pearl-white", "ultimaker_pla_red", + "ultimaker_pla_silver-metallic", "ultimaker_pla_transparent", "ultimaker_pla_white", "ultimaker_pla_yellow", "ultimaker_pp_transparent", "ultimaker_pva", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "ultimaker_tpu_black", "ultimaker_tpu_blue", - "ultimaker_tpu_red", "ultimaker_tpu_white", + "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "ultimaker_tpu_black", "ultimaker_tpu_blue", + "ultimaker_tpu_red", "ultimaker_tpu_white", "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", - "volumic_support_ultra", "volumic_abs_ultra", "volumic_arma_ultra", "volumic_asa_ultra", "volumic_br80_ultra", + "Vertex_Delta_PLA_Mat", "Vertex_Delta_PLA_Satin", "Vertex_Delta_PLA_Wood", "Vertex_Delta_TPU", + "volumic_support_ultra", "volumic_abs_ultra", "volumic_arma_ultra", "volumic_asa_ultra", "volumic_br80_ultra", "volumic_bumper_ultra", "volumic_cu80_ultra", "volumic_flex93_ultra", "volumic_medical_ultra", "volumic_nylon_ultra", "volumic_pekk_carbone", "volumic_petg_ultra", "volumic_petgcarbone_ultra", "volumic_pla_ultra", "volumic_pp_ultra", "volumic_strong_ultra", @@ -75,9 +75,9 @@ ] }, "overrides": { - "machine_name": { "default_value": "Rigid3D Base Printer" }, + "machine_name": { "default_value": "Rigid3D Base Printer" }, - "material_diameter": { "default_value": 1.75 }, + "material_diameter": { "default_value": 1.75 }, "machine_max_feedrate_x": { "value": 100 }, "machine_max_feedrate_y": { "value": 100 }, @@ -93,17 +93,17 @@ "machine_max_jerk_xy": { "value": 10.0 }, "machine_max_jerk_z": { "value": 0.3 }, "machine_max_jerk_e": { "value": 5 }, - - - "optimize_wall_printing_order": { "value": "True" }, - "outer_inset_first": { "value": "True" }, - "travel_compensate_overlapping_walls_enabled": { "value": "False" }, - "fill_perimeter_gaps": { "value": "'nowhere'" }, - "z_seam_type": { "value": "'back'" }, - "z_seam_position": { "value": "'backleft'" }, - "top_bottom_pattern": { "value": "'zigzag'" }, - "expand_skins_expand_distance": { "value": 0.3 }, + + "optimize_wall_printing_order": { "value": "True" }, + "outer_inset_first": { "value": "True" }, + "travel_compensate_overlapping_walls_enabled": { "value": "False" }, + "fill_perimeter_gaps": { "value": "'nowhere'" }, + "z_seam_type": { "value": "'back'" }, + "z_seam_position": { "value": "'backleft'" }, + + "top_bottom_pattern": { "value": "'zigzag'" }, + "expand_skins_expand_distance": { "value": 0.3 }, "infill_sparse_density": { "value": 10 }, "infill_pattern": { "value": "'zigzag'" }, @@ -115,8 +115,8 @@ "speed_topbottom": { "value": "speed_print" }, "speed_support_interface": { "value": "speed_support" }, "speed_travel": { "value": 100.0 }, - "speed_z_hop": { "value": 8.0 }, - + "speed_z_hop": { "value": 8.0 }, + "acceleration_print": { "value": 500 }, "acceleration_travel": { "value": 500 }, @@ -128,15 +128,15 @@ "jerk_enabled": { "value": "False" }, "retraction_amount": { "value": 1.5 }, - "retraction_min_travel": { "value": 1.5 }, - "travel_retract_before_outer_wall": { "value": "True" }, + "retraction_min_travel": { "value": 1.5 }, + "travel_retract_before_outer_wall": { "value": "True" }, "retract_at_layer_change": { "value": "True" }, "retraction_combing": { "value": "'all'" }, "retraction_combing_max_distance": { "value": 30 }, - "support_wall_count": { "value": 1 }, - "support_infill_rate": { "value": 20 }, - "support_bottom_stair_step_height": { "value": 0.4 }, + "support_wall_count": { "value": 1 }, + "support_infill_rate": { "value": 20 }, + "support_bottom_stair_step_height": { "value": 0.4 }, "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, "support_interface_enable": { "value": "True" }, "support_interface_density": { "value": 70 }, @@ -147,11 +147,11 @@ "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'" }, - + "adhesion_type": { "value": "'skirt'" }, "skirt_gap": { "value": 5.0 }, "skirt_line_count": { "value": 2 }, - + "adaptive_layer_height_variation": { "value": 0.16 }, "adaptive_layer_height_variation_step": { "value": 0.04 }, From 43cc971835cd36a0ef7f2045b8516e47da7d4dec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Thu, 10 Mar 2022 20:07:22 +0300 Subject: [PATCH 05/27] Update rigid3d_base.def.json --- resources/definitions/rigid3d_base.def.json | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index ec3a0a993a..4397930c80 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -96,9 +96,7 @@ "optimize_wall_printing_order": { "value": "True" }, - "outer_inset_first": { "value": "True" }, - "travel_compensate_overlapping_walls_enabled": { "value": "False" }, - "fill_perimeter_gaps": { "value": "'nowhere'" }, + "inset_direction": { "value": "'outside_in'" }, "z_seam_type": { "value": "'back'" }, "z_seam_position": { "value": "'backleft'" }, From a5fff8078dc3e6faf8ac25ec4cd73a2eda10f84b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Wed, 6 Apr 2022 20:30:21 +0300 Subject: [PATCH 06/27] Update tpu default temps --- .../rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg | 4 ++-- .../quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg | 4 ++-- .../quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg | 4 ++-- .../rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg | 4 ++-- .../quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg | 4 ++-- .../quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) 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 0bbf74e3b2..d4bf310ce7 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,8 +10,8 @@ quality_type = adaptive material = generic_tpu [values] -default_material_print_temperature = 250 -default_material_bed_temperature = 70 +default_material_print_temperature = 240 +default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 20 retraction_amount = 3 \ No newline at end of file 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 53eed1dac9..34a8b29fdd 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,8 +10,8 @@ quality_type = good material = generic_tpu [values] -default_material_print_temperature = 245 -default_material_bed_temperature = 70 +default_material_print_temperature = 230 +default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 20 retraction_amount = 3 \ No newline at end of file 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 496f4c5a4a..ca5e599b22 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,8 +10,8 @@ quality_type = low material = generic_tpu [values] -default_material_print_temperature = 250 -default_material_bed_temperature = 70 +default_material_print_temperature = 240 +default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 20 retraction_amount = 3 \ No newline at end of file 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 263ab96ee7..83e88944b2 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,8 +10,8 @@ quality_type = standard material = generic_tpu [values] -default_material_print_temperature = 245 -default_material_bed_temperature = 70 +default_material_print_temperature = 230 +default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 20 retraction_amount = 3 \ No newline at end of file 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 73f59d3109..17d9de980d 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,8 +10,8 @@ quality_type = super material = generic_tpu [values] -default_material_print_temperature = 245 -default_material_bed_temperature = 70 +default_material_print_temperature = 230 +default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 20 retraction_amount = 3 \ No newline at end of file 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 bacaca0f0e..83136451c7 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,8 +10,8 @@ quality_type = ultra material = generic_tpu [values] -default_material_print_temperature = 245 -default_material_bed_temperature = 70 +default_material_print_temperature = 230 +default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 20 retraction_amount = 3 \ No newline at end of file From 380da58cf4e4280e5f4a437e2442bb936518b56c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Tue, 12 Apr 2022 12:54:33 +0300 Subject: [PATCH 07/27] Revert "Update tpu default temps" This reverts commit a5fff8078dc3e6faf8ac25ec4cd73a2eda10f84b. --- .../rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg | 4 ++-- .../quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg | 4 ++-- .../quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg | 4 ++-- .../rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg | 4 ++-- .../quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg | 4 ++-- .../quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg | 4 ++-- 6 files changed, 12 insertions(+), 12 deletions(-) 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 d4bf310ce7..0bbf74e3b2 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,8 +10,8 @@ quality_type = adaptive material = generic_tpu [values] -default_material_print_temperature = 240 -default_material_bed_temperature = 60 +default_material_print_temperature = 250 +default_material_bed_temperature = 70 speed_print = 20 retraction_speed = 20 retraction_amount = 3 \ No newline at end of file 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 34a8b29fdd..53eed1dac9 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,8 +10,8 @@ quality_type = good material = generic_tpu [values] -default_material_print_temperature = 230 -default_material_bed_temperature = 60 +default_material_print_temperature = 245 +default_material_bed_temperature = 70 speed_print = 20 retraction_speed = 20 retraction_amount = 3 \ No newline at end of file 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 ca5e599b22..496f4c5a4a 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,8 +10,8 @@ quality_type = low material = generic_tpu [values] -default_material_print_temperature = 240 -default_material_bed_temperature = 60 +default_material_print_temperature = 250 +default_material_bed_temperature = 70 speed_print = 20 retraction_speed = 20 retraction_amount = 3 \ No newline at end of file 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 83e88944b2..263ab96ee7 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,8 +10,8 @@ quality_type = standard material = generic_tpu [values] -default_material_print_temperature = 230 -default_material_bed_temperature = 60 +default_material_print_temperature = 245 +default_material_bed_temperature = 70 speed_print = 20 retraction_speed = 20 retraction_amount = 3 \ No newline at end of file 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 17d9de980d..73f59d3109 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,8 +10,8 @@ quality_type = super material = generic_tpu [values] -default_material_print_temperature = 230 -default_material_bed_temperature = 60 +default_material_print_temperature = 245 +default_material_bed_temperature = 70 speed_print = 20 retraction_speed = 20 retraction_amount = 3 \ No newline at end of file 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 83136451c7..bacaca0f0e 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,8 +10,8 @@ quality_type = ultra material = generic_tpu [values] -default_material_print_temperature = 230 -default_material_bed_temperature = 60 +default_material_print_temperature = 245 +default_material_bed_temperature = 70 speed_print = 20 retraction_speed = 20 retraction_amount = 3 \ No newline at end of file From 6e96e6086f0f2e6aa48964965ebf837932a6abeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Tue, 12 Apr 2022 18:29:39 +0300 Subject: [PATCH 08/27] More tweaks --- resources/definitions/rigid3d_base.def.json | 3 ++- .../rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg | 4 ++-- .../quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg | 4 ++-- .../quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg | 4 ++-- .../rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg | 4 ++-- .../quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg | 4 ++-- .../quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg | 4 ++-- 7 files changed, 14 insertions(+), 13 deletions(-) diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index 4397930c80..e805bbe16a 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -97,6 +97,7 @@ "optimize_wall_printing_order": { "value": "True" }, "inset_direction": { "value": "'outside_in'" }, + "xy_offset_layer_0": { "value": -0.2 }, "z_seam_type": { "value": "'back'" }, "z_seam_position": { "value": "'backleft'" }, @@ -112,7 +113,7 @@ "speed_print": { "value": 60.0 } , "speed_topbottom": { "value": "speed_print" }, "speed_support_interface": { "value": "speed_support" }, - "speed_travel": { "value": 100.0 }, + "speed_travel": { "value": 80.0 }, "speed_z_hop": { "value": 8.0 }, "acceleration_print": { "value": 500 }, 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 0bbf74e3b2..d4bf310ce7 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,8 +10,8 @@ quality_type = adaptive material = generic_tpu [values] -default_material_print_temperature = 250 -default_material_bed_temperature = 70 +default_material_print_temperature = 240 +default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 20 retraction_amount = 3 \ No newline at end of file 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 53eed1dac9..0cdb560118 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,8 +10,8 @@ quality_type = good material = generic_tpu [values] -default_material_print_temperature = 245 -default_material_bed_temperature = 70 +default_material_print_temperature = 235 +default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 20 retraction_amount = 3 \ No newline at end of file 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 496f4c5a4a..ca5e599b22 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,8 +10,8 @@ quality_type = low material = generic_tpu [values] -default_material_print_temperature = 250 -default_material_bed_temperature = 70 +default_material_print_temperature = 240 +default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 20 retraction_amount = 3 \ No newline at end of file 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 263ab96ee7..056060e323 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,8 +10,8 @@ quality_type = standard material = generic_tpu [values] -default_material_print_temperature = 245 -default_material_bed_temperature = 70 +default_material_print_temperature = 235 +default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 20 retraction_amount = 3 \ No newline at end of file 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 73f59d3109..76fb5cf210 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,8 +10,8 @@ quality_type = super material = generic_tpu [values] -default_material_print_temperature = 245 -default_material_bed_temperature = 70 +default_material_print_temperature = 235 +default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 20 retraction_amount = 3 \ No newline at end of file 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 bacaca0f0e..6daf915e12 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,8 +10,8 @@ quality_type = ultra material = generic_tpu [values] -default_material_print_temperature = 245 -default_material_bed_temperature = 70 +default_material_print_temperature = 235 +default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 20 retraction_amount = 3 \ No newline at end of file From 897fc3997ad89347de1217469d9854c3e3c40942 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Fri, 6 May 2022 07:10:38 +0300 Subject: [PATCH 09/27] Update rigid3d_base.def.json --- resources/definitions/rigid3d_base.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index e805bbe16a..17d44581db 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -129,7 +129,6 @@ "retraction_amount": { "value": 1.5 }, "retraction_min_travel": { "value": 1.5 }, "travel_retract_before_outer_wall": { "value": "True" }, - "retract_at_layer_change": { "value": "True" }, "retraction_combing": { "value": "'all'" }, "retraction_combing_max_distance": { "value": 30 }, From 09c00485765966d92ad0403a250e12e11ca41a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Tue, 28 Jun 2022 16:24:17 +0300 Subject: [PATCH 10/27] Add monotonic update tpu & nylon temperatures --- resources/definitions/rigid3d_base.def.json | 1 + .../rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg | 2 +- .../rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg | 4 ++-- .../rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg | 2 +- .../rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg | 4 ++-- .../rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg | 4 ++-- .../rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg | 4 ++-- .../rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg | 2 +- .../quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg | 2 +- .../quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg | 2 +- .../rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg | 2 +- .../quality/rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg | 2 +- .../quality/rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg | 2 +- 13 files changed, 17 insertions(+), 16 deletions(-) diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index 17d44581db..19cb322f69 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -102,6 +102,7 @@ "z_seam_position": { "value": "'backleft'" }, "top_bottom_pattern": { "value": "'zigzag'" }, + "skin_monotonic": { "value": "True" }, "expand_skins_expand_distance": { "value": 0.3 }, "infill_sparse_density": { "value": 10 }, "infill_pattern": { "value": "'zigzag'" }, 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 dcbb011c18..c7198b50cb 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,7 +11,7 @@ material = generic_nylon [values] default_material_print_temperature = 250 -default_material_bed_temperature = 90 +default_material_bed_temperature = 100 retraction_amount = 3 cool_fan_enabled = False retraction_speed = 40 \ No newline at end of file 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 dba0a1e9ce..7c2892f4da 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 @@ -10,8 +10,8 @@ quality_type = good material = generic_nylon [values] -default_material_print_temperature = 245 -default_material_bed_temperature = 90 +default_material_print_temperature = 250 +default_material_bed_temperature = 100 retraction_amount = 3 cool_fan_enabled = False retraction_speed = 40 \ No newline at end of file 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 f5bd2fd2ba..539d489f76 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,7 +11,7 @@ material = generic_nylon [values] default_material_print_temperature = 250 -default_material_bed_temperature = 90 +default_material_bed_temperature = 100 retraction_amount = 3 cool_fan_enabled = False retraction_speed = 40 \ No newline at end of file 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 6773e95aa9..04ef7d5806 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 @@ -10,8 +10,8 @@ quality_type = standard material = generic_nylon [values] -default_material_print_temperature = 245 -default_material_bed_temperature = 90 +default_material_print_temperature = 250 +default_material_bed_temperature = 100 retraction_amount = 3 cool_fan_enabled = False retraction_speed = 40 \ No newline at end of file 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 19844b1221..01c9aa05d3 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 @@ -10,8 +10,8 @@ quality_type = super material = generic_nylon [values] -default_material_print_temperature = 245 -default_material_bed_temperature = 90 +default_material_print_temperature = 250 +default_material_bed_temperature = 100 retraction_amount = 3 cool_fan_enabled = False retraction_speed = 40 \ No newline at end of file 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 a6545e3a5b..e1367cabe3 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 @@ -10,8 +10,8 @@ quality_type = ultra material = generic_nylon [values] -default_material_print_temperature = 245 -default_material_bed_temperature = 90 +default_material_print_temperature = 250 +default_material_bed_temperature = 100 retraction_amount = 3 cool_fan_enabled = False retraction_speed = 40 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 d4bf310ce7..8fc3101a30 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,7 +10,7 @@ quality_type = adaptive material = generic_tpu [values] -default_material_print_temperature = 240 +default_material_print_temperature = 230 default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 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 0cdb560118..34a8b29fdd 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,7 +10,7 @@ quality_type = good material = generic_tpu [values] -default_material_print_temperature = 235 +default_material_print_temperature = 230 default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 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 ca5e599b22..a71796d12c 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,7 +10,7 @@ quality_type = low material = generic_tpu [values] -default_material_print_temperature = 240 +default_material_print_temperature = 230 default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 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 056060e323..83e88944b2 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,7 +10,7 @@ quality_type = standard material = generic_tpu [values] -default_material_print_temperature = 235 +default_material_print_temperature = 230 default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 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 76fb5cf210..17d9de980d 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,7 +10,7 @@ quality_type = super material = generic_tpu [values] -default_material_print_temperature = 235 +default_material_print_temperature = 230 default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 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 6daf915e12..83136451c7 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,7 +10,7 @@ quality_type = ultra material = generic_tpu [values] -default_material_print_temperature = 235 +default_material_print_temperature = 230 default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 20 From 5fbfbd0a7c6e84b48f78c27515eaaa8a965932d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Tue, 28 Jun 2022 16:36:07 +0300 Subject: [PATCH 11/27] settings version correction --- .../quality/rigid3d_base/rigid3d_base_global_adaptive.inst.cfg | 2 +- .../quality/rigid3d_base/rigid3d_base_global_good.inst.cfg | 2 +- resources/quality/rigid3d_base/rigid3d_base_global_low.inst.cfg | 2 +- .../quality/rigid3d_base/rigid3d_base_global_standard.inst.cfg | 2 +- .../quality/rigid3d_base/rigid3d_base_global_super.inst.cfg | 2 +- .../quality/rigid3d_base/rigid3d_base_global_ultra.inst.cfg | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_adaptive.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_adaptive.inst.cfg index 67db5f127c..a066a1d526 100644 --- a/resources/quality/rigid3d_base/rigid3d_base_global_adaptive.inst.cfg +++ b/resources/quality/rigid3d_base/rigid3d_base_global_adaptive.inst.cfg @@ -4,7 +4,7 @@ name = Dynamic Quality definition = rigid3d_base [metadata] -setting_version = 19 +setting_version = 20 type = quality quality_type = adaptive weight = -6 diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_good.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_good.inst.cfg index 6ee179a6fb..f6fbe8def0 100644 --- a/resources/quality/rigid3d_base/rigid3d_base_global_good.inst.cfg +++ b/resources/quality/rigid3d_base/rigid3d_base_global_good.inst.cfg @@ -4,7 +4,7 @@ name = Good Quality definition = rigid3d_base [metadata] -setting_version = 19 +setting_version = 20 type = quality quality_type = good weight = -2 diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_low.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_low.inst.cfg index 0a59e4833a..52a376ea65 100644 --- a/resources/quality/rigid3d_base/rigid3d_base_global_low.inst.cfg +++ b/resources/quality/rigid3d_base/rigid3d_base_global_low.inst.cfg @@ -4,7 +4,7 @@ name = Low Quality definition = rigid3d_base [metadata] -setting_version = 19 +setting_version = 20 type = quality quality_type = low weight = -4 diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_standard.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_standard.inst.cfg index 527af7565d..28b1e7c974 100644 --- a/resources/quality/rigid3d_base/rigid3d_base_global_standard.inst.cfg +++ b/resources/quality/rigid3d_base/rigid3d_base_global_standard.inst.cfg @@ -4,7 +4,7 @@ name = Standard Quality definition = rigid3d_base [metadata] -setting_version = 19 +setting_version = 20 type = quality quality_type = standard weight = -3 diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_super.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_super.inst.cfg index cec42523dc..1dbebd0301 100644 --- a/resources/quality/rigid3d_base/rigid3d_base_global_super.inst.cfg +++ b/resources/quality/rigid3d_base/rigid3d_base_global_super.inst.cfg @@ -4,7 +4,7 @@ name = Super Quality definition = rigid3d_base [metadata] -setting_version = 19 +setting_version = 20 type = quality quality_type = super weight = -1 diff --git a/resources/quality/rigid3d_base/rigid3d_base_global_ultra.inst.cfg b/resources/quality/rigid3d_base/rigid3d_base_global_ultra.inst.cfg index 9a88c02ca8..35a7a8f91e 100644 --- a/resources/quality/rigid3d_base/rigid3d_base_global_ultra.inst.cfg +++ b/resources/quality/rigid3d_base/rigid3d_base_global_ultra.inst.cfg @@ -4,7 +4,7 @@ name = Ultra Quality definition = rigid3d_base [metadata] -setting_version = 19 +setting_version = 20 type = quality quality_type = ultra weight = 0 From 5fa113fef5c0cc8c45ccd9eb4f14118691ae2250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Mon, 5 Sep 2022 19:24:09 +0300 Subject: [PATCH 12/27] Remove material exclusions --- resources/definitions/rigid3d_base.def.json | 66 ++------------------- 1 file changed, 5 insertions(+), 61 deletions(-) diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index 19cb322f69..bb051c68f0 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -16,63 +16,7 @@ "first_start_actions": ["MachineSettingsAction"], "supported_actions": ["MachineSettingsAction"], - "preferred_material": "generic_pla_175", - "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", "bestfilament_petg_orange", "bestfilament_pla_green", - "chromatik_pla", - "dsm_arnitel2045_175", "dsm_novamid1070_175", - "emotiontech_abs", "emotiontech_absx", "emotiontech_acetate", "emotiontech_bvoh", "emotiontech_asax", - "emotiontech_bvoh", "emotiontech_copa", "emotiontech_hips", "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", "emotiontech_nylon_1070","emotiontech_pc", "emotiontech_petg", - "emotiontech_pla", "emotiontech_pla_hr_870", "emotiontech_pva-m", "emotiontech_pva-oks", - "emotiontech_pva-s", "emotiontech_tpu98a", "emotiontech_pekk", - "eryone_petg", "eryone_pla", "eryone_pla_glow", "eryone_pla_matte", "eryone_pla_wood", - "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", - "Extrudr_GreenTECPro_Anthracite_175", "Extrudr_GreenTECPro_Black_175", "Extrudr_GreenTECPro_Blue_175", "Extrudr_GreenTECPro_Nature_175", - "Extrudr_GreenTECPro_Red_175", "Extrudr_GreenTECPro_Silver_175", "Extrudr_GreenTECPro_White_175", - "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", - "fdplast_pla_olive", "fdplast_abs_tomato", "fdplast_petg_gray", - "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", - "goofoo_abs", "goofoo_asa", "goofoo_bronze_pla", "goofoo_emarble_pla", "goofoo_esilk_pla", "goofoo_hips", "goofoo_pa", "goofoo_pa_cf", "goofoo_pc", - "goofoo_peek", "goofoo_petg", "goofoo_pla", "goofoo_pva", "goofoo_tpe_83a", "goofoo_tpu_87a", "goofoo_tpu_95a", "goofoo_wood_pla", - "imade3d_petg_175", "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_white_pla", "layer_one_black_pla", "layer_one_dark_gray_pla", - "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", - "ultimaker_abs_black", "ultimaker_abs_blue", "ultimaker_abs_green", "ultimaker_abs_grey", - "ultimaker_abs_orange", "ultimaker_abs_pearl-gold", "ultimaker_abs_red", "ultimaker_abs_silver-metallic", - "ultimaker_abs_white", "ultimaker_abs_yellow", "ultimaker_bam", "ultimaker_cpe_black", - "ultimaker_cpe_blue", "ultimaker_cpe_dark-grey", "ultimaker_cpe_green", "ultimaker_cpe_light-grey", - "ultimaker_cpe_plus_black", "ultimaker_cpe_plus_transparent", "ultimaker_cpe_plus_white", - "ultimaker_cpe_red", "ultimaker_cpe_transparent", "ultimaker_cpe_white", "ultimaker_cpe_yellow", - "ultimaker_nylon_black", "ultimaker_nylon_transparent", "ultimaker_pc_black", "ultimaker_pc_transparent", - "ultimaker_pc_white", "ultimaker_pla_black", "ultimaker_pla_blue", "ultimaker_pla_green", - "ultimaker_pla_magenta", "ultimaker_pla_orange", "ultimaker_pla_pearl-white", "ultimaker_pla_red", - "ultimaker_pla_silver-metallic", "ultimaker_pla_transparent", "ultimaker_pla_white", "ultimaker_pla_yellow", - "ultimaker_pp_transparent", "ultimaker_pva", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", - "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "ultimaker_tpu_black", "ultimaker_tpu_blue", - "ultimaker_tpu_red", "ultimaker_tpu_white", - "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", - "volumic_support_ultra", "volumic_abs_ultra", "volumic_arma_ultra", "volumic_asa_ultra", "volumic_br80_ultra", - "volumic_bumper_ultra", "volumic_cu80_ultra", "volumic_flex93_ultra", "volumic_medical_ultra", - "volumic_nylon_ultra", "volumic_pekk_carbone", "volumic_petg_ultra", "volumic_petgcarbone_ultra", - "volumic_pla_ultra", "volumic_pp_ultra", "volumic_strong_ultra", - "xyzprinting_abs", "xyzprinting_antibact_pla", "xyzprinting_carbon_fiber", "xyzprinting_colorinkjet_pla", "xyzprinting_flexible", "xyzprinting_metallic_pla", - "xyzprinting_nylon", "xyzprinting_petg", "xyzprinting_pla", "xyzprinting_tough_pla", "xyzprinting_tpu", - "zyyx_pro_flex", "zyyx_pro_pla" - ] + "preferred_material": "generic_pla_175" }, "overrides": { "machine_name": { "default_value": "Rigid3D Base Printer" }, @@ -94,7 +38,7 @@ "machine_max_jerk_z": { "value": 0.3 }, "machine_max_jerk_e": { "value": 5 }, - + "wall_0_wipe_dist": { "value": 0.0 }, "optimize_wall_printing_order": { "value": "True" }, "inset_direction": { "value": "'outside_in'" }, "xy_offset_layer_0": { "value": -0.2 }, @@ -105,7 +49,7 @@ "skin_monotonic": { "value": "True" }, "expand_skins_expand_distance": { "value": 0.3 }, "infill_sparse_density": { "value": 10 }, - "infill_pattern": { "value": "'zigzag'" }, + "infill_pattern": { "value": "'lines'" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, @@ -127,10 +71,10 @@ "acceleration_enabled": { "value": "False" }, "jerk_enabled": { "value": "False" }, - "retraction_amount": { "value": 1.5 }, + "retraction_amount": { "value": 1.0 }, "retraction_min_travel": { "value": 1.5 }, "travel_retract_before_outer_wall": { "value": "True" }, - "retraction_combing": { "value": "'all'" }, + "retraction_combing": { "value": "'off'" }, "retraction_combing_max_distance": { "value": 30 }, "support_wall_count": { "value": 1 }, From b9ee978eadc2f80d85c2f72c26be2f0269fe958b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Tue, 20 Sep 2022 10:08:24 +0300 Subject: [PATCH 13/27] Revert "Remove material exclusions" This reverts commit 5fa113fef5c0cc8c45ccd9eb4f14118691ae2250. --- resources/definitions/rigid3d_base.def.json | 66 +++++++++++++++++++-- 1 file changed, 61 insertions(+), 5 deletions(-) diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index bb051c68f0..19cb322f69 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -16,7 +16,63 @@ "first_start_actions": ["MachineSettingsAction"], "supported_actions": ["MachineSettingsAction"], - "preferred_material": "generic_pla_175" + "preferred_material": "generic_pla_175", + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", "bestfilament_petg_orange", "bestfilament_pla_green", + "chromatik_pla", + "dsm_arnitel2045_175", "dsm_novamid1070_175", + "emotiontech_abs", "emotiontech_absx", "emotiontech_acetate", "emotiontech_bvoh", "emotiontech_asax", + "emotiontech_bvoh", "emotiontech_copa", "emotiontech_hips", "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", "emotiontech_nylon_1070","emotiontech_pc", "emotiontech_petg", + "emotiontech_pla", "emotiontech_pla_hr_870", "emotiontech_pva-m", "emotiontech_pva-oks", + "emotiontech_pva-s", "emotiontech_tpu98a", "emotiontech_pekk", + "eryone_petg", "eryone_pla", "eryone_pla_glow", "eryone_pla_matte", "eryone_pla_wood", + "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", + "Extrudr_GreenTECPro_Anthracite_175", "Extrudr_GreenTECPro_Black_175", "Extrudr_GreenTECPro_Blue_175", "Extrudr_GreenTECPro_Nature_175", + "Extrudr_GreenTECPro_Red_175", "Extrudr_GreenTECPro_Silver_175", "Extrudr_GreenTECPro_White_175", + "fabtotum_abs", "fabtotum_nylon", "fabtotum_pla", "fabtotum_tpu", + "fdplast_pla_olive", "fdplast_abs_tomato", "fdplast_petg_gray", + "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", + "goofoo_abs", "goofoo_asa", "goofoo_bronze_pla", "goofoo_emarble_pla", "goofoo_esilk_pla", "goofoo_hips", "goofoo_pa", "goofoo_pa_cf", "goofoo_pc", + "goofoo_peek", "goofoo_petg", "goofoo_pla", "goofoo_pva", "goofoo_tpe_83a", "goofoo_tpu_87a", "goofoo_tpu_95a", "goofoo_wood_pla", + "imade3d_petg_175", "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_white_pla", "layer_one_black_pla", "layer_one_dark_gray_pla", + "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", + "ultimaker_abs_black", "ultimaker_abs_blue", "ultimaker_abs_green", "ultimaker_abs_grey", + "ultimaker_abs_orange", "ultimaker_abs_pearl-gold", "ultimaker_abs_red", "ultimaker_abs_silver-metallic", + "ultimaker_abs_white", "ultimaker_abs_yellow", "ultimaker_bam", "ultimaker_cpe_black", + "ultimaker_cpe_blue", "ultimaker_cpe_dark-grey", "ultimaker_cpe_green", "ultimaker_cpe_light-grey", + "ultimaker_cpe_plus_black", "ultimaker_cpe_plus_transparent", "ultimaker_cpe_plus_white", + "ultimaker_cpe_red", "ultimaker_cpe_transparent", "ultimaker_cpe_white", "ultimaker_cpe_yellow", + "ultimaker_nylon_black", "ultimaker_nylon_transparent", "ultimaker_pc_black", "ultimaker_pc_transparent", + "ultimaker_pc_white", "ultimaker_pla_black", "ultimaker_pla_blue", "ultimaker_pla_green", + "ultimaker_pla_magenta", "ultimaker_pla_orange", "ultimaker_pla_pearl-white", "ultimaker_pla_red", + "ultimaker_pla_silver-metallic", "ultimaker_pla_transparent", "ultimaker_pla_white", "ultimaker_pla_yellow", + "ultimaker_pp_transparent", "ultimaker_pva", "ultimaker_tough_pla_black", "ultimaker_tough_pla_green", + "ultimaker_tough_pla_red", "ultimaker_tough_pla_white", "ultimaker_tpu_black", "ultimaker_tpu_blue", + "ultimaker_tpu_red", "ultimaker_tpu_white", + "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", + "volumic_support_ultra", "volumic_abs_ultra", "volumic_arma_ultra", "volumic_asa_ultra", "volumic_br80_ultra", + "volumic_bumper_ultra", "volumic_cu80_ultra", "volumic_flex93_ultra", "volumic_medical_ultra", + "volumic_nylon_ultra", "volumic_pekk_carbone", "volumic_petg_ultra", "volumic_petgcarbone_ultra", + "volumic_pla_ultra", "volumic_pp_ultra", "volumic_strong_ultra", + "xyzprinting_abs", "xyzprinting_antibact_pla", "xyzprinting_carbon_fiber", "xyzprinting_colorinkjet_pla", "xyzprinting_flexible", "xyzprinting_metallic_pla", + "xyzprinting_nylon", "xyzprinting_petg", "xyzprinting_pla", "xyzprinting_tough_pla", "xyzprinting_tpu", + "zyyx_pro_flex", "zyyx_pro_pla" + ] }, "overrides": { "machine_name": { "default_value": "Rigid3D Base Printer" }, @@ -38,7 +94,7 @@ "machine_max_jerk_z": { "value": 0.3 }, "machine_max_jerk_e": { "value": 5 }, - "wall_0_wipe_dist": { "value": 0.0 }, + "optimize_wall_printing_order": { "value": "True" }, "inset_direction": { "value": "'outside_in'" }, "xy_offset_layer_0": { "value": -0.2 }, @@ -49,7 +105,7 @@ "skin_monotonic": { "value": "True" }, "expand_skins_expand_distance": { "value": 0.3 }, "infill_sparse_density": { "value": 10 }, - "infill_pattern": { "value": "'lines'" }, + "infill_pattern": { "value": "'zigzag'" }, "material_initial_print_temperature": { "value": "material_print_temperature" }, "material_final_print_temperature": { "value": "material_print_temperature" }, @@ -71,10 +127,10 @@ "acceleration_enabled": { "value": "False" }, "jerk_enabled": { "value": "False" }, - "retraction_amount": { "value": 1.0 }, + "retraction_amount": { "value": 1.5 }, "retraction_min_travel": { "value": 1.5 }, "travel_retract_before_outer_wall": { "value": "True" }, - "retraction_combing": { "value": "'off'" }, + "retraction_combing": { "value": "'all'" }, "retraction_combing_max_distance": { "value": 30 }, "support_wall_count": { "value": 1 }, From b45a20a39b657bdd993348e1f2c0717d6337fbee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Tue, 20 Sep 2022 14:48:48 +0300 Subject: [PATCH 14/27] Default Temperature Clean up --- .../rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg | 4 ++-- .../quality/rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg | 3 +-- .../quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg | 4 ++-- .../rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg | 3 +-- .../rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg | 3 +-- .../rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg | 3 +-- .../rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg | 6 ++---- .../rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg | 5 +---- .../rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg | 6 ++---- .../rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg | 5 +---- .../rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg | 5 +---- .../rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg | 5 +---- .../rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg | 4 +--- .../rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg | 4 +--- .../rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg | 4 +--- .../rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg | 4 +--- .../rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg | 4 +--- .../rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg | 4 +--- .../rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg | 3 +-- .../quality/rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg | 3 +-- .../quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg | 3 +-- .../rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg | 3 +-- .../rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg | 3 +-- .../rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg | 3 +-- .../rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg | 4 +--- .../quality/rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg | 4 +--- .../quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg | 4 +--- .../rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg | 4 +--- .../rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg | 4 +--- .../rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg | 4 +--- 30 files changed, 34 insertions(+), 84 deletions(-) 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 91485b44c7..16fba2b1b1 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,5 +11,5 @@ material = generic_abs [values] cool_fan_enabled = False -default_material_print_temperature = 240 -default_material_bed_temperature = 100 +material_print_temperature = =default_material_print_temperature + 5 +material_bed_temperature = =default_material_bed_temperature + 20 \ No newline at end of file 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 223f2866f9..df4a0d78df 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,5 +12,4 @@ variant = 0.4mm Nozzle [values] cool_fan_enabled = False -default_material_print_temperature = 235 -default_material_bed_temperature = 100 \ No newline at end of file +material_bed_temperature = =default_material_bed_temperature + 20 \ No newline at end of file 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 b194edea3a..a5017c8454 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,5 +12,5 @@ variant = 0.4mm Nozzle [values] cool_fan_enabled = False -default_material_print_temperature = 240 -default_material_bed_temperature = 100 +material_print_temperature = =default_material_print_temperature + 5 +material_bed_temperature = =default_material_bed_temperature + 20 \ No newline at end of file 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 22ac39071c..b3feab4ba3 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,5 +11,4 @@ material = generic_abs [values] cool_fan_enabled = False -default_material_print_temperature = 235 -default_material_bed_temperature = 100 +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 feff17d39a..67ce7ac3da 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,5 +11,4 @@ material = generic_abs [values] cool_fan_enabled = False -default_material_print_temperature = 235 -default_material_bed_temperature = 100 +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 929a9fd2e3..6c88825ca5 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,5 +11,4 @@ material = generic_abs [values] cool_fan_enabled = False -default_material_print_temperature = 235 -default_material_bed_temperature = 100 +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 6d41498e30..b2c82a46ef 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 @@ -10,8 +10,6 @@ quality_type = adaptive material = generic_nylon [values] -default_material_print_temperature = 250 -default_material_bed_temperature = 100 -retraction_amount = 3 +material_print_temperature = =default_material_print_temperature + 5 cool_fan_enabled = False -retraction_speed = 40 \ No newline at end of file +material_bed_temperature = =default_material_bed_temperature + 40 \ No newline at end of file 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 b3558c29d3..fdf434297d 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 @@ -10,8 +10,5 @@ quality_type = good material = generic_nylon [values] -default_material_print_temperature = 250 -default_material_bed_temperature = 100 -retraction_amount = 3 cool_fan_enabled = False -retraction_speed = 40 \ No newline at end of file +material_bed_temperature = =default_material_bed_temperature + 40 \ No newline at end of file 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 0f412d463f..749c862a84 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 @@ -10,8 +10,6 @@ quality_type = low material = generic_nylon [values] -default_material_print_temperature = 250 -default_material_bed_temperature = 100 -retraction_amount = 3 +material_print_temperature = =default_material_print_temperature + 5 cool_fan_enabled = False -retraction_speed = 40 \ No newline at end of file +material_bed_temperature = =default_material_bed_temperature + 40 \ No newline at end of file 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 34f3780442..bd437965d3 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 @@ -10,8 +10,5 @@ quality_type = standard material = generic_nylon [values] -default_material_print_temperature = 250 -default_material_bed_temperature = 100 -retraction_amount = 3 cool_fan_enabled = False -retraction_speed = 40 \ No newline at end of file +material_bed_temperature = =default_material_bed_temperature + 40 \ No newline at end of file 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 f18f752a13..6df1bb3705 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 @@ -10,8 +10,5 @@ quality_type = super material = generic_nylon [values] -default_material_print_temperature = 250 -default_material_bed_temperature = 100 -retraction_amount = 3 cool_fan_enabled = False -retraction_speed = 40 \ No newline at end of file +material_bed_temperature = =default_material_bed_temperature + 40 \ No newline at end of file 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 381eb74bf6..3f181ff838 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 @@ -10,8 +10,5 @@ quality_type = ultra material = generic_nylon [values] -default_material_print_temperature = 250 -default_material_bed_temperature = 100 -retraction_amount = 3 cool_fan_enabled = False -retraction_speed = 40 +material_bed_temperature = =default_material_bed_temperature + 40 \ No newline at end of file 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 e45d965bbc..29f7acefb1 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,6 +10,4 @@ quality_type = adaptive material = generic_petg [values] -retraction_amount = 2 -default_material_print_temperature = 250 -default_material_bed_temperature = 85 +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 1cb3ddd594..308a6d67ad 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,6 +10,4 @@ quality_type = good material = generic_petg [values] -retraction_amount = 2 -default_material_print_temperature = 245 -default_material_bed_temperature = 85 +material_print_temperature = =default_material_print_temperature + 25 \ No newline at end of file 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 142dab0fa5..ca40b19df9 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,6 +10,4 @@ quality_type = low material = generic_petg [values] -retraction_amount = 2 -default_material_print_temperature = 250 -default_material_bed_temperature = 85 +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 9970ea80d5..d81a2fad09 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,6 +10,4 @@ quality_type = standard material = generic_petg [values] -retraction_amount = 2 -default_material_print_temperature = 245 -default_material_bed_temperature = 85 +material_print_temperature = =default_material_print_temperature + 25 \ No newline at end of file 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 d9b88d6f06..4ca03db230 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,6 +10,4 @@ quality_type = super material = generic_petg [values] -retraction_amount = 2 -default_material_print_temperature = 245 -default_material_bed_temperature = 85 +material_print_temperature = =default_material_print_temperature + 25 \ No newline at end of file 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 a2cd29e814..98cb37974a 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,6 +10,4 @@ quality_type = ultra material = generic_petg [values] -retraction_amount = 2 -default_material_print_temperature = 245 -default_material_bed_temperature = 85 +material_print_temperature = =default_material_print_temperature + 25 \ No newline at end of file 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 b5717639ec..a53fda819f 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,5 +10,4 @@ quality_type = adaptive material = generic_pla [values] -default_material_print_temperature = 210 -default_material_bed_temperature = 55 +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 af26bebec3..2aab7a0a12 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,5 +10,4 @@ quality_type = good material = generic_pla [values] -default_material_print_temperature = 205 -default_material_bed_temperature = 55 +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 39902dcd0d..14ae5390b3 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,5 +10,4 @@ quality_type = low material = generic_pla [values] -default_material_print_temperature = 210 -default_material_bed_temperature = 55 +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 f4d2a94bb7..191ac4dff2 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,5 +10,4 @@ quality_type = standard material = generic_pla [values] -default_material_print_temperature = 205 -default_material_bed_temperature = 55 +material_print_temperature = =default_material_print_temperature + 5 \ No newline at end of file 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 2c99771ee3..9fd11647bc 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,5 +10,4 @@ quality_type = super material = generic_pla [values] -default_material_print_temperature = 205 -default_material_bed_temperature = 55 +material_print_temperature = =default_material_print_temperature + 5 \ No newline at end of file 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 55c658b6f7..a2d0414e5e 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,5 +10,4 @@ quality_type = ultra material = generic_pla [values] -default_material_print_temperature = 205 -default_material_bed_temperature = 55 +material_print_temperature = =default_material_print_temperature + 5 \ No newline at end of file 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 47bd8709ce..fe7d8a342d 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,8 +10,6 @@ quality_type = adaptive material = generic_tpu [values] -default_material_print_temperature = 230 -default_material_bed_temperature = 60 +material_bed_temperature = =default_material_bed_temperature + 60 speed_print = 20 retraction_speed = 20 -retraction_amount = 3 \ No newline at end of file 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 5ae336a85b..cf30f739a4 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,8 +10,6 @@ quality_type = good material = generic_tpu [values] -default_material_print_temperature = 230 -default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 20 -retraction_amount = 3 \ No newline at end of file +material_bed_temperature = =default_material_bed_temperature + 60 \ No newline at end of file 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 c9a9eb986e..8d6bab2cc5 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,8 +10,6 @@ quality_type = low material = generic_tpu [values] -default_material_print_temperature = 230 -default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 20 -retraction_amount = 3 \ No newline at end of file +material_bed_temperature = =default_material_bed_temperature + 60 \ No newline at end of file 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 8f28f74899..554d451b1f 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,8 +10,6 @@ quality_type = standard material = generic_tpu [values] -default_material_print_temperature = 230 -default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 20 -retraction_amount = 3 \ No newline at end of file +material_bed_temperature = =default_material_bed_temperature + 60 \ No newline at end of file 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 32e1c81f6d..32096a6c4b 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,8 +10,6 @@ quality_type = super material = generic_tpu [values] -default_material_print_temperature = 230 -default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 20 -retraction_amount = 3 \ No newline at end of file +material_bed_temperature = =default_material_bed_temperature + 60 \ No newline at end of file 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 ce840ccbe2..ae68bfbe77 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,8 +10,6 @@ quality_type = ultra material = generic_tpu [values] -default_material_print_temperature = 230 -default_material_bed_temperature = 60 speed_print = 20 retraction_speed = 20 -retraction_amount = 3 \ No newline at end of file +material_bed_temperature = =default_material_bed_temperature + 60 \ No newline at end of file From 4c18c4400273ca63445e5d52e4d7187cef6a798d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Wed, 30 Nov 2022 00:44:21 +0300 Subject: [PATCH 15/27] Update resources/definitions/rigid3d_zero3.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/rigid3d_zero3.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/rigid3d_zero3.def.json b/resources/definitions/rigid3d_zero3.def.json index 764628a85d..8c96f5be0e 100644 --- a/resources/definitions/rigid3d_zero3.def.json +++ b/resources/definitions/rigid3d_zero3.def.json @@ -23,7 +23,7 @@ "machine_max_acceleration_x": { "value": 500 }, "machine_max_acceleration_y": { "value": 500 }, "machine_max_acceleration_z": { "value": 100 }, - "machine_max_acceleration_e": { "value": 1000 }, + "machine_acceleration": { "value": 500 }, "machine_center_is_zero": { "default_value": false }, From f36ff605b45ead1889b4fa6421b69eb97e18e0c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Wed, 30 Nov 2022 00:45:11 +0300 Subject: [PATCH 16/27] Update resources/definitions/rigid3d_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/rigid3d_base.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index 9bc65b912b..307c3baade 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -36,7 +36,7 @@ "machine_max_jerk_xy": { "value": 10.0 }, "machine_max_jerk_z": { "value": 0.3 }, - "machine_max_jerk_e": { "value": 5 }, + , "optimize_wall_printing_order": { "value": "True" }, From 97c812f1b40d4dc7f06aef71a15090f5d2182658 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Wed, 30 Nov 2022 00:45:36 +0300 Subject: [PATCH 17/27] Update resources/definitions/rigid3d_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/rigid3d_base.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index 307c3baade..9c0ee47070 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -55,7 +55,7 @@ "material_final_print_temperature": { "value": "material_print_temperature" }, "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, - "speed_print": { "value": 60.0 } , + } , "speed_topbottom": { "value": "speed_print" }, "speed_support_interface": { "value": "speed_support" }, "speed_travel": { "value": 80.0 }, From af530c6103348e6d36394336b303836c54581632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Wed, 30 Nov 2022 00:45:53 +0300 Subject: [PATCH 18/27] Update resources/definitions/rigid3d_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/rigid3d_base.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index 9c0ee47070..94fdec9e9f 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -72,7 +72,7 @@ "jerk_enabled": { "value": "False" }, "retraction_amount": { "value": 1.5 }, - "retraction_min_travel": { "value": 1.5 }, + , "travel_retract_before_outer_wall": { "value": "True" }, "retraction_combing": { "value": "'all'" }, "retraction_combing_max_distance": { "value": 30 }, From f8278427fbbd00cdd97a6b874420146bdc23aeda Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Wed, 30 Nov 2022 00:46:10 +0300 Subject: [PATCH 19/27] Update resources/definitions/rigid3d_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/rigid3d_base.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index 94fdec9e9f..6fd1407d70 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -77,7 +77,7 @@ "retraction_combing": { "value": "'all'" }, "retraction_combing_max_distance": { "value": 30 }, - "support_wall_count": { "value": 1 }, + , "support_infill_rate": { "value": 20 }, "support_bottom_stair_step_height": { "value": 0.4 }, "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, From e74379f00d37dba40b44f0851ea25880b5ae636a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Wed, 30 Nov 2022 00:46:32 +0300 Subject: [PATCH 20/27] Update resources/definitions/rigid3d_mucit2.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/rigid3d_mucit2.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/rigid3d_mucit2.def.json b/resources/definitions/rigid3d_mucit2.def.json index 27a59dac83..9f4b69527a 100644 --- a/resources/definitions/rigid3d_mucit2.def.json +++ b/resources/definitions/rigid3d_mucit2.def.json @@ -23,7 +23,7 @@ "machine_max_acceleration_x": { "value": 500 }, "machine_max_acceleration_y": { "value": 500 }, "machine_max_acceleration_z": { "value": 100 }, - "machine_max_acceleration_e": { "value": 1000 }, + "machine_acceleration": { "value": 500 }, "machine_center_is_zero": { "default_value": false }, From 5ced58a3b4f59278db425eb20dfb48ee9ea6127d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Wed, 30 Nov 2022 01:20:52 +0300 Subject: [PATCH 21/27] Update rigid3d_base.def.json --- resources/definitions/rigid3d_base.def.json | 5 ----- 1 file changed, 5 deletions(-) diff --git a/resources/definitions/rigid3d_base.def.json b/resources/definitions/rigid3d_base.def.json index 6fd1407d70..5c37424742 100644 --- a/resources/definitions/rigid3d_base.def.json +++ b/resources/definitions/rigid3d_base.def.json @@ -36,8 +36,6 @@ "machine_max_jerk_xy": { "value": 10.0 }, "machine_max_jerk_z": { "value": 0.3 }, - , - "optimize_wall_printing_order": { "value": "True" }, "inset_direction": { "value": "'outside_in'" }, @@ -55,7 +53,6 @@ "material_final_print_temperature": { "value": "material_print_temperature" }, "material_bed_temperature_layer_0": { "value": "material_bed_temperature" }, - } , "speed_topbottom": { "value": "speed_print" }, "speed_support_interface": { "value": "speed_support" }, "speed_travel": { "value": 80.0 }, @@ -72,12 +69,10 @@ "jerk_enabled": { "value": "False" }, "retraction_amount": { "value": 1.5 }, - , "travel_retract_before_outer_wall": { "value": "True" }, "retraction_combing": { "value": "'all'" }, "retraction_combing_max_distance": { "value": 30 }, - , "support_infill_rate": { "value": 20 }, "support_bottom_stair_step_height": { "value": 0.4 }, "support_z_distance": { "value": "layer_height if layer_height >= 0.16 else layer_height*2" }, From c4b1f1c20d33c0ee527792d7ec00257d14356ce3 Mon Sep 17 00:00:00 2001 From: mehmetsutas Date: Fri, 13 Jan 2023 23:53:54 +0000 Subject: [PATCH 22/27] Applied printer-linter format --- resources/definitions/rigid3d_zero3.def.json | 63 ++++++++++---------- 1 file changed, 32 insertions(+), 31 deletions(-) diff --git a/resources/definitions/rigid3d_zero3.def.json b/resources/definitions/rigid3d_zero3.def.json index 8c96f5be0e..712db7bf99 100644 --- a/resources/definitions/rigid3d_zero3.def.json +++ b/resources/definitions/rigid3d_zero3.def.json @@ -1,43 +1,44 @@ { - "name": "Rigid3D Zero3", "version": 2, + "name": "Rigid3D Zero3", "inherits": "rigid3d_base", - "metadata": { + "metadata": + { "visible": true, - "quality_definition": "rigid3d_base", - "preferred_quality_type": "standard", "platform": "rigid3d_zero3_platform.3mf", - "platform_offset": [ 0, 0, 0], - - "preferred_material": "generic_pla_175" + "platform_offset": [ + 0, + 0, + 0 + ], + "preferred_material": "generic_pla_175", + "preferred_quality_type": "standard", + "quality_definition": "rigid3d_base" }, - "overrides": { - "machine_name": { "default_value": "Rigid3D Zero3" }, - - "machine_heated_bed": { "default_value": true }, - - "machine_width": { "default_value": 200 }, + "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_acceleration": { "value": 500 }, - - "machine_center_is_zero": { "default_value": false }, - - "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_end_gcode": {"default_value": "G92 E0\nT0\nG1 F1800 E-2\nG27 P2\nM107\nM104 T0 S0\nM140 S0\nG90\nG92 E0\nM18\n"}, - - "adhesion_type": { "value": "'none'" }, - - "machine_head_with_fans_polygon": { - "default_value": [ - [ -20, 40], [ -20, -65], [ 40, -65], [ 40, 40]] - }, - - "gantry_height": { "value": 30 } + "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 From 8b1ab32796a7a91ed3023224c622b17b46c8c4db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Sat, 14 Jan 2023 21:42:28 +0300 Subject: [PATCH 23/27] Rigid3D Definitions Update --- resources/definitions/rigid3d_base.def.json | 122 +++--------------- resources/definitions/rigid3d_hobby.def.json | 76 ----------- resources/definitions/rigid3d_mucit.def.json | 76 ----------- resources/definitions/rigid3d_mucit2.def.json | 8 +- resources/definitions/rigid3d_zero.def.json | 76 ----------- resources/definitions/rigid3d_zero3.def.json | 51 ++++---- 6 files changed, 49 insertions(+), 360 deletions(-) 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 index 8c96f5be0e..8ef406c14a 100644 --- a/resources/definitions/rigid3d_zero3.def.json +++ b/resources/definitions/rigid3d_zero3.def.json @@ -1,43 +1,40 @@ { - "name": "Rigid3D Zero3", "version": 2, + "name": "Rigid3D Zero3", "inherits": "rigid3d_base", - "metadata": { + "metadata": + { "visible": true, - "quality_definition": "rigid3d_base", - "preferred_quality_type": "standard", "platform": "rigid3d_zero3_platform.3mf", "platform_offset": [ 0, 0, 0], - "preferred_material": "generic_pla_175" + "preferred_quality_type": "standard", + "quality_definition": "rigid3d_base", }, - "overrides": { - "machine_name": { "default_value": "Rigid3D Zero3" }, - - "machine_heated_bed": { "default_value": true }, - - "machine_width": { "default_value": 200 }, + "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_acceleration": { "value": 500 }, - - "machine_center_is_zero": { "default_value": false }, - + "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_end_gcode": {"default_value": "G92 E0\nT0\nG1 F1800 E-2\nG27 P2\nM107\nM104 T0 S0\nM140 S0\nG90\nG92 E0\nM18\n"}, - - "adhesion_type": { "value": "'none'" }, - - "machine_head_with_fans_polygon": { - "default_value": [ - [ -20, 40], [ -20, -65], [ 40, -65], [ 40, 40]] - }, - - "gantry_height": { "value": 30 } + "machine_width": { "default_value": 200 }, } } From a9bd21e1b79dc3a7ea856cd27d95dbd20c355055 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Sat, 14 Jan 2023 22:30:43 +0300 Subject: [PATCH 24/27] Rigid3D Quality Definition Updates --- .../rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg | 5 ++--- .../rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg | 4 ++-- .../quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg | 4 ++-- .../rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg | 4 +--- .../rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg | 4 +--- .../rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg | 4 +--- .../nylon/rigid3d_base_nylon_adaptive.inst.cfg | 7 ++----- .../rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg | 6 +----- .../rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg | 7 ++----- .../nylon/rigid3d_base_nylon_standard.inst.cfg | 6 +----- .../rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg | 6 +----- .../rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg | 6 +----- .../rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg | 5 +---- .../rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg | 5 +---- .../rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg | 5 +---- .../rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg | 5 +---- .../rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg | 5 +---- .../rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg | 5 +---- .../rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg | 4 +--- .../rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg | 4 +--- .../quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg | 4 +--- .../rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg | 4 +--- .../rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg | 4 +--- .../rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg | 4 +--- .../rigid3d_base/tpu/rigid3d_base_tpu_adaptive.inst.cfg | 4 +--- .../rigid3d_base/tpu/rigid3d_base_tpu_good.inst.cfg | 4 +--- .../quality/rigid3d_base/tpu/rigid3d_base_tpu_low.inst.cfg | 4 +--- .../rigid3d_base/tpu/rigid3d_base_tpu_standard.inst.cfg | 4 +--- .../rigid3d_base/tpu/rigid3d_base_tpu_super.inst.cfg | 4 +--- .../rigid3d_base/tpu/rigid3d_base_tpu_ultra.inst.cfg | 4 +--- 30 files changed, 35 insertions(+), 106 deletions(-) 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..487e3f93c9 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,5 @@ type = quality [values] cool_fan_enabled = False -default_material_bed_temperature = 100 -default_material_print_temperature = 240 - +material_print_temperature = =default_material_print_temperature + 5 +material_bed_temperature = =default_material_bed_temperature + 20 \ No newline at end of file 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..44ab0a50da 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,6 @@ 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..436f1c656a 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_print_temperature = =default_material_print_temperature + 5 +material_bed_temperature = =default_material_bed_temperature + 20 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..503d627311 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,4 @@ 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..cc1a05dae3 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,4 @@ 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..65ca493e84 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,4 @@ 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..207c74ca60 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,5 @@ 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 \ No newline at end of file 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..9d3e8de773 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,4 @@ 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 \ No newline at end of file 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..580e26d6e7 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,5 @@ 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 \ No newline at end of file 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..96d549f04f 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,4 @@ 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 \ No newline at end of file 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..a8897d6803 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,4 @@ 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 \ No newline at end of file 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..da9001e715 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,4 @@ 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 \ No newline at end of file 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..9e8dfb743b 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,4 @@ 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 \ No newline at end of file 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..6a1284a6a4 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,4 @@ 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 \ No newline at end of file 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..15417891d3 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,4 @@ 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 \ No newline at end of file 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..cc55a07cc2 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,4 @@ 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 \ No newline at end of file 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..8c5cea4c31 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,4 @@ 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 \ No newline at end of file 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..514ff6da06 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,4 @@ 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 \ No newline at end of file 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..794b3977a5 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,4 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 55 -default_material_print_temperature = 210 - +material_print_temperature = =default_material_print_temperature + 5 \ No newline at end of file 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..453ce05745 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,4 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 55 -default_material_print_temperature = 205 - +material_print_temperature = =default_material_print_temperature + 5 \ No newline at end of file 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..7117ecba73 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,4 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 55 -default_material_print_temperature = 210 - +material_print_temperature = =default_material_print_temperature + 10 \ No newline at end of file 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..317d5e8986 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,4 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 55 -default_material_print_temperature = 205 - +material_print_temperature = =default_material_print_temperature + 5 \ No newline at end of file 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..d270eafead 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,4 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 55 -default_material_print_temperature = 205 - +material_print_temperature = =default_material_print_temperature + 5 \ No newline at end of file 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..bc202d214b 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,4 @@ setting_version = 20 type = quality [values] -default_material_bed_temperature = 55 -default_material_print_temperature = 205 - +material_print_temperature = =default_material_print_temperature + 5 \ No newline at end of file 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 From 565febad0a344df13a588e8a0e9239acb5286c7b Mon Sep 17 00:00:00 2001 From: mehmetsutas Date: Sat, 14 Jan 2023 19:31:50 +0000 Subject: [PATCH 25/27] Applied printer-linter format --- .../rigid3d_base/abs/rigid3d_base_abs_adaptive.inst.cfg | 3 ++- .../quality/rigid3d_base/abs/rigid3d_base_abs_good.inst.cfg | 1 - .../quality/rigid3d_base/abs/rigid3d_base_abs_low.inst.cfg | 2 +- .../rigid3d_base/abs/rigid3d_base_abs_standard.inst.cfg | 1 + .../quality/rigid3d_base/abs/rigid3d_base_abs_super.inst.cfg | 1 + .../quality/rigid3d_base/abs/rigid3d_base_abs_ultra.inst.cfg | 1 + .../rigid3d_base/nylon/rigid3d_base_nylon_adaptive.inst.cfg | 3 ++- .../rigid3d_base/nylon/rigid3d_base_nylon_good.inst.cfg | 3 ++- .../quality/rigid3d_base/nylon/rigid3d_base_nylon_low.inst.cfg | 3 ++- .../rigid3d_base/nylon/rigid3d_base_nylon_standard.inst.cfg | 3 ++- .../rigid3d_base/nylon/rigid3d_base_nylon_super.inst.cfg | 3 ++- .../rigid3d_base/nylon/rigid3d_base_nylon_ultra.inst.cfg | 3 ++- .../rigid3d_base/petg/rigid3d_base_petg_adaptive.inst.cfg | 3 ++- .../quality/rigid3d_base/petg/rigid3d_base_petg_good.inst.cfg | 3 ++- .../quality/rigid3d_base/petg/rigid3d_base_petg_low.inst.cfg | 3 ++- .../rigid3d_base/petg/rigid3d_base_petg_standard.inst.cfg | 3 ++- .../quality/rigid3d_base/petg/rigid3d_base_petg_super.inst.cfg | 3 ++- .../quality/rigid3d_base/petg/rigid3d_base_petg_ultra.inst.cfg | 3 ++- .../rigid3d_base/pla/rigid3d_base_pla_adaptive.inst.cfg | 3 ++- .../quality/rigid3d_base/pla/rigid3d_base_pla_good.inst.cfg | 3 ++- .../quality/rigid3d_base/pla/rigid3d_base_pla_low.inst.cfg | 3 ++- .../rigid3d_base/pla/rigid3d_base_pla_standard.inst.cfg | 3 ++- .../quality/rigid3d_base/pla/rigid3d_base_pla_super.inst.cfg | 3 ++- .../quality/rigid3d_base/pla/rigid3d_base_pla_ultra.inst.cfg | 3 ++- 24 files changed, 42 insertions(+), 21 deletions(-) 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 487e3f93c9..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,5 +11,6 @@ type = quality [values] cool_fan_enabled = False +material_bed_temperature = =default_material_bed_temperature + 20 material_print_temperature = =default_material_print_temperature + 5 -material_bed_temperature = =default_material_bed_temperature + 20 \ No newline at end of file + 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 44ab0a50da..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 @@ -14,4 +14,3 @@ variant = 0.4mm Nozzle cool_fan_enabled = False 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 436f1c656a..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 -material_print_temperature = =default_material_print_temperature + 5 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 503d627311..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 @@ -12,3 +12,4 @@ type = quality [values] cool_fan_enabled = False 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 cc1a05dae3..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 @@ -12,3 +12,4 @@ type = quality [values] cool_fan_enabled = False 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 65ca493e84..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 @@ -12,3 +12,4 @@ type = quality [values] cool_fan_enabled = False 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 207c74ca60..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 @@ -12,4 +12,5 @@ type = quality [values] cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 40 -material_print_temperature = =default_material_print_temperature + 5 \ No newline at end of file +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 9d3e8de773..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,4 +11,5 @@ type = quality [values] cool_fan_enabled = False -material_bed_temperature = =default_material_bed_temperature + 40 \ No newline at end of file +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 580e26d6e7..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 @@ -12,4 +12,5 @@ type = quality [values] cool_fan_enabled = False material_bed_temperature = =default_material_bed_temperature + 40 -material_print_temperature = =default_material_print_temperature + 5 \ No newline at end of file +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 96d549f04f..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,4 +11,5 @@ type = quality [values] cool_fan_enabled = False -material_bed_temperature = =default_material_bed_temperature + 40 \ No newline at end of file +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 a8897d6803..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,4 +11,5 @@ type = quality [values] cool_fan_enabled = False -material_bed_temperature = =default_material_bed_temperature + 40 \ No newline at end of file +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 da9001e715..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,4 +11,5 @@ type = quality [values] cool_fan_enabled = False -material_bed_temperature = =default_material_bed_temperature + 40 \ No newline at end of file +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 9e8dfb743b..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,4 +10,5 @@ setting_version = 20 type = quality [values] -material_print_temperature = =default_material_print_temperature + 30 \ No newline at end of file +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 6a1284a6a4..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,4 +10,5 @@ setting_version = 20 type = quality [values] -material_print_temperature = =default_material_print_temperature + 25 \ No newline at end of file +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 15417891d3..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,4 +10,5 @@ setting_version = 20 type = quality [values] -material_print_temperature = =default_material_print_temperature + 30 \ No newline at end of file +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 cc55a07cc2..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,4 +10,5 @@ setting_version = 20 type = quality [values] -material_print_temperature = =default_material_print_temperature + 25 \ No newline at end of file +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 8c5cea4c31..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,4 +10,5 @@ setting_version = 20 type = quality [values] -material_print_temperature = =default_material_print_temperature + 25 \ No newline at end of file +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 514ff6da06..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,4 +10,5 @@ setting_version = 20 type = quality [values] -material_print_temperature = =default_material_print_temperature + 25 \ No newline at end of file +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 794b3977a5..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,4 +10,5 @@ setting_version = 20 type = quality [values] -material_print_temperature = =default_material_print_temperature + 5 \ No newline at end of file +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 453ce05745..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,4 +10,5 @@ setting_version = 20 type = quality [values] -material_print_temperature = =default_material_print_temperature + 5 \ No newline at end of file +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 7117ecba73..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,4 +10,5 @@ setting_version = 20 type = quality [values] -material_print_temperature = =default_material_print_temperature + 10 \ No newline at end of file +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 317d5e8986..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,4 +10,5 @@ setting_version = 20 type = quality [values] -material_print_temperature = =default_material_print_temperature + 5 \ No newline at end of file +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 d270eafead..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,4 +10,5 @@ setting_version = 20 type = quality [values] -material_print_temperature = =default_material_print_temperature + 5 \ No newline at end of file +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 bc202d214b..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,4 +10,5 @@ setting_version = 20 type = quality [values] -material_print_temperature = =default_material_print_temperature + 5 \ No newline at end of file +material_print_temperature = =default_material_print_temperature + 5 + From 1fa2eb956501ea06ee3f218e92c5e84d76690fd8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mehmet=20Suta=C5=9F?= <46458775+mehmetsutas@users.noreply.github.com> Date: Sat, 14 Jan 2023 23:05:46 +0300 Subject: [PATCH 26/27] Update rigid3d_zero3.def.json --- resources/definitions/rigid3d_zero3.def.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/definitions/rigid3d_zero3.def.json b/resources/definitions/rigid3d_zero3.def.json index 8ef406c14a..c156d664bc 100644 --- a/resources/definitions/rigid3d_zero3.def.json +++ b/resources/definitions/rigid3d_zero3.def.json @@ -7,14 +7,14 @@ "visible": true, "platform": "rigid3d_zero3_platform.3mf", "platform_offset": [ 0, 0, 0], - "preferred_material": "generic_pla_175" + "preferred_material": "generic_pla_175", "preferred_quality_type": "standard", - "quality_definition": "rigid3d_base", + "quality_definition": "rigid3d_base" }, "overrides": { "adhesion_type": { "value": "'none'" }, - "gantry_height": { "value": 30 } + "gantry_height": { "value": 30 }, "machine_acceleration": { "value": 500 }, "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 200 }, @@ -35,6 +35,6 @@ "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 }, + "machine_width": { "default_value": 200 } } } From 18a5059bf69ea8f91a26497aed7916e03dec5dc4 Mon Sep 17 00:00:00 2001 From: mehmetsutas Date: Sat, 14 Jan 2023 20:06:57 +0000 Subject: [PATCH 27/27] Applied printer-linter format --- resources/definitions/rigid3d_zero3.def.json | 24 ++++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/resources/definitions/rigid3d_zero3.def.json b/resources/definitions/rigid3d_zero3.def.json index c156d664bc..712db7bf99 100644 --- a/resources/definitions/rigid3d_zero3.def.json +++ b/resources/definitions/rigid3d_zero3.def.json @@ -6,7 +6,11 @@ { "visible": true, "platform": "rigid3d_zero3_platform.3mf", - "platform_offset": [ 0, 0, 0], + "platform_offset": [ + 0, + 0, + 0 + ], "preferred_material": "generic_pla_175", "preferred_quality_type": "standard", "quality_definition": "rigid3d_base" @@ -18,15 +22,15 @@ "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_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] - ] + [-20, 40], + [-20, -65], + [40, -65], + [40, 40] + ] }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 200 }, @@ -34,7 +38,7 @@ "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_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