Completed auto/start ink filling change.

4 files changed, 159 insertions, 26 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs
index a24947108..ca81b2050 100644
--- a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs
+++ b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs
@@ -22,7 +22,7 @@ namespace Tango.PMR.Common {
     static MessageTypeReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiqbQQoLTWVz",
+            "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiq8QQoLTWVz",
             "c2FnZVR5cGUSCAoETm9uZRAAEhEKDUVycm9yUmVzcG9uc2UQARIUChBDYWxj",
             "dWxhdGVSZXF1ZXN0EAMSFQoRQ2FsY3VsYXRlUmVzcG9uc2UQBBITCg9Qcm9n",
             "cmVzc1JlcXVlc3QQBRIUChBQcm9ncmVzc1Jlc3BvbnNlEAYSHAoYU3R1YkNh",
@@ -204,12 +204,12 @@ namespace Tango.PMR.Common {
             "VhIhChxBdHRlbXB0VGhyZWFkSm9nZ2luZ1Jlc3BvbnNlEIFWEiEKHFN0YXJ0",
             "SW5rRmlsbGluZ1N0YXR1c1JlcXVlc3QQ4F0SIgodU3RhcnRJbmtGaWxsaW5n",
             "U3RhdHVzUmVzcG9uc2UQ4V0SHgoZSW5pdGlhdGVJbmtGaWxsaW5nUmVxdWVz",
-            "dBDiXRIcChdQdXREYXRhU3RvcmVJdGVtUmVxdWVzdBDIZRIdChhQdXREYXRh",
-            "U3RvcmVJdGVtUmVzcG9uc2UQyWUSHAoXR2V0RGF0YVN0b3JlSXRlbVJlcXVl",
-            "c3QQymUSHQoYR2V0RGF0YVN0b3JlSXRlbVJlc3BvbnNlEMtlEiEKHERhdGFT",
-            "dG9yZUl0ZW1Nb2RpZmllZFJlcXVlc3QQzGUSIgodRGF0YVN0b3JlSXRlbU1v",
-            "ZGlmaWVkUmVzcG9uc2UQzWVCHAoaY29tLnR3aW5lLnRhbmdvLnBtci5jb21t",
-            "b25iBnByb3RvMw=="));
+            "dBDiXRIfChpJbml0aWF0ZUlua0ZpbGxpbmdSZXNwb25zZRDjXRIcChdQdXRE",
+            "YXRhU3RvcmVJdGVtUmVxdWVzdBDIZRIdChhQdXREYXRhU3RvcmVJdGVtUmVz",
+            "cG9uc2UQyWUSHAoXR2V0RGF0YVN0b3JlSXRlbVJlcXVlc3QQymUSHQoYR2V0",
+            "RGF0YVN0b3JlSXRlbVJlc3BvbnNlEMtlEiEKHERhdGFTdG9yZUl0ZW1Nb2Rp",
+            "ZmllZFJlcXVlc3QQzGUSIgodRGF0YVN0b3JlSXRlbU1vZGlmaWVkUmVzcG9u",
+            "c2UQzWVCHAoaY29tLnR3aW5lLnRhbmdvLnBtci5jb21tb25iBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Common.MessageType), }, null));
@@ -545,6 +545,7 @@ namespace Tango.PMR.Common {
     [pbr::OriginalName("StartInkFillingStatusRequest")] StartInkFillingStatusRequest = 12000,
     [pbr::OriginalName("StartInkFillingStatusResponse")] StartInkFillingStatusResponse = 12001,
     [pbr::OriginalName("InitiateInkFillingRequest")] InitiateInkFillingRequest = 12002,
+    [pbr::OriginalName("InitiateInkFillingResponse")] InitiateInkFillingResponse = 12003,
     /// <summary>
     ///DataStore
     /// </summary>
diff --git a/Software/Visual_Studio/Tango.PMR/IFS/InitiateInkFillingResponse.cs b/Software/Visual_Studio/Tango.PMR/IFS/InitiateInkFillingResponse.cs
new file mode 100644
index 000000000..b5297c054
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/IFS/InitiateInkFillingResponse.cs
@@ -0,0 +1,131 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: InitiateInkFillingResponse.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.MachineStatus {
+
+  /// <summary>Holder for reflection information generated from InitiateInkFillingResponse.proto</summary>
+  public static partial class InitiateInkFillingResponseReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for InitiateInkFillingResponse.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static InitiateInkFillingResponseReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "CiBJbml0aWF0ZUlua0ZpbGxpbmdSZXNwb25zZS5wcm90bxIXVGFuZ28uUE1S",
+            "Lk1hY2hpbmVTdGF0dXMiHAoaSW5pdGlhdGVJbmtGaWxsaW5nUmVzcG9uc2VC",
+            "IwohY29tLnR3aW5lLnRhbmdvLnBtci5tYWNoaW5lc3RhdHVzYgZwcm90bzM="));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.InitiateInkFillingResponse), global::Tango.PMR.MachineStatus.InitiateInkFillingResponse.Parser, null, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class InitiateInkFillingResponse : pb::IMessage<InitiateInkFillingResponse> {
+    private static readonly pb::MessageParser<InitiateInkFillingResponse> _parser = new pb::MessageParser<InitiateInkFillingResponse>(() => new InitiateInkFillingResponse());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<InitiateInkFillingResponse> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.MachineStatus.InitiateInkFillingResponseReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public InitiateInkFillingResponse() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public InitiateInkFillingResponse(InitiateInkFillingResponse other) : this() {
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public InitiateInkFillingResponse Clone() {
+      return new InitiateInkFillingResponse(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as InitiateInkFillingResponse);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(InitiateInkFillingResponse 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(InitiateInkFillingResponse 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/MachineStatus/MachineStatus.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs
index ccc02e572..a50669c26 100644
--- a/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs
+++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs
@@ -24,17 +24,17 @@ namespace Tango.PMR.MachineStatus {
           string.Concat(
             "ChNNYWNoaW5lU3RhdHVzLnByb3RvEhdUYW5nby5QTVIuTWFjaGluZVN0YXR1",
             "cxoSTWFjaGluZVN0YXRlLnByb3RvGhJJRFNQYWNrTGV2ZWwucHJvdG8aEFNw",
-            "b29sU3RhdGUucHJvdG8i+QEKDU1hY2hpbmVTdGF0dXMSNAoFU3RhdGUYASAB",
+            "b29sU3RhdGUucHJvdG8i+AEKDU1hY2hpbmVTdGF0dXMSNAoFU3RhdGUYASAB",
             "KA4yJS5UYW5nby5QTVIuTWFjaGluZVN0YXR1cy5NYWNoaW5lU3RhdGUSPQoO",
             "SURTUGFja3NMZXZlbHMYAiADKAsyJS5UYW5nby5QTVIuTWFjaGluZVN0YXR1",
             "cy5JRFNQYWNrTGV2ZWwSGgoST3ZlcmFsbFRlbXBlcmF0dXJlGAMgASgBEjcK",
             "ClNwb29sU3RhdGUYBCABKA4yIy5UYW5nby5QTVIuTWFjaGluZVN0YXR1cy5T",
-            "cG9vbFN0YXRlEh4KFkF1dG9JbmtGaWxsaW5nRGlzYWJsZWQYBSABKAhCIwoh",
-            "Y29tLnR3aW5lLnRhbmdvLnBtci5tYWNoaW5lc3RhdHVzYgZwcm90bzM="));
+            "cG9vbFN0YXRlEh0KFUF1dG9JbmtGaWxsaW5nRW5hYmxlZBgFIAEoCEIjCiFj",
+            "b20udHdpbmUudGFuZ28ucG1yLm1hY2hpbmVzdGF0dXNiBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.MachineStatus.MachineStateReflection.Descriptor, global::Tango.PMR.MachineStatus.IDSPackLevelReflection.Descriptor, global::Tango.PMR.MachineStatus.SpoolStateReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.MachineStatus), global::Tango.PMR.MachineStatus.MachineStatus.Parser, new[]{ "State", "IDSPacksLevels", "OverallTemperature", "SpoolState", "AutoInkFillingDisabled" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.MachineStatus), global::Tango.PMR.MachineStatus.MachineStatus.Parser, new[]{ "State", "IDSPacksLevels", "OverallTemperature", "SpoolState", "AutoInkFillingEnabled" }, null, null, null)
           }));
     }
     #endregion
@@ -69,7 +69,7 @@ namespace Tango.PMR.MachineStatus {
       iDSPacksLevels_ = other.iDSPacksLevels_.Clone();
       overallTemperature_ = other.overallTemperature_;
       spoolState_ = other.spoolState_;
-      autoInkFillingDisabled_ = other.autoInkFillingDisabled_;
+      autoInkFillingEnabled_ = other.autoInkFillingEnabled_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -120,14 +120,14 @@ namespace Tango.PMR.MachineStatus {
       }
     }
 
-    /// <summary>Field number for the "AutoInkFillingDisabled" field.</summary>
-    public const int AutoInkFillingDisabledFieldNumber = 5;
-    private bool autoInkFillingDisabled_;
+    /// <summary>Field number for the "AutoInkFillingEnabled" field.</summary>
+    public const int AutoInkFillingEnabledFieldNumber = 5;
+    private bool autoInkFillingEnabled_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool AutoInkFillingDisabled {
-      get { return autoInkFillingDisabled_; }
+    public bool AutoInkFillingEnabled {
+      get { return autoInkFillingEnabled_; }
       set {
-        autoInkFillingDisabled_ = value;
+        autoInkFillingEnabled_ = value;
       }
     }
 
@@ -148,7 +148,7 @@ namespace Tango.PMR.MachineStatus {
       if(!iDSPacksLevels_.Equals(other.iDSPacksLevels_)) return false;
       if (OverallTemperature != other.OverallTemperature) return false;
       if (SpoolState != other.SpoolState) return false;
-      if (AutoInkFillingDisabled != other.AutoInkFillingDisabled) return false;
+      if (AutoInkFillingEnabled != other.AutoInkFillingEnabled) return false;
       return true;
     }
 
@@ -159,7 +159,7 @@ namespace Tango.PMR.MachineStatus {
       hash ^= iDSPacksLevels_.GetHashCode();
       if (OverallTemperature != 0D) hash ^= OverallTemperature.GetHashCode();
       if (SpoolState != 0) hash ^= SpoolState.GetHashCode();
-      if (AutoInkFillingDisabled != false) hash ^= AutoInkFillingDisabled.GetHashCode();
+      if (AutoInkFillingEnabled != false) hash ^= AutoInkFillingEnabled.GetHashCode();
       return hash;
     }
 
@@ -183,9 +183,9 @@ namespace Tango.PMR.MachineStatus {
         output.WriteRawTag(32);
         output.WriteEnum((int) SpoolState);
       }
-      if (AutoInkFillingDisabled != false) {
+      if (AutoInkFillingEnabled != false) {
         output.WriteRawTag(40);
-        output.WriteBool(AutoInkFillingDisabled);
+        output.WriteBool(AutoInkFillingEnabled);
       }
     }
 
@@ -202,7 +202,7 @@ namespace Tango.PMR.MachineStatus {
       if (SpoolState != 0) {
         size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) SpoolState);
       }
-      if (AutoInkFillingDisabled != false) {
+      if (AutoInkFillingEnabled != false) {
         size += 1 + 1;
       }
       return size;
@@ -223,8 +223,8 @@ namespace Tango.PMR.MachineStatus {
       if (other.SpoolState != 0) {
         SpoolState = other.SpoolState;
       }
-      if (other.AutoInkFillingDisabled != false) {
-        AutoInkFillingDisabled = other.AutoInkFillingDisabled;
+      if (other.AutoInkFillingEnabled != false) {
+        AutoInkFillingEnabled = other.AutoInkFillingEnabled;
       }
     }
 
@@ -253,7 +253,7 @@ namespace Tango.PMR.MachineStatus {
             break;
           }
           case 40: {
-            AutoInkFillingDisabled = input.ReadBool();
+            AutoInkFillingEnabled = input.ReadBool();
             break;
           }
         }
diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
index 7d6c1a68c..9effc3fcf 100644
--- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
+++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
@@ -239,6 +239,7 @@
     <Compile Include="IFS\CartridgeState.cs" />
     <Compile Include="IFS\CartridgeStatus.cs" />
     <Compile Include="IFS\InitiateInkFillingRequest.cs" />
+    <Compile Include="IFS\InitiateInkFillingResponse.cs" />
     <Compile Include="IFS\InkFillingStatus.cs" />
     <Compile Include="IFS\StartInkFillingStatusRequest.cs" />
     <Compile Include="IFS\StartInkFillingStatusResponse.cs" />