From 23d6f7ba0b7f101a9d27df1cb57956ad6b90a88e Mon Sep 17 00:00:00 2001 From: Orel Date: Tue, 5 Jun 2018 17:36:44 +0200 Subject: [PATCH 1/9] Enhance Dagoma printers profiles and add printer-specific quality profiles. --- .../definitions/dagoma_discoeasy200.def.json | 25 ++++-- resources/definitions/dagoma_neva.def.json | 26 ++++-- .../definitions/dagoma_neva_magis.def.json | 81 +++++++++++++++++++ .../dagoma_discoeasy200_pla_fast.inst.cfg | 17 ++++ .../dagoma_discoeasy200_pla_fine.inst.cfg | 14 ++++ .../dagoma_discoeasy200_pla_standard.inst.cfg | 17 ++++ .../dagoma_neva_magis_pla_fast.inst.cfg | 17 ++++ .../dagoma_neva_magis_pla_fine.inst.cfg | 14 ++++ .../dagoma_neva_magis_pla_standard.inst.cfg | 17 ++++ .../dagoma/dagoma_neva_pla_fast.inst.cfg | 17 ++++ .../dagoma/dagoma_neva_pla_fine.inst.cfg | 14 ++++ .../dagoma/dagoma_neva_pla_standard.inst.cfg | 17 ++++ 12 files changed, 263 insertions(+), 13 deletions(-) create mode 100644 resources/definitions/dagoma_neva_magis.def.json create mode 100644 resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg create mode 100644 resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg create mode 100644 resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg create mode 100644 resources/quality/dagoma/dagoma_neva_magis_pla_fast.inst.cfg create mode 100644 resources/quality/dagoma/dagoma_neva_magis_pla_fine.inst.cfg create mode 100644 resources/quality/dagoma/dagoma_neva_magis_pla_standard.inst.cfg create mode 100644 resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg create mode 100644 resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg create mode 100644 resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg diff --git a/resources/definitions/dagoma_discoeasy200.def.json b/resources/definitions/dagoma_discoeasy200.def.json index 4f0fddc41d..9df8829ec5 100644 --- a/resources/definitions/dagoma_discoeasy200.def.json +++ b/resources/definitions/dagoma_discoeasy200.def.json @@ -1,4 +1,5 @@ { + "id": "dagoma_discoeasy200", "name": "Dagoma DiscoEasy200", "version": 2, "inherits": "fdmprinter", @@ -28,17 +29,17 @@ }, "machine_head_with_fans_polygon": { "default_value": [ - [17, 70], - [17, -40], - [-17, -40], - [17, 70] + [-17, -70], + [-17, 40], + [17, 40], + [17, -70] ] }, "gantry_height": { "default_value": 10 }, "machine_start_gcode": { - "default_value": ";Gcode by Cura\nG90\nM106 S250\nG28 X Y\nG1 X50\nM109 S180\nG28\nM104 S{material_print_temperature_layer_0}\nG29\nM107\nG1 X100 Y20 F3000\nG1 Z0.5\nM109 S{material_print_temperature_layer_0}\nM82\nG92 E0\nG1 F200 E10\nG92 E0\nG1 Z3\nG1 F6000\n" + "default_value": ";Gcode by Cura\nG90\nM106 S255\nG28 X Y\nG1 X50\nM109 R90\nG28\nM104 S{material_print_temperature_layer_0}\nG29\nM107\nG1 X100 Y20 F3000\nG1 Z0.5\nM109 S{material_print_temperature_layer_0}\nM82\nG92 E0\nG1 F200 E10\nG92 E0\nG1 Z3\nG1 F6000\n" }, "machine_end_gcode": { "default_value": "\nM104 S0\nM106 S255\nM140 S0\nG91\nG1 E-1 F300\nG1 Z+3 F3000\nG90\nG28 X Y\nM107\nM84\n" @@ -46,17 +47,29 @@ "material_diameter": { "default_value": 1.75 }, + "default_material_print_temperature": { + "default_value": 205 + }, "speed_print": { "default_value": 60 }, "speed_travel": { - "value": "100" + "default_value": 100 }, "retraction_amount": { "default_value": 3.5 }, "retraction_speed": { "default_value": 50 + }, + "adhesion_type": { + "default_value": "skirt" + }, + "skirt_line_count": { + "default_value": 2 + }, + "layer_height_0": { + "default_value": 0.26 } } } diff --git a/resources/definitions/dagoma_neva.def.json b/resources/definitions/dagoma_neva.def.json index 21a557ac22..d133ec820c 100644 --- a/resources/definitions/dagoma_neva.def.json +++ b/resources/definitions/dagoma_neva.def.json @@ -1,5 +1,5 @@ { - "id": "Dagoma_neva", + "id": "dagoma_neva", "name": "Dagoma NEVA", "version": 2, "inherits": "fdmprinter", @@ -29,10 +29,10 @@ }, "machine_head_with_fans_polygon": { "default_value": [ - [17, 40], - [17, -70], - [-17, -70], - [17, 40] + [-36, -42], + [-36, 42], + [36, 42], + [36, -42] ] }, "gantry_height": { @@ -42,10 +42,10 @@ "default_value": "elliptic" }, "machine_gcode_flavor": { - "default_value": "RepRap (RepRap)" + "default_value": "RepRap" }, "machine_start_gcode": { - "default_value": ";Gcode by Cura\nG90\nG28\nM109 S100\nG29\nM104 S{material_print_temperature_layer_0}\nG0 X0 Y-85\nG0 Z0.26\nM109 S{material_print_temperature_layer_0}\nM82\nG92 E0\nG1 F200 E6\nG92 E0\nG1 F200 E-3.5\nG0 Z0.15\nG0 X10\nG0 Z3\nG1 F6000\n" + "default_value": ";Gcode by Cura\nG90\nG28\nM107\nM109 R100\nG29\nM109 S{material_print_temperature_layer_0} U-55 X55 V-85 Y-85 W0.26 Z0.26\nM82\nG92 E0\nG1 F200 E6\nG92 E0\nG1 F200 E-3.5\nG0 Z0.15\nG0 X10\nG0 Z3\nG1 F6000\n" }, "machine_end_gcode": { "default_value": "\nM104 S0\nM106 S255\nM140 S0\nG91\nG1 E-1 F300\nG1 Z+3 E-2 F9000\nG90\nG28\n" @@ -53,6 +53,9 @@ "material_diameter": { "default_value": 1.75 }, + "default_material_print_temperature": { + "default_value": 205 + }, "speed_print": { "default_value": 40 }, @@ -64,6 +67,15 @@ }, "retraction_speed": { "default_value": 60 + }, + "adhesion_type": { + "default_value": "skirt" + }, + "skirt_line_count": { + "default_value": 2 + }, + "layer_height_0": { + "default_value": 0.26 } } } diff --git a/resources/definitions/dagoma_neva_magis.def.json b/resources/definitions/dagoma_neva_magis.def.json new file mode 100644 index 0000000000..9f599cf85d --- /dev/null +++ b/resources/definitions/dagoma_neva_magis.def.json @@ -0,0 +1,81 @@ +{ + "id": "dagoma_neva_magis", + "name": "Dagoma NEVA", + "version": 2, + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "Dagoma", + "manufacturer": "Dagoma", + "file_formats": "text/x-gcode", + "platform": "neva.stl", + "platform_offset": [ 0, 0, 0] + }, + "overrides": { + "machine_width": { + "default_value": 195.55 + }, + "machine_height": { + "default_value": 205 + }, + "machine_depth": { + "default_value": 195.55 + }, + "machine_center_is_zero": { + "default_value": true + }, + "machine_nozzle_size": { + "default_value": 0.4 + }, + "machine_head_with_fans_polygon": { + "default_value": [ + [-36, -42], + [-36, 42], + [36, 42], + [36, -42] + ] + }, + "gantry_height": { + "default_value": 0 + }, + "machine_shape": { + "default_value": "elliptic" + }, + "machine_gcode_flavor": { + "default_value": "RepRap" + }, + "machine_start_gcode": { + "default_value": ";Gcode by Cura\nG90\nG28\nM107\nM109 R100\nG29\nM109 S{material_print_temperature_layer_0} U-55 X55 V-85 Y-85 W0.26 Z0.26\nM82\nG92 E0\nG1 F200 E6\nG92 E0\nG1 F200 E-3.5\nG0 Z0.15\nG0 X10\nG0 Z3\nG1 F6000\n" + }, + "machine_end_gcode": { + "default_value": "\nM104 S0\nM106 S255\nM140 S0\nG91\nG1 E-1 F300\nG1 Z+3 E-2 F9000\nG90\nG28\n" + }, + "material_diameter": { + "default_value": 1.75 + }, + "default_material_print_temperature": { + "default_value": 205 + }, + "speed_print": { + "default_value": 40 + }, + "speed_travel": { + "default_value": 120 + }, + "retraction_amount": { + "default_value": 3.8 + }, + "retraction_speed": { + "default_value": 60 + }, + "adhesion_type": { + "default_value": "skirt" + }, + "skirt_line_count": { + "default_value": 2 + }, + "layer_height_0": { + "default_value": 0.26 + } + } +} diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg new file mode 100644 index 0000000000..6cd88f819c --- /dev/null +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 3 +name = Fast +definition = dagoma_discoeasy200 + +[metadata] +setting_version = 4 +type = quality +quality_type = draft +weight = -2 +material = generic_pla + +[values] +layer_height = 0.2 + +material_print_temperature = =default_material_print_temperature + 10 +material_bed_temperature_layer_0 = =default_material_print_temperature + 10 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg new file mode 100644 index 0000000000..0f59401dd5 --- /dev/null +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 3 +name = Fine +definition = dagoma_discoeasy200 + +[metadata] +setting_version = 4 +type = quality +quality_type = high +weight = 0 +material = generic_pla + +[values] +layer_height = 0.1 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg new file mode 100644 index 0000000000..9c1cc19f9e --- /dev/null +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 3 +name = Standard +definition = dagoma_discoeasy200 + +[metadata] +setting_version = 4 +type = quality +quality_type = normal +weight = -1 +material = generic_pla + +[values] +layer_height = 0.15 + +material_print_temperature = =default_material_print_temperature + 5 +material_bed_temperature_layer_0 = =default_material_print_temperature + 5 diff --git a/resources/quality/dagoma/dagoma_neva_magis_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_neva_magis_pla_fast.inst.cfg new file mode 100644 index 0000000000..f0f5810e82 --- /dev/null +++ b/resources/quality/dagoma/dagoma_neva_magis_pla_fast.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 3 +name = Fast +definition = dagoma_neva + +[metadata] +setting_version = 4 +type = quality +quality_type = draft +weight = -2 +material = generic_pla + +[values] +layer_height = 0.2 + +material_print_temperature = =default_material_print_temperature + 10 +material_bed_temperature_layer_0 = =default_material_print_temperature + 10 diff --git a/resources/quality/dagoma/dagoma_neva_magis_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_neva_magis_pla_fine.inst.cfg new file mode 100644 index 0000000000..3dc4ce5627 --- /dev/null +++ b/resources/quality/dagoma/dagoma_neva_magis_pla_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 3 +name = Fine +definition = dagoma_neva + +[metadata] +setting_version = 4 +type = quality +quality_type = high +weight = 0 +material = generic_pla + +[values] +layer_height = 0.1 diff --git a/resources/quality/dagoma/dagoma_neva_magis_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_neva_magis_pla_standard.inst.cfg new file mode 100644 index 0000000000..ce2157c90b --- /dev/null +++ b/resources/quality/dagoma/dagoma_neva_magis_pla_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 3 +name = Standard +definition = dagoma_neva + +[metadata] +setting_version = 4 +type = quality +quality_type = normal +weight = -1 +material = generic_pla + +[values] +layer_height = 0.15 + +material_print_temperature = =default_material_print_temperature + 5 +material_bed_temperature_layer_0 = =default_material_print_temperature + 5 diff --git a/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg new file mode 100644 index 0000000000..f0f5810e82 --- /dev/null +++ b/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 3 +name = Fast +definition = dagoma_neva + +[metadata] +setting_version = 4 +type = quality +quality_type = draft +weight = -2 +material = generic_pla + +[values] +layer_height = 0.2 + +material_print_temperature = =default_material_print_temperature + 10 +material_bed_temperature_layer_0 = =default_material_print_temperature + 10 diff --git a/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg new file mode 100644 index 0000000000..3dc4ce5627 --- /dev/null +++ b/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 3 +name = Fine +definition = dagoma_neva + +[metadata] +setting_version = 4 +type = quality +quality_type = high +weight = 0 +material = generic_pla + +[values] +layer_height = 0.1 diff --git a/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg new file mode 100644 index 0000000000..ce2157c90b --- /dev/null +++ b/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg @@ -0,0 +1,17 @@ +[general] +version = 3 +name = Standard +definition = dagoma_neva + +[metadata] +setting_version = 4 +type = quality +quality_type = normal +weight = -1 +material = generic_pla + +[values] +layer_height = 0.15 + +material_print_temperature = =default_material_print_temperature + 5 +material_bed_temperature_layer_0 = =default_material_print_temperature + 5 From 46ce90c803cea95a68c76d151f76d5934d2aec35 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Mon, 16 Jul 2018 16:54:50 +0200 Subject: [PATCH 2/9] Fix-up Dagoma definitions - Removed nozzle size in magis def because it's in the extruder def on other machines - Removed material diam from disco extruder def because its in the disco machine - Remove material diam from neva extruder def because its in the neva machine Contributes to CURA-5499 --- .../definitions/dagoma_neva_magis.def.json | 3 --- .../dagoma_discoeasy200_extruder_0.def.json | 9 ++++++--- .../extruders/dagoma_neva_extruder_0.def.json | 9 ++++++--- .../dagoma_neva_magis_extruder_0.def.json | 19 +++++++++++++++++++ 4 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 resources/extruders/dagoma_neva_magis_extruder_0.def.json diff --git a/resources/definitions/dagoma_neva_magis.def.json b/resources/definitions/dagoma_neva_magis.def.json index fe5cff471e..91f99146ba 100644 --- a/resources/definitions/dagoma_neva_magis.def.json +++ b/resources/definitions/dagoma_neva_magis.def.json @@ -24,9 +24,6 @@ "machine_center_is_zero": { "default_value": true }, - "machine_nozzle_size": { - "default_value": 0.4 - }, "machine_head_with_fans_polygon": { "default_value": [ [-36, -42], diff --git a/resources/extruders/dagoma_discoeasy200_extruder_0.def.json b/resources/extruders/dagoma_discoeasy200_extruder_0.def.json index eb2b8ef1f7..342741c559 100644 --- a/resources/extruders/dagoma_discoeasy200_extruder_0.def.json +++ b/resources/extruders/dagoma_discoeasy200_extruder_0.def.json @@ -9,8 +9,11 @@ }, "overrides": { - "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "extruder_nr": { + "default_value": 0 + }, + "machine_nozzle_size": { + "default_value": 0.4 + } } } diff --git a/resources/extruders/dagoma_neva_extruder_0.def.json b/resources/extruders/dagoma_neva_extruder_0.def.json index dcb8311be4..eeb8a42a3a 100644 --- a/resources/extruders/dagoma_neva_extruder_0.def.json +++ b/resources/extruders/dagoma_neva_extruder_0.def.json @@ -9,8 +9,11 @@ }, "overrides": { - "extruder_nr": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.4 }, - "material_diameter": { "default_value": 1.75 } + "extruder_nr": { + "default_value": 0 + }, + "machine_nozzle_size": { + "default_value": 0.4 + } } } diff --git a/resources/extruders/dagoma_neva_magis_extruder_0.def.json b/resources/extruders/dagoma_neva_magis_extruder_0.def.json new file mode 100644 index 0000000000..4a20b64fe8 --- /dev/null +++ b/resources/extruders/dagoma_neva_magis_extruder_0.def.json @@ -0,0 +1,19 @@ +{ + "id": "dagoma_neva_magis_extruder_0", + "version": 2, + "name": "Extruder 1", + "inherits": "fdmextruder", + "metadata": { + "machine": "dagoma_neva_magis", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0 + }, + "machine_nozzle_size": { + "default_value": 0.4 + } + } +} From ed1e47dcc99e79d05f80fdd7d7e8d899b2347ea9 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Tue, 17 Jul 2018 10:56:33 +0200 Subject: [PATCH 3/9] Moved material diameters to extruders defs Contributes to CURA-5499 --- resources/definitions/dagoma_discoeasy200.def.json | 3 --- resources/definitions/dagoma_neva.def.json | 4 ---- resources/definitions/dagoma_neva_magis.def.json | 4 ---- resources/extruders/dagoma_discoeasy200_extruder_0.def.json | 4 +++- resources/extruders/dagoma_neva_extruder_0.def.json | 4 +++- resources/extruders/dagoma_neva_magis_extruder_0.def.json | 4 +++- 6 files changed, 9 insertions(+), 14 deletions(-) diff --git a/resources/definitions/dagoma_discoeasy200.def.json b/resources/definitions/dagoma_discoeasy200.def.json index 60f371ec88..5e45947393 100644 --- a/resources/definitions/dagoma_discoeasy200.def.json +++ b/resources/definitions/dagoma_discoeasy200.def.json @@ -44,9 +44,6 @@ "machine_end_gcode": { "default_value": "\nM104 S0\nM106 S255\nM140 S0\nG91\nG1 E-1 F300\nG1 Z+3 F3000\nG90\nG28 X Y\nM107\nM84\n" }, - "material_diameter": { - "default_value": 1.75 - }, "default_material_print_temperature": { "default_value": 205 }, diff --git a/resources/definitions/dagoma_neva.def.json b/resources/definitions/dagoma_neva.def.json index b7a15995c3..be429e32af 100644 --- a/resources/definitions/dagoma_neva.def.json +++ b/resources/definitions/dagoma_neva.def.json @@ -1,5 +1,4 @@ { - "id": "dagoma_neva", "name": "Dagoma NEVA", "version": 2, "inherits": "fdmprinter", @@ -51,9 +50,6 @@ "machine_end_gcode": { "default_value": "\nM104 S0\nM106 S255\nM140 S0\nG91\nG1 E-1 F300\nG1 Z+3 E-2 F9000\nG90\nG28\n" }, - "material_diameter": { - "default_value": 1.75 - }, "default_material_print_temperature": { "default_value": 205 }, diff --git a/resources/definitions/dagoma_neva_magis.def.json b/resources/definitions/dagoma_neva_magis.def.json index 91f99146ba..6a856044b2 100644 --- a/resources/definitions/dagoma_neva_magis.def.json +++ b/resources/definitions/dagoma_neva_magis.def.json @@ -1,5 +1,4 @@ { - "id": "dagoma_neva_magis", "name": "Dagoma NEVA Magis", "version": 2, "inherits": "fdmprinter", @@ -47,9 +46,6 @@ "machine_end_gcode": { "default_value": "\nM104 S0\nM106 S255\nM140 S0\nG91\nG1 E-1 F300\nG1 Z+3 E-2 F9000\nG90\nG28\n" }, - "material_diameter": { - "default_value": 1.75 - }, "default_material_print_temperature": { "default_value": 205 }, diff --git a/resources/extruders/dagoma_discoeasy200_extruder_0.def.json b/resources/extruders/dagoma_discoeasy200_extruder_0.def.json index 342741c559..c885ac971e 100644 --- a/resources/extruders/dagoma_discoeasy200_extruder_0.def.json +++ b/resources/extruders/dagoma_discoeasy200_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "dagoma_discoeasy200_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", @@ -14,6 +13,9 @@ }, "machine_nozzle_size": { "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 } } } diff --git a/resources/extruders/dagoma_neva_extruder_0.def.json b/resources/extruders/dagoma_neva_extruder_0.def.json index eeb8a42a3a..95035f63f2 100644 --- a/resources/extruders/dagoma_neva_extruder_0.def.json +++ b/resources/extruders/dagoma_neva_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "dagoma_neva_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", @@ -14,6 +13,9 @@ }, "machine_nozzle_size": { "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 } } } diff --git a/resources/extruders/dagoma_neva_magis_extruder_0.def.json b/resources/extruders/dagoma_neva_magis_extruder_0.def.json index 4a20b64fe8..0d5fd3c9b4 100644 --- a/resources/extruders/dagoma_neva_magis_extruder_0.def.json +++ b/resources/extruders/dagoma_neva_magis_extruder_0.def.json @@ -1,5 +1,4 @@ { - "id": "dagoma_neva_magis_extruder_0", "version": 2, "name": "Extruder 1", "inherits": "fdmextruder", @@ -14,6 +13,9 @@ }, "machine_nozzle_size": { "default_value": 0.4 + }, + "material_diameter": { + "default_value": 1.75 } } } From 139ac5c5460da2e118b9258f472edc09160304b5 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Tue, 17 Jul 2018 13:18:22 +0200 Subject: [PATCH 4/9] Quality profile fixes Contributes to CURA-5499 --- .../quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg | 2 +- .../quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg | 4 ++-- .../quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg | 4 ++-- resources/quality/dagoma/dagoma_neva_magis_pla_fast.inst.cfg | 2 +- resources/quality/dagoma/dagoma_neva_magis_pla_fine.inst.cfg | 4 ++-- .../quality/dagoma/dagoma_neva_magis_pla_standard.inst.cfg | 4 ++-- resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg | 2 +- resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg | 4 ++-- resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg | 4 ++-- 9 files changed, 15 insertions(+), 15 deletions(-) diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg index 6cd88f819c..b1b742935d 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = dagoma_discoeasy200 [metadata] -setting_version = 4 +setting_version = 5 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg index 0f59401dd5..e6ac921430 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg @@ -4,9 +4,9 @@ name = Fine definition = dagoma_discoeasy200 [metadata] -setting_version = 4 +setting_version = 5 type = quality -quality_type = high +quality_type = normal weight = 0 material = generic_pla diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg index 9c1cc19f9e..7261c2c416 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg @@ -4,9 +4,9 @@ name = Standard definition = dagoma_discoeasy200 [metadata] -setting_version = 4 +setting_version = 5 type = quality -quality_type = normal +quality_type = fast weight = -1 material = generic_pla diff --git a/resources/quality/dagoma/dagoma_neva_magis_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_neva_magis_pla_fast.inst.cfg index f0f5810e82..8f75d6733d 100644 --- a/resources/quality/dagoma/dagoma_neva_magis_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_magis_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = dagoma_neva [metadata] -setting_version = 4 +setting_version = 5 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/dagoma/dagoma_neva_magis_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_neva_magis_pla_fine.inst.cfg index 3dc4ce5627..018e7f1e63 100644 --- a/resources/quality/dagoma/dagoma_neva_magis_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_magis_pla_fine.inst.cfg @@ -4,9 +4,9 @@ name = Fine definition = dagoma_neva [metadata] -setting_version = 4 +setting_version = 5 type = quality -quality_type = high +quality_type = normal weight = 0 material = generic_pla diff --git a/resources/quality/dagoma/dagoma_neva_magis_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_neva_magis_pla_standard.inst.cfg index ce2157c90b..9456eb25f8 100644 --- a/resources/quality/dagoma/dagoma_neva_magis_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_magis_pla_standard.inst.cfg @@ -4,9 +4,9 @@ name = Standard definition = dagoma_neva [metadata] -setting_version = 4 +setting_version = 5 type = quality -quality_type = normal +quality_type = fast weight = -1 material = generic_pla diff --git a/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg index f0f5810e82..8f75d6733d 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = dagoma_neva [metadata] -setting_version = 4 +setting_version = 5 type = quality quality_type = draft weight = -2 diff --git a/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg index 3dc4ce5627..018e7f1e63 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg @@ -4,9 +4,9 @@ name = Fine definition = dagoma_neva [metadata] -setting_version = 4 +setting_version = 5 type = quality -quality_type = high +quality_type = normal weight = 0 material = generic_pla diff --git a/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg index ce2157c90b..9456eb25f8 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg @@ -4,9 +4,9 @@ name = Standard definition = dagoma_neva [metadata] -setting_version = 4 +setting_version = 5 type = quality -quality_type = normal +quality_type = fast weight = -1 material = generic_pla From f1efaa78b7719efaf425316e3896d013a2ce6b28 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Tue, 17 Jul 2018 13:22:15 +0200 Subject: [PATCH 5/9] General version to v4, fixed bed temp Contributes to CURA-5499 --- .../quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg | 2 +- .../quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg | 2 +- .../quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg | 4 ++-- resources/quality/dagoma/dagoma_neva_magis_pla_fast.inst.cfg | 4 ++-- resources/quality/dagoma/dagoma_neva_magis_pla_fine.inst.cfg | 2 +- .../quality/dagoma/dagoma_neva_magis_pla_standard.inst.cfg | 4 ++-- resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg | 4 ++-- resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg | 2 +- resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg | 4 ++-- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg index b1b742935d..5ba805a4fa 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg @@ -1,5 +1,5 @@ [general] -version = 3 +version = 4 name = Fast definition = dagoma_discoeasy200 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg index e6ac921430..695fd7bc7e 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg @@ -1,5 +1,5 @@ [general] -version = 3 +version = 4 name = Fine definition = dagoma_discoeasy200 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg index 7261c2c416..b6b086403d 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg @@ -1,5 +1,5 @@ [general] -version = 3 +version = 4 name = Standard definition = dagoma_discoeasy200 @@ -14,4 +14,4 @@ material = generic_pla layer_height = 0.15 material_print_temperature = =default_material_print_temperature + 5 -material_bed_temperature_layer_0 = =default_material_print_temperature + 5 +material_bed_temperature_layer_0 = =default_material_bed_temperature + 5 diff --git a/resources/quality/dagoma/dagoma_neva_magis_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_neva_magis_pla_fast.inst.cfg index 8f75d6733d..51fb17a5cc 100644 --- a/resources/quality/dagoma/dagoma_neva_magis_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_magis_pla_fast.inst.cfg @@ -1,5 +1,5 @@ [general] -version = 3 +version = 4 name = Fast definition = dagoma_neva @@ -14,4 +14,4 @@ material = generic_pla layer_height = 0.2 material_print_temperature = =default_material_print_temperature + 10 -material_bed_temperature_layer_0 = =default_material_print_temperature + 10 +material_bed_temperature_layer_0 = =default_material_bed_temperature + 10 diff --git a/resources/quality/dagoma/dagoma_neva_magis_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_neva_magis_pla_fine.inst.cfg index 018e7f1e63..1ff947d766 100644 --- a/resources/quality/dagoma/dagoma_neva_magis_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_magis_pla_fine.inst.cfg @@ -1,5 +1,5 @@ [general] -version = 3 +version = 4 name = Fine definition = dagoma_neva diff --git a/resources/quality/dagoma/dagoma_neva_magis_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_neva_magis_pla_standard.inst.cfg index 9456eb25f8..dfcc1c967b 100644 --- a/resources/quality/dagoma/dagoma_neva_magis_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_magis_pla_standard.inst.cfg @@ -1,5 +1,5 @@ [general] -version = 3 +version = 4 name = Standard definition = dagoma_neva @@ -14,4 +14,4 @@ material = generic_pla layer_height = 0.15 material_print_temperature = =default_material_print_temperature + 5 -material_bed_temperature_layer_0 = =default_material_print_temperature + 5 +material_bed_temperature_layer_0 = =default_material_bed_temperature + 5 diff --git a/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg index 8f75d6733d..51fb17a5cc 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg @@ -1,5 +1,5 @@ [general] -version = 3 +version = 4 name = Fast definition = dagoma_neva @@ -14,4 +14,4 @@ material = generic_pla layer_height = 0.2 material_print_temperature = =default_material_print_temperature + 10 -material_bed_temperature_layer_0 = =default_material_print_temperature + 10 +material_bed_temperature_layer_0 = =default_material_bed_temperature + 10 diff --git a/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg index 018e7f1e63..1ff947d766 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg @@ -1,5 +1,5 @@ [general] -version = 3 +version = 4 name = Fine definition = dagoma_neva diff --git a/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg index 9456eb25f8..dfcc1c967b 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg @@ -1,5 +1,5 @@ [general] -version = 3 +version = 4 name = Standard definition = dagoma_neva @@ -14,4 +14,4 @@ material = generic_pla layer_height = 0.15 material_print_temperature = =default_material_print_temperature + 5 -material_bed_temperature_layer_0 = =default_material_print_temperature + 5 +material_bed_temperature_layer_0 = =default_material_bed_temperature + 5 From 350f9caa2a69259b82527f68bf3d539f8234a554 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Tue, 17 Jul 2018 14:15:16 +0200 Subject: [PATCH 6/9] Use material bed temperature as reference for the bed temperature of the first layer. Contributes to CURA-5499. --- resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg index 5ba805a4fa..a75d01c9f0 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg @@ -14,4 +14,4 @@ material = generic_pla layer_height = 0.2 material_print_temperature = =default_material_print_temperature + 10 -material_bed_temperature_layer_0 = =default_material_print_temperature + 10 +material_bed_temperature_layer_0 = =default_material_bed_temperature + 10 From eab10401eeaefdaecf0e5cf3499be2f476410c34 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Tue, 17 Jul 2018 18:02:11 +0200 Subject: [PATCH 7/9] Add global profiles and define that the printers have materials and quality profiles, in the definition files. Contributes to CURA-5499 --- cura/Settings/MachineManager.py | 2 ++ resources/definitions/dagoma_discoeasy200.def.json | 2 ++ resources/definitions/dagoma_neva.def.json | 2 ++ resources/definitions/dagoma_neva_magis.def.json | 8 +++++++- .../dagoma/dagoma_discoeasy200_pla_fast.inst.cfg | 2 -- .../dagoma/dagoma_discoeasy200_pla_fine.inst.cfg | 1 - .../dagoma_discoeasy200_pla_standard.inst.cfg | 2 -- .../quality/dagoma/dagoma_global_fast.inst.cfg | 14 ++++++++++++++ .../quality/dagoma/dagoma_global_fine.inst.cfg | 14 ++++++++++++++ .../quality/dagoma/dagoma_global_standard.inst.cfg | 14 ++++++++++++++ .../dagoma/dagoma_neva_magis_pla_fast.inst.cfg | 2 -- .../dagoma/dagoma_neva_magis_pla_fine.inst.cfg | 1 - .../dagoma/dagoma_neva_magis_pla_standard.inst.cfg | 2 -- .../quality/dagoma/dagoma_neva_pla_fast.inst.cfg | 2 -- .../quality/dagoma/dagoma_neva_pla_fine.inst.cfg | 1 - .../dagoma/dagoma_neva_pla_standard.inst.cfg | 2 -- 16 files changed, 55 insertions(+), 16 deletions(-) create mode 100644 resources/quality/dagoma/dagoma_global_fast.inst.cfg create mode 100644 resources/quality/dagoma/dagoma_global_fine.inst.cfg create mode 100644 resources/quality/dagoma/dagoma_global_standard.inst.cfg diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 26f5a490dd..1f1e940100 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -335,6 +335,7 @@ class MachineManager(QObject): global_stack.getName(), new_quality_changes_group.name) else: new_quality_group = quality_groups.get(quality_type) + print(quality_groups) if new_quality_group is not None: self._setQualityGroup(new_quality_group, empty_quality_changes = True) same_quality_found = True @@ -1107,6 +1108,7 @@ class MachineManager(QObject): # Set quality and quality_changes for each ExtruderStack for position, node in quality_group.nodes_for_extruders.items(): self._global_container_stack.extruders[str(position)].quality = node.getContainer() + print("#######", node.getContainer().getName()) if empty_quality_changes: self._global_container_stack.extruders[str(position)].qualityChanges = self._empty_quality_changes_container diff --git a/resources/definitions/dagoma_discoeasy200.def.json b/resources/definitions/dagoma_discoeasy200.def.json index 5e45947393..89d94ff6b7 100644 --- a/resources/definitions/dagoma_discoeasy200.def.json +++ b/resources/definitions/dagoma_discoeasy200.def.json @@ -9,6 +9,8 @@ "file_formats": "text/x-gcode", "platform": "discoeasy200.stl", "platform_offset": [ 105, -59, 280], + "has_machine_quality": true, + "has_materials": true, "machine_extruder_trains": { "0": "dagoma_discoeasy200_extruder_0" diff --git a/resources/definitions/dagoma_neva.def.json b/resources/definitions/dagoma_neva.def.json index be429e32af..cdd5725765 100644 --- a/resources/definitions/dagoma_neva.def.json +++ b/resources/definitions/dagoma_neva.def.json @@ -9,6 +9,8 @@ "file_formats": "text/x-gcode", "platform": "neva.stl", "platform_offset": [ 0, 0, 0], + "has_machine_quality": true, + "has_materials": true, "machine_extruder_trains": { "0": "dagoma_neva_extruder_0" diff --git a/resources/definitions/dagoma_neva_magis.def.json b/resources/definitions/dagoma_neva_magis.def.json index 6a856044b2..07bf5987f5 100644 --- a/resources/definitions/dagoma_neva_magis.def.json +++ b/resources/definitions/dagoma_neva_magis.def.json @@ -8,7 +8,13 @@ "manufacturer": "Dagoma", "file_formats": "text/x-gcode", "platform": "neva.stl", - "platform_offset": [ 0, 0, 0] + "platform_offset": [ 0, 0, 0], + "has_machine_quality": true, + "has_materials": true, + "machine_extruder_trains": + { + "0": "dagoma_neva_extruder_0" + } }, "overrides": { "machine_width": { diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg index a75d01c9f0..a302f5b513 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fast.inst.cfg @@ -11,7 +11,5 @@ weight = -2 material = generic_pla [values] -layer_height = 0.2 - material_print_temperature = =default_material_print_temperature + 10 material_bed_temperature_layer_0 = =default_material_bed_temperature + 10 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg index 695fd7bc7e..b26eb1d910 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_fine.inst.cfg @@ -11,4 +11,3 @@ weight = 0 material = generic_pla [values] -layer_height = 0.1 diff --git a/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg index b6b086403d..9ec56f696a 100644 --- a/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_discoeasy200_pla_standard.inst.cfg @@ -11,7 +11,5 @@ weight = -1 material = generic_pla [values] -layer_height = 0.15 - material_print_temperature = =default_material_print_temperature + 5 material_bed_temperature_layer_0 = =default_material_bed_temperature + 5 diff --git a/resources/quality/dagoma/dagoma_global_fast.inst.cfg b/resources/quality/dagoma/dagoma_global_fast.inst.cfg new file mode 100644 index 0000000000..28569387f2 --- /dev/null +++ b/resources/quality/dagoma/dagoma_global_fast.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Fast +definition = dagoma_discoeasy200 + +[metadata] +setting_version = 5 +type = quality +quality_type = draft +weight = -2 +global_quality = True + +[values] +layer_height = 0.2 diff --git a/resources/quality/dagoma/dagoma_global_fine.inst.cfg b/resources/quality/dagoma/dagoma_global_fine.inst.cfg new file mode 100644 index 0000000000..1f7d577c1b --- /dev/null +++ b/resources/quality/dagoma/dagoma_global_fine.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Fine +definition = dagoma_discoeasy200 + +[metadata] +setting_version = 5 +type = quality +quality_type = normal +weight = 0 +global_quality = True + +[values] +layer_height = 0.1 diff --git a/resources/quality/dagoma/dagoma_global_standard.inst.cfg b/resources/quality/dagoma/dagoma_global_standard.inst.cfg new file mode 100644 index 0000000000..167062c1d7 --- /dev/null +++ b/resources/quality/dagoma/dagoma_global_standard.inst.cfg @@ -0,0 +1,14 @@ +[general] +version = 4 +name = Standard +definition = dagoma_discoeasy200 + +[metadata] +setting_version = 5 +type = quality +quality_type = fast +weight = -1 +global_quality = True + +[values] +layer_height = 0.15 diff --git a/resources/quality/dagoma/dagoma_neva_magis_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_neva_magis_pla_fast.inst.cfg index 51fb17a5cc..efdf2f7d32 100644 --- a/resources/quality/dagoma/dagoma_neva_magis_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_magis_pla_fast.inst.cfg @@ -11,7 +11,5 @@ weight = -2 material = generic_pla [values] -layer_height = 0.2 - material_print_temperature = =default_material_print_temperature + 10 material_bed_temperature_layer_0 = =default_material_bed_temperature + 10 diff --git a/resources/quality/dagoma/dagoma_neva_magis_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_neva_magis_pla_fine.inst.cfg index 1ff947d766..50915db112 100644 --- a/resources/quality/dagoma/dagoma_neva_magis_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_magis_pla_fine.inst.cfg @@ -11,4 +11,3 @@ weight = 0 material = generic_pla [values] -layer_height = 0.1 diff --git a/resources/quality/dagoma/dagoma_neva_magis_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_neva_magis_pla_standard.inst.cfg index dfcc1c967b..ed67800eac 100644 --- a/resources/quality/dagoma/dagoma_neva_magis_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_magis_pla_standard.inst.cfg @@ -11,7 +11,5 @@ weight = -1 material = generic_pla [values] -layer_height = 0.15 - material_print_temperature = =default_material_print_temperature + 5 material_bed_temperature_layer_0 = =default_material_bed_temperature + 5 diff --git a/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg index 51fb17a5cc..efdf2f7d32 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_fast.inst.cfg @@ -11,7 +11,5 @@ weight = -2 material = generic_pla [values] -layer_height = 0.2 - material_print_temperature = =default_material_print_temperature + 10 material_bed_temperature_layer_0 = =default_material_bed_temperature + 10 diff --git a/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg index 1ff947d766..50915db112 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_fine.inst.cfg @@ -11,4 +11,3 @@ weight = 0 material = generic_pla [values] -layer_height = 0.1 diff --git a/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg b/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg index dfcc1c967b..ed67800eac 100644 --- a/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg +++ b/resources/quality/dagoma/dagoma_neva_pla_standard.inst.cfg @@ -11,7 +11,5 @@ weight = -1 material = generic_pla [values] -layer_height = 0.15 - material_print_temperature = =default_material_print_temperature + 5 material_bed_temperature_layer_0 = =default_material_bed_temperature + 5 From 327eaf9564b7369e35041c234b0e966bb5b45da0 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Tue, 17 Jul 2018 18:09:59 +0200 Subject: [PATCH 8/9] Remove debug printing Contributes to CURA-5499 --- cura/Settings/MachineManager.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/cura/Settings/MachineManager.py b/cura/Settings/MachineManager.py index 1f1e940100..26f5a490dd 100755 --- a/cura/Settings/MachineManager.py +++ b/cura/Settings/MachineManager.py @@ -335,7 +335,6 @@ class MachineManager(QObject): global_stack.getName(), new_quality_changes_group.name) else: new_quality_group = quality_groups.get(quality_type) - print(quality_groups) if new_quality_group is not None: self._setQualityGroup(new_quality_group, empty_quality_changes = True) same_quality_found = True @@ -1108,7 +1107,6 @@ class MachineManager(QObject): # Set quality and quality_changes for each ExtruderStack for position, node in quality_group.nodes_for_extruders.items(): self._global_container_stack.extruders[str(position)].quality = node.getContainer() - print("#######", node.getContainer().getName()) if empty_quality_changes: self._global_container_stack.extruders[str(position)].qualityChanges = self._empty_quality_changes_container From e96c59223434705c99df915f68594783d0fb43d9 Mon Sep 17 00:00:00 2001 From: Diego Prado Gesto Date: Tue, 17 Jul 2018 18:12:22 +0200 Subject: [PATCH 9/9] Add correct name to the Dagoma Neva Magis extruder. Contributes to CURA-5499 --- resources/definitions/dagoma_neva_magis.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/dagoma_neva_magis.def.json b/resources/definitions/dagoma_neva_magis.def.json index 07bf5987f5..0b7b50cb5f 100644 --- a/resources/definitions/dagoma_neva_magis.def.json +++ b/resources/definitions/dagoma_neva_magis.def.json @@ -13,7 +13,7 @@ "has_materials": true, "machine_extruder_trains": { - "0": "dagoma_neva_extruder_0" + "0": "dagoma_neva_magis_extruder_0" } }, "overrides": {