aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Embedded_SW/Embedded/Modules/IFS
diff options
context:
space:
mode:
authorShlomo Hecht <shlomo@twine-s.com>2019-09-09 11:58:16 +0300
committerShlomo Hecht <shlomo@twine-s.com>2019-09-09 11:58:16 +0300
commitadb75c06d7d75a6ebfaadab3c17c5b8296fd485d (patch)
tree67bcade177ad9f05349af468594ec21df86c4cd6 /Software/Embedded_SW/Embedded/Modules/IFS
parent738bebec92cfcec046821fe994f3a168df870978 (diff)
downloadTango-adb75c06d7d75a6ebfaadab3c17c5b8296fd485d.tar.gz
Tango-adb75c06d7d75a6ebfaadab3c17c5b8296fd485d.zip
USE BOTH HEATERS IN DRYER! machine calibration data. rfid tag content PPC<==>RFID transfer.
Diffstat (limited to 'Software/Embedded_SW/Embedded/Modules/IFS')
-rw-r--r--Software/Embedded_SW/Embedded/Modules/IFS/RfidTagContent.h51
-rw-r--r--Software/Embedded_SW/Embedded/Modules/IFS/ifs.c2
2 files changed, 1 insertions, 52 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/RfidTagContent.h b/Software/Embedded_SW/Embedded/Modules/IFS/RfidTagContent.h
deleted file mode 100644
index 57659616e..000000000
--- a/Software/Embedded_SW/Embedded/Modules/IFS/RfidTagContent.h
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * RfidTagContent.h
- *
- * Created on: Jul 8, 2019
- * Author: shlomo
- */
-
-#ifndef MODULES_IFS_RFIDTAGCONTENT_H_
-#define MODULES_IFS_RFIDTAGCONTENT_H_
-
-#include "PMR/Diagnostics/CartridgeSlot.pb-c.h"
-#include "PMR/Diagnostics/CartridgeTagContent.pb-c.h"
-
-#include <DataDef.h>
-#include "include.h"
-
-
-#define MAX_CARTRIDGES (CARTRIDGE_SLOT__WasteLower+1)
-typedef struct
-{
- uint32_t UniqueId;
- char SerialNumber[16];
- char FactoryId[3];
- int32_t FillingSystemId;
- char ColorName[12];
- int32_t ColorCategory;
- int32_t ColorTypeRevision;
- int32_t CartridgeSize;
- int32_t FilledInkVolume;
- char InkBatchNum[10];
- char InkMFGDate[6];
- char InkEOLDate[6];
- char CartridgeFillingDate[6];
- char WasteFilledDate[6];
- int32_t PlugInCounter;
- bool Inkfill;
- bool InkUsed;
- bool InkEmpty;
- bool WasteEmpty;
- bool WasteFilling;
- bool WasteFull;
- bool Blocked;
- bool Fail;
- int32_t WasteCounter;
- char MachineIdInkUsed[16];
- char MachineIdWasteUsed[16];
-}RfidTagContent;
-
-
-
-#endif /* MODULES_IFS_RFIDTAGCONTENT_H_ */
diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
index 0e18ffdad..d51dc6748 100644
--- a/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
+++ b/Software/Embedded_SW/Embedded/Modules/IFS/ifs.c
@@ -10,7 +10,7 @@
#include "PMR/Diagnostics/CartridgeSlot.pb-c.h"
#include "PMR/Diagnostics/CartridgeTagContent.pb-c.h"
-#include "RfidTagContent.h"
+#include "common/utilities/RfidTagContent.h"
#include <Drivers/I2C_Communication/RFID_NFC/RFIDTagInfo.h>
#include <DataDef.h>