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 aa879ef889..fc7bfec60a 100644
--- a/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
+++ b/plugins/PostProcessingPlugin/scripts/PauseAtHeight.py
@@ -1,4 +1,4 @@
-# Copyright (c) 2019 Ultimaker B.V.
+# Copyright (c) 2020 Ultimaker B.V.
# Cura is released under the terms of the LGPLv3 or higher.
from ..Script import Script
@@ -182,7 +182,22 @@ class PauseAtHeight(Script):
"Repetier": "Repetier"
},
"default_value": "RepRap (Marlin/Sprinter)",
- "enabled": false
+ "enabled": false,
+ "default_value": ""
+ },
+ "custom_gcode_before_pause":
+ {
+ "label": "G-code Before Pause",
+ "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 g-code to run after the pause, for example, M300 S440 P200 to beep.",
+ "type": "str",
+ "default_value": ""
}
}
}"""
@@ -235,6 +250,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")
pause_method = self.getSettingValueByKey("pause_method")
pause_command = {
@@ -411,9 +428,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 += pause_command + " ; Do the actual pause\n"
+ # Set a custom GCODE section before pause
+ if gcode_after:
+ prepend_gcode += gcode_after + "\n"
+
if pause_method == "repetier":
#Push the filament back,
if retraction_amount != 0:
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"]
)
)