From 7d8c97dd7bf1b9a66722521baa86bf0beedd812e Mon Sep 17 00:00:00 2001 From: Jaime van Kessel Date: Mon, 20 May 2019 11:02:40 +0200 Subject: [PATCH] ChangeAtZ no longer sets flow to -1 if no previous flow was found It makes a lot more sense to just asume the value is 100 than -1 Fixes #5284 --- plugins/PostProcessingPlugin/scripts/ChangeAtZ.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py index be9f93c0f6..ad9bc63a90 100644 --- a/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py +++ b/plugins/PostProcessingPlugin/scripts/ChangeAtZ.py @@ -330,7 +330,7 @@ class ChangeAtZ(Script): "extruderOne": self.getSettingValueByKey("i2_extruderOne"), "extruderTwo": self.getSettingValueByKey("i4_extruderTwo"), "fanSpeed": self.getSettingValueByKey("j2_fanSpeed")} - old = {"speed": -1, "flowrate": -1, "flowrateOne": -1, "flowrateTwo": -1, "platformTemp": -1, "extruderOne": -1, + old = {"speed": -1, "flowrate": 100, "flowrateOne": -1, "flowrateTwo": -1, "platformTemp": -1, "extruderOne": -1, "extruderTwo": -1, "bedTemp": -1, "fanSpeed": -1, "state": -1} twLayers = self.getSettingValueByKey("d_twLayers") if self.getSettingValueByKey("c_behavior") == "single_layer": @@ -410,6 +410,8 @@ class ChangeAtZ(Script): tmp_extruder = self.getValue(line, "T", None) if tmp_extruder == None: #check if extruder is specified old["flowrate"] = self.getValue(line, "S", old["flowrate"]) + if old["flowrate"] == -1: + old["flowrate"] = 100.0 elif tmp_extruder == 0: #first extruder old["flowrateOne"] = self.getValue(line, "S", old["flowrateOne"]) elif tmp_extruder == 1: #second extruder @@ -481,9 +483,9 @@ class ChangeAtZ(Script): state = 2 done_layers = 0 if targetL_i > -100000: - modified_gcode += ";ChangeAtZ V%s: reset below Layer %d\n" % (self.version,targetL_i) + modified_gcode += ";ChangeAtZ V%s: reset below Layer %d\n" % (self.version, targetL_i) else: - modified_gcode += ";ChangeAtZ V%s: reset below %1.2f mm\n" % (self.version,targetZ) + modified_gcode += ";ChangeAtZ V%s: reset below %1.2f mm\n" % (self.version, targetZ) if IsUM2 and oldValueUnknown: #executes on UM2 with Ultigcode and machine setting modified_gcode += "M606 S%d;recalls saved settings\n" % (TWinstances-1) else: #executes on RepRap, UM2 with Ultigcode and Cura setting