PMR IFS.

5 files changed, 428 insertions, 939 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/CartridgeTagContent.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/CartridgeTagContent.cs
index 4880e278e..70b4b48df 100644
--- a/Software/Visual_Studio/Tango.PMR/Diagnostics/CartridgeTagContent.cs
+++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/CartridgeTagContent.cs
@@ -23,27 +23,27 @@ namespace Tango.PMR.Diagnostics {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChlDYXJ0cmlkZ2VUYWdDb250ZW50LnByb3RvEhVUYW5nby5QTVIuRGlhZ25v",
-            "c3RpY3MitAUKE0NhcnRyaWRnZVRhZ0NvbnRlbnQSEAoIVW5pcXVlSWQYASAB",
-            "KAkSFAoMU2VyaWFsTnVtYmVyGAIgASgJEhEKCUZhY3RvcnlJZBgDIAEoBRIX",
-            "Cg9GaWxsaW5nU3lzdGVtSWQYBCABKAUSEQoJV29ya09yZGVyGAUgASgJEhEK",
-            "CUNvbG9yTmFtZRgGIAEoCRIVCg1Db2xvckNhdGVnb3J5GAcgASgFEhkKEUNv",
-            "bG9yVHlwZVJldmlzaW9uGAggASgFEhUKDUNhcnRyaWRnZVNpemUYCSABKAUS",
-            "FwoPRmlsbGVkSW5rVm9sdW1lGAogASgFEhMKC0lua0JhdGNoTnVtGAsgASgJ",
-            "EhIKCklua01GR0RhdGUYDCABKAkSEgoKSW5rRU9MRGF0ZRgNIAEoCRIcChRD",
-            "YXJ0cmlkZ2VGaWxsaW5nRGF0ZRgOIAEoCRIXCg9XYXN0ZUZpbGxlZERhdGUY",
-            "DyABKAkSFQoNUGx1Z0luQ291bnRlchgQIAEoBRIMCgRNaXNjGBEgASgNEg8K",
-            "B0lua2ZpbGwYEiABKAgSDwoHSW5rVXNlZBgTIAEoCBIQCghJbmtFbXB0eRgU",
-            "IAEoCBISCgpXYXN0ZUVtcHR5GBUgASgIEhQKDFdhc3RlRmlsbGluZxgWIAEo",
-            "CBIRCglXYXN0ZUZ1bGwYFyABKAgSDwoHQmxvY2tlZBgYIAEoCBIMCgRGYWls",
-            "GBkgASgIEhQKDFdhc3RlQ291bnRlchgaIAEoBRIYChBNYWNoaW5lSWRJbmtV",
-            "c2VkGBsgASgJEhoKEk1hY2hpbmVJZFdhc3RlVXNlZBgcIAEoCRIPCgdDb3Vu",
-            "dGVyGB0gASgNEhAKCFRhZ1ZhbGlkGB4gASgIEhEKCUhhc2hWYWx1ZRgfIAEo",
-            "CRIWCg5DaGVja3N1bV9DUkMxNhggIAEoDUIhCh9jb20udHdpbmUudGFuZ28u",
-            "cG1yLmRpYWdub3N0aWNzYgZwcm90bzM="));
+            "c3RpY3MivQUKE0NhcnRyaWRnZVRhZ0NvbnRlbnQSEwoLVGFnVW5pcXVlSUQY",
+            "ASABKAkSDgoGQ2FydFNOGAIgASgJEhQKDElua0ZhY3RvcnlJRBgDIAEoDRIR",
+            "CglGaWxsU3lzSUQYBCABKA0SEQoJV29ya09yZGVyGAUgASgJEhEKCUNvbG9y",
+            "TmFtZRgGIAEoCRITCgtJbmtDYXRlZ29yeRgHIAEoDRIQCghUeXBlX1JldhgI",
+            "IAEoDRIVCg1DYXJ0cmlkZ2VTaXplGAkgASgNEhMKC0ZpbGVkSW5rVm9sGAog",
+            "ASgNEhIKCklua0JhdGNoTm8YCyABKAkSEgoKSW5rTUZHRGF0ZRgMIAEoCRIS",
+            "CgpJbmtFT0xEYXRlGA0gASgJEhQKDENhcnRGaWxsRGF0ZRgOIAEoCRIVCg1X",
+            "YXN0ZUZpbGxEYXRlGA8gASgJEgwKBE1pc2MYECABKA0SFQoNUGx1Z2luQ291",
+            "bnRlchgRIAEoDRIVCg1JbmtGaWxsU3RhdHVzGBIgASgIEhUKDUlua1VzZWRT",
+            "dGF0dXMYEyABKAgSFgoOSW5rRW1wdHlTdGF0dXMYFCABKAgSGAoQV2FzdGVF",
+            "bXB0eVN0YXR1cxgVIAEoCBIaChJXYXN0ZUZpbGxpbmdTdGF0dXMYFiABKAgS",
+            "FwoPV2FzdGVGdWxsU3RhdHVzGBcgASgIEg8KB0Jsb2NrZWQYGCABKAgSDAoE",
+            "RmFpbBgZIAEoCBIUCgxXYXN0ZUNvdW50ZXIYGiABKA0SFAoMTWFjaGluZUlk",
+            "SU5MGBsgASgJEhQKDE1hY2hpbmVJZFdTVBgcIAEoCRINCgVTcGFyZRgdIAEo",
+            "CRIPCgdDb3VudGVyGB4gASgNEhAKCFRhZ1ZhbGlkGB8gASgIEhEKCUhhc2hW",
+            "YWx1ZRggIAEoCRIWCg5DaGVja3N1bV9DUkMxNhghIAEoDUIhCh9jb20udHdp",
+            "bmUudGFuZ28ucG1yLmRpYWdub3N0aWNzYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.CartridgeTagContent), global::Tango.PMR.Diagnostics.CartridgeTagContent.Parser, new[]{ "UniqueId", "SerialNumber", "FactoryId", "FillingSystemId", "WorkOrder", "ColorName", "ColorCategory", "ColorTypeRevision", "CartridgeSize", "FilledInkVolume", "InkBatchNum", "InkMFGDate", "InkEOLDate", "CartridgeFillingDate", "WasteFilledDate", "PlugInCounter", "Misc", "Inkfill", "InkUsed", "InkEmpty", "WasteEmpty", "WasteFilling", "WasteFull", "Blocked", "Fail", "WasteCounter", "MachineIdInkUsed", "MachineIdWasteUsed", "Counter", "TagValid", "HashValue", "ChecksumCRC16" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.CartridgeTagContent), global::Tango.PMR.Diagnostics.CartridgeTagContent.Parser, new[]{ "TagUniqueID", "CartSN", "InkFactoryID", "FillSysID", "WorkOrder", "ColorName", "InkCategory", "TypeRev", "CartridgeSize", "FiledInkVol", "InkBatchNo", "InkMFGDate", "InkEOLDate", "CartFillDate", "WasteFillDate", "Misc", "PluginCounter", "InkFillStatus", "InkUsedStatus", "InkEmptyStatus", "WasteEmptyStatus", "WasteFillingStatus", "WasteFullStatus", "Blocked", "Fail", "WasteCounter", "MachineIdINL", "MachineIdWST", "Spare", "Counter", "TagValid", "HashValue", "ChecksumCRC16" }, null, null, null)
           }));
     }
     #endregion
@@ -74,34 +74,35 @@ namespace Tango.PMR.Diagnostics {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public CartridgeTagContent(CartridgeTagContent other) : this() {
-      uniqueId_ = other.uniqueId_;
-      serialNumber_ = other.serialNumber_;
-      factoryId_ = other.factoryId_;
-      fillingSystemId_ = other.fillingSystemId_;
+      tagUniqueID_ = other.tagUniqueID_;
+      cartSN_ = other.cartSN_;
+      inkFactoryID_ = other.inkFactoryID_;
+      fillSysID_ = other.fillSysID_;
       workOrder_ = other.workOrder_;
       colorName_ = other.colorName_;
-      colorCategory_ = other.colorCategory_;
-      colorTypeRevision_ = other.colorTypeRevision_;
+      inkCategory_ = other.inkCategory_;
+      typeRev_ = other.typeRev_;
       cartridgeSize_ = other.cartridgeSize_;
-      filledInkVolume_ = other.filledInkVolume_;
-      inkBatchNum_ = other.inkBatchNum_;
+      filedInkVol_ = other.filedInkVol_;
+      inkBatchNo_ = other.inkBatchNo_;
       inkMFGDate_ = other.inkMFGDate_;
       inkEOLDate_ = other.inkEOLDate_;
-      cartridgeFillingDate_ = other.cartridgeFillingDate_;
-      wasteFilledDate_ = other.wasteFilledDate_;
-      plugInCounter_ = other.plugInCounter_;
+      cartFillDate_ = other.cartFillDate_;
+      wasteFillDate_ = other.wasteFillDate_;
       misc_ = other.misc_;
-      inkfill_ = other.inkfill_;
-      inkUsed_ = other.inkUsed_;
-      inkEmpty_ = other.inkEmpty_;
-      wasteEmpty_ = other.wasteEmpty_;
-      wasteFilling_ = other.wasteFilling_;
-      wasteFull_ = other.wasteFull_;
+      pluginCounter_ = other.pluginCounter_;
+      inkFillStatus_ = other.inkFillStatus_;
+      inkUsedStatus_ = other.inkUsedStatus_;
+      inkEmptyStatus_ = other.inkEmptyStatus_;
+      wasteEmptyStatus_ = other.wasteEmptyStatus_;
+      wasteFillingStatus_ = other.wasteFillingStatus_;
+      wasteFullStatus_ = other.wasteFullStatus_;
       blocked_ = other.blocked_;
       fail_ = other.fail_;
       wasteCounter_ = other.wasteCounter_;
-      machineIdInkUsed_ = other.machineIdInkUsed_;
-      machineIdWasteUsed_ = other.machineIdWasteUsed_;
+      machineIdINL_ = other.machineIdINL_;
+      machineIdWST_ = other.machineIdWST_;
+      spare_ = other.spare_;
       counter_ = other.counter_;
       tagValid_ = other.tagValid_;
       hashValue_ = other.hashValue_;
@@ -113,53 +114,68 @@ namespace Tango.PMR.Diagnostics {
       return new CartridgeTagContent(this);
     }
 
-    /// <summary>Field number for the "UniqueId" field.</summary>
-    public const int UniqueIdFieldNumber = 1;
-    private string uniqueId_ = "";
+    /// <summary>Field number for the "TagUniqueID" field.</summary>
+    public const int TagUniqueIDFieldNumber = 1;
+    private string tagUniqueID_ = "";
+    /// <summary>
+    ///RFID Tag unique ID
+    /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string UniqueId {
-      get { return uniqueId_; }
+    public string TagUniqueID {
+      get { return tagUniqueID_; }
       set {
-        uniqueId_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+        tagUniqueID_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
 
-    /// <summary>Field number for the "SerialNumber" field.</summary>
-    public const int SerialNumberFieldNumber = 2;
-    private string serialNumber_ = "";
+    /// <summary>Field number for the "CartSN" field.</summary>
+    public const int CartSNFieldNumber = 2;
+    private string cartSN_ = "";
+    /// <summary>
+    ///Cartridge serial number
+    /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string SerialNumber {
-      get { return serialNumber_; }
+    public string CartSN {
+      get { return cartSN_; }
       set {
-        serialNumber_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+        cartSN_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
 
-    /// <summary>Field number for the "FactoryId" field.</summary>
-    public const int FactoryIdFieldNumber = 3;
-    private int factoryId_;
+    /// <summary>Field number for the "InkFactoryID" field.</summary>
+    public const int InkFactoryIDFieldNumber = 3;
+    private uint inkFactoryID_;
+    /// <summary>
+    ///Ink factory ID
+    /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int FactoryId {
-      get { return factoryId_; }
+    public uint InkFactoryID {
+      get { return inkFactoryID_; }
       set {
-        factoryId_ = value;
+        inkFactoryID_ = value;
       }
     }
 
-    /// <summary>Field number for the "FillingSystemId" field.</summary>
-    public const int FillingSystemIdFieldNumber = 4;
-    private int fillingSystemId_;
+    /// <summary>Field number for the "FillSysID" field.</summary>
+    public const int FillSysIDFieldNumber = 4;
+    private uint fillSysID_;
+    /// <summary>
+    ///Filling system ID number
+    /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int FillingSystemId {
-      get { return fillingSystemId_; }
+    public uint FillSysID {
+      get { return fillSysID_; }
       set {
-        fillingSystemId_ = value;
+        fillSysID_ = value;
       }
     }
 
     /// <summary>Field number for the "WorkOrder" field.</summary>
     public const int WorkOrderFieldNumber = 5;
     private string workOrder_ = "";
+    /// <summary>
+    ///Color description / ID
+    /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public string WorkOrder {
       get { return workOrder_; }
@@ -171,6 +187,9 @@ namespace Tango.PMR.Diagnostics {
     /// <summary>Field number for the "ColorName" field.</summary>
     public const int ColorNameFieldNumber = 6;
     private string colorName_ = "";
+    /// <summary>
+    ///Color description / ID
+    /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public string ColorName {
       get { return colorName_; }
@@ -179,64 +198,82 @@ namespace Tango.PMR.Diagnostics {
       }
     }
 
-    /// <summary>Field number for the "ColorCategory" field.</summary>
-    public const int ColorCategoryFieldNumber = 7;
-    private int colorCategory_;
+    /// <summary>Field number for the "InkCategory" field.</summary>
+    public const int InkCategoryFieldNumber = 7;
+    private uint inkCategory_;
+    /// <summary>
+    ///Ink category (TBD)
+    /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int ColorCategory {
-      get { return colorCategory_; }
+    public uint InkCategory {
+      get { return inkCategory_; }
       set {
-        colorCategory_ = value;
+        inkCategory_ = value;
       }
     }
 
-    /// <summary>Field number for the "ColorTypeRevision" field.</summary>
-    public const int ColorTypeRevisionFieldNumber = 8;
-    private int colorTypeRevision_;
+    /// <summary>Field number for the "Type_Rev" field.</summary>
+    public const int TypeRevFieldNumber = 8;
+    private uint typeRev_;
+    /// <summary>
+    ///TBD � can be formulation #
+    /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int ColorTypeRevision {
-      get { return colorTypeRevision_; }
+    public uint TypeRev {
+      get { return typeRev_; }
       set {
-        colorTypeRevision_ = value;
+        typeRev_ = value;
       }
     }
 
     /// <summary>Field number for the "CartridgeSize" field.</summary>
     public const int CartridgeSizeFieldNumber = 9;
-    private int cartridgeSize_;
+    private uint cartridgeSize_;
+    /// <summary>
+    ///Size in cc
+    /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CartridgeSize {
+    public uint CartridgeSize {
       get { return cartridgeSize_; }
       set {
         cartridgeSize_ = value;
       }
     }
 
-    /// <summary>Field number for the "FilledInkVolume" field.</summary>
-    public const int FilledInkVolumeFieldNumber = 10;
-    private int filledInkVolume_;
+    /// <summary>Field number for the "FiledInkVol" field.</summary>
+    public const int FiledInkVolFieldNumber = 10;
+    private uint filedInkVol_;
+    /// <summary>
+    ///Size in cc
+    /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int FilledInkVolume {
-      get { return filledInkVolume_; }
+    public uint FiledInkVol {
+      get { return filedInkVol_; }
       set {
-        filledInkVolume_ = value;
+        filedInkVol_ = value;
       }
     }
 
-    /// <summary>Field number for the "InkBatchNum" field.</summary>
-    public const int InkBatchNumFieldNumber = 11;
-    private string inkBatchNum_ = "";
+    /// <summary>Field number for the "InkBatchNo" field.</summary>
+    public const int InkBatchNoFieldNumber = 11;
+    private string inkBatchNo_ = "";
+    /// <summary>
+    ///MFG batch No�
+    /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string InkBatchNum {
-      get { return inkBatchNum_; }
+    public string InkBatchNo {
+      get { return inkBatchNo_; }
       set {
-        inkBatchNum_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+        inkBatchNo_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
 
     /// <summary>Field number for the "InkMFGDate" field.</summary>
     public const int InkMFGDateFieldNumber = 12;
     private string inkMFGDate_ = "";
+    /// <summary>
+    ///Date Ink was manufactured (20L container bar-code)
+    /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public string InkMFGDate {
       get { return inkMFGDate_; }
@@ -248,6 +285,9 @@ namespace Tango.PMR.Diagnostics {
     /// <summary>Field number for the "InkEOLDate" field.</summary>
     public const int InkEOLDateFieldNumber = 13;
     private string inkEOLDate_ = "";
+    /// <summary>
+    ///Ink end of life date
+    /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public string InkEOLDate {
       get { return inkEOLDate_; }
@@ -256,41 +296,36 @@ namespace Tango.PMR.Diagnostics {
       }
     }
 
-    /// <summary>Field number for the "CartridgeFillingDate" field.</summary>
-    public const int CartridgeFillingDateFieldNumber = 14;
-    private string cartridgeFillingDate_ = "";
+    /// <summary>Field number for the "CartFillDate" field.</summary>
+    public const int CartFillDateFieldNumber = 14;
+    private string cartFillDate_ = "";
+    /// <summary>
+    ///Date cartridge was filled with ink (CFS)
+    /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string CartridgeFillingDate {
-      get { return cartridgeFillingDate_; }
+    public string CartFillDate {
+      get { return cartFillDate_; }
       set {
-        cartridgeFillingDate_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+        cartFillDate_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
 
-    /// <summary>Field number for the "WasteFilledDate" field.</summary>
-    public const int WasteFilledDateFieldNumber = 15;
-    private string wasteFilledDate_ = "";
+    /// <summary>Field number for the "WasteFillDate" field.</summary>
+    public const int WasteFillDateFieldNumber = 15;
+    private string wasteFillDate_ = "";
+    /// <summary>
+    ///Date cartridge was filled with waste (Machine)
+    /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string WasteFilledDate {
-      get { return wasteFilledDate_; }
+    public string WasteFillDate {
+      get { return wasteFillDate_; }
       set {
-        wasteFilledDate_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
-    /// <summary>Field number for the "PlugInCounter" field.</summary>
-    public const int PlugInCounterFieldNumber = 16;
-    private int plugInCounter_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int PlugInCounter {
-      get { return plugInCounter_; }
-      set {
-        plugInCounter_ = value;
+        wasteFillDate_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
 
     /// <summary>Field number for the "Misc" field.</summary>
-    public const int MiscFieldNumber = 17;
+    public const int MiscFieldNumber = 16;
     private uint misc_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public uint Misc {
@@ -300,69 +335,86 @@ namespace Tango.PMR.Diagnostics {
       }
     }
 
-    /// <summary>Field number for the "Inkfill" field.</summary>
-    public const int InkfillFieldNumber = 18;
-    private bool inkfill_;
+    /// <summary>Field number for the "PluginCounter" field.</summary>
+    public const int PluginCounterFieldNumber = 17;
+    private uint pluginCounter_;
+    /// <summary>
+    ///Number of times cartridge was plugged in INK Slot
+    /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Inkfill {
-      get { return inkfill_; }
+    public uint PluginCounter {
+      get { return pluginCounter_; }
       set {
-        inkfill_ = value;
+        pluginCounter_ = value;
       }
     }
 
-    /// <summary>Field number for the "InkUsed" field.</summary>
-    public const int InkUsedFieldNumber = 19;
-    private bool inkUsed_;
+    /// <summary>Field number for the "InkFillStatus" field.</summary>
+    public const int InkFillStatusFieldNumber = 18;
+    private bool inkFillStatus_;
+    /// <summary>
+    ///State indicator  - successful state change when starting to fill mid. tank
+    /// </summary>
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool InkUsed {
-      get { return inkUsed_; }
+    public bool InkFillStatus {
+      get { return inkFillStatus_; }
       set {
-        inkUsed_ = value;
+        inkFillStatus_ = value;
       }
     }
 
-    /// <summary>Field number for the "InkEmpty" field.</summary>
-    public const int InkEmptyFieldNumber = 20;
-    private bool inkEmpty_;
+    /// <summary>Field number for the "InkUsedStatus" field.</summary>
+    public const int InkUsedStatusFieldNumber = 19;
+    private bool inkUsedStatus_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool InkEmpty {
-      get { return inkEmpty_; }
+    public bool InkUsedStatus {
+      get { return inkUsedStatus_; }
       set {
-        inkEmpty_ = value;
+        inkUsedStatus_ = value;
       }
     }
 
-    /// <summary>Field number for the "WasteEmpty" field.</summary>
-    public const int WasteEmptyFieldNumber = 21;
-    private bool wasteEmpty_;
+    /// <summary>Field number for the "InkEmptyStatus" field.</summary>
+    public const int InkEmptyStatusFieldNumber = 20;
+    private bool inkEmptyStatus_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool WasteEmpty {
-      get { return wasteEmpty_; }
+    public bool InkEmptyStatus {
+      get { return inkEmptyStatus_; }
       set {
-        wasteEmpty_ = value;
+        inkEmptyStatus_ = value;
       }
     }
 
-    /// <summary>Field number for the "WasteFilling" field.</summary>
-    public const int WasteFillingFieldNumber = 22;
-    private bool wasteFilling_;
+    /// <summary>Field number for the "WasteEmptyStatus" field.</summary>
+    public const int WasteEmptyStatusFieldNumber = 21;
+    private bool wasteEmptyStatus_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool WasteFilling {
-      get { return wasteFilling_; }
+    public bool WasteEmptyStatus {
+      get { return wasteEmptyStatus_; }
       set {
-        wasteFilling_ = value;
+        wasteEmptyStatus_ = value;
       }
     }
 
-    /// <summary>Field number for the "WasteFull" field.</summary>
-    public const int WasteFullFieldNumber = 23;
-    private bool wasteFull_;
+    /// <summary>Field number for the "WasteFillingStatus" field.</summary>
+    public const int WasteFillingStatusFieldNumber = 22;
+    private bool wasteFillingStatus_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool WasteFull {
-      get { return wasteFull_; }
+    public bool WasteFillingStatus {
+      get { return wasteFillingStatus_; }
       set {
-        wasteFull_ = value;
+        wasteFillingStatus_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "WasteFullStatus" field.</summary>
+    public const int WasteFullStatusFieldNumber = 23;
+    private bool wasteFullStatus_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool WasteFullStatus {
+      get { return wasteFullStatus_; }
+      set {
+        wasteFullStatus_ = value;
       }
     }
 
@@ -390,39 +442,50 @@ namespace Tango.PMR.Diagnostics {
 
     /// <summary>Field number for the "WasteCounter" field.</summary>
     public const int WasteCounterFieldNumber = 26;
-    private int wasteCounter_;
+    private uint wasteCounter_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int WasteCounter {
+    public uint WasteCounter {
       get { return wasteCounter_; }
       set {
         wasteCounter_ = value;
       }
     }
 
-    /// <summary>Field number for the "MachineIdInkUsed" field.</summary>
-    public const int MachineIdInkUsedFieldNumber = 27;
-    private string machineIdInkUsed_ = "";
+    /// <summary>Field number for the "MachineIdINL" field.</summary>
+    public const int MachineIdINLFieldNumber = 27;
+    private string machineIdINL_ = "";
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public string MachineIdINL {
+      get { return machineIdINL_; }
+      set {
+        machineIdINL_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+      }
+    }
+
+    /// <summary>Field number for the "MachineIdWST" field.</summary>
+    public const int MachineIdWSTFieldNumber = 28;
+    private string machineIdWST_ = "";
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string MachineIdInkUsed {
-      get { return machineIdInkUsed_; }
+    public string MachineIdWST {
+      get { return machineIdWST_; }
       set {
-        machineIdInkUsed_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+        machineIdWST_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
 
-    /// <summary>Field number for the "MachineIdWasteUsed" field.</summary>
-    public const int MachineIdWasteUsedFieldNumber = 28;
-    private string machineIdWasteUsed_ = "";
+    /// <summary>Field number for the "Spare" field.</summary>
+    public const int SpareFieldNumber = 29;
+    private string spare_ = "";
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string MachineIdWasteUsed {
-      get { return machineIdWasteUsed_; }
+    public string Spare {
+      get { return spare_; }
       set {
-        machineIdWasteUsed_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+        spare_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
       }
     }
 
     /// <summary>Field number for the "Counter" field.</summary>
-    public const int CounterFieldNumber = 29;
+    public const int CounterFieldNumber = 30;
     private uint counter_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public uint Counter {
@@ -433,7 +496,7 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "TagValid" field.</summary>
-    public const int TagValidFieldNumber = 30;
+    public const int TagValidFieldNumber = 31;
     private bool tagValid_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public bool TagValid {
@@ -444,7 +507,7 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "HashValue" field.</summary>
-    public const int HashValueFieldNumber = 31;
+    public const int HashValueFieldNumber = 32;
     private string hashValue_ = "";
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public string HashValue {
@@ -455,7 +518,7 @@ namespace Tango.PMR.Diagnostics {
     }
 
     /// <summary>Field number for the "Checksum_CRC16" field.</summary>
-    public const int ChecksumCRC16FieldNumber = 32;
+    public const int ChecksumCRC16FieldNumber = 33;
     private uint checksumCRC16_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public uint ChecksumCRC16 {
@@ -478,34 +541,35 @@ namespace Tango.PMR.Diagnostics {
       if (ReferenceEquals(other, this)) {
         return true;
       }
-      if (UniqueId != other.UniqueId) return false;
-      if (SerialNumber != other.SerialNumber) return false;
-      if (FactoryId != other.FactoryId) return false;
-      if (FillingSystemId != other.FillingSystemId) return false;
+      if (TagUniqueID != other.TagUniqueID) return false;
+      if (CartSN != other.CartSN) return false;
+      if (InkFactoryID != other.InkFactoryID) return false;
+      if (FillSysID != other.FillSysID) return false;
       if (WorkOrder != other.WorkOrder) return false;
       if (ColorName != other.ColorName) return false;
-      if (ColorCategory != other.ColorCategory) return false;
-      if (ColorTypeRevision != other.ColorTypeRevision) return false;
+      if (InkCategory != other.InkCategory) return false;
+      if (TypeRev != other.TypeRev) return false;
       if (CartridgeSize != other.CartridgeSize) return false;
-      if (FilledInkVolume != other.FilledInkVolume) return false;
-      if (InkBatchNum != other.InkBatchNum) return false;
+      if (FiledInkVol != other.FiledInkVol) return false;
+      if (InkBatchNo != other.InkBatchNo) return false;
       if (InkMFGDate != other.InkMFGDate) return false;
       if (InkEOLDate != other.InkEOLDate) return false;
-      if (CartridgeFillingDate != other.CartridgeFillingDate) return false;
-      if (WasteFilledDate != other.WasteFilledDate) return false;
-      if (PlugInCounter != other.PlugInCounter) return false;
+      if (CartFillDate != other.CartFillDate) return false;
+      if (WasteFillDate != other.WasteFillDate) return false;
       if (Misc != other.Misc) return false;
-      if (Inkfill != other.Inkfill) return false;
-      if (InkUsed != other.InkUsed) return false;
-      if (InkEmpty != other.InkEmpty) return false;
-      if (WasteEmpty != other.WasteEmpty) return false;
-      if (WasteFilling != other.WasteFilling) return false;
-      if (WasteFull != other.WasteFull) return false;
+      if (PluginCounter != other.PluginCounter) return false;
+      if (InkFillStatus != other.InkFillStatus) return false;
+      if (InkUsedStatus != other.InkUsedStatus) return false;
+      if (InkEmptyStatus != other.InkEmptyStatus) return false;
+      if (WasteEmptyStatus != other.WasteEmptyStatus) return false;
+      if (WasteFillingStatus != other.WasteFillingStatus) return false;
+      if (WasteFullStatus != other.WasteFullStatus) return false;
       if (Blocked != other.Blocked) return false;
       if (Fail != other.Fail) return false;
       if (WasteCounter != other.WasteCounter) return false;
-      if (MachineIdInkUsed != other.MachineIdInkUsed) return false;
-      if (MachineIdWasteUsed != other.MachineIdWasteUsed) return false;
+      if (MachineIdINL != other.MachineIdINL) return false;
+      if (MachineIdWST != other.MachineIdWST) return false;
+      if (Spare != other.Spare) return false;
       if (Counter != other.Counter) return false;
       if (TagValid != other.TagValid) return false;
       if (HashValue != other.HashValue) return false;
@@ -516,34 +580,35 @@ namespace Tango.PMR.Diagnostics {
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override int GetHashCode() {
       int hash = 1;
-      if (UniqueId.Length != 0) hash ^= UniqueId.GetHashCode();
-      if (SerialNumber.Length != 0) hash ^= SerialNumber.GetHashCode();
-      if (FactoryId != 0) hash ^= FactoryId.GetHashCode();
-      if (FillingSystemId != 0) hash ^= FillingSystemId.GetHashCode();
+      if (TagUniqueID.Length != 0) hash ^= TagUniqueID.GetHashCode();
+      if (CartSN.Length != 0) hash ^= CartSN.GetHashCode();
+      if (InkFactoryID != 0) hash ^= InkFactoryID.GetHashCode();
+      if (FillSysID != 0) hash ^= FillSysID.GetHashCode();
       if (WorkOrder.Length != 0) hash ^= WorkOrder.GetHashCode();
       if (ColorName.Length != 0) hash ^= ColorName.GetHashCode();
-      if (ColorCategory != 0) hash ^= ColorCategory.GetHashCode();
-      if (ColorTypeRevision != 0) hash ^= ColorTypeRevision.GetHashCode();
+      if (InkCategory != 0) hash ^= InkCategory.GetHashCode();
+      if (TypeRev != 0) hash ^= TypeRev.GetHashCode();
       if (CartridgeSize != 0) hash ^= CartridgeSize.GetHashCode();
-      if (FilledInkVolume != 0) hash ^= FilledInkVolume.GetHashCode();
-      if (InkBatchNum.Length != 0) hash ^= InkBatchNum.GetHashCode();
+      if (FiledInkVol != 0) hash ^= FiledInkVol.GetHashCode();
+      if (InkBatchNo.Length != 0) hash ^= InkBatchNo.GetHashCode();
       if (InkMFGDate.Length != 0) hash ^= InkMFGDate.GetHashCode();
       if (InkEOLDate.Length != 0) hash ^= InkEOLDate.GetHashCode();
-      if (CartridgeFillingDate.Length != 0) hash ^= CartridgeFillingDate.GetHashCode();
-      if (WasteFilledDate.Length != 0) hash ^= WasteFilledDate.GetHashCode();
-      if (PlugInCounter != 0) hash ^= PlugInCounter.GetHashCode();
+      if (CartFillDate.Length != 0) hash ^= CartFillDate.GetHashCode();
+      if (WasteFillDate.Length != 0) hash ^= WasteFillDate.GetHashCode();
       if (Misc != 0) hash ^= Misc.GetHashCode();
-      if (Inkfill != false) hash ^= Inkfill.GetHashCode();
-      if (InkUsed != false) hash ^= InkUsed.GetHashCode();
-      if (InkEmpty != false) hash ^= InkEmpty.GetHashCode();
-      if (WasteEmpty != false) hash ^= WasteEmpty.GetHashCode();
-      if (WasteFilling != false) hash ^= WasteFilling.GetHashCode();
-      if (WasteFull != false) hash ^= WasteFull.GetHashCode();
+      if (PluginCounter != 0) hash ^= PluginCounter.GetHashCode();
+      if (InkFillStatus != false) hash ^= InkFillStatus.GetHashCode();
+      if (InkUsedStatus != false) hash ^= InkUsedStatus.GetHashCode();
+      if (InkEmptyStatus != false) hash ^= InkEmptyStatus.GetHashCode();
+      if (WasteEmptyStatus != false) hash ^= WasteEmptyStatus.GetHashCode();
+      if (WasteFillingStatus != false) hash ^= WasteFillingStatus.GetHashCode();
+      if (WasteFullStatus != false) hash ^= WasteFullStatus.GetHashCode();
       if (Blocked != false) hash ^= Blocked.GetHashCode();
       if (Fail != false) hash ^= Fail.GetHashCode();
       if (WasteCounter != 0) hash ^= WasteCounter.GetHashCode();
-      if (MachineIdInkUsed.Length != 0) hash ^= MachineIdInkUsed.GetHashCode();
-      if (MachineIdWasteUsed.Length != 0) hash ^= MachineIdWasteUsed.GetHashCode();
+      if (MachineIdINL.Length != 0) hash ^= MachineIdINL.GetHashCode();
+      if (MachineIdWST.Length != 0) hash ^= MachineIdWST.GetHashCode();
+      if (Spare.Length != 0) hash ^= Spare.GetHashCode();
       if (Counter != 0) hash ^= Counter.GetHashCode();
       if (TagValid != false) hash ^= TagValid.GetHashCode();
       if (HashValue.Length != 0) hash ^= HashValue.GetHashCode();
@@ -558,21 +623,21 @@ namespace Tango.PMR.Diagnostics {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public void WriteTo(pb::CodedOutputStream output) {
-      if (UniqueId.Length != 0) {
+      if (TagUniqueID.Length != 0) {
         output.WriteRawTag(10);
-        output.WriteString(UniqueId);
+        output.WriteString(TagUniqueID);
       }
-      if (SerialNumber.Length != 0) {
+      if (CartSN.Length != 0) {
         output.WriteRawTag(18);
-        output.WriteString(SerialNumber);
+        output.WriteString(CartSN);
       }
-      if (FactoryId != 0) {
+      if (InkFactoryID != 0) {
         output.WriteRawTag(24);
-        output.WriteInt32(FactoryId);
+        output.WriteUInt32(InkFactoryID);
       }
-      if (FillingSystemId != 0) {
+      if (FillSysID != 0) {
         output.WriteRawTag(32);
-        output.WriteInt32(FillingSystemId);
+        output.WriteUInt32(FillSysID);
       }
       if (WorkOrder.Length != 0) {
         output.WriteRawTag(42);
@@ -582,25 +647,25 @@ namespace Tango.PMR.Diagnostics {
         output.WriteRawTag(50);
         output.WriteString(ColorName);
       }
-      if (ColorCategory != 0) {
+      if (InkCategory != 0) {
         output.WriteRawTag(56);
-        output.WriteInt32(ColorCategory);
+        output.WriteUInt32(InkCategory);
       }
-      if (ColorTypeRevision != 0) {
+      if (TypeRev != 0) {
         output.WriteRawTag(64);
-        output.WriteInt32(ColorTypeRevision);
+        output.WriteUInt32(TypeRev);
       }
       if (CartridgeSize != 0) {
         output.WriteRawTag(72);
-        output.WriteInt32(CartridgeSize);
+        output.WriteUInt32(CartridgeSize);
       }
-      if (FilledInkVolume != 0) {
+      if (FiledInkVol != 0) {
         output.WriteRawTag(80);
-        output.WriteInt32(FilledInkVolume);
+        output.WriteUInt32(FiledInkVol);
       }
-      if (InkBatchNum.Length != 0) {
+      if (InkBatchNo.Length != 0) {
         output.WriteRawTag(90);
-        output.WriteString(InkBatchNum);
+        output.WriteString(InkBatchNo);
       }
       if (InkMFGDate.Length != 0) {
         output.WriteRawTag(98);
@@ -610,45 +675,45 @@ namespace Tango.PMR.Diagnostics {
         output.WriteRawTag(106);
         output.WriteString(InkEOLDate);
       }
-      if (CartridgeFillingDate.Length != 0) {
+      if (CartFillDate.Length != 0) {
         output.WriteRawTag(114);
-        output.WriteString(CartridgeFillingDate);
+        output.WriteString(CartFillDate);
       }
-      if (WasteFilledDate.Length != 0) {
+      if (WasteFillDate.Length != 0) {
         output.WriteRawTag(122);
-        output.WriteString(WasteFilledDate);
+        output.WriteString(WasteFillDate);
       }
-      if (PlugInCounter != 0) {
+      if (Misc != 0) {
         output.WriteRawTag(128, 1);
-        output.WriteInt32(PlugInCounter);
+        output.WriteUInt32(Misc);
       }
-      if (Misc != 0) {
+      if (PluginCounter != 0) {
         output.WriteRawTag(136, 1);
-        output.WriteUInt32(Misc);
+        output.WriteUInt32(PluginCounter);
       }
-      if (Inkfill != false) {
+      if (InkFillStatus != false) {
         output.WriteRawTag(144, 1);
-        output.WriteBool(Inkfill);
+        output.WriteBool(InkFillStatus);
       }
-      if (InkUsed != false) {
+      if (InkUsedStatus != false) {
         output.WriteRawTag(152, 1);
-        output.WriteBool(InkUsed);
+        output.WriteBool(InkUsedStatus);
       }
-      if (InkEmpty != false) {
+      if (InkEmptyStatus != false) {
         output.WriteRawTag(160, 1);
-        output.WriteBool(InkEmpty);
+        output.WriteBool(InkEmptyStatus);
       }
-      if (WasteEmpty != false) {
+      if (WasteEmptyStatus != false) {
         output.WriteRawTag(168, 1);
-        output.WriteBool(WasteEmpty);
+        output.WriteBool(WasteEmptyStatus);
       }
-      if (WasteFilling != false) {
+      if (WasteFillingStatus != false) {
         output.WriteRawTag(176, 1);
-        output.WriteBool(WasteFilling);
+        output.WriteBool(WasteFillingStatus);
       }
-      if (WasteFull != false) {
+      if (WasteFullStatus != false) {
         output.WriteRawTag(184, 1);
-        output.WriteBool(WasteFull);
+        output.WriteBool(WasteFullStatus);
       }
       if (Blocked != false) {
         output.WriteRawTag(192, 1);
@@ -660,30 +725,34 @@ namespace Tango.PMR.Diagnostics {
       }
       if (WasteCounter != 0) {
         output.WriteRawTag(208, 1);
-        output.WriteInt32(WasteCounter);
+        output.WriteUInt32(WasteCounter);
       }
-      if (MachineIdInkUsed.Length != 0) {
+      if (MachineIdINL.Length != 0) {
         output.WriteRawTag(218, 1);
-        output.WriteString(MachineIdInkUsed);
+        output.WriteString(MachineIdINL);
       }
-      if (MachineIdWasteUsed.Length != 0) {
+      if (MachineIdWST.Length != 0) {
         output.WriteRawTag(226, 1);
-        output.WriteString(MachineIdWasteUsed);
+        output.WriteString(MachineIdWST);
+      }
+      if (Spare.Length != 0) {
+        output.WriteRawTag(234, 1);
+        output.WriteString(Spare);
       }
       if (Counter != 0) {
-        output.WriteRawTag(232, 1);
+        output.WriteRawTag(240, 1);
         output.WriteUInt32(Counter);
       }
       if (TagValid != false) {
-        output.WriteRawTag(240, 1);
+        output.WriteRawTag(248, 1);
         output.WriteBool(TagValid);
       }
       if (HashValue.Length != 0) {
-        output.WriteRawTag(250, 1);
+        output.WriteRawTag(130, 2);
         output.WriteString(HashValue);
       }
       if (ChecksumCRC16 != 0) {
-        output.WriteRawTag(128, 2);
+        output.WriteRawTag(136, 2);
         output.WriteUInt32(ChecksumCRC16);
       }
     }
@@ -691,17 +760,17 @@ namespace Tango.PMR.Diagnostics {
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public int CalculateSize() {
       int size = 0;
-      if (UniqueId.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(UniqueId);
+      if (TagUniqueID.Length != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeStringSize(TagUniqueID);
       }
-      if (SerialNumber.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(SerialNumber);
+      if (CartSN.Length != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeStringSize(CartSN);
       }
-      if (FactoryId != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(FactoryId);
+      if (InkFactoryID != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(InkFactoryID);
       }
-      if (FillingSystemId != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(FillingSystemId);
+      if (FillSysID != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(FillSysID);
       }
       if (WorkOrder.Length != 0) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(WorkOrder);
@@ -709,20 +778,20 @@ namespace Tango.PMR.Diagnostics {
       if (ColorName.Length != 0) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(ColorName);
       }
-      if (ColorCategory != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(ColorCategory);
+      if (InkCategory != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(InkCategory);
       }
-      if (ColorTypeRevision != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(ColorTypeRevision);
+      if (TypeRev != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(TypeRev);
       }
       if (CartridgeSize != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(CartridgeSize);
+        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CartridgeSize);
       }
-      if (FilledInkVolume != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeInt32Size(FilledInkVolume);
+      if (FiledInkVol != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(FiledInkVol);
       }
-      if (InkBatchNum.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(InkBatchNum);
+      if (InkBatchNo.Length != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeStringSize(InkBatchNo);
       }
       if (InkMFGDate.Length != 0) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(InkMFGDate);
@@ -730,34 +799,34 @@ namespace Tango.PMR.Diagnostics {
       if (InkEOLDate.Length != 0) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(InkEOLDate);
       }
-      if (CartridgeFillingDate.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(CartridgeFillingDate);
+      if (CartFillDate.Length != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeStringSize(CartFillDate);
       }
-      if (WasteFilledDate.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(WasteFilledDate);
-      }
-      if (PlugInCounter != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(PlugInCounter);
+      if (WasteFillDate.Length != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeStringSize(WasteFillDate);
       }
       if (Misc != 0) {
         size += 2 + pb::CodedOutputStream.ComputeUInt32Size(Misc);
       }
-      if (Inkfill != false) {
+      if (PluginCounter != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeUInt32Size(PluginCounter);
+      }
+      if (InkFillStatus != false) {
         size += 2 + 1;
       }
-      if (InkUsed != false) {
+      if (InkUsedStatus != false) {
         size += 2 + 1;
       }
-      if (InkEmpty != false) {
+      if (InkEmptyStatus != false) {
         size += 2 + 1;
       }
-      if (WasteEmpty != false) {
+      if (WasteEmptyStatus != false) {
         size += 2 + 1;
       }
-      if (WasteFilling != false) {
+      if (WasteFillingStatus != false) {
         size += 2 + 1;
       }
-      if (WasteFull != false) {
+      if (WasteFullStatus != false) {
         size += 2 + 1;
       }
       if (Blocked != false) {
@@ -767,13 +836,16 @@ namespace Tango.PMR.Diagnostics {
         size += 2 + 1;
       }
       if (WasteCounter != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeInt32Size(WasteCounter);
+        size += 2 + pb::CodedOutputStream.ComputeUInt32Size(WasteCounter);
       }
-      if (MachineIdInkUsed.Length != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(MachineIdInkUsed);
+      if (MachineIdINL.Length != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeStringSize(MachineIdINL);
       }
-      if (MachineIdWasteUsed.Length != 0) {
-        size += 2 + pb::CodedOutputStream.ComputeStringSize(MachineIdWasteUsed);
+      if (MachineIdWST.Length != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeStringSize(MachineIdWST);
+      }
+      if (Spare.Length != 0) {
+        size += 2 + pb::CodedOutputStream.ComputeStringSize(Spare);
       }
       if (Counter != 0) {
         size += 2 + pb::CodedOutputStream.ComputeUInt32Size(Counter);
@@ -795,17 +867,17 @@ namespace Tango.PMR.Diagnostics {
       if (other == null) {
         return;
       }
-      if (other.UniqueId.Length != 0) {
-        UniqueId = other.UniqueId;
+      if (other.TagUniqueID.Length != 0) {
+        TagUniqueID = other.TagUniqueID;
       }
-      if (other.SerialNumber.Length != 0) {
-        SerialNumber = other.SerialNumber;
+      if (other.CartSN.Length != 0) {
+        CartSN = other.CartSN;
       }
-      if (other.FactoryId != 0) {
-        FactoryId = other.FactoryId;
+      if (other.InkFactoryID != 0) {
+        InkFactoryID = other.InkFactoryID;
       }
-      if (other.FillingSystemId != 0) {
-        FillingSystemId = other.FillingSystemId;
+      if (other.FillSysID != 0) {
+        FillSysID = other.FillSysID;
       }
       if (other.WorkOrder.Length != 0) {
         WorkOrder = other.WorkOrder;
@@ -813,20 +885,20 @@ namespace Tango.PMR.Diagnostics {
       if (other.ColorName.Length != 0) {
         ColorName = other.ColorName;
       }
-      if (other.ColorCategory != 0) {
-        ColorCategory = other.ColorCategory;
+      if (other.InkCategory != 0) {
+        InkCategory = other.InkCategory;
       }
-      if (other.ColorTypeRevision != 0) {
-        ColorTypeRevision = other.ColorTypeRevision;
+      if (other.TypeRev != 0) {
+        TypeRev = other.TypeRev;
       }
       if (other.CartridgeSize != 0) {
         CartridgeSize = other.CartridgeSize;
       }
-      if (other.FilledInkVolume != 0) {
-        FilledInkVolume = other.FilledInkVolume;
+      if (other.FiledInkVol != 0) {
+        FiledInkVol = other.FiledInkVol;
       }
-      if (other.InkBatchNum.Length != 0) {
-        InkBatchNum = other.InkBatchNum;
+      if (other.InkBatchNo.Length != 0) {
+        InkBatchNo = other.InkBatchNo;
       }
       if (other.InkMFGDate.Length != 0) {
         InkMFGDate = other.InkMFGDate;
@@ -834,35 +906,35 @@ namespace Tango.PMR.Diagnostics {
       if (other.InkEOLDate.Length != 0) {
         InkEOLDate = other.InkEOLDate;
       }
-      if (other.CartridgeFillingDate.Length != 0) {
-        CartridgeFillingDate = other.CartridgeFillingDate;
-      }
-      if (other.WasteFilledDate.Length != 0) {
-        WasteFilledDate = other.WasteFilledDate;
+      if (other.CartFillDate.Length != 0) {
+        CartFillDate = other.CartFillDate;
       }
-      if (other.PlugInCounter != 0) {
-        PlugInCounter = other.PlugInCounter;
+      if (other.WasteFillDate.Length != 0) {
+        WasteFillDate = other.WasteFillDate;
       }
       if (other.Misc != 0) {
         Misc = other.Misc;
       }
-      if (other.Inkfill != false) {
-        Inkfill = other.Inkfill;
+      if (other.PluginCounter != 0) {
+        PluginCounter = other.PluginCounter;
       }
-      if (other.InkUsed != false) {
-        InkUsed = other.InkUsed;
+      if (other.InkFillStatus != false) {
+        InkFillStatus = other.InkFillStatus;
       }
-      if (other.InkEmpty != false) {
-        InkEmpty = other.InkEmpty;
+      if (other.InkUsedStatus != false) {
+        InkUsedStatus = other.InkUsedStatus;
       }
-      if (other.WasteEmpty != false) {
-        WasteEmpty = other.WasteEmpty;
+      if (other.InkEmptyStatus != false) {
+        InkEmptyStatus = other.InkEmptyStatus;
       }
-      if (other.WasteFilling != false) {
-        WasteFilling = other.WasteFilling;
+      if (other.WasteEmptyStatus != false) {
+        WasteEmptyStatus = other.WasteEmptyStatus;
       }
-      if (other.WasteFull != false) {
-        WasteFull = other.WasteFull;
+      if (other.WasteFillingStatus != false) {
+        WasteFillingStatus = other.WasteFillingStatus;
+      }
+      if (other.WasteFullStatus != false) {
+        WasteFullStatus = other.WasteFullStatus;
       }
       if (other.Blocked != false) {
         Blocked = other.Blocked;
@@ -873,11 +945,14 @@ namespace Tango.PMR.Diagnostics {
       if (other.WasteCounter != 0) {
         WasteCounter = other.WasteCounter;
       }
-      if (other.MachineIdInkUsed.Length != 0) {
-        MachineIdInkUsed = other.MachineIdInkUsed;
+      if (other.MachineIdINL.Length != 0) {
+        MachineIdINL = other.MachineIdINL;
+      }
+      if (other.MachineIdWST.Length != 0) {
+        MachineIdWST = other.MachineIdWST;
       }
-      if (other.MachineIdWasteUsed.Length != 0) {
-        MachineIdWasteUsed = other.MachineIdWasteUsed;
+      if (other.Spare.Length != 0) {
+        Spare = other.Spare;
       }
       if (other.Counter != 0) {
         Counter = other.Counter;
@@ -902,19 +977,19 @@ namespace Tango.PMR.Diagnostics {
             input.SkipLastField();
             break;
           case 10: {
-            UniqueId = input.ReadString();
+            TagUniqueID = input.ReadString();
             break;
           }
           case 18: {
-            SerialNumber = input.ReadString();
+            CartSN = input.ReadString();
             break;
           }
           case 24: {
-            FactoryId = input.ReadInt32();
+            InkFactoryID = input.ReadUInt32();
             break;
           }
           case 32: {
-            FillingSystemId = input.ReadInt32();
+            FillSysID = input.ReadUInt32();
             break;
           }
           case 42: {
@@ -926,23 +1001,23 @@ namespace Tango.PMR.Diagnostics {
             break;
           }
           case 56: {
-            ColorCategory = input.ReadInt32();
+            InkCategory = input.ReadUInt32();
             break;
           }
           case 64: {
-            ColorTypeRevision = input.ReadInt32();
+            TypeRev = input.ReadUInt32();
             break;
           }
           case 72: {
-            CartridgeSize = input.ReadInt32();
+            CartridgeSize = input.ReadUInt32();
             break;
           }
           case 80: {
-            FilledInkVolume = input.ReadInt32();
+            FiledInkVol = input.ReadUInt32();
             break;
           }
           case 90: {
-            InkBatchNum = input.ReadString();
+            InkBatchNo = input.ReadString();
             break;
           }
           case 98: {
@@ -954,43 +1029,43 @@ namespace Tango.PMR.Diagnostics {
             break;
           }
           case 114: {
-            CartridgeFillingDate = input.ReadString();
+            CartFillDate = input.ReadString();
             break;
           }
           case 122: {
-            WasteFilledDate = input.ReadString();
+            WasteFillDate = input.ReadString();
             break;
           }
           case 128: {
-            PlugInCounter = input.ReadInt32();
+            Misc = input.ReadUInt32();
             break;
           }
           case 136: {
-            Misc = input.ReadUInt32();
+            PluginCounter = input.ReadUInt32();
             break;
           }
           case 144: {
-            Inkfill = input.ReadBool();
+            InkFillStatus = input.ReadBool();
             break;
           }
           case 152: {
-            InkUsed = input.ReadBool();
+            InkUsedStatus = input.ReadBool();
             break;
           }
           case 160: {
-            InkEmpty = input.ReadBool();
+            InkEmptyStatus = input.ReadBool();
             break;
           }
           case 168: {
-            WasteEmpty = input.ReadBool();
+            WasteEmptyStatus = input.ReadBool();
             break;
           }
           case 176: {
-            WasteFilling = input.ReadBool();
+            WasteFillingStatus = input.ReadBool();
             break;
           }
           case 184: {
-            WasteFull = input.ReadBool();
+            WasteFullStatus = input.ReadBool();
             break;
           }
           case 192: {
@@ -1002,30 +1077,34 @@ namespace Tango.PMR.Diagnostics {
             break;
           }
           case 208: {
-            WasteCounter = input.ReadInt32();
+            WasteCounter = input.ReadUInt32();
             break;
           }
           case 218: {
-            MachineIdInkUsed = input.ReadString();
+            MachineIdINL = input.ReadString();
             break;
           }
           case 226: {
-            MachineIdWasteUsed = input.ReadString();
+            MachineIdWST = input.ReadString();
             break;
           }
-          case 232: {
-            Counter = input.ReadUInt32();
+          case 234: {
+            Spare = input.ReadString();
             break;
           }
           case 240: {
+            Counter = input.ReadUInt32();
+            break;
+          }
+          case 248: {
             TagValid = input.ReadBool();
             break;
           }
-          case 250: {
+          case 258: {
             HashValue = input.ReadString();
             break;
           }
-          case 256: {
+          case 264: {
             ChecksumCRC16 = input.ReadUInt32();
             break;
           }
diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/StartCartridgesUpdateRequest.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/StartCartridgesUpdateRequest.cs
deleted file mode 100644
index b21b24a86..000000000
--- a/Software/Visual_Studio/Tango.PMR/Diagnostics/StartCartridgesUpdateRequest.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: StartCartridgesUpdateRequest.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Tango.PMR.Diagnostics {
-
-  /// <summary>Holder for reflection information generated from StartCartridgesUpdateRequest.proto</summary>
-  public static partial class StartCartridgesUpdateRequestReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for StartCartridgesUpdateRequest.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static StartCartridgesUpdateRequestReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "CiJTdGFydENhcnRyaWRnZXNVcGRhdGVSZXF1ZXN0LnByb3RvEhVUYW5nby5Q",
-            "TVIuRGlhZ25vc3RpY3MiHgocU3RhcnRDYXJ0cmlkZ2VzVXBkYXRlUmVxdWVz",
-            "dEIhCh9jb20udHdpbmUudGFuZ28ucG1yLmRpYWdub3N0aWNzYgZwcm90bzM="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.StartCartridgesUpdateRequest), global::Tango.PMR.Diagnostics.StartCartridgesUpdateRequest.Parser, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class StartCartridgesUpdateRequest : pb::IMessage<StartCartridgesUpdateRequest> {
-    private static readonly pb::MessageParser<StartCartridgesUpdateRequest> _parser = new pb::MessageParser<StartCartridgesUpdateRequest>(() => new StartCartridgesUpdateRequest());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<StartCartridgesUpdateRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Tango.PMR.Diagnostics.StartCartridgesUpdateRequestReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public StartCartridgesUpdateRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public StartCartridgesUpdateRequest(StartCartridgesUpdateRequest other) : this() {
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public StartCartridgesUpdateRequest Clone() {
-      return new StartCartridgesUpdateRequest(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as StartCartridgesUpdateRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(StartCartridgesUpdateRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(StartCartridgesUpdateRequest other) {
-      if (other == null) {
-        return;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/StartCartridgesUpdateResponse.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/StartCartridgesUpdateResponse.cs
deleted file mode 100644
index 3ae89c8ee..000000000
--- a/Software/Visual_Studio/Tango.PMR/Diagnostics/StartCartridgesUpdateResponse.cs
+++ /dev/null
@@ -1,197 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: StartCartridgesUpdateResponse.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Tango.PMR.Diagnostics {
-
-  /// <summary>Holder for reflection information generated from StartCartridgesUpdateResponse.proto</summary>
-  public static partial class StartCartridgesUpdateResponseReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for StartCartridgesUpdateResponse.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static StartCartridgesUpdateResponseReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "CiNTdGFydENhcnRyaWRnZXNVcGRhdGVSZXNwb25zZS5wcm90bxIVVGFuZ28u",
-            "UE1SLkRpYWdub3N0aWNzGg9DYXJ0cmlkZ2UucHJvdG8aFUNhcnRyaWRnZUFj",
-            "dGlvbi5wcm90byKMAQodU3RhcnRDYXJ0cmlkZ2VzVXBkYXRlUmVzcG9uc2US",
-            "MwoJQ2FydHJpZGdlGAEgASgLMiAuVGFuZ28uUE1SLkRpYWdub3N0aWNzLkNh",
-            "cnRyaWRnZRI2CgZBY3Rpb24YAiABKA4yJi5UYW5nby5QTVIuRGlhZ25vc3Rp",
-            "Y3MuQ2FydHJpZGdlQWN0aW9uQiEKH2NvbS50d2luZS50YW5nby5wbXIuZGlh",
-            "Z25vc3RpY3NiBnByb3RvMw=="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { global::Tango.PMR.Diagnostics.CartridgeReflection.Descriptor, global::Tango.PMR.Diagnostics.CartridgeActionReflection.Descriptor, },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.StartCartridgesUpdateResponse), global::Tango.PMR.Diagnostics.StartCartridgesUpdateResponse.Parser, new[]{ "Cartridge", "Action" }, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class StartCartridgesUpdateResponse : pb::IMessage<StartCartridgesUpdateResponse> {
-    private static readonly pb::MessageParser<StartCartridgesUpdateResponse> _parser = new pb::MessageParser<StartCartridgesUpdateResponse>(() => new StartCartridgesUpdateResponse());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<StartCartridgesUpdateResponse> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Tango.PMR.Diagnostics.StartCartridgesUpdateResponseReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public StartCartridgesUpdateResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public StartCartridgesUpdateResponse(StartCartridgesUpdateResponse other) : this() {
-      Cartridge = other.cartridge_ != null ? other.Cartridge.Clone() : null;
-      action_ = other.action_;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public StartCartridgesUpdateResponse Clone() {
-      return new StartCartridgesUpdateResponse(this);
-    }
-
-    /// <summary>Field number for the "Cartridge" field.</summary>
-    public const int CartridgeFieldNumber = 1;
-    private global::Tango.PMR.Diagnostics.Cartridge cartridge_;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::Tango.PMR.Diagnostics.Cartridge Cartridge {
-      get { return cartridge_; }
-      set {
-        cartridge_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "Action" field.</summary>
-    public const int ActionFieldNumber = 2;
-    private global::Tango.PMR.Diagnostics.CartridgeAction action_ = 0;
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public global::Tango.PMR.Diagnostics.CartridgeAction Action {
-      get { return action_; }
-      set {
-        action_ = value;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as StartCartridgesUpdateResponse);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(StartCartridgesUpdateResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      if (!object.Equals(Cartridge, other.Cartridge)) return false;
-      if (Action != other.Action) return false;
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      if (cartridge_ != null) hash ^= Cartridge.GetHashCode();
-      if (Action != 0) hash ^= Action.GetHashCode();
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-      if (cartridge_ != null) {
-        output.WriteRawTag(10);
-        output.WriteMessage(Cartridge);
-      }
-      if (Action != 0) {
-        output.WriteRawTag(16);
-        output.WriteEnum((int) Action);
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      if (cartridge_ != null) {
-        size += 1 + pb::CodedOutputStream.ComputeMessageSize(Cartridge);
-      }
-      if (Action != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) Action);
-      }
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(StartCartridgesUpdateResponse other) {
-      if (other == null) {
-        return;
-      }
-      if (other.cartridge_ != null) {
-        if (cartridge_ == null) {
-          cartridge_ = new global::Tango.PMR.Diagnostics.Cartridge();
-        }
-        Cartridge.MergeFrom(other.Cartridge);
-      }
-      if (other.Action != 0) {
-        Action = other.Action;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-          case 10: {
-            if (cartridge_ == null) {
-              cartridge_ = new global::Tango.PMR.Diagnostics.Cartridge();
-            }
-            input.ReadMessage(cartridge_);
-            break;
-          }
-          case 16: {
-            action_ = (global::Tango.PMR.Diagnostics.CartridgeAction) input.ReadEnum();
-            break;
-          }
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/StopCartridgesUpdateRequest.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/StopCartridgesUpdateRequest.cs
deleted file mode 100644
index 9630b94b9..000000000
--- a/Software/Visual_Studio/Tango.PMR/Diagnostics/StopCartridgesUpdateRequest.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: StopCartridgesUpdateRequest.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Tango.PMR.Diagnostics {
-
-  /// <summary>Holder for reflection information generated from StopCartridgesUpdateRequest.proto</summary>
-  public static partial class StopCartridgesUpdateRequestReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for StopCartridgesUpdateRequest.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static StopCartridgesUpdateRequestReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "CiFTdG9wQ2FydHJpZGdlc1VwZGF0ZVJlcXVlc3QucHJvdG8SFVRhbmdvLlBN",
-            "Ui5EaWFnbm9zdGljcyIdChtTdG9wQ2FydHJpZGdlc1VwZGF0ZVJlcXVlc3RC",
-            "IQofY29tLnR3aW5lLnRhbmdvLnBtci5kaWFnbm9zdGljc2IGcHJvdG8z"));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.StopCartridgesUpdateRequest), global::Tango.PMR.Diagnostics.StopCartridgesUpdateRequest.Parser, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class StopCartridgesUpdateRequest : pb::IMessage<StopCartridgesUpdateRequest> {
-    private static readonly pb::MessageParser<StopCartridgesUpdateRequest> _parser = new pb::MessageParser<StopCartridgesUpdateRequest>(() => new StopCartridgesUpdateRequest());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<StopCartridgesUpdateRequest> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Tango.PMR.Diagnostics.StopCartridgesUpdateRequestReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public StopCartridgesUpdateRequest() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public StopCartridgesUpdateRequest(StopCartridgesUpdateRequest other) : this() {
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public StopCartridgesUpdateRequest Clone() {
-      return new StopCartridgesUpdateRequest(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as StopCartridgesUpdateRequest);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(StopCartridgesUpdateRequest other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(StopCartridgesUpdateRequest other) {
-      if (other == null) {
-        return;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/StopCartridgesUpdateResponse.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/StopCartridgesUpdateResponse.cs
deleted file mode 100644
index a497c980f..000000000
--- a/Software/Visual_Studio/Tango.PMR/Diagnostics/StopCartridgesUpdateResponse.cs
+++ /dev/null
@@ -1,131 +0,0 @@
-// Generated by the protocol buffer compiler.  DO NOT EDIT!
-// source: StopCartridgesUpdateResponse.proto
-#pragma warning disable 1591, 0612, 3021
-#region Designer generated code
-
-using pb = global::Google.Protobuf;
-using pbc = global::Google.Protobuf.Collections;
-using pbr = global::Google.Protobuf.Reflection;
-using scg = global::System.Collections.Generic;
-namespace Tango.PMR.Diagnostics {
-
-  /// <summary>Holder for reflection information generated from StopCartridgesUpdateResponse.proto</summary>
-  public static partial class StopCartridgesUpdateResponseReflection {
-
-    #region Descriptor
-    /// <summary>File descriptor for StopCartridgesUpdateResponse.proto</summary>
-    public static pbr::FileDescriptor Descriptor {
-      get { return descriptor; }
-    }
-    private static pbr::FileDescriptor descriptor;
-
-    static StopCartridgesUpdateResponseReflection() {
-      byte[] descriptorData = global::System.Convert.FromBase64String(
-          string.Concat(
-            "CiJTdG9wQ2FydHJpZGdlc1VwZGF0ZVJlc3BvbnNlLnByb3RvEhVUYW5nby5Q",
-            "TVIuRGlhZ25vc3RpY3MiHgocU3RvcENhcnRyaWRnZXNVcGRhdGVSZXNwb25z",
-            "ZUIhCh9jb20udHdpbmUudGFuZ28ucG1yLmRpYWdub3N0aWNzYgZwcm90bzM="));
-      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
-          new pbr::FileDescriptor[] { },
-          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.StopCartridgesUpdateResponse), global::Tango.PMR.Diagnostics.StopCartridgesUpdateResponse.Parser, null, null, null, null)
-          }));
-    }
-    #endregion
-
-  }
-  #region Messages
-  public sealed partial class StopCartridgesUpdateResponse : pb::IMessage<StopCartridgesUpdateResponse> {
-    private static readonly pb::MessageParser<StopCartridgesUpdateResponse> _parser = new pb::MessageParser<StopCartridgesUpdateResponse>(() => new StopCartridgesUpdateResponse());
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pb::MessageParser<StopCartridgesUpdateResponse> Parser { get { return _parser; } }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public static pbr::MessageDescriptor Descriptor {
-      get { return global::Tango.PMR.Diagnostics.StopCartridgesUpdateResponseReflection.Descriptor.MessageTypes[0]; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    pbr::MessageDescriptor pb::IMessage.Descriptor {
-      get { return Descriptor; }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public StopCartridgesUpdateResponse() {
-      OnConstruction();
-    }
-
-    partial void OnConstruction();
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public StopCartridgesUpdateResponse(StopCartridgesUpdateResponse other) : this() {
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public StopCartridgesUpdateResponse Clone() {
-      return new StopCartridgesUpdateResponse(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override bool Equals(object other) {
-      return Equals(other as StopCartridgesUpdateResponse);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Equals(StopCartridgesUpdateResponse other) {
-      if (ReferenceEquals(other, null)) {
-        return false;
-      }
-      if (ReferenceEquals(other, this)) {
-        return true;
-      }
-      return true;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override int GetHashCode() {
-      int hash = 1;
-      return hash;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public override string ToString() {
-      return pb::JsonFormatter.ToDiagnosticString(this);
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void WriteTo(pb::CodedOutputStream output) {
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public int CalculateSize() {
-      int size = 0;
-      return size;
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(StopCartridgesUpdateResponse other) {
-      if (other == null) {
-        return;
-      }
-    }
-
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public void MergeFrom(pb::CodedInputStream input) {
-      uint tag;
-      while ((tag = input.ReadTag()) != 0) {
-        switch(tag) {
-          default:
-            input.SkipLastField();
-            break;
-        }
-      }
-    }
-
-  }
-
-  #endregion
-
-}
-
-#endregion Designer generated code