From 176bfc8a4ef316c3658b92e90d9178a2ca023f6d Mon Sep 17 00:00:00 2001 From: mao Date: Thu, 25 Aug 2022 13:26:41 +0800 Subject: [PATCH 01/43] Add some WEEDO printers --- resources/definitions/weedo_base.def.json | 457 ++++++++++++++++++ resources/definitions/weedo_f150s.def.json | 51 ++ resources/definitions/weedo_f152s.def.json | 48 ++ resources/definitions/weedo_f370.def.json | 48 ++ resources/definitions/weedo_hephi3s.def.json | 57 +++ resources/definitions/weedo_me40.def.json | 57 +++ .../definitions/weedo_me40_lite.def.json | 60 +++ resources/definitions/weedo_tina2.def.json | 90 ++++ resources/definitions/weedo_tina2s.def.json | 90 ++++ resources/definitions/weedo_x40v3.def.json | 85 ++++ .../extruders/weedo_base_extruder_0.def.json | 16 + .../extruders/weedo_m_extruder_left.def.json | 22 + .../extruders/weedo_m_extruder_right.def.json | 22 + .../weedo_x40v3_extruder_left.def.json | 24 + .../weedo_x40v3_extruder_right.def.json | 24 + 15 files changed, 1151 insertions(+) create mode 100644 resources/definitions/weedo_base.def.json create mode 100644 resources/definitions/weedo_f150s.def.json create mode 100644 resources/definitions/weedo_f152s.def.json create mode 100644 resources/definitions/weedo_f370.def.json create mode 100644 resources/definitions/weedo_hephi3s.def.json create mode 100644 resources/definitions/weedo_me40.def.json create mode 100644 resources/definitions/weedo_me40_lite.def.json create mode 100644 resources/definitions/weedo_tina2.def.json create mode 100644 resources/definitions/weedo_tina2s.def.json create mode 100644 resources/definitions/weedo_x40v3.def.json create mode 100644 resources/extruders/weedo_base_extruder_0.def.json create mode 100644 resources/extruders/weedo_m_extruder_left.def.json create mode 100644 resources/extruders/weedo_m_extruder_right.def.json create mode 100644 resources/extruders/weedo_x40v3_extruder_left.def.json create mode 100644 resources/extruders/weedo_x40v3_extruder_right.def.json diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json new file mode 100644 index 0000000000..a3738411f9 --- /dev/null +++ b/resources/definitions/weedo_base.def.json @@ -0,0 +1,457 @@ +{ + "version": 2, + "name": "WEEDO Base", + "inherits": "fdmprinter", + "metadata": { + "author": "WEEDO", + "manufacturer": "WEEDO", + "category": "WEEDO", + "visible": false, + "file_formats": "text/x-gcode", + "machine_extruder_trains": { + "0": "weedo_base_extruder_0" + }, + "has_materials": true, + "has_variants": false, + "has_machine_quality": false, + "preferred_quality_type": "draft", + "preferred_material": "generic_pla_175" + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO Base" + }, + "machine_start_gcode": { + "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0" + }, + "machine_end_gcode": { + "default_value": "G92 E0\nG1 E-10 F1680 \nG28 Z F400; Get extruder out of way.\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n" + }, + "material_diameter": { + "default_value": 1.75 + }, + "material_bed_temp_wait": { + "default_value": false + }, + "material_print_temp_wait": { + "default_value": false + }, + "material_print_temp_prepend": { + "default_value": true + }, + "material_bed_temp_prepend": { + "default_value": true + }, + "machine_width": { + "default_value": 200.0 + }, + "machine_depth": { + "default_value": 150.0 + }, + "machine_height": { + "default_value": 150.0 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_always_write_active_tool": { + "default_value": false + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_extruder_count": { + "default_value": 1 + }, + "machine_nozzle_tip_outer_diameter": { + "default_value": 1 + }, + "machine_nozzle_heat_up_speed": { + "default_value": 1.8 + }, + "machine_nozzle_cool_down_speed": { + "default_value": 2.0 + }, + "machine_min_cool_heat_time_window": { + "default_value": 1200.0 + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "machine_max_feedrate_x": { + "default_value": 200 + }, + "machine_max_feedrate_y": { + "default_value": 130 + }, + "machine_max_feedrate_z": { + "default_value": 10 + }, + "machine_max_feedrate_e": { + "default_value": 50 + }, + "machine_max_acceleration_x": { + "default_value": 3000 + }, + "machine_max_acceleration_y": { + "default_value": 3000 + }, + "machine_max_acceleration_z": { + "default_value": 100 + }, + "machine_max_acceleration_e": { + "default_value": 200 + }, + "machine_acceleration": { + "default_value": 4000 + }, + "machine_max_jerk_xy": { + "default_value": 10.0 + }, + "machine_max_jerk_z": { + "default_value": 5 + }, + "machine_max_jerk_e": { + "default_value": 5.0 + }, + "layer_height_0": { + "default_value": 0.3 + }, + "line_width": { + "default_value": 0.4 + }, + "infill_line_width": { + "value": "line_width*1.25" + }, + "initial_layer_line_width_factor": { + "default_value": 100.0 + }, + "wall_thickness": { + "default_value": 0.8 + }, + "wall_0_wipe_dist": { + "value": 0.0 + }, + "wall_0_inset": { + "value": 0.0 + }, + "optimize_wall_printing_order": { + "default_value": false + }, + "inset_direction": { + "default_value": "inside_out" + }, + "roofing_layer_count": { + "default_value": 0 + }, + "z_seam_type": { + "default_value": "sharpest_corner" + }, + "z_seam_x": { + "default_value": 100.0 + }, + "z_seam_y": { + "default_value": 400.0 + }, + "z_seam_corner": { + "default_value": "z_seam_corner_weighted" + }, + "z_seam_relative": { + "default_value": false + }, + "skin_outline_count": { + "default_value": 0 + }, + "infill_sparse_density": { + "default_value": 10.0 + }, + "infill_pattern": { + "value": "'zigzag'" + }, + "infill_before_walls": { + "default_value": false + }, + "default_material_print_temperature": { + "default_value": 200.0 + }, + "material_print_temperature": { + "default_value": 200.0 + }, + "material_print_temperature_layer_0": { + "value": "material_print_temperature+15" + }, + "material_initial_print_temperature": { + "value": "material_print_temperature" + }, + "material_final_print_temperature": { + "value": "material_print_temperature" + }, + "default_material_bed_temperature": { + "default_value": 60.0 + }, + "material_bed_temperature": { + "value": 60.0 + }, + "material_bed_temperature_layer_0": { + "value": "material_bed_temperature" + }, + "material_flow": { + "default_value": 95.0 + }, + "material_flow_layer_0": { + "default_value": 95.0 + }, + "infill_material_flow": { + "value": "material_flow-5" + }, + "support_material_flow": { + "value": "material_flow-5" + }, + "speed_print": { + "default_value": 70.0 + }, + "speed_infill": { + "default_value": 70.0 + }, + "speed_wall": { + "value": "max(5,round(speed_print / 2-5,1))" + }, + "speed_wall_0": { + "value": "max(5,speed_wall-5)" + }, + "speed_wall_x": { + "value": "speed_wall" + }, + "speed_topbottom": { + "value": "round(speed_print * 0.65,1)" + }, + "speed_support": { + "value": "round(speed_print*0.82,1)" + }, + "speed_support_infill": { + "value": "speed_support" + }, + "speed_support_interface": { + "value": "round(speed_support*0.689,1)" + }, + "speed_prime_tower": { + "value": "speed_support" + }, + "speed_travel": { + "value": 105.0 + }, + "speed_layer_0": { + "value": 26.0 + }, + "speed_print_layer_0": { + "value": 26.0 + }, + "speed_travel_layer_0": { + "value": 80.0 + }, + "skirt_brim_speed": { + "value": 26.0 + }, + "retraction_enable": { + "default_value": true + }, + "retract_at_layer_change": { + "default_value": false + }, + "retraction_amount": { + "default_value": 3 + }, + "retraction_speed": { + "default_value": 28.0 + }, + "retraction_min_travel": { + "default_value": 0.8 + }, + "retraction_count_max": { + "default_value": 90 + }, + "retraction_extrusion_window": { + "value": 1.0 + }, + "material_standby_temperature": { + "default_value": 175.0 + }, + "switch_extruder_retraction_amount": { + "value": 16.5 + }, + "switch_extruder_retraction_speeds": { + "default_value": 28.0 + }, + "retraction_combing": { + "default_value": "off" + }, + "retraction_hop_enabled": { + "default_value": false + }, + "retraction_hop_only_when_collides": { + "default_value": false + }, + "retraction_hop": { + "default_value": 0.0 + }, + "retraction_hop_after_extruder_switch": { + "default_value": false + }, + "cool_fan_enabled": { + "default_value": true + }, + "support_enable": { + "default_value": false + }, + "support_type": { + "default_value": "everywhere" + }, + "support_angle": { + "default_value": 60.0 + }, + "support_pattern": { + "default_value": "zigzag" + }, + "support_wall_count": { + "default_value": 0 + }, + "support_connect_zigzags": { + "default_value": false + }, + "support_infill_rate": { + "default_value": 15.0 + }, + "support_z_distance": { + "default_value": 0.2 + }, + "support_xy_distance": { + "default_value": 0.7 + }, + "support_interface_enable": { + "default_value": true + }, + "support_interface_density": { + "default_value": 60.0 + }, + "support_interface_height": { + "default_value": 0.8 + }, + "support_interface_pattern": { + "default_value": "lines" + }, + "adhesion_type": { + "default_value": "raft" + }, + "skirt_line_count": { + "default_value": 2 + }, + "skirt_gap": { + "default_value": 3.0 + }, + "brim_width": { + "default_value": 8.0 + }, + "brim_line_count": { + "default_value": 20 + }, + "raft_margin": { + "default_value": 8.0 + }, + "raft_airgap": { + "default_value": 0.19 + }, + "layer_0_z_overlap": { + "value": 0.09 + }, + "raft_surface_layers": { + "default_value": 2 + }, + "raft_surface_thickness": { + "value": 0.25 + }, + "raft_surface_line_width": { + "value": 0.4 + }, + "raft_surface_line_spacing": { + "value": "raft_surface_line_width" + }, + "raft_interface_thickness": { + "value": 0.27 + }, + "raft_interface_line_width": { + "value": 0.7 + }, + "raft_interface_line_spacing": { + "value": "raft_interface_line_width + 0.2" + }, + "raft_base_thickness": { + "value": 0.3 + }, + "raft_base_line_width": { + "value": "machine_nozzle_size * 2" + }, + "raft_base_line_spacing": { + "value": "raft_base_line_width * 2" + }, + "raft_surface_speed": { + "value": 40.0 + }, + "raft_interface_speed": { + "value": 33.0 + }, + "raft_base_speed": { + "value": 20.0 + }, + "raft_surface_fan_speed": { + "value": 100.0 + }, + "raft_interface_fan_speed": { + "value": 0.0 + }, + "raft_base_fan_speed": { + "value": 0.0 + }, + "prime_tower_enable": { + "default_value": false + }, + "prime_tower_size": { + "default_value": 15.0 + }, + "prime_tower_min_volume": { + "default_value": 10.0 + }, + "prime_tower_position_x": { + "default_value": 200.0 + }, + "prime_tower_position_y": { + "default_value": 200.0 + }, + "prime_tower_flow": { + "default_value": 100.0 + }, + "ooze_shield_enabled": { + "default_value": false + }, + "ooze_shield_angle": { + "default_value": 60.0 + }, + "ooze_shield_dist": { + "default_value": 2.0 + }, + "roofing_line_width": { + "default_value": 0.4 + }, + "draft_shield_enabled": { + "default_value": false + }, + "draft_shield_dist": { + "default_value": 3 + }, + "top_skin_preshrink": { + "value": 0.0 + } + } +} \ No newline at end of file diff --git a/resources/definitions/weedo_f150s.def.json b/resources/definitions/weedo_f150s.def.json new file mode 100644 index 0000000000..5078beb023 --- /dev/null +++ b/resources/definitions/weedo_f150s.def.json @@ -0,0 +1,51 @@ +{ + "name": "WEEDO F150S", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO F150S" + }, + "machine_start_gcode": { + "default_value": ";MachineType:WEEDO F150S\n\n;(**** start.gcode for (150S)****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z140 F300\nG28 Z\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z5" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for 150s****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680 ; Reduce filament pressure\nG28 Z F1500; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "material_print_temp_prepend": { + "default_value": false + }, + "machine_width": { + "default_value": 200 + }, + "machine_depth": { + "default_value": 150 + }, + "machine_height": { + "default_value": 150 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_extruder_count": { + "default_value": 1 + }, + "material_bed_temperature": { + "value": 35 + }, + "retraction_amount": { + "default_value": 1.2 + } + } +} \ No newline at end of file diff --git a/resources/definitions/weedo_f152s.def.json b/resources/definitions/weedo_f152s.def.json new file mode 100644 index 0000000000..77390fcdba --- /dev/null +++ b/resources/definitions/weedo_f152s.def.json @@ -0,0 +1,48 @@ +{ + "name": "WEEDO F152S", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO F152S" + }, + "machine_start_gcode": { + "default_value": ";MachineType:WEEDO F152S\n\n;(**** start.gcode for F152S ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z5" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for F152S****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "material_print_temp_prepend": { + "default_value": false + }, + "machine_width": { + "default_value": 200 + }, + "machine_depth": { + "default_value": 185 + }, + "machine_height": { + "default_value": 195 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_extruder_count": { + "default_value": 1 + }, + "retraction_amount": { + "default_value": 1.2 + } + } +} \ No newline at end of file diff --git a/resources/definitions/weedo_f370.def.json b/resources/definitions/weedo_f370.def.json new file mode 100644 index 0000000000..ede3244afa --- /dev/null +++ b/resources/definitions/weedo_f370.def.json @@ -0,0 +1,48 @@ +{ + "name": "WEEDO F370", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO F370" + }, + "machine_start_gcode": { + "default_value": ";MachineType:WEEDO F370\n\n;(**** start.gcode for 370 ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z2" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for F370****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "material_print_temp_prepend": { + "default_value": false + }, + "machine_width": { + "default_value": 310 + }, + "machine_depth": { + "default_value": 310 + }, + "machine_height": { + "default_value": 370 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_extruder_count": { + "default_value": 1 + }, + "retraction_amount": { + "default_value": 1.2 + } + } +} \ No newline at end of file diff --git a/resources/definitions/weedo_hephi3s.def.json b/resources/definitions/weedo_hephi3s.def.json new file mode 100644 index 0000000000..fdc0bb9530 --- /dev/null +++ b/resources/definitions/weedo_hephi3s.def.json @@ -0,0 +1,57 @@ +{ + "name": "WEEDO hephi3s", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO hephi3s" + }, + "machine_start_gcode": { + "default_value": ";MachineType:WEEDO hephi3s\n\n;(**** start.gcode for hephi3****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15 F1000\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for hephi3****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "material_print_temp_prepend": { + "default_value": false + }, + "machine_width": { + "default_value": 220 + }, + "machine_depth": { + "default_value": 220 + }, + "machine_height": { + "default_value": 250 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_extruder_count": { + "default_value": 1 + }, + "speed_print": { + "default_value": 60.0 + }, + "speed_wall": { + "value": "speed_print / 2" + }, + "speed_topbottom": { + "value": "round(speed_print * 0.58,1)" + }, + "speed_support": { + "value": "round(speed_print*0.96,1)" + } + } +} \ No newline at end of file diff --git a/resources/definitions/weedo_me40.def.json b/resources/definitions/weedo_me40.def.json new file mode 100644 index 0000000000..d89c4bb590 --- /dev/null +++ b/resources/definitions/weedo_me40.def.json @@ -0,0 +1,57 @@ +{ + "name": "WEEDO ME40", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO ME40" + }, + "machine_start_gcode": { + "default_value": ";MachineType:WEEDO ME40\n\n;(**** start.gcode for ME40****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "material_print_temp_prepend": { + "default_value": false + }, + "machine_width": { + "default_value": 300 + }, + "machine_depth": { + "default_value": 300 + }, + "machine_height": { + "default_value": 400 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_extruder_count": { + "default_value": 1 + }, + "speed_print": { + "default_value": 60.0 + }, + "speed_wall": { + "value": "speed_print / 2" + }, + "speed_topbottom": { + "value": "round(speed_print * 0.58,1)" + }, + "speed_support": { + "value": "round(speed_print*0.96,1)" + } + } +} \ No newline at end of file diff --git a/resources/definitions/weedo_me40_lite.def.json b/resources/definitions/weedo_me40_lite.def.json new file mode 100644 index 0000000000..50c1afd1ae --- /dev/null +++ b/resources/definitions/weedo_me40_lite.def.json @@ -0,0 +1,60 @@ +{ + "name": "WEEDO ME40 Lite", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO ME40 Lite" + }, + "machine_start_gcode": { + "default_value": ";MachineType:WEEDO ME40 Lite\n\n;(**** start.gcode for ME40 Lite****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "material_print_temp_prepend": { + "default_value": false + }, + "machine_width": { + "default_value": 300 + }, + "machine_depth": { + "default_value": 300 + }, + "machine_height": { + "default_value": 400 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_extruder_count": { + "default_value": 1 + }, + "material_bed_temperature": { + "value": 55 + }, + "speed_print": { + "default_value": 60.0 + }, + "speed_wall": { + "value": "speed_print / 2" + }, + "speed_topbottom": { + "value": "round(speed_print * 0.58,1)" + }, + "speed_support": { + "value": "round(speed_print*0.96,1)" + } + } +} \ No newline at end of file diff --git a/resources/definitions/weedo_tina2.def.json b/resources/definitions/weedo_tina2.def.json new file mode 100644 index 0000000000..ea04f9402c --- /dev/null +++ b/resources/definitions/weedo_tina2.def.json @@ -0,0 +1,90 @@ +{ + "name": "WEEDO TINA2", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO TINA2" + }, + "machine_start_gcode": { + "default_value": ";MachineType:WEEDO TINA2\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" + }, + "material_print_temp_prepend": { + "default_value": false + }, + "machine_width": { + "default_value": 100 + }, + "machine_depth": { + "default_value": 120 + }, + "machine_height": { + "default_value": 100 + }, + "machine_heated_bed": { + "default_value": false + }, + "machine_extruder_count": { + "default_value": 1 + }, + "infill_pattern": { + "value": "'lines' if infill_sparse_density > 45 else 'grid'" + }, + "speed_print": { + "value": 40.0 + }, + "speed_infill": { + "value": 40.0 + }, + "speed_wall": { + "value": 25.0 + }, + "speed_wall_0": { + "value": 20.0 + }, + "speed_wall_x": { + "value": 25.0 + }, + "speed_topbottom": { + "value": 30.0 + }, + "speed_support_infill": { + "value": 45.0 + }, + "speed_print_layer_0": { + "value": 22.0 + }, + "speed_travel_layer_0": { + "value": 60 + }, + "speed_travel": { + "value": 65.0 + }, + "speed_support_roof": { + "value": 30.0 + }, + "speed_support_bottom": { + "dvalue": 30.0 + }, + "speed_roofing": { + "value": 25.0 + }, + "raft_base_thickness": { + "default_value": 0.35 + } + } +} \ No newline at end of file diff --git a/resources/definitions/weedo_tina2s.def.json b/resources/definitions/weedo_tina2s.def.json new file mode 100644 index 0000000000..6589379119 --- /dev/null +++ b/resources/definitions/weedo_tina2s.def.json @@ -0,0 +1,90 @@ +{ + "name": "WEEDO TINA2S", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO TINA2S" + }, + "machine_start_gcode": { + "default_value": ";MachineType:WEEDO TINA2S\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" + }, + "material_print_temp_prepend": { + "default_value": false + }, + "machine_width": { + "default_value": 100 + }, + "machine_depth": { + "default_value": 110 + }, + "machine_height": { + "default_value": 100 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_extruder_count": { + "default_value": 1 + }, + "material_bed_temperature": { + "value": 50 + }, + "speed_print": { + "value": 40.0 + }, + "speed_infill": { + "value": 40.0 + }, + "speed_wall": { + "value": 25.0 + }, + "speed_wall_0": { + "value": 20.0 + }, + "speed_wall_x": { + "value": 25.0 + }, + "speed_topbottom": { + "value": 30.0 + }, + "speed_support_infill": { + "value": 45.0 + }, + "speed_print_layer_0": { + "value": 22.0 + }, + "speed_travel_layer_0": { + "value": 60 + }, + "speed_travel": { + "value": 65.0 + }, + "speed_support_roof": { + "value": 30.0 + }, + "speed_support_bottom": { + "dvalue": 30.0 + }, + "speed_roofing": { + "value": 25.0 + }, + "raft_base_thickness": { + "default_value": 0.35 + } + } +} \ No newline at end of file diff --git a/resources/definitions/weedo_x40v3.def.json b/resources/definitions/weedo_x40v3.def.json new file mode 100644 index 0000000000..9de2364e1b --- /dev/null +++ b/resources/definitions/weedo_x40v3.def.json @@ -0,0 +1,85 @@ +{ + "name": "WEEDO X40 V3+", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "machine_extruder_trains": { + "0": "weedo_x40v3_extruder_left", + "1": "weedo_x40v3_extruder_right" + }, + "platform_offset": [ + 0, + 0, + 0 + ] + }, + "overrides": { + "machine_name": { + "default_value": "WEEDO X40 V3" + }, + "machine_start_gcode": { + "default_value": ";MachineType:WEEDO X40\n\n;(**** start.gcode for X40 ****)\nM203 Z15\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG28 ;This command will use tool0 to get the x endstop and setup coordinate system\nG29 ;Auto level\nM107 P0 ;Turn off fan\nM107 P1\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 X-47 F3000\nG1 Z20 F600\nT{initial_extruder_nr} S ;Set start extruder nr after G28\nM109 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG92 E0\nG1 E22 F300\nG92 E0\nM203 Z2" + }, + "machine_end_gcode": { + "default_value": ";(*********end X40 End.gcode*******)\nM203 Z15\nM605 S1 ;Set to auto-park\nG28 X F3000\nG91 ; Relative positioning\nG1 E-1 ; Reduce filament pressure\nG90\nG1 Y300 F3000\nM104 S0 T0\nM104 S0 T1\nM140 S0\nM107 P0\nM107 P1\nM82" + }, + "material_print_temp_prepend": { + "default_value": false + }, + "machine_width": { + "default_value": 300 + }, + "machine_depth": { + "default_value": 300 + }, + "machine_height": { + "default_value": 400 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_always_write_active_tool": { + "default_value": true + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_nozzle_heat_up_speed": { + "default_value": 1.7 + }, + "material_standby_temperature": { + "value": "material_print_temperature-20" + }, + "speed_print": { + "default_value": 60.0 + }, + "speed_wall": { + "value": "speed_print / 2" + }, + "speed_topbottom": { + "value": "round(speed_print * 0.58,1)" + }, + "speed_support": { + "value": "round(speed_print*0.96,1)" + }, + "switch_extruder_retraction_amount": { + "value": 0 + }, + "adhesion_type": { + "default_value": "brim" + }, + "ooze_shield_enabled": { + "default_value": true + }, + "ooze_shield_angle": { + "default_value": 0 + }, + "ooze_shield_dist": { + "default_value": 3.0 + } + } +} \ No newline at end of file diff --git a/resources/extruders/weedo_base_extruder_0.def.json b/resources/extruders/weedo_base_extruder_0.def.json new file mode 100644 index 0000000000..a41f999dc2 --- /dev/null +++ b/resources/extruders/weedo_base_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "id": "weedo_base_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "weedo_base", + "position": "0" + }, + + "overrides": { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} diff --git a/resources/extruders/weedo_m_extruder_left.def.json b/resources/extruders/weedo_m_extruder_left.def.json new file mode 100644 index 0000000000..82fa372826 --- /dev/null +++ b/resources/extruders/weedo_m_extruder_left.def.json @@ -0,0 +1,22 @@ +{ + "id": "weedo_m_extruder_left", + "version": 2, + "name": "Extruder Left", + "inherits": "fdmextruder", + "metadata": { + "machine": "weedo_base", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_extruder_cooling_fan_number": {"default_value": 0} + } +} diff --git a/resources/extruders/weedo_m_extruder_right.def.json b/resources/extruders/weedo_m_extruder_right.def.json new file mode 100644 index 0000000000..f7bf2ca77c --- /dev/null +++ b/resources/extruders/weedo_m_extruder_right.def.json @@ -0,0 +1,22 @@ +{ + "id": "weedo_m_extruder_right", + "version": 2, + "name": "Extruder Right", + "inherits": "fdmextruder", + "metadata": { + "machine": "weedo_base", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_extruder_cooling_fan_number": {"default_value": 1} + } +} diff --git a/resources/extruders/weedo_x40v3_extruder_left.def.json b/resources/extruders/weedo_x40v3_extruder_left.def.json new file mode 100644 index 0000000000..ae25fa4d2a --- /dev/null +++ b/resources/extruders/weedo_x40v3_extruder_left.def.json @@ -0,0 +1,24 @@ +{ + "id": "weedo_x40v3_extruder_left", + "version": 2, + "name": "Extruder Left", + "inherits": "fdmextruder", + "metadata": { + "machine": "weedo_x40v3", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_extruder_cooling_fan_number": {"default_value": 0}, + "machine_extruder_start_code":{ "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, + "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X-47 F3000\n"} + } +} diff --git a/resources/extruders/weedo_x40v3_extruder_right.def.json b/resources/extruders/weedo_x40v3_extruder_right.def.json new file mode 100644 index 0000000000..5e42a5902b --- /dev/null +++ b/resources/extruders/weedo_x40v3_extruder_right.def.json @@ -0,0 +1,24 @@ +{ + "id": "weedo_x40v3_extruder_right", + "version": 2, + "name": "Extruder Right", + "inherits": "fdmextruder", + "metadata": { + "machine": "weedo_x40v3", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_extruder_cooling_fan_number": {"default_value": 1}, + "machine_extruder_start_code":{ "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, + "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X353.7 F3000\n"} + } +} From c2253ebac1b31a9ec9090b6d61362a959464d268 Mon Sep 17 00:00:00 2001 From: mao Date: Tue, 6 Sep 2022 14:00:09 +0800 Subject: [PATCH 02/43] Update WEEDO machine profiles Update settings and delete unnecessary settings. --- resources/definitions/weedo_base.def.json | 335 +++++++++--------- resources/definitions/weedo_f150s.def.json | 14 +- resources/definitions/weedo_f152s.def.json | 11 +- resources/definitions/weedo_f370.def.json | 11 +- resources/definitions/weedo_hephi3s.def.json | 11 +- resources/definitions/weedo_me40.def.json | 13 +- .../definitions/weedo_me40_lite.def.json | 14 +- resources/definitions/weedo_tina2.def.json | 166 ++++++++- resources/definitions/weedo_tina2s.def.json | 170 ++++++++- resources/definitions/weedo_x40v3.def.json | 5 +- .../extruders/weedo_base_extruder_0.def.json | 1 - .../extruders/weedo_m_extruder_left.def.json | 22 -- .../extruders/weedo_m_extruder_right.def.json | 22 -- .../weedo_x40v3_extruder_left.def.json | 1 - .../weedo_x40v3_extruder_right.def.json | 1 - 15 files changed, 496 insertions(+), 301 deletions(-) delete mode 100644 resources/extruders/weedo_m_extruder_left.def.json delete mode 100644 resources/extruders/weedo_m_extruder_right.def.json diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index a3738411f9..095f54f2f6 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -15,7 +15,157 @@ "has_variants": false, "has_machine_quality": false, "preferred_quality_type": "draft", - "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", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_pc_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "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", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "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", + "volumic_support_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": { @@ -36,51 +186,24 @@ "material_print_temp_wait": { "default_value": false }, - "material_print_temp_prepend": { - "default_value": true - }, - "material_bed_temp_prepend": { - "default_value": true - }, - "machine_width": { - "default_value": 200.0 - }, - "machine_depth": { - "default_value": 150.0 - }, - "machine_height": { - "default_value": 150.0 - }, "machine_heated_bed": { "default_value": true }, - "machine_always_write_active_tool": { - "default_value": false - }, "machine_center_is_zero": { "default_value": false }, - "machine_extruder_count": { - "default_value": 1 - }, "machine_nozzle_tip_outer_diameter": { - "default_value": 1 + "default_value": 0.8 }, "machine_nozzle_heat_up_speed": { "default_value": 1.8 }, "machine_nozzle_cool_down_speed": { - "default_value": 2.0 + "default_value": 0.67 }, "machine_min_cool_heat_time_window": { "default_value": 1200.0 }, - "machine_gcode_flavor": { - "default_value": "RepRap (Marlin/Sprinter)" - }, - "machine_nozzle_size": { - "default_value": 0.4 - }, "machine_max_feedrate_x": { "default_value": 200 }, @@ -117,53 +240,20 @@ "machine_max_jerk_e": { "default_value": 5.0 }, - "layer_height_0": { - "default_value": 0.3 - }, - "line_width": { - "default_value": 0.4 - }, "infill_line_width": { "value": "line_width*1.25" }, "initial_layer_line_width_factor": { - "default_value": 100.0 - }, - "wall_thickness": { - "default_value": 0.8 + "default_value": 110.0 }, "wall_0_wipe_dist": { "value": 0.0 }, - "wall_0_inset": { - "value": 0.0 - }, - "optimize_wall_printing_order": { - "default_value": false - }, - "inset_direction": { - "default_value": "inside_out" - }, - "roofing_layer_count": { - "default_value": 0 - }, - "z_seam_type": { - "default_value": "sharpest_corner" - }, - "z_seam_x": { - "default_value": 100.0 - }, - "z_seam_y": { - "default_value": 400.0 - }, "z_seam_corner": { - "default_value": "z_seam_corner_weighted" - }, - "z_seam_relative": { - "default_value": false + "default_value": "z_seam_corner_any" }, "skin_outline_count": { - "default_value": 0 + "value": "0" }, "infill_sparse_density": { "default_value": 10.0 @@ -174,14 +264,11 @@ "infill_before_walls": { "default_value": false }, - "default_material_print_temperature": { - "default_value": 200.0 - }, "material_print_temperature": { - "default_value": 200.0 + "maximum_value": "300" }, "material_print_temperature_layer_0": { - "value": "material_print_temperature+15" + "value": "min(material_print_temperature+10,300)" }, "material_initial_print_temperature": { "value": "material_print_temperature" @@ -189,14 +276,8 @@ "material_final_print_temperature": { "value": "material_print_temperature" }, - "default_material_bed_temperature": { - "default_value": 60.0 - }, "material_bed_temperature": { - "value": 60.0 - }, - "material_bed_temperature_layer_0": { - "value": "material_bed_temperature" + "maximum_value_warning": "96" }, "material_flow": { "default_value": 95.0 @@ -205,10 +286,10 @@ "default_value": 95.0 }, "infill_material_flow": { - "value": "material_flow-5" + "value": "max(0,material_flow-5)" }, "support_material_flow": { - "value": "material_flow-5" + "value": "max(0,material_flow-5)" }, "speed_print": { "default_value": 70.0 @@ -255,12 +336,6 @@ "skirt_brim_speed": { "value": 26.0 }, - "retraction_enable": { - "default_value": true - }, - "retract_at_layer_change": { - "default_value": false - }, "retraction_amount": { "default_value": 3 }, @@ -270,9 +345,6 @@ "retraction_min_travel": { "default_value": 0.8 }, - "retraction_count_max": { - "default_value": 90 - }, "retraction_extrusion_window": { "value": 1.0 }, @@ -286,50 +358,23 @@ "default_value": 28.0 }, "retraction_combing": { - "default_value": "off" - }, - "retraction_hop_enabled": { - "default_value": false - }, - "retraction_hop_only_when_collides": { - "default_value": false - }, - "retraction_hop": { - "default_value": 0.0 + "value": "off" }, "retraction_hop_after_extruder_switch": { "default_value": false }, - "cool_fan_enabled": { - "default_value": true - }, - "support_enable": { - "default_value": false - }, - "support_type": { - "default_value": "everywhere" - }, "support_angle": { "default_value": 60.0 }, "support_pattern": { "default_value": "zigzag" }, - "support_wall_count": { - "default_value": 0 - }, "support_connect_zigzags": { "default_value": false }, - "support_infill_rate": { - "default_value": 15.0 - }, "support_z_distance": { "default_value": 0.2 }, - "support_xy_distance": { - "default_value": 0.7 - }, "support_interface_enable": { "default_value": true }, @@ -348,15 +393,6 @@ "skirt_line_count": { "default_value": 2 }, - "skirt_gap": { - "default_value": 3.0 - }, - "brim_width": { - "default_value": 8.0 - }, - "brim_line_count": { - "default_value": 20 - }, "raft_margin": { "default_value": 8.0 }, @@ -366,36 +402,18 @@ "layer_0_z_overlap": { "value": 0.09 }, - "raft_surface_layers": { - "default_value": 2 - }, "raft_surface_thickness": { "value": 0.25 }, - "raft_surface_line_width": { - "value": 0.4 - }, - "raft_surface_line_spacing": { - "value": "raft_surface_line_width" - }, "raft_interface_thickness": { "value": 0.27 }, "raft_interface_line_width": { "value": 0.7 }, - "raft_interface_line_spacing": { - "value": "raft_interface_line_width + 0.2" - }, "raft_base_thickness": { "value": 0.3 }, - "raft_base_line_width": { - "value": "machine_nozzle_size * 2" - }, - "raft_base_line_spacing": { - "value": "raft_base_line_width * 2" - }, "raft_surface_speed": { "value": 40.0 }, @@ -406,7 +424,7 @@ "value": 20.0 }, "raft_surface_fan_speed": { - "value": 100.0 + "value": "100.0 if cool_fan_enabled else 0.0" }, "raft_interface_fan_speed": { "value": 0.0 @@ -414,39 +432,12 @@ "raft_base_fan_speed": { "value": 0.0 }, - "prime_tower_enable": { - "default_value": false - }, "prime_tower_size": { "default_value": 15.0 }, "prime_tower_min_volume": { "default_value": 10.0 }, - "prime_tower_position_x": { - "default_value": 200.0 - }, - "prime_tower_position_y": { - "default_value": 200.0 - }, - "prime_tower_flow": { - "default_value": 100.0 - }, - "ooze_shield_enabled": { - "default_value": false - }, - "ooze_shield_angle": { - "default_value": 60.0 - }, - "ooze_shield_dist": { - "default_value": 2.0 - }, - "roofing_line_width": { - "default_value": 0.4 - }, - "draft_shield_enabled": { - "default_value": false - }, "draft_shield_dist": { "default_value": 3 }, diff --git a/resources/definitions/weedo_f150s.def.json b/resources/definitions/weedo_f150s.def.json index 5078beb023..fc7660824d 100644 --- a/resources/definitions/weedo_f150s.def.json +++ b/resources/definitions/weedo_f150s.def.json @@ -18,14 +18,11 @@ "default_value": "WEEDO F150S" }, "machine_start_gcode": { - "default_value": ";MachineType:WEEDO F150S\n\n;(**** start.gcode for (150S)****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z140 F300\nG28 Z\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z5" + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for (150S)****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z140 F300\nG28 Z\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z5" }, "machine_end_gcode": { "default_value": ";(**** end.gcode for 150s****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680 ; Reduce filament pressure\nG28 Z F1500; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, - "material_print_temp_prepend": { - "default_value": false - }, "machine_width": { "default_value": 200 }, @@ -35,14 +32,9 @@ "machine_height": { "default_value": 150 }, - "machine_heated_bed": { - "default_value": true - }, - "machine_extruder_count": { - "default_value": 1 - }, "material_bed_temperature": { - "value": 35 + "maximum_value_warning": "70", + "maximum_value": "90" }, "retraction_amount": { "default_value": 1.2 diff --git a/resources/definitions/weedo_f152s.def.json b/resources/definitions/weedo_f152s.def.json index 77390fcdba..9ecbbafb3b 100644 --- a/resources/definitions/weedo_f152s.def.json +++ b/resources/definitions/weedo_f152s.def.json @@ -18,14 +18,11 @@ "default_value": "WEEDO F152S" }, "machine_start_gcode": { - "default_value": ";MachineType:WEEDO F152S\n\n;(**** start.gcode for F152S ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z5" + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for F152S ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z5" }, "machine_end_gcode": { "default_value": ";(**** end.gcode for F152S****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, - "material_print_temp_prepend": { - "default_value": false - }, "machine_width": { "default_value": 200 }, @@ -35,12 +32,6 @@ "machine_height": { "default_value": 195 }, - "machine_heated_bed": { - "default_value": true - }, - "machine_extruder_count": { - "default_value": 1 - }, "retraction_amount": { "default_value": 1.2 } diff --git a/resources/definitions/weedo_f370.def.json b/resources/definitions/weedo_f370.def.json index ede3244afa..e2e8a9b3ed 100644 --- a/resources/definitions/weedo_f370.def.json +++ b/resources/definitions/weedo_f370.def.json @@ -18,14 +18,11 @@ "default_value": "WEEDO F370" }, "machine_start_gcode": { - "default_value": ";MachineType:WEEDO F370\n\n;(**** start.gcode for 370 ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z2" + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for 370 ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z2" }, "machine_end_gcode": { "default_value": ";(**** end.gcode for F370****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, - "material_print_temp_prepend": { - "default_value": false - }, "machine_width": { "default_value": 310 }, @@ -35,12 +32,6 @@ "machine_height": { "default_value": 370 }, - "machine_heated_bed": { - "default_value": true - }, - "machine_extruder_count": { - "default_value": 1 - }, "retraction_amount": { "default_value": 1.2 } diff --git a/resources/definitions/weedo_hephi3s.def.json b/resources/definitions/weedo_hephi3s.def.json index fdc0bb9530..2f8af0ac7f 100644 --- a/resources/definitions/weedo_hephi3s.def.json +++ b/resources/definitions/weedo_hephi3s.def.json @@ -18,14 +18,11 @@ "default_value": "WEEDO hephi3s" }, "machine_start_gcode": { - "default_value": ";MachineType:WEEDO hephi3s\n\n;(**** start.gcode for hephi3****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15 F1000\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for hephi3****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15 F1000\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" }, "machine_end_gcode": { "default_value": ";(**** end.gcode for hephi3****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, - "material_print_temp_prepend": { - "default_value": false - }, "machine_width": { "default_value": 220 }, @@ -35,12 +32,6 @@ "machine_height": { "default_value": 250 }, - "machine_heated_bed": { - "default_value": true - }, - "machine_extruder_count": { - "default_value": 1 - }, "speed_print": { "default_value": 60.0 }, diff --git a/resources/definitions/weedo_me40.def.json b/resources/definitions/weedo_me40.def.json index d89c4bb590..0a5fe37017 100644 --- a/resources/definitions/weedo_me40.def.json +++ b/resources/definitions/weedo_me40.def.json @@ -18,13 +18,10 @@ "default_value": "WEEDO ME40" }, "machine_start_gcode": { - "default_value": ";MachineType:WEEDO ME40\n\n;(**** start.gcode for ME40****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" }, "machine_end_gcode": { - "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "material_print_temp_prepend": { - "default_value": false + "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y150 F3000\nG28 Z\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, "machine_width": { "default_value": 300 @@ -35,12 +32,6 @@ "machine_height": { "default_value": 400 }, - "machine_heated_bed": { - "default_value": true - }, - "machine_extruder_count": { - "default_value": 1 - }, "speed_print": { "default_value": 60.0 }, diff --git a/resources/definitions/weedo_me40_lite.def.json b/resources/definitions/weedo_me40_lite.def.json index 50c1afd1ae..e1e14fcd2f 100644 --- a/resources/definitions/weedo_me40_lite.def.json +++ b/resources/definitions/weedo_me40_lite.def.json @@ -18,14 +18,11 @@ "default_value": "WEEDO ME40 Lite" }, "machine_start_gcode": { - "default_value": ";MachineType:WEEDO ME40 Lite\n\n;(**** start.gcode for ME40 Lite****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40 Lite****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" }, "machine_end_gcode": { "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, - "material_print_temp_prepend": { - "default_value": false - }, "machine_width": { "default_value": 300 }, @@ -35,14 +32,9 @@ "machine_height": { "default_value": 400 }, - "machine_heated_bed": { - "default_value": true - }, - "machine_extruder_count": { - "default_value": 1 - }, "material_bed_temperature": { - "value": 55 + "maximum_value_warning": "70", + "maximum_value": "90" }, "speed_print": { "default_value": 60.0 diff --git a/resources/definitions/weedo_tina2.def.json b/resources/definitions/weedo_tina2.def.json index ea04f9402c..46feeb39f8 100644 --- a/resources/definitions/weedo_tina2.def.json +++ b/resources/definitions/weedo_tina2.def.json @@ -11,6 +11,164 @@ 0, 0, 0 + ], + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_abs_175", + "generic_asa_175", + "generic_bvoh_175", + "generic_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "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", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "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", + "volumic_support_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": { @@ -18,14 +176,11 @@ "default_value": "WEEDO TINA2" }, "machine_start_gcode": { - "default_value": ";MachineType:WEEDO TINA2\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" }, "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" }, - "material_print_temp_prepend": { - "default_value": false - }, "machine_width": { "default_value": 100 }, @@ -38,9 +193,6 @@ "machine_heated_bed": { "default_value": false }, - "machine_extruder_count": { - "default_value": 1 - }, "infill_pattern": { "value": "'lines' if infill_sparse_density > 45 else 'grid'" }, diff --git a/resources/definitions/weedo_tina2s.def.json b/resources/definitions/weedo_tina2s.def.json index 6589379119..ed97a58edd 100644 --- a/resources/definitions/weedo_tina2s.def.json +++ b/resources/definitions/weedo_tina2s.def.json @@ -11,6 +11,162 @@ 0, 0, 0 + ], + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_abs_175", + "generic_asa_175", + "generic_cpe_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "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", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "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", + "volumic_support_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": { @@ -18,14 +174,11 @@ "default_value": "WEEDO TINA2S" }, "machine_start_gcode": { - "default_value": ";MachineType:WEEDO TINA2S\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" }, "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" }, - "material_print_temp_prepend": { - "default_value": false - }, "machine_width": { "default_value": 100 }, @@ -35,14 +188,9 @@ "machine_height": { "default_value": 100 }, - "machine_heated_bed": { - "default_value": true - }, - "machine_extruder_count": { - "default_value": 1 - }, "material_bed_temperature": { - "value": 50 + "maximum_value_warning": "60", + "maximum_value": "65" }, "speed_print": { "value": 40.0 diff --git a/resources/definitions/weedo_x40v3.def.json b/resources/definitions/weedo_x40v3.def.json index 9de2364e1b..44c22668bf 100644 --- a/resources/definitions/weedo_x40v3.def.json +++ b/resources/definitions/weedo_x40v3.def.json @@ -22,7 +22,7 @@ "default_value": "WEEDO X40 V3" }, "machine_start_gcode": { - "default_value": ";MachineType:WEEDO X40\n\n;(**** start.gcode for X40 ****)\nM203 Z15\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG28 ;This command will use tool0 to get the x endstop and setup coordinate system\nG29 ;Auto level\nM107 P0 ;Turn off fan\nM107 P1\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 X-47 F3000\nG1 Z20 F600\nT{initial_extruder_nr} S ;Set start extruder nr after G28\nM109 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG92 E0\nG1 E22 F300\nG92 E0\nM203 Z2" + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for X40 ****)\nM203 Z15\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG28 ;This command will use tool0 to get the x endstop and setup coordinate system\nG29 ;Auto level\nM107 P0 ;Turn off fan\nM107 P1\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 X-47 F3000\nG1 Z20 F600\nT{initial_extruder_nr} S ;Set start extruder nr after G28\nM109 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG92 E0\nG1 E22 F300\nG92 E0\nM203 Z2" }, "machine_end_gcode": { "default_value": ";(*********end X40 End.gcode*******)\nM203 Z15\nM605 S1 ;Set to auto-park\nG28 X F3000\nG91 ; Relative positioning\nG1 E-1 ; Reduce filament pressure\nG90\nG1 Y300 F3000\nM104 S0 T0\nM104 S0 T1\nM140 S0\nM107 P0\nM107 P1\nM82" @@ -54,6 +54,9 @@ "material_standby_temperature": { "value": "material_print_temperature-20" }, + "retraction_amount": { + "default_value": 4 + }, "speed_print": { "default_value": 60.0 }, diff --git a/resources/extruders/weedo_base_extruder_0.def.json b/resources/extruders/weedo_base_extruder_0.def.json index a41f999dc2..0cb088acdd 100644 --- a/resources/extruders/weedo_base_extruder_0.def.json +++ b/resources/extruders/weedo_base_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "weedo_base_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", diff --git a/resources/extruders/weedo_m_extruder_left.def.json b/resources/extruders/weedo_m_extruder_left.def.json deleted file mode 100644 index 82fa372826..0000000000 --- a/resources/extruders/weedo_m_extruder_left.def.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "weedo_m_extruder_left", - "version": 2, - "name": "Extruder Left", - "inherits": "fdmextruder", - "metadata": { - "machine": "weedo_base", - "position": "0" - }, - - "overrides": { - "extruder_nr": { - "default_value": 0, - "maximum_value": "1" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_cooling_fan_number": {"default_value": 0} - } -} diff --git a/resources/extruders/weedo_m_extruder_right.def.json b/resources/extruders/weedo_m_extruder_right.def.json deleted file mode 100644 index f7bf2ca77c..0000000000 --- a/resources/extruders/weedo_m_extruder_right.def.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "id": "weedo_m_extruder_right", - "version": 2, - "name": "Extruder Right", - "inherits": "fdmextruder", - "metadata": { - "machine": "weedo_base", - "position": "1" - }, - - "overrides": { - "extruder_nr": { - "default_value": 1, - "maximum_value": "1" - }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_cooling_fan_number": {"default_value": 1} - } -} diff --git a/resources/extruders/weedo_x40v3_extruder_left.def.json b/resources/extruders/weedo_x40v3_extruder_left.def.json index ae25fa4d2a..dc1de46bc6 100644 --- a/resources/extruders/weedo_x40v3_extruder_left.def.json +++ b/resources/extruders/weedo_x40v3_extruder_left.def.json @@ -1,5 +1,4 @@ { - "id": "weedo_x40v3_extruder_left", "version": 2, "name": "Extruder Left", "inherits": "fdmextruder", diff --git a/resources/extruders/weedo_x40v3_extruder_right.def.json b/resources/extruders/weedo_x40v3_extruder_right.def.json index 5e42a5902b..41e74a5009 100644 --- a/resources/extruders/weedo_x40v3_extruder_right.def.json +++ b/resources/extruders/weedo_x40v3_extruder_right.def.json @@ -1,5 +1,4 @@ { - "id": "weedo_x40v3_extruder_right", "version": 2, "name": "Extruder Right", "inherits": "fdmextruder", From d216af7ecca0bb9e19dc424202d42970c7974600 Mon Sep 17 00:00:00 2001 From: mao Date: Mon, 19 Sep 2022 14:25:27 +0800 Subject: [PATCH 03/43] Update settings and JSON format. Use 4 spaces instead of 2 for indentation, remove the redundant settings, and add spacing to the formulas. --- resources/definitions/weedo_base.def.json | 875 +++++++++--------- resources/definitions/weedo_f150s.def.json | 78 +- resources/definitions/weedo_f152s.def.json | 70 +- resources/definitions/weedo_f370.def.json | 70 +- resources/definitions/weedo_hephi3s.def.json | 88 +- resources/definitions/weedo_me40.def.json | 88 +- .../definitions/weedo_me40_lite.def.json | 96 +- resources/definitions/weedo_tina2.def.json | 476 +++++----- resources/definitions/weedo_tina2s.def.json | 468 +++++----- resources/definitions/weedo_x40v3.def.json | 168 ++-- 10 files changed, 1231 insertions(+), 1246 deletions(-) diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index 095f54f2f6..3419c92d49 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -1,448 +1,433 @@ { - "version": 2, - "name": "WEEDO Base", - "inherits": "fdmprinter", - "metadata": { - "author": "WEEDO", - "manufacturer": "WEEDO", - "category": "WEEDO", - "visible": false, - "file_formats": "text/x-gcode", - "machine_extruder_trains": { - "0": "weedo_base_extruder_0" - }, - "has_materials": true, - "has_variants": false, - "has_machine_quality": false, - "preferred_quality_type": "draft", - "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", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_pc_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eryone_tpu", - "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", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "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", - "volumic_support_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": "WEEDO Base" - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_end_gcode": { - "default_value": "G92 E0\nG1 E-10 F1680 \nG28 Z F400; Get extruder out of way.\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n" - }, - "material_diameter": { - "default_value": 1.75 - }, - "material_bed_temp_wait": { - "default_value": false - }, - "material_print_temp_wait": { - "default_value": false - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_center_is_zero": { - "default_value": false - }, - "machine_nozzle_tip_outer_diameter": { - "default_value": 0.8 - }, - "machine_nozzle_heat_up_speed": { - "default_value": 1.8 - }, - "machine_nozzle_cool_down_speed": { - "default_value": 0.67 - }, - "machine_min_cool_heat_time_window": { - "default_value": 1200.0 - }, - "machine_max_feedrate_x": { - "default_value": 200 - }, - "machine_max_feedrate_y": { - "default_value": 130 - }, - "machine_max_feedrate_z": { - "default_value": 10 - }, - "machine_max_feedrate_e": { - "default_value": 50 - }, - "machine_max_acceleration_x": { - "default_value": 3000 - }, - "machine_max_acceleration_y": { - "default_value": 3000 - }, - "machine_max_acceleration_z": { - "default_value": 100 - }, - "machine_max_acceleration_e": { - "default_value": 200 - }, - "machine_acceleration": { - "default_value": 4000 - }, - "machine_max_jerk_xy": { - "default_value": 10.0 - }, - "machine_max_jerk_z": { - "default_value": 5 - }, - "machine_max_jerk_e": { - "default_value": 5.0 - }, - "infill_line_width": { - "value": "line_width*1.25" - }, - "initial_layer_line_width_factor": { - "default_value": 110.0 - }, - "wall_0_wipe_dist": { - "value": 0.0 - }, - "z_seam_corner": { - "default_value": "z_seam_corner_any" - }, - "skin_outline_count": { - "value": "0" - }, - "infill_sparse_density": { - "default_value": 10.0 - }, - "infill_pattern": { - "value": "'zigzag'" - }, - "infill_before_walls": { - "default_value": false - }, - "material_print_temperature": { - "maximum_value": "300" - }, - "material_print_temperature_layer_0": { - "value": "min(material_print_temperature+10,300)" - }, - "material_initial_print_temperature": { - "value": "material_print_temperature" - }, - "material_final_print_temperature": { - "value": "material_print_temperature" - }, - "material_bed_temperature": { - "maximum_value_warning": "96" - }, - "material_flow": { - "default_value": 95.0 - }, - "material_flow_layer_0": { - "default_value": 95.0 - }, - "infill_material_flow": { - "value": "max(0,material_flow-5)" - }, - "support_material_flow": { - "value": "max(0,material_flow-5)" - }, - "speed_print": { - "default_value": 70.0 - }, - "speed_infill": { - "default_value": 70.0 - }, - "speed_wall": { - "value": "max(5,round(speed_print / 2-5,1))" - }, - "speed_wall_0": { - "value": "max(5,speed_wall-5)" - }, - "speed_wall_x": { - "value": "speed_wall" - }, - "speed_topbottom": { - "value": "round(speed_print * 0.65,1)" - }, - "speed_support": { - "value": "round(speed_print*0.82,1)" - }, - "speed_support_infill": { - "value": "speed_support" - }, - "speed_support_interface": { - "value": "round(speed_support*0.689,1)" - }, - "speed_prime_tower": { - "value": "speed_support" - }, - "speed_travel": { - "value": 105.0 - }, - "speed_layer_0": { - "value": 26.0 - }, - "speed_print_layer_0": { - "value": 26.0 - }, - "speed_travel_layer_0": { - "value": 80.0 - }, - "skirt_brim_speed": { - "value": 26.0 - }, - "retraction_amount": { - "default_value": 3 - }, - "retraction_speed": { - "default_value": 28.0 - }, - "retraction_min_travel": { - "default_value": 0.8 - }, - "retraction_extrusion_window": { - "value": 1.0 - }, - "material_standby_temperature": { - "default_value": 175.0 - }, - "switch_extruder_retraction_amount": { - "value": 16.5 - }, - "switch_extruder_retraction_speeds": { - "default_value": 28.0 - }, - "retraction_combing": { - "value": "off" - }, - "retraction_hop_after_extruder_switch": { - "default_value": false - }, - "support_angle": { - "default_value": 60.0 - }, - "support_pattern": { - "default_value": "zigzag" - }, - "support_connect_zigzags": { - "default_value": false - }, - "support_z_distance": { - "default_value": 0.2 - }, - "support_interface_enable": { - "default_value": true - }, - "support_interface_density": { - "default_value": 60.0 - }, - "support_interface_height": { - "default_value": 0.8 - }, - "support_interface_pattern": { - "default_value": "lines" - }, - "adhesion_type": { - "default_value": "raft" - }, - "skirt_line_count": { - "default_value": 2 - }, - "raft_margin": { - "default_value": 8.0 - }, - "raft_airgap": { - "default_value": 0.19 - }, - "layer_0_z_overlap": { - "value": 0.09 - }, - "raft_surface_thickness": { - "value": 0.25 - }, - "raft_interface_thickness": { - "value": 0.27 - }, - "raft_interface_line_width": { - "value": 0.7 - }, - "raft_base_thickness": { - "value": 0.3 - }, - "raft_surface_speed": { - "value": 40.0 - }, - "raft_interface_speed": { - "value": 33.0 - }, - "raft_base_speed": { - "value": 20.0 - }, - "raft_surface_fan_speed": { - "value": "100.0 if cool_fan_enabled else 0.0" - }, - "raft_interface_fan_speed": { - "value": 0.0 - }, - "raft_base_fan_speed": { - "value": 0.0 - }, - "prime_tower_size": { - "default_value": 15.0 - }, - "prime_tower_min_volume": { - "default_value": 10.0 - }, - "draft_shield_dist": { - "default_value": 3 - }, - "top_skin_preshrink": { - "value": 0.0 + "version": 2, + "name": "WEEDO Base", + "inherits": "fdmprinter", + "metadata": { + "author": "WEEDO", + "manufacturer": "WEEDO", + "category": "WEEDO", + "visible": false, + "file_formats": "text/x-gcode", + "machine_extruder_trains": { + "0": "weedo_base_extruder_0" + }, + "has_materials": true, + "has_variants": false, + "has_machine_quality": false, + "preferred_quality_type": "draft", + "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", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_pc_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "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", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "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", + "volumic_support_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": "WEEDO Base" + }, + "machine_start_gcode": { + "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0" + }, + "machine_end_gcode": { + "default_value": "G92 E0\nG1 E-3 F1680 \nG28 Z F400; Get extruder out of way.\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n" + }, + "material_diameter": { + "default_value": 1.75 + }, + "material_bed_temp_wait": { + "default_value": false + }, + "material_print_temp_wait": { + "default_value": false + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_nozzle_tip_outer_diameter": { + "default_value": 0.8 + }, + "machine_nozzle_heat_up_speed": { + "default_value": 1.8 + }, + "machine_nozzle_cool_down_speed": { + "default_value": 0.67 + }, + "machine_min_cool_heat_time_window": { + "default_value": 1200.0 + }, + "machine_max_feedrate_x": { + "default_value": 200 + }, + "machine_max_feedrate_y": { + "default_value": 130 + }, + "machine_max_feedrate_z": { + "default_value": 10 + }, + "machine_max_feedrate_e": { + "default_value": 50 + }, + "machine_max_acceleration_x": { + "default_value": 3000 + }, + "machine_max_acceleration_y": { + "default_value": 3000 + }, + "machine_max_acceleration_z": { + "default_value": 120 + }, + "machine_max_acceleration_e": { + "default_value": 1600 + }, + "machine_acceleration": { + "default_value": 3000 + }, + "machine_max_jerk_xy": { + "default_value": 10.0 + }, + "machine_max_jerk_z": { + "default_value": 5 + }, + "machine_max_jerk_e": { + "default_value": 5.1 + }, + "infill_line_width": { + "value": "line_width * 1.25" + }, + "initial_layer_line_width_factor": { + "default_value": 110.0 + }, + "wall_0_wipe_dist": { + "value": 0.0 + }, + "z_seam_corner": { + "default_value": "z_seam_corner_any" + }, + "skin_outline_count": { + "value": "0" + }, + "infill_sparse_density": { + "default_value": 10.0 + }, + "infill_pattern": { + "value": "'zigzag'" + }, + "infill_before_walls": { + "default_value": false + }, + "material_print_temperature": { + "maximum_value": "300" + }, + "material_print_temperature_layer_0": { + "value": "min(material_print_temperature + 10, 300)" + }, + "material_initial_print_temperature": { + "value": "material_print_temperature" + }, + "material_final_print_temperature": { + "value": "material_print_temperature" + }, + "material_bed_temperature": { + "maximum_value_warning": "96" + }, + "material_flow": { + "default_value": 95.0 + }, + "material_flow_layer_0": { + "default_value": 95.0 + }, + "infill_material_flow": { + "value": "max(0, material_flow - 5)" + }, + "support_material_flow": { + "value": "max(0, material_flow - 5)" + }, + "speed_print": { + "default_value": 70.0 + }, + "speed_wall": { + "value": "max(5, round(speed_print / 2 - 5, 1))" + }, + "speed_wall_0": { + "value": "max(5, speed_wall - 5)" + }, + "speed_wall_x": { + "value": "speed_wall" + }, + "speed_topbottom": { + "value": "round(speed_print * 0.65, 1)" + }, + "speed_support": { + "value": "round(speed_print * 0.82, 1)" + }, + "speed_support_interface": { + "value": "round(speed_support * 0.689, 1)" + }, + "speed_prime_tower": { + "value": "speed_support" + }, + "speed_travel": { + "value": 105.0 + }, + "speed_layer_0": { + "value": 26.0 + }, + "speed_travel_layer_0": { + "value": 80.0 + }, + "skirt_brim_speed": { + "value": 26.0 + }, + "retraction_amount": { + "default_value": 3 + }, + "retraction_speed": { + "default_value": 28.0 + }, + "retraction_min_travel": { + "default_value": 0.8 + }, + "retraction_extrusion_window": { + "value": 1.0 + }, + "material_standby_temperature": { + "default_value": 175.0 + }, + "switch_extruder_retraction_amount": { + "value": 16.5 + }, + "switch_extruder_retraction_speeds": { + "default_value": 28.0 + }, + "retraction_combing": { + "value": "off" + }, + "retraction_hop_after_extruder_switch": { + "default_value": false + }, + "support_angle": { + "default_value": 60.0 + }, + "support_connect_zigzags": { + "default_value": false + }, + "support_z_distance": { + "default_value": 0.18 + }, + "support_interface_enable": { + "default_value": true + }, + "support_interface_density": { + "default_value": 60.0 + }, + "support_interface_height": { + "default_value": 0.8 + }, + "support_interface_pattern": { + "default_value": "lines" + }, + "adhesion_type": { + "default_value": "raft" + }, + "skirt_line_count": { + "default_value": 2 + }, + "raft_margin": { + "default_value": 8.0 + }, + "raft_airgap": { + "default_value": 0.19 + }, + "layer_0_z_overlap": { + "value": 0.09 + }, + "raft_surface_thickness": { + "value": 0.25 + }, + "raft_interface_thickness": { + "value": 0.27 + }, + "raft_interface_line_width": { + "value": 0.7 + }, + "raft_base_thickness": { + "value": 0.3 + }, + "raft_surface_speed": { + "value": 40.0 + }, + "raft_interface_speed": { + "value": 33.0 + }, + "raft_base_speed": { + "value": 20.0 + }, + "raft_surface_fan_speed": { + "value": "100.0 if cool_fan_enabled else 0.0" + }, + "raft_interface_fan_speed": { + "value": 0.0 + }, + "raft_base_fan_speed": { + "value": 0.0 + }, + "prime_tower_size": { + "default_value": 15.0 + }, + "prime_tower_min_volume": { + "default_value": 10.0 + }, + "draft_shield_dist": { + "default_value": 3 + }, + "top_skin_preshrink": { + "value": 0.0 + } } - } } \ No newline at end of file diff --git a/resources/definitions/weedo_f150s.def.json b/resources/definitions/weedo_f150s.def.json index fc7660824d..91b823277f 100644 --- a/resources/definitions/weedo_f150s.def.json +++ b/resources/definitions/weedo_f150s.def.json @@ -1,43 +1,43 @@ { - "name": "WEEDO F150S", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ] - }, - "overrides": { - "machine_name": { - "default_value": "WEEDO F150S" + "name": "WEEDO F150S", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for (150S)****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z140 F300\nG28 Z\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z5" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for 150s****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680 ; Reduce filament pressure\nG28 Z F1500; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 150 - }, - "machine_height": { - "default_value": 150 - }, - "material_bed_temperature": { - "maximum_value_warning": "70", - "maximum_value": "90" - }, - "retraction_amount": { - "default_value": 1.2 + "overrides": { + "machine_name": { + "default_value": "WEEDO F150S" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for (150S)****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z140 F300\nG28 Z\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z5" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for 150s****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680 ; Reduce filament pressure\nG28 Z F1500; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "machine_width": { + "default_value": 200 + }, + "machine_depth": { + "default_value": 150 + }, + "machine_height": { + "default_value": 150 + }, + "material_bed_temperature": { + "maximum_value_warning": "70", + "maximum_value": "90" + }, + "retraction_amount": { + "default_value": 1.2 + } } - } } \ No newline at end of file diff --git a/resources/definitions/weedo_f152s.def.json b/resources/definitions/weedo_f152s.def.json index 9ecbbafb3b..ef8b4ed042 100644 --- a/resources/definitions/weedo_f152s.def.json +++ b/resources/definitions/weedo_f152s.def.json @@ -1,39 +1,39 @@ { - "name": "WEEDO F152S", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ] - }, - "overrides": { - "machine_name": { - "default_value": "WEEDO F152S" + "name": "WEEDO F152S", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for F152S ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z5" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for F152S****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 185 - }, - "machine_height": { - "default_value": 195 - }, - "retraction_amount": { - "default_value": 1.2 + "overrides": { + "machine_name": { + "default_value": "WEEDO F152S" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for F152S ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z5" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for F152S****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "machine_width": { + "default_value": 200 + }, + "machine_depth": { + "default_value": 185 + }, + "machine_height": { + "default_value": 195 + }, + "retraction_amount": { + "default_value": 1.2 + } } - } } \ No newline at end of file diff --git a/resources/definitions/weedo_f370.def.json b/resources/definitions/weedo_f370.def.json index e2e8a9b3ed..2487a2eb53 100644 --- a/resources/definitions/weedo_f370.def.json +++ b/resources/definitions/weedo_f370.def.json @@ -1,39 +1,39 @@ { - "name": "WEEDO F370", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ] - }, - "overrides": { - "machine_name": { - "default_value": "WEEDO F370" + "name": "WEEDO F370", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for 370 ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z2" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for F370****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 310 - }, - "machine_depth": { - "default_value": 310 - }, - "machine_height": { - "default_value": 370 - }, - "retraction_amount": { - "default_value": 1.2 + "overrides": { + "machine_name": { + "default_value": "WEEDO F370" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for 370 ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z2" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for F370****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "machine_width": { + "default_value": 310 + }, + "machine_depth": { + "default_value": 310 + }, + "machine_height": { + "default_value": 370 + }, + "retraction_amount": { + "default_value": 1.2 + } } - } } \ No newline at end of file diff --git a/resources/definitions/weedo_hephi3s.def.json b/resources/definitions/weedo_hephi3s.def.json index 2f8af0ac7f..20dbfaaa72 100644 --- a/resources/definitions/weedo_hephi3s.def.json +++ b/resources/definitions/weedo_hephi3s.def.json @@ -1,48 +1,48 @@ { - "name": "WEEDO hephi3s", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ] - }, - "overrides": { - "machine_name": { - "default_value": "WEEDO hephi3s" + "name": "WEEDO hephi3s", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for hephi3****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15 F1000\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for hephi3****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_height": { - "default_value": 250 - }, - "speed_print": { - "default_value": 60.0 - }, - "speed_wall": { - "value": "speed_print / 2" - }, - "speed_topbottom": { - "value": "round(speed_print * 0.58,1)" - }, - "speed_support": { - "value": "round(speed_print*0.96,1)" + "overrides": { + "machine_name": { + "default_value": "WEEDO hephi3s" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for hephi3****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15 F1000\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for hephi3****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "machine_width": { + "default_value": 220 + }, + "machine_depth": { + "default_value": 220 + }, + "machine_height": { + "default_value": 250 + }, + "speed_print": { + "default_value": 60.0 + }, + "speed_wall": { + "value": "speed_print / 2" + }, + "speed_topbottom": { + "value": "round(speed_print * 0.58, 1)" + }, + "speed_support": { + "value": "round(speed_print * 0.96, 1)" + } } - } } \ No newline at end of file diff --git a/resources/definitions/weedo_me40.def.json b/resources/definitions/weedo_me40.def.json index 0a5fe37017..59aaa58993 100644 --- a/resources/definitions/weedo_me40.def.json +++ b/resources/definitions/weedo_me40.def.json @@ -1,48 +1,48 @@ { - "name": "WEEDO ME40", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ] - }, - "overrides": { - "machine_name": { - "default_value": "WEEDO ME40" + "name": "WEEDO ME40", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y150 F3000\nG28 Z\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "speed_print": { - "default_value": 60.0 - }, - "speed_wall": { - "value": "speed_print / 2" - }, - "speed_topbottom": { - "value": "round(speed_print * 0.58,1)" - }, - "speed_support": { - "value": "round(speed_print*0.96,1)" + "overrides": { + "machine_name": { + "default_value": "WEEDO ME40" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y150 F3000\nG28 Z\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "machine_width": { + "default_value": 300 + }, + "machine_depth": { + "default_value": 300 + }, + "machine_height": { + "default_value": 400 + }, + "speed_print": { + "default_value": 60.0 + }, + "speed_wall": { + "value": "speed_print / 2" + }, + "speed_topbottom": { + "value": "round(speed_print * 0.58, 1)" + }, + "speed_support": { + "value": "round(speed_print * 0.96, 1)" + } } - } } \ No newline at end of file diff --git a/resources/definitions/weedo_me40_lite.def.json b/resources/definitions/weedo_me40_lite.def.json index e1e14fcd2f..c9b7cd2d28 100644 --- a/resources/definitions/weedo_me40_lite.def.json +++ b/resources/definitions/weedo_me40_lite.def.json @@ -1,52 +1,52 @@ { - "name": "WEEDO ME40 Lite", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ] - }, - "overrides": { - "machine_name": { - "default_value": "WEEDO ME40 Lite" + "name": "WEEDO ME40 Lite", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ] }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40 Lite****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "material_bed_temperature": { - "maximum_value_warning": "70", - "maximum_value": "90" - }, - "speed_print": { - "default_value": 60.0 - }, - "speed_wall": { - "value": "speed_print / 2" - }, - "speed_topbottom": { - "value": "round(speed_print * 0.58,1)" - }, - "speed_support": { - "value": "round(speed_print*0.96,1)" + "overrides": { + "machine_name": { + "default_value": "WEEDO ME40 Lite" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40 Lite****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" + }, + "machine_width": { + "default_value": 300 + }, + "machine_depth": { + "default_value": 300 + }, + "machine_height": { + "default_value": 400 + }, + "material_bed_temperature": { + "maximum_value_warning": "70", + "maximum_value": "90" + }, + "speed_print": { + "default_value": 60.0 + }, + "speed_wall": { + "value": "speed_print / 2" + }, + "speed_topbottom": { + "value": "round(speed_print * 0.58, 1)" + }, + "speed_support": { + "value": "round(speed_print * 0.96, 1)" + } } - } } \ No newline at end of file diff --git a/resources/definitions/weedo_tina2.def.json b/resources/definitions/weedo_tina2.def.json index 46feeb39f8..9bf0ac8b9e 100644 --- a/resources/definitions/weedo_tina2.def.json +++ b/resources/definitions/weedo_tina2.def.json @@ -1,242 +1,242 @@ { - "name": "WEEDO TINA2", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ], - "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_abs_175", - "generic_asa_175", - "generic_bvoh_175", - "generic_cpe_175", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eryone_tpu", - "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", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "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", - "volumic_support_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": "WEEDO TINA2" + "name": "WEEDO TINA2", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ], + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_abs_175", + "generic_asa_175", + "generic_bvoh_175", + "generic_cpe_175", + "generic_hips_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "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", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "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", + "volumic_support_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" + ] }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" - }, - "machine_width": { - "default_value": 100 - }, - "machine_depth": { - "default_value": 120 - }, - "machine_height": { - "default_value": 100 - }, - "machine_heated_bed": { - "default_value": false - }, - "infill_pattern": { - "value": "'lines' if infill_sparse_density > 45 else 'grid'" - }, - "speed_print": { - "value": 40.0 - }, - "speed_infill": { - "value": 40.0 - }, - "speed_wall": { - "value": 25.0 - }, - "speed_wall_0": { - "value": 20.0 - }, - "speed_wall_x": { - "value": 25.0 - }, - "speed_topbottom": { - "value": 30.0 - }, - "speed_support_infill": { - "value": 45.0 - }, - "speed_print_layer_0": { - "value": 22.0 - }, - "speed_travel_layer_0": { - "value": 60 - }, - "speed_travel": { - "value": 65.0 - }, - "speed_support_roof": { - "value": 30.0 - }, - "speed_support_bottom": { - "dvalue": 30.0 - }, - "speed_roofing": { - "value": 25.0 - }, - "raft_base_thickness": { - "default_value": 0.35 + "overrides": { + "machine_name": { + "default_value": "WEEDO TINA2" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" + }, + "machine_width": { + "default_value": 100 + }, + "machine_depth": { + "default_value": 120 + }, + "machine_height": { + "default_value": 100 + }, + "machine_heated_bed": { + "default_value": false + }, + "infill_pattern": { + "value": "'lines' if infill_sparse_density > 45 else 'grid'" + }, + "speed_print": { + "value": 40.0 + }, + "speed_infill": { + "value": 40.0 + }, + "speed_wall": { + "value": 25.0 + }, + "speed_wall_0": { + "value": 20.0 + }, + "speed_wall_x": { + "value": 25.0 + }, + "speed_topbottom": { + "value": 30.0 + }, + "speed_support_infill": { + "value": 45.0 + }, + "speed_print_layer_0": { + "value": 22.0 + }, + "speed_travel_layer_0": { + "value": 60 + }, + "speed_travel": { + "value": 65.0 + }, + "speed_support_roof": { + "value": 30.0 + }, + "speed_support_bottom": { + "value": 30.0 + }, + "speed_roofing": { + "value": 25.0 + }, + "raft_base_thickness": { + "default_value": 0.35 + } } - } } \ No newline at end of file diff --git a/resources/definitions/weedo_tina2s.def.json b/resources/definitions/weedo_tina2s.def.json index ed97a58edd..769ad23cf7 100644 --- a/resources/definitions/weedo_tina2s.def.json +++ b/resources/definitions/weedo_tina2s.def.json @@ -1,238 +1,238 @@ { - "name": "WEEDO TINA2S", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ], - "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_abs_175", - "generic_asa_175", - "generic_cpe_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eryone_tpu", - "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", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "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", - "volumic_support_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": "WEEDO TINA2S" + "name": "WEEDO TINA2S", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "platform_offset": [ + 0, + 0, + 0 + ], + "exclude_materials": [ + "3D-Fuel_PLA_PRO_Black", + "3D-Fuel_PLA_SnapSupport", + "bestfilament_abs_skyblue", + "bestfilament_petg_orange", + "bestfilament_pla_green", + "leapfrog_abs_natural", + "leapfrog_epla_natural", + "leapfrog_pva_natural", + "generic_abs_175", + "generic_asa_175", + "generic_cpe_175", + "generic_nylon_175", + "generic_pc_175", + "generic_petg_175", + "generic_pva_175", + "goofoo_abs", + "goofoo_asa", + "goofoo_bronze_pla", + "goofoo_emarble_pla", + "goofoo_esilk_pla", + "goofoo_hips", + "goofoo_pa_cf", + "goofoo_pa", + "goofoo_pc", + "goofoo_peek", + "goofoo_petg", + "goofoo_pla", + "goofoo_pva", + "goofoo_tpe_83a", + "goofoo_tpu_87a", + "goofoo_tpu_95a", + "goofoo_wood_pla", + "emotiontech_abs", + "emotiontech_absx", + "emotiontech_acetate", + "emotiontech_asax", + "emotiontech_bvoh", + "emotiontech_copa", + "emotiontech_hips", + "emotiontech_nylon_1030", + "emotiontech_nylon_1030cf", + "emotiontech_nylon_1070", + "emotiontech_pc", + "emotiontech_pekk", + "emotiontech_petg", + "emotiontech_pla", + "emotiontech_pla_hr_870", + "emotiontech_pva-m", + "emotiontech_pva-s", + "emotiontech_tpu98a", + "eryone_petg", + "eryone_pla_glow", + "eryone_pla_matte", + "eryone_pla_wood", + "eryone_pla", + "eryone_tpu", + "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", + "verbatim_bvoh_175", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "chromatik_pla", + "dsm_arnitel2045_175", + "dsm_novamid1070_175", + "fabtotum_abs", + "fabtotum_nylon", + "fabtotum_pla", + "fabtotum_tpu", + "fdplast_abs_tomato", + "fdplast_petg_gray", + "fdplast_pla_olive", + "fiberlogy_hd_pla", + "filo3d_pla", + "filo3d_pla_green", + "filo3d_pla_red", + "imade3d_petg_green", + "imade3d_petg_pink", + "imade3d_pla_green", + "imade3d_pla_pink", + "imade3d_petg_175", + "imade3d_pla_175", + "innofill_innoflex60_175", + "layer_one_black_pla", + "layer_one_dark_gray_pla", + "layer_one_white_pla", + "octofiber_pla", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_abs", + "redd_asa", + "redd_hips", + "redd_nylon", + "redd_petg", + "redd_pla", + "redd_tpe", + "tizyx_abs", + "tizyx_flex", + "tizyx_petg", + "tizyx_pla_bois", + "tizyx_pla", + "tizyx_pva", + "Vertex_Delta_ABS", + "Vertex_Delta_PET", + "Vertex_Delta_PLA_Glitter", + "Vertex_Delta_PLA_Mat", + "Vertex_Delta_PLA_Satin", + "Vertex_Delta_PLA_Wood", + "Vertex_Delta_PLA", + "Vertex_Delta_TPU", + "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", + "volumic_support_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" + ] }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" - }, - "machine_width": { - "default_value": 100 - }, - "machine_depth": { - "default_value": 110 - }, - "machine_height": { - "default_value": 100 - }, - "material_bed_temperature": { - "maximum_value_warning": "60", - "maximum_value": "65" - }, - "speed_print": { - "value": 40.0 - }, - "speed_infill": { - "value": 40.0 - }, - "speed_wall": { - "value": 25.0 - }, - "speed_wall_0": { - "value": 20.0 - }, - "speed_wall_x": { - "value": 25.0 - }, - "speed_topbottom": { - "value": 30.0 - }, - "speed_support_infill": { - "value": 45.0 - }, - "speed_print_layer_0": { - "value": 22.0 - }, - "speed_travel_layer_0": { - "value": 60 - }, - "speed_travel": { - "value": 65.0 - }, - "speed_support_roof": { - "value": 30.0 - }, - "speed_support_bottom": { - "dvalue": 30.0 - }, - "speed_roofing": { - "value": 25.0 - }, - "raft_base_thickness": { - "default_value": 0.35 + "overrides": { + "machine_name": { + "default_value": "WEEDO TINA2S" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" + }, + "machine_end_gcode": { + "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" + }, + "machine_width": { + "default_value": 100 + }, + "machine_depth": { + "default_value": 110 + }, + "machine_height": { + "default_value": 100 + }, + "material_bed_temperature": { + "maximum_value_warning": "60", + "maximum_value": "65" + }, + "speed_print": { + "value": 40.0 + }, + "speed_infill": { + "value": 40.0 + }, + "speed_wall": { + "value": 25.0 + }, + "speed_wall_0": { + "value": 20.0 + }, + "speed_wall_x": { + "value": 25.0 + }, + "speed_topbottom": { + "value": 30.0 + }, + "speed_support_infill": { + "value": 45.0 + }, + "speed_print_layer_0": { + "value": 22.0 + }, + "speed_travel_layer_0": { + "value": 60 + }, + "speed_travel": { + "value": 65.0 + }, + "speed_support_roof": { + "value": 30.0 + }, + "speed_support_bottom": { + "value": 30.0 + }, + "speed_roofing": { + "value": 25.0 + }, + "raft_base_thickness": { + "default_value": 0.35 + } } - } } \ No newline at end of file diff --git a/resources/definitions/weedo_x40v3.def.json b/resources/definitions/weedo_x40v3.def.json index 44c22668bf..55dc6c637c 100644 --- a/resources/definitions/weedo_x40v3.def.json +++ b/resources/definitions/weedo_x40v3.def.json @@ -1,88 +1,88 @@ { - "name": "WEEDO X40 V3+", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "machine_extruder_trains": { - "0": "weedo_x40v3_extruder_left", - "1": "weedo_x40v3_extruder_right" + "name": "WEEDO X40 V3+", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEDO", + "manufacturer": "WEEDO", + "file_formats": "text/x-gcode", + "machine_extruder_trains": { + "0": "weedo_x40v3_extruder_left", + "1": "weedo_x40v3_extruder_right" + }, + "platform_offset": [ + 0, + 0, + 0 + ] }, - "platform_offset": [ - 0, - 0, - 0 - ] - }, - "overrides": { - "machine_name": { - "default_value": "WEEDO X40 V3" - }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for X40 ****)\nM203 Z15\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG28 ;This command will use tool0 to get the x endstop and setup coordinate system\nG29 ;Auto level\nM107 P0 ;Turn off fan\nM107 P1\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 X-47 F3000\nG1 Z20 F600\nT{initial_extruder_nr} S ;Set start extruder nr after G28\nM109 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG92 E0\nG1 E22 F300\nG92 E0\nM203 Z2" - }, - "machine_end_gcode": { - "default_value": ";(*********end X40 End.gcode*******)\nM203 Z15\nM605 S1 ;Set to auto-park\nG28 X F3000\nG91 ; Relative positioning\nG1 E-1 ; Reduce filament pressure\nG90\nG1 Y300 F3000\nM104 S0 T0\nM104 S0 T1\nM140 S0\nM107 P0\nM107 P1\nM82" - }, - "material_print_temp_prepend": { - "default_value": false - }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_always_write_active_tool": { - "default_value": true - }, - "machine_extruder_count": { - "default_value": 2 - }, - "machine_nozzle_heat_up_speed": { - "default_value": 1.7 - }, - "material_standby_temperature": { - "value": "material_print_temperature-20" - }, - "retraction_amount": { - "default_value": 4 - }, - "speed_print": { - "default_value": 60.0 - }, - "speed_wall": { - "value": "speed_print / 2" - }, - "speed_topbottom": { - "value": "round(speed_print * 0.58,1)" - }, - "speed_support": { - "value": "round(speed_print*0.96,1)" - }, - "switch_extruder_retraction_amount": { - "value": 0 - }, - "adhesion_type": { - "default_value": "brim" - }, - "ooze_shield_enabled": { - "default_value": true - }, - "ooze_shield_angle": { - "default_value": 0 - }, - "ooze_shield_dist": { - "default_value": 3.0 + "overrides": { + "machine_name": { + "default_value": "WEEDO X40" + }, + "machine_start_gcode": { + "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for X40 ****)\nM203 Z15\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG28 ;This command will use tool0 to get the x endstop and setup coordinate system\nG29 ;Auto level\nM107 P0 ;Turn off fan\nM107 P1\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 X-47 F3000\nG1 Z20 F600\nT{initial_extruder_nr} S ;Set start extruder nr after G28\nM109 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG92 E0\nG1 E22 F300\nG92 E0\nM203 Z2" + }, + "machine_end_gcode": { + "default_value": ";(*********end X40 End.gcode*******)\nM203 Z15\nM605 S1 ;Set to auto-park\nG28 X F3000\nG91 ; Relative positioning\nG1 E-1 ; Reduce filament pressure\nG90\nG1 Y300 F3000\nM104 S0 T0\nM104 S0 T1\nM140 S0\nM107 P0\nM107 P1\nM82" + }, + "material_print_temp_prepend": { + "default_value": false + }, + "machine_width": { + "default_value": 300 + }, + "machine_depth": { + "default_value": 300 + }, + "machine_height": { + "default_value": 400 + }, + "machine_heated_bed": { + "default_value": true + }, + "machine_always_write_active_tool": { + "default_value": true + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_nozzle_heat_up_speed": { + "default_value": 1.7 + }, + "material_standby_temperature": { + "value": "max(0, material_print_temperature - 20)" + }, + "retraction_amount": { + "default_value": 4 + }, + "speed_print": { + "default_value": 60.0 + }, + "speed_wall": { + "value": "speed_print / 2" + }, + "speed_topbottom": { + "value": "round(speed_print * 0.58, 1)" + }, + "speed_support": { + "value": "round(speed_print * 0.96, 1)" + }, + "switch_extruder_retraction_amount": { + "value": 0 + }, + "adhesion_type": { + "default_value": "brim" + }, + "ooze_shield_enabled": { + "default_value": true + }, + "ooze_shield_angle": { + "default_value": 0 + }, + "ooze_shield_dist": { + "default_value": 3.0 + } } - } } \ No newline at end of file From dd868ee1b66badc5476b44e7a4c4bf0354cc590a Mon Sep 17 00:00:00 2001 From: mao Date: Tue, 20 Sep 2022 11:25:13 +0800 Subject: [PATCH 04/43] Delete "category" in metadata, change some default_values to values --- resources/definitions/weedo_base.def.json | 3 +-- resources/definitions/weedo_tina2.def.json | 2 +- resources/definitions/weedo_tina2s.def.json | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index 3419c92d49..131eae4549 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -5,7 +5,6 @@ "metadata": { "author": "WEEDO", "manufacturer": "WEEDO", - "category": "WEEDO", "visible": false, "file_formats": "text/x-gcode", "machine_extruder_trains": { @@ -331,7 +330,7 @@ "default_value": 28.0 }, "retraction_min_travel": { - "default_value": 0.8 + "value": 0.8 }, "retraction_extrusion_window": { "value": 1.0 diff --git a/resources/definitions/weedo_tina2.def.json b/resources/definitions/weedo_tina2.def.json index 9bf0ac8b9e..555bb05d69 100644 --- a/resources/definitions/weedo_tina2.def.json +++ b/resources/definitions/weedo_tina2.def.json @@ -236,7 +236,7 @@ "value": 25.0 }, "raft_base_thickness": { - "default_value": 0.35 + "value": 0.35 } } } \ No newline at end of file diff --git a/resources/definitions/weedo_tina2s.def.json b/resources/definitions/weedo_tina2s.def.json index 769ad23cf7..ed6a2470de 100644 --- a/resources/definitions/weedo_tina2s.def.json +++ b/resources/definitions/weedo_tina2s.def.json @@ -232,7 +232,7 @@ "value": 25.0 }, "raft_base_thickness": { - "default_value": 0.35 + "value": 0.35 } } } \ No newline at end of file From 425734301b2e39728feab513ae0b62d5a6da2d82 Mon Sep 17 00:00:00 2001 From: mao Date: Wed, 7 Dec 2022 10:16:57 +0800 Subject: [PATCH 05/43] Remove redundant value --- resources/definitions/weedo_base.def.json | 12 ------------ resources/definitions/weedo_x40v3.def.json | 3 --- resources/extruders/weedo_base_extruder_0.def.json | 1 - .../extruders/weedo_x40v3_extruder_left.def.json | 4 ---- .../extruders/weedo_x40v3_extruder_right.def.json | 3 --- 5 files changed, 23 deletions(-) diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index 131eae4549..7c2cced10c 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -392,12 +392,6 @@ "raft_interface_thickness": { "value": 0.27 }, - "raft_interface_line_width": { - "value": 0.7 - }, - "raft_base_thickness": { - "value": 0.3 - }, "raft_surface_speed": { "value": 40.0 }, @@ -410,12 +404,6 @@ "raft_surface_fan_speed": { "value": "100.0 if cool_fan_enabled else 0.0" }, - "raft_interface_fan_speed": { - "value": 0.0 - }, - "raft_base_fan_speed": { - "value": 0.0 - }, "prime_tower_size": { "default_value": 15.0 }, diff --git a/resources/definitions/weedo_x40v3.def.json b/resources/definitions/weedo_x40v3.def.json index 55dc6c637c..edadcd291b 100644 --- a/resources/definitions/weedo_x40v3.def.json +++ b/resources/definitions/weedo_x40v3.def.json @@ -39,9 +39,6 @@ "machine_height": { "default_value": 400 }, - "machine_heated_bed": { - "default_value": true - }, "machine_always_write_active_tool": { "default_value": true }, diff --git a/resources/extruders/weedo_base_extruder_0.def.json b/resources/extruders/weedo_base_extruder_0.def.json index 0cb088acdd..311a57f572 100644 --- a/resources/extruders/weedo_base_extruder_0.def.json +++ b/resources/extruders/weedo_base_extruder_0.def.json @@ -9,7 +9,6 @@ "overrides": { "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } } diff --git a/resources/extruders/weedo_x40v3_extruder_left.def.json b/resources/extruders/weedo_x40v3_extruder_left.def.json index dc1de46bc6..8126207c88 100644 --- a/resources/extruders/weedo_x40v3_extruder_left.def.json +++ b/resources/extruders/weedo_x40v3_extruder_left.def.json @@ -12,11 +12,7 @@ "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_cooling_fan_number": {"default_value": 0}, "machine_extruder_start_code":{ "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X-47 F3000\n"} } diff --git a/resources/extruders/weedo_x40v3_extruder_right.def.json b/resources/extruders/weedo_x40v3_extruder_right.def.json index 41e74a5009..ffb8cb5a17 100644 --- a/resources/extruders/weedo_x40v3_extruder_right.def.json +++ b/resources/extruders/weedo_x40v3_extruder_right.def.json @@ -12,10 +12,7 @@ "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, "machine_extruder_cooling_fan_number": {"default_value": 1}, "machine_extruder_start_code":{ "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X353.7 F3000\n"} From a7082fde2bbab87dd5998d6d50560357f5b23e9e Mon Sep 17 00:00:00 2001 From: mao Date: Wed, 18 Jan 2023 13:35:04 +0800 Subject: [PATCH 06/43] Updated json format --- resources/definitions/weedo_base.def.json | 356 +++++------------- resources/definitions/weedo_f150s.def.json | 43 +-- resources/definitions/weedo_f152s.def.json | 36 +- resources/definitions/weedo_f370.def.json | 36 +- resources/definitions/weedo_hephi3s.def.json | 48 +-- resources/definitions/weedo_me40.def.json | 48 +-- .../definitions/weedo_me40_lite.def.json | 55 +-- resources/definitions/weedo_tina2.def.json | 106 ++---- resources/definitions/weedo_tina2s.def.json | 105 ++---- resources/definitions/weedo_x40v3.def.json | 95 ++--- 10 files changed, 278 insertions(+), 650 deletions(-) diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index 7c2cced10c..22f2085659 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -2,19 +2,12 @@ "version": 2, "name": "WEEDO Base", "inherits": "fdmprinter", - "metadata": { + "metadata": + { + "visible": false, "author": "WEEDO", "manufacturer": "WEEDO", - "visible": false, "file_formats": "text/x-gcode", - "machine_extruder_trains": { - "0": "weedo_base_extruder_0" - }, - "has_materials": true, - "has_variants": false, - "has_machine_quality": false, - "preferred_quality_type": "draft", - "preferred_material": "generic_pla_175", "exclude_materials": [ "3D-Fuel_PLA_PRO_Black", "3D-Fuel_PLA_SnapSupport", @@ -164,257 +157,98 @@ "xyzprinting_tpu", "zyyx_pro_flex", "zyyx_pro_pla" - ] + ], + "has_machine_quality": false, + "has_materials": true, + "has_variants": false, + "machine_extruder_trains": { "0": "weedo_base_extruder_0" }, + "preferred_material": "generic_pla_175", + "preferred_quality_type": "draft" }, - "overrides": { - "machine_name": { - "default_value": "WEEDO Base" - }, - "machine_start_gcode": { - "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0" - }, - "machine_end_gcode": { - "default_value": "G92 E0\nG1 E-3 F1680 \nG28 Z F400; Get extruder out of way.\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n" - }, - "material_diameter": { - "default_value": 1.75 - }, - "material_bed_temp_wait": { - "default_value": false - }, - "material_print_temp_wait": { - "default_value": false - }, - "machine_heated_bed": { - "default_value": true - }, - "machine_nozzle_tip_outer_diameter": { - "default_value": 0.8 - }, - "machine_nozzle_heat_up_speed": { - "default_value": 1.8 - }, - "machine_nozzle_cool_down_speed": { - "default_value": 0.67 - }, - "machine_min_cool_heat_time_window": { - "default_value": 1200.0 - }, - "machine_max_feedrate_x": { - "default_value": 200 - }, - "machine_max_feedrate_y": { - "default_value": 130 - }, - "machine_max_feedrate_z": { - "default_value": 10 - }, - "machine_max_feedrate_e": { - "default_value": 50 - }, - "machine_max_acceleration_x": { - "default_value": 3000 - }, - "machine_max_acceleration_y": { - "default_value": 3000 - }, - "machine_max_acceleration_z": { - "default_value": 120 - }, - "machine_max_acceleration_e": { - "default_value": 1600 - }, - "machine_acceleration": { - "default_value": 3000 - }, - "machine_max_jerk_xy": { - "default_value": 10.0 - }, - "machine_max_jerk_z": { - "default_value": 5 - }, - "machine_max_jerk_e": { - "default_value": 5.1 - }, - "infill_line_width": { - "value": "line_width * 1.25" - }, - "initial_layer_line_width_factor": { - "default_value": 110.0 - }, - "wall_0_wipe_dist": { - "value": 0.0 - }, - "z_seam_corner": { - "default_value": "z_seam_corner_any" - }, - "skin_outline_count": { - "value": "0" - }, - "infill_sparse_density": { - "default_value": 10.0 - }, - "infill_pattern": { - "value": "'zigzag'" - }, - "infill_before_walls": { - "default_value": false - }, - "material_print_temperature": { - "maximum_value": "300" - }, - "material_print_temperature_layer_0": { - "value": "min(material_print_temperature + 10, 300)" - }, - "material_initial_print_temperature": { - "value": "material_print_temperature" - }, - "material_final_print_temperature": { - "value": "material_print_temperature" - }, - "material_bed_temperature": { - "maximum_value_warning": "96" - }, - "material_flow": { - "default_value": 95.0 - }, - "material_flow_layer_0": { - "default_value": 95.0 - }, - "infill_material_flow": { - "value": "max(0, material_flow - 5)" - }, - "support_material_flow": { - "value": "max(0, material_flow - 5)" - }, - "speed_print": { - "default_value": 70.0 - }, - "speed_wall": { - "value": "max(5, round(speed_print / 2 - 5, 1))" - }, - "speed_wall_0": { - "value": "max(5, speed_wall - 5)" - }, - "speed_wall_x": { - "value": "speed_wall" - }, - "speed_topbottom": { - "value": "round(speed_print * 0.65, 1)" - }, - "speed_support": { - "value": "round(speed_print * 0.82, 1)" - }, - "speed_support_interface": { - "value": "round(speed_support * 0.689, 1)" - }, - "speed_prime_tower": { - "value": "speed_support" - }, - "speed_travel": { - "value": 105.0 - }, - "speed_layer_0": { - "value": 26.0 - }, - "speed_travel_layer_0": { - "value": 80.0 - }, - "skirt_brim_speed": { - "value": 26.0 - }, - "retraction_amount": { - "default_value": 3 - }, - "retraction_speed": { - "default_value": 28.0 - }, - "retraction_min_travel": { - "value": 0.8 - }, - "retraction_extrusion_window": { - "value": 1.0 - }, - "material_standby_temperature": { - "default_value": 175.0 - }, - "switch_extruder_retraction_amount": { - "value": 16.5 - }, - "switch_extruder_retraction_speeds": { - "default_value": 28.0 - }, - "retraction_combing": { - "value": "off" - }, - "retraction_hop_after_extruder_switch": { - "default_value": false - }, - "support_angle": { - "default_value": 60.0 - }, - "support_connect_zigzags": { - "default_value": false - }, - "support_z_distance": { - "default_value": 0.18 - }, - "support_interface_enable": { - "default_value": true - }, - "support_interface_density": { - "default_value": 60.0 - }, - "support_interface_height": { - "default_value": 0.8 - }, - "support_interface_pattern": { - "default_value": "lines" - }, - "adhesion_type": { - "default_value": "raft" - }, - "skirt_line_count": { - "default_value": 2 - }, - "raft_margin": { - "default_value": 8.0 - }, - "raft_airgap": { - "default_value": 0.19 - }, - "layer_0_z_overlap": { - "value": 0.09 - }, - "raft_surface_thickness": { - "value": 0.25 - }, - "raft_interface_thickness": { - "value": 0.27 - }, - "raft_surface_speed": { - "value": 40.0 - }, - "raft_interface_speed": { - "value": 33.0 - }, - "raft_base_speed": { - "value": 20.0 - }, - "raft_surface_fan_speed": { - "value": "100.0 if cool_fan_enabled else 0.0" - }, - "prime_tower_size": { - "default_value": 15.0 - }, - "prime_tower_min_volume": { - "default_value": 10.0 - }, - "draft_shield_dist": { - "default_value": 3 - }, - "top_skin_preshrink": { - "value": 0.0 - } + "overrides": + { + "adhesion_type": { "default_value": "raft" }, + "draft_shield_dist": { "default_value": 3 }, + "infill_before_walls": { "default_value": false }, + "infill_line_width": { "value": "line_width * 1.25" }, + "infill_material_flow": { "value": "max(0, material_flow - 5)" }, + "infill_pattern": { "value": "'zigzag'" }, + "infill_sparse_density": { "default_value": 10.0 }, + "initial_layer_line_width_factor": { "default_value": 110.0 }, + "layer_0_z_overlap": { "value": 0.09 }, + "machine_acceleration": { "default_value": 3000 }, + "machine_end_gcode": { "default_value": "G92 E0\nG1 E-3 F1680 \nG28 Z F400; Get extruder out of way.\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n" }, + "machine_heated_bed": { "default_value": true }, + "machine_max_acceleration_e": { "default_value": 1600 }, + "machine_max_acceleration_x": { "default_value": 3000 }, + "machine_max_acceleration_y": { "default_value": 3000 }, + "machine_max_acceleration_z": { "default_value": 120 }, + "machine_max_feedrate_e": { "default_value": 50 }, + "machine_max_feedrate_x": { "default_value": 200 }, + "machine_max_feedrate_y": { "default_value": 130 }, + "machine_max_feedrate_z": { "default_value": 10 }, + "machine_max_jerk_e": { "default_value": 5.1 }, + "machine_max_jerk_xy": { "default_value": 10.0 }, + "machine_max_jerk_z": { "default_value": 5 }, + "machine_min_cool_heat_time_window": { "default_value": 1200.0 }, + "machine_name": { "default_value": "WEEDO Base" }, + "machine_nozzle_cool_down_speed": { "default_value": 0.67 }, + "machine_nozzle_heat_up_speed": { "default_value": 1.8 }, + "machine_nozzle_tip_outer_diameter": { "default_value": 0.8 }, + "machine_start_gcode": { "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0" }, + "material_bed_temp_wait": { "default_value": false }, + "material_bed_temperature": { "maximum_value_warning": "96" }, + "material_diameter": { "default_value": 1.75 }, + "material_final_print_temperature": { "value": "material_print_temperature" }, + "material_flow": { "default_value": 95.0 }, + "material_flow_layer_0": { "default_value": 95.0 }, + "material_initial_print_temperature": { "value": "material_print_temperature" }, + "material_print_temp_wait": { "default_value": false }, + "material_print_temperature": { "maximum_value": "300" }, + "material_print_temperature_layer_0": { "value": "min(material_print_temperature + 10, 300)" }, + "material_standby_temperature": { "default_value": 175.0 }, + "prime_tower_min_volume": { "default_value": 10.0 }, + "prime_tower_size": { "default_value": 15.0 }, + "raft_airgap": { "default_value": 0.19 }, + "raft_base_speed": { "value": 20.0 }, + "raft_interface_speed": { "value": 33.0 }, + "raft_interface_thickness": { "value": 0.27 }, + "raft_margin": { "default_value": 8.0 }, + "raft_surface_fan_speed": { "value": "100.0 if cool_fan_enabled else 0.0" }, + "raft_surface_speed": { "value": 40.0 }, + "raft_surface_thickness": { "value": 0.25 }, + "retraction_amount": { "default_value": 3 }, + "retraction_combing": { "value": "off" }, + "retraction_extrusion_window": { "value": 1.0 }, + "retraction_hop_after_extruder_switch": { "default_value": false }, + "retraction_min_travel": { "value": 0.8 }, + "retraction_speed": { "default_value": 28.0 }, + "skin_outline_count": { "value": "0" }, + "skirt_brim_speed": { "value": 26.0 }, + "skirt_line_count": { "default_value": 2 }, + "speed_layer_0": { "value": 26.0 }, + "speed_prime_tower": { "value": "speed_support" }, + "speed_print": { "default_value": 70.0 }, + "speed_support": { "value": "round(speed_print * 0.82, 1)" }, + "speed_support_interface": { "value": "round(speed_support * 0.689, 1)" }, + "speed_topbottom": { "value": "round(speed_print * 0.65, 1)" }, + "speed_travel": { "value": 105.0 }, + "speed_travel_layer_0": { "value": 80.0 }, + "speed_wall": { "value": "max(5, round(speed_print / 2 - 5, 1))" }, + "speed_wall_0": { "value": "max(5, speed_wall - 5)" }, + "speed_wall_x": { "value": "speed_wall" }, + "support_angle": { "default_value": 60.0 }, + "support_connect_zigzags": { "default_value": false }, + "support_interface_density": { "default_value": 60.0 }, + "support_interface_enable": { "default_value": true }, + "support_interface_height": { "default_value": 0.8 }, + "support_interface_pattern": { "default_value": "lines" }, + "support_material_flow": { "value": "max(0, material_flow - 5)" }, + "support_z_distance": { "default_value": 0.18 }, + "switch_extruder_retraction_amount": { "value": 16.5 }, + "switch_extruder_retraction_speeds": { "default_value": 28.0 }, + "top_skin_preshrink": { "value": 0.0 }, + "wall_0_wipe_dist": { "value": 0.0 }, + "z_seam_corner": { "default_value": "z_seam_corner_any" } } } \ No newline at end of file diff --git a/resources/definitions/weedo_f150s.def.json b/resources/definitions/weedo_f150s.def.json index 91b823277f..05b5359cda 100644 --- a/resources/definitions/weedo_f150s.def.json +++ b/resources/definitions/weedo_f150s.def.json @@ -1,8 +1,9 @@ { - "name": "WEEDO F150S", "version": 2, + "name": "WEEDO F150S", "inherits": "weedo_base", - "metadata": { + "metadata": + { "visible": true, "author": "WEEDO", "manufacturer": "WEEDO", @@ -13,31 +14,19 @@ 0 ] }, - "overrides": { - "machine_name": { - "default_value": "WEEDO F150S" + "overrides": + { + "machine_depth": { "default_value": 150 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for 150s****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680 ; Reduce filament pressure\nG28 Z F1500; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, + "machine_height": { "default_value": 150 }, + "machine_name": { "default_value": "WEEDO F150S" }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for (150S)****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z140 F300\nG28 Z\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z5" }, + "machine_width": { "default_value": 200 }, + "material_bed_temperature": + { + "maximum_value": "90", + "maximum_value_warning": "70" }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for (150S)****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z140 F300\nG28 Z\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z5" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for 150s****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680 ; Reduce filament pressure\nG28 Z F1500; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 150 - }, - "machine_height": { - "default_value": 150 - }, - "material_bed_temperature": { - "maximum_value_warning": "70", - "maximum_value": "90" - }, - "retraction_amount": { - "default_value": 1.2 - } + "retraction_amount": { "default_value": 1.2 } } } \ No newline at end of file diff --git a/resources/definitions/weedo_f152s.def.json b/resources/definitions/weedo_f152s.def.json index ef8b4ed042..8da41c946e 100644 --- a/resources/definitions/weedo_f152s.def.json +++ b/resources/definitions/weedo_f152s.def.json @@ -1,8 +1,9 @@ { - "name": "WEEDO F152S", "version": 2, + "name": "WEEDO F152S", "inherits": "weedo_base", - "metadata": { + "metadata": + { "visible": true, "author": "WEEDO", "manufacturer": "WEEDO", @@ -13,27 +14,14 @@ 0 ] }, - "overrides": { - "machine_name": { - "default_value": "WEEDO F152S" - }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for F152S ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z5" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for F152S****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 200 - }, - "machine_depth": { - "default_value": 185 - }, - "machine_height": { - "default_value": 195 - }, - "retraction_amount": { - "default_value": 1.2 - } + "overrides": + { + "machine_depth": { "default_value": 185 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for F152S****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, + "machine_height": { "default_value": 195 }, + "machine_name": { "default_value": "WEEDO F152S" }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for F152S ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z5" }, + "machine_width": { "default_value": 200 }, + "retraction_amount": { "default_value": 1.2 } } } \ No newline at end of file diff --git a/resources/definitions/weedo_f370.def.json b/resources/definitions/weedo_f370.def.json index 2487a2eb53..a967be62d2 100644 --- a/resources/definitions/weedo_f370.def.json +++ b/resources/definitions/weedo_f370.def.json @@ -1,8 +1,9 @@ { - "name": "WEEDO F370", "version": 2, + "name": "WEEDO F370", "inherits": "weedo_base", - "metadata": { + "metadata": + { "visible": true, "author": "WEEDO", "manufacturer": "WEEDO", @@ -13,27 +14,14 @@ 0 ] }, - "overrides": { - "machine_name": { - "default_value": "WEEDO F370" - }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for 370 ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z2" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for F370****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 310 - }, - "machine_depth": { - "default_value": 310 - }, - "machine_height": { - "default_value": 370 - }, - "retraction_amount": { - "default_value": 1.2 - } + "overrides": + { + "machine_depth": { "default_value": 310 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for F370****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, + "machine_height": { "default_value": 370 }, + "machine_name": { "default_value": "WEEDO F370" }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for 370 ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z2" }, + "machine_width": { "default_value": 310 }, + "retraction_amount": { "default_value": 1.2 } } } \ No newline at end of file diff --git a/resources/definitions/weedo_hephi3s.def.json b/resources/definitions/weedo_hephi3s.def.json index 20dbfaaa72..4cc1f5a41f 100644 --- a/resources/definitions/weedo_hephi3s.def.json +++ b/resources/definitions/weedo_hephi3s.def.json @@ -1,8 +1,9 @@ { - "name": "WEEDO hephi3s", "version": 2, + "name": "WEEDO hephi3s", "inherits": "weedo_base", - "metadata": { + "metadata": + { "visible": true, "author": "WEEDO", "manufacturer": "WEEDO", @@ -13,36 +14,17 @@ 0 ] }, - "overrides": { - "machine_name": { - "default_value": "WEEDO hephi3s" - }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for hephi3****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15 F1000\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for hephi3****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 220 - }, - "machine_depth": { - "default_value": 220 - }, - "machine_height": { - "default_value": 250 - }, - "speed_print": { - "default_value": 60.0 - }, - "speed_wall": { - "value": "speed_print / 2" - }, - "speed_topbottom": { - "value": "round(speed_print * 0.58, 1)" - }, - "speed_support": { - "value": "round(speed_print * 0.96, 1)" - } + "overrides": + { + "machine_depth": { "default_value": 220 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for hephi3****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "WEEDO hephi3s" }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for hephi3****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15 F1000\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" }, + "machine_width": { "default_value": 220 }, + "speed_print": { "default_value": 60.0 }, + "speed_support": { "value": "round(speed_print * 0.96, 1)" }, + "speed_topbottom": { "value": "round(speed_print * 0.58, 1)" }, + "speed_wall": { "value": "speed_print / 2" } } } \ No newline at end of file diff --git a/resources/definitions/weedo_me40.def.json b/resources/definitions/weedo_me40.def.json index 59aaa58993..348d5dc0cd 100644 --- a/resources/definitions/weedo_me40.def.json +++ b/resources/definitions/weedo_me40.def.json @@ -1,8 +1,9 @@ { - "name": "WEEDO ME40", "version": 2, + "name": "WEEDO ME40", "inherits": "weedo_base", - "metadata": { + "metadata": + { "visible": true, "author": "WEEDO", "manufacturer": "WEEDO", @@ -13,36 +14,17 @@ 0 ] }, - "overrides": { - "machine_name": { - "default_value": "WEEDO ME40" - }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y150 F3000\nG28 Z\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "speed_print": { - "default_value": 60.0 - }, - "speed_wall": { - "value": "speed_print / 2" - }, - "speed_topbottom": { - "value": "round(speed_print * 0.58, 1)" - }, - "speed_support": { - "value": "round(speed_print * 0.96, 1)" - } + "overrides": + { + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y150 F3000\nG28 Z\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "WEEDO ME40" }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" }, + "machine_width": { "default_value": 300 }, + "speed_print": { "default_value": 60.0 }, + "speed_support": { "value": "round(speed_print * 0.96, 1)" }, + "speed_topbottom": { "value": "round(speed_print * 0.58, 1)" }, + "speed_wall": { "value": "speed_print / 2" } } } \ No newline at end of file diff --git a/resources/definitions/weedo_me40_lite.def.json b/resources/definitions/weedo_me40_lite.def.json index c9b7cd2d28..2c7c809e21 100644 --- a/resources/definitions/weedo_me40_lite.def.json +++ b/resources/definitions/weedo_me40_lite.def.json @@ -1,8 +1,9 @@ { - "name": "WEEDO ME40 Lite", "version": 2, + "name": "WEEDO ME40 Lite", "inherits": "weedo_base", - "metadata": { + "metadata": + { "visible": true, "author": "WEEDO", "manufacturer": "WEEDO", @@ -13,40 +14,22 @@ 0 ] }, - "overrides": { - "machine_name": { - "default_value": "WEEDO ME40 Lite" + "overrides": + { + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "WEEDO ME40 Lite" }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40 Lite****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" }, + "machine_width": { "default_value": 300 }, + "material_bed_temperature": + { + "maximum_value": "90", + "maximum_value_warning": "70" }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40 Lite****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y130 F3000\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" - }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "material_bed_temperature": { - "maximum_value_warning": "70", - "maximum_value": "90" - }, - "speed_print": { - "default_value": 60.0 - }, - "speed_wall": { - "value": "speed_print / 2" - }, - "speed_topbottom": { - "value": "round(speed_print * 0.58, 1)" - }, - "speed_support": { - "value": "round(speed_print * 0.96, 1)" - } + "speed_print": { "default_value": 60.0 }, + "speed_support": { "value": "round(speed_print * 0.96, 1)" }, + "speed_topbottom": { "value": "round(speed_print * 0.58, 1)" }, + "speed_wall": { "value": "speed_print / 2" } } } \ No newline at end of file diff --git a/resources/definitions/weedo_tina2.def.json b/resources/definitions/weedo_tina2.def.json index 555bb05d69..7824aa3006 100644 --- a/resources/definitions/weedo_tina2.def.json +++ b/resources/definitions/weedo_tina2.def.json @@ -1,17 +1,13 @@ { - "name": "WEEDO TINA2", "version": 2, + "name": "WEEDO TINA2", "inherits": "weedo_base", - "metadata": { + "metadata": + { "visible": true, "author": "WEEDO", "manufacturer": "WEEDO", "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ], "exclude_materials": [ "3D-Fuel_PLA_PRO_Black", "3D-Fuel_PLA_SnapSupport", @@ -169,74 +165,36 @@ "xyzprinting_tpu", "zyyx_pro_flex", "zyyx_pro_pla" + ], + "platform_offset": [ + 0, + 0, + 0 ] }, - "overrides": { - "machine_name": { - "default_value": "WEEDO TINA2" - }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" - }, - "machine_width": { - "default_value": 100 - }, - "machine_depth": { - "default_value": 120 - }, - "machine_height": { - "default_value": 100 - }, - "machine_heated_bed": { - "default_value": false - }, - "infill_pattern": { - "value": "'lines' if infill_sparse_density > 45 else 'grid'" - }, - "speed_print": { - "value": 40.0 - }, - "speed_infill": { - "value": 40.0 - }, - "speed_wall": { - "value": 25.0 - }, - "speed_wall_0": { - "value": 20.0 - }, - "speed_wall_x": { - "value": 25.0 - }, - "speed_topbottom": { - "value": 30.0 - }, - "speed_support_infill": { - "value": 45.0 - }, - "speed_print_layer_0": { - "value": 22.0 - }, - "speed_travel_layer_0": { - "value": 60 - }, - "speed_travel": { - "value": 65.0 - }, - "speed_support_roof": { - "value": 30.0 - }, - "speed_support_bottom": { - "value": 30.0 - }, - "speed_roofing": { - "value": 25.0 - }, - "raft_base_thickness": { - "value": 0.35 - } + "overrides": + { + "infill_pattern": { "value": "'lines' if infill_sparse_density > 45 else 'grid'" }, + "machine_depth": { "default_value": 120 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" }, + "machine_heated_bed": { "default_value": false }, + "machine_height": { "default_value": 100 }, + "machine_name": { "default_value": "WEEDO TINA2" }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" }, + "machine_width": { "default_value": 100 }, + "raft_base_thickness": { "value": 0.35 }, + "speed_infill": { "value": 40.0 }, + "speed_print": { "value": 40.0 }, + "speed_print_layer_0": { "value": 22.0 }, + "speed_roofing": { "value": 25.0 }, + "speed_support_bottom": { "value": 30.0 }, + "speed_support_infill": { "value": 45.0 }, + "speed_support_roof": { "value": 30.0 }, + "speed_topbottom": { "value": 30.0 }, + "speed_travel": { "value": 65.0 }, + "speed_travel_layer_0": { "value": 60 }, + "speed_wall": { "value": 25.0 }, + "speed_wall_0": { "value": 20.0 }, + "speed_wall_x": { "value": 25.0 } } } \ No newline at end of file diff --git a/resources/definitions/weedo_tina2s.def.json b/resources/definitions/weedo_tina2s.def.json index ed6a2470de..5c11529854 100644 --- a/resources/definitions/weedo_tina2s.def.json +++ b/resources/definitions/weedo_tina2s.def.json @@ -1,17 +1,13 @@ { - "name": "WEEDO TINA2S", "version": 2, + "name": "WEEDO TINA2S", "inherits": "weedo_base", - "metadata": { + "metadata": + { "visible": true, "author": "WEEDO", "manufacturer": "WEEDO", "file_formats": "text/x-gcode", - "platform_offset": [ - 0, - 0, - 0 - ], "exclude_materials": [ "3D-Fuel_PLA_PRO_Black", "3D-Fuel_PLA_SnapSupport", @@ -167,72 +163,39 @@ "xyzprinting_tpu", "zyyx_pro_flex", "zyyx_pro_pla" + ], + "platform_offset": [ + 0, + 0, + 0 ] }, - "overrides": { - "machine_name": { - "default_value": "WEEDO TINA2S" + "overrides": + { + "machine_depth": { "default_value": 110 }, + "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" }, + "machine_height": { "default_value": 100 }, + "machine_name": { "default_value": "WEEDO TINA2S" }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" }, + "machine_width": { "default_value": 100 }, + "material_bed_temperature": + { + "maximum_value": "65", + "maximum_value_warning": "60" }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" - }, - "machine_end_gcode": { - "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" - }, - "machine_width": { - "default_value": 100 - }, - "machine_depth": { - "default_value": 110 - }, - "machine_height": { - "default_value": 100 - }, - "material_bed_temperature": { - "maximum_value_warning": "60", - "maximum_value": "65" - }, - "speed_print": { - "value": 40.0 - }, - "speed_infill": { - "value": 40.0 - }, - "speed_wall": { - "value": 25.0 - }, - "speed_wall_0": { - "value": 20.0 - }, - "speed_wall_x": { - "value": 25.0 - }, - "speed_topbottom": { - "value": 30.0 - }, - "speed_support_infill": { - "value": 45.0 - }, - "speed_print_layer_0": { - "value": 22.0 - }, - "speed_travel_layer_0": { - "value": 60 - }, - "speed_travel": { - "value": 65.0 - }, - "speed_support_roof": { - "value": 30.0 - }, - "speed_support_bottom": { - "value": 30.0 - }, - "speed_roofing": { - "value": 25.0 - }, - "raft_base_thickness": { - "value": 0.35 - } + "raft_base_thickness": { "value": 0.35 }, + "speed_infill": { "value": 40.0 }, + "speed_print": { "value": 40.0 }, + "speed_print_layer_0": { "value": 22.0 }, + "speed_roofing": { "value": 25.0 }, + "speed_support_bottom": { "value": 30.0 }, + "speed_support_infill": { "value": 45.0 }, + "speed_support_roof": { "value": 30.0 }, + "speed_topbottom": { "value": 30.0 }, + "speed_travel": { "value": 65.0 }, + "speed_travel_layer_0": { "value": 60 }, + "speed_wall": { "value": 25.0 }, + "speed_wall_0": { "value": 20.0 }, + "speed_wall_x": { "value": 25.0 } } } \ No newline at end of file diff --git a/resources/definitions/weedo_x40v3.def.json b/resources/definitions/weedo_x40v3.def.json index edadcd291b..47912a7f8d 100644 --- a/resources/definitions/weedo_x40v3.def.json +++ b/resources/definitions/weedo_x40v3.def.json @@ -1,13 +1,15 @@ { - "name": "WEEDO X40 V3+", "version": 2, + "name": "WEEDO X40 V3+", "inherits": "weedo_base", - "metadata": { + "metadata": + { "visible": true, "author": "WEEDO", "manufacturer": "WEEDO", "file_formats": "text/x-gcode", - "machine_extruder_trains": { + "machine_extruder_trains": + { "0": "weedo_x40v3_extruder_left", "1": "weedo_x40v3_extruder_right" }, @@ -17,69 +19,28 @@ 0 ] }, - "overrides": { - "machine_name": { - "default_value": "WEEDO X40" - }, - "machine_start_gcode": { - "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for X40 ****)\nM203 Z15\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG28 ;This command will use tool0 to get the x endstop and setup coordinate system\nG29 ;Auto level\nM107 P0 ;Turn off fan\nM107 P1\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 X-47 F3000\nG1 Z20 F600\nT{initial_extruder_nr} S ;Set start extruder nr after G28\nM109 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG92 E0\nG1 E22 F300\nG92 E0\nM203 Z2" - }, - "machine_end_gcode": { - "default_value": ";(*********end X40 End.gcode*******)\nM203 Z15\nM605 S1 ;Set to auto-park\nG28 X F3000\nG91 ; Relative positioning\nG1 E-1 ; Reduce filament pressure\nG90\nG1 Y300 F3000\nM104 S0 T0\nM104 S0 T1\nM140 S0\nM107 P0\nM107 P1\nM82" - }, - "material_print_temp_prepend": { - "default_value": false - }, - "machine_width": { - "default_value": 300 - }, - "machine_depth": { - "default_value": 300 - }, - "machine_height": { - "default_value": 400 - }, - "machine_always_write_active_tool": { - "default_value": true - }, - "machine_extruder_count": { - "default_value": 2 - }, - "machine_nozzle_heat_up_speed": { - "default_value": 1.7 - }, - "material_standby_temperature": { - "value": "max(0, material_print_temperature - 20)" - }, - "retraction_amount": { - "default_value": 4 - }, - "speed_print": { - "default_value": 60.0 - }, - "speed_wall": { - "value": "speed_print / 2" - }, - "speed_topbottom": { - "value": "round(speed_print * 0.58, 1)" - }, - "speed_support": { - "value": "round(speed_print * 0.96, 1)" - }, - "switch_extruder_retraction_amount": { - "value": 0 - }, - "adhesion_type": { - "default_value": "brim" - }, - "ooze_shield_enabled": { - "default_value": true - }, - "ooze_shield_angle": { - "default_value": 0 - }, - "ooze_shield_dist": { - "default_value": 3.0 - } + "overrides": + { + "adhesion_type": { "default_value": "brim" }, + "machine_always_write_active_tool": { "default_value": true }, + "machine_depth": { "default_value": 300 }, + "machine_end_gcode": { "default_value": ";(*********end X40 End.gcode*******)\nM203 Z15\nM605 S1 ;Set to auto-park\nG28 X F3000\nG91 ; Relative positioning\nG1 E-1 ; Reduce filament pressure\nG90\nG1 Y300 F3000\nM104 S0 T0\nM104 S0 T1\nM140 S0\nM107 P0\nM107 P1\nM82" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_height": { "default_value": 400 }, + "machine_name": { "default_value": "WEEDO X40" }, + "machine_nozzle_heat_up_speed": { "default_value": 1.7 }, + "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for X40 ****)\nM203 Z15\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG28 ;This command will use tool0 to get the x endstop and setup coordinate system\nG29 ;Auto level\nM107 P0 ;Turn off fan\nM107 P1\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 X-47 F3000\nG1 Z20 F600\nT{initial_extruder_nr} S ;Set start extruder nr after G28\nM109 S{material_print_temperature_layer_0} T{initial_extruder_nr}\nG92 E0\nG1 E22 F300\nG92 E0\nM203 Z2" }, + "machine_width": { "default_value": 300 }, + "material_print_temp_prepend": { "default_value": false }, + "material_standby_temperature": { "value": "max(0, material_print_temperature - 20)" }, + "ooze_shield_angle": { "default_value": 0 }, + "ooze_shield_dist": { "default_value": 3.0 }, + "ooze_shield_enabled": { "default_value": true }, + "retraction_amount": { "default_value": 4 }, + "speed_print": { "default_value": 60.0 }, + "speed_support": { "value": "round(speed_print * 0.96, 1)" }, + "speed_topbottom": { "value": "round(speed_print * 0.58, 1)" }, + "speed_wall": { "value": "speed_print / 2" }, + "switch_extruder_retraction_amount": { "value": 0 } } } \ No newline at end of file From d072c71621b1b123786f5882d43e6443ed4b8758 Mon Sep 17 00:00:00 2001 From: WinstonMao Date: Sun, 28 Apr 2024 10:05:31 +0800 Subject: [PATCH 07/43] Sync with main branch --- resources/definitions/weedo_base.def.json | 10 +++++++--- resources/extruders/weedo_x40v3_extruder_left.def.json | 2 +- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index 22f2085659..04549e6768 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -196,6 +196,10 @@ "machine_nozzle_heat_up_speed": { "default_value": 1.8 }, "machine_nozzle_tip_outer_diameter": { "default_value": 0.8 }, "machine_start_gcode": { "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0" }, + "machine_steps_per_mm_e": { "default_value": 96 }, + "machine_steps_per_mm_x": { "default_value": 94 }, + "machine_steps_per_mm_y": { "default_value": 94 }, + "machine_steps_per_mm_z": { "default_value": 400 }, "material_bed_temp_wait": { "default_value": false }, "material_bed_temperature": { "maximum_value_warning": "96" }, "material_diameter": { "default_value": 1.75 }, @@ -210,15 +214,15 @@ "prime_tower_min_volume": { "default_value": 10.0 }, "prime_tower_size": { "default_value": 15.0 }, "raft_airgap": { "default_value": 0.19 }, + "raft_base_fan_speed": { "value": 0.0 }, "raft_base_speed": { "value": 20.0 }, + "raft_base_thickness": { "value": 0.3 }, "raft_interface_speed": { "value": 33.0 }, - "raft_interface_thickness": { "value": 0.27 }, "raft_margin": { "default_value": 8.0 }, - "raft_surface_fan_speed": { "value": "100.0 if cool_fan_enabled else 0.0" }, "raft_surface_speed": { "value": 40.0 }, "raft_surface_thickness": { "value": 0.25 }, "retraction_amount": { "default_value": 3 }, - "retraction_combing": { "value": "off" }, + "retraction_combing": { "value": "'off'" }, "retraction_extrusion_window": { "value": 1.0 }, "retraction_hop_after_extruder_switch": { "default_value": false }, "retraction_min_travel": { "value": 0.8 }, diff --git a/resources/extruders/weedo_x40v3_extruder_left.def.json b/resources/extruders/weedo_x40v3_extruder_left.def.json index 8126207c88..26967d71d9 100644 --- a/resources/extruders/weedo_x40v3_extruder_left.def.json +++ b/resources/extruders/weedo_x40v3_extruder_left.def.json @@ -14,6 +14,6 @@ }, "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code":{ "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, - "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X-47 F3000\n"} + "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X-49 F3000\n"} } } From 2c4859d4bf622396af64a13efbc3ec1cdc24986f Mon Sep 17 00:00:00 2001 From: WinstonMao Date: Sun, 28 Apr 2024 02:06:19 +0000 Subject: [PATCH 08/43] Applied printer-linter format --- .../weedo_x40v3_extruder_left.def.json | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/resources/extruders/weedo_x40v3_extruder_left.def.json b/resources/extruders/weedo_x40v3_extruder_left.def.json index 26967d71d9..eac3309fc0 100644 --- a/resources/extruders/weedo_x40v3_extruder_left.def.json +++ b/resources/extruders/weedo_x40v3_extruder_left.def.json @@ -2,18 +2,20 @@ "version": 2, "name": "Extruder Left", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "weedo_x40v3", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_start_code":{ "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, - "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X-49 F3000\n"} + "machine_extruder_end_code": { "default_value": "M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X-49 F3000\n" }, + "machine_extruder_start_code": { "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file From a464cbd9f65c1f93f0d49f58f4951e20a852e78d Mon Sep 17 00:00:00 2001 From: WinstonMao Date: Sun, 28 Apr 2024 10:05:31 +0800 Subject: [PATCH 09/43] Sync with main branch --- resources/definitions/weedo_base.def.json | 254 ------------------ resources/definitions/weedo_tina2.def.json | 200 -------------- resources/definitions/weedo_tina2s.def.json | 201 -------------- .../extruders/weedo_base_extruder_0.def.json | 14 - .../weedo_x40v3_extruder_left.def.json | 2 +- 5 files changed, 1 insertion(+), 670 deletions(-) delete mode 100644 resources/definitions/weedo_base.def.json delete mode 100644 resources/definitions/weedo_tina2.def.json delete mode 100644 resources/definitions/weedo_tina2s.def.json delete mode 100644 resources/extruders/weedo_base_extruder_0.def.json diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json deleted file mode 100644 index 22f2085659..0000000000 --- a/resources/definitions/weedo_base.def.json +++ /dev/null @@ -1,254 +0,0 @@ -{ - "version": 2, - "name": "WEEDO Base", - "inherits": "fdmprinter", - "metadata": - { - "visible": false, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_pc_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eryone_tpu", - "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", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "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", - "volumic_support_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" - ], - "has_machine_quality": false, - "has_materials": true, - "has_variants": false, - "machine_extruder_trains": { "0": "weedo_base_extruder_0" }, - "preferred_material": "generic_pla_175", - "preferred_quality_type": "draft" - }, - "overrides": - { - "adhesion_type": { "default_value": "raft" }, - "draft_shield_dist": { "default_value": 3 }, - "infill_before_walls": { "default_value": false }, - "infill_line_width": { "value": "line_width * 1.25" }, - "infill_material_flow": { "value": "max(0, material_flow - 5)" }, - "infill_pattern": { "value": "'zigzag'" }, - "infill_sparse_density": { "default_value": 10.0 }, - "initial_layer_line_width_factor": { "default_value": 110.0 }, - "layer_0_z_overlap": { "value": 0.09 }, - "machine_acceleration": { "default_value": 3000 }, - "machine_end_gcode": { "default_value": "G92 E0\nG1 E-3 F1680 \nG28 Z F400; Get extruder out of way.\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM84 ; Turn steppers off\n" }, - "machine_heated_bed": { "default_value": true }, - "machine_max_acceleration_e": { "default_value": 1600 }, - "machine_max_acceleration_x": { "default_value": 3000 }, - "machine_max_acceleration_y": { "default_value": 3000 }, - "machine_max_acceleration_z": { "default_value": 120 }, - "machine_max_feedrate_e": { "default_value": 50 }, - "machine_max_feedrate_x": { "default_value": 200 }, - "machine_max_feedrate_y": { "default_value": 130 }, - "machine_max_feedrate_z": { "default_value": 10 }, - "machine_max_jerk_e": { "default_value": 5.1 }, - "machine_max_jerk_xy": { "default_value": 10.0 }, - "machine_max_jerk_z": { "default_value": 5 }, - "machine_min_cool_heat_time_window": { "default_value": 1200.0 }, - "machine_name": { "default_value": "WEEDO Base" }, - "machine_nozzle_cool_down_speed": { "default_value": 0.67 }, - "machine_nozzle_heat_up_speed": { "default_value": 1.8 }, - "machine_nozzle_tip_outer_diameter": { "default_value": 0.8 }, - "machine_start_gcode": { "default_value": "G28 ;Home\nG92 E0\nG1 F200 E3\nG92 E0" }, - "material_bed_temp_wait": { "default_value": false }, - "material_bed_temperature": { "maximum_value_warning": "96" }, - "material_diameter": { "default_value": 1.75 }, - "material_final_print_temperature": { "value": "material_print_temperature" }, - "material_flow": { "default_value": 95.0 }, - "material_flow_layer_0": { "default_value": 95.0 }, - "material_initial_print_temperature": { "value": "material_print_temperature" }, - "material_print_temp_wait": { "default_value": false }, - "material_print_temperature": { "maximum_value": "300" }, - "material_print_temperature_layer_0": { "value": "min(material_print_temperature + 10, 300)" }, - "material_standby_temperature": { "default_value": 175.0 }, - "prime_tower_min_volume": { "default_value": 10.0 }, - "prime_tower_size": { "default_value": 15.0 }, - "raft_airgap": { "default_value": 0.19 }, - "raft_base_speed": { "value": 20.0 }, - "raft_interface_speed": { "value": 33.0 }, - "raft_interface_thickness": { "value": 0.27 }, - "raft_margin": { "default_value": 8.0 }, - "raft_surface_fan_speed": { "value": "100.0 if cool_fan_enabled else 0.0" }, - "raft_surface_speed": { "value": 40.0 }, - "raft_surface_thickness": { "value": 0.25 }, - "retraction_amount": { "default_value": 3 }, - "retraction_combing": { "value": "off" }, - "retraction_extrusion_window": { "value": 1.0 }, - "retraction_hop_after_extruder_switch": { "default_value": false }, - "retraction_min_travel": { "value": 0.8 }, - "retraction_speed": { "default_value": 28.0 }, - "skin_outline_count": { "value": "0" }, - "skirt_brim_speed": { "value": 26.0 }, - "skirt_line_count": { "default_value": 2 }, - "speed_layer_0": { "value": 26.0 }, - "speed_prime_tower": { "value": "speed_support" }, - "speed_print": { "default_value": 70.0 }, - "speed_support": { "value": "round(speed_print * 0.82, 1)" }, - "speed_support_interface": { "value": "round(speed_support * 0.689, 1)" }, - "speed_topbottom": { "value": "round(speed_print * 0.65, 1)" }, - "speed_travel": { "value": 105.0 }, - "speed_travel_layer_0": { "value": 80.0 }, - "speed_wall": { "value": "max(5, round(speed_print / 2 - 5, 1))" }, - "speed_wall_0": { "value": "max(5, speed_wall - 5)" }, - "speed_wall_x": { "value": "speed_wall" }, - "support_angle": { "default_value": 60.0 }, - "support_connect_zigzags": { "default_value": false }, - "support_interface_density": { "default_value": 60.0 }, - "support_interface_enable": { "default_value": true }, - "support_interface_height": { "default_value": 0.8 }, - "support_interface_pattern": { "default_value": "lines" }, - "support_material_flow": { "value": "max(0, material_flow - 5)" }, - "support_z_distance": { "default_value": 0.18 }, - "switch_extruder_retraction_amount": { "value": 16.5 }, - "switch_extruder_retraction_speeds": { "default_value": 28.0 }, - "top_skin_preshrink": { "value": 0.0 }, - "wall_0_wipe_dist": { "value": 0.0 }, - "z_seam_corner": { "default_value": "z_seam_corner_any" } - } -} \ No newline at end of file diff --git a/resources/definitions/weedo_tina2.def.json b/resources/definitions/weedo_tina2.def.json deleted file mode 100644 index 7824aa3006..0000000000 --- a/resources/definitions/weedo_tina2.def.json +++ /dev/null @@ -1,200 +0,0 @@ -{ - "version": 2, - "name": "WEEDO TINA2", - "inherits": "weedo_base", - "metadata": - { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_abs_175", - "generic_asa_175", - "generic_bvoh_175", - "generic_cpe_175", - "generic_hips_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eryone_tpu", - "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", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "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", - "volumic_support_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" - ], - "platform_offset": [ - 0, - 0, - 0 - ] - }, - "overrides": - { - "infill_pattern": { "value": "'lines' if infill_sparse_density > 45 else 'grid'" }, - "machine_depth": { "default_value": 120 }, - "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" }, - "machine_heated_bed": { "default_value": false }, - "machine_height": { "default_value": 100 }, - "machine_name": { "default_value": "WEEDO TINA2" }, - "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" }, - "machine_width": { "default_value": 100 }, - "raft_base_thickness": { "value": 0.35 }, - "speed_infill": { "value": 40.0 }, - "speed_print": { "value": 40.0 }, - "speed_print_layer_0": { "value": 22.0 }, - "speed_roofing": { "value": 25.0 }, - "speed_support_bottom": { "value": 30.0 }, - "speed_support_infill": { "value": 45.0 }, - "speed_support_roof": { "value": 30.0 }, - "speed_topbottom": { "value": 30.0 }, - "speed_travel": { "value": 65.0 }, - "speed_travel_layer_0": { "value": 60 }, - "speed_wall": { "value": 25.0 }, - "speed_wall_0": { "value": 20.0 }, - "speed_wall_x": { "value": 25.0 } - } -} \ No newline at end of file diff --git a/resources/definitions/weedo_tina2s.def.json b/resources/definitions/weedo_tina2s.def.json deleted file mode 100644 index 5c11529854..0000000000 --- a/resources/definitions/weedo_tina2s.def.json +++ /dev/null @@ -1,201 +0,0 @@ -{ - "version": 2, - "name": "WEEDO TINA2S", - "inherits": "weedo_base", - "metadata": - { - "visible": true, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "exclude_materials": [ - "3D-Fuel_PLA_PRO_Black", - "3D-Fuel_PLA_SnapSupport", - "bestfilament_abs_skyblue", - "bestfilament_petg_orange", - "bestfilament_pla_green", - "leapfrog_abs_natural", - "leapfrog_epla_natural", - "leapfrog_pva_natural", - "generic_abs_175", - "generic_asa_175", - "generic_cpe_175", - "generic_nylon_175", - "generic_pc_175", - "generic_petg_175", - "generic_pva_175", - "goofoo_abs", - "goofoo_asa", - "goofoo_bronze_pla", - "goofoo_emarble_pla", - "goofoo_esilk_pla", - "goofoo_hips", - "goofoo_pa_cf", - "goofoo_pa", - "goofoo_pc", - "goofoo_peek", - "goofoo_petg", - "goofoo_pla", - "goofoo_pva", - "goofoo_tpe_83a", - "goofoo_tpu_87a", - "goofoo_tpu_95a", - "goofoo_wood_pla", - "emotiontech_abs", - "emotiontech_absx", - "emotiontech_acetate", - "emotiontech_asax", - "emotiontech_bvoh", - "emotiontech_copa", - "emotiontech_hips", - "emotiontech_nylon_1030", - "emotiontech_nylon_1030cf", - "emotiontech_nylon_1070", - "emotiontech_pc", - "emotiontech_pekk", - "emotiontech_petg", - "emotiontech_pla", - "emotiontech_pla_hr_870", - "emotiontech_pva-m", - "emotiontech_pva-s", - "emotiontech_tpu98a", - "eryone_petg", - "eryone_pla_glow", - "eryone_pla_matte", - "eryone_pla_wood", - "eryone_pla", - "eryone_tpu", - "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", - "verbatim_bvoh_175", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "chromatik_pla", - "dsm_arnitel2045_175", - "dsm_novamid1070_175", - "fabtotum_abs", - "fabtotum_nylon", - "fabtotum_pla", - "fabtotum_tpu", - "fdplast_abs_tomato", - "fdplast_petg_gray", - "fdplast_pla_olive", - "fiberlogy_hd_pla", - "filo3d_pla", - "filo3d_pla_green", - "filo3d_pla_red", - "imade3d_petg_green", - "imade3d_petg_pink", - "imade3d_pla_green", - "imade3d_pla_pink", - "imade3d_petg_175", - "imade3d_pla_175", - "innofill_innoflex60_175", - "layer_one_black_pla", - "layer_one_dark_gray_pla", - "layer_one_white_pla", - "octofiber_pla", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_abs", - "redd_asa", - "redd_hips", - "redd_nylon", - "redd_petg", - "redd_pla", - "redd_tpe", - "tizyx_abs", - "tizyx_flex", - "tizyx_petg", - "tizyx_pla_bois", - "tizyx_pla", - "tizyx_pva", - "Vertex_Delta_ABS", - "Vertex_Delta_PET", - "Vertex_Delta_PLA_Glitter", - "Vertex_Delta_PLA_Mat", - "Vertex_Delta_PLA_Satin", - "Vertex_Delta_PLA_Wood", - "Vertex_Delta_PLA", - "Vertex_Delta_TPU", - "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", - "volumic_support_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" - ], - "platform_offset": [ - 0, - 0, - 0 - ] - }, - "overrides": - { - "machine_depth": { "default_value": 110 }, - "machine_end_gcode": { "default_value": ";(**** end.gcode for tina2****)\nM203 Z15\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG28 Z F300\nG28 X0 Y0\nG1 Y90 F1000" }, - "machine_height": { "default_value": 100 }, - "machine_name": { "default_value": "WEEDO TINA2S" }, - "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for tina2****)\nM203 Z15\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000\nG92 E0 ; Reset extruder position\nM203 Z5" }, - "machine_width": { "default_value": 100 }, - "material_bed_temperature": - { - "maximum_value": "65", - "maximum_value_warning": "60" - }, - "raft_base_thickness": { "value": 0.35 }, - "speed_infill": { "value": 40.0 }, - "speed_print": { "value": 40.0 }, - "speed_print_layer_0": { "value": 22.0 }, - "speed_roofing": { "value": 25.0 }, - "speed_support_bottom": { "value": 30.0 }, - "speed_support_infill": { "value": 45.0 }, - "speed_support_roof": { "value": 30.0 }, - "speed_topbottom": { "value": 30.0 }, - "speed_travel": { "value": 65.0 }, - "speed_travel_layer_0": { "value": 60 }, - "speed_wall": { "value": 25.0 }, - "speed_wall_0": { "value": 20.0 }, - "speed_wall_x": { "value": 25.0 } - } -} \ No newline at end of file diff --git a/resources/extruders/weedo_base_extruder_0.def.json b/resources/extruders/weedo_base_extruder_0.def.json deleted file mode 100644 index 311a57f572..0000000000 --- a/resources/extruders/weedo_base_extruder_0.def.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": 2, - "name": "Extruder 1", - "inherits": "fdmextruder", - "metadata": { - "machine": "weedo_base", - "position": "0" - }, - - "overrides": { - "extruder_nr": { "default_value": 0 }, - "material_diameter": { "default_value": 1.75 } - } -} diff --git a/resources/extruders/weedo_x40v3_extruder_left.def.json b/resources/extruders/weedo_x40v3_extruder_left.def.json index 8126207c88..26967d71d9 100644 --- a/resources/extruders/weedo_x40v3_extruder_left.def.json +++ b/resources/extruders/weedo_x40v3_extruder_left.def.json @@ -14,6 +14,6 @@ }, "material_diameter": { "default_value": 1.75 }, "machine_extruder_start_code":{ "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, - "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X-47 F3000\n"} + "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X-49 F3000\n"} } } From d896eb38ff278bf447df56016b7ae0e7e73e31f2 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Fri, 24 May 2024 10:52:06 +0200 Subject: [PATCH 10/43] Preventing PVA and BAM to interfer with the build plate and build volume temperature settings of the model material. PP-371 --- .../quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg | 2 ++ .../quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg | 2 ++ .../quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg | 2 ++ .../quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg | 2 ++ .../quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg | 2 ++ .../quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg | 2 ++ .../quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg | 2 ++ .../quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg | 2 ++ .../quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg | 2 ++ resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg | 2 ++ resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg | 2 ++ 33 files changed, 66 insertions(+) diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg index eb28e13dfa..1b9ef96490 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg @@ -16,6 +16,8 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_heat_up_speed = 1.56 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg index 6bdee60b57..fba4209699 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg @@ -16,6 +16,8 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_heat_up_speed = 1.56 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_material_flow = =material_flow * 0.965 diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg index 407447f7c6..7921c1bbe7 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg @@ -16,6 +16,8 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_heat_up_speed = 1.56 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 skin_material_flow = =material_flow * 0.965 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg index 0433df8c7b..49d92e473f 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 speed_print = 50 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg index d2bf84490f..926ba15fab 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 speed_print = 50 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg index b2ccbffdb0..80a1526bca 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 speed_print = 40 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg index 22d5a3aedf..e8cd213610 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg index 9387393eaa..0521ceec69 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg index fab9114a4b..f114826c4a 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg @@ -18,6 +18,8 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg index bcca24890b..e2f4bd3b41 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg @@ -13,6 +13,8 @@ weight = -1 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg index f398a6a42d..c8625d8dc4 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg @@ -13,6 +13,8 @@ weight = 0 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg index 522f155ad0..cccbe6e43a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg @@ -13,6 +13,8 @@ weight = -2 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg index acd966f3ab..9bea9c666e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg @@ -14,6 +14,8 @@ weight = -3 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg index 44a7379dcb..0424946cab 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg @@ -13,7 +13,9 @@ weight = 1 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = False retraction_count_max = 5 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg index 3541afe350..0f713bc4fd 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg @@ -13,7 +13,9 @@ weight = -1 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_enable = False retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg index 23ac57b474..1937594899 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg @@ -13,7 +13,9 @@ weight = 0 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = False retraction_count_max = 5 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg index e12a164f80..fac2f6022b 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg @@ -13,7 +13,9 @@ weight = -2 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False retraction_count_max = 5 diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg index 4b148bd5fd..f85e2eaf39 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg @@ -14,7 +14,9 @@ weight = -3 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature - 5 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg index 563f441335..7ba8ce6b48 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg @@ -13,7 +13,9 @@ weight = -2 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg index 66e9d39a07..f15c020b2d 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg @@ -13,7 +13,9 @@ weight = -3 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature + 5 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) diff --git a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg index ee6d9fce33..bf7d09c54a 100644 --- a/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg @@ -13,7 +13,9 @@ weight = -4 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature + 5 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg index 6b118fde63..4b1603be59 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg @@ -13,6 +13,8 @@ weight = -1 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg index 6422d61996..e72b2a10c7 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg @@ -13,6 +13,8 @@ weight = 0 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg index 4b82ec4068..a6ecd76664 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg @@ -13,6 +13,8 @@ weight = -2 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg index 6a910b3deb..2e5f7e9f18 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg @@ -14,6 +14,8 @@ weight = -3 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg index 79c891b513..7eddb08a1b 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg @@ -13,7 +13,9 @@ weight = 1 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = False retraction_count_max = 5 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg index 0606d82159..467c991751 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg @@ -13,7 +13,9 @@ weight = -1 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_enable = False retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg index a4e7838358..b89f6c0df1 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg @@ -13,7 +13,9 @@ weight = 0 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = False retraction_count_max = 5 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg index 1f9754b2a2..cba8a6e47e 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg @@ -13,7 +13,9 @@ weight = -2 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature + 5 prime_tower_enable = False retraction_count_max = 5 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg index 04a35d798a..f96cde019e 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg @@ -14,7 +14,9 @@ weight = -3 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature - 5 prime_tower_enable = False retraction_count_max = 5 diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg index bab8bce504..4efde670e1 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg @@ -13,7 +13,9 @@ weight = -2 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg index 31b316d5d2..7cf27136fb 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg @@ -13,7 +13,9 @@ weight = -3 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature + 5 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) diff --git a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg index 773fae8204..00d105e435 100644 --- a/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg @@ -13,7 +13,9 @@ weight = -4 [values] brim_replaces_support = False +build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 material_print_temperature = =default_material_print_temperature + 5 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) From 8632efa4ec4f5b614aca0cd771c2ef6979662ef2 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Thu, 30 May 2024 14:34:52 +0200 Subject: [PATCH 11/43] Updated PVA max. temperature to be 40C iso 70C to prevent problems with PVA in the Bowden tube. PP-333 --- .../quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg | 2 +- .../quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg | 2 +- .../quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg | 2 +- .../quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg | 2 +- .../quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg | 2 +- .../quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg index 49d92e473f..ff16fdfc12 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg @@ -18,7 +18,7 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg index 926ba15fab..ee33eb7e04 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg @@ -18,7 +18,7 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg index 80a1526bca..b71e8805df 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg @@ -18,7 +18,7 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg index e8cd213610..7c9008a463 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg @@ -18,7 +18,7 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg index 0521ceec69..1af44b9b0d 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg @@ -18,7 +18,7 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg index f114826c4a..186ae845de 100644 --- a/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg @@ -18,7 +18,7 @@ _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 acceleration_support_bottom = 100 acceleration_support_interface = 1500 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =40 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 prime_tower_min_volume = 15 skin_material_flow = =material_flow * 0.93 From 03c5eccc73281f67567cef64bc508d49700da106 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Thu, 6 Jun 2024 09:09:36 +0200 Subject: [PATCH 12/43] Changed max. temperature for break away to 50C PP-371 --- .../quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg | 2 +- .../quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg | 2 +- .../quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg | 2 +- resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg | 2 +- resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg | 2 +- resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg | 2 +- resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg | 2 +- resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg | 2 +- resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg | 2 +- resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg | 2 +- resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg index 1b9ef96490..4d19af3298 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.1mm.inst.cfg @@ -16,7 +16,7 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =50 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_heat_up_speed = 1.56 material_print_temperature = =default_material_print_temperature - 5 diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg index fba4209699..bb057c5cda 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.2mm.inst.cfg @@ -16,7 +16,7 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =50 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_heat_up_speed = 1.56 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg index 7921c1bbe7..7203764593 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.3mm.inst.cfg @@ -16,7 +16,7 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0 _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 35 +build_volume_temperature = =50 if extruders_enabled_count > 1 else 35 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_heat_up_speed = 1.56 prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg index e2f4bd3b41..205434e462 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.15mm.inst.cfg @@ -13,7 +13,7 @@ weight = -1 [values] brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg index c8625d8dc4..0e7c3a6500 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.1mm.inst.cfg @@ -13,7 +13,7 @@ weight = 0 [values] brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg index cccbe6e43a..51e698affa 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.2mm.inst.cfg @@ -13,7 +13,7 @@ weight = -2 [values] brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg index 9bea9c666e..348f6de988 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_bam_0.3mm.inst.cfg @@ -14,7 +14,7 @@ weight = -3 [values] brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg index 4b1603be59..808bdd3de3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.15mm.inst.cfg @@ -13,7 +13,7 @@ weight = -1 [values] brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg index e72b2a10c7..4d30a7c10d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.1mm.inst.cfg @@ -13,7 +13,7 @@ weight = 0 [values] brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg index a6ecd76664..65f11b5736 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.2mm.inst.cfg @@ -13,7 +13,7 @@ weight = -2 [values] brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg index 2e5f7e9f18..c4bf1775bb 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_bam_0.3mm.inst.cfg @@ -14,7 +14,7 @@ weight = -3 [values] brim_replaces_support = False -build_volume_temperature = =70 if extruders_enabled_count > 1 else 24 +build_volume_temperature = =50 if extruders_enabled_count > 1 else 24 default_material_bed_temperature = =0 if extruders_enabled_count > 1 else 60 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 From a71784a8c564e58abff7cd1e4667ca1c55ca15d2 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 18 Jun 2024 11:41:02 +0200 Subject: [PATCH 13/43] Add setting for minimal prime tower shell thickness --- resources/definitions/fdmprinter.def.json | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index c76617ec17..d12823e020 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -6902,6 +6902,20 @@ "settable_per_mesh": false, "settable_per_extruder": true }, + "prime_tower_min_shell_thickness": + { + "label": "Prime Tower Minimum Shell Thickness", + "description": "The minimum thickness of the prime tower shell. You may increase it to make the prime tower stronger.", + "unit": "mm", + "type": "float", + "default_value": 0.4, + "minimum_value": "max(extruderValues('prime_tower_line_width'))", + "maximum_value_warning": "10.0", + "enabled": "prime_tower_enable and resolveOrValue('prime_tower_mode') == 'interleaved'", + "resolve": "max(extruderValues('prime_tower_line_width'))", + "settable_per_mesh": false, + "settable_per_extruder": false + }, "prime_tower_position_x": { "label": "Prime Tower X Position", From 96d233fa8cf10ca199094cec829c3111a0ceca6b Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 18 Jun 2024 11:47:05 +0200 Subject: [PATCH 14/43] Add prime_tower_min_shell_thickness to expert settings --- resources/setting_visibility/expert.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index dee3188dd5..5257da75e8 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -371,6 +371,7 @@ prime_tower_base_height prime_tower_base_curve_magnitude prime_tower_raft_base_line_spacing prime_tower_max_bridging_distance +prime_tower_min_shell_thickness ooze_shield_enabled ooze_shield_angle ooze_shield_dist From 79b6794a0bf3ae90ba8a858c0adebdbff01716a1 Mon Sep 17 00:00:00 2001 From: THeijmans Date: Wed, 26 Jun 2024 10:50:50 +0200 Subject: [PATCH 15/43] PP-489 adds 0.1C to the heat up speed, reduces time spend at printing temperature without printing. --- resources/definitions/ultimaker_factor4.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker_factor4.def.json b/resources/definitions/ultimaker_factor4.def.json index 5501148967..684729f710 100644 --- a/resources/definitions/ultimaker_factor4.def.json +++ b/resources/definitions/ultimaker_factor4.def.json @@ -130,7 +130,7 @@ "machine_min_cool_heat_time_window": { "value": "15" }, "machine_name": { "default_value": "Ultimaker Factor 4" }, "machine_nozzle_cool_down_speed": { "value": "0.3 + 0.0025 * material_print_temperature" }, - "machine_nozzle_heat_up_speed": { "value": "2 - 0.0025 * material_print_temperature" }, + "machine_nozzle_heat_up_speed": { "value": "2.1 - 0.0025 * material_print_temperature" }, "machine_start_gcode": { "default_value": "" }, "machine_width": { "default_value": 330 }, "material_bed_temperature": { "maximum_value": "120" }, From cfaeb2d8fcd432ce3bf682b60d490b180efe55ad Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Wed, 26 Jun 2024 13:25:52 +0200 Subject: [PATCH 16/43] Add setting to setup cooling during nozzle switch CURA-11795 --- resources/definitions/fdmprinter.def.json | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index a124145314..85f8ba3124 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4612,6 +4612,21 @@ "maximum_value": "365", "settable_per_mesh": false, "settable_per_extruder": true + }, + "cool_during_extruder_switch": + { + "label": "Cooling during extruder switch", + "description": "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
  • Unchanged: keep the fans as they were previously
  • Only last extruder: turn on the fan of the last used extruder, but turn the others off. This is useful if you have completely separate extruders.
  • All fans: turn on all fans during nozzle switch. This is useful if you have multiple fans that stay close to each other.
", + "type": "enum", + "options": + { + "unchanged": "Unchanged", + "only_last_extruder": "Only last extruder", + "all_fans": "All fans" + }, + "default_value": "unchanged", + "settable_per_mesh": false, + "settable_per_extruder": false } } }, From 86a829a8b58a18c0f047441729b60a24d8541c6b Mon Sep 17 00:00:00 2001 From: THeijmans Date: Wed, 26 Jun 2024 15:00:18 +0200 Subject: [PATCH 17/43] PP-491 Improves top surface quality --- resources/definitions/ultimaker_factor4.def.json | 1 + .../ultimaker_factor4/um_f4_aa0.4_cpe-plus_0.2mm.inst.cfg | 3 ++- .../quality/ultimaker_factor4/um_f4_aa0.4_pc_0.2mm.inst.cfg | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_factor4.def.json b/resources/definitions/ultimaker_factor4.def.json index 5501148967..ca72e05c8f 100644 --- a/resources/definitions/ultimaker_factor4.def.json +++ b/resources/definitions/ultimaker_factor4.def.json @@ -64,6 +64,7 @@ "bridge_skin_material_flow": { "maximum_value": "100" }, "bridge_skin_material_flow_2": { "maximum_value": "100" }, "bridge_skin_material_flow_3": { "maximum_value": "100" }, + "bridge_sparse_infill_max_density": { "value": "50" }, "bridge_wall_material_flow": { "maximum_value": "100" }, "bridge_wall_speed": { "value": "speed_wall" }, "brim_width": { "value": "5" }, diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_cpe-plus_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_cpe-plus_0.2mm.inst.cfg index cd3fdba7a1..a35f2d6e10 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_cpe-plus_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_cpe-plus_0.2mm.inst.cfg @@ -17,5 +17,6 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 inset_direction = outside_in skin_material_flow = =material_flow * 0.93 -speed_print = 60 +speed_print = 80 +wall_thickness = =line_width * 3 diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_pc_0.2mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_pc_0.2mm.inst.cfg index 16ea397d55..3257605cd2 100644 --- a/resources/quality/ultimaker_factor4/um_f4_aa0.4_pc_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_pc_0.2mm.inst.cfg @@ -17,5 +17,6 @@ _plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True _plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 inset_direction = outside_in skin_material_flow = =material_flow * 0.965 -speed_print = 60 +speed_print = 80 +wall_thickness = =line_width * 3 From 7a3f3eb3fa347f3d00fcd38af7d8bb4e9de9719c Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Thu, 27 Jun 2024 01:29:21 -0400 Subject: [PATCH 18/43] Added profiles for PLA / PVA on Method, MethodX and Method XL PP-475 --- .../ultimaker_method_extruder_left.def.json | 29 +++++++ .../ultimaker_method_extruder_right.def.json | 29 +++++++ ...methodx_1a_um-pla-175_0.2mm_solid.inst.cfg | 18 ++++ ...methodx_1c_um-pla-175_0.2mm_solid.inst.cfg | 18 ++++ ...thodx_labs_um-pla-175_0.2mm_solid.inst.cfg | 18 ++++ ...ethodxl_1a_um-pla-175_0.2mm_solid.inst.cfg | 19 ++++ ...ethodxl_1c_um-pla-175_0.2mm_solid.inst.cfg | 19 ++++ ...hodxl_labs_um-pla-175_0.2mm_solid.inst.cfg | 19 ++++ .../um_methodx_1a_um-pla-175_0.2mm.inst.cfg | 84 ++++++++++++++++++ .../um_methodx_1c_um-pla-175_0.2mm.inst.cfg | 84 ++++++++++++++++++ .../um_methodx_2a_um-pva-175_0.2mm.inst.cfg | 77 ++++++++++++++++ .../um_methodx_labs_um-pla-175_0.2mm.inst.cfg | 84 ++++++++++++++++++ .../um_methodxl_1a_um-pla-175_0.2mm.inst.cfg | 87 +++++++++++++++++++ .../um_methodxl_1c_um-pla-175_0.2mm.inst.cfg | 87 +++++++++++++++++++ .../um_methodxl_2a_um-pva-175_0.2mm.inst.cfg | 77 ++++++++++++++++ ...um_methodxl_labs_um-pla-175_0.2mm.inst.cfg | 87 +++++++++++++++++++ .../variants/ultimaker_methodx_2A.inst.cfg | 15 ++++ .../variants/ultimaker_methodxl_1A.inst.cfg | 15 ++++ .../variants/ultimaker_methodxl_2A.inst.cfg | 15 ++++ 19 files changed, 881 insertions(+) create mode 100644 resources/extruders/ultimaker_method_extruder_left.def.json create mode 100644 resources/extruders/ultimaker_method_extruder_right.def.json create mode 100644 resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg create mode 100644 resources/variants/ultimaker_methodx_2A.inst.cfg create mode 100644 resources/variants/ultimaker_methodxl_1A.inst.cfg create mode 100644 resources/variants/ultimaker_methodxl_2A.inst.cfg diff --git a/resources/extruders/ultimaker_method_extruder_left.def.json b/resources/extruders/ultimaker_method_extruder_left.def.json new file mode 100644 index 0000000000..b64e66ad5d --- /dev/null +++ b/resources/extruders/ultimaker_method_extruder_left.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "ultimaker_method", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_extruder_start_code": { + "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" + }, + "machine_extruder_end_code": { + "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" + }, + "machine_extruder_start_code_duration": { + "default_value":8 + } + } +} diff --git a/resources/extruders/ultimaker_method_extruder_right.def.json b/resources/extruders/ultimaker_method_extruder_right.def.json new file mode 100644 index 0000000000..ec4d40dd59 --- /dev/null +++ b/resources/extruders/ultimaker_method_extruder_right.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "Extruder 2", + "inherits": "fdmextruder", + "metadata": { + "machine": "ultimaker_method", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "1" + }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_extruder_start_code": { + "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" + }, + "machine_extruder_end_code": { + "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" + }, + "machine_extruder_start_code_duration": { + "default_value":8 + } + } +} diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..8293c9f51a --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +setting_version = 23 +variant = 1A +material = ultimaker_pla_175 +quality_type = draft +intent_category = solid +type = intent + +[values] +build_volume_temperature = 47 +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..f98c3b0043 --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +setting_version = 23 +variant = 1C +material = ultimaker_pla_175 +quality_type = draft +intent_category = solid +type = intent + +[values] +build_volume_temperature = 47 +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..2c82f9dde9 --- /dev/null +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_methodx +name = Solid +version = 4 + +[metadata] +setting_version = 23 +variant = LABS +material = ultimaker_pla_175 +quality_type = draft +intent_category = solid +type = intent + +[values] +build_volume_temperature = 47 +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..9759b6ccd6 --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_methodxl +name = Solid +version = 4 + +[metadata] +setting_version = 23 +variant = 1A +material = ultimaker_pla_175 +quality_type = draft +intent_category = solid +type = intent + +[values] +build_plate_temperature = 45 +build_volume_temperature = 45 +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..3d6d9ab875 --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_methodxl +name = Solid +version = 4 + +[metadata] +setting_version = 23 +variant = 1C +material = ultimaker_pla_175 +quality_type = draft +intent_category = solid +type = intent + +[values] +build_plate_temperature = 45 +build_volume_temperature = 45 +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..f27719fb38 --- /dev/null +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,19 @@ +[general] +definition = ultimaker_methodxl +name = Solid +version = 4 + +[metadata] +setting_version = 23 +variant = LABS +material = ultimaker_pla_175 +quality_type = draft +intent_category = solid +type = intent + +[values] +build_plate_temperature = 45 +build_volume_temperature = 45 +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..d8d1aba9e8 --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg @@ -0,0 +1,84 @@ +[general] +definition = ultimaker_methodx +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = 1A +material = ultimaker_pla_175 +quality_type = draft +type = quality +weight = -2 + +[values] +bottom_layers = 4 +cool_fan_enabled = True +cool_fan_full_layer = 4 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +infill_sparse_density = 15 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 225 +material_standby_temperature = 160 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.18 +raft_base_line_spacing = 4 +raft_base_line_width = 1.2 +raft_base_speed = =raft_speed +raft_base_thickness = 0.6 +raft_interface_fan_speed = 0 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 60 +raft_interface_thickness = 0.2 +raft_speed = 30 +raft_surface_fan_speed = 0 +raft_surface_line_spacing = 0.425 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +retract_at_layer_change = True +skin_material_flow_layer_0 = =material_flow +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_fan_enable = True +support_infill_angles = [45 ] +support_infill_rate = 12 +support_infill_sparse_thickness = =layer_height +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 1 +support_interface_wall_count = 0 +support_line_width = line_width * 0.75 +support_material_flow = =material_flow * 0.8 +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_roof_material_flow = =support_interface_material_flow +support_roof_wall_count = 1 +support_xy_distance = 0.3 +support_xy_distance_overhang = 0.1 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +switch_extruder_retraction_amount = 0.5 +wall_0_material_flow_layer_0 = =material_flow +wall_x_material_flow_layer_0 = =material_flow + diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..2ee6e68d37 --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg @@ -0,0 +1,84 @@ +[general] +definition = ultimaker_methodx +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = 1C +material = ultimaker_pla_175 +quality_type = draft +type = quality +weight = -2 + +[values] +bottom_layers = 4 +cool_fan_enabled = True +cool_fan_full_layer = 4 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +infill_sparse_density = 15 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 225 +material_standby_temperature = 160 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.18 +raft_base_line_spacing = 4 +raft_base_line_width = 1.2 +raft_base_speed = =raft_speed +raft_base_thickness = 0.6 +raft_interface_fan_speed = 0 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 60 +raft_interface_thickness = 0.2 +raft_speed = 30 +raft_surface_fan_speed = 0 +raft_surface_line_spacing = 0.425 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +retract_at_layer_change = True +skin_material_flow_layer_0 = =material_flow +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_fan_enable = True +support_infill_angles = [45 ] +support_infill_rate = 12 +support_infill_sparse_thickness = =layer_height +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 1 +support_interface_wall_count = 0 +support_line_width = line_width * 0.75 +support_material_flow = =material_flow * 0.8 +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_roof_material_flow = =support_interface_material_flow +support_roof_wall_count = 1 +support_xy_distance = 0.3 +support_xy_distance_overhang = 0.1 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +switch_extruder_retraction_amount = 0.5 +wall_0_material_flow_layer_0 = =material_flow +wall_x_material_flow_layer_0 = =material_flow + diff --git a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..1f5ac00167 --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg @@ -0,0 +1,77 @@ +[general] +definition = ultimaker_methodx +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = 2A +material = ultimaker_pva_175 +quality_type = draft +type = quality +weight = -2 + +[values] +brim_replaces_support = False +cool_fan_enabled = False +cool_min_speed = 5 +cool_min_temperature = =material_print_temperature +initial_layer_line_width_factor = 300 +material_bed_temperature = 45 +material_bed_temperature_layer_0 = 50 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 220 +material_standby_temperature = 160 +prime_tower_flow = 125 +raft_airgap = 0.0 +raft_base_wall_count = 4 +raft_interface_flow = 110 +raft_interface_infill_overlap = 50 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.9 +raft_interface_line_width = 1 +raft_interface_speed = 15 +raft_interface_z_offset = -0.05 +raft_surface_flow = 110 +raft_surface_infill_overlap = 50 +raft_surface_line_spacing = 0.44 +raft_surface_line_width = 0.4 +raft_surface_speed = 20 +raft_surface_thickness = 0.27 +raft_surface_z_offset = -0.075 +retraction_speed = 1.75 +speed_layer_0 = 10 +speed_prime_tower = 10 +speed_print = 50 +speed_roofing = 50 +speed_support = 50 +speed_support_bottom = 10 +speed_support_interface = 50 +speed_topbottom = 50 +speed_wall_0 = 50 +speed_wall_x = 50 +support_angle = 50 +support_bottom_density = 99 +support_bottom_height = 0.406 +support_bottom_line_width = 1.2 +support_bottom_wall_count = 2 +support_conical_angle = 20 +support_conical_min_width = 20 +support_fan_enable = False +support_infill_density_multiplier_layer_0 = 2 +support_infill_rate = 12 +support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height +support_interface_enable = True +support_interface_offset = 0.8 +support_pattern = grid +support_roof_density = 95 +support_roof_height = =layer_height*8 +support_wall_count = 2 +support_xy_distance = 0.2 +support_z_distance = 0 +switch_extruder_extra_prime_amount = 1 +switch_extruder_retraction_amount = 2.5 +switch_extruder_retraction_speeds = 3 + diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..5b615d9329 --- /dev/null +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg @@ -0,0 +1,84 @@ +[general] +definition = ultimaker_methodx +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = LABS +material = ultimaker_pla_175 +quality_type = draft +type = quality +weight = -2 + +[values] +bottom_layers = 4 +cool_fan_enabled = True +cool_fan_full_layer = 4 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +infill_sparse_density = 15 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 225 +material_standby_temperature = 160 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.18 +raft_base_line_spacing = 4 +raft_base_line_width = 1.2 +raft_base_speed = =raft_speed +raft_base_thickness = 0.6 +raft_interface_fan_speed = 0 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 60 +raft_interface_thickness = 0.2 +raft_speed = 30 +raft_surface_fan_speed = 0 +raft_surface_line_spacing = 0.425 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +retract_at_layer_change = True +skin_material_flow_layer_0 = =material_flow +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_fan_enable = True +support_infill_angles = [45 ] +support_infill_rate = 12 +support_infill_sparse_thickness = =layer_height +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 1 +support_interface_wall_count = 0 +support_line_width = line_width * 0.75 +support_material_flow = =material_flow * 0.8 +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_roof_material_flow = =support_interface_material_flow +support_roof_wall_count = 1 +support_xy_distance = 0.3 +support_xy_distance_overhang = 0.1 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +switch_extruder_retraction_amount = 0.5 +wall_0_material_flow_layer_0 = =material_flow +wall_x_material_flow_layer_0 = =material_flow + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..c43848cd42 --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg @@ -0,0 +1,87 @@ +[general] +definition = ultimaker_methodxl +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = 1A +material = ultimaker_pla_175 +quality_type = draft +type = quality +weight = -2 + +[values] +bottom_layers = 4 +cool_fan_enabled = True +cool_fan_full_layer = 4 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +default_material_bed_temperature = 45 +infill_sparse_density = 15 +material_bed_temperature = =default_material_bed_temperature +material_bed_temperature_layer_0 = =default_material_bed_temperature + 5 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 225 +material_standby_temperature = 160 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.18 +raft_base_line_spacing = 4 +raft_base_line_width = 1.2 +raft_base_speed = =raft_speed +raft_base_thickness = 0.6 +raft_interface_fan_speed = 0 +raft_interface_layers = 2 +raft_interface_line_spacing = 0.7 +raft_interface_speed = 60 +raft_interface_thickness = 0.3 +raft_speed = 30 +raft_surface_fan_speed = 0 +raft_surface_line_spacing = 0.425 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +retract_at_layer_change = True +skin_material_flow_layer_0 = =material_flow +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_fan_enable = True +support_infill_angles = [45 ] +support_infill_rate = 12 +support_infill_sparse_thickness = =layer_height +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 1 +support_interface_wall_count = 0 +support_line_width = line_width * 0.75 +support_material_flow = =material_flow * 0.8 +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_roof_material_flow = =support_interface_material_flow +support_roof_wall_count = 1 +support_xy_distance = 0.3 +support_xy_distance_overhang = 0.1 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +switch_extruder_retraction_amount = 0.5 +wall_0_material_flow_layer_0 = =material_flow +wall_x_material_flow_layer_0 = =material_flow + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..cc774cfe15 --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg @@ -0,0 +1,87 @@ +[general] +definition = ultimaker_methodxl +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = 1C +material = ultimaker_pla_175 +quality_type = draft +type = quality +weight = -2 + +[values] +bottom_layers = 4 +cool_fan_enabled = True +cool_fan_full_layer = 4 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +default_material_bed_temperature = 45 +infill_sparse_density = 15 +material_bed_temperature = =default_material_bed_temperature +material_bed_temperature_layer_0 = =default_material_bed_temperature + 5 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 225 +material_standby_temperature = 160 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.18 +raft_base_line_spacing = 4 +raft_base_line_width = 1.2 +raft_base_speed = =raft_speed +raft_base_thickness = 0.6 +raft_interface_fan_speed = 0 +raft_interface_layers = 2 +raft_interface_line_spacing = 0.7 +raft_interface_speed = 60 +raft_interface_thickness = 0.3 +raft_speed = 30 +raft_surface_fan_speed = 0 +raft_surface_line_spacing = 0.425 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +retract_at_layer_change = True +skin_material_flow_layer_0 = =material_flow +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_fan_enable = True +support_infill_angles = [45 ] +support_infill_rate = 12 +support_infill_sparse_thickness = =layer_height +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 1 +support_interface_wall_count = 0 +support_line_width = line_width * 0.75 +support_material_flow = =material_flow * 0.8 +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_roof_material_flow = =support_interface_material_flow +support_roof_wall_count = 1 +support_xy_distance = 0.3 +support_xy_distance_overhang = 0.1 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +switch_extruder_retraction_amount = 0.5 +wall_0_material_flow_layer_0 = =material_flow +wall_x_material_flow_layer_0 = =material_flow + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..2eb21fb62f --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg @@ -0,0 +1,77 @@ +[general] +definition = ultimaker_methodxl +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = 2A +material = ultimaker_pva_175 +quality_type = draft +type = quality +weight = -2 + +[values] +brim_replaces_support = False +cool_fan_enabled = False +cool_min_speed = 5 +cool_min_temperature = =material_print_temperature +initial_layer_line_width_factor = 300 +material_bed_temperature = 45 +material_bed_temperature_layer_0 = 50 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 220 +material_standby_temperature = 160 +prime_tower_flow = 125 +raft_airgap = 0.0 +raft_base_wall_count = 4 +raft_interface_flow = 110 +raft_interface_infill_overlap = 50 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.9 +raft_interface_line_width = 1 +raft_interface_speed = 15 +raft_interface_z_offset = -0.05 +raft_surface_flow = 110 +raft_surface_infill_overlap = 50 +raft_surface_line_spacing = 0.44 +raft_surface_line_width = 0.4 +raft_surface_speed = 20 +raft_surface_thickness = 0.27 +raft_surface_z_offset = -0.075 +retraction_speed = 1.75 +speed_layer_0 = 10 +speed_prime_tower = 10 +speed_print = 50 +speed_roofing = 50 +speed_support = 50 +speed_support_bottom = 10 +speed_support_interface = 50 +speed_topbottom = 50 +speed_wall_0 = 50 +speed_wall_x = 50 +support_angle = 50 +support_bottom_density = 99 +support_bottom_height = 0.406 +support_bottom_line_width = 1.2 +support_bottom_wall_count = 2 +support_conical_angle = 20 +support_conical_min_width = 20 +support_fan_enable = False +support_infill_density_multiplier_layer_0 = 2 +support_infill_rate = 12 +support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height +support_interface_enable = True +support_interface_offset = 0.8 +support_pattern = grid +support_roof_density = 95 +support_roof_height = =layer_height*8 +support_wall_count = 2 +support_xy_distance = 0.2 +support_z_distance = 0 +switch_extruder_extra_prime_amount = 1 +switch_extruder_retraction_amount = 2.5 +switch_extruder_retraction_speeds = 3 + diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..cb6738bc3e --- /dev/null +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg @@ -0,0 +1,87 @@ +[general] +definition = ultimaker_methodxl +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = LABS +material = ultimaker_pla_175 +quality_type = draft +type = quality +weight = -2 + +[values] +bottom_layers = 4 +cool_fan_enabled = True +cool_fan_full_layer = 4 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +default_material_bed_temperature = 45 +infill_sparse_density = 15 +material_bed_temperature = =default_material_bed_temperature +material_bed_temperature_layer_0 = =default_material_bed_temperature + 5 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 225 +material_standby_temperature = 160 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.18 +raft_base_line_spacing = 4 +raft_base_line_width = 1.2 +raft_base_speed = =raft_speed +raft_base_thickness = 0.6 +raft_interface_fan_speed = 0 +raft_interface_layers = 2 +raft_interface_line_spacing = 0.7 +raft_interface_speed = 60 +raft_interface_thickness = 0.3 +raft_speed = 30 +raft_surface_fan_speed = 0 +raft_surface_line_spacing = 0.425 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +retract_at_layer_change = True +skin_material_flow_layer_0 = =material_flow +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_fan_enable = True +support_infill_angles = [45 ] +support_infill_rate = 12 +support_infill_sparse_thickness = =layer_height +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 1 +support_interface_wall_count = 0 +support_line_width = line_width * 0.75 +support_material_flow = =material_flow * 0.8 +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_roof_material_flow = =support_interface_material_flow +support_roof_wall_count = 1 +support_xy_distance = 0.3 +support_xy_distance_overhang = 0.1 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +switch_extruder_retraction_amount = 0.5 +wall_0_material_flow_layer_0 = =material_flow +wall_x_material_flow_layer_0 = =material_flow + diff --git a/resources/variants/ultimaker_methodx_2A.inst.cfg b/resources/variants/ultimaker_methodx_2A.inst.cfg new file mode 100644 index 0000000000..49edb9cf3c --- /dev/null +++ b/resources/variants/ultimaker_methodx_2A.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = ultimaker_methodx +name = 2A +version = 4 + +[metadata] +hardware_type = nozzle +reference_extruder_id = mk14_s +setting_version = 23 +type = variant + +[values] +machine_nozzle_id = 2A +machine_nozzle_size = 0.4 + diff --git a/resources/variants/ultimaker_methodxl_1A.inst.cfg b/resources/variants/ultimaker_methodxl_1A.inst.cfg new file mode 100644 index 0000000000..b7a54d8242 --- /dev/null +++ b/resources/variants/ultimaker_methodxl_1A.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = ultimaker_methodxl +name = 1A +version = 4 + +[metadata] +hardware_type = nozzle +reference_extruder_id = mk14 +setting_version = 23 +type = variant + +[values] +machine_nozzle_id = 1A +machine_nozzle_size = 0.4 + diff --git a/resources/variants/ultimaker_methodxl_2A.inst.cfg b/resources/variants/ultimaker_methodxl_2A.inst.cfg new file mode 100644 index 0000000000..3a93dfdd9f --- /dev/null +++ b/resources/variants/ultimaker_methodxl_2A.inst.cfg @@ -0,0 +1,15 @@ +[general] +definition = ultimaker_methodxl +name = 2A +version = 4 + +[metadata] +hardware_type = nozzle +reference_extruder_id = mk14_s +setting_version = 23 +type = variant + +[values] +machine_nozzle_id = 2A +machine_nozzle_size = 0.4 + From b3dd3c2dfd51fdc7a7ee5a8be84cfbdba52d1dce Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Thu, 27 Jun 2024 01:31:08 -0400 Subject: [PATCH 19/43] Added profiles for PLA / PVA on Method, MethodX and Method XL PP-475 --- .../ultimaker_method_base.def.json | 1108 ++++++++++------- .../ultimaker_methodx_extruder_left.def.json | 28 +- .../ultimaker_methodx_extruder_right.def.json | 28 +- ...inst.cfg => ultimaker_methodx_1A.inst.cfg} | 8 +- 4 files changed, 713 insertions(+), 459 deletions(-) rename resources/variants/{ultimaker_sketch_0.4mm.inst.cfg => ultimaker_methodx_1A.inst.cfg} (54%) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 22d25f92c7..95514f58c6 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -1,436 +1,682 @@ { - "version": 2, - "name": "UltiMaker Method Base Profile", - "inherits": "ultimaker", - "metadata": - { - "visible": false, - "author": "UltiMaker", - "manufacturer": "Ultimaker B.V.", - "file_formats": "application/x-makerbot", - "platform": "ultimaker_method_platform.stl", - "exclude_materials": [ - "dsm_", - "Essentium_", - "imade3d_", - "chromatik_", - "3D-Fuel_", - "bestfilament_", - "emotiontech_", - "eryone_", - "eSUN_", - "Extrudr_", - "fabtotum_", - "fdplast_", - "filo3d_", - "generic_bvoh_175", - "generic_cpe_175", - "generic_hips_175", - "generic_pc_175", - "ultimaker_rapidrinse_175", - "generic_tpu_175", - "goofoo_", - "ideagen3D_", - "imade3d_", - "innofill_", - "layer_one_", - "leapfrog_", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_", - "tizyx_", - "verbatim_", - "Vertex_", - "volumic_", - "xyzprinting_", - "zyyx_pro_", - "octofiber_", - "fiberlogy_" - ], - "has_machine_materials": true, - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "machine_extruder_trains": - { - "0": "ultimaker_method_extruder_left", - "1": "ultimaker_method_extruder_right" - }, - "nozzle_offsetting_for_disallowed_areas": false, - "platform_offset": [ - 0, - 0, - 0 - ], - "platform_texture": "MakerbotMethod.png", - "preferred_material": "generic_pla_175", - "preferred_quality_type": "fast", - "preferred_variant_name": "1A", - "supports_network_connection": true, - "supports_usb_connection": false, - "variants_name": "Extruder", - "weight": -1 + "version": 2, + "inherits": "ultimaker", + "metadata": { + "author": "UltiMaker", + "exclude_materials": [ + "dsm_", + "Essentium_", + "imade3d_", + "chromatik_", + "3D-Fuel_", + "bestfilament_", + "emotiontech_", + "eryone_", + "eSUN_", + "Extrudr_", + "fabtotum_", + "fdplast_", + "filo3d_", + "generic_", + "ultimaker_rapidrinse_175", + "goofoo_", + "ideagen3D_", + "imade3d_", + "innofill_", + "layer_one_", + "leapfrog_", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_", + "tizyx_", + "verbatim_", + "Vertex_", + "volumic_", + "xyzprinting_", + "zyyx_pro_", + "octofiber_", + "fiberlogy_" + ], + "file_formats": "application/x-makerbot", + "has_machine_materials": true, + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { + "0": "ultimaker_method_extruder_left", + "1": "ultimaker_method_extruder_right" }, - "overrides": + "manufacturer": "Ultimaker B.V.", + "nozzle_offsetting_for_disallowed_areas": false, + "platform": "ultimaker_method_platform.stl", + "preferred_quality_type": "fast", + "preferred_variant_name": "1A", + "preferred_material": "ultimaker_pla_175", + "supports_network_connection": true, + "supports_usb_connection": false, + "variants_name": "Extruder", + "visible": false, + "weight": -1 + }, + "name": "UltiMaker Method Base Profile", + "overrides": { + "adhesion_extruder_nr": { + "value": 0 + }, + "adhesion_type": { + "value": "'raft'" + }, + "bridge_enable_more_layers": { + "value": true + }, + "bridge_fan_speed": { + "value": "cool_fan_speed_max" + }, + "bridge_fan_speed_2": { + "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" + }, + "bridge_fan_speed_3": { + "value": "cool_fan_speed_min" + }, + "bridge_settings_enabled": { + "value": true + }, + "bridge_skin_density": { + "value": 100 + }, + "bridge_skin_density_2": { + "value": 100 + }, + "bridge_skin_density_3": { + "value": 100 + }, + "bridge_skin_material_flow": { + "value": "material_flow" + }, + "bridge_skin_material_flow_2": { + "value": "material_flow" + }, + "bridge_skin_material_flow_3": { + "value": "material_flow" + }, + "bridge_skin_speed": { + "value": "speed_topbottom" + }, + "bridge_skin_speed_2": { + "value": "speed_topbottom" + }, + "bridge_skin_speed_3": { + "value": "speed_topbottom" + }, + "bridge_sparse_infill_max_density": { + "value": 50 + }, + "bridge_wall_coast": { + "value": 0 + }, + "bridge_wall_material_flow": { + "value": "material_flow" + }, + "bridge_wall_speed": { + "value": "speed_wall" + }, + "brim_width": { + "value": 5 + }, + "extruder_prime_pos_abs": { + "default_value": true + }, + "gradual_support_infill_steps": { + "value": 0 + }, + "infill_before_walls": { + "value": false + }, + "inset_direction": { + "value": "'inside_out'" + }, + "infill_enable_travel_optimization": { + "value": true + }, + "infill_material_flow": { + "value": "material_flow" + }, + "infill_overlap": { + "value": 0 + }, + "infill_pattern": { + "value": "'lines' if infill_sparse_density > 80 else 'grid'" + }, + "infill_wipe_dist": { + "value": 0 + }, + "layer_start_x": { + "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" + }, + "layer_start_y": { + "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" + }, + "machine_acceleration": { + "default_value": 3000 + }, + "machine_center_is_zero": { + "value": true + }, + "machine_scale_fan_speed_zero_to_one": { + "value": true + }, + "machine_end_gcode": { + "default_value": "" + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_gcode_flavor": { + "default_value": "Griffin" + }, + "machine_heated_bed": { + "default_value": false + }, + "machine_heated_build_volume": { + "default_value": true + }, + "machine_min_cool_heat_time_window": { + "value": 15 + }, + "machine_name": { + "default_value": "UltiMaker Method" + }, + "machine_start_gcode": { + "default_value": "" + }, + "material_initial_print_temperature": { + "value": "material_print_temperature-10" + }, + "material_final_print_temperature": { + "value": "material_print_temperature-10" + }, + "machine_nozzle_heat_up_speed": { + "value": 3.5 + }, + "machine_nozzle_cool_down_speed": { + "value": 0.8 + }, + "material_flow": { + "value": 100 + }, + "skin_material_flow": { + "value": "material_flow" + }, + "material_print_temperature": { + "value": "default_material_print_temperature" + }, + "material_bed_temperature": { + "enabled": "machine_heated_bed" + }, + "material_bed_temperature_layer_0": { + "enabled": "machine_heated_bed" + }, + "material_shrinkage_percentage": { + "enabled": true + }, + "min_wall_line_width": { + "value": 0.4 + }, + "minimum_support_area": { + "value": 0.1 + }, + "multiple_mesh_overlap": { + "value": 0 + }, + "optimize_wall_printing_order": { + "value": true + }, + "prime_blob_enable": { + "enabled": false + }, + "prime_tower_enable": { + "value": false + }, + "prime_tower_flow": { + "value": "material_flow" + }, + "prime_tower_line_width": { + "value": 1 + }, + "prime_tower_raft_base_line_spacing": { + "value": "raft_base_line_width" + }, + "prime_tower_wipe_enabled": { + "value": true + }, + "print_sequence": { - "acceleration_enabled": - { - "enabled": false, - "value": true - }, - "acceleration_infill": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_layer_0": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_prime_tower": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_print": - { - "enabled": false, - "value": 800 - }, - "acceleration_print_layer_0": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_roofing": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_bottom": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_infill": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_interface": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_roof": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_topbottom": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_travel": - { - "enabled": false, - "value": 5000 - }, - "acceleration_travel_enabled": - { - "enabled": false, - "value": true - }, - "acceleration_travel_layer_0": - { - "enabled": false, - "value": "acceleration_travel" - }, - "acceleration_wall": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_0": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_0_roofing": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_x": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_x_roofing": - { - "enabled": false, - "value": "acceleration_print" - }, - "adhesion_extruder_nr": { "value": 0 }, - "adhesion_type": { "value": "'raft'" }, - "bridge_enable_more_layers": { "value": true }, - "bridge_fan_speed": { "value": "cool_fan_speed_max" }, - "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, - "bridge_fan_speed_3": { "value": "cool_fan_speed_min" }, - "bridge_settings_enabled": { "value": true }, - "bridge_skin_density": { "value": 100 }, - "bridge_skin_density_2": { "value": 100 }, - "bridge_skin_density_3": { "value": 100 }, - "bridge_skin_material_flow": { "value": "material_flow" }, - "bridge_skin_material_flow_2": { "value": "material_flow" }, - "bridge_skin_material_flow_3": { "value": "material_flow" }, - "bridge_skin_speed": { "value": "speed_topbottom" }, - "bridge_skin_speed_2": { "value": "speed_topbottom" }, - "bridge_skin_speed_3": { "value": "speed_topbottom" }, - "bridge_sparse_infill_max_density": { "value": 50 }, - "bridge_wall_coast": { "value": 0 }, - "bridge_wall_material_flow": { "value": "material_flow" }, - "bridge_wall_speed": { "value": "speed_wall" }, - "brim_width": { "value": 5 }, - "extruder_prime_pos_abs": { "default_value": true }, - "gradual_support_infill_steps": { "value": 0 }, - "infill_before_walls": { "value": false }, - "infill_enable_travel_optimization": { "value": true }, - "infill_material_flow": { "value": "material_flow" }, - "infill_overlap": { "value": 0 }, - "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'lines'" }, - "infill_wipe_dist": { "value": 0 }, - "inset_direction": { "value": "'inside_out'" }, - "jerk_enabled": - { - "enabled": false, - "value": true - }, - "jerk_infill": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_layer_0": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_prime_tower": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_print": - { - "enabled": false, - "value": 6.25 - }, - "jerk_print_layer_0": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_roofing": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_bottom": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_infill": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_interface": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_roof": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_topbottom": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_travel": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_travel_enabled": - { - "enabled": false, - "value": true - }, - "jerk_travel_layer_0": - { - "enabled": false, - "value": "jerk_travel" - }, - "jerk_wall": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_0": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_0_roofing": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_x": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_x_roofing": - { - "enabled": false, - "value": "jerk_print" - }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, - "machine_acceleration": { "default_value": 3000 }, - "machine_center_is_zero": { "value": true }, - "machine_end_gcode": { "default_value": "" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_gcode_flavor": { "default_value": "Griffin" }, - "machine_heated_bed": { "default_value": false }, - "machine_heated_build_volume": { "default_value": true }, - "machine_min_cool_heat_time_window": { "value": 15 }, - "machine_name": { "default_value": "UltiMaker Method" }, - "machine_nozzle_cool_down_speed": { "value": 0.8 }, - "machine_nozzle_heat_up_speed": { "value": 3.5 }, - "machine_scale_fan_speed_zero_to_one": { "value": true }, - "machine_start_gcode": { "default_value": "" }, - "material_bed_temperature": { "enabled": "machine_heated_bed" }, - "material_bed_temperature_layer_0": { "enabled": "machine_heated_bed" }, - "material_final_print_temperature": { "value": "material_print_temperature-10" }, - "material_flow": { "value": 97 }, - "material_initial_print_temperature": { "value": "material_print_temperature-10" }, - "material_print_temperature": { "value": "default_material_print_temperature" }, - "material_shrinkage_percentage": { "enabled": true }, - "min_wall_line_width": { "value": 0.4 }, - "minimum_support_area": { "value": 0.1 }, - "multiple_mesh_overlap": { "value": 0 }, - "optimize_wall_printing_order": { "value": true }, - "prime_blob_enable": { "enabled": false }, - "prime_tower_base_curve_magnitude": { "value": 2 }, - "prime_tower_base_height": { "value": 6 }, - "prime_tower_base_size": { "value": 10 }, - "prime_tower_enable": { "value": false }, - "prime_tower_flow": { "value": "material_flow" }, - "prime_tower_line_width": { "value": 1 }, - "prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" }, - "prime_tower_wipe_enabled": { "value": true }, - "print_sequence": { "enabled": false }, - "raft_base_line_spacing": { "value": "2*raft_base_line_width" }, - "raft_base_line_width": { "value": 1.4 }, - "raft_base_speed": { "value": 10 }, - "raft_base_thickness": { "value": 0.8 }, - "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" }, - "raft_interface_layers": { "value": 2 }, - "raft_interface_line_width": { "value": 0.7 }, - "raft_interface_speed": { "value": 90 }, - "raft_interface_thickness": { "value": 0.3 }, - "raft_interface_wall_count": { "value": "raft_wall_count" }, - "raft_margin": { "value": 1.2 }, - "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" }, - "raft_surface_wall_count": { "value": "raft_wall_count" }, - "retraction_amount": { "value": 0.75 }, - "retraction_combing": { "value": "'off'" }, - "retraction_combing_max_distance": { "value": "speed_travel / 10" }, - "retraction_count_max": { "value": 100 }, - "retraction_extrusion_window": { "value": 0 }, - "retraction_hop": { "value": 0.4 }, - "retraction_hop_enabled": { "value": true }, - "retraction_hop_only_when_collides": { "value": false }, - "retraction_prime_speed": { "value": "retraction_speed" }, - "retraction_speed": { "value": 5 }, - "roofing_layer_count": { "value": 2 }, - "roofing_monotonic": { "value": true }, - "skin_material_flow": { "value": "0.95*material_flow" }, - "skin_outline_count": { "value": 0 }, - "skin_overlap": { "value": 0 }, - "skin_preshrink": { "value": 0 }, - "skirt_brim_material_flow": { "value": "material_flow" }, - "skirt_brim_minimal_length": { "value": 500 }, - "small_skin_width": { "value": 4 }, - "speed_equalize_flow_width_factor": { "value": 0 }, - "speed_prime_tower": { "value": "speed_topbottom" }, - "speed_print": { "value": 50 }, - "speed_roofing": { "value": "speed_wall_0" }, - "speed_support": { "value": "speed_wall" }, - "speed_support_interface": { "value": "speed_topbottom" }, - "speed_topbottom": { "value": "speed_wall" }, - "speed_travel": { "value": 250 }, - "speed_wall": { "value": "speed_print * 40/50" }, - "speed_wall_0": { "value": "speed_wall * 30/40" }, - "speed_wall_x": { "value": "speed_wall" }, - "support_angle": { "value": 40 }, - "support_bottom_distance": { "value": "support_z_distance / 2" }, - "support_bottom_material_flow": { "value": "material_flow" }, - "support_brim_enable": { "value": false }, - "support_conical_min_width": { "value": 10 }, - "support_enable": { "value": true }, - "support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" }, - "support_fan_enable": { "value": false }, - "support_infill_rate": { "value": 20.0 }, - "support_interface_enable": { "value": true }, - "support_interface_material_flow": { "value": "material_flow" }, - "support_interface_offset": { "value": 0 }, - "support_interface_pattern": { "value": "'lines'" }, - "support_interface_wall_count": { "value": 2 }, - "support_material_flow": { "value": "material_flow" }, - "support_pattern": { "value": "'lines'" }, - "support_roof_material_flow": { "value": "material_flow" }, - "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" }, - "support_top_distance": { "value": "support_z_distance" }, - "support_wall_count": { "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" }, - "support_xy_distance": { "value": 0.2 }, - "support_z_distance": { "value": 0 }, - "switch_extruder_retraction_amount": { "value": 0.5 }, - "switch_extruder_retraction_speeds": { "value": "retraction_speed" }, - "top_bottom_thickness": { "value": "5*layer_height" }, - "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, - "travel_avoid_other_parts": { "value": false }, - "wall_0_inset": { "value": 0 }, - "wall_0_material_flow": { "value": "material_flow" }, - "wall_0_wipe_dist": { "value": 0.8 }, - "wall_material_flow": { "value": "material_flow" }, - "wall_x_material_flow": { "value": "material_flow" }, - "xy_offset": { "value": 0 }, - "xy_offset_layer_0": { "value": "xy_offset" }, - "z_seam_corner": { "value": "'z_seam_corner_none'" }, - "z_seam_position": { "value": "'backright'" }, - "z_seam_type": { "value": "'sharpest_corner'" }, - "zig_zaggify_infill": { "value": true } + "enabled": false + }, + "prime_tower_base_size": { + "value": 10 + }, + "prime_tower_base_height": { + "value": 6 + }, + "prime_tower_base_curve_magnitude": { + "value": 2 + }, + "raft_base_line_spacing": { + "value": "2*raft_base_line_width" + }, + "raft_base_line_width": { + "value": 1.4 + }, + "raft_base_speed": { + "value": 10 + }, + "raft_base_thickness": { + "value": 0.8 + }, + "raft_interface_extruder_nr": { + "value": "raft_surface_extruder_nr" + }, + "raft_interface_layers": { + "value": 2 + }, + "raft_interface_line_width": { + "value": 0.7 + }, + "raft_interface_speed": { + "value": 90 + }, + "raft_interface_thickness": { + "value": 0.3 + }, + "raft_interface_wall_count": { + "value": "raft_wall_count" + }, + "raft_margin": { + "value": 1.2 + }, + "raft_surface_extruder_nr": { + "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" + }, + "raft_surface_wall_count": { + "value": "raft_wall_count" + }, + "retraction_amount": { + "value": 0.75 + }, + "retraction_combing": { + "value": "'off'" + }, + "retraction_combing_max_distance": { + "value": "speed_travel / 10" + }, + "retraction_count_max": { + "value": 100 + }, + "retraction_extrusion_window": { + "value": 0 + }, + "retraction_hop": { + "value": 0.4 + }, + "retraction_hop_enabled": { + "value": true + }, + "retraction_hop_only_when_collides": { + "value": false + }, + "retraction_prime_speed": { + "value": "retraction_speed" + }, + "retraction_speed": { + "value": 5 + }, + "roofing_layer_count": { + "value": 2 + }, + "roofing_monotonic": { + "value": true + }, + "skin_monotonic": { + "value": true + }, + "skin_outline_count": { + "value": 0 + }, + "skin_overlap": { + "value": 0 + }, + "skin_preshrink": { + "value": 0 + }, + "skirt_brim_material_flow": { + "value": "material_flow" + }, + "skirt_brim_minimal_length": { + "value": 500 + }, + "small_skin_width": { + "value": 4 + }, + "speed_equalize_flow_width_factor": { + "value": 0 + }, + "speed_prime_tower": { + "value": "speed_topbottom" + }, + "speed_print": { + "value": 50 + }, + "speed_roofing": { + "value": "speed_wall_0" + }, + "speed_support": { + "value": "speed_wall" + }, + "speed_support_interface": { + "value": "speed_topbottom" + }, + "speed_topbottom": { + "value": "speed_wall" + }, + "speed_travel": { + "value": 250 + }, + "speed_wall": { + "value": "speed_print * 40/50" + }, + "speed_wall_0": { + "value": "speed_wall * 30/40" + }, + "speed_wall_x": { + "value": "speed_wall" + }, + "support_angle": { + "value": 40 + }, + "support_bottom_distance": { + "value": "support_z_distance / 2" + }, + "support_bottom_material_flow": { + "value": "material_flow" + }, + "support_brim_enable": { + "value": false + }, + "support_conical_min_width": { + "value": 10 + }, + "support_enable": { + "value": true + }, + "support_extruder_nr": { + "value": "int(anyExtruderWithMaterial('material_is_support_material'))" + }, + "support_fan_enable": { + "value": false + }, + "support_infill_rate": { + "value": 20.0 + }, + "support_interface_enable": { + "value": true + }, + "support_interface_material_flow": { + "value": "material_flow" + }, + "support_interface_offset": { + "value": 0 + }, + "support_interface_pattern": { + "value": "'lines'" + }, + "support_interface_wall_count": { + "value": 2 + }, + "support_material_flow": { + "value": "material_flow" + }, + "support_pattern": { + "value": "'lines'" + }, + "support_roof_material_flow": { + "value": "material_flow" + }, + "support_supported_skin_fan_speed": { + "value": "cool_fan_speed_max" + }, + "support_top_distance": { + "value": "support_z_distance" + }, + "support_wall_count": { + "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" + }, + "support_xy_distance": { + "value": 0.2 + }, + "support_z_distance": { + "value": 0 + }, + "switch_extruder_retraction_amount": { + "value": 0.5 + }, + "switch_extruder_retraction_speeds": { + "value": "retraction_speed" + }, + "top_bottom_thickness": { + "value": "5*layer_height" + }, + "travel_avoid_distance": { + "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" + }, + "travel_avoid_other_parts": { + "value": false + }, + "wall_0_inset": { + "value": 0 + }, + "wall_0_material_flow": { + "value": "material_flow" + }, + "wall_0_wipe_dist": { + "value": 0.8 + }, + "wall_material_flow": { + "value": "material_flow" + }, + "wall_x_material_flow": { + "value": "material_flow" + }, + "xy_offset": { + "value": 0 + }, + "xy_offset_layer_0": { + "value": "xy_offset" + }, + "zig_zaggify_infill": { + "value": true + }, + "z_seam_corner": { + "value": "'z_seam_corner_none'" + }, + "z_seam_position": { + "value": "'backright'" + }, + "z_seam_relative": { + "value": true + }, + "z_seam_type": { + "value": "'sharpest_corner'" + }, + "acceleration_enabled": { + "value": true, + "enabled": false + }, + "acceleration_travel_enabled": { + "value": true, + "enabled": false + }, + "acceleration_print": { + "value": 800, + "enabled": false + }, + "acceleration_infill": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_0": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_x": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_roofing": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_topbottom": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_infill": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_interface": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_roof": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_bottom": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_prime_tower": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_travel": { + "value": 5000, + "enabled": false + }, + "acceleration_travel_layer_0": { + "value": "acceleration_travel", + "enabled": false + }, + "acceleration_layer_0": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_print_layer_0": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_0_roofing": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_x_roofing": { + "value": "acceleration_print", + "enabled": false + }, + "jerk_enabled": { + "value": true, + "enabled": false + }, + "jerk_travel_enabled": { + "value": true, + "enabled": false + }, + "jerk_print": { + "value": 6.25, + "enabled": false + }, + "jerk_infill": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_0": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_x": { + "value": "jerk_print", + "enabled": false + }, + "jerk_roofing": { + "value": "jerk_print", + "enabled": false + }, + "jerk_topbottom": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_infill": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_interface": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_roof": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_bottom": { + "value": "jerk_print", + "enabled": false + }, + "jerk_prime_tower": { + "value": "jerk_print", + "enabled": false + }, + "jerk_travel": { + "value": "jerk_print", + "enabled": false + }, + "jerk_travel_layer_0": { + "value": "jerk_travel", + "enabled": false + }, + "jerk_layer_0": { + "value": "jerk_print", + "enabled": false + }, + "jerk_print_layer_0": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_0_roofing": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_x_roofing": { + "value": "jerk_print", + "enabled": false } + } } \ No newline at end of file diff --git a/resources/extruders/ultimaker_methodx_extruder_left.def.json b/resources/extruders/ultimaker_methodx_extruder_left.def.json index 648a1d6a5c..a77c9c576b 100644 --- a/resources/extruders/ultimaker_methodx_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_left.def.json @@ -2,24 +2,28 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": - { + "metadata": { "machine": "ultimaker_methodx", "position": "0" }, - "overrides": - { - "extruder_nr": - { + + "overrides": { + "extruder_nr": { "default_value": 0, "maximum_value": "1" }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, - "machine_extruder_start_code_duration": { "default_value": 8 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "machine_extruder_start_code": { + "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" + }, + "machine_extruder_end_code": { + "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" + }, + "machine_extruder_start_code_duration": { + "default_value":8 + } } -} \ No newline at end of file +} diff --git a/resources/extruders/ultimaker_methodx_extruder_right.def.json b/resources/extruders/ultimaker_methodx_extruder_right.def.json index ea52c5dbd2..6ff40895a0 100644 --- a/resources/extruders/ultimaker_methodx_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_right.def.json @@ -2,24 +2,28 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": - { + "metadata": { "machine": "ultimaker_methodx", "position": "1" }, - "overrides": - { - "extruder_nr": - { + + "overrides": { + "extruder_nr": { "default_value": 1, "maximum_value": "1" }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, - "machine_extruder_start_code_duration": { "default_value": 8 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "machine_extruder_start_code": { + "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" + }, + "machine_extruder_end_code": { + "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" + }, + "machine_extruder_start_code_duration": { + "default_value":8 + } } -} \ No newline at end of file +} diff --git a/resources/variants/ultimaker_sketch_0.4mm.inst.cfg b/resources/variants/ultimaker_methodx_1A.inst.cfg similarity index 54% rename from resources/variants/ultimaker_sketch_0.4mm.inst.cfg rename to resources/variants/ultimaker_methodx_1A.inst.cfg index 26ab646015..886c14c184 100644 --- a/resources/variants/ultimaker_sketch_0.4mm.inst.cfg +++ b/resources/variants/ultimaker_methodx_1A.inst.cfg @@ -1,15 +1,15 @@ [general] -definition = ultimaker_sketch -name = 0.4mm +definition = ultimaker_methodx +name = 1A version = 4 [metadata] hardware_type = nozzle -reference_extruder_id = sketch_extruder +reference_extruder_id = mk14 setting_version = 23 type = variant [values] -machine_nozzle_id = 0.4mm +machine_nozzle_id = 1A machine_nozzle_size = 0.4 From 12a04e68d671a326ba2d7b131bc41e03c399c42d Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Thu, 27 Jun 2024 05:32:42 +0000 Subject: [PATCH 20/43] Applied printer-linter format --- .../ultimaker_method_base.def.json | 1102 +++++++---------- .../ultimaker_method_extruder_left.def.json | 28 +- .../ultimaker_method_extruder_right.def.json | 28 +- .../ultimaker_methodx_extruder_left.def.json | 28 +- .../ultimaker_methodx_extruder_right.def.json | 28 +- ...methodx_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...methodx_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...thodx_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...ethodxl_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...ethodxl_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...hodxl_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +- .../um_methodx_1a_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodx_1c_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodx_2a_um-pva-175_0.2mm.inst.cfg | 4 +- .../um_methodx_labs_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodxl_1a_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodxl_1c_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodxl_2a_um-pva-175_0.2mm.inst.cfg | 4 +- ...um_methodxl_labs_um-pla-175_0.2mm.inst.cfg | 4 +- 19 files changed, 506 insertions(+), 776 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 95514f58c6..26d0ce8329 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -1,682 +1,428 @@ { - "version": 2, - "inherits": "ultimaker", - "metadata": { - "author": "UltiMaker", - "exclude_materials": [ - "dsm_", - "Essentium_", - "imade3d_", - "chromatik_", - "3D-Fuel_", - "bestfilament_", - "emotiontech_", - "eryone_", - "eSUN_", - "Extrudr_", - "fabtotum_", - "fdplast_", - "filo3d_", - "generic_", - "ultimaker_rapidrinse_175", - "goofoo_", - "ideagen3D_", - "imade3d_", - "innofill_", - "layer_one_", - "leapfrog_", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_", - "tizyx_", - "verbatim_", - "Vertex_", - "volumic_", - "xyzprinting_", - "zyyx_pro_", - "octofiber_", - "fiberlogy_" - ], - "file_formats": "application/x-makerbot", - "has_machine_materials": true, - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "machine_extruder_trains": { - "0": "ultimaker_method_extruder_left", - "1": "ultimaker_method_extruder_right" - }, - "manufacturer": "Ultimaker B.V.", - "nozzle_offsetting_for_disallowed_areas": false, - "platform": "ultimaker_method_platform.stl", - "preferred_quality_type": "fast", - "preferred_variant_name": "1A", - "preferred_material": "ultimaker_pla_175", - "supports_network_connection": true, - "supports_usb_connection": false, - "variants_name": "Extruder", - "visible": false, - "weight": -1 - }, - "name": "UltiMaker Method Base Profile", - "overrides": { - "adhesion_extruder_nr": { - "value": 0 - }, - "adhesion_type": { - "value": "'raft'" - }, - "bridge_enable_more_layers": { - "value": true - }, - "bridge_fan_speed": { - "value": "cool_fan_speed_max" - }, - "bridge_fan_speed_2": { - "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" - }, - "bridge_fan_speed_3": { - "value": "cool_fan_speed_min" - }, - "bridge_settings_enabled": { - "value": true - }, - "bridge_skin_density": { - "value": 100 - }, - "bridge_skin_density_2": { - "value": 100 - }, - "bridge_skin_density_3": { - "value": 100 - }, - "bridge_skin_material_flow": { - "value": "material_flow" - }, - "bridge_skin_material_flow_2": { - "value": "material_flow" - }, - "bridge_skin_material_flow_3": { - "value": "material_flow" - }, - "bridge_skin_speed": { - "value": "speed_topbottom" - }, - "bridge_skin_speed_2": { - "value": "speed_topbottom" - }, - "bridge_skin_speed_3": { - "value": "speed_topbottom" - }, - "bridge_sparse_infill_max_density": { - "value": 50 - }, - "bridge_wall_coast": { - "value": 0 - }, - "bridge_wall_material_flow": { - "value": "material_flow" - }, - "bridge_wall_speed": { - "value": "speed_wall" - }, - "brim_width": { - "value": 5 - }, - "extruder_prime_pos_abs": { - "default_value": true - }, - "gradual_support_infill_steps": { - "value": 0 - }, - "infill_before_walls": { - "value": false - }, - "inset_direction": { - "value": "'inside_out'" - }, - "infill_enable_travel_optimization": { - "value": true - }, - "infill_material_flow": { - "value": "material_flow" - }, - "infill_overlap": { - "value": 0 - }, - "infill_pattern": { - "value": "'lines' if infill_sparse_density > 80 else 'grid'" - }, - "infill_wipe_dist": { - "value": 0 - }, - "layer_start_x": { - "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" - }, - "layer_start_y": { - "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" - }, - "machine_acceleration": { - "default_value": 3000 - }, - "machine_center_is_zero": { - "value": true - }, - "machine_scale_fan_speed_zero_to_one": { - "value": true - }, - "machine_end_gcode": { - "default_value": "" - }, - "machine_extruder_count": { - "default_value": 2 - }, - "machine_gcode_flavor": { - "default_value": "Griffin" - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_heated_build_volume": { - "default_value": true - }, - "machine_min_cool_heat_time_window": { - "value": 15 - }, - "machine_name": { - "default_value": "UltiMaker Method" - }, - "machine_start_gcode": { - "default_value": "" - }, - "material_initial_print_temperature": { - "value": "material_print_temperature-10" - }, - "material_final_print_temperature": { - "value": "material_print_temperature-10" - }, - "machine_nozzle_heat_up_speed": { - "value": 3.5 - }, - "machine_nozzle_cool_down_speed": { - "value": 0.8 - }, - "material_flow": { - "value": 100 - }, - "skin_material_flow": { - "value": "material_flow" - }, - "material_print_temperature": { - "value": "default_material_print_temperature" - }, - "material_bed_temperature": { - "enabled": "machine_heated_bed" - }, - "material_bed_temperature_layer_0": { - "enabled": "machine_heated_bed" - }, - "material_shrinkage_percentage": { - "enabled": true - }, - "min_wall_line_width": { - "value": 0.4 - }, - "minimum_support_area": { - "value": 0.1 - }, - "multiple_mesh_overlap": { - "value": 0 - }, - "optimize_wall_printing_order": { - "value": true - }, - "prime_blob_enable": { - "enabled": false - }, - "prime_tower_enable": { - "value": false - }, - "prime_tower_flow": { - "value": "material_flow" - }, - "prime_tower_line_width": { - "value": 1 - }, - "prime_tower_raft_base_line_spacing": { - "value": "raft_base_line_width" - }, - "prime_tower_wipe_enabled": { - "value": true - }, - "print_sequence": + "version": 2, + "name": "UltiMaker Method Base Profile", + "inherits": "ultimaker", + "metadata": { - "enabled": false - }, - "prime_tower_base_size": { - "value": 10 - }, - "prime_tower_base_height": { - "value": 6 - }, - "prime_tower_base_curve_magnitude": { - "value": 2 - }, - "raft_base_line_spacing": { - "value": "2*raft_base_line_width" - }, - "raft_base_line_width": { - "value": 1.4 - }, - "raft_base_speed": { - "value": 10 - }, - "raft_base_thickness": { - "value": 0.8 - }, - "raft_interface_extruder_nr": { - "value": "raft_surface_extruder_nr" - }, - "raft_interface_layers": { - "value": 2 - }, - "raft_interface_line_width": { - "value": 0.7 - }, - "raft_interface_speed": { - "value": 90 - }, - "raft_interface_thickness": { - "value": 0.3 - }, - "raft_interface_wall_count": { - "value": "raft_wall_count" - }, - "raft_margin": { - "value": 1.2 - }, - "raft_surface_extruder_nr": { - "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" - }, - "raft_surface_wall_count": { - "value": "raft_wall_count" - }, - "retraction_amount": { - "value": 0.75 - }, - "retraction_combing": { - "value": "'off'" - }, - "retraction_combing_max_distance": { - "value": "speed_travel / 10" - }, - "retraction_count_max": { - "value": 100 - }, - "retraction_extrusion_window": { - "value": 0 - }, - "retraction_hop": { - "value": 0.4 - }, - "retraction_hop_enabled": { - "value": true - }, - "retraction_hop_only_when_collides": { - "value": false - }, - "retraction_prime_speed": { - "value": "retraction_speed" - }, - "retraction_speed": { - "value": 5 - }, - "roofing_layer_count": { - "value": 2 - }, - "roofing_monotonic": { - "value": true - }, - "skin_monotonic": { - "value": true - }, - "skin_outline_count": { - "value": 0 - }, - "skin_overlap": { - "value": 0 - }, - "skin_preshrink": { - "value": 0 - }, - "skirt_brim_material_flow": { - "value": "material_flow" - }, - "skirt_brim_minimal_length": { - "value": 500 - }, - "small_skin_width": { - "value": 4 - }, - "speed_equalize_flow_width_factor": { - "value": 0 - }, - "speed_prime_tower": { - "value": "speed_topbottom" - }, - "speed_print": { - "value": 50 - }, - "speed_roofing": { - "value": "speed_wall_0" - }, - "speed_support": { - "value": "speed_wall" - }, - "speed_support_interface": { - "value": "speed_topbottom" - }, - "speed_topbottom": { - "value": "speed_wall" - }, - "speed_travel": { - "value": 250 - }, - "speed_wall": { - "value": "speed_print * 40/50" - }, - "speed_wall_0": { - "value": "speed_wall * 30/40" - }, - "speed_wall_x": { - "value": "speed_wall" - }, - "support_angle": { - "value": 40 - }, - "support_bottom_distance": { - "value": "support_z_distance / 2" - }, - "support_bottom_material_flow": { - "value": "material_flow" - }, - "support_brim_enable": { - "value": false - }, - "support_conical_min_width": { - "value": 10 - }, - "support_enable": { - "value": true - }, - "support_extruder_nr": { - "value": "int(anyExtruderWithMaterial('material_is_support_material'))" - }, - "support_fan_enable": { - "value": false - }, - "support_infill_rate": { - "value": 20.0 - }, - "support_interface_enable": { - "value": true - }, - "support_interface_material_flow": { - "value": "material_flow" - }, - "support_interface_offset": { - "value": 0 - }, - "support_interface_pattern": { - "value": "'lines'" - }, - "support_interface_wall_count": { - "value": 2 - }, - "support_material_flow": { - "value": "material_flow" - }, - "support_pattern": { - "value": "'lines'" - }, - "support_roof_material_flow": { - "value": "material_flow" - }, - "support_supported_skin_fan_speed": { - "value": "cool_fan_speed_max" - }, - "support_top_distance": { - "value": "support_z_distance" - }, - "support_wall_count": { - "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" - }, - "support_xy_distance": { - "value": 0.2 - }, - "support_z_distance": { - "value": 0 - }, - "switch_extruder_retraction_amount": { - "value": 0.5 - }, - "switch_extruder_retraction_speeds": { - "value": "retraction_speed" - }, - "top_bottom_thickness": { - "value": "5*layer_height" - }, - "travel_avoid_distance": { - "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" - }, - "travel_avoid_other_parts": { - "value": false - }, - "wall_0_inset": { - "value": 0 - }, - "wall_0_material_flow": { - "value": "material_flow" - }, - "wall_0_wipe_dist": { - "value": 0.8 - }, - "wall_material_flow": { - "value": "material_flow" - }, - "wall_x_material_flow": { - "value": "material_flow" - }, - "xy_offset": { - "value": 0 - }, - "xy_offset_layer_0": { - "value": "xy_offset" - }, - "zig_zaggify_infill": { - "value": true - }, - "z_seam_corner": { - "value": "'z_seam_corner_none'" - }, - "z_seam_position": { - "value": "'backright'" - }, - "z_seam_relative": { - "value": true - }, - "z_seam_type": { - "value": "'sharpest_corner'" - }, - "acceleration_enabled": { - "value": true, - "enabled": false - }, - "acceleration_travel_enabled": { - "value": true, - "enabled": false - }, - "acceleration_print": { - "value": 800, - "enabled": false - }, - "acceleration_infill": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_0": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_x": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_roofing": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_topbottom": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_infill": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_interface": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_roof": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_bottom": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_prime_tower": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_travel": { - "value": 5000, - "enabled": false - }, - "acceleration_travel_layer_0": { - "value": "acceleration_travel", - "enabled": false - }, - "acceleration_layer_0": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_print_layer_0": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_0_roofing": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_x_roofing": { - "value": "acceleration_print", - "enabled": false - }, - "jerk_enabled": { - "value": true, - "enabled": false - }, - "jerk_travel_enabled": { - "value": true, - "enabled": false - }, - "jerk_print": { - "value": 6.25, - "enabled": false - }, - "jerk_infill": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_0": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_x": { - "value": "jerk_print", - "enabled": false - }, - "jerk_roofing": { - "value": "jerk_print", - "enabled": false - }, - "jerk_topbottom": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_infill": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_interface": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_roof": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_bottom": { - "value": "jerk_print", - "enabled": false - }, - "jerk_prime_tower": { - "value": "jerk_print", - "enabled": false - }, - "jerk_travel": { - "value": "jerk_print", - "enabled": false - }, - "jerk_travel_layer_0": { - "value": "jerk_travel", - "enabled": false - }, - "jerk_layer_0": { - "value": "jerk_print", - "enabled": false - }, - "jerk_print_layer_0": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_0_roofing": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_x_roofing": { - "value": "jerk_print", - "enabled": false + "visible": false, + "author": "UltiMaker", + "manufacturer": "Ultimaker B.V.", + "file_formats": "application/x-makerbot", + "platform": "ultimaker_method_platform.stl", + "exclude_materials": [ + "dsm_", + "Essentium_", + "imade3d_", + "chromatik_", + "3D-Fuel_", + "bestfilament_", + "emotiontech_", + "eryone_", + "eSUN_", + "Extrudr_", + "fabtotum_", + "fdplast_", + "filo3d_", + "generic_", + "ultimaker_rapidrinse_175", + "goofoo_", + "ideagen3D_", + "imade3d_", + "innofill_", + "layer_one_", + "leapfrog_", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_", + "tizyx_", + "verbatim_", + "Vertex_", + "volumic_", + "xyzprinting_", + "zyyx_pro_", + "octofiber_", + "fiberlogy_" + ], + "has_machine_materials": true, + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": + { + "0": "ultimaker_method_extruder_left", + "1": "ultimaker_method_extruder_right" + }, + "nozzle_offsetting_for_disallowed_areas": false, + "preferred_material": "ultimaker_pla_175", + "preferred_quality_type": "fast", + "preferred_variant_name": "1A", + "supports_network_connection": true, + "supports_usb_connection": false, + "variants_name": "Extruder", + "weight": -1 + }, + "overrides": + { + "acceleration_enabled": + { + "enabled": false, + "value": true + }, + "acceleration_infill": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_layer_0": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_prime_tower": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_print": + { + "enabled": false, + "value": 800 + }, + "acceleration_print_layer_0": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_roofing": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_bottom": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_infill": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_interface": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_roof": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_topbottom": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_travel": + { + "enabled": false, + "value": 5000 + }, + "acceleration_travel_enabled": + { + "enabled": false, + "value": true + }, + "acceleration_travel_layer_0": + { + "enabled": false, + "value": "acceleration_travel" + }, + "acceleration_wall": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_0": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_0_roofing": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_x": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_x_roofing": + { + "enabled": false, + "value": "acceleration_print" + }, + "adhesion_extruder_nr": { "value": 0 }, + "adhesion_type": { "value": "'raft'" }, + "bridge_enable_more_layers": { "value": true }, + "bridge_fan_speed": { "value": "cool_fan_speed_max" }, + "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, + "bridge_fan_speed_3": { "value": "cool_fan_speed_min" }, + "bridge_settings_enabled": { "value": true }, + "bridge_skin_density": { "value": 100 }, + "bridge_skin_density_2": { "value": 100 }, + "bridge_skin_density_3": { "value": 100 }, + "bridge_skin_material_flow": { "value": "material_flow" }, + "bridge_skin_material_flow_2": { "value": "material_flow" }, + "bridge_skin_material_flow_3": { "value": "material_flow" }, + "bridge_skin_speed": { "value": "speed_topbottom" }, + "bridge_skin_speed_2": { "value": "speed_topbottom" }, + "bridge_skin_speed_3": { "value": "speed_topbottom" }, + "bridge_sparse_infill_max_density": { "value": 50 }, + "bridge_wall_coast": { "value": 0 }, + "bridge_wall_material_flow": { "value": "material_flow" }, + "bridge_wall_speed": { "value": "speed_wall" }, + "brim_width": { "value": 5 }, + "extruder_prime_pos_abs": { "default_value": true }, + "gradual_support_infill_steps": { "value": 0 }, + "infill_before_walls": { "value": false }, + "infill_enable_travel_optimization": { "value": true }, + "infill_material_flow": { "value": "material_flow" }, + "infill_overlap": { "value": 0 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 80 else 'grid'" }, + "infill_wipe_dist": { "value": 0 }, + "inset_direction": { "value": "'inside_out'" }, + "jerk_enabled": + { + "enabled": false, + "value": true + }, + "jerk_infill": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_layer_0": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_prime_tower": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_print": + { + "enabled": false, + "value": 6.25 + }, + "jerk_print_layer_0": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_roofing": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_bottom": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_infill": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_interface": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_roof": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_topbottom": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_travel": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_travel_enabled": + { + "enabled": false, + "value": true + }, + "jerk_travel_layer_0": + { + "enabled": false, + "value": "jerk_travel" + }, + "jerk_wall": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_0": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_0_roofing": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_x": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_x_roofing": + { + "enabled": false, + "value": "jerk_print" + }, + "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, + "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_center_is_zero": { "value": true }, + "machine_end_gcode": { "default_value": "" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Griffin" }, + "machine_heated_bed": { "default_value": false }, + "machine_heated_build_volume": { "default_value": true }, + "machine_min_cool_heat_time_window": { "value": 15 }, + "machine_name": { "default_value": "UltiMaker Method" }, + "machine_nozzle_cool_down_speed": { "value": 0.8 }, + "machine_nozzle_heat_up_speed": { "value": 3.5 }, + "machine_scale_fan_speed_zero_to_one": { "value": true }, + "machine_start_gcode": { "default_value": "" }, + "material_bed_temperature": { "enabled": "machine_heated_bed" }, + "material_bed_temperature_layer_0": { "enabled": "machine_heated_bed" }, + "material_final_print_temperature": { "value": "material_print_temperature-10" }, + "material_flow": { "value": 100 }, + "material_initial_print_temperature": { "value": "material_print_temperature-10" }, + "material_print_temperature": { "value": "default_material_print_temperature" }, + "material_shrinkage_percentage": { "enabled": true }, + "min_wall_line_width": { "value": 0.4 }, + "minimum_support_area": { "value": 0.1 }, + "multiple_mesh_overlap": { "value": 0 }, + "optimize_wall_printing_order": { "value": true }, + "prime_blob_enable": { "enabled": false }, + "prime_tower_base_curve_magnitude": { "value": 2 }, + "prime_tower_base_height": { "value": 6 }, + "prime_tower_base_size": { "value": 10 }, + "prime_tower_enable": { "value": false }, + "prime_tower_flow": { "value": "material_flow" }, + "prime_tower_line_width": { "value": 1 }, + "prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" }, + "prime_tower_wipe_enabled": { "value": true }, + "print_sequence": { "enabled": false }, + "raft_base_line_spacing": { "value": "2*raft_base_line_width" }, + "raft_base_line_width": { "value": 1.4 }, + "raft_base_speed": { "value": 10 }, + "raft_base_thickness": { "value": 0.8 }, + "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" }, + "raft_interface_layers": { "value": 2 }, + "raft_interface_line_width": { "value": 0.7 }, + "raft_interface_speed": { "value": 90 }, + "raft_interface_thickness": { "value": 0.3 }, + "raft_interface_wall_count": { "value": "raft_wall_count" }, + "raft_margin": { "value": 1.2 }, + "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" }, + "raft_surface_wall_count": { "value": "raft_wall_count" }, + "retraction_amount": { "value": 0.75 }, + "retraction_combing": { "value": "'off'" }, + "retraction_combing_max_distance": { "value": "speed_travel / 10" }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 0 }, + "retraction_hop": { "value": 0.4 }, + "retraction_hop_enabled": { "value": true }, + "retraction_hop_only_when_collides": { "value": false }, + "retraction_prime_speed": { "value": "retraction_speed" }, + "retraction_speed": { "value": 5 }, + "roofing_layer_count": { "value": 2 }, + "roofing_monotonic": { "value": true }, + "skin_material_flow": { "value": "material_flow" }, + "skin_monotonic": { "value": true }, + "skin_outline_count": { "value": 0 }, + "skin_overlap": { "value": 0 }, + "skin_preshrink": { "value": 0 }, + "skirt_brim_material_flow": { "value": "material_flow" }, + "skirt_brim_minimal_length": { "value": 500 }, + "small_skin_width": { "value": 4 }, + "speed_equalize_flow_width_factor": { "value": 0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 50 }, + "speed_roofing": { "value": "speed_wall_0" }, + "speed_support": { "value": "speed_wall" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_topbottom": { "value": "speed_wall" }, + "speed_travel": { "value": 250 }, + "speed_wall": { "value": "speed_print * 40/50" }, + "speed_wall_0": { "value": "speed_wall * 30/40" }, + "speed_wall_x": { "value": "speed_wall" }, + "support_angle": { "value": 40 }, + "support_bottom_distance": { "value": "support_z_distance / 2" }, + "support_bottom_material_flow": { "value": "material_flow" }, + "support_brim_enable": { "value": false }, + "support_conical_min_width": { "value": 10 }, + "support_enable": { "value": true }, + "support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" }, + "support_fan_enable": { "value": false }, + "support_infill_rate": { "value": 20.0 }, + "support_interface_enable": { "value": true }, + "support_interface_material_flow": { "value": "material_flow" }, + "support_interface_offset": { "value": 0 }, + "support_interface_pattern": { "value": "'lines'" }, + "support_interface_wall_count": { "value": 2 }, + "support_material_flow": { "value": "material_flow" }, + "support_pattern": { "value": "'lines'" }, + "support_roof_material_flow": { "value": "material_flow" }, + "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" }, + "support_top_distance": { "value": "support_z_distance" }, + "support_wall_count": { "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" }, + "support_xy_distance": { "value": 0.2 }, + "support_z_distance": { "value": 0 }, + "switch_extruder_retraction_amount": { "value": 0.5 }, + "switch_extruder_retraction_speeds": { "value": "retraction_speed" }, + "top_bottom_thickness": { "value": "5*layer_height" }, + "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, + "travel_avoid_other_parts": { "value": false }, + "wall_0_inset": { "value": 0 }, + "wall_0_material_flow": { "value": "material_flow" }, + "wall_0_wipe_dist": { "value": 0.8 }, + "wall_material_flow": { "value": "material_flow" }, + "wall_x_material_flow": { "value": "material_flow" }, + "xy_offset": { "value": 0 }, + "xy_offset_layer_0": { "value": "xy_offset" }, + "z_seam_corner": { "value": "'z_seam_corner_none'" }, + "z_seam_position": { "value": "'backright'" }, + "z_seam_relative": { "value": true }, + "z_seam_type": { "value": "'sharpest_corner'" }, + "zig_zaggify_infill": { "value": true } } - } } \ No newline at end of file diff --git a/resources/extruders/ultimaker_method_extruder_left.def.json b/resources/extruders/ultimaker_method_extruder_left.def.json index b64e66ad5d..f6c9e35622 100644 --- a/resources/extruders/ultimaker_method_extruder_left.def.json +++ b/resources/extruders/ultimaker_method_extruder_left.def.json @@ -2,28 +2,24 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_method", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_code": { - "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" - }, - "machine_extruder_end_code": { - "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" - }, - "machine_extruder_start_code_duration": { - "default_value":8 - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_method_extruder_right.def.json b/resources/extruders/ultimaker_method_extruder_right.def.json index ec4d40dd59..9c6521f35b 100644 --- a/resources/extruders/ultimaker_method_extruder_right.def.json +++ b/resources/extruders/ultimaker_method_extruder_right.def.json @@ -2,28 +2,24 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_method", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_code": { - "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" - }, - "machine_extruder_end_code": { - "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" - }, - "machine_extruder_start_code_duration": { - "default_value":8 - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_methodx_extruder_left.def.json b/resources/extruders/ultimaker_methodx_extruder_left.def.json index a77c9c576b..1e4fefb17e 100644 --- a/resources/extruders/ultimaker_methodx_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_left.def.json @@ -2,28 +2,24 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_methodx", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_code": { - "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" - }, - "machine_extruder_end_code": { - "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" - }, - "machine_extruder_start_code_duration": { - "default_value":8 - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_methodx_extruder_right.def.json b/resources/extruders/ultimaker_methodx_extruder_right.def.json index 6ff40895a0..34aba96b42 100644 --- a/resources/extruders/ultimaker_methodx_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_right.def.json @@ -2,28 +2,24 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_methodx", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_code": { - "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" - }, - "machine_extruder_end_code": { - "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" - }, - "machine_extruder_start_code_duration": { - "default_value":8 - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg index 8293c9f51a..5375e81138 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1A +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1A [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg index f98c3b0043..7164ec03e8 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg index 2c82f9dde9..271a651e20 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg index 9759b6ccd6..428c5e950f 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1A +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1A [values] build_plate_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg index 3d6d9ab875..fff7bb9e19 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] build_plate_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg index f27719fb38..c27d1e596a 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] build_plate_temperature = 45 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg index d8d1aba9e8..9db56941cb 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1A material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg index 2ee6e68d37..a75826d1ae 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg index 1f5ac00167..4fa889187b 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 2A material = ultimaker_pva_175 quality_type = draft +setting_version = 23 type = quality +variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg index 5b615d9329..44b777ea77 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg index c43848cd42..c1f049384a 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1A material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg index cc774cfe15..9ddfc18600 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg index 2eb21fb62f..594c9e6d15 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 2A material = ultimaker_pva_175 quality_type = draft +setting_version = 23 type = quality +variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg index cb6738bc3e..40a85a3a0e 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] From aacc11a1be3c6f421ed23b46094281a57bd3348f Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 27 Jun 2024 08:52:06 +0200 Subject: [PATCH 21/43] Setup multi cooling fans for Method printers CURA-11795 --- resources/extruders/ultimaker_methodx_extruder_left.def.json | 5 +++-- .../extruders/ultimaker_methodx_extruder_right.def.json | 5 +++-- .../extruders/ultimaker_methodxl_extruder_left.def.json | 5 +++-- .../extruders/ultimaker_methodxl_extruder_right.def.json | 5 +++-- 4 files changed, 12 insertions(+), 8 deletions(-) diff --git a/resources/extruders/ultimaker_methodx_extruder_left.def.json b/resources/extruders/ultimaker_methodx_extruder_left.def.json index 648a1d6a5c..de0c566a28 100644 --- a/resources/extruders/ultimaker_methodx_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_left.def.json @@ -14,8 +14,9 @@ "default_value": 0, "maximum_value": "1" }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, + "machine_extruder_cooling_fan_number": { "default_value": 0 }, + "machine_extruder_end_code": { "default_value": "G91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodx_extruder_right.def.json b/resources/extruders/ultimaker_methodx_extruder_right.def.json index ea52c5dbd2..a837f9943f 100644 --- a/resources/extruders/ultimaker_methodx_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_right.def.json @@ -14,8 +14,9 @@ "default_value": 1, "maximum_value": "1" }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, + "machine_extruder_cooling_fan_number": { "default_value": 1 }, + "machine_extruder_end_code": { "default_value": "G91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodxl_extruder_left.def.json b/resources/extruders/ultimaker_methodxl_extruder_left.def.json index 43de74b497..175029aa69 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_left.def.json @@ -14,8 +14,9 @@ "default_value": 0, "maximum_value": "1" }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, + "machine_extruder_cooling_fan_number": { "default_value": 0 }, + "machine_extruder_end_code": { "default_value": "G91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90" }, "machine_extruder_start_code_duration": { "default_value": 10 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodxl_extruder_right.def.json b/resources/extruders/ultimaker_methodxl_extruder_right.def.json index 581811646f..7749974663 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_right.def.json @@ -14,8 +14,9 @@ "default_value": 1, "maximum_value": "1" }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, + "machine_extruder_cooling_fan_number": { "default_value": 1 }, + "machine_extruder_end_code": { "default_value": "G91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90" }, "machine_extruder_start_code_duration": { "default_value": 10 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, From 40881268a0c7af98d4dbb6256881ca4c269a54bc Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 27 Jun 2024 08:52:40 +0200 Subject: [PATCH 22/43] Activate all fans cooling during switch for UM printers CURA-11795 --- resources/definitions/ultimaker.def.json | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 97bb099ea4..02cba7db20 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -36,6 +36,7 @@ "bridge_wall_coast": { "value": 0 }, "bridge_wall_material_flow": { "value": "wall_material_flow" }, "bridge_wall_speed": { "value": "bridge_skin_speed" }, + "cool_during_extruder_switch": { "value": "'all_fans'" }, "cool_fan_speed_0": { "value": "cool_fan_speed_min" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_layer_time": { "value": 6 }, From a9b144c0fa2528e68ab7f2b752994390fbb1d136 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 27 Jun 2024 08:52:59 +0200 Subject: [PATCH 23/43] Refine setting description CURA-11795 --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 85f8ba3124..a661d78e31 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4616,7 +4616,7 @@ "cool_during_extruder_switch": { "label": "Cooling during extruder switch", - "description": "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
  • Unchanged: keep the fans as they were previously
  • Only last extruder: turn on the fan of the last used extruder, but turn the others off. This is useful if you have completely separate extruders.
  • All fans: turn on all fans during nozzle switch. This is useful if you have multiple fans that stay close to each other.
", + "description": "Whether to activate the cooling fans during a nozzle switch. This can help reducing oozing by cooling the nozzle faster:
  • Unchanged: keep the fans as they were previously
  • Only last extruder: turn on the fan of the last used extruder, but turn the others off (if any). This is useful if you have completely separate extruders.
  • All fans: turn on all fans during nozzle switch. This is useful if you have a single cooling fan, or multiple fans that stay close to each other.
", "type": "enum", "options": { From ecf482016a596e19ba62e8cda37849819712f16c Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 27 Jun 2024 10:23:04 +0200 Subject: [PATCH 24/43] Not enable fans cooling during extruder switch This will be applied by more specific profiles CURA-11795 --- resources/definitions/ultimaker.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 02cba7db20..97bb099ea4 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -36,7 +36,6 @@ "bridge_wall_coast": { "value": 0 }, "bridge_wall_material_flow": { "value": "wall_material_flow" }, "bridge_wall_speed": { "value": "bridge_skin_speed" }, - "cool_during_extruder_switch": { "value": "'all_fans'" }, "cool_fan_speed_0": { "value": "cool_fan_speed_min" }, "cool_fan_speed_max": { "value": "100" }, "cool_min_layer_time": { "value": 6 }, From b5cd19d6fc202646a376c96e5fc361bc1993fa0d Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 27 Jun 2024 11:12:13 +0200 Subject: [PATCH 25/43] Revert "Setup multi cooling fans for Method printers" This reverts commit aacc11a1be3c6f421ed23b46094281a57bd3348f. --- resources/extruders/ultimaker_methodx_extruder_left.def.json | 5 ++--- .../extruders/ultimaker_methodx_extruder_right.def.json | 5 ++--- .../extruders/ultimaker_methodxl_extruder_left.def.json | 5 ++--- .../extruders/ultimaker_methodxl_extruder_right.def.json | 5 ++--- 4 files changed, 8 insertions(+), 12 deletions(-) diff --git a/resources/extruders/ultimaker_methodx_extruder_left.def.json b/resources/extruders/ultimaker_methodx_extruder_left.def.json index de0c566a28..648a1d6a5c 100644 --- a/resources/extruders/ultimaker_methodx_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_left.def.json @@ -14,9 +14,8 @@ "default_value": 0, "maximum_value": "1" }, - "machine_extruder_cooling_fan_number": { "default_value": 0 }, - "machine_extruder_end_code": { "default_value": "G91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90" }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodx_extruder_right.def.json b/resources/extruders/ultimaker_methodx_extruder_right.def.json index a837f9943f..ea52c5dbd2 100644 --- a/resources/extruders/ultimaker_methodx_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_right.def.json @@ -14,9 +14,8 @@ "default_value": 1, "maximum_value": "1" }, - "machine_extruder_cooling_fan_number": { "default_value": 1 }, - "machine_extruder_end_code": { "default_value": "G91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90" }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodxl_extruder_left.def.json b/resources/extruders/ultimaker_methodxl_extruder_left.def.json index 175029aa69..43de74b497 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_left.def.json @@ -14,9 +14,8 @@ "default_value": 0, "maximum_value": "1" }, - "machine_extruder_cooling_fan_number": { "default_value": 0 }, - "machine_extruder_end_code": { "default_value": "G91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90" }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, "machine_extruder_start_code_duration": { "default_value": 10 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, diff --git a/resources/extruders/ultimaker_methodxl_extruder_right.def.json b/resources/extruders/ultimaker_methodxl_extruder_right.def.json index 7749974663..581811646f 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_right.def.json @@ -14,9 +14,8 @@ "default_value": 1, "maximum_value": "1" }, - "machine_extruder_cooling_fan_number": { "default_value": 1 }, - "machine_extruder_end_code": { "default_value": "G91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90" }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, "machine_extruder_start_code_duration": { "default_value": 10 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, From 3712b81d76355f373ab69979edef4aa386469c6e Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Thu, 27 Jun 2024 11:14:21 +0200 Subject: [PATCH 26/43] Setup multi cooling fans for Method printers Start and end G-code are intentionally not updated, to keep the current behavior in place until the fans use is properly setup. CURA-11795 --- resources/extruders/ultimaker_methodx_extruder_left.def.json | 1 + resources/extruders/ultimaker_methodx_extruder_right.def.json | 1 + resources/extruders/ultimaker_methodxl_extruder_left.def.json | 1 + resources/extruders/ultimaker_methodxl_extruder_right.def.json | 1 + 4 files changed, 4 insertions(+) diff --git a/resources/extruders/ultimaker_methodx_extruder_left.def.json b/resources/extruders/ultimaker_methodx_extruder_left.def.json index 648a1d6a5c..9ee09b9fae 100644 --- a/resources/extruders/ultimaker_methodx_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_left.def.json @@ -14,6 +14,7 @@ "default_value": 0, "maximum_value": "1" }, + "machine_extruder_cooling_fan_number": { "default_value": 0 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, diff --git a/resources/extruders/ultimaker_methodx_extruder_right.def.json b/resources/extruders/ultimaker_methodx_extruder_right.def.json index ea52c5dbd2..ff014e0f74 100644 --- a/resources/extruders/ultimaker_methodx_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_right.def.json @@ -14,6 +14,7 @@ "default_value": 1, "maximum_value": "1" }, + "machine_extruder_cooling_fan_number": { "default_value": 1 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, "machine_extruder_start_code_duration": { "default_value": 8 }, diff --git a/resources/extruders/ultimaker_methodxl_extruder_left.def.json b/resources/extruders/ultimaker_methodxl_extruder_left.def.json index 43de74b497..68d6fe416b 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_left.def.json @@ -14,6 +14,7 @@ "default_value": 0, "maximum_value": "1" }, + "machine_extruder_cooling_fan_number": { "default_value": 0 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, "machine_extruder_start_code_duration": { "default_value": 10 }, diff --git a/resources/extruders/ultimaker_methodxl_extruder_right.def.json b/resources/extruders/ultimaker_methodxl_extruder_right.def.json index 581811646f..4e43bdbfc6 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_right.def.json @@ -14,6 +14,7 @@ "default_value": 1, "maximum_value": "1" }, + "machine_extruder_cooling_fan_number": { "default_value": 1 }, "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, "machine_extruder_start_code_duration": { "default_value": 10 }, From 07a3162bb4d93480f7dfd0ac0985a7946e61742e Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Thu, 27 Jun 2024 09:06:11 -0400 Subject: [PATCH 27/43] Adding Method files that were missing PP-475 --- .../definitions/ultimaker_method.def.json | 137 ++++++++++++++++++ ..._method_1a_um-pla-175_0.2mm_solid.inst.cfg | 18 +++ ..._1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 17 +++ ..._method_1c_um-pla-175_0.2mm_solid.inst.cfg | 18 +++ ...abs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 17 +++ ...ethod_labs_um-pla-175_0.2mm_solid.inst.cfg | 18 +++ .../um_method_1a_um-pla-175_0.2mm.inst.cfg | 84 +++++++++++ ...method_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 52 +++++++ .../um_method_1c_um-pla-175_0.2mm.inst.cfg | 84 +++++++++++ .../um_method_2a_um-pva-175_0.2mm.inst.cfg | 77 ++++++++++ .../um_method_global_Draft_Quality.inst.cfg} | 10 +- .../um_method_global_Normal_Quality.inst.cfg | 15 ++ ...thod_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 52 +++++++ .../um_method_labs_um-pla-175_0.2mm.inst.cfg | 84 +++++++++++ .../variants/ultimaker_method_1A.inst.cfg | 15 ++ .../variants/ultimaker_method_1C.inst.cfg | 15 ++ .../variants/ultimaker_method_2A.inst.cfg | 15 ++ .../variants/ultimaker_method_LABS.inst.cfg | 14 ++ 18 files changed, 737 insertions(+), 5 deletions(-) create mode 100644 resources/definitions/ultimaker_method.def.json create mode 100644 resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg create mode 100644 resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg create mode 100644 resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg rename resources/quality/{ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg => ultimaker_method/um_method_global_Draft_Quality.inst.cfg} (74%) create mode 100644 resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg create mode 100644 resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg create mode 100644 resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg create mode 100644 resources/variants/ultimaker_method_1A.inst.cfg create mode 100644 resources/variants/ultimaker_method_1C.inst.cfg create mode 100644 resources/variants/ultimaker_method_2A.inst.cfg create mode 100644 resources/variants/ultimaker_method_LABS.inst.cfg diff --git a/resources/definitions/ultimaker_method.def.json b/resources/definitions/ultimaker_method.def.json new file mode 100644 index 0000000000..0d23ba4813 --- /dev/null +++ b/resources/definitions/ultimaker_method.def.json @@ -0,0 +1,137 @@ +{ + "version": 2, + "name": "UltiMaker Method", + "inherits": "ultimaker_method_base", + "metadata": + { + "visible": true, + "author": "UltiMaker", + "manufacturer": "Ultimaker B.V.", + "file_formats": "application/x-makerbot", + "platform": "ultimaker_method_platform.stl", + "exclude_materials": [ + "dsm_", + "Essentium_", + "imade3d_", + "chromatik_", + "3D-Fuel_", + "bestfilament_", + "emotiontech_", + "eryone_", + "eSUN_", + "Extrudr_", + "fabtotum_", + "fdplast_", + "filo3d_", + "generic_asa_175", + "generic_abs_175", + "generic_bvoh_175", + "generic_petg_175", + "generic_pla_175", + "generic_tough_pla_175", + "generic_pva_175", + "generic_cffpa_175", + "generic_cpe_175", + "generic_nylon_175", + "generic_hips_175", + "generic_pc_175", + "generic_tpu_175", + "goofoo_", + "ideagen3D_", + "imade3d_", + "innofill_", + "layer_one_", + "leapfrog_", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_", + "tizyx_", + "ultimaker_asa_175", + "ultimaker_abs_175", + "ultimaker_absr_175", + "ultimaker_abscf_175", + "ultimaker_bvoh_175", + "ultimaker_petg_175", + "ultimaker_cffpa_175", + "ultimaker_cpe_175", + "ultimaker_nylon_175", + "ultimaker_hips_175", + "ultimaker_pc_175", + "ultimaker_tpu_175", + "ultimaker_tough_pla_175", + "ultimaker_rapidrinse_175", + "ultimaker_sr30", + "verbatim_", + "Vertex_", + "volumic_", + "xyzprinting_", + "zyyx_pro_", + "octofiber_", + "fiberlogy_" + ], + "has_machine_materials": true, + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": + { + "0": "ultimaker_method_extruder_left", + "1": "ultimaker_method_extruder_right" + }, + "platform_offset": [ + 0, + 0, + 16 + ], + "platform_texture": "MakerbotMethod.png", + "preferred_material": "ultimaker_pla_175", + "preferred_quality_type": "draft", + "preferred_variant_name": "1A", + "reference_machine_id": "fire_e", + "supports_network_connection": true, + "supports_usb_connection": false, + "variant_definition": "ultimaker_method", + "variants_name": "Extruder", + "weight": -1 + }, + "overrides": + { + "machine_depth": { "default_value": 236.48 }, + "machine_disallowed_areas": + { + "default_value": [ + [ + [-141.65, -118.11], + [141.65, -118.11], + [141.65, -94], + [-141.65, -94] + ], + [ + [-141.65, 118.37], + [141.65, 118.37], + [141.65, 94], + [-141.65, 94] + ], + [ + [-141.65, -118.11], + [-75, -118.11], + [-75, 118.37], + [-141.65, 118.37] + ], + [ + [75, -118.11], + [141.65, -118.11], + [141.65, 118.37], + [75, 118.37] + ] + ] + }, + "machine_height": { "default_value": 196 }, + "machine_name": { "default_value": "UltiMaker Method" }, + "machine_width": { "default_value": 283.3 }, + "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, + "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" } + } +} \ No newline at end of file diff --git a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..8f4fcf08cd --- /dev/null +++ b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_method +name = Solid +version = 4 + +[metadata] +setting_version = 23 +variant = 1A +material = ultimaker_pla_175 +quality_type = draft +intent_category = solid +type = intent + +[values] +build_volume_temperature = 47 +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..8d73200d81 --- /dev/null +++ b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = ultimaker_method +name = Solid +version = 4 + +[metadata] +setting_version = 23 +variant = 1C +material = ultimaker_nylon12-cf_175 +quality_type = draft +intent_category = solid +type = intent + +[values] +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..b903d9a419 --- /dev/null +++ b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_method +name = Solid +version = 4 + +[metadata] +setting_version = 23 +variant = 1C +material = ultimaker_pla_175 +quality_type = draft +intent_category = solid +type = intent + +[values] +build_volume_temperature = 47 +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..e760b2d642 --- /dev/null +++ b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -0,0 +1,17 @@ +[general] +definition = ultimaker_method +name = Solid +version = 4 + +[metadata] +setting_version = 23 +variant = LABS +material = ultimaker_nylon12-cf_175 +quality_type = draft +intent_category = solid +type = intent + +[values] +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg new file mode 100644 index 0000000000..2527856c8c --- /dev/null +++ b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -0,0 +1,18 @@ +[general] +definition = ultimaker_method +name = Solid +version = 4 + +[metadata] +setting_version = 23 +variant = LABS +material = ultimaker_pla_175 +quality_type = draft +intent_category = solid +type = intent + +[values] +build_volume_temperature = 47 +infill_pattern = lines +infill_sparse_density = 100 + diff --git a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..809acb9d2d --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg @@ -0,0 +1,84 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = 1A +material = ultimaker_pla_175 +quality_type = draft +type = quality +weight = -2 + +[values] +bottom_layers = 4 +cool_fan_enabled = True +cool_fan_full_layer = 4 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +infill_sparse_density = 15 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 225 +material_standby_temperature = 160 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.18 +raft_base_line_spacing = 4 +raft_base_line_width = 1.2 +raft_base_speed = =raft_speed +raft_base_thickness = 0.6 +raft_interface_fan_speed = 0 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 60 +raft_interface_thickness = 0.2 +raft_speed = 30 +raft_surface_fan_speed = 0 +raft_surface_line_spacing = 0.425 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +retract_at_layer_change = True +skin_material_flow_layer_0 = =material_flow +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_fan_enable = True +support_infill_angles = [45 ] +support_infill_rate = 12 +support_infill_sparse_thickness = =layer_height +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 1 +support_interface_wall_count = 0 +support_line_width = line_width * 0.75 +support_material_flow = =material_flow * 0.8 +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_roof_material_flow = =support_interface_material_flow +support_roof_wall_count = 1 +support_xy_distance = 0.3 +support_xy_distance_overhang = 0.1 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +switch_extruder_retraction_amount = 0.5 +wall_0_material_flow_layer_0 = =material_flow +wall_x_material_flow_layer_0 = =material_flow + diff --git a/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..1617da74c1 --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -0,0 +1,52 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = 1C +material = ultimaker_nylon12-cf_175 +quality_type = draft +type = quality +weight = -2 + +[values] +cool_fan_enabled = False +material_final_print_temperature = =default_material_print_temperature-5 +material_initial_print_temperature = =default_material_print_temperature-5 +raft_airgap = 0.3 +raft_base_line_spacing = 3 +raft_base_line_width = 1.2 +raft_base_speed = 10 +retract_at_layer_change = True +retraction_amount = 0.5 +retraction_min_travel = 3.2 +roofing_material_flow = 100 +small_skin_width = 3.6 +speed_prime_tower = 30.0 +speed_print = 120.0 +speed_roofing = 55 +speed_topbottom = 55 +speed_travel = 250.0 +speed_wall_0 = 45 +speed_wall_x = 65 +support_angle = 50 +support_bottom_density = 24 +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_fan_enable = False +support_infill_rate = 12.0 +support_interface_enable = True +support_interface_pattern = lines +support_line_width = 0.3 +support_pattern = lines +support_roof_density = 97 +support_roof_height = 1.015 +support_roof_line_width = 0.25 +support_use_towers = False +support_xy_distance = 0.2 +support_xy_distance_overhang = 0.15 +support_z_distance = 0.25 + diff --git a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..cd264fb95f --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg @@ -0,0 +1,84 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = 1C +material = ultimaker_pla_175 +quality_type = draft +type = quality +weight = -2 + +[values] +bottom_layers = 4 +cool_fan_enabled = True +cool_fan_full_layer = 4 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +infill_sparse_density = 15 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 225 +material_standby_temperature = 160 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.18 +raft_base_line_spacing = 4 +raft_base_line_width = 1.2 +raft_base_speed = =raft_speed +raft_base_thickness = 0.6 +raft_interface_fan_speed = 0 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 60 +raft_interface_thickness = 0.2 +raft_speed = 30 +raft_surface_fan_speed = 0 +raft_surface_line_spacing = 0.425 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +retract_at_layer_change = True +skin_material_flow_layer_0 = =material_flow +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_fan_enable = True +support_infill_angles = [45 ] +support_infill_rate = 12 +support_infill_sparse_thickness = =layer_height +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 1 +support_interface_wall_count = 0 +support_line_width = line_width * 0.75 +support_material_flow = =material_flow * 0.8 +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_roof_material_flow = =support_interface_material_flow +support_roof_wall_count = 1 +support_xy_distance = 0.3 +support_xy_distance_overhang = 0.1 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +switch_extruder_retraction_amount = 0.5 +wall_0_material_flow_layer_0 = =material_flow +wall_x_material_flow_layer_0 = =material_flow + diff --git a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..82298fbb70 --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg @@ -0,0 +1,77 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = 2A +material = ultimaker_pva_175 +quality_type = draft +type = quality +weight = -2 + +[values] +brim_replaces_support = False +cool_fan_enabled = False +cool_min_speed = 5 +cool_min_temperature = =material_print_temperature +initial_layer_line_width_factor = 300 +material_bed_temperature = 45 +material_bed_temperature_layer_0 = 50 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 220 +material_standby_temperature = 160 +prime_tower_flow = 125 +raft_airgap = 0.0 +raft_base_wall_count = 4 +raft_interface_flow = 110 +raft_interface_infill_overlap = 50 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.9 +raft_interface_line_width = 1 +raft_interface_speed = 15 +raft_interface_z_offset = -0.05 +raft_surface_flow = 110 +raft_surface_infill_overlap = 50 +raft_surface_line_spacing = 0.44 +raft_surface_line_width = 0.4 +raft_surface_speed = 20 +raft_surface_thickness = 0.27 +raft_surface_z_offset = -0.075 +retraction_speed = 1.75 +speed_layer_0 = 10 +speed_prime_tower = 10 +speed_print = 50 +speed_roofing = 50 +speed_support = 50 +speed_support_bottom = 10 +speed_support_interface = 50 +speed_topbottom = 50 +speed_wall_0 = 50 +speed_wall_x = 50 +support_angle = 50 +support_bottom_density = 99 +support_bottom_height = 0.406 +support_bottom_line_width = 1.2 +support_bottom_wall_count = 2 +support_conical_angle = 20 +support_conical_min_width = 20 +support_fan_enable = False +support_infill_density_multiplier_layer_0 = 2 +support_infill_rate = 12 +support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height +support_interface_enable = True +support_interface_offset = 0.8 +support_pattern = grid +support_roof_density = 95 +support_roof_height = =layer_height*8 +support_wall_count = 2 +support_xy_distance = 0.2 +support_z_distance = 0 +switch_extruder_extra_prime_amount = 1 +switch_extruder_retraction_amount = 2.5 +switch_extruder_retraction_speeds = 3 + diff --git a/resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg similarity index 74% rename from resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg rename to resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg index 01222c6f9d..f889bedb60 100644 --- a/resources/quality/ultimaker_sketch/um_sketch_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg @@ -1,15 +1,15 @@ [general] -definition = ultimaker_sketch -name = Fast version = 4 +name = Fast +definition = ultimaker_method [metadata] -global_quality = True -quality_type = draft setting_version = 23 type = quality +quality_type = draft weight = -2 +global_quality = True [values] -layer_height = 0.2 +layer_height = 0.203 diff --git a/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg new file mode 100644 index 0000000000..b07a54ce8e --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg @@ -0,0 +1,15 @@ +[general] +version = 4 +name = Fine +definition = ultimaker_method + +[metadata] +setting_version = 23 +type = quality +quality_type = normal +weight = 0 +global_quality = True + +[values] +layer_height = 0.1 + diff --git a/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..47b957e0e9 --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -0,0 +1,52 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = LABS +material = ultimaker_nylon12-cf_175 +quality_type = draft +type = quality +weight = -2 + +[values] +cool_fan_enabled = False +material_final_print_temperature = =default_material_print_temperature-5 +material_initial_print_temperature = =default_material_print_temperature-5 +raft_airgap = 0.3 +raft_base_line_spacing = 3 +raft_base_line_width = 1.2 +raft_base_speed = 10 +retract_at_layer_change = True +retraction_amount = 0.5 +retraction_min_travel = 3.2 +roofing_material_flow = 100 +small_skin_width = 3.6 +speed_prime_tower = 30.0 +speed_print = 120.0 +speed_roofing = 55 +speed_topbottom = 55 +speed_travel = 250.0 +speed_wall_0 = 45 +speed_wall_x = 65 +support_angle = 50 +support_bottom_density = 24 +support_bottom_enable = False +support_bottom_line_width = 0.6 +support_bottom_stair_step_height = 0 +support_fan_enable = False +support_infill_rate = 12.0 +support_interface_enable = True +support_interface_pattern = lines +support_line_width = 0.3 +support_pattern = lines +support_roof_density = 97 +support_roof_height = 1.015 +support_roof_line_width = 0.25 +support_use_towers = False +support_xy_distance = 0.2 +support_xy_distance_overhang = 0.15 +support_z_distance = 0.25 + diff --git a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg new file mode 100644 index 0000000000..0069d15c80 --- /dev/null +++ b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg @@ -0,0 +1,84 @@ +[general] +definition = ultimaker_method +name = Fast +version = 4 + +[metadata] +setting_version = 23 +variant = LABS +material = ultimaker_pla_175 +quality_type = draft +type = quality +weight = -2 + +[values] +bottom_layers = 4 +cool_fan_enabled = True +cool_fan_full_layer = 4 +cool_fan_speed = 100 +cool_fan_speed_0 = 0 +cool_min_layer_time = 10 +cool_min_speed = 5 +cool_min_temperature = 205 +infill_sparse_density = 15 +material_final_print_temperature = 210 +material_initial_print_temperature = 210 +material_print_temperature = 210 +material_print_temperature_layer_0 = 225 +material_standby_temperature = 160 +min_bead_width = =line_width * 0.75 +min_wall_line_width = =line_width * 0.75 +raft_airgap = 0.18 +raft_base_line_spacing = 4 +raft_base_line_width = 1.2 +raft_base_speed = =raft_speed +raft_base_thickness = 0.6 +raft_interface_fan_speed = 0 +raft_interface_layers = 1 +raft_interface_line_spacing = 0.75 +raft_interface_speed = 60 +raft_interface_thickness = 0.2 +raft_speed = 30 +raft_surface_fan_speed = 0 +raft_surface_line_spacing = 0.425 +raft_surface_speed = 90 +raft_surface_wall_count = 2 +retract_at_layer_change = True +skin_material_flow_layer_0 = =material_flow +speed_layer_0 = 15 +speed_print = 150 +speed_roofing = =speed_print / 3 +speed_support = =speed_print +speed_support_interface = 65 +speed_topbottom = =speed_print * 0.6 +speed_wall = =speed_print / 6 +speed_wall_0 = =speed_wall +speed_wall_x = =speed_wall +support_angle = 50.0 +support_bottom_distance = =layer_height +support_bottom_enable = False +support_fan_enable = True +support_infill_angles = [45 ] +support_infill_rate = 12 +support_infill_sparse_thickness = =layer_height +support_interface_density = 83 +support_interface_height = =layer_height * 4 +support_interface_material_flow = =material_flow * 0.9 +support_interface_offset = 1 +support_interface_wall_count = 0 +support_line_width = line_width * 0.75 +support_material_flow = =material_flow * 0.8 +support_offset = 3 +support_roof_density = =support_interface_density +support_roof_height = =layer_height * 4 +support_roof_line_width = =line_width +support_roof_material_flow = =support_interface_material_flow +support_roof_wall_count = 1 +support_xy_distance = 0.3 +support_xy_distance_overhang = 0.1 +support_xy_overrides_z = xy_overrides_z +support_z_distance = 0.15 +switch_extruder_retraction_amount = 0.5 +wall_0_material_flow_layer_0 = =material_flow +wall_x_material_flow_layer_0 = =material_flow + diff --git a/resources/variants/ultimaker_method_1A.inst.cfg b/resources/variants/ultimaker_method_1A.inst.cfg new file mode 100644 index 0000000000..5d637829ec --- /dev/null +++ b/resources/variants/ultimaker_method_1A.inst.cfg @@ -0,0 +1,15 @@ +[general] +name = 1A +version = 4 +definition = ultimaker_method + +[metadata] +setting_version = 23 +type = variant +reference_extruder_id = mk14 +hardware_type = nozzle + +[values] +machine_nozzle_id = 1A +machine_nozzle_size = 0.4 + diff --git a/resources/variants/ultimaker_method_1C.inst.cfg b/resources/variants/ultimaker_method_1C.inst.cfg new file mode 100644 index 0000000000..bfb2e05bc8 --- /dev/null +++ b/resources/variants/ultimaker_method_1C.inst.cfg @@ -0,0 +1,15 @@ +[general] +name = 1C +version = 4 +definition = ultimaker_method + +[metadata] +setting_version = 23 +type = variant +reference_extruder_id = mk14_c +hardware_type = nozzle + +[values] +machine_nozzle_id = 1C +machine_nozzle_size = 0.4 + diff --git a/resources/variants/ultimaker_method_2A.inst.cfg b/resources/variants/ultimaker_method_2A.inst.cfg new file mode 100644 index 0000000000..8e336e8170 --- /dev/null +++ b/resources/variants/ultimaker_method_2A.inst.cfg @@ -0,0 +1,15 @@ +[general] +name = 2A +version = 4 +definition = ultimaker_method + +[metadata] +setting_version = 23 +type = variant +reference_extruder_id = mk14_s +hardware_type = nozzle + +[values] +machine_nozzle_id = 2A +machine_nozzle_size = 0.4 + diff --git a/resources/variants/ultimaker_method_LABS.inst.cfg b/resources/variants/ultimaker_method_LABS.inst.cfg new file mode 100644 index 0000000000..25f35f7bd3 --- /dev/null +++ b/resources/variants/ultimaker_method_LABS.inst.cfg @@ -0,0 +1,14 @@ +[general] +name = LABS +version = 4 +definition = ultimaker_method + +[metadata] +setting_version = 23 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_id = LABS +machine_nozzle_size = 0.4 + From 729387921b4ab4b5b38d90db00913f765ee17434 Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Thu, 27 Jun 2024 13:07:19 +0000 Subject: [PATCH 28/43] Applied printer-linter format --- .../um_method_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_method_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_method_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_method_1a_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 4 ++-- .../um_method_1c_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_method_2a_um-pva-175_0.2mm.inst.cfg | 4 ++-- .../um_method_global_Draft_Quality.inst.cfg | 8 ++++---- .../um_method_global_Normal_Quality.inst.cfg | 8 ++++---- .../um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 4 ++-- .../um_method_labs_um-pla-175_0.2mm.inst.cfg | 4 ++-- resources/variants/ultimaker_method_1A.inst.cfg | 6 +++--- resources/variants/ultimaker_method_1C.inst.cfg | 6 +++--- resources/variants/ultimaker_method_2A.inst.cfg | 6 +++--- resources/variants/ultimaker_method_LABS.inst.cfg | 4 ++-- 17 files changed, 46 insertions(+), 46 deletions(-) diff --git a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg index 8f4fcf08cd..09767ce8a7 100644 --- a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1A +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1A [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 8d73200d81..17b29cbbef 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_nylon12-cf_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg index b903d9a419..3d5fa82b7a 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index e760b2d642..fe2f11dac9 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_nylon12-cf_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg index 2527856c8c..05a61d6b82 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] build_volume_temperature = 47 diff --git a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg index 809acb9d2d..65218afbda 100644 --- a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1A material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg index 1617da74c1..e4ab617a39 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_nylon12-cf_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg index cd264fb95f..ca62933f25 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg index 82298fbb70..c2fab76b89 100644 --- a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 2A material = ultimaker_pva_175 quality_type = draft +setting_version = 23 type = quality +variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg index f889bedb60..433d839545 100644 --- a/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Fast definition = ultimaker_method +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 23 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.203 diff --git a/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg index b07a54ce8e..b1304e3b14 100644 --- a/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Fine definition = ultimaker_method +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 23 type = quality -quality_type = normal weight = 0 -global_quality = True [values] layer_height = 0.1 diff --git a/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg index 47b957e0e9..b3e7d1da4d 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_nylon12-cf_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg index 0069d15c80..7f6b2a7be2 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] diff --git a/resources/variants/ultimaker_method_1A.inst.cfg b/resources/variants/ultimaker_method_1A.inst.cfg index 5d637829ec..d8ac36154a 100644 --- a/resources/variants/ultimaker_method_1A.inst.cfg +++ b/resources/variants/ultimaker_method_1A.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = ultimaker_method name = 1A version = 4 -definition = ultimaker_method [metadata] +hardware_type = nozzle +reference_extruder_id = mk14 setting_version = 23 type = variant -reference_extruder_id = mk14 -hardware_type = nozzle [values] machine_nozzle_id = 1A diff --git a/resources/variants/ultimaker_method_1C.inst.cfg b/resources/variants/ultimaker_method_1C.inst.cfg index bfb2e05bc8..b881a01fdc 100644 --- a/resources/variants/ultimaker_method_1C.inst.cfg +++ b/resources/variants/ultimaker_method_1C.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = ultimaker_method name = 1C version = 4 -definition = ultimaker_method [metadata] +hardware_type = nozzle +reference_extruder_id = mk14_c setting_version = 23 type = variant -reference_extruder_id = mk14_c -hardware_type = nozzle [values] machine_nozzle_id = 1C diff --git a/resources/variants/ultimaker_method_2A.inst.cfg b/resources/variants/ultimaker_method_2A.inst.cfg index 8e336e8170..b2f16e4472 100644 --- a/resources/variants/ultimaker_method_2A.inst.cfg +++ b/resources/variants/ultimaker_method_2A.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = ultimaker_method name = 2A version = 4 -definition = ultimaker_method [metadata] +hardware_type = nozzle +reference_extruder_id = mk14_s setting_version = 23 type = variant -reference_extruder_id = mk14_s -hardware_type = nozzle [values] machine_nozzle_id = 2A diff --git a/resources/variants/ultimaker_method_LABS.inst.cfg b/resources/variants/ultimaker_method_LABS.inst.cfg index 25f35f7bd3..97e78c30e0 100644 --- a/resources/variants/ultimaker_method_LABS.inst.cfg +++ b/resources/variants/ultimaker_method_LABS.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker_method name = LABS version = 4 -definition = ultimaker_method [metadata] +hardware_type = nozzle setting_version = 23 type = variant -hardware_type = nozzle [values] machine_nozzle_id = LABS From 98994518f7a524a9912da2a592eed83a2973b59b Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Thu, 27 Jun 2024 12:18:48 -0400 Subject: [PATCH 29/43] Update resources/definitions/ultimaker_method_base.def.json Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> --- resources/definitions/ultimaker_method_base.def.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 26d0ce8329..505d9046cb 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -419,8 +419,7 @@ "wall_x_material_flow": { "value": "material_flow" }, "xy_offset": { "value": 0 }, "xy_offset_layer_0": { "value": "xy_offset" }, - "z_seam_corner": { "value": "'z_seam_corner_none'" }, - "z_seam_position": { "value": "'backright'" }, + "z_seam_position": { "value": "'backright'" }, "z_seam_relative": { "value": true }, "z_seam_type": { "value": "'sharpest_corner'" }, "zig_zaggify_infill": { "value": true } From b3b06e86268b353fb4543295609f99d0c81e511a Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Thu, 27 Jun 2024 16:19:53 +0000 Subject: [PATCH 30/43] Applied printer-linter format --- resources/definitions/ultimaker_method_base.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 505d9046cb..a2a5990979 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -419,7 +419,7 @@ "wall_x_material_flow": { "value": "material_flow" }, "xy_offset": { "value": 0 }, "xy_offset_layer_0": { "value": "xy_offset" }, - "z_seam_position": { "value": "'backright'" }, + "z_seam_position": { "value": "'backright'" }, "z_seam_relative": { "value": true }, "z_seam_type": { "value": "'sharpest_corner'" }, "zig_zaggify_infill": { "value": true } From f554b0d4f2707bad3d446c4812625e642122fff7 Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Thu, 27 Jun 2024 12:50:43 -0400 Subject: [PATCH 31/43] Updated PLA PVA N12CF 175 settings PP-475 --- .../ultimaker_method_base.def.json | 1084 ++++++++++------- .../definitions/ultimaker_methodx.def.json | 25 +- .../definitions/ultimaker_methodxl.def.json | 6 - .../ultimaker_method_extruder_left.def.json | 30 +- .../ultimaker_method_extruder_right.def.json | 30 +- .../ultimaker_methodx_extruder_left.def.json | 28 +- .../ultimaker_methodx_extruder_right.def.json | 28 +- .../ultimaker_methodxl_extruder_left.def.json | 28 +- ...ultimaker_methodxl_extruder_right.def.json | 28 +- ..._method_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ..._1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 6 +- ..._method_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...abs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 6 +- ...ethod_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...methodx_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ..._1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 7 +- ...methodx_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...abs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 7 +- ...thodx_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...ethodxl_1a_um-pla-175_0.2mm_solid.inst.cfg | 8 +- ..._1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 7 +- ...ethodxl_1c_um-pla-175_0.2mm_solid.inst.cfg | 8 +- ...abs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 7 +- ...hodxl_labs_um-pla-175_0.2mm_solid.inst.cfg | 8 +- .../um_method_1a_um-pla-175_0.2mm.inst.cfg | 4 +- ...method_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 8 +- .../um_method_1c_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_method_2a_um-pva-175_0.2mm.inst.cfg | 4 +- .../um_method_global_Draft_Quality.inst.cfg | 8 +- .../um_method_global_Normal_Quality.inst.cfg | 8 +- ...thod_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 8 +- .../um_method_labs_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodx_1a_um-pla-175_0.2mm.inst.cfg | 4 +- ...ethodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 11 +- .../um_methodx_1c_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodx_2a_um-pva-175_0.2mm.inst.cfg | 4 +- .../um_methodx_global_Draft_Quality.inst.cfg | 8 +- ...hodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 11 +- .../um_methodx_labs_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodxl_1a_um-pla-175_0.2mm.inst.cfg | 4 +- ...thodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 11 +- .../um_methodxl_1c_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodxl_2a_um-pva-175_0.2mm.inst.cfg | 4 +- .../um_methodxl_global_Draft_Quality.inst.cfg | 8 +- ...odxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 11 +- ...um_methodxl_labs_um-pla-175_0.2mm.inst.cfg | 4 +- .../variants/ultimaker_method_1A.inst.cfg | 6 +- .../variants/ultimaker_method_1C.inst.cfg | 6 +- .../variants/ultimaker_method_2A.inst.cfg | 6 +- .../variants/ultimaker_method_LABS.inst.cfg | 4 +- 50 files changed, 903 insertions(+), 646 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index a2a5990979..cd46b31900 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -1,427 +1,667 @@ { - "version": 2, - "name": "UltiMaker Method Base Profile", - "inherits": "ultimaker", - "metadata": - { - "visible": false, - "author": "UltiMaker", - "manufacturer": "Ultimaker B.V.", - "file_formats": "application/x-makerbot", - "platform": "ultimaker_method_platform.stl", - "exclude_materials": [ - "dsm_", - "Essentium_", - "imade3d_", - "chromatik_", - "3D-Fuel_", - "bestfilament_", - "emotiontech_", - "eryone_", - "eSUN_", - "Extrudr_", - "fabtotum_", - "fdplast_", - "filo3d_", - "generic_", - "ultimaker_rapidrinse_175", - "goofoo_", - "ideagen3D_", - "imade3d_", - "innofill_", - "layer_one_", - "leapfrog_", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_", - "tizyx_", - "verbatim_", - "Vertex_", - "volumic_", - "xyzprinting_", - "zyyx_pro_", - "octofiber_", - "fiberlogy_" - ], - "has_machine_materials": true, - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "machine_extruder_trains": - { - "0": "ultimaker_method_extruder_left", - "1": "ultimaker_method_extruder_right" - }, - "nozzle_offsetting_for_disallowed_areas": false, - "preferred_material": "ultimaker_pla_175", - "preferred_quality_type": "fast", - "preferred_variant_name": "1A", - "supports_network_connection": true, - "supports_usb_connection": false, - "variants_name": "Extruder", - "weight": -1 + "version": 2, + "inherits": "ultimaker", + "metadata": { + "author": "UltiMaker", + "exclude_materials": [ + "dsm_", + "Essentium_", + "imade3d_", + "chromatik_", + "3D-Fuel_", + "bestfilament_", + "emotiontech_", + "eryone_", + "eSUN_", + "Extrudr_", + "fabtotum_", + "fdplast_", + "filo3d_", + "generic_", + "ultimaker_rapidrinse_175", + "goofoo_", + "ideagen3D_", + "imade3d_", + "innofill_", + "layer_one_", + "leapfrog_", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_", + "tizyx_", + "verbatim_", + "Vertex_", + "volumic_", + "xyzprinting_", + "zyyx_pro_", + "octofiber_", + "fiberlogy_" + ], + "file_formats": "application/x-makerbot", + "has_machine_materials": true, + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { + "0": "ultimaker_method_extruder_left", + "1": "ultimaker_method_extruder_right" }, - "overrides": + "manufacturer": "Ultimaker B.V.", + "nozzle_offsetting_for_disallowed_areas": false, + "platform": "ultimaker_method_platform.stl", + "preferred_quality_type": "fast", + "preferred_variant_name": "1A", + "preferred_material": "ultimaker_pla_175", + "supports_network_connection": true, + "supports_usb_connection": false, + "variants_name": "Extruder", + "visible": false, + "weight": -1 + }, + "name": "UltiMaker Method Base Profile", + "overrides": { + "adhesion_extruder_nr": { + "value": 0 + }, + "adhesion_type": { + "value": "'raft'" + }, + "bridge_enable_more_layers": { + "value": true + }, + "bridge_fan_speed": { + "value": "cool_fan_speed_max" + }, + "bridge_fan_speed_2": { + "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" + }, + "bridge_fan_speed_3": { + "value": "cool_fan_speed_min" + }, + "bridge_settings_enabled": { + "value": true + }, + "bridge_skin_density": { + "value": 100 + }, + "bridge_skin_density_2": { + "value": 100 + }, + "bridge_skin_density_3": { + "value": 100 + }, + "bridge_skin_material_flow": { + "value": "material_flow" + }, + "bridge_skin_material_flow_2": { + "value": "material_flow" + }, + "bridge_skin_material_flow_3": { + "value": "material_flow" + }, + "bridge_skin_speed": { + "value": "speed_topbottom" + }, + "bridge_skin_speed_2": { + "value": "speed_topbottom" + }, + "bridge_skin_speed_3": { + "value": "speed_topbottom" + }, + "bridge_sparse_infill_max_density": { + "value": 50 + }, + "bridge_wall_coast": { + "value": 0 + }, + "bridge_wall_material_flow": { + "value": "material_flow" + }, + "bridge_wall_speed": { + "value": "speed_wall" + }, + "brim_width": { + "value": 5 + }, + "extruder_prime_pos_abs": { + "default_value": true + }, + "gradual_support_infill_steps": { + "value": 0 + }, + "infill_before_walls": { + "value": false + }, + "inset_direction": { + "value": "'inside_out'" + }, + "infill_material_flow": { + "value": "material_flow" + }, + "infill_overlap": { + "value": 0 + }, + "infill_pattern": { + "value": "'lines' if infill_sparse_density > 80 else 'grid'" + }, + "infill_wipe_dist": { + "value": 0 + }, + "layer_start_x": { + "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" + }, + "layer_start_y": { + "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" + }, + "machine_acceleration": { + "default_value": 3000 + }, + "machine_center_is_zero": { + "value": true + }, + "machine_scale_fan_speed_zero_to_one": { + "value": true + }, + "machine_end_gcode": { + "default_value": "" + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_gcode_flavor": { + "default_value": "Griffin" + }, + "machine_heated_bed": { + "default_value": false + }, + "machine_heated_build_volume": { + "default_value": true + }, + "machine_min_cool_heat_time_window": { + "value": 15 + }, + "machine_name": { + "default_value": "UltiMaker Method" + }, + "machine_start_gcode": { + "default_value": "" + }, + "material_initial_print_temperature": { + "value": "material_print_temperature-10" + }, + "machine_nozzle_heat_up_speed": { + "value": 3.5 + }, + "machine_nozzle_cool_down_speed": { + "value": 0.8 + }, + "material_flow": { + "value": 100 + }, + "skin_material_flow": { + "value": "material_flow" + }, + "material_bed_temperature": { + "enabled": "machine_heated_bed" + }, + "material_shrinkage_percentage": { + "enabled": true + }, + "min_wall_line_width": { + "value": 0.4 + }, + "minimum_support_area": { + "value": 0.1 + }, + "multiple_mesh_overlap": { + "value": 0 + }, + "optimize_wall_printing_order": { + "value": true + }, + "prime_blob_enable": { + "enabled": false + }, + "prime_tower_enable": { + "value": false + }, + "prime_tower_flow": { + "value": "material_flow" + }, + "prime_tower_line_width": { + "value": 1 + }, + "prime_tower_raft_base_line_spacing": { + "value": "raft_base_line_width" + }, + "prime_tower_wipe_enabled": { + "value": true + }, + "print_sequence": { - "acceleration_enabled": - { - "enabled": false, - "value": true - }, - "acceleration_infill": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_layer_0": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_prime_tower": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_print": - { - "enabled": false, - "value": 800 - }, - "acceleration_print_layer_0": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_roofing": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_bottom": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_infill": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_interface": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_roof": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_topbottom": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_travel": - { - "enabled": false, - "value": 5000 - }, - "acceleration_travel_enabled": - { - "enabled": false, - "value": true - }, - "acceleration_travel_layer_0": - { - "enabled": false, - "value": "acceleration_travel" - }, - "acceleration_wall": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_0": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_0_roofing": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_x": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_x_roofing": - { - "enabled": false, - "value": "acceleration_print" - }, - "adhesion_extruder_nr": { "value": 0 }, - "adhesion_type": { "value": "'raft'" }, - "bridge_enable_more_layers": { "value": true }, - "bridge_fan_speed": { "value": "cool_fan_speed_max" }, - "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, - "bridge_fan_speed_3": { "value": "cool_fan_speed_min" }, - "bridge_settings_enabled": { "value": true }, - "bridge_skin_density": { "value": 100 }, - "bridge_skin_density_2": { "value": 100 }, - "bridge_skin_density_3": { "value": 100 }, - "bridge_skin_material_flow": { "value": "material_flow" }, - "bridge_skin_material_flow_2": { "value": "material_flow" }, - "bridge_skin_material_flow_3": { "value": "material_flow" }, - "bridge_skin_speed": { "value": "speed_topbottom" }, - "bridge_skin_speed_2": { "value": "speed_topbottom" }, - "bridge_skin_speed_3": { "value": "speed_topbottom" }, - "bridge_sparse_infill_max_density": { "value": 50 }, - "bridge_wall_coast": { "value": 0 }, - "bridge_wall_material_flow": { "value": "material_flow" }, - "bridge_wall_speed": { "value": "speed_wall" }, - "brim_width": { "value": 5 }, - "extruder_prime_pos_abs": { "default_value": true }, - "gradual_support_infill_steps": { "value": 0 }, - "infill_before_walls": { "value": false }, - "infill_enable_travel_optimization": { "value": true }, - "infill_material_flow": { "value": "material_flow" }, - "infill_overlap": { "value": 0 }, - "infill_pattern": { "value": "'lines' if infill_sparse_density > 80 else 'grid'" }, - "infill_wipe_dist": { "value": 0 }, - "inset_direction": { "value": "'inside_out'" }, - "jerk_enabled": - { - "enabled": false, - "value": true - }, - "jerk_infill": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_layer_0": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_prime_tower": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_print": - { - "enabled": false, - "value": 6.25 - }, - "jerk_print_layer_0": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_roofing": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_bottom": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_infill": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_interface": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_roof": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_topbottom": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_travel": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_travel_enabled": - { - "enabled": false, - "value": true - }, - "jerk_travel_layer_0": - { - "enabled": false, - "value": "jerk_travel" - }, - "jerk_wall": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_0": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_0_roofing": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_x": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_x_roofing": - { - "enabled": false, - "value": "jerk_print" - }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, - "machine_acceleration": { "default_value": 3000 }, - "machine_center_is_zero": { "value": true }, - "machine_end_gcode": { "default_value": "" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_gcode_flavor": { "default_value": "Griffin" }, - "machine_heated_bed": { "default_value": false }, - "machine_heated_build_volume": { "default_value": true }, - "machine_min_cool_heat_time_window": { "value": 15 }, - "machine_name": { "default_value": "UltiMaker Method" }, - "machine_nozzle_cool_down_speed": { "value": 0.8 }, - "machine_nozzle_heat_up_speed": { "value": 3.5 }, - "machine_scale_fan_speed_zero_to_one": { "value": true }, - "machine_start_gcode": { "default_value": "" }, - "material_bed_temperature": { "enabled": "machine_heated_bed" }, - "material_bed_temperature_layer_0": { "enabled": "machine_heated_bed" }, - "material_final_print_temperature": { "value": "material_print_temperature-10" }, - "material_flow": { "value": 100 }, - "material_initial_print_temperature": { "value": "material_print_temperature-10" }, - "material_print_temperature": { "value": "default_material_print_temperature" }, - "material_shrinkage_percentage": { "enabled": true }, - "min_wall_line_width": { "value": 0.4 }, - "minimum_support_area": { "value": 0.1 }, - "multiple_mesh_overlap": { "value": 0 }, - "optimize_wall_printing_order": { "value": true }, - "prime_blob_enable": { "enabled": false }, - "prime_tower_base_curve_magnitude": { "value": 2 }, - "prime_tower_base_height": { "value": 6 }, - "prime_tower_base_size": { "value": 10 }, - "prime_tower_enable": { "value": false }, - "prime_tower_flow": { "value": "material_flow" }, - "prime_tower_line_width": { "value": 1 }, - "prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" }, - "prime_tower_wipe_enabled": { "value": true }, - "print_sequence": { "enabled": false }, - "raft_base_line_spacing": { "value": "2*raft_base_line_width" }, - "raft_base_line_width": { "value": 1.4 }, - "raft_base_speed": { "value": 10 }, - "raft_base_thickness": { "value": 0.8 }, - "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" }, - "raft_interface_layers": { "value": 2 }, - "raft_interface_line_width": { "value": 0.7 }, - "raft_interface_speed": { "value": 90 }, - "raft_interface_thickness": { "value": 0.3 }, - "raft_interface_wall_count": { "value": "raft_wall_count" }, - "raft_margin": { "value": 1.2 }, - "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" }, - "raft_surface_wall_count": { "value": "raft_wall_count" }, - "retraction_amount": { "value": 0.75 }, - "retraction_combing": { "value": "'off'" }, - "retraction_combing_max_distance": { "value": "speed_travel / 10" }, - "retraction_count_max": { "value": 100 }, - "retraction_extrusion_window": { "value": 0 }, - "retraction_hop": { "value": 0.4 }, - "retraction_hop_enabled": { "value": true }, - "retraction_hop_only_when_collides": { "value": false }, - "retraction_prime_speed": { "value": "retraction_speed" }, - "retraction_speed": { "value": 5 }, - "roofing_layer_count": { "value": 2 }, - "roofing_monotonic": { "value": true }, - "skin_material_flow": { "value": "material_flow" }, - "skin_monotonic": { "value": true }, - "skin_outline_count": { "value": 0 }, - "skin_overlap": { "value": 0 }, - "skin_preshrink": { "value": 0 }, - "skirt_brim_material_flow": { "value": "material_flow" }, - "skirt_brim_minimal_length": { "value": 500 }, - "small_skin_width": { "value": 4 }, - "speed_equalize_flow_width_factor": { "value": 0 }, - "speed_prime_tower": { "value": "speed_topbottom" }, - "speed_print": { "value": 50 }, - "speed_roofing": { "value": "speed_wall_0" }, - "speed_support": { "value": "speed_wall" }, - "speed_support_interface": { "value": "speed_topbottom" }, - "speed_topbottom": { "value": "speed_wall" }, - "speed_travel": { "value": 250 }, - "speed_wall": { "value": "speed_print * 40/50" }, - "speed_wall_0": { "value": "speed_wall * 30/40" }, - "speed_wall_x": { "value": "speed_wall" }, - "support_angle": { "value": 40 }, - "support_bottom_distance": { "value": "support_z_distance / 2" }, - "support_bottom_material_flow": { "value": "material_flow" }, - "support_brim_enable": { "value": false }, - "support_conical_min_width": { "value": 10 }, - "support_enable": { "value": true }, - "support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" }, - "support_fan_enable": { "value": false }, - "support_infill_rate": { "value": 20.0 }, - "support_interface_enable": { "value": true }, - "support_interface_material_flow": { "value": "material_flow" }, - "support_interface_offset": { "value": 0 }, - "support_interface_pattern": { "value": "'lines'" }, - "support_interface_wall_count": { "value": 2 }, - "support_material_flow": { "value": "material_flow" }, - "support_pattern": { "value": "'lines'" }, - "support_roof_material_flow": { "value": "material_flow" }, - "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" }, - "support_top_distance": { "value": "support_z_distance" }, - "support_wall_count": { "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" }, - "support_xy_distance": { "value": 0.2 }, - "support_z_distance": { "value": 0 }, - "switch_extruder_retraction_amount": { "value": 0.5 }, - "switch_extruder_retraction_speeds": { "value": "retraction_speed" }, - "top_bottom_thickness": { "value": "5*layer_height" }, - "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, - "travel_avoid_other_parts": { "value": false }, - "wall_0_inset": { "value": 0 }, - "wall_0_material_flow": { "value": "material_flow" }, - "wall_0_wipe_dist": { "value": 0.8 }, - "wall_material_flow": { "value": "material_flow" }, - "wall_x_material_flow": { "value": "material_flow" }, - "xy_offset": { "value": 0 }, - "xy_offset_layer_0": { "value": "xy_offset" }, - "z_seam_position": { "value": "'backright'" }, - "z_seam_relative": { "value": true }, - "z_seam_type": { "value": "'sharpest_corner'" }, - "zig_zaggify_infill": { "value": true } + "enabled": false + }, + "prime_tower_base_size": { + "value": 10 + }, + "prime_tower_base_height": { + "value": 6 + }, + "prime_tower_base_curve_magnitude": { + "value": 2 + }, + "raft_base_line_spacing": { + "value": "2*raft_base_line_width" + }, + "raft_base_line_width": { + "value": 1.4 + }, + "raft_base_speed": { + "value": 10 + }, + "raft_base_thickness": { + "value": 0.8 + }, + "raft_interface_extruder_nr": { + "value": "raft_surface_extruder_nr" + }, + "raft_interface_layers": { + "value": 2 + }, + "raft_interface_line_width": { + "value": 0.7 + }, + "raft_interface_speed": { + "value": 90 + }, + "raft_interface_thickness": { + "value": 0.3 + }, + "raft_interface_wall_count": { + "value": "raft_wall_count" + }, + "raft_margin": { + "value": 1.2 + }, + "raft_surface_extruder_nr": { + "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" + }, + "raft_surface_wall_count": { + "value": "raft_wall_count" + }, + "retraction_amount": { + "value": 0.75 + }, + "retraction_combing": { + "value": "'off'" + }, + "retraction_combing_max_distance": { + "value": "speed_travel / 10" + }, + "retraction_count_max": { + "value": 100 + }, + "retraction_extrusion_window": { + "value": 0 + }, + "retraction_hop": { + "value": 0.4 + }, + "retraction_hop_enabled": { + "value": true + }, + "retraction_hop_only_when_collides": { + "value": false + }, + "retraction_prime_speed": { + "value": "retraction_speed" + }, + "retraction_speed": { + "value": 5 + }, + "roofing_layer_count": { + "value": 2 + }, + "roofing_monotonic": { + "value": true + }, + "skin_monotonic": { + "value": true + }, + "skin_outline_count": { + "value": 0 + }, + "skin_overlap": { + "value": 0 + }, + "skin_preshrink": { + "value": 0 + }, + "skirt_brim_material_flow": { + "value": "material_flow" + }, + "skirt_brim_minimal_length": { + "value": 500 + }, + "small_skin_width": { + "value": 4 + }, + "speed_equalize_flow_width_factor": { + "value": 0 + }, + "speed_prime_tower": { + "value": "speed_topbottom" + }, + "speed_print": { + "value": 50 + }, + "speed_roofing": { + "value": "speed_wall_0" + }, + "speed_support": { + "value": "speed_wall" + }, + "speed_support_interface": { + "value": "speed_topbottom" + }, + "speed_topbottom": { + "value": "speed_wall" + }, + "speed_travel": { + "value": 250 + }, + "speed_wall": { + "value": "speed_print * 40/50" + }, + "speed_wall_0": { + "value": "speed_wall * 30/40" + }, + "speed_wall_x": { + "value": "speed_wall" + }, + "support_angle": { + "value": 40 + }, + "support_bottom_distance": { + "value": "support_z_distance / 2" + }, + "support_bottom_material_flow": { + "value": "material_flow" + }, + "support_brim_enable": { + "value": false + }, + "support_conical_min_width": { + "value": 10 + }, + "support_enable": { + "value": true + }, + "support_extruder_nr": { + "value": "int(anyExtruderWithMaterial('material_is_support_material'))" + }, + "support_fan_enable": { + "value": false + }, + "support_infill_rate": { + "value": 20.0 + }, + "support_interface_enable": { + "value": true + }, + "support_interface_material_flow": { + "value": "material_flow" + }, + "support_interface_offset": { + "value": 0 + }, + "support_interface_pattern": { + "value": "'lines'" + }, + "support_interface_wall_count": { + "value": 2 + }, + "support_material_flow": { + "value": "material_flow" + }, + "support_pattern": { + "value": "'lines'" + }, + "support_roof_material_flow": { + "value": "material_flow" + }, + "support_supported_skin_fan_speed": { + "value": "cool_fan_speed_max" + }, + "support_top_distance": { + "value": "support_z_distance" + }, + "support_wall_count": { + "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" + }, + "support_xy_distance": { + "value": 0.2 + }, + "support_z_distance": { + "value": 0 + }, + "switch_extruder_retraction_amount": { + "value": 0.5 + }, + "switch_extruder_retraction_speeds": { + "value": "retraction_speed" + }, + "top_bottom_thickness": { + "value": "5*layer_height" + }, + "travel_avoid_distance": { + "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" + }, + "travel_avoid_other_parts": { + "value": false + }, + "wall_0_inset": { + "value": 0 + }, + "wall_0_material_flow": { + "value": "material_flow" + }, + "wall_0_wipe_dist": { + "value": 0.8 + }, + "wall_material_flow": { + "value": "material_flow" + }, + "wall_x_material_flow": { + "value": "material_flow" + }, + "xy_offset": { + "value": 0 + }, + "xy_offset_layer_0": { + "value": "xy_offset" + }, + "zig_zaggify_infill": { + "value": true + }, + "z_seam_position": { + "value": "'backright'" + }, + "z_seam_relative": { + "value": true + }, + "z_seam_type": { + "value": "'sharpest_corner'" + }, + "acceleration_enabled": { + "value": true, + "enabled": false + }, + "acceleration_travel_enabled": { + "value": true, + "enabled": false + }, + "acceleration_print": { + "value": 800, + "enabled": false + }, + "acceleration_infill": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_0": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_x": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_roofing": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_topbottom": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_infill": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_interface": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_roof": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_bottom": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_prime_tower": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_travel": { + "value": 5000, + "enabled": false + }, + "acceleration_travel_layer_0": { + "value": "acceleration_travel", + "enabled": false + }, + "acceleration_layer_0": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_print_layer_0": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_0_roofing": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_x_roofing": { + "value": "acceleration_print", + "enabled": false + }, + "jerk_enabled": { + "value": true, + "enabled": false + }, + "jerk_travel_enabled": { + "value": true, + "enabled": false + }, + "jerk_print": { + "value": 6.25, + "enabled": false + }, + "jerk_infill": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_0": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_x": { + "value": "jerk_print", + "enabled": false + }, + "jerk_roofing": { + "value": "jerk_print", + "enabled": false + }, + "jerk_topbottom": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_infill": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_interface": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_roof": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_bottom": { + "value": "jerk_print", + "enabled": false + }, + "jerk_prime_tower": { + "value": "jerk_print", + "enabled": false + }, + "jerk_travel": { + "value": "jerk_print", + "enabled": false + }, + "jerk_travel_layer_0": { + "value": "jerk_travel", + "enabled": false + }, + "jerk_layer_0": { + "value": "jerk_print", + "enabled": false + }, + "jerk_print_layer_0": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_0_roofing": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_x_roofing": { + "value": "jerk_print", + "enabled": false } + } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 9828ba96f2..262647e781 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -23,19 +23,7 @@ "fabtotum_", "fdplast_", "filo3d_", - "generic_asa_175", - "generic_abs_175", - "generic_bvoh_175", - "generic_petg_175", - "generic_pla_175", - "generic_tough_pla_175", - "generic_pva_175", - "generic_cffpa_175", - "generic_cpe_175", - "generic_nylon_175", - "generic_hips_175", - "generic_pc_175", - "generic_tpu_175", + "generic_", "goofoo_", "ideagen3D_", "imade3d_", @@ -48,6 +36,8 @@ "polywood_pla", "redd_", "tizyx_", + "ultimaker_pla_175", + "ultimaker_tough_pla_175", "verbatim_", "Vertex_", "volumic_", @@ -70,7 +60,6 @@ 0, 16 ], - "platform_texture": "MakerbotMethod.png", "preferred_material": "ultimaker_absr_175", "preferred_quality_type": "draft", "preferred_variant_name": "1XA", @@ -116,7 +105,13 @@ "machine_height": { "default_value": 196 }, "machine_name": { "default_value": "UltiMaker Method X" }, "machine_width": { "default_value": 283.3 }, + "material_flow": { + "value": 97 + }, "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, - "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" } + "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, + "skin_material_flow": { + "value": "0.95*material_flow" + } } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_methodxl.def.json b/resources/definitions/ultimaker_methodxl.def.json index 6c12218b51..098586df68 100644 --- a/resources/definitions/ultimaker_methodxl.def.json +++ b/resources/definitions/ultimaker_methodxl.def.json @@ -18,12 +18,6 @@ "0": "ultimaker_methodxl_extruder_left", "1": "ultimaker_methodxl_extruder_right" }, - "platform_offset": [ - 0, - 0, - 0 - ], - "platform_texture": "MakerbotMethod.png", "preferred_quality_type": "draft", "reference_machine_id": "magma_10", "supports_network_connection": true, diff --git a/resources/extruders/ultimaker_method_extruder_left.def.json b/resources/extruders/ultimaker_method_extruder_left.def.json index f6c9e35622..e6d17d87a8 100644 --- a/resources/extruders/ultimaker_method_extruder_left.def.json +++ b/resources/extruders/ultimaker_method_extruder_left.def.json @@ -2,24 +2,28 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": - { + "metadata": { "machine": "ultimaker_method", "position": "0" }, - "overrides": - { - "extruder_nr": - { + + "overrides": { + "extruder_nr": { "default_value": 0, - "maximum_value": "1" + "maximum_value": 1 }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, - "machine_extruder_start_code_duration": { "default_value": 8 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "machine_extruder_start_code": { + "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" + }, + "machine_extruder_end_code": { + "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" + }, + "machine_extruder_start_code_duration": { + "default_value":8 + } } -} \ No newline at end of file +} diff --git a/resources/extruders/ultimaker_method_extruder_right.def.json b/resources/extruders/ultimaker_method_extruder_right.def.json index 9c6521f35b..9591daa35a 100644 --- a/resources/extruders/ultimaker_method_extruder_right.def.json +++ b/resources/extruders/ultimaker_method_extruder_right.def.json @@ -2,24 +2,28 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": - { + "metadata": { "machine": "ultimaker_method", "position": "1" }, - "overrides": - { - "extruder_nr": - { + + "overrides": { + "extruder_nr": { "default_value": 1, - "maximum_value": "1" + "maximum_value": 1 }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, - "machine_extruder_start_code_duration": { "default_value": 8 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "machine_extruder_start_code": { + "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" + }, + "machine_extruder_end_code": { + "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" + }, + "machine_extruder_start_code_duration": { + "default_value":8 + } } -} \ No newline at end of file +} diff --git a/resources/extruders/ultimaker_methodx_extruder_left.def.json b/resources/extruders/ultimaker_methodx_extruder_left.def.json index 1e4fefb17e..a77c9c576b 100644 --- a/resources/extruders/ultimaker_methodx_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_left.def.json @@ -2,24 +2,28 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": - { + "metadata": { "machine": "ultimaker_methodx", "position": "0" }, - "overrides": - { - "extruder_nr": - { + + "overrides": { + "extruder_nr": { "default_value": 0, "maximum_value": "1" }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, - "machine_extruder_start_code_duration": { "default_value": 8 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "machine_extruder_start_code": { + "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" + }, + "machine_extruder_end_code": { + "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" + }, + "machine_extruder_start_code_duration": { + "default_value":8 + } } -} \ No newline at end of file +} diff --git a/resources/extruders/ultimaker_methodx_extruder_right.def.json b/resources/extruders/ultimaker_methodx_extruder_right.def.json index 34aba96b42..6ff40895a0 100644 --- a/resources/extruders/ultimaker_methodx_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_right.def.json @@ -2,24 +2,28 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": - { + "metadata": { "machine": "ultimaker_methodx", "position": "1" }, - "overrides": - { - "extruder_nr": - { + + "overrides": { + "extruder_nr": { "default_value": 1, "maximum_value": "1" }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, - "machine_extruder_start_code_duration": { "default_value": 8 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "machine_extruder_start_code": { + "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" + }, + "machine_extruder_end_code": { + "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" + }, + "machine_extruder_start_code_duration": { + "default_value":8 + } } -} \ No newline at end of file +} diff --git a/resources/extruders/ultimaker_methodxl_extruder_left.def.json b/resources/extruders/ultimaker_methodxl_extruder_left.def.json index 43de74b497..4f315999a5 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_left.def.json @@ -2,24 +2,28 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": - { + "metadata": { "machine": "ultimaker_methodxl", "position": "0" }, - "overrides": - { - "extruder_nr": - { + + "overrides": { + "extruder_nr": { "default_value": 0, "maximum_value": "1" }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, - "machine_extruder_start_code_duration": { "default_value": 10 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "machine_extruder_start_code": { + "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" + }, + "machine_extruder_end_code": { + "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" + }, + "machine_extruder_start_code_duration": { + "default_value":10 + } } -} \ No newline at end of file +} diff --git a/resources/extruders/ultimaker_methodxl_extruder_right.def.json b/resources/extruders/ultimaker_methodxl_extruder_right.def.json index 581811646f..c0d39f811a 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_right.def.json @@ -2,24 +2,28 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": - { + "metadata": { "machine": "ultimaker_methodxl", "position": "1" }, - "overrides": - { - "extruder_nr": - { + + "overrides": { + "extruder_nr": { "default_value": 1, "maximum_value": "1" }, - "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, - "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed/100}" }, - "machine_extruder_start_code_duration": { "default_value": 10 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "machine_extruder_start_code": { + "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" + }, + "machine_extruder_end_code": { + "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" + }, + "machine_extruder_start_code_duration": { + "default_value":10 + } } -} \ No newline at end of file +} diff --git a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg index 09767ce8a7..8f4fcf08cd 100644 --- a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1A [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 17b29cbbef..8d73200d81 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1C material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1C [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg index 3d5fa82b7a..b903d9a419 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1C [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index fe2f11dac9..e760b2d642 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = LABS material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = LABS [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg index 05a61d6b82..2527856c8c 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = LABS [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg index 5375e81138..8293c9f51a 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1A [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 364eea5b52..e5877fbae4 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,13 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid -is_experimental = True +setting_version = 23 +variant = 1C material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1C [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg index 7164ec03e8..f98c3b0043 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1C [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 3a5e5e4491..3c760ee13c 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,13 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid -is_experimental = True +setting_version = 23 +variant = LABS material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = LABS [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg index 271a651e20..2c82f9dde9 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = LABS [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg index 428c5e950f..294aa9e702 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,16 +4,16 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1A [values] -build_plate_temperature = 45 build_volume_temperature = 45 infill_pattern = lines infill_sparse_density = 100 +material_bed_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 4594c37f50..11589adae4 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,13 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid -is_experimental = True +setting_version = 23 +variant = 1C material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1C [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg index fff7bb9e19..91a9e40dcc 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,16 +4,16 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1C [values] -build_plate_temperature = 45 build_volume_temperature = 45 infill_pattern = lines infill_sparse_density = 100 +material_bed_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 0ae080086d..4a8faa703f 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,13 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid -is_experimental = True +setting_version = 23 +variant = LABS material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = LABS [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg index c27d1e596a..af7e8e0819 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,16 +4,16 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = LABS [values] -build_plate_temperature = 45 build_volume_temperature = 45 infill_pattern = lines infill_sparse_density = 100 +material_bed_temperature = 45 diff --git a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg index 65218afbda..809acb9d2d 100644 --- a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg index e4ab617a39..4c80139d70 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1C material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 type = quality -variant = 1C weight = -2 [values] @@ -17,8 +17,10 @@ material_final_print_temperature = =default_material_print_temperature-5 material_initial_print_temperature = =default_material_print_temperature-5 raft_airgap = 0.3 raft_base_line_spacing = 3 -raft_base_line_width = 1.2 +raft_base_line_width = 1 raft_base_speed = 10 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.5 +raft_base_wall_count = =3 if extruder_nr == support_extruder_nr else 1 retract_at_layer_change = True retraction_amount = 0.5 retraction_min_travel = 3.2 diff --git a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg index ca62933f25..cd264fb95f 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg index c2fab76b89..82298fbb70 100644 --- a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 2A material = ultimaker_pva_175 quality_type = draft -setting_version = 23 type = quality -variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg index 433d839545..f889bedb60 100644 --- a/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] -definition = ultimaker_method -name = Fast version = 4 +name = Fast +definition = ultimaker_method [metadata] -global_quality = True -quality_type = draft setting_version = 23 type = quality +quality_type = draft weight = -2 +global_quality = True [values] layer_height = 0.203 diff --git a/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg index b1304e3b14..b07a54ce8e 100644 --- a/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] -definition = ultimaker_method -name = Fine version = 4 +name = Fine +definition = ultimaker_method [metadata] -global_quality = True -quality_type = normal setting_version = 23 type = quality +quality_type = normal weight = 0 +global_quality = True [values] layer_height = 0.1 diff --git a/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg index b3e7d1da4d..57c3ed6207 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = LABS material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 type = quality -variant = LABS weight = -2 [values] @@ -17,8 +17,10 @@ material_final_print_temperature = =default_material_print_temperature-5 material_initial_print_temperature = =default_material_print_temperature-5 raft_airgap = 0.3 raft_base_line_spacing = 3 -raft_base_line_width = 1.2 +raft_base_line_width = 1 raft_base_speed = 10 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.5 +raft_base_wall_count = =3 if extruder_nr == support_extruder_nr else 1 retract_at_layer_change = True retraction_amount = 0.5 retraction_min_travel = 3.2 diff --git a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg index 7f6b2a7be2..0069d15c80 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg index 9db56941cb..d8d1aba9e8 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg index 78e7b96bc8..005f55166f 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -1,15 +1,14 @@ [general] definition = ultimaker_methodx -name = Fast - Experimental +name = Fast version = 4 [metadata] -is_experimental = True +setting_version = 23 +variant = 1C material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 type = quality -variant = 1C weight = -2 [values] @@ -18,8 +17,10 @@ material_final_print_temperature = =default_material_print_temperature-5 material_initial_print_temperature = =default_material_print_temperature-5 raft_airgap = 0.3 raft_base_line_spacing = 3 -raft_base_line_width = 1.2 +raft_base_line_width = 1 raft_base_speed = 10 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.5 +raft_base_wall_count = =3 if extruder_nr == support_extruder_nr else 1 retract_at_layer_change = True retraction_amount = 0.5 retraction_min_travel = 3.2 diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg index a75826d1ae..2ee6e68d37 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg index 4fa889187b..1f5ac00167 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 2A material = ultimaker_pva_175 quality_type = draft -setting_version = 23 type = quality -variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_global_Draft_Quality.inst.cfg index f3d1eea204..082218b554 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_global_Draft_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] -definition = ultimaker_methodx -name = Fast version = 4 +name = Fast +definition = ultimaker_methodx [metadata] -global_quality = True -quality_type = draft setting_version = 23 type = quality +quality_type = draft weight = -2 +global_quality = True [values] layer_height = 0.203 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg index afc790abb4..0d8e243dc9 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -1,15 +1,14 @@ [general] definition = ultimaker_methodx -name = Fast - Experimental +name = Fast version = 4 [metadata] -is_experimental = True +setting_version = 23 +variant = LABS material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 type = quality -variant = LABS weight = -2 [values] @@ -18,8 +17,10 @@ material_final_print_temperature = =default_material_print_temperature-5 material_initial_print_temperature = =default_material_print_temperature-5 raft_airgap = 0.3 raft_base_line_spacing = 3 -raft_base_line_width = 1.2 +raft_base_line_width = 1 raft_base_speed = 10 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.5 +raft_base_wall_count = =3 if extruder_nr == support_extruder_nr else 1 retract_at_layer_change = True retraction_amount = 0.5 retraction_min_travel = 3.2 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg index 44b777ea77..5b615d9329 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg index c1f049384a..c43848cd42 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg index 5d5f891daf..a82e951c77 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -1,15 +1,14 @@ [general] definition = ultimaker_methodxl -name = Fast - Experimental +name = Fast version = 4 [metadata] -is_experimental = True +setting_version = 23 +variant = 1C material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 type = quality -variant = 1C weight = -2 [values] @@ -18,8 +17,10 @@ material_final_print_temperature = =default_material_print_temperature-5 material_initial_print_temperature = =default_material_print_temperature-5 raft_airgap = 0.3 raft_base_line_spacing = 3 -raft_base_line_width = 1.2 +raft_base_line_width = 1 raft_base_speed = 10 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.5 +raft_base_wall_count = =3 if extruder_nr == support_extruder_nr else 1 retract_at_layer_change = True retraction_amount = 0.5 retraction_min_travel = 3.2 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg index 9ddfc18600..cc774cfe15 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg index 594c9e6d15..2eb21fb62f 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 2A material = ultimaker_pva_175 quality_type = draft -setting_version = 23 type = quality -variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_global_Draft_Quality.inst.cfg index 115568be2c..d15026d184 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_global_Draft_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] -definition = ultimaker_methodxl -name = Fast version = 4 +name = Fast +definition = ultimaker_methodxl [metadata] -global_quality = True -quality_type = draft setting_version = 23 type = quality +quality_type = draft weight = -2 +global_quality = True [values] layer_height = 0.2 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg index cc075adf90..b191c53e4d 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -1,15 +1,14 @@ [general] definition = ultimaker_methodxl -name = Fast - Experimental +name = Fast version = 4 [metadata] -is_experimental = True +setting_version = 23 +variant = LABS material = ultimaker_nylon12-cf_175 quality_type = draft -setting_version = 23 type = quality -variant = LABS weight = -2 [values] @@ -18,8 +17,10 @@ material_final_print_temperature = =default_material_print_temperature-5 material_initial_print_temperature = =default_material_print_temperature-5 raft_airgap = 0.3 raft_base_line_spacing = 3 -raft_base_line_width = 1.2 +raft_base_line_width = 1 raft_base_speed = 10 +raft_base_thickness = =0.6 if extruder_nr == support_extruder_nr else 0.5 +raft_base_wall_count = =3 if extruder_nr == support_extruder_nr else 1 retract_at_layer_change = True retraction_amount = 0.5 retraction_min_travel = 3.2 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg index 40a85a3a0e..cb6738bc3e 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = LABS weight = -2 [values] diff --git a/resources/variants/ultimaker_method_1A.inst.cfg b/resources/variants/ultimaker_method_1A.inst.cfg index d8ac36154a..5d637829ec 100644 --- a/resources/variants/ultimaker_method_1A.inst.cfg +++ b/resources/variants/ultimaker_method_1A.inst.cfg @@ -1,13 +1,13 @@ [general] -definition = ultimaker_method name = 1A version = 4 +definition = ultimaker_method [metadata] -hardware_type = nozzle -reference_extruder_id = mk14 setting_version = 23 type = variant +reference_extruder_id = mk14 +hardware_type = nozzle [values] machine_nozzle_id = 1A diff --git a/resources/variants/ultimaker_method_1C.inst.cfg b/resources/variants/ultimaker_method_1C.inst.cfg index b881a01fdc..bfb2e05bc8 100644 --- a/resources/variants/ultimaker_method_1C.inst.cfg +++ b/resources/variants/ultimaker_method_1C.inst.cfg @@ -1,13 +1,13 @@ [general] -definition = ultimaker_method name = 1C version = 4 +definition = ultimaker_method [metadata] -hardware_type = nozzle -reference_extruder_id = mk14_c setting_version = 23 type = variant +reference_extruder_id = mk14_c +hardware_type = nozzle [values] machine_nozzle_id = 1C diff --git a/resources/variants/ultimaker_method_2A.inst.cfg b/resources/variants/ultimaker_method_2A.inst.cfg index b2f16e4472..8e336e8170 100644 --- a/resources/variants/ultimaker_method_2A.inst.cfg +++ b/resources/variants/ultimaker_method_2A.inst.cfg @@ -1,13 +1,13 @@ [general] -definition = ultimaker_method name = 2A version = 4 +definition = ultimaker_method [metadata] -hardware_type = nozzle -reference_extruder_id = mk14_s setting_version = 23 type = variant +reference_extruder_id = mk14_s +hardware_type = nozzle [values] machine_nozzle_id = 2A diff --git a/resources/variants/ultimaker_method_LABS.inst.cfg b/resources/variants/ultimaker_method_LABS.inst.cfg index 97e78c30e0..25f35f7bd3 100644 --- a/resources/variants/ultimaker_method_LABS.inst.cfg +++ b/resources/variants/ultimaker_method_LABS.inst.cfg @@ -1,12 +1,12 @@ [general] -definition = ultimaker_method name = LABS version = 4 +definition = ultimaker_method [metadata] -hardware_type = nozzle setting_version = 23 type = variant +hardware_type = nozzle [values] machine_nozzle_id = LABS From 74777085df7c6cbec01e80f511c56a6558d81bae Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Thu, 27 Jun 2024 16:51:45 +0000 Subject: [PATCH 32/43] Applied printer-linter format --- .../ultimaker_method_base.def.json | 1082 +++++++---------- .../definitions/ultimaker_methodx.def.json | 8 +- .../ultimaker_method_extruder_left.def.json | 28 +- .../ultimaker_method_extruder_right.def.json | 28 +- .../ultimaker_methodx_extruder_left.def.json | 28 +- .../ultimaker_methodx_extruder_right.def.json | 28 +- .../ultimaker_methodxl_extruder_left.def.json | 28 +- ...ultimaker_methodxl_extruder_right.def.json | 28 +- ..._method_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ..._1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 6 +- ..._method_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...abs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 6 +- ...ethod_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...methodx_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ..._1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 6 +- ...methodx_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...abs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 6 +- ...thodx_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...ethodxl_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ..._1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 6 +- ...ethodxl_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +- ...abs_um-nylon12-cf-175_0.2mm_solid.inst.cfg | 6 +- ...hodxl_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +- .../um_method_1a_um-pla-175_0.2mm.inst.cfg | 4 +- ...method_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 4 +- .../um_method_1c_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_method_2a_um-pva-175_0.2mm.inst.cfg | 4 +- .../um_method_global_Draft_Quality.inst.cfg | 8 +- .../um_method_global_Normal_Quality.inst.cfg | 8 +- ...thod_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 4 +- .../um_method_labs_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodx_1a_um-pla-175_0.2mm.inst.cfg | 4 +- ...ethodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 4 +- .../um_methodx_1c_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodx_2a_um-pva-175_0.2mm.inst.cfg | 4 +- .../um_methodx_global_Draft_Quality.inst.cfg | 8 +- ...hodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 4 +- .../um_methodx_labs_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodxl_1a_um-pla-175_0.2mm.inst.cfg | 4 +- ...thodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg | 4 +- .../um_methodxl_1c_um-pla-175_0.2mm.inst.cfg | 4 +- .../um_methodxl_2a_um-pva-175_0.2mm.inst.cfg | 4 +- .../um_methodxl_global_Draft_Quality.inst.cfg | 8 +- ...odxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg | 4 +- ...um_methodxl_labs_um-pla-175_0.2mm.inst.cfg | 4 +- .../variants/ultimaker_method_1A.inst.cfg | 6 +- .../variants/ultimaker_method_1C.inst.cfg | 6 +- .../variants/ultimaker_method_2A.inst.cfg | 6 +- .../variants/ultimaker_method_LABS.inst.cfg | 4 +- 49 files changed, 601 insertions(+), 873 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index cd46b31900..e97db9b28e 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -1,667 +1,423 @@ { - "version": 2, - "inherits": "ultimaker", - "metadata": { - "author": "UltiMaker", - "exclude_materials": [ - "dsm_", - "Essentium_", - "imade3d_", - "chromatik_", - "3D-Fuel_", - "bestfilament_", - "emotiontech_", - "eryone_", - "eSUN_", - "Extrudr_", - "fabtotum_", - "fdplast_", - "filo3d_", - "generic_", - "ultimaker_rapidrinse_175", - "goofoo_", - "ideagen3D_", - "imade3d_", - "innofill_", - "layer_one_", - "leapfrog_", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_", - "tizyx_", - "verbatim_", - "Vertex_", - "volumic_", - "xyzprinting_", - "zyyx_pro_", - "octofiber_", - "fiberlogy_" - ], - "file_formats": "application/x-makerbot", - "has_machine_materials": true, - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "machine_extruder_trains": { - "0": "ultimaker_method_extruder_left", - "1": "ultimaker_method_extruder_right" - }, - "manufacturer": "Ultimaker B.V.", - "nozzle_offsetting_for_disallowed_areas": false, - "platform": "ultimaker_method_platform.stl", - "preferred_quality_type": "fast", - "preferred_variant_name": "1A", - "preferred_material": "ultimaker_pla_175", - "supports_network_connection": true, - "supports_usb_connection": false, - "variants_name": "Extruder", - "visible": false, - "weight": -1 - }, - "name": "UltiMaker Method Base Profile", - "overrides": { - "adhesion_extruder_nr": { - "value": 0 - }, - "adhesion_type": { - "value": "'raft'" - }, - "bridge_enable_more_layers": { - "value": true - }, - "bridge_fan_speed": { - "value": "cool_fan_speed_max" - }, - "bridge_fan_speed_2": { - "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" - }, - "bridge_fan_speed_3": { - "value": "cool_fan_speed_min" - }, - "bridge_settings_enabled": { - "value": true - }, - "bridge_skin_density": { - "value": 100 - }, - "bridge_skin_density_2": { - "value": 100 - }, - "bridge_skin_density_3": { - "value": 100 - }, - "bridge_skin_material_flow": { - "value": "material_flow" - }, - "bridge_skin_material_flow_2": { - "value": "material_flow" - }, - "bridge_skin_material_flow_3": { - "value": "material_flow" - }, - "bridge_skin_speed": { - "value": "speed_topbottom" - }, - "bridge_skin_speed_2": { - "value": "speed_topbottom" - }, - "bridge_skin_speed_3": { - "value": "speed_topbottom" - }, - "bridge_sparse_infill_max_density": { - "value": 50 - }, - "bridge_wall_coast": { - "value": 0 - }, - "bridge_wall_material_flow": { - "value": "material_flow" - }, - "bridge_wall_speed": { - "value": "speed_wall" - }, - "brim_width": { - "value": 5 - }, - "extruder_prime_pos_abs": { - "default_value": true - }, - "gradual_support_infill_steps": { - "value": 0 - }, - "infill_before_walls": { - "value": false - }, - "inset_direction": { - "value": "'inside_out'" - }, - "infill_material_flow": { - "value": "material_flow" - }, - "infill_overlap": { - "value": 0 - }, - "infill_pattern": { - "value": "'lines' if infill_sparse_density > 80 else 'grid'" - }, - "infill_wipe_dist": { - "value": 0 - }, - "layer_start_x": { - "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" - }, - "layer_start_y": { - "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" - }, - "machine_acceleration": { - "default_value": 3000 - }, - "machine_center_is_zero": { - "value": true - }, - "machine_scale_fan_speed_zero_to_one": { - "value": true - }, - "machine_end_gcode": { - "default_value": "" - }, - "machine_extruder_count": { - "default_value": 2 - }, - "machine_gcode_flavor": { - "default_value": "Griffin" - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_heated_build_volume": { - "default_value": true - }, - "machine_min_cool_heat_time_window": { - "value": 15 - }, - "machine_name": { - "default_value": "UltiMaker Method" - }, - "machine_start_gcode": { - "default_value": "" - }, - "material_initial_print_temperature": { - "value": "material_print_temperature-10" - }, - "machine_nozzle_heat_up_speed": { - "value": 3.5 - }, - "machine_nozzle_cool_down_speed": { - "value": 0.8 - }, - "material_flow": { - "value": 100 - }, - "skin_material_flow": { - "value": "material_flow" - }, - "material_bed_temperature": { - "enabled": "machine_heated_bed" - }, - "material_shrinkage_percentage": { - "enabled": true - }, - "min_wall_line_width": { - "value": 0.4 - }, - "minimum_support_area": { - "value": 0.1 - }, - "multiple_mesh_overlap": { - "value": 0 - }, - "optimize_wall_printing_order": { - "value": true - }, - "prime_blob_enable": { - "enabled": false - }, - "prime_tower_enable": { - "value": false - }, - "prime_tower_flow": { - "value": "material_flow" - }, - "prime_tower_line_width": { - "value": 1 - }, - "prime_tower_raft_base_line_spacing": { - "value": "raft_base_line_width" - }, - "prime_tower_wipe_enabled": { - "value": true - }, - "print_sequence": + "version": 2, + "name": "UltiMaker Method Base Profile", + "inherits": "ultimaker", + "metadata": { - "enabled": false - }, - "prime_tower_base_size": { - "value": 10 - }, - "prime_tower_base_height": { - "value": 6 - }, - "prime_tower_base_curve_magnitude": { - "value": 2 - }, - "raft_base_line_spacing": { - "value": "2*raft_base_line_width" - }, - "raft_base_line_width": { - "value": 1.4 - }, - "raft_base_speed": { - "value": 10 - }, - "raft_base_thickness": { - "value": 0.8 - }, - "raft_interface_extruder_nr": { - "value": "raft_surface_extruder_nr" - }, - "raft_interface_layers": { - "value": 2 - }, - "raft_interface_line_width": { - "value": 0.7 - }, - "raft_interface_speed": { - "value": 90 - }, - "raft_interface_thickness": { - "value": 0.3 - }, - "raft_interface_wall_count": { - "value": "raft_wall_count" - }, - "raft_margin": { - "value": 1.2 - }, - "raft_surface_extruder_nr": { - "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" - }, - "raft_surface_wall_count": { - "value": "raft_wall_count" - }, - "retraction_amount": { - "value": 0.75 - }, - "retraction_combing": { - "value": "'off'" - }, - "retraction_combing_max_distance": { - "value": "speed_travel / 10" - }, - "retraction_count_max": { - "value": 100 - }, - "retraction_extrusion_window": { - "value": 0 - }, - "retraction_hop": { - "value": 0.4 - }, - "retraction_hop_enabled": { - "value": true - }, - "retraction_hop_only_when_collides": { - "value": false - }, - "retraction_prime_speed": { - "value": "retraction_speed" - }, - "retraction_speed": { - "value": 5 - }, - "roofing_layer_count": { - "value": 2 - }, - "roofing_monotonic": { - "value": true - }, - "skin_monotonic": { - "value": true - }, - "skin_outline_count": { - "value": 0 - }, - "skin_overlap": { - "value": 0 - }, - "skin_preshrink": { - "value": 0 - }, - "skirt_brim_material_flow": { - "value": "material_flow" - }, - "skirt_brim_minimal_length": { - "value": 500 - }, - "small_skin_width": { - "value": 4 - }, - "speed_equalize_flow_width_factor": { - "value": 0 - }, - "speed_prime_tower": { - "value": "speed_topbottom" - }, - "speed_print": { - "value": 50 - }, - "speed_roofing": { - "value": "speed_wall_0" - }, - "speed_support": { - "value": "speed_wall" - }, - "speed_support_interface": { - "value": "speed_topbottom" - }, - "speed_topbottom": { - "value": "speed_wall" - }, - "speed_travel": { - "value": 250 - }, - "speed_wall": { - "value": "speed_print * 40/50" - }, - "speed_wall_0": { - "value": "speed_wall * 30/40" - }, - "speed_wall_x": { - "value": "speed_wall" - }, - "support_angle": { - "value": 40 - }, - "support_bottom_distance": { - "value": "support_z_distance / 2" - }, - "support_bottom_material_flow": { - "value": "material_flow" - }, - "support_brim_enable": { - "value": false - }, - "support_conical_min_width": { - "value": 10 - }, - "support_enable": { - "value": true - }, - "support_extruder_nr": { - "value": "int(anyExtruderWithMaterial('material_is_support_material'))" - }, - "support_fan_enable": { - "value": false - }, - "support_infill_rate": { - "value": 20.0 - }, - "support_interface_enable": { - "value": true - }, - "support_interface_material_flow": { - "value": "material_flow" - }, - "support_interface_offset": { - "value": 0 - }, - "support_interface_pattern": { - "value": "'lines'" - }, - "support_interface_wall_count": { - "value": 2 - }, - "support_material_flow": { - "value": "material_flow" - }, - "support_pattern": { - "value": "'lines'" - }, - "support_roof_material_flow": { - "value": "material_flow" - }, - "support_supported_skin_fan_speed": { - "value": "cool_fan_speed_max" - }, - "support_top_distance": { - "value": "support_z_distance" - }, - "support_wall_count": { - "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" - }, - "support_xy_distance": { - "value": 0.2 - }, - "support_z_distance": { - "value": 0 - }, - "switch_extruder_retraction_amount": { - "value": 0.5 - }, - "switch_extruder_retraction_speeds": { - "value": "retraction_speed" - }, - "top_bottom_thickness": { - "value": "5*layer_height" - }, - "travel_avoid_distance": { - "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" - }, - "travel_avoid_other_parts": { - "value": false - }, - "wall_0_inset": { - "value": 0 - }, - "wall_0_material_flow": { - "value": "material_flow" - }, - "wall_0_wipe_dist": { - "value": 0.8 - }, - "wall_material_flow": { - "value": "material_flow" - }, - "wall_x_material_flow": { - "value": "material_flow" - }, - "xy_offset": { - "value": 0 - }, - "xy_offset_layer_0": { - "value": "xy_offset" - }, - "zig_zaggify_infill": { - "value": true - }, - "z_seam_position": { - "value": "'backright'" - }, - "z_seam_relative": { - "value": true - }, - "z_seam_type": { - "value": "'sharpest_corner'" - }, - "acceleration_enabled": { - "value": true, - "enabled": false - }, - "acceleration_travel_enabled": { - "value": true, - "enabled": false - }, - "acceleration_print": { - "value": 800, - "enabled": false - }, - "acceleration_infill": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_0": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_x": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_roofing": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_topbottom": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_infill": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_interface": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_roof": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_bottom": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_prime_tower": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_travel": { - "value": 5000, - "enabled": false - }, - "acceleration_travel_layer_0": { - "value": "acceleration_travel", - "enabled": false - }, - "acceleration_layer_0": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_print_layer_0": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_0_roofing": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_x_roofing": { - "value": "acceleration_print", - "enabled": false - }, - "jerk_enabled": { - "value": true, - "enabled": false - }, - "jerk_travel_enabled": { - "value": true, - "enabled": false - }, - "jerk_print": { - "value": 6.25, - "enabled": false - }, - "jerk_infill": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_0": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_x": { - "value": "jerk_print", - "enabled": false - }, - "jerk_roofing": { - "value": "jerk_print", - "enabled": false - }, - "jerk_topbottom": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_infill": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_interface": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_roof": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_bottom": { - "value": "jerk_print", - "enabled": false - }, - "jerk_prime_tower": { - "value": "jerk_print", - "enabled": false - }, - "jerk_travel": { - "value": "jerk_print", - "enabled": false - }, - "jerk_travel_layer_0": { - "value": "jerk_travel", - "enabled": false - }, - "jerk_layer_0": { - "value": "jerk_print", - "enabled": false - }, - "jerk_print_layer_0": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_0_roofing": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_x_roofing": { - "value": "jerk_print", - "enabled": false + "visible": false, + "author": "UltiMaker", + "manufacturer": "Ultimaker B.V.", + "file_formats": "application/x-makerbot", + "platform": "ultimaker_method_platform.stl", + "exclude_materials": [ + "dsm_", + "Essentium_", + "imade3d_", + "chromatik_", + "3D-Fuel_", + "bestfilament_", + "emotiontech_", + "eryone_", + "eSUN_", + "Extrudr_", + "fabtotum_", + "fdplast_", + "filo3d_", + "generic_", + "ultimaker_rapidrinse_175", + "goofoo_", + "ideagen3D_", + "imade3d_", + "innofill_", + "layer_one_", + "leapfrog_", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_", + "tizyx_", + "verbatim_", + "Vertex_", + "volumic_", + "xyzprinting_", + "zyyx_pro_", + "octofiber_", + "fiberlogy_" + ], + "has_machine_materials": true, + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": + { + "0": "ultimaker_method_extruder_left", + "1": "ultimaker_method_extruder_right" + }, + "nozzle_offsetting_for_disallowed_areas": false, + "preferred_material": "ultimaker_pla_175", + "preferred_quality_type": "fast", + "preferred_variant_name": "1A", + "supports_network_connection": true, + "supports_usb_connection": false, + "variants_name": "Extruder", + "weight": -1 + }, + "overrides": + { + "acceleration_enabled": + { + "enabled": false, + "value": true + }, + "acceleration_infill": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_layer_0": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_prime_tower": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_print": + { + "enabled": false, + "value": 800 + }, + "acceleration_print_layer_0": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_roofing": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_bottom": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_infill": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_interface": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_roof": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_topbottom": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_travel": + { + "enabled": false, + "value": 5000 + }, + "acceleration_travel_enabled": + { + "enabled": false, + "value": true + }, + "acceleration_travel_layer_0": + { + "enabled": false, + "value": "acceleration_travel" + }, + "acceleration_wall": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_0": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_0_roofing": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_x": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_x_roofing": + { + "enabled": false, + "value": "acceleration_print" + }, + "adhesion_extruder_nr": { "value": 0 }, + "adhesion_type": { "value": "'raft'" }, + "bridge_enable_more_layers": { "value": true }, + "bridge_fan_speed": { "value": "cool_fan_speed_max" }, + "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, + "bridge_fan_speed_3": { "value": "cool_fan_speed_min" }, + "bridge_settings_enabled": { "value": true }, + "bridge_skin_density": { "value": 100 }, + "bridge_skin_density_2": { "value": 100 }, + "bridge_skin_density_3": { "value": 100 }, + "bridge_skin_material_flow": { "value": "material_flow" }, + "bridge_skin_material_flow_2": { "value": "material_flow" }, + "bridge_skin_material_flow_3": { "value": "material_flow" }, + "bridge_skin_speed": { "value": "speed_topbottom" }, + "bridge_skin_speed_2": { "value": "speed_topbottom" }, + "bridge_skin_speed_3": { "value": "speed_topbottom" }, + "bridge_sparse_infill_max_density": { "value": 50 }, + "bridge_wall_coast": { "value": 0 }, + "bridge_wall_material_flow": { "value": "material_flow" }, + "bridge_wall_speed": { "value": "speed_wall" }, + "brim_width": { "value": 5 }, + "extruder_prime_pos_abs": { "default_value": true }, + "gradual_support_infill_steps": { "value": 0 }, + "infill_before_walls": { "value": false }, + "infill_material_flow": { "value": "material_flow" }, + "infill_overlap": { "value": 0 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 80 else 'grid'" }, + "infill_wipe_dist": { "value": 0 }, + "inset_direction": { "value": "'inside_out'" }, + "jerk_enabled": + { + "enabled": false, + "value": true + }, + "jerk_infill": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_layer_0": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_prime_tower": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_print": + { + "enabled": false, + "value": 6.25 + }, + "jerk_print_layer_0": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_roofing": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_bottom": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_infill": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_interface": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_roof": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_topbottom": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_travel": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_travel_enabled": + { + "enabled": false, + "value": true + }, + "jerk_travel_layer_0": + { + "enabled": false, + "value": "jerk_travel" + }, + "jerk_wall": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_0": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_0_roofing": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_x": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_x_roofing": + { + "enabled": false, + "value": "jerk_print" + }, + "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, + "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_center_is_zero": { "value": true }, + "machine_end_gcode": { "default_value": "" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Griffin" }, + "machine_heated_bed": { "default_value": false }, + "machine_heated_build_volume": { "default_value": true }, + "machine_min_cool_heat_time_window": { "value": 15 }, + "machine_name": { "default_value": "UltiMaker Method" }, + "machine_nozzle_cool_down_speed": { "value": 0.8 }, + "machine_nozzle_heat_up_speed": { "value": 3.5 }, + "machine_scale_fan_speed_zero_to_one": { "value": true }, + "machine_start_gcode": { "default_value": "" }, + "material_bed_temperature": { "enabled": "machine_heated_bed" }, + "material_flow": { "value": 100 }, + "material_initial_print_temperature": { "value": "material_print_temperature-10" }, + "material_shrinkage_percentage": { "enabled": true }, + "min_wall_line_width": { "value": 0.4 }, + "minimum_support_area": { "value": 0.1 }, + "multiple_mesh_overlap": { "value": 0 }, + "optimize_wall_printing_order": { "value": true }, + "prime_blob_enable": { "enabled": false }, + "prime_tower_base_curve_magnitude": { "value": 2 }, + "prime_tower_base_height": { "value": 6 }, + "prime_tower_base_size": { "value": 10 }, + "prime_tower_enable": { "value": false }, + "prime_tower_flow": { "value": "material_flow" }, + "prime_tower_line_width": { "value": 1 }, + "prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" }, + "prime_tower_wipe_enabled": { "value": true }, + "print_sequence": { "enabled": false }, + "raft_base_line_spacing": { "value": "2*raft_base_line_width" }, + "raft_base_line_width": { "value": 1.4 }, + "raft_base_speed": { "value": 10 }, + "raft_base_thickness": { "value": 0.8 }, + "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" }, + "raft_interface_layers": { "value": 2 }, + "raft_interface_line_width": { "value": 0.7 }, + "raft_interface_speed": { "value": 90 }, + "raft_interface_thickness": { "value": 0.3 }, + "raft_interface_wall_count": { "value": "raft_wall_count" }, + "raft_margin": { "value": 1.2 }, + "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" }, + "raft_surface_wall_count": { "value": "raft_wall_count" }, + "retraction_amount": { "value": 0.75 }, + "retraction_combing": { "value": "'off'" }, + "retraction_combing_max_distance": { "value": "speed_travel / 10" }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 0 }, + "retraction_hop": { "value": 0.4 }, + "retraction_hop_enabled": { "value": true }, + "retraction_hop_only_when_collides": { "value": false }, + "retraction_prime_speed": { "value": "retraction_speed" }, + "retraction_speed": { "value": 5 }, + "roofing_layer_count": { "value": 2 }, + "roofing_monotonic": { "value": true }, + "skin_material_flow": { "value": "material_flow" }, + "skin_monotonic": { "value": true }, + "skin_outline_count": { "value": 0 }, + "skin_overlap": { "value": 0 }, + "skin_preshrink": { "value": 0 }, + "skirt_brim_material_flow": { "value": "material_flow" }, + "skirt_brim_minimal_length": { "value": 500 }, + "small_skin_width": { "value": 4 }, + "speed_equalize_flow_width_factor": { "value": 0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 50 }, + "speed_roofing": { "value": "speed_wall_0" }, + "speed_support": { "value": "speed_wall" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_topbottom": { "value": "speed_wall" }, + "speed_travel": { "value": 250 }, + "speed_wall": { "value": "speed_print * 40/50" }, + "speed_wall_0": { "value": "speed_wall * 30/40" }, + "speed_wall_x": { "value": "speed_wall" }, + "support_angle": { "value": 40 }, + "support_bottom_distance": { "value": "support_z_distance / 2" }, + "support_bottom_material_flow": { "value": "material_flow" }, + "support_brim_enable": { "value": false }, + "support_conical_min_width": { "value": 10 }, + "support_enable": { "value": true }, + "support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" }, + "support_fan_enable": { "value": false }, + "support_infill_rate": { "value": 20.0 }, + "support_interface_enable": { "value": true }, + "support_interface_material_flow": { "value": "material_flow" }, + "support_interface_offset": { "value": 0 }, + "support_interface_pattern": { "value": "'lines'" }, + "support_interface_wall_count": { "value": 2 }, + "support_material_flow": { "value": "material_flow" }, + "support_pattern": { "value": "'lines'" }, + "support_roof_material_flow": { "value": "material_flow" }, + "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" }, + "support_top_distance": { "value": "support_z_distance" }, + "support_wall_count": { "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" }, + "support_xy_distance": { "value": 0.2 }, + "support_z_distance": { "value": 0 }, + "switch_extruder_retraction_amount": { "value": 0.5 }, + "switch_extruder_retraction_speeds": { "value": "retraction_speed" }, + "top_bottom_thickness": { "value": "5*layer_height" }, + "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, + "travel_avoid_other_parts": { "value": false }, + "wall_0_inset": { "value": 0 }, + "wall_0_material_flow": { "value": "material_flow" }, + "wall_0_wipe_dist": { "value": 0.8 }, + "wall_material_flow": { "value": "material_flow" }, + "wall_x_material_flow": { "value": "material_flow" }, + "xy_offset": { "value": 0 }, + "xy_offset_layer_0": { "value": "xy_offset" }, + "z_seam_position": { "value": "'backright'" }, + "z_seam_relative": { "value": true }, + "z_seam_type": { "value": "'sharpest_corner'" }, + "zig_zaggify_infill": { "value": true } } - } } \ No newline at end of file diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 262647e781..7a6c8aa494 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -105,13 +105,9 @@ "machine_height": { "default_value": 196 }, "machine_name": { "default_value": "UltiMaker Method X" }, "machine_width": { "default_value": 283.3 }, - "material_flow": { - "value": 97 - }, + "material_flow": { "value": 97 }, "prime_tower_position_x": { "value": "(150 / 2 + resolveOrValue('prime_tower_size') / 2) if resolveOrValue('machine_shape') == 'elliptic' else (150 - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_x'))), 1)) - (150 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, "prime_tower_position_y": { "value": "190 - prime_tower_size - (resolveOrValue('prime_tower_base_size') if (resolveOrValue('adhesion_type') == 'raft' or resolveOrValue('prime_tower_brim_enable')) else 0) - max(max(extruderValues('travel_avoid_distance')) + max(extruderValues('support_offset')) + (extruderValue(skirt_brim_extruder_nr, 'skirt_brim_line_width') * extruderValue(skirt_brim_extruder_nr, 'skirt_line_count') * extruderValue(skirt_brim_extruder_nr, 'initial_layer_line_width_factor') / 100 + extruderValue(skirt_brim_extruder_nr, 'skirt_gap') if resolveOrValue('adhesion_type') == 'skirt' else 0) + (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0), max(map(abs, extruderValues('machine_nozzle_offset_y'))), 1) - (190 / 2 if resolveOrValue('machine_center_is_zero') else 0)" }, - "skin_material_flow": { - "value": "0.95*material_flow" - } + "skin_material_flow": { "value": "0.95*material_flow" } } } \ No newline at end of file diff --git a/resources/extruders/ultimaker_method_extruder_left.def.json b/resources/extruders/ultimaker_method_extruder_left.def.json index e6d17d87a8..cb8e86a33b 100644 --- a/resources/extruders/ultimaker_method_extruder_left.def.json +++ b/resources/extruders/ultimaker_method_extruder_left.def.json @@ -2,28 +2,24 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_method", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": 1 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_code": { - "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" - }, - "machine_extruder_end_code": { - "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" - }, - "machine_extruder_start_code_duration": { - "default_value":8 - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_method_extruder_right.def.json b/resources/extruders/ultimaker_method_extruder_right.def.json index 9591daa35a..520d8abae8 100644 --- a/resources/extruders/ultimaker_method_extruder_right.def.json +++ b/resources/extruders/ultimaker_method_extruder_right.def.json @@ -2,28 +2,24 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_method", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": 1 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_code": { - "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" - }, - "machine_extruder_end_code": { - "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" - }, - "machine_extruder_start_code_duration": { - "default_value":8 - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_methodx_extruder_left.def.json b/resources/extruders/ultimaker_methodx_extruder_left.def.json index a77c9c576b..1e4fefb17e 100644 --- a/resources/extruders/ultimaker_methodx_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_left.def.json @@ -2,28 +2,24 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_methodx", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_code": { - "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" - }, - "machine_extruder_end_code": { - "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" - }, - "machine_extruder_start_code_duration": { - "default_value":8 - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_methodx_extruder_right.def.json b/resources/extruders/ultimaker_methodx_extruder_right.def.json index 6ff40895a0..34aba96b42 100644 --- a/resources/extruders/ultimaker_methodx_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodx_extruder_right.def.json @@ -2,28 +2,24 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_methodx", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code_duration": { "default_value": 8 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_code": { - "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" - }, - "machine_extruder_end_code": { - "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" - }, - "machine_extruder_start_code_duration": { - "default_value":8 - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_methodxl_extruder_left.def.json b/resources/extruders/ultimaker_methodxl_extruder_left.def.json index 4f315999a5..64c1577f1e 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_left.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_left.def.json @@ -2,28 +2,24 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_methodxl", "position": "0" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 0, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code_duration": { "default_value": 10 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_code": { - "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" - }, - "machine_extruder_end_code": { - "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" - }, - "machine_extruder_start_code_duration": { - "default_value":10 - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/ultimaker_methodxl_extruder_right.def.json b/resources/extruders/ultimaker_methodxl_extruder_right.def.json index c0d39f811a..0af672130d 100644 --- a/resources/extruders/ultimaker_methodxl_extruder_right.def.json +++ b/resources/extruders/ultimaker_methodxl_extruder_right.def.json @@ -2,28 +2,24 @@ "version": 2, "name": "Extruder 2", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "ultimaker_methodxl", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_code": { "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" }, + "machine_extruder_start_code": { "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" }, + "machine_extruder_start_code_duration": { "default_value": 10 }, "machine_nozzle_offset_x": { "default_value": 0 }, "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_extruder_start_code": { - "default_value": "G0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000\nM104 S{material_print_temperature}\nG4 S5\nG91\nG0 Z-0.4 F600\nG90\nM107 P{(extruder_nr+1)%2}\nM106 P{extruder_nr} S{cool_fan_speed_0/100}" - }, - "machine_extruder_end_code": { - "default_value": "M106 P{extruder_nr} S1.0\nG91\nG0 Z0.4 F600\nG90\nG0 X{prime_tower_position_x - prime_tower_size/2} Y{prime_tower_position_y + prime_tower_size/2} F6000" - }, - "machine_extruder_start_code_duration": { - "default_value":10 - } + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg index 8f4fcf08cd..09767ce8a7 100644 --- a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1A +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1A [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 8d73200d81..17b29cbbef 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_nylon12-cf_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg index b903d9a419..3d5fa82b7a 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index e760b2d642..fe2f11dac9 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_nylon12-cf_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg index 2527856c8c..05a61d6b82 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg index 8293c9f51a..5375e81138 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1A +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1A [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index e5877fbae4..2a6f009282 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_nylon12-cf_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg index f98c3b0043..7164ec03e8 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 3c760ee13c..13ff5b5b67 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_nylon12-cf_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg index 2c82f9dde9..271a651e20 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg index 294aa9e702..ce3c938e8c 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1A +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1A [values] build_volume_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 11589adae4..1f6aad371a 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_nylon12-cf_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg index 91a9e40dcc..2ac7cdd32a 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] build_volume_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg index 4a8faa703f..0322b30164 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_nylon12-cf_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] infill_pattern = lines diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg index af7e8e0819..242d166473 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] build_volume_temperature = 45 diff --git a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg index 809acb9d2d..65218afbda 100644 --- a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1A material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg index 4c80139d70..fd1f868b7a 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_nylon12-cf_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg index cd264fb95f..ca62933f25 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg index 82298fbb70..c2fab76b89 100644 --- a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 2A material = ultimaker_pva_175 quality_type = draft +setting_version = 23 type = quality +variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg index f889bedb60..433d839545 100644 --- a/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_global_Draft_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Fast definition = ultimaker_method +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 23 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.203 diff --git a/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg b/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg index b07a54ce8e..b1304e3b14 100644 --- a/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_global_Normal_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Fine definition = ultimaker_method +name = Fine +version = 4 [metadata] +global_quality = True +quality_type = normal setting_version = 23 type = quality -quality_type = normal weight = 0 -global_quality = True [values] layer_height = 0.1 diff --git a/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg index 57c3ed6207..8fa5f11f67 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_nylon12-cf_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg index 0069d15c80..7f6b2a7be2 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg index d8d1aba9e8..9db56941cb 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1A material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg index 005f55166f..aafa89e07c 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_nylon12-cf_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg index 2ee6e68d37..a75826d1ae 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg index 1f5ac00167..4fa889187b 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 2A material = ultimaker_pva_175 quality_type = draft +setting_version = 23 type = quality +variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_global_Draft_Quality.inst.cfg index 082218b554..f3d1eea204 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_global_Draft_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Fast definition = ultimaker_methodx +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 23 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.203 diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg index 0d8e243dc9..b2d657955a 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_nylon12-cf_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg index 5b615d9329..44b777ea77 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg index c43848cd42..c1f049384a 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1A material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg index a82e951c77..8554e49fe8 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-nylon12-cf-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_nylon12-cf_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg index cc774cfe15..9ddfc18600 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg index 2eb21fb62f..594c9e6d15 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 2A material = ultimaker_pva_175 quality_type = draft +setting_version = 23 type = quality +variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_global_Draft_Quality.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_global_Draft_Quality.inst.cfg index d15026d184..115568be2c 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_global_Draft_Quality.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_global_Draft_Quality.inst.cfg @@ -1,14 +1,14 @@ [general] -version = 4 -name = Fast definition = ultimaker_methodxl +name = Fast +version = 4 [metadata] +global_quality = True +quality_type = draft setting_version = 23 type = quality -quality_type = draft weight = -2 -global_quality = True [values] layer_height = 0.2 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg index b191c53e4d..b14d2334e5 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-nylon12-cf-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_nylon12-cf_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg index cb6738bc3e..40a85a3a0e 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] diff --git a/resources/variants/ultimaker_method_1A.inst.cfg b/resources/variants/ultimaker_method_1A.inst.cfg index 5d637829ec..d8ac36154a 100644 --- a/resources/variants/ultimaker_method_1A.inst.cfg +++ b/resources/variants/ultimaker_method_1A.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = ultimaker_method name = 1A version = 4 -definition = ultimaker_method [metadata] +hardware_type = nozzle +reference_extruder_id = mk14 setting_version = 23 type = variant -reference_extruder_id = mk14 -hardware_type = nozzle [values] machine_nozzle_id = 1A diff --git a/resources/variants/ultimaker_method_1C.inst.cfg b/resources/variants/ultimaker_method_1C.inst.cfg index bfb2e05bc8..b881a01fdc 100644 --- a/resources/variants/ultimaker_method_1C.inst.cfg +++ b/resources/variants/ultimaker_method_1C.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = ultimaker_method name = 1C version = 4 -definition = ultimaker_method [metadata] +hardware_type = nozzle +reference_extruder_id = mk14_c setting_version = 23 type = variant -reference_extruder_id = mk14_c -hardware_type = nozzle [values] machine_nozzle_id = 1C diff --git a/resources/variants/ultimaker_method_2A.inst.cfg b/resources/variants/ultimaker_method_2A.inst.cfg index 8e336e8170..b2f16e4472 100644 --- a/resources/variants/ultimaker_method_2A.inst.cfg +++ b/resources/variants/ultimaker_method_2A.inst.cfg @@ -1,13 +1,13 @@ [general] +definition = ultimaker_method name = 2A version = 4 -definition = ultimaker_method [metadata] +hardware_type = nozzle +reference_extruder_id = mk14_s setting_version = 23 type = variant -reference_extruder_id = mk14_s -hardware_type = nozzle [values] machine_nozzle_id = 2A diff --git a/resources/variants/ultimaker_method_LABS.inst.cfg b/resources/variants/ultimaker_method_LABS.inst.cfg index 25f35f7bd3..97e78c30e0 100644 --- a/resources/variants/ultimaker_method_LABS.inst.cfg +++ b/resources/variants/ultimaker_method_LABS.inst.cfg @@ -1,12 +1,12 @@ [general] +definition = ultimaker_method name = LABS version = 4 -definition = ultimaker_method [metadata] +hardware_type = nozzle setting_version = 23 type = variant -hardware_type = nozzle [values] machine_nozzle_id = LABS From 0d977178f105d11ef34f500271e0102854c775ab Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Fri, 28 Jun 2024 11:02:14 +0200 Subject: [PATCH 33/43] Removed PLA filter from Method X and Method XL. Changed setting support_infill_density_multiplier_layer_0 to support_infill_density_multiplier_initial_layer. Added Tough PLA to the MaterialOutputModel.py so it is recognised by Cura. PP-475 --- cura/PrinterOutput/Models/MaterialOutputModel.py | 3 ++- resources/definitions/ultimaker_methodx.def.json | 1 - .../ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg | 2 +- .../ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg | 2 +- .../um_methodxl_2a_um-pva-175_0.2mm.inst.cfg | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/cura/PrinterOutput/Models/MaterialOutputModel.py b/cura/PrinterOutput/Models/MaterialOutputModel.py index f9125278f0..06d01604d2 100644 --- a/cura/PrinterOutput/Models/MaterialOutputModel.py +++ b/cura/PrinterOutput/Models/MaterialOutputModel.py @@ -39,7 +39,8 @@ class MaterialOutputModel(QObject): "bvoh" :{"name" :"BVOH" ,"guid": "923e604c-8432-4b09-96aa-9bbbd42207f4"}, "cpe" :{"name" :"CPE" ,"guid": "da1872c1-b991-4795-80ad-bdac0f131726"}, "hips" :{"name" :"HIPS" ,"guid": "a468d86a-220c-47eb-99a5-bbb47e514eb0"}, - "tpu" :{"name" :"TPU 95A" ,"guid": "19baa6a9-94ff-478b-b4a1-8157b74358d2"} + "tpu" :{"name" :"TPU 95A" ,"guid": "19baa6a9-94ff-478b-b4a1-8157b74358d2"}, + "im-pla" :{"name": "Tough" ,"guid": "de031137-a8ca-4a72-bd1b-17bb964033ad"} } diff --git a/resources/definitions/ultimaker_methodx.def.json b/resources/definitions/ultimaker_methodx.def.json index 7a6c8aa494..5202b7f66a 100644 --- a/resources/definitions/ultimaker_methodx.def.json +++ b/resources/definitions/ultimaker_methodx.def.json @@ -36,7 +36,6 @@ "polywood_pla", "redd_", "tizyx_", - "ultimaker_pla_175", "ultimaker_tough_pla_175", "verbatim_", "Vertex_", diff --git a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg index c2fab76b89..40b591975c 100644 --- a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg @@ -60,7 +60,7 @@ support_bottom_wall_count = 2 support_conical_angle = 20 support_conical_min_width = 20 support_fan_enable = False -support_infill_density_multiplier_layer_0 = 2 +support_infill_density_multiplier_initial_layer = 2 support_infill_rate = 12 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height support_interface_enable = True diff --git a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg index 4fa889187b..fe1a6de6b7 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg @@ -60,7 +60,7 @@ support_bottom_wall_count = 2 support_conical_angle = 20 support_conical_min_width = 20 support_fan_enable = False -support_infill_density_multiplier_layer_0 = 2 +support_infill_density_multiplier_initial_layer = 2 support_infill_rate = 12 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height support_interface_enable = True diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg index 594c9e6d15..611921c3f1 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg @@ -60,7 +60,7 @@ support_bottom_wall_count = 2 support_conical_angle = 20 support_conical_min_width = 20 support_fan_enable = False -support_infill_density_multiplier_layer_0 = 2 +support_infill_density_multiplier_initial_layer = 2 support_infill_rate = 12 support_infill_sparse_thickness = =min(layer_height * 2, machine_nozzle_size * 3 / 4) if layer_height <= 0.15 / 0.4 * machine_nozzle_size else layer_height support_interface_enable = True From 06d85437f7e6d92b43a13e6a59af4caed9f13e55 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 28 Jun 2024 12:05:38 +0200 Subject: [PATCH 34/43] Display new setting in advanced and expert configs CURA-11795 --- resources/setting_visibility/advanced.cfg | 1 + resources/setting_visibility/expert.cfg | 1 + 2 files changed, 2 insertions(+) diff --git a/resources/setting_visibility/advanced.cfg b/resources/setting_visibility/advanced.cfg index 652f33b4a4..261743c708 100644 --- a/resources/setting_visibility/advanced.cfg +++ b/resources/setting_visibility/advanced.cfg @@ -97,6 +97,7 @@ cool_fan_full_layer cool_min_layer_time cool_min_speed cool_lift_head +cool_during_extruder_switch [support] support_enable diff --git a/resources/setting_visibility/expert.cfg b/resources/setting_visibility/expert.cfg index 3742fc9f60..4c0c2180ec 100644 --- a/resources/setting_visibility/expert.cfg +++ b/resources/setting_visibility/expert.cfg @@ -249,6 +249,7 @@ cool_fan_full_layer cool_min_layer_time cool_min_speed cool_lift_head +cool_during_extruder_switch [support] support_enable From 7233bcfa29f7e3cc0dd4bb2d39deb08a2e7ec956 Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Fri, 28 Jun 2024 10:18:09 -0400 Subject: [PATCH 35/43] updated PLA on Method XL PP-475 --- .../um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodxl_1c_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodxl_labs_um-pla-175_0.2mm.inst.cfg | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg index 2ac7cdd32a..91a9e40dcc 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1C [values] build_volume_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg index 242d166473..af7e8e0819 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = LABS [values] build_volume_temperature = 45 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg index 9ddfc18600..cc774cfe15 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg index 40a85a3a0e..cb6738bc3e 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = LABS weight = -2 [values] From 216420a755d2756ede41d5cf3f289d0db114bc6a Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 28 Jun 2024 14:19:25 +0000 Subject: [PATCH 36/43] Applied printer-linter format --- .../um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodxl_1c_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodxl_labs_um-pla-175_0.2mm.inst.cfg | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg index 91a9e40dcc..2ac7cdd32a 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] build_volume_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg index af7e8e0819..242d166473 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] build_volume_temperature = 45 diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg index cc774cfe15..9ddfc18600 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg index cb6738bc3e..40a85a3a0e 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] From 770d12e9bb967d6ff80a11347393541c52fe3d92 Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Fri, 28 Jun 2024 11:36:25 -0400 Subject: [PATCH 37/43] Adding PLA with 1A extruder for Method XL, updated adhesion messages for PLA and PVA PP-475 --- .../um_method_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_method_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_method_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg | 4 ++-- .../um_method_labs_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodx_1a_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodx_1c_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodx_2a_um-pva-175_0.2mm.inst.cfg | 4 ++-- .../um_methodx_labs_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodxl_1a_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodxl_1c_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodxl_2a_um-pva-175_0.2mm.inst.cfg | 4 ++-- .../um_methodxl_labs_um-pla-175_0.2mm.inst.cfg | 4 ++-- 21 files changed, 51 insertions(+), 51 deletions(-) diff --git a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg index 09767ce8a7..8f4fcf08cd 100644 --- a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1A [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg index 3d5fa82b7a..b903d9a419 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1C [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg index 05a61d6b82..2527856c8c 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = LABS [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg index 5375e81138..8293c9f51a 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1A [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg index 7164ec03e8..f98c3b0043 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1C [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg index 271a651e20..2c82f9dde9 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = LABS [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg index ce3c938e8c..294aa9e702 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1A [values] build_volume_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg index 2ac7cdd32a..91a9e40dcc 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = 1C [values] build_volume_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg index 242d166473..af7e8e0819 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -intent_category = solid +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 +intent_category = solid type = intent -variant = LABS [values] build_volume_temperature = 45 diff --git a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg index 65218afbda..809acb9d2d 100644 --- a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg index ca62933f25..cd264fb95f 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg index 40b591975c..69baab3115 100644 --- a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 2A material = ultimaker_pva_175 quality_type = draft -setting_version = 23 type = quality -variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg index 7f6b2a7be2..0069d15c80 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg index 9db56941cb..d8d1aba9e8 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg index a75826d1ae..2ee6e68d37 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg index fe1a6de6b7..6fb312b3e4 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 2A material = ultimaker_pva_175 quality_type = draft -setting_version = 23 type = quality -variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg index 44b777ea77..5b615d9329 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg index c1f049384a..c43848cd42 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1A material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg index 9ddfc18600..cc774cfe15 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 1C material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg index 611921c3f1..0c34af917b 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = 2A material = ultimaker_pva_175 quality_type = draft -setting_version = 23 type = quality -variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg index 40a85a3a0e..cb6738bc3e 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] +setting_version = 23 +variant = LABS material = ultimaker_pla_175 quality_type = draft -setting_version = 23 type = quality -variant = LABS weight = -2 [values] From a6ff0589fd3e66b593c88fb6bb8bfcbfb07a9132 Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 28 Jun 2024 15:37:26 +0000 Subject: [PATCH 38/43] Applied printer-linter format --- .../um_method_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_method_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_method_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg | 6 +++--- .../ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg | 4 ++-- .../um_method_labs_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodx_1a_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodx_1c_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodx_2a_um-pva-175_0.2mm.inst.cfg | 4 ++-- .../um_methodx_labs_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodxl_1a_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodxl_1c_um-pla-175_0.2mm.inst.cfg | 4 ++-- .../um_methodxl_2a_um-pva-175_0.2mm.inst.cfg | 4 ++-- .../um_methodxl_labs_um-pla-175_0.2mm.inst.cfg | 4 ++-- 21 files changed, 51 insertions(+), 51 deletions(-) diff --git a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg index 8f4fcf08cd..09767ce8a7 100644 --- a/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1A +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1A [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg index b903d9a419..3d5fa82b7a 100644 --- a/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg index 2527856c8c..05a61d6b82 100644 --- a/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_method/um_method_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg index 8293c9f51a..5375e81138 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1A +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1A [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg index f98c3b0043..7164ec03e8 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg index 2c82f9dde9..271a651e20 100644 --- a/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] build_volume_temperature = 47 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg index 294aa9e702..ce3c938e8c 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1A +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1A [values] build_volume_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg index 91a9e40dcc..2ac7cdd32a 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = 1C +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = 1C [values] build_volume_temperature = 45 diff --git a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg index af7e8e0819..242d166473 100644 --- a/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg +++ b/resources/intent/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm_solid.inst.cfg @@ -4,12 +4,12 @@ name = Solid version = 4 [metadata] -setting_version = 23 -variant = LABS +intent_category = solid material = ultimaker_pla_175 quality_type = draft -intent_category = solid +setting_version = 23 type = intent +variant = LABS [values] build_volume_temperature = 45 diff --git a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg index 809acb9d2d..65218afbda 100644 --- a/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1A material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg index cd264fb95f..ca62933f25 100644 --- a/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg index 69baab3115..40b591975c 100644 --- a/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 2A material = ultimaker_pva_175 quality_type = draft +setting_version = 23 type = quality +variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg index 0069d15c80..7f6b2a7be2 100644 --- a/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_method/um_method_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg index d8d1aba9e8..9db56941cb 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1A material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg index 2ee6e68d37..a75826d1ae 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg index 6fb312b3e4..fe1a6de6b7 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 2A material = ultimaker_pva_175 quality_type = draft +setting_version = 23 type = quality +variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg index 5b615d9329..44b777ea77 100644 --- a/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodx/um_methodx_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg index c43848cd42..c1f049384a 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1a_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1A material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg index cc774cfe15..9ddfc18600 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_1c_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 1C material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = 1C weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg index 0c34af917b..611921c3f1 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_2a_um-pva-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = 2A material = ultimaker_pva_175 quality_type = draft +setting_version = 23 type = quality +variant = 2A weight = -2 [values] diff --git a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg index cb6738bc3e..40a85a3a0e 100644 --- a/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_methodxl/um_methodxl_labs_um-pla-175_0.2mm.inst.cfg @@ -4,11 +4,11 @@ name = Fast version = 4 [metadata] -setting_version = 23 -variant = LABS material = ultimaker_pla_175 quality_type = draft +setting_version = 23 type = quality +variant = LABS weight = -2 [values] From 6b1a6127f490bfeca07a6121b59a015b3140d290 Mon Sep 17 00:00:00 2001 From: Alan Bjorklund Date: Fri, 28 Jun 2024 16:24:13 -0400 Subject: [PATCH 39/43] removed method platform texture PP-475 --- .../definitions/ultimaker_method.def.json | 1 - .../ultimaker_method_base.def.json | 1080 ++++++++++------- 2 files changed, 662 insertions(+), 419 deletions(-) diff --git a/resources/definitions/ultimaker_method.def.json b/resources/definitions/ultimaker_method.def.json index 0d23ba4813..90c3a0ae2f 100644 --- a/resources/definitions/ultimaker_method.def.json +++ b/resources/definitions/ultimaker_method.def.json @@ -85,7 +85,6 @@ 0, 16 ], - "platform_texture": "MakerbotMethod.png", "preferred_material": "ultimaker_pla_175", "preferred_quality_type": "draft", "preferred_variant_name": "1A", diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index e97db9b28e..cd46b31900 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -1,423 +1,667 @@ { - "version": 2, - "name": "UltiMaker Method Base Profile", - "inherits": "ultimaker", - "metadata": - { - "visible": false, - "author": "UltiMaker", - "manufacturer": "Ultimaker B.V.", - "file_formats": "application/x-makerbot", - "platform": "ultimaker_method_platform.stl", - "exclude_materials": [ - "dsm_", - "Essentium_", - "imade3d_", - "chromatik_", - "3D-Fuel_", - "bestfilament_", - "emotiontech_", - "eryone_", - "eSUN_", - "Extrudr_", - "fabtotum_", - "fdplast_", - "filo3d_", - "generic_", - "ultimaker_rapidrinse_175", - "goofoo_", - "ideagen3D_", - "imade3d_", - "innofill_", - "layer_one_", - "leapfrog_", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_", - "tizyx_", - "verbatim_", - "Vertex_", - "volumic_", - "xyzprinting_", - "zyyx_pro_", - "octofiber_", - "fiberlogy_" - ], - "has_machine_materials": true, - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "machine_extruder_trains": - { - "0": "ultimaker_method_extruder_left", - "1": "ultimaker_method_extruder_right" - }, - "nozzle_offsetting_for_disallowed_areas": false, - "preferred_material": "ultimaker_pla_175", - "preferred_quality_type": "fast", - "preferred_variant_name": "1A", - "supports_network_connection": true, - "supports_usb_connection": false, - "variants_name": "Extruder", - "weight": -1 + "version": 2, + "inherits": "ultimaker", + "metadata": { + "author": "UltiMaker", + "exclude_materials": [ + "dsm_", + "Essentium_", + "imade3d_", + "chromatik_", + "3D-Fuel_", + "bestfilament_", + "emotiontech_", + "eryone_", + "eSUN_", + "Extrudr_", + "fabtotum_", + "fdplast_", + "filo3d_", + "generic_", + "ultimaker_rapidrinse_175", + "goofoo_", + "ideagen3D_", + "imade3d_", + "innofill_", + "layer_one_", + "leapfrog_", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_", + "tizyx_", + "verbatim_", + "Vertex_", + "volumic_", + "xyzprinting_", + "zyyx_pro_", + "octofiber_", + "fiberlogy_" + ], + "file_formats": "application/x-makerbot", + "has_machine_materials": true, + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": { + "0": "ultimaker_method_extruder_left", + "1": "ultimaker_method_extruder_right" }, - "overrides": + "manufacturer": "Ultimaker B.V.", + "nozzle_offsetting_for_disallowed_areas": false, + "platform": "ultimaker_method_platform.stl", + "preferred_quality_type": "fast", + "preferred_variant_name": "1A", + "preferred_material": "ultimaker_pla_175", + "supports_network_connection": true, + "supports_usb_connection": false, + "variants_name": "Extruder", + "visible": false, + "weight": -1 + }, + "name": "UltiMaker Method Base Profile", + "overrides": { + "adhesion_extruder_nr": { + "value": 0 + }, + "adhesion_type": { + "value": "'raft'" + }, + "bridge_enable_more_layers": { + "value": true + }, + "bridge_fan_speed": { + "value": "cool_fan_speed_max" + }, + "bridge_fan_speed_2": { + "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" + }, + "bridge_fan_speed_3": { + "value": "cool_fan_speed_min" + }, + "bridge_settings_enabled": { + "value": true + }, + "bridge_skin_density": { + "value": 100 + }, + "bridge_skin_density_2": { + "value": 100 + }, + "bridge_skin_density_3": { + "value": 100 + }, + "bridge_skin_material_flow": { + "value": "material_flow" + }, + "bridge_skin_material_flow_2": { + "value": "material_flow" + }, + "bridge_skin_material_flow_3": { + "value": "material_flow" + }, + "bridge_skin_speed": { + "value": "speed_topbottom" + }, + "bridge_skin_speed_2": { + "value": "speed_topbottom" + }, + "bridge_skin_speed_3": { + "value": "speed_topbottom" + }, + "bridge_sparse_infill_max_density": { + "value": 50 + }, + "bridge_wall_coast": { + "value": 0 + }, + "bridge_wall_material_flow": { + "value": "material_flow" + }, + "bridge_wall_speed": { + "value": "speed_wall" + }, + "brim_width": { + "value": 5 + }, + "extruder_prime_pos_abs": { + "default_value": true + }, + "gradual_support_infill_steps": { + "value": 0 + }, + "infill_before_walls": { + "value": false + }, + "inset_direction": { + "value": "'inside_out'" + }, + "infill_material_flow": { + "value": "material_flow" + }, + "infill_overlap": { + "value": 0 + }, + "infill_pattern": { + "value": "'lines' if infill_sparse_density > 80 else 'grid'" + }, + "infill_wipe_dist": { + "value": 0 + }, + "layer_start_x": { + "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" + }, + "layer_start_y": { + "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" + }, + "machine_acceleration": { + "default_value": 3000 + }, + "machine_center_is_zero": { + "value": true + }, + "machine_scale_fan_speed_zero_to_one": { + "value": true + }, + "machine_end_gcode": { + "default_value": "" + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_gcode_flavor": { + "default_value": "Griffin" + }, + "machine_heated_bed": { + "default_value": false + }, + "machine_heated_build_volume": { + "default_value": true + }, + "machine_min_cool_heat_time_window": { + "value": 15 + }, + "machine_name": { + "default_value": "UltiMaker Method" + }, + "machine_start_gcode": { + "default_value": "" + }, + "material_initial_print_temperature": { + "value": "material_print_temperature-10" + }, + "machine_nozzle_heat_up_speed": { + "value": 3.5 + }, + "machine_nozzle_cool_down_speed": { + "value": 0.8 + }, + "material_flow": { + "value": 100 + }, + "skin_material_flow": { + "value": "material_flow" + }, + "material_bed_temperature": { + "enabled": "machine_heated_bed" + }, + "material_shrinkage_percentage": { + "enabled": true + }, + "min_wall_line_width": { + "value": 0.4 + }, + "minimum_support_area": { + "value": 0.1 + }, + "multiple_mesh_overlap": { + "value": 0 + }, + "optimize_wall_printing_order": { + "value": true + }, + "prime_blob_enable": { + "enabled": false + }, + "prime_tower_enable": { + "value": false + }, + "prime_tower_flow": { + "value": "material_flow" + }, + "prime_tower_line_width": { + "value": 1 + }, + "prime_tower_raft_base_line_spacing": { + "value": "raft_base_line_width" + }, + "prime_tower_wipe_enabled": { + "value": true + }, + "print_sequence": { - "acceleration_enabled": - { - "enabled": false, - "value": true - }, - "acceleration_infill": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_layer_0": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_prime_tower": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_print": - { - "enabled": false, - "value": 800 - }, - "acceleration_print_layer_0": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_roofing": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_bottom": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_infill": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_interface": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_support_roof": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_topbottom": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_travel": - { - "enabled": false, - "value": 5000 - }, - "acceleration_travel_enabled": - { - "enabled": false, - "value": true - }, - "acceleration_travel_layer_0": - { - "enabled": false, - "value": "acceleration_travel" - }, - "acceleration_wall": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_0": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_0_roofing": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_x": - { - "enabled": false, - "value": "acceleration_print" - }, - "acceleration_wall_x_roofing": - { - "enabled": false, - "value": "acceleration_print" - }, - "adhesion_extruder_nr": { "value": 0 }, - "adhesion_type": { "value": "'raft'" }, - "bridge_enable_more_layers": { "value": true }, - "bridge_fan_speed": { "value": "cool_fan_speed_max" }, - "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, - "bridge_fan_speed_3": { "value": "cool_fan_speed_min" }, - "bridge_settings_enabled": { "value": true }, - "bridge_skin_density": { "value": 100 }, - "bridge_skin_density_2": { "value": 100 }, - "bridge_skin_density_3": { "value": 100 }, - "bridge_skin_material_flow": { "value": "material_flow" }, - "bridge_skin_material_flow_2": { "value": "material_flow" }, - "bridge_skin_material_flow_3": { "value": "material_flow" }, - "bridge_skin_speed": { "value": "speed_topbottom" }, - "bridge_skin_speed_2": { "value": "speed_topbottom" }, - "bridge_skin_speed_3": { "value": "speed_topbottom" }, - "bridge_sparse_infill_max_density": { "value": 50 }, - "bridge_wall_coast": { "value": 0 }, - "bridge_wall_material_flow": { "value": "material_flow" }, - "bridge_wall_speed": { "value": "speed_wall" }, - "brim_width": { "value": 5 }, - "extruder_prime_pos_abs": { "default_value": true }, - "gradual_support_infill_steps": { "value": 0 }, - "infill_before_walls": { "value": false }, - "infill_material_flow": { "value": "material_flow" }, - "infill_overlap": { "value": 0 }, - "infill_pattern": { "value": "'lines' if infill_sparse_density > 80 else 'grid'" }, - "infill_wipe_dist": { "value": 0 }, - "inset_direction": { "value": "'inside_out'" }, - "jerk_enabled": - { - "enabled": false, - "value": true - }, - "jerk_infill": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_layer_0": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_prime_tower": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_print": - { - "enabled": false, - "value": 6.25 - }, - "jerk_print_layer_0": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_roofing": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_bottom": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_infill": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_interface": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_support_roof": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_topbottom": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_travel": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_travel_enabled": - { - "enabled": false, - "value": true - }, - "jerk_travel_layer_0": - { - "enabled": false, - "value": "jerk_travel" - }, - "jerk_wall": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_0": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_0_roofing": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_x": - { - "enabled": false, - "value": "jerk_print" - }, - "jerk_wall_x_roofing": - { - "enabled": false, - "value": "jerk_print" - }, - "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, - "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, - "machine_acceleration": { "default_value": 3000 }, - "machine_center_is_zero": { "value": true }, - "machine_end_gcode": { "default_value": "" }, - "machine_extruder_count": { "default_value": 2 }, - "machine_gcode_flavor": { "default_value": "Griffin" }, - "machine_heated_bed": { "default_value": false }, - "machine_heated_build_volume": { "default_value": true }, - "machine_min_cool_heat_time_window": { "value": 15 }, - "machine_name": { "default_value": "UltiMaker Method" }, - "machine_nozzle_cool_down_speed": { "value": 0.8 }, - "machine_nozzle_heat_up_speed": { "value": 3.5 }, - "machine_scale_fan_speed_zero_to_one": { "value": true }, - "machine_start_gcode": { "default_value": "" }, - "material_bed_temperature": { "enabled": "machine_heated_bed" }, - "material_flow": { "value": 100 }, - "material_initial_print_temperature": { "value": "material_print_temperature-10" }, - "material_shrinkage_percentage": { "enabled": true }, - "min_wall_line_width": { "value": 0.4 }, - "minimum_support_area": { "value": 0.1 }, - "multiple_mesh_overlap": { "value": 0 }, - "optimize_wall_printing_order": { "value": true }, - "prime_blob_enable": { "enabled": false }, - "prime_tower_base_curve_magnitude": { "value": 2 }, - "prime_tower_base_height": { "value": 6 }, - "prime_tower_base_size": { "value": 10 }, - "prime_tower_enable": { "value": false }, - "prime_tower_flow": { "value": "material_flow" }, - "prime_tower_line_width": { "value": 1 }, - "prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" }, - "prime_tower_wipe_enabled": { "value": true }, - "print_sequence": { "enabled": false }, - "raft_base_line_spacing": { "value": "2*raft_base_line_width" }, - "raft_base_line_width": { "value": 1.4 }, - "raft_base_speed": { "value": 10 }, - "raft_base_thickness": { "value": 0.8 }, - "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" }, - "raft_interface_layers": { "value": 2 }, - "raft_interface_line_width": { "value": 0.7 }, - "raft_interface_speed": { "value": 90 }, - "raft_interface_thickness": { "value": 0.3 }, - "raft_interface_wall_count": { "value": "raft_wall_count" }, - "raft_margin": { "value": 1.2 }, - "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" }, - "raft_surface_wall_count": { "value": "raft_wall_count" }, - "retraction_amount": { "value": 0.75 }, - "retraction_combing": { "value": "'off'" }, - "retraction_combing_max_distance": { "value": "speed_travel / 10" }, - "retraction_count_max": { "value": 100 }, - "retraction_extrusion_window": { "value": 0 }, - "retraction_hop": { "value": 0.4 }, - "retraction_hop_enabled": { "value": true }, - "retraction_hop_only_when_collides": { "value": false }, - "retraction_prime_speed": { "value": "retraction_speed" }, - "retraction_speed": { "value": 5 }, - "roofing_layer_count": { "value": 2 }, - "roofing_monotonic": { "value": true }, - "skin_material_flow": { "value": "material_flow" }, - "skin_monotonic": { "value": true }, - "skin_outline_count": { "value": 0 }, - "skin_overlap": { "value": 0 }, - "skin_preshrink": { "value": 0 }, - "skirt_brim_material_flow": { "value": "material_flow" }, - "skirt_brim_minimal_length": { "value": 500 }, - "small_skin_width": { "value": 4 }, - "speed_equalize_flow_width_factor": { "value": 0 }, - "speed_prime_tower": { "value": "speed_topbottom" }, - "speed_print": { "value": 50 }, - "speed_roofing": { "value": "speed_wall_0" }, - "speed_support": { "value": "speed_wall" }, - "speed_support_interface": { "value": "speed_topbottom" }, - "speed_topbottom": { "value": "speed_wall" }, - "speed_travel": { "value": 250 }, - "speed_wall": { "value": "speed_print * 40/50" }, - "speed_wall_0": { "value": "speed_wall * 30/40" }, - "speed_wall_x": { "value": "speed_wall" }, - "support_angle": { "value": 40 }, - "support_bottom_distance": { "value": "support_z_distance / 2" }, - "support_bottom_material_flow": { "value": "material_flow" }, - "support_brim_enable": { "value": false }, - "support_conical_min_width": { "value": 10 }, - "support_enable": { "value": true }, - "support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" }, - "support_fan_enable": { "value": false }, - "support_infill_rate": { "value": 20.0 }, - "support_interface_enable": { "value": true }, - "support_interface_material_flow": { "value": "material_flow" }, - "support_interface_offset": { "value": 0 }, - "support_interface_pattern": { "value": "'lines'" }, - "support_interface_wall_count": { "value": 2 }, - "support_material_flow": { "value": "material_flow" }, - "support_pattern": { "value": "'lines'" }, - "support_roof_material_flow": { "value": "material_flow" }, - "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" }, - "support_top_distance": { "value": "support_z_distance" }, - "support_wall_count": { "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" }, - "support_xy_distance": { "value": 0.2 }, - "support_z_distance": { "value": 0 }, - "switch_extruder_retraction_amount": { "value": 0.5 }, - "switch_extruder_retraction_speeds": { "value": "retraction_speed" }, - "top_bottom_thickness": { "value": "5*layer_height" }, - "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, - "travel_avoid_other_parts": { "value": false }, - "wall_0_inset": { "value": 0 }, - "wall_0_material_flow": { "value": "material_flow" }, - "wall_0_wipe_dist": { "value": 0.8 }, - "wall_material_flow": { "value": "material_flow" }, - "wall_x_material_flow": { "value": "material_flow" }, - "xy_offset": { "value": 0 }, - "xy_offset_layer_0": { "value": "xy_offset" }, - "z_seam_position": { "value": "'backright'" }, - "z_seam_relative": { "value": true }, - "z_seam_type": { "value": "'sharpest_corner'" }, - "zig_zaggify_infill": { "value": true } + "enabled": false + }, + "prime_tower_base_size": { + "value": 10 + }, + "prime_tower_base_height": { + "value": 6 + }, + "prime_tower_base_curve_magnitude": { + "value": 2 + }, + "raft_base_line_spacing": { + "value": "2*raft_base_line_width" + }, + "raft_base_line_width": { + "value": 1.4 + }, + "raft_base_speed": { + "value": 10 + }, + "raft_base_thickness": { + "value": 0.8 + }, + "raft_interface_extruder_nr": { + "value": "raft_surface_extruder_nr" + }, + "raft_interface_layers": { + "value": 2 + }, + "raft_interface_line_width": { + "value": 0.7 + }, + "raft_interface_speed": { + "value": 90 + }, + "raft_interface_thickness": { + "value": 0.3 + }, + "raft_interface_wall_count": { + "value": "raft_wall_count" + }, + "raft_margin": { + "value": 1.2 + }, + "raft_surface_extruder_nr": { + "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" + }, + "raft_surface_wall_count": { + "value": "raft_wall_count" + }, + "retraction_amount": { + "value": 0.75 + }, + "retraction_combing": { + "value": "'off'" + }, + "retraction_combing_max_distance": { + "value": "speed_travel / 10" + }, + "retraction_count_max": { + "value": 100 + }, + "retraction_extrusion_window": { + "value": 0 + }, + "retraction_hop": { + "value": 0.4 + }, + "retraction_hop_enabled": { + "value": true + }, + "retraction_hop_only_when_collides": { + "value": false + }, + "retraction_prime_speed": { + "value": "retraction_speed" + }, + "retraction_speed": { + "value": 5 + }, + "roofing_layer_count": { + "value": 2 + }, + "roofing_monotonic": { + "value": true + }, + "skin_monotonic": { + "value": true + }, + "skin_outline_count": { + "value": 0 + }, + "skin_overlap": { + "value": 0 + }, + "skin_preshrink": { + "value": 0 + }, + "skirt_brim_material_flow": { + "value": "material_flow" + }, + "skirt_brim_minimal_length": { + "value": 500 + }, + "small_skin_width": { + "value": 4 + }, + "speed_equalize_flow_width_factor": { + "value": 0 + }, + "speed_prime_tower": { + "value": "speed_topbottom" + }, + "speed_print": { + "value": 50 + }, + "speed_roofing": { + "value": "speed_wall_0" + }, + "speed_support": { + "value": "speed_wall" + }, + "speed_support_interface": { + "value": "speed_topbottom" + }, + "speed_topbottom": { + "value": "speed_wall" + }, + "speed_travel": { + "value": 250 + }, + "speed_wall": { + "value": "speed_print * 40/50" + }, + "speed_wall_0": { + "value": "speed_wall * 30/40" + }, + "speed_wall_x": { + "value": "speed_wall" + }, + "support_angle": { + "value": 40 + }, + "support_bottom_distance": { + "value": "support_z_distance / 2" + }, + "support_bottom_material_flow": { + "value": "material_flow" + }, + "support_brim_enable": { + "value": false + }, + "support_conical_min_width": { + "value": 10 + }, + "support_enable": { + "value": true + }, + "support_extruder_nr": { + "value": "int(anyExtruderWithMaterial('material_is_support_material'))" + }, + "support_fan_enable": { + "value": false + }, + "support_infill_rate": { + "value": 20.0 + }, + "support_interface_enable": { + "value": true + }, + "support_interface_material_flow": { + "value": "material_flow" + }, + "support_interface_offset": { + "value": 0 + }, + "support_interface_pattern": { + "value": "'lines'" + }, + "support_interface_wall_count": { + "value": 2 + }, + "support_material_flow": { + "value": "material_flow" + }, + "support_pattern": { + "value": "'lines'" + }, + "support_roof_material_flow": { + "value": "material_flow" + }, + "support_supported_skin_fan_speed": { + "value": "cool_fan_speed_max" + }, + "support_top_distance": { + "value": "support_z_distance" + }, + "support_wall_count": { + "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" + }, + "support_xy_distance": { + "value": 0.2 + }, + "support_z_distance": { + "value": 0 + }, + "switch_extruder_retraction_amount": { + "value": 0.5 + }, + "switch_extruder_retraction_speeds": { + "value": "retraction_speed" + }, + "top_bottom_thickness": { + "value": "5*layer_height" + }, + "travel_avoid_distance": { + "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" + }, + "travel_avoid_other_parts": { + "value": false + }, + "wall_0_inset": { + "value": 0 + }, + "wall_0_material_flow": { + "value": "material_flow" + }, + "wall_0_wipe_dist": { + "value": 0.8 + }, + "wall_material_flow": { + "value": "material_flow" + }, + "wall_x_material_flow": { + "value": "material_flow" + }, + "xy_offset": { + "value": 0 + }, + "xy_offset_layer_0": { + "value": "xy_offset" + }, + "zig_zaggify_infill": { + "value": true + }, + "z_seam_position": { + "value": "'backright'" + }, + "z_seam_relative": { + "value": true + }, + "z_seam_type": { + "value": "'sharpest_corner'" + }, + "acceleration_enabled": { + "value": true, + "enabled": false + }, + "acceleration_travel_enabled": { + "value": true, + "enabled": false + }, + "acceleration_print": { + "value": 800, + "enabled": false + }, + "acceleration_infill": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_0": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_x": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_roofing": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_topbottom": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_infill": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_interface": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_roof": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_support_bottom": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_prime_tower": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_travel": { + "value": 5000, + "enabled": false + }, + "acceleration_travel_layer_0": { + "value": "acceleration_travel", + "enabled": false + }, + "acceleration_layer_0": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_print_layer_0": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_0_roofing": { + "value": "acceleration_print", + "enabled": false + }, + "acceleration_wall_x_roofing": { + "value": "acceleration_print", + "enabled": false + }, + "jerk_enabled": { + "value": true, + "enabled": false + }, + "jerk_travel_enabled": { + "value": true, + "enabled": false + }, + "jerk_print": { + "value": 6.25, + "enabled": false + }, + "jerk_infill": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_0": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_x": { + "value": "jerk_print", + "enabled": false + }, + "jerk_roofing": { + "value": "jerk_print", + "enabled": false + }, + "jerk_topbottom": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_infill": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_interface": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_roof": { + "value": "jerk_print", + "enabled": false + }, + "jerk_support_bottom": { + "value": "jerk_print", + "enabled": false + }, + "jerk_prime_tower": { + "value": "jerk_print", + "enabled": false + }, + "jerk_travel": { + "value": "jerk_print", + "enabled": false + }, + "jerk_travel_layer_0": { + "value": "jerk_travel", + "enabled": false + }, + "jerk_layer_0": { + "value": "jerk_print", + "enabled": false + }, + "jerk_print_layer_0": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_0_roofing": { + "value": "jerk_print", + "enabled": false + }, + "jerk_wall_x_roofing": { + "value": "jerk_print", + "enabled": false } + } } \ No newline at end of file From 2ecea2c4429ce8447cfbd145abdfc7ee47ab1ce7 Mon Sep 17 00:00:00 2001 From: alanbjorklund Date: Fri, 28 Jun 2024 20:25:16 +0000 Subject: [PATCH 40/43] Applied printer-linter format --- .../ultimaker_method_base.def.json | 1082 +++++++---------- 1 file changed, 419 insertions(+), 663 deletions(-) diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index cd46b31900..e97db9b28e 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -1,667 +1,423 @@ { - "version": 2, - "inherits": "ultimaker", - "metadata": { - "author": "UltiMaker", - "exclude_materials": [ - "dsm_", - "Essentium_", - "imade3d_", - "chromatik_", - "3D-Fuel_", - "bestfilament_", - "emotiontech_", - "eryone_", - "eSUN_", - "Extrudr_", - "fabtotum_", - "fdplast_", - "filo3d_", - "generic_", - "ultimaker_rapidrinse_175", - "goofoo_", - "ideagen3D_", - "imade3d_", - "innofill_", - "layer_one_", - "leapfrog_", - "polyflex_pla", - "polymax_pla", - "polyplus_pla", - "polywood_pla", - "redd_", - "tizyx_", - "verbatim_", - "Vertex_", - "volumic_", - "xyzprinting_", - "zyyx_pro_", - "octofiber_", - "fiberlogy_" - ], - "file_formats": "application/x-makerbot", - "has_machine_materials": true, - "has_machine_quality": true, - "has_materials": true, - "has_variants": true, - "machine_extruder_trains": { - "0": "ultimaker_method_extruder_left", - "1": "ultimaker_method_extruder_right" - }, - "manufacturer": "Ultimaker B.V.", - "nozzle_offsetting_for_disallowed_areas": false, - "platform": "ultimaker_method_platform.stl", - "preferred_quality_type": "fast", - "preferred_variant_name": "1A", - "preferred_material": "ultimaker_pla_175", - "supports_network_connection": true, - "supports_usb_connection": false, - "variants_name": "Extruder", - "visible": false, - "weight": -1 - }, - "name": "UltiMaker Method Base Profile", - "overrides": { - "adhesion_extruder_nr": { - "value": 0 - }, - "adhesion_type": { - "value": "'raft'" - }, - "bridge_enable_more_layers": { - "value": true - }, - "bridge_fan_speed": { - "value": "cool_fan_speed_max" - }, - "bridge_fan_speed_2": { - "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" - }, - "bridge_fan_speed_3": { - "value": "cool_fan_speed_min" - }, - "bridge_settings_enabled": { - "value": true - }, - "bridge_skin_density": { - "value": 100 - }, - "bridge_skin_density_2": { - "value": 100 - }, - "bridge_skin_density_3": { - "value": 100 - }, - "bridge_skin_material_flow": { - "value": "material_flow" - }, - "bridge_skin_material_flow_2": { - "value": "material_flow" - }, - "bridge_skin_material_flow_3": { - "value": "material_flow" - }, - "bridge_skin_speed": { - "value": "speed_topbottom" - }, - "bridge_skin_speed_2": { - "value": "speed_topbottom" - }, - "bridge_skin_speed_3": { - "value": "speed_topbottom" - }, - "bridge_sparse_infill_max_density": { - "value": 50 - }, - "bridge_wall_coast": { - "value": 0 - }, - "bridge_wall_material_flow": { - "value": "material_flow" - }, - "bridge_wall_speed": { - "value": "speed_wall" - }, - "brim_width": { - "value": 5 - }, - "extruder_prime_pos_abs": { - "default_value": true - }, - "gradual_support_infill_steps": { - "value": 0 - }, - "infill_before_walls": { - "value": false - }, - "inset_direction": { - "value": "'inside_out'" - }, - "infill_material_flow": { - "value": "material_flow" - }, - "infill_overlap": { - "value": 0 - }, - "infill_pattern": { - "value": "'lines' if infill_sparse_density > 80 else 'grid'" - }, - "infill_wipe_dist": { - "value": 0 - }, - "layer_start_x": { - "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" - }, - "layer_start_y": { - "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" - }, - "machine_acceleration": { - "default_value": 3000 - }, - "machine_center_is_zero": { - "value": true - }, - "machine_scale_fan_speed_zero_to_one": { - "value": true - }, - "machine_end_gcode": { - "default_value": "" - }, - "machine_extruder_count": { - "default_value": 2 - }, - "machine_gcode_flavor": { - "default_value": "Griffin" - }, - "machine_heated_bed": { - "default_value": false - }, - "machine_heated_build_volume": { - "default_value": true - }, - "machine_min_cool_heat_time_window": { - "value": 15 - }, - "machine_name": { - "default_value": "UltiMaker Method" - }, - "machine_start_gcode": { - "default_value": "" - }, - "material_initial_print_temperature": { - "value": "material_print_temperature-10" - }, - "machine_nozzle_heat_up_speed": { - "value": 3.5 - }, - "machine_nozzle_cool_down_speed": { - "value": 0.8 - }, - "material_flow": { - "value": 100 - }, - "skin_material_flow": { - "value": "material_flow" - }, - "material_bed_temperature": { - "enabled": "machine_heated_bed" - }, - "material_shrinkage_percentage": { - "enabled": true - }, - "min_wall_line_width": { - "value": 0.4 - }, - "minimum_support_area": { - "value": 0.1 - }, - "multiple_mesh_overlap": { - "value": 0 - }, - "optimize_wall_printing_order": { - "value": true - }, - "prime_blob_enable": { - "enabled": false - }, - "prime_tower_enable": { - "value": false - }, - "prime_tower_flow": { - "value": "material_flow" - }, - "prime_tower_line_width": { - "value": 1 - }, - "prime_tower_raft_base_line_spacing": { - "value": "raft_base_line_width" - }, - "prime_tower_wipe_enabled": { - "value": true - }, - "print_sequence": + "version": 2, + "name": "UltiMaker Method Base Profile", + "inherits": "ultimaker", + "metadata": { - "enabled": false - }, - "prime_tower_base_size": { - "value": 10 - }, - "prime_tower_base_height": { - "value": 6 - }, - "prime_tower_base_curve_magnitude": { - "value": 2 - }, - "raft_base_line_spacing": { - "value": "2*raft_base_line_width" - }, - "raft_base_line_width": { - "value": 1.4 - }, - "raft_base_speed": { - "value": 10 - }, - "raft_base_thickness": { - "value": 0.8 - }, - "raft_interface_extruder_nr": { - "value": "raft_surface_extruder_nr" - }, - "raft_interface_layers": { - "value": 2 - }, - "raft_interface_line_width": { - "value": 0.7 - }, - "raft_interface_speed": { - "value": 90 - }, - "raft_interface_thickness": { - "value": 0.3 - }, - "raft_interface_wall_count": { - "value": "raft_wall_count" - }, - "raft_margin": { - "value": 1.2 - }, - "raft_surface_extruder_nr": { - "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" - }, - "raft_surface_wall_count": { - "value": "raft_wall_count" - }, - "retraction_amount": { - "value": 0.75 - }, - "retraction_combing": { - "value": "'off'" - }, - "retraction_combing_max_distance": { - "value": "speed_travel / 10" - }, - "retraction_count_max": { - "value": 100 - }, - "retraction_extrusion_window": { - "value": 0 - }, - "retraction_hop": { - "value": 0.4 - }, - "retraction_hop_enabled": { - "value": true - }, - "retraction_hop_only_when_collides": { - "value": false - }, - "retraction_prime_speed": { - "value": "retraction_speed" - }, - "retraction_speed": { - "value": 5 - }, - "roofing_layer_count": { - "value": 2 - }, - "roofing_monotonic": { - "value": true - }, - "skin_monotonic": { - "value": true - }, - "skin_outline_count": { - "value": 0 - }, - "skin_overlap": { - "value": 0 - }, - "skin_preshrink": { - "value": 0 - }, - "skirt_brim_material_flow": { - "value": "material_flow" - }, - "skirt_brim_minimal_length": { - "value": 500 - }, - "small_skin_width": { - "value": 4 - }, - "speed_equalize_flow_width_factor": { - "value": 0 - }, - "speed_prime_tower": { - "value": "speed_topbottom" - }, - "speed_print": { - "value": 50 - }, - "speed_roofing": { - "value": "speed_wall_0" - }, - "speed_support": { - "value": "speed_wall" - }, - "speed_support_interface": { - "value": "speed_topbottom" - }, - "speed_topbottom": { - "value": "speed_wall" - }, - "speed_travel": { - "value": 250 - }, - "speed_wall": { - "value": "speed_print * 40/50" - }, - "speed_wall_0": { - "value": "speed_wall * 30/40" - }, - "speed_wall_x": { - "value": "speed_wall" - }, - "support_angle": { - "value": 40 - }, - "support_bottom_distance": { - "value": "support_z_distance / 2" - }, - "support_bottom_material_flow": { - "value": "material_flow" - }, - "support_brim_enable": { - "value": false - }, - "support_conical_min_width": { - "value": 10 - }, - "support_enable": { - "value": true - }, - "support_extruder_nr": { - "value": "int(anyExtruderWithMaterial('material_is_support_material'))" - }, - "support_fan_enable": { - "value": false - }, - "support_infill_rate": { - "value": 20.0 - }, - "support_interface_enable": { - "value": true - }, - "support_interface_material_flow": { - "value": "material_flow" - }, - "support_interface_offset": { - "value": 0 - }, - "support_interface_pattern": { - "value": "'lines'" - }, - "support_interface_wall_count": { - "value": 2 - }, - "support_material_flow": { - "value": "material_flow" - }, - "support_pattern": { - "value": "'lines'" - }, - "support_roof_material_flow": { - "value": "material_flow" - }, - "support_supported_skin_fan_speed": { - "value": "cool_fan_speed_max" - }, - "support_top_distance": { - "value": "support_z_distance" - }, - "support_wall_count": { - "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" - }, - "support_xy_distance": { - "value": 0.2 - }, - "support_z_distance": { - "value": 0 - }, - "switch_extruder_retraction_amount": { - "value": 0.5 - }, - "switch_extruder_retraction_speeds": { - "value": "retraction_speed" - }, - "top_bottom_thickness": { - "value": "5*layer_height" - }, - "travel_avoid_distance": { - "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" - }, - "travel_avoid_other_parts": { - "value": false - }, - "wall_0_inset": { - "value": 0 - }, - "wall_0_material_flow": { - "value": "material_flow" - }, - "wall_0_wipe_dist": { - "value": 0.8 - }, - "wall_material_flow": { - "value": "material_flow" - }, - "wall_x_material_flow": { - "value": "material_flow" - }, - "xy_offset": { - "value": 0 - }, - "xy_offset_layer_0": { - "value": "xy_offset" - }, - "zig_zaggify_infill": { - "value": true - }, - "z_seam_position": { - "value": "'backright'" - }, - "z_seam_relative": { - "value": true - }, - "z_seam_type": { - "value": "'sharpest_corner'" - }, - "acceleration_enabled": { - "value": true, - "enabled": false - }, - "acceleration_travel_enabled": { - "value": true, - "enabled": false - }, - "acceleration_print": { - "value": 800, - "enabled": false - }, - "acceleration_infill": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_0": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_x": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_roofing": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_topbottom": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_infill": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_interface": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_roof": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_support_bottom": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_prime_tower": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_travel": { - "value": 5000, - "enabled": false - }, - "acceleration_travel_layer_0": { - "value": "acceleration_travel", - "enabled": false - }, - "acceleration_layer_0": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_print_layer_0": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_0_roofing": { - "value": "acceleration_print", - "enabled": false - }, - "acceleration_wall_x_roofing": { - "value": "acceleration_print", - "enabled": false - }, - "jerk_enabled": { - "value": true, - "enabled": false - }, - "jerk_travel_enabled": { - "value": true, - "enabled": false - }, - "jerk_print": { - "value": 6.25, - "enabled": false - }, - "jerk_infill": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_0": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_x": { - "value": "jerk_print", - "enabled": false - }, - "jerk_roofing": { - "value": "jerk_print", - "enabled": false - }, - "jerk_topbottom": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_infill": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_interface": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_roof": { - "value": "jerk_print", - "enabled": false - }, - "jerk_support_bottom": { - "value": "jerk_print", - "enabled": false - }, - "jerk_prime_tower": { - "value": "jerk_print", - "enabled": false - }, - "jerk_travel": { - "value": "jerk_print", - "enabled": false - }, - "jerk_travel_layer_0": { - "value": "jerk_travel", - "enabled": false - }, - "jerk_layer_0": { - "value": "jerk_print", - "enabled": false - }, - "jerk_print_layer_0": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_0_roofing": { - "value": "jerk_print", - "enabled": false - }, - "jerk_wall_x_roofing": { - "value": "jerk_print", - "enabled": false + "visible": false, + "author": "UltiMaker", + "manufacturer": "Ultimaker B.V.", + "file_formats": "application/x-makerbot", + "platform": "ultimaker_method_platform.stl", + "exclude_materials": [ + "dsm_", + "Essentium_", + "imade3d_", + "chromatik_", + "3D-Fuel_", + "bestfilament_", + "emotiontech_", + "eryone_", + "eSUN_", + "Extrudr_", + "fabtotum_", + "fdplast_", + "filo3d_", + "generic_", + "ultimaker_rapidrinse_175", + "goofoo_", + "ideagen3D_", + "imade3d_", + "innofill_", + "layer_one_", + "leapfrog_", + "polyflex_pla", + "polymax_pla", + "polyplus_pla", + "polywood_pla", + "redd_", + "tizyx_", + "verbatim_", + "Vertex_", + "volumic_", + "xyzprinting_", + "zyyx_pro_", + "octofiber_", + "fiberlogy_" + ], + "has_machine_materials": true, + "has_machine_quality": true, + "has_materials": true, + "has_variants": true, + "machine_extruder_trains": + { + "0": "ultimaker_method_extruder_left", + "1": "ultimaker_method_extruder_right" + }, + "nozzle_offsetting_for_disallowed_areas": false, + "preferred_material": "ultimaker_pla_175", + "preferred_quality_type": "fast", + "preferred_variant_name": "1A", + "supports_network_connection": true, + "supports_usb_connection": false, + "variants_name": "Extruder", + "weight": -1 + }, + "overrides": + { + "acceleration_enabled": + { + "enabled": false, + "value": true + }, + "acceleration_infill": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_layer_0": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_prime_tower": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_print": + { + "enabled": false, + "value": 800 + }, + "acceleration_print_layer_0": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_roofing": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_bottom": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_infill": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_interface": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_support_roof": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_topbottom": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_travel": + { + "enabled": false, + "value": 5000 + }, + "acceleration_travel_enabled": + { + "enabled": false, + "value": true + }, + "acceleration_travel_layer_0": + { + "enabled": false, + "value": "acceleration_travel" + }, + "acceleration_wall": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_0": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_0_roofing": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_x": + { + "enabled": false, + "value": "acceleration_print" + }, + "acceleration_wall_x_roofing": + { + "enabled": false, + "value": "acceleration_print" + }, + "adhesion_extruder_nr": { "value": 0 }, + "adhesion_type": { "value": "'raft'" }, + "bridge_enable_more_layers": { "value": true }, + "bridge_fan_speed": { "value": "cool_fan_speed_max" }, + "bridge_fan_speed_2": { "value": "(cool_fan_speed_max + cool_fan_speed_min) / 2" }, + "bridge_fan_speed_3": { "value": "cool_fan_speed_min" }, + "bridge_settings_enabled": { "value": true }, + "bridge_skin_density": { "value": 100 }, + "bridge_skin_density_2": { "value": 100 }, + "bridge_skin_density_3": { "value": 100 }, + "bridge_skin_material_flow": { "value": "material_flow" }, + "bridge_skin_material_flow_2": { "value": "material_flow" }, + "bridge_skin_material_flow_3": { "value": "material_flow" }, + "bridge_skin_speed": { "value": "speed_topbottom" }, + "bridge_skin_speed_2": { "value": "speed_topbottom" }, + "bridge_skin_speed_3": { "value": "speed_topbottom" }, + "bridge_sparse_infill_max_density": { "value": 50 }, + "bridge_wall_coast": { "value": 0 }, + "bridge_wall_material_flow": { "value": "material_flow" }, + "bridge_wall_speed": { "value": "speed_wall" }, + "brim_width": { "value": 5 }, + "extruder_prime_pos_abs": { "default_value": true }, + "gradual_support_infill_steps": { "value": 0 }, + "infill_before_walls": { "value": false }, + "infill_material_flow": { "value": "material_flow" }, + "infill_overlap": { "value": 0 }, + "infill_pattern": { "value": "'lines' if infill_sparse_density > 80 else 'grid'" }, + "infill_wipe_dist": { "value": 0 }, + "inset_direction": { "value": "'inside_out'" }, + "jerk_enabled": + { + "enabled": false, + "value": true + }, + "jerk_infill": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_layer_0": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_prime_tower": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_print": + { + "enabled": false, + "value": 6.25 + }, + "jerk_print_layer_0": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_roofing": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_bottom": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_infill": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_interface": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_support_roof": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_topbottom": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_travel": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_travel_enabled": + { + "enabled": false, + "value": true + }, + "jerk_travel_layer_0": + { + "enabled": false, + "value": "jerk_travel" + }, + "jerk_wall": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_0": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_0_roofing": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_x": + { + "enabled": false, + "value": "jerk_print" + }, + "jerk_wall_x_roofing": + { + "enabled": false, + "value": "jerk_print" + }, + "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" }, + "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" }, + "machine_acceleration": { "default_value": 3000 }, + "machine_center_is_zero": { "value": true }, + "machine_end_gcode": { "default_value": "" }, + "machine_extruder_count": { "default_value": 2 }, + "machine_gcode_flavor": { "default_value": "Griffin" }, + "machine_heated_bed": { "default_value": false }, + "machine_heated_build_volume": { "default_value": true }, + "machine_min_cool_heat_time_window": { "value": 15 }, + "machine_name": { "default_value": "UltiMaker Method" }, + "machine_nozzle_cool_down_speed": { "value": 0.8 }, + "machine_nozzle_heat_up_speed": { "value": 3.5 }, + "machine_scale_fan_speed_zero_to_one": { "value": true }, + "machine_start_gcode": { "default_value": "" }, + "material_bed_temperature": { "enabled": "machine_heated_bed" }, + "material_flow": { "value": 100 }, + "material_initial_print_temperature": { "value": "material_print_temperature-10" }, + "material_shrinkage_percentage": { "enabled": true }, + "min_wall_line_width": { "value": 0.4 }, + "minimum_support_area": { "value": 0.1 }, + "multiple_mesh_overlap": { "value": 0 }, + "optimize_wall_printing_order": { "value": true }, + "prime_blob_enable": { "enabled": false }, + "prime_tower_base_curve_magnitude": { "value": 2 }, + "prime_tower_base_height": { "value": 6 }, + "prime_tower_base_size": { "value": 10 }, + "prime_tower_enable": { "value": false }, + "prime_tower_flow": { "value": "material_flow" }, + "prime_tower_line_width": { "value": 1 }, + "prime_tower_raft_base_line_spacing": { "value": "raft_base_line_width" }, + "prime_tower_wipe_enabled": { "value": true }, + "print_sequence": { "enabled": false }, + "raft_base_line_spacing": { "value": "2*raft_base_line_width" }, + "raft_base_line_width": { "value": 1.4 }, + "raft_base_speed": { "value": 10 }, + "raft_base_thickness": { "value": 0.8 }, + "raft_interface_extruder_nr": { "value": "raft_surface_extruder_nr" }, + "raft_interface_layers": { "value": 2 }, + "raft_interface_line_width": { "value": 0.7 }, + "raft_interface_speed": { "value": 90 }, + "raft_interface_thickness": { "value": 0.3 }, + "raft_interface_wall_count": { "value": "raft_wall_count" }, + "raft_margin": { "value": 1.2 }, + "raft_surface_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material')) if support_enable and extruderValue(support_extruder_nr,'material_is_support_material') else raft_base_extruder_nr" }, + "raft_surface_wall_count": { "value": "raft_wall_count" }, + "retraction_amount": { "value": 0.75 }, + "retraction_combing": { "value": "'off'" }, + "retraction_combing_max_distance": { "value": "speed_travel / 10" }, + "retraction_count_max": { "value": 100 }, + "retraction_extrusion_window": { "value": 0 }, + "retraction_hop": { "value": 0.4 }, + "retraction_hop_enabled": { "value": true }, + "retraction_hop_only_when_collides": { "value": false }, + "retraction_prime_speed": { "value": "retraction_speed" }, + "retraction_speed": { "value": 5 }, + "roofing_layer_count": { "value": 2 }, + "roofing_monotonic": { "value": true }, + "skin_material_flow": { "value": "material_flow" }, + "skin_monotonic": { "value": true }, + "skin_outline_count": { "value": 0 }, + "skin_overlap": { "value": 0 }, + "skin_preshrink": { "value": 0 }, + "skirt_brim_material_flow": { "value": "material_flow" }, + "skirt_brim_minimal_length": { "value": 500 }, + "small_skin_width": { "value": 4 }, + "speed_equalize_flow_width_factor": { "value": 0 }, + "speed_prime_tower": { "value": "speed_topbottom" }, + "speed_print": { "value": 50 }, + "speed_roofing": { "value": "speed_wall_0" }, + "speed_support": { "value": "speed_wall" }, + "speed_support_interface": { "value": "speed_topbottom" }, + "speed_topbottom": { "value": "speed_wall" }, + "speed_travel": { "value": 250 }, + "speed_wall": { "value": "speed_print * 40/50" }, + "speed_wall_0": { "value": "speed_wall * 30/40" }, + "speed_wall_x": { "value": "speed_wall" }, + "support_angle": { "value": 40 }, + "support_bottom_distance": { "value": "support_z_distance / 2" }, + "support_bottom_material_flow": { "value": "material_flow" }, + "support_brim_enable": { "value": false }, + "support_conical_min_width": { "value": 10 }, + "support_enable": { "value": true }, + "support_extruder_nr": { "value": "int(anyExtruderWithMaterial('material_is_support_material'))" }, + "support_fan_enable": { "value": false }, + "support_infill_rate": { "value": 20.0 }, + "support_interface_enable": { "value": true }, + "support_interface_material_flow": { "value": "material_flow" }, + "support_interface_offset": { "value": 0 }, + "support_interface_pattern": { "value": "'lines'" }, + "support_interface_wall_count": { "value": 2 }, + "support_material_flow": { "value": "material_flow" }, + "support_pattern": { "value": "'lines'" }, + "support_roof_material_flow": { "value": "material_flow" }, + "support_supported_skin_fan_speed": { "value": "cool_fan_speed_max" }, + "support_top_distance": { "value": "support_z_distance" }, + "support_wall_count": { "value": "1 if support_conical_enabled or support_structure == 'tree' else 0" }, + "support_xy_distance": { "value": 0.2 }, + "support_z_distance": { "value": 0 }, + "switch_extruder_retraction_amount": { "value": 0.5 }, + "switch_extruder_retraction_speeds": { "value": "retraction_speed" }, + "top_bottom_thickness": { "value": "5*layer_height" }, + "travel_avoid_distance": { "value": "3 if extruders_enabled_count > 1 else machine_nozzle_tip_outer_diameter / 2 * 1.5" }, + "travel_avoid_other_parts": { "value": false }, + "wall_0_inset": { "value": 0 }, + "wall_0_material_flow": { "value": "material_flow" }, + "wall_0_wipe_dist": { "value": 0.8 }, + "wall_material_flow": { "value": "material_flow" }, + "wall_x_material_flow": { "value": "material_flow" }, + "xy_offset": { "value": 0 }, + "xy_offset_layer_0": { "value": "xy_offset" }, + "z_seam_position": { "value": "'backright'" }, + "z_seam_relative": { "value": true }, + "z_seam_type": { "value": "'sharpest_corner'" }, + "zig_zaggify_infill": { "value": true } } - } } \ No newline at end of file From 2bf62d8b3a9c71a0636c391cd92017df3c02baa9 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 1 Jul 2024 11:28:37 +0200 Subject: [PATCH 41/43] Remove useless image and offset definition PP-475 --- resources/images/MakerbotMethod.png | Bin 138 -> 0 bytes 1 file changed, 0 insertions(+), 0 deletions(-) delete mode 100644 resources/images/MakerbotMethod.png diff --git a/resources/images/MakerbotMethod.png b/resources/images/MakerbotMethod.png deleted file mode 100644 index 4406a6175b848efd4563c5bb84b0e4a7cbcc1432..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 138 zcmeAS@N?(olHy`uVBq!ia0vp^AT}2V8<6ZZI=>f4aTa()7Bet#3xhBt!>l*8o|0J>k`SPAFjv*C{Z%-*QGB9v3Z*VMH6#S6s Date: Tue, 2 Jul 2024 07:31:04 +0000 Subject: [PATCH 42/43] Applied printer-linter format --- .../weedo_x40v3_extruder_right.def.json | 20 ++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/resources/extruders/weedo_x40v3_extruder_right.def.json b/resources/extruders/weedo_x40v3_extruder_right.def.json index ffb8cb5a17..14faf4d632 100644 --- a/resources/extruders/weedo_x40v3_extruder_right.def.json +++ b/resources/extruders/weedo_x40v3_extruder_right.def.json @@ -2,19 +2,21 @@ "version": 2, "name": "Extruder Right", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "weedo_x40v3", "position": "1" }, - - "overrides": { - "extruder_nr": { + "overrides": + { + "extruder_nr": + { "default_value": 1, "maximum_value": "1" }, - "material_diameter": { "default_value": 1.75 }, - "machine_extruder_cooling_fan_number": {"default_value": 1}, - "machine_extruder_start_code":{ "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, - "machine_extruder_end_code":{"default_value":"M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X353.7 F3000\n"} + "machine_extruder_cooling_fan_number": { "default_value": 1 }, + "machine_extruder_end_code": { "default_value": "M605 S0 ;Disable auto-park\nG91 ; Relative positioning\nG1 E-8 1680\nG90\nG0 X353.7 F3000\n" }, + "machine_extruder_start_code": { "default_value": "G91 ; Relative positioning\nG1 E14 F300\nG1 E-5 F1800\nG90\nG92 E-4.5" }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file From c9e23dab83ac53921f2d21486fa521c1e3d04ab9 Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Tue, 2 Jul 2024 13:17:21 +0200 Subject: [PATCH 43/43] Disable 'temp should be defined in material' warning for now. relates to CURA-11999 --- .printer-linter | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.printer-linter b/.printer-linter index 31376f4dad..02be6361b9 100644 --- a/.printer-linter +++ b/.printer-linter @@ -6,7 +6,7 @@ checks: diagnostic-resources-macos-app-directory-name: true diagnostic-incorrect-formula: true diagnostic-resource-file-deleted: true - diagnostic-material-temperature-defined: true + diagnostic-material-temperature-defined: false diagnostic-long-profile-names: true fixes: diagnostic-definition-redundant-override: true