Updated PMR after short-cycle merge.

1 files changed, 24 insertions, 22 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs
index a96da0f5e..fb2e44740 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(
-            "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbircPwoLTWVz",
+            "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiqNQAoLTWVz",
             "c2FnZVR5cGUSCAoETm9uZRAAEhEKDUVycm9yUmVzcG9uc2UQARIUChBDYWxj",
             "dWxhdGVSZXF1ZXN0EAMSFQoRQ2FsY3VsYXRlUmVzcG9uc2UQBBITCg9Qcm9n",
             "cmVzc1JlcXVlc3QQBRIUChBQcm9ncmVzc1Jlc3BvbnNlEAYSHAoYU3R1YkNh",
@@ -184,27 +184,29 @@ namespace Tango.PMR.Common {
             "UmVzcG9uc2UQxz4SJAofU3RhcnRNYWNoaW5lU3RhdHVzVXBkYXRlUmVxdWVz",
             "dBCoRhIlCiBTdGFydE1hY2hpbmVTdGF0dXNVcGRhdGVSZXNwb25zZRCpRhIj",
             "Ch5TdG9wTWFjaGluZVN0YXR1c1VwZGF0ZVJlcXVlc3QQqkYSJAofU3RvcE1h",
-            "Y2hpbmVTdGF0dXNVcGRhdGVSZXNwb25zZRCrRhIaChVTdGFydFBvd2VyRG93",
-            "blJlcXVlc3QQkE4SGwoWU3RhcnRQb3dlckRvd25SZXNwb25zZRCRThIaChVB",
-            "Ym9ydFBvd2VyRG93blJlcXVlc3QQkk4SGwoWQWJvcnRQb3dlckRvd25SZXNw",
-            "b25zZRCTThIYChNTdGFydFBvd2VyVXBSZXF1ZXN0EJROEhkKFFN0YXJ0UG93",
-            "ZXJVcFJlc3BvbnNlEJVOEhgKE0Fib3J0UG93ZXJVcFJlcXVlc3QQlk4SGQoU",
-            "QWJvcnRQb3dlclVwUmVzcG9uc2UQl04SEwoOU3RhbmRCeVJlcXVlc3QQmE4S",
-            "FAoPU3RhbmRCeVJlc3BvbnNlEJlOEh4KGVN0YXJ0VGhyZWFkTG9hZGluZ1Jl",
-            "cXVlc3QQ+FUSHwoaU3RhcnRUaHJlYWRMb2FkaW5nUmVzcG9uc2UQ+VUSIQoc",
-            "Q29udGludWVUaHJlYWRMb2FkaW5nUmVxdWVzdBD6VRIiCh1Db250aW51ZVRo",
-            "cmVhZExvYWRpbmdSZXNwb25zZRD7VRIdChhTdG9wVGhyZWFkTG9hZGluZ1Jl",
-            "cXVlc3QQ/FUSHgoZU3RvcFRocmVhZExvYWRpbmdSZXNwb25zZRD9VRIcChdU",
-            "cnlUaHJlYWRMb2FkaW5nUmVxdWVzdBD+VRIdChhUcnlUaHJlYWRMb2FkaW5n",
-            "UmVzcG9uc2UQ/1USIAobQXR0ZW1wdFRocmVhZEpvZ2dpbmdSZXF1ZXN0EIBW",
-            "EiEKHEF0dGVtcHRUaHJlYWRKb2dnaW5nUmVzcG9uc2UQgVYSIQocU3RhcnRJ",
-            "bmtGaWxsaW5nU3RhdHVzUmVxdWVzdBDgXRIiCh1TdGFydElua0ZpbGxpbmdT",
-            "dGF0dXNSZXNwb25zZRDhXRIcChdQdXREYXRhU3RvcmVJdGVtUmVxdWVzdBDI",
-            "ZRIdChhQdXREYXRhU3RvcmVJdGVtUmVzcG9uc2UQyWUSHAoXR2V0RGF0YVN0",
-            "b3JlSXRlbVJlcXVlc3QQymUSHQoYR2V0RGF0YVN0b3JlSXRlbVJlc3BvbnNl",
-            "EMtlEiEKHERhdGFTdG9yZUl0ZW1Nb2RpZmllZFJlcXVlc3QQzGUSIgodRGF0",
-            "YVN0b3JlSXRlbU1vZGlmaWVkUmVzcG9uc2UQzWVCHAoaY29tLnR3aW5lLnRh",
-            "bmdvLnBtci5jb21tb25iBnByb3RvMw=="));
+            "Y2hpbmVTdGF0dXNVcGRhdGVSZXNwb25zZRCrRhIhChxTZXRJbmtBdXRvRmls",
+            "bGluZ01vZGVSZXF1ZXN0EKxGEiIKHVNldElua0F1dG9GaWxsaW5nTW9kZVJl",
+            "c3BvbnNlEK1GEhoKFVN0YXJ0UG93ZXJEb3duUmVxdWVzdBCQThIbChZTdGFy",
+            "dFBvd2VyRG93blJlc3BvbnNlEJFOEhoKFUFib3J0UG93ZXJEb3duUmVxdWVz",
+            "dBCSThIbChZBYm9ydFBvd2VyRG93blJlc3BvbnNlEJNOEhgKE1N0YXJ0UG93",
+            "ZXJVcFJlcXVlc3QQlE4SGQoUU3RhcnRQb3dlclVwUmVzcG9uc2UQlU4SGAoT",
+            "QWJvcnRQb3dlclVwUmVxdWVzdBCWThIZChRBYm9ydFBvd2VyVXBSZXNwb25z",
+            "ZRCXThITCg5TdGFuZEJ5UmVxdWVzdBCYThIUCg9TdGFuZEJ5UmVzcG9uc2UQ",
+            "mU4SHgoZU3RhcnRUaHJlYWRMb2FkaW5nUmVxdWVzdBD4VRIfChpTdGFydFRo",
+            "cmVhZExvYWRpbmdSZXNwb25zZRD5VRIhChxDb250aW51ZVRocmVhZExvYWRp",
+            "bmdSZXF1ZXN0EPpVEiIKHUNvbnRpbnVlVGhyZWFkTG9hZGluZ1Jlc3BvbnNl",
+            "EPtVEh0KGFN0b3BUaHJlYWRMb2FkaW5nUmVxdWVzdBD8VRIeChlTdG9wVGhy",
+            "ZWFkTG9hZGluZ1Jlc3BvbnNlEP1VEhwKF1RyeVRocmVhZExvYWRpbmdSZXF1",
+            "ZXN0EP5VEh0KGFRyeVRocmVhZExvYWRpbmdSZXNwb25zZRD/VRIgChtBdHRl",
+            "bXB0VGhyZWFkSm9nZ2luZ1JlcXVlc3QQgFYSIQocQXR0ZW1wdFRocmVhZEpv",
+            "Z2dpbmdSZXNwb25zZRCBVhIhChxTdGFydElua0ZpbGxpbmdTdGF0dXNSZXF1",
+            "ZXN0EOBdEiIKHVN0YXJ0SW5rRmlsbGluZ1N0YXR1c1Jlc3BvbnNlEOFdEhwK",
+            "F1B1dERhdGFTdG9yZUl0ZW1SZXF1ZXN0EMhlEh0KGFB1dERhdGFTdG9yZUl0",
+            "ZW1SZXNwb25zZRDJZRIcChdHZXREYXRhU3RvcmVJdGVtUmVxdWVzdBDKZRId",
+            "ChhHZXREYXRhU3RvcmVJdGVtUmVzcG9uc2UQy2USIQocRGF0YVN0b3JlSXRl",
+            "bU1vZGlmaWVkUmVxdWVzdBDMZRIiCh1EYXRhU3RvcmVJdGVtTW9kaWZpZWRS",
+            "ZXNwb25zZRDNZUIcChpjb20udHdpbmUudGFuZ28ucG1yLmNvbW1vbmIGcHJv",
+            "dG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Common.MessageType), }, null));