merge

2 files changed, 12 insertions, 13 deletions

diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC.c
index 33f154492..1e989d4d1 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/NFC.c
@@ -118,15 +118,14 @@ RFID_RETURN_CODE RFID_Status = 0;
 uint8_t Connect_to_RFID_Reder(uint8_t readerID)//2
 {
     RFID_RETURN_CODE RFIDRetValue;
-    bool isTagValid;
     uint8_t Status = OK;
-
-
+/*
+    bool isTagValid;
     uint32_t newPwd;
     uint32_t newPACK;
     uint32_t counter;
-
     int PwdRetVal;
+*/
     static uint32_t nop = 0;
 
     RFID_StartDiscovery(readerID);
@@ -187,7 +186,7 @@ NFC_Tag NFC_Tag_U[Max_Readers];//read with updates
 
 RFID_RETURN_CODE  TagWriteData(RFID_READER_ID readerID)
 {
-    uint8_t index = 0;
+    //uint8_t index = 0;
     uint32_t dummy = 0;
     uint32_t Tuint32 = 0;
     //uint16_t Tuint16 = 0;
@@ -375,7 +374,7 @@ RFID_RETURN_CODE  TagWriteData(RFID_READER_ID readerID)
     RFIDRetValue = WriteValue( readerID, &tagInfo, tagMemory, 31, Tuint32 );
 
 
-    return SUCCESS;
+    return RFIDRetValue;
 }
 
 
diff --git a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/logi-tag/LT_RFID.c b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/logi-tag/LT_RFID.c
index 7035d172e..6d6425172 100644
--- a/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/logi-tag/LT_RFID.c
+++ b/Software/Embedded_SW/Embedded/Drivers/I2C_Communication/RFID_NFC/logi-tag/LT_RFID.c
@@ -1209,13 +1209,13 @@ uint32_t crc_ccitt_update(unsigned char * buf, int len)
 }
 
 
-void RFID_Test()
+RFID_RETURN_CODE RFID_Test()
 {
 
 uint8_t i, readerID = 1;
 NxpNci_RfIntf_t tagInfo;
-uint8_t addressBlock = 0xE3; // NTAG216 - User memory blocks: 0x04-0xE1 = 222 blocks = 888 bytes
-uint8_t tagId[]= {0};
+//uint8_t addressBlock = 0xE3; // NTAG216 - User memory blocks: 0x04-0xE1 = 222 blocks = 888 bytes
+//uint8_t tagId[]= {0};
 uint8_t Serial[] = {'1', '2', '3', '4', '5', '6', '7', '8', '9', 'A', 'B', 'C', 'D', 'E', 'F', 'G'};
 uint8_t factoryID[] = { '1', '2', '3'};
 uint16_t fillingSystem = 55;
@@ -1250,12 +1250,12 @@ uint8_t uid[7] = {0};
 uint8_t hashValue[16] = {0};
 uint8_t newPACK[] = {0x11, 0x22};
 uint8_t newPwd[] = {0xFF, 0xFF, 0xFF, 0xFF};
-uint8_t startingBlock = 0x04;
+/*uint8_t startingBlock = 0x04;
 uint8_t pwdAddr = 0xE5;
-uint8_t tagMemory[1024];
 uint16_t succeededWriteSize = 0;
 uint16_t succeededReadSize = 0;
-bool firstTime = true;
+bool firstTime = true;*/
+uint8_t tagMemory[1024];
 
 uint32_t dummy = 0;
 RFID_RETURN_CODE RFIDRetValue;
@@ -1421,6 +1421,6 @@ while(1)
     }
 
     //----------------------------------------------------------------------------
-
+    return RFIDRetValue;
 }