Updated PMR to latest shlomo changes.

7 files changed, 364 insertions, 12 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs
index 0c46ea0d9..f81964aad 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(
-            "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbirqGAoLTWVz",
+            "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiqdGQoLTWVz",
             "c2FnZVR5cGUSCAoETm9uZRAAEhQKEENhbGN1bGF0ZVJlcXVlc3QQAxIVChFD",
             "YWxjdWxhdGVSZXNwb25zZRAEEhMKD1Byb2dyZXNzUmVxdWVzdBAFEhQKEFBy",
             "b2dyZXNzUmVzcG9uc2UQBhIcChhTdHViQ2FydHJpZGdlUmVhZFJlcXVlc3QQ",
@@ -93,8 +93,9 @@ namespace Tango.PMR.Common {
             "YWRQcm9jZXNzUGFyYW1ldGVyc1Jlc3BvbnNlEL0XEhQKD0RlYnVnTG9nUmVx",
             "dWVzdBCgHxIVChBEZWJ1Z0xvZ1Jlc3BvbnNlEKEfEicKIlVwbG9hZEhhcmR3",
             "YXJlQ29uZmlndXJhdGlvblJlcXVlc3QQiCcSKAojVXBsb2FkSGFyZHdhcmVD",
-            "b25maWd1cmF0aW9uUmVzcG9uc2UQiSdCHAoaY29tLnR3aW5lLnRhbmdvLnBt",
-            "ci5jb21tb25iBnByb3RvMw=="));
+            "b25maWd1cmF0aW9uUmVzcG9uc2UQiScSFwoSU3lzdGVtUmVzZXRSZXF1ZXN0",
+            "EIonEhgKE1N5c3RlbVJlc2V0UmVzcG9uc2UQiydCHAoaY29tLnR3aW5lLnRh",
+            "bmdvLnBtci5jb21tb25iBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Common.MessageType), }, null));
@@ -235,6 +236,8 @@ namespace Tango.PMR.Common {
     /// </summary>
     [pbr::OriginalName("UploadHardwareConfigurationRequest")] UploadHardwareConfigurationRequest = 5000,
     [pbr::OriginalName("UploadHardwareConfigurationResponse")] UploadHardwareConfigurationResponse = 5001,
+    [pbr::OriginalName("SystemResetRequest")] SystemResetRequest = 5002,
+    [pbr::OriginalName("SystemResetResponse")] SystemResetResponse = 5003,
   }
 
   #endregion
diff --git a/Software/Visual_Studio/Tango.PMR/ExtensionMethods.cs b/Software/Visual_Studio/Tango.PMR/ExtensionMethods.cs
index f1adb193b..f20298826 100644
--- a/Software/Visual_Studio/Tango.PMR/ExtensionMethods.cs
+++ b/Software/Visual_Studio/Tango.PMR/ExtensionMethods.cs
@@ -13,7 +13,7 @@ namespace Tango.PMR
     /// <summary>
     /// Contains PMR extension methods.
     /// </summary>
-    public static class ExtensionMethods                
+    public static class ExtensionMethods                  
     {
         /// <summary>
         /// Gets the protobuf <see cref="OriginalNameAttribute"/> attribute value from the message type.
diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/SystemResetRequest.cs b/Software/Visual_Studio/Tango.PMR/Hardware/SystemResetRequest.cs
new file mode 100644
index 000000000..0e8dddeb9
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/Hardware/SystemResetRequest.cs
@@ -0,0 +1,131 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: SystemResetRequest.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.Hardware {
+
+  /// <summary>Holder for reflection information generated from SystemResetRequest.proto</summary>
+  public static partial class SystemResetRequestReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for SystemResetRequest.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static SystemResetRequestReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "ChhTeXN0ZW1SZXNldFJlcXVlc3QucHJvdG8SElRhbmdvLlBNUi5IYXJkd2Fy",
+            "ZSIUChJTeXN0ZW1SZXNldFJlcXVlc3RCHgocY29tLnR3aW5lLnRhbmdvLnBt",
+            "ci5oYXJkd2FyZWIGcHJvdG8z"));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.SystemResetRequest), global::Tango.PMR.Hardware.SystemResetRequest.Parser, null, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class SystemResetRequest : pb::IMessage<SystemResetRequest> {
+    private static readonly pb::MessageParser<SystemResetRequest> _parser = new pb::MessageParser<SystemResetRequest>(() => new SystemResetRequest());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<SystemResetRequest> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.Hardware.SystemResetRequestReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public SystemResetRequest() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public SystemResetRequest(SystemResetRequest other) : this() {
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public SystemResetRequest Clone() {
+      return new SystemResetRequest(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as SystemResetRequest);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(SystemResetRequest 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(SystemResetRequest 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/Hardware/SystemResetResponse.cs b/Software/Visual_Studio/Tango.PMR/Hardware/SystemResetResponse.cs
new file mode 100644
index 000000000..cf300a5d8
--- /dev/null
+++ b/Software/Visual_Studio/Tango.PMR/Hardware/SystemResetResponse.cs
@@ -0,0 +1,131 @@
+// Generated by the protocol buffer compiler.  DO NOT EDIT!
+// source: SystemResetResponse.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.Hardware {
+
+  /// <summary>Holder for reflection information generated from SystemResetResponse.proto</summary>
+  public static partial class SystemResetResponseReflection {
+
+    #region Descriptor
+    /// <summary>File descriptor for SystemResetResponse.proto</summary>
+    public static pbr::FileDescriptor Descriptor {
+      get { return descriptor; }
+    }
+    private static pbr::FileDescriptor descriptor;
+
+    static SystemResetResponseReflection() {
+      byte[] descriptorData = global::System.Convert.FromBase64String(
+          string.Concat(
+            "ChlTeXN0ZW1SZXNldFJlc3BvbnNlLnByb3RvEhJUYW5nby5QTVIuSGFyZHdh",
+            "cmUiFQoTU3lzdGVtUmVzZXRSZXNwb25zZUIeChxjb20udHdpbmUudGFuZ28u",
+            "cG1yLmhhcmR3YXJlYgZwcm90bzM="));
+      descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
+          new pbr::FileDescriptor[] { },
+          new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Hardware.SystemResetResponse), global::Tango.PMR.Hardware.SystemResetResponse.Parser, null, null, null, null)
+          }));
+    }
+    #endregion
+
+  }
+  #region Messages
+  public sealed partial class SystemResetResponse : pb::IMessage<SystemResetResponse> {
+    private static readonly pb::MessageParser<SystemResetResponse> _parser = new pb::MessageParser<SystemResetResponse>(() => new SystemResetResponse());
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pb::MessageParser<SystemResetResponse> Parser { get { return _parser; } }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public static pbr::MessageDescriptor Descriptor {
+      get { return global::Tango.PMR.Hardware.SystemResetResponseReflection.Descriptor.MessageTypes[0]; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    pbr::MessageDescriptor pb::IMessage.Descriptor {
+      get { return Descriptor; }
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public SystemResetResponse() {
+      OnConstruction();
+    }
+
+    partial void OnConstruction();
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public SystemResetResponse(SystemResetResponse other) : this() {
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public SystemResetResponse Clone() {
+      return new SystemResetResponse(this);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public override bool Equals(object other) {
+      return Equals(other as SystemResetResponse);
+    }
+
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public bool Equals(SystemResetResponse 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(SystemResetResponse 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/Printing/JobSpool.cs b/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs
index 6525e691f..afe846303 100644
--- a/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs
+++ b/Software/Visual_Studio/Tango.PMR/Printing/JobSpool.cs
@@ -23,16 +23,17 @@ namespace Tango.PMR.Printing {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
             "Cg5Kb2JTcG9vbC5wcm90bxISVGFuZ28uUE1SLlByaW50aW5nGhJKb2JTcG9v",
-            "bFR5cGUucHJvdG8iwQEKCEpvYlNwb29sEjYKDEpvYlNwb29sVHlwZRgBIAEo",
+            "bFR5cGUucHJvdG8i+QEKCEpvYlNwb29sEjYKDEpvYlNwb29sVHlwZRgBIAEo",
             "DjIgLlRhbmdvLlBNUi5QcmludGluZy5Kb2JTcG9vbFR5cGUSDgoGTGVuZ3Ro",
             "GAIgASgBEg4KBldlaWdodBgDIAEoARIQCghEaWFtZXRlchgEIAEoARIZChFT",
             "dGFydE9mZnNldFB1bHNlcxgFIAEoBRITCgtCYWNraW5nUmF0ZRgGIAEoBRIb",
-            "ChNTZWdtZW50T2Zmc2V0UHVsc2VzGAcgASgFQh4KHGNvbS50d2luZS50YW5n",
-            "by5wbXIucHJpbnRpbmdiBnByb3RvMw=="));
+            "ChNTZWdtZW50T2Zmc2V0UHVsc2VzGAcgASgFEhkKEUJvdHRvbUJhY2tpbmdS",
+            "YXRlGAggASgFEhsKE1JvdGF0aW9uc1BlclBhc3NhZ2UYCSABKAFCHgocY29t",
+            "LnR3aW5lLnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { global::Tango.PMR.Printing.JobSpoolTypeReflection.Descriptor, },
           new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] {
-            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.JobSpool), global::Tango.PMR.Printing.JobSpool.Parser, new[]{ "JobSpoolType", "Length", "Weight", "Diameter", "StartOffsetPulses", "BackingRate", "SegmentOffsetPulses" }, null, null, null)
+            new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.JobSpool), global::Tango.PMR.Printing.JobSpool.Parser, new[]{ "JobSpoolType", "Length", "Weight", "Diameter", "StartOffsetPulses", "BackingRate", "SegmentOffsetPulses", "BottomBackingRate", "RotationsPerPassage" }, null, null, null)
           }));
     }
     #endregion
@@ -70,6 +71,8 @@ namespace Tango.PMR.Printing {
       startOffsetPulses_ = other.startOffsetPulses_;
       backingRate_ = other.backingRate_;
       segmentOffsetPulses_ = other.segmentOffsetPulses_;
+      bottomBackingRate_ = other.bottomBackingRate_;
+      rotationsPerPassage_ = other.rotationsPerPassage_;
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -154,6 +157,28 @@ namespace Tango.PMR.Printing {
       }
     }
 
+    /// <summary>Field number for the "BottomBackingRate" field.</summary>
+    public const int BottomBackingRateFieldNumber = 8;
+    private int bottomBackingRate_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public int BottomBackingRate {
+      get { return bottomBackingRate_; }
+      set {
+        bottomBackingRate_ = value;
+      }
+    }
+
+    /// <summary>Field number for the "RotationsPerPassage" field.</summary>
+    public const int RotationsPerPassageFieldNumber = 9;
+    private double rotationsPerPassage_;
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
+    public double RotationsPerPassage {
+      get { return rotationsPerPassage_; }
+      set {
+        rotationsPerPassage_ = value;
+      }
+    }
+
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
     public override bool Equals(object other) {
       return Equals(other as JobSpool);
@@ -174,6 +199,8 @@ namespace Tango.PMR.Printing {
       if (StartOffsetPulses != other.StartOffsetPulses) return false;
       if (BackingRate != other.BackingRate) return false;
       if (SegmentOffsetPulses != other.SegmentOffsetPulses) return false;
+      if (BottomBackingRate != other.BottomBackingRate) return false;
+      if (RotationsPerPassage != other.RotationsPerPassage) return false;
       return true;
     }
 
@@ -187,6 +214,8 @@ namespace Tango.PMR.Printing {
       if (StartOffsetPulses != 0) hash ^= StartOffsetPulses.GetHashCode();
       if (BackingRate != 0) hash ^= BackingRate.GetHashCode();
       if (SegmentOffsetPulses != 0) hash ^= SegmentOffsetPulses.GetHashCode();
+      if (BottomBackingRate != 0) hash ^= BottomBackingRate.GetHashCode();
+      if (RotationsPerPassage != 0D) hash ^= RotationsPerPassage.GetHashCode();
       return hash;
     }
 
@@ -225,6 +254,14 @@ namespace Tango.PMR.Printing {
         output.WriteRawTag(56);
         output.WriteInt32(SegmentOffsetPulses);
       }
+      if (BottomBackingRate != 0) {
+        output.WriteRawTag(64);
+        output.WriteInt32(BottomBackingRate);
+      }
+      if (RotationsPerPassage != 0D) {
+        output.WriteRawTag(73);
+        output.WriteDouble(RotationsPerPassage);
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -251,6 +288,12 @@ namespace Tango.PMR.Printing {
       if (SegmentOffsetPulses != 0) {
         size += 1 + pb::CodedOutputStream.ComputeInt32Size(SegmentOffsetPulses);
       }
+      if (BottomBackingRate != 0) {
+        size += 1 + pb::CodedOutputStream.ComputeInt32Size(BottomBackingRate);
+      }
+      if (RotationsPerPassage != 0D) {
+        size += 1 + 8;
+      }
       return size;
     }
 
@@ -280,6 +323,12 @@ namespace Tango.PMR.Printing {
       if (other.SegmentOffsetPulses != 0) {
         SegmentOffsetPulses = other.SegmentOffsetPulses;
       }
+      if (other.BottomBackingRate != 0) {
+        BottomBackingRate = other.BottomBackingRate;
+      }
+      if (other.RotationsPerPassage != 0D) {
+        RotationsPerPassage = other.RotationsPerPassage;
+      }
     }
 
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute]
@@ -318,6 +367,14 @@ namespace Tango.PMR.Printing {
             SegmentOffsetPulses = input.ReadInt32();
             break;
           }
+          case 64: {
+            BottomBackingRate = input.ReadInt32();
+            break;
+          }
+          case 73: {
+            RotationsPerPassage = input.ReadDouble();
+            break;
+          }
         }
       }
     }
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;
+          }
         }
       }
     }
diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
index d3299baa1..930fd8819 100644
--- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
+++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj
@@ -116,6 +116,8 @@
     <Compile Include="Hardware\HardwarePidControlType.cs" />
     <Compile Include="Hardware\HardwareWinder.cs" />
     <Compile Include="Hardware\HardwareWinderType.cs" />
+    <Compile Include="Hardware\SystemResetRequest.cs" />
+    <Compile Include="Hardware\SystemResetResponse.cs" />
     <Compile Include="Hardware\UploadHardwareConfigurationRequest.cs" />
     <Compile Include="Hardware\UploadHardwareConfigurationResponse.cs" />
     <Compile Include="Integration\DirectSynchronizationRequest.cs" />