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/32] 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 00000000000..a6c001b55a3 --- /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/32] 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 00000000000..e67ee99b130 --- /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/32] 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 00000000000..61615f92b7e --- /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/32] 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 00000000000..1817f394028 --- /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/32] 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 00000000000..4787f681d7f --- /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/32] 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 00000000000..e84dc74b167 --- /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 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 07/32] 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 28d6ac141d5..50ee14db4e3 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 8f8080d58f1..4e35fff69ad 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 08/32] 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 de0d4ed0bff..93038d9effc 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 09/32] 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 00000000000..e4cdf12e605 --- /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 10/32] 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 00000000000..efb2a8342cf --- /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 00000000000..c9d4204ace3 --- /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 00000000000..9046a71b0b7 --- /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 00000000000..c8ce62ffc78 --- /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 00000000000..3eba1d8b6b2 --- /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 00000000000..e697ea96cb3 --- /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 00000000000..7901fe9e689 --- /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 11/32] 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 12/32] 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 e4cdf12e605..6272d3e04a7 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 efb2a8342cf..b5969358e6f 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 c9d4204ace3..c8314bda4da 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 9046a71b0b7..1b519ad1211 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 c8ce62ffc78..6bc413f30bb 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 3eba1d8b6b2..f2356509112 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 e697ea96cb3..52b16eea23d 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 7901fe9e689..06c558c42bf 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 13/32] 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 6272d3e04a7..6deeba5c6fd 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 14/32] 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 3d768e3bd0d..79a4916680c 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 15/32] 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 00000000000..1c3894ef077 --- /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 00000000000..fe74030da45 --- /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 00000000000..0f197367fb9 --- /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 0a43dae8cc3..49f98ebfe10 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 00000000000..f0d5a17a094 --- /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 00000000000..bbf73e7cf96 --- /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 ebe026b163e..0009267f0c2 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 d23e0c356c2..54299a261d0 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 82cf9d9541e..0cb088acdd1 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 16/32] 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 1c3894ef077..00000000000 --- 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 17/32] 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 49f98ebfe10..5023d5669f8 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 18/32] 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 5023d5669f8..86dfdb619f9 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 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 19/32] 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 37e69d72c08..62405572d78 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 61da5b690e7..0982104cd99 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 ba5d22e2dc6..d375a904de2 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 1e240e32292557fb4b5bbdb3eb3011894260a2e2 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Fri, 21 Jul 2023 10:57:39 +0200 Subject: [PATCH 20/32] 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 603244a12bf..3df94e4ad82 100644 --- a/cura/Machines/Models/IntentSelectionModel.py +++ b/cura/Machines/Models/IntentSelectionModel.py @@ -71,15 +71,15 @@ def _onChange(self) -> None: 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 @@ def _update(self) -> None: 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 41502f8874d..b5b8a1b7213 100755 --- a/cura/Settings/CuraContainerStack.py +++ b/cura/Settings/CuraContainerStack.py @@ -359,7 +359,7 @@ def _getMachineDefinition(self) -> DefinitionContainer: 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 @@ def _findInstanceContainerDefinitionId(cls, machine_definition: DefinitionContai 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 0c7d0540b9cc05ee37ce5e2d9f4991065ed6490c Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Tue, 25 Jul 2023 11:20:58 +0200 Subject: [PATCH 21/32] 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 45cf4400f6e..048bb915c74 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 00000000000..05034696602 --- /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 46e143cc105..d75b2bc6bfb 100644 --- a/conanfile.py +++ b/conanfile.py @@ -138,6 +138,29 @@ def _pyinstaller_spec_arch(self): 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 @@ def generate(self): 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 4ccf58d0b46..361e19a45d2 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 86cb3851fe8091df96613ce91e5c9f5d39321fdc Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Tue, 25 Jul 2023 13:20:26 +0200 Subject: [PATCH 22/32] 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 64beeb98343..408db66f3a8 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 58048598b413dd8098f8f3be58191b9e21c563a1 Mon Sep 17 00:00:00 2001 From: "saumya.jain" Date: Tue, 25 Jul 2023 15:10:02 +0200 Subject: [PATCH 23/32] 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 361e19a45d2..ae2bd44d742 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 24/32] Attempt to fix build --- conanfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/conanfile.py b/conanfile.py index d75b2bc6bfb..438e3f07b74 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 25/32] 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 701a978cd89..98e207acf30 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 26/32] 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 98e207acf30..701a978cd89 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 27/32] 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 cb3202bc003..31066f8f46e 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 28/32] 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 438e3f07b74..520e7a693fc 100644 --- a/conanfile.py +++ b/conanfile.py @@ -10,7 +10,7 @@ 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 d3027fa976226fff3822500958a8e3c839f4d36a Mon Sep 17 00:00:00 2001 From: nallath Date: Tue, 1 Aug 2023 11:27:33 +0000 Subject: [PATCH 29/32] 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 93038d9effc..aa5daa132b0 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 30/32] 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 fe74030da45..7e6b18a9821 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 0f197367fb9..82dc85b36ef 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 86dfdb619f9..bbc1fcd09e9 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 f0d5a17a094..7824aa3006a 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 bbf73e7cf96..5c115298546 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 0009267f0c2..8177da741cc 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 54299a261d0..fc0720ade00 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 0cb088acdd1..82cf9d9541e 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 31/32] 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 e84dc74b167..2ba2351c560 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 61615f92b7e..deae0b748c2 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 4787f681d7f..99b00d76839 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 a6c001b55a3..5a9bde2f79e 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 1817f394028..8d124cca032 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 e67ee99b130..896a12aee72 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 32/32] 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 6deeba5c6fd..32dbf75b020 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 b5969358e6f..bb3e5312eab 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 c8314bda4da..f7aa3350bc6 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 1b519ad1211..6e38f503fcb 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 6bc413f30bb..cb2b6845426 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 f2356509112..2c2d0480ff6 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 52b16eea23d..2e95f8e3d00 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 06c558c42bf..48fba7a715b 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 +