From db752f6853b578fc6b7d6271daf3ee18d7a3fa2d Mon Sep 17 00:00:00 2001 From: zadi15 <44522755+zadi15@users.noreply.github.com> Date: Tue, 2 May 2023 03:19:13 +0100 Subject: [PATCH 01/69] Create voron_trident_300_0.50.inst.cfg Add 0.50mm nozzle option --- .../variants/voron/voron_trident_300_0.50.inst.cfg | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 resources/variants/voron/voron_trident_300_0.50.inst.cfg diff --git a/resources/variants/voron/voron_trident_300_0.50.inst.cfg b/resources/variants/voron/voron_trident_300_0.50.inst.cfg new file mode 100644 index 0000000000..a6c001b55a --- /dev/null +++ b/resources/variants/voron/voron_trident_300_0.50.inst.cfg @@ -0,0 +1,12 @@ +[general] +definition = voron_trident_300 +name = V6 0.50mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.5 From 2bd1a4aa308f78b066bb52ace883c9cab701c173 Mon Sep 17 00:00:00 2001 From: zadi15 <44522755+zadi15@users.noreply.github.com> Date: Tue, 2 May 2023 03:20:01 +0100 Subject: [PATCH 02/69] Create voron_trident_350_0.50.inst.cfg --- .../variants/voron/voron_trident_350_0.50.inst.cfg | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 resources/variants/voron/voron_trident_350_0.50.inst.cfg diff --git a/resources/variants/voron/voron_trident_350_0.50.inst.cfg b/resources/variants/voron/voron_trident_350_0.50.inst.cfg new file mode 100644 index 0000000000..e67ee99b13 --- /dev/null +++ b/resources/variants/voron/voron_trident_350_0.50.inst.cfg @@ -0,0 +1,12 @@ +[general] +definition = voron_trident_350 +name = V6 0.50mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.5 From d4d9903f57fbd313caaf948d0d5376bd07350229 Mon Sep 17 00:00:00 2001 From: zadi15 <44522755+zadi15@users.noreply.github.com> Date: Tue, 2 May 2023 03:34:18 +0100 Subject: [PATCH 03/69] Create voron_trident_250_0.50.inst.cfg --- .../variants/voron/voron_trident_250_0.50.inst.cfg | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 resources/variants/voron/voron_trident_250_0.50.inst.cfg diff --git a/resources/variants/voron/voron_trident_250_0.50.inst.cfg b/resources/variants/voron/voron_trident_250_0.50.inst.cfg new file mode 100644 index 0000000000..61615f92b7 --- /dev/null +++ b/resources/variants/voron/voron_trident_250_0.50.inst.cfg @@ -0,0 +1,12 @@ +[general] +definition = voron_trident_250 +name = V6 0.50mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.5 From 5da5f938fb01f49a6f12922289eaa2ddf63069a3 Mon Sep 17 00:00:00 2001 From: zadi15 <44522755+zadi15@users.noreply.github.com> Date: Tue, 2 May 2023 03:35:16 +0100 Subject: [PATCH 04/69] Create voron_trident_350_0.25.inst.cfg --- .../variants/voron/voron_trident_350_0.25.inst.cfg | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 resources/variants/voron/voron_trident_350_0.25.inst.cfg diff --git a/resources/variants/voron/voron_trident_350_0.25.inst.cfg b/resources/variants/voron/voron_trident_350_0.25.inst.cfg new file mode 100644 index 0000000000..1817f39402 --- /dev/null +++ b/resources/variants/voron/voron_trident_350_0.25.inst.cfg @@ -0,0 +1,12 @@ +[general] +definition = voron_trident_350 +name = V6 0.25mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.25 From 51fceb63ef1090ffd2fd3c10f5c6cd4d72cf7db8 Mon Sep 17 00:00:00 2001 From: zadi15 <44522755+zadi15@users.noreply.github.com> Date: Tue, 2 May 2023 03:35:36 +0100 Subject: [PATCH 05/69] Create voron_trident_300_0.25.inst.cfg --- .../variants/voron/voron_trident_300_0.25.inst.cfg | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 resources/variants/voron/voron_trident_300_0.25.inst.cfg diff --git a/resources/variants/voron/voron_trident_300_0.25.inst.cfg b/resources/variants/voron/voron_trident_300_0.25.inst.cfg new file mode 100644 index 0000000000..4787f681d7 --- /dev/null +++ b/resources/variants/voron/voron_trident_300_0.25.inst.cfg @@ -0,0 +1,12 @@ +[general] +definition = voron_trident_300 +name = V6 0.25mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.25 From 5b4f83c47bf5ebc72309b7587a5747b264843913 Mon Sep 17 00:00:00 2001 From: zadi15 <44522755+zadi15@users.noreply.github.com> Date: Tue, 2 May 2023 03:35:58 +0100 Subject: [PATCH 06/69] Create voron_trident_250_0.25.inst.cfg --- .../variants/voron/voron_trident_250_0.25.inst.cfg | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 resources/variants/voron/voron_trident_250_0.25.inst.cfg diff --git a/resources/variants/voron/voron_trident_250_0.25.inst.cfg b/resources/variants/voron/voron_trident_250_0.25.inst.cfg new file mode 100644 index 0000000000..e84dc74b16 --- /dev/null +++ b/resources/variants/voron/voron_trident_250_0.25.inst.cfg @@ -0,0 +1,12 @@ +[general] +definition = voron_trident_250 +name = V6 0.25mm +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 22 +type = variant + +[values] +machine_nozzle_size = 0.25 From b9a6efb332e09565681f658a88c0186e1bd8a73d Mon Sep 17 00:00:00 2001 From: Jordon Brooks <16258926+Jordonbc@users.noreply.github.com> Date: Tue, 23 May 2023 03:35:43 +0100 Subject: [PATCH 07/69] Added Kobra Plus printer profiles --- .../definitions/anycubic_kobra_plus.def.json | 30 +++++++++++++++++++ .../anycubic_kobra_plus_extruder_0.def.json | 16 ++++++++++ .../anycubic_kobra_plus_pla.inst.cfg | 27 +++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 resources/definitions/anycubic_kobra_plus.def.json create mode 100644 resources/extruders/anycubic_kobra_plus_extruder_0.def.json create mode 100644 resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg diff --git a/resources/definitions/anycubic_kobra_plus.def.json b/resources/definitions/anycubic_kobra_plus.def.json new file mode 100644 index 0000000000..5d41a5ef33 --- /dev/null +++ b/resources/definitions/anycubic_kobra_plus.def.json @@ -0,0 +1,30 @@ +{ + "version": 2, + "name": "Anycubic Kobra Plus", + "inherits": "fdmprinter", + "metadata": + { + "visible": true, + "author": "Jordon Brooks", + "manufacturer": "Anycubic", + "file_formats": "text/x-gcode", + "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": { "0": "anycubic_kobra_plus_extruder_0" }, + "preferred_material": "generic_pla", + "preferred_quality_type": "pla", + "quality_definition": "anycubic_kobra_plus" + }, + "overrides": + { + "machine_depth": { "default_value": 302 }, + "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_heated_bed": { "default_value": true }, + "machine_height": { "default_value": 352 }, + "machine_name": { "default_value": "Anycubic Kobra Plus" }, + "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nM355 S1; Turn LED on\n; Add Custom purge lines\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X1.0 Y30 Z0.3 F5000.0 ; Move to start position\nG1 X1.0 Y100.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X1.3 Y100.0 Z0.3 F5000.0 ; Move to side a little\nG1 X1.3 Y30 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 E-2 F500 ; Retract a little \nG1 X50 F500 ; wipe away from the filament line\nG1 X100 F9000 ; Quickly wipe away from the filament line\nG1 Z5.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n; End custom purge lines" }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84\nM355 S0; led off" }, + "machine_width": { "default_value": 302 } + } +} + diff --git a/resources/extruders/anycubic_kobra_plus_extruder_0.def.json b/resources/extruders/anycubic_kobra_plus_extruder_0.def.json new file mode 100644 index 0000000000..51a6c351bc --- /dev/null +++ b/resources/extruders/anycubic_kobra_plus_extruder_0.def.json @@ -0,0 +1,16 @@ +{ + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": + { + "machine": "anycubic_kobra_plus", + "position": "0" + }, + "overrides": + { + "extruder_nr": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.4 }, + "material_diameter": { "default_value": 1.75 } + } +} \ No newline at end of file diff --git a/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg b/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg new file mode 100644 index 0000000000..a2565e0dc7 --- /dev/null +++ b/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg @@ -0,0 +1,27 @@ +[general] +definition = anycubic_kobra_plus +name = Normal +version = 4 + +[metadata] +global_quality = True +quality_type = pla +setting_version = 21 +type = quality +weight = 0 + +[values] +layer_height = 0.2 +layer_height_0 = 0.2 +infill_pattern = cubic +retraction_hop = 0.1 +retraction_combing = off +retraction_hop_enabled = True +retraction_hop_only_when_collides = True +speed_print = 80 +speed_infill = 40 +speed_wall_x = 60 +speed_layer_0 = 20 +wall_thickness = 1.2 +material_print_temperature = 195 +material_final_print_temperature = 195 \ No newline at end of file From d3c88eb7a6a9bed2d16a504eed0bad435bee112f Mon Sep 17 00:00:00 2001 From: Jordon Brooks <16258926+Jordonbc@users.noreply.github.com> Date: Tue, 23 May 2023 11:20:14 +0100 Subject: [PATCH 08/69] Update anycubic_kobra_plus_pla.inst.cfg Changed setting_version to 22 --- .../anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg b/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg index a2565e0dc7..02bd9edb5e 100644 --- a/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg +++ b/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg @@ -6,7 +6,7 @@ version = 4 [metadata] global_quality = True quality_type = pla -setting_version = 21 +setting_version = 22 type = quality weight = 0 @@ -24,4 +24,4 @@ speed_wall_x = 60 speed_layer_0 = 20 wall_thickness = 1.2 material_print_temperature = 195 -material_final_print_temperature = 195 \ No newline at end of file +material_final_print_temperature = 195 From 8cfa59eabf7c140e99e9babe26eb5e8a80038a05 Mon Sep 17 00:00:00 2001 From: GregValiant <64202104+GregValiant@users.noreply.github.com> Date: Wed, 21 Jun 2023 17:52:00 -0400 Subject: [PATCH 09/69] Update AnyCubic Kossel Remove the Disallowed areas from the Kossel and the Kossle Linear Plus. They cause disallowed areas to appear within the build area of the build plate. They were also designed to be off the build plate. --- .../definitions/anycubic_kossel.def.json | 45 ------------------- .../anycubic_kossel_linear_plus.def.json | 45 ------------------- 2 files changed, 90 deletions(-) diff --git a/resources/definitions/anycubic_kossel.def.json b/resources/definitions/anycubic_kossel.def.json index 28d6ac141d..50ee14db4e 100644 --- a/resources/definitions/anycubic_kossel.def.json +++ b/resources/definitions/anycubic_kossel.def.json @@ -18,51 +18,6 @@ { "machine_center_is_zero": { "default_value": true }, "machine_depth": { "default_value": 180 }, - "machine_disallowed_areas": - { - "default_value": [ - [ - [-50, -85], - [-85, -85], - [-90, -90] - ], - [ - [-85, -85], - [-85, -50], - [-90, -90] - ], - [ - [50, -85], - [85, -85], - [90, -90] - ], - [ - [85, -85], - [85, -50], - [90, -90] - ], - [ - [-50, 85], - [-85, 85], - [-90, 90] - ], - [ - [-85, 85], - [-85, 50], - [-90, 90] - ], - [ - [50, 85], - [85, 85], - [90, 90] - ], - [ - [85, 85], - [85, 50], - [90, 90] - ] - ] - }, "machine_end_gcode": { "default_value": "M400 ;Free buffer\nG91 ;relative positioning\nG1 E-1 F300 ;retract the filament a bit before lifting the nozzle, to release some of the pressure\nG1 F{speed_travel} Z+1 E-5 ;move Z up a bit and retract filament even more\nG90 ;absolute positioning\nM104 S0 ;extruder heater off\nM140 S0 ;heated bed heater off\nM107 ;fan off\nM84 ;steppers off\nG28 ;move to endstop\nM84 ;steppers off" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_heated_bed": { "default_value": true }, diff --git a/resources/definitions/anycubic_kossel_linear_plus.def.json b/resources/definitions/anycubic_kossel_linear_plus.def.json index 8f8080d58f..4e35fff69a 100644 --- a/resources/definitions/anycubic_kossel_linear_plus.def.json +++ b/resources/definitions/anycubic_kossel_linear_plus.def.json @@ -16,51 +16,6 @@ "overrides": { "machine_depth": { "default_value": 240 }, - "machine_disallowed_areas": - { - "default_value": [ - [ - [-50, -115], - [-115, -115], - [-90, -90] - ], - [ - [-115, -115], - [-115, -50], - [-90, -90] - ], - [ - [50, -115], - [115, -115], - [90, -90] - ], - [ - [115, -115], - [115, -50], - [90, -90] - ], - [ - [-50, 115], - [-115, 115], - [-90, 90] - ], - [ - [-115, 115], - [-115, 50], - [-90, 90] - ], - [ - [50, 115], - [115, 115], - [90, 90] - ], - [ - [115, 115], - [115, 50], - [90, 90] - ] - ] - }, "machine_name": { "default_value": "Anycubic Kossel Linear Plus" }, "machine_width": { "default_value": 240 } } From b23ab8f94083aa0575d9ce081a12db683680b75f Mon Sep 17 00:00:00 2001 From: Patrick Date: Thu, 29 Jun 2023 17:14:07 -0400 Subject: [PATCH 10/69] Update Ender 3 Pro Profile to not Damage Bed --- resources/definitions/creality_ender3pro.def.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/resources/definitions/creality_ender3pro.def.json b/resources/definitions/creality_ender3pro.def.json index de0d4ed0bf..93038d9eff 100644 --- a/resources/definitions/creality_ender3pro.def.json +++ b/resources/definitions/creality_ender3pro.def.json @@ -23,7 +23,7 @@ }, "machine_height": { "default_value": 250 }, "machine_name": { "default_value": "Creality Ender-3 Pro" }, - "machine_start_gcode": { "default_value": "; Ender 3 Custom Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nM104 S{material_standby_temperature} ; Start heating up the nozzle most of the way\nM190 S{material_bed_temperature_layer_0} ; Start heating the bed, wait until target temperature reached\nM109 S{material_print_temperature_layer_0} ; Finish heating the nozzle\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" }, + "machine_start_gcode": { "default_value": "; Ender 3 Custom Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z5.0 F3000 ; Move Z Axis up a bit during heating to not damage bed\nM104 S{material_standby_temperature} ; Start heating up the nozzle most of the way\nM190 S{material_bed_temperature_layer_0} ; Start heating the bed, wait until target temperature reached\nM109 S{material_print_temperature_layer_0} ; Finish heating the nozzle\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" }, "machine_width": { "default_value": 220 } } -} \ No newline at end of file +} From 4cc45da84d3238d03ae30fdf88bd4c143aa103a2 Mon Sep 17 00:00:00 2001 From: Thomas Pleasance Date: Mon, 3 Jul 2023 19:09:00 +0100 Subject: [PATCH 11/69] Added Creality Ender-5 S1 Def --- .../definitions/creality_ender5s1.def.json | 42 +++++++++++++++++++ 1 file changed, 42 insertions(+) create mode 100644 resources/definitions/creality_ender5s1.def.json diff --git a/resources/definitions/creality_ender5s1.def.json b/resources/definitions/creality_ender5s1.def.json new file mode 100644 index 0000000000..e4cdf12e60 --- /dev/null +++ b/resources/definitions/creality_ender5s1.def.json @@ -0,0 +1,42 @@ +{ + "name": "Creality Ender-5 S1", + "version": 2, + "inherits": "creality_base", + "overrides": { + "machine_name": { "default_value": "Creality Ender-5/Ender-3Pro" }, + "machine_end_gcode": { "default_value": "G91 ;Relative positionning\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 positionning\n\nG1 X0 Y0 ;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": 225 }, + "machine_depth": { "default_value": 225 }, + "machine_height": { "default_value": 305 }, + "machine_head_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [22, -32], + [22, 34] + ] + }, + "machine_head_with_fans_polygon": { "default_value": [ + [-26, 34], + [-26, -32], + [32, -32], + [32, 34] + ] + }, + + "gantry_height": { "value": 25 }, + "build_volume_temperature": { "value": 195 }, + "material_bed_temperature": { "value": 60 }, + "retraction_amount": { "value": 2}, + "z_seam_type": { "value": "'sharpest_corner'" }, + "support_z_distance": { "value": 0.25 }, + "cool_min_layer_time": { "value": 5 }, + "wall_thickness": {"value": "line_width * 3" }, + "retraction_speed": { "value": 45 }, + "speed_print": { "value": 80.0 } + + }, + "metadata": { + "quality_definition": "creality_base", + "visible": true + } +} \ No newline at end of file From bd27d3a15405ff3cde6bc37699aea037c5916c4b Mon Sep 17 00:00:00 2001 From: Thomas Pleasance Date: Mon, 3 Jul 2023 19:50:06 +0100 Subject: [PATCH 12/69] Added Creality Ender-5 S1 Nozzle Variants --- resources/variants/creality_ender5s1_0.2.inst.cfg | 12 ++++++++++++ resources/variants/creality_ender5s1_0.3.inst.cfg | 12 ++++++++++++ resources/variants/creality_ender5s1_0.4.inst.cfg | 12 ++++++++++++ resources/variants/creality_ender5s1_0.5.inst.cfg | 12 ++++++++++++ resources/variants/creality_ender5s1_0.6.inst.cfg | 12 ++++++++++++ resources/variants/creality_ender5s1_0.8.inst.cfg | 12 ++++++++++++ resources/variants/creality_ender5s1_1.0.inst.cfg | 12 ++++++++++++ 7 files changed, 84 insertions(+) create mode 100644 resources/variants/creality_ender5s1_0.2.inst.cfg create mode 100644 resources/variants/creality_ender5s1_0.3.inst.cfg create mode 100644 resources/variants/creality_ender5s1_0.4.inst.cfg create mode 100644 resources/variants/creality_ender5s1_0.5.inst.cfg create mode 100644 resources/variants/creality_ender5s1_0.6.inst.cfg create mode 100644 resources/variants/creality_ender5s1_0.8.inst.cfg create mode 100644 resources/variants/creality_ender5s1_1.0.inst.cfg diff --git a/resources/variants/creality_ender5s1_0.2.inst.cfg b/resources/variants/creality_ender5s1_0.2.inst.cfg new file mode 100644 index 0000000000..efb2a8342c --- /dev/null +++ b/resources/variants/creality_ender5s1_0.2.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.2mm +version = 4 +definition = creality_ender5s1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.2 diff --git a/resources/variants/creality_ender5s1_0.3.inst.cfg b/resources/variants/creality_ender5s1_0.3.inst.cfg new file mode 100644 index 0000000000..c9d4204ace --- /dev/null +++ b/resources/variants/creality_ender5s1_0.3.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.3mm +version = 4 +definition = creality_ender5s1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.3 diff --git a/resources/variants/creality_ender5s1_0.4.inst.cfg b/resources/variants/creality_ender5s1_0.4.inst.cfg new file mode 100644 index 0000000000..9046a71b0b --- /dev/null +++ b/resources/variants/creality_ender5s1_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.4mm +version = 4 +definition = creality_ender5s1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 diff --git a/resources/variants/creality_ender5s1_0.5.inst.cfg b/resources/variants/creality_ender5s1_0.5.inst.cfg new file mode 100644 index 0000000000..c8ce62ffc7 --- /dev/null +++ b/resources/variants/creality_ender5s1_0.5.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.5mm +version = 4 +definition = creality_ender5s1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.5 diff --git a/resources/variants/creality_ender5s1_0.6.inst.cfg b/resources/variants/creality_ender5s1_0.6.inst.cfg new file mode 100644 index 0000000000..3eba1d8b6b --- /dev/null +++ b/resources/variants/creality_ender5s1_0.6.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.6mm +version = 4 +definition = creality_ender5s1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.6 diff --git a/resources/variants/creality_ender5s1_0.8.inst.cfg b/resources/variants/creality_ender5s1_0.8.inst.cfg new file mode 100644 index 0000000000..e697ea96cb --- /dev/null +++ b/resources/variants/creality_ender5s1_0.8.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 0.8mm +version = 4 +definition = creality_ender5s1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 diff --git a/resources/variants/creality_ender5s1_1.0.inst.cfg b/resources/variants/creality_ender5s1_1.0.inst.cfg new file mode 100644 index 0000000000..7901fe9e68 --- /dev/null +++ b/resources/variants/creality_ender5s1_1.0.inst.cfg @@ -0,0 +1,12 @@ +[general] +name = 1.0mm +version = 4 +definition = creality_ender5s1 + +[metadata] +setting_version = 16 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 1.0 From 4b9a40215e767f4384dd670ccd632031403c784c Mon Sep 17 00:00:00 2001 From: Thomas Pleasance Date: Mon, 3 Jul 2023 19:52:21 +0100 Subject: [PATCH 13/69] Moved Creality Ender-5 S1 Nozzle Variants into the correct folder --- resources/variants/{ => creality}/creality_ender5s1_0.2.inst.cfg | 0 resources/variants/{ => creality}/creality_ender5s1_0.3.inst.cfg | 0 resources/variants/{ => creality}/creality_ender5s1_0.4.inst.cfg | 0 resources/variants/{ => creality}/creality_ender5s1_0.5.inst.cfg | 0 resources/variants/{ => creality}/creality_ender5s1_0.6.inst.cfg | 0 resources/variants/{ => creality}/creality_ender5s1_0.8.inst.cfg | 0 resources/variants/{ => creality}/creality_ender5s1_1.0.inst.cfg | 0 7 files changed, 0 insertions(+), 0 deletions(-) rename resources/variants/{ => creality}/creality_ender5s1_0.2.inst.cfg (100%) rename resources/variants/{ => creality}/creality_ender5s1_0.3.inst.cfg (100%) rename resources/variants/{ => creality}/creality_ender5s1_0.4.inst.cfg (100%) rename resources/variants/{ => creality}/creality_ender5s1_0.5.inst.cfg (100%) rename resources/variants/{ => creality}/creality_ender5s1_0.6.inst.cfg (100%) rename resources/variants/{ => creality}/creality_ender5s1_0.8.inst.cfg (100%) rename resources/variants/{ => creality}/creality_ender5s1_1.0.inst.cfg (100%) diff --git a/resources/variants/creality_ender5s1_0.2.inst.cfg b/resources/variants/creality/creality_ender5s1_0.2.inst.cfg similarity index 100% rename from resources/variants/creality_ender5s1_0.2.inst.cfg rename to resources/variants/creality/creality_ender5s1_0.2.inst.cfg diff --git a/resources/variants/creality_ender5s1_0.3.inst.cfg b/resources/variants/creality/creality_ender5s1_0.3.inst.cfg similarity index 100% rename from resources/variants/creality_ender5s1_0.3.inst.cfg rename to resources/variants/creality/creality_ender5s1_0.3.inst.cfg diff --git a/resources/variants/creality_ender5s1_0.4.inst.cfg b/resources/variants/creality/creality_ender5s1_0.4.inst.cfg similarity index 100% rename from resources/variants/creality_ender5s1_0.4.inst.cfg rename to resources/variants/creality/creality_ender5s1_0.4.inst.cfg diff --git a/resources/variants/creality_ender5s1_0.5.inst.cfg b/resources/variants/creality/creality_ender5s1_0.5.inst.cfg similarity index 100% rename from resources/variants/creality_ender5s1_0.5.inst.cfg rename to resources/variants/creality/creality_ender5s1_0.5.inst.cfg diff --git a/resources/variants/creality_ender5s1_0.6.inst.cfg b/resources/variants/creality/creality_ender5s1_0.6.inst.cfg similarity index 100% rename from resources/variants/creality_ender5s1_0.6.inst.cfg rename to resources/variants/creality/creality_ender5s1_0.6.inst.cfg diff --git a/resources/variants/creality_ender5s1_0.8.inst.cfg b/resources/variants/creality/creality_ender5s1_0.8.inst.cfg similarity index 100% rename from resources/variants/creality_ender5s1_0.8.inst.cfg rename to resources/variants/creality/creality_ender5s1_0.8.inst.cfg diff --git a/resources/variants/creality_ender5s1_1.0.inst.cfg b/resources/variants/creality/creality_ender5s1_1.0.inst.cfg similarity index 100% rename from resources/variants/creality_ender5s1_1.0.inst.cfg rename to resources/variants/creality/creality_ender5s1_1.0.inst.cfg From 5acba34f97f35153fbccd60c00a04d0873749173 Mon Sep 17 00:00:00 2001 From: Thomas Pleasance Date: Mon, 3 Jul 2023 19:57:36 +0100 Subject: [PATCH 14/69] Updated Creality Ender-5 S1 Nozzle Variants Names --- resources/definitions/creality_ender5s1.def.json | 2 +- resources/variants/creality/creality_ender5s1_0.2.inst.cfg | 4 ++-- resources/variants/creality/creality_ender5s1_0.3.inst.cfg | 4 ++-- resources/variants/creality/creality_ender5s1_0.4.inst.cfg | 4 ++-- resources/variants/creality/creality_ender5s1_0.5.inst.cfg | 4 ++-- resources/variants/creality/creality_ender5s1_0.6.inst.cfg | 4 ++-- resources/variants/creality/creality_ender5s1_0.8.inst.cfg | 4 ++-- resources/variants/creality/creality_ender5s1_1.0.inst.cfg | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) diff --git a/resources/definitions/creality_ender5s1.def.json b/resources/definitions/creality_ender5s1.def.json index e4cdf12e60..6272d3e04a 100644 --- a/resources/definitions/creality_ender5s1.def.json +++ b/resources/definitions/creality_ender5s1.def.json @@ -3,7 +3,7 @@ "version": 2, "inherits": "creality_base", "overrides": { - "machine_name": { "default_value": "Creality Ender-5/Ender-3Pro" }, + "machine_name": { "default_value": "Creality Ender-5 S1" }, "machine_end_gcode": { "default_value": "G91 ;Relative positionning\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 positionning\n\nG1 X0 Y0 ;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": 225 }, "machine_depth": { "default_value": 225 }, diff --git a/resources/variants/creality/creality_ender5s1_0.2.inst.cfg b/resources/variants/creality/creality_ender5s1_0.2.inst.cfg index efb2a8342c..b5969358e6 100644 --- a/resources/variants/creality/creality_ender5s1_0.2.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.2.inst.cfg @@ -1,10 +1,10 @@ [general] -name = 0.2mm +name = 0.2mm Nozzle version = 4 definition = creality_ender5s1 [metadata] -setting_version = 16 +setting_version = 22 type = variant hardware_type = nozzle diff --git a/resources/variants/creality/creality_ender5s1_0.3.inst.cfg b/resources/variants/creality/creality_ender5s1_0.3.inst.cfg index c9d4204ace..c8314bda4d 100644 --- a/resources/variants/creality/creality_ender5s1_0.3.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.3.inst.cfg @@ -1,10 +1,10 @@ [general] -name = 0.3mm +name = 0.3mm Nozzle version = 4 definition = creality_ender5s1 [metadata] -setting_version = 16 +setting_version = 22 type = variant hardware_type = nozzle diff --git a/resources/variants/creality/creality_ender5s1_0.4.inst.cfg b/resources/variants/creality/creality_ender5s1_0.4.inst.cfg index 9046a71b0b..1b519ad121 100644 --- a/resources/variants/creality/creality_ender5s1_0.4.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.4.inst.cfg @@ -1,10 +1,10 @@ [general] -name = 0.4mm +name = 0.4mm Nozzle version = 4 definition = creality_ender5s1 [metadata] -setting_version = 16 +setting_version = 22 type = variant hardware_type = nozzle diff --git a/resources/variants/creality/creality_ender5s1_0.5.inst.cfg b/resources/variants/creality/creality_ender5s1_0.5.inst.cfg index c8ce62ffc7..6bc413f30b 100644 --- a/resources/variants/creality/creality_ender5s1_0.5.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.5.inst.cfg @@ -1,10 +1,10 @@ [general] -name = 0.5mm +name = 0.5mm Nozzle version = 4 definition = creality_ender5s1 [metadata] -setting_version = 16 +setting_version = 22 type = variant hardware_type = nozzle diff --git a/resources/variants/creality/creality_ender5s1_0.6.inst.cfg b/resources/variants/creality/creality_ender5s1_0.6.inst.cfg index 3eba1d8b6b..f235650911 100644 --- a/resources/variants/creality/creality_ender5s1_0.6.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.6.inst.cfg @@ -1,10 +1,10 @@ [general] -name = 0.6mm +name = 0.6mm Nozzle version = 4 definition = creality_ender5s1 [metadata] -setting_version = 16 +setting_version = 22 type = variant hardware_type = nozzle diff --git a/resources/variants/creality/creality_ender5s1_0.8.inst.cfg b/resources/variants/creality/creality_ender5s1_0.8.inst.cfg index e697ea96cb..52b16eea23 100644 --- a/resources/variants/creality/creality_ender5s1_0.8.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.8.inst.cfg @@ -1,10 +1,10 @@ [general] -name = 0.8mm +name = 0.8mm Nozzle version = 4 definition = creality_ender5s1 [metadata] -setting_version = 16 +setting_version = 22 type = variant hardware_type = nozzle diff --git a/resources/variants/creality/creality_ender5s1_1.0.inst.cfg b/resources/variants/creality/creality_ender5s1_1.0.inst.cfg index 7901fe9e68..06c558c42b 100644 --- a/resources/variants/creality/creality_ender5s1_1.0.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_1.0.inst.cfg @@ -1,10 +1,10 @@ [general] -name = 1.0mm +name = 1.0mm Nozzle version = 4 definition = creality_ender5s1 [metadata] -setting_version = 16 +setting_version = 22 type = variant hardware_type = nozzle From b1e85a1b9c30c449797c1922c69446678b858aff Mon Sep 17 00:00:00 2001 From: Thomas Pleasance Date: Mon, 3 Jul 2023 20:46:27 +0100 Subject: [PATCH 15/69] Updated Creality Ender-5 S1 Profile to be more inline with other defs --- .../definitions/creality_ender5s1.def.json | 30 +++++++------------ 1 file changed, 11 insertions(+), 19 deletions(-) diff --git a/resources/definitions/creality_ender5s1.def.json b/resources/definitions/creality_ender5s1.def.json index 6272d3e04a..6deeba5c6f 100644 --- a/resources/definitions/creality_ender5s1.def.json +++ b/resources/definitions/creality_ender5s1.def.json @@ -2,28 +2,25 @@ "name": "Creality Ender-5 S1", "version": 2, "inherits": "creality_base", + "metadata": { + "quality_definition": "creality_base", + "visible": true + }, "overrides": { - "machine_name": { "default_value": "Creality Ender-5 S1" }, - "machine_end_gcode": { "default_value": "G91 ;Relative positionning\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 positionning\n\nG1 X0 Y0 ;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": 225 }, + "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 225 }, - "machine_height": { "default_value": 305 }, - "machine_head_polygon": { "default_value": [ - [-26, 34], - [-26, -32], - [22, -32], - [22, 34] - ] - }, - "machine_head_with_fans_polygon": { "default_value": [ + "machine_head_with_fans_polygon": { + "default_value": [ [-26, 34], [-26, -32], [32, -32], [32, 34] ] }, - - "gantry_height": { "value": 25 }, + "machine_height": { "default_value": 305 }, + "machine_name": { "default_value": "Creality Ender-5 S1" }, + "machine_width": { "default_value": 225 }, + "machine_end_gcode": { "default_value": "G91 ;Relative positionning\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 positionning\n\nG1 X0 Y0 ;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" }, "build_volume_temperature": { "value": 195 }, "material_bed_temperature": { "value": 60 }, "retraction_amount": { "value": 2}, @@ -33,10 +30,5 @@ "wall_thickness": {"value": "line_width * 3" }, "retraction_speed": { "value": 45 }, "speed_print": { "value": 80.0 } - - }, - "metadata": { - "quality_definition": "creality_base", - "visible": true } } \ No newline at end of file From 85926e772c2cc1009b803a615b164f5dae2523d0 Mon Sep 17 00:00:00 2001 From: William Faircloth Date: Wed, 5 Jul 2023 15:04:19 -0400 Subject: [PATCH 16/69] fix: author --- resources/definitions/kingroon_kp3s_pro.def.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/resources/definitions/kingroon_kp3s_pro.def.json b/resources/definitions/kingroon_kp3s_pro.def.json index 3d768e3bd0..79a4916680 100644 --- a/resources/definitions/kingroon_kp3s_pro.def.json +++ b/resources/definitions/kingroon_kp3s_pro.def.json @@ -6,7 +6,8 @@ { "visible": true, "platform": "kingroon_kp3s.stl", - "quality_definition": "kingroon_base" + "quality_definition": "kingroon_base", + "author": "willuhmjs" }, "overrides": { @@ -33,4 +34,4 @@ "retraction_speed": { "value": 40 }, "speed_z_hop": { "value": 4 } } -} \ No newline at end of file +} From 3ea970ff735f7df73dc97dfacb563a7dff3b807a Mon Sep 17 00:00:00 2001 From: protosam Date: Fri, 7 Jul 2023 05:32:46 -0500 Subject: [PATCH 17/69] add tina2 support --- resources/README.md | 3 + resources/definitions/entina_tina2.def.json | 242 ++++++++ resources/definitions/entina_tina2s.def.json | 238 ++++++++ resources/definitions/weedo_base.def.json | 544 +++++++++++++++--- resources/definitions/weedo_tina2.def.json | 242 ++++++++ resources/definitions/weedo_tina2s.def.json | 238 ++++++++ resources/definitions/weefun_tina2.def.json | 283 +++++++-- resources/definitions/weefun_tina2s.def.json | 277 +++++++-- .../extruders/weedo_base_extruder_0.def.json | 9 +- 9 files changed, 1895 insertions(+), 181 deletions(-) create mode 100644 resources/README.md create mode 100644 resources/definitions/entina_tina2.def.json create mode 100644 resources/definitions/entina_tina2s.def.json create mode 100644 resources/definitions/weedo_tina2.def.json create mode 100644 resources/definitions/weedo_tina2s.def.json diff --git a/resources/README.md b/resources/README.md new file mode 100644 index 0000000000..1c3894ef07 --- /dev/null +++ b/resources/README.md @@ -0,0 +1,3 @@ +Copy contents to: +- C:\Program Files\UltiMaker Cura 5.3.1\share\cura\resources\definitions +- C:\Program Files\UltiMaker Cura 5.3.1\share\cura\resources\extruders \ No newline at end of file diff --git a/resources/definitions/entina_tina2.def.json b/resources/definitions/entina_tina2.def.json new file mode 100644 index 0000000000..fe74030da4 --- /dev/null +++ b/resources/definitions/entina_tina2.def.json @@ -0,0 +1,242 @@ +{ + "name": "ENTINA TINA2", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "ENTINA", + "manufacturer": "ENTINA", + "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": "ENTINA 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 + } + } +} \ No newline at end of file diff --git a/resources/definitions/entina_tina2s.def.json b/resources/definitions/entina_tina2s.def.json new file mode 100644 index 0000000000..0f197367fb --- /dev/null +++ b/resources/definitions/entina_tina2s.def.json @@ -0,0 +1,238 @@ +{ + "name": "ENTINA TINA2S", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "ENTINA", + "manufacturer": "ENTINA", + "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": "ENTINA 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": { + "value": 0.35 + } + } +} \ No newline at end of file diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index 0a43dae8cc..49f98ebfe1 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -1,95 +1,451 @@ -{ - "version": 2, - "name": "WEEDO Base", - "inherits": "fdmprinter", - "metadata": - { - "visible": false, - "author": "WEEDO", - "manufacturer": "WEEDO", - "file_formats": "text/x-gcode", - "exclude_materials": [ - "Extrudr_GreenTECPro_Anthracite", - "Extrudr_GreenTECPro_Black", - "Extrudr_GreenTECPro_Blue", - "Extrudr_GreenTECPro_Nature", - "Extrudr_GreenTECPro_Red", - "Extrudr_GreenTECPro_Silver", - "Extrudr_GreenTECPro_White", - "verbatim_bvoh", - "dsm_arnitel2045", - "dsm_novamid1070", - "imade3d_petg", - "imade3d_pla", - "innofill_innoflex60" - ], - "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 } - } +{ + "version": 2, + "name": "WEEDO Base", + "inherits": "fdmprinter", + "metadata": { + "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", + "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 + }, + "machine_id": { + "default_value": 1 + }, + "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_steps_per_mm_x": + { + "default_value": 94 + }, + "machine_steps_per_mm_y": + { + "default_value": 94 + }, + "machine_steps_per_mm_z": + { + "default_value": 400 + }, + "machine_steps_per_mm_e": + { + "default_value": 96 + }, + "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_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_tina2.def.json b/resources/definitions/weedo_tina2.def.json new file mode 100644 index 0000000000..f0d5a17a09 --- /dev/null +++ b/resources/definitions/weedo_tina2.def.json @@ -0,0 +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" + }, + "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 + } + } +} \ 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..bbf73e7cf9 --- /dev/null +++ b/resources/definitions/weedo_tina2s.def.json @@ -0,0 +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" + }, + "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 + } + } +} \ No newline at end of file diff --git a/resources/definitions/weefun_tina2.def.json b/resources/definitions/weefun_tina2.def.json index ebe026b163..0009267f0c 100644 --- a/resources/definitions/weefun_tina2.def.json +++ b/resources/definitions/weefun_tina2.def.json @@ -1,43 +1,242 @@ -{ - "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 } - } +{ + "name": "WEEFUN TINA2", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEFUN", + "manufacturer": "WEEFUN", + "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": "WEEFUN 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 + } + } } \ No newline at end of file diff --git a/resources/definitions/weefun_tina2s.def.json b/resources/definitions/weefun_tina2s.def.json index d23e0c356c..54299a261d 100644 --- a/resources/definitions/weefun_tina2s.def.json +++ b/resources/definitions/weefun_tina2s.def.json @@ -1,41 +1,238 @@ -{ - "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 } - } +{ + "name": "WEEFUN TINA2S", + "version": 2, + "inherits": "weedo_base", + "metadata": { + "visible": true, + "author": "WEEFUN", + "manufacturer": "WEEFUN", + "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": "WEEFUN 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": { + "value": 0.35 + } + } } \ 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 index 82cf9d9541..0cb088acdd 100644 --- a/resources/extruders/weedo_base_extruder_0.def.json +++ b/resources/extruders/weedo_base_extruder_0.def.json @@ -2,15 +2,14 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": - { + "metadata": { "machine": "weedo_base", "position": "0" }, - "overrides": - { + + "overrides": { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} \ No newline at end of file +} From dd89acdff4f97ea12876866607eaea47dfabf92a Mon Sep 17 00:00:00 2001 From: protosam Date: Fri, 7 Jul 2023 05:52:49 -0500 Subject: [PATCH 18/69] remove private readme --- resources/README.md | 3 --- 1 file changed, 3 deletions(-) delete mode 100644 resources/README.md diff --git a/resources/README.md b/resources/README.md deleted file mode 100644 index 1c3894ef07..0000000000 --- a/resources/README.md +++ /dev/null @@ -1,3 +0,0 @@ -Copy contents to: -- C:\Program Files\UltiMaker Cura 5.3.1\share\cura\resources\definitions -- C:\Program Files\UltiMaker Cura 5.3.1\share\cura\resources\extruders \ No newline at end of file From 0782ce43835741e3c1a5c132837cbf819e168170 Mon Sep 17 00:00:00 2001 From: protosam Date: Fri, 7 Jul 2023 06:01:22 -0500 Subject: [PATCH 19/69] removed machine_id value from weedo_base.def.json --- resources/definitions/weedo_base.def.json | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index 49f98ebfe1..5023d5669f 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -179,9 +179,6 @@ "material_diameter": { "default_value": 1.75 }, - "machine_id": { - "default_value": 1 - }, "material_bed_temp_wait": { "default_value": false }, @@ -203,20 +200,16 @@ "machine_min_cool_heat_time_window": { "default_value": 1200.0 }, - "machine_steps_per_mm_x": - { + "machine_steps_per_mm_x": { "default_value": 94 }, - "machine_steps_per_mm_y": - { + "machine_steps_per_mm_y": { "default_value": 94 }, - "machine_steps_per_mm_z": - { + "machine_steps_per_mm_z": { "default_value": 400 }, - "machine_steps_per_mm_e": - { + "machine_steps_per_mm_e": { "default_value": 96 }, "machine_max_feedrate_x": { From 49b9d0b9de0c4f1c34fb50ec859ef15519f1cd6e Mon Sep 17 00:00:00 2001 From: protosam Date: Fri, 7 Jul 2023 06:05:42 -0500 Subject: [PATCH 20/69] resolve redundant settings in weedo_base.def.json --- resources/definitions/weedo_base.def.json | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/resources/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index 5023d5669f..86dfdb619f 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -401,12 +401,6 @@ "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 }, @@ -419,12 +413,6 @@ "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 }, From 076db20aaf7b09711ab10accdd8f2250267a83a0 Mon Sep 17 00:00:00 2001 From: Paul Kuiper <46715907+pkuiper-ultimaker@users.noreply.github.com> Date: Mon, 10 Jul 2023 20:52:06 +0200 Subject: [PATCH 21/69] Enable support interface for the AA0.25 and AA0.4 nozzles for all materials. Default interface distance is 0.3mm (rounded to layerheights) and 0.4mm for CPE+ Relates to: PP-10 --- .../quality/ultimaker_s3/um_s3_aa0.25_abs_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.25_cpe_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.25_nylon_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.25_pc_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.25_petg_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.25_pla_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.25_pp_0.1mm.inst.cfg | 4 ++++ .../ultimaker_s3/um_s3_aa0.25_tough-pla_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_abs_0.06mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_abs_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_abs_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_abs_0.2mm.inst.cfg | 4 ++++ .../ultimaker_s3/um_s3_aa0.4_cpe-plus_0.06mm.inst.cfg | 5 ++++- .../ultimaker_s3/um_s3_aa0.4_cpe-plus_0.15mm.inst.cfg | 5 ++++- .../ultimaker_s3/um_s3_aa0.4_cpe-plus_0.1mm.inst.cfg | 5 ++++- .../ultimaker_s3/um_s3_aa0.4_cpe-plus_0.2mm.inst.cfg | 5 ++++- .../quality/ultimaker_s3/um_s3_aa0.4_cpe_0.06mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_cpe_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_cpe_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_cpe_0.2mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_nylon_0.06mm.inst.cfg | 5 ++++- .../quality/ultimaker_s3/um_s3_aa0.4_nylon_0.15mm.inst.cfg | 5 ++++- .../quality/ultimaker_s3/um_s3_aa0.4_nylon_0.1mm.inst.cfg | 5 ++++- .../quality/ultimaker_s3/um_s3_aa0.4_nylon_0.2mm.inst.cfg | 5 ++++- .../quality/ultimaker_s3/um_s3_aa0.4_pc_0.06mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_pc_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_pc_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_pc_0.2mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_petg_0.06mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_petg_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_petg_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_petg_0.2mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_pla_0.06mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_pla_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_pla_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_pla_0.2mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_pla_0.3mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_pp_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_pp_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_pp_0.2mm.inst.cfg | 4 ++++ .../ultimaker_s3/um_s3_aa0.4_tough-pla_0.06mm.inst.cfg | 4 ++++ .../ultimaker_s3/um_s3_aa0.4_tough-pla_0.15mm.inst.cfg | 4 ++++ .../ultimaker_s3/um_s3_aa0.4_tough-pla_0.1mm.inst.cfg | 4 ++++ .../ultimaker_s3/um_s3_aa0.4_tough-pla_0.2mm.inst.cfg | 4 ++++ .../ultimaker_s3/um_s3_aa0.4_tough-pla_0.3mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg | 4 ++++ .../quality/ultimaker_s3/um_s3_cc0.4_petcf_0.15mm.inst.cfg | 7 ++++--- .../quality/ultimaker_s3/um_s3_cc0.4_petcf_0.2mm.inst.cfg | 7 ++++--- .../quality/ultimaker_s3/um_s3_cc0.6_petcf_0.15mm.inst.cfg | 7 ++++--- .../quality/ultimaker_s3/um_s3_cc0.6_petcf_0.2mm.inst.cfg | 7 ++++--- .../quality/ultimaker_s3/um_s3_cc0.6_petcf_0.3mm.inst.cfg | 7 ++++--- .../quality/ultimaker_s5/um_s5_aa0.25_abs_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.25_cpe_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.25_nylon_0.1mm.inst.cfg | 6 +++++- .../quality/ultimaker_s5/um_s5_aa0.25_pc_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.25_petg_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.25_pla_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.25_pp_0.1mm.inst.cfg | 4 ++++ .../ultimaker_s5/um_s5_aa0.25_tough-pla_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_abs_0.06mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_abs_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_abs_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_abs_0.2mm.inst.cfg | 4 ++++ .../ultimaker_s5/um_s5_aa0.4_cpe-plus_0.06mm.inst.cfg | 5 ++++- .../ultimaker_s5/um_s5_aa0.4_cpe-plus_0.15mm.inst.cfg | 5 ++++- .../ultimaker_s5/um_s5_aa0.4_cpe-plus_0.1mm.inst.cfg | 5 ++++- .../ultimaker_s5/um_s5_aa0.4_cpe-plus_0.2mm.inst.cfg | 5 ++++- .../quality/ultimaker_s5/um_s5_aa0.4_cpe_0.06mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_cpe_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_cpe_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_cpe_0.2mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_nylon_0.06mm.inst.cfg | 5 ++++- .../quality/ultimaker_s5/um_s5_aa0.4_nylon_0.15mm.inst.cfg | 5 ++++- .../quality/ultimaker_s5/um_s5_aa0.4_nylon_0.1mm.inst.cfg | 5 ++++- .../quality/ultimaker_s5/um_s5_aa0.4_nylon_0.2mm.inst.cfg | 5 ++++- .../quality/ultimaker_s5/um_s5_aa0.4_pc_0.06mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_pc_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_pc_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_pc_0.2mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_petg_0.06mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_petg_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_petg_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_petg_0.2mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_pla_0.06mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_pla_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_pla_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_pla_0.2mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_pla_0.3mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_pp_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_pp_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_pp_0.2mm.inst.cfg | 4 ++++ .../ultimaker_s5/um_s5_aa0.4_tough-pla_0.06mm.inst.cfg | 4 ++++ .../ultimaker_s5/um_s5_aa0.4_tough-pla_0.15mm.inst.cfg | 4 ++++ .../ultimaker_s5/um_s5_aa0.4_tough-pla_0.1mm.inst.cfg | 4 ++++ .../ultimaker_s5/um_s5_aa0.4_tough-pla_0.2mm.inst.cfg | 4 ++++ .../ultimaker_s5/um_s5_aa0.4_tough-pla_0.3mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg | 4 ++++ .../quality/ultimaker_s5/um_s5_cc0.4_petcf_0.15mm.inst.cfg | 7 ++++--- .../quality/ultimaker_s5/um_s5_cc0.4_petcf_0.2mm.inst.cfg | 7 ++++--- .../quality/ultimaker_s5/um_s5_cc0.6_petcf_0.15mm.inst.cfg | 7 ++++--- .../quality/ultimaker_s5/um_s5_cc0.6_petcf_0.2mm.inst.cfg | 7 ++++--- .../quality/ultimaker_s5/um_s5_cc0.6_petcf_0.3mm.inst.cfg | 7 ++++--- 106 files changed, 425 insertions(+), 47 deletions(-) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_abs_0.1mm.inst.cfg index 6bc57b7a6e..3a88801570 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_abs_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_abs_0.1mm.inst.cfg @@ -13,4 +13,8 @@ weight = 0 [values] speed_topbottom = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_cpe_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_cpe_0.1mm.inst.cfg index 2cba4bb788..cd74f2688f 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_cpe_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_cpe_0.1mm.inst.cfg @@ -14,5 +14,9 @@ weight = 0 [values] speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.8 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_nylon_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_nylon_0.1mm.inst.cfg index 3d765aaa1e..a148563d97 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_nylon_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_nylon_0.1mm.inst.cfg @@ -20,6 +20,10 @@ retraction_min_travel = 5 speed_print = 70 speed_topbottom = =math.ceil(speed_print * 30 / 70) speed_wall = =math.ceil(speed_print * 30 / 70) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_pc_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_pc_0.1mm.inst.cfg index 3e97141c64..7a15e94478 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_pc_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_pc_0.1mm.inst.cfg @@ -29,7 +29,11 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_petg_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_petg_0.1mm.inst.cfg index ffaf1dd591..d2695b0eaf 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_petg_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_petg_0.1mm.inst.cfg @@ -15,5 +15,9 @@ weight = 0 material_print_temperature = =default_material_print_temperature - 5 speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.8 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_pla_0.1mm.inst.cfg index 95d624cf99..1b40b93f91 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_pla_0.1mm.inst.cfg @@ -21,6 +21,10 @@ retraction_hop = 0.2 speed_print = 30 speed_wall = =math.ceil(speed_print * 25 / 30) speed_wall_0 = =math.ceil(speed_print * 20 / 30) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.72 travel_avoid_distance = 0.4 wall_0_inset = 0.015 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_pp_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_pp_0.1mm.inst.cfg index 90ac201992..75cea75e5b 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_pp_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_pp_0.1mm.inst.cfg @@ -34,6 +34,10 @@ speed_print = 25 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.25_tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.25_tough-pla_0.1mm.inst.cfg index 90a389ea0b..03daa33819 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.25_tough-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.25_tough-pla_0.1mm.inst.cfg @@ -21,6 +21,10 @@ speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) speed_wall = =math.ceil(speed_print * 25 / 30) speed_wall_0 = =math.ceil(speed_print * 20 / 30) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.72 wall_0_inset = 0.015 wall_0_wipe_dist = 0.25 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.06mm.inst.cfg index ad57f4d87d..f6969a31a3 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.06mm.inst.cfg @@ -22,4 +22,8 @@ speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.15mm.inst.cfg index 075c1fd4aa..6d5e7148c4 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.15mm.inst.cfg @@ -23,4 +23,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.1mm.inst.cfg index 5c2bb0f6f4..852c8580d7 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.1mm.inst.cfg @@ -22,4 +22,8 @@ speed_infill = =math.ceil(speed_print * 40 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.2mm.inst.cfg index 6d68564281..df95d49c12 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_abs_0.2mm.inst.cfg @@ -23,4 +23,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.06mm.inst.cfg index fe501993d4..baa0b0c36d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.06mm.inst.cfg @@ -28,6 +28,9 @@ speed_print = 40 speed_topbottom = =math.ceil(speed_print * 30 / 35) speed_wall = =math.ceil(speed_print * 35 / 40) speed_wall_0 = =math.ceil(speed_wall * 30 / 35) -support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.4/layer_height)*layer_height wall_0_inset = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.15mm.inst.cfg index f9c44650c2..f53c0f5aeb 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.15mm.inst.cfg @@ -26,6 +26,9 @@ speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 45 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) -support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.4/layer_height)*layer_height wall_0_inset = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.1mm.inst.cfg index d7b82b4a1c..967d3ccd44 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.1mm.inst.cfg @@ -28,6 +28,9 @@ speed_print = 40 speed_topbottom = =math.ceil(speed_print * 30 / 35) speed_wall = =math.ceil(speed_print * 35 / 40) speed_wall_0 = =math.ceil(speed_wall * 30 / 35) -support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.4/layer_height)*layer_height wall_0_inset = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.2mm.inst.cfg index 76a248a749..de0053edf9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe-plus_0.2mm.inst.cfg @@ -26,6 +26,9 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 40 / 50) speed_wall = =math.ceil(speed_print * 50 / 50) speed_wall_0 = =math.ceil(speed_wall * 40 / 50) -support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.4/layer_height)*layer_height wall_0_inset = 0 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.06mm.inst.cfg index 8a399bd637..7a13861023 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.06mm.inst.cfg @@ -21,4 +21,8 @@ speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.15mm.inst.cfg index e6f19344df..60a9e47834 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.15mm.inst.cfg @@ -20,4 +20,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.1mm.inst.cfg index 730f7cd2f3..422258c09c 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.1mm.inst.cfg @@ -20,4 +20,8 @@ speed_infill = =math.ceil(speed_print * 45 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.2mm.inst.cfg index da5699d463..1764954dd5 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_cpe_0.2mm.inst.cfg @@ -20,4 +20,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.06mm.inst.cfg index 39f3fd8686..f6be35a2ec 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.06mm.inst.cfg @@ -14,7 +14,10 @@ weight = 1 [values] ooze_shield_angle = 40 raft_airgap = 0.4 -retraction_prime_speed = =retraction_speed +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.15mm.inst.cfg index b834ac75bb..874bcc66f0 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.15mm.inst.cfg @@ -15,7 +15,10 @@ weight = -1 material_print_temperature = =default_material_print_temperature + 5 ooze_shield_angle = 40 raft_airgap = 0.4 -retraction_prime_speed = =retraction_speed +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.1mm.inst.cfg index ea8f7837a2..89c3b6f361 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.1mm.inst.cfg @@ -14,7 +14,10 @@ weight = 0 [values] ooze_shield_angle = 40 raft_airgap = 0.4 -retraction_prime_speed = =retraction_speed +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.2mm.inst.cfg index 88b89d7a47..662aa9fb66 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_nylon_0.2mm.inst.cfg @@ -15,7 +15,10 @@ weight = -2 material_print_temperature = =default_material_print_temperature + 10 ooze_shield_angle = 40 raft_airgap = 0.4 -retraction_prime_speed = =retraction_speed +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.06mm.inst.cfg index 046b9f6ce2..4e217f5cca 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.06mm.inst.cfg @@ -31,7 +31,11 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.15mm.inst.cfg index c1d488bf5f..b5ec910404 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.15mm.inst.cfg @@ -31,7 +31,11 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.1mm.inst.cfg index d2a3b67d4c..ff2159e522 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.1mm.inst.cfg @@ -30,7 +30,11 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.2mm.inst.cfg index c95009797d..a524c5c040 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pc_0.2mm.inst.cfg @@ -31,7 +31,11 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.06mm.inst.cfg index fdbdb811c1..adc4670e8d 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.06mm.inst.cfg @@ -20,4 +20,8 @@ speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.15mm.inst.cfg index d71148e5ce..3967838a12 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.15mm.inst.cfg @@ -19,4 +19,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.1mm.inst.cfg index 69f6059c00..7829f46334 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.1mm.inst.cfg @@ -20,4 +20,8 @@ speed_infill = =math.ceil(speed_print * 45 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.2mm.inst.cfg index 5291946ccd..db079b04c9 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_petg_0.2mm.inst.cfg @@ -19,4 +19,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height 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 6de3ad3edb..4b8f9f433b 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 @@ -21,5 +21,9 @@ retraction_prime_speed = =retraction_speed speed_print = 50 speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 35 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1 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 f076447401..5581284de4 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 @@ -21,5 +21,9 @@ speed_print = 70 speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 45 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 70) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1 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 40b7c5b843..30af138465 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 @@ -17,5 +17,9 @@ 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 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1 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 8452bce4a9..e5dc960d98 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 @@ -24,5 +24,9 @@ retraction_prime_speed = =retraction_speed speed_topbottom = =math.ceil(speed_print * 40 / 70) speed_wall = =math.ceil(speed_print * 55 / 70) speed_wall_0 = =math.ceil(speed_wall * 45 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.8 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 98990f6fe0..719adc820b 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 @@ -27,6 +27,10 @@ raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 50 speed_wall = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.9 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.15mm.inst.cfg index b2cbff9177..70d53dd331 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.15mm.inst.cfg @@ -35,6 +35,10 @@ speed_topbottom = =math.ceil(speed_print * 25 / 25) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.1mm.inst.cfg index 309f646559..009039d972 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.1mm.inst.cfg @@ -35,6 +35,10 @@ speed_topbottom = =math.ceil(speed_print * 25 / 25) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.2mm.inst.cfg index 234ec47e8f..9c2870b661 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_pp_0.2mm.inst.cfg @@ -35,6 +35,10 @@ speed_topbottom = =math.ceil(speed_print * 25 / 25) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.06mm.inst.cfg index 6268da9a9f..e091136b32 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.06mm.inst.cfg @@ -21,5 +21,9 @@ speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.15mm.inst.cfg index d94df8b8f3..450c82a0c2 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.15mm.inst.cfg @@ -21,5 +21,9 @@ speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.1mm.inst.cfg index cd358539bb..fa25ccb171 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.1mm.inst.cfg @@ -21,5 +21,9 @@ speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.2mm.inst.cfg index a0d698a327..fd3574f313 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.2mm.inst.cfg @@ -22,5 +22,9 @@ speed_roofing = =math.ceil(speed_wall * 20 / 24) speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 36 / 50) speed_wall_0 = =math.ceil(speed_print * 26 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.3mm.inst.cfg index e9e0c2fc7f..cbf086000e 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tough-pla_0.3mm.inst.cfg @@ -27,6 +27,10 @@ raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 50 speed_wall = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg index 18aaeb6470..c6e9fc00d1 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.15mm.inst.cfg @@ -36,6 +36,10 @@ speed_topbottom = =math.ceil(speed_print * 0.8) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg index e8e7410cd5..043aa880ad 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.1mm.inst.cfg @@ -35,6 +35,10 @@ speed_topbottom = =math.ceil(speed_print * 0.8) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg index e24ab778b5..0c8d7eb429 100644 --- a/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_aa0.4_tpu_0.2mm.inst.cfg @@ -36,6 +36,10 @@ speed_topbottom = =math.ceil(speed_print * 0.8) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.15mm.inst.cfg index 3dff641b42..fd25f84ca5 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.15mm.inst.cfg @@ -22,8 +22,9 @@ speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -support_bottom_distance = =support_z_distance / 2 -support_top_distance = =support_z_distance / 2 -support_z_distance = =layer_height * 2 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.8 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.2mm.inst.cfg index f9d1cb1295..ea26d6b146 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.4_petcf_0.2mm.inst.cfg @@ -22,8 +22,9 @@ speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -support_bottom_distance = =support_z_distance / 2 -support_top_distance = =support_z_distance / 2 -support_z_distance = =layer_height * 2 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.8 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.15mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.15mm.inst.cfg index 864e913a9c..b49ee3061e 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.15mm.inst.cfg @@ -22,8 +22,9 @@ speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -support_bottom_distance = =support_z_distance / 2 -support_top_distance = =support_z_distance / 2 -support_z_distance = =layer_height * 2 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.2mm.inst.cfg index 138b118073..db82d6e40e 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.2mm.inst.cfg @@ -22,8 +22,9 @@ speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -support_bottom_distance = =support_z_distance / 2 -support_top_distance = =support_z_distance / 2 -support_z_distance = =layer_height * 2 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.3mm.inst.cfg b/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.3mm.inst.cfg index 6f899afbbf..8e94df9387 100644 --- a/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s3/um_s3_cc0.6_petcf_0.3mm.inst.cfg @@ -22,8 +22,9 @@ speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -support_bottom_distance = =support_z_distance / 2 -support_top_distance = =support_z_distance / 2 -support_z_distance = =layer_height * 2 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_abs_0.1mm.inst.cfg index ae9144728a..08053a4f6d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_abs_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_abs_0.1mm.inst.cfg @@ -13,4 +13,8 @@ weight = 0 [values] speed_topbottom = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_cpe_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_cpe_0.1mm.inst.cfg index ba519667d0..ca39f8dc7a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_cpe_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_cpe_0.1mm.inst.cfg @@ -14,5 +14,9 @@ weight = 0 [values] speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.8 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_nylon_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_nylon_0.1mm.inst.cfg index 710701b22a..009628fd2e 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_nylon_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_nylon_0.1mm.inst.cfg @@ -15,11 +15,15 @@ weight = 0 machine_nozzle_cool_down_speed = 0.9 machine_nozzle_heat_up_speed = 1.4 ooze_shield_angle = 40 -raft_airgap = 0.15 +raft_airgap = 0.4 retraction_min_travel = 5 speed_print = 70 speed_topbottom = =math.ceil(speed_print * 30 / 70) speed_wall = =math.ceil(speed_print * 30 / 70) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_pc_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_pc_0.1mm.inst.cfg index f5a34415b4..eeffba5b98 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_pc_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_pc_0.1mm.inst.cfg @@ -29,7 +29,11 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_petg_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_petg_0.1mm.inst.cfg index 7b41e45d1c..374ef26315 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_petg_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_petg_0.1mm.inst.cfg @@ -15,5 +15,9 @@ weight = 0 material_print_temperature = =default_material_print_temperature - 5 speed_infill = =math.ceil(speed_print * 40 / 55) speed_topbottom = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.8 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_pla_0.1mm.inst.cfg index 199995e5a1..2b99c9acce 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_pla_0.1mm.inst.cfg @@ -21,6 +21,10 @@ retraction_hop = 0.2 speed_print = 30 speed_wall = =math.ceil(speed_print * 25 / 30) speed_wall_0 = =math.ceil(speed_print * 20 / 30) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.72 travel_avoid_distance = 0.4 wall_0_inset = 0.015 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_pp_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_pp_0.1mm.inst.cfg index 4b9d902b31..d38c036bcd 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_pp_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_pp_0.1mm.inst.cfg @@ -34,6 +34,10 @@ speed_print = 25 speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.25_tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.25_tough-pla_0.1mm.inst.cfg index 81d1d1f735..4f02a053b4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.25_tough-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.25_tough-pla_0.1mm.inst.cfg @@ -21,6 +21,10 @@ speed_print = 30 speed_topbottom = =math.ceil(speed_print * 20 / 30) speed_wall = =math.ceil(speed_print * 25 / 30) speed_wall_0 = =math.ceil(speed_print * 20 / 30) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.72 wall_0_inset = 0.015 wall_0_wipe_dist = 0.25 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.06mm.inst.cfg index 8ecbf19956..7694e37ba3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.06mm.inst.cfg @@ -22,4 +22,8 @@ speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.15mm.inst.cfg index f576b20987..c27a4a1b57 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.15mm.inst.cfg @@ -23,4 +23,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.1mm.inst.cfg index 65e2cb0361..f19345a0fe 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.1mm.inst.cfg @@ -22,4 +22,8 @@ speed_infill = =math.ceil(speed_print * 40 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.2mm.inst.cfg index 337054f0de..03f67f9924 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_abs_0.2mm.inst.cfg @@ -23,4 +23,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.06mm.inst.cfg index e95804af3a..72e6ead239 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.06mm.inst.cfg @@ -28,6 +28,9 @@ speed_print = 40 speed_topbottom = =math.ceil(speed_print * 30 / 35) speed_wall = =math.ceil(speed_print * 35 / 40) speed_wall_0 = =math.ceil(speed_wall * 30 / 35) -support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.4/layer_height)*layer_height wall_0_inset = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.15mm.inst.cfg index ac1e50fd49..1a4e89f783 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.15mm.inst.cfg @@ -26,6 +26,9 @@ speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 45 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) -support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.4/layer_height)*layer_height wall_0_inset = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.1mm.inst.cfg index 77ccf92459..6c2e7b2f94 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.1mm.inst.cfg @@ -28,6 +28,9 @@ speed_print = 40 speed_topbottom = =math.ceil(speed_print * 30 / 35) speed_wall = =math.ceil(speed_print * 35 / 40) speed_wall_0 = =math.ceil(speed_wall * 30 / 35) -support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.4/layer_height)*layer_height wall_0_inset = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.2mm.inst.cfg index dde22bbd42..b2182320fd 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe-plus_0.2mm.inst.cfg @@ -26,6 +26,9 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 40 / 50) speed_wall = =math.ceil(speed_print * 50 / 50) speed_wall_0 = =math.ceil(speed_wall * 40 / 50) -support_z_distance = =layer_height +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.4/layer_height)*layer_height wall_0_inset = 0 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.06mm.inst.cfg index 5e96ec7e28..ab7fc5ef9b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.06mm.inst.cfg @@ -21,4 +21,8 @@ speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.15mm.inst.cfg index ec4cef925d..7c27d79d2d 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.15mm.inst.cfg @@ -20,4 +20,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.1mm.inst.cfg index 2928127314..20c036907a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.1mm.inst.cfg @@ -20,4 +20,8 @@ speed_infill = =math.ceil(speed_print * 45 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.2mm.inst.cfg index af34967c61..b1094daf5a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_cpe_0.2mm.inst.cfg @@ -20,4 +20,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.06mm.inst.cfg index e243e33749..0abeb14221 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.06mm.inst.cfg @@ -14,7 +14,10 @@ weight = 1 [values] ooze_shield_angle = 40 raft_airgap = 0.4 -retraction_prime_speed = =retraction_speed +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.15mm.inst.cfg index 8833881fdf..94536f1904 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.15mm.inst.cfg @@ -15,7 +15,10 @@ weight = -1 material_print_temperature = =default_material_print_temperature + 5 ooze_shield_angle = 40 raft_airgap = 0.4 -retraction_prime_speed = =retraction_speed +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.1mm.inst.cfg index 70f76a5266..f07d801dc0 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.1mm.inst.cfg @@ -14,7 +14,10 @@ weight = 0 [values] ooze_shield_angle = 40 raft_airgap = 0.4 -retraction_prime_speed = =retraction_speed +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.2mm.inst.cfg index 0f7b604b15..005ccf6e59 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_nylon_0.2mm.inst.cfg @@ -15,7 +15,10 @@ weight = -2 material_print_temperature = =default_material_print_temperature + 10 ooze_shield_angle = 40 raft_airgap = 0.4 -retraction_prime_speed = =retraction_speed +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 30 switch_extruder_retraction_amount = 30 switch_extruder_retraction_speeds = 40 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.06mm.inst.cfg index c19de26c93..a2e3bd792b 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.06mm.inst.cfg @@ -31,7 +31,11 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.15mm.inst.cfg index b21da5f2e4..9ef073b635 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.15mm.inst.cfg @@ -31,7 +31,11 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.1mm.inst.cfg index c99934288e..e118f0db8a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.1mm.inst.cfg @@ -30,7 +30,11 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.2mm.inst.cfg index 7eedf33df9..4351a289b9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pc_0.2mm.inst.cfg @@ -31,7 +31,11 @@ speed_print = 50 speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 40 / 50) speed_wall_0 = =math.ceil(speed_wall * 25 / 40) +support_bottom_distance = =support_z_distance support_interface_density = 87.5 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.06mm.inst.cfg index 8bebbf4113..6fe817fba1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.06mm.inst.cfg @@ -20,4 +20,8 @@ speed_infill = =math.ceil(speed_print * 40 / 50) speed_print = 50 speed_topbottom = =math.ceil(speed_print * 30 / 50) speed_wall = =math.ceil(speed_print * 30 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.15mm.inst.cfg index ce957c1a50..060e9b3540 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.15mm.inst.cfg @@ -19,4 +19,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 30 / 60) speed_wall = =math.ceil(speed_print * 40 / 60) speed_wall_0 = =math.ceil(speed_wall * 30 / 40) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.1mm.inst.cfg index 4bba37dd01..1e04aad8ce 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.1mm.inst.cfg @@ -20,4 +20,8 @@ speed_infill = =math.ceil(speed_print * 45 / 55) speed_print = 55 speed_topbottom = =math.ceil(speed_print * 30 / 55) speed_wall = =math.ceil(speed_print * 30 / 55) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.2mm.inst.cfg index 6b7f2fba1a..aaf279f115 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_petg_0.2mm.inst.cfg @@ -19,4 +19,8 @@ speed_print = 60 speed_topbottom = =math.ceil(speed_print * 35 / 60) speed_wall = =math.ceil(speed_print * 45 / 60) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height 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 5facf88970..f34549bc78 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 @@ -21,5 +21,9 @@ retraction_prime_speed = =retraction_speed speed_print = 50 speed_topbottom = =math.ceil(speed_print * 35 / 50) speed_wall = =math.ceil(speed_print * 35 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1 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 262fa01441..4a9e914b99 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 @@ -21,5 +21,9 @@ speed_print = 70 speed_topbottom = =math.ceil(speed_print * 35 / 70) speed_wall = =math.ceil(speed_print * 45 / 70) speed_wall_0 = =math.ceil(speed_wall * 35 / 70) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1 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 b05f4fdd62..dc73f13bb5 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 @@ -17,5 +17,9 @@ 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 +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1 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 aea145b1f9..ead512bb50 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 @@ -24,5 +24,9 @@ retraction_prime_speed = =retraction_speed speed_topbottom = =math.ceil(speed_print * 40 / 70) speed_wall = =math.ceil(speed_print * 55 / 70) speed_wall_0 = =math.ceil(speed_wall * 45 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.8 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 31d2b31017..c6641e7a08 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 @@ -27,6 +27,10 @@ raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 50 speed_wall = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.9 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.15mm.inst.cfg index 318a14834f..9712132da9 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.15mm.inst.cfg @@ -35,6 +35,10 @@ speed_topbottom = =math.ceil(speed_print * 25 / 25) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.1mm.inst.cfg index 1527a11fd0..79a0f11262 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.1mm.inst.cfg @@ -35,6 +35,10 @@ speed_topbottom = =math.ceil(speed_print * 25 / 25) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.2mm.inst.cfg index 356fa2d4cb..70207475dc 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_pp_0.2mm.inst.cfg @@ -35,6 +35,10 @@ speed_topbottom = =math.ceil(speed_print * 25 / 25) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.06mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.06mm.inst.cfg index 5f63f533f7..f3e17318b6 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.06mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.06mm.inst.cfg @@ -21,5 +21,9 @@ speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.15mm.inst.cfg index bf64c24170..6a3ec605ad 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.15mm.inst.cfg @@ -21,5 +21,9 @@ speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.1mm.inst.cfg index 977232f4d4..9e3a3586f3 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.1mm.inst.cfg @@ -21,5 +21,9 @@ speed_print = 45 speed_topbottom = =math.ceil(speed_print * 35 / 45) speed_wall = =math.ceil(speed_print * 40 / 45) speed_wall_0 = =math.ceil(speed_wall * 35 / 45) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.2mm.inst.cfg index 8e904a41a5..506ed71f9a 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.2mm.inst.cfg @@ -22,5 +22,9 @@ speed_roofing = =math.ceil(speed_wall * 20 / 24) speed_topbottom = =math.ceil(speed_print * 25 / 50) speed_wall = =math.ceil(speed_print * 36 / 50) speed_wall_0 = =math.ceil(speed_print * 26 / 50) +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.3mm.inst.cfg index 0ac60ad5a2..5590368369 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tough-pla_0.3mm.inst.cfg @@ -27,6 +27,10 @@ raft_airgap = 0.25 retraction_prime_speed = =retraction_speed speed_print = 50 speed_wall = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 wall_line_width_0 = =line_width * (1 + magic_spiralize * 0.25) diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg index b641bdbe13..281d99afb1 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.15mm.inst.cfg @@ -36,6 +36,10 @@ speed_topbottom = =math.ceil(speed_print * 0.8) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg index 9a4f7c61fd..450b9adeb4 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.1mm.inst.cfg @@ -35,6 +35,10 @@ speed_topbottom = =math.ceil(speed_print * 0.8) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg index 3461b45736..21fbcff466 100644 --- a/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_aa0.4_tpu_0.2mm.inst.cfg @@ -36,6 +36,10 @@ speed_topbottom = =math.ceil(speed_print * 0.8) speed_wall = =math.ceil(speed_print * 25 / 25) speed_wall_0 = =math.ceil(speed_wall * 25 / 25) support_angle = 50 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height switch_extruder_prime_speed = 15 switch_extruder_retraction_amount = 20 switch_extruder_retraction_speeds = 35 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.15mm.inst.cfg index 4921b87434..88ee346758 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.15mm.inst.cfg @@ -22,8 +22,9 @@ speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -support_bottom_distance = =support_z_distance / 2 -support_top_distance = =support_z_distance / 2 -support_z_distance = =layer_height * 2 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.8 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.2mm.inst.cfg index 2dde7772b6..00f9ef51ff 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.4_petcf_0.2mm.inst.cfg @@ -22,8 +22,9 @@ speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -support_bottom_distance = =support_z_distance / 2 -support_top_distance = =support_z_distance / 2 -support_z_distance = =layer_height * 2 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 0.8 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.15mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.15mm.inst.cfg index df11fcf377..c9a6a2bafe 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.15mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.15mm.inst.cfg @@ -22,8 +22,9 @@ speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -support_bottom_distance = =support_z_distance / 2 -support_top_distance = =support_z_distance / 2 -support_z_distance = =layer_height * 2 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.2mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.2mm.inst.cfg index 759f3ed41d..7abb9e4018 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.2mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.2mm.inst.cfg @@ -22,8 +22,9 @@ speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -support_bottom_distance = =support_z_distance / 2 -support_top_distance = =support_z_distance / 2 -support_z_distance = =layer_height * 2 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 diff --git a/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.3mm.inst.cfg b/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.3mm.inst.cfg index f18c0e018e..e0c6719bde 100644 --- a/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.3mm.inst.cfg +++ b/resources/quality/ultimaker_s5/um_s5_cc0.6_petcf_0.3mm.inst.cfg @@ -22,8 +22,9 @@ speed_topbottom = =speed_print speed_wall = =speed_print speed_wall_0 = =speed_wall speed_wall_x = =speed_wall -support_bottom_distance = =support_z_distance / 2 -support_top_distance = =support_z_distance / 2 -support_z_distance = =layer_height * 2 +support_bottom_distance = =support_z_distance +support_interface_enable = True +support_top_distance = =support_z_distance +support_z_distance = =math.ceil(0.3/layer_height)*layer_height top_bottom_thickness = 1.2 From 9407345377bf0479148308dbbe3ae2c7797b9724 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Wed, 12 Jul 2023 16:04:56 +0200 Subject: [PATCH 22/69] Color Picker from Qt 6.4 Native platform dialog is available on iOS,Linux (when running with the GTK+ platform theme) and macOS fixes: CURA-10687 --- resources/qml/ColorDialog.qml | 152 ------------------ .../Preferences/Materials/MaterialsView.qml | 6 +- 2 files changed, 3 insertions(+), 155 deletions(-) delete mode 100644 resources/qml/ColorDialog.qml diff --git a/resources/qml/ColorDialog.qml b/resources/qml/ColorDialog.qml deleted file mode 100644 index 99d46ed327..0000000000 --- a/resources/qml/ColorDialog.qml +++ /dev/null @@ -1,152 +0,0 @@ -// Copyright (c) 2022 UltiMaker -// Cura is released under the terms of the LGPLv3 or higher. - -import QtQuick 2.15 -import QtQuick.Controls 2.2 -import QtQuick.Window 2.1 -import QtQuick.Layouts 1.1 - -import UM 1.7 as UM -import Cura 1.7 as Cura - - -/* -* A dialog that provides the option to pick a color. Currently it only asks for a hex code and shows the color -* in a color swath -*/ -UM.Dialog -{ - id: base - - property variant catalog: UM.I18nCatalog { name: "cura" } - - margin: UM.Theme.getSize("default_margin").width - - property alias swatchGridColumns: colorSwatchGrid.columns - - // In this case we would like to let the content of the dialog determine the size of the dialog - // however with the current implementation of the dialog this is not possible, so instead we calculate - // the size of the dialog ourselves. - // Ugly workaround for windows having overlapping elements due to incorrect dialog width - minimumWidth: content.width + (Qt.platform.os === "windows" ? 4 * margin : 2 * margin) - minimumHeight: { - const footerHeight = Math.max(okButton.height, cancelButton.height); - return content.height + footerHeight + (Qt.platform.os === "windows" ? 5 * margin : 3 * margin); - } - - property alias color: colorInput.text - property var swatchColors: [ - "#2161AF", "#57AFB2", "#F7B32D", "#E33D4A", "#C088AD", - "#5D88BE", "#5ABD0E", "#E17239", "#F74E46", "#874AF9", - "#50C2EC", "#8DC15A", "#C3977A", "#CD7776", "#9086BA", - "#FFFFFF", "#D3D3D3", "#9E9E9E", "#5A5A5A", "#000000", - ] - - Component.onCompleted: updateSwatches() - onSwatchColorsChanged: updateSwatches() - - function updateSwatches() - { - swatchColorsModel.clear(); - for (const swatchColor of base.swatchColors) - { - swatchColorsModel.append({ swatchColor }); - } - } - - Column - { - id: content - width: childrenRect.width - height: childrenRect.height - spacing: UM.Theme.getSize("wide_margin").height - - GridLayout { - id: colorSwatchGrid - columns: 5 - width: childrenRect.width - height: childrenRect.height - columnSpacing: UM.Theme.getSize("thick_margin").width - rowSpacing: UM.Theme.getSize("thick_margin").height - - Repeater - { - model: ListModel - { - id: swatchColorsModel - } - - delegate: Rectangle - { - color: swatchColor - implicitWidth: UM.Theme.getSize("medium_button_icon").width - implicitHeight: UM.Theme.getSize("medium_button_icon").height - radius: width / 2 - - UM.ColorImage - { - anchors.fill: parent - visible: swatchColor == base.color - source: UM.Theme.getIcon("Check", "low") - color: UM.Theme.getColor("checkbox") - } - - MouseArea - { - anchors.fill: parent - onClicked: base.color = swatchColor - } - } - } - } - - RowLayout - { - width: parent.width - spacing: UM.Theme.getSize("default_margin").width - - UM.Label - { - text: catalog.i18nc("@label", "Hex") - } - - Cura.TextField - { - id: colorInput - Layout.fillWidth: true - text: "#FFFFFF" - selectByMouse: true - onTextChanged: { - if (!text.startsWith("#")) - { - text = `#${text}`; - } - } - validator: UM.HexColorValidator {} - } - - Rectangle - { - color: base.color - Layout.preferredHeight: parent.height - Layout.preferredWidth: height - } - } - } - - buttonSpacing: UM.Theme.getSize("thin_margin").width - - rightButtons: - [ - Cura.TertiaryButton { - id: cancelButton - text: catalog.i18nc("@action:button", "Cancel") - onClicked: base.close() - }, - Cura.PrimaryButton { - id: okButton - text: catalog.i18nc("@action:button", "OK") - onClicked: base.accept() - } - ] -} \ No newline at end of file diff --git a/resources/qml/Preferences/Materials/MaterialsView.qml b/resources/qml/Preferences/Materials/MaterialsView.qml index d37150075b..3245009a96 100644 --- a/resources/qml/Preferences/Materials/MaterialsView.qml +++ b/resources/qml/Preferences/Materials/MaterialsView.qml @@ -256,12 +256,12 @@ Item // popup dialog to select a new color // if successful it sets the properties.color_code value to the new color - Cura.ColorDialog + ColorDialog { id: colorDialog title: catalog.i18nc("@title", "Material color picker") - color: properties.color_code - onAccepted: base.setMetaDataEntry("color_code", properties.color_code, color) + selectedColor: properties.color_code + onAccepted: base.setMetaDataEntry("color_code", properties.color_code, selectedColor) } } } From f5785cf2354e433409225426ce8811e372e32ba4 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 14 Jul 2023 11:42:44 +0200 Subject: [PATCH 23/69] Add serialport logging to autobaudjob --- plugins/USBPrinting/AutoDetectBaudJob.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/USBPrinting/AutoDetectBaudJob.py b/plugins/USBPrinting/AutoDetectBaudJob.py index 1b791f6187..9d7a045bcc 100644 --- a/plugins/USBPrinting/AutoDetectBaudJob.py +++ b/plugins/USBPrinting/AutoDetectBaudJob.py @@ -21,7 +21,7 @@ class AutoDetectBaudJob(Job): self._all_baud_rates = [115200, 250000, 500000, 230400, 76800, 57600, 38400, 19200, 9600] def run(self) -> None: - Logger.log("d", "Auto detect baud rate started.") + Logger.debug(f"Auto detect baud rate started for {self._serial_port}") wait_response_timeouts = [3, 15, 30] wait_bootloader_times = [1.5, 5, 15] write_timeout = 3 From 9d72cc6acab8b450f703a586b5c807e788b47e17 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 14 Jul 2023 11:45:04 +0200 Subject: [PATCH 24/69] Update logging for autodetect baudrate --- plugins/USBPrinting/AutoDetectBaudJob.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/USBPrinting/AutoDetectBaudJob.py b/plugins/USBPrinting/AutoDetectBaudJob.py index 9d7a045bcc..1a7187be4d 100644 --- a/plugins/USBPrinting/AutoDetectBaudJob.py +++ b/plugins/USBPrinting/AutoDetectBaudJob.py @@ -46,8 +46,7 @@ class AutoDetectBaudJob(Job): wait_bootloader = wait_bootloader_times[retry] else: wait_bootloader = wait_bootloader_times[-1] - Logger.log("d", "Checking {serial} if baud rate {baud_rate} works. Retry nr: {retry}. Wait timeout: {timeout}".format( - serial = self._serial_port, baud_rate = baud_rate, retry = retry, timeout = wait_response_timeout)) + Logger.debug(f"Checking {self._serial_port} if baud rate {baud_rate} works. Retry nr: {retry}. Wait timeout: {wait_response_timeout}") if serial is None: try: @@ -61,7 +60,9 @@ class AutoDetectBaudJob(Job): serial.baudrate = baud_rate except ValueError: continue - sleep(wait_bootloader) # Ensure that we are not talking to the boot loader. 1.5 seconds seems to be the magic number + + # Ensure that we are not talking to the boot loader. 1.5 seconds seems to be the magic number + sleep(wait_bootloader) serial.write(b"\n") # Ensure we clear out previous responses serial.write(b"M105\n") @@ -83,4 +84,5 @@ class AutoDetectBaudJob(Job): serial.write(b"M105\n") sleep(15) # Give the printer some time to init and try again. + Logger.debug(f"Unable to find a working baudrate for {serial}") self.setResult(None) # Unable to detect the correct baudrate. From e05feb642fcc63bc13b64274e6184269242eee07 Mon Sep 17 00:00:00 2001 From: Randy Zwitch Date: Sat, 15 Jul 2023 13:18:31 -0400 Subject: [PATCH 25/69] Update PULL_REQUEST_TEMPLATE.md When clicked from PR, the link is broken (Chrome, Windows 11). It appears that GitHub might be case-sensitive w.r.t URLs. --- .github/PULL_REQUEST_TEMPLATE.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index a6327de3b6..8a014c17bc 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -28,6 +28,6 @@ This fixes... OR This improves... --> - [ ] My code follows the style guidelines of this project as described in [UltiMaker Meta](https://github.com/Ultimaker/Meta) and [Cura QML best practices](https://github.com/Ultimaker/Cura/wiki/QML-Best-Practices) -- [ ] I have read the [Contribution guide](https://github.com/Ultimaker/Cura/blob/main/contributing.md) +- [ ] I have read the [Contribution guide](https://github.com/Ultimaker/Cura/blob/main/CONTRIBUTING.md) - [ ] I have commented my code, particularly in hard-to-understand areas -- [ ] I have uploaded any files required to test this change \ No newline at end of file +- [ ] I have uploaded any files required to test this change From 7f04c326fbb0144d8cfd76a2ae66932f09ad4e48 Mon Sep 17 00:00:00 2001 From: GregValiant <64202104+GregValiant@users.noreply.github.com> Date: Sun, 16 Jul 2023 13:20:08 -0400 Subject: [PATCH 26/69] Update creality_ender3s1plus.def.json Change the G28 O to a plain G28 for backward compatibility with firmware. Update Creality3s1 series startup gcode Removed the "G28 O ;Home all untrusted axes" Replaced with "G28 ; Home all axes" Some firmware will not accept the "O" parameter. --- resources/definitions/creality_ender3s1.def.json | 2 +- resources/definitions/creality_ender3s1plus.def.json | 2 +- resources/definitions/creality_ender3s1pro.def.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/creality_ender3s1.def.json b/resources/definitions/creality_ender3s1.def.json index 37e69d72c0..62405572d7 100644 --- a/resources/definitions/creality_ender3s1.def.json +++ b/resources/definitions/creality_ender3s1.def.json @@ -24,7 +24,7 @@ }, "machine_height": { "default_value": 270 }, "machine_name": { "default_value": "Creality Ender-3 S1" }, - "machine_start_gcode": { "default_value": "; Ender 3 S1 Start G-code\n; M413 S0 ; Disable power loss recovery\nG92 E0 ; Reset Extruder\n\n; Prep surfaces before auto home for better accuracy\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0}\n\nG28 O ; Home all untrusted axes\nG1 Z10.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0 Y0\n\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\n\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" }, + "machine_start_gcode": { "default_value": "; Ender 3 S1 Start G-code\n; M413 S0 ; Disable power loss recovery\nG92 E0 ; Reset Extruder\n\n; Prep surfaces before auto home for better accuracy\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0}\n\nG28 ; Home all axes\nG1 Z10.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0 Y0\n\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\n\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" }, "machine_width": { "default_value": 220 }, "retraction_amount": { "value": 0.8 }, "retraction_extrusion_window": { "value": 1.5 }, diff --git a/resources/definitions/creality_ender3s1plus.def.json b/resources/definitions/creality_ender3s1plus.def.json index 61da5b690e..0982104cd9 100644 --- a/resources/definitions/creality_ender3s1plus.def.json +++ b/resources/definitions/creality_ender3s1plus.def.json @@ -24,7 +24,7 @@ }, "machine_height": { "default_value": 300 }, "machine_name": { "default_value": "Creality Ender-3 S1 Plus" }, - "machine_start_gcode": { "default_value": "; Ender 3 S1 Plus Start G-code\n; M413 S0 ; Disable power loss recovery\nG92 E0 ; Reset Extruder\n\n; Prep surfaces before auto home for better accuracy\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0}\n\nG28 O ; Home all untrusted axes\nG1 Z10.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0 Y0\n\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\n\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" }, + "machine_start_gcode": { "default_value": "; Ender 3 S1 Plus Start G-code\n; M413 S0 ; Disable power loss recovery\nG92 E0 ; Reset Extruder\n\n; Prep surfaces before auto home for better accuracy\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0}\n\nG28 ; Home all axes\nG1 Z10.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0 Y0\n\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\n\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" }, "machine_width": { "default_value": 300 }, "retraction_amount": { "value": 0.8 }, "retraction_extrusion_window": { "value": 1.5 }, diff --git a/resources/definitions/creality_ender3s1pro.def.json b/resources/definitions/creality_ender3s1pro.def.json index ba5d22e2dc..d375a904de 100644 --- a/resources/definitions/creality_ender3s1pro.def.json +++ b/resources/definitions/creality_ender3s1pro.def.json @@ -24,7 +24,7 @@ }, "machine_height": { "default_value": 270 }, "machine_name": { "default_value": "Creality Ender-3 S1 Pro" }, - "machine_start_gcode": { "default_value": "; Ender 3 S1 Pro Start G-code\n; M413 S0 ; Disable power loss recovery\nG92 E0 ; Reset Extruder\n\n; Prep surfaces before auto home for better accuracy\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0}\n\nG28 O ; Home all untrusted axes\nG1 Z10.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0 Y0\n\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\n\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" }, + "machine_start_gcode": { "default_value": "; Ender 3 S1 Pro Start G-code\n; M413 S0 ; Disable power loss recovery\nG92 E0 ; Reset Extruder\n\n; Prep surfaces before auto home for better accuracy\nM140 S{material_bed_temperature_layer_0}\nM104 S{material_print_temperature_layer_0}\n\nG28 ; Home all axes\nG1 Z10.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0 Y0\n\nM190 S{material_bed_temperature_layer_0}\nM109 S{material_print_temperature_layer_0}\n\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish\n" }, "machine_width": { "default_value": 220 }, "retraction_amount": { "value": 0.8 }, "retraction_extrusion_window": { "value": 1.5 }, From 4d99dabefcae552affff698725f887f666bf5db3 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Mon, 17 Jul 2023 10:42:07 +0200 Subject: [PATCH 27/69] Discription added in the tooltip about skirt presence even after disabling it CURA-10758 --- .../Recommended/RecommendedAdhesionSelector.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml index 2183ef7d5e..07e9c1ffaa 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedAdhesionSelector.qml @@ -17,7 +17,7 @@ RecommendedSettingSection enableSectionSwitchVisible: platformAdhesionType.properties.enabled === "True" enableSectionSwitchChecked: platformAdhesionType.properties.value !== "skirt" && platformAdhesionType.properties.value !== "none" enableSectionSwitchEnabled: recommendedPrintSetup.settingsEnabled - tooltipText: catalog.i18nc("@label", "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards.") + tooltipText: catalog.i18nc("@label", "Enable printing a brim or raft. This will add a flat area around or under your object which is easy to cut off afterwards. Disabling it results in a skirt around object by default.") property var curaRecommendedMode: Cura.RecommendedMode {} From 62d3e1cf40863064a4a2186a5562f30a3d5a37fa Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 17 Jul 2023 12:55:52 +0200 Subject: [PATCH 28/69] Automatically scroll down in crash handler It was reaaaaaly annoying me that people would post screenshots all the time. Those screenshots would never include the info you need, because it would only capture the top of the exception / logs. --- cura/CrashHandler.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/cura/CrashHandler.py b/cura/CrashHandler.py index e6214d7073..e2f20355c7 100644 --- a/cura/CrashHandler.py +++ b/cura/CrashHandler.py @@ -22,7 +22,7 @@ except ImportError: from PyQt6.QtCore import QT_VERSION_STR, PYQT_VERSION_STR, QUrl from PyQt6.QtWidgets import QDialog, QDialogButtonBox, QVBoxLayout, QLabel, QTextEdit, QGroupBox, QCheckBox, QPushButton -from PyQt6.QtGui import QDesktopServices +from PyQt6.QtGui import QDesktopServices, QTextCursor from UM.Application import Application from UM.Logger import Logger @@ -309,7 +309,7 @@ class CrashHandler: trace = "".join(trace_list) text_area.setText(trace) text_area.setReadOnly(True) - + text_area.moveCursor(QTextCursor.MoveOperation.End) # Move cursor to end, so we see last bit of the exception layout.addWidget(text_area) group.setLayout(layout) @@ -400,7 +400,7 @@ class CrashHandler: text_area.setText(logdata) text_area.setReadOnly(True) - + text_area.moveCursor(QTextCursor.MoveOperation.End) # Move cursor to end, so we see last bit of the log layout.addWidget(text_area) group.setLayout(layout) From 228a3e821e3e9e295130904844f800fe287cc27f Mon Sep 17 00:00:00 2001 From: MariMakes <40423138+MariMakes@users.noreply.github.com> Date: Tue, 18 Jul 2023 12:06:26 +0200 Subject: [PATCH 29/69] Add Support Structure to Basic We show this setting in recommended, so it's safe to say we can show it in basic. --- resources/setting_visibility/basic.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/resources/setting_visibility/basic.cfg b/resources/setting_visibility/basic.cfg index 927989fee3..0193eb26ba 100644 --- a/resources/setting_visibility/basic.cfg +++ b/resources/setting_visibility/basic.cfg @@ -45,6 +45,7 @@ support_extruder_nr support_type support_angle support_offset +support_structure [platform_adhesion] prime_blob_enable From 1e240e32292557fb4b5bbdb3eb3011894260a2e2 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 21 Jul 2023 10:57:39 +0200 Subject: [PATCH 30/69] Let intent selection use the quality_definition instead of direct def The issue was that sometimes intents are also shared. CURA-10788 --- cura/Machines/Models/IntentSelectionModel.py | 19 ++++++++++--------- cura/Settings/CuraContainerStack.py | 4 ++-- 2 files changed, 12 insertions(+), 11 deletions(-) diff --git a/cura/Machines/Models/IntentSelectionModel.py b/cura/Machines/Models/IntentSelectionModel.py index 603244a12b..3df94e4ad8 100644 --- a/cura/Machines/Models/IntentSelectionModel.py +++ b/cura/Machines/Models/IntentSelectionModel.py @@ -71,15 +71,15 @@ class IntentSelectionModel(ListModel): def _update(self) -> None: Logger.log("d", "Updating {model_class_name}.".format(model_class_name = self.__class__.__name__)) - - global_stack = cura.CuraApplication.CuraApplication.getInstance().getGlobalContainerStack() + cura_application = cura.CuraApplication.CuraApplication.getInstance() + global_stack = cura_application.getGlobalContainerStack() if global_stack is None: self.setItems([]) Logger.log("d", "No active GlobalStack, set quality profile model as empty.") return # Check for material compatibility - if not cura.CuraApplication.CuraApplication.getInstance().getMachineManager().activeMaterialsCompatible(): + if not cura_application.getMachineManager().activeMaterialsCompatible(): Logger.log("d", "No active material compatibility, set quality profile model as empty.") self.setItems([]) return @@ -101,17 +101,18 @@ class IntentSelectionModel(ListModel): else: # There can be multiple intents with the same category, use one of these # intent-metadata's for the icon/description defintions for the intent - intent_metadata = cura.CuraApplication.CuraApplication \ - .getInstance() \ - .getContainerRegistry() \ - .findContainersMetadata(type="intent", definition=global_stack.definition.getId(), - intent_category=category)[0] + + + + intent_metadata = cura_application.getContainerRegistry().findContainersMetadata(type="intent", + definition=global_stack.findInstanceContainerDefinitionId(global_stack.definition), + intent_category=category)[0] intent_name = intent_metadata.get("name", category.title()) icon = intent_metadata.get("icon", None) description = intent_metadata.get("description", None) - if icon is not None: + if icon is not None and icon != '': try: icon = QUrl.fromLocalFile( Resources.getPath(cura.CuraApplication.CuraApplication.ResourceTypes.ImageFiles, icon)) diff --git a/cura/Settings/CuraContainerStack.py b/cura/Settings/CuraContainerStack.py index 41502f8874..b5b8a1b721 100755 --- a/cura/Settings/CuraContainerStack.py +++ b/cura/Settings/CuraContainerStack.py @@ -359,7 +359,7 @@ class CuraContainerStack(ContainerStack): return self.definition @classmethod - def _findInstanceContainerDefinitionId(cls, machine_definition: DefinitionContainerInterface) -> str: + def findInstanceContainerDefinitionId(cls, machine_definition: DefinitionContainerInterface) -> str: """Find the ID that should be used when searching for instance containers for a specified definition. This handles the situation where the definition specifies we should use a different definition when @@ -379,7 +379,7 @@ class CuraContainerStack(ContainerStack): Logger.log("w", "Unable to find parent definition {parent} for machine {machine}", parent = quality_definition, machine = machine_definition.id) #type: ignore return machine_definition.id #type: ignore - return cls._findInstanceContainerDefinitionId(definitions[0]) + return cls.findInstanceContainerDefinitionId(definitions[0]) def getExtruderPositionValueWithDefault(self, key): """getProperty for extruder positions, with translation from -1 to default extruder number""" From 8b8e96429339f7543c7cd0f50c710a3539b74258 Mon Sep 17 00:00:00 2001 From: MariMakes <40423138+MariMakes@users.noreply.github.com> Date: Fri, 21 Jul 2023 11:34:02 +0200 Subject: [PATCH 31/69] Fix wrong licenses These seem to be wrong by accident. Let's update them to reflect the rest of Cura which falls under the LGPLv3 or higher. --- plugins/PostProcessingPlugin/PostProcessingPlugin.py | 2 +- plugins/PostProcessingPlugin/PostProcessingPlugin.qml | 2 +- plugins/PostProcessingPlugin/Script.py | 2 +- plugins/PostProcessingPlugin/scripts/ChangeAtZ.py | 2 +- plugins/PostProcessingPlugin/scripts/ColorMix.py | 2 +- plugins/PostProcessingPlugin/scripts/FilamentChange.py | 2 +- plugins/PostProcessingPlugin/scripts/RetractContinue.py | 2 +- plugins/PostProcessingPlugin/scripts/SearchAndReplace.py | 2 +- plugins/PostProcessingPlugin/scripts/Stretch.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.py b/plugins/PostProcessingPlugin/PostProcessingPlugin.py index fbb4214021..b3ef761af5 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.py +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.py @@ -1,5 +1,5 @@ # Copyright (c) 2018 Jaime van Kessel, Ultimaker B.V. -# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. +# The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. import configparser # The script lists are stored in metadata as serialised config files. import importlib.util diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml index a80f304aaa..0f379479ba 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml @@ -1,5 +1,5 @@ // Copyright (c) 2022 Jaime van Kessel, Ultimaker B.V. -// The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. +// The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. import QtQuick 2.2 import QtQuick.Controls 2.15 diff --git a/plugins/PostProcessingPlugin/Script.py b/plugins/PostProcessingPlugin/Script.py index 1cc9b59c9c..be661e0889 100644 --- a/plugins/PostProcessingPlugin/Script.py +++ b/plugins/PostProcessingPlugin/Script.py @@ -1,6 +1,6 @@ # Copyright (c) 2015 Jaime van Kessel # Copyright (c) 2018 Ultimaker B.V. -# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. +# The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. from typing import Optional, Any, Dict, TYPE_CHECKING, List from UM.Signal import Signal, signalemitter diff --git a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py index 91b36389f3..2930623a93 100644 --- a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py +++ b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py @@ -1,7 +1,7 @@ # ChangeAtZ script - Change printing parameters at a given height # This script is the successor of the TweakAtZ plugin for legacy Cura. # It contains code from the TweakAtZ plugin V1.0-V4.x and from the ExampleScript by Jaime van Kessel, Ultimaker B.V. -# It runs with the PostProcessingPlugin which is released under the terms of the AGPLv3 or higher. +# It runs with the PostProcessingPlugin which is released under the terms of the LGPLv3 or higher. # This script is licensed under the Creative Commons - Attribution - Share Alike (CC BY-SA) terms # Authors of the ChangeAtZ plugin / script: diff --git a/plugins/PostProcessingPlugin/scripts/ColorMix.py b/plugins/PostProcessingPlugin/scripts/ColorMix.py index dacb40e905..534c0208cf 100644 --- a/plugins/PostProcessingPlugin/scripts/ColorMix.py +++ b/plugins/PostProcessingPlugin/scripts/ColorMix.py @@ -1,6 +1,6 @@ # ColorMix script - 2-1 extruder color mix and blending # This script is specific for the Geeetech A10M dual extruder but should work with other Marlin printers. -# It runs with the PostProcessingPlugin which is released under the terms of the AGPLv3 or higher. +# It runs with the PostProcessingPlugin which is released under the terms of the LGPLv3 or higher. # This script is licensed under the Creative Commons - Attribution - Share Alike (CC BY-SA) terms #Authors of the 2-1 ColorMix plug-in / script: diff --git a/plugins/PostProcessingPlugin/scripts/FilamentChange.py b/plugins/PostProcessingPlugin/scripts/FilamentChange.py index d3c1e60192..93941c0992 100644 --- a/plugins/PostProcessingPlugin/scripts/FilamentChange.py +++ b/plugins/PostProcessingPlugin/scripts/FilamentChange.py @@ -1,5 +1,5 @@ # Copyright (c) 2023 Ultimaker B.V. -# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. +# The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. # Modification 06.09.2020 # add checkbox, now you can choose and use configuration from the firmware itself. diff --git a/plugins/PostProcessingPlugin/scripts/RetractContinue.py b/plugins/PostProcessingPlugin/scripts/RetractContinue.py index b5ea4d4eda..eaa15e0942 100644 --- a/plugins/PostProcessingPlugin/scripts/RetractContinue.py +++ b/plugins/PostProcessingPlugin/scripts/RetractContinue.py @@ -1,5 +1,5 @@ # Copyright (c) 2023 UltiMaker B.V. -# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. +# The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. from ..Script import Script diff --git a/plugins/PostProcessingPlugin/scripts/SearchAndReplace.py b/plugins/PostProcessingPlugin/scripts/SearchAndReplace.py index 40a56ace57..7a12c229cc 100644 --- a/plugins/PostProcessingPlugin/scripts/SearchAndReplace.py +++ b/plugins/PostProcessingPlugin/scripts/SearchAndReplace.py @@ -1,5 +1,5 @@ # Copyright (c) 2017 Ghostkeeper -# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. +# The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. import re #To perform the search and replace. diff --git a/plugins/PostProcessingPlugin/scripts/Stretch.py b/plugins/PostProcessingPlugin/scripts/Stretch.py index 8d35f68822..ab964d160a 100644 --- a/plugins/PostProcessingPlugin/scripts/Stretch.py +++ b/plugins/PostProcessingPlugin/scripts/Stretch.py @@ -1,4 +1,4 @@ -# This PostProcessingPlugin script is released under the terms of the AGPLv3 or higher. +# This PostProcessingPlugin script is released under the terms of the LGPLv3 or higher. """ Copyright (c) 2017 Christophe Baribaud 2017 Python implementation of https://github.com/electrocbd/post_stretch From 08748b1a336b4bb5a40e55b05bd6f4937621f7ac Mon Sep 17 00:00:00 2001 From: MariMakes <40423138+MariMakes@users.noreply.github.com> Date: Fri, 21 Jul 2023 13:53:36 +0200 Subject: [PATCH 32/69] Update description for Hole Horizontal expansion Clarify relation with Hole Horizontal Expansion and ole Horizontal Expansion Max Diameter --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 915a550a33..d1c532a32d 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -1289,7 +1289,7 @@ "hole_xy_offset": { "label": "Hole Horizontal Expansion", - "description": "Amount of offset applied to all holes in each layer. Positive values increase the size of the holes, negative values reduce the size of the holes.", + "description": "When greater than zero, the Hole Horizontal Expansion is the amount of offset applied to all holes in each layer. Positive values increase the size of the holes, negative values reduce the size of the holes. When this setting is enabled it can be further tuned with Hole Horizontal Expansion Max Diameter.", "unit": "mm", "type": "float", "minimum_value_warning": "-1", From 56b8205ce04c30ff954dba03ab453e64499d9a85 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Sun, 23 Jul 2023 17:48:11 +0200 Subject: [PATCH 33/69] Revert "Fix wrong licenses" This reverts commit 8b8e96429339f7543c7cd0f50c710a3539b74258. --- plugins/PostProcessingPlugin/PostProcessingPlugin.py | 2 +- plugins/PostProcessingPlugin/PostProcessingPlugin.qml | 2 +- plugins/PostProcessingPlugin/Script.py | 2 +- plugins/PostProcessingPlugin/scripts/ChangeAtZ.py | 2 +- plugins/PostProcessingPlugin/scripts/ColorMix.py | 2 +- plugins/PostProcessingPlugin/scripts/FilamentChange.py | 2 +- plugins/PostProcessingPlugin/scripts/RetractContinue.py | 2 +- plugins/PostProcessingPlugin/scripts/SearchAndReplace.py | 2 +- plugins/PostProcessingPlugin/scripts/Stretch.py | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.py b/plugins/PostProcessingPlugin/PostProcessingPlugin.py index b3ef761af5..fbb4214021 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.py +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.py @@ -1,5 +1,5 @@ # Copyright (c) 2018 Jaime van Kessel, Ultimaker B.V. -# The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. +# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. import configparser # The script lists are stored in metadata as serialised config files. import importlib.util diff --git a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml index 0f379479ba..a80f304aaa 100644 --- a/plugins/PostProcessingPlugin/PostProcessingPlugin.qml +++ b/plugins/PostProcessingPlugin/PostProcessingPlugin.qml @@ -1,5 +1,5 @@ // Copyright (c) 2022 Jaime van Kessel, Ultimaker B.V. -// The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. +// The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. import QtQuick 2.2 import QtQuick.Controls 2.15 diff --git a/plugins/PostProcessingPlugin/Script.py b/plugins/PostProcessingPlugin/Script.py index be661e0889..1cc9b59c9c 100644 --- a/plugins/PostProcessingPlugin/Script.py +++ b/plugins/PostProcessingPlugin/Script.py @@ -1,6 +1,6 @@ # Copyright (c) 2015 Jaime van Kessel # Copyright (c) 2018 Ultimaker B.V. -# The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. +# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. from typing import Optional, Any, Dict, TYPE_CHECKING, List from UM.Signal import Signal, signalemitter diff --git a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py index 2930623a93..91b36389f3 100644 --- a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py +++ b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py @@ -1,7 +1,7 @@ # ChangeAtZ script - Change printing parameters at a given height # This script is the successor of the TweakAtZ plugin for legacy Cura. # It contains code from the TweakAtZ plugin V1.0-V4.x and from the ExampleScript by Jaime van Kessel, Ultimaker B.V. -# It runs with the PostProcessingPlugin which is released under the terms of the LGPLv3 or higher. +# It runs with the PostProcessingPlugin which is released under the terms of the AGPLv3 or higher. # This script is licensed under the Creative Commons - Attribution - Share Alike (CC BY-SA) terms # Authors of the ChangeAtZ plugin / script: diff --git a/plugins/PostProcessingPlugin/scripts/ColorMix.py b/plugins/PostProcessingPlugin/scripts/ColorMix.py index 534c0208cf..dacb40e905 100644 --- a/plugins/PostProcessingPlugin/scripts/ColorMix.py +++ b/plugins/PostProcessingPlugin/scripts/ColorMix.py @@ -1,6 +1,6 @@ # ColorMix script - 2-1 extruder color mix and blending # This script is specific for the Geeetech A10M dual extruder but should work with other Marlin printers. -# It runs with the PostProcessingPlugin which is released under the terms of the LGPLv3 or higher. +# It runs with the PostProcessingPlugin which is released under the terms of the AGPLv3 or higher. # This script is licensed under the Creative Commons - Attribution - Share Alike (CC BY-SA) terms #Authors of the 2-1 ColorMix plug-in / script: diff --git a/plugins/PostProcessingPlugin/scripts/FilamentChange.py b/plugins/PostProcessingPlugin/scripts/FilamentChange.py index 93941c0992..d3c1e60192 100644 --- a/plugins/PostProcessingPlugin/scripts/FilamentChange.py +++ b/plugins/PostProcessingPlugin/scripts/FilamentChange.py @@ -1,5 +1,5 @@ # Copyright (c) 2023 Ultimaker B.V. -# The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. +# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. # Modification 06.09.2020 # add checkbox, now you can choose and use configuration from the firmware itself. diff --git a/plugins/PostProcessingPlugin/scripts/RetractContinue.py b/plugins/PostProcessingPlugin/scripts/RetractContinue.py index eaa15e0942..b5ea4d4eda 100644 --- a/plugins/PostProcessingPlugin/scripts/RetractContinue.py +++ b/plugins/PostProcessingPlugin/scripts/RetractContinue.py @@ -1,5 +1,5 @@ # Copyright (c) 2023 UltiMaker B.V. -# The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. +# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. from ..Script import Script diff --git a/plugins/PostProcessingPlugin/scripts/SearchAndReplace.py b/plugins/PostProcessingPlugin/scripts/SearchAndReplace.py index 7a12c229cc..40a56ace57 100644 --- a/plugins/PostProcessingPlugin/scripts/SearchAndReplace.py +++ b/plugins/PostProcessingPlugin/scripts/SearchAndReplace.py @@ -1,5 +1,5 @@ # Copyright (c) 2017 Ghostkeeper -# The PostProcessingPlugin is released under the terms of the LGPLv3 or higher. +# The PostProcessingPlugin is released under the terms of the AGPLv3 or higher. import re #To perform the search and replace. diff --git a/plugins/PostProcessingPlugin/scripts/Stretch.py b/plugins/PostProcessingPlugin/scripts/Stretch.py index ab964d160a..8d35f68822 100644 --- a/plugins/PostProcessingPlugin/scripts/Stretch.py +++ b/plugins/PostProcessingPlugin/scripts/Stretch.py @@ -1,4 +1,4 @@ -# This PostProcessingPlugin script is released under the terms of the LGPLv3 or higher. +# This PostProcessingPlugin script is released under the terms of the AGPLv3 or higher. """ Copyright (c) 2017 Christophe Baribaud 2017 Python implementation of https://github.com/electrocbd/post_stretch From 0c7d0540b9cc05ee37ce5e2d9f4991065ed6490c Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Tue, 25 Jul 2023 11:20:58 +0200 Subject: [PATCH 34/69] Cura about dialog when shaked gives extra info CURA-10770 --- .gitignore | 1 + AboutDialogVersionsList.qml.jinja | 61 +++++++++++++++++++++++++++ conanfile.py | 24 +++++++++++ resources/qml/Dialogs/AboutDialog.qml | 45 +++++++++++++++++++- 4 files changed, 129 insertions(+), 2 deletions(-) create mode 100644 AboutDialogVersionsList.qml.jinja diff --git a/.gitignore b/.gitignore index 45cf4400f6..048bb915c7 100644 --- a/.gitignore +++ b/.gitignore @@ -101,3 +101,4 @@ graph_info.json Ultimaker-Cura.spec .run/ /printer-linter/src/printerlinter.egg-info/ +/resources/qml/Dialogs/AboutDialogVersionsList.qml diff --git a/AboutDialogVersionsList.qml.jinja b/AboutDialogVersionsList.qml.jinja new file mode 100644 index 0000000000..0503469660 --- /dev/null +++ b/AboutDialogVersionsList.qml.jinja @@ -0,0 +1,61 @@ +import QtQuick 2.2 +import QtQuick.Controls 2.9 + +import UM 1.6 as UM +import Cura 1.5 as Cura + + +ListView +{ + id: projectBuildInfoList + visible: false + anchors.top: creditsNotes.bottom + anchors.topMargin: UM.Theme.getSize("default_margin").height + width: parent.width + height: base.height - y - (2 * UM.Theme.getSize("default_margin").height + closeButton.height) + + ScrollBar.vertical: UM.ScrollBar + { + id: projectBuildInfoListScrollBar + } + + delegate: Row + { + spacing: UM.Theme.getSize("narrow_margin").width + UM.Label + { + text: (model.name) + width: (projectBuildInfoList.width* 0.4) | 0 + elide: Text.ElideRight + } + UM.Label + { + text: (model.version) + width: (projectBuildInfoList.width *0.6) | 0 + elide: Text.ElideRight + } + + } + model: ListModel + { + id: developerInfo + } + Component.onCompleted: + { + var conan_installs = {{ conan_installs }}; + var python_installs = {{ python_installs }}; + developerInfo.append({ name : "

Conan Installs

", version : '' }); + for (var n in conan_installs) + { + developerInfo.append({ name : conan_installs[n][0], version : conan_installs[n][1] }); + } + developerInfo.append({ name : '', version : '' }); + developerInfo.append({ name : "

Python Installs

", version : '' }); + for (var n in python_installs) + { + developerInfo.append({ name : python_installs[n][0], version : python_installs[n][1] }); + } + + } +} + diff --git a/conanfile.py b/conanfile.py index 46e143cc10..d75b2bc6bf 100644 --- a/conanfile.py +++ b/conanfile.py @@ -138,6 +138,29 @@ class CuraConan(ConanFile): return "'x86_64'" return "None" + def _generate_about_versions(self, location): + with open(os.path.join(self.recipe_folder, "AboutDialogVersionsList.qml.jinja"), "r") as f: + cura_version_py = Template(f.read()) + + conan_installs = [] + python_installs = [] + + # list of conan installs + for _, dependency in self.dependencies.host.items(): + conan_installs.append([dependency.ref.name,dependency.ref.version]) + + #list of python installs + import pkg_resources + for package in pkg_resources.working_set: + python_installs.append([package.key, package.version]) + + with open(os.path.join(location, "AboutDialogVersionsList.qml"), "w") as f: + f.write(cura_version_py.render( + conan_installs = conan_installs, + python_installs = python_installs + )) + + def _generate_cura_version(self, location): with open(os.path.join(self.recipe_folder, "CuraVersion.py.jinja"), "r") as f: cura_version_py = Template(f.read()) @@ -307,6 +330,7 @@ class CuraConan(ConanFile): vr.generate() self._generate_cura_version(os.path.join(self.source_folder, "cura")) + self._generate_about_versions(os.path.join(self.source_folder, "resources/qml/Dialogs")) if self.options.devtools: entitlements_file = "'{}'".format(os.path.join(self.source_folder, "packaging", "MacOS", "cura.entitlements")) diff --git a/resources/qml/Dialogs/AboutDialog.qml b/resources/qml/Dialogs/AboutDialog.qml index 4ccf58d0b4..361e19a45d 100644 --- a/resources/qml/Dialogs/AboutDialog.qml +++ b/resources/qml/Dialogs/AboutDialog.qml @@ -1,10 +1,10 @@ // Copyright (c) 2022 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. -import QtQuick 2.2 +import QtQuick 2.4 import QtQuick.Controls 2.9 -import UM 1.5 as UM +import UM 1.6 as UM import Cura 1.5 as Cura UM.Dialog @@ -21,6 +21,22 @@ UM.Dialog backgroundColor: UM.Theme.getColor("main_background") + property real dialogX: base.x + property real dialogY: base.y + property int shakeDetected: (shakeDetector.shakeIsdetected) + property UM.ShakeDetector shakeDetector: UM.ShakeDetector{ } + + readonly property Timer timer : Timer + { + interval: 100 // Update interval in milliseconds (adjust as needed) + running: onDialogXChanged || onDialogYChanged + repeat: true + onTriggered: + { + shakeDetector.checkForShake(dialogX, dialogY) + } + } + Rectangle { id: header @@ -181,6 +197,31 @@ UM.Dialog } } + AboutDialogVersionsList{ + id: projectBuildInfoList + + } + + onShakeDetectedChanged: + { + if (!projectBuildInfoList.visible) + { + projectsList.visible= false; + projectBuildInfoList.visible = true; + } + else + { + projectsList.visible = true; + projectBuildInfoList.visible = false; + } + } + + onVisibleChanged: + { + projectsList.visible = true; + projectBuildInfoList.visible = false; + } + rightButtons: Cura.TertiaryButton { //: Close about dialog button From afc0f7c615a7b819c331d8a596d76831489c3b43 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Tue, 25 Jul 2023 13:11:43 +0200 Subject: [PATCH 35/69] Update to add sort_by option Added a class attribute "last_updated" for sort_by Added an instance attribute for search_sort Added if statement to add the sort_by string, currently by default. --- plugins/Marketplace/RemotePackageList.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/Marketplace/RemotePackageList.py b/plugins/Marketplace/RemotePackageList.py index d06d2c64c5..a4c453e25d 100644 --- a/plugins/Marketplace/RemotePackageList.py +++ b/plugins/Marketplace/RemotePackageList.py @@ -21,6 +21,7 @@ catalog = i18nCatalog("cura") class RemotePackageList(PackageList): ITEMS_PER_PAGE = 20 # Pagination of number of elements to download at once. + LAST_UPDATED = "last_updated" # Default value to send for sort_by filter. def __init__(self, parent: Optional["QObject"] = None) -> None: super().__init__(parent) @@ -28,6 +29,7 @@ class RemotePackageList(PackageList): self._package_type_filter = "" self._requested_search_string = "" self._current_search_string = "" + self._search_sort = "sort_by" self._search_type = "search" self._request_url = self._initialRequestUrl() self._ongoing_requests["get_packages"] = None @@ -102,6 +104,8 @@ class RemotePackageList(PackageList): request_url += f"&package_type={self._package_type_filter}" if self._current_search_string != "": request_url += f"&{self._search_type}={self._current_search_string}" + if self._search_sort != "": + request_url += f"&{self._search_sort}={self.LAST_UPDATED}" return request_url def _parseResponse(self, reply: "QNetworkReply") -> None: From 86cb3851fe8091df96613ce91e5c9f5d39321fdc Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 25 Jul 2023 13:20:26 +0200 Subject: [PATCH 36/69] Force left to right reading direction for numeric textfield CURA-10583 --- resources/qml/MachineSettings/NumericTextFieldWithUnit.qml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml b/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml index 64beeb9834..408db66f3a 100644 --- a/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml +++ b/resources/qml/MachineSettings/NumericTextFieldWithUnit.qml @@ -76,6 +76,11 @@ UM.TooltipArea anchors.left: fieldLabel.right anchors.leftMargin: spacing verticalAlignment: Text.AlignVCenter + + // The control is set up for left to right. So we force it to that. If we don't, it will take the OS reading + // direction, which might not be left to right. This will lead to the text overlapping with the unit + horizontalAlignment: TextInput.AlignLeft + selectionColor: UM.Theme.getColor("text_selection") selectedTextColor: UM.Theme.getColor("setting_control_text") padding: 0 From 8c54d44cbb61e80f138fc8de4a708a1b0f432625 Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Tue, 25 Jul 2023 13:27:08 +0200 Subject: [PATCH 37/69] Apply suggestions from code review --- plugins/Marketplace/RemotePackageList.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/Marketplace/RemotePackageList.py b/plugins/Marketplace/RemotePackageList.py index a4c453e25d..78f24a72a1 100644 --- a/plugins/Marketplace/RemotePackageList.py +++ b/plugins/Marketplace/RemotePackageList.py @@ -21,7 +21,7 @@ catalog = i18nCatalog("cura") class RemotePackageList(PackageList): ITEMS_PER_PAGE = 20 # Pagination of number of elements to download at once. - LAST_UPDATED = "last_updated" # Default value to send for sort_by filter. + SORT_TYPE = "last_updated" # Default value to send for sort_by filter. def __init__(self, parent: Optional["QObject"] = None) -> None: super().__init__(parent) @@ -105,7 +105,7 @@ class RemotePackageList(PackageList): if self._current_search_string != "": request_url += f"&{self._search_type}={self._current_search_string}" if self._search_sort != "": - request_url += f"&{self._search_sort}={self.LAST_UPDATED}" + request_url += f"&{self._search_sort}={self.SORT_TYPE}" return request_url def _parseResponse(self, reply: "QNetworkReply") -> None: From 7e2fc1ac5b03d2b2d1f7b55314acc5f018cdc289 Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Tue, 25 Jul 2023 13:29:22 +0200 Subject: [PATCH 38/69] Update plugins/Marketplace/RemotePackageList.py --- plugins/Marketplace/RemotePackageList.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Marketplace/RemotePackageList.py b/plugins/Marketplace/RemotePackageList.py index 78f24a72a1..f8826ff395 100644 --- a/plugins/Marketplace/RemotePackageList.py +++ b/plugins/Marketplace/RemotePackageList.py @@ -104,7 +104,7 @@ class RemotePackageList(PackageList): request_url += f"&package_type={self._package_type_filter}" if self._current_search_string != "": request_url += f"&{self._search_type}={self._current_search_string}" - if self._search_sort != "": + if self.SORT_TYPE: request_url += f"&{self._search_sort}={self.SORT_TYPE}" return request_url From 23d79de4b982e05952138e425bb62f6ea22af1ab Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Tue, 25 Jul 2023 13:34:29 +0200 Subject: [PATCH 39/69] Make show custom button more visible in darkmode CURA-10782 --- .../qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml index 50b5dc7357..0f4efc8498 100644 --- a/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml +++ b/resources/qml/PrintSetupSelector/Recommended/RecommendedPrintSetup.qml @@ -111,7 +111,6 @@ Flickable anchors.right: parent.right text: catalog.i18nc("@button", "Show Custom") textFont: UM.Theme.getFont("medium_bold") - outlineColor: "transparent" onClicked: onModeChanged() } } From 58048598b413dd8098f8f3be58191b9e21c563a1 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Tue, 25 Jul 2023 15:10:02 +0200 Subject: [PATCH 40/69] fixing Review Comments CURA-10770 --- resources/qml/Dialogs/AboutDialog.qml | 26 +++++--------------------- 1 file changed, 5 insertions(+), 21 deletions(-) diff --git a/resources/qml/Dialogs/AboutDialog.qml b/resources/qml/Dialogs/AboutDialog.qml index 361e19a45d..ae2bd44d74 100644 --- a/resources/qml/Dialogs/AboutDialog.qml +++ b/resources/qml/Dialogs/AboutDialog.qml @@ -23,18 +23,10 @@ UM.Dialog property real dialogX: base.x property real dialogY: base.y - property int shakeDetected: (shakeDetector.shakeIsdetected) - property UM.ShakeDetector shakeDetector: UM.ShakeDetector{ } - - readonly property Timer timer : Timer + property int shakeDetected: shakeDetector.shakeIsdetected + property UM.ShakeDetector shakeDetector: UM.ShakeDetector { - interval: 100 // Update interval in milliseconds (adjust as needed) - running: onDialogXChanged || onDialogYChanged - repeat: true - onTriggered: - { - shakeDetector.checkForShake(dialogX, dialogY) - } + position: Qt.point(base.x, base.y) } Rectangle @@ -204,16 +196,8 @@ UM.Dialog onShakeDetectedChanged: { - if (!projectBuildInfoList.visible) - { - projectsList.visible= false; - projectBuildInfoList.visible = true; - } - else - { - projectsList.visible = true; - projectBuildInfoList.visible = false; - } + projectsList.visible = !projectsList.visible; + projectBuildInfoList.visible = !projectBuildInfoList.visible; } onVisibleChanged: From e5f5011f820530b67992c0d40e119de2298f6e28 Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Wed, 26 Jul 2023 11:00:40 +0200 Subject: [PATCH 41/69] Attempt to fix build --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index d75b2bc6bf..438e3f07b7 100644 --- a/conanfile.py +++ b/conanfile.py @@ -21,7 +21,7 @@ class CuraConan(ConanFile): description = "3D printer / slicing GUI built on top of the Uranium framework" topics = ("conan", "python", "pyqt6", "qt", "qml", "3d-printing", "slicer") build_policy = "missing" - exports = "LICENSE*", "UltiMaker-Cura.spec.jinja", "CuraVersion.py.jinja" + exports = "LICENSE*", "UltiMaker-Cura.spec.jinja", "CuraVersion.py.jinja", "AboutDialogVersionsList.qml.jinja" settings = "os", "compiler", "build_type", "arch" # FIXME: Remove specific branch once merged to main From 3521947fefb72a9524b33e296b3b55cb9d6762a3 Mon Sep 17 00:00:00 2001 From: Casper Lamboo Date: Thu, 27 Jul 2023 13:49:21 +0200 Subject: [PATCH 42/69] Upload packages to jfrog --- .github/workflows/conan-package-create.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml index 701a978cd8..98e207acf3 100644 --- a/.github/workflows/conan-package-create.yml +++ b/.github/workflows/conan-package-create.yml @@ -151,7 +151,9 @@ jobs: - name: Upload the Package(s) if: ${{ always() && inputs.conan_upload_community }} - run: conan upload ${{ inputs.recipe_id_full }} -r cura --all -c + run: | + conan upload ${{ inputs.recipe_id_full }} -r cura --all -c + conan upload "*" -r cura --all -c - name: Upload the Package(s) to the private Artifactory if: ${{ always() && ! inputs.conan_upload_community }} From fa6961a45035e5a0136423439ae23ff9ab5c5eab Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Thu, 27 Jul 2023 13:52:15 +0200 Subject: [PATCH 43/69] Revert "Upload packages to jfrog" This reverts commit 3521947fefb72a9524b33e296b3b55cb9d6762a3. --- .github/workflows/conan-package-create.yml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/.github/workflows/conan-package-create.yml b/.github/workflows/conan-package-create.yml index 98e207acf3..701a978cd8 100644 --- a/.github/workflows/conan-package-create.yml +++ b/.github/workflows/conan-package-create.yml @@ -151,9 +151,7 @@ jobs: - name: Upload the Package(s) if: ${{ always() && inputs.conan_upload_community }} - run: | - conan upload ${{ inputs.recipe_id_full }} -r cura --all -c - conan upload "*" -r cura --all -c + run: conan upload ${{ inputs.recipe_id_full }} -r cura --all -c - name: Upload the Package(s) to the private Artifactory if: ${{ always() && ! inputs.conan_upload_community }} From 1d91eca483be47c2e88542b3473728502b35204e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 28 Jul 2023 10:52:27 +0200 Subject: [PATCH 44/69] Use correct value for multiple file open enum Previously we used the qdialog enum, which isn't the one you should use for the qml dialog. CURA-10741 --- resources/qml/Cura.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index cb3202bc00..31066f8f46 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -628,7 +628,7 @@ UM.MainWindow //: File open dialog title title: catalog.i18nc("@title:window","Open file(s)") modality: Qt.WindowModal - fileMode: FileDialog.FileMode.ExistingFile + fileMode: FileDialog.FileMode.OpenFiles nameFilters: UM.MeshFileHandler.supportedReadFileTypes; currentFolder: CuraApplication.getDefaultPath("dialog_load_path") onAccepted: From d08e2bc018026d7528199c96da17dbe48fa2511f Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 28 Jul 2023 11:16:51 +0200 Subject: [PATCH 45/69] Increased max conan version to 1.60.0 For some magical reason, i got issues with 1.56.0. It used to work but when I needed to do a conan install, it suddenly failed to install any python packages, claiming I didn't have openssl. --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 438e3f07b7..520e7a693f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -10,7 +10,7 @@ from conan.tools.env import VirtualRunEnv, Environment, VirtualBuildEnv from conan.tools.scm import Version from conan.errors import ConanInvalidConfiguration, ConanException -required_conan_version = "<=1.56.0" +required_conan_version = "<=1.60.0" class CuraConan(ConanFile): From e686baaf923f58555ee796fddc9cdd08581ce9a0 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Mon, 31 Jul 2023 11:47:15 +0200 Subject: [PATCH 46/69] Fixed for all the used python packages in venv CURA-10770 --- conanfile.py | 16 ++++++++++++---- resources/qml/Dialogs/AboutDialog.qml | 9 +++++++++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/conanfile.py b/conanfile.py index d75b2bc6bf..f028ccbe9e 100644 --- a/conanfile.py +++ b/conanfile.py @@ -150,9 +150,14 @@ class CuraConan(ConanFile): conan_installs.append([dependency.ref.name,dependency.ref.version]) #list of python installs - import pkg_resources - for package in pkg_resources.working_set: - python_installs.append([package.key, package.version]) + python_ins_cmd = f""" python -c "import pkg_resources; import os; [open(os.path.join("'"{self.recipe_folder}"'", "'"info.txt"'"), "'"a"'").write(s.key+"'","'"+ s.version+"'";"'") for s in pkg_resources.working_set]" """ + self.run(python_ins_cmd, run_environment= True, env = "conanrun", output=True) + with open(os.path.join(self.recipe_folder, "info.txt"), "r") as f: + packages = f.read() + package = packages.split(";") + for pack in package: + python_installs.append(pack.split(",")) + os.remove(os.path.join(self.recipe_folder, "info.txt")) with open(os.path.join(location, "AboutDialogVersionsList.qml"), "w") as f: f.write(cura_version_py.render( @@ -330,7 +335,7 @@ class CuraConan(ConanFile): vr.generate() self._generate_cura_version(os.path.join(self.source_folder, "cura")) - self._generate_about_versions(os.path.join(self.source_folder, "resources/qml/Dialogs")) + if self.options.devtools: entitlements_file = "'{}'".format(os.path.join(self.source_folder, "packaging", "MacOS", "cura.entitlements")) @@ -349,6 +354,8 @@ class CuraConan(ConanFile): pot = self.python_requires["translationextractor"].module.ExtractTranslations(self, cpp_info.bindirs[0]) pot.generate() + self._generate_about_versions(os.path.join(self.source_folder, "resources/qml/Dialogs")) + def build(self): if self.options.devtools: if self.settings.os != "Windows" or self.conf.get("tools.microsoft.bash:path", check_type = str): @@ -358,6 +365,7 @@ class CuraConan(ConanFile): mo_file = mo_file.parent.joinpath("LC_MESSAGES", mo_file.name) mkdir(self, str(unix_path(self, Path(mo_file).parent))) cpp_info = self.dependencies["gettext"].cpp_info + print("we are here /n") self.run(f"{cpp_info.bindirs[0]}/msgfmt {po_file} -o {mo_file} -f", env="conanbuild", ignore_errors=True) def imports(self): diff --git a/resources/qml/Dialogs/AboutDialog.qml b/resources/qml/Dialogs/AboutDialog.qml index ae2bd44d74..8f3723da87 100644 --- a/resources/qml/Dialogs/AboutDialog.qml +++ b/resources/qml/Dialogs/AboutDialog.qml @@ -58,6 +58,15 @@ UM.Dialog anchors.horizontalCenter: parent.horizontalCenter UM.I18nCatalog{id: catalog; name: "cura"} + MouseArea + { + anchors.fill: parent + onClicked: + { + projectsList.visible = !projectsList.visible; + projectBuildInfoList.visible = !projectBuildInfoList.visible; + } + } } UM.Label From d3027fa976226fff3822500958a8e3c839f4d36a Mon Sep 17 00:00:00 2001 From: nallath Date: Tue, 1 Aug 2023 11:27:33 +0000 Subject: [PATCH 47/69] Applied printer-linter format --- resources/definitions/creality_ender3pro.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/creality_ender3pro.def.json b/resources/definitions/creality_ender3pro.def.json index 93038d9eff..aa5daa132b 100644 --- a/resources/definitions/creality_ender3pro.def.json +++ b/resources/definitions/creality_ender3pro.def.json @@ -26,4 +26,4 @@ "machine_start_gcode": { "default_value": "; Ender 3 Custom Start G-code\nG92 E0 ; Reset Extruder\nG28 ; Home all axes\nG1 Z5.0 F3000 ; Move Z Axis up a bit during heating to not damage bed\nM104 S{material_standby_temperature} ; Start heating up the nozzle most of the way\nM190 S{material_bed_temperature_layer_0} ; Start heating the bed, wait until target temperature reached\nM109 S{material_print_temperature_layer_0} ; Finish heating the nozzle\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X0.1 Y20 Z0.3 F5000.0 ; Move to start position\nG1 X0.1 Y200.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y200.0 Z0.3 F5000.0 ; Move to side a little\nG1 X0.4 Y20 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X5 Y20 Z0.3 F5000.0 ; Move over to prevent blob squish" }, "machine_width": { "default_value": 220 } } -} +} \ No newline at end of file From 5ef0cbd945f0000744ed6b8aa647cc2c9b838a24 Mon Sep 17 00:00:00 2001 From: nallath Date: Tue, 1 Aug 2023 11:42:07 +0000 Subject: [PATCH 48/69] Applied printer-linter format --- resources/definitions/entina_tina2.def.json | 440 +++++------ resources/definitions/entina_tina2s.def.json | 437 +++++------ resources/definitions/weedo_base.def.json | 688 +++++++----------- resources/definitions/weedo_tina2.def.json | 440 +++++------ resources/definitions/weedo_tina2s.def.json | 437 +++++------ resources/definitions/weefun_tina2.def.json | 440 +++++------ resources/definitions/weefun_tina2s.def.json | 437 +++++------ .../extruders/weedo_base_extruder_0.def.json | 9 +- 8 files changed, 1459 insertions(+), 1869 deletions(-) diff --git a/resources/definitions/entina_tina2.def.json b/resources/definitions/entina_tina2.def.json index fe74030da4..7e6b18a982 100644 --- a/resources/definitions/entina_tina2.def.json +++ b/resources/definitions/entina_tina2.def.json @@ -1,242 +1,200 @@ -{ - "name": "ENTINA TINA2", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "ENTINA", - "manufacturer": "ENTINA", - "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": "ENTINA 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 - } - } +{ + "version": 2, + "name": "ENTINA TINA2", + "inherits": "weedo_base", + "metadata": + { + "visible": true, + "author": "ENTINA", + "manufacturer": "ENTINA", + "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": "ENTINA 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/entina_tina2s.def.json b/resources/definitions/entina_tina2s.def.json index 0f197367fb..82dc85b36e 100644 --- a/resources/definitions/entina_tina2s.def.json +++ b/resources/definitions/entina_tina2s.def.json @@ -1,238 +1,201 @@ -{ - "name": "ENTINA TINA2S", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "ENTINA", - "manufacturer": "ENTINA", - "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": "ENTINA 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": { - "value": 0.35 - } - } +{ + "version": 2, + "name": "ENTINA TINA2S", + "inherits": "weedo_base", + "metadata": + { + "visible": true, + "author": "ENTINA", + "manufacturer": "ENTINA", + "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": "ENTINA 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/definitions/weedo_base.def.json b/resources/definitions/weedo_base.def.json index 86dfdb619f..bbc1fcd09e 100644 --- a/resources/definitions/weedo_base.def.json +++ b/resources/definitions/weedo_base.def.json @@ -1,432 +1,258 @@ -{ - "version": 2, - "name": "WEEDO Base", - "inherits": "fdmprinter", - "metadata": { - "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", - "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_steps_per_mm_x": { - "default_value": 94 - }, - "machine_steps_per_mm_y": { - "default_value": 94 - }, - "machine_steps_per_mm_z": { - "default_value": 400 - }, - "machine_steps_per_mm_e": { - "default_value": 96 - }, - "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_base_thickness": { - "value": 0.3 - }, - "raft_surface_speed": { - "value": 40.0 - }, - "raft_interface_speed": { - "value": 33.0 - }, - "raft_base_speed": { - "value": 20.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": + { + "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" }, + "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 }, + "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_fan_speed": { "value": 0.0 }, + "raft_base_speed": { "value": 20.0 }, + "raft_base_thickness": { "value": 0.3 }, + "raft_interface_speed": { "value": 33.0 }, + "raft_margin": { "default_value": 8.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 index f0d5a17a09..7824aa3006 100644 --- a/resources/definitions/weedo_tina2.def.json +++ b/resources/definitions/weedo_tina2.def.json @@ -1,242 +1,200 @@ -{ - "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" - }, - "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 - } - } +{ + "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 index bbf73e7cf9..5c11529854 100644 --- a/resources/definitions/weedo_tina2s.def.json +++ b/resources/definitions/weedo_tina2s.def.json @@ -1,238 +1,201 @@ -{ - "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" - }, - "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 - } - } +{ + "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/definitions/weefun_tina2.def.json b/resources/definitions/weefun_tina2.def.json index 0009267f0c..8177da741c 100644 --- a/resources/definitions/weefun_tina2.def.json +++ b/resources/definitions/weefun_tina2.def.json @@ -1,242 +1,200 @@ -{ - "name": "WEEFUN TINA2", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEFUN", - "manufacturer": "WEEFUN", - "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": "WEEFUN 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 - } - } +{ + "version": 2, + "name": "WEEFUN TINA2", + "inherits": "weedo_base", + "metadata": + { + "visible": true, + "author": "WEEFUN", + "manufacturer": "WEEFUN", + "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": "WEEFUN 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/weefun_tina2s.def.json b/resources/definitions/weefun_tina2s.def.json index 54299a261d..fc0720ade0 100644 --- a/resources/definitions/weefun_tina2s.def.json +++ b/resources/definitions/weefun_tina2s.def.json @@ -1,238 +1,201 @@ -{ - "name": "WEEFUN TINA2S", - "version": 2, - "inherits": "weedo_base", - "metadata": { - "visible": true, - "author": "WEEFUN", - "manufacturer": "WEEFUN", - "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": "WEEFUN 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": { - "value": 0.35 - } - } +{ + "version": 2, + "name": "WEEFUN TINA2S", + "inherits": "weedo_base", + "metadata": + { + "visible": true, + "author": "WEEFUN", + "manufacturer": "WEEFUN", + "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": "WEEFUN 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 index 0cb088acdd..82cf9d9541 100644 --- a/resources/extruders/weedo_base_extruder_0.def.json +++ b/resources/extruders/weedo_base_extruder_0.def.json @@ -2,14 +2,15 @@ "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", - "metadata": { + "metadata": + { "machine": "weedo_base", "position": "0" }, - - "overrides": { + "overrides": + { "extruder_nr": { "default_value": 0 }, "machine_nozzle_size": { "default_value": 0.4 }, "material_diameter": { "default_value": 1.75 } } -} +} \ No newline at end of file From 2876a0e922d4a8603260de1ff1b909d9ccbdfcaf Mon Sep 17 00:00:00 2001 From: rburema Date: Tue, 1 Aug 2023 11:54:38 +0000 Subject: [PATCH 49/69] Applied printer-linter format --- resources/variants/voron/voron_trident_250_0.25.inst.cfg | 1 + resources/variants/voron/voron_trident_250_0.50.inst.cfg | 1 + resources/variants/voron/voron_trident_300_0.25.inst.cfg | 1 + resources/variants/voron/voron_trident_300_0.50.inst.cfg | 1 + resources/variants/voron/voron_trident_350_0.25.inst.cfg | 1 + resources/variants/voron/voron_trident_350_0.50.inst.cfg | 1 + 6 files changed, 6 insertions(+) diff --git a/resources/variants/voron/voron_trident_250_0.25.inst.cfg b/resources/variants/voron/voron_trident_250_0.25.inst.cfg index e84dc74b16..2ba2351c56 100644 --- a/resources/variants/voron/voron_trident_250_0.25.inst.cfg +++ b/resources/variants/voron/voron_trident_250_0.25.inst.cfg @@ -10,3 +10,4 @@ type = variant [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/voron/voron_trident_250_0.50.inst.cfg b/resources/variants/voron/voron_trident_250_0.50.inst.cfg index 61615f92b7..deae0b748c 100644 --- a/resources/variants/voron/voron_trident_250_0.50.inst.cfg +++ b/resources/variants/voron/voron_trident_250_0.50.inst.cfg @@ -10,3 +10,4 @@ type = variant [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/voron/voron_trident_300_0.25.inst.cfg b/resources/variants/voron/voron_trident_300_0.25.inst.cfg index 4787f681d7..99b00d7683 100644 --- a/resources/variants/voron/voron_trident_300_0.25.inst.cfg +++ b/resources/variants/voron/voron_trident_300_0.25.inst.cfg @@ -10,3 +10,4 @@ type = variant [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/voron/voron_trident_300_0.50.inst.cfg b/resources/variants/voron/voron_trident_300_0.50.inst.cfg index a6c001b55a..5a9bde2f79 100644 --- a/resources/variants/voron/voron_trident_300_0.50.inst.cfg +++ b/resources/variants/voron/voron_trident_300_0.50.inst.cfg @@ -10,3 +10,4 @@ type = variant [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/voron/voron_trident_350_0.25.inst.cfg b/resources/variants/voron/voron_trident_350_0.25.inst.cfg index 1817f39402..8d124cca03 100644 --- a/resources/variants/voron/voron_trident_350_0.25.inst.cfg +++ b/resources/variants/voron/voron_trident_350_0.25.inst.cfg @@ -10,3 +10,4 @@ type = variant [values] machine_nozzle_size = 0.25 + diff --git a/resources/variants/voron/voron_trident_350_0.50.inst.cfg b/resources/variants/voron/voron_trident_350_0.50.inst.cfg index e67ee99b13..896a12aee7 100644 --- a/resources/variants/voron/voron_trident_350_0.50.inst.cfg +++ b/resources/variants/voron/voron_trident_350_0.50.inst.cfg @@ -10,3 +10,4 @@ type = variant [values] machine_nozzle_size = 0.5 + From 60dba90cb519c865242cdd13841d1787331fbd90 Mon Sep 17 00:00:00 2001 From: MariMakes Date: Tue, 1 Aug 2023 13:27:47 +0000 Subject: [PATCH 50/69] Applied printer-linter format --- .../definitions/creality_ender5s1.def.json | 37 ++++++++++--------- .../creality/creality_ender5s1_0.2.inst.cfg | 5 ++- .../creality/creality_ender5s1_0.3.inst.cfg | 5 ++- .../creality/creality_ender5s1_0.4.inst.cfg | 5 ++- .../creality/creality_ender5s1_0.5.inst.cfg | 5 ++- .../creality/creality_ender5s1_0.6.inst.cfg | 5 ++- .../creality/creality_ender5s1_0.8.inst.cfg | 5 ++- .../creality/creality_ender5s1_1.0.inst.cfg | 5 ++- 8 files changed, 41 insertions(+), 31 deletions(-) diff --git a/resources/definitions/creality_ender5s1.def.json b/resources/definitions/creality_ender5s1.def.json index 6deeba5c6f..32dbf75b02 100644 --- a/resources/definitions/creality_ender5s1.def.json +++ b/resources/definitions/creality_ender5s1.def.json @@ -1,15 +1,21 @@ { - "name": "Creality Ender-5 S1", "version": 2, + "name": "Creality Ender-5 S1", "inherits": "creality_base", - "metadata": { - "quality_definition": "creality_base", - "visible": true + "metadata": + { + "visible": true, + "quality_definition": "creality_base" }, - "overrides": { + "overrides": + { + "build_volume_temperature": { "value": 195 }, + "cool_min_layer_time": { "value": 5 }, "gantry_height": { "value": 25 }, "machine_depth": { "default_value": 225 }, - "machine_head_with_fans_polygon": { + "machine_end_gcode": { "default_value": "G91 ;Relative positionning\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 positionning\n\nG1 X0 Y0 ;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_head_with_fans_polygon": + { "default_value": [ [-26, 34], [-26, -32], @@ -19,16 +25,13 @@ }, "machine_height": { "default_value": 305 }, "machine_name": { "default_value": "Creality Ender-5 S1" }, - "machine_width": { "default_value": 225 }, - "machine_end_gcode": { "default_value": "G91 ;Relative positionning\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 positionning\n\nG1 X0 Y0 ;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" }, - "build_volume_temperature": { "value": 195 }, - "material_bed_temperature": { "value": 60 }, - "retraction_amount": { "value": 2}, - "z_seam_type": { "value": "'sharpest_corner'" }, - "support_z_distance": { "value": 0.25 }, - "cool_min_layer_time": { "value": 5 }, - "wall_thickness": {"value": "line_width * 3" }, - "retraction_speed": { "value": 45 }, - "speed_print": { "value": 80.0 } + "machine_width": { "default_value": 225 }, + "material_bed_temperature": { "value": 60 }, + "retraction_amount": { "value": 2 }, + "retraction_speed": { "value": 45 }, + "speed_print": { "value": 80.0 }, + "support_z_distance": { "value": 0.25 }, + "wall_thickness": { "value": "line_width * 3" }, + "z_seam_type": { "value": "'sharpest_corner'" } } } \ No newline at end of file diff --git a/resources/variants/creality/creality_ender5s1_0.2.inst.cfg b/resources/variants/creality/creality_ender5s1_0.2.inst.cfg index b5969358e6..bb3e5312ea 100644 --- a/resources/variants/creality/creality_ender5s1_0.2.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.2.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5s1 name = 0.2mm Nozzle version = 4 -definition = creality_ender5s1 [metadata] +hardware_type = nozzle setting_version = 22 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality/creality_ender5s1_0.3.inst.cfg b/resources/variants/creality/creality_ender5s1_0.3.inst.cfg index c8314bda4d..f7aa3350bc 100644 --- a/resources/variants/creality/creality_ender5s1_0.3.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.3.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5s1 name = 0.3mm Nozzle version = 4 -definition = creality_ender5s1 [metadata] +hardware_type = nozzle setting_version = 22 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality/creality_ender5s1_0.4.inst.cfg b/resources/variants/creality/creality_ender5s1_0.4.inst.cfg index 1b519ad121..6e38f503fc 100644 --- a/resources/variants/creality/creality_ender5s1_0.4.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.4.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5s1 name = 0.4mm Nozzle version = 4 -definition = creality_ender5s1 [metadata] +hardware_type = nozzle setting_version = 22 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality/creality_ender5s1_0.5.inst.cfg b/resources/variants/creality/creality_ender5s1_0.5.inst.cfg index 6bc413f30b..cb2b684542 100644 --- a/resources/variants/creality/creality_ender5s1_0.5.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.5.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5s1 name = 0.5mm Nozzle version = 4 -definition = creality_ender5s1 [metadata] +hardware_type = nozzle setting_version = 22 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality/creality_ender5s1_0.6.inst.cfg b/resources/variants/creality/creality_ender5s1_0.6.inst.cfg index f235650911..2c2d0480ff 100644 --- a/resources/variants/creality/creality_ender5s1_0.6.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.6.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5s1 name = 0.6mm Nozzle version = 4 -definition = creality_ender5s1 [metadata] +hardware_type = nozzle setting_version = 22 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality/creality_ender5s1_0.8.inst.cfg b/resources/variants/creality/creality_ender5s1_0.8.inst.cfg index 52b16eea23..2e95f8e3d0 100644 --- a/resources/variants/creality/creality_ender5s1_0.8.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_0.8.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5s1 name = 0.8mm Nozzle version = 4 -definition = creality_ender5s1 [metadata] +hardware_type = nozzle setting_version = 22 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality/creality_ender5s1_1.0.inst.cfg b/resources/variants/creality/creality_ender5s1_1.0.inst.cfg index 06c558c42b..48fba7a715 100644 --- a/resources/variants/creality/creality_ender5s1_1.0.inst.cfg +++ b/resources/variants/creality/creality_ender5s1_1.0.inst.cfg @@ -1,12 +1,13 @@ [general] +definition = creality_ender5s1 name = 1.0mm Nozzle version = 4 -definition = creality_ender5s1 [metadata] +hardware_type = nozzle setting_version = 22 type = variant -hardware_type = nozzle [values] machine_nozzle_size = 1.0 + From 1442031e28dde91ba12bf2a8b67b1f41154cfbc2 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Wed, 2 Aug 2023 09:24:42 +0200 Subject: [PATCH 51/69] Review comments fixed CURA-10770 --- conanfile.py | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/conanfile.py b/conanfile.py index f028ccbe9e..8c86bdb60f 100644 --- a/conanfile.py +++ b/conanfile.py @@ -139,7 +139,7 @@ class CuraConan(ConanFile): return "None" def _generate_about_versions(self, location): - with open(os.path.join(self.recipe_folder, "AboutDialogVersionsList.qml.jinja"), "r") as f: + with open(os.path.join(self.source_folder, "AboutDialogVersionsList.qml.jinja"), "r") as f: cura_version_py = Template(f.read()) conan_installs = [] @@ -150,14 +150,17 @@ class CuraConan(ConanFile): conan_installs.append([dependency.ref.name,dependency.ref.version]) #list of python installs - python_ins_cmd = f""" python -c "import pkg_resources; import os; [open(os.path.join("'"{self.recipe_folder}"'", "'"info.txt"'"), "'"a"'").write(s.key+"'","'"+ s.version+"'";"'") for s in pkg_resources.working_set]" """ - self.run(python_ins_cmd, run_environment= True, env = "conanrun", output=True) - with open(os.path.join(self.recipe_folder, "info.txt"), "r") as f: - packages = f.read() - package = packages.split(";") - for pack in package: - python_installs.append(pack.split(",")) - os.remove(os.path.join(self.recipe_folder, "info.txt")) + outer = '"' if self.settings.os == "Windows" else "'" + inner = "'" if self.settings.os == "Windows" else '"' + python_ins_cmd = f"python -c {outer}import pkg_resources; print({inner};{inner}.join([(s.key+{inner},{inner}+ s.version) for s in pkg_resources.working_set])){outer}" + from six import StringIO + buffer = StringIO() + self.run(python_ins_cmd, run_environment= True, env = "conanrun", output=buffer) + + packages = str(buffer.getvalue()).split("-----------------\n") + package = packages[1].strip('\r\n').split(";") + for pack in package: + python_installs.append(pack.split(",")) with open(os.path.join(location, "AboutDialogVersionsList.qml"), "w") as f: f.write(cura_version_py.render( @@ -354,7 +357,7 @@ class CuraConan(ConanFile): pot = self.python_requires["translationextractor"].module.ExtractTranslations(self, cpp_info.bindirs[0]) pot.generate() - self._generate_about_versions(os.path.join(self.source_folder, "resources/qml/Dialogs")) + self._generate_about_versions(os.path.join(self.source_folder, "resources","qml", "Dialogs")) def build(self): if self.options.devtools: @@ -365,7 +368,6 @@ class CuraConan(ConanFile): mo_file = mo_file.parent.joinpath("LC_MESSAGES", mo_file.name) mkdir(self, str(unix_path(self, Path(mo_file).parent))) cpp_info = self.dependencies["gettext"].cpp_info - print("we are here /n") self.run(f"{cpp_info.bindirs[0]}/msgfmt {po_file} -o {mo_file} -f", env="conanbuild", ignore_errors=True) def imports(self): @@ -471,6 +473,8 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV icon_path = "'{}'".format(os.path.join(self.package_folder, self.cpp_info.resdirs[2], self.conan_data["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"), entitlements_file = entitlements_file if self.settings.os == "Macos" else "None") + self._generate_about_versions(os.path.join(self.source_folder, "resources", "qml", "Dialogs")) + def package(self): copy(self, "cura_app.py", src = self.source_folder, dst = os.path.join(self.package_folder, self.cpp.package.bindirs[0])) copy(self, "*", src = os.path.join(self.source_folder, "cura"), dst = os.path.join(self.package_folder, self.cpp.package.libdirs[0])) From a6780b541726dd5eb479583cbd267751afd3ac08 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Wed, 2 Aug 2023 10:45:02 +0200 Subject: [PATCH 52/69] Review comments fixed CURA-10770 --- conanfile.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/conanfile.py b/conanfile.py index 8c86bdb60f..1f7b1c6620 100644 --- a/conanfile.py +++ b/conanfile.py @@ -21,7 +21,7 @@ class CuraConan(ConanFile): description = "3D printer / slicing GUI built on top of the Uranium framework" topics = ("conan", "python", "pyqt6", "qt", "qml", "3d-printing", "slicer") build_policy = "missing" - exports = "LICENSE*", "UltiMaker-Cura.spec.jinja", "CuraVersion.py.jinja" + exports = "LICENSE*", "UltiMaker-Cura.spec.jinja", "CuraVersion.py.jinja", "AboutDialogVersionsList.qml.jinja" settings = "os", "compiler", "build_type", "arch" # FIXME: Remove specific branch once merged to main @@ -139,7 +139,7 @@ class CuraConan(ConanFile): return "None" def _generate_about_versions(self, location): - with open(os.path.join(self.source_folder, "AboutDialogVersionsList.qml.jinja"), "r") as f: + with open(os.path.join(self.recipe_folder, "AboutDialogVersionsList.qml.jinja"), "r") as f: cura_version_py = Template(f.read()) conan_installs = [] From 9c7f14d00da16bc35f352816383265e77b8b7995 Mon Sep 17 00:00:00 2001 From: Mariska <40423138+MariMakes@users.noreply.github.com> Date: Wed, 2 Aug 2023 16:21:19 +0200 Subject: [PATCH 53/69] Revert " Creat new machine named Renkforce 10+" --- .../definitions/renkforce_pro10plus.def.json | 18 ------------------ .../renkforce/renkforce_pro10plus_0.4.inst.cfg | 13 ------------- .../renkforce/renkforce_pro10plus_0.6.inst.cfg | 13 ------------- .../renkforce/renkforce_pro10plus_0.8.inst.cfg | 13 ------------- .../renkforce/renkforce_pro10plus_1.0.inst.cfg | 13 ------------- 5 files changed, 70 deletions(-) delete mode 100644 resources/definitions/renkforce_pro10plus.def.json delete mode 100644 resources/variants/renkforce/renkforce_pro10plus_0.4.inst.cfg delete mode 100644 resources/variants/renkforce/renkforce_pro10plus_0.6.inst.cfg delete mode 100644 resources/variants/renkforce/renkforce_pro10plus_0.8.inst.cfg delete mode 100644 resources/variants/renkforce/renkforce_pro10plus_1.0.inst.cfg diff --git a/resources/definitions/renkforce_pro10plus.def.json b/resources/definitions/renkforce_pro10plus.def.json deleted file mode 100644 index 414d59ec0b..0000000000 --- a/resources/definitions/renkforce_pro10plus.def.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "version": 2, - "name": "Renkforce Pro 10+", - "inherits": "goofoo_near", - "metadata": - { - "visible": true, - "author": "Woosh (based on RF100.ini by Conrad Electronic SE)", - "manufacturer": "Renkforce" - }, - "overrides": - { - "machine_depth": { "default_value": 360 }, - "machine_height": { "default_value": 400 }, - "machine_name": { "default_value": "Renkforce Pro 10+" }, - "machine_width": { "default_value": 360 } - } -} \ No newline at end of file diff --git a/resources/variants/renkforce/renkforce_pro10plus_0.4.inst.cfg b/resources/variants/renkforce/renkforce_pro10plus_0.4.inst.cfg deleted file mode 100644 index aea6acc5e5..0000000000 --- a/resources/variants/renkforce/renkforce_pro10plus_0.4.inst.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[general] -definition = renkforce_pro10plus -name = 0.4mm Nozzle -version = 4 - -[metadata] -hardware_type = nozzle -setting_version = 22 -type = variant - -[values] -machine_nozzle_size = 0.4 - diff --git a/resources/variants/renkforce/renkforce_pro10plus_0.6.inst.cfg b/resources/variants/renkforce/renkforce_pro10plus_0.6.inst.cfg deleted file mode 100644 index 228ea98425..0000000000 --- a/resources/variants/renkforce/renkforce_pro10plus_0.6.inst.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[general] -definition = renkforce_pro10plus -name = 0.6mm Nozzle -version = 4 - -[metadata] -hardware_type = nozzle -setting_version = 22 -type = variant - -[values] -machine_nozzle_size = 0.6 - diff --git a/resources/variants/renkforce/renkforce_pro10plus_0.8.inst.cfg b/resources/variants/renkforce/renkforce_pro10plus_0.8.inst.cfg deleted file mode 100644 index c7b037a84d..0000000000 --- a/resources/variants/renkforce/renkforce_pro10plus_0.8.inst.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[general] -definition = renkforce_pro10plus -name = 0.8mm Nozzle -version = 4 - -[metadata] -hardware_type = nozzle -setting_version = 22 -type = variant - -[values] -machine_nozzle_size = 0.8 - diff --git a/resources/variants/renkforce/renkforce_pro10plus_1.0.inst.cfg b/resources/variants/renkforce/renkforce_pro10plus_1.0.inst.cfg deleted file mode 100644 index 2c1e6194ed..0000000000 --- a/resources/variants/renkforce/renkforce_pro10plus_1.0.inst.cfg +++ /dev/null @@ -1,13 +0,0 @@ -[general] -definition = renkforce_pro10plus -name = 1.0mm Nozzle -version = 4 - -[metadata] -hardware_type = nozzle -setting_version = 22 -type = variant - -[values] -machine_nozzle_size = 1.0 - From f07faac4223d3d15d36b486e1fce18a84ea55fb0 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Fri, 4 Aug 2023 13:24:06 +0200 Subject: [PATCH 54/69] Add copy, paste, cut functionality CURA-7913 --- cura/CuraActions.py | 70 +++++++++++++++++++++++++++-- resources/qml/Actions.qml | 33 +++++++++++++- resources/qml/Menus/ContextMenu.qml | 2 + 3 files changed, 101 insertions(+), 4 deletions(-) diff --git a/cura/CuraActions.py b/cura/CuraActions.py index 193803325f..aef26c7082 100644 --- a/cura/CuraActions.py +++ b/cura/CuraActions.py @@ -1,15 +1,20 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2023 UltiMaker # Cura is released under the terms of the LGPLv3 or higher. -from PyQt6.QtCore import QObject, QUrl -from PyQt6.QtGui import QDesktopServices from typing import List, cast +from PyQt6.QtCore import QObject, QUrl, QMimeData +from PyQt6.QtGui import QDesktopServices +from PyQt6.QtWidgets import QApplication + +import pySavitar as Savitar + from UM.Event import CallFunctionEvent from UM.FlameProfiler import pyqtSlot from UM.Math.Vector import Vector from UM.Scene.Selection import Selection from UM.Scene.Iterator.BreadthFirstIterator import BreadthFirstIterator +from UM.Scene.Iterator.DepthFirstIterator import DepthFirstIterator from UM.Operations.GroupedOperation import GroupedOperation from UM.Operations.RemoveSceneNodeOperation import RemoveSceneNodeOperation from UM.Operations.TranslateOperation import TranslateOperation @@ -19,6 +24,7 @@ from cura.Operations.SetParentOperation import SetParentOperation from cura.MultiplyObjectsJob import MultiplyObjectsJob from cura.Settings.SetObjectExtruderOperation import SetObjectExtruderOperation from cura.Settings.ExtruderManager import ExtruderManager +from cura.Arranging.Nest2DArrange import createGroupOperationForArrange from cura.Operations.SetBuildPlateNumberOperation import SetBuildPlateNumberOperation @@ -181,5 +187,63 @@ class CuraActions(QObject): Selection.clear() + @pyqtSlot() + def cut(self) -> None: + self.copy() + self.deleteSelection() + + @pyqtSlot() + def copy(self) -> None: + # Convert all selected objects to a Savitar scene + savitar_scene = Savitar.Scene() + mesh_writer = cura.CuraApplication.CuraApplication.getInstance().getMeshFileHandler().getWriter("3MFWriter") + for scene_node in Selection.getAllSelectedObjects(): + savitar_node = mesh_writer._convertUMNodeToSavitarNode(scene_node) + savitar_scene.addSceneNode(savitar_node) + + # Convert the scene to a string + parser = Savitar.ThreeMFParser() + scene_string = parser.sceneToString(savitar_scene) + + # Copy the scene to the clipboard + QApplication.clipboard().setText(scene_string) + + @pyqtSlot() + def paste(self) -> None: + application = cura.CuraApplication.CuraApplication.getInstance() + + # Parse the scene from the clipboard + scene_string = QApplication.clipboard().text() + parser = Savitar.ThreeMFParser() + scene = parser.parse(scene_string) + + # Convert the scene to scene nodes + nodes = [] + mesh_reader = application.getMeshFileHandler().getReaderForFile(".3mf") + for savitar_node in scene.getSceneNodes(): + scene_node = mesh_reader._convertSavitarNodeToUMNode(savitar_node, "file_name") + if scene_node is None: + continue + nodes.append(scene_node) + + # Find all fixed nodes, these are the nodes that should be avoided when arranging + fixed_nodes = [] + root = application.getController().getScene().getRoot() + for node in DepthFirstIterator(root): + # Only count sliceable objects + if node.callDecoration("isSliceable"): + fixed_nodes.append(node) + # Add the new nodes to the scene, and arrange them + group_operation, not_fit_count = createGroupOperationForArrange(nodes, application.getBuildVolume(), + fixed_nodes, factor=10000, + add_new_nodes_in_scene=True) + group_operation.push() + + # deselect currently selected nodes, and select the new nodes + for node in Selection.getAllSelectedObjects(): + Selection.remove(node) + for node in nodes: + Selection.add(node) + def _openUrl(self, url: QUrl) -> None: QDesktopServices.openUrl(url) diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index 6cd75b51ac..9cd72026b2 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -1,4 +1,4 @@ -// Copyright (c) 2022 UltiMaker +// Copyright (c) 2023 UltiMaker // Cura is released under the terms of the LGPLv3 or higher. pragma Singleton @@ -71,6 +71,10 @@ Item property alias browsePackages: browsePackagesAction + property alias paste: pasteAction + property alias copy: copyAction + property alias cut: cutAction + UM.I18nCatalog{id: catalog; name: "cura"} @@ -309,6 +313,33 @@ Item onTriggered: CuraActions.centerSelection() } + Action + { + id: copyAction + text: catalog.i18nc("@action:inmenu menubar:edit", "Copy to clipboard") + onTriggered: CuraActions.copy() + enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection + shortcut: StandardKey.Copy + } + + Action + { + id: pasteAction + text: catalog.i18nc("@action:inmenu menubar:edit", "Paste from clipboard") + onTriggered: CuraActions.paste() + enabled: UM.Controller.toolsEnabled + shortcut: StandardKey.Paste + } + + Action + { + id: cutAction + text: catalog.i18nc("@action:inmenu menubar:edit", "Cut") + onTriggered: CuraActions.cut() + enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection + shortcut: StandardKey.Cut + } + Action { id: multiplySelectionAction diff --git a/resources/qml/Menus/ContextMenu.qml b/resources/qml/Menus/ContextMenu.qml index f7029939cd..d85703451f 100644 --- a/resources/qml/Menus/ContextMenu.qml +++ b/resources/qml/Menus/ContextMenu.qml @@ -19,6 +19,8 @@ Cura.Menu // Selection-related actions. Cura.MenuItem { action: Cura.Actions.centerSelection; } Cura.MenuItem { action: Cura.Actions.deleteSelection; } + Cura.MenuItem { action: Cura.Actions.copy; } + Cura.MenuItem { action: Cura.Actions.paste; } Cura.MenuItem { action: Cura.Actions.multiplySelection; } // Extruder selection - only visible if there is more than 1 extruder From f9981d3df18005a255dc88fb2d4b05179116449f Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Fri, 4 Aug 2023 14:14:08 +0200 Subject: [PATCH 55/69] Clicking Show all connected printers shows all cloud printers offline and online CURA-10770 --- cura/Machines/Models/MachineListModel.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/cura/Machines/Models/MachineListModel.py b/cura/Machines/Models/MachineListModel.py index 74ef7ae7b4..69a3c53d03 100644 --- a/cura/Machines/Models/MachineListModel.py +++ b/cura/Machines/Models/MachineListModel.py @@ -110,22 +110,22 @@ class MachineListModel(ListModel): for abstract_machine in abstract_machine_stacks: definition_id = abstract_machine.definition.getId() - online_machine_stacks = machines_manager.getMachinesWithDefinition(definition_id, online_only = True) + connected_machine_stacks = machines_manager.getMachinesWithDefinition(definition_id, online_only = False) - online_machine_stacks = list(filter(lambda machine: machine.hasNetworkedConnection(), online_machine_stacks)) - online_machine_stacks.sort(key=lambda machine: machine.getName().upper()) + connected_machine_stacks = list(filter(lambda machine: machine.hasNetworkedConnection(), connected_machine_stacks)) + connected_machine_stacks.sort(key=lambda machine: machine.getName().upper()) if abstract_machine in other_machine_stacks: other_machine_stacks.remove(abstract_machine) - if abstract_machine in online_machine_stacks: - online_machine_stacks.remove(abstract_machine) + if abstract_machine in connected_machine_stacks: + connected_machine_stacks.remove(abstract_machine) # Create a list item for abstract machine - self.addItem(abstract_machine, True, len(online_machine_stacks)) + self.addItem(abstract_machine, True, len(connected_machine_stacks)) # Create list of machines that are children of the abstract machine - for stack in online_machine_stacks: + for stack in connected_machine_stacks: if self._show_cloud_printers: self.addItem(stack, True) # Remove this machine from the other stack list From fc9a2280623003f109de53bd49e9477b17411d95 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Fri, 4 Aug 2023 14:24:38 +0200 Subject: [PATCH 56/69] Deleting Shake detection CURA-10770 --- resources/qml/Dialogs/AboutDialog.qml | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/resources/qml/Dialogs/AboutDialog.qml b/resources/qml/Dialogs/AboutDialog.qml index 8f3723da87..b0cd9d2ad3 100644 --- a/resources/qml/Dialogs/AboutDialog.qml +++ b/resources/qml/Dialogs/AboutDialog.qml @@ -21,13 +21,6 @@ UM.Dialog backgroundColor: UM.Theme.getColor("main_background") - property real dialogX: base.x - property real dialogY: base.y - property int shakeDetected: shakeDetector.shakeIsdetected - property UM.ShakeDetector shakeDetector: UM.ShakeDetector - { - position: Qt.point(base.x, base.y) - } Rectangle { @@ -203,11 +196,6 @@ UM.Dialog } - onShakeDetectedChanged: - { - projectsList.visible = !projectsList.visible; - projectBuildInfoList.visible = !projectBuildInfoList.visible; - } onVisibleChanged: { From b1100cb4c586dbfe952576a914d626e79d89c63a Mon Sep 17 00:00:00 2001 From: Remco Burema Date: Fri, 4 Aug 2023 15:53:52 +0200 Subject: [PATCH 57/69] Relevant comment specifically requests not to call closeApplication in most cases. done as a 5 min fix. --- plugins/Marketplace/resources/qml/Marketplace.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/Marketplace/resources/qml/Marketplace.qml b/plugins/Marketplace/resources/qml/Marketplace.qml index 97ba2303e9..8028b89e02 100644 --- a/plugins/Marketplace/resources/qml/Marketplace.qml +++ b/plugins/Marketplace/resources/qml/Marketplace.qml @@ -280,7 +280,7 @@ Window onClicked: { marketplaceDialog.hide(); - CuraApplication.closeApplication(); + CuraApplication.checkAndExitApplication(); } } } From ce82033f6ac6e2f1ef5dd946d4273a91d572efff Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Mon, 7 Aug 2023 08:21:03 +0200 Subject: [PATCH 58/69] exclude the correct conan versions --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 520e7a693f..7157a679ac 100644 --- a/conanfile.py +++ b/conanfile.py @@ -10,7 +10,7 @@ from conan.tools.env import VirtualRunEnv, Environment, VirtualBuildEnv from conan.tools.scm import Version from conan.errors import ConanInvalidConfiguration, ConanException -required_conan_version = "<=1.60.0" +required_conan_version = ">=1.54 <=1.56.0 || >=1.58.0 <2.0.0" class CuraConan(ConanFile): From 476f92bd1c3d1812e40a252a30fad283aa3e1dc6 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Mon, 7 Aug 2023 12:40:05 +0200 Subject: [PATCH 59/69] Brim distance is not "settable_per_mesh" A new feature request needed to make this work. CURA-10770 --- resources/definitions/fdmprinter.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index d1c532a32d..fca9e69310 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -5921,7 +5921,7 @@ "maximum_value_warning": "skirt_brim_line_width", "enabled": "resolveOrValue('adhesion_type') == 'brim'", "limit_to_extruder": "skirt_brim_extruder_nr", - "settable_per_mesh": true, + "settable_per_mesh": false, "settable_per_extruder": true }, "brim_replaces_support": From f8b3fb3d67890b5ee3d2aeac945c9ff136cf62bf Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Mon, 7 Aug 2023 13:41:01 +0200 Subject: [PATCH 60/69] Move parse/write responsibility of copy/paste to 3MFWriter/3MFReader CURA-7913 --- cura/CuraActions.py | 27 ++++++--------------------- plugins/3MFReader/ThreeMFReader.py | 29 +++++++++++++++++++++++------ plugins/3MFWriter/ThreeMFWriter.py | 26 +++++++++++++++++++------- 3 files changed, 48 insertions(+), 34 deletions(-) diff --git a/cura/CuraActions.py b/cura/CuraActions.py index aef26c7082..338c18a6b9 100644 --- a/cura/CuraActions.py +++ b/cura/CuraActions.py @@ -7,8 +7,6 @@ from PyQt6.QtCore import QObject, QUrl, QMimeData from PyQt6.QtGui import QDesktopServices from PyQt6.QtWidgets import QApplication -import pySavitar as Savitar - from UM.Event import CallFunctionEvent from UM.FlameProfiler import pyqtSlot from UM.Math.Vector import Vector @@ -194,18 +192,13 @@ class CuraActions(QObject): @pyqtSlot() def copy(self) -> None: - # Convert all selected objects to a Savitar scene - savitar_scene = Savitar.Scene() mesh_writer = cura.CuraApplication.CuraApplication.getInstance().getMeshFileHandler().getWriter("3MFWriter") - for scene_node in Selection.getAllSelectedObjects(): - savitar_node = mesh_writer._convertUMNodeToSavitarNode(scene_node) - savitar_scene.addSceneNode(savitar_node) - # Convert the scene to a string - parser = Savitar.ThreeMFParser() - scene_string = parser.sceneToString(savitar_scene) - - # Copy the scene to the clipboard + # Get the selected nodes + selected_objects = Selection.getAllSelectedObjects() + # Serialize the nodes to a string + scene_string = mesh_writer.sceneNodesToString(selected_objects) + # Put the string on the clipboard QApplication.clipboard().setText(scene_string) @pyqtSlot() @@ -214,17 +207,9 @@ class CuraActions(QObject): # Parse the scene from the clipboard scene_string = QApplication.clipboard().text() - parser = Savitar.ThreeMFParser() - scene = parser.parse(scene_string) - # Convert the scene to scene nodes - nodes = [] mesh_reader = application.getMeshFileHandler().getReaderForFile(".3mf") - for savitar_node in scene.getSceneNodes(): - scene_node = mesh_reader._convertSavitarNodeToUMNode(savitar_node, "file_name") - if scene_node is None: - continue - nodes.append(scene_node) + nodes = mesh_reader.stringToSceneNodes(scene_string) # Find all fixed nodes, these are the nodes that should be avoided when arranging fixed_nodes = [] diff --git a/plugins/3MFReader/ThreeMFReader.py b/plugins/3MFReader/ThreeMFReader.py index e8b6a54e46..e06e9dcf4e 100755 --- a/plugins/3MFReader/ThreeMFReader.py +++ b/plugins/3MFReader/ThreeMFReader.py @@ -56,7 +56,8 @@ class ThreeMFReader(MeshReader): def emptyFileHintSet(self) -> bool: return self._empty_project - def _createMatrixFromTransformationString(self, transformation: str) -> Matrix: + @staticmethod + def _createMatrixFromTransformationString(transformation: str) -> Matrix: if transformation == "": return Matrix() @@ -90,7 +91,8 @@ class ThreeMFReader(MeshReader): return temp_mat - def _convertSavitarNodeToUMNode(self, savitar_node: Savitar.SceneNode, file_name: str = "") -> Optional[SceneNode]: + @staticmethod + def _convertSavitarNodeToUMNode(savitar_node: Savitar.SceneNode, file_name: str = "") -> Optional[SceneNode]: """Convenience function that converts a SceneNode object (as obtained from libSavitar) to a scene node. :returns: Scene node. @@ -119,7 +121,7 @@ class ThreeMFReader(MeshReader): pass um_node.setName(node_name) um_node.setId(node_id) - transformation = self._createMatrixFromTransformationString(savitar_node.getTransformation()) + transformation = ThreeMFReader._createMatrixFromTransformationString(savitar_node.getTransformation()) um_node.setTransformation(transformation) mesh_builder = MeshBuilder() @@ -138,7 +140,7 @@ class ThreeMFReader(MeshReader): um_node.setMeshData(mesh_data) for child in savitar_node.getChildren(): - child_node = self._convertSavitarNodeToUMNode(child) + child_node = ThreeMFReader._convertSavitarNodeToUMNode(child) if child_node: um_node.addChild(child_node) @@ -214,7 +216,7 @@ class ThreeMFReader(MeshReader): CuraApplication.getInstance().getController().getScene().setMetaDataEntry(key, value) for node in scene_3mf.getSceneNodes(): - um_node = self._convertSavitarNodeToUMNode(node, file_name) + um_node = ThreeMFReader._convertSavitarNodeToUMNode(node, file_name) if um_node is None: continue @@ -300,8 +302,23 @@ class ThreeMFReader(MeshReader): if unit is None: unit = "millimeter" elif unit not in conversion_to_mm: - Logger.log("w", "Unrecognised unit {unit} used. Assuming mm instead.".format(unit = unit)) + Logger.log("w", "Unrecognised unit {unit} used. Assuming mm instead.".format(unit=unit)) unit = "millimeter" scale = conversion_to_mm[unit] return Vector(scale, scale, scale) + + @staticmethod + def stringToSceneNodes(scene_string: str) -> List[SceneNode]: + parser = Savitar.ThreeMFParser() + scene = parser.parse(scene_string) + + # Convert the scene to scene nodes + nodes = [] + for savitar_node in scene.getSceneNodes(): + scene_node = ThreeMFReader._convertSavitarNodeToUMNode(savitar_node, "file_name") + if scene_node is None: + continue + nodes.append(scene_node) + + return nodes diff --git a/plugins/3MFWriter/ThreeMFWriter.py b/plugins/3MFWriter/ThreeMFWriter.py index 57c667145e..3f6fef7201 100644 --- a/plugins/3MFWriter/ThreeMFWriter.py +++ b/plugins/3MFWriter/ThreeMFWriter.py @@ -55,11 +55,12 @@ class ThreeMFWriter(MeshWriter): "cura": "http://software.ultimaker.com/xml/cura/3mf/2015/10" } - self._unit_matrix_string = self._convertMatrixToString(Matrix()) + self._unit_matrix_string = ThreeMFWriter._convertMatrixToString(Matrix()) self._archive: Optional[zipfile.ZipFile] = None self._store_archive = False - def _convertMatrixToString(self, matrix): + @staticmethod + def _convertMatrixToString(matrix): result = "" result += str(matrix._data[0, 0]) + " " result += str(matrix._data[1, 0]) + " " @@ -83,7 +84,8 @@ class ThreeMFWriter(MeshWriter): """ self._store_archive = store_archive - def _convertUMNodeToSavitarNode(self, um_node, transformation = Matrix()): + @staticmethod + def _convertUMNodeToSavitarNode(um_node, transformation=Matrix()): """Convenience function that converts an Uranium SceneNode object to a SavitarSceneNode :returns: Uranium Scene node. @@ -100,7 +102,7 @@ class ThreeMFWriter(MeshWriter): node_matrix = um_node.getLocalTransformation() - matrix_string = self._convertMatrixToString(node_matrix.preMultiply(transformation)) + matrix_string = ThreeMFWriter._convertMatrixToString(node_matrix.preMultiply(transformation)) savitar_node.setTransformation(matrix_string) mesh_data = um_node.getMeshData() @@ -133,7 +135,7 @@ class ThreeMFWriter(MeshWriter): # only save the nodes on the active build plate if child_node.callDecoration("getBuildPlateNumber") != active_build_plate_nr: continue - savitar_child_node = self._convertUMNodeToSavitarNode(child_node) + savitar_child_node = ThreeMFWriter._convertUMNodeToSavitarNode(child_node) if savitar_child_node is not None: savitar_node.addChild(savitar_child_node) @@ -221,7 +223,7 @@ class ThreeMFWriter(MeshWriter): for node in nodes: if node == root_node: for root_child in node.getChildren(): - savitar_node = self._convertUMNodeToSavitarNode(root_child, transformation_matrix) + savitar_node = ThreeMFWriter._convertUMNodeToSavitarNode(root_child, transformation_matrix) if savitar_node: savitar_scene.addSceneNode(savitar_node) else: @@ -303,9 +305,19 @@ class ThreeMFWriter(MeshWriter): Logger.log("w", "Can't create snapshot when renderer not initialized.") return None try: - snapshot = Snapshot.snapshot(width = 300, height = 300) + snapshot = Snapshot.snapshot(width=300, height=300) except: Logger.logException("w", "Failed to create snapshot image") return None return snapshot + + @staticmethod + def sceneNodesToString(scene_nodes: [SceneNode]) -> str: + savitar_scene = Savitar.Scene() + for scene_node in scene_nodes: + savitar_node = ThreeMFWriter._convertUMNodeToSavitarNode(scene_node) + savitar_scene.addSceneNode(savitar_node) + parser = Savitar.ThreeMFParser() + scene_string = parser.sceneToString(savitar_scene) + return scene_string From c393d915d7e85e7437846475d416ead9c3455c0d Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 8 Aug 2023 12:17:08 +0200 Subject: [PATCH 61/69] Disable copy paste when either 3mf reader or writer is disabled CURA-7913 --- cura/CuraActions.py | 8 +++++++- resources/qml/Actions.qml | 13 +++++++++---- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/cura/CuraActions.py b/cura/CuraActions.py index 338c18a6b9..2f62944caa 100644 --- a/cura/CuraActions.py +++ b/cura/CuraActions.py @@ -193,6 +193,9 @@ class CuraActions(QObject): @pyqtSlot() def copy(self) -> None: mesh_writer = cura.CuraApplication.CuraApplication.getInstance().getMeshFileHandler().getWriter("3MFWriter") + if not mesh_writer: + Logger.log("e", "No 3MF writer found, unable to copy.") + return # Get the selected nodes selected_objects = Selection.getAllSelectedObjects() @@ -204,11 +207,14 @@ class CuraActions(QObject): @pyqtSlot() def paste(self) -> None: application = cura.CuraApplication.CuraApplication.getInstance() + mesh_reader = application.getMeshFileHandler().getReaderForFile(".3mf") + if not mesh_reader: + Logger.log("e", "No 3MF reader found, unable to paste.") + return # Parse the scene from the clipboard scene_string = QApplication.clipboard().text() - mesh_reader = application.getMeshFileHandler().getReaderForFile(".3mf") nodes = mesh_reader.stringToSceneNodes(scene_string) # Find all fixed nodes, these are the nodes that should be avoided when arranging diff --git a/resources/qml/Actions.qml b/resources/qml/Actions.qml index 9cd72026b2..3b75c7699e 100644 --- a/resources/qml/Actions.qml +++ b/resources/qml/Actions.qml @@ -6,7 +6,7 @@ pragma Singleton import QtQuick 2.10 import QtQuick.Controls 2.4 import UM 1.1 as UM -import Cura 1.0 as Cura +import Cura 1.5 as Cura Item { @@ -75,6 +75,11 @@ Item property alias copy: copyAction property alias cut: cutAction + readonly property bool copy_paste_enabled: { + const all_enabled_packages = CuraApplication.getPackageManager().allEnabledPackages; + return all_enabled_packages.includes("3MFReader") && all_enabled_packages.includes("3MFWriter"); + } + UM.I18nCatalog{id: catalog; name: "cura"} @@ -318,7 +323,7 @@ Item id: copyAction text: catalog.i18nc("@action:inmenu menubar:edit", "Copy to clipboard") onTriggered: CuraActions.copy() - enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection + enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection && copy_paste_enabled shortcut: StandardKey.Copy } @@ -327,7 +332,7 @@ Item id: pasteAction text: catalog.i18nc("@action:inmenu menubar:edit", "Paste from clipboard") onTriggered: CuraActions.paste() - enabled: UM.Controller.toolsEnabled + enabled: UM.Controller.toolsEnabled && copy_paste_enabled shortcut: StandardKey.Paste } @@ -336,7 +341,7 @@ Item id: cutAction text: catalog.i18nc("@action:inmenu menubar:edit", "Cut") onTriggered: CuraActions.cut() - enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection + enabled: UM.Controller.toolsEnabled && UM.Selection.hasSelection && copy_paste_enabled shortcut: StandardKey.Cut } From 511f05c392648c93c1840fac3b47b5dd70706558 Mon Sep 17 00:00:00 2001 From: "c.lamboo" Date: Tue, 8 Aug 2023 12:26:44 +0200 Subject: [PATCH 62/69] Don't arrange in paste when no objects were present in the clipboard CURA-7913 --- cura/CuraActions.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/cura/CuraActions.py b/cura/CuraActions.py index 2f62944caa..6c2d3f4cb8 100644 --- a/cura/CuraActions.py +++ b/cura/CuraActions.py @@ -217,6 +217,10 @@ class CuraActions(QObject): nodes = mesh_reader.stringToSceneNodes(scene_string) + if not nodes: + # Nothing to paste + return + # Find all fixed nodes, these are the nodes that should be avoided when arranging fixed_nodes = [] root = application.getController().getScene().getRoot() From fd97dd5d0c7303fc455581cb08dd406f77cd868a Mon Sep 17 00:00:00 2001 From: jellespijker Date: Tue, 8 Aug 2023 11:25:29 +0000 Subject: [PATCH 63/69] Applied printer-linter format --- resources/definitions/anycubic_kobra_plus.def.json | 5 ++--- .../anycubic_kobra_plus_pla.inst.cfg | 13 +++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/definitions/anycubic_kobra_plus.def.json b/resources/definitions/anycubic_kobra_plus.def.json index 5d41a5ef33..85b2ac15a9 100644 --- a/resources/definitions/anycubic_kobra_plus.def.json +++ b/resources/definitions/anycubic_kobra_plus.def.json @@ -18,13 +18,12 @@ "overrides": { "machine_depth": { "default_value": 302 }, + "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84\nM355 S0; led off" }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 352 }, "machine_name": { "default_value": "Anycubic Kobra Plus" }, "machine_start_gcode": { "default_value": "G28 ;Home\nG1 Z15.0 F6000 ;Move the platform down 15mm\n;Prime the extruder\nG92 E0\nM355 S1; Turn LED on\n; Add Custom purge lines\nG1 Z2.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\nG1 X1.0 Y30 Z0.3 F5000.0 ; Move to start position\nG1 X1.0 Y100.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X1.3 Y100.0 Z0.3 F5000.0 ; Move to side a little\nG1 X1.3 Y30 Z0.3 F1500.0 E30 ; Draw the second line\nG92 E0 ; Reset Extruder\nG1 E-2 F500 ; Retract a little \nG1 X50 F500 ; wipe away from the filament line\nG1 X100 F9000 ; Quickly wipe away from the filament line\nG1 Z5.0 F3000 ; Move Z Axis up little to prevent scratching of Heat Bed\n; End custom purge lines" }, - "machine_end_gcode": { "default_value": "M104 S0\nM140 S0\n;Retract the filament\nG92 E1\nG1 E-1 F300\nG28 X0 Y0\nM84\nM355 S0; led off" }, "machine_width": { "default_value": 302 } } -} - +} \ No newline at end of file diff --git a/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg b/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg index 02bd9edb5e..4a3a5817cf 100644 --- a/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg +++ b/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg @@ -11,17 +11,18 @@ type = quality weight = 0 [values] +infill_pattern = cubic layer_height = 0.2 layer_height_0 = 0.2 -infill_pattern = cubic -retraction_hop = 0.1 +material_final_print_temperature = 195 +material_print_temperature = 195 retraction_combing = off +retraction_hop = 0.1 retraction_hop_enabled = True retraction_hop_only_when_collides = True -speed_print = 80 speed_infill = 40 -speed_wall_x = 60 speed_layer_0 = 20 +speed_print = 80 +speed_wall_x = 60 wall_thickness = 1.2 -material_print_temperature = 195 -material_final_print_temperature = 195 + From 63bc3cc996f7275330a9afb920b5e268e3f4773a Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Tue, 8 Aug 2023 13:29:10 +0200 Subject: [PATCH 64/69] Renamed pla quality to normal Contributes CURA-10885 --- resources/definitions/anycubic_kobra_plus.def.json | 2 +- ...ra_plus_pla.inst.cfg => anycubic_kobra_plus_normal.inst.cfg} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename resources/quality/anycubic_kobra_plus/{anycubic_kobra_plus_pla.inst.cfg => anycubic_kobra_plus_normal.inst.cfg} (95%) diff --git a/resources/definitions/anycubic_kobra_plus.def.json b/resources/definitions/anycubic_kobra_plus.def.json index 85b2ac15a9..944398711f 100644 --- a/resources/definitions/anycubic_kobra_plus.def.json +++ b/resources/definitions/anycubic_kobra_plus.def.json @@ -12,7 +12,7 @@ "has_materials": true, "machine_extruder_trains": { "0": "anycubic_kobra_plus_extruder_0" }, "preferred_material": "generic_pla", - "preferred_quality_type": "pla", + "preferred_quality_type": "normal", "quality_definition": "anycubic_kobra_plus" }, "overrides": diff --git a/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg b/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_normal.inst.cfg similarity index 95% rename from resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg rename to resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_normal.inst.cfg index 4a3a5817cf..47983fe3b1 100644 --- a/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_pla.inst.cfg +++ b/resources/quality/anycubic_kobra_plus/anycubic_kobra_plus_normal.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] global_quality = True -quality_type = pla +quality_type = normal setting_version = 22 type = quality weight = 0 From 64a77440daee0a53341f8e8a532684051dba02b0 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Tue, 8 Aug 2023 13:40:51 +0200 Subject: [PATCH 65/69] from deploy field. CURA-10770 --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index d4f365c7a4..7a4e8174f9 100644 --- a/conanfile.py +++ b/conanfile.py @@ -473,7 +473,7 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV icon_path = "'{}'".format(os.path.join(self.package_folder, self.cpp_info.resdirs[2], self.conan_data["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"), entitlements_file = entitlements_file if self.settings.os == "Macos" else "None") - self._generate_about_versions(os.path.join(self.source_folder, "resources", "qml", "Dialogs")) + self._generate_about_versions(os.path.join(self._site_packages, "resources", "qml", "Dialogs")) def package(self): copy(self, "cura_app.py", src = self.source_folder, dst = os.path.join(self.package_folder, self.cpp.package.bindirs[0])) From f2a1830ad99c7d5ccadac37e795dfe618481f6bb Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Tue, 8 Aug 2023 15:05:53 +0200 Subject: [PATCH 66/69] testing for build CURA-10770 --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index 7a4e8174f9..77cecf1134 100644 --- a/conanfile.py +++ b/conanfile.py @@ -466,6 +466,7 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV save(self, os.path.join(self._script_dir, f"activate_github_actions_version_env{ext}"), activate_github_actions_version_env) self._generate_cura_version(os.path.join(self._site_packages, "cura")) + self._generate_about_versions(str(self._share_dir.joinpath("cura", "resources", "qml", "Dialogs"))) entitlements_file = "'{}'".format(Path(self.cpp_info.res_paths[2], "MacOS", "cura.entitlements")) self._generate_pyinstaller_spec(location = self._base_dir, @@ -473,7 +474,6 @@ echo "CURA_APP_NAME={{ cura_app_name }}" >> ${{ env_prefix }}GITHUB_ENV icon_path = "'{}'".format(os.path.join(self.package_folder, self.cpp_info.resdirs[2], self.conan_data["pyinstaller"]["icon"][str(self.settings.os)])).replace("\\", "\\\\"), entitlements_file = entitlements_file if self.settings.os == "Macos" else "None") - self._generate_about_versions(os.path.join(self._site_packages, "resources", "qml", "Dialogs")) def package(self): copy(self, "cura_app.py", src = self.source_folder, dst = os.path.join(self.package_folder, self.cpp.package.bindirs[0])) From 415d2481d359a7f62bd6a67e316fbb1657d3b56c Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 9 Aug 2023 23:44:01 +0200 Subject: [PATCH 67/69] Update README.md --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index c40ead2baa..94187fdff8 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ [![Badge Test]][Test]    [![Badge Conan]][Conan]    - +[![Badge Downloads]][Downloads]

@@ -84,6 +84,7 @@ [Badge Conan]: https://img.shields.io/github/workflow/status/Ultimaker/Cura/conan-package?style=for-the-badge&logoColor=white&labelColor=6185aa&color=4c6987&logo=Conan&label=Conan%20Package [Badge Test]: https://img.shields.io/github/workflow/status/Ultimaker/Cura/unit-test?style=for-the-badge&logoColor=white&labelColor=4a999d&color=346c6e&logo=Codacy&label=Unit%20Test [Badge Size]: https://img.shields.io/github/repo-size/ultimaker/cura?style=for-the-badge&logoColor=white&labelColor=715a97&color=584674&logo=GoogleAnalytics +[Badge Downloads]: https://img.shields.io/github/downloads-pre/Ultimaker/Cura/latest/total?style=for-the-badge From 298f00ebdeb545ea93d56001c962b5eb8a26f1ab Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 9 Aug 2023 23:45:44 +0200 Subject: [PATCH 68/69] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 94187fdff8..3ab44b88e3 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ [![Badge Test]][Test]    [![Badge Conan]][Conan]    -[![Badge Downloads]][Downloads] +[![Badge Downloads]]

From 8eb7866694e0286f1f42885cf33ecf0eb75b2dd9 Mon Sep 17 00:00:00 2001 From: Jelle Spijker Date: Wed, 9 Aug 2023 23:46:01 +0200 Subject: [PATCH 69/69] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 3ab44b88e3..eb04799339 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ [![Badge Test]][Test]    [![Badge Conan]][Conan]    -[![Badge Downloads]] +![Badge Downloads]