diff --git a/PrinterCommunication/Io/WaitForTempStream.cs b/PrinterCommunication/Io/WaitForTempStream.cs index 25b3b8fb5..40163bd54 100644 --- a/PrinterCommunication/Io/WaitForTempStream.cs +++ b/PrinterCommunication/Io/WaitForTempStream.cs @@ -44,7 +44,8 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io private double extruderIndex; private double ignoreRequestIfBelowTemp = 20; - private double sameTempRange = 1; + private double sameTempRangeBed = 3; + private double sameTempRangeHotEnd = 1; private State state = State.passthrough; private double targetTemp = 0; private Stopwatch timeHaveBeenAtTemp = new Stopwatch(); @@ -142,7 +143,8 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io case State.waitingForExtruderTemp: { double extruderTemp = printerConnection.GetActualHotendTemperature((int)extruderIndex); - bool tempWithinRange = extruderTemp >= targetTemp - sameTempRange && extruderTemp <= targetTemp + sameTempRange; + bool tempWithinRange = extruderTemp >= targetTemp - sameTempRangeHotEnd + && extruderTemp <= targetTemp + sameTempRangeHotEnd; if (tempWithinRange && !timeHaveBeenAtTemp.IsRunning) { timeHaveBeenAtTemp.Start(); @@ -169,11 +171,12 @@ namespace MatterHackers.MatterControl.PrinterCommunication.Io bool tempWithinRange; if (waitWhenCooling) { - tempWithinRange = bedTemp >= targetTemp - sameTempRange && bedTemp <= targetTemp + sameTempRange; + tempWithinRange = bedTemp >= targetTemp - sameTempRangeBed + && bedTemp <= targetTemp + sameTempRangeBed; } else { - tempWithinRange = bedTemp >= targetTemp - sameTempRange; + tempWithinRange = bedTemp >= targetTemp - sameTempRangeBed; } // Added R code for M190 diff --git a/Submodules/MatterSlice b/Submodules/MatterSlice index 42eb065bc..eb6c719f0 160000 --- a/Submodules/MatterSlice +++ b/Submodules/MatterSlice @@ -1 +1 @@ -Subproject commit 42eb065bc970917d46d754f3bee4cabb751a689e +Subproject commit eb6c719f0f2ae129c6403eed1b142500dfd021ec diff --git a/Submodules/agg-sharp b/Submodules/agg-sharp index afd773d0a..11c03860e 160000 --- a/Submodules/agg-sharp +++ b/Submodules/agg-sharp @@ -1 +1 @@ -Subproject commit afd773d0a7f2c12d9d71f9c0956e49a7a2dfeb83 +Subproject commit 11c03860efab1f72866d0dfe0c515ce41e677fce