merge

1 files changed, 4 insertions, 67 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/StartDiagnosticsResponse.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/StartDiagnosticsResponse.cs
index 81c05c805..1e14a6213 100644
--- a/Software/Visual_Studio/Tango.PMR/Diagnostics/StartDiagnosticsResponse.cs
+++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/StartDiagnosticsResponse.cs
@@ -25,7 +25,7 @@ namespace Tango.PMR.Diagnostics {
             "Ch5TdGFydERpYWdub3N0aWNzUmVzcG9uc2UucHJvdG8SFVRhbmdvLlBNUi5E",
             "aWFnbm9zdGljcxobRGlnaXRhbEludGVyZmFjZVN0YXRlLnByb3RvGhlWYWx1",
             "ZUNvbXBvbmVudFN0YXRlLnByb3RvGhlEaWFnbm9zdGljc01vbml0b3JzLnBy",
-            "b3RvGhFIZWF0ZXJTdGF0ZS5wcm90bxoQVmFsdmVTdGF0ZS5wcm90byKIAwoY",
+            "b3RvGhFIZWF0ZXJTdGF0ZS5wcm90bxoQVmFsdmVTdGF0ZS5wcm90byLgAgoY",
             "U3RhcnREaWFnbm9zdGljc1Jlc3BvbnNlEjwKCE1vbml0b3JzGAEgASgLMiou",
             "VGFuZ28uUE1SLkRpYWdub3N0aWNzLkRpYWdub3N0aWNzTW9uaXRvcnMSTAoW",
             "RGlnaXRhbEludGVyZmFjZVN0YXRlcxgCIAMoCzIsLlRhbmdvLlBNUi5EaWFn",
@@ -33,13 +33,12 @@ namespace Tango.PMR.Diagnostics {
             "YXRlcxgDIAMoCzIqLlRhbmdvLlBNUi5EaWFnbm9zdGljcy5WYWx1ZUNvbXBv",
             "bmVudFN0YXRlEjkKDUhlYXRlcnNTdGF0ZXMYBCADKAsyIi5UYW5nby5QTVIu",
             "RGlhZ25vc3RpY3MuSGVhdGVyU3RhdGUSNwoMVmFsdmVzU3RhdGVzGAUgAygL",
-            "MiEuVGFuZ28uUE1SLkRpYWdub3N0aWNzLlZhbHZlU3RhdGUSFAoMRWxhcHNl",
-            "ZE1pbGxpGAYgASgNEhAKCERhdGVUaW1lGAcgASgJQiEKH2NvbS50d2luZS50",
-            "YW5nby5wbXIuZGlhZ25vc3RpY3NiBnByb3RvMw=="));
+            "MiEuVGFuZ28uUE1SLkRpYWdub3N0aWNzLlZhbHZlU3RhdGVCIQofY29tLnR3",
+            "aW5lLnRhbmdvLnBtci5kaWFnbm9zdGljc2IGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.Diagnostics.DigitalInterfaceStateReflection.Descriptor, global::Tango.PMR.Diagnostics.ValueComponentStateReflection.Descriptor, global::Tango.PMR.Diagnostics.DiagnosticsMonitorsReflection.Descriptor, global::Tango.PMR.Diagnostics.HeaterStateReflection.Descriptor, global::Tango.PMR.Diagnostics.ValveStateReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.StartDiagnosticsResponse), global::Tango.PMR.Diagnostics.StartDiagnosticsResponse.Parser, new[]{ "Monitors", "DigitalInterfaceStates", "ComponentsStates", "HeatersStates", "ValvesStates", "ElapsedMilli", "DateTime" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.StartDiagnosticsResponse), global::Tango.PMR.Diagnostics.StartDiagnosticsResponse.Parser, new[]{ "Monitors", "DigitalInterfaceStates", "ComponentsStates", "HeatersStates", "ValvesStates" }, null, null, null)
           }));
     }
     #endregion
@@ -75,8 +74,6 @@ namespace Tango.PMR.Diagnostics {
       componentsStates_ = other.componentsStates_.Clone();
       heatersStates_ = other.heatersStates_.Clone();
       valvesStates_ = other.valvesStates_.Clone();
-      elapsedMilli_ = other.elapsedMilli_;
-      dateTime_ = other.dateTime_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -150,34 +147,6 @@ namespace Tango.PMR.Diagnostics {
       get { return valvesStates_; }
     }
 
-    /// <summary>Field number for the "ElapsedMilli" field.</summary>
-    public const int ElapsedMilliFieldNumber = 6;
-    private uint elapsedMilli_;
-    /// <summary>
-    ///Milliseconds that had past from the previous StartDiagosticsResponse
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public uint ElapsedMilli {
-      get { return elapsedMilli_; }
-      set {
-        elapsedMilli_ = value;
-      }
-    }
-
-    /// <summary>Field number for the "DateTime" field.</summary>
-    public const int DateTimeFieldNumber = 7;
-    private string dateTime_ = "";
-    /// <summary>
-    ///Emulated date and time of this packet (Use for client software only)
-    /// </summary>
-    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
-    public string DateTime {
-      get { return dateTime_; }
-      set {
-        dateTime_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
-      }
-    }
-
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as StartDiagnosticsResponse);
@@ -196,8 +165,6 @@ namespace Tango.PMR.Diagnostics {
       if(!componentsStates_.Equals(other.componentsStates_)) return false;
       if(!heatersStates_.Equals(other.heatersStates_)) return false;
       if(!valvesStates_.Equals(other.valvesStates_)) return false;
-      if (ElapsedMilli != other.ElapsedMilli) return false;
-      if (DateTime != other.DateTime) return false;
       return true;
     }
 
@@ -209,8 +176,6 @@ namespace Tango.PMR.Diagnostics {
       hash ^= componentsStates_.GetHashCode();
       hash ^= heatersStates_.GetHashCode();
       hash ^= valvesStates_.GetHashCode();
-      if (ElapsedMilli != 0) hash ^= ElapsedMilli.GetHashCode();
-      if (DateTime.Length != 0) hash ^= DateTime.GetHashCode();
       return hash;
     }
 
@@ -229,14 +194,6 @@ namespace Tango.PMR.Diagnostics {
       componentsStates_.WriteTo(output, _repeated_componentsStates_codec);
       heatersStates_.WriteTo(output, _repeated_heatersStates_codec);
       valvesStates_.WriteTo(output, _repeated_valvesStates_codec);
-      if (ElapsedMilli != 0) {
-        output.WriteRawTag(48);
-        output.WriteUInt32(ElapsedMilli);
-      }
-      if (DateTime.Length != 0) {
-        output.WriteRawTag(58);
-        output.WriteString(DateTime);
-      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -249,12 +206,6 @@ namespace Tango.PMR.Diagnostics {
       size += componentsStates_.CalculateSize(_repeated_componentsStates_codec);
       size += heatersStates_.CalculateSize(_repeated_heatersStates_codec);
       size += valvesStates_.CalculateSize(_repeated_valvesStates_codec);
-      if (ElapsedMilli != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeUInt32Size(ElapsedMilli);
-      }
-      if (DateTime.Length != 0) {
-        size += 1 + pb::CodedOutputStream.ComputeStringSize(DateTime);
-      }
       return size;
     }
 
@@ -273,12 +224,6 @@ namespace Tango.PMR.Diagnostics {
       componentsStates_.Add(other.componentsStates_);
       heatersStates_.Add(other.heatersStates_);
       valvesStates_.Add(other.valvesStates_);
-      if (other.ElapsedMilli != 0) {
-        ElapsedMilli = other.ElapsedMilli;
-      }
-      if (other.DateTime.Length != 0) {
-        DateTime = other.DateTime;
-      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -312,14 +257,6 @@ namespace Tango.PMR.Diagnostics {
             valvesStates_.AddEntriesFrom(input, _repeated_valvesStates_codec);
             break;
           }
-          case 48: {
-            ElapsedMilli = input.ReadUInt32();
-            break;
-          }
-          case 58: {
-            DateTime = input.ReadString();
-            break;
-          }
         }
       }
     }