merge

1 files changed, 4 insertions, 35 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Connection/DeviceInformation.cs b/Software/Visual_Studio/Tango.PMR/Connection/DeviceInformation.cs
index 3b5b4cfa7..525d751b5 100644
--- a/Software/Visual_Studio/Tango.PMR/Connection/DeviceInformation.cs
+++ b/Software/Visual_Studio/Tango.PMR/Connection/DeviceInformation.cs
@@ -23,16 +23,16 @@ namespace Tango.PMR.Connection {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "ChdEZXZpY2VJbmZvcm1hdGlvbi5wcm90bxIUVGFuZ28uUE1SLkNvbm5lY3Rp",
-            "b24i1AEKEURldmljZUluZm9ybWF0aW9uEgwKBE5hbWUYASABKAkSDwoHVmVy",
+            "b24itwEKEURldmljZUluZm9ybWF0aW9uEgwKBE5hbWUYASABKAkSDwoHVmVy",
             "c2lvbhgCIAEoCRIRCglCdWlsZERhdGUYAyABKAkSFQoNQm9hcmRSZXZpc2lv",
             "bhgEIAEoCRIXCg9Bc3NlbWJseVZlcnNpb24YBSABKAkSFAoMRlBHQTFWZXJz",
             "aW9uGAYgASgJEhQKDEZQR0EyVmVyc2lvbhgHIAEoCRIUCgxGUEdBM1ZlcnNp",
-            "b24YCCABKAkSGwoTRGlhZ25vc3RpY3NJbnRlcnZhbBgJIAEoDUIgCh5jb20u",
-            "dHdpbmUudGFuZ28ucG1yLmNvbm5lY3Rpb25iBnByb3RvMw=="));
+            "b24YCCABKAlCIAoeY29tLnR3aW5lLnRhbmdvLnBtci5jb25uZWN0aW9uYgZw",
+            "cm90bzM="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Connection.DeviceInformation), global::Tango.PMR.Connection.DeviceInformation.Parser, new[]{ "Name", "Version", "BuildDate", "BoardRevision", "AssemblyVersion", "FPGA1Version", "FPGA2Version", "FPGA3Version", "DiagnosticsInterval" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Connection.DeviceInformation), global::Tango.PMR.Connection.DeviceInformation.Parser, new[]{ "Name", "Version", "BuildDate", "BoardRevision", "AssemblyVersion", "FPGA1Version", "FPGA2Version", "FPGA3Version" }, null, null, null)
           }));
     }
     #endregion
@@ -71,7 +71,6 @@ namespace Tango.PMR.Connection {
       fPGA1Version_ = other.fPGA1Version_;
       fPGA2Version_ = other.fPGA2Version_;
       fPGA3Version_ = other.fPGA3Version_;
-      diagnosticsInterval_ = other.diagnosticsInterval_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -167,20 +166,6 @@ namespace Tango.PMR.Connection {
       }
     }
 
-    /// <summary>Field number for the "DiagnosticsInterval" field.</summary>
-    public const int DiagnosticsIntervalFieldNumber = 9;
-    private uint diagnosticsInterval_;
-    /// <summary>
-    ///Diagnostics interval in milliseconds
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public uint DiagnosticsInterval {
-      get { return diagnosticsInterval_; }
-      set {
-        diagnosticsInterval_ = value;
-      }
-    }
-
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as DeviceInformation);
@@ -202,7 +187,6 @@ namespace Tango.PMR.Connection {
       if (FPGA1Version != other.FPGA1Version) return false;
       if (FPGA2Version != other.FPGA2Version) return false;
       if (FPGA3Version != other.FPGA3Version) return false;
-      if (DiagnosticsInterval != other.DiagnosticsInterval) return false;
       return true;
     }
 
@@ -217,7 +201,6 @@ namespace Tango.PMR.Connection {
       if (FPGA1Version.Length != 0) hash ^= FPGA1Version.GetHashCode();
       if (FPGA2Version.Length != 0) hash ^= FPGA2Version.GetHashCode();
       if (FPGA3Version.Length != 0) hash ^= FPGA3Version.GetHashCode();
-      if (DiagnosticsInterval != 0) hash ^= DiagnosticsInterval.GetHashCode();
       return hash;
     }
 
@@ -260,10 +243,6 @@ namespace Tango.PMR.Connection {
         output.WriteRawTag(66);
         output.WriteString(FPGA3Version);
       }
-      if (DiagnosticsInterval != 0) {
-        output.WriteRawTag(72);
-        output.WriteUInt32(DiagnosticsInterval);
-      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -293,9 +272,6 @@ namespace Tango.PMR.Connection {
       if (FPGA3Version.Length != 0) {
         size += 1 + pb::CodedOutputStream.ComputeStringSize(FPGA3Version);
       }
-      if (DiagnosticsInterval != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(DiagnosticsInterval);
-      }
       return size;
     }
 
@@ -328,9 +304,6 @@ namespace Tango.PMR.Connection {
       if (other.FPGA3Version.Length != 0) {
         FPGA3Version = other.FPGA3Version;
       }
-      if (other.DiagnosticsInterval != 0) {
-        DiagnosticsInterval = other.DiagnosticsInterval;
-      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -373,10 +346,6 @@ namespace Tango.PMR.Connection {
             FPGA3Version = input.ReadString();
             break;
           }
-          case 72: {
-            DiagnosticsInterval = input.ReadUInt32();
-            break;
-          }
         }
       }
     }