From e56a9779fe8c9ce56f0e63a2de8977e249024b2d Mon Sep 17 00:00:00 2001
From: David Crocker <dcrocker@eschertech.com>
Date: Mon, 3 Oct 2022 13:38:01 +0100
Subject: Removed useless M570 S parameter

---
 src/GCodes/GCodes.cpp  |  2 --
 src/GCodes/GCodes.h    |  3 ---
 src/GCodes/GCodes2.cpp | 19 ++-----------------
 src/Version.h          |  2 +-
 4 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/src/GCodes/GCodes.cpp b/src/GCodes/GCodes.cpp
index 12ba77aa..fc3541db 100644
--- a/src/GCodes/GCodes.cpp
+++ b/src/GCodes/GCodes.cpp
@@ -187,8 +187,6 @@ void GCodes::Init() noexcept
 	laserMaxPower = DefaultMaxLaserPower;
 	laserPowerSticky = false;
 
-	heaterFaultTimeout = DefaultHeaterFaultTimeout;
-
 #if SUPPORT_SCANNER
 	reprap.GetScanner().SetGCodeBuffer(usbGCode);
 #endif
diff --git a/src/GCodes/GCodes.h b/src/GCodes/GCodes.h
index 9e482fcf..84969541 100644
--- a/src/GCodes/GCodes.h
+++ b/src/GCodes/GCodes.h
@@ -688,9 +688,6 @@ private:
 	float laserMaxPower;
 	bool laserPowerSticky;						// true if G1 S parameters are remembered across G1 commands
 
-	// Heater fault handler
-	uint32_t heaterFaultTimeout;				// how long we wait for the user to fix it before turning everything off
-
 	// Object cancellation
 	ObjectTracker buildObjects;
 
diff --git a/src/GCodes/GCodes2.cpp b/src/GCodes/GCodes2.cpp
index ddff52d8..68ea6823 100644
--- a/src/GCodes/GCodes2.cpp
+++ b/src/GCodes/GCodes2.cpp
@@ -3474,23 +3474,8 @@ bool GCodes::HandleMcode(GCodeBuffer& gb, const StringRef& reply) THROWS(GCodeEx
 				break;
 
 			case 570: // Set/report heater monitoring
-				{
-					bool seen = false;
-					if (gb.Seen('S'))
-					{
-						seen = true;
-						heaterFaultTimeout = gb.GetUIValue() * (60 * 1000);
-					}
-					if (gb.Seen('H'))
-					{
-						seen = true;
-						result = reprap.GetHeat().ConfigureHeaterMonitoring(gb.GetUIValue(), gb, reply);
-					}
-					if (!seen)
-					{
-						reply.printf("Print will be terminated if a heater fault is not reset within %" PRIu32 " minutes", heaterFaultTimeout/(60 * 1000));
-					}
-				}
+				gb.MustSee('H');
+				result = reprap.GetHeat().ConfigureHeaterMonitoring(gb.GetUIValue(), gb, reply);
 				break;
 
 			case 571: // Set output on extrude
diff --git a/src/Version.h b/src/Version.h
index d09f5e77..0aec94ab 100644
--- a/src/Version.h
+++ b/src/Version.h
@@ -10,7 +10,7 @@
 
 #ifndef VERSION
 // Note: the complete VERSION string must be in standard version number format and must not contain spaces! This is so that DWC can parse it.
-# define MAIN_VERSION	"3.4.2+"
+# define MAIN_VERSION	"3.4.3rc1"
 # ifdef USE_CAN0
 #  define VERSION_SUFFIX	"(CAN0)"
 # else
-- 
cgit v1.2.3