From 323c374cc4477a3a143b932fefb77929c70da7ec Mon Sep 17 00:00:00 2001 From: Rodrigo Sclosa Date: Thu, 23 Apr 2020 20:15:10 -0300 Subject: [PATCH 1/6] Included two fields on PauseAtHeight script for user to put custom GCODE before and after the pause, such as a beep code. --- plugins/PostProcessingPlugin/plugin.json | 2 +- .../scripts/PauseAtHeight.py | 24 +++++++++++++++++ .../scripts/PauseAtHeightforRepetier.py | 27 +++++++++++++++++++ 3 files changed, 52 insertions(+), 1 deletion(-) diff --git a/plugins/PostProcessingPlugin/plugin.json b/plugins/PostProcessingPlugin/plugin.json index 21a7cedb75..9f74d54b2a 100644 --- a/plugins/PostProcessingPlugin/plugin.json +++ b/plugins/PostProcessingPlugin/plugin.json @@ -1,7 +1,7 @@ { "name": "Post Processing", "author": "Ultimaker", - "version": "2.2.1", + "version": "2.3.0", "api": "7.2.0", "description": "Extension that allows for user created scripts for post processing", "catalog": "cura" diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py index 1ba8b8213b..2d8a82c1d0 100644 --- a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py +++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py @@ -130,6 +130,20 @@ class PauseAtHeight(Script): "description": "Text that should appear on the display while paused. If left empty, there will not be any message.", "type": "str", "default_value": "" + }, + "custom_gcode_before_pause": + { + "label": "GCODE Before Pause", + "description": "Any custom GCODE to run before the pause, for example, M300 S440 P200 to beep.", + "type": "str", + "default_value": "" + }, + "custom_gcode_after_pause": + { + "label": "GCODE After Pause", + "description": "Any custom GCODE to run after the pause, for example, M300 S440 P200 to beep.", + "type": "str", + "default_value": "" } } }""" @@ -166,6 +180,8 @@ class PauseAtHeight(Script): control_temperatures = Application.getInstance().getGlobalContainerStack().getProperty("machine_nozzle_temp_enabled", "value") initial_layer_height = Application.getInstance().getGlobalContainerStack().getProperty("layer_height_0", "value") display_text = self.getSettingValueByKey("display_text") + gcode_before = self.getSettingValueByKey("custom_gcode_before_pause") + gcode_after = self.getSettingValueByKey("custom_gcode_after_pause") is_griffin = False @@ -323,9 +339,17 @@ class PauseAtHeight(Script): if disarm_timeout > 0: prepend_gcode += self.putValue(M = 18, S = disarm_timeout) + " ; Set the disarm timeout\n" + # Set a custom GCODE section before pause + if gcode_before: + prepend_gcode += gcode_before + "\n" + # Wait till the user continues printing prepend_gcode += self.putValue(M = 0) + " ; Do the actual pause\n" + # Set a custom GCODE section before pause + if gcode_after: + prepend_gcode += gcode_after + "\n" + if not is_griffin: if control_temperatures: # Set extruder resume temperature diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeightforRepetier.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeightforRepetier.py index 0353574289..ac80361e0d 100644 --- a/plugins/PostProcessingPlugin/scripts/PauseAtHeightforRepetier.py +++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeightforRepetier.py @@ -67,6 +67,21 @@ class PauseAtHeightforRepetier(Script): "unit": "layers", "type": "int", "default_value": 0 + }, + , + "custom_gcode_before_pause": + { + "label": "GCODE Before Pause", + "description": "Any custom GCODE to run before the pause, for example, M300 S300 P1000 to beep.", + "type": "str", + "default_value": "" + }, + "custom_gcode_after_pause": + { + "label": "GCODE After Pause", + "description": "Any custom GCODE to run after the pause, for example, M300 S300 P1000 to beep.", + "type": "str", + "default_value": "" } } }""" @@ -84,6 +99,9 @@ class PauseAtHeightforRepetier(Script): move_Z = self.getSettingValueByKey("head_move_Z") layers_started = False redo_layers = self.getSettingValueByKey("redo_layers") + gcode_before = self.getSettingValueByKey("custom_gcode_before_pause") + gcode_after = self.getSettingValueByKey("custom_gcode_after_pause") + for layer in data: lines = layer.split("\n") for line in lines: @@ -132,9 +150,18 @@ class PauseAtHeightforRepetier(Script): #Disable the E steppers prepend_gcode += "M84 E0\n" + + # Set a custom GCODE section before pause + if gcode_before: + prepend_gcode += gcode_before + "\n" + #Wait till the user continues printing prepend_gcode += "@pause now change filament and press continue printing ;Do the actual pause\n" + # Set a custom GCODE section before pause + if gcode_after: + prepend_gcode += gcode_after + "\n" + #Push the filament back, if retraction_amount != 0: prepend_gcode += "G1 E%f F6000\n" % (retraction_amount) From f9868a5aa4e7c436fb8f0078de48e57d8d4750d6 Mon Sep 17 00:00:00 2001 From: Rodrigo Sclosa Date: Thu, 30 Apr 2020 16:34:20 -0300 Subject: [PATCH 2/6] Revert "Included two fields on PauseAtHeight script for user to put custom GCODE before and after the pause, such as a beep code." This reverts commit 323c374cc4477a3a143b932fefb77929c70da7ec. --- plugins/PostProcessingPlugin/plugin.json | 2 +- .../scripts/PauseAtHeight.py | 24 ----------------- .../scripts/PauseAtHeightforRepetier.py | 27 ------------------- 3 files changed, 1 insertion(+), 52 deletions(-) diff --git a/plugins/PostProcessingPlugin/plugin.json b/plugins/PostProcessingPlugin/plugin.json index 9f74d54b2a..21a7cedb75 100644 --- a/plugins/PostProcessingPlugin/plugin.json +++ b/plugins/PostProcessingPlugin/plugin.json @@ -1,7 +1,7 @@ { "name": "Post Processing", "author": "Ultimaker", - "version": "2.3.0", + "version": "2.2.1", "api": "7.2.0", "description": "Extension that allows for user created scripts for post processing", "catalog": "cura" diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py index 2d8a82c1d0..1ba8b8213b 100644 --- a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py +++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py @@ -130,20 +130,6 @@ class PauseAtHeight(Script): "description": "Text that should appear on the display while paused. If left empty, there will not be any message.", "type": "str", "default_value": "" - }, - "custom_gcode_before_pause": - { - "label": "GCODE Before Pause", - "description": "Any custom GCODE to run before the pause, for example, M300 S440 P200 to beep.", - "type": "str", - "default_value": "" - }, - "custom_gcode_after_pause": - { - "label": "GCODE After Pause", - "description": "Any custom GCODE to run after the pause, for example, M300 S440 P200 to beep.", - "type": "str", - "default_value": "" } } }""" @@ -180,8 +166,6 @@ class PauseAtHeight(Script): control_temperatures = Application.getInstance().getGlobalContainerStack().getProperty("machine_nozzle_temp_enabled", "value") initial_layer_height = Application.getInstance().getGlobalContainerStack().getProperty("layer_height_0", "value") display_text = self.getSettingValueByKey("display_text") - gcode_before = self.getSettingValueByKey("custom_gcode_before_pause") - gcode_after = self.getSettingValueByKey("custom_gcode_after_pause") is_griffin = False @@ -339,17 +323,9 @@ class PauseAtHeight(Script): if disarm_timeout > 0: prepend_gcode += self.putValue(M = 18, S = disarm_timeout) + " ; Set the disarm timeout\n" - # Set a custom GCODE section before pause - if gcode_before: - prepend_gcode += gcode_before + "\n" - # Wait till the user continues printing prepend_gcode += self.putValue(M = 0) + " ; Do the actual pause\n" - # Set a custom GCODE section before pause - if gcode_after: - prepend_gcode += gcode_after + "\n" - if not is_griffin: if control_temperatures: # Set extruder resume temperature diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeightforRepetier.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeightforRepetier.py index ac80361e0d..0353574289 100644 --- a/plugins/PostProcessingPlugin/scripts/PauseAtHeightforRepetier.py +++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeightforRepetier.py @@ -67,21 +67,6 @@ class PauseAtHeightforRepetier(Script): "unit": "layers", "type": "int", "default_value": 0 - }, - , - "custom_gcode_before_pause": - { - "label": "GCODE Before Pause", - "description": "Any custom GCODE to run before the pause, for example, M300 S300 P1000 to beep.", - "type": "str", - "default_value": "" - }, - "custom_gcode_after_pause": - { - "label": "GCODE After Pause", - "description": "Any custom GCODE to run after the pause, for example, M300 S300 P1000 to beep.", - "type": "str", - "default_value": "" } } }""" @@ -99,9 +84,6 @@ class PauseAtHeightforRepetier(Script): move_Z = self.getSettingValueByKey("head_move_Z") layers_started = False redo_layers = self.getSettingValueByKey("redo_layers") - gcode_before = self.getSettingValueByKey("custom_gcode_before_pause") - gcode_after = self.getSettingValueByKey("custom_gcode_after_pause") - for layer in data: lines = layer.split("\n") for line in lines: @@ -150,18 +132,9 @@ class PauseAtHeightforRepetier(Script): #Disable the E steppers prepend_gcode += "M84 E0\n" - - # Set a custom GCODE section before pause - if gcode_before: - prepend_gcode += gcode_before + "\n" - #Wait till the user continues printing prepend_gcode += "@pause now change filament and press continue printing ;Do the actual pause\n" - # Set a custom GCODE section before pause - if gcode_after: - prepend_gcode += gcode_after + "\n" - #Push the filament back, if retraction_amount != 0: prepend_gcode += "G1 E%f F6000\n" % (retraction_amount) From d354c9f8ca0e53bbc7e124e35167de435c52e884 Mon Sep 17 00:00:00 2001 From: Rodrigo Sclosa Date: Thu, 30 Apr 2020 16:37:20 -0300 Subject: [PATCH 3/6] Included two fields on PauseAtHeight script for user to put custom GCODE before and after the pause, such as a beep code. --- .../scripts/PauseAtHeight.py | 24 +++++++++++++++++ .../scripts/PauseAtHeightforRepetier.py | 27 +++++++++++++++++++ 2 files changed, 51 insertions(+) diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py index 1ba8b8213b..ff4abedd38 100644 --- a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py +++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py @@ -130,6 +130,20 @@ class PauseAtHeight(Script): "description": "Text that should appear on the display while paused. If left empty, there will not be any message.", "type": "str", "default_value": "" + }, + "custom_gcode_before_pause": + { + "label": "GCODE Before Pause", + "description": "Any custom GCODE to run before the pause, for example, M300 S440 P200 to beep.", + "type": "str", + "default_value": "M300 S440 P200; M300 S660 P250; M300 S880 P300;" + }, + "custom_gcode_after_pause": + { + "label": "GCODE After Pause", + "description": "Any custom GCODE to run after the pause, for example, M300 S440 P200 to beep.", + "type": "str", + "default_value": "" } } }""" @@ -166,6 +180,8 @@ class PauseAtHeight(Script): control_temperatures = Application.getInstance().getGlobalContainerStack().getProperty("machine_nozzle_temp_enabled", "value") initial_layer_height = Application.getInstance().getGlobalContainerStack().getProperty("layer_height_0", "value") display_text = self.getSettingValueByKey("display_text") + gcode_before = self.getSettingValueByKey("custom_gcode_before_pause") + gcode_after = self.getSettingValueByKey("custom_gcode_after_pause") is_griffin = False @@ -323,9 +339,17 @@ class PauseAtHeight(Script): if disarm_timeout > 0: prepend_gcode += self.putValue(M = 18, S = disarm_timeout) + " ; Set the disarm timeout\n" + # Set a custom GCODE section before pause + if gcode_before: + prepend_gcode += gcode_before + "\n" + # Wait till the user continues printing prepend_gcode += self.putValue(M = 0) + " ; Do the actual pause\n" + # Set a custom GCODE section before pause + if gcode_after: + prepend_gcode += gcode_after + "\n" + if not is_griffin: if control_temperatures: # Set extruder resume temperature diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeightforRepetier.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeightforRepetier.py index 0353574289..f2f23c0459 100644 --- a/plugins/PostProcessingPlugin/scripts/PauseAtHeightforRepetier.py +++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeightforRepetier.py @@ -67,6 +67,21 @@ class PauseAtHeightforRepetier(Script): "unit": "layers", "type": "int", "default_value": 0 + }, + , + "custom_gcode_before_pause": + { + "label": "GCODE Before Pause", + "description": "Any custom GCODE to run before the pause, for example, M300 S300 P1000 to beep.", + "type": "str", + "default_value": "M300 S440 P200; M300 S660 P250; M300 S880 P300;" + }, + "custom_gcode_after_pause": + { + "label": "GCODE After Pause", + "description": "Any custom GCODE to run after the pause, for example, M300 S300 P1000 to beep.", + "type": "str", + "default_value": "" } } }""" @@ -84,6 +99,9 @@ class PauseAtHeightforRepetier(Script): move_Z = self.getSettingValueByKey("head_move_Z") layers_started = False redo_layers = self.getSettingValueByKey("redo_layers") + gcode_before = self.getSettingValueByKey("custom_gcode_before_pause") + gcode_after = self.getSettingValueByKey("custom_gcode_after_pause") + for layer in data: lines = layer.split("\n") for line in lines: @@ -132,9 +150,18 @@ class PauseAtHeightforRepetier(Script): #Disable the E steppers prepend_gcode += "M84 E0\n" + + # Set a custom GCODE section before pause + if gcode_before: + prepend_gcode += gcode_before + "\n" + #Wait till the user continues printing prepend_gcode += "@pause now change filament and press continue printing ;Do the actual pause\n" + # Set a custom GCODE section before pause + if gcode_after: + prepend_gcode += gcode_after + "\n" + #Push the filament back, if retraction_amount != 0: prepend_gcode += "G1 E%f F6000\n" % (retraction_amount) From 13ff186c8edb813b07608358ac2d78f73fad6a09 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 20 Jul 2020 13:23:24 +0200 Subject: [PATCH 4/6] Correct spelling of 'g-code' This is the convention we're holding in this application. --- plugins/PostProcessingPlugin/scripts/PauseAtHeight.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py index 314fc5a25d..39b4cfdac3 100644 --- a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py +++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py @@ -182,19 +182,19 @@ class PauseAtHeight(Script): "Repetier": "Repetier" }, "default_value": "RepRap (Marlin/Sprinter)", - "enabled": false + "enabled": false, "default_value": "" }, "custom_gcode_before_pause": { - "label": "GCODE Before Pause", + "label": "G-code Before Pause", "description": "Any custom GCODE to run before the pause, for example, M300 S440 P200 to beep.", "type": "str", "default_value": "M300 S440 P200; M300 S660 P250; M300 S880 P300;" }, "custom_gcode_after_pause": { - "label": "GCODE After Pause", + "label": "G-code After Pause", "description": "Any custom GCODE to run after the pause, for example, M300 S440 P200 to beep.", "type": "str", "default_value": "" From a84598a8c9845ea1b4488ad6f56c92672a34c60c Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 20 Jul 2020 13:24:18 +0200 Subject: [PATCH 5/6] Remove default value for g-code before pause It's best to just leave it as is. Not everyone appreciates bleeps. Contributes to issue CURA-7599. --- plugins/PostProcessingPlugin/scripts/PauseAtHeight.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py index 39b4cfdac3..f28ed29c38 100644 --- a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py +++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py @@ -190,7 +190,7 @@ class PauseAtHeight(Script): "label": "G-code Before Pause", "description": "Any custom GCODE to run before the pause, for example, M300 S440 P200 to beep.", "type": "str", - "default_value": "M300 S440 P200; M300 S660 P250; M300 S880 P300;" + "default_value": "" }, "custom_gcode_after_pause": { From db15bc84cf32a6f454e7a4a2fcc362fa5d7640b3 Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Mon, 20 Jul 2020 13:36:49 +0200 Subject: [PATCH 6/6] Correct and consistent spelling of g-code This spelling is in Ultimaker's style guide. We use g-code, and capitalise the G if it's at the start of a sentence or header. Pretty good score, considering there are literally thousands of user- or log-visible strings mentioning g-code across Cura. --- plugins/GCodeGzReader/GCodeGzReader.py | 4 ++-- plugins/GCodeReader/FlavorParser.py | 10 +++++----- plugins/GCodeReader/GCodeReader.py | 4 ++-- .../scripts/InsertAtLayerChange.py | 6 ++++-- plugins/PostProcessingPlugin/scripts/PauseAtHeight.py | 4 ++-- plugins/PostProcessingPlugin/scripts/TimeLapse.py | 4 +++- scripts/check_gcode_buffer.py | 4 ++-- tests/TestPrintInformation.py | 5 ++++- 8 files changed, 24 insertions(+), 17 deletions(-) diff --git a/plugins/GCodeGzReader/GCodeGzReader.py b/plugins/GCodeGzReader/GCodeGzReader.py index 85a5b01107..fb8bbe0ecd 100644 --- a/plugins/GCodeGzReader/GCodeGzReader.py +++ b/plugins/GCodeGzReader/GCodeGzReader.py @@ -1,4 +1,4 @@ -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2020 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import gzip @@ -19,7 +19,7 @@ class GCodeGzReader(MeshReader): MimeTypeDatabase.addMimeType( MimeType( name = "application/x-cura-compressed-gcode-file", - comment = "Cura Compressed GCode File", + comment = "Cura Compressed G-code File", suffixes = ["gcode.gz"] ) ) diff --git a/plugins/GCodeReader/FlavorParser.py b/plugins/GCodeReader/FlavorParser.py index a49de266c4..09495c527f 100644 --- a/plugins/GCodeReader/FlavorParser.py +++ b/plugins/GCodeReader/FlavorParser.py @@ -312,7 +312,7 @@ class FlavorParser: # F5, that gcode SceneNode will be removed because it doesn't have a file to be reloaded from. # def processGCodeStream(self, stream: str, filename: str) -> Optional["CuraSceneNode"]: - Logger.log("d", "Preparing to load GCode") + Logger.log("d", "Preparing to load g-code") self._cancelled = False # We obtain the filament diameter from the selected extruder to calculate line widths global_stack = CuraApplication.getInstance().getGlobalContainerStack() @@ -352,7 +352,7 @@ class FlavorParser: self._message.setProgress(0) self._message.show() - Logger.log("d", "Parsing Gcode...") + Logger.log("d", "Parsing g-code...") current_position = Position(0, 0, 0, 0, [0]) current_path = [] #type: List[List[float]] @@ -363,7 +363,7 @@ class FlavorParser: for line in stream.split("\n"): if self._cancelled: - Logger.log("d", "Parsing Gcode file cancelled") + Logger.log("d", "Parsing g-code file cancelled.") return None current_line += 1 @@ -482,7 +482,7 @@ class FlavorParser: gcode_dict = {active_build_plate_id: gcode_list} CuraApplication.getInstance().getController().getScene().gcode_dict = gcode_dict #type: ignore #Because gcode_dict is generated dynamically. - Logger.log("d", "Finished parsing Gcode") + Logger.log("d", "Finished parsing g-code.") self._message.hide() if self._layer_number == 0: @@ -493,7 +493,7 @@ class FlavorParser: machine_depth = global_stack.getProperty("machine_depth", "value") scene_node.setPosition(Vector(-machine_width / 2, 0, machine_depth / 2)) - Logger.log("d", "GCode loading finished") + Logger.log("d", "G-code loading finished.") if CuraApplication.getInstance().getPreferences().getValue("gcodereader/show_caution"): caution_message = Message(catalog.i18nc( diff --git a/plugins/GCodeReader/GCodeReader.py b/plugins/GCodeReader/GCodeReader.py index 21be026cc6..8d4e53ae60 100755 --- a/plugins/GCodeReader/GCodeReader.py +++ b/plugins/GCodeReader/GCodeReader.py @@ -1,5 +1,5 @@ # Copyright (c) 2017 Aleph Objects, Inc. -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2020 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. from typing import Optional, Union, List, TYPE_CHECKING @@ -32,7 +32,7 @@ class GCodeReader(MeshReader): MimeTypeDatabase.addMimeType( MimeType( name = "application/x-cura-gcode-file", - comment = "Cura GCode File", + comment = "Cura G-code File", suffixes = ["gcode"] ) ) diff --git a/plugins/PostProcessingPlugin/scripts/InsertAtLayerChange.py b/plugins/PostProcessingPlugin/scripts/InsertAtLayerChange.py index c21993aad1..5fb506b42b 100644 --- a/plugins/PostProcessingPlugin/scripts/InsertAtLayerChange.py +++ b/plugins/PostProcessingPlugin/scripts/InsertAtLayerChange.py @@ -1,3 +1,5 @@ +# Copyright (c) 2020 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. # Created by Wayne Porter from ..Script import Script @@ -24,8 +26,8 @@ class InsertAtLayerChange(Script): }, "gcode_to_add": { - "label": "GCODE to insert.", - "description": "GCODE to add before or after layer change.", + "label": "G-code to insert.", + "description": "G-code to add before or after layer change.", "type": "str", "default_value": "" } diff --git a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py index f28ed29c38..fc7bfec60a 100644 --- a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py +++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py @@ -188,14 +188,14 @@ class PauseAtHeight(Script): "custom_gcode_before_pause": { "label": "G-code Before Pause", - "description": "Any custom GCODE to run before the pause, for example, M300 S440 P200 to beep.", + "description": "Any custom g-code to run before the pause, for example, M300 S440 P200 to beep.", "type": "str", "default_value": "" }, "custom_gcode_after_pause": { "label": "G-code After Pause", - "description": "Any custom GCODE to run after the pause, for example, M300 S440 P200 to beep.", + "description": "Any custom g-code to run after the pause, for example, M300 S440 P200 to beep.", "type": "str", "default_value": "" } diff --git a/plugins/PostProcessingPlugin/scripts/TimeLapse.py b/plugins/PostProcessingPlugin/scripts/TimeLapse.py index 427f80315d..41fd4a5805 100644 --- a/plugins/PostProcessingPlugin/scripts/TimeLapse.py +++ b/plugins/PostProcessingPlugin/scripts/TimeLapse.py @@ -1,3 +1,5 @@ +# Copyright (c) 2020 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. # Created by Wayne Porter from ..Script import Script @@ -18,7 +20,7 @@ class TimeLapse(Script): "trigger_command": { "label": "Trigger camera command", - "description": "Gcode command used to trigger camera.", + "description": "G-code command used to trigger camera.", "type": "str", "default_value": "M240" }, diff --git a/scripts/check_gcode_buffer.py b/scripts/check_gcode_buffer.py index 321b2439c0..ed093089e4 100755 --- a/scripts/check_gcode_buffer.py +++ b/scripts/check_gcode_buffer.py @@ -1,5 +1,5 @@ #!/usr/bin/env python3 -# Copyright (c) 2018 Ultimaker B.V. +# Copyright (c) 2020 Ultimaker B.V. # Cura is released under the terms of the LGPLv3 or higher. import copy @@ -522,7 +522,7 @@ class CommandBuffer: if __name__ == "__main__": if len(sys.argv) < 2 or 3 < len(sys.argv): - print("Usage: [output gcode]") + print("Usage: [output g-code]") sys.exit(1) in_filename = sys.argv[1] out_filename = None diff --git a/tests/TestPrintInformation.py b/tests/TestPrintInformation.py index 5133dfcafb..bfebe4a528 100644 --- a/tests/TestPrintInformation.py +++ b/tests/TestPrintInformation.py @@ -1,3 +1,6 @@ +# Copyright (c) 2020 Ultimaker B.V. +# Cura is released under the terms of the LGPLv3 or higher. + import functools from UM.Qt.Duration import Duration @@ -55,7 +58,7 @@ def setup_module(): MimeTypeDatabase.addMimeType( MimeType( name = "application/x-cura-gcode-file", - comment = "Cura GCode File", + comment = "Cura G-code File", suffixes = ["gcode"] ) )