From 176bfc8a4ef316c3658b92e90d9178a2ca023f6d Mon Sep 17 00:00:00 2001 From: mao Date: Thu, 25 Aug 2022 13:26:41 +0800 Subject: [PATCH 01/24] 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/24] 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/24] 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/24] 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/24] 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/24] 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/24] 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/24] 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/24] 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 8815f52f2a74072de714c643066c9c616f698a09 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Fri, 24 May 2024 11:54:38 +0200 Subject: [PATCH 10/24] New 0.15mm mode for the factor 4 for PVA and BAM. Needed by 0.15mm 3rd party material profiles that require support. PP-485 --- .../um_f4_aa0.4_bam_0.15mm.inst.cfg | 30 +++++++++++++++++++ .../um_f4_bb0.4_pva_0.15mm.inst.cfg | 28 +++++++++++++++++ 2 files changed, 58 insertions(+) create mode 100644 resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.15mm.inst.cfg create mode 100644 resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg diff --git a/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.15mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.15mm.inst.cfg new file mode 100644 index 0000000000..d7aad11dec --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_aa0.4_bam_0.15mm.inst.cfg @@ -0,0 +1,30 @@ +[general] +definition = ultimaker_factor4 +name = Normal +version = 4 + +[metadata] +material = generic_bam +quality_type = fast +setting_version = 23 +type = quality +variant = AA 0.4 +weight = -1 + +[values] +_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1 +_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True +_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 +brim_replaces_support = False +machine_nozzle_heat_up_speed = 1.56 +material_print_temperature = =default_material_print_temperature - 5 +prime_tower_enable = =min(extruderValues('material_surface_energy')) < 100 +skin_material_flow = =material_flow * 0.965 +speed_print = 60 +support_angle = 45 +support_bottom_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 2) * layer_height +support_interface_density = =min(extruderValues('material_surface_energy')) +support_interface_enable = True +support_join_distance = 5 +support_top_distance = =math.ceil(min(extruderValues('material_adhesion_tendency')) / 1) * layer_height + diff --git a/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg new file mode 100644 index 0000000000..6fd09e5917 --- /dev/null +++ b/resources/quality/ultimaker_factor4/um_f4_bb0.4_pva_0.15mm.inst.cfg @@ -0,0 +1,28 @@ +[general] +definition = ultimaker_factor4 +name = Normal +version = 4 + +[metadata] +material = generic_pva +quality_type = fast +setting_version = 23 +type = quality +variant = BB 0.4 +weight = -1 + +[values] +_plugin__curaenginegradualflow__0_1_0__gradual_flow_discretisation_step_size = 0.1 +_plugin__curaenginegradualflow__0_1_0__gradual_flow_enabled = True +_plugin__curaenginegradualflow__0_1_0__max_flow_acceleration = 1 +acceleration_support_bottom = 100 +acceleration_support_interface = 1500 +brim_replaces_support = False +prime_tower_min_volume = 15 +skin_material_flow = =material_flow * 0.93 +speed_print = 50 +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_offset = 1 +support_offset = 3 +support_z_distance = 0 + From e1d64b4fc66df819778e1c7beb272e4da5f4539c Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Wed, 5 Jun 2024 10:01:47 +0200 Subject: [PATCH 11/24] Reduce the build plate, build volume and print temperature of the T-PLA 0.2mm engineering mode with 5C to improve the overhang quality. Strength and dimensional accuarcy were not affected by this change. PP-488 --- .../um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg b/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg index 9dd0190dbc..0aa1fc3d6d 100644 --- a/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg +++ b/resources/intent/ultimaker_factor4/um_f4_aa0.4_tough-pla_0.2mm_engineering.inst.cfg @@ -12,10 +12,8 @@ type = intent variant = AA 0.4 [values] -build_volume_temperature = 35 jerk_print = 30 -material_bed_temperature = =default_material_bed_temperature + 5 -material_print_temperature = =default_material_print_temperature + 15 +material_print_temperature = =default_material_print_temperature + 10 speed_print = 80 wall_thickness = =line_width * 3 From 5cfb3dbf7fa21f413d24abc6dc13639333e3d69c Mon Sep 17 00:00:00 2001 From: "Justin F. Hallett" Date: Fri, 7 Jun 2024 15:49:09 -0600 Subject: [PATCH 12/24] Add DraftShift Design Voron2 based StealthChanger profiles --- .../voron2_stealthchanger_250.def.json | 18 ++++++++++++ .../voron2_stealthchanger_300.def.json | 18 ++++++++++++ .../voron2_stealthchanger_350.def.json | 18 ++++++++++++ .../voron2_stealthchanger_base.def.json | 29 +++++++++++++++++++ .../voron2_stealthchanger_extruder_0.def.json | 25 ++++++++++++++++ .../voron2_stealthchanger_extruder_1.def.json | 25 ++++++++++++++++ .../voron2_stealthchanger_extruder_2.def.json | 25 ++++++++++++++++ .../voron2_stealthchanger_extruder_3.def.json | 25 ++++++++++++++++ .../voron2_stealthchanger_extruder_4.def.json | 25 ++++++++++++++++ .../voron2_stealthchanger_extruder_5.def.json | 25 ++++++++++++++++ .../voron2_stealthchanger_extruder_6.def.json | 25 ++++++++++++++++ .../voron2_stealthchanger_extruder_7.def.json | 25 ++++++++++++++++ ...voron2_stealthchanger_250_v6_0.25.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_250_v6_0.30.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_250_v6_0.35.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_250_v6_0.40.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_250_v6_0.50.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_250_v6_0.60.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_250_v6_0.80.inst.cfg | 13 +++++++++ ...2_stealthchanger_250_volcano_0.40.inst.cfg | 13 +++++++++ ...2_stealthchanger_250_volcano_0.60.inst.cfg | 13 +++++++++ ...2_stealthchanger_250_volcano_0.80.inst.cfg | 13 +++++++++ ...2_stealthchanger_250_volcano_1.00.inst.cfg | 13 +++++++++ ...2_stealthchanger_250_volcano_1.20.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_300_v6_0.25.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_300_v6_0.30.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_300_v6_0.35.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_300_v6_0.40.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_300_v6_0.50.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_300_v6_0.60.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_300_v6_0.80.inst.cfg | 13 +++++++++ ...2_stealthchanger_300_volcano_0.40.inst.cfg | 13 +++++++++ ...2_stealthchanger_300_volcano_0.60.inst.cfg | 13 +++++++++ ...2_stealthchanger_300_volcano_0.80.inst.cfg | 13 +++++++++ ...2_stealthchanger_300_volcano_1.00.inst.cfg | 13 +++++++++ ...2_stealthchanger_300_volcano_1.20.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_350_v6_0.25.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_350_v6_0.30.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_350_v6_0.35.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_350_v6_0.40.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_350_v6_0.50.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_350_v6_0.60.inst.cfg | 13 +++++++++ ...voron2_stealthchanger_350_v6_0.80.inst.cfg | 13 +++++++++ ...2_stealthchanger_350_volcano_0.40.inst.cfg | 13 +++++++++ ...2_stealthchanger_350_volcano_0.60.inst.cfg | 13 +++++++++ ...2_stealthchanger_350_volcano_0.80.inst.cfg | 13 +++++++++ ...2_stealthchanger_350_volcano_1.00.inst.cfg | 13 +++++++++ ...2_stealthchanger_350_volcano_1.20.inst.cfg | 13 +++++++++ 48 files changed, 751 insertions(+) create mode 100644 resources/definitions/voron2_stealthchanger_250.def.json create mode 100644 resources/definitions/voron2_stealthchanger_300.def.json create mode 100644 resources/definitions/voron2_stealthchanger_350.def.json create mode 100644 resources/definitions/voron2_stealthchanger_base.def.json create mode 100644 resources/extruders/voron2_stealthchanger_extruder_0.def.json create mode 100644 resources/extruders/voron2_stealthchanger_extruder_1.def.json create mode 100644 resources/extruders/voron2_stealthchanger_extruder_2.def.json create mode 100644 resources/extruders/voron2_stealthchanger_extruder_3.def.json create mode 100644 resources/extruders/voron2_stealthchanger_extruder_4.def.json create mode 100644 resources/extruders/voron2_stealthchanger_extruder_5.def.json create mode 100644 resources/extruders/voron2_stealthchanger_extruder_6.def.json create mode 100644 resources/extruders/voron2_stealthchanger_extruder_7.def.json create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_v6_0.25.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_v6_0.30.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_v6_0.35.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_v6_0.40.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_v6_0.50.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_v6_0.60.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_v6_0.80.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.40.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.60.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.80.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_volcano_1.00.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_250_volcano_1.20.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_v6_0.25.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_v6_0.30.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_v6_0.35.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_v6_0.40.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_v6_0.50.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_v6_0.60.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_v6_0.80.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.40.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.60.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.80.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_volcano_1.00.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_300_volcano_1.20.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_v6_0.25.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_v6_0.30.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_v6_0.35.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_v6_0.40.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_v6_0.50.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_v6_0.60.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_v6_0.80.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.40.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.60.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.80.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_volcano_1.00.inst.cfg create mode 100644 resources/variants/draftshift/voron2_stealthchanger_350_volcano_1.20.inst.cfg diff --git a/resources/definitions/voron2_stealthchanger_250.def.json b/resources/definitions/voron2_stealthchanger_250.def.json new file mode 100644 index 0000000000..123852a661 --- /dev/null +++ b/resources/definitions/voron2_stealthchanger_250.def.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "name": "Voron2 StealthChanger 250", + "inherits": "voron2_stealthchanger_base", + "metadata": + { + "visible": true, + "platform": "voron2_250_bed.3mf", + "quality_definition": "voron2_base" + }, + "overrides": + { + "machine_depth": { "default_value": 250 }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "VORON2 StealthChanger 250" }, + "machine_width": { "default_value": 250 } + } +} diff --git a/resources/definitions/voron2_stealthchanger_300.def.json b/resources/definitions/voron2_stealthchanger_300.def.json new file mode 100644 index 0000000000..bc079a1714 --- /dev/null +++ b/resources/definitions/voron2_stealthchanger_300.def.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "name": "Voron2 StealthChanger 300", + "inherits": "voron2_stealthchanger_base", + "metadata": + { + "visible": true, + "platform": "voron2_300_bed.3mf", + "quality_definition": "voron2_base" + }, + "overrides": + { + "machine_depth": { "default_value": 300 }, + "machine_height": { "default_value": 300 }, + "machine_name": { "default_value": "VORON2 StealthChanger 300" }, + "machine_width": { "default_value": 300 } + } +} diff --git a/resources/definitions/voron2_stealthchanger_350.def.json b/resources/definitions/voron2_stealthchanger_350.def.json new file mode 100644 index 0000000000..a73e274809 --- /dev/null +++ b/resources/definitions/voron2_stealthchanger_350.def.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "name": "Voron2 StealthChanger 350", + "inherits": "voron2_stealthchanger_base", + "metadata": + { + "visible": true, + "platform": "voron2_350_bed.3mf", + "quality_definition": "voron2_base" + }, + "overrides": + { + "machine_depth": { "default_value": 350 }, + "machine_height": { "default_value": 350 }, + "machine_name": { "default_value": "VORON2 StealthChanger 350" }, + "machine_width": { "default_value": 350 } + } +} diff --git a/resources/definitions/voron2_stealthchanger_base.def.json b/resources/definitions/voron2_stealthchanger_base.def.json new file mode 100644 index 0000000000..3eabc3e04e --- /dev/null +++ b/resources/definitions/voron2_stealthchanger_base.def.json @@ -0,0 +1,29 @@ +{ + "version": 2, + "name": "Voron2 StealthChanger Base", + "inherits": "voron2_base", + "metadata": + { + "visible": false, + "author": "Thessien", + "manufacturer": "DraftShift Design", + "machine_extruder_trains": + { + "0": "voron2_stealthchanger_extruder_0", + "1": "voron2_stealthchanger_extruder_1", + "2": "voron2_stealthchanger_extruder_2", + "3": "voron2_stealthchanger_extruder_3", + "4": "voron2_stealthchanger_extruder_4", + "5": "voron2_stealthchanger_extruder_5", + "6": "voron2_stealthchanger_extruder_6", + "7": "voron2_stealthchanger_extruder_7" + } + }, + "overrides": + { + "machine_name": { "default_value": "VORON2 StealthChanger" }, + "machine_end_gcode": { "default_value": "PRINT_END" }, + "machine_extruder_count": { "default_value": 1 }, + "machine_start_gcode": { "default_value": "PRINT_START TOOL_TEMP={material_print_temperature_layer_0} T{initial_extruder_nr}_TEMP={material_print_temperature_layer_0} BED_TEMP={material_bed_temperature_layer_0} TOOL={initial_extruder_nr}" } + } +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_0.def.json b/resources/extruders/voron2_stealthchanger_extruder_0.def.json new file mode 100644 index 0000000000..887ab01349 --- /dev/null +++ b/resources/extruders/voron2_stealthchanger_extruder_0.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Toolhead 0", + "inherits": "fdmextruder", + "metadata": + { + "machine": "voron2_stealthchanger_base", + "position": "0" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 0, + "maximum_value": 7 + }, + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + } +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_1.def.json b/resources/extruders/voron2_stealthchanger_extruder_1.def.json new file mode 100644 index 0000000000..4342d4ba55 --- /dev/null +++ b/resources/extruders/voron2_stealthchanger_extruder_1.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Toolhead 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "voron2_stealthchanger_base", + "position": "1" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 1, + "maximum_value": 7 + }, + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + } +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_2.def.json b/resources/extruders/voron2_stealthchanger_extruder_2.def.json new file mode 100644 index 0000000000..3dd2955b2a --- /dev/null +++ b/resources/extruders/voron2_stealthchanger_extruder_2.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Toolhead 2", + "inherits": "fdmextruder", + "metadata": + { + "machine": "voron2_stealthchanger_base", + "position": "2" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 2, + "maximum_value": 7 + }, + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + } +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_3.def.json b/resources/extruders/voron2_stealthchanger_extruder_3.def.json new file mode 100644 index 0000000000..9eeb9702eb --- /dev/null +++ b/resources/extruders/voron2_stealthchanger_extruder_3.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Toolhead 3", + "inherits": "fdmextruder", + "metadata": + { + "machine": "voron2_stealthchanger_base", + "position": "3" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 3, + "maximum_value": 7 + }, + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + } +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_4.def.json b/resources/extruders/voron2_stealthchanger_extruder_4.def.json new file mode 100644 index 0000000000..6641620313 --- /dev/null +++ b/resources/extruders/voron2_stealthchanger_extruder_4.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Toolhead 4", + "inherits": "fdmextruder", + "metadata": + { + "machine": "voron2_stealthchanger_base", + "position": "4" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 4, + "maximum_value": 7 + }, + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + } +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_5.def.json b/resources/extruders/voron2_stealthchanger_extruder_5.def.json new file mode 100644 index 0000000000..fe8c86cd6b --- /dev/null +++ b/resources/extruders/voron2_stealthchanger_extruder_5.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Toolhead 5", + "inherits": "fdmextruder", + "metadata": + { + "machine": "voron2_stealthchanger_base", + "position": "5" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 5, + "maximum_value": 7 + }, + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + } +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_6.def.json b/resources/extruders/voron2_stealthchanger_extruder_6.def.json new file mode 100644 index 0000000000..e8aac016c4 --- /dev/null +++ b/resources/extruders/voron2_stealthchanger_extruder_6.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Toolhead 6", + "inherits": "fdmextruder", + "metadata": + { + "machine": "voron2_stealthchanger_base", + "position": "6" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 6, + "maximum_value": 7 + }, + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + } +} diff --git a/resources/extruders/voron2_stealthchanger_extruder_7.def.json b/resources/extruders/voron2_stealthchanger_extruder_7.def.json new file mode 100644 index 0000000000..9e98525f90 --- /dev/null +++ b/resources/extruders/voron2_stealthchanger_extruder_7.def.json @@ -0,0 +1,25 @@ +{ + "version": 2, + "name": "Toolhead 7", + "inherits": "fdmextruder", + "metadata": + { + "machine": "voron2_stealthchanger_base", + "position": "7" + }, + "overrides": + { + "extruder_nr": + { + "default_value": 7, + "maximum_value": 7 + }, + "material_diameter": { "default_value": 1.75 }, + "machine_extruder_end_pos_abs": { "default_value": true }, + "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, + "machine_extruder_start_pos_abs": { "default_value": true }, + "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + } +} diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.25.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.25.inst.cfg new file mode 100644 index 0000000000..d9dc67d195 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.25.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_250 +name = V6 0.25mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.25 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.30.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.30.inst.cfg new file mode 100644 index 0000000000..348f1c0f8b --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.30.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_250 +name = V6 0.30mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.30 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.35.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.35.inst.cfg new file mode 100644 index 0000000000..d56e3c80e3 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.35.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_250 +name = V6 0.35mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.35 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.40.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.40.inst.cfg new file mode 100644 index 0000000000..817bccacfe --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_250 +name = V6 0.40mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.50.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.50.inst.cfg new file mode 100644 index 0000000000..30774fcf86 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.50.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_250 +name = V6 0.50mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.60.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.60.inst.cfg new file mode 100644 index 0000000000..06841a8187 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_250 +name = V6 0.60mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.80.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.80.inst.cfg new file mode 100644 index 0000000000..037414e04c --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_v6_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_250 +name = V6 0.80mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.40.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.40.inst.cfg new file mode 100644 index 0000000000..8b2e14dde6 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_250 +name = Volcano 0.40mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.60.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.60.inst.cfg new file mode 100644 index 0000000000..0bd7fca9eb --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_250 +name = Volcano 0.60mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.80.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.80.inst.cfg new file mode 100644 index 0000000000..7b6a99d012 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_volcano_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_250 +name = Volcano 0.80mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_volcano_1.00.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_volcano_1.00.inst.cfg new file mode 100644 index 0000000000..79a110a357 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_volcano_1.00.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = Volcano 1.00mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_250_volcano_1.20.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_250_volcano_1.20.inst.cfg new file mode 100644 index 0000000000..b30a6d2b22 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_250_volcano_1.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_250 +name = Volcano 1.20mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 1.2 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.25.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.25.inst.cfg new file mode 100644 index 0000000000..91cfe55050 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.25.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = V6 0.25mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.25 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.30.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.30.inst.cfg new file mode 100644 index 0000000000..a01d46ea83 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.30.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = V6 0.30mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.30 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.35.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.35.inst.cfg new file mode 100644 index 0000000000..f7b96d3913 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.35.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = V6 0.35mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.35 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.40.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.40.inst.cfg new file mode 100644 index 0000000000..4d533d6923 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = V6 0.40mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.50.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.50.inst.cfg new file mode 100644 index 0000000000..7732cae34c --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.50.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = V6 0.50mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.60.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.60.inst.cfg new file mode 100644 index 0000000000..65343c2314 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = V6 0.60mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.80.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.80.inst.cfg new file mode 100644 index 0000000000..eef2b9b5cc --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_v6_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = V6 0.80mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.40.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.40.inst.cfg new file mode 100644 index 0000000000..e2924355a5 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = Volcano 0.40mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.60.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.60.inst.cfg new file mode 100644 index 0000000000..e95b345f1c --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = Volcano 0.60mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.80.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.80.inst.cfg new file mode 100644 index 0000000000..3a088ec895 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_volcano_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = Volcano 0.80mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_volcano_1.00.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_volcano_1.00.inst.cfg new file mode 100644 index 0000000000..423c53a7af --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_volcano_1.00.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = Volcano 1.00mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_300_volcano_1.20.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_300_volcano_1.20.inst.cfg new file mode 100644 index 0000000000..682d0f32b4 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_300_volcano_1.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_300 +name = Volcano 1.20mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 1.2 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.25.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.25.inst.cfg new file mode 100644 index 0000000000..00ee1e22de --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.25.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = V6 0.25mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.25 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.30.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.30.inst.cfg new file mode 100644 index 0000000000..50b48831f8 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.30.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = V6 0.30mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.30 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.35.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.35.inst.cfg new file mode 100644 index 0000000000..d6a356a046 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.35.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = V6 0.35mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.35 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.40.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.40.inst.cfg new file mode 100644 index 0000000000..b6cea8053e --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = V6 0.40mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.50.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.50.inst.cfg new file mode 100644 index 0000000000..3b382dee7d --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.50.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = V6 0.50mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.60.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.60.inst.cfg new file mode 100644 index 0000000000..327b8f2233 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = V6 0.60mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.80.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.80.inst.cfg new file mode 100644 index 0000000000..b1db27ccd8 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_v6_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = V6 0.80mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.40.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.40.inst.cfg new file mode 100644 index 0000000000..f9ebd89d4a --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.40.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = Volcano 0.40mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.60.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.60.inst.cfg new file mode 100644 index 0000000000..1dc02511a7 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.60.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = Volcano 0.60mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.80.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.80.inst.cfg new file mode 100644 index 0000000000..3857baf3a3 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_volcano_0.80.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = Volcano 0.80mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_volcano_1.00.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_volcano_1.00.inst.cfg new file mode 100644 index 0000000000..79a110a357 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_volcano_1.00.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = Volcano 1.00mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 1.0 + diff --git a/resources/variants/draftshift/voron2_stealthchanger_350_volcano_1.20.inst.cfg b/resources/variants/draftshift/voron2_stealthchanger_350_volcano_1.20.inst.cfg new file mode 100644 index 0000000000..33c94db3e8 --- /dev/null +++ b/resources/variants/draftshift/voron2_stealthchanger_350_volcano_1.20.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = voron2_stealthchanger_350 +name = Volcano 1.20mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 1.2 + From 262b6f1458777b055e4cdd879e2b3398f7fdfcbb Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Mon, 17 Jun 2024 15:19:52 +0200 Subject: [PATCH 13/24] Improve PVA printing reliability. Increase linewidth at first layer, enable prime tower, increase print speed PVA. PP-429 --- resources/definitions/ultimaker.def.json | 4 ++++ .../ultimaker_factor4/um_f4_bb0.4_pva_0.1mm.inst.cfg | 2 ++ .../ultimaker_factor4/um_f4_bb0.4_pva_0.2mm.inst.cfg | 2 ++ .../ultimaker_factor4/um_f4_bb0.4_pva_0.3mm.inst.cfg | 2 ++ .../ultimaker_factor4/um_f4_bb0.8_pva_0.2mm.inst.cfg | 2 ++ .../ultimaker_factor4/um_f4_bb0.8_pva_0.3mm.inst.cfg | 2 ++ .../ultimaker_factor4/um_f4_bb0.8_pva_0.4mm.inst.cfg | 2 ++ .../quality/ultimaker_s3/um_s3_aa0.25_um-pla_0.1mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_pla_0.06mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_pla_0.1mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_pla_0.3mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.8_pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.8_pla_0.3mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.8_pla_0.4mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_bb0.4_pva_0.06mm.inst.cfg | 6 +++++- .../quality/ultimaker_s3/um_s3_bb0.4_pva_0.15mm.inst.cfg | 6 +++++- .../quality/ultimaker_s3/um_s3_bb0.4_pva_0.1mm.inst.cfg | 6 +++++- .../quality/ultimaker_s3/um_s3_bb0.4_pva_0.2mm.inst.cfg | 6 +++++- .../quality/ultimaker_s3/um_s3_bb0.4_pva_0.3mm.inst.cfg | 5 +++++ .../quality/ultimaker_s3/um_s3_bb0.8_pva_0.2mm.inst.cfg | 5 +++++ .../quality/ultimaker_s3/um_s3_bb0.8_pva_0.3mm.inst.cfg | 5 +++++ .../quality/ultimaker_s3/um_s3_bb0.8_pva_0.4mm.inst.cfg | 5 +++++ .../quality/ultimaker_s3/um_s3_cc0.4_pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_cc0.4_pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_cc0.6_pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_cc0.6_pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.25_um-pla_0.1mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_pla_0.06mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_pla_0.1mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_pla_0.3mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.8_pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.8_pla_0.3mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.8_pla_0.4mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_bb0.4_pva_0.06mm.inst.cfg | 6 +++++- .../quality/ultimaker_s5/um_s5_bb0.4_pva_0.15mm.inst.cfg | 6 +++++- .../quality/ultimaker_s5/um_s5_bb0.4_pva_0.1mm.inst.cfg | 6 +++++- .../quality/ultimaker_s5/um_s5_bb0.4_pva_0.2mm.inst.cfg | 6 +++++- .../quality/ultimaker_s5/um_s5_bb0.4_pva_0.3mm.inst.cfg | 6 +++++- .../quality/ultimaker_s5/um_s5_bb0.8_pva_0.2mm.inst.cfg | 5 +++++ .../quality/ultimaker_s5/um_s5_bb0.8_pva_0.3mm.inst.cfg | 5 +++++ .../quality/ultimaker_s5/um_s5_bb0.8_pva_0.4mm.inst.cfg | 5 +++++ .../quality/ultimaker_s5/um_s5_cc0.4_pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_cc0.4_pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_cc0.6_pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_cc0.6_pla_0.2mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.15mm.inst.cfg | 1 - .../quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.2mm.inst.cfg | 1 - 73 files changed, 96 insertions(+), 59 deletions(-) diff --git a/resources/definitions/ultimaker.def.json b/resources/definitions/ultimaker.def.json index 97bb099ea4..918db0d0ea 100644 --- a/resources/definitions/ultimaker.def.json +++ b/resources/definitions/ultimaker.def.json @@ -89,6 +89,9 @@ }, "meshfix_maximum_deviation": { "value": "machine_nozzle_size / 10" }, "meshfix_maximum_resolution": { "value": "max(speed_wall_0 / 75, 0.5)" }, + "prime_tower_base_curve_magnitude": { "value": 2 }, + "prime_tower_base_height": { "value": 6 }, + "prime_tower_base_size": { "value": 10 }, "raft_base_speed": { "value": "raft_speed" }, "raft_base_thickness": { "value": "min(machine_nozzle_size * 0.75, 0.3)" }, "raft_interface_fan_speed": { "value": "(raft_base_fan_speed + raft_surface_fan_speed) / 2" }, @@ -126,6 +129,7 @@ "support_line_distance": { "minimum_value_warning": "0 if support_structure == 'tree' else support_line_width" }, "support_tower_maximum_supported_diameter": { "value": "support_tower_diameter" }, "support_tower_roof_angle": { "value": "0 if support_interface_enable else 65" }, + "support_use_towers": { "value": false }, "support_wall_count": { "value": "1 if support_structure == 'tree' else 0" }, "support_xy_distance_overhang": { "value": "0.2" }, "support_z_distance": { "value": "0" }, 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..2c99c484c9 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 +initial_layer_line_width_factor = 150 +minimum_support_area = 4 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..f0aeb24746 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 +initial_layer_line_width_factor = 150 +minimum_support_area = 4 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..1856bda292 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 +initial_layer_line_width_factor = 150 +minimum_support_area = 4 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..f51bdb596a 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 +initial_layer_line_width_factor = 150 +minimum_support_area = 4 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..e39b921c31 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 +initial_layer_line_width_factor = 150 +minimum_support_area = 4 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..aa36cd2fd2 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 +initial_layer_line_width_factor = 150 +minimum_support_area = 4 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.25_um-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-pla_0.1mm.inst.cfg index 042058d1f0..d7bd9816ed 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_um-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_um-pla_0.1mm.inst.cfg @@ -41,7 +41,6 @@ machine_nozzle_cool_down_speed = 1.3 machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.06mm.inst.cfg index 9b2325250c..ae9436c02e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.06mm.inst.cfg @@ -15,7 +15,6 @@ weight = 1 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.15mm.inst.cfg index caf4248a91..f51a43350a 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.15mm.inst.cfg @@ -14,7 +14,6 @@ weight = -1 [values] machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = False raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 70 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.1mm.inst.cfg index 3e79a33e69..ea29968088 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.1mm.inst.cfg @@ -14,7 +14,6 @@ weight = 0 [values] machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = False raft_airgap = 0.25 retraction_prime_speed = =retraction_speed support_bottom_distance = =support_z_distance diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.2mm.inst.cfg index 3e814754e4..ab6b521213 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.2mm.inst.cfg @@ -18,7 +18,6 @@ infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = False raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_topbottom = =math.ceil(speed_print * 40 / 70) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.3mm.inst.cfg index 87eeb609a7..8f535a445c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pla_0.3mm.inst.cfg @@ -22,7 +22,6 @@ infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = False raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 50 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm.inst.cfg index 00c4be354f..40b74593fa 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.06mm.inst.cfg @@ -42,7 +42,6 @@ machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 12 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg index 432f722013..a52bc4173d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.15mm.inst.cfg @@ -43,7 +43,6 @@ material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 12 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm.inst.cfg index 39aa770c10..0fe2f9f4a1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.1mm.inst.cfg @@ -42,7 +42,6 @@ machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 12 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg index 8a2a5b19a7..c6206182fb 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.2mm.inst.cfg @@ -45,7 +45,6 @@ material_max_flowrate = 12 material_print_temperature = =default_material_print_temperature + 5 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg index 1851be3eab..8044b7141f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_um-pla_0.3mm.inst.cfg @@ -44,7 +44,6 @@ material_max_flowrate = 12 material_print_temperature = =default_material_print_temperature + 10 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.2mm.inst.cfg index 87b1b64804..f1d084d5b9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.2mm.inst.cfg @@ -16,7 +16,6 @@ gradual_infill_step_height = =3 * layer_height machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.3mm.inst.cfg index 75b5ddfd5f..7d3603b7b2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.3mm.inst.cfg @@ -16,7 +16,6 @@ gradual_infill_step_height = =3 * layer_height machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.4mm.inst.cfg index 5eccf9bef4..8345c85825 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_pla_0.4mm.inst.cfg @@ -16,7 +16,6 @@ gradual_infill_step_height = =3 * layer_height machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 15 -prime_tower_enable = True speed_infill = =math.ceil(speed_print * 35 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg index 336beaf117..23ebb75153 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.2mm.inst.cfg @@ -47,7 +47,6 @@ material_max_flowrate = 15 material_print_temperature = =default_material_print_temperature + 10 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = True raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg index 07641eb84a..ee0f35b386 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.3mm.inst.cfg @@ -44,7 +44,6 @@ material_flow = 93 material_max_flowrate = 15 material_print_temperature = =default_material_print_temperature + 10 optimize_wall_printing_order = False -prime_tower_enable = True raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg index 880ac666d7..6e481a3a94 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.8_um-pla_0.4mm.inst.cfg @@ -44,7 +44,6 @@ material_flow = 93 material_max_flowrate = 15 material_print_temperature = =default_material_print_temperature + 15 optimize_wall_printing_order = False -prime_tower_enable = True raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 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..e5369b467e 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 @@ -12,12 +12,16 @@ variant = BB 0.4 weight = 1 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_infill_sparse_thickness = =3 * layer_height support_interface_enable = True 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..bad46d3573 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 @@ -12,11 +12,15 @@ variant = BB 0.4 weight = -1 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -prime_tower_enable = False +initial_layer_line_width_factor = 150 +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_infill_sparse_thickness = =2 * layer_height support_interface_enable = True 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..8424914a2d 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 @@ -12,12 +12,16 @@ variant = BB 0.4 weight = 0 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_infill_sparse_thickness = =2 * layer_height support_interface_enable = True 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..fc34184c72 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 @@ -12,11 +12,15 @@ variant = BB 0.4 weight = -2 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = False +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_interface_enable = True 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..184f40a74d 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 @@ -13,11 +13,16 @@ variant = BB 0.4 weight = -3 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_infill_sparse_thickness = 0.3 support_interface_enable = True 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..9477268780 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 @@ -12,9 +12,14 @@ variant = BB 0.8 weight = -2 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 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..58a4a1901f 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 @@ -12,11 +12,16 @@ variant = BB 0.8 weight = -3 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_infill_sparse_thickness = 0.3 support_interface_enable = True 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..a7817b224b 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 @@ -12,10 +12,15 @@ variant = BB 0.8 weight = -4 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_interface_enable = True diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.15mm.inst.cfg index b45c225162..f6f2b8bacd 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.15mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.2mm.inst.cfg index ed0186e5d0..b71b3f481d 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_pla_0.2mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.15mm.inst.cfg index f5077c90db..f1d114fe46 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.15mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.2mm.inst.cfg index 70a278ea32..ea1a1021a7 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_um-pla_0.2mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.15mm.inst.cfg index 9c1570ee8f..f5398069b1 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.15mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.2mm.inst.cfg index 0ed8088a9b..a0822a4be1 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_pla_0.2mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.15mm.inst.cfg index 2a596778ff..d83764aefa 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.15mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.2mm.inst.cfg index 6ecdf06d8f..e289c8c014 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_um-pla_0.2mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-pla_0.1mm.inst.cfg index fec58e9d8c..5948b72f7d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_um-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_um-pla_0.1mm.inst.cfg @@ -41,7 +41,6 @@ machine_nozzle_cool_down_speed = 1.3 machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.06mm.inst.cfg index a06de49699..786701bf52 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.06mm.inst.cfg @@ -15,7 +15,6 @@ weight = 1 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.15mm.inst.cfg index de3e873bd7..7889fa288c 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.15mm.inst.cfg @@ -14,7 +14,6 @@ weight = -1 [values] machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = False raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 70 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.1mm.inst.cfg index f6b0cc0a72..d5d07d2118 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.1mm.inst.cfg @@ -14,7 +14,6 @@ weight = 0 [values] machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 -prime_tower_enable = False raft_airgap = 0.25 retraction_prime_speed = =retraction_speed support_bottom_distance = =support_z_distance diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.2mm.inst.cfg index c520a270cd..9d616ae31a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.2mm.inst.cfg @@ -18,7 +18,6 @@ infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = False raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_topbottom = =math.ceil(speed_print * 40 / 70) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.3mm.inst.cfg index 3d7d7bf0e8..67b52cb861 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pla_0.3mm.inst.cfg @@ -22,7 +22,6 @@ infill_sparse_density = 15 machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = False raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 50 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm.inst.cfg index dc83ca3836..2ee13388b9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.06mm.inst.cfg @@ -42,7 +42,6 @@ machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 12 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm.inst.cfg index 05ace5503b..faeca1fc2d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.15mm.inst.cfg @@ -43,7 +43,6 @@ material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 12 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm.inst.cfg index 9c47aedd1b..a5b4aa9aac 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.1mm.inst.cfg @@ -42,7 +42,6 @@ machine_nozzle_heat_up_speed = 1.9 material_extrusion_cool_down_speed = 0.7 material_max_flowrate = 12 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm.inst.cfg index f88ae2633f..b7f21f2449 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.2mm.inst.cfg @@ -45,7 +45,6 @@ material_max_flowrate = 12 material_print_temperature = =default_material_print_temperature + 5 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm.inst.cfg index ff6107a869..b4f500cd29 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_um-pla_0.3mm.inst.cfg @@ -44,7 +44,6 @@ material_max_flowrate = 12 material_print_temperature = =default_material_print_temperature + 10 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = False raft_airgap = 0.25 retraction_amount = 6.5 retraction_prime_speed = =retraction_speed diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.2mm.inst.cfg index a91d523213..16856d2826 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.2mm.inst.cfg @@ -16,7 +16,6 @@ gradual_infill_step_height = =3 * layer_height machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.3mm.inst.cfg index 8a0f863da8..44d9b20567 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.3mm.inst.cfg @@ -16,7 +16,6 @@ gradual_infill_step_height = =3 * layer_height machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.4mm.inst.cfg index c9aa0476a2..b490c59430 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_pla_0.4mm.inst.cfg @@ -16,7 +16,6 @@ gradual_infill_step_height = =3 * layer_height machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 15 -prime_tower_enable = True speed_infill = =math.ceil(speed_print * 35 / 45) speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm.inst.cfg index 0736e60059..bbc57e29d9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.2mm.inst.cfg @@ -47,7 +47,6 @@ material_max_flowrate = 15 material_print_temperature = =default_material_print_temperature + 10 meshfix_maximum_resolution = 0.7 optimize_wall_printing_order = False -prime_tower_enable = True raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm.inst.cfg index 5c7b8fa441..f3e8ca0332 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.3mm.inst.cfg @@ -44,7 +44,6 @@ material_flow = 93 material_max_flowrate = 15 material_print_temperature = =default_material_print_temperature + 10 optimize_wall_printing_order = False -prime_tower_enable = True raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm.inst.cfg index 1f2e30f402..c5c7bc2732 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.8_um-pla_0.4mm.inst.cfg @@ -44,7 +44,6 @@ material_flow = 93 material_max_flowrate = 15 material_print_temperature = =default_material_print_temperature + 15 optimize_wall_printing_order = False -prime_tower_enable = True raft_airgap = 0.25 retraction_amount = 4 retraction_prime_speed = 22 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..f22a56d0b7 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 @@ -12,12 +12,16 @@ variant = BB 0.4 weight = 1 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_infill_sparse_thickness = =3 * layer_height support_interface_enable = True 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..b2e541697c 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 @@ -12,11 +12,15 @@ variant = BB 0.4 weight = -1 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) -prime_tower_enable = False +initial_layer_line_width_factor = 150 +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_infill_sparse_thickness = =2 * layer_height support_interface_enable = True 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..d3ca3ea07f 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 @@ -12,12 +12,16 @@ variant = BB 0.4 weight = 0 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_infill_sparse_thickness = =2 * layer_height support_interface_enable = True 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..eb0293dd11 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 @@ -12,11 +12,15 @@ variant = BB 0.4 weight = -2 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 -prime_tower_enable = False +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_interface_enable = True 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..b87724042c 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 @@ -13,12 +13,16 @@ variant = BB 0.4 weight = -3 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature - 5 -prime_tower_enable = False +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_infill_sparse_thickness = 0.3 support_interface_enable = True 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..9940bab26a 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 @@ -12,9 +12,14 @@ variant = BB 0.8 weight = -2 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 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..d2e6410596 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 @@ -12,11 +12,16 @@ variant = BB 0.8 weight = -3 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_infill_sparse_thickness = 0.3 support_interface_enable = True 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..07e4d926ac 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 @@ -12,10 +12,15 @@ variant = BB 0.8 weight = -4 [values] +acceleration_prime_tower = 1500 brim_replaces_support = False cool_fan_enabled = =not (support_enable and (extruder_nr == support_infill_extruder_nr)) +initial_layer_line_width_factor = 150 material_print_temperature = =default_material_print_temperature + 5 +minimum_support_area = 4 retraction_count_max = 5 skirt_brim_minimal_length = =min(2000, 175 / (layer_height * line_width)) +speed_prime_tower = 25 +speed_support = 50 support_interface_enable = True diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.15mm.inst.cfg index 0797ce3a74..ee7e43e2b6 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.15mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.2mm.inst.cfg index 5efec81bb2..52bf2b2bb5 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_pla_0.2mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.15mm.inst.cfg index ceedc5958d..3c9ad8f923 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.15mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.2mm.inst.cfg index 9cd74fd0b2..aa57f9bc05 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_um-pla_0.2mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.15mm.inst.cfg index b5258d9288..ba11a298b7 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.15mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.2mm.inst.cfg index eac67e08c8..945ee51843 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_pla_0.2mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.15mm.inst.cfg index f4b98360cb..479bc2693f 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.15mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.2mm.inst.cfg index 2e5abe5101..281689ebbb 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_um-pla_0.2mm.inst.cfg @@ -18,7 +18,6 @@ infill_pattern = ='zigzag' if infill_sparse_density > 80 else 'triangles' machine_nozzle_cool_down_speed = 0.75 machine_nozzle_heat_up_speed = 1.6 material_print_temperature = =default_material_print_temperature + 10 -prime_tower_enable = True speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) From 675c2caaba9dd9a36c71c93be13909dd5bd10279 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 25 Jun 2024 11:33:07 +0200 Subject: [PATCH 14/24] Default layer start position to machine_extruder start position CURA-11937 --- resources/definitions/fdmprinter.def.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index a124145314..ef0631ac36 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4372,6 +4372,7 @@ "unit": "mm", "type": "float", "default_value": 0.0, + "value": "machine_extruder_start_pos_x", "minimum_value": "machine_width / -2 if machine_center_is_zero else 0", "settable_per_mesh": false, "settable_per_extruder": true, @@ -4384,6 +4385,7 @@ "unit": "mm", "type": "float", "default_value": 0.0, + "value": "machine_extruder_start_pos_y", "minimum_value": "machine_depth / -2 if machine_center_is_zero else 0", "settable_per_mesh": false, "settable_per_extruder": true, From 0d805df7110f8f043aa997980fd70948b7a0fd25 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Tue, 25 Jun 2024 17:09:51 +0200 Subject: [PATCH 15/24] Set layer_start_x/y to a safer value Also remove all the definitions that had exactly this value as an override. CURA-11947 --- resources/definitions/fdmprinter.def.json | 4 ++-- resources/definitions/strateo3d.def.json | 2 -- resources/definitions/ultimaker3.def.json | 2 -- resources/definitions/ultimaker_factor4.def.json | 2 -- resources/definitions/ultimaker_method_base.def.json | 2 -- resources/definitions/ultimaker_s3.def.json | 2 -- resources/definitions/ultimaker_s5.def.json | 3 +-- resources/definitions/ultimaker_sketch.def.json | 2 -- 8 files changed, 3 insertions(+), 16 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index ef0631ac36..89dde70354 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -4372,7 +4372,7 @@ "unit": "mm", "type": "float", "default_value": 0.0, - "value": "machine_extruder_start_pos_x", + "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))", "minimum_value": "machine_width / -2 if machine_center_is_zero else 0", "settable_per_mesh": false, "settable_per_extruder": true, @@ -4385,7 +4385,7 @@ "unit": "mm", "type": "float", "default_value": 0.0, - "value": "machine_extruder_start_pos_y", + "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))", "minimum_value": "machine_depth / -2 if machine_center_is_zero else 0", "settable_per_mesh": false, "settable_per_extruder": true, diff --git a/resources/definitions/strateo3d.def.json b/resources/definitions/strateo3d.def.json index f21a13ca86..39ac818e6a 100644 --- a/resources/definitions/strateo3d.def.json +++ b/resources/definitions/strateo3d.def.json @@ -157,8 +157,6 @@ "value": "jerk_wall * 5 / 10" }, "jerk_wall_x": { "maximum_value_warning": "0.01" }, - "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": 1500 }, "machine_center_is_zero": { "default_value": false }, "machine_depth": { "default_value": 420 }, diff --git a/resources/definitions/ultimaker3.def.json b/resources/definitions/ultimaker3.def.json index 173fbdb524..9b732aa421 100644 --- a/resources/definitions/ultimaker3.def.json +++ b/resources/definitions/ultimaker3.def.json @@ -70,8 +70,6 @@ "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, - "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_depth": { "default_value": 215 }, "machine_disallowed_areas": diff --git a/resources/definitions/ultimaker_factor4.def.json b/resources/definitions/ultimaker_factor4.def.json index 5501148967..3fed9b2388 100644 --- a/resources/definitions/ultimaker_factor4.def.json +++ b/resources/definitions/ultimaker_factor4.def.json @@ -103,8 +103,6 @@ }, "jerk_travel_enabled": { "value": "True" }, "layer_height": { "value": "min(min(extruderValues('machine_nozzle_size')) / 2, 0.2)" }, - "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_depth": { "default_value": 240 }, "machine_end_gcode": { "default_value": "" }, diff --git a/resources/definitions/ultimaker_method_base.def.json b/resources/definitions/ultimaker_method_base.def.json index 22d25f92c7..c5a1f522cb 100644 --- a/resources/definitions/ultimaker_method_base.def.json +++ b/resources/definitions/ultimaker_method_base.def.json @@ -315,8 +315,6 @@ "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": "" }, diff --git a/resources/definitions/ultimaker_s3.def.json b/resources/definitions/ultimaker_s3.def.json index 3750b83553..82776bd62e 100644 --- a/resources/definitions/ultimaker_s3.def.json +++ b/resources/definitions/ultimaker_s3.def.json @@ -70,8 +70,6 @@ "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, - "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_depth": { "default_value": 190 }, "machine_end_gcode": { "default_value": "" }, diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index eb3984510e..42e26225c5 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -74,8 +74,7 @@ "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, - "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_depth": { "default_value": 240 }, "machine_end_gcode": { "default_value": "" }, diff --git a/resources/definitions/ultimaker_sketch.def.json b/resources/definitions/ultimaker_sketch.def.json index 05e506c3b6..cac14b07d4 100644 --- a/resources/definitions/ultimaker_sketch.def.json +++ b/resources/definitions/ultimaker_sketch.def.json @@ -208,8 +208,6 @@ "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_sparse_density": { "value": 15 }, "jerk_enabled": { "value": false }, - "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_center_is_zero": { "default_value": true }, "machine_depth": { "default_value": 150 }, "machine_end_gcode": { "default_value": "M107; Disable Fan; \n; End of print; \n; End GCode\nM104 S0 T0; Set Toolhead Temp to 0\nM140 S0 T0; Set Platform Temp to 0\nG162 Z F1800; Move to max axes position\nG28 X Y; Home\nM652; Turn off back fan\nM132 X Y Z A B; Set Home Position\nG91; Use Relative Positioning\nM18; Disable Axes\n\n" }, From 6b0e492dffd060bb468bdc36fc986f6aaaa90c3b Mon Sep 17 00:00:00 2001 From: wawanbreton Date: Tue, 25 Jun 2024 15:12:08 +0000 Subject: [PATCH 16/24] Applied printer-linter format --- resources/definitions/ultimaker_s5.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/ultimaker_s5.def.json b/resources/definitions/ultimaker_s5.def.json index 42e26225c5..3c35c84a00 100644 --- a/resources/definitions/ultimaker_s5.def.json +++ b/resources/definitions/ultimaker_s5.def.json @@ -74,7 +74,6 @@ "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" }, "infill_wipe_dist": { "value": "0" }, "jerk_enabled": { "value": "True" }, - "machine_acceleration": { "default_value": 3000 }, "machine_depth": { "default_value": 240 }, "machine_end_gcode": { "default_value": "" }, From 9e2c44009716ccc401ec52632f36cb2a1bb3ecc3 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 28 Jun 2024 15:36:10 +0200 Subject: [PATCH 17/24] Fix false warnings on setting formulas We also need to consider the extruder settings when looking into formulas for existing values. --- printer-linter/src/printerlinter/linters/formulas.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/printer-linter/src/printerlinter/linters/formulas.py b/printer-linter/src/printerlinter/linters/formulas.py index aa31619678..07f1bc24a8 100644 --- a/printer-linter/src/printerlinter/linters/formulas.py +++ b/printer-linter/src/printerlinter/linters/formulas.py @@ -51,9 +51,17 @@ class Formulas(Linter): self._definition = {} def getCuraSettingList(self) -> list: + settings_list = [] + with open(os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", "resources", "definitions", "fdmprinter.def.json")) as data: json_data = json.load(data) - return self.extractKeys(json_data) + settings_list += self.extractKeys(json_data) + + with open(os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", "resources", "definitions", "fdmextruder.def.json")) as data: + json_data = json.load(data) + settings_list += self.extractKeys(json_data) + + return settings_list def extractKeys(self, json_obj, parent_key=''): keys_with_value = [] From 9f5658adb79b1b10c827f77698b4dd80810895f1 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Fri, 28 Jun 2024 16:43:38 +0200 Subject: [PATCH 18/24] Add missing intent translation CURA-11976 --- cura/Machines/Models/IntentTranslations.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cura/Machines/Models/IntentTranslations.py b/cura/Machines/Models/IntentTranslations.py index 3a2afcb7c5..aab902204a 100644 --- a/cura/Machines/Models/IntentTranslations.py +++ b/cura/Machines/Models/IntentTranslations.py @@ -24,6 +24,10 @@ intent_translations["quick"] = { "name": catalog.i18nc("@label", "Draft"), "description": catalog.i18nc("@text", "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction.") } +intent_translations["annealing"] = { + "name": catalog.i18nc("@label", "Annealing"), + "description": catalog.i18nc("@text", "The annealing profile requires post-processing in an oven after the print is finished. This profile retains the dimensional accuracy of the printed part after annealing and improves strength, stiffness, and thermal resistance.") +} intent_translations["solid"] = { "name": catalog.i18nc("@label", "Solid"), "description": catalog.i18nc("@text", From d828396749979e86094bc5f7c8cd0b12e959ab06 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 1 Jul 2024 12:04:47 +0200 Subject: [PATCH 19/24] Remove indirect conan dependency --- conandata.yml | 1 - conanfile.py | 1 - 2 files changed, 2 deletions(-) diff --git a/conandata.yml b/conandata.yml index 89ceba3d30..9c52662398 100644 --- a/conandata.yml +++ b/conandata.yml @@ -9,7 +9,6 @@ requirements: - "dulcificum/latest@ultimaker/testing" - "pysavitar/5.3.0" - "pynest2d/5.3.0" - - "curaengine_grpc_definitions/0.2.0" - "native_cad_plugin/2.0.0" requirements_internal: - "fdm_materials/(latest)@internal/testing" diff --git a/conanfile.py b/conanfile.py index 221d4ea288..787c26785f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -329,7 +329,6 @@ class CuraConan(ConanFile): self.options["cpython"].shared = True self.options["boost"].header_only = True if self.settings.os == "Linux": - self.options["curaengine_grpc_definitions"].shared = True self.options["openssl"].shared = True if self.conf.get("user.curaengine:sentry_url", "", check_type=str) != "": self.options["curaengine"].enable_sentry = True From 6cc6026b22f4642dc18f75a0cbeb6f89ba56dd50 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 1 Jul 2024 13:47:05 +0200 Subject: [PATCH 20/24] Remove MacOS 11 runner which is deprecated --- .github/workflows/macos.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index 9c940330e1..ffc9b27b8b 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -40,7 +40,6 @@ on: options: - self-hosted-X64 - self-hosted-ARM64 - - macos-11 - macos-12 jobs: @@ -53,4 +52,4 @@ jobs: staging: ${{ inputs.staging }} architecture: ${{ inputs.architecture }} operating_system: ${{ inputs.operating_system }} - secrets: inherit \ No newline at end of file + secrets: inherit From a087cbffae5a409419a2b83fca15ecd9b4566519 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 1 Jul 2024 13:59:05 +0200 Subject: [PATCH 21/24] Bump gradual flow plugin version --- conandata.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conandata.yml b/conandata.yml index 9c52662398..cf94aee8ac 100644 --- a/conandata.yml +++ b/conandata.yml @@ -5,7 +5,7 @@ requirements: - "curaengine/(latest)@ultimaker/testing" - "cura_binary_data/(latest)@ultimaker/testing" - "fdm_materials/(latest)@ultimaker/testing" - - "curaengine_plugin_gradual_flow/0.1.0-beta.3" + - "curaengine_plugin_gradual_flow/0.1.1-beta.3" - "dulcificum/latest@ultimaker/testing" - "pysavitar/5.3.0" - "pynest2d/5.3.0" From f7a3b48bcdd22063c1612b9ca9044b159a72fb62 Mon Sep 17 00:00:00 2001 From: Erwan MATHIEU Date: Mon, 1 Jul 2024 15:40:24 +0200 Subject: [PATCH 22/24] Fix Creality profiles This should have been caught before the PR was merged... --- resources/definitions/creality_ender3v3ke.def.json | 2 +- resources/variants/creality/creality_ender3v3ke_0.2.inst.cfg | 2 +- resources/variants/creality/creality_ender3v3ke_0.3.inst.cfg | 2 +- resources/variants/creality/creality_ender3v3ke_0.4.inst.cfg | 2 +- resources/variants/creality/creality_ender3v3ke_0.5.inst.cfg | 2 +- resources/variants/creality/creality_ender3v3ke_0.6.inst.cfg | 2 +- resources/variants/creality/creality_ender3v3ke_0.8.inst.cfg | 2 +- resources/variants/creality/creality_ender3v3ke_1.0.inst.cfg | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/resources/definitions/creality_ender3v3ke.def.json b/resources/definitions/creality_ender3v3ke.def.json index c1016b515f..47227e187d 100644 --- a/resources/definitions/creality_ender3v3ke.def.json +++ b/resources/definitions/creality_ender3v3ke.def.json @@ -49,7 +49,7 @@ "material_print_temp_wait": { "default_value": false }, "retraction_amount": { "default_value": 0.8 }, "retraction_combing": { "value": "no_outer_surfaces" }, - "retraction_combing_max_distance": { "default_value": 5.0 }, + "retraction_combing_max_distance": { "value": 5.0 }, "retraction_extrusion_window": { "value": "retraction_amount" }, "retraction_min_travel": { "value": 2.0 }, "retraction_speed": { "default_value": 40 }, diff --git a/resources/variants/creality/creality_ender3v3ke_0.2.inst.cfg b/resources/variants/creality/creality_ender3v3ke_0.2.inst.cfg index 7ef855b97c..7d92d94a8c 100644 --- a/resources/variants/creality/creality_ender3v3ke_0.2.inst.cfg +++ b/resources/variants/creality/creality_ender3v3ke_0.2.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 22 +setting_version = 23 type = variant [values] diff --git a/resources/variants/creality/creality_ender3v3ke_0.3.inst.cfg b/resources/variants/creality/creality_ender3v3ke_0.3.inst.cfg index b4523fb2ec..dc779a977f 100644 --- a/resources/variants/creality/creality_ender3v3ke_0.3.inst.cfg +++ b/resources/variants/creality/creality_ender3v3ke_0.3.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 22 +setting_version = 23 type = variant [values] diff --git a/resources/variants/creality/creality_ender3v3ke_0.4.inst.cfg b/resources/variants/creality/creality_ender3v3ke_0.4.inst.cfg index 08617c2b6a..745880b4c5 100644 --- a/resources/variants/creality/creality_ender3v3ke_0.4.inst.cfg +++ b/resources/variants/creality/creality_ender3v3ke_0.4.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 22 +setting_version = 23 type = variant [values] diff --git a/resources/variants/creality/creality_ender3v3ke_0.5.inst.cfg b/resources/variants/creality/creality_ender3v3ke_0.5.inst.cfg index 337181748d..e58eaeef03 100644 --- a/resources/variants/creality/creality_ender3v3ke_0.5.inst.cfg +++ b/resources/variants/creality/creality_ender3v3ke_0.5.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 22 +setting_version = 23 type = variant [values] diff --git a/resources/variants/creality/creality_ender3v3ke_0.6.inst.cfg b/resources/variants/creality/creality_ender3v3ke_0.6.inst.cfg index 405d4e0c75..6b90f99126 100644 --- a/resources/variants/creality/creality_ender3v3ke_0.6.inst.cfg +++ b/resources/variants/creality/creality_ender3v3ke_0.6.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 22 +setting_version = 23 type = variant [values] diff --git a/resources/variants/creality/creality_ender3v3ke_0.8.inst.cfg b/resources/variants/creality/creality_ender3v3ke_0.8.inst.cfg index 645713d5ef..e4dfb23e5f 100644 --- a/resources/variants/creality/creality_ender3v3ke_0.8.inst.cfg +++ b/resources/variants/creality/creality_ender3v3ke_0.8.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 22 +setting_version = 23 type = variant [values] diff --git a/resources/variants/creality/creality_ender3v3ke_1.0.inst.cfg b/resources/variants/creality/creality_ender3v3ke_1.0.inst.cfg index bb26262203..30758942af 100644 --- a/resources/variants/creality/creality_ender3v3ke_1.0.inst.cfg +++ b/resources/variants/creality/creality_ender3v3ke_1.0.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 22 +setting_version = 23 type = variant [values] From 346ea887dc7498ad200e2d6a797363c7c3a80ec9 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 2 Jul 2024 07:10:52 +0000 Subject: [PATCH 23/24] Applied printer-linter format --- resources/definitions/voron2_stealthchanger_250.def.json | 2 +- resources/definitions/voron2_stealthchanger_300.def.json | 2 +- resources/definitions/voron2_stealthchanger_350.def.json | 2 +- resources/definitions/voron2_stealthchanger_base.def.json | 4 ++-- .../extruders/voron2_stealthchanger_extruder_0.def.json | 6 +++--- .../extruders/voron2_stealthchanger_extruder_1.def.json | 6 +++--- .../extruders/voron2_stealthchanger_extruder_2.def.json | 6 +++--- .../extruders/voron2_stealthchanger_extruder_3.def.json | 6 +++--- .../extruders/voron2_stealthchanger_extruder_4.def.json | 6 +++--- .../extruders/voron2_stealthchanger_extruder_5.def.json | 6 +++--- .../extruders/voron2_stealthchanger_extruder_6.def.json | 6 +++--- .../extruders/voron2_stealthchanger_extruder_7.def.json | 6 +++--- 12 files changed, 29 insertions(+), 29 deletions(-) diff --git a/resources/definitions/voron2_stealthchanger_250.def.json b/resources/definitions/voron2_stealthchanger_250.def.json index 123852a661..e75c3c8daf 100644 --- a/resources/definitions/voron2_stealthchanger_250.def.json +++ b/resources/definitions/voron2_stealthchanger_250.def.json @@ -15,4 +15,4 @@ "machine_name": { "default_value": "VORON2 StealthChanger 250" }, "machine_width": { "default_value": 250 } } -} +} \ No newline at end of file diff --git a/resources/definitions/voron2_stealthchanger_300.def.json b/resources/definitions/voron2_stealthchanger_300.def.json index bc079a1714..5672d72159 100644 --- a/resources/definitions/voron2_stealthchanger_300.def.json +++ b/resources/definitions/voron2_stealthchanger_300.def.json @@ -15,4 +15,4 @@ "machine_name": { "default_value": "VORON2 StealthChanger 300" }, "machine_width": { "default_value": 300 } } -} +} \ No newline at end of file diff --git a/resources/definitions/voron2_stealthchanger_350.def.json b/resources/definitions/voron2_stealthchanger_350.def.json index a73e274809..99ef8e46f9 100644 --- a/resources/definitions/voron2_stealthchanger_350.def.json +++ b/resources/definitions/voron2_stealthchanger_350.def.json @@ -15,4 +15,4 @@ "machine_name": { "default_value": "VORON2 StealthChanger 350" }, "machine_width": { "default_value": 350 } } -} +} \ No newline at end of file diff --git a/resources/definitions/voron2_stealthchanger_base.def.json b/resources/definitions/voron2_stealthchanger_base.def.json index 3eabc3e04e..e1db1d24c3 100644 --- a/resources/definitions/voron2_stealthchanger_base.def.json +++ b/resources/definitions/voron2_stealthchanger_base.def.json @@ -21,9 +21,9 @@ }, "overrides": { - "machine_name": { "default_value": "VORON2 StealthChanger" }, "machine_end_gcode": { "default_value": "PRINT_END" }, "machine_extruder_count": { "default_value": 1 }, + "machine_name": { "default_value": "VORON2 StealthChanger" }, "machine_start_gcode": { "default_value": "PRINT_START TOOL_TEMP={material_print_temperature_layer_0} T{initial_extruder_nr}_TEMP={material_print_temperature_layer_0} BED_TEMP={material_bed_temperature_layer_0} TOOL={initial_extruder_nr}" } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_0.def.json b/resources/extruders/voron2_stealthchanger_extruder_0.def.json index 887ab01349..55ddf8f90b 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_0.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_0.def.json @@ -14,12 +14,12 @@ "default_value": 0, "maximum_value": 7 }, - "material_diameter": { "default_value": 1.75 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_1.def.json b/resources/extruders/voron2_stealthchanger_extruder_1.def.json index 4342d4ba55..ad29966960 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_1.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_1.def.json @@ -14,12 +14,12 @@ "default_value": 1, "maximum_value": 7 }, - "material_diameter": { "default_value": 1.75 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_2.def.json b/resources/extruders/voron2_stealthchanger_extruder_2.def.json index 3dd2955b2a..ec3b6ff3a9 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_2.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_2.def.json @@ -14,12 +14,12 @@ "default_value": 2, "maximum_value": 7 }, - "material_diameter": { "default_value": 1.75 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_3.def.json b/resources/extruders/voron2_stealthchanger_extruder_3.def.json index 9eeb9702eb..dfaa249e5d 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_3.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_3.def.json @@ -14,12 +14,12 @@ "default_value": 3, "maximum_value": 7 }, - "material_diameter": { "default_value": 1.75 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_4.def.json b/resources/extruders/voron2_stealthchanger_extruder_4.def.json index 6641620313..eeb6fbbe60 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_4.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_4.def.json @@ -14,12 +14,12 @@ "default_value": 4, "maximum_value": 7 }, - "material_diameter": { "default_value": 1.75 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_5.def.json b/resources/extruders/voron2_stealthchanger_extruder_5.def.json index fe8c86cd6b..61e05b6945 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_5.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_5.def.json @@ -14,12 +14,12 @@ "default_value": 5, "maximum_value": 7 }, - "material_diameter": { "default_value": 1.75 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_6.def.json b/resources/extruders/voron2_stealthchanger_extruder_6.def.json index e8aac016c4..3b3f614ae7 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_6.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_6.def.json @@ -14,12 +14,12 @@ "default_value": 6, "maximum_value": 7 }, - "material_diameter": { "default_value": 1.75 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file diff --git a/resources/extruders/voron2_stealthchanger_extruder_7.def.json b/resources/extruders/voron2_stealthchanger_extruder_7.def.json index 9e98525f90..071cd5d064 100644 --- a/resources/extruders/voron2_stealthchanger_extruder_7.def.json +++ b/resources/extruders/voron2_stealthchanger_extruder_7.def.json @@ -14,12 +14,12 @@ "default_value": 7, "maximum_value": 7 }, - "material_diameter": { "default_value": 1.75 }, "machine_extruder_end_pos_abs": { "default_value": true }, "machine_extruder_end_pos_x": { "value": "prime_tower_position_x" }, "machine_extruder_end_pos_y": { "value": "prime_tower_position_y" }, "machine_extruder_start_pos_abs": { "default_value": true }, "machine_extruder_start_pos_x": { "value": "prime_tower_position_x" }, - "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" } + "machine_extruder_start_pos_y": { "value": "prime_tower_position_y" }, + "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file From abf9fef334387b01c7d054bff5ea3f2247ff6926 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 2 Jul 2024 07:31:04 +0000 Subject: [PATCH 24/24] 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