Merge pull request #2 from IncursioHack/main

Implementation of RFID in the new Bruce.

platformio.ini

@@ -91,6 +91,9 @@ build_flags =
 	-DSDCARD_MISO=36
 	-DSDCARD_MOSI=26
 
+	-DGROOVE_SDA=32
+	-DGROOVE_SCL=33
+
 lib_deps = 
 	${common.lib_deps}
 
@@ -146,6 +149,9 @@ build_flags =
 	-DSDCARD_SCK=0
 	-DSDCARD_MISO=36
 	-DSDCARD_MOSI=26
+
+	-DGROOVE_SDA=32
+	-DGROOVE_SCL=33
 
 lib_deps = 
 	https://github.com/tanakamasayuki/I2C_AXP192
@@ -205,6 +211,8 @@ build_flags =
 	-DSDCARD_MISO=39
 	-DSDCARD_MOSI=14
 
+	-DGROOVE_SDA=2
+	-DGROOVE_SCL=1
 lib_deps = 
 	${common.lib_deps}
 
@@ -246,6 +254,9 @@ build_flags =
 	-DSDCARD_MISO=36
 	-DSDCARD_MOSI=26
 
+	-DGROOVE_SDA=32
+	-DGROOVE_SCL=33
+
 lib_deps = 
 	${common.lib_deps}
 
@@ -309,6 +320,9 @@ build_flags =
 	-DSDCARD_MISO=39
 	-DSDCARD_MOSI=14
 
+	-DGROOVE_SDA=32
+	-DGROOVE_SCL=33
+
 lib_deps = 
 	${common.lib_deps}
 

src/main.cpp

@@ -38,6 +38,9 @@ TFT_eSprite draw = TFT_eSprite(&tft);
 #include "settings.h"
 #include "dpwo.h"
 #include "wg.h"
+#include "rfid.h"
+#include "Wire.h"
+#include "mfrc522_i2c.h"
 
 #ifdef CARDPUTER
 #include "bad_usb.h"
@@ -187,7 +190,7 @@ void loop() {
           break;
         case 2: // RF
           options = {
-            {"Scan/copy", [=]()   { displayRedStripe("Scan/copy"); }},
+            {"Scan/copy", [=]()   { displayRedStripe("Scan/Copy"); }},
             {"Replay", [=]()      { displayRedStripe("Replay"); }},
             {"Spectrum", [=]()    { displayRedStripe("Spectrum"); }},
             {"Main Menu", [=]()   { backToMenu(); }},
@@ -198,13 +201,13 @@ void loop() {
           break;
         case 3: // RFID
           options = {
-            {"Scan/copy", [=]()   { displayRedStripe("Scan/copy"); }},
+            {"Scan/copy", [=]()   { rfid_setup(); }},
             {"Replay", [=]()      { displayRedStripe("Replay"); }},
             {"Main Menu", [=]()   { backToMenu(); }},
           };
           delay(200);
           loopOptions(options,false,true,"RFID");
-          delay(1000); // remover depois, está aqui só por causa do "displayRedStripe"
+          //delay(1000); // remover depois, está aqui só por causa do "displayRedStripe"
           break;
         case 4: //Other
           options = {