merge

2 files changed, 92 insertions, 211 deletions

diff --git a/Software/Visual_Studio/Tango.PMR/Common/ErrorCode.cs b/Software/Visual_Studio/Tango.PMR/Common/ErrorCode.cs
index 98931d0a6..48a9e05d0 100644
--- a/Software/Visual_Studio/Tango.PMR/Common/ErrorCode.cs
+++ b/Software/Visual_Studio/Tango.PMR/Common/ErrorCode.cs
@@ -22,7 +22,7 @@ namespace Tango.PMR.Common {
     static ErrorCodeReflection() {
       byte[] descriptorData = global::System.Convert.FromBase64String(
           string.Concat(
-            "Cg9FcnJvckNvZGUucHJvdG8SEFRhbmdvLlBNUi5Db21tb24q5AwKCUVycm9y",
+            "Cg9FcnJvckNvZGUucHJvdG8SEFRhbmdvLlBNUi5Db21tb24q7wkKCUVycm9y",
             "Q29kZRIICgROT05FEAASEQoNR0VORVJBTF9FUlJPUhABEgsKB0JBRF9DUkMQ",
             "AhIeChpJTlZBTElEX0RJR0lUQUxfUElOX05VTUJFUhADEhsKF1VOQVVUSE9S",
             "SVpFRF9DT05ORUNUSU9OEAQSHwobQ09OVElOVU9VU19SRVNQT05TRV9BQk9S",
@@ -50,17 +50,8 @@ namespace Tango.PMR.Common {
             "UEVSQVRVUkVfQUxBUk0Q2A8SEQoMSk9CX0xTX0FMQVJNENkPEhcKEkpPQl9Q",
             "UkVTU1VSRV9BTEFSTRDaDxIWChFKT0JfQ1VSUkVOVF9BTEFSTRDbDxIUCg9K",
             "T0JfTU9UT1JfQUxBUk0Q3A8SEgoNSk9CX0xJRFNfT1BFThDdDxIYChNKT0Jf",
-            "QUJPUlRFRF9CWV9VU0VSEN4PEhUKEEpPQl9TQUZFVFlfQUxBUk0Q3w8SFgoR",
-            "Sk9CX05PX0FMQVJNX0ZJTEUQ4A8SFQoQSk9CX0ZJTEVfUFJPQkxFTRDhDxIf",
-            "ChpKT0JfV0FTVEVfSEFORExJTkdfUFJPQkxFTRDiDxIZChRQT1dFUl9VUF9O",
-            "T19DRkdfRklMRRC4FxIeChlQT1dFUl9VUF9IV19DT05GSUdfRkFJTEVEELkX",
-            "Eh0KGFBPV0VSX1VQX0JVSUxUX0lOX0ZBSUxFRBC6FxIjCh5QT1dFUl9VUF9J",
-            "TklUSUFMX0JMT1dFUl9GQUlMRUQQuxcSLwoqUE9XRVJfVVBfRElTUEVOU0VS",
-            "X1BSRVNTVVJFX0JVSUxEVVBfRkFJTEVEELwXEiAKG1BPV0VSX1VQX05PX1RI",
-            "UkVBRF9ERVRFQ1RFRBC9FxIfChpQT1dFUl9VUF9OT19QUk9DRVNTX1BBUkFN",
-            "UxC+FxIcChdHRU5FUkFMX0RBVEFTVE9SRV9FUlJPUhCgHxISCg1LRVlfTk9U",
-            "X0ZPVU5EEKEfQhwKGmNvbS50d2luZS50YW5nby5wbXIuY29tbW9uYgZwcm90",
-            "bzM="));
+            "QUJPUlRFRF9CWV9VU0VSEN4PEhUKEEpPQl9TQUZFVFlfQUxBUk0Q3w9CHAoa",
+            "Y29tLnR3aW5lLnRhbmdvLnBtci5jb21tb25iBnByb3RvMw=="));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Common.ErrorCode), }, null));
@@ -147,24 +138,6 @@ namespace Tango.PMR.Common {
     [pbr::OriginalName("JOB_LIDS_OPEN")] JobLidsOpen = 2013,
     [pbr::OriginalName("JOB_ABORTED_BY_USER")] JobAbortedByUser = 2014,
     [pbr::OriginalName("JOB_SAFETY_ALARM")] JobSafetyAlarm = 2015,
-    [pbr::OriginalName("JOB_NO_ALARM_FILE")] JobNoAlarmFile = 2016,
-    [pbr::OriginalName("JOB_FILE_PROBLEM")] JobFileProblem = 2017,
-    [pbr::OriginalName("JOB_WASTE_HANDLING_PROBLEM")] JobWasteHandlingProblem = 2018,
-    /// <summary>
-    ///power up
-    /// </summary>
-    [pbr::OriginalName("POWER_UP_NO_CFG_FILE")] PowerUpNoCfgFile = 3000,
-    [pbr::OriginalName("POWER_UP_HW_CONFIG_FAILED")] PowerUpHwConfigFailed = 3001,
-    [pbr::OriginalName("POWER_UP_BUILT_IN_FAILED")] PowerUpBuiltInFailed = 3002,
-    [pbr::OriginalName("POWER_UP_INITIAL_BLOWER_FAILED")] PowerUpInitialBlowerFailed = 3003,
-    [pbr::OriginalName("POWER_UP_DISPENSER_PRESSURE_BUILDUP_FAILED")] PowerUpDispenserPressureBuildupFailed = 3004,
-    [pbr::OriginalName("POWER_UP_NO_THREAD_DETECTED")] PowerUpNoThreadDetected = 3005,
-    [pbr::OriginalName("POWER_UP_NO_PROCESS_PARAMS")] PowerUpNoProcessParams = 3006,
-    /// <summary>
-    ///DataStore
-    /// </summary>
-    [pbr::OriginalName("GENERAL_DATASTORE_ERROR")] GeneralDatastoreError = 4000,
-    [pbr::OriginalName("KEY_NOT_FOUND")] KeyNotFound = 4001,
   }
 
   #endregion
diff --git a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs
index 03b9e40bf..6ae399816 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(
-            "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiqVPwoLTWVz",
+            "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbirvMwoLTWVz",
             "c2FnZVR5cGUSCAoETm9uZRAAEhEKDUVycm9yUmVzcG9uc2UQARIUChBDYWxj",
             "dWxhdGVSZXF1ZXN0EAMSFQoRQ2FsY3VsYXRlUmVzcG9uc2UQBBITCg9Qcm9n",
             "cmVzc1JlcXVlc3QQBRIUChBQcm9ncmVzc1Jlc3BvbnNlEAYSHAoYU3R1YkNh",
@@ -89,121 +89,89 @@ namespace Tango.PMR.Common {
             "YlJlc3BvbnNlEGQSFwoTU3R1YkFib3J0Sm9iUmVxdWVzdBBlEhgKFFN0dWJB",
             "Ym9ydEpvYlJlc3BvbnNlEGYSJAogU3R1Yk1pZFRhbmtQcmVzc3VyZVNlbnNv",
             "clJlcXVlc3QQZxIlCiFTdHViTWlkVGFua1ByZXNzdXJlU2Vuc29yUmVzcG9u",
-            "c2UQaBIeChpTdHViRGlzcGVuc2VyRUVwcm9tUmVxdWVzdBBpEh8KG1N0dWJE",
-            "aXNwZW5zZXJFRXByb21SZXNwb25zZRBqEhgKFFN0dWJXaHNFRXByb21SZXF1",
-            "ZXN0EGsSGQoVU3R1Yldoc0VFcHJvbVJlc3BvbnNlEGwSIQodU3R1Yk1haW5D",
-            "YXJkRUVwcm9tUmVhZFJlcXVlc3QQbRIiCh5TdHViTWFpbkNhcmRFRXByb21S",
-            "ZWFkUmVzcG9uc2UQbhIiCh5TdHViTWFpbkNhcmRFRXByb21Xcml0ZVJlcXVl",
-            "c3QQbxIjCh9TdHViTWFpbkNhcmRFRXByb21Xcml0ZVJlc3BvbnNlEHASGQoV",
-            "U3R1YkhlYWRFRXByb21SZXF1ZXN0EHESGgoWU3R1YkhlYWRFRXByb21SZXNw",
-            "b25zZRByEhQKEFByb2NlZHVyZVJlcXVlc3QQcxIVChFQcm9jZWR1cmVSZXNw",
-            "b25zZRB0EiUKIEV4dGVybmFsQnJpZGdlVWRwRGlzY292ZXJ5UGFja2V0EOgH",
-            "Eh8KGkV4dGVybmFsQnJpZGdlTG9naW5SZXF1ZXN0EOkHEiAKG0V4dGVybmFs",
-            "QnJpZGdlTG9naW5SZXNwb25zZRDqBxIgChtFeHRlcm5hbEJyaWRnZUxvZ291",
-            "dFJlcXVlc3QQ6wcSIQocRXh0ZXJuYWxCcmlkZ2VMb2dvdXRSZXNwb25zZRDs",
-            "BxIhChxEaXJlY3RTeW5jaHJvbml6YXRpb25SZXF1ZXN0EO0HEiIKHURpcmVj",
-            "dFN5bmNocm9uaXphdGlvblJlc3BvbnNlEO4HEhwKF092ZXJyaWRlRGF0YUJh",
-            "c2VSZXF1ZXN0EO8HEh0KGE92ZXJyaWRlRGF0YUJhc2VSZXNwb25zZRDwBxIg",
-            "ChtTdGFydEFwcGxpY2F0aW9uTG9nc1JlcXVlc3QQ8QcSIQocU3RhcnRBcHBs",
-            "aWNhdGlvbkxvZ3NSZXNwb25zZRDyBxIfChpTdG9wQXBwbGljYXRpb25Mb2dz",
-            "UmVxdWVzdBDzBxIgChtTdG9wQXBwbGljYXRpb25Mb2dzUmVzcG9uc2UQ9AcS",
-            "GAoTQ29sb3JQcm9maWxlUmVxdWVzdBD1BxIZChRDb2xvclByb2ZpbGVSZXNw",
-            "b25zZRD2BxIYChNVcGRhdGVTdGF0dXNSZXF1ZXN0EPcHEhkKFFVwZGF0ZVN0",
-            "YXR1c1Jlc3BvbnNlEPgHEhMKDkdlbmVyaWNSZXF1ZXN0EPkHEhQKD0dlbmVy",
-            "aWNSZXNwb25zZRD6BxIdChhDb25maWd1cmVQcm90b2NvbFJlcXVlc3QQ+wcS",
-            "HgoZQ29uZmlndXJlUHJvdG9jb2xSZXNwb25zZRD8BxIcChdTdGFydERpYWdu",
-            "b3N0aWNzUmVxdWVzdBDQDxIdChhTdGFydERpYWdub3N0aWNzUmVzcG9uc2UQ",
-            "0Q8SHAoXTW90b3JBYm9ydEhvbWluZ1JlcXVlc3QQ0g8SHQoYTW90b3JBYm9y",
-            "dEhvbWluZ1Jlc3BvbnNlENMPEhcKEk1vdG9ySG9taW5nUmVxdWVzdBDUDxIY",
-            "ChNNb3RvckhvbWluZ1Jlc3BvbnNlENUPEhgKE01vdG9ySm9nZ2luZ1JlcXVl",
-            "c3QQ1g8SGQoUTW90b3JKb2dnaW5nUmVzcG9uc2UQ1w8SHQoYTW90b3JBYm9y",
-            "dEpvZ2dpbmdSZXF1ZXN0ENgPEh4KGU1vdG9yQWJvcnRKb2dnaW5nUmVzcG9u",
-            "c2UQ2Q8SIAobRGlzcGVuc2VyQWJvcnRIb21pbmdSZXF1ZXN0ENoPEiEKHERp",
-            "c3BlbnNlckFib3J0SG9taW5nUmVzcG9uc2UQ2w8SGwoWRGlzcGVuc2VySG9t",
-            "aW5nUmVxdWVzdBDcDxIcChdEaXNwZW5zZXJIb21pbmdSZXNwb25zZRDdDxIc",
-            "ChdEaXNwZW5zZXJKb2dnaW5nUmVxdWVzdBDeDxIdChhEaXNwZW5zZXJKb2dn",
-            "aW5nUmVzcG9uc2UQ3w8SIQocRGlzcGVuc2VyQWJvcnRKb2dnaW5nUmVxdWVz",
-            "dBDgDxIiCh1EaXNwZW5zZXJBYm9ydEpvZ2dpbmdSZXNwb25zZRDhDxIZChRT",
-            "ZXREaWdpdGFsT3V0UmVxdWVzdBDiDxIaChVTZXREaWdpdGFsT3V0UmVzcG9u",
-            "c2UQ4w8SGQoUVGhyZWFkSm9nZ2luZ1JlcXVlc3QQ5A8SGgoVVGhyZWFkSm9n",
-            "Z2luZ1Jlc3BvbnNlEOUPEh4KGVRocmVhZEFib3J0Sm9nZ2luZ1JlcXVlc3QQ",
-            "5g8SHwoaVGhyZWFkQWJvcnRKb2dnaW5nUmVzcG9uc2UQ5w8SHQoYU2V0Q29t",
-            "cG9uZW50VmFsdWVSZXF1ZXN0EOgPEh4KGVNldENvbXBvbmVudFZhbHVlUmVz",
-            "cG9uc2UQ6Q8SGAoTUmVzb2x2ZUV2ZW50UmVxdWVzdBDqDxIZChRSZXNvbHZl",
-            "RXZlbnRSZXNwb25zZRDrDxIbChZTdG9wRGlhZ25vc3RpY3NSZXF1ZXN0EOwP",
-            "EhwKF1N0b3BEaWFnbm9zdGljc1Jlc3BvbnNlEO0PEiMKHlN0YXJ0RXZlbnRz",
-            "Tm90aWZpY2F0aW9uUmVxdWVzdBDuDxIkCh9TdGFydEV2ZW50c05vdGlmaWNh",
-            "dGlvblJlc3BvbnNlEO8PEiIKHVN0b3BFdmVudHNOb3RpZmljYXRpb25SZXF1",
-            "ZXN0EPAPEiMKHlN0b3BFdmVudHNOb3RpZmljYXRpb25SZXNwb25zZRDxDxIa",
-            "ChVTZXRIZWF0ZXJTdGF0ZVJlcXVlc3QQ8g8SGwoWU2V0SGVhdGVyU3RhdGVS",
-            "ZXNwb25zZRDzDxIaChVTZXRCbG93ZXJTdGF0ZVJlcXVlc3QQ9A8SGwoWU2V0",
-            "Qmxvd2VyU3RhdGVSZXNwb25zZRD1DxIZChRTZXRWYWx2ZVN0YXRlUmVxdWVz",
-            "dBD2DxIaChVTZXRWYWx2ZVN0YXRlUmVzcG9uc2UQ9w8SHwoaQ2FydHJpZGdl",
-            "VmFsaWRhdGlvblJlcXVlc3QQ/A8SIAobQ2FydHJpZGdlVmFsaWRhdGlvblJl",
-            "c3BvbnNlEP0PEg8KCkpvYlJlcXVlc3QQuBcSEAoLSm9iUmVzcG9uc2UQuRcS",
-            "FAoPQWJvcnRKb2JSZXF1ZXN0ELoXEhUKEEFib3J0Sm9iUmVzcG9uc2UQuxcS",
-            "IwoeVXBsb2FkUHJvY2Vzc1BhcmFtZXRlcnNSZXF1ZXN0ELwXEiQKH1VwbG9h",
-            "ZFByb2Nlc3NQYXJhbWV0ZXJzUmVzcG9uc2UQvRcSFgoRQ3VycmVudEpvYlJl",
-            "cXVlc3QQvhcSFwoSQ3VycmVudEpvYlJlc3BvbnNlEL8XEhwKF1Jlc3VtZUN1",
-            "cnJlbnRKb2JSZXF1ZXN0EMAXEh0KGFJlc3VtZUN1cnJlbnRKb2JSZXNwb25z",
-            "ZRDBFxIdChhTdGFydEhlYWRDbGVhbmluZ1JlcXVlc3QQwhcSHgoZU3RhcnRI",
-            "ZWFkQ2xlYW5pbmdSZXNwb25zZRDDFxIdChhBYm9ydEhlYWRDbGVhbmluZ1Jl",
-            "cXVlc3QQxBcSHgoZQWJvcnRIZWFkQ2xlYW5pbmdSZXNwb25zZRDFFxIZChRT",
-            "dGFydERlYnVnTG9nUmVxdWVzdBCgHxIaChVTdGFydERlYnVnTG9nUmVzcG9u",
-            "c2UQoR8SGAoTU3RvcERlYnVnTG9nUmVxdWVzdBCiHxIZChRTdG9wRGVidWdM",
-            "b2dSZXNwb25zZRCjHxIfChpTZXREZWJ1Z0xvZ0NhdGVnb3J5UmVxdWVzdBCk",
-            "HxIgChtTZXREZWJ1Z0xvZ0NhdGVnb3J5UmVzcG9uc2UQpR8SIQocU2V0dXBE",
-            "ZWJ1Z0Rpc3JpYnV0b3JzUmVxdWVzdBCmHxIiCh1TZXR1cERlYnVnRGlzcmli",
-            "dXRvcnNSZXNwb25zZRCnHxInCiJVcGxvYWRIYXJkd2FyZUNvbmZpZ3VyYXRp",
-            "b25SZXF1ZXN0EIgnEigKI1VwbG9hZEhhcmR3YXJlQ29uZmlndXJhdGlvblJl",
-            "c3BvbnNlEIknEhcKElN5c3RlbVJlc2V0UmVxdWVzdBCKJxIYChNTeXN0ZW1S",
-            "ZXNldFJlc3BvbnNlEIsnEhUKEEtlZXBBbGl2ZVJlcXVlc3QQ8C4SFgoRS2Vl",
-            "cEFsaXZlUmVzcG9uc2UQ8S4SEwoOQ29ubmVjdFJlcXVlc3QQ8i4SFAoPQ29u",
-            "bmVjdFJlc3BvbnNlEPMuEhYKEURpc2Nvbm5lY3RSZXF1ZXN0EPQuEhcKEkRp",
-            "c2Nvbm5lY3RSZXNwb25zZRD1LhIWChFGaWxlVXBsb2FkUmVxdWVzdBDYNhIX",
-            "ChJGaWxlVXBsb2FkUmVzcG9uc2UQ2TYSGwoWRmlsZUNodW5rVXBsb2FkUmVx",
-            "dWVzdBDaNhIcChdGaWxlQ2h1bmtVcGxvYWRSZXNwb25zZRDbNhIaChVFeGVj",
-            "dXRlUHJvY2Vzc1JlcXVlc3QQ3DYSGwoWRXhlY3V0ZVByb2Nlc3NSZXNwb25z",
-            "ZRDdNhIXChJLaWxsUHJvY2Vzc1JlcXVlc3QQ3jYSGAoTS2lsbFByb2Nlc3NS",
-            "ZXNwb25zZRDfNhISCg1DcmVhdGVSZXF1ZXN0EOA2EhMKDkNyZWF0ZVJlc3Bv",
-            "bnNlEOE2EhIKDURlbGV0ZVJlcXVlc3QQ4jYSEwoORGVsZXRlUmVzcG9uc2UQ",
-            "4zYSGgoVR2V0U3RvcmFnZUluZm9SZXF1ZXN0EOQ2EhsKFkdldFN0b3JhZ2VJ",
-            "bmZvUmVzcG9uc2UQ5TYSFAoPR2V0RmlsZXNSZXF1ZXN0EOY2EhUKEEdldEZp",
-            "bGVzUmVzcG9uc2UQ5zYSGAoTRmlsZURvd25sb2FkUmVxdWVzdBDoNhIZChRG",
-            "aWxlRG93bmxvYWRSZXNwb25zZRDpNhIdChhGaWxlQ2h1bmtEb3dubG9hZFJl",
-            "cXVlc3QQ6jYSHgoZRmlsZUNodW5rRG93bmxvYWRSZXNwb25zZRDrNhIbChZW",
-            "YWxpZGF0ZVZlcnNpb25SZXF1ZXN0EOw2EhwKF1ZhbGlkYXRlVmVyc2lvblJl",
-            "c3BvbnNlEO02EhsKFkFjdGl2YXRlVmVyc2lvblJlcXVlc3QQ7jYSHAoXQWN0",
-            "aXZhdGVWZXJzaW9uUmVzcG9uc2UQ7zYSGQoURGlzcGVuc2VyRGF0YVJlcXVl",
-            "c3QQwD4SGgoVRGlzcGVuc2VyRGF0YVJlc3BvbnNlEME+EhwKF01pZFRhbmtE",
-            "YXRhU2V0dXBSZXF1ZXN0EMI+Eh0KGE1pZFRhbmtEYXRhU2V0dXBSZXNwb25z",
-            "ZRDDPhIiCh1NYWNoaW5lQ2FsaWJyYXRpb25EYXRhUmVxdWVzdBDEPhIjCh5N",
-            "YWNoaW5lQ2FsaWJyYXRpb25EYXRhUmVzcG9uc2UQxT4SHgoZTWFpbkNhcmRT",
-            "dG9yZWREYXRhUmVxdWVzdBDGPhIfChpNYWluQ2FyZFN0b3JlZERhdGFSZXNw",
-            "b25zZRDHPhIkCh9TdGFydE1hY2hpbmVTdGF0dXNVcGRhdGVSZXF1ZXN0EKhG",
-            "EiUKIFN0YXJ0TWFjaGluZVN0YXR1c1VwZGF0ZVJlc3BvbnNlEKlGEiMKHlN0",
-            "b3BNYWNoaW5lU3RhdHVzVXBkYXRlUmVxdWVzdBCqRhIkCh9TdG9wTWFjaGlu",
-            "ZVN0YXR1c1VwZGF0ZVJlc3BvbnNlEKtGEhoKFVN0YXJ0UG93ZXJEb3duUmVx",
-            "dWVzdBCQThIbChZTdGFydFBvd2VyRG93blJlc3BvbnNlEJFOEhoKFUFib3J0",
-            "UG93ZXJEb3duUmVxdWVzdBCSThIbChZBYm9ydFBvd2VyRG93blJlc3BvbnNl",
-            "EJNOEhgKE1N0YXJ0UG93ZXJVcFJlcXVlc3QQlE4SGQoUU3RhcnRQb3dlclVw",
-            "UmVzcG9uc2UQlU4SGAoTQWJvcnRQb3dlclVwUmVxdWVzdBCWThIZChRBYm9y",
-            "dFBvd2VyVXBSZXNwb25zZRCXThITCg5TdGFuZEJ5UmVxdWVzdBCYThIUCg9T",
-            "dGFuZEJ5UmVzcG9uc2UQmU4SHgoZU3RhcnRUaHJlYWRMb2FkaW5nUmVxdWVz",
-            "dBD4VRIfChpTdGFydFRocmVhZExvYWRpbmdSZXNwb25zZRD5VRIhChxDb250",
-            "aW51ZVRocmVhZExvYWRpbmdSZXF1ZXN0EPpVEiIKHUNvbnRpbnVlVGhyZWFk",
-            "TG9hZGluZ1Jlc3BvbnNlEPtVEh0KGFN0b3BUaHJlYWRMb2FkaW5nUmVxdWVz",
-            "dBD8VRIeChlTdG9wVGhyZWFkTG9hZGluZ1Jlc3BvbnNlEP1VEhwKF1RyeVRo",
-            "cmVhZExvYWRpbmdSZXF1ZXN0EP5VEh0KGFRyeVRocmVhZExvYWRpbmdSZXNw",
-            "b25zZRD/VRIgChtBdHRlbXB0VGhyZWFkSm9nZ2luZ1JlcXVlc3QQgFYSIQoc",
-            "QXR0ZW1wdFRocmVhZEpvZ2dpbmdSZXNwb25zZRCBVhIhChxTdGFydElua0Zp",
-            "bGxpbmdTdGF0dXNSZXF1ZXN0EOBdEiIKHVN0YXJ0SW5rRmlsbGluZ1N0YXR1",
-            "c1Jlc3BvbnNlEOFdEhwKF1B1dERhdGFTdG9yZUl0ZW1SZXF1ZXN0EMhlEh0K",
-            "GFB1dERhdGFTdG9yZUl0ZW1SZXNwb25zZRDJZRIcChdHZXREYXRhU3RvcmVJ",
-            "dGVtUmVxdWVzdBDKZRIdChhHZXREYXRhU3RvcmVJdGVtUmVzcG9uc2UQy2US",
-            "IQocRGF0YVN0b3JlSXRlbU1vZGlmaWVkUmVxdWVzdBDMZRIiCh1EYXRhU3Rv",
-            "cmVJdGVtTW9kaWZpZWRSZXNwb25zZRDNZUIcChpjb20udHdpbmUudGFuZ28u",
-            "cG1yLmNvbW1vbmIGcHJvdG8z"));
+            "c2UQaBIlCiBFeHRlcm5hbEJyaWRnZVVkcERpc2NvdmVyeVBhY2tldBDoBxIf",
+            "ChpFeHRlcm5hbEJyaWRnZUxvZ2luUmVxdWVzdBDpBxIgChtFeHRlcm5hbEJy",
+            "aWRnZUxvZ2luUmVzcG9uc2UQ6gcSIAobRXh0ZXJuYWxCcmlkZ2VMb2dvdXRS",
+            "ZXF1ZXN0EOsHEiEKHEV4dGVybmFsQnJpZGdlTG9nb3V0UmVzcG9uc2UQ7AcS",
+            "IQocRGlyZWN0U3luY2hyb25pemF0aW9uUmVxdWVzdBDtBxIiCh1EaXJlY3RT",
+            "eW5jaHJvbml6YXRpb25SZXNwb25zZRDuBxIcChdPdmVycmlkZURhdGFCYXNl",
+            "UmVxdWVzdBDvBxIdChhPdmVycmlkZURhdGFCYXNlUmVzcG9uc2UQ8AcSIAob",
+            "U3RhcnRBcHBsaWNhdGlvbkxvZ3NSZXF1ZXN0EPEHEiEKHFN0YXJ0QXBwbGlj",
+            "YXRpb25Mb2dzUmVzcG9uc2UQ8gcSHwoaU3RvcEFwcGxpY2F0aW9uTG9nc1Jl",
+            "cXVlc3QQ8wcSIAobU3RvcEFwcGxpY2F0aW9uTG9nc1Jlc3BvbnNlEPQHEhgK",
+            "E0NvbG9yUHJvZmlsZVJlcXVlc3QQ9QcSGQoUQ29sb3JQcm9maWxlUmVzcG9u",
+            "c2UQ9gcSGAoTVXBkYXRlU3RhdHVzUmVxdWVzdBD3BxIZChRVcGRhdGVTdGF0",
+            "dXNSZXNwb25zZRD4BxIcChdTdGFydERpYWdub3N0aWNzUmVxdWVzdBDQDxId",
+            "ChhTdGFydERpYWdub3N0aWNzUmVzcG9uc2UQ0Q8SHAoXTW90b3JBYm9ydEhv",
+            "bWluZ1JlcXVlc3QQ0g8SHQoYTW90b3JBYm9ydEhvbWluZ1Jlc3BvbnNlENMP",
+            "EhcKEk1vdG9ySG9taW5nUmVxdWVzdBDUDxIYChNNb3RvckhvbWluZ1Jlc3Bv",
+            "bnNlENUPEhgKE01vdG9ySm9nZ2luZ1JlcXVlc3QQ1g8SGQoUTW90b3JKb2dn",
+            "aW5nUmVzcG9uc2UQ1w8SHQoYTW90b3JBYm9ydEpvZ2dpbmdSZXF1ZXN0ENgP",
+            "Eh4KGU1vdG9yQWJvcnRKb2dnaW5nUmVzcG9uc2UQ2Q8SIAobRGlzcGVuc2Vy",
+            "QWJvcnRIb21pbmdSZXF1ZXN0ENoPEiEKHERpc3BlbnNlckFib3J0SG9taW5n",
+            "UmVzcG9uc2UQ2w8SGwoWRGlzcGVuc2VySG9taW5nUmVxdWVzdBDcDxIcChdE",
+            "aXNwZW5zZXJIb21pbmdSZXNwb25zZRDdDxIcChdEaXNwZW5zZXJKb2dnaW5n",
+            "UmVxdWVzdBDeDxIdChhEaXNwZW5zZXJKb2dnaW5nUmVzcG9uc2UQ3w8SIQoc",
+            "RGlzcGVuc2VyQWJvcnRKb2dnaW5nUmVxdWVzdBDgDxIiCh1EaXNwZW5zZXJB",
+            "Ym9ydEpvZ2dpbmdSZXNwb25zZRDhDxIZChRTZXREaWdpdGFsT3V0UmVxdWVz",
+            "dBDiDxIaChVTZXREaWdpdGFsT3V0UmVzcG9uc2UQ4w8SGQoUVGhyZWFkSm9n",
+            "Z2luZ1JlcXVlc3QQ5A8SGgoVVGhyZWFkSm9nZ2luZ1Jlc3BvbnNlEOUPEh4K",
+            "GVRocmVhZEFib3J0Sm9nZ2luZ1JlcXVlc3QQ5g8SHwoaVGhyZWFkQWJvcnRK",
+            "b2dnaW5nUmVzcG9uc2UQ5w8SHQoYU2V0Q29tcG9uZW50VmFsdWVSZXF1ZXN0",
+            "EOgPEh4KGVNldENvbXBvbmVudFZhbHVlUmVzcG9uc2UQ6Q8SGAoTUmVzb2x2",
+            "ZUV2ZW50UmVxdWVzdBDqDxIZChRSZXNvbHZlRXZlbnRSZXNwb25zZRDrDxIb",
+            "ChZTdG9wRGlhZ25vc3RpY3NSZXF1ZXN0EOwPEhwKF1N0b3BEaWFnbm9zdGlj",
+            "c1Jlc3BvbnNlEO0PEiMKHlN0YXJ0RXZlbnRzTm90aWZpY2F0aW9uUmVxdWVz",
+            "dBDuDxIkCh9TdGFydEV2ZW50c05vdGlmaWNhdGlvblJlc3BvbnNlEO8PEiIK",
+            "HVN0b3BFdmVudHNOb3RpZmljYXRpb25SZXF1ZXN0EPAPEiMKHlN0b3BFdmVu",
+            "dHNOb3RpZmljYXRpb25SZXNwb25zZRDxDxIaChVTZXRIZWF0ZXJTdGF0ZVJl",
+            "cXVlc3QQ8g8SGwoWU2V0SGVhdGVyU3RhdGVSZXNwb25zZRDzDxIaChVTZXRC",
+            "bG93ZXJTdGF0ZVJlcXVlc3QQ9A8SGwoWU2V0Qmxvd2VyU3RhdGVSZXNwb25z",
+            "ZRD1DxIZChRTZXRWYWx2ZVN0YXRlUmVxdWVzdBD2DxIaChVTZXRWYWx2ZVN0",
+            "YXRlUmVzcG9uc2UQ9w8SIQocU3RhcnRDYXJ0cmlkZ2VzVXBkYXRlUmVxdWVz",
+            "dBD4DxIiCh1TdGFydENhcnRyaWRnZXNVcGRhdGVSZXNwb25zZRD5DxIgChtT",
+            "dG9wQ2FydHJpZGdlc1VwZGF0ZVJlcXVlc3QQ+g8SIQocU3RvcENhcnRyaWRn",
+            "ZXNVcGRhdGVSZXNwb25zZRD7DxIfChpDYXJ0cmlkZ2VWYWxpZGF0aW9uUmVx",
+            "dWVzdBD8DxIgChtDYXJ0cmlkZ2VWYWxpZGF0aW9uUmVzcG9uc2UQ/Q8SDwoK",
+            "Sm9iUmVxdWVzdBC4FxIQCgtKb2JSZXNwb25zZRC5FxIUCg9BYm9ydEpvYlJl",
+            "cXVlc3QQuhcSFQoQQWJvcnRKb2JSZXNwb25zZRC7FxIjCh5VcGxvYWRQcm9j",
+            "ZXNzUGFyYW1ldGVyc1JlcXVlc3QQvBcSJAofVXBsb2FkUHJvY2Vzc1BhcmFt",
+            "ZXRlcnNSZXNwb25zZRC9FxIWChFDdXJyZW50Sm9iUmVxdWVzdBC+FxIXChJD",
+            "dXJyZW50Sm9iUmVzcG9uc2UQvxcSHAoXUmVzdW1lQ3VycmVudEpvYlJlcXVl",
+            "c3QQwBcSHQoYUmVzdW1lQ3VycmVudEpvYlJlc3BvbnNlEMEXEhkKFFN0YXJ0",
+            "RGVidWdMb2dSZXF1ZXN0EKAfEhoKFVN0YXJ0RGVidWdMb2dSZXNwb25zZRCh",
+            "HxIYChNTdG9wRGVidWdMb2dSZXF1ZXN0EKIfEhkKFFN0b3BEZWJ1Z0xvZ1Jl",
+            "c3BvbnNlEKMfEh8KGlNldERlYnVnTG9nQ2F0ZWdvcnlSZXF1ZXN0EKQfEiAK",
+            "G1NldERlYnVnTG9nQ2F0ZWdvcnlSZXNwb25zZRClHxInCiJVcGxvYWRIYXJk",
+            "d2FyZUNvbmZpZ3VyYXRpb25SZXF1ZXN0EIgnEigKI1VwbG9hZEhhcmR3YXJl",
+            "Q29uZmlndXJhdGlvblJlc3BvbnNlEIknEhcKElN5c3RlbVJlc2V0UmVxdWVz",
+            "dBCKJxIYChNTeXN0ZW1SZXNldFJlc3BvbnNlEIsnEhUKEEtlZXBBbGl2ZVJl",
+            "cXVlc3QQ8C4SFgoRS2VlcEFsaXZlUmVzcG9uc2UQ8S4SEwoOQ29ubmVjdFJl",
+            "cXVlc3QQ8i4SFAoPQ29ubmVjdFJlc3BvbnNlEPMuEhYKEURpc2Nvbm5lY3RS",
+            "ZXF1ZXN0EPQuEhcKEkRpc2Nvbm5lY3RSZXNwb25zZRD1LhIWChFGaWxlVXBs",
+            "b2FkUmVxdWVzdBDYNhIXChJGaWxlVXBsb2FkUmVzcG9uc2UQ2TYSGwoWRmls",
+            "ZUNodW5rVXBsb2FkUmVxdWVzdBDaNhIcChdGaWxlQ2h1bmtVcGxvYWRSZXNw",
+            "b25zZRDbNhIaChVFeGVjdXRlUHJvY2Vzc1JlcXVlc3QQ3DYSGwoWRXhlY3V0",
+            "ZVByb2Nlc3NSZXNwb25zZRDdNhIXChJLaWxsUHJvY2Vzc1JlcXVlc3QQ3jYS",
+            "GAoTS2lsbFByb2Nlc3NSZXNwb25zZRDfNhISCg1DcmVhdGVSZXF1ZXN0EOA2",
+            "EhMKDkNyZWF0ZVJlc3BvbnNlEOE2EhIKDURlbGV0ZVJlcXVlc3QQ4jYSEwoO",
+            "RGVsZXRlUmVzcG9uc2UQ4zYSGgoVR2V0U3RvcmFnZUluZm9SZXF1ZXN0EOQ2",
+            "EhsKFkdldFN0b3JhZ2VJbmZvUmVzcG9uc2UQ5TYSFAoPR2V0RmlsZXNSZXF1",
+            "ZXN0EOY2EhUKEEdldEZpbGVzUmVzcG9uc2UQ5zYSGAoTRmlsZURvd25sb2Fk",
+            "UmVxdWVzdBDoNhIZChRGaWxlRG93bmxvYWRSZXNwb25zZRDpNhIdChhGaWxl",
+            "Q2h1bmtEb3dubG9hZFJlcXVlc3QQ6jYSHgoZRmlsZUNodW5rRG93bmxvYWRS",
+            "ZXNwb25zZRDrNhIbChZWYWxpZGF0ZVZlcnNpb25SZXF1ZXN0EOw2EhwKF1Zh",
+            "bGlkYXRlVmVyc2lvblJlc3BvbnNlEO02EhsKFkFjdGl2YXRlVmVyc2lvblJl",
+            "cXVlc3QQ7jYSHAoXQWN0aXZhdGVWZXJzaW9uUmVzcG9uc2UQ7zYSGQoURGlz",
+            "cGVuc2VyRGF0YVJlcXVlc3QQwD4SGgoVRGlzcGVuc2VyRGF0YVJlc3BvbnNl",
+            "EME+EhwKF01pZFRhbmtEYXRhU2V0dXBSZXF1ZXN0EMI+Eh0KGE1pZFRhbmtE",
+            "YXRhU2V0dXBSZXNwb25zZRDDPhIiCh1NYWNoaW5lQ2FsaWJyYXRpb25EYXRh",
+            "UmVxdWVzdBDEPhIjCh5NYWNoaW5lQ2FsaWJyYXRpb25EYXRhUmVzcG9uc2UQ",
+            "xT4SJAofU3RhcnRNYWNoaW5lU3RhdHVzVXBkYXRlUmVxdWVzdBCoRhIlCiBT",
+            "dGFydE1hY2hpbmVTdGF0dXNVcGRhdGVSZXNwb25zZRCpRhIjCh5TdG9wTWFj",
+            "aGluZVN0YXR1c1VwZGF0ZVJlcXVlc3QQqkYSJAofU3RvcE1hY2hpbmVTdGF0",
+            "dXNVcGRhdGVSZXNwb25zZRCrRkIcChpjb20udHdpbmUudGFuZ28ucG1yLmNv",
+            "bW1vbmIGcHJvdG8z"));
       descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData,
           new pbr::FileDescriptor[] { },
           new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Common.MessageType), }, null));
@@ -325,22 +293,10 @@ namespace Tango.PMR.Common {
     [pbr::OriginalName("StubAbortJobRequest")] StubAbortJobRequest = 101,
     [pbr::OriginalName("StubAbortJobResponse")] StubAbortJobResponse = 102,
     [pbr::OriginalName("StubMidTankPressureSensorRequest")] StubMidTankPressureSensorRequest = 103,
-    [pbr::OriginalName("StubMidTankPressureSensorResponse")] StubMidTankPressureSensorResponse = 104,
-    [pbr::OriginalName("StubDispenserEEpromRequest")] StubDispenserEepromRequest = 105,
-    [pbr::OriginalName("StubDispenserEEpromResponse")] StubDispenserEepromResponse = 106,
-    [pbr::OriginalName("StubWhsEEpromRequest")] StubWhsEepromRequest = 107,
-    [pbr::OriginalName("StubWhsEEpromResponse")] StubWhsEepromResponse = 108,
-    [pbr::OriginalName("StubMainCardEEpromReadRequest")] StubMainCardEepromReadRequest = 109,
-    [pbr::OriginalName("StubMainCardEEpromReadResponse")] StubMainCardEepromReadResponse = 110,
-    [pbr::OriginalName("StubMainCardEEpromWriteRequest")] StubMainCardEepromWriteRequest = 111,
-    [pbr::OriginalName("StubMainCardEEpromWriteResponse")] StubMainCardEepromWriteResponse = 112,
-    [pbr::OriginalName("StubHeadEEpromRequest")] StubHeadEepromRequest = 113,
-    [pbr::OriginalName("StubHeadEEpromResponse")] StubHeadEepromResponse = 114,
-    [pbr::OriginalName("ProcedureRequest")] ProcedureRequest = 115,
     /// <summary>
     ///------------------------------------
     /// </summary>
-    [pbr::OriginalName("ProcedureResponse")] ProcedureResponse = 116,
+    [pbr::OriginalName("StubMidTankPressureSensorResponse")] StubMidTankPressureSensorResponse = 104,
     /// <summary>
     ///Integration
     /// </summary>
@@ -361,10 +317,6 @@ namespace Tango.PMR.Common {
     [pbr::OriginalName("ColorProfileResponse")] ColorProfileResponse = 1014,
     [pbr::OriginalName("UpdateStatusRequest")] UpdateStatusRequest = 1015,
     [pbr::OriginalName("UpdateStatusResponse")] UpdateStatusResponse = 1016,
-    [pbr::OriginalName("GenericRequest")] GenericRequest = 1017,
-    [pbr::OriginalName("GenericResponse")] GenericResponse = 1018,
-    [pbr::OriginalName("ConfigureProtocolRequest")] ConfigureProtocolRequest = 1019,
-    [pbr::OriginalName("ConfigureProtocolResponse")] ConfigureProtocolResponse = 1020,
     /// <summary>
     ///Diagnostics
     /// </summary>
@@ -408,6 +360,10 @@ namespace Tango.PMR.Common {
     [pbr::OriginalName("SetBlowerStateResponse")] SetBlowerStateResponse = 2037,
     [pbr::OriginalName("SetValveStateRequest")] SetValveStateRequest = 2038,
     [pbr::OriginalName("SetValveStateResponse")] SetValveStateResponse = 2039,
+    [pbr::OriginalName("StartCartridgesUpdateRequest")] StartCartridgesUpdateRequest = 2040,
+    [pbr::OriginalName("StartCartridgesUpdateResponse")] StartCartridgesUpdateResponse = 2041,
+    [pbr::OriginalName("StopCartridgesUpdateRequest")] StopCartridgesUpdateRequest = 2042,
+    [pbr::OriginalName("StopCartridgesUpdateResponse")] StopCartridgesUpdateResponse = 2043,
     [pbr::OriginalName("CartridgeValidationRequest")] CartridgeValidationRequest = 2044,
     [pbr::OriginalName("CartridgeValidationResponse")] CartridgeValidationResponse = 2045,
     /// <summary>
@@ -423,10 +379,6 @@ namespace Tango.PMR.Common {
     [pbr::OriginalName("CurrentJobResponse")] CurrentJobResponse = 3007,
     [pbr::OriginalName("ResumeCurrentJobRequest")] ResumeCurrentJobRequest = 3008,
     [pbr::OriginalName("ResumeCurrentJobResponse")] ResumeCurrentJobResponse = 3009,
-    [pbr::OriginalName("StartHeadCleaningRequest")] StartHeadCleaningRequest = 3010,
-    [pbr::OriginalName("StartHeadCleaningResponse")] StartHeadCleaningResponse = 3011,
-    [pbr::OriginalName("AbortHeadCleaningRequest")] AbortHeadCleaningRequest = 3012,
-    [pbr::OriginalName("AbortHeadCleaningResponse")] AbortHeadCleaningResponse = 3013,
     /// <summary>
     ///Debugging
     /// </summary>
@@ -436,8 +388,6 @@ namespace Tango.PMR.Common {
     [pbr::OriginalName("StopDebugLogResponse")] StopDebugLogResponse = 4003,
     [pbr::OriginalName("SetDebugLogCategoryRequest")] SetDebugLogCategoryRequest = 4004,
     [pbr::OriginalName("SetDebugLogCategoryResponse")] SetDebugLogCategoryResponse = 4005,
-    [pbr::OriginalName("SetupDebugDisributorsRequest")] SetupDebugDisributorsRequest = 4006,
-    [pbr::OriginalName("SetupDebugDisributorsResponse")] SetupDebugDisributorsResponse = 4007,
     /// <summary>
     ///Hardware
     /// </summary>
@@ -490,8 +440,6 @@ namespace Tango.PMR.Common {
     [pbr::OriginalName("MidTankDataSetupResponse")] MidTankDataSetupResponse = 8003,
     [pbr::OriginalName("MachineCalibrationDataRequest")] MachineCalibrationDataRequest = 8004,
     [pbr::OriginalName("MachineCalibrationDataResponse")] MachineCalibrationDataResponse = 8005,
-    [pbr::OriginalName("MainCardStoredDataRequest")] MainCardStoredDataRequest = 8006,
-    [pbr::OriginalName("MainCardStoredDataResponse")] MainCardStoredDataResponse = 8007,
     /// <summary>
     ///Machine Status
     /// </summary>
@@ -499,46 +447,6 @@ namespace Tango.PMR.Common {
     [pbr::OriginalName("StartMachineStatusUpdateResponse")] StartMachineStatusUpdateResponse = 9001,
     [pbr::OriginalName("StopMachineStatusUpdateRequest")] StopMachineStatusUpdateRequest = 9002,
     [pbr::OriginalName("StopMachineStatusUpdateResponse")] StopMachineStatusUpdateResponse = 9003,
-    /// <summary>
-    ///Power
-    /// </summary>
-    [pbr::OriginalName("StartPowerDownRequest")] StartPowerDownRequest = 10000,
-    [pbr::OriginalName("StartPowerDownResponse")] StartPowerDownResponse = 10001,
-    [pbr::OriginalName("AbortPowerDownRequest")] AbortPowerDownRequest = 10002,
-    [pbr::OriginalName("AbortPowerDownResponse")] AbortPowerDownResponse = 10003,
-    [pbr::OriginalName("StartPowerUpRequest")] StartPowerUpRequest = 10004,
-    [pbr::OriginalName("StartPowerUpResponse")] StartPowerUpResponse = 10005,
-    [pbr::OriginalName("AbortPowerUpRequest")] AbortPowerUpRequest = 10006,
-    [pbr::OriginalName("AbortPowerUpResponse")] AbortPowerUpResponse = 10007,
-    [pbr::OriginalName("StandByRequest")] StandByRequest = 10008,
-    [pbr::OriginalName("StandByResponse")] StandByResponse = 10009,
-    /// <summary>
-    ///Thread Loading
-    /// </summary>
-    [pbr::OriginalName("StartThreadLoadingRequest")] StartThreadLoadingRequest = 11000,
-    [pbr::OriginalName("StartThreadLoadingResponse")] StartThreadLoadingResponse = 11001,
-    [pbr::OriginalName("ContinueThreadLoadingRequest")] ContinueThreadLoadingRequest = 11002,
-    [pbr::OriginalName("ContinueThreadLoadingResponse")] ContinueThreadLoadingResponse = 11003,
-    [pbr::OriginalName("StopThreadLoadingRequest")] StopThreadLoadingRequest = 11004,
-    [pbr::OriginalName("StopThreadLoadingResponse")] StopThreadLoadingResponse = 11005,
-    [pbr::OriginalName("TryThreadLoadingRequest")] TryThreadLoadingRequest = 11006,
-    [pbr::OriginalName("TryThreadLoadingResponse")] TryThreadLoadingResponse = 11007,
-    [pbr::OriginalName("AttemptThreadJoggingRequest")] AttemptThreadJoggingRequest = 11008,
-    [pbr::OriginalName("AttemptThreadJoggingResponse")] AttemptThreadJoggingResponse = 11009,
-    /// <summary>
-    ///IFS
-    /// </summary>
-    [pbr::OriginalName("StartInkFillingStatusRequest")] StartInkFillingStatusRequest = 12000,
-    [pbr::OriginalName("StartInkFillingStatusResponse")] StartInkFillingStatusResponse = 12001,
-    /// <summary>
-    ///DataStore
-    /// </summary>
-    [pbr::OriginalName("PutDataStoreItemRequest")] PutDataStoreItemRequest = 13000,
-    [pbr::OriginalName("PutDataStoreItemResponse")] PutDataStoreItemResponse = 13001,
-    [pbr::OriginalName("GetDataStoreItemRequest")] GetDataStoreItemRequest = 13002,
-    [pbr::OriginalName("GetDataStoreItemResponse")] GetDataStoreItemResponse = 13003,
-    [pbr::OriginalName("DataStoreItemModifiedRequest")] DataStoreItemModifiedRequest = 13004,
-    [pbr::OriginalName("DataStoreItemModifiedResponse")] DataStoreItemModifiedResponse = 13005,
   }
 
   #endregion