3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-08-07 05:53:59 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

Merge branch 'master' into PP-1-Improved_print_profiles

Browse source 
# Conflicts:
#	resources/definitions/ultimaker_s3.def.json
#	resources/definitions/ultimaker_s5.def.json
This commit is contained in:
p.kuiper 2021-09-29 17:33:02 +02:00
commit f9f59d0da1
4026 changed files with 4374 additions and 4056 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -92,7 +92,7 @@
"retraction_hop_enabled": { "value": "True" },
"retraction_hop": { "value": 0.2 },
"retraction_combing": { "default_value": "noskin" },
"retraction_combing": { "value": "'noskin'" },
"retraction_combing_max_distance": { "value": 30 },
"travel_avoid_other_parts": { "value": true },

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

@ -225,7 +225,7 @@
"retraction_prime_speed": { "value": "math.ceil(retraction_speed * 0.4)", "maximum_value_warning": "130" },
"retraction_hop_enabled": { "value": "True" },
"retraction_hop": { "value": "0.5" },
"retraction_combing": { "default_value": "noskin" },
"retraction_combing": { "value": "'noskin'" },
"retraction_combing_max_distance": { "value": "10" },
"travel_avoid_other_parts": { "value": "True" },
"travel_avoid_supports": { "value": "True" },

1
resources/definitions/blv_mgn_cube_300.def.json
View file

@ -4,7 +4,6 @@
"inherits": "blv_mgn_cube_base",
"metadata": {
"visible": true,
"setting_version": 17,
"author": "wolfgangmauer",
"manufacturer": "BLV",
"file_formats": "text/x-gcode",

1
resources/definitions/blv_mgn_cube_350.def.json
View file

@ -4,7 +4,6 @@
"inherits": "blv_mgn_cube_base",
"metadata": {
"visible": true,
"setting_version": 17,
"author": "wolfgangmauer",
"manufacturer": "BLV",
"file_formats": "text/x-gcode",

1
resources/definitions/creality_ender5plus.def.json
View file

@ -5,6 +5,7 @@
"overrides": {
"machine_name": { "default_value": "Creality Ender-5 Plus" },
"machine_start_gcode": { "default_value": "M201 X500.00 Y500.00 Z100.00 E5000.00 ;Setup machine max acceleration\nM203 X500.00 Y500.00 Z10.00 E50.00 ;Setup machine max feedrate\nM204 P500.00 R1000.00 T500.00 ;Setup Print/Retract/Travel acceleration\nM205 X8.00 Y8.00 Z0.40 E5.00 ;Setup Jerk\nM220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\nM420 S1 Z2 ;Enable ABL using saved Mesh and Fade Height\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X10.1 Y20 Z0.28 F5000.0 ;Move to start position\nG1 X10.1 Y200.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X10.4 Y200.0 Z0.28 F5000.0 ;Move to side a little\nG1 X10.4 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\n"},
"machine_end_gcode": { "default_value": "G91 ;Relative positioning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z10 ;Raise Z more\nG90 ;Absolute positioning\n\nG1 X{machine_width} Y{machine_depth} ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z\n" },
"machine_width": { "default_value": 350 },
"machine_depth": { "default_value": 350 },
"machine_height": { "default_value": 400 },

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

@ -27,7 +27,7 @@
"gantry_height": {"value": "43"},
"layer_height": { "default_value": 0.1 },
"relative_extrusion": { "value": "False" },
"retraction_combing": { "default_value": "off" },
"retraction_combing": { "value": "'off'" },
"retraction_hop_enabled": { "default_value": true },
"retraction_hop_only_when_collides": { "default_value": false },
"retraction_speed": { "default_value": 100 },

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

@ -64,7 +64,7 @@
"retraction_hop": { "default_value": 1.0 },
"retraction_amount" : { "default_value": 3.5 },
"retraction_speed" : { "default_value": 40 },
"retraction_combing" : { "default_value": "noskin" },
"retraction_combing" : { "value": "'noskin'" },
"travel_avoid_distance": { "value": "1" },
"travel_avoid_supports": { "value": "True" },
"retraction_hop_only_when_collides": { "value": "1" },

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

@ -12,7 +12,7 @@
"platform_texture": "eryone_thinker_plate.png",
"platform_offset": [0, -120, 0],
"has_materials": true,
"preferred_material": "generic_pla",
"preferred_material": "eryone_pla",
"has_machine_quality": true,
"preferred_quality_type": "normal",
"machine_extruder_trains":
@ -57,10 +57,10 @@
"default_value": "Marlin"
},
"machine_start_gcode": {
"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z10.0 F600 ;move the platform down 10mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Y-3 F1200 ;move to prime\nG1 X10 F1200 ;\nG1 Z0.1 F600 ;get ready to prime\nG1 X120 E15 F1200 ;prime nozzle \nG1 X120 F3600 ;quick wipe\nG92 E0 ;zero the extruded length\nG5 ;enable resume from power failure\nM117 Printing..."
"default_value": "G21 ;metric values\nG90 ;absolute positioning\nM82 ;set extruder to absolute mode\nM107 ;start with the fan off\nG28 X0 Y0 ;move X/Y to min endstops\nG28 Z0 ;move Z to min endstops\nG1 Z10.0 F600 ;move the platform down 10mm\nG92 E0 ;zero the extruded length\nG1 F200 E3 ;extrude 3mm of feed stock\nG92 E0 ;zero the extruded length again\nG1 Y-3 F1200 ;move to prime\nG1 X10 F1200 ;\nG1 Z0.1 F600 ;get ready to prime\nG1 X120 E15 F1200 ;prime nozzle \nG1 X120 F3600 ;quick wipe\nG92 E0 ;zero the extruded length\nM413 S1 ;enable resume from power failure\nM117 Printing..."
},
"machine_end_gcode": {
"default_value": "M104 S0 ;turn off extruder\nM140 S0 ;turn off bed\nM107 ;turn off all fans\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 E-5 F300\nG1 Z+0.5 E-5 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nG1 X0 Y250 F4800 ; position for easy part removal\nM84 ;steppers off"
"default_value": "M104 S0 ;turn off extruder\nM140 S0 ;turn off bed\nM107 ;turn off all fans\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 Z+0.5 E-5 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nG1 X0 Y250 F4800 ; position for easy part removal\nM84 ;steppers off"
},
"acceleration_enabled": {
"value": true
@ -160,7 +160,7 @@
"value": 10
},
"skirt_brim_speed": {
"value": 40
"value": "math.ceil(speed_print * 40 / 60)"
},
"skirt_gap": {
"value": 5
@ -229,7 +229,7 @@
"value": 3
},
"wall_thickness": {
"value": "1.2"
"value": "line_width * wall_line_count"
},
"bottom_layers": {
"value": "4"
@ -250,4 +250,4 @@
"value": "'z_seam_corner_inner'"
}
}
}
}

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

@ -6,7 +6,7 @@
"type": "extruder",
"author": "Ultimaker",
"manufacturer": "Unknown",
"setting_version": 17,
"setting_version": 19,
"visible": false,
"position": "0"
},

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

@ -6,7 +6,7 @@
"type": "machine",
"author": "Ultimaker",
"manufacturer": "Unknown",
"setting_version": 17,
"setting_version": 19,
"file_formats": "text/x-gcode;model/stl;application/x-wavefront-obj;application/x3g",
"visible": false,
"has_materials": true,
@ -3850,11 +3850,13 @@
{
"off": "Off",
"all": "All",
"no_outer_surfaces": "Not on Outer Surface",
"noskin": "Not in Skin",
"infill": "Within Infill"
},
"default_value": "all",
"resolve": "'noskin' if 'noskin' in extruderValues('retraction_combing') else ('infill' if 'infill' in extruderValues('retraction_combing') else ('all' if 'all' in extruderValues('retraction_combing') else 'off'))",
"value": "'no_outer_surfaces' if (any(extruderValues('skin_monotonic')) or any(extruderValues('ironing_enabled')) or (any(extruderValues('roofing_monotonic')) and any(extruderValues('roofing_layer_count')))) else 'all'",
"resolve": "'noskin' if 'noskin' in extruderValues('retraction_combing') else ('infill' if 'infill' in extruderValues('retraction_combing') else ('all' if 'all' in extruderValues('retraction_combing') else ('no_outer_surfaces' if 'no_outer_surfaces' in extruderValues('retraction_combing') else 'off')))",
"settable_per_mesh": false,
"settable_per_extruder": false
},

5
resources/definitions/hellbot_magna_2_230_dual.def.json
View file

@ -39,11 +39,10 @@
"default_value": 2
},
"machine_start_gcode": {
"default_value": "G21\nG90\nM107\nG28 X0 Y0\nG28 Z0\nG1 Z15.0 F300\nT0\nG92 E0\nG1 F700 E-80\nT1\nG92 E0\nG1 F1000 X1 Y1 Z0.3\nG1 F600 X200 E60\nG1 F1000 Y3\nG1 F600 X1 E120\nT1\nG92 E0\nG28 X0 Y0\nG1 F700 E-80\nT0\nG92 E0"
},
"default_value": "M104 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nM109 T0 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nG21\nG90 \nG28 X0 Y0 \nG28 Z0 \nG1 Z15.0 F300 \nT0 \nG92 E0 \nG1 F700 E-80 \nT1 \nG92 E0 \nG1 F1000 X1 Y1 Z0.3 \nG1 F600 X200 E60 \nG1 F1000 Y3 \nG1 F600 X1 E120 \nT1 \nG92 E0 \nG28 X0 Y0 \nG1 F700 E-80 \nT0 \nG92 E0"
},
"machine_end_gcode": {
"default_value": "M104 T0 S0\nM104 T1 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84"
}
}
}

5
resources/definitions/hellbot_magna_2_300_dual.def.json
View file

@ -39,11 +39,10 @@
"default_value": 2
},
"machine_start_gcode": {
"default_value": "G21\nG90\nM107\nG28 X0 Y0\nG28 Z0\nG1 Z15.0 F300\nT0\nG92 E0\nG1 F700 E-80\nT1\nG92 E0\nG1 F1000 X1 Y1 Z0.3\nG1 F600 X200 E60\nG1 F1000 Y3\nG1 F600 X1 E120\nT1\nG92 E0\nG28 X0 Y0\nG1 F700 E-80\nT0\nG92 E0"
},
"default_value": "M104 T0 S{material_print_temperature}\nM104 T1 S{material_print_temperature}\nM109 T0 S{material_print_temperature}\nM109 T1 S{material_print_temperature}\nG21\nG90 \nG28 X0 Y0 \nG28 Z0 \nG1 Z15.0 F300 \nT0 \nG92 E0 \nG1 F700 E-80 \nT1 \nG92 E0 \nG1 F1000 X1 Y1 Z0.3 \nG1 F600 X200 E60 \nG1 F1000 Y3 \nG1 F600 X1 E120 \nT1 \nG92 E0 \nG28 X0 Y0 \nG1 F700 E-80 \nT0 \nG92 E0"
},
"machine_end_gcode": {
"default_value": "M104 T0 S0\nM104 T1 S0\nM140 S0\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84"
}
}
}

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

@ -369,7 +369,7 @@
"value": 45
},
"retraction_combing": {
"value": "infill"
"value": "'infill'"
},
"retraction_hop_enabled": {
"value": true

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

@ -30,7 +30,7 @@
"support_pattern": { "default_value": "grid" },
"infill_sparse_density": { "default_value": 10 },
"machine_extruder_count": { "default_value": 1 },
"retraction_combing": { "default_value": "off" },
"retraction_combing": { "value": "'off'" },
"machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": false },
"machine_height": { "default_value": 260 },

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

@ -97,7 +97,7 @@
"material_final_print_temperature": {"value": "default_material_print_temperature" },
"material_initial_print_temperature": {"value": "default_material_print_temperature" },
"gantry_height": {"value": "20"},
"retraction_combing": { "default_value": "all" },
"retraction_combing": { "value": "'all'" },
"retraction_amount": {"default_value": 2},
"adhesion_type": {"default_value": "skirt"},
"skirt_line_count": {"default_value": 3},

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

@ -172,7 +172,7 @@
"meshfix_maximum_resolution": { "value": "(speed_wall_0 + speed_wall_x) / 100" },
"meshfix_maximum_deviation": { "value": "layer_height / 4" },
"optimize_wall_printing_order": { "value": "True" },
"retraction_combing": { "default_value": "all" },
"retraction_combing": { "value": "'all'" },
"initial_layer_line_width_factor": { "value": "120" },
"zig_zaggify_infill": { "value": "gradual_infill_steps == 0" }
}

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

@ -101,7 +101,7 @@
"acceleration_enabled": {"value": false },
"acceleration_roofing": {"value": 3000 },
"jerk_enabled": {"value": false },
"retraction_combing": {"value": "'within infill'" },
"retraction_combing": {"value": "'infill'" },
"travel_retract_before_outer_wall": {"value": false },
"travel_avoid_other_parts": {"value": true },
"retraction_hop_enabled": {"value": false },

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

@ -76,7 +76,7 @@
"raft_surface_layers": { "default_value": 1 },
"skirt_line_count": { "default_value": 2},
"brim_width" : { "default_value": 5},
"retraction_combing": { "default_value": "noskin" },
"retraction_combing": { "value": "'noskin'" },
"retraction_amount" : { "default_value": 4.5},
"retraction_speed" : { "default_value": 40},
"coasting_enable": { "default_value": true },

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

@ -23,7 +23,7 @@
"default_value": "G0 X0 Y120;(Stick out the part)\nM190 S0;(Turn off heat bed, don't wait.)\nG92 E10;(Set extruder to 10)\nG1 E7 F200;(retract 3mm)\nM104 S0;(Turn off nozzle, don't wait)\nG4 S300;(Delay 5 minutes)\nM107;(Turn off part fan)\nM84;(Turn off stepper motors.)"
},
"adhesion_type": { "default_value": "brim" },
"retraction_combing": { "default_value": "noskin" },
"retraction_combing": { "value": "'noskin'" },
"retraction_amount" : { "default_value": 2.5},
"retraction_speed" : { "default_value": 40},
"material_print_temperature_layer_0": { "value": "material_print_temperature + 5" }

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

@ -153,7 +153,7 @@
"value": "5.0"
},
"retraction_combing": {
"default_value": "all"
"value": "'all'"
},
"retraction_enable": {
"value": "True"

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

@ -153,7 +153,7 @@
"value": "5.0"
},
"retraction_combing": {
"default_value": "all"
"value": "'all'"
},
"retraction_enable": {
"value": "True"

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

@ -141,7 +141,7 @@
"value": "5.0"
},
"retraction_combing": {
"default_value": "all"
"value": "'all'"
},
"retraction_enable": {
"value": "True"

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

@ -36,7 +36,7 @@
"layer_height": { "default_value": 0.2 },
"speed_print": { "default_value": 40 },
"machine_extruder_count": { "default_value": 1 },
"retraction_combing": { "default_value": "off" },
"retraction_combing": { "value": "'off'" },
"machine_heated_bed": { "default_value": true },
"machine_center_is_zero": { "default_value": false },
"machine_height": { "default_value": 210 },

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

@ -29,7 +29,7 @@
"machine_width": { "default_value": 290 },
"relative_extrusion": { "value": "False" },
"retraction_amount": { "default_value": 3.2 },
"retraction_combing": { "default_value": "off" },
"retraction_combing": { "value": "'off'" },
"retraction_hop_enabled": { "default_value": true },
"retraction_hop_only_when_collides": { "default_value": false },
"retraction_speed": { "default_value": 45 },

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

@ -29,7 +29,7 @@
"machine_width": { "default_value": 265 },
"relative_extrusion": { "value": "False" },
"retraction_amount": { "default_value": 3.2 },
"retraction_combing": { "default_value": "off" },
"retraction_combing": { "value": "'off'" },
"retraction_hop_enabled": { "default_value": true },
"retraction_hop_only_when_collides": { "default_value": false },
"retraction_speed": { "default_value": 45 },

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

@ -417,7 +417,7 @@
"value": "1"
},
"retraction_combing": {
"default_value": "infill"
"value": "'infill'"
},
"acceleration_prime_tower": {
"value": "250"

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

@ -116,7 +116,7 @@
"prime_tower_position_x": { "value": "machine_width/2 + prime_tower_size/2" },
"prime_tower_position_y": { "value": "machine_depth - prime_tower_size - max(extruderValue(adhesion_extruder_nr, 'brim_width') * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 if adhesion_type == 'brim' else (extruderValue(adhesion_extruder_nr, 'raft_margin') if adhesion_type == 'raft' else (extruderValue(adhesion_extruder_nr, 'skirt_gap') if adhesion_type == 'skirt' else 0)), max(extruderValues('travel_avoid_distance'))) - max(extruderValues('support_offset')) - sum(extruderValues('skirt_brim_line_width')) * extruderValue(adhesion_extruder_nr, 'initial_layer_line_width_factor') / 100 - (resolveOrValue('draft_shield_dist') if resolveOrValue('draft_shield_enabled') else 0) - 1" },
"retraction_amount": { "default_value": 1.5 },
"retraction_combing": { "default_value": "all" },
"retraction_combing": { "value": "'all'" },
"retraction_combing_max_distance": { "default_value": 5 },
"retraction_count_max": { "default_value": 15 },
"retraction_hop": { "value": "2" },

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

@ -70,6 +70,6 @@
"z_seam_type": {"default_value": "back"},
"z_seam_x": {"value": "127.5"},
"z_seam_y": {"value": "250"},
"retraction_combing": {"default_value": "off"}
"retraction_combing": {"value": "'off'"}
}
}

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

@ -58,6 +58,6 @@
"z_seam_type": {"default_value": "back"},
"z_seam_x": {"value": "127.5"},
"z_seam_y": {"value": "250"},
"retraction_combing": {"default_value": "off"}
"retraction_combing": {"value": "'off'"}
}
}

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

@ -55,6 +55,6 @@
"z_seam_type": {"default_value": "back"},
"z_seam_x": {"value": "127.5"},
"z_seam_y": {"value": "250"},
"retraction_combing": {"default_value": "off"}
"retraction_combing": {"value": "'off'"}
}
}

3
resources/definitions/ultimaker_s3.def.json
View file

@ -93,8 +93,7 @@
"infill_overlap": { "value": "0" },
"infill_pattern": { "value": "'lines'" },
"infill_wipe_dist": { "value": "0" },
"infill_before_walls": { "value": false },
"jerk_enabled": { "value": "True" },
"jerk_enabled": { "value": "False" },
"jerk_layer_0": { "value": "jerk_topbottom" },
"jerk_prime_tower": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" },
"jerk_print": { "value": "25" },

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

@ -95,7 +95,7 @@
"infill_overlap": { "value": "0" },
"infill_pattern": { "value": "'lines'" },
"infill_wipe_dist": { "value": "0" },
"infill_before_walls": { "value": false },
"infill_before_walls": { "value": "False" },
"jerk_enabled": { "value": "True" },
"jerk_layer_0": { "value": "jerk_topbottom" },
"jerk_prime_tower": { "value": "max(math.ceil(jerk_print * 15 / 25), 20)" },

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

@ -104,7 +104,7 @@
"retraction_prime_speed": { "value": "math.ceil(retraction_speed * 0.4)", "maximum_value_warning": 130 },
"retraction_hop_enabled": { "default_value": true },
"retraction_hop": { "default_value": 0.2 },
"retraction_combing": { "default_value": "noskin" },
"retraction_combing": { "value": "'noskin'" },
"retraction_combing_max_distance": { "default_value": 10 },
"travel_avoid_other_parts": { "default_value": false },
"speed_travel": { "maximum_value": 300, "value": 300, "maximum_value_warning": 501 },