3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-09 06:45:09 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge branch 'main' into CURA-10415_main_based_update_tree

Browse source
This commit is contained in:
c.lamboo 2023-04-24 11:01:04 +02:00
commit b033ada606
57 changed files with 579 additions and 257 deletions
Download patch file Download diff file Expand all files Collapse all files

6
resources/definitions/elegoo_base.def.json
View file

@ -114,11 +114,7 @@
"support_angle": { "value": "45 if speed_print > 99.9 else 50" },
"support_bottom_offset": { "value": "-0.4" },
"support_brim_enable": { "value": "support_structure == 'normal' or support_structure == 'tree'" },
"support_brim_width":
{
"default_value": 3,
"value": "6 if support_structure == 'tree' else line_width * initial_layer_line_width_factor * 0.02 "
},
"support_brim_width": { "value": "6 if support_structure == 'tree' else line_width * initial_layer_line_width_factor * 0.02 " },
"support_infill_angles": { "default_value": "[65]" },
"support_interface_density": { "default_value": 33.333 },
"support_interface_pattern": { "default_value": "lines" },

12
resources/definitions/fdmprinter.def.json
View file

@ -4340,7 +4340,7 @@
"description": "The speed at which the fans spin on the minimum layer time. The fan speed gradually increases between the regular fan speed and maximum fan speed when the threshold is hit.",
"unit": "%",
"type": "float",
"minimum_value": "max(0, cool_fan_speed_min)",
"minimum_value": "0",
"maximum_value": "100",
"default_value": 100,
"enabled": "cool_fan_enabled",
@ -4953,8 +4953,7 @@
"label": "Enable Support Brim",
"description": "Generate a brim within the support infill regions of the first layer. This brim is printed underneath the support, not around it. Enabling this setting increases the adhesion of support to the build plate.",
"type": "bool",
"default_value": false,
"value": "support_structure == 'tree'",
"default_value": true,
"enabled": "support_enable or support_meshes_present",
"limit_to_extruder": "support_infill_extruder_nr",
"settable_per_mesh": false,
@ -4966,9 +4965,10 @@
"description": "The width of the brim to print underneath the support. A larger brim enhances adhesion to the build plate, at the cost of some extra material.",
"type": "float",
"unit": "mm",
"default_value": 8.0,
"default_value": 1.2,
"minimum_value": "0.0",
"maximum_value_warning": "50.0",
"value": "(skirt_brim_line_width * initial_layer_line_width_factor / 100.0) * 3",
"enabled": "(support_enable or support_meshes_present) and support_brim_enable",
"settable_per_mesh": false,
"settable_per_extruder": true,
@ -4980,10 +4980,10 @@
"label": "Support Brim Line Count",
"description": "The number of lines used for the support brim. More brim lines enhance adhesion to the build plate, at the cost of some extra material.",
"type": "int",
"default_value": 20,
"default_value": 3,
"minimum_value": "0",
"maximum_value_warning": "50 / skirt_brim_line_width",
"value": "math.ceil(support_brim_width / (skirt_brim_line_width * initial_layer_line_width_factor / 100.0))",
"value": "round(support_brim_width / (skirt_brim_line_width * initial_layer_line_width_factor / 100.0))",
"enabled": "(support_enable or support_meshes_present) and support_brim_enable",
"settable_per_mesh": false,
"settable_per_extruder": true,

2
resources/definitions/mixware_hyper_s.def.json
View file

@ -118,7 +118,7 @@
"speed_z_hop": { "default_value": 5 },
"support_angle": { "default_value": 60 },
"support_bottom_stair_step_height": { "value": 0.2 },
"support_brim_width": { "default_value": 4 },
"support_brim_enable": { "value": false },
"support_enable": { "default_value": true },
"support_interface_density": { "default_value": 80 },
"support_interface_enable": { "default_value": true },

10
resources/definitions/ultimaker.def.json
View file

@ -69,10 +69,16 @@
"machine_max_feedrate_e": { "default_value": 45 },
"material_bed_temperature":
{
"maximum_value_warning": "125",
"maximum_value": "140",
"maximum_value_warning": "120",
"minimum_value": "0"
},
"material_bed_temperature_layer_0":
{
"maximum_value": "140",
"maximum_value_warning": "120",
"minimum_value": "0"
},
"material_bed_temperature_layer_0": { "maximum_value_warning": "125" },
"material_print_temperature": { "minimum_value": "0" },
"material_standby_temperature":
{

2
resources/definitions/ultimaker2.def.json
View file

@ -100,6 +100,8 @@
"machine_start_gcode": { "value": "\"G0 F3000 Y50 ;avoid prime blob\" if machine_gcode_flavor == \"UltiGCode\" else \"G21 ;metric values\\nG90 ;absolute positioning\\nM82 ;set extruder to absolute mode\\nM107 ;start with the fan off\\nG28 Z0 ;move Z to bottom endstops\\nG28 X0 Y0 ;move X/Y to endstops\\nG1 X15 Y0 F4000 ;move X/Y to front of printer\\nG1 Z15.0 F9000 ;move the platform to 15mm\\nG92 E0 ;zero the extruded length\\nG1 F200 E10 ;extrude 10 mm of feed stock\\nG92 E0 ;zero the extruded length again\\nG1 Y50 F9000\\n;Put printing message on LCD screen\\nM117 Printing...\"" },
"machine_use_extruder_offset_to_offset_coords": { "default_value": true },
"machine_width": { "default_value": 223 },
"material_bed_temperature": { "maximum_value": "110" },
"material_bed_temperature_layer_0": { "maximum_value": "110" },
"speed_slowdown_layers": { "value": 2 },
"support_z_distance": { "value": "0.1" }
}

7
resources/definitions/ultimaker2_plus_connect.def.json
View file

@ -99,8 +99,11 @@
"machine_show_variants": { "default_value": true },
"machine_start_gcode": { "value": "''" },
"machine_width": { "default_value": 223 },
"material_bed_temperature": { "maximum_value": 110 },
"material_bed_temperature_layer_0": { "maximum_value": 110 },
"material_initial_print_temperature":
{
"maximum_value": 260,
"value": "material_print_temperature"
},
"material_print_temperature": { "maximum_value": 260 },
"material_print_temperature_layer_0": { "maximum_value": 260 },
"meshfix_maximum_deviation": { "value": "(layer_height / 3) if magic_spiralize else (layer_height / 4)" },

230
resources/definitions/weedo_base.def.json Normal file
View file

@ -0,0 +1,230 @@
{
"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" },
"default_material_bed_temperature": { "default_value": 35 },
"extruder_prime_pos_x":
{
"maximum_value": "machine_width",
"minimum_value": "0"
},
"extruder_prime_pos_y":
{
"maximum_value": "machine_depth",
"minimum_value": "0"
},
"infill_sparse_density": { "default_value": 10 },
"machine_endstop_positive_direction_x": { "default_value": true },
"machine_endstop_positive_direction_y": { "default_value": true },
"machine_endstop_positive_direction_z": { "default_value": false },
"machine_feeder_wheel_diameter": { "default_value": 10.61 },
"machine_max_feedrate_e": { "default_value": 45 },
"machine_max_feedrate_x": { "default_value": 250 },
"machine_max_feedrate_y": { "default_value": 250 },
"machine_max_feedrate_z": { "default_value": 10 },
"machine_nozzle_size": { "default_value": 0.4 },
"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_diameter": { "default_value": 1.75 },
"material_flow": { "default_value": 95 },
"material_print_temp_prepend": { "default_value": false },
"material_print_temp_wait": { "default_value": false },
"material_standby_temperature": { "minimum_value": "0" },
"prime_tower_min_volume": { "default_value": 10 },
"prime_tower_size": { "default_value": 15 },
"raft_airgap": { "default_value": 0.22 },
"raft_base_speed": { "value": 20 },
"raft_interface_speed": { "value": 33 },
"raft_margin": { "default_value": 8 },
"raft_surface_fan_speed": { "value": 100 },
"raft_surface_speed": { "value": 40 },
"retraction_amount": { "default_value": 1.5 },
"retraction_combing": { "value": "off" },
"retraction_speed": { "default_value": 28 },
"skirt_brim_speed": { "value": 26.0 },
"speed_layer_0": { "value": 26.0 },
"speed_prime_tower": { "value": "speed_support" },
"speed_print_layer_0": { "value": 26.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,1))" },
"speed_wall_0": { "value": "max(5,speed_wall-5)" },
"speed_wall_x": { "value": "speed_wall" },
"support_angle": { "default_value": 60 },
"support_interface_pattern": { "default_value": "lines" },
"switch_extruder_retraction_amount": { "value": 16.5 },
"switch_extruder_retraction_speeds": { "default_value": 28 }
}
}

43
resources/definitions/weefun_tina2.def.json Normal file
View file

@ -0,0 +1,43 @@
{
"version": 2,
"name": "WEEFUN TINA2",
"inherits": "weedo_base",
"metadata":
{
"visible": true,
"author": "WEEFUN",
"manufacturer": "WEEFUN",
"file_formats": "text/x-gcode",
"platform_offset": [
0,
0,
0
]
},
"overrides":
{
"machine_center_is_zero": { "default_value": false },
"machine_depth": { "default_value": 120 },
"machine_end_gcode": { "default_value": ";(**** end.gcode for TINA2****)\nM104 S0\nM107\nG92 E0 (Reset after prime)\nG0 E-1 F300\nG1 Z105 F300\nG28 X0 Y0\nG1 Y90 F1000\nM203 Z30" },
"machine_extruder_count": { "default_value": 1 },
"machine_heated_bed": { "default_value": false },
"machine_height": { "default_value": 100 },
"machine_name": { "default_value": "WEEFUN TINA2" },
"machine_start_gcode": { "default_value": ";(**** start.gcode for TINA2****)\nM104 S150\nG28 Z\nG28 X Y; Home extruder\nG1 X55 Y55 F1000\nG1 Z10 F200\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 X90 Y6 Z0.27 F2000\nG1 X20 Y6 Z0.27 E15 F1000 \nG92 E0 ; Reset extruder position\n\nM203 Z5" },
"machine_width": { "default_value": 100 },
"retraction_amount": { "default_value": 3 },
"retraction_count_max": { "default_value": 10 },
"retraction_speed": { "default_value": 35 },
"speed_infill": { "value": 40.0 },
"speed_print_layer_0": { "value": 22.0 },
"speed_roofing": { "value": 25.0 },
"speed_support_bottom": { "dvalue": 30.0 },
"speed_support_infill": { "value": 45.0 },
"speed_support_roof": { "value": 30.0 },
"speed_topbottom": { "value": 30.0 },
"speed_travel_layer_0": { "value": 60 },
"speed_wall_0": { "value": 20.0 },
"speed_wall_x": { "value": 25.0 },
"support_xy_distance": { "default_value": 1.0 }
}
}

41
resources/definitions/weefun_tina2s.def.json Normal file
View file

@ -0,0 +1,41 @@
{
"version": 2,
"name": "WEEFUN TINA2S",
"inherits": "weedo_base",
"metadata":
{
"visible": true,
"author": "WEEFUN",
"manufacturer": "WEEFUN",
"file_formats": "text/x-gcode",
"platform_offset": [
0,
0,
0
]
},
"overrides":
{
"gantry_height": { "value": 20 },
"machine_center_is_zero": { "default_value": false },
"machine_depth": { "default_value": 120 },
"machine_end_gcode": { "default_value": ";(**** end.gcode for tina2s****)\nM203 Z15 ;Move Z axis up 5mm\nM104 S0 ;Turn off extruder heating\nM140 S0 ;Turn off bed heating\nM107 ;Turn Fans off\nG92 E0 ;(Reset after prime)\nG0 E-1 F300 ;Retract Fillament 1mm\nG28 Z F300 ;Park Hotend up\nG28 X0 Y0 ;Park Hotend\nG1 Y90 F1000 ;Present finished model\nG0 E-2 F300 ;Retract Fillament 2mm\nM82 ;absolute extrusion mode\nM104 S0 ;Ensure hotend is off\nM117 Print Complete" },
"machine_extruder_count": { "default_value": 1 },
"machine_heated_bed": { "default_value": true },
"machine_height": { "default_value": 100 },
"machine_name": { "default_value": "WEEFUN TINA2S" },
"machine_start_gcode": { "default_value": ";MachineType:TINA2S\n;FilamentType:{material_type}\n;Layer height:{layer_height}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n;InfillDensity:{infill_sparse_density}\n;(**** start.gcode for tina2s****)\nM203 Z5 ;Move Z axis up 5mm\nM117 Homing axes\nG28 Z; Home extruder axis Z\nG28 X Y; Home extruder axis X Y\nM117 Start Warm Up\nM140 S{material_bed_temperature} ;start heating the bed to what is set in Cura\nM104 S130 ;start heating E to 130 for preheat\nM190 S{material_bed_temperature} ;Wait for Bed Temperature\nM117 Levling the build plate\nG29\nG1 Z1.0 F3000 ;Move Z Axis up to 1mm\nG1 X0.5 Y1 ;Move hotend to starting position\nM117 Heating Hotend\nM104 S{material_initial_print_temperature} T0 ;start heating T0 to what is set in Cura\nM109 S{material_initial_print_temperature} T0 ;Wait for Hotend Temperature\nG92 E0 ;Reset Extruder\nM117 Purging and cleaning nozzle\nG1 X1.1 Y10 Z0.28 F1000.0 ;Move to start position\nG1 X1.1 Y90.0 Z0.28 F2000.0 E15 ;Draw the first line\nG1 X1.4 Y90.0 Z0.23 F5000.0 ;Move to side a little\nG1 X1.4 Y10 Z0.20 F2000.0 E15 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X1 Y5 Z0.2 F5000.0 ;Move over to prevent blob squish\nM117 Printing..." },
"machine_width": { "default_value": 100 },
"retraction_amount": { "default_value": 3 },
"speed_infill": { "value": 40.0 },
"speed_print_layer_0": { "value": 22.0 },
"speed_roofing": { "value": 25.0 },
"speed_support_bottom": { "dvalue": 30.0 },
"speed_support_infill": { "value": 45.0 },
"speed_support_roof": { "value": 30.0 },
"speed_topbottom": { "value": 30.0 },
"speed_travel_layer_0": { "value": 60 },
"speed_wall_0": { "value": 20.0 },
"speed_wall_x": { "value": 25.0 }
}
}