From e2e7006ee761746b09b76075006162c0c6f699c9 Mon Sep 17 00:00:00 2001 From: Brad Date: Sat, 4 Feb 2023 20:30:03 +0300 Subject: [PATCH 1/7] Addition of Longer3D LK4 X Vendor provided this information as a custom file for Cura 4; I have taken that input and adjusted to suit Cura 5 --- resources/definitions/longer_lk4_x.def.json | 38 +++++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 resources/definitions/longer_lk4_x.def.json diff --git a/resources/definitions/longer_lk4_x.def.json b/resources/definitions/longer_lk4_x.def.json new file mode 100644 index 0000000000..236b8c24dd --- /dev/null +++ b/resources/definitions/longer_lk4_x.def.json @@ -0,0 +1,38 @@ +{ + "version": 2, + "name": "Longer LK4 X", + "inherits": "longer_base", + "metadata": + { + "visible": true, + "platform": "longer_235mm_platform.stl", + "platform_offset": [ + -117.5, + -3, + 117.5 + ], + "quality_definition": "longer_base" + }, + "overrides": + { + "gantry_height": { "value": 35 }, + "machine_depth": { "default_value": 220 }, + "machine_head_with_fans_polygon": + { + "default_value": [ + [-55, 20], + [-55, -36], + [35, -36], + [35, 20] + ] + }, + "machine_start_gcode": { "default_value": "; -- LONGER BL-TOUCH Start G-code --\nG21 ; metric values\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nM107 ; start with the fan off\n\n; confirm BL-touch safety\nM280 P0 S160 ; BL-Touch Alarm release\nG4 P100 ; Delay for BL-Touch\n\n; homing\nG28 X0 Y0 ; move X/Y to min endstops\nG28 Z0 ; move Z to min endstops\n\n; reconfirm BL-touch safety\nM280 P0 S160 ; BL-Touch Alarm realease\nG4 P100 ; Delay for BL-Touch\n\n; bed leveling\nG29; Auto leveling\nM420 Z5 ; set LEVELING_FADE_HEIGHT\nM500 ; save data of G29 and M420\nM420 S1 ; enable bed leveling\n\n; prepare hot-end\nG92 E0 ; Reset Extruder\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 Y150.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y150.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; -- end of LONGER BL-TOUCH Start G-code --" }, + "machine_height": { "default_value": 250 }, + "machine_name": { "default_value": "LONGER LK4 X" }, + "machine_width": { "default_value": 220 }, + "speed_travel": { "value": 65 } + "retraction_amount": { "value": 2.0 }, + "z_seam_type": { "value": "'shortest'" }, + "retraction_combing": { "value": "'noskin'" } + } +} From 92bcacfaaa529bcbdd02c9da46d7cfa8222d867a Mon Sep 17 00:00:00 2001 From: Brad Date: Sat, 4 Feb 2023 20:31:14 +0300 Subject: [PATCH 2/7] Create longer_lk4x_0.4.inst.cfg --- resources/variants/longer/longer_lk4x_0.4.inst.cfg | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 resources/variants/longer/longer_lk4x_0.4.inst.cfg diff --git a/resources/variants/longer/longer_lk4x_0.4.inst.cfg b/resources/variants/longer/longer_lk4x_0.4.inst.cfg new file mode 100644 index 0000000000..399b02ce70 --- /dev/null +++ b/resources/variants/longer/longer_lk4x_0.4.inst.cfg @@ -0,0 +1,12 @@ +[general] +definition = longer_lk4x +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 19 +type = variant + +[values] +machine_nozzle_size = 0.4 From e93dd8857d90d3b663f395cc7f57c1df8cf3e0e9 Mon Sep 17 00:00:00 2001 From: Brad Date: Sat, 4 Feb 2023 20:31:51 +0300 Subject: [PATCH 3/7] Rename longer_lk4_x.def.json to longer_lk4x.def.json --- .../definitions/{longer_lk4_x.def.json => longer_lk4x.def.json} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename resources/definitions/{longer_lk4_x.def.json => longer_lk4x.def.json} (100%) diff --git a/resources/definitions/longer_lk4_x.def.json b/resources/definitions/longer_lk4x.def.json similarity index 100% rename from resources/definitions/longer_lk4_x.def.json rename to resources/definitions/longer_lk4x.def.json From 18020338eaef30b5d00af678d4ae6f96c26c6ba5 Mon Sep 17 00:00:00 2001 From: Brad Date: Sat, 4 Feb 2023 20:41:23 +0300 Subject: [PATCH 4/7] Fixed linter error --- resources/definitions/longer_lk4x.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/longer_lk4x.def.json b/resources/definitions/longer_lk4x.def.json index 236b8c24dd..b98dbeca06 100644 --- a/resources/definitions/longer_lk4x.def.json +++ b/resources/definitions/longer_lk4x.def.json @@ -30,7 +30,7 @@ "machine_height": { "default_value": 250 }, "machine_name": { "default_value": "LONGER LK4 X" }, "machine_width": { "default_value": 220 }, - "speed_travel": { "value": 65 } + "speed_travel": { "value": 65 }, "retraction_amount": { "value": 2.0 }, "z_seam_type": { "value": "'shortest'" }, "retraction_combing": { "value": "'noskin'" } From 7dd6335f4b4378981767cb4c1fe40461bd1f4639 Mon Sep 17 00:00:00 2001 From: Brad Date: Sat, 4 Feb 2023 20:50:37 +0300 Subject: [PATCH 5/7] Outdated definition was updated --- resources/variants/longer/longer_lk4x_0.4.inst.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/variants/longer/longer_lk4x_0.4.inst.cfg b/resources/variants/longer/longer_lk4x_0.4.inst.cfg index 399b02ce70..c5e7cdb230 100644 --- a/resources/variants/longer/longer_lk4x_0.4.inst.cfg +++ b/resources/variants/longer/longer_lk4x_0.4.inst.cfg @@ -5,7 +5,7 @@ version = 4 [metadata] hardware_type = nozzle -setting_version = 19 +setting_version = 21 type = variant [values] From 024876b314069f44a3b8e347e2218c95c07233b7 Mon Sep 17 00:00:00 2001 From: casperlamboo Date: Fri, 14 Apr 2023 15:23:38 +0000 Subject: [PATCH 6/7] Applied printer-linter format --- resources/definitions/longer_lk4x.def.json | 10 +++++----- resources/variants/longer/longer_lk4x_0.4.inst.cfg | 1 + 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/resources/definitions/longer_lk4x.def.json b/resources/definitions/longer_lk4x.def.json index b98dbeca06..9d3de42599 100644 --- a/resources/definitions/longer_lk4x.def.json +++ b/resources/definitions/longer_lk4x.def.json @@ -26,13 +26,13 @@ [35, 20] ] }, - "machine_start_gcode": { "default_value": "; -- LONGER BL-TOUCH Start G-code --\nG21 ; metric values\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nM107 ; start with the fan off\n\n; confirm BL-touch safety\nM280 P0 S160 ; BL-Touch Alarm release\nG4 P100 ; Delay for BL-Touch\n\n; homing\nG28 X0 Y0 ; move X/Y to min endstops\nG28 Z0 ; move Z to min endstops\n\n; reconfirm BL-touch safety\nM280 P0 S160 ; BL-Touch Alarm realease\nG4 P100 ; Delay for BL-Touch\n\n; bed leveling\nG29; Auto leveling\nM420 Z5 ; set LEVELING_FADE_HEIGHT\nM500 ; save data of G29 and M420\nM420 S1 ; enable bed leveling\n\n; prepare hot-end\nG92 E0 ; Reset Extruder\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 Y150.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y150.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; -- end of LONGER BL-TOUCH Start G-code --" }, "machine_height": { "default_value": 250 }, "machine_name": { "default_value": "LONGER LK4 X" }, + "machine_start_gcode": { "default_value": "; -- LONGER BL-TOUCH Start G-code --\nG21 ; metric values\nG90 ; absolute positioning\nM82 ; set extruder to absolute mode\nM107 ; start with the fan off\n\n; confirm BL-touch safety\nM280 P0 S160 ; BL-Touch Alarm release\nG4 P100 ; Delay for BL-Touch\n\n; homing\nG28 X0 Y0 ; move X/Y to min endstops\nG28 Z0 ; move Z to min endstops\n\n; reconfirm BL-touch safety\nM280 P0 S160 ; BL-Touch Alarm realease\nG4 P100 ; Delay for BL-Touch\n\n; bed leveling\nG29; Auto leveling\nM420 Z5 ; set LEVELING_FADE_HEIGHT\nM500 ; save data of G29 and M420\nM420 S1 ; enable bed leveling\n\n; prepare hot-end\nG92 E0 ; Reset Extruder\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 Y150.0 Z0.3 F1500.0 E15 ; Draw the first line\nG1 X0.4 Y150.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; -- end of LONGER BL-TOUCH Start G-code --" }, "machine_width": { "default_value": 220 }, - "speed_travel": { "value": 65 }, "retraction_amount": { "value": 2.0 }, - "z_seam_type": { "value": "'shortest'" }, - "retraction_combing": { "value": "'noskin'" } + "retraction_combing": { "value": "'noskin'" }, + "speed_travel": { "value": 65 }, + "z_seam_type": { "value": "'shortest'" } } -} +} \ No newline at end of file diff --git a/resources/variants/longer/longer_lk4x_0.4.inst.cfg b/resources/variants/longer/longer_lk4x_0.4.inst.cfg index c5e7cdb230..0ecce67ff9 100644 --- a/resources/variants/longer/longer_lk4x_0.4.inst.cfg +++ b/resources/variants/longer/longer_lk4x_0.4.inst.cfg @@ -10,3 +10,4 @@ type = variant [values] machine_nozzle_size = 0.4 + From b5b6f8197bed78528184ee07f880db7d141d08f2 Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 17 Apr 2023 12:47:54 +0200 Subject: [PATCH 7/7] Fix the writeStarted emit When printing via abstract printer, this signal was not correctly emitted causing the postprocessing script to fail CURA-10524 --- .../UM3NetworkPrinting/src/Cloud/AbstractCloudOutputDevice.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/plugins/UM3NetworkPrinting/src/Cloud/AbstractCloudOutputDevice.py b/plugins/UM3NetworkPrinting/src/Cloud/AbstractCloudOutputDevice.py index 4ee74550a4..fdbeb051cf 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/AbstractCloudOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/AbstractCloudOutputDevice.py @@ -96,6 +96,9 @@ class AbstractCloudOutputDevice(UltimakerNetworkedPrinterOutputDevice): @pyqtSlot(str) def printerSelected(self, unique_id: str): + # The device that it defers the actual write to isn't hooked up correctly. So we should emit the write signal + # here. + self.writeStarted.emit(self) self._request_write_callback(unique_id, self._nodes) if self._on_print_dialog: self._on_print_dialog.close()