From 2ad73735cb8153c87d818c822d3835e63e29f3fb Mon Sep 17 00:00:00 2001 From: Shai Frieder Date: Wed, 10 Jul 2019 10:45:54 +0300 Subject: fix for new protobuff --- Software/Embedded_SW/Embedded/Modules/IFS/RfidTagContent.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'Software/Embedded_SW/Embedded/Modules') 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 #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; -- cgit v1.3.1