Implemented ink waste cartridge filling emptying progress.

1 files changed, 35 insertions, 23 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/IFS/CartridgeState.cs b/Software/Visual_Studio/Tango.PMR/IFS/CartridgeState.cs
index 815d7b370..6b2daa8f7 100644
--- a/Software/Visual_Studio/Tango.PMR/IFS/CartridgeState.cs
+++ b/Software/Visual_Studio/Tango.PMR/IFS/CartridgeState.cs
@@ -22,12 +22,13 @@ namespace Tango.PMR.IFS {
     static CartridgeStateReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "ChRDYXJ0cmlkZ2VTdGF0ZS5wcm90bxINVGFuZ28uUE1SLklGUyqoAQoOQ2Fy",
-            "dHJpZGdlU3RhdGUSCAoETm9uZRAAEgoKBkFic2VudBABEgoKBkV4aXN0cxAC",
-            "EgwKCEluc2VydGVkEAMSCwoHRmlsbGluZxAEEhQKEEZpbGxpbmdDb21wbGV0",
-            "ZWQQBRIMCghFbXB0eWluZxAGEhUKEUVtcHR5aW5nQ29tcGxldGVkEAcSCQoF",
-            "RW1wdHkQCBIICgRGdWxsEAkSCQoFRXJyb3IQCkIZChdjb20udHdpbmUudGFu",
-            "Z28ucG1yLmlmc2IGcHJvdG8z"));
+            "ChRDYXJ0cmlkZ2VTdGF0ZS5wcm90bxINVGFuZ28uUE1SLklGUyrPAQoOQ2Fy",
+            "dHJpZGdlU3RhdGUSCAoETm9uZRAAEgoKBkFic2VudBABEgsKB1ByZXNlbnQQ",
+            "AhIMCghJbnNlcnRlZBADEgkKBUVtcHR5EAQSCAoERnVsbBAFEgkKBUVycm9y",
+            "EAYSCwoHRmlsbGluZxAKEhQKEEZpbGxpbmdDb21wbGV0ZWQQCxIRCg1GaWxs",
+            "aW5nRmFpbGVkEAwSDAoIRW1wdHlpbmcQFBIVChFFbXB0eWluZ0NvbXBsZXRl",
+            "ZBAVEhEKDUVtcHlpbmdGYWlsZWQQFkIZChdjb20udHdpbmUudGFuZ28ucG1y",
+            "Lmlmc2IGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.IFS.CartridgeState), }, null));
@@ -36,6 +37,9 @@ namespace Tango.PMR.IFS {
 
   }
   #region Enums
+  /// <summary>
+  ///OT = One Trigger, meaning, the state should be sent once, then return to a none OT state.
+  /// </summary>
   public enum CartridgeState {
     /// <summary>
     ///Unspecified.
@@ -46,41 +50,49 @@ namespace Tango.PMR.IFS {
     /// </summary>
     [pbr::OriginalName("Absent")] Absent = 1,
     /// <summary>
-    ///Waste or ink cartridge exists.
+    ///Waste or ink cartridge present.
     /// </summary>
-    [pbr::OriginalName("Exists")] Exists = 2,
+    [pbr::OriginalName("Present")] Present = 2,
     /// <summary>
-    ///Waste or ink cartridge inserted.
+    ///Waste or ink cartridge inserted. | OT
     /// </summary>
     [pbr::OriginalName("Inserted")] Inserted = 3,
     /// <summary>
-    ///Ink cartridge is now filling...
+    ///Waste or ink cartridge is empty.
     /// </summary>
-    [pbr::OriginalName("Filling")] Filling = 4,
+    [pbr::OriginalName("Empty")] Empty = 4,
     /// <summary>
-    ///Ink cartridge filing completed.
+    ///Waste or ink cartridge is full.
     /// </summary>
-    [pbr::OriginalName("FillingCompleted")] FillingCompleted = 5,
+    [pbr::OriginalName("Full")] Full = 5,
     /// <summary>
-    ///Waste cartridge is emptying...
+    ///Waste or ink is in an error state. (unrelated to filling or emptying)
     /// </summary>
-    [pbr::OriginalName("Emptying")] Emptying = 6,
+    [pbr::OriginalName("Error")] Error = 6,
     /// <summary>
-    ///Waste cartridge emptying completed.
+    ///Ink cartridge is now filling...
     /// </summary>
-    [pbr::OriginalName("EmptyingCompleted")] EmptyingCompleted = 7,
+    [pbr::OriginalName("Filling")] Filling = 10,
     /// <summary>
-    ///Waste or ink cartridge is empty.
+    ///Ink cartridge filing completed. | OT
     /// </summary>
-    [pbr::OriginalName("Empty")] Empty = 8,
+    [pbr::OriginalName("FillingCompleted")] FillingCompleted = 11,
     /// <summary>
-    ///Waste or ink cartridge is full.
+    ///Error occurred while ink filling. | OT
+    /// </summary>
+    [pbr::OriginalName("FillingFailed")] FillingFailed = 12,
+    /// <summary>
+    ///Waste cartridge is emptying...
+    /// </summary>
+    [pbr::OriginalName("Emptying")] Emptying = 20,
+    /// <summary>
+    ///Waste cartridge emptying completed. | OT
     /// </summary>
-    [pbr::OriginalName("Full")] Full = 9,
+    [pbr::OriginalName("EmptyingCompleted")] EmptyingCompleted = 21,
     /// <summary>
-    ///Error occurred while filling or emptying.
+    ///Error occurred while waste emptying. | OT
     /// </summary>
-    [pbr::OriginalName("Error")] Error = 10,
+    [pbr::OriginalName("EmpyingFailed")] EmpyingFailed = 22,
   }
 
   #endregion