Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/Ultimaker/Cura.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaime van Kessel <nallath@gmail.com>2020-02-27 12:47:32 +0300
committerJaime van Kessel <nallath@gmail.com>2020-02-27 12:47:32 +0300
commit1a44aa6d2e5e4b89d9de14d4f2cc9b3e1c0f84bf (patch)
tree86ae7c9747a4761ad995e4c1be0ec5b65199da82 /plugins/CuraEngineBackend/StartSliceJob.py
parentba0eb114f6395cf235e5c5f8f03ef0506e70f5bd (diff)
Ignore comments when checking for temperature prepends
Fixes #7124
Diffstat (limited to 'plugins/CuraEngineBackend/StartSliceJob.py')
-rw-r--r--plugins/CuraEngineBackend/StartSliceJob.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/CuraEngineBackend/StartSliceJob.py b/plugins/CuraEngineBackend/StartSliceJob.py
index c6841c6ea9..a99c559bac 100644
--- a/plugins/CuraEngineBackend/StartSliceJob.py
+++ b/plugins/CuraEngineBackend/StartSliceJob.py
@@ -422,13 +422,14 @@ class StartSliceJob(Job):
# Pre-compute material material_bed_temp_prepend and material_print_temp_prepend
start_gcode = settings["machine_start_gcode"]
+ # Remove all the comments from the start g-code
+ start_gcode = re.sub(r";.+?(\n|$)", "\n", start_gcode)
bed_temperature_settings = ["material_bed_temperature", "material_bed_temperature_layer_0"]
pattern = r"\{(%s)(,\s?\w+)?\}" % "|".join(bed_temperature_settings) # match {setting} as well as {setting, extruder_nr}
settings["material_bed_temp_prepend"] = re.search(pattern, start_gcode) == None
print_temperature_settings = ["material_print_temperature", "material_print_temperature_layer_0", "default_material_print_temperature", "material_initial_print_temperature", "material_final_print_temperature", "material_standby_temperature"]
pattern = r"\{(%s)(,\s?\w+)?\}" % "|".join(print_temperature_settings) # match {setting} as well as {setting, extruder_nr}
settings["material_print_temp_prepend"] = re.search(pattern, start_gcode) == None
-
# Replace the setting tokens in start and end g-code.
# Use values from the first used extruder by default so we get the expected temperatures
initial_extruder_stack = CuraApplication.getInstance().getExtruderManager().getUsedExtruderStacks()[0]