Jerrycan change impl.

4 files changed, 332 insertions, 8 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs
index d289ba7f0..ce5cdc202 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(
-            "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbirlQwoLTWVz",
+            "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiqiRAoLTWVz",
             "c2FnZVR5cGUSCAoETm9uZRAAEhEKDUVycm9yUmVzcG9uc2UQARIUChBDYWxj",
             "dWxhdGVSZXF1ZXN0EAMSFQoRQ2FsY3VsYXRlUmVzcG9uc2UQBBITCg9Qcm9n",
             "cmVzc1JlcXVlc3QQBRIUChBQcm9ncmVzc1Jlc3BvbnNlEAYSHAoYU3R1YkNh",
@@ -211,12 +211,13 @@ namespace Tango.PMR.Common {
             "EiIKHVN0YXJ0SW5rRmlsbGluZ1N0YXR1c1Jlc3BvbnNlEOFdEh4KGUluaXRp",
             "YXRlSW5rRmlsbGluZ1JlcXVlc3QQ4l0SHwoaSW5pdGlhdGVJbmtGaWxsaW5n",
             "UmVzcG9uc2UQ410SGAoTV2FzdGVSZXBsYWNlUmVxdWVzdBDkXRIZChRXYXN0",
-            "ZVJlcGxhY2VSZXNwb25zZRDlXRIcChdQdXREYXRhU3RvcmVJdGVtUmVxdWVz",
-            "dBDIZRIdChhQdXREYXRhU3RvcmVJdGVtUmVzcG9uc2UQyWUSHAoXR2V0RGF0",
-            "YVN0b3JlSXRlbVJlcXVlc3QQymUSHQoYR2V0RGF0YVN0b3JlSXRlbVJlc3Bv",
-            "bnNlEMtlEiEKHERhdGFTdG9yZUl0ZW1Nb2RpZmllZFJlcXVlc3QQzGUSIgod",
-            "RGF0YVN0b3JlSXRlbU1vZGlmaWVkUmVzcG9uc2UQzWVCHAoaY29tLnR3aW5l",
-            "LnRhbmdvLnBtci5jb21tb25iBnByb3RvMw=="));
+            "ZVJlcGxhY2VSZXNwb25zZRDlXRIcChdTZXRKZXJyaWNhbkxldmVsUmVxdWVz",
+            "dBDmXRIdChhTZXRKZXJyaWNhbkxldmVsUmVzcG9uc2UQ510SHAoXUHV0RGF0",
+            "YVN0b3JlSXRlbVJlcXVlc3QQyGUSHQoYUHV0RGF0YVN0b3JlSXRlbVJlc3Bv",
+            "bnNlEMllEhwKF0dldERhdGFTdG9yZUl0ZW1SZXF1ZXN0EMplEh0KGEdldERh",
+            "dGFTdG9yZUl0ZW1SZXNwb25zZRDLZRIhChxEYXRhU3RvcmVJdGVtTW9kaWZp",
+            "ZWRSZXF1ZXN0EMxlEiIKHURhdGFTdG9yZUl0ZW1Nb2RpZmllZFJlc3BvbnNl",
+            "EM1lQhwKGmNvbS50d2luZS50YW5nby5wbXIuY29tbW9uYgZwcm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Common.MessageType), }, null));
@@ -563,6 +564,8 @@ namespace Tango.PMR.Common {
     [pbr::OriginalName("InitiateInkFillingResponse")] InitiateInkFillingResponse = 12003,
     [pbr::OriginalName("WasteReplaceRequest")] WasteReplaceRequest = 12004,
     [pbr::OriginalName("WasteReplaceResponse")] WasteReplaceResponse = 12005,
+    [pbr::OriginalName("SetJerricanLevelRequest")] SetJerricanLevelRequest = 12006,
+    [pbr::OriginalName("SetJerricanLevelResponse")] SetJerricanLevelResponse = 12007,
     /// <summary>
     ///DataStore
     /// </summary>
diff --git a/Software/Visual_Studio/Tango.PMR/IFS/SetJerricanLevelRequest.cs b/Software/Visual_Studio/Tango.PMR/IFS/SetJerricanLevelRequest.cs
new file mode 100644
index 000000000..a5c5a6777
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/IFS/SetJerricanLevelRequest.cs
@@ -0,0 +1,188 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: SetJerricanLevelRequest.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 SetJerricanLevelRequest.proto</summary>
+  public static partial class SetJerricanLevelRequestReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for SetJerricanLevelRequest.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static SetJerricanLevelRequestReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "Ch1TZXRKZXJyaWNhbkxldmVsUmVxdWVzdC5wcm90bxIXVGFuZ28uUE1SLk1h",
+            "Y2hpbmVTdGF0dXMiQAoXU2V0SmVycmljYW5MZXZlbFJlcXVlc3QSDQoFSW5k",
+            "ZXgYASABKAUSFgoOSW5zZXJ0ZWRMaXRlcnMYAiABKAFCIwohY29tLnR3aW5l",
+            "LnRhbmdvLnBtci5tYWNoaW5lc3RhdHVzYgZwcm90bzM="));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.SetJerricanLevelRequest), global::Tango.PMR.MachineStatus.SetJerricanLevelRequest.Parser, new[]{ "Index", "InsertedLiters" }, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class SetJerricanLevelRequest : pb::IMessage<SetJerricanLevelRequest> {
+    private static readonly pb::MessageParser<SetJerricanLevelRequest> _parser = new pb::MessageParser<SetJerricanLevelRequest>(() => new SetJerricanLevelRequest());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<SetJerricanLevelRequest> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.MachineStatus.SetJerricanLevelRequestReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public SetJerricanLevelRequest() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public SetJerricanLevelRequest(SetJerricanLevelRequest other) : this() {
+      index_ = other.index_;
+      insertedLiters_ = other.insertedLiters_;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public SetJerricanLevelRequest Clone() {
+      return new SetJerricanLevelRequest(this);
+    }
+
+    /// <summary>Field number for the "Index" field.</summary>
+    public const int IndexFieldNumber = 1;
+    private int index_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int Index {
+      get { return index_; }
+      set {
+        index_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "InsertedLiters" field.</summary>
+    public const int InsertedLitersFieldNumber = 2;
+    private double insertedLiters_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double InsertedLiters {
+      get { return insertedLiters_; }
+      set {
+        insertedLiters_ = value;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as SetJerricanLevelRequest);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(SetJerricanLevelRequest other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if (Index != other.Index) return false;
+      if (InsertedLiters != other.InsertedLiters) return false;
+      return true;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override int GetHashCode() {
+      int hash = 1;
+      if (Index != 0) hash ^= Index.GetHashCode();
+      if (InsertedLiters != 0D) hash ^= InsertedLiters.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 (Index != 0) {
+        output.WriteRawTag(8);
+        output.WriteInt32(Index);
+      }
+      if (InsertedLiters != 0D) {
+        output.WriteRawTag(17);
+        output.WriteDouble(InsertedLiters);
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int CalculateSize() {
+      int size = 0;
+      if (Index != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeInt32Size(Index);
+      }
+      if (InsertedLiters != 0D) {
+        size += 1 + 8;
+      }
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(SetJerricanLevelRequest other) {
+      if (other == null) {
+        return;
+      }
+      if (other.Index != 0) {
+        Index = other.Index;
+      }
+      if (other.InsertedLiters != 0D) {
+        InsertedLiters = other.InsertedLiters;
+      }
+    }
+
+    [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: {
+            Index = input.ReadInt32();
+            break;
+          }
+          case 17: {
+            InsertedLiters = input.ReadDouble();
+            break;
+          }
+        }
+      }
+    }
+
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/IFS/SetJerricanLevelResponse.cs b/Software/Visual_Studio/Tango.PMR/IFS/SetJerricanLevelResponse.cs
new file mode 100644
index 000000000..8827a5485
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/IFS/SetJerricanLevelResponse.cs
@@ -0,0 +1,131 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: SetJerricanLevelResponse.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 SetJerricanLevelResponse.proto</summary>
+  public static partial class SetJerricanLevelResponseReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for SetJerricanLevelResponse.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static SetJerricanLevelResponseReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "Ch5TZXRKZXJyaWNhbkxldmVsUmVzcG9uc2UucHJvdG8SF1RhbmdvLlBNUi5N",
+            "YWNoaW5lU3RhdHVzIhoKGFNldEplcnJpY2FuTGV2ZWxSZXNwb25zZUIjCiFj",
+            "b20udHdpbmUudGFuZ28ucG1yLm1hY2hpbmVzdGF0dXNiBnByb3RvMw=="));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.SetJerricanLevelResponse), global::Tango.PMR.MachineStatus.SetJerricanLevelResponse.Parser, null, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class SetJerricanLevelResponse : pb::IMessage<SetJerricanLevelResponse> {
+    private static readonly pb::MessageParser<SetJerricanLevelResponse> _parser = new pb::MessageParser<SetJerricanLevelResponse>(() => new SetJerricanLevelResponse());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<SetJerricanLevelResponse> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.MachineStatus.SetJerricanLevelResponseReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public SetJerricanLevelResponse() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public SetJerricanLevelResponse(SetJerricanLevelResponse other) : this() {
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public SetJerricanLevelResponse Clone() {
+      return new SetJerricanLevelResponse(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as SetJerricanLevelResponse);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(SetJerricanLevelResponse 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(SetJerricanLevelResponse 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 ac425cb03..b5ea1877c 100644
--- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
+++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
@@ -247,6 +247,8 @@
     <Compile Include="IFS\InitiateInkFillingRequest.cs" />
     <Compile Include="IFS\InitiateInkFillingResponse.cs" />
     <Compile Include="IFS\InkFillingStatus.cs" />
+    <Compile Include="IFS\SetJerricanLevelRequest.cs" />
+    <Compile Include="IFS\SetJerricanLevelResponse.cs" />
     <Compile Include="IFS\StartInkFillingStatusRequest.cs" />
     <Compile Include="IFS\StartInkFillingStatusResponse.cs" />
     <Compile Include="IFS\WasteReplaceRequest.cs" />
@@ -525,7 +527,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