Merge git://github.com/fourstix/Fingerprint_Scanner-TTL into fourstix-master

Toni Klopfenstein · Toni Klopfenstein · commit b9886ecdca03 · 2015-06-19T15:31:01.000-06:00
diff --git a/FPS_GT511C3/FPS_GT511C3.cpp b/FPS_GT511C3/FPS_GT511C3.cpp
@@ -121,8 +121,10 @@ Response_Packet::ErrorCodes::Errors_Enum Response_Packet::ErrorCodes::ParseFromB
 	if (high == 0x00)
 	{
 	}
-	if (high == 0x01)
-	{
+	// grw 01/03/15 - replaced if clause with else clause for any non-zero high byte
+	// if (high == 0x01)
+	// {
+	else {
 		switch(low)
 		{
 			case 0x00: e = NO_ERROR; break;
@@ -555,6 +557,7 @@ int FPS_GT511C3::Verify1_1(int id)
 	int retval = 0;
 	if (rp->ACK == false)
 	{
+		retval = 3; // grw 01/03/15 - set default value of not verified before assignment
 		if (rp->Error == Response_Packet::ErrorCodes::NACK_INVALID_POS) retval = 1;
 		if (rp->Error == Response_Packet::ErrorCodes::NACK_IS_NOT_USED) retval = 2;
 		if (rp->Error == Response_Packet::ErrorCodes::NACK_VERIFY_FAILED) retval = 3;

Original file line number	Diff line number	Diff line change
`@@ -121,8 +121,10 @@ Response_Packet::ErrorCodes::Errors_Enum Response_Packet::ErrorCodes::ParseFromB`
`121`	`121`	`if (high == 0x00)`
`122`	`122`	`{`
`123`	`123`	`}`
`124`		`- if (high == 0x01)`
`125`		`- {`
	`124`	`+ // grw 01/03/15 - replaced if clause with else clause for any non-zero high byte`
	`125`	`+ // if (high == 0x01)`
	`126`	`+ // {`
	`127`	`+ else {`
`126`	`128`	`switch(low)`
`127`	`129`	`{`
`128`	`130`	`case 0x00: e = NO_ERROR; break;`
`@@ -555,6 +557,7 @@ int FPS_GT511C3::Verify1_1(int id)`
`555`	`557`	`int retval = 0;`
`556`	`558`	`if (rp->ACK == false)`
`557`	`559`	`{`
	`560`	`+ retval = 3; // grw 01/03/15 - set default value of not verified before assignment`
`558`	`561`	`if (rp->Error == Response_Packet::ErrorCodes::NACK_INVALID_POS) retval = 1;`
`559`	`562`	`if (rp->Error == Response_Packet::ErrorCodes::NACK_IS_NOT_USED) retval = 2;`
`560`	`563`	`if (rp->Error == Response_Packet::ErrorCodes::NACK_VERIFY_FAILED) retval = 3;`