From f59c9383dabce1b11ddf7cdeec72cf4a53945fdd Mon Sep 17 00:00:00 2001 From: mobilityapplab <50751850+mobilityapplab@users.noreply.github.com> Date: Tue, 4 Feb 2020 14:00:23 -0500 Subject: [PATCH 01/15] Update fdmprinter.def.json Add Smoothie Firmware Flavor option. --- resources/definitions/fdmprinter.def.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 3a222215d8..e25eedd7bf 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -369,7 +369,8 @@ "Makerbot": "Makerbot", "BFB": "Bits from Bytes", "MACH3": "Mach3", - "Repetier": "Repetier" + "Repetier": "Repetier", + "Smoothie": "Smoothie" }, "default_value": "RepRap (Marlin/Sprinter)", "settable_per_mesh": false, From cbe87a39a8f3d0d0fed704bc910b670cace2f720 Mon Sep 17 00:00:00 2001 From: grk3010 <50751850+grk3010@users.noreply.github.com> Date: Wed, 6 May 2020 22:44:39 -0400 Subject: [PATCH 02/15] Add "Always Write Active Tool" machine setting. Required for dual extruder printing with Smoothieware firmware. --- resources/definitions/fdmprinter.def.json | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index e25eedd7bf..2642e4021e 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -216,6 +216,16 @@ "settable_per_extruder": false, "settable_per_meshgroup": false }, + "machine_always_write_active_tool": + { + "label": "Always Write Active Tool", + "description": "Write active tool after sending temp commands to inactive tool. Required for Dual Extruder printing with Smoothie or other firmware with modal tool commands.", + "default_value": false, + "type": "bool", + "settable_per_mesh": false, + "settable_per_extruder": false, + "settable_per_meshgroup": false + }, "machine_center_is_zero": { "label": "Is Center Origin", @@ -369,8 +379,7 @@ "Makerbot": "Makerbot", "BFB": "Bits from Bytes", "MACH3": "Mach3", - "Repetier": "Repetier", - "Smoothie": "Smoothie" + "Repetier": "Repetier" }, "default_value": "RepRap (Marlin/Sprinter)", "settable_per_mesh": false, From 731455c12b5f7903c6956656eb14a749cf083c19 Mon Sep 17 00:00:00 2001 From: grk3010 <50751850+grk3010@users.noreply.github.com> Date: Wed, 6 May 2020 23:23:42 -0400 Subject: [PATCH 03/15] Create smoothie_dual.def.json --- resources/definitions/smoothie_dual.def.json | 47 ++++++++++++++++++++ 1 file changed, 47 insertions(+) create mode 100644 resources/definitions/smoothie_dual.def.json diff --git a/resources/definitions/smoothie_dual.def.json b/resources/definitions/smoothie_dual.def.json new file mode 100644 index 0000000000..3e753cf0ed --- /dev/null +++ b/resources/definitions/smoothie_dual.def.json @@ -0,0 +1,47 @@ +{ + "version": 2, + "name": "Smoothie Dual Custom", + "inherits": "fdmprinter", + "metadata": { + "visible": true, + "author": "grk3010", + "manufacturer": "Custom", + "file_formats": "text/x-gcode", + "has_materials": true, + "has_variants": true, + "preferred_variant_name": "Sparse 0.8", + "variants_name": "Nozzle", + "machine_extruder_trains": + { + "0": "bondtech_bmgx2m_extruder_0", + "1": "bondtech_bmgx2m_extruder_1" + } + }, + "overrides": { + "machine_name": { "default_value": "Smoothie Dual Custom" }, + "machine_width": { + "default_value": 600 + }, + "machine_depth": { + "default_value": 550 + }, + "machine_height": { + "default_value": 500 + }, + "machine_center_is_zero": { + "default_value": false + }, + "machine_gcode_flavor": { + "default_value": "RepRap (Marlin/Sprinter)" + }, + "machine_extruder_count": { + "default_value": 2 + }, + "machine_start_gcode": { + "default_value": "G28 X0 Y0 ; Home X Y\nM375; Load Bed Leveling Grid\nG1 X300 Y275 F15000 ; Move to bed center\nM280 S3.0 ; Deploy probe pin\n## NOTE: Adjust \"ZX.XX\" after G30 to be the Z-offset (in mm) between the probe and the nozzle\n## This is how you adjust nozzle printing height!\nG30 Z1.25 ; Move down to find bed & set Z home offset\nM280 S7.0 ; Retract probe\nG1 Z15.0 F600 ; move extruder up 15mm\nT0; Activate Extruder 1" + }, + "machine_end_gcode": { + "default_value": "G28 X0 Y0; Home X and Y\nM104 S0 ; turn off extruder\nM140 S0 ; turn off bed\nM107; turn off fans\nM84 ; disable motors" + } + } +} From 5c0de33e32352d7b5ab29ba55ed13f432a819da8 Mon Sep 17 00:00:00 2001 From: grk3010 <50751850+grk3010@users.noreply.github.com> Date: Wed, 6 May 2020 23:30:02 -0400 Subject: [PATCH 04/15] Add bondtech extruder definitions --- .../bondtech_bmgx2m_extruder_0.def.json | 21 +++++++++++++++++++ .../bondtech_bmgx2m_extruder_1.def.json | 21 +++++++++++++++++++ 2 files changed, 42 insertions(+) create mode 100644 resources/extruders/bondtech_bmgx2m_extruder_0.def.json create mode 100644 resources/extruders/bondtech_bmgx2m_extruder_1.def.json diff --git a/resources/extruders/bondtech_bmgx2m_extruder_0.def.json b/resources/extruders/bondtech_bmgx2m_extruder_0.def.json new file mode 100644 index 0000000000..80c853e56a --- /dev/null +++ b/resources/extruders/bondtech_bmgx2m_extruder_0.def.json @@ -0,0 +1,21 @@ +{ + "version": 2, + "name": "Left Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "smoothie_dual", + "position": "0" + }, + + "overrides": { + "extruder_nr": { + "default_value": 0, + "maximum_value": "1" + }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.8 }, + "material_diameter": { "default_value": 1.75 } + + } +} diff --git a/resources/extruders/bondtech_bmgx2m_extruder_1.def.json b/resources/extruders/bondtech_bmgx2m_extruder_1.def.json new file mode 100644 index 0000000000..2c5f193bc6 --- /dev/null +++ b/resources/extruders/bondtech_bmgx2m_extruder_1.def.json @@ -0,0 +1,21 @@ +{ + "version": 2, + "name": "Right Extruder", + "inherits": "fdmextruder", + "metadata": { + "machine": "smoothie_dual", + "position": "1" + }, + + "overrides": { + "extruder_nr": { + "default_value": 1, + "maximum_value": "2" + }, + "machine_nozzle_offset_x": { "default_value": 0 }, + "machine_nozzle_offset_y": { "default_value": 0 }, + "machine_nozzle_size": { "default_value": 0.8 }, + "material_diameter": { "default_value": 1.75 } + + } +} From b7097eed05de05433f4502a167924dbffede247f Mon Sep 17 00:00:00 2001 From: grk3010 <59886923+grk3010@users.noreply.github.com> Date: Mon, 11 May 2020 16:09:47 -0400 Subject: [PATCH 05/15] Add Hotend Definitions Add Variant definitions for Slice Engineering Mosquito Magnum Hotends --- .../variants/mosquito_magnum_0.4.inst.cfg | 32 +++++++++++++++++++ .../variants/mosquito_magnum_0.8.inst.cfg | 32 +++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 resources/variants/mosquito_magnum_0.4.inst.cfg create mode 100644 resources/variants/mosquito_magnum_0.8.inst.cfg diff --git a/resources/variants/mosquito_magnum_0.4.inst.cfg b/resources/variants/mosquito_magnum_0.4.inst.cfg new file mode 100644 index 0000000000..75f87c4d8d --- /dev/null +++ b/resources/variants/mosquito_magnum_0.4.inst.cfg @@ -0,0 +1,32 @@ +[general] +name = Mosquito Magnum 0.4 +version = 4 +definition = smoothie_dual + +[metadata] +setting_version = 11 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.4 +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_id = Mosquito Magnum 0.4 +machine_nozzle_tip_outer_diameter = 2.0 +retraction_amount = 6.5 +retraction_count_max = 25 +retraction_min_travel = =line_width * 2 +retraction_prime_speed = =retraction_speed +skin_overlap = 15 +speed_print = 60 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_wall = =math.ceil(speed_print * 30 / 70) +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_pattern = zigzag +support_top_distance = =support_z_distance +support_use_towers = True +support_z_distance = =layer_height * 2 +switch_extruder_prime_speed = =switch_extruder_retraction_speeds +switch_extruder_retraction_amount = =machine_heat_zone_length + diff --git a/resources/variants/mosquito_magnum_0.8.inst.cfg b/resources/variants/mosquito_magnum_0.8.inst.cfg new file mode 100644 index 0000000000..5f60b0fec1 --- /dev/null +++ b/resources/variants/mosquito_magnum_0.8.inst.cfg @@ -0,0 +1,32 @@ +[general] +name = Mosquito Magnum 0.8 +version = 4 +definition = smoothie_dual + +[metadata] +setting_version = 11 +type = variant +hardware_type = nozzle + +[values] +machine_nozzle_size = 0.8 +machine_nozzle_cool_down_speed = 0.9 +machine_nozzle_id = Mosquito Magnum 0.8 +machine_nozzle_tip_outer_diameter = 2.0 +retraction_amount = 6.5 +retraction_count_max = 25 +retraction_min_travel = =line_width * 2 +retraction_prime_speed = =retraction_speed +skin_overlap = 15 +speed_print = 60 +speed_topbottom = =math.ceil(speed_print * 30 / 70) +speed_wall = =math.ceil(speed_print * 30 / 70) +support_angle = 60 +support_bottom_distance = =support_z_distance / 2 +support_pattern = zigzag +support_top_distance = =support_z_distance +support_use_towers = True +support_z_distance = =layer_height * 2 +switch_extruder_prime_speed = =switch_extruder_retraction_speeds +switch_extruder_retraction_amount = =machine_heat_zone_length + From ab6d15141e6ceaf0b1c48e8d15879a189d8d93ce Mon Sep 17 00:00:00 2001 From: grk3010 <59886923+grk3010@users.noreply.github.com> Date: Mon, 11 May 2020 16:11:57 -0400 Subject: [PATCH 06/15] Add Quality Definitions for Smoothie based printers --- .../smoothie_dual/smoothie_0.4_fast.inst.cfg | 24 +++++++++++++++++++ .../smoothie_dual/smoothie_0.4_high.inst.cfg | 24 +++++++++++++++++++ .../smoothie_0.4_normal.inst.cfg | 24 +++++++++++++++++++ .../smoothie_dual/smoothie_0.8_fast.inst.cfg | 24 +++++++++++++++++++ .../smoothie_dual/smoothie_0.8_high.inst.cfg | 24 +++++++++++++++++++ .../smoothie_0.8_normal.inst.cfg | 24 +++++++++++++++++++ 6 files changed, 144 insertions(+) create mode 100644 resources/quality/smoothie_dual/smoothie_0.4_fast.inst.cfg create mode 100644 resources/quality/smoothie_dual/smoothie_0.4_high.inst.cfg create mode 100644 resources/quality/smoothie_dual/smoothie_0.4_normal.inst.cfg create mode 100644 resources/quality/smoothie_dual/smoothie_0.8_fast.inst.cfg create mode 100644 resources/quality/smoothie_dual/smoothie_0.8_high.inst.cfg create mode 100644 resources/quality/smoothie_dual/smoothie_0.8_normal.inst.cfg diff --git a/resources/quality/smoothie_dual/smoothie_0.4_fast.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.4_fast.inst.cfg new file mode 100644 index 0000000000..7364efe490 --- /dev/null +++ b/resources/quality/smoothie_dual/smoothie_0.4_fast.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Normal +definition = smoothie_dual + +[metadata] +setting_version = 11 +type = quality +quality_type = fast +weight = -1 +variant = Mosquito Magnum 0.4 +global_quality = True + +[values] +layer_height = 0.2 +layer_height_0 = 0.25 +wall_line_count = 4 +bottom_layers = 4 +top_layers = 4 +infill_pattern = grid +infill_sparse_density = 50 +adhesion_type = skirt +skirt_line_count = 2 +skirt_gap = 6 \ No newline at end of file diff --git a/resources/quality/smoothie_dual/smoothie_0.4_high.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.4_high.inst.cfg new file mode 100644 index 0000000000..899d6ea430 --- /dev/null +++ b/resources/quality/smoothie_dual/smoothie_0.4_high.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Extra Fine +definition = smoothie_dual + +[metadata] +setting_version = 11 +type = quality +quality_type = high +weight = 1 +variant = Mosquito Magnum 0.4 +global_quality = True + +[values] +layer_height = 0.2 +layer_height_0 = 0.25 +wall_line_count = 3 +bottom_layers = 3 +top_layers = 3 +infill_pattern = grid +infill_sparse_density = 50 +adhesion_type = skirt +skirt_line_count = 2 +skirt_gap = 6 \ No newline at end of file diff --git a/resources/quality/smoothie_dual/smoothie_0.4_normal.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.4_normal.inst.cfg new file mode 100644 index 0000000000..c1af449138 --- /dev/null +++ b/resources/quality/smoothie_dual/smoothie_0.4_normal.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Fine +definition = smoothie_dual + +[metadata] +setting_version = 11 +type = quality +quality_type = normal +weight = 0 +variant = Mosquito Magnum 0.4 +global_quality = True + +[values] +layer_height = 0.2 +layer_height_0 = 0.25 +wall_line_count = 3 +bottom_layers = 3 +top_layers = 3 +infill_pattern = grid +infill_sparse_density = 30 +adhesion_type = skirt +skirt_line_count = 2 +skirt_gap = 6 \ No newline at end of file diff --git a/resources/quality/smoothie_dual/smoothie_0.8_fast.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.8_fast.inst.cfg new file mode 100644 index 0000000000..388eac8452 --- /dev/null +++ b/resources/quality/smoothie_dual/smoothie_0.8_fast.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Sprint +definition = smoothie_dual + +[metadata] +setting_version = 11 +type = quality +quality_type = superdraft +weight = -1 +variant = Mosquito Magnum 0.8 +global_quality = True + +[values] +layer_height = 0.4 +layer_height_0 = 0.4 +wall_line_count = 2 +bottom_layers = 2 +top_layers = 2 +infill_pattern = lines +infill_sparse_density = 20 +adhesion_type = skirt +skirt_line_count = 2 +skirt_gap = 6 diff --git a/resources/quality/smoothie_dual/smoothie_0.8_high.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.8_high.inst.cfg new file mode 100644 index 0000000000..7f46b78410 --- /dev/null +++ b/resources/quality/smoothie_dual/smoothie_0.8_high.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Dense +definition = smoothie_dual + +[metadata] +setting_version = 11 +type = quality +quality_type = draft +weight = 1 +variant = Mosquito Magnum 0.8 +global_quality = True + +[values] +layer_height = 0.4 +layer_height_0 = 0.4 +wall_line_count = 4 +bottom_layers = 4 +top_layers = 4 +infill_pattern = grid +infill_sparse_density = 50 +adhesion_type = skirt +skirt_line_count = 2 +skirt_gap = 6 diff --git a/resources/quality/smoothie_dual/smoothie_0.8_normal.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.8_normal.inst.cfg new file mode 100644 index 0000000000..8590eba7fd --- /dev/null +++ b/resources/quality/smoothie_dual/smoothie_0.8_normal.inst.cfg @@ -0,0 +1,24 @@ +[general] +version = 4 +name = Fast +definition = smoothie_dual + +[metadata] +setting_version = 11 +type = quality +quality_type = verydraft +weight = 0 +variant = Mosquito Magnum 0.8 +global_quality = True + +[values] +layer_height = 0.4 +layer_height_0 = 0.4 +wall_line_count = 3 +bottom_layers = 3 +top_layers = 3 +infill_pattern = grid +infill_sparse_density = 30 +adhesion_type = skirt +skirt_line_count = 2 +skirt_gap = 6 \ No newline at end of file From b8d74c8b4d3097d7a6986b7b73904df5f983b7bc Mon Sep 17 00:00:00 2001 From: grk3010 <59886923+grk3010@users.noreply.github.com> Date: Mon, 11 May 2020 16:12:49 -0400 Subject: [PATCH 07/15] Update smoothie_dual.def.json Complete printer definition including "Machine_always_write_active_tool" setting. --- resources/definitions/smoothie_dual.def.json | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/resources/definitions/smoothie_dual.def.json b/resources/definitions/smoothie_dual.def.json index 3e753cf0ed..9b168a0cd7 100644 --- a/resources/definitions/smoothie_dual.def.json +++ b/resources/definitions/smoothie_dual.def.json @@ -7,9 +7,10 @@ "author": "grk3010", "manufacturer": "Custom", "file_formats": "text/x-gcode", - "has_materials": true, + "has_machine_quality": true, "has_variants": true, - "preferred_variant_name": "Sparse 0.8", + "preferred_variant_name": "Mosquito Magnum 0.8", + "preferred_quality_type": "normal", "variants_name": "Nozzle", "machine_extruder_trains": { @@ -34,9 +35,15 @@ "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, + "machine_always_write_active_tool": { + "default_value": true + }, "machine_extruder_count": { "default_value": 2 }, + "machine_heat_zone_length": { + "default_value": 15 + }, "machine_start_gcode": { "default_value": "G28 X0 Y0 ; Home X Y\nM375; Load Bed Leveling Grid\nG1 X300 Y275 F15000 ; Move to bed center\nM280 S3.0 ; Deploy probe pin\n## NOTE: Adjust \"ZX.XX\" after G30 to be the Z-offset (in mm) between the probe and the nozzle\n## This is how you adjust nozzle printing height!\nG30 Z1.25 ; Move down to find bed & set Z home offset\nM280 S7.0 ; Retract probe\nG1 Z15.0 F600 ; move extruder up 15mm\nT0; Activate Extruder 1" }, From 17c4bf7d6a84d4389dec5f486603eaae15464a5b Mon Sep 17 00:00:00 2001 From: grk3010 <59886923+grk3010@users.noreply.github.com> Date: Mon, 11 May 2020 16:28:41 -0400 Subject: [PATCH 08/15] Update to settings version 15 --- resources/definitions/fdmprinter.def.json | 2 +- resources/quality/smoothie_dual/smoothie_0.4_fast.inst.cfg | 2 +- resources/quality/smoothie_dual/smoothie_0.4_high.inst.cfg | 2 +- resources/quality/smoothie_dual/smoothie_0.4_normal.inst.cfg | 2 +- resources/quality/smoothie_dual/smoothie_0.8_fast.inst.cfg | 2 +- resources/quality/smoothie_dual/smoothie_0.8_high.inst.cfg | 2 +- resources/quality/smoothie_dual/smoothie_0.8_normal.inst.cfg | 2 +- resources/variants/mosquito_magnum_0.4.inst.cfg | 2 +- resources/variants/mosquito_magnum_0.8.inst.cfg | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 2642e4021e..c3d2eca654 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -7,7 +7,7 @@ "author": "Ultimaker", "category": "Other", "manufacturer": "Unknown", - "setting_version": 11, + "setting_version": 15, "file_formats": "text/x-gcode;application/x-stl-ascii;application/x-stl-binary;application/x-wavefront-obj;application/x3g", "visible": false, "has_materials": true, diff --git a/resources/quality/smoothie_dual/smoothie_0.4_fast.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.4_fast.inst.cfg index 7364efe490..8b10ee1e20 100644 --- a/resources/quality/smoothie_dual/smoothie_0.4_fast.inst.cfg +++ b/resources/quality/smoothie_dual/smoothie_0.4_fast.inst.cfg @@ -4,7 +4,7 @@ name = Normal definition = smoothie_dual [metadata] -setting_version = 11 +setting_version = 15 type = quality quality_type = fast weight = -1 diff --git a/resources/quality/smoothie_dual/smoothie_0.4_high.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.4_high.inst.cfg index 899d6ea430..974c8a42ea 100644 --- a/resources/quality/smoothie_dual/smoothie_0.4_high.inst.cfg +++ b/resources/quality/smoothie_dual/smoothie_0.4_high.inst.cfg @@ -4,7 +4,7 @@ name = Extra Fine definition = smoothie_dual [metadata] -setting_version = 11 +setting_version = 15 type = quality quality_type = high weight = 1 diff --git a/resources/quality/smoothie_dual/smoothie_0.4_normal.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.4_normal.inst.cfg index c1af449138..b64a3f5168 100644 --- a/resources/quality/smoothie_dual/smoothie_0.4_normal.inst.cfg +++ b/resources/quality/smoothie_dual/smoothie_0.4_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fine definition = smoothie_dual [metadata] -setting_version = 11 +setting_version = 15 type = quality quality_type = normal weight = 0 diff --git a/resources/quality/smoothie_dual/smoothie_0.8_fast.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.8_fast.inst.cfg index 388eac8452..2fbd0e8061 100644 --- a/resources/quality/smoothie_dual/smoothie_0.8_fast.inst.cfg +++ b/resources/quality/smoothie_dual/smoothie_0.8_fast.inst.cfg @@ -4,7 +4,7 @@ name = Sprint definition = smoothie_dual [metadata] -setting_version = 11 +setting_version = 15 type = quality quality_type = superdraft weight = -1 diff --git a/resources/quality/smoothie_dual/smoothie_0.8_high.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.8_high.inst.cfg index 7f46b78410..75e75c2635 100644 --- a/resources/quality/smoothie_dual/smoothie_0.8_high.inst.cfg +++ b/resources/quality/smoothie_dual/smoothie_0.8_high.inst.cfg @@ -4,7 +4,7 @@ name = Dense definition = smoothie_dual [metadata] -setting_version = 11 +setting_version = 15 type = quality quality_type = draft weight = 1 diff --git a/resources/quality/smoothie_dual/smoothie_0.8_normal.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.8_normal.inst.cfg index 8590eba7fd..b021f9a54a 100644 --- a/resources/quality/smoothie_dual/smoothie_0.8_normal.inst.cfg +++ b/resources/quality/smoothie_dual/smoothie_0.8_normal.inst.cfg @@ -4,7 +4,7 @@ name = Fast definition = smoothie_dual [metadata] -setting_version = 11 +setting_version = 15 type = quality quality_type = verydraft weight = 0 diff --git a/resources/variants/mosquito_magnum_0.4.inst.cfg b/resources/variants/mosquito_magnum_0.4.inst.cfg index 75f87c4d8d..a8486d7b5c 100644 --- a/resources/variants/mosquito_magnum_0.4.inst.cfg +++ b/resources/variants/mosquito_magnum_0.4.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = smoothie_dual [metadata] -setting_version = 11 +setting_version = 15 type = variant hardware_type = nozzle diff --git a/resources/variants/mosquito_magnum_0.8.inst.cfg b/resources/variants/mosquito_magnum_0.8.inst.cfg index 5f60b0fec1..eac2bab60a 100644 --- a/resources/variants/mosquito_magnum_0.8.inst.cfg +++ b/resources/variants/mosquito_magnum_0.8.inst.cfg @@ -4,7 +4,7 @@ version = 4 definition = smoothie_dual [metadata] -setting_version = 11 +setting_version = 15 type = variant hardware_type = nozzle From 3d412e53b72082517250f5c2debb5b44e6cd2ca9 Mon Sep 17 00:00:00 2001 From: grk3010 <59886923+grk3010@users.noreply.github.com> Date: Thu, 14 May 2020 16:05:27 -0400 Subject: [PATCH 09/15] Make Smoothie definition Generic Remove quality, extruder, and nozzle profiles to make the smoothie machine definition a generic custom configuration. --- ...oothie_dual.def.json => smoothie.def.json} | 40 ++++++------------- .../bondtech_bmgx2m_extruder_0.def.json | 21 ---------- .../bondtech_bmgx2m_extruder_1.def.json | 21 ---------- .../smoothie_dual/smoothie_0.4_fast.inst.cfg | 24 ----------- .../smoothie_dual/smoothie_0.4_high.inst.cfg | 24 ----------- .../smoothie_0.4_normal.inst.cfg | 24 ----------- .../smoothie_dual/smoothie_0.8_fast.inst.cfg | 24 ----------- .../smoothie_dual/smoothie_0.8_high.inst.cfg | 24 ----------- .../smoothie_0.8_normal.inst.cfg | 24 ----------- .../variants/mosquito_magnum_0.4.inst.cfg | 32 --------------- .../variants/mosquito_magnum_0.8.inst.cfg | 32 --------------- 11 files changed, 12 insertions(+), 278 deletions(-) rename resources/definitions/{smoothie_dual.def.json => smoothie.def.json} (57%) delete mode 100644 resources/extruders/bondtech_bmgx2m_extruder_0.def.json delete mode 100644 resources/extruders/bondtech_bmgx2m_extruder_1.def.json delete mode 100644 resources/quality/smoothie_dual/smoothie_0.4_fast.inst.cfg delete mode 100644 resources/quality/smoothie_dual/smoothie_0.4_high.inst.cfg delete mode 100644 resources/quality/smoothie_dual/smoothie_0.4_normal.inst.cfg delete mode 100644 resources/quality/smoothie_dual/smoothie_0.8_fast.inst.cfg delete mode 100644 resources/quality/smoothie_dual/smoothie_0.8_high.inst.cfg delete mode 100644 resources/quality/smoothie_dual/smoothie_0.8_normal.inst.cfg delete mode 100644 resources/variants/mosquito_magnum_0.4.inst.cfg delete mode 100644 resources/variants/mosquito_magnum_0.8.inst.cfg diff --git a/resources/definitions/smoothie_dual.def.json b/resources/definitions/smoothie.def.json similarity index 57% rename from resources/definitions/smoothie_dual.def.json rename to resources/definitions/smoothie.def.json index 9b168a0cd7..5fce686161 100644 --- a/resources/definitions/smoothie_dual.def.json +++ b/resources/definitions/smoothie.def.json @@ -1,49 +1,33 @@ { "version": 2, - "name": "Smoothie Dual Custom", + "name": "Smoothie Custom Printer", "inherits": "fdmprinter", "metadata": { "visible": true, "author": "grk3010", "manufacturer": "Custom", + "category": "Custom", "file_formats": "text/x-gcode", - "has_machine_quality": true, - "has_variants": true, - "preferred_variant_name": "Mosquito Magnum 0.8", - "preferred_quality_type": "normal", - "variants_name": "Nozzle", "machine_extruder_trains": { - "0": "bondtech_bmgx2m_extruder_0", - "1": "bondtech_bmgx2m_extruder_1" - } + "0": "custom_extruder_1", + "1": "custom_extruder_2", + "2": "custom_extruder_3", + "3": "custom_extruder_4", + "4": "custom_extruder_5", + "5": "custom_extruder_6", + "6": "custom_extruder_7", + "7": "custom_extruder_8" + }, + "first_start_actions": ["MachineSettingsAction"] }, "overrides": { - "machine_name": { "default_value": "Smoothie Dual Custom" }, - "machine_width": { - "default_value": 600 - }, - "machine_depth": { - "default_value": 550 - }, - "machine_height": { - "default_value": 500 - }, - "machine_center_is_zero": { - "default_value": false - }, "machine_gcode_flavor": { "default_value": "RepRap (Marlin/Sprinter)" }, "machine_always_write_active_tool": { "default_value": true }, - "machine_extruder_count": { - "default_value": 2 - }, - "machine_heat_zone_length": { - "default_value": 15 - }, "machine_start_gcode": { "default_value": "G28 X0 Y0 ; Home X Y\nM375; Load Bed Leveling Grid\nG1 X300 Y275 F15000 ; Move to bed center\nM280 S3.0 ; Deploy probe pin\n## NOTE: Adjust \"ZX.XX\" after G30 to be the Z-offset (in mm) between the probe and the nozzle\n## This is how you adjust nozzle printing height!\nG30 Z1.25 ; Move down to find bed & set Z home offset\nM280 S7.0 ; Retract probe\nG1 Z15.0 F600 ; move extruder up 15mm\nT0; Activate Extruder 1" }, diff --git a/resources/extruders/bondtech_bmgx2m_extruder_0.def.json b/resources/extruders/bondtech_bmgx2m_extruder_0.def.json deleted file mode 100644 index 80c853e56a..0000000000 --- a/resources/extruders/bondtech_bmgx2m_extruder_0.def.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": 2, - "name": "Left Extruder", - "inherits": "fdmextruder", - "metadata": { - "machine": "smoothie_dual", - "position": "0" - }, - - "overrides": { - "extruder_nr": { - "default_value": 0, - "maximum_value": "1" - }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.8 }, - "material_diameter": { "default_value": 1.75 } - - } -} diff --git a/resources/extruders/bondtech_bmgx2m_extruder_1.def.json b/resources/extruders/bondtech_bmgx2m_extruder_1.def.json deleted file mode 100644 index 2c5f193bc6..0000000000 --- a/resources/extruders/bondtech_bmgx2m_extruder_1.def.json +++ /dev/null @@ -1,21 +0,0 @@ -{ - "version": 2, - "name": "Right Extruder", - "inherits": "fdmextruder", - "metadata": { - "machine": "smoothie_dual", - "position": "1" - }, - - "overrides": { - "extruder_nr": { - "default_value": 1, - "maximum_value": "2" - }, - "machine_nozzle_offset_x": { "default_value": 0 }, - "machine_nozzle_offset_y": { "default_value": 0 }, - "machine_nozzle_size": { "default_value": 0.8 }, - "material_diameter": { "default_value": 1.75 } - - } -} diff --git a/resources/quality/smoothie_dual/smoothie_0.4_fast.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.4_fast.inst.cfg deleted file mode 100644 index 8b10ee1e20..0000000000 --- a/resources/quality/smoothie_dual/smoothie_0.4_fast.inst.cfg +++ /dev/null @@ -1,24 +0,0 @@ -[general] -version = 4 -name = Normal -definition = smoothie_dual - -[metadata] -setting_version = 15 -type = quality -quality_type = fast -weight = -1 -variant = Mosquito Magnum 0.4 -global_quality = True - -[values] -layer_height = 0.2 -layer_height_0 = 0.25 -wall_line_count = 4 -bottom_layers = 4 -top_layers = 4 -infill_pattern = grid -infill_sparse_density = 50 -adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 6 \ No newline at end of file diff --git a/resources/quality/smoothie_dual/smoothie_0.4_high.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.4_high.inst.cfg deleted file mode 100644 index 974c8a42ea..0000000000 --- a/resources/quality/smoothie_dual/smoothie_0.4_high.inst.cfg +++ /dev/null @@ -1,24 +0,0 @@ -[general] -version = 4 -name = Extra Fine -definition = smoothie_dual - -[metadata] -setting_version = 15 -type = quality -quality_type = high -weight = 1 -variant = Mosquito Magnum 0.4 -global_quality = True - -[values] -layer_height = 0.2 -layer_height_0 = 0.25 -wall_line_count = 3 -bottom_layers = 3 -top_layers = 3 -infill_pattern = grid -infill_sparse_density = 50 -adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 6 \ No newline at end of file diff --git a/resources/quality/smoothie_dual/smoothie_0.4_normal.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.4_normal.inst.cfg deleted file mode 100644 index b64a3f5168..0000000000 --- a/resources/quality/smoothie_dual/smoothie_0.4_normal.inst.cfg +++ /dev/null @@ -1,24 +0,0 @@ -[general] -version = 4 -name = Fine -definition = smoothie_dual - -[metadata] -setting_version = 15 -type = quality -quality_type = normal -weight = 0 -variant = Mosquito Magnum 0.4 -global_quality = True - -[values] -layer_height = 0.2 -layer_height_0 = 0.25 -wall_line_count = 3 -bottom_layers = 3 -top_layers = 3 -infill_pattern = grid -infill_sparse_density = 30 -adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 6 \ No newline at end of file diff --git a/resources/quality/smoothie_dual/smoothie_0.8_fast.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.8_fast.inst.cfg deleted file mode 100644 index 2fbd0e8061..0000000000 --- a/resources/quality/smoothie_dual/smoothie_0.8_fast.inst.cfg +++ /dev/null @@ -1,24 +0,0 @@ -[general] -version = 4 -name = Sprint -definition = smoothie_dual - -[metadata] -setting_version = 15 -type = quality -quality_type = superdraft -weight = -1 -variant = Mosquito Magnum 0.8 -global_quality = True - -[values] -layer_height = 0.4 -layer_height_0 = 0.4 -wall_line_count = 2 -bottom_layers = 2 -top_layers = 2 -infill_pattern = lines -infill_sparse_density = 20 -adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 6 diff --git a/resources/quality/smoothie_dual/smoothie_0.8_high.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.8_high.inst.cfg deleted file mode 100644 index 75e75c2635..0000000000 --- a/resources/quality/smoothie_dual/smoothie_0.8_high.inst.cfg +++ /dev/null @@ -1,24 +0,0 @@ -[general] -version = 4 -name = Dense -definition = smoothie_dual - -[metadata] -setting_version = 15 -type = quality -quality_type = draft -weight = 1 -variant = Mosquito Magnum 0.8 -global_quality = True - -[values] -layer_height = 0.4 -layer_height_0 = 0.4 -wall_line_count = 4 -bottom_layers = 4 -top_layers = 4 -infill_pattern = grid -infill_sparse_density = 50 -adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 6 diff --git a/resources/quality/smoothie_dual/smoothie_0.8_normal.inst.cfg b/resources/quality/smoothie_dual/smoothie_0.8_normal.inst.cfg deleted file mode 100644 index b021f9a54a..0000000000 --- a/resources/quality/smoothie_dual/smoothie_0.8_normal.inst.cfg +++ /dev/null @@ -1,24 +0,0 @@ -[general] -version = 4 -name = Fast -definition = smoothie_dual - -[metadata] -setting_version = 15 -type = quality -quality_type = verydraft -weight = 0 -variant = Mosquito Magnum 0.8 -global_quality = True - -[values] -layer_height = 0.4 -layer_height_0 = 0.4 -wall_line_count = 3 -bottom_layers = 3 -top_layers = 3 -infill_pattern = grid -infill_sparse_density = 30 -adhesion_type = skirt -skirt_line_count = 2 -skirt_gap = 6 \ No newline at end of file diff --git a/resources/variants/mosquito_magnum_0.4.inst.cfg b/resources/variants/mosquito_magnum_0.4.inst.cfg deleted file mode 100644 index a8486d7b5c..0000000000 --- a/resources/variants/mosquito_magnum_0.4.inst.cfg +++ /dev/null @@ -1,32 +0,0 @@ -[general] -name = Mosquito Magnum 0.4 -version = 4 -definition = smoothie_dual - -[metadata] -setting_version = 15 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.4 -machine_nozzle_cool_down_speed = 0.9 -machine_nozzle_id = Mosquito Magnum 0.4 -machine_nozzle_tip_outer_diameter = 2.0 -retraction_amount = 6.5 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed -skin_overlap = 15 -speed_print = 60 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -switch_extruder_prime_speed = =switch_extruder_retraction_speeds -switch_extruder_retraction_amount = =machine_heat_zone_length - diff --git a/resources/variants/mosquito_magnum_0.8.inst.cfg b/resources/variants/mosquito_magnum_0.8.inst.cfg deleted file mode 100644 index eac2bab60a..0000000000 --- a/resources/variants/mosquito_magnum_0.8.inst.cfg +++ /dev/null @@ -1,32 +0,0 @@ -[general] -name = Mosquito Magnum 0.8 -version = 4 -definition = smoothie_dual - -[metadata] -setting_version = 15 -type = variant -hardware_type = nozzle - -[values] -machine_nozzle_size = 0.8 -machine_nozzle_cool_down_speed = 0.9 -machine_nozzle_id = Mosquito Magnum 0.8 -machine_nozzle_tip_outer_diameter = 2.0 -retraction_amount = 6.5 -retraction_count_max = 25 -retraction_min_travel = =line_width * 2 -retraction_prime_speed = =retraction_speed -skin_overlap = 15 -speed_print = 60 -speed_topbottom = =math.ceil(speed_print * 30 / 70) -speed_wall = =math.ceil(speed_print * 30 / 70) -support_angle = 60 -support_bottom_distance = =support_z_distance / 2 -support_pattern = zigzag -support_top_distance = =support_z_distance -support_use_towers = True -support_z_distance = =layer_height * 2 -switch_extruder_prime_speed = =switch_extruder_retraction_speeds -switch_extruder_retraction_amount = =machine_heat_zone_length - From 885fe32fb0cbf5104c8d09d27dcc556149804cad Mon Sep 17 00:00:00 2001 From: grk3010 <59886923+grk3010@users.noreply.github.com> Date: Thu, 14 May 2020 16:15:12 -0400 Subject: [PATCH 10/15] Update smoothie.def.json remove depreciated "category" --- resources/definitions/smoothie.def.json | 1 - 1 file changed, 1 deletion(-) diff --git a/resources/definitions/smoothie.def.json b/resources/definitions/smoothie.def.json index 5fce686161..a2313487f7 100644 --- a/resources/definitions/smoothie.def.json +++ b/resources/definitions/smoothie.def.json @@ -6,7 +6,6 @@ "visible": true, "author": "grk3010", "manufacturer": "Custom", - "category": "Custom", "file_formats": "text/x-gcode", "machine_extruder_trains": { From b2ce1419cf8c8dddd9cbf954d91b7a5caf541d93 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Wed, 3 Jun 2020 17:48:28 +0200 Subject: [PATCH 11/15] Don't crash when syncing material that has no colour code Use the colour code for Generic PLA then. --- .../src/Models/Http/ClusterPrinterConfigurationMaterial.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py index 5d55f2f16b..6f2992a03b 100644 --- a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrinterConfigurationMaterial.py @@ -54,4 +54,4 @@ class ClusterPrinterConfigurationMaterial(BaseModel): "name": "Empty" if self.material == "empty" else "Unknown" } - return MaterialOutputModel(guid = self.guid, type = material_metadata["material"], brand = material_metadata["brand"], color = material_metadata["color_code"], name = material_metadata["name"]) + return MaterialOutputModel(guid = self.guid, type = material_metadata["material"], brand = material_metadata["brand"], color = material_metadata.get("color_code", "#ffc924"), name = material_metadata["name"]) From 1d6c722505c5ef9a347473fbf3fa8bec936fd6e8 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 4 Jun 2020 13:14:56 +0200 Subject: [PATCH 12/15] Indent using spaces, not a mix of tabs and spaces Contributes to issue CURA-7450. --- resources/definitions/smoothie.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/smoothie.def.json b/resources/definitions/smoothie.def.json index a2313487f7..463fbc92c2 100644 --- a/resources/definitions/smoothie.def.json +++ b/resources/definitions/smoothie.def.json @@ -25,7 +25,7 @@ "default_value": "RepRap (Marlin/Sprinter)" }, "machine_always_write_active_tool": { - "default_value": true + "default_value": true }, "machine_start_gcode": { "default_value": "G28 X0 Y0 ; Home X Y\nM375; Load Bed Leveling Grid\nG1 X300 Y275 F15000 ; Move to bed center\nM280 S3.0 ; Deploy probe pin\n## NOTE: Adjust \"ZX.XX\" after G30 to be the Z-offset (in mm) between the probe and the nozzle\n## This is how you adjust nozzle printing height!\nG30 Z1.25 ; Move down to find bed & set Z home offset\nM280 S7.0 ; Retract probe\nG1 Z15.0 F600 ; move extruder up 15mm\nT0; Activate Extruder 1" From 2e5f4764bdf288e065c4bd54cd2d7fe1633ec976 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 4 Jun 2020 13:37:30 +0200 Subject: [PATCH 13/15] Remove duplicated version upgrade plug-in These two version upgraders do the same operation. Their code is copied. Instead, we can just let one version upgrader upgrade both versions of the files. Contributes to issue CURA-7413. --- .../VersionUpgrade45to46/__init__.py | 9 ++ .../VersionUpgrade46bto46.py | 86 ------------------- .../VersionUpgrade46bto46/__init__.py | 59 ------------- .../VersionUpgrade46bto46/plugin.json | 8 -- 4 files changed, 9 insertions(+), 153 deletions(-) delete mode 100644 plugins/VersionUpgrade/VersionUpgrade46bto46/VersionUpgrade46bto46.py delete mode 100644 plugins/VersionUpgrade/VersionUpgrade46bto46/__init__.py delete mode 100644 plugins/VersionUpgrade/VersionUpgrade46bto46/plugin.json diff --git a/plugins/VersionUpgrade/VersionUpgrade45to46/__init__.py b/plugins/VersionUpgrade/VersionUpgrade45to46/__init__.py index 090f8a109c..e9e835555c 100644 --- a/plugins/VersionUpgrade/VersionUpgrade45to46/__init__.py +++ b/plugins/VersionUpgrade/VersionUpgrade45to46/__init__.py @@ -21,6 +21,15 @@ def getMetaData() -> Dict[str, Any]: ("quality_changes", 4000011): ("quality_changes", 4000013, upgrade.upgradeInstanceContainer), ("quality", 4000011): ("quality", 4000013, upgrade.upgradeInstanceContainer), ("user", 4000011): ("user", 4000013, upgrade.upgradeInstanceContainer), + + # Setting version 12 was also used during the 4.6 beta, but had no changes. + ("preferences", 6000012): ("preferences", 6000013, upgrade.upgradePreferences), + ("machine_stack", 4000012): ("machine_stack", 4000013, upgrade.upgradeStack), + ("extruder_train", 4000012): ("extruder_train", 4000013, upgrade.upgradeStack), + ("definition_changes", 4000012): ("definition_changes", 4000013, upgrade.upgradeInstanceContainer), + ("quality_changes", 4000012): ("quality_changes", 4000013, upgrade.upgradeInstanceContainer), + ("quality", 4000012): ("quality", 4000013, upgrade.upgradeInstanceContainer), + ("user", 4000012): ("user", 4000013, upgrade.upgradeInstanceContainer), }, "sources": { "preferences": { diff --git a/plugins/VersionUpgrade/VersionUpgrade46bto46/VersionUpgrade46bto46.py b/plugins/VersionUpgrade/VersionUpgrade46bto46/VersionUpgrade46bto46.py deleted file mode 100644 index 7d1b865e19..0000000000 --- a/plugins/VersionUpgrade/VersionUpgrade46bto46/VersionUpgrade46bto46.py +++ /dev/null @@ -1,86 +0,0 @@ -# Copyright (c) 2020 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. - -import configparser -from typing import Tuple, List -import io -from UM.VersionUpgrade import VersionUpgrade - -class VersionUpgrade46bto46(VersionUpgrade): - def getCfgVersion(self, serialised: str) -> int: - parser = configparser.ConfigParser(interpolation = None) - parser.read_string(serialised) - format_version = int(parser.get("general", "version")) # Explicitly give an exception when this fails. That means that the file format is not recognised. - setting_version = int(parser.get("metadata", "setting_version", fallback = "0")) - return format_version * 1000000 + setting_version - - def upgradePreferences(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: - """ - Upgrades preferences to have the new version number. - :param serialized: The original contents of the preferences file. - :param filename: The file name of the preferences file. - :return: A list of new file names, and a list of the new contents for - those files. - """ - parser = configparser.ConfigParser(interpolation = None) - parser.read_string(serialized) - - # Update version number. - parser["metadata"]["setting_version"] = "13" - - result = io.StringIO() - parser.write(result) - return [filename], [result.getvalue()] - - def upgradeInstanceContainer(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: - """ - Upgrades instance containers to have the new version number. - - This changes the maximum deviation setting if that setting was present - in the profile. - :param serialized: The original contents of the instance container. - :param filename: The original file name of the instance container. - :return: A list of new file names, and a list of the new contents for - those files. - """ - parser = configparser.ConfigParser(interpolation = None, comment_prefixes = ()) - parser.read_string(serialized) - - # Update version number. - parser["metadata"]["setting_version"] = "13" - - if "values" in parser: - # Maximum Deviation's effect was corrected. Previously the deviation - # ended up being only half of what the user had entered. This was - # fixed in Cura 4.7 so there we need to halve the deviation that the - # user had entered. - if "meshfix_maximum_deviation" in parser["values"]: - maximum_deviation = parser["values"]["meshfix_maximum_deviation"] - if maximum_deviation.startswith("="): - maximum_deviation = maximum_deviation[1:] - maximum_deviation = "=(" + maximum_deviation + ") / 2" - parser["values"]["meshfix_maximum_deviation"] = maximum_deviation - - result = io.StringIO() - parser.write(result) - return [filename], [result.getvalue()] - - def upgradeStack(self, serialized: str, filename: str) -> Tuple[List[str], List[str]]: - """ - Upgrades stacks to have the new version number. - :param serialized: The original contents of the stack. - :param filename: The original file name of the stack. - :return: A list of new file names, and a list of the new contents for - those files. - """ - parser = configparser.ConfigParser(interpolation = None) - parser.read_string(serialized) - - # Update version number. - if "metadata" not in parser: - parser["metadata"] = {} - parser["metadata"]["setting_version"] = "13" - - result = io.StringIO() - parser.write(result) - return [filename], [result.getvalue()] diff --git a/plugins/VersionUpgrade/VersionUpgrade46bto46/__init__.py b/plugins/VersionUpgrade/VersionUpgrade46bto46/__init__.py deleted file mode 100644 index 9f099110ea..0000000000 --- a/plugins/VersionUpgrade/VersionUpgrade46bto46/__init__.py +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright (c) 2020 Ultimaker B.V. -# Cura is released under the terms of the LGPLv3 or higher. - -from typing import Any, Dict, TYPE_CHECKING - -from . import VersionUpgrade46bto46 - -if TYPE_CHECKING: - from UM.Application import Application - -upgrade = VersionUpgrade46bto46.VersionUpgrade46bto46() - -def getMetaData() -> Dict[str, Any]: - return { - "version_upgrade": { - # From To Upgrade function - ("preferences", 6000012): ("preferences", 6000013, upgrade.upgradePreferences), - ("machine_stack", 4000012): ("machine_stack", 4000013, upgrade.upgradeStack), - ("extruder_train", 4000012): ("extruder_train", 4000013, upgrade.upgradeStack), - ("definition_changes", 4000012): ("definition_changes", 4000013, upgrade.upgradeInstanceContainer), - ("quality_changes", 4000012): ("quality_changes", 4000013, upgrade.upgradeInstanceContainer), - ("quality", 4000012): ("quality", 4000013, upgrade.upgradeInstanceContainer), - ("user", 4000012): ("user", 4000013, upgrade.upgradeInstanceContainer), - }, - "sources": { - "preferences": { - "get_version": upgrade.getCfgVersion, - "location": {"."} - }, - "machine_stack": { - "get_version": upgrade.getCfgVersion, - "location": {"./machine_instances"} - }, - "extruder_train": { - "get_version": upgrade.getCfgVersion, - "location": {"./extruders"} - }, - "definition_changes": { - "get_version": upgrade.getCfgVersion, - "location": {"./definition_changes"} - }, - "quality_changes": { - "get_version": upgrade.getCfgVersion, - "location": {"./quality_changes"} - }, - "quality": { - "get_version": upgrade.getCfgVersion, - "location": {"./quality"} - }, - "user": { - "get_version": upgrade.getCfgVersion, - "location": {"./user"} - } - } - } - - -def register(app: "Application") -> Dict[str, Any]: - return {"version_upgrade": upgrade} diff --git a/plugins/VersionUpgrade/VersionUpgrade46bto46/plugin.json b/plugins/VersionUpgrade/VersionUpgrade46bto46/plugin.json deleted file mode 100644 index 5100528017..0000000000 --- a/plugins/VersionUpgrade/VersionUpgrade46bto46/plugin.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "name": "Version Upgrade 4.6-beta to 4.6.0", - "author": "Ultimaker B.V.", - "version": "1.0.0", - "description": "Upgrades configurations from Cura 4.6-BETA to Cura 4.6.", - "api": "7.2.0", - "i18n-catalog": "cura" -} From 2ebf32831a06f5773dc0b4e9d94822c45d6603df Mon Sep 17 00:00:00 2001 From: Gabriel Vogel Date: Thu, 4 Jun 2020 13:50:24 +0200 Subject: [PATCH 14/15] remove duplicate updates for model properties --- .../src/Models/Http/ClusterPrintJobStatus.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py index 8c8b187288..6e46c12cf0 100644 --- a/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py +++ b/plugins/UM3NetworkPrinting/src/Models/Http/ClusterPrintJobStatus.py @@ -125,9 +125,6 @@ class ClusterPrintJobStatus(BaseModel): model.updateOwner(self.owner) model.updateState(self.status) model.setCompatibleMachineFamilies(self.compatible_machine_families) - model.updateTimeTotal(self.time_total) - model.updateTimeElapsed(self.time_elapsed) - model.updateOwner(self.owner) status_set_by_impediment = False for impediment in self.impediments_to_printing: From fd2a7689cc822f1bce87736b4a8dbc9bb958c4d3 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Thu, 4 Jun 2020 14:32:37 +0200 Subject: [PATCH 15/15] Remove overly spammy logging --- cura/API/Account.py | 3 --- plugins/Toolbox/src/CloudSync/CloudPackageChecker.py | 1 - 2 files changed, 4 deletions(-) diff --git a/cura/API/Account.py b/cura/API/Account.py index 581a91da04..ef46368474 100644 --- a/cura/API/Account.py +++ b/cura/API/Account.py @@ -112,9 +112,6 @@ class Account(QObject): :param service_name: A unique name for your service, such as `plugins` or `backups` :param state: One of SyncState """ - - Logger.info("Service {service} enters sync state {state}", service = service_name, state = state) - prev_state = self._sync_state self._sync_services[service_name] = state diff --git a/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py b/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py index ef8e82f576..7c39354317 100644 --- a/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py +++ b/plugins/Toolbox/src/CloudSync/CloudPackageChecker.py @@ -62,7 +62,6 @@ class CloudPackageChecker(QObject): def _getUserSubscribedPackages(self) -> None: self._application.getCuraAPI().account.setSyncState(self.SYNC_SERVICE_NAME, SyncState.SYNCING) - Logger.debug("Requesting subscribed packages metadata from server.") url = CloudApiModel.api_url_user_packages self._application.getHttpRequestManager().get(url, callback = self._onUserPackagesRequestFinished,