Default PCF speed is now saved in a restore point

1 files changed, 4 insertions, 5 deletions

diff --git a/src/GCodes/GCodes4.cpp b/src/GCodes/GCodes4.cpp
index 96c0c019..244a3a7d 100644
--- a/src/GCodes/GCodes4.cpp
+++ b/src/GCodes/GCodes4.cpp
@@ -310,8 +310,9 @@ void GCodes::RunStateMachine(GCodeBuffer& gb, const StringRef& reply) noexcept
 	case GCodeState::toolChange0: 						// run tfree for the old tool (if any)
 	case GCodeState::m109ToolChange0:					// run tfree for the old tool (if any)
 		doingToolChange = true;
-		SaveFanSpeeds();
 		SavePosition(toolChangeRestorePoint, gb);
+		toolChangeRestorePoint.toolNumber = reprap.GetCurrentToolNumber();
+		toolChangeRestorePoint.fanSpeed = lastDefaultFanSpeed;
 		reprap.SetPreviousToolNumber();
 		gb.AdvanceState();
 
@@ -529,10 +530,8 @@ void GCodes::RunStateMachine(GCodeBuffer& gb, const StringRef& reply) noexcept
 	case GCodeState::resuming3:
 		if (LockMovementAndWaitForStandstill(gb))
 		{
-			for (size_t i = 0; i < MaxFans; ++i)
-			{
-				reprap.GetFansManager().SetFanValue(i, pausedFanSpeeds[i]);
-			}
+			// We no longer restore the paused fan speeds automatically on resuming, because that messes up the print cooling fan speed if a tool change has been done
+			// They can be restored manually in resume.g if required
 			virtualExtruderPosition = pauseRestorePoint.virtualExtruderPosition;	// reset the extruder position in case we are receiving absolute extruder moves
 			moveBuffer.virtualExtruderPosition = pauseRestorePoint.virtualExtruderPosition;
 			fileGCode->LatestMachineState().feedRate = pauseRestorePoint.feedRate;