From 4e8e916e5e205e4e7f76fc42e251711f44229c2e Mon Sep 17 00:00:00 2001
From: Guska <gildas.gonzalez@epitech.eu>
Date: Fri, 19 Jan 2024 11:35:21 +0100
Subject: [PATCH 1/3] NFC: Correcting bug & adding in config

---
 config.ini                                 |  1 +
 lib/NFC/src/NfcReader.cpp                  | 11 +----------
 lib/NFC/src/{NfcReader.hpp => NfcReader.h} |  9 +--------
 3 files changed, 3 insertions(+), 18 deletions(-)
 rename lib/NFC/src/{NfcReader.hpp => NfcReader.h} (73%)

diff --git a/config.ini b/config.ini
index dff2d75..dc000d2 100644
--- a/config.ini
+++ b/config.ini
@@ -4,6 +4,7 @@
 ; Hardware Serial baud rate
 ; Also available in the code as `MONITOR_SPEED`
 monitor_speed = 115200
+NFC_ADDR = 0x28
 
 ; Software Config
 ; note: additionnal flags are added by Platform.io (see total amount in `.vscode/c_cpp_properties.json` in the `defines` section)
diff --git a/lib/NFC/src/NfcReader.cpp b/lib/NFC/src/NfcReader.cpp
index 23ea403..049f35a 100644
--- a/lib/NFC/src/NfcReader.cpp
+++ b/lib/NFC/src/NfcReader.cpp
@@ -1,11 +1,4 @@
-/*
-** EPITECH PROJECT, 2024
-** T-IOT-901_convoyor
-** File description:
-** NfcReader
-*/
-
-#include "NfcReader.hpp"
+#include "NfcReader.h"
 
 NfcReader::NfcReader(int i2c_adress)
 {
@@ -13,8 +6,6 @@ NfcReader::NfcReader(int i2c_adress)
     this->mfrc522->PCD_Init();
 }
 
-NfcReader::~NfcReader() {}
-
 String NfcReader::ReadNfc()
 {
     this->uid.clear();
diff --git a/lib/NFC/src/NfcReader.hpp b/lib/NFC/src/NfcReader.h
similarity index 73%
rename from lib/NFC/src/NfcReader.hpp
rename to lib/NFC/src/NfcReader.h
index aab376f..eeb976a 100644
--- a/lib/NFC/src/NfcReader.hpp
+++ b/lib/NFC/src/NfcReader.h
@@ -1,10 +1,3 @@
-/*
-** EPITECH PROJECT, 2024
-** T-IOT-901_convoyor
-** File description:
-** NfcReader
-*/
-
 #ifndef NFCREADER_HPP_
 #define NFCREADER_HPP_
 
@@ -15,7 +8,7 @@
 class NfcReader {
     public:
         NfcReader(int i2c_adress);
-        ~NfcReader();
+        ~NfcReader() = default;
 
         String ReadNfc();
 

From 032960c168d7a7255e832dbecba2cf65e071ce61 Mon Sep 17 00:00:00 2001
From: Clement <c.boesmier@aptatio.com>
Date: Fri, 19 Jan 2024 11:51:59 +0100
Subject: [PATCH 2/3] fix: Addr config

---
 config.ini | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/config.ini b/config.ini
index dc000d2..48f3769 100644
--- a/config.ini
+++ b/config.ini
@@ -4,7 +4,6 @@
 ; Hardware Serial baud rate
 ; Also available in the code as `MONITOR_SPEED`
 monitor_speed = 115200
-NFC_ADDR = 0x28
 
 ; Software Config
 ; note: additionnal flags are added by Platform.io (see total amount in `.vscode/c_cpp_properties.json` in the `defines` section)
@@ -15,3 +14,6 @@ build_flags =
     -D MONITOR_SPEED=${config.monitor_speed}
 ; DO NOT TOUCH --- END
     -D WAITING_WIFI_DELAY=1000
+
+    ; nfc addr
+    -D NFC_ADDR=0x28

From 4023cfcb3d143d3784966840e6e2502edde63f7f Mon Sep 17 00:00:00 2001
From: Guska <gildas.gonzalez@epitech.eu>
Date: Fri, 19 Jan 2024 11:58:13 +0100
Subject: [PATCH 3/3] NFC: Removing delay function

---
 lib/NFC/src/NfcReader.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/NFC/src/NfcReader.cpp b/lib/NFC/src/NfcReader.cpp
index 049f35a..c52af0b 100644
--- a/lib/NFC/src/NfcReader.cpp
+++ b/lib/NFC/src/NfcReader.cpp
@@ -11,8 +11,7 @@ String NfcReader::ReadNfc()
     this->uid.clear();
     if (!this->mfrc522->PICC_IsNewCardPresent() ||
         !this->mfrc522->PICC_ReadCardSerial()) {
-        delay(200);
-        return "0";
+        return ("0");
     }
     for (unsigned int i = 0; i < this->mfrc522->uid.size; i++) {
         if (this->mfrc522->uid.uidByte[i] < 0xF) {