Updated required PMR for new Auto Ink Filling default mode.

8 files changed, 191 insertions, 47 deletions

diff --git a/Software/PMR/Messages/Common/MessageType.proto b/Software/PMR/Messages/Common/MessageType.proto
index 753f3392a..ebcb50ccd 100644
--- a/Software/PMR/Messages/Common/MessageType.proto
+++ b/Software/PMR/Messages/Common/MessageType.proto
@@ -319,6 +319,7 @@ enum MessageType
 	//IFS
 	StartInkFillingStatusRequest = 12000;
 	StartInkFillingStatusResponse = 12001;
+	InitiateInkFillingRequest = 12002;
 
 	//DataStore
 	PutDataStoreItemRequest = 13000;
diff --git a/Software/PMR/Messages/IFS/InitiateInkFillingRequest.proto b/Software/PMR/Messages/IFS/InitiateInkFillingRequest.proto
new file mode 100644
index 000000000..6f82accff
--- /dev/null
+++ b/Software/PMR/Messages/IFS/InitiateInkFillingRequest.proto
@@ -0,0 +1,9 @@
+syntax = "proto3";
+
+package Tango.PMR.MachineStatus;
+option java_package = "com.twine.tango.pmr.machinestatus";
+
+message InitiateInkFillingRequest
+{
+    
+}
\ No newline at end of file
diff --git a/Software/PMR/Messages/MachineStatus/SetInkAutoFillingModeRequest.proto b/Software/PMR/Messages/MachineStatus/SetInkAutoFillingModeRequest.proto
index 68bb65fca..9d3647342 100644
--- a/Software/PMR/Messages/MachineStatus/SetInkAutoFillingModeRequest.proto
+++ b/Software/PMR/Messages/MachineStatus/SetInkAutoFillingModeRequest.proto
@@ -5,5 +5,5 @@ option java_package = "com.twine.tango.pmr.machinestatus";
 
 message SetInkAutoFillingModeRequest
 {
-    bool Disabled = 1;
+    bool Enable = 1;
 }
\ No newline at end of file
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs
index 6e1d76d9d..1890fdab7 100644
--- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs
+++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs
@@ -92,11 +92,11 @@ namespace Tango.PPC.Maintenance.ViewModels
             set { _wasteStates = value; RaisePropertyChangedAuto(); }
         }
 
-        private bool _isInkAutoFillingDisabled;
-        public bool IsInkAutoFillingDisabled
+        private bool _isInkAutoFillingEnabled;
+        public bool IsInkAutoFillingEnabled
         {
-            get { return _isInkAutoFillingDisabled; }
-            set { _isInkAutoFillingDisabled = value; RaisePropertyChangedAuto(); OnInkAutoFillingChanged(); }
+            get { return _isInkAutoFillingEnabled; }
+            set { _isInkAutoFillingEnabled = value; RaisePropertyChangedAuto(); OnInkAutoFillingChanged(); }
         }
 
         public RelayCommand ExportLogsCommand { get; set; }
@@ -190,8 +190,8 @@ namespace Tango.PPC.Maintenance.ViewModels
             UpdateMidTankLevels(status);
             OverallTemperature.Temperature = status.OverallTemperature;
             SpoolState = status.SpoolState;
-            _isInkAutoFillingDisabled = status.AutoInkFillingDisabled;
-            RaisePropertyChanged(nameof(IsInkAutoFillingDisabled));
+            _isInkAutoFillingEnabled = status.AutoInkFillingDisabled;
+            RaisePropertyChanged(nameof(IsInkAutoFillingEnabled));
             InvalidateRelayCommands();
         }
 
@@ -335,22 +335,22 @@ namespace Tango.PPC.Maintenance.ViewModels
 
         private async void OnInkAutoFillingChanged()
         {
-            if (IsInkAutoFillingDisabled)
+            if (IsInkAutoFillingEnabled)
             {
                 try
                 {
-                    NotificationProvider.SetGlobalBusyMessage("Disabling auto ink filling...");
+                    NotificationProvider.SetGlobalBusyMessage("Enabling auto ink filling...");
                     await MachineProvider.MachineOperator.SendRequest<SetInkAutoFillingModeRequest, SetInkAutoFillingModeResponse>(new SetInkAutoFillingModeRequest()
                     {
-                        Disabled = true
+                        Enable = true
                     });
                 }
                 catch (Exception ex)
                 {
-                    LogManager.Log(ex, "Error disabling ink filling.");
-                    _isInkAutoFillingDisabled = false;
-                    RaisePropertyChanged(nameof(IsInkAutoFillingDisabled));
-                    await NotificationProvider.ShowError($"Error disabling auto ink filling.\n{ex.Message}");
+                    LogManager.Log(ex, "Error enabling auto ink filling.");
+                    _isInkAutoFillingEnabled = false;
+                    RaisePropertyChanged(nameof(IsInkAutoFillingEnabled));
+                    await NotificationProvider.ShowError($"Error enabling auto ink filling.\n{ex.Message}");
                 }
                 finally
                 {
@@ -361,18 +361,18 @@ namespace Tango.PPC.Maintenance.ViewModels
             {
                 try
                 {
-                    NotificationProvider.SetGlobalBusyMessage("Enabling auto ink filling...");
+                    NotificationProvider.SetGlobalBusyMessage("Disabling auto ink filling...");
                     await MachineProvider.MachineOperator.SendRequest<SetInkAutoFillingModeRequest, SetInkAutoFillingModeResponse>(new SetInkAutoFillingModeRequest()
                     {
-                        Disabled = false
+                        Enable = false
                     });
                 }
                 catch (Exception ex)
                 {
-                    LogManager.Log(ex, "Error enabling ink filling.");
-                    _isInkAutoFillingDisabled = true;
-                    RaisePropertyChanged(nameof(IsInkAutoFillingDisabled));
-                    await NotificationProvider.ShowError($"Error enabling auto ink filling.\n{ex.Message}");
+                    LogManager.Log(ex, "Error disabling auto ink filling.");
+                    _isInkAutoFillingEnabled = true;
+                    RaisePropertyChanged(nameof(IsInkAutoFillingEnabled));
+                    await NotificationProvider.ShowError($"Error disabling auto ink filling.\n{ex.Message}");
                 }
                 finally
                 {
diff --git a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs
index 2612810bf..a24947108 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(
-            "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbir7QAoLTWVz",
+            "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiqbQQoLTWVz",
             "c2FnZVR5cGUSCAoETm9uZRAAEhEKDUVycm9yUmVzcG9uc2UQARIUChBDYWxj",
             "dWxhdGVSZXF1ZXN0EAMSFQoRQ2FsY3VsYXRlUmVzcG9uc2UQBBITCg9Qcm9n",
             "cmVzc1JlcXVlc3QQBRIUChBQcm9ncmVzc1Jlc3BvbnNlEAYSHAoYU3R1YkNh",
@@ -203,12 +203,13 @@ namespace Tango.PMR.Common {
             "Z1Jlc3BvbnNlEP9VEiAKG0F0dGVtcHRUaHJlYWRKb2dnaW5nUmVxdWVzdBCA",
             "VhIhChxBdHRlbXB0VGhyZWFkSm9nZ2luZ1Jlc3BvbnNlEIFWEiEKHFN0YXJ0",
             "SW5rRmlsbGluZ1N0YXR1c1JlcXVlc3QQ4F0SIgodU3RhcnRJbmtGaWxsaW5n",
-            "U3RhdHVzUmVzcG9uc2UQ4V0SHAoXUHV0RGF0YVN0b3JlSXRlbVJlcXVlc3QQ",
-            "yGUSHQoYUHV0RGF0YVN0b3JlSXRlbVJlc3BvbnNlEMllEhwKF0dldERhdGFT",
-            "dG9yZUl0ZW1SZXF1ZXN0EMplEh0KGEdldERhdGFTdG9yZUl0ZW1SZXNwb25z",
-            "ZRDLZRIhChxEYXRhU3RvcmVJdGVtTW9kaWZpZWRSZXF1ZXN0EMxlEiIKHURh",
-            "dGFTdG9yZUl0ZW1Nb2RpZmllZFJlc3BvbnNlEM1lQhwKGmNvbS50d2luZS50",
-            "YW5nby5wbXIuY29tbW9uYgZwcm90bzM="));
+            "U3RhdHVzUmVzcG9uc2UQ4V0SHgoZSW5pdGlhdGVJbmtGaWxsaW5nUmVxdWVz",
+            "dBDiXRIcChdQdXREYXRhU3RvcmVJdGVtUmVxdWVzdBDIZRIdChhQdXREYXRh",
+            "U3RvcmVJdGVtUmVzcG9uc2UQyWUSHAoXR2V0RGF0YVN0b3JlSXRlbVJlcXVl",
+            "c3QQymUSHQoYR2V0RGF0YVN0b3JlSXRlbVJlc3BvbnNlEMtlEiEKHERhdGFT",
+            "dG9yZUl0ZW1Nb2RpZmllZFJlcXVlc3QQzGUSIgodRGF0YVN0b3JlSXRlbU1v",
+            "ZGlmaWVkUmVzcG9uc2UQzWVCHAoaY29tLnR3aW5lLnRhbmdvLnBtci5jb21t",
+            "b25iBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Common.MessageType), }, null));
@@ -543,6 +544,7 @@ namespace Tango.PMR.Common {
     /// </summary>
     [pbr::OriginalName("StartInkFillingStatusRequest")] StartInkFillingStatusRequest = 12000,
     [pbr::OriginalName("StartInkFillingStatusResponse")] StartInkFillingStatusResponse = 12001,
+    [pbr::OriginalName("InitiateInkFillingRequest")] InitiateInkFillingRequest = 12002,
     /// <summary>
     ///DataStore
     /// </summary>
diff --git a/Software/Visual_Studio/Tango.PMR/IFS/InitiateInkFillingRequest.cs b/Software/Visual_Studio/Tango.PMR/IFS/InitiateInkFillingRequest.cs
new file mode 100644
index 000000000..925e54aef
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/IFS/InitiateInkFillingRequest.cs
@@ -0,0 +1,131 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: InitiateInkFillingRequest.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 InitiateInkFillingRequest.proto</summary>
+  public static partial class InitiateInkFillingRequestReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for InitiateInkFillingRequest.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static InitiateInkFillingRequestReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "Ch9Jbml0aWF0ZUlua0ZpbGxpbmdSZXF1ZXN0LnByb3RvEhdUYW5nby5QTVIu",
+            "TWFjaGluZVN0YXR1cyIbChlJbml0aWF0ZUlua0ZpbGxpbmdSZXF1ZXN0QiMK",
+            "IWNvbS50d2luZS50YW5nby5wbXIubWFjaGluZXN0YXR1c2IGcHJvdG8z"));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.InitiateInkFillingRequest), global::Tango.PMR.MachineStatus.InitiateInkFillingRequest.Parser, null, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class InitiateInkFillingRequest : pb::IMessage<InitiateInkFillingRequest> {
+    private static readonly pb::MessageParser<InitiateInkFillingRequest> _parser = new pb::MessageParser<InitiateInkFillingRequest>(() => new InitiateInkFillingRequest());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<InitiateInkFillingRequest> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.MachineStatus.InitiateInkFillingRequestReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public InitiateInkFillingRequest() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public InitiateInkFillingRequest(InitiateInkFillingRequest other) : this() {
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public InitiateInkFillingRequest Clone() {
+      return new InitiateInkFillingRequest(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as InitiateInkFillingRequest);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(InitiateInkFillingRequest 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(InitiateInkFillingRequest 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/SetInkAutoFillingModeRequest.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/SetInkAutoFillingModeRequest.cs
index d41234d99..cfc1b7d40 100644
--- a/Software/Visual_Studio/Tango.PMR/MachineStatus/SetInkAutoFillingModeRequest.cs
+++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/SetInkAutoFillingModeRequest.cs
@@ -23,13 +23,13 @@ namespace Tango.PMR.MachineStatus {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "CiJTZXRJbmtBdXRvRmlsbGluZ01vZGVSZXF1ZXN0LnByb3RvEhdUYW5nby5Q",
-            "TVIuTWFjaGluZVN0YXR1cyIwChxTZXRJbmtBdXRvRmlsbGluZ01vZGVSZXF1",
-            "ZXN0EhAKCERpc2FibGVkGAEgASgIQiMKIWNvbS50d2luZS50YW5nby5wbXIu",
-            "bWFjaGluZXN0YXR1c2IGcHJvdG8z"));
+            "TVIuTWFjaGluZVN0YXR1cyIuChxTZXRJbmtBdXRvRmlsbGluZ01vZGVSZXF1",
+            "ZXN0Eg4KBkVuYWJsZRgBIAEoCEIjCiFjb20udHdpbmUudGFuZ28ucG1yLm1h",
+            "Y2hpbmVzdGF0dXNiBnByb3RvMw=="));
       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)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.SetInkAutoFillingModeRequest), global::Tango.PMR.MachineStatus.SetInkAutoFillingModeRequest.Parser, new[]{ "Enable" }, null, null, null)
           }));
     }
     #endregion
@@ -60,7 +60,7 @@ namespace Tango.PMR.MachineStatus {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public SetInkAutoFillingModeRequest(SetInkAutoFillingModeRequest other) : this() {
-      disabled_ = other.disabled_;
+      enable_ = other.enable_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -68,14 +68,14 @@ namespace Tango.PMR.MachineStatus {
       return new SetInkAutoFillingModeRequest(this);
     }
 
-    /// <summary>Field number for the "Disabled" field.</summary>
-    public const int DisabledFieldNumber = 1;
-    private bool disabled_;
+    /// <summary>Field number for the "Enable" field.</summary>
+    public const int EnableFieldNumber = 1;
+    private bool enable_;
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public bool Disabled {
-      get { return disabled_; }
+    public bool Enable {
+      get { return enable_; }
       set {
-        disabled_ = value;
+        enable_ = value;
       }
     }
 
@@ -92,14 +92,14 @@ namespace Tango.PMR.MachineStatus {
       if (ReferenceEquals(other, this)) {
         return true;
       }
-      if (Disabled != other.Disabled) return false;
+      if (Enable != other.Enable) return false;
       return true;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override int GetHashCode() {
       int hash = 1;
-      if (Disabled != false) hash ^= Disabled.GetHashCode();
+      if (Enable != false) hash ^= Enable.GetHashCode();
       return hash;
     }
 
@@ -110,16 +110,16 @@ namespace Tango.PMR.MachineStatus {
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public void WriteTo(pb::CodedOutputStream output) {
-      if (Disabled != false) {
+      if (Enable != false) {
         output.WriteRawTag(8);
-        output.WriteBool(Disabled);
+        output.WriteBool(Enable);
       }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public int CalculateSize() {
       int size = 0;
-      if (Disabled != false) {
+      if (Enable != false) {
         size += 1 + 1;
       }
       return size;
@@ -130,8 +130,8 @@ namespace Tango.PMR.MachineStatus {
       if (other == null) {
         return;
       }
-      if (other.Disabled != false) {
-        Disabled = other.Disabled;
+      if (other.Enable != false) {
+        Enable = other.Enable;
       }
     }
 
@@ -144,7 +144,7 @@ namespace Tango.PMR.MachineStatus {
             input.SkipLastField();
             break;
           case 8: {
-            Disabled = input.ReadBool();
+            Enable = input.ReadBool();
             break;
           }
         }
diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
index 9577be6a9..7d6c1a68c 100644
--- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
+++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
@@ -238,6 +238,7 @@
     <Compile Include="Hardware\UploadHardwareConfigurationResponse.cs" />
     <Compile Include="IFS\CartridgeState.cs" />
     <Compile Include="IFS\CartridgeStatus.cs" />
+    <Compile Include="IFS\InitiateInkFillingRequest.cs" />
     <Compile Include="IFS\InkFillingStatus.cs" />
     <Compile Include="IFS\StartInkFillingStatusRequest.cs" />
     <Compile Include="IFS\StartInkFillingStatusResponse.cs" />
@@ -511,7 +512,7 @@
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
+      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file