Skip to content

High baud fix #35

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
RoelVB wants to merge 2 commits into from
Closed

High baud fix #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bf6c8fc
Added preprocessor option to remove SoftwareSerial
RoelVB Dec 10, 2017
adba575
Fix 115200 baud
RoelVB Dec 15, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Adafruit_Fingerprint.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
****************************************************/

#include "Adafruit_Fingerprint.h"
#if defined(__AVR__) || defined(ESP8266)
#if (defined(__AVR__) || defined(ESP8266)) && !defined(_DISABLE_SOFTSERIAL_)
#include <SoftwareSerial.h>
#endif

Expand Down Expand Up @@ -50,7 +50,7 @@
@param password 32-bit integer password (default is 0)
*/
/**************************************************************************/
#if defined(__AVR__) || defined(ESP8266)
#if (defined(__AVR__) || defined(ESP8266)) && !defined(_DISABLE_SOFTSERIAL_)
Adafruit_Fingerprint::Adafruit_Fingerprint(SoftwareSerial *ss, uint32_t password) {
thePassword = password;
theAddress = 0xFFFFFFFF;
Expand All @@ -73,7 +73,7 @@ Adafruit_Fingerprint::Adafruit_Fingerprint(HardwareSerial *ss, uint32_t password
thePassword = password;
theAddress = 0xFFFFFFFF;

#if defined(__AVR__) || defined(ESP8266)
#if (defined(__AVR__) || defined(ESP8266)) && !defined(_DISABLE_SOFTSERIAL_)
swSerial = NULL;
#endif
hwSerial = ss;
Expand All @@ -86,11 +86,11 @@ Adafruit_Fingerprint::Adafruit_Fingerprint(HardwareSerial *ss, uint32_t password
@param baudrate Sensor's UART baud rate (usually 57600, 9600 or 115200)
*/
/**************************************************************************/
void Adafruit_Fingerprint::begin(uint16_t baudrate) {
void Adafruit_Fingerprint::begin(uint32_t baudrate) {
delay(1000); // one second delay to let the sensor 'boot up'

if (hwSerial) hwSerial->begin(baudrate);
#if defined(__AVR__) || defined(ESP8266)
#if (defined(__AVR__) || defined(ESP8266)) && !defined(_DISABLE_SOFTSERIAL_)
if (swSerial) swSerial->begin(baudrate);
#endif
}
Expand Down
8 changes: 4 additions & 4 deletions Adafruit_Fingerprint.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
****************************************************/

#include "Arduino.h"
#if defined(__AVR__) || defined(ESP8266)
#if (defined(__AVR__) || defined(ESP8266)) && !defined(_DISABLE_SOFTSERIAL_) // You could append "-D_DISABLE_SOFTSERIAL_" to the build command to disable SoftwareSerial for a project
#include <SoftwareSerial.h>
#endif

Expand Down Expand Up @@ -93,12 +93,12 @@ struct Adafruit_Fingerprint_Packet {

class Adafruit_Fingerprint {
public:
#if defined(__AVR__) || defined(ESP8266)
#if (defined(__AVR__) || defined(ESP8266)) && !defined(_DISABLE_SOFTSERIAL_)
Adafruit_Fingerprint(SoftwareSerial *, uint32_t password = 0x0);
#endif
Adafruit_Fingerprint(HardwareSerial *, uint32_t password = 0x0);

void begin(uint16_t baud);
void begin(uint32_t baud);

boolean verifyPassword(void);
uint8_t getImage(void);
Expand Down Expand Up @@ -130,7 +130,7 @@ class Adafruit_Fingerprint {
uint8_t recvPacket[20];

Stream *mySerial;
#if defined(__AVR__) || defined(ESP8266)
#if (defined(__AVR__) || defined(ESP8266)) && !defined(_DISABLE_SOFTSERIAL_)
SoftwareSerial *swSerial;
#endif
HardwareSerial *hwSerial;
Expand Down