Merged short-cycle-mode branch.

5 files changed, 329 insertions, 5 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs
index a46b2d2d0..a96da0f5e 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(
-            "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbirGPwoLTWVz",
+            "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbircPwoLTWVz",
             "c2FnZVR5cGUSCAoETm9uZRAAEhEKDUVycm9yUmVzcG9uc2UQARIUChBDYWxj",
             "dWxhdGVSZXF1ZXN0EAMSFQoRQ2FsY3VsYXRlUmVzcG9uc2UQBBITCg9Qcm9n",
             "cmVzc1JlcXVlc3QQBRIUChBQcm9ncmVzc1Jlc3BvbnNlEAYSHAoYU3R1YkNh",
@@ -502,6 +502,8 @@ namespace Tango.PMR.Common {
     [pbr::OriginalName("StartMachineStatusUpdateResponse")] StartMachineStatusUpdateResponse = 9001,
     [pbr::OriginalName("StopMachineStatusUpdateRequest")] StopMachineStatusUpdateRequest = 9002,
     [pbr::OriginalName("StopMachineStatusUpdateResponse")] StopMachineStatusUpdateResponse = 9003,
+    [pbr::OriginalName("SetInkAutoFillingModeRequest")] SetInkAutoFillingModeRequest = 9004,
+    [pbr::OriginalName("SetInkAutoFillingModeResponse")] SetInkAutoFillingModeResponse = 9005,
     /// <summary>
     ///Power
     /// </summary>
diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs
index dc2713128..ccc02e572 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",
-            "b29sU3RhdGUucHJvdG8i2QEKDU1hY2hpbmVTdGF0dXMSNAoFU3RhdGUYASAB",
+            "b29sU3RhdGUucHJvdG8i+QEKDU1hY2hpbmVTdGF0dXMSNAoFU3RhdGUYASAB",
             "KA4yJS5UYW5nby5QTVIuTWFjaGluZVN0YXR1cy5NYWNoaW5lU3RhdGUSPQoO",
             "SURTUGFja3NMZXZlbHMYAiADKAsyJS5UYW5nby5QTVIuTWFjaGluZVN0YXR1",
             "cy5JRFNQYWNrTGV2ZWwSGgoST3ZlcmFsbFRlbXBlcmF0dXJlGAMgASgBEjcK",
             "ClNwb29sU3RhdGUYBCABKA4yIy5UYW5nby5QTVIuTWFjaGluZVN0YXR1cy5T",
-            "cG9vbFN0YXRlQiMKIWNvbS50d2luZS50YW5nby5wbXIubWFjaGluZXN0YXR1",
-            "c2IGcHJvdG8z"));
+            "cG9vbFN0YXRlEh4KFkF1dG9JbmtGaWxsaW5nRGlzYWJsZWQYBSABKAhCIwoh",
+            "Y29tLnR3aW5lLnRhbmdvLnBtci5tYWNoaW5lc3RhdHVzYgZwcm90bzM="));
       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" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.MachineStatus), global::Tango.PMR.MachineStatus.MachineStatus.Parser, new[]{ "State", "IDSPacksLevels", "OverallTemperature", "SpoolState", "AutoInkFillingDisabled" }, null, null, null)
           }));
     }
     #endregion
@@ -69,6 +69,7 @@ namespace Tango.PMR.MachineStatus {
       iDSPacksLevels_ = other.iDSPacksLevels_.Clone();
       overallTemperature_ = other.overallTemperature_;
       spoolState_ = other.spoolState_;
+      autoInkFillingDisabled_ = other.autoInkFillingDisabled_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -119,6 +120,17 @@ namespace Tango.PMR.MachineStatus {
       }
     }
 
+    /// <summary>Field number for the "AutoInkFillingDisabled" field.</summary>
+    public const int AutoInkFillingDisabledFieldNumber = 5;
+    private bool autoInkFillingDisabled_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool AutoInkFillingDisabled {
+      get { return autoInkFillingDisabled_; }
+      set {
+        autoInkFillingDisabled_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as MachineStatus);
@@ -136,6 +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;
       return true;
     }
 
@@ -146,6 +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();
       return hash;
     }
 
@@ -169,6 +183,10 @@ namespace Tango.PMR.MachineStatus {
         output.WriteRawTag(32);
         output.WriteEnum((int) SpoolState);
       }
+      if (AutoInkFillingDisabled != false) {
+        output.WriteRawTag(40);
+        output.WriteBool(AutoInkFillingDisabled);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -184,6 +202,9 @@ namespace Tango.PMR.MachineStatus {
       if (SpoolState != 0) {
         size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) SpoolState);
       }
+      if (AutoInkFillingDisabled != false) {
+        size += 1 + 1;
+      }
       return size;
     }
 
@@ -202,6 +223,9 @@ namespace Tango.PMR.MachineStatus {
       if (other.SpoolState != 0) {
         SpoolState = other.SpoolState;
       }
+      if (other.AutoInkFillingDisabled != false) {
+        AutoInkFillingDisabled = other.AutoInkFillingDisabled;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -228,6 +252,10 @@ namespace Tango.PMR.MachineStatus {
             spoolState_ = (global::Tango.PMR.MachineStatus.SpoolState) input.ReadEnum();
             break;
           }
+          case 40: {
+            AutoInkFillingDisabled = input.ReadBool();
+            break;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/SetInkAutoFillingModeRequest.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/SetInkAutoFillingModeRequest.cs
new file mode 100644
index 000000000..d41234d99
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/SetInkAutoFillingModeRequest.cs
@@ -0,0 +1,160 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: SetInkAutoFillingModeRequest.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 SetInkAutoFillingModeRequest.proto</summary>
+  public static partial class SetInkAutoFillingModeRequestReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for SetInkAutoFillingModeRequest.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static SetInkAutoFillingModeRequestReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "CiJTZXRJbmtBdXRvRmlsbGluZ01vZGVSZXF1ZXN0LnByb3RvEhdUYW5nby5Q",
+            "TVIuTWFjaGluZVN0YXR1cyIwChxTZXRJbmtBdXRvRmlsbGluZ01vZGVSZXF1",
+            "ZXN0EhAKCERpc2FibGVkGAEgASgIQiMKIWNvbS50d2luZS50YW5nby5wbXIu",
+            "bWFjaGluZXN0YXR1c2IGcHJvdG8z"));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.SetInkAutoFillingModeRequest), global::Tango.PMR.MachineStatus.SetInkAutoFillingModeRequest.Parser, new[]{ "Disabled" }, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class SetInkAutoFillingModeRequest : pb::IMessage<SetInkAutoFillingModeRequest> {
+    private static readonly pb::MessageParser<SetInkAutoFillingModeRequest> _parser = new pb::MessageParser<SetInkAutoFillingModeRequest>(() => new SetInkAutoFillingModeRequest());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<SetInkAutoFillingModeRequest> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.MachineStatus.SetInkAutoFillingModeRequestReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public SetInkAutoFillingModeRequest() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public SetInkAutoFillingModeRequest(SetInkAutoFillingModeRequest other) : this() {
+      disabled_ = other.disabled_;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public SetInkAutoFillingModeRequest Clone() {
+      return new SetInkAutoFillingModeRequest(this);
+    }
+
+    /// <summary>Field number for the "Disabled" field.</summary>
+    public const int DisabledFieldNumber = 1;
+    private bool disabled_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Disabled {
+      get { return disabled_; }
+      set {
+        disabled_ = value;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as SetInkAutoFillingModeRequest);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(SetInkAutoFillingModeRequest other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if (Disabled != other.Disabled) return false;
+      return true;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override int GetHashCode() {
+      int hash = 1;
+      if (Disabled != false) hash ^= Disabled.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 (Disabled != false) {
+        output.WriteRawTag(8);
+        output.WriteBool(Disabled);
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int CalculateSize() {
+      int size = 0;
+      if (Disabled != false) {
+        size += 1 + 1;
+      }
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(SetInkAutoFillingModeRequest other) {
+      if (other == null) {
+        return;
+      }
+      if (other.Disabled != false) {
+        Disabled = other.Disabled;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(pb::CodedInputStream input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            input.SkipLastField();
+            break;
+          case 8: {
+            Disabled = input.ReadBool();
+            break;
+          }
+        }
+      }
+    }
+
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/SetInkAutoFillingModeResponse.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/SetInkAutoFillingModeResponse.cs
new file mode 100644
index 000000000..c59108eb1
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/SetInkAutoFillingModeResponse.cs
@@ -0,0 +1,132 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: SetInkAutoFillingModeResponse.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 SetInkAutoFillingModeResponse.proto</summary>
+  public static partial class SetInkAutoFillingModeResponseReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for SetInkAutoFillingModeResponse.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static SetInkAutoFillingModeResponseReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "CiNTZXRJbmtBdXRvRmlsbGluZ01vZGVSZXNwb25zZS5wcm90bxIXVGFuZ28u",
+            "UE1SLk1hY2hpbmVTdGF0dXMiHwodU2V0SW5rQXV0b0ZpbGxpbmdNb2RlUmVz",
+            "cG9uc2VCIwohY29tLnR3aW5lLnRhbmdvLnBtci5tYWNoaW5lc3RhdHVzYgZw",
+            "cm90bzM="));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.SetInkAutoFillingModeResponse), global::Tango.PMR.MachineStatus.SetInkAutoFillingModeResponse.Parser, null, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class SetInkAutoFillingModeResponse : pb::IMessage<SetInkAutoFillingModeResponse> {
+    private static readonly pb::MessageParser<SetInkAutoFillingModeResponse> _parser = new pb::MessageParser<SetInkAutoFillingModeResponse>(() => new SetInkAutoFillingModeResponse());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<SetInkAutoFillingModeResponse> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.MachineStatus.SetInkAutoFillingModeResponseReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public SetInkAutoFillingModeResponse() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public SetInkAutoFillingModeResponse(SetInkAutoFillingModeResponse other) : this() {
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public SetInkAutoFillingModeResponse Clone() {
+      return new SetInkAutoFillingModeResponse(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as SetInkAutoFillingModeResponse);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(SetInkAutoFillingModeResponse 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(SetInkAutoFillingModeResponse 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/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
index cdd9e23a2..bbe145163 100644
--- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
+++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
@@ -282,6 +282,8 @@
     <Compile Include="MachineStatus\IDSPackLevel.cs" />
     <Compile Include="MachineStatus\MachineState.cs" />
     <Compile Include="MachineStatus\MachineStatus.cs" />
+    <Compile Include="MachineStatus\SetInkAutoFillingModeRequest.cs" />
+    <Compile Include="MachineStatus\SetInkAutoFillingModeResponse.cs" />
     <Compile Include="MachineStatus\SpoolState.cs" />
     <Compile Include="MachineStatus\StartMachineStatusUpdateRequest.cs" />
     <Compile Include="MachineStatus\StartMachineStatusUpdateResponse.cs" />