diff options
18 files changed, 461 insertions, 104 deletions
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf Binary files differindex d284c2355..ff8e11bbf 100644 --- a/Software/DB/Tango.mdf +++ b/Software/DB/Tango.mdf diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf Binary files differindex d5962be86..f35e4270c 100644 --- a/Software/DB/Tango_log.ldf +++ b/Software/DB/Tango_log.ldf diff --git a/Software/PMR/Messages/Common/MessageType.proto b/Software/PMR/Messages/Common/MessageType.proto index a4031b5e8..8bd0c6e98 100644 --- a/Software/PMR/Messages/Common/MessageType.proto +++ b/Software/PMR/Messages/Common/MessageType.proto @@ -200,6 +200,8 @@ enum MessageType CartridgeValidationResponse = 2045; BitResultsRequest = 2046; BitResultsResponse = 2047; + ResetCardRequest = 2048; + ResetCardResponse = 2049; //Printing JobRequest = 3000; diff --git a/Software/PMR/Messages/Diagnostics/EventType.proto b/Software/PMR/Messages/Diagnostics/EventType.proto index 6e1383175..0adfa71bf 100644 --- a/Software/PMR/Messages/Diagnostics/EventType.proto +++ b/Software/PMR/Messages/Diagnostics/EventType.proto @@ -1762,49 +1762,49 @@ enum EventType //Pressure in @ ink line too low. Cannot execute job (Group = InkDeliverySystem, Category = Error) E_INK_LINE_10_PRESSURE_TOO_LOW = 112019; - //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) E_INK_PUMP_1_MALFUNCTION = 112020; - //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) E_INK_PUMP_2_MALFUNCTION = 112021; - //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) E_INK_PUMP_3_MALFUNCTION = 112022; - //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) E_INK_PUMP_4_MALFUNCTION = 112023; - //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) E_INK_PUMP_5_MALFUNCTION = 112024; - //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) E_INK_PUMP_6_MALFUNCTION = 112025; - //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) E_INK_PUMP_7_MALFUNCTION = 112026; - //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) E_INK_PUMP_8_MALFUNCTION = 112027; - //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) E_INK_PUMP_9_MALFUNCTION = 112028; - //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) E_INK_PUMP_10_MALFUNCTION = 112029; - //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) E_INK_PUMP_11_MALFUNCTION = 112030; - //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) E_INK_PUMP_12_MALFUNCTION = 112031; - //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) E_INK_PUMP_13_MALFUNCTION = 112032; - //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) E_INK_PUMP_14_MALFUNCTION = 112033; - //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + //Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) E_INK_PUMP_15_MALFUNCTION = 112034; //The @ tank level is low (Group = InkFillingSystem, Category = Warning) diff --git a/Software/PMR/Messages/Diagnostics/ResetCardRequest.proto b/Software/PMR/Messages/Diagnostics/ResetCardRequest.proto new file mode 100644 index 000000000..b7c041874 --- /dev/null +++ b/Software/PMR/Messages/Diagnostics/ResetCardRequest.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +package Tango.PMR.Diagnostics; +option java_package = "com.twine.tango.pmr.diagnostics"; + +message ResetCardRequest +{ + int32 CardID = 1; +}
\ No newline at end of file diff --git a/Software/PMR/Messages/Diagnostics/ResetCardResponse.proto b/Software/PMR/Messages/Diagnostics/ResetCardResponse.proto new file mode 100644 index 000000000..3093e6f95 --- /dev/null +++ b/Software/PMR/Messages/Diagnostics/ResetCardResponse.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +package Tango.PMR.Diagnostics; +option java_package = "com.twine.tango.pmr.diagnostics"; + +message ResetCardResponse +{ + +}
\ No newline at end of file diff --git a/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs index 5db477b6b..68ed696fa 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs @@ -593,5 +593,18 @@ namespace Tango.Integration.Operation /// </summary> /// <param name="approved">Approve or decline the sequence.</param> Task CompleteWasteReplacement(bool approved); + + /// <summary> + /// Gets the list of firmware version descriptors. + /// </summary> + /// <returns></returns> + Task<List<VersionFileDescriptor>> GetFirmwareVersionDescriptors(); + + /// <summary> + /// Resets the firmware card by the specified card id. + /// </summary> + /// <param name="cardID">The card identifier.</param> + /// <returns></returns> + Task ResetCard(int cardID); } } diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs index 430533768..2d066a78f 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs @@ -4637,6 +4637,26 @@ namespace Tango.Integration.Operation } } + /// <summary> + /// Gets the list of firmware version descriptors. + /// </summary> + /// <returns></returns> + public async Task<List<VersionFileDescriptor>> GetFirmwareVersionDescriptors() + { + var response = await SendRequest<GetVersionDescriptorsRequest, GetVersionDescriptorsResponse>(new GetVersionDescriptorsRequest()); + return response.Message.Descriptors.ToList(); + } + + /// <summary> + /// Resets the firmware card by the specified card id. + /// </summary> + /// <param name="cardID">The card identifier.</param> + /// <returns></returns> + public Task ResetCard(int cardID) + { + return SendRequest<ResetCardRequest, ResetCardResponse>(new ResetCardRequest() { }, new TransportRequestConfig() { Timeout = TimeSpan.FromSeconds(10) }); + } + #endregion } } diff --git a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs index dae38027e..d106ab382 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( - "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiq4QgoLTWVz", + "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbirnQgoLTWVz", "c2FnZVR5cGUSCAoETm9uZRAAEhEKDUVycm9yUmVzcG9uc2UQARIUChBDYWxj", "dWxhdGVSZXF1ZXN0EAMSFQoRQ2FsY3VsYXRlUmVzcG9uc2UQBBITCg9Qcm9n", "cmVzc1JlcXVlc3QQBRIUChBQcm9ncmVzc1Jlc3BvbnNlEAYSHAoYU3R1YkNh", @@ -141,78 +141,79 @@ namespace Tango.PMR.Common { "dBD2DxIaChVTZXRWYWx2ZVN0YXRlUmVzcG9uc2UQ9w8SHwoaQ2FydHJpZGdl", "VmFsaWRhdGlvblJlcXVlc3QQ/A8SIAobQ2FydHJpZGdlVmFsaWRhdGlvblJl", "c3BvbnNlEP0PEhYKEUJpdFJlc3VsdHNSZXF1ZXN0EP4PEhcKEkJpdFJlc3Vs", - "dHNSZXNwb25zZRD/DxIPCgpKb2JSZXF1ZXN0ELgXEhAKC0pvYlJlc3BvbnNl", - "ELkXEhQKD0Fib3J0Sm9iUmVxdWVzdBC6FxIVChBBYm9ydEpvYlJlc3BvbnNl", - "ELsXEiMKHlVwbG9hZFByb2Nlc3NQYXJhbWV0ZXJzUmVxdWVzdBC8FxIkCh9V", - "cGxvYWRQcm9jZXNzUGFyYW1ldGVyc1Jlc3BvbnNlEL0XEhYKEUN1cnJlbnRK", - "b2JSZXF1ZXN0EL4XEhcKEkN1cnJlbnRKb2JSZXNwb25zZRC/FxIcChdSZXN1", - "bWVDdXJyZW50Sm9iUmVxdWVzdBDAFxIdChhSZXN1bWVDdXJyZW50Sm9iUmVz", - "cG9uc2UQwRcSHQoYU3RhcnRIZWFkQ2xlYW5pbmdSZXF1ZXN0EMIXEh4KGVN0", - "YXJ0SGVhZENsZWFuaW5nUmVzcG9uc2UQwxcSHQoYQWJvcnRIZWFkQ2xlYW5p", - "bmdSZXF1ZXN0EMQXEh4KGUFib3J0SGVhZENsZWFuaW5nUmVzcG9uc2UQxRcS", - "FgoRSm9iUHJlcGFyZVJlcXVlc3QQxhcSFwoSSm9iUHJlcGFyZVJlc3BvbnNl", - "EMcXEhkKFFN0YXJ0RGVidWdMb2dSZXF1ZXN0EKAfEhoKFVN0YXJ0RGVidWdM", - "b2dSZXNwb25zZRChHxIYChNTdG9wRGVidWdMb2dSZXF1ZXN0EKIfEhkKFFN0", - "b3BEZWJ1Z0xvZ1Jlc3BvbnNlEKMfEh8KGlNldERlYnVnTG9nQ2F0ZWdvcnlS", - "ZXF1ZXN0EKQfEiAKG1NldERlYnVnTG9nQ2F0ZWdvcnlSZXNwb25zZRClHxIh", - "ChxTZXR1cERlYnVnRGlzcmlidXRvcnNSZXF1ZXN0EKYfEiIKHVNldHVwRGVi", - "dWdEaXNyaWJ1dG9yc1Jlc3BvbnNlEKcfEicKIlVwbG9hZEhhcmR3YXJlQ29u", - "ZmlndXJhdGlvblJlcXVlc3QQiCcSKAojVXBsb2FkSGFyZHdhcmVDb25maWd1", - "cmF0aW9uUmVzcG9uc2UQiScSFwoSU3lzdGVtUmVzZXRSZXF1ZXN0EIonEhgK", - "E1N5c3RlbVJlc2V0UmVzcG9uc2UQiycSFQoQS2VlcEFsaXZlUmVxdWVzdBDw", - "LhIWChFLZWVwQWxpdmVSZXNwb25zZRDxLhITCg5Db25uZWN0UmVxdWVzdBDy", - "LhIUCg9Db25uZWN0UmVzcG9uc2UQ8y4SFgoRRGlzY29ubmVjdFJlcXVlc3QQ", - "9C4SFwoSRGlzY29ubmVjdFJlc3BvbnNlEPUuEhYKEUZpbGVVcGxvYWRSZXF1", - "ZXN0ENg2EhcKEkZpbGVVcGxvYWRSZXNwb25zZRDZNhIbChZGaWxlQ2h1bmtV", - "cGxvYWRSZXF1ZXN0ENo2EhwKF0ZpbGVDaHVua1VwbG9hZFJlc3BvbnNlENs2", - "EhoKFUV4ZWN1dGVQcm9jZXNzUmVxdWVzdBDcNhIbChZFeGVjdXRlUHJvY2Vz", - "c1Jlc3BvbnNlEN02EhcKEktpbGxQcm9jZXNzUmVxdWVzdBDeNhIYChNLaWxs", - "UHJvY2Vzc1Jlc3BvbnNlEN82EhIKDUNyZWF0ZVJlcXVlc3QQ4DYSEwoOQ3Jl", - "YXRlUmVzcG9uc2UQ4TYSEgoNRGVsZXRlUmVxdWVzdBDiNhITCg5EZWxldGVS", - "ZXNwb25zZRDjNhIaChVHZXRTdG9yYWdlSW5mb1JlcXVlc3QQ5DYSGwoWR2V0", - "U3RvcmFnZUluZm9SZXNwb25zZRDlNhIUCg9HZXRGaWxlc1JlcXVlc3QQ5jYS", - "FQoQR2V0RmlsZXNSZXNwb25zZRDnNhIYChNGaWxlRG93bmxvYWRSZXF1ZXN0", - "EOg2EhkKFEZpbGVEb3dubG9hZFJlc3BvbnNlEOk2Eh0KGEZpbGVDaHVua0Rv", - "d25sb2FkUmVxdWVzdBDqNhIeChlGaWxlQ2h1bmtEb3dubG9hZFJlc3BvbnNl", - "EOs2EhsKFlZhbGlkYXRlVmVyc2lvblJlcXVlc3QQ7DYSHAoXVmFsaWRhdGVW", - "ZXJzaW9uUmVzcG9uc2UQ7TYSGwoWQWN0aXZhdGVWZXJzaW9uUmVxdWVzdBDu", - "NhIcChdBY3RpdmF0ZVZlcnNpb25SZXNwb25zZRDvNhIhChxHZXRWZXJzaW9u", - "RGVzY3JpcHRvcnNSZXF1ZXN0EPA2EiIKHUdldFZlcnNpb25EZXNjcmlwdG9y", - "c1Jlc3BvbnNlEPE2EhkKFERpc3BlbnNlckRhdGFSZXF1ZXN0EMA+EhoKFURp", - "c3BlbnNlckRhdGFSZXNwb25zZRDBPhIcChdNaWRUYW5rRGF0YVNldHVwUmVx", - "dWVzdBDCPhIdChhNaWRUYW5rRGF0YVNldHVwUmVzcG9uc2UQwz4SIgodTWFj", - "aGluZUNhbGlicmF0aW9uRGF0YVJlcXVlc3QQxD4SIwoeTWFjaGluZUNhbGli", - "cmF0aW9uRGF0YVJlc3BvbnNlEMU+Eh4KGU1haW5DYXJkU3RvcmVkRGF0YVJl", - "cXVlc3QQxj4SHwoaTWFpbkNhcmRTdG9yZWREYXRhUmVzcG9uc2UQxz4SJAof", - "U3RhcnRNYWNoaW5lU3RhdHVzVXBkYXRlUmVxdWVzdBCoRhIlCiBTdGFydE1h", - "Y2hpbmVTdGF0dXNVcGRhdGVSZXNwb25zZRCpRhIjCh5TdG9wTWFjaGluZVN0", - "YXR1c1VwZGF0ZVJlcXVlc3QQqkYSJAofU3RvcE1hY2hpbmVTdGF0dXNVcGRh", - "dGVSZXNwb25zZRCrRhIhChxTZXRJbmtBdXRvRmlsbGluZ01vZGVSZXF1ZXN0", - "EKxGEiIKHVNldElua0F1dG9GaWxsaW5nTW9kZVJlc3BvbnNlEK1GEhwKF1Nw", - "b29sVHlwZUNoYW5nZWRSZXF1ZXN0EK5GEh0KGFNwb29sVHlwZUNoYW5nZWRS", - "ZXNwb25zZRCvRhIaChVTdGFydFBvd2VyRG93blJlcXVlc3QQkE4SGwoWU3Rh", - "cnRQb3dlckRvd25SZXNwb25zZRCRThIaChVBYm9ydFBvd2VyRG93blJlcXVl", - "c3QQkk4SGwoWQWJvcnRQb3dlckRvd25SZXNwb25zZRCTThIYChNTdGFydFBv", - "d2VyVXBSZXF1ZXN0EJROEhkKFFN0YXJ0UG93ZXJVcFJlc3BvbnNlEJVOEhgK", - "E0Fib3J0UG93ZXJVcFJlcXVlc3QQlk4SGQoUQWJvcnRQb3dlclVwUmVzcG9u", - "c2UQl04SEwoOU3RhbmRCeVJlcXVlc3QQmE4SFAoPU3RhbmRCeVJlc3BvbnNl", - "EJlOEh4KGVN0YXJ0VGhyZWFkTG9hZGluZ1JlcXVlc3QQ+FUSHwoaU3RhcnRU", - "aHJlYWRMb2FkaW5nUmVzcG9uc2UQ+VUSIQocQ29udGludWVUaHJlYWRMb2Fk", - "aW5nUmVxdWVzdBD6VRIiCh1Db250aW51ZVRocmVhZExvYWRpbmdSZXNwb25z", - "ZRD7VRIdChhTdG9wVGhyZWFkTG9hZGluZ1JlcXVlc3QQ/FUSHgoZU3RvcFRo", - "cmVhZExvYWRpbmdSZXNwb25zZRD9VRIcChdUcnlUaHJlYWRMb2FkaW5nUmVx", - "dWVzdBD+VRIdChhUcnlUaHJlYWRMb2FkaW5nUmVzcG9uc2UQ/1USIAobQXR0", - "ZW1wdFRocmVhZEpvZ2dpbmdSZXF1ZXN0EIBWEiEKHEF0dGVtcHRUaHJlYWRK", - "b2dnaW5nUmVzcG9uc2UQgVYSIQocU3RhcnRJbmtGaWxsaW5nU3RhdHVzUmVx", - "dWVzdBDgXRIiCh1TdGFydElua0ZpbGxpbmdTdGF0dXNSZXNwb25zZRDhXRIe", - "ChlJbml0aWF0ZUlua0ZpbGxpbmdSZXF1ZXN0EOJdEh8KGkluaXRpYXRlSW5r", - "RmlsbGluZ1Jlc3BvbnNlEONdEhgKE1dhc3RlUmVwbGFjZVJlcXVlc3QQ5F0S", - "GQoUV2FzdGVSZXBsYWNlUmVzcG9uc2UQ5V0SHAoXUHV0RGF0YVN0b3JlSXRl", - "bVJlcXVlc3QQyGUSHQoYUHV0RGF0YVN0b3JlSXRlbVJlc3BvbnNlEMllEhwK", - "F0dldERhdGFTdG9yZUl0ZW1SZXF1ZXN0EMplEh0KGEdldERhdGFTdG9yZUl0", - "ZW1SZXNwb25zZRDLZRIhChxEYXRhU3RvcmVJdGVtTW9kaWZpZWRSZXF1ZXN0", - "EMxlEiIKHURhdGFTdG9yZUl0ZW1Nb2RpZmllZFJlc3BvbnNlEM1lQhwKGmNv", - "bS50d2luZS50YW5nby5wbXIuY29tbW9uYgZwcm90bzM=")); + "dHNSZXNwb25zZRD/DxIVChBSZXNldENhcmRSZXF1ZXN0EIAQEhYKEVJlc2V0", + "Q2FyZFJlc3BvbnNlEIEQEg8KCkpvYlJlcXVlc3QQuBcSEAoLSm9iUmVzcG9u", + "c2UQuRcSFAoPQWJvcnRKb2JSZXF1ZXN0ELoXEhUKEEFib3J0Sm9iUmVzcG9u", + "c2UQuxcSIwoeVXBsb2FkUHJvY2Vzc1BhcmFtZXRlcnNSZXF1ZXN0ELwXEiQK", + "H1VwbG9hZFByb2Nlc3NQYXJhbWV0ZXJzUmVzcG9uc2UQvRcSFgoRQ3VycmVu", + "dEpvYlJlcXVlc3QQvhcSFwoSQ3VycmVudEpvYlJlc3BvbnNlEL8XEhwKF1Jl", + "c3VtZUN1cnJlbnRKb2JSZXF1ZXN0EMAXEh0KGFJlc3VtZUN1cnJlbnRKb2JS", + "ZXNwb25zZRDBFxIdChhTdGFydEhlYWRDbGVhbmluZ1JlcXVlc3QQwhcSHgoZ", + "U3RhcnRIZWFkQ2xlYW5pbmdSZXNwb25zZRDDFxIdChhBYm9ydEhlYWRDbGVh", + "bmluZ1JlcXVlc3QQxBcSHgoZQWJvcnRIZWFkQ2xlYW5pbmdSZXNwb25zZRDF", + "FxIWChFKb2JQcmVwYXJlUmVxdWVzdBDGFxIXChJKb2JQcmVwYXJlUmVzcG9u", + "c2UQxxcSGQoUU3RhcnREZWJ1Z0xvZ1JlcXVlc3QQoB8SGgoVU3RhcnREZWJ1", + "Z0xvZ1Jlc3BvbnNlEKEfEhgKE1N0b3BEZWJ1Z0xvZ1JlcXVlc3QQoh8SGQoU", + "U3RvcERlYnVnTG9nUmVzcG9uc2UQox8SHwoaU2V0RGVidWdMb2dDYXRlZ29y", + "eVJlcXVlc3QQpB8SIAobU2V0RGVidWdMb2dDYXRlZ29yeVJlc3BvbnNlEKUf", + "EiEKHFNldHVwRGVidWdEaXNyaWJ1dG9yc1JlcXVlc3QQph8SIgodU2V0dXBE", + "ZWJ1Z0Rpc3JpYnV0b3JzUmVzcG9uc2UQpx8SJwoiVXBsb2FkSGFyZHdhcmVD", + "b25maWd1cmF0aW9uUmVxdWVzdBCIJxIoCiNVcGxvYWRIYXJkd2FyZUNvbmZp", + "Z3VyYXRpb25SZXNwb25zZRCJJxIXChJTeXN0ZW1SZXNldFJlcXVlc3QQiicS", + "GAoTU3lzdGVtUmVzZXRSZXNwb25zZRCLJxIVChBLZWVwQWxpdmVSZXF1ZXN0", + "EPAuEhYKEUtlZXBBbGl2ZVJlc3BvbnNlEPEuEhMKDkNvbm5lY3RSZXF1ZXN0", + "EPIuEhQKD0Nvbm5lY3RSZXNwb25zZRDzLhIWChFEaXNjb25uZWN0UmVxdWVz", + "dBD0LhIXChJEaXNjb25uZWN0UmVzcG9uc2UQ9S4SFgoRRmlsZVVwbG9hZFJl", + "cXVlc3QQ2DYSFwoSRmlsZVVwbG9hZFJlc3BvbnNlENk2EhsKFkZpbGVDaHVu", + "a1VwbG9hZFJlcXVlc3QQ2jYSHAoXRmlsZUNodW5rVXBsb2FkUmVzcG9uc2UQ", + "2zYSGgoVRXhlY3V0ZVByb2Nlc3NSZXF1ZXN0ENw2EhsKFkV4ZWN1dGVQcm9j", + "ZXNzUmVzcG9uc2UQ3TYSFwoSS2lsbFByb2Nlc3NSZXF1ZXN0EN42EhgKE0tp", + "bGxQcm9jZXNzUmVzcG9uc2UQ3zYSEgoNQ3JlYXRlUmVxdWVzdBDgNhITCg5D", + "cmVhdGVSZXNwb25zZRDhNhISCg1EZWxldGVSZXF1ZXN0EOI2EhMKDkRlbGV0", + "ZVJlc3BvbnNlEOM2EhoKFUdldFN0b3JhZ2VJbmZvUmVxdWVzdBDkNhIbChZH", + "ZXRTdG9yYWdlSW5mb1Jlc3BvbnNlEOU2EhQKD0dldEZpbGVzUmVxdWVzdBDm", + "NhIVChBHZXRGaWxlc1Jlc3BvbnNlEOc2EhgKE0ZpbGVEb3dubG9hZFJlcXVl", + "c3QQ6DYSGQoURmlsZURvd25sb2FkUmVzcG9uc2UQ6TYSHQoYRmlsZUNodW5r", + "RG93bmxvYWRSZXF1ZXN0EOo2Eh4KGUZpbGVDaHVua0Rvd25sb2FkUmVzcG9u", + "c2UQ6zYSGwoWVmFsaWRhdGVWZXJzaW9uUmVxdWVzdBDsNhIcChdWYWxpZGF0", + "ZVZlcnNpb25SZXNwb25zZRDtNhIbChZBY3RpdmF0ZVZlcnNpb25SZXF1ZXN0", + "EO42EhwKF0FjdGl2YXRlVmVyc2lvblJlc3BvbnNlEO82EiEKHEdldFZlcnNp", + "b25EZXNjcmlwdG9yc1JlcXVlc3QQ8DYSIgodR2V0VmVyc2lvbkRlc2NyaXB0", + "b3JzUmVzcG9uc2UQ8TYSGQoURGlzcGVuc2VyRGF0YVJlcXVlc3QQwD4SGgoV", + "RGlzcGVuc2VyRGF0YVJlc3BvbnNlEME+EhwKF01pZFRhbmtEYXRhU2V0dXBS", + "ZXF1ZXN0EMI+Eh0KGE1pZFRhbmtEYXRhU2V0dXBSZXNwb25zZRDDPhIiCh1N", + "YWNoaW5lQ2FsaWJyYXRpb25EYXRhUmVxdWVzdBDEPhIjCh5NYWNoaW5lQ2Fs", + "aWJyYXRpb25EYXRhUmVzcG9uc2UQxT4SHgoZTWFpbkNhcmRTdG9yZWREYXRh", + "UmVxdWVzdBDGPhIfChpNYWluQ2FyZFN0b3JlZERhdGFSZXNwb25zZRDHPhIk", + "Ch9TdGFydE1hY2hpbmVTdGF0dXNVcGRhdGVSZXF1ZXN0EKhGEiUKIFN0YXJ0", + "TWFjaGluZVN0YXR1c1VwZGF0ZVJlc3BvbnNlEKlGEiMKHlN0b3BNYWNoaW5l", + "U3RhdHVzVXBkYXRlUmVxdWVzdBCqRhIkCh9TdG9wTWFjaGluZVN0YXR1c1Vw", + "ZGF0ZVJlc3BvbnNlEKtGEiEKHFNldElua0F1dG9GaWxsaW5nTW9kZVJlcXVl", + "c3QQrEYSIgodU2V0SW5rQXV0b0ZpbGxpbmdNb2RlUmVzcG9uc2UQrUYSHAoX", + "U3Bvb2xUeXBlQ2hhbmdlZFJlcXVlc3QQrkYSHQoYU3Bvb2xUeXBlQ2hhbmdl", + "ZFJlc3BvbnNlEK9GEhoKFVN0YXJ0UG93ZXJEb3duUmVxdWVzdBCQThIbChZT", + "dGFydFBvd2VyRG93blJlc3BvbnNlEJFOEhoKFUFib3J0UG93ZXJEb3duUmVx", + "dWVzdBCSThIbChZBYm9ydFBvd2VyRG93blJlc3BvbnNlEJNOEhgKE1N0YXJ0", + "UG93ZXJVcFJlcXVlc3QQlE4SGQoUU3RhcnRQb3dlclVwUmVzcG9uc2UQlU4S", + "GAoTQWJvcnRQb3dlclVwUmVxdWVzdBCWThIZChRBYm9ydFBvd2VyVXBSZXNw", + "b25zZRCXThITCg5TdGFuZEJ5UmVxdWVzdBCYThIUCg9TdGFuZEJ5UmVzcG9u", + "c2UQmU4SHgoZU3RhcnRUaHJlYWRMb2FkaW5nUmVxdWVzdBD4VRIfChpTdGFy", + "dFRocmVhZExvYWRpbmdSZXNwb25zZRD5VRIhChxDb250aW51ZVRocmVhZExv", + "YWRpbmdSZXF1ZXN0EPpVEiIKHUNvbnRpbnVlVGhyZWFkTG9hZGluZ1Jlc3Bv", + "bnNlEPtVEh0KGFN0b3BUaHJlYWRMb2FkaW5nUmVxdWVzdBD8VRIeChlTdG9w", + "VGhyZWFkTG9hZGluZ1Jlc3BvbnNlEP1VEhwKF1RyeVRocmVhZExvYWRpbmdS", + "ZXF1ZXN0EP5VEh0KGFRyeVRocmVhZExvYWRpbmdSZXNwb25zZRD/VRIgChtB", + "dHRlbXB0VGhyZWFkSm9nZ2luZ1JlcXVlc3QQgFYSIQocQXR0ZW1wdFRocmVh", + "ZEpvZ2dpbmdSZXNwb25zZRCBVhIhChxTdGFydElua0ZpbGxpbmdTdGF0dXNS", + "ZXF1ZXN0EOBdEiIKHVN0YXJ0SW5rRmlsbGluZ1N0YXR1c1Jlc3BvbnNlEOFd", + "Eh4KGUluaXRpYXRlSW5rRmlsbGluZ1JlcXVlc3QQ4l0SHwoaSW5pdGlhdGVJ", + "bmtGaWxsaW5nUmVzcG9uc2UQ410SGAoTV2FzdGVSZXBsYWNlUmVxdWVzdBDk", + "XRIZChRXYXN0ZVJlcGxhY2VSZXNwb25zZRDlXRIcChdQdXREYXRhU3RvcmVJ", + "dGVtUmVxdWVzdBDIZRIdChhQdXREYXRhU3RvcmVJdGVtUmVzcG9uc2UQyWUS", + "HAoXR2V0RGF0YVN0b3JlSXRlbVJlcXVlc3QQymUSHQoYR2V0RGF0YVN0b3Jl", + "SXRlbVJlc3BvbnNlEMtlEiEKHERhdGFTdG9yZUl0ZW1Nb2RpZmllZFJlcXVl", + "c3QQzGUSIgodRGF0YVN0b3JlSXRlbU1vZGlmaWVkUmVzcG9uc2UQzWVCHAoa", + "Y29tLnR3aW5lLnRhbmdvLnBtci5jb21tb25iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Common.MessageType), }, null)); @@ -421,6 +422,8 @@ namespace Tango.PMR.Common { [pbr::OriginalName("CartridgeValidationResponse")] CartridgeValidationResponse = 2045, [pbr::OriginalName("BitResultsRequest")] BitResultsRequest = 2046, [pbr::OriginalName("BitResultsResponse")] BitResultsResponse = 2047, + [pbr::OriginalName("ResetCardRequest")] ResetCardRequest = 2048, + [pbr::OriginalName("ResetCardResponse")] ResetCardResponse = 2049, /// <summary> ///Printing /// </summary> diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs index 9d21471e6..8c490af74 100644 --- a/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs +++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs @@ -2861,63 +2861,63 @@ namespace Tango.PMR.Diagnostics { /// </summary> [pbr::OriginalName("E_INK_LINE_10_PRESSURE_TOO_LOW")] EInkLine10PressureTooLow = 112019, /// <summary> - ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("E_INK_PUMP_1_MALFUNCTION")] EInkPump1Malfunction = 112020, /// <summary> - ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("E_INK_PUMP_2_MALFUNCTION")] EInkPump2Malfunction = 112021, /// <summary> - ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("E_INK_PUMP_3_MALFUNCTION")] EInkPump3Malfunction = 112022, /// <summary> - ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("E_INK_PUMP_4_MALFUNCTION")] EInkPump4Malfunction = 112023, /// <summary> - ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("E_INK_PUMP_5_MALFUNCTION")] EInkPump5Malfunction = 112024, /// <summary> - ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("E_INK_PUMP_6_MALFUNCTION")] EInkPump6Malfunction = 112025, /// <summary> - ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("E_INK_PUMP_7_MALFUNCTION")] EInkPump7Malfunction = 112026, /// <summary> - ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("E_INK_PUMP_8_MALFUNCTION")] EInkPump8Malfunction = 112027, /// <summary> - ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("E_INK_PUMP_9_MALFUNCTION")] EInkPump9Malfunction = 112028, /// <summary> - ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("E_INK_PUMP_10_MALFUNCTION")] EInkPump10Malfunction = 112029, /// <summary> - ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("E_INK_PUMP_11_MALFUNCTION")] EInkPump11Malfunction = 112030, /// <summary> - ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("E_INK_PUMP_12_MALFUNCTION")] EInkPump12Malfunction = 112031, /// <summary> - ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("E_INK_PUMP_13_MALFUNCTION")] EInkPump13Malfunction = 112032, /// <summary> - ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("E_INK_PUMP_14_MALFUNCTION")] EInkPump14Malfunction = 112033, /// <summary> - ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Warning) + ///Malfunction in @ ink pump. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("E_INK_PUMP_15_MALFUNCTION")] EInkPump15Malfunction = 112034, /// <summary> diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/ResetCardRequest.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/ResetCardRequest.cs new file mode 100644 index 000000000..8c98366a4 --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/ResetCardRequest.cs @@ -0,0 +1,159 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: ResetCardRequest.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.Diagnostics { + + /// <summary>Holder for reflection information generated from ResetCardRequest.proto</summary> + public static partial class ResetCardRequestReflection { + + #region Descriptor + /// <summary>File descriptor for ResetCardRequest.proto</summary> + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static ResetCardRequestReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChZSZXNldENhcmRSZXF1ZXN0LnByb3RvEhVUYW5nby5QTVIuRGlhZ25vc3Rp", + "Y3MiIgoQUmVzZXRDYXJkUmVxdWVzdBIOCgZDYXJkSUQYASABKAVCIQofY29t", + "LnR3aW5lLnRhbmdvLnBtci5kaWFnbm9zdGljc2IGcHJvdG8z")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.ResetCardRequest), global::Tango.PMR.Diagnostics.ResetCardRequest.Parser, new[]{ "CardID" }, null, null, null) + })); + } + #endregion + + } + #region Messages + public sealed partial class ResetCardRequest : pb::IMessage<ResetCardRequest> { + private static readonly pb::MessageParser<ResetCardRequest> _parser = new pb::MessageParser<ResetCardRequest>(() => new ResetCardRequest()); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser<ResetCardRequest> Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Tango.PMR.Diagnostics.ResetCardRequestReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public ResetCardRequest() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public ResetCardRequest(ResetCardRequest other) : this() { + cardID_ = other.cardID_; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public ResetCardRequest Clone() { + return new ResetCardRequest(this); + } + + /// <summary>Field number for the "CardID" field.</summary> + public const int CardIDFieldNumber = 1; + private int cardID_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CardID { + get { return cardID_; } + set { + cardID_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as ResetCardRequest); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(ResetCardRequest other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (CardID != other.CardID) return false; + return true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (CardID != 0) hash ^= CardID.GetHashCode(); + 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) { + if (CardID != 0) { + output.WriteRawTag(8); + output.WriteInt32(CardID); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (CardID != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(CardID); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(ResetCardRequest other) { + if (other == null) { + return; + } + if (other.CardID != 0) { + CardID = other.CardID; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + input.SkipLastField(); + break; + case 8: { + CardID = input.ReadInt32(); + break; + } + } + } + } + + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/ResetCardResponse.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/ResetCardResponse.cs new file mode 100644 index 000000000..139427048 --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/ResetCardResponse.cs @@ -0,0 +1,131 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: ResetCardResponse.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.Diagnostics { + + /// <summary>Holder for reflection information generated from ResetCardResponse.proto</summary> + public static partial class ResetCardResponseReflection { + + #region Descriptor + /// <summary>File descriptor for ResetCardResponse.proto</summary> + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static ResetCardResponseReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChdSZXNldENhcmRSZXNwb25zZS5wcm90bxIVVGFuZ28uUE1SLkRpYWdub3N0", + "aWNzIhMKEVJlc2V0Q2FyZFJlc3BvbnNlQiEKH2NvbS50d2luZS50YW5nby5w", + "bXIuZGlhZ25vc3RpY3NiBnByb3RvMw==")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.ResetCardResponse), global::Tango.PMR.Diagnostics.ResetCardResponse.Parser, null, null, null, null) + })); + } + #endregion + + } + #region Messages + public sealed partial class ResetCardResponse : pb::IMessage<ResetCardResponse> { + private static readonly pb::MessageParser<ResetCardResponse> _parser = new pb::MessageParser<ResetCardResponse>(() => new ResetCardResponse()); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser<ResetCardResponse> Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Tango.PMR.Diagnostics.ResetCardResponseReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public ResetCardResponse() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public ResetCardResponse(ResetCardResponse other) : this() { + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public ResetCardResponse Clone() { + return new ResetCardResponse(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as ResetCardResponse); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(ResetCardResponse 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(ResetCardResponse 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/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj index c92828fad..d7ef29237 100644 --- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj +++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj @@ -145,6 +145,8 @@ <Compile Include="Diagnostics\MotorHomingResponse.cs" /> <Compile Include="Diagnostics\MotorJoggingRequest.cs" /> <Compile Include="Diagnostics\MotorJoggingResponse.cs" /> + <Compile Include="Diagnostics\ResetCardRequest.cs" /> + <Compile Include="Diagnostics\ResetCardResponse.cs" /> <Compile Include="Diagnostics\ResolveEventRequest.cs" /> <Compile Include="Diagnostics\ResolveEventResponse.cs" /> <Compile Include="Diagnostics\SetBlowerStateRequest.cs" /> diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Eureka BB alarm events handling chart_TS_and_X4_Rev5.xlsx b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Eureka BB alarm events handling chart_TS_and_X4_Rev5.xlsx Binary files differnew file mode 100644 index 000000000..8814872ef --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Eureka BB alarm events handling chart_TS_and_X4_Rev5.xlsx diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Eureka BB alarm events handling chart_TS_and_X4_Rev7.xlsx b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Eureka BB alarm events handling chart_TS_and_X4_Rev7.xlsx Binary files differnew file mode 100644 index 000000000..f7574efc4 --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Eureka BB alarm events handling chart_TS_and_X4_Rev7.xlsx diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Eureka BB alarm events handling chart_TS_and_X4_Rev8.xlsx b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Eureka BB alarm events handling chart_TS_and_X4_Rev8.xlsx Binary files differnew file mode 100644 index 000000000..f7574efc4 --- /dev/null +++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Eureka BB alarm events handling chart_TS_and_X4_Rev8.xlsx diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs index 502927c1d..84a6c4094 100644 --- a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs @@ -16,7 +16,7 @@ namespace Tango.EventsTypesGenerator { class Program { - private static string EVENTS_FILE = "Eureka BB alarm events handling chart_TS_and_X4_Rev4_groups.xlsx"; + private static string EVENTS_FILE = "Eureka BB alarm events handling chart_TS_and_X4_Rev8.xlsx"; private class ExcelEventType { diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj index 48e407aba..188794a23 100644 --- a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj +++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj @@ -67,6 +67,15 @@ <None Include="Eureka BB alarm events handling chart_TS_and_X4_Rev4_groups.xlsx"> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> + <None Include="Eureka BB alarm events handling chart_TS_and_X4_Rev5.xlsx"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="Eureka BB alarm events handling chart_TS_and_X4_Rev7.xlsx"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> + <None Include="Eureka BB alarm events handling chart_TS_and_X4_Rev8.xlsx"> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> <None Include="packages.config" /> </ItemGroup> <ItemGroup> |