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] 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]]