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

Merge branch 'master' of ssh://github.com/Ultimaker/Cura

Browse source
This commit is contained in:
Ghostkeeper 2019-12-10 16:03:02 +01:00
commit 7f969528f3
No known key found for this signature in database
GPG key ID: 59A4C0959592C05C
1225 changed files with 1441 additions and 1373 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -88,7 +88,7 @@
"adhesion_type": { "default_value": "skirt" },
"machine_nozzle_heat_up_speed": { "default_value": 2 },
"machine_nozzle_cool_down_speed": { "default_value": 2 },
"machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
"machine_head_with_fans_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
"gantry_height": { "value": "55" },
"machine_max_feedrate_x": { "default_value": 300 },
"machine_max_feedrate_y": { "default_value": 300 },

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

@ -88,7 +88,7 @@
"adhesion_type": { "default_value": "skirt" },
"machine_nozzle_heat_up_speed": { "default_value": 2 },
"machine_nozzle_cool_down_speed": { "default_value": 2 },
"machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
"machine_head_with_fans_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
"gantry_height": { "value": "55" },
"machine_max_feedrate_x": { "default_value": 300 },
"machine_max_feedrate_y": { "default_value": 300 },

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

@ -87,7 +87,7 @@
"adhesion_type": { "default_value": "skirt" },
"machine_nozzle_heat_up_speed": { "default_value": 2 },
"machine_nozzle_cool_down_speed": { "default_value": 2 },
"machine_head_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
"machine_head_with_fans_polygon": { "default_value": [[-75, -18],[-75, 35],[18, 35],[18, -18]] },
"gantry_height": { "value": "55" },
"machine_max_feedrate_x": { "default_value": 300 },
"machine_max_feedrate_y": { "default_value": 300 },

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

@ -7,13 +7,6 @@
"machine_width": { "default_value": 300 },
"machine_depth": { "default_value": 300 },
"machine_height": { "default_value": 400 },
"machine_head_polygon": { "default_value": [
[-26, 34],
[-26, -32],
[22, -32],
[22, 34]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-26, 34],
[-26, -32],

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

@ -8,13 +8,6 @@
"machine_width": { "default_value": 450 },
"machine_depth": { "default_value": 450 },
"machine_height": { "default_value": 470 },
"machine_head_polygon": { "default_value": [
[-44, 34],
[-44, -34],
[18, -34],
[18, 34]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-44, 34],
[-44, -34],

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

@ -7,13 +7,6 @@
"machine_width": { "default_value": 300 },
"machine_depth": { "default_value": 220 },
"machine_height": { "default_value": 300 },
"machine_head_polygon": { "default_value": [
[-26, 34],
[-26, -32],
[22, -32],
[22, 34]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-26, 34],
[-26, -32],

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

@ -7,13 +7,6 @@
"machine_width": { "default_value": 400 },
"machine_depth": { "default_value": 400 },
"machine_height": { "default_value": 400 },
"machine_head_polygon": { "default_value": [
[-26, 34],
[-26, -32],
[22, -32],
[22, 34]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-26, 34],
[-26, -32],

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

@ -7,13 +7,6 @@
"machine_width": { "default_value": 500 },
"machine_depth": { "default_value": 500 },
"machine_height": { "default_value": 500 },
"machine_head_polygon": { "default_value": [
[-26, 34],
[-26, -32],
[22, -32],
[22, 34]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-26, 34],
[-26, -32],

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

@ -5,13 +5,6 @@
"overrides": {
"machine_name": { "default_value": "Creality CR-10S Pro" },
"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_head_polygon": { "default_value": [
[-44, 34],
[-44, -34],
[18, -34],
[18, 34]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-44, 34],
[-44, -34],

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

@ -7,13 +7,6 @@
"machine_width": { "default_value": 220 },
"machine_depth": { "default_value": 220 },
"machine_height": { "default_value": 250 },
"machine_head_polygon": { "default_value": [
[-26, 34],
[-26, -32],
[22, -32],
[22, 34]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-26, 34],
[-26, -32],

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

@ -8,13 +8,6 @@
"machine_width": { "default_value": 150 },
"machine_depth": { "default_value": 150 },
"machine_height": { "default_value": 200 },
"machine_head_polygon": { "default_value": [
[-26, 34],
[-26, -32],
[22, -32],
[22, 34]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-26, 34],
[-26, -32],

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

@ -17,13 +17,6 @@
[[-117.5, 117.5], [-117.5, 108], [117.5, 108], [117.5, 117.5]],
[[-117.5, -108], [-117.5, -117.5], [117.5, -117.5], [117.5, -108]]
]},
"machine_head_polygon": { "default_value": [
[-1, 1],
[-1, -1],
[1, -1],
[1, 1]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-26, 34],
[-26, -32],

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

@ -7,13 +7,6 @@
"machine_width": { "default_value": 452 },
"machine_depth": { "default_value": 468 },
"machine_height": { "default_value": 482 },
"machine_head_polygon": { "default_value": [
[-26, 34],
[-26, -32],
[22, -32],
[22, 34]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-26, 34],
[-26, -32],

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

@ -8,13 +8,6 @@
"machine_width": { "default_value": 220 },
"machine_depth": { "default_value": 220 },
"machine_height": { "default_value": 300 },
"machine_head_polygon": { "default_value": [
[-26, 34],
[-26, -32],
[22, -32],
[22, 34]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-26, 34],
[-26, -32],

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

@ -8,13 +8,6 @@
"machine_width": { "default_value": 350 },
"machine_depth": { "default_value": 350 },
"machine_height": { "default_value": 400 },
"machine_head_polygon": { "default_value": [
[-26, 34],
[-26, -32],
[22, -32],
[22, 34]
]
},
"machine_head_with_fans_polygon": { "default_value": [
[-26, 34],
[-26, -32],

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

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

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

@ -7,7 +7,7 @@
"author": "Ultimaker",
"category": "Other",
"manufacturer": "Unknown",
"setting_version": 10,
"setting_version": 11,
"file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g",
"visible": false,
"has_materials": true,
@ -421,34 +421,6 @@
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"machine_head_polygon":
{
"label": "Machine Head Polygon",
"description": "A 2D silhouette of the print head (fan caps excluded).",
"type": "polygon",
"default_value":
[
[
-1,
1
],
[
-1,
-1
],
[
1,
-1
],
[
1,
1
]
],
"settable_per_mesh": false,
"settable_per_extruder": false,
"settable_per_meshgroup": false
},
"machine_head_with_fans_polygon":
{
"label": "Machine Head & Fan Polygon",
@ -2737,7 +2709,6 @@
"minimum_value": "0",
"minimum_value_warning": "line_width * 1.5",
"maximum_value_warning": "10",
"enabled": false,
"settable_per_mesh": false,
"settable_per_extruder": true
},

8
resources/definitions/geeetech_a30.def.json
View file

@ -59,14 +59,6 @@
"adhesion_type": {
"default_value": "skirt"
},
"machine_head_polygon": {
"default_value": [
[-75, 35],
[18, 35],
[18, -18],
[-75, -18]
]
},
"machine_head_with_fans_polygon": {
"default_value": [
[-75, 35],

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

@ -28,7 +28,7 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_head_polygon": {
"machine_head_with_fans_polygon": {
"default_value": [
[-75, -18],
[-75, 35],

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

@ -32,7 +32,7 @@
"machine_center_is_zero": {
"default_value": true
},
"machine_head_polygon": {
"machine_head_with_fans_polygon": {
"default_value": [
[-43.7, -19.2],
[-43.7, 55],

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

@ -32,7 +32,7 @@
"machine_depth": {
"default_value": 150
},
"machine_head_polygon": {
"machine_head_with_fans_polygon": {
"default_value": [
[-30, 34],
[-30, -32],

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

@ -32,7 +32,7 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_head_polygon": {
"machine_head_with_fans_polygon": {
"default_value": [
[-75, -18],
[-75, 35],

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

@ -32,7 +32,7 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_head_polygon": {
"machine_head_with_fans_polygon": {
"default_value": [
[-75, -18],
[-75, 35],

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

@ -34,7 +34,7 @@
"machine_depth": {
"default_value": 300
},
"machine_head_polygon": {
"machine_head_with_fans_polygon": {
"default_value": [
[-30, 34],
[-30, -32],

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

@ -32,7 +32,7 @@
"machine_depth": {
"default_value": 150
},
"machine_head_polygon": {
"machine_head_with_fans_polygon": {
"default_value": [
[-30, 34],
[-30, -32],

8
resources/definitions/prusa_i3.def.json
View file

@ -31,14 +31,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_head_polygon": {
"default_value": [
[-75, -18],
[-75, 35],
[18, 35],
[18, -18]
]
},
"machine_head_with_fans_polygon": {
"default_value": [
[-75, -18],

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

@ -31,7 +31,7 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_head_polygon": {
"machine_head_with_fans_polygon": {
"default_value": [
[-75, -18],
[-75, 35],

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

@ -16,7 +16,7 @@
},
"overrides": {
"machine_head_polygon": { "default_value": [[ 0, 0], [ 0, 0], [ 0, 0], [ 0, 0]] },
"machine_head_with_fans_polygon": { "default_value": [[ 0, 0], [ 0, 0], [ 0, 0], [ 0, 0]] },
"prime_tower_size": { "default_value": 8.660254037844387 },
"layer_height": { "default_value": 0.2 },
"speed_print": { "default_value": 40 },

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

@ -21,7 +21,7 @@
"machine_end_gcode": {
"default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn ectruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n"
},
"machine_head_polygon": { "default_value": [[ 22, 67], [ 22, 51], [ 36, 51], [ 36, 67]] },
"machine_head_with_fans_polygon": { "default_value": [[ 22, 67], [ 22, 51], [ 36, 51], [ 36, 67]] },
"skirt_gap": { "default_value": 5.0 },
"cool_min_layer_time": { "default_value": 10 },
"prime_tower_size": { "default_value": 7.745966692414834 },

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

@ -21,7 +21,7 @@
"machine_end_gcode": {
"default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn extruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n"
},
"machine_head_polygon": { "default_value": [[ 18, 0], [ 18, 65], [ 32, 65], [ 32, 0]] },
"machine_head_with_fans_polygon": { "default_value": [[ 18, 0], [ 18, 65], [ 32, 65], [ 32, 0]] },
"cool_min_layer_time": { "default_value": 10 },
"prime_tower_size": { "default_value": 7.745966692414834 },
"skirt_gap": { "default_value": 5.0 },

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

@ -15,7 +15,7 @@
},
"overrides": {
"machine_head_polygon": { "default_value": [[ 16, 30], [ 16, 45], [ 16, 45], [ 16, 30]] },
"machine_head_with_fans_polygon": { "default_value": [[ 16, 30], [ 16, 45], [ 16, 45], [ 16, 30]] },
"prime_tower_size": { "default_value": 8.660254037844387 },
"skirt_gap": { "default_value": 5.0 },
"cool_min_layer_time": { "default_value": 15 },

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

@ -21,7 +21,7 @@
"machine_end_gcode": {
"default_value": " ; -- END GCODE --\n G1 X0 Y230 ; Get extruder out of way.\n M107 ; Turn off fan\n G91 ; Relative positioning\n G0 Z20 ; Lift extruder up\n T0\n G1 E-1 ; Reduce filament pressure\n M104 T0 S0 ; Turn ectruder heater off\n G90 ; Absolute positioning\n G92 E0 ; Reset extruder position\n M140 S0 ; Disable heated bed\n M84 ; Turn steppers off\n ; -- end of END GCODE --\n"
},
"machine_head_polygon": { "default_value": [[ 40, 15], [ 40, 60], [ 30, 60], [ 30, 15]] },
"machine_head_with_fans_polygon": { "default_value": [[ 40, 15], [ 40, 60], [ 30, 60], [ 30, 15]] },
"support_pattern": { "default_value": "grid" },
"cool_min_layer_time": { "default_value": 10 },
"support_angle": { "default_value": 45 },

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

@ -23,7 +23,7 @@
"machine_height": { "default_value": 200 },
"machine_depth": { "default_value": 200 },
"machine_center_is_zero": { "default_value": false },
"machine_head_polygon":
"machine_head_with_fans_polygon":
{
"default_value":
[

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

@ -28,7 +28,7 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_head_polygon": {
"machine_head_with_fans_polygon": {
"default_value": [
[-30, 34],
[-30, -32],

8
resources/definitions/vertex_k8400.def.json
View file

@ -35,14 +35,6 @@
"machine_center_is_zero": {
"default_value": false
},
"machine_head_polygon": {
"default_value": [
[-60, -18],
[-60, 40],
[18, 40],
[18, -18]
]
},
"machine_head_with_fans_polygon": {
"default_value": [
[-60, -40],

8
resources/definitions/vertex_k8400_dual.def.json
View file

@ -36,14 +36,6 @@
"machine_use_extruder_offset_to_offset_coords": {
"default_value": true
},
"machine_head_polygon": {
"default_value": [
[-60, -18],
[-60, 40],
[18, 40],
[18, -18]
]
},
"machine_head_with_fans_polygon": {
"default_value": [
[-60, -40],