aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules
diff options
context:
space:
mode:
authorRoy Ben Shabat <Roy.mail.net@gmail.com>2020-07-28 19:21:30 +0300
committerRoy Ben Shabat <Roy.mail.net@gmail.com>2020-07-28 19:21:30 +0300
commitbdf7e5a2abc2c9d3b7889d2d71754c33ea3efbf6 (patch)
tree3347b66602a1f6b25a6303b2fb0a0e73af537eb9 /Software/Embedded_SW/Embedded/Modules
parent1b6f1e483a866bbd13cad7343e95dfebf0f08a21 (diff)
parent2c0ab3af114e0e18f4779bc82c239b91d169fd93 (diff)
downloadTango-bdf7e5a2abc2c9d3b7889d2d71754c33ea3efbf6.tar.gz
Tango-bdf7e5a2abc2c9d3b7889d2d71754c33ea3efbf6.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Cartridge.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Cartridge.c b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Cartridge.c
index 938b3bbd7..8830fcb3c 100644
--- a/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Cartridge.c
+++ b/Software/Embedded_SW/Embedded/Modules/Stubs_Handler/Stub_Cartridge.c
@@ -15,6 +15,9 @@
#include "Drivers/I2C_Communication/RFID_NFC/NFC.h"
#include <Utilities/RfidTagHandling.h>
#include <Drivers/I2C_Communication/RFID_NFC/RFIDTagInfo.h>
+#include <Drivers/I2C_Communication/I2C.h>
+#include <Drivers/I2C_Communication/RFID_NFC/I2C_IFS_Mux.h>
+
#include "Stub_Status.h"
@@ -23,6 +26,8 @@ void Stub_CartridgeReadRequest(MessageContainer* requestContainer)
uint32_t status = PASSED;
MessageContainer responseContainer;
+ static bool first_time = true;
+
StubCartridgeReadRequest* request = stub_cartridge_read_request__unpack(NULL, requestContainer->data.len, requestContainer->data.data);
Cartridge CartridgeRead = CARTRIDGE__INIT;
@@ -41,6 +46,17 @@ void Stub_CartridgeReadRequest(MessageContainer* requestContainer)
{
Connect_to_RFID_Reder(readerID);//0-2 - conect the card and get tag id
}
+ else if(request->cartridgeid == 0x0102)
+ {
+ Active_RFID_Reader = readerID + 1;
+ if(first_time == true)
+ {
+ TagStage = Tag_PrepareForDiscovery;
+ first_time = false;
+ }
+
+ RFIDTagComm_StateMachine(Auto);
+ }
response.cartridge = &CartridgeRead;
CartridgeRead.has_index = false;