HOTFIX: Fixed bug in the enroll process, where any error in the Enrol…

…lX() method would be ignored in Arduino code.
sparkfun · Mar 18, 2019 · d9ac1bb · d9ac1bb
1 parent 032ed6d
commit d9ac1bb
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 10 deletions.
diff --git a/examples/FPS_Enroll/FPS_Enroll.ino b/examples/FPS_Enroll/FPS_Enroll.ino
@@ -101,20 +101,20 @@ void Enroll()
 	if (bret != false)
 	{
 		Serial.println("Remove finger");
-		fps.Enroll1(); 
+		iret = fps.Enroll1(); 
 		while(fps.IsPressFinger() == true) delay(100);
 		Serial.println("Press same finger again");
 		while(fps.IsPressFinger() == false) delay(100);
 		bret = fps.CaptureFinger(true);
-		if (bret != false)
+		if (bret != false && !iret)
 		{
 			Serial.println("Remove finger");
-			fps.Enroll2();
+			iret = fps.Enroll2();
 			while(fps.IsPressFinger() == true) delay(100);
 			Serial.println("Press same finger yet again");
 			while(fps.IsPressFinger() == false) delay(100);
 			bret = fps.CaptureFinger(true);
-			if (bret != false)
+			if (bret != false && !iret)
 			{
 				Serial.println("Remove finger");
 				iret = fps.Enroll3();
@@ -128,8 +128,18 @@ void Enroll()
 					Serial.println(iret);
 				}
 			}
+			else if (iret)
+			{
+				Serial.print("Enrolling Failed with error code:");
+				Serial.println(iret);
+			}
 			else Serial.println("Failed to capture third finger");
 		}
+		else if (iret)
+		{
+			Serial.print("Enrolling Failed with error code:");
+			Serial.println(iret);
+		}
 		else Serial.println("Failed to capture second finger");
 	}
 	else Serial.println("Failed to capture first finger");

diff --git a/src/FPS_GT511C3.cpp b/src/FPS_GT511C3.cpp
@@ -602,9 +602,9 @@ uint8_t FPS_GT511C3::Enroll1()
 	{
 		if (rp->Error == Response_Packet::ErrorCodes::NACK_ENROLL_FAILED) retval = 1;
 		if (rp->Error == Response_Packet::ErrorCodes::NACK_BAD_FINGER) retval = 2;
-	}
+	} else retval = 0;
 	delete rp;
-	if (rp->ACK) return 0; else return retval;
+	return retval;
 }
 
 // Gets the Second scan of an enrollment
@@ -633,9 +633,9 @@ uint8_t FPS_GT511C3::Enroll2()
 	{
 		if (rp->Error == Response_Packet::ErrorCodes::NACK_ENROLL_FAILED) retval = 1;
 		if (rp->Error == Response_Packet::ErrorCodes::NACK_BAD_FINGER) retval = 2;
-	}
+	} else retval = 0;
 	delete rp;
-	if (rp->ACK) return 0; else return retval;
+	return retval;
 }
 
 // Gets the Third scan of an enrollment
@@ -665,9 +665,9 @@ uint8_t FPS_GT511C3::Enroll3()
 	{
 		if (rp->Error == Response_Packet::ErrorCodes::NACK_ENROLL_FAILED) retval = 1;
 		if (rp->Error == Response_Packet::ErrorCodes::NACK_BAD_FINGER) retval = 2;
-	}
+	} else retval = 0;
 	delete rp;
-	if (rp->ACK) return 0; else return retval;
+	return retval;
 }
 
 // Checks to see if a finger is pressed on the FPS