From acd87d8e1829d4e99fc8ebd2c62c28019caaa55f Mon Sep 17 00:00:00 2001
From: Torsten Stauder <stauder@ts-cs.de>
Date: Tue, 30 Mar 2021 23:42:47 +0200
Subject: [PATCH] Fixing compiling-issues with ESP32-A1S

---
 platformio.ini | 12 +++++-------
 src/main.cpp   |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/platformio.ini b/platformio.ini
index a6e3d81..50fb53c 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -23,6 +23,8 @@ lib_deps_external =
 	https://github.com/bblanchon/ArduinoJson.git
 	https://github.com/pschatzmann/ESP32-A2DP.git
 	https://github.com/Arduino-IRremote/Arduino-IRremote.git
+	https://github.com/kkloesener/MFRC522_I2C.git
+	https://github.com/miguelbalboa/rfid.git
 
 [env:common]
 platform = espressif32
@@ -41,12 +43,14 @@ build_flags = -DHAL=2
 			  -DBOARD_HAS_PSRAM
               -mfix-esp32-psram-cache-issue
 lib_deps =
-	https://github.com/kkloesener/MFRC522_I2C_Library.git
+	;https://github.com/kkloesener/MFRC522_I2C_Library.git
 	https://github.com/kkloesener/AC101.git
 	${common.lib_deps_builtin}
 	${common.lib_deps_external}
 platform_packages =
     platformio/framework-arduinoespressif32 @ https://github.com/espressif/arduino-esp32.git#1.0.5
+board_upload.maximum_size = 16777216
+board_upload.flash_size = 16MB
 
 [env:lolin32]
 ;https://docs.platformio.org/en/latest/boards/espressif32/lolin32.html
@@ -59,7 +63,6 @@ build_flags = -DHAL=1
 lib_deps =
 	${common.lib_deps_builtin}
 	${common.lib_deps_external}
-	https://github.com/miguelbalboa/rfid.git
 	https://github.com/tueddy/PN5180-Library.git#0c200f5
 extra_scripts = ${env:common.extra_scripts}
 upload_port = /dev/cu.SLAB_USBtoUART
@@ -78,7 +81,6 @@ build_flags = -DHAL=3
 lib_deps =
 	${common.lib_deps_builtin}
 	${common.lib_deps_external}
-	https://github.com/miguelbalboa/rfid.git
 	https://github.com/tueddy/PN5180-Library.git#0c200f5
 extra_scripts = ${env:common.extra_scripts}
 upload_port = /dev/cu.wchusbserial1410
@@ -96,7 +98,6 @@ board_build.partitions = huge_app.csv
 lib_deps =
 	${common.lib_deps_builtin}
 	${common.lib_deps_external}
-	https://github.com/miguelbalboa/rfid.git
 	https://github.com/tueddy/PN5180-Library.git#0c200f5
 extra_scripts = ${env:common.extra_scripts}
 upload_port = /dev/cu.wchusbserial1410
@@ -119,7 +120,6 @@ board_build.partitions = huge_app.csv
 lib_deps =
 	${common.lib_deps_builtin}
 	${common.lib_deps_external}
-	https://github.com/miguelbalboa/rfid.git
 	https://github.com/tueddy/PN5180-Library.git#0c200f5
 extra_scripts = ${env:common.extra_scripts}
 upload_port = /dev/cu.SLAB_USBtoUART
@@ -137,7 +137,6 @@ board_build.partitions = huge_app.csv
 lib_deps =
 	${common.lib_deps_builtin}
 	${common.lib_deps_external}
-	https://github.com/miguelbalboa/rfid.git
 	https://github.com/tueddy/PN5180-Library.git#0c200f5
 extra_scripts = ${env:common.extra_scripts}
 upload_port = /dev/cu.SLAB_USBtoUART
@@ -155,7 +154,6 @@ board_build.partitions = huge_app.csv
 lib_deps =
 	${common.lib_deps_builtin}
 	${common.lib_deps_external}
-	https://github.com/miguelbalboa/rfid.git
 	https://github.com/tueddy/PN5180-Library.git#0c200f5
 extra_scripts = ${env:common.extra_scripts}
 upload_port = /dev/cu.SLAB_USBtoUART
diff --git a/src/main.cpp b/src/main.cpp
index 6bc17c9..d9032b8 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -267,7 +267,7 @@ TaskHandle_t fileStorageTaskHandle;
     static TwoWire i2cBusTwo = TwoWire(1);
 #endif
 #ifdef RFID_READER_TYPE_MFRC522_I2C
-    static MFRC522 mfrc522(MFRC522_ADDR, MFRC522_RST_PIN, &i2cBusTwo);
+    static MFRC522_I2C mfrc522(MFRC522_ADDR, MFRC522_RST_PIN, &i2cBusTwo);
 #endif
 
 #ifdef PORT_EXPANDER_ENABLE