Skip to content

Commit

Permalink
HOTFIX: Fixed bug in the enroll process, where any error in the Enrol…
Browse files Browse the repository at this point in the history 
…lX() method would be ignored in Arduino code.
  • Loading branch information
@Fasgort
Fasgort committed Feb 22, 2019
1 parent 032ed6d commit 53f4326
Show file tree
Hide file tree
Showing 2 changed files with 91 additions and 85 deletions.
164 changes: 85 additions & 79 deletions examples/FPS_Enroll/FPS_Enroll.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
Licensed for non-commercial use, must include this license message
basically, Feel free to hack away at it, but just give me credit for my work =)
TLDR; Wil Wheaton's Law
Description: This code enrolls a fingerprint by creating a ID template. It requires
three samples of your fingerprint.
This code should work with the any model of ADH-Tech's FPS as long as
you are within the minimum logic level threshold for the FPS serial UART.
This code has been tested with these models:
Expand All @@ -16,38 +16,38 @@
GT-521F32 [ https://www.sparkfun.com/products/14518 ]
GT-511C3 [ https://www.sparkfun.com/products/11792 ]
GT-511C1R [ https://www.sparkfun.com/products/13007 ]
-------------------- HARDWARE HOOKUP with 5V Arduino --------------------
1.) Dedicated Bi-Directional Logic Level Converter (LLC)
-------------------- HARDWARE HOOKUP with 5V Arduino --------------------
1.) Dedicated Bi-Directional Logic Level Converter (LLC)
It is recommended to use a dedicated bi-direcitonal LLC
[ https://www.sparkfun.com/products/12009 ] for a reliable connection if you
are using a 5V Arduino microcontroller:
It is recommended to use a dedicated bi-direcitonal LLC
[ https://www.sparkfun.com/products/12009 ] for a reliable connection if you
are using a 5V Arduino microcontroller:
Fingerprint Scanner (Pin #) <-> Logic Level Converter <-> 5V Arduino w/ Atmega328P
UART_TX (3.3V TTL)(Pin 1) <-> LV1 <-> HV1 <-> RX (pin 4)
UART_RX (3.3V TTL)(Pin 2) <-> LV4 <-> HV4 <-> TX (pin 5)
GND (Pin 3) <-> GND <-> GND <-> GND
Vin (3.3V~6V) (Pin 4) <-> HV <-> 5V
LV <-> 3.3V
2.) Voltage Division w/ 3x 10kOhm Resistors
Otherwise, you could use 3x 10kOhm resistors [ https://www.sparkfun.com/products/11508 ]
to divide the voltage from a 5V Arduino down to 3.3V FPS similar to the
"Uni-Directional" application circuit on our old logic level converter
[ https://cdn.sparkfun.com/assets/b/0/e/1/0/522637c6757b7f2b228b4568.png ]:
2.) Voltage Division w/ 3x 10kOhm Resistors
Otherwise, you could use 3x 10kOhm resistors [ https://www.sparkfun.com/products/11508 ]
to divide the voltage from a 5V Arduino down to 3.3V FPS similar to the
"Uni-Directional" application circuit on our old logic level converter
[ https://cdn.sparkfun.com/assets/b/0/e/1/0/522637c6757b7f2b228b4568.png ]:
Voltage Divider <-> Fingerprint Scanner(Pin #) <-> Voltage Divider <-> 5V Arduino w/ Atmega328P
<-> UART_TX (3.3V TTL) (Pin 1) <-> <-> RX (pin 4)
GND <-> 10kOhm <-> 10kOhm <-> UART_RX (3.3V TTL) (Pin 2) <-> 10kOhm <-> TX (pin 5)
GND <-> GND (Pin 3) <-> GND <-> GND
<-> Vin (3.3V~6V) (Pin 4) <-> <-> 5V
Note: You can add the two 10kOhm resistors in series for 20kOhms. =)
--------------------------------------------------------------------------------
Note: You can add the two 10kOhm resistors in series for 20kOhms. =)
--------------------------------------------------------------------------------
*****************************************************************/

Expand All @@ -60,83 +60,89 @@ Note: You can add the two 10kOhm resistors in series for 20kOhms. =)
FPS_GT511C3 fps(4, 5); // (Arduino SS_RX = pin 4, Arduino SS_TX = pin 5)

/*If using another Arduino microcontroller, try commenting out line 60 and
uncommenting line 69 due to the limitations listed in the
library's note => https://www.arduino.cc/en/Reference/softwareSerial . Do
not forget to rewire the connection to the Arduino*/
uncommenting line 69 due to the limitations listed in the
library's note => https://www.arduino.cc/en/Reference/softwareSerial . Do
not forget to rewire the connection to the Arduino*/

// FPS (TX) is connected to pin 10 (Arduino's Software RX)
// FPS (RX) is connected through a converter to pin 11 (Arduino's Software TX)
//FPS_GT511C3 fps(10, 11); // (Arduino SS_RX = pin 10, Arduino SS_TX = pin 11)

void setup()
{
Serial.begin(9600); //set up Arduino's hardware serial UART
delay(100);
fps.Open(); //send serial command to initialize fps
fps.SetLED(true); //turn on LED so fps can see fingerprint
Serial.begin(9600); //set up Arduino's hardware serial UART
delay(100);
fps.Open(); //send serial command to initialize fps
fps.SetLED(true); //turn on LED so fps can see fingerprint

Enroll(); //begin enrolling fingerprint
Enroll(); //begin enrolling fingerprint
}

void Enroll()
{
// Enroll test

// find open enroll id
int enrollid = 0;
bool usedid = true;
while (usedid == true)
{
usedid = fps.CheckEnrolled(enrollid);
if (usedid==true) enrollid++;
}
fps.EnrollStart(enrollid);

// enroll
Serial.print("Press finger to Enroll #");
Serial.println(enrollid);
while(fps.IsPressFinger() == false) delay(100);
bool bret = fps.CaptureFinger(true);
int iret = 0;
if (bret != false)
{
Serial.println("Remove finger");
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)
{
Serial.println("Remove finger");
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)
{
Serial.println("Remove finger");
iret = fps.Enroll3();
if (iret == 0)
{
Serial.println("Enrolling Successful");
}
else
{
Serial.print("Enrolling Failed with error code:");
Serial.println(iret);
}
}
else Serial.println("Failed to capture third finger");
}
else Serial.println("Failed to capture second finger");
}
else Serial.println("Failed to capture first finger");
// Enroll test

// find open enroll id
int enrollid = 0;
bool usedid = true;
while (usedid == true)
{
usedid = fps.CheckEnrolled(enrollid);
if (usedid == true) enrollid++;
}
fps.EnrollStart(enrollid);

// enroll
Serial.print("Press finger to Enroll #");
Serial.println(enrollid);
while (fps.IsPressFinger() == false) delay(100);
bool bret = fps.CaptureFinger(true);
int iret = 0;
if (bret != false)
{
Serial.println("Remove finger");
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 && !iret)
{
Serial.println("Remove finger");
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 && !iret)
{
Serial.println("Remove finger");
iret = fps.Enroll3();
if (iret == 0)
{
Serial.println("Enrolling Successful");
}
else
{
Serial.print("Enrolling Failed with error code:");
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");
}


void loop()
{
delay(100000);
delay(100000);
}
12 changes: 6 additions & 6 deletions src/FPS_GT511C3.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 53f4326

Please sign in to comment.