Added support for multiple ColorLib versions !

Added version control and display in RML & Research Module.
Implemented GenerateHive optimizations.

3 files changed, 532 insertions, 0 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/MachineCalibrationData.cs b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/MachineCalibrationData.cs
new file mode 100644
index 000000000..07e83c519
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/MachineCalibrationData.cs
@@ -0,0 +1,232 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: MachineCalibrationData.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 MachineCalibrationData.proto</summary>
+  public static partial class MachineCalibrationDataReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for MachineCalibrationData.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static MachineCalibrationDataReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "ChxNYWNoaW5lQ2FsaWJyYXRpb25EYXRhLnByb3RvEhxUYW5nby5QTVIuRW1i",
+            "ZWRkZWRQYXJhbWV0ZXJzGhFNaWRUYW5rRGF0YS5wcm90byKkAQoWTWFjaGlu",
+            "ZUNhbGlicmF0aW9uRGF0YRIZChFEYW5jZXJNaWRkbGVQb2ludBgBIAMoDRI+",
+            "CgtNaWRUYW5rSW5mbxgCIAMoCzIpLlRhbmdvLlBNUi5FbWJlZGRlZFBhcmFt",
+            "ZXRlcnMuTWlkVGFua0RhdGESGwoTTWFjaGluZVNlcmlhbE51bWJlchgDIAEo",
+            "CRISCgpNQUNBZGRyZXNzGAQgASgJQigKJmNvbS50d2luZS50YW5nby5wbXIu",
+            "ZW1iZWRkZWRwYXJhbWV0ZXJzYgZwcm90bzM="));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { global::Tango.PMR.EmbeddedParameters.MidTankDataReflection.Descriptor, },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.EmbeddedParameters.MachineCalibrationData), global::Tango.PMR.EmbeddedParameters.MachineCalibrationData.Parser, new[]{ "DancerMiddlePoint", "MidTankInfo", "MachineSerialNumber", "MACAddress" }, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class MachineCalibrationData : pb::IMessage<MachineCalibrationData> {
+    private static readonly pb::MessageParser<MachineCalibrationData> _parser = new pb::MessageParser<MachineCalibrationData>(() => new MachineCalibrationData());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<MachineCalibrationData> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.EmbeddedParameters.MachineCalibrationDataReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public MachineCalibrationData() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public MachineCalibrationData(MachineCalibrationData other) : this() {
+      dancerMiddlePoint_ = other.dancerMiddlePoint_.Clone();
+      midTankInfo_ = other.midTankInfo_.Clone();
+      machineSerialNumber_ = other.machineSerialNumber_;
+      mACAddress_ = other.mACAddress_;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public MachineCalibrationData Clone() {
+      return new MachineCalibrationData(this);
+    }
+
+    /// <summary>Field number for the "DancerMiddlePoint" field.</summary>
+    public const int DancerMiddlePointFieldNumber = 1;
+    private static readonly pb::FieldCodec<uint> _repeated_dancerMiddlePoint_codec
+        = pb::FieldCodec.ForUInt32(10);
+    private readonly pbc::RepeatedField<uint> dancerMiddlePoint_ = new pbc::RepeatedField<uint>();
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<uint> DancerMiddlePoint {
+      get { return dancerMiddlePoint_; }
+    }
+
+    /// <summary>Field number for the "MidTankInfo" field.</summary>
+    public const int MidTankInfoFieldNumber = 2;
+    private static readonly pb::FieldCodec<global::Tango.PMR.EmbeddedParameters.MidTankData> _repeated_midTankInfo_codec
+        = pb::FieldCodec.ForMessage(18, global::Tango.PMR.EmbeddedParameters.MidTankData.Parser);
+    private readonly pbc::RepeatedField<global::Tango.PMR.EmbeddedParameters.MidTankData> midTankInfo_ = new pbc::RepeatedField<global::Tango.PMR.EmbeddedParameters.MidTankData>();
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public pbc::RepeatedField<global::Tango.PMR.EmbeddedParameters.MidTankData> MidTankInfo {
+      get { return midTankInfo_; }
+    }
+
+    /// <summary>Field number for the "MachineSerialNumber" field.</summary>
+    public const int MachineSerialNumberFieldNumber = 3;
+    private string machineSerialNumber_ = "";
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public string MachineSerialNumber {
+      get { return machineSerialNumber_; }
+      set {
+        machineSerialNumber_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+      }
+    }
+
+    /// <summary>Field number for the "MACAddress" field.</summary>
+    public const int MACAddressFieldNumber = 4;
+    private string mACAddress_ = "";
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public string MACAddress {
+      get { return mACAddress_; }
+      set {
+        mACAddress_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as MachineCalibrationData);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(MachineCalibrationData other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if(!dancerMiddlePoint_.Equals(other.dancerMiddlePoint_)) return false;
+      if(!midTankInfo_.Equals(other.midTankInfo_)) return false;
+      if (MachineSerialNumber != other.MachineSerialNumber) return false;
+      if (MACAddress != other.MACAddress) return false;
+      return true;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override int GetHashCode() {
+      int hash = 1;
+      hash ^= dancerMiddlePoint_.GetHashCode();
+      hash ^= midTankInfo_.GetHashCode();
+      if (MachineSerialNumber.Length != 0) hash ^= MachineSerialNumber.GetHashCode();
+      if (MACAddress.Length != 0) hash ^= MACAddress.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) {
+      dancerMiddlePoint_.WriteTo(output, _repeated_dancerMiddlePoint_codec);
+      midTankInfo_.WriteTo(output, _repeated_midTankInfo_codec);
+      if (MachineSerialNumber.Length != 0) {
+        output.WriteRawTag(26);
+        output.WriteString(MachineSerialNumber);
+      }
+      if (MACAddress.Length != 0) {
+        output.WriteRawTag(34);
+        output.WriteString(MACAddress);
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int CalculateSize() {
+      int size = 0;
+      size += dancerMiddlePoint_.CalculateSize(_repeated_dancerMiddlePoint_codec);
+      size += midTankInfo_.CalculateSize(_repeated_midTankInfo_codec);
+      if (MachineSerialNumber.Length != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeStringSize(MachineSerialNumber);
+      }
+      if (MACAddress.Length != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeStringSize(MACAddress);
+      }
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(MachineCalibrationData other) {
+      if (other == null) {
+        return;
+      }
+      dancerMiddlePoint_.Add(other.dancerMiddlePoint_);
+      midTankInfo_.Add(other.midTankInfo_);
+      if (other.MachineSerialNumber.Length != 0) {
+        MachineSerialNumber = other.MachineSerialNumber;
+      }
+      if (other.MACAddress.Length != 0) {
+        MACAddress = other.MACAddress;
+      }
+    }
+
+    [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:
+          case 8: {
+            dancerMiddlePoint_.AddEntriesFrom(input, _repeated_dancerMiddlePoint_codec);
+            break;
+          }
+          case 18: {
+            midTankInfo_.AddEntriesFrom(input, _repeated_midTankInfo_codec);
+            break;
+          }
+          case 26: {
+            MachineSerialNumber = input.ReadString();
+            break;
+          }
+          case 34: {
+            MACAddress = input.ReadString();
+            break;
+          }
+        }
+      }
+    }
+
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code
diff --git a/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/MachineCalibrationDataRequest.cs b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/MachineCalibrationDataRequest.cs
new file mode 100644
index 000000000..adbccf6b3
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/MachineCalibrationDataRequest.cs
@@ -0,0 +1,132 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: MachineCalibrationDataRequest.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 MachineCalibrationDataRequest.proto</summary>
+  public static partial class MachineCalibrationDataRequestReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for MachineCalibrationDataRequest.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static MachineCalibrationDataRequestReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "CiNNYWNoaW5lQ2FsaWJyYXRpb25EYXRhUmVxdWVzdC5wcm90bxIcVGFuZ28u",
+            "UE1SLkVtYmVkZGVkUGFyYW1ldGVycyIfCh1NYWNoaW5lQ2FsaWJyYXRpb25E",
+            "YXRhUmVxdWVzdEIoCiZjb20udHdpbmUudGFuZ28ucG1yLmVtYmVkZGVkcGFy",
+            "YW1ldGVyc2IGcHJvdG8z"));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.EmbeddedParameters.MachineCalibrationDataRequest), global::Tango.PMR.EmbeddedParameters.MachineCalibrationDataRequest.Parser, null, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class MachineCalibrationDataRequest : pb::IMessage<MachineCalibrationDataRequest> {
+    private static readonly pb::MessageParser<MachineCalibrationDataRequest> _parser = new pb::MessageParser<MachineCalibrationDataRequest>(() => new MachineCalibrationDataRequest());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<MachineCalibrationDataRequest> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.EmbeddedParameters.MachineCalibrationDataRequestReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public MachineCalibrationDataRequest() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public MachineCalibrationDataRequest(MachineCalibrationDataRequest other) : this() {
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public MachineCalibrationDataRequest Clone() {
+      return new MachineCalibrationDataRequest(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as MachineCalibrationDataRequest);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(MachineCalibrationDataRequest 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(MachineCalibrationDataRequest 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/MachineCalibrationDataResponse.cs b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/MachineCalibrationDataResponse.cs
new file mode 100644
index 000000000..995426f2c
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/EmbeddedParameters/MachineCalibrationDataResponse.cs
@@ -0,0 +1,168 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: MachineCalibrationDataResponse.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 MachineCalibrationDataResponse.proto</summary>
+  public static partial class MachineCalibrationDataResponseReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for MachineCalibrationDataResponse.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static MachineCalibrationDataResponseReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "CiRNYWNoaW5lQ2FsaWJyYXRpb25EYXRhUmVzcG9uc2UucHJvdG8SHFRhbmdv",
+            "LlBNUi5FbWJlZGRlZFBhcmFtZXRlcnMaHE1hY2hpbmVDYWxpYnJhdGlvbkRh",
+            "dGEucHJvdG8idgoeTWFjaGluZUNhbGlicmF0aW9uRGF0YVJlc3BvbnNlElQK",
+            "Fk1hY2hpbmVDYWxpYnJhdGlvbkRhdGEYASABKAsyNC5UYW5nby5QTVIuRW1i",
+            "ZWRkZWRQYXJhbWV0ZXJzLk1hY2hpbmVDYWxpYnJhdGlvbkRhdGFCKAomY29t",
+            "LnR3aW5lLnRhbmdvLnBtci5lbWJlZGRlZHBhcmFtZXRlcnNiBnByb3RvMw=="));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { global::Tango.PMR.EmbeddedParameters.MachineCalibrationDataReflection.Descriptor, },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.EmbeddedParameters.MachineCalibrationDataResponse), global::Tango.PMR.EmbeddedParameters.MachineCalibrationDataResponse.Parser, new[]{ "MachineCalibrationData" }, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class MachineCalibrationDataResponse : pb::IMessage<MachineCalibrationDataResponse> {
+    private static readonly pb::MessageParser<MachineCalibrationDataResponse> _parser = new pb::MessageParser<MachineCalibrationDataResponse>(() => new MachineCalibrationDataResponse());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<MachineCalibrationDataResponse> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.EmbeddedParameters.MachineCalibrationDataResponseReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public MachineCalibrationDataResponse() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public MachineCalibrationDataResponse(MachineCalibrationDataResponse other) : this() {
+      MachineCalibrationData = other.machineCalibrationData_ != null ? other.MachineCalibrationData.Clone() : null;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public MachineCalibrationDataResponse Clone() {
+      return new MachineCalibrationDataResponse(this);
+    }
+
+    /// <summary>Field number for the "MachineCalibrationData" field.</summary>
+    public const int MachineCalibrationDataFieldNumber = 1;
+    private global::Tango.PMR.EmbeddedParameters.MachineCalibrationData machineCalibrationData_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public global::Tango.PMR.EmbeddedParameters.MachineCalibrationData MachineCalibrationData {
+      get { return machineCalibrationData_; }
+      set {
+        machineCalibrationData_ = value;
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as MachineCalibrationDataResponse);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(MachineCalibrationDataResponse other) {
+      if (ReferenceEquals(other, null)) {
+        return false;
+      }
+      if (ReferenceEquals(other, this)) {
+        return true;
+      }
+      if (!object.Equals(MachineCalibrationData, other.MachineCalibrationData)) return false;
+      return true;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override int GetHashCode() {
+      int hash = 1;
+      if (machineCalibrationData_ != null) hash ^= MachineCalibrationData.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 (machineCalibrationData_ != null) {
+        output.WriteRawTag(10);
+        output.WriteMessage(MachineCalibrationData);
+      }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int CalculateSize() {
+      int size = 0;
+      if (machineCalibrationData_ != null) {
+        size += 1 + pb::CodedOutputStream.ComputeMessageSize(MachineCalibrationData);
+      }
+      return size;
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public void MergeFrom(MachineCalibrationDataResponse other) {
+      if (other == null) {
+        return;
+      }
+      if (other.machineCalibrationData_ != null) {
+        if (machineCalibrationData_ == null) {
+          machineCalibrationData_ = new global::Tango.PMR.EmbeddedParameters.MachineCalibrationData();
+        }
+        MachineCalibrationData.MergeFrom(other.MachineCalibrationData);
+      }
+    }
+
+    [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: {
+            if (machineCalibrationData_ == null) {
+              machineCalibrationData_ = new global::Tango.PMR.EmbeddedParameters.MachineCalibrationData();
+            }
+            input.ReadMessage(machineCalibrationData_);
+            break;
+          }
+        }
+      }
+    }
+
+  }
+
+  #endregion
+
+}
+
+#endregion Designer generated code