mERGE

1 files changed, 32 insertions, 4 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubHeatingTestPollResponse.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubHeatingTestPollResponse.cs
index 33b500c98..8aef8b020 100644
--- a/Software/Visual_Studio/Tango.PMR/Stubs/StubHeatingTestPollResponse.cs
+++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubHeatingTestPollResponse.cs
@@ -23,16 +23,16 @@ namespace Tango.PMR.Stubs {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "CiFTdHViSGVhdGluZ1Rlc3RQb2xsUmVzcG9uc2UucHJvdG8SD1RhbmdvLlBN",
-            "Ui5TdHVicyK+AQobU3R1YkhlYXRpbmdUZXN0UG9sbFJlc3BvbnNlEhUKDUhl",
+            "Ui5TdHVicyLTAQobU3R1YkhlYXRpbmdUZXN0UG9sbFJlc3BvbnNlEhUKDUhl",
             "YXRlckdyb3VwSWQYASABKA0SEQoJWm9uZTFUZW1wGAIgASgNEhEKCVpvbmUy",
             "VGVtcBgDIAEoDRIVCg1IZWF0ZXIxQWN0aXZlGAQgASgIEhUKDUhlYXRlcjJB",
             "Y3RpdmUYBSABKAgSGQoRSGVhdGVyMVBlcmNlbnRhZ2UYBiABKA0SGQoRSGVh",
-            "dGVyMlBlcmNlbnRhZ2UYByABKA1CGwoZY29tLnR3aW5lLnRhbmdvLnBtci5z",
-            "dHVic2IGcHJvdG8z"));
+            "dGVyMlBlcmNlbnRhZ2UYByABKA0SEwoLSW5mb01lc3NhZ2UYCCABKAlCGwoZ",
+            "Y29tLnR3aW5lLnRhbmdvLnBtci5zdHVic2IGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubHeatingTestPollResponse), global::Tango.PMR.Stubs.StubHeatingTestPollResponse.Parser, new[]{ "HeaterGroupId", "Zone1Temp", "Zone2Temp", "Heater1Active", "Heater2Active", "Heater1Percentage", "Heater2Percentage" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubHeatingTestPollResponse), global::Tango.PMR.Stubs.StubHeatingTestPollResponse.Parser, new[]{ "HeaterGroupId", "Zone1Temp", "Zone2Temp", "Heater1Active", "Heater2Active", "Heater1Percentage", "Heater2Percentage", "InfoMessage" }, null, null, null)
           }));
     }
     #endregion
@@ -70,6 +70,7 @@ namespace Tango.PMR.Stubs {
       heater2Active_ = other.heater2Active_;
       heater1Percentage_ = other.heater1Percentage_;
       heater2Percentage_ = other.heater2Percentage_;
+      infoMessage_ = other.infoMessage_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -157,6 +158,17 @@ namespace Tango.PMR.Stubs {
       }
     }
 
+    /// <summary>Field number for the "InfoMessage" field.</summary>
+    public const int InfoMessageFieldNumber = 8;
+    private string infoMessage_ = "";
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public string InfoMessage {
+      get { return infoMessage_; }
+      set {
+        infoMessage_ = pb::ProtoPreconditions.CheckNotNull(value, "value");
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as StubHeatingTestPollResponse);
@@ -177,6 +189,7 @@ namespace Tango.PMR.Stubs {
       if (Heater2Active != other.Heater2Active) return false;
       if (Heater1Percentage != other.Heater1Percentage) return false;
       if (Heater2Percentage != other.Heater2Percentage) return false;
+      if (InfoMessage != other.InfoMessage) return false;
       return true;
     }
 
@@ -190,6 +203,7 @@ namespace Tango.PMR.Stubs {
       if (Heater2Active != false) hash ^= Heater2Active.GetHashCode();
       if (Heater1Percentage != 0) hash ^= Heater1Percentage.GetHashCode();
       if (Heater2Percentage != 0) hash ^= Heater2Percentage.GetHashCode();
+      if (InfoMessage.Length != 0) hash ^= InfoMessage.GetHashCode();
       return hash;
     }
 
@@ -228,6 +242,10 @@ namespace Tango.PMR.Stubs {
         output.WriteRawTag(56);
         output.WriteUInt32(Heater2Percentage);
       }
+      if (InfoMessage.Length != 0) {
+        output.WriteRawTag(66);
+        output.WriteString(InfoMessage);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -254,6 +272,9 @@ namespace Tango.PMR.Stubs {
       if (Heater2Percentage != 0) {
         size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Heater2Percentage);
       }
+      if (InfoMessage.Length != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeStringSize(InfoMessage);
+      }
       return size;
     }
 
@@ -283,6 +304,9 @@ namespace Tango.PMR.Stubs {
       if (other.Heater2Percentage != 0) {
         Heater2Percentage = other.Heater2Percentage;
       }
+      if (other.InfoMessage.Length != 0) {
+        InfoMessage = other.InfoMessage;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -321,6 +345,10 @@ namespace Tango.PMR.Stubs {
             Heater2Percentage = input.ReadUInt32();
             break;
           }
+          case 66: {
+            InfoMessage = input.ReadString();
+            break;
+          }
         }
       }
     }