Compiled latest PMR.

6 files changed, 301 insertions, 8 deletions

diff --git a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk
index 19334a605..e0127e799 100644
--- a/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk
+++ b/Software/Visual_Studio/Build/Shortcuts/Machine Studio.lnk
diff --git a/Software/Visual_Studio/Tango.PMR/ColorLab/ColorSpace.cs b/Software/Visual_Studio/Tango.PMR/ColorLab/ColorSpace.cs
index a1c1cd3a3..7ce723f02 100644
--- a/Software/Visual_Studio/Tango.PMR/ColorLab/ColorSpace.cs
+++ b/Software/Visual_Studio/Tango.PMR/ColorLab/ColorSpace.cs
@@ -22,10 +22,10 @@ namespace Tango.PMR.ColorLab {
     static ColorSpaceReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "ChBDb2xvclNwYWNlLnByb3RvEhJUYW5nby5QTVIuQ29sb3JMYWIqSwoKQ29s",
+            "ChBDb2xvclNwYWNlLnByb3RvEhJUYW5nby5QTVIuQ29sb3JMYWIqSgoKQ29s",
             "b3JTcGFjZRIKCgZWb2x1bWUQABIHCgNSR0IQARIICgRDTVlLEAISBwoDTEFC",
-            "EAMSCgoGUEFOVE9OEAQSCQoFVHdpbmUQBUIeChxjb20udHdpbmUudGFuZ28u",
-            "cG1yLmNvbG9ybGFiYgZwcm90bzM="));
+            "EAMSCQoFQ29hdHMQBBIJCgVUd2luZRAFQh4KHGNvbS50d2luZS50YW5nby5w",
+            "bXIuY29sb3JsYWJiBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.ColorLab.ColorSpace), }, null));
@@ -39,7 +39,7 @@ namespace Tango.PMR.ColorLab {
     [pbr::OriginalName("RGB")] Rgb = 1,
     [pbr::OriginalName("CMYK")] Cmyk = 2,
     [pbr::OriginalName("LAB")] Lab = 3,
-    [pbr::OriginalName("PANTON")] Panton = 4,
+    [pbr::OriginalName("Coats")] Coats = 4,
     [pbr::OriginalName("Twine")] Twine = 5,
   }
 
diff --git a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs
index b378f1ca5..e731b8ce1 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(
-            "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiqeLgoLTWVz",
+            "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbirVLgoLTWVz",
             "c2FnZVR5cGUSCAoETm9uZRAAEhEKDUVycm9yUmVzcG9uc2UQARIUChBDYWxj",
             "dWxhdGVSZXF1ZXN0EAMSFQoRQ2FsY3VsYXRlUmVzcG9uc2UQBBITCg9Qcm9n",
             "cmVzc1JlcXVlc3QQBRIUChBQcm9ncmVzc1Jlc3BvbnNlEAYSHAoYU3R1YkNh",
@@ -154,8 +154,9 @@ namespace Tango.PMR.Common {
             "EOo2Eh4KGUZpbGVDaHVua0Rvd25sb2FkUmVzcG9uc2UQ6zYSGwoWVmFsaWRh",
             "dGVWZXJzaW9uUmVxdWVzdBDsNhIcChdWYWxpZGF0ZVZlcnNpb25SZXNwb25z",
             "ZRDtNhIbChZBY3RpdmF0ZVZlcnNpb25SZXF1ZXN0EO42EhwKF0FjdGl2YXRl",
-            "VmVyc2lvblJlc3BvbnNlEO82QhwKGmNvbS50d2luZS50YW5nby5wbXIuY29t",
-            "bW9uYgZwcm90bzM="));
+            "VmVyc2lvblJlc3BvbnNlEO82EhkKFERpc3BlbnNlckRhdGFSZXF1ZXN0EMA+",
+            "EhoKFURpc3BlbnNlckRhdGFSZXNwb25zZRDBPkIcChpjb20udHdpbmUudGFu",
+            "Z28ucG1yLmNvbW1vbmIGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Common.MessageType), }, null));
@@ -403,6 +404,11 @@ namespace Tango.PMR.Common {
     [pbr::OriginalName("ValidateVersionResponse")] ValidateVersionResponse = 7021,
     [pbr::OriginalName("ActivateVersionRequest")] ActivateVersionRequest = 7022,
     [pbr::OriginalName("ActivateVersionResponse")] ActivateVersionResponse = 7023,
+    /// <summary>
+    ///EmbeddedParameters
+    /// </summary>
+    [pbr::OriginalName("DispenserDataRequest")] DispenserDataRequest = 8000,
+    [pbr::OriginalName("DispenserDataResponse")] DispenserDataResponse = 8001,
   }
 
   #endregion
diff --git a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/DispenserDataRequest.cs b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/DispenserDataRequest.cs
new file mode 100644
index 000000000..5ea95f09a
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/DispenserDataRequest.cs
@@ -0,0 +1,131 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: DispenserDataRequest.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.EmbeddedParameters {
+
+  /// <summary>Holder for reflection information generated from DispenserDataRequest.proto</summary>
+  public static partial class DispenserDataRequestReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for DispenserDataRequest.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static DispenserDataRequestReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "ChpEaXNwZW5zZXJEYXRhUmVxdWVzdC5wcm90bxIcVGFuZ28uUE1SLkVtYmVk",
+            "ZGVkUGFyYW1ldGVycyIWChREaXNwZW5zZXJEYXRhUmVxdWVzdEIoCiZjb20u",
+            "dHdpbmUudGFuZ28ucG1yLmVtYmVkZGVkcGFyYW1ldGVyc2IGcHJvdG8z"));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.EmbeddedParameters.DispenserDataRequest), global::Tango.PMR.EmbeddedParameters.DispenserDataRequest.Parser, null, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class DispenserDataRequest : pb::IMessage<DispenserDataRequest> {
+    private static readonly pb::MessageParser<DispenserDataRequest> _parser = new pb::MessageParser<DispenserDataRequest>(() => new DispenserDataRequest());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<DispenserDataRequest> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.EmbeddedParameters.DispenserDataRequestReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public DispenserDataRequest() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public DispenserDataRequest(DispenserDataRequest other) : this() {
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public DispenserDataRequest Clone() {
+      return new DispenserDataRequest(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as DispenserDataRequest);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(DispenserDataRequest 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(DispenserDataRequest 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/EmbeddedParameters/DispenserDataResponse.cs b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/DispenserDataResponse.cs
new file mode 100644
index 000000000..f3ba643f7
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/DispenserDataResponse.cs
@@ -0,0 +1,154 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: DispenserDataResponse.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.EmbeddedParameters {
+
+  /// <summary>Holder for reflection information generated from DispenserDataResponse.proto</summary>
+  public static partial class DispenserDataResponseReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for DispenserDataResponse.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static DispenserDataResponseReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "ChtEaXNwZW5zZXJEYXRhUmVzcG9uc2UucHJvdG8SHFRhbmdvLlBNUi5FbWJl",
+            "ZGRlZFBhcmFtZXRlcnMaGkRpc3BlbnNlclJ1bm5pbmdEYXRhLnByb3RvImIK",
+            "FURpc3BlbnNlckRhdGFSZXNwb25zZRJJCg1EaXNwZW5zZXJJbmZvGAEgAygL",
+            "MjIuVGFuZ28uUE1SLkVtYmVkZGVkUGFyYW1ldGVycy5EaXNwZW5zZXJSdW5u",
+            "aW5nRGF0YUIoCiZjb20udHdpbmUudGFuZ28ucG1yLmVtYmVkZGVkcGFyYW1l",
+            "dGVyc2IGcHJvdG8z"));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { global::Tango.PMR.EmbeddedParameters.DispenserRunningDataReflection.Descriptor, },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.EmbeddedParameters.DispenserDataResponse), global::Tango.PMR.EmbeddedParameters.DispenserDataResponse.Parser, new[]{ "DispenserInfo" }, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class DispenserDataResponse : pb::IMessage<DispenserDataResponse> {
+    private static readonly pb::MessageParser<DispenserDataResponse> _parser = new pb::MessageParser<DispenserDataResponse>(() => new DispenserDataResponse());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<DispenserDataResponse> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.EmbeddedParameters.DispenserDataResponseReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public DispenserDataResponse() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public DispenserDataResponse(DispenserDataResponse other) : this() {
+      dispenserInfo_ = other.dispenserInfo_.Clone();
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public DispenserDataResponse Clone() {
+      return new DispenserDataResponse(this);
+    }
+
+    /// <summary>Field number for the "DispenserInfo" field.</summary>
+    public const int DispenserInfoFieldNumber = 1;
+    private static readonly pb::FieldCodec<global::Tango.PMR.EmbeddedParameters.DispenserRunningData> _repeated_dispenserInfo_codec
+        = pb::FieldCodec.ForMessage(10, global::Tango.PMR.EmbeddedParameters.DispenserRunningData.Parser);
+    private readonly pbc::RepeatedField<global::Tango.PMR.EmbeddedParameters.DispenserRunningData> dispenserInfo_ = new pbc::RepeatedField<global::Tango.PMR.EmbeddedParameters.DispenserRunningData>();
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<global::Tango.PMR.EmbeddedParameters.DispenserRunningData> DispenserInfo {
+      get { return dispenserInfo_; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as DispenserDataResponse);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(DispenserDataResponse other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if(!dispenserInfo_.Equals(other.dispenserInfo_)) return false;
+      return true;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override int GetHashCode() {
+      int hash = 1;
+      hash ^= dispenserInfo_.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) {
+      dispenserInfo_.WriteTo(output, _repeated_dispenserInfo_codec);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int CalculateSize() {
+      int size = 0;
+      size += dispenserInfo_.CalculateSize(_repeated_dispenserInfo_codec);
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(DispenserDataResponse other) {
+      if (other == null) {
+        return;
+      }
+      dispenserInfo_.Add(other.dispenserInfo_);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(pb::CodedInputStream input) {
+      uint tag;
+      while ((tag = input.ReadTag()) != 0) {
+        switch(tag) {
+          default:
+            input.SkipLastField();
+            break;
+          case 10: {
+            dispenserInfo_.AddEntriesFrom(input, _repeated_dispenserInfo_codec);
+            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 c0ac1e155..6cc8e4c17 100644
--- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
+++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
@@ -139,6 +139,8 @@
     <Compile Include="EmbeddedParameters\AlarmSourceType.cs" />
     <Compile Include="EmbeddedParameters\ConfigurationParameters.cs" />
     <Compile Include="EmbeddedParameters\DispenserData.cs" />
+    <Compile Include="EmbeddedParameters\DispenserDataRequest.cs" />
+    <Compile Include="EmbeddedParameters\DispenserDataResponse.cs" />
     <Compile Include="EmbeddedParameters\DispenserRunningData.cs" />
     <Compile Include="Embroidery\AnalyzeInput.cs" />
     <Compile Include="Embroidery\AnalyzeOutput.cs" />
@@ -273,7 +275,7 @@
   </PropertyGroup>
   <ProjectExtensions>
     <VisualStudio>
-      <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" />
+      <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" />
     </VisualStudio>
   </ProjectExtensions>
 </Project>
\ No newline at end of file