diff options
| author | Avi Levkovich <avi@twine-s.com> | 2020-10-22 13:36:16 +0300 |
|---|---|---|
| committer | Avi Levkovich <avi@twine-s.com> | 2020-10-22 13:36:16 +0300 |
| commit | f20922743b92f60e8b9d10589a5e5a1ca6f838b9 (patch) | |
| tree | d13ab739b819eade9ae31295568e92152ce9cf9e /Software/Embedded_SW/Embedded/Modules/Control | |
| parent | be590cb8631d480e904ca9685e616c8fd6c1d573 (diff) | |
| download | Tango-f20922743b92f60e8b9d10589a5e5a1ca6f838b9.tar.gz Tango-f20922743b92f60e8b9d10589a5e5a1ca6f838b9.zip | |
merge
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/Control')
| -rw-r--r-- | Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c | 23 |
1 files changed, 23 insertions, 0 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c index b5ff665ef..24d97407e 100644 --- a/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c +++ b/Software/Embedded_SW/Embedded/Modules/Control/MillisecTask.c @@ -68,6 +68,12 @@ #include "drivers/Uart_Comm/WHS_Controller_Comm/WHS_UART/WHS_Uart.h" #include "Drivers/Uart_Comm/WHS_Controller_Comm/Shinko/ACS-13AC5E3.h" +#include <Drivers/I2C_Communication/RFID_NFC/NFC_MainBaord.h> +#include <Drivers/I2C_Communication/RFID_NFC/logi-tag/LT_RFID.h> +#include <Drivers/I2C_Communication/RFID_NFC/RFIDTagInfo.h> +#include <Drivers/I2C_Communication/RFID_NFC/I2C_IFS_Mux.h> +#include <Drivers/I2C_Communication/RFID_NFC/NFC.h> + Task_Handle Millisecond_Task_Handle; /******************** Definitions ********************************************/ @@ -600,6 +606,7 @@ uint32_t MillisecLowLoop(uint32_t tick) { uint8_t Motor_i,Disp_i,temp; TEMPERATURE_SENSOR_ID_ENUM Sensor_i; + RFID_READER_ID readerID; //static int temp=0; //call all modules Millisec functions @@ -696,6 +703,18 @@ uint32_t MillisecLowLoop(uint32_t tick) } Trigger_InputsReading(); + + #ifdef USE_RFID + //every 100 m sec + for(readerID = READER_1; readerID < Max_Readers ; readerID++) + { + if(DiscoverRFIDTagEvery100mSec[readerID] == true) + { + RFIDCallEvery100mSec(readerID); + break; + } + } + #endif } if (Gradient_Tick) DispensersCollectionCall(); @@ -812,6 +831,10 @@ uint32_t MillisecLowLoop(uint32_t tick) //call IFS state machine midTankStateMachine(); + + #ifdef USE_RFID + RFIDCycleEvery1Sec(); + #endif } if (Tensecond_Tick) { |