Merge branch 'master' of https://twinetfs.visualstudio.com/Tango/_git/Tango

3 files changed, 80 insertions, 52 deletions

diff --git a/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.c b/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.c
index f6bc50a7e..7bc1c2e54 100644
--- a/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.c
+++ b/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.c
@@ -18,6 +18,24 @@
 #include "CartridgeTagContent.pb-c.h"
 #include "Cartridge.pb-c.h"
 
+uint32_t LoadCartridgeData(PANEL_BUTTON_OR_CRAT_ID Cart,void *CartridgePtr)
+{
+    if (CartridgePtr == NULL) return ERROR;
+    if (Cart>CART_3) return ERROR;
+    Cartridge *Cartridge = CartridgePtr;
+    /*
+  ProtobufCMessage base;
+  protobuf_c_boolean has_slot;
+  CartridgeSlot slot;
+  CartridgeTagContent *tag;
+  protobuf_c_boolean has_index;
+  int32_t index;
+     * */
+    Cartridge->has_slot = true;
+    Cartridge->slot = Cart-1;
+    //Cartridge->tag = NFCTag_Tag2PPC(NFC_TagRead[Cart-1].Struct);
+    return OK;
+}
 /*
  typedef struct
 {
@@ -152,56 +170,56 @@ CartridgeTagContent * NFCTag_Tag2PPC(NFCTag_t *Tag)
 
 
      cartridge_tag_content__init(PpcTag);
-     strncpy(PpcTag->taguniqueid , Tag->TagUniqueID,sizeof(Tag->TagUniqueID));
-     strncpy(PpcTag->cartsn , Tag->CartSN,sizeof(Tag->CartSN));
-     strncpy(PpcTag->workorder , Tag->WorkOrder,sizeof(Tag->WorkOrder));
-     strncpy(PpcTag->colorname , Tag->ColorName,sizeof(Tag->ColorName));
-     strncpy(PpcTag->inkbatchno , Tag->InkBatchNo,sizeof(Tag->InkBatchNo));
-     strncpy(PpcTag->inkmfgdate , Tag->InkMFGDate,sizeof(Tag->InkMFGDate));
-     strncpy(PpcTag->inkeoldate , Tag->InkEOLDate,sizeof(Tag->InkEOLDate));
+     strncpy(PpcTag->taguniqueid , Tag->tagId,sizeof(Tag->tagId));
+     strncpy(PpcTag->cartsn , Tag->Serial,sizeof(Tag->Serial));
+     strncpy(PpcTag->workorder , Tag->workOrder,sizeof(Tag->workOrder));
+     strncpy(PpcTag->colorname , Tag->colorName,sizeof(Tag->colorName));
+     strncpy(PpcTag->inkbatchno , Tag->inkBatch,sizeof(Tag->inkBatch));
+     strncpy(PpcTag->inkmfgdate , Tag->inkMfgDate,sizeof(Tag->inkMfgDate));
+     strncpy(PpcTag->inkeoldate , Tag->inkEolDate,sizeof(Tag->inkEolDate));
      strncpy(PpcTag->cartfilldate , Tag->CartFillDate,sizeof(Tag->CartFillDate));
      strncpy(PpcTag->wastefilldate , Tag->WasteFillDate,sizeof(Tag->WasteFillDate));
-     strncpy(PpcTag->machineidinl , Tag->MachineIdINL,sizeof(Tag->MachineIdINL));
-     strncpy(PpcTag->machineidwst , Tag->MachineIdWST,sizeof(Tag->MachineIdWST));
-     strncpy(PpcTag->spare , Tag->Spare,sizeof(Tag->Spare));
+     strncpy(PpcTag->machineidinl , Tag->MachineIdInl,sizeof(Tag->MachineIdInl));
+     strncpy(PpcTag->machineidwst , Tag->MachineIdWst,sizeof(Tag->MachineIdWst));
+     strncpy(PpcTag->spare , Tag->reserved,sizeof(Tag->reserved));
      strncpy(PpcTag->hashvalue , Tag->HashValue,sizeof(Tag->HashValue));
 
 
 
      PpcTag->has_inkfactoryid = true;
-     PpcTag->inkfactoryid = Tag->InkFactoryID;
+     PpcTag->inkfactoryid = (uint32_t)Tag->factoryID;
      PpcTag->has_fillsysid = true;
-     PpcTag->fillsysid = Tag->FillSysID;
+     PpcTag->fillsysid = Tag->fillingSystem;
      PpcTag->has_inkcategory = true;
-     PpcTag->inkcategory = Tag->InkCategory;
+     PpcTag->inkcategory = Tag->catagory;
      PpcTag->has_type_rev = true;
-     PpcTag->type_rev = Tag->Type_Rev;
+     PpcTag->type_rev = Tag->type;
      PpcTag->has_cartridgesize = true;
-     PpcTag->cartridgesize = Tag->CartridgeSize;
+     PpcTag->cartridgesize = Tag->cartSize;
      PpcTag->has_filedinkvol = true;
-     PpcTag->filedinkvol = Tag->FiledInkVol;
+     PpcTag->filedinkvol = Tag->inkVolume;
      PpcTag->has_misc = true;
      PpcTag->misc = Tag->Misc;
      PpcTag->has_plugincounter = true;
-     PpcTag->plugincounter = Tag->PluginCounter;
+     PpcTag->plugincounter = Tag->pluginCounter;
      PpcTag->has_inkfillstatus = true;
-     PpcTag->inkfillstatus = Tag->InkFillStatus;
+     PpcTag->inkfillstatus = Tag->inkFill;
      PpcTag->has_inkusedstatus = true;
-     PpcTag->inkusedstatus = Tag->InkUsedStatus;
+     PpcTag->inkusedstatus = Tag->inkUsed;
      PpcTag->has_inkemptystatus = true;
-     PpcTag->inkemptystatus = Tag->InkEmptyStatus;
+     PpcTag->inkemptystatus = Tag->inkEmpty;
      PpcTag->has_inkemptystatus = true;
-     PpcTag->inkemptystatus = Tag->WasteEmptyStatus;
+     PpcTag->inkemptystatus = Tag->wasteEmpty;
      PpcTag->has_wastefillingstatus = true;
-     PpcTag->wastefillingstatus = Tag->WasteFillingStatus;
+     PpcTag->wastefillingstatus = Tag->wasteFilling;
      PpcTag->has_wastefullstatus = true;
-     PpcTag->wastefullstatus = Tag->WasteFullStatus;
+     PpcTag->wastefullstatus = Tag->wasteFull;
      PpcTag->has_blocked = true;
-     PpcTag->blocked = Tag->Blocked;
+     PpcTag->blocked = Tag->blocked;
      PpcTag->has_fail = true;
-     PpcTag->fail = Tag->Fail;
+     PpcTag->fail = Tag->fail;
      PpcTag->has_wastecounter = true;
-     PpcTag->wastecounter = Tag->WasteCounter;
+     PpcTag->wastecounter = Tag->counter;
 
      return PpcTag;
 }
@@ -212,50 +230,50 @@ CartridgeTagContent * NFCTag_Tag2PPC(NFCTag_t *Tag)
          return NULL;
      memset (Tag,0,sizeof(Tag));
 
-     strncpy(Tag->TagUniqueID , PpcTag->taguniqueid,sizeof(Tag->TagUniqueID));
-     strncpy(Tag->CartSN , PpcTag->cartsn,sizeof(Tag->CartSN));
+     strncpy(Tag->tagId , PpcTag->taguniqueid,sizeof(Tag->tagId));
+     strncpy(Tag->Serial , PpcTag->cartsn,sizeof(Tag->Serial));
      if (PpcTag->has_inkfactoryid == true)
-         Tag->InkFactoryID = PpcTag->inkfactoryid;
+         memcpy(Tag->factoryID,PpcTag->inkfactoryid,3);
      if (PpcTag->has_fillsysid == true)
-         Tag->FillSysID  = PpcTag->fillsysid;
-     strncpy(Tag->ColorName , PpcTag->colorname,sizeof(Tag->ColorName));
-     strncpy(Tag->WorkOrder , PpcTag->workorder ,sizeof(Tag->WorkOrder));
+         Tag->fillingSystem  = PpcTag->fillsysid;
+     strncpy(Tag->colorName , PpcTag->colorname,sizeof(Tag->colorName));
+     strncpy(Tag->workOrder , PpcTag->workorder ,sizeof(Tag->workOrder));
      if (PpcTag->has_inkcategory == true)
-         Tag->InkCategory = PpcTag->inkcategory;
+         memcpy( Tag->catagory, PpcTag->inkcategory,sizeof(Tag->catagory));
      if (PpcTag->has_type_rev == true)
-         Tag->Type_Rev = PpcTag->type_rev;
+         Tag->type = PpcTag->type_rev;
      if (PpcTag->has_cartridgesize == true)
-         Tag->CartridgeSize = PpcTag->cartridgesize;
+         Tag->cartSize = PpcTag->cartridgesize;
      if (PpcTag->has_filedinkvol == true)
-         Tag->FiledInkVol = PpcTag->filedinkvol;
-     strncpy(Tag->InkBatchNo , PpcTag->inkbatchno,sizeof(Tag->InkBatchNo));
-     strncpy(Tag->InkMFGDate , PpcTag->inkmfgdate,sizeof(Tag->InkMFGDate));
-     strncpy(Tag->InkEOLDate , PpcTag->inkeoldate,sizeof(Tag->InkEOLDate));
+         Tag->inkVolume = PpcTag->filedinkvol;
+     strncpy(Tag->inkBatch , PpcTag->inkbatchno,sizeof(Tag->inkBatch));
+     strncpy(Tag->inkMfgDate , PpcTag->inkmfgdate,sizeof(Tag->inkMfgDate));
+     strncpy(Tag->inkEolDate , PpcTag->inkeoldate,sizeof(Tag->inkEolDate));
      strncpy(Tag->CartFillDate , PpcTag->cartfilldate,sizeof(Tag->CartFillDate));
      strncpy(Tag->WasteFillDate , PpcTag->wastefilldate,sizeof(Tag->WasteFillDate));
      if (PpcTag->has_plugincounter == true)
-         Tag->PluginCounter = PpcTag->plugincounter;
+         Tag->pluginCounter = PpcTag->plugincounter;
      if (PpcTag->has_inkfillstatus == true)
-         Tag->InkFillStatus = PpcTag->inkfillstatus;
+         Tag->inkFill = PpcTag->inkfillstatus;
      if (PpcTag->has_inkusedstatus == true)
-         Tag->InkUsedStatus = PpcTag->inkusedstatus;
+         Tag->inkUsed = PpcTag->inkusedstatus;
      if (PpcTag->has_inkemptystatus == true)
-         Tag->InkEmptyStatus = PpcTag->inkemptystatus;
+         Tag->inkEmpty = PpcTag->inkemptystatus;
      if (PpcTag->has_wasteemptystatus == true)
-         Tag->WasteEmptyStatus = PpcTag->wasteemptystatus;
+         Tag->wasteEmpty = PpcTag->wasteemptystatus;
      if (PpcTag->has_wastefillingstatus == true)
-         Tag->WasteFillingStatus = PpcTag->wastefillingstatus;
+         Tag->wasteFilling = PpcTag->wastefillingstatus;
      if (PpcTag->has_wastefullstatus == true)
-         Tag->WasteFullStatus = PpcTag->wastefullstatus;
+         Tag->wasteFull = PpcTag->wastefullstatus;
      if (PpcTag->has_blocked == true)
-         Tag->Blocked = PpcTag->blocked;
+         Tag->blocked = PpcTag->blocked;
      if (PpcTag->has_fail == true)
-         Tag->Fail = PpcTag->fail;
+         Tag->fail = PpcTag->fail;
      if (PpcTag->has_wastecounter == true)
-         Tag->WasteCounter = PpcTag->wastecounter;
-     strncpy(Tag->MachineIdINL , PpcTag->machineidinl,sizeof(Tag->MachineIdINL));
-     strncpy(Tag->MachineIdWST , PpcTag->machineidwst,sizeof(Tag->MachineIdWST));
-     strncpy(Tag->Spare,PpcTag->spare ,sizeof(Tag->Spare));
+         Tag->wasteCounter = PpcTag->wastecounter;
+     strncpy(Tag->MachineIdInl , PpcTag->machineidinl,sizeof(Tag->MachineIdInl));
+     strncpy(Tag->MachineIdWst , PpcTag->machineidwst,sizeof(Tag->MachineIdWst));
+     strncpy(Tag->reserved,PpcTag->spare ,sizeof(Tag->reserved));
      strncpy(Tag->HashValue,PpcTag->hashvalue ,sizeof(Tag->HashValue));
 
      return Tag;
diff --git a/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.h b/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.h
index 496b1aae3..0eee787f4 100644
--- a/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.h
+++ b/Software/Embedded_SW/Embedded/Common/Utilities/RFIDTagHandling.h
@@ -11,4 +11,6 @@
 
 CartridgeTagContent * NFCTag_Tag2PPC(NFCTag_t *Tag);
  NFCTag_t * NFCTag_PPC2Tag( CartridgeTagContent *PpcTag);
+ uint32_t LoadCartridgeData(PANEL_BUTTON_OR_CRAT_ID Cart,void *CartridgePtr);
+
 
diff --git a/Software/Embedded_SW/Embedded/Common/report/reportInit.c b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
index d466432b1..82c8b8099 100644
--- a/Software/Embedded_SW/Embedded/Common/report/reportInit.c
+++ b/Software/Embedded_SW/Embedded/Common/report/reportInit.c
@@ -64,6 +64,10 @@ PackageHandle FPGAFilter;
 PackageHandle LoadFilter;
 PackageHandle InitFilter;
 PackageHandle MaintFilter;
+PackageHandle IFSFilter;
+PackageHandle FilesFilter;
+PackageHandle I2CFilter;
+PackageHandle MotorFilter;
 
 char LogPath[50] = "0://ErrFile.txt";
 
@@ -498,6 +502,10 @@ STATUS ReportInit(ReportInitParams InitParams)
     LoadFilter  = ReportAddFilterPackage("Load");
     InitFilter  = ReportAddFilterPackage("Init");
     MaintFilter  = ReportAddFilterPackage("Maint");
+    IFSFilter  = ReportAddFilterPackage("IFS");
+    FilesFilter  = ReportAddFilterPackage("Files");
+    I2CFilter  = ReportAddFilterPackage("I2C");
+    MotorFilter  = ReportAddFilterPackage("Motor");
 //    Filter  = ReportAddFilterPackage("");
     ReportSwitchPackageFilter(IDSFilter,REPORT_OFF);
     ReportSwitchPackageFilter(WasteFilter,REPORT_OFF);