From 9fa564ba8bdc768425f979eba55c95c03efea09e Mon Sep 17 00:00:00 2001 From: Roy Date: Wed, 6 Jul 2022 21:58:07 +0300 Subject: Completed auto/start ink filling change. --- Software/PMR/Messages/Common/MessageType.proto | 1 + .../Messages/IFS/InitiateInkFillingResponse.proto | 9 ++ .../PMR/Messages/MachineStatus/MachineStatus.proto | 2 +- .../ViewModels/MaintenanceViewVM.cs | 2 +- .../Views/MaintenanceView.xaml | 2 +- .../Dialogs/InsufficientLiquidQuantityView.xaml | 4 +- .../Dialogs/InsufficientLiquidQuantityViewVM.cs | 16 +-- .../Printing/DefaultPrintingManager.cs | 15 +-- .../PPC/Tango.PPC.UI/Views/LayoutView.xaml | 4 +- .../Visual_Studio/PPC/Tango.PPC.UI/app.manifest | 2 +- .../Tango.Emulations/Emulators/MachineEmulator.cs | 11 +- .../Visual_Studio/Tango.PMR/Common/MessageType.cs | 15 +-- .../Tango.PMR/IFS/InitiateInkFillingResponse.cs | 131 +++++++++++++++++++++ .../Tango.PMR/MachineStatus/MachineStatus.cs | 38 +++--- Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj | 1 + 15 files changed, 201 insertions(+), 52 deletions(-) create mode 100644 Software/PMR/Messages/IFS/InitiateInkFillingResponse.proto create mode 100644 Software/Visual_Studio/Tango.PMR/IFS/InitiateInkFillingResponse.cs (limited to 'Software') diff --git a/Software/PMR/Messages/Common/MessageType.proto b/Software/PMR/Messages/Common/MessageType.proto index ebcb50ccd..7b7115d50 100644 --- a/Software/PMR/Messages/Common/MessageType.proto +++ b/Software/PMR/Messages/Common/MessageType.proto @@ -320,6 +320,7 @@ enum MessageType StartInkFillingStatusRequest = 12000; StartInkFillingStatusResponse = 12001; InitiateInkFillingRequest = 12002; + InitiateInkFillingResponse = 12003; //DataStore PutDataStoreItemRequest = 13000; diff --git a/Software/PMR/Messages/IFS/InitiateInkFillingResponse.proto b/Software/PMR/Messages/IFS/InitiateInkFillingResponse.proto new file mode 100644 index 000000000..ba84c0b5f --- /dev/null +++ b/Software/PMR/Messages/IFS/InitiateInkFillingResponse.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +package Tango.PMR.MachineStatus; +option java_package = "com.twine.tango.pmr.machinestatus"; + +message InitiateInkFillingResponse +{ + +} \ No newline at end of file diff --git a/Software/PMR/Messages/MachineStatus/MachineStatus.proto b/Software/PMR/Messages/MachineStatus/MachineStatus.proto index 4e0649510..9ea3db19d 100644 --- a/Software/PMR/Messages/MachineStatus/MachineStatus.proto +++ b/Software/PMR/Messages/MachineStatus/MachineStatus.proto @@ -13,5 +13,5 @@ message MachineStatus repeated IDSPackLevel IDSPacksLevels = 2; double OverallTemperature = 3; SpoolState SpoolState = 4; - bool AutoInkFillingDisabled = 5; + bool AutoInkFillingEnabled = 5; } \ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs index 1890fdab7..cd646ce02 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs @@ -190,7 +190,7 @@ namespace Tango.PPC.Maintenance.ViewModels UpdateMidTankLevels(status); OverallTemperature.Temperature = status.OverallTemperature; SpoolState = status.SpoolState; - _isInkAutoFillingEnabled = status.AutoInkFillingDisabled; + _isInkAutoFillingEnabled = status.AutoInkFillingEnabled; RaisePropertyChanged(nameof(IsInkAutoFillingEnabled)); InvalidateRelayCommands(); } diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml index 4f93f9b31..a77ec5901 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml @@ -261,7 +261,7 @@ VIEW BIT RESULTS - + diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityView.xaml index d2fe31387..d9ec6d1c2 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityView.xaml @@ -12,9 +12,9 @@ CLOSE - + Auto ink filling is disabled - ENABLE AUTO INK FILLING + START INK FILLING diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityViewVM.cs index 6d4c90e21..20f1fc18a 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityViewVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityViewVM.cs @@ -13,22 +13,22 @@ namespace Tango.PPC.UI.Dialogs { public InsufficientLiquidQuantityException Exception { get; set; } - public bool IsAutoInkFillingDisabled { get; set; } + public bool IsAutoInkFillingEnabled { get; set; } - public bool EnableAutoInkFillingOnExit { get; set; } + public bool StartAutoInkFillingOnExit { get; set; } - public RelayCommand EnableAutoInkFillingCommand { get; set; } + public RelayCommand StartAutoInkFillingCommand { get; set; } - public InsufficientLiquidQuantityViewVM(InsufficientLiquidQuantityException ex,bool isAutoInkFillingDisabled) + public InsufficientLiquidQuantityViewVM(InsufficientLiquidQuantityException ex,bool isAutoInkFillingEnabled) { Exception = ex; - IsAutoInkFillingDisabled = isAutoInkFillingDisabled; - EnableAutoInkFillingCommand = new RelayCommand(EnableAutoInkFilling); + IsAutoInkFillingEnabled = isAutoInkFillingEnabled; + StartAutoInkFillingCommand = new RelayCommand(StartAutoInkFilling); } - private void EnableAutoInkFilling() + private void StartAutoInkFilling() { - EnableAutoInkFillingOnExit = true; + StartAutoInkFillingOnExit = true; Accept(); } } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs index 9856faf3d..938d99451 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs @@ -104,22 +104,19 @@ namespace Tango.PPC.UI.Printing _notificationProvider.ReleaseGlobalBusyMessage(); LogManager.Log(ex); - var vm = await _notificationProvider.ShowDialog(new InsufficientLiquidQuantityViewVM(ex, _machineProvider.MachineOperator.MachineStatus.AutoInkFillingDisabled)); + var vm = await _notificationProvider.ShowDialog(new InsufficientLiquidQuantityViewVM(ex, _machineProvider.MachineOperator.MachineStatus.AutoInkFillingEnabled)); - if (vm.EnableAutoInkFillingOnExit) + if (vm.StartAutoInkFillingOnExit) { try { - _notificationProvider.SetGlobalBusyMessage("Enabling auto ink filling..."); - await _machineProvider.MachineOperator.SendRequest(new SetInkAutoFillingModeRequest() - { - Disabled = false - }); + _notificationProvider.SetGlobalBusyMessage("Starting ink filling..."); + await _machineProvider.MachineOperator.SendRequest(new InitiateInkFillingRequest()); } catch (Exception exx) { - LogManager.Log(exx, "Error enabling ink filling."); - await _notificationProvider.ShowError($"Error enabling auto ink filling.\n{ex.Message}"); + LogManager.Log(exx, "Error starting ink filling."); + await _notificationProvider.ShowError($"Error starting ink filling.\n{ex.Message}"); } finally { diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml index ff35fb059..1417c79f3 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml @@ -291,7 +291,7 @@ - + diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index d72e75011..efc5f8179 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - + diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs index 6d3c15fee..5bf3b8a9a 100644 --- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs +++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs @@ -493,6 +493,9 @@ namespace Tango.Emulations.Emulators case MessageType.SpoolTypeChangedRequest: HandleSpoolTypeChangedRequest(MessageFactory.ParseTangoMessageFromContainer(container)); break; + case MessageType.InitiateInkFillingRequest: + HandleInitiateInkFillingRequest(MessageFactory.ParseTangoMessageFromContainer(container)); + break; } } @@ -1814,7 +1817,7 @@ namespace Tango.Emulations.Emulators private async void HandleSetInkAutoFillingModeRequest(TangoMessage request) { await Task.Delay(1000); - MachineStatus.AutoInkFillingDisabled = request.Message.Disabled; + MachineStatus.AutoInkFillingEnabled = request.Message.Enable; await Transporter.SendResponse(new SetInkAutoFillingModeResponse(), request.Container.Token); } @@ -1863,6 +1866,12 @@ namespace Tango.Emulations.Emulators await Transporter.SendResponse(new SpoolTypeChangedResponse(), request.Container.Token); } + private async void HandleInitiateInkFillingRequest(TangoMessage request) + { + await Task.Delay(1000); + await Transporter.SendResponse(new InitiateInkFillingResponse(), request.Container.Token); + } + #endregion #region Public Methods diff --git a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs index a24947108..ca81b2050 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( - "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiqbQQoLTWVz", + "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiq8QQoLTWVz", "c2FnZVR5cGUSCAoETm9uZRAAEhEKDUVycm9yUmVzcG9uc2UQARIUChBDYWxj", "dWxhdGVSZXF1ZXN0EAMSFQoRQ2FsY3VsYXRlUmVzcG9uc2UQBBITCg9Qcm9n", "cmVzc1JlcXVlc3QQBRIUChBQcm9ncmVzc1Jlc3BvbnNlEAYSHAoYU3R1YkNh", @@ -204,12 +204,12 @@ namespace Tango.PMR.Common { "VhIhChxBdHRlbXB0VGhyZWFkSm9nZ2luZ1Jlc3BvbnNlEIFWEiEKHFN0YXJ0", "SW5rRmlsbGluZ1N0YXR1c1JlcXVlc3QQ4F0SIgodU3RhcnRJbmtGaWxsaW5n", "U3RhdHVzUmVzcG9uc2UQ4V0SHgoZSW5pdGlhdGVJbmtGaWxsaW5nUmVxdWVz", - "dBDiXRIcChdQdXREYXRhU3RvcmVJdGVtUmVxdWVzdBDIZRIdChhQdXREYXRh", - "U3RvcmVJdGVtUmVzcG9uc2UQyWUSHAoXR2V0RGF0YVN0b3JlSXRlbVJlcXVl", - "c3QQymUSHQoYR2V0RGF0YVN0b3JlSXRlbVJlc3BvbnNlEMtlEiEKHERhdGFT", - "dG9yZUl0ZW1Nb2RpZmllZFJlcXVlc3QQzGUSIgodRGF0YVN0b3JlSXRlbU1v", - "ZGlmaWVkUmVzcG9uc2UQzWVCHAoaY29tLnR3aW5lLnRhbmdvLnBtci5jb21t", - "b25iBnByb3RvMw==")); + "dBDiXRIfChpJbml0aWF0ZUlua0ZpbGxpbmdSZXNwb25zZRDjXRIcChdQdXRE", + "YXRhU3RvcmVJdGVtUmVxdWVzdBDIZRIdChhQdXREYXRhU3RvcmVJdGVtUmVz", + "cG9uc2UQyWUSHAoXR2V0RGF0YVN0b3JlSXRlbVJlcXVlc3QQymUSHQoYR2V0", + "RGF0YVN0b3JlSXRlbVJlc3BvbnNlEMtlEiEKHERhdGFTdG9yZUl0ZW1Nb2Rp", + "ZmllZFJlcXVlc3QQzGUSIgodRGF0YVN0b3JlSXRlbU1vZGlmaWVkUmVzcG9u", + "c2UQzWVCHAoaY29tLnR3aW5lLnRhbmdvLnBtci5jb21tb25iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Common.MessageType), }, null)); @@ -545,6 +545,7 @@ namespace Tango.PMR.Common { [pbr::OriginalName("StartInkFillingStatusRequest")] StartInkFillingStatusRequest = 12000, [pbr::OriginalName("StartInkFillingStatusResponse")] StartInkFillingStatusResponse = 12001, [pbr::OriginalName("InitiateInkFillingRequest")] InitiateInkFillingRequest = 12002, + [pbr::OriginalName("InitiateInkFillingResponse")] InitiateInkFillingResponse = 12003, /// ///DataStore /// diff --git a/Software/Visual_Studio/Tango.PMR/IFS/InitiateInkFillingResponse.cs b/Software/Visual_Studio/Tango.PMR/IFS/InitiateInkFillingResponse.cs new file mode 100644 index 000000000..b5297c054 --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/IFS/InitiateInkFillingResponse.cs @@ -0,0 +1,131 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: InitiateInkFillingResponse.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.MachineStatus { + + /// Holder for reflection information generated from InitiateInkFillingResponse.proto + public static partial class InitiateInkFillingResponseReflection { + + #region Descriptor + /// File descriptor for InitiateInkFillingResponse.proto + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static InitiateInkFillingResponseReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "CiBJbml0aWF0ZUlua0ZpbGxpbmdSZXNwb25zZS5wcm90bxIXVGFuZ28uUE1S", + "Lk1hY2hpbmVTdGF0dXMiHAoaSW5pdGlhdGVJbmtGaWxsaW5nUmVzcG9uc2VC", + "IwohY29tLnR3aW5lLnRhbmdvLnBtci5tYWNoaW5lc3RhdHVzYgZwcm90bzM=")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.InitiateInkFillingResponse), global::Tango.PMR.MachineStatus.InitiateInkFillingResponse.Parser, null, null, null, null) + })); + } + #endregion + + } + #region Messages + public sealed partial class InitiateInkFillingResponse : pb::IMessage { + private static readonly pb::MessageParser _parser = new pb::MessageParser(() => new InitiateInkFillingResponse()); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Tango.PMR.MachineStatus.InitiateInkFillingResponseReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public InitiateInkFillingResponse() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public InitiateInkFillingResponse(InitiateInkFillingResponse other) : this() { + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public InitiateInkFillingResponse Clone() { + return new InitiateInkFillingResponse(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as InitiateInkFillingResponse); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(InitiateInkFillingResponse 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(InitiateInkFillingResponse 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/MachineStatus/MachineStatus.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs index ccc02e572..a50669c26 100644 --- a/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs +++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs @@ -24,17 +24,17 @@ namespace Tango.PMR.MachineStatus { string.Concat( "ChNNYWNoaW5lU3RhdHVzLnByb3RvEhdUYW5nby5QTVIuTWFjaGluZVN0YXR1", "cxoSTWFjaGluZVN0YXRlLnByb3RvGhJJRFNQYWNrTGV2ZWwucHJvdG8aEFNw", - "b29sU3RhdGUucHJvdG8i+QEKDU1hY2hpbmVTdGF0dXMSNAoFU3RhdGUYASAB", + "b29sU3RhdGUucHJvdG8i+AEKDU1hY2hpbmVTdGF0dXMSNAoFU3RhdGUYASAB", "KA4yJS5UYW5nby5QTVIuTWFjaGluZVN0YXR1cy5NYWNoaW5lU3RhdGUSPQoO", "SURTUGFja3NMZXZlbHMYAiADKAsyJS5UYW5nby5QTVIuTWFjaGluZVN0YXR1", "cy5JRFNQYWNrTGV2ZWwSGgoST3ZlcmFsbFRlbXBlcmF0dXJlGAMgASgBEjcK", "ClNwb29sU3RhdGUYBCABKA4yIy5UYW5nby5QTVIuTWFjaGluZVN0YXR1cy5T", - "cG9vbFN0YXRlEh4KFkF1dG9JbmtGaWxsaW5nRGlzYWJsZWQYBSABKAhCIwoh", - "Y29tLnR3aW5lLnRhbmdvLnBtci5tYWNoaW5lc3RhdHVzYgZwcm90bzM=")); + "cG9vbFN0YXRlEh0KFUF1dG9JbmtGaWxsaW5nRW5hYmxlZBgFIAEoCEIjCiFj", + "b20udHdpbmUudGFuZ28ucG1yLm1hY2hpbmVzdGF0dXNiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Tango.PMR.MachineStatus.MachineStateReflection.Descriptor, global::Tango.PMR.MachineStatus.IDSPackLevelReflection.Descriptor, global::Tango.PMR.MachineStatus.SpoolStateReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.MachineStatus), global::Tango.PMR.MachineStatus.MachineStatus.Parser, new[]{ "State", "IDSPacksLevels", "OverallTemperature", "SpoolState", "AutoInkFillingDisabled" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.MachineStatus), global::Tango.PMR.MachineStatus.MachineStatus.Parser, new[]{ "State", "IDSPacksLevels", "OverallTemperature", "SpoolState", "AutoInkFillingEnabled" }, null, null, null) })); } #endregion @@ -69,7 +69,7 @@ namespace Tango.PMR.MachineStatus { iDSPacksLevels_ = other.iDSPacksLevels_.Clone(); overallTemperature_ = other.overallTemperature_; spoolState_ = other.spoolState_; - autoInkFillingDisabled_ = other.autoInkFillingDisabled_; + autoInkFillingEnabled_ = other.autoInkFillingEnabled_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -120,14 +120,14 @@ namespace Tango.PMR.MachineStatus { } } - /// Field number for the "AutoInkFillingDisabled" field. - public const int AutoInkFillingDisabledFieldNumber = 5; - private bool autoInkFillingDisabled_; + /// Field number for the "AutoInkFillingEnabled" field. + public const int AutoInkFillingEnabledFieldNumber = 5; + private bool autoInkFillingEnabled_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool AutoInkFillingDisabled { - get { return autoInkFillingDisabled_; } + public bool AutoInkFillingEnabled { + get { return autoInkFillingEnabled_; } set { - autoInkFillingDisabled_ = value; + autoInkFillingEnabled_ = value; } } @@ -148,7 +148,7 @@ namespace Tango.PMR.MachineStatus { if(!iDSPacksLevels_.Equals(other.iDSPacksLevels_)) return false; if (OverallTemperature != other.OverallTemperature) return false; if (SpoolState != other.SpoolState) return false; - if (AutoInkFillingDisabled != other.AutoInkFillingDisabled) return false; + if (AutoInkFillingEnabled != other.AutoInkFillingEnabled) return false; return true; } @@ -159,7 +159,7 @@ namespace Tango.PMR.MachineStatus { hash ^= iDSPacksLevels_.GetHashCode(); if (OverallTemperature != 0D) hash ^= OverallTemperature.GetHashCode(); if (SpoolState != 0) hash ^= SpoolState.GetHashCode(); - if (AutoInkFillingDisabled != false) hash ^= AutoInkFillingDisabled.GetHashCode(); + if (AutoInkFillingEnabled != false) hash ^= AutoInkFillingEnabled.GetHashCode(); return hash; } @@ -183,9 +183,9 @@ namespace Tango.PMR.MachineStatus { output.WriteRawTag(32); output.WriteEnum((int) SpoolState); } - if (AutoInkFillingDisabled != false) { + if (AutoInkFillingEnabled != false) { output.WriteRawTag(40); - output.WriteBool(AutoInkFillingDisabled); + output.WriteBool(AutoInkFillingEnabled); } } @@ -202,7 +202,7 @@ namespace Tango.PMR.MachineStatus { if (SpoolState != 0) { size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) SpoolState); } - if (AutoInkFillingDisabled != false) { + if (AutoInkFillingEnabled != false) { size += 1 + 1; } return size; @@ -223,8 +223,8 @@ namespace Tango.PMR.MachineStatus { if (other.SpoolState != 0) { SpoolState = other.SpoolState; } - if (other.AutoInkFillingDisabled != false) { - AutoInkFillingDisabled = other.AutoInkFillingDisabled; + if (other.AutoInkFillingEnabled != false) { + AutoInkFillingEnabled = other.AutoInkFillingEnabled; } } @@ -253,7 +253,7 @@ namespace Tango.PMR.MachineStatus { break; } case 40: { - AutoInkFillingDisabled = input.ReadBool(); + AutoInkFillingEnabled = input.ReadBool(); break; } } diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj index 7d6c1a68c..9effc3fcf 100644 --- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj +++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj @@ -239,6 +239,7 @@ + -- cgit v1.3.1