From 08f6b09414a0c748a7a932f16ddaa84b505b4582 Mon Sep 17 00:00:00 2001 From: Theo Arends <11044339+arendst@users.noreply.github.com> Date: Thu, 12 Nov 2020 13:47:50 +0100 Subject: [PATCH] Add ESP32 fingerprint support --- .../Adafruit_Fingerprint.cpp | 8 ++++---- .../Adafruit_Fingerprint.h | 6 +++--- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/lib_div/Adafruit-Fingerprint-Sensor-Library-2.0.4-Tasmota/Adafruit_Fingerprint.cpp b/lib/lib_div/Adafruit-Fingerprint-Sensor-Library-2.0.4-Tasmota/Adafruit_Fingerprint.cpp index 3585cf90a..102277087 100644 --- a/lib/lib_div/Adafruit-Fingerprint-Sensor-Library-2.0.4-Tasmota/Adafruit_Fingerprint.cpp +++ b/lib/lib_div/Adafruit-Fingerprint-Sensor-Library-2.0.4-Tasmota/Adafruit_Fingerprint.cpp @@ -54,7 +54,7 @@ PUBLIC FUNCTIONS ***************************************************************************/ -#if defined(__AVR__) || defined(ESP8266) || defined(FREEDOM_E300_HIFIVE1) +#if defined(__AVR__) || defined(ESP8266) || defined(ESP32) || defined(FREEDOM_E300_HIFIVE1) /**************************************************************************/ /*! @brief Instantiates sensor with Software Serial @@ -87,7 +87,7 @@ Adafruit_Fingerprint::Adafruit_Fingerprint(HardwareSerial *hs, thePassword = password; theAddress = 0xFFFFFFFF; -#if defined(__AVR__) || defined(ESP8266) || defined(FREEDOM_E300_HIFIVE1) +#if defined(__AVR__) || defined(ESP8266) || defined(ESP32) || defined(FREEDOM_E300_HIFIVE1) swSerial = NULL; #endif hwSerial = hs; @@ -109,7 +109,7 @@ Adafruit_Fingerprint::Adafruit_Fingerprint(Stream *serial, uint32_t password) { theAddress = 0xFFFFFFFF; hwSerial = NULL; -#if defined(__AVR__) || defined(ESP8266) || defined(FREEDOM_E300_HIFIVE1) +#if defined(__AVR__) || defined(ESP8266) || defined(ESP32) || defined(FREEDOM_E300_HIFIVE1) swSerial = NULL; #endif mySerial = serial; @@ -126,7 +126,7 @@ void Adafruit_Fingerprint::begin(uint32_t baudrate) { if (hwSerial) hwSerial->begin(baudrate); -#if defined(__AVR__) || defined(ESP8266) || defined(FREEDOM_E300_HIFIVE1) +#if defined(__AVR__) || defined(ESP8266) || defined(ESP32) || defined(FREEDOM_E300_HIFIVE1) if (swSerial) swSerial->begin(baudrate); #endif diff --git a/lib/lib_div/Adafruit-Fingerprint-Sensor-Library-2.0.4-Tasmota/Adafruit_Fingerprint.h b/lib/lib_div/Adafruit-Fingerprint-Sensor-Library-2.0.4-Tasmota/Adafruit_Fingerprint.h index 1139209fd..604386f63 100644 --- a/lib/lib_div/Adafruit-Fingerprint-Sensor-Library-2.0.4-Tasmota/Adafruit_Fingerprint.h +++ b/lib/lib_div/Adafruit-Fingerprint-Sensor-Library-2.0.4-Tasmota/Adafruit_Fingerprint.h @@ -6,7 +6,7 @@ */ #include "Arduino.h" -#if defined(__AVR__) || defined(ESP8266) +#if defined(__AVR__) || defined(ESP8266) || defined(ESP32) //#include #include #elif defined(FREEDOM_E300_HIFIVE1) @@ -129,7 +129,7 @@ struct Adafruit_Fingerprint_Packet { ///! Helper class to communicate with and keep state for fingerprint sensors class Adafruit_Fingerprint { public: -#if defined(__AVR__) || defined(ESP8266) || defined(FREEDOM_E300_HIFIVE1) +#if defined(__AVR__) || defined(ESP8266) || defined(ESP32) || defined(FREEDOM_E300_HIFIVE1) // Adafruit_Fingerprint(SoftwareSerial *ss, uint32_t password = 0x0); Adafruit_Fingerprint(TasmotaSerial *ss, uint32_t password = 0x0); #endif @@ -186,7 +186,7 @@ private: uint8_t recvPacket[20]; Stream *mySerial; -#if defined(__AVR__) || defined(ESP8266) || defined(FREEDOM_E300_HIFIVE1) +#if defined(__AVR__) || defined(ESP8266) || defined(ESP32) || defined(FREEDOM_E300_HIFIVE1) // SoftwareSerial *swSerial; TasmotaSerial *swSerial; #endif