Bug fix: when enabling a filament monitor, don't reset it

Duet3D · Dec 16, 2021 · 41b857d · 41b857d
1 parent e6f37f6
commit 41b857d
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/src/FilamentMonitors/LaserFilamentMonitor.cpp b/src/FilamentMonitors/LaserFilamentMonitor.cpp
@@ -68,6 +68,11 @@ GCodeResult LaserFilamentMonitor::Configure(const CanMessageGenericParser& parse
 	const GCodeResult rslt = CommonConfigure(parser, reply, InterruptMode::change, seen);
 	if (rslt <= GCodeResult::warning)
 	{
+		if (seen)
+		{
+			Init();				// Init() resets dataReceived and version, so only do it if the port has been configured
+		}
+
 		if (parser.GetFloatParam('L', calibrationFactor))
 		{
 			seen = true;
@@ -105,11 +110,7 @@ GCodeResult LaserFilamentMonitor::Configure(const CanMessageGenericParser& parse
 			checkNonPrintingMoves = (temp > 0);
 		}
 
-		if (seen)
-		{
-			Init();
-		}
-		else
+		if (!seen)
 		{
 			reply.printf("Duet3D laser filament monitor v%u%s on pin ", version, (switchOpenMask != 0) ? " with switch" : "");
 			GetPort().AppendPinName(reply);

diff --git a/src/FilamentMonitors/RotatingMagnetFilamentMonitor.cpp b/src/FilamentMonitors/RotatingMagnetFilamentMonitor.cpp
@@ -68,8 +68,14 @@ GCodeResult RotatingMagnetFilamentMonitor::Configure(const CanMessageGenericPars
 {
 	bool seen = false;
 	const GCodeResult rslt = CommonConfigure(parser, reply, InterruptMode::change, seen);
+
 	if (rslt <= GCodeResult::warning)
 	{
+		if (seen)
+		{
+			Init();				// Init() resets dataReceived and version, so only do it if the port has been configured
+		}
+
 		if (parser.GetFloatParam('L', mmPerRev))
 		{
 			seen = true;
@@ -107,11 +113,7 @@ GCodeResult RotatingMagnetFilamentMonitor::Configure(const CanMessageGenericPars
 			checkNonPrintingMoves = (temp > 0);
 		}
 
-		if (seen)
-		{
-			Init();
-		}
-		else
+		if (!seen)
 		{
 			reply.printf("Duet3D rotating magnet filament monitor v%u%s on pin ", version, (switchOpenMask != 0) ? " with switch" : "");
 			GetPort().AppendPinName(reply);