diff options
| author | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-07-11 13:22:48 +0300 |
|---|---|---|
| committer | Victoria Plitt <Victoria.Plitt@twine-s.com> | 2019-07-11 13:22:48 +0300 |
| commit | 35030dd8e1d2a5b8bfc2feed6c138f4eaddc8bfc (patch) | |
| tree | 841511fdba02b43cfe715c01da6ecb39dd2c3925 /Software/Embedded_SW/Embedded/Modules | |
| parent | 71147a336a79ea164c73d3174daeed8d73ae7900 (diff) | |
| parent | c839fa3d339f90f15e0548fc056828c533123bfc (diff) | |
| download | Tango-35030dd8e1d2a5b8bfc2feed6c138f4eaddc8bfc.tar.gz Tango-35030dd8e1d2a5b8bfc2feed6c138f4eaddc8bfc.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/IFS/RfidTagContent.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Software/Embedded_SW/Embedded/Modules/IFS/RfidTagContent.h b/Software/Embedded_SW/Embedded/Modules/IFS/RfidTagContent.h index 0764f2862..57659616e 100644 --- a/Software/Embedded_SW/Embedded/Modules/IFS/RfidTagContent.h +++ b/Software/Embedded_SW/Embedded/Modules/IFS/RfidTagContent.h @@ -8,15 +8,15 @@ #ifndef MODULES_IFS_RFIDTAGCONTENT_H_ #define MODULES_IFS_RFIDTAGCONTENT_H_ -#include "PMR/Rfid/RfidCartridgeSlot.pb-c.h" -#include "PMR/Rfid/RfidTagContent.pb-c.h" +#include "PMR/Diagnostics/CartridgeSlot.pb-c.h" +#include "PMR/Diagnostics/CartridgeTagContent.pb-c.h" #include <DataDef.h> #include "include.h" -#define MAX_CARTRIDGES (RFID_CARTRIDGE_SLOT__LowerWasteCartridge+1) -typedef struct RfidTagContent +#define MAX_CARTRIDGES (CARTRIDGE_SLOT__WasteLower+1) +typedef struct { uint32_t UniqueId; char SerialNumber[16]; @@ -44,7 +44,7 @@ typedef struct RfidTagContent int32_t WasteCounter; char MachineIdInkUsed[16]; char MachineIdWasteUsed[16]; -}; +}RfidTagContent; |