mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-06 22:47:29 -06:00
Add back placeholder expansion for start/end gcode
See issue Ultimaker/CuraEngine#240 The intent of this change it to allow token replacement in start/end gcode similar to the old Cura. Tokens are of the form {material_bed_temperature} where the name is any setting name that is passed to the engine. Control the backend's generation of temperature commands via new settings material_bed_temp_prepend and material_print_temp_prepend based on whether there are temperature tokens in the printer profile's start gcode. This change will generate the same temperature gcode as FffGcodeWriter at the head, if none of the temperature tokens are present in the machine profile. Otherwise, they're suppressed via the prepend settings. Also, set fdmprinter.json so that all that inherit from it default to having the gcode temperature prepend also wait for temperature. Profiles can override these settings: material_bed_temp_wait and material_print_temp_wait This PR intends to change both Cura and CuraEngine. However, it is safe to sequence with the Cura change first which will do token replacement (if present), but will fail to supress the temperature prepends.
This commit is contained in:
parent
107beb9798
commit
4a3db419ec
3 changed files with 40 additions and 3 deletions
|
@ -2,6 +2,8 @@
|
|||
# Cura is released under the terms of the AGPLv3 or higher.
|
||||
|
||||
import numpy
|
||||
from string import Formatter
|
||||
import traceback
|
||||
|
||||
from UM.Job import Job
|
||||
from UM.Application import Application
|
||||
|
@ -14,6 +16,19 @@ from cura.OneAtATimeIterator import OneAtATimeIterator
|
|||
|
||||
from . import Cura_pb2
|
||||
|
||||
## Formatter class that handles token expansion in start/end gcod
|
||||
class GcodeStartEndFormatter(Formatter):
|
||||
def get_value(self, key, args, kwargs):
|
||||
if isinstance(key, str):
|
||||
try:
|
||||
return kwargs[key]
|
||||
except KeyError:
|
||||
Logger.log("w", "Unable to replace '%s' placeholder in start/end gcode", key)
|
||||
return "{" + key + "}"
|
||||
else:
|
||||
Logger.log("w", "Incorrectly formatted placeholder '%s' in start/end gcode", key)
|
||||
return "{" + str(key) + "}"
|
||||
|
||||
## Job class that handles sending the current scene data to CuraEngine
|
||||
class StartSliceJob(Job):
|
||||
def __init__(self, profile, socket):
|
||||
|
@ -90,12 +105,28 @@ class StartSliceJob(Job):
|
|||
|
||||
self.setResult(True)
|
||||
|
||||
def _expandGcodeTokens(self, key, value, settings):
|
||||
try:
|
||||
# any setting can be used as a token
|
||||
fmt = GcodeStartEndFormatter()
|
||||
return str(fmt.format(value, **settings)).encode("utf-8")
|
||||
except:
|
||||
Logger.log("w", "Unabled to do token replacement on start/end gcode %s", traceback.format_exc())
|
||||
return str(value).encode("utf-8")
|
||||
|
||||
def _sendSettings(self, profile):
|
||||
msg = Cura_pb2.SettingList()
|
||||
for key, value in profile.getAllSettingValues(include_machine = True).items():
|
||||
settings = profile.getAllSettingValues(include_machine = True)
|
||||
start_gcode = settings["machine_start_gcode"]
|
||||
settings["material_bed_temp_prepend"] = not "{material_bed_temperature}" in start_gcode
|
||||
settings["material_print_temp_prepend"] = not "{material_print_temperature" in start_gcode
|
||||
for key, value in settings.items():
|
||||
s = msg.settings.add()
|
||||
s.name = key
|
||||
s.value = str(value).encode("utf-8")
|
||||
if key == "machine_start_gcode" or key == "machine_end_gcode":
|
||||
s.value = self._expandGcodeTokens(key, value, settings)
|
||||
else:
|
||||
s.value = str(value).encode("utf-8")
|
||||
|
||||
self._socket.sendMessage(msg)
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue