From d733552b94a565f3723c76ae531e4b04431ff085 Mon Sep 17 00:00:00 2001 From: Roy Date: Mon, 8 May 2023 15:21:56 +0300 Subject: Added required machine status indications. Added Tunnel_Temp on Process Params. --- Software/DB/PPC/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/PPC/Tango_log.ldf | Bin 53673984 -> 53673984 bytes Software/DB/Tango.mdf | Bin 75497472 -> 75497472 bytes Software/DB/Tango_log.ldf | Bin 22675456 -> 22675456 bytes .../PMR/Messages/MachineStatus/IDSPackLevel.proto | 5 + .../PMR/Messages/Printing/ProcessParameters.proto | 2 + .../Tango.BL/DTO/ProcessParametersTableDTOBase.cs | 8 + .../Entities/ProcessParametersTableBase.cs | 52 +++++- .../Tango.BL/Enumerations/MidTankTypes.cs | 6 + .../DB/PROCESS_PARAMETERS_TABLES.cs | 1 + .../Tango.DAL.Remote/DB/RemoteADO.edmx | 3 + .../Tango.DAL.Remote/DB/RemoteADO.edmx.diagram | 192 ++++++++++----------- .../Tango.PMR/MachineStatus/IDSPackLevel.cs | 123 ++++++++++++- .../Tango.PMR/Printing/ProcessParameters.cs | 37 +++- 14 files changed, 320 insertions(+), 109 deletions(-) (limited to 'Software') diff --git a/Software/DB/PPC/Tango.mdf b/Software/DB/PPC/Tango.mdf index ced5658d5..18d1e7b95 100644 Binary files a/Software/DB/PPC/Tango.mdf and b/Software/DB/PPC/Tango.mdf differ diff --git a/Software/DB/PPC/Tango_log.ldf b/Software/DB/PPC/Tango_log.ldf index e19e8cb25..567fa5b83 100644 Binary files a/Software/DB/PPC/Tango_log.ldf and b/Software/DB/PPC/Tango_log.ldf differ diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf index 7dd4615d5..a2fdb9c9b 100644 Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf index 2799c5cba..016df86cf 100644 Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ diff --git a/Software/PMR/Messages/MachineStatus/IDSPackLevel.proto b/Software/PMR/Messages/MachineStatus/IDSPackLevel.proto index d4bda8f95..36658e117 100644 --- a/Software/PMR/Messages/MachineStatus/IDSPackLevel.proto +++ b/Software/PMR/Messages/MachineStatus/IDSPackLevel.proto @@ -8,4 +8,9 @@ message IDSPackLevel int32 Index = 1; int32 DispenserLevel = 2; double MidTankLevel = 3; + + bool JerricanPresent = 4; + bool FillingTimeoutError = 5; + bool MidTankEmpty = 6; + bool MidTankRefillPumpActive = 7; } \ No newline at end of file diff --git a/Software/PMR/Messages/Printing/ProcessParameters.proto b/Software/PMR/Messages/Printing/ProcessParameters.proto index 2be52fd00..03d41174e 100644 --- a/Software/PMR/Messages/Printing/ProcessParameters.proto +++ b/Software/PMR/Messages/Printing/ProcessParameters.proto @@ -142,4 +142,6 @@ message ProcessParameters double ESpare5 = 63; + double ETunnelTemp = 64; + } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs index 7fdc91308..9ee86e42a 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs @@ -541,5 +541,13 @@ namespace Tango.BL.DTO get; set; } + /// + /// e tunnel temp + /// + public Double ETunnelTemp + { + get; set; + } + } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs index c45ee73e9..3fe1cacee 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs @@ -155,6 +155,8 @@ namespace Tango.BL.Entities public event EventHandler ESpare5Changed; + public event EventHandler ETunnelTempChanged; + public event EventHandler ProcessParametersTablesGroupChanged; protected String _name; @@ -2018,7 +2020,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(64)] + [PropertyIndex(65)] public Double ESpare1 { @@ -2049,7 +2051,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(65)] + [PropertyIndex(66)] public Double ESpare2 { @@ -2080,7 +2082,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(66)] + [PropertyIndex(67)] public Double ESpare3 { @@ -2111,7 +2113,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(67)] + [PropertyIndex(68)] public Double ESpare4 { @@ -2142,7 +2144,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(68)] + [PropertyIndex(69)] public Double ESpare5 { @@ -2163,6 +2165,37 @@ namespace Tango.BL.Entities } } + protected Double _etunneltemp; + + /// + /// Gets or sets the processparameterstablebase e tunnel temp. + /// + + [Column("E_TUNNEL_TEMP")] + + [StringFormat("0.0")] + + [PropertyIndex(64)] + + public Double ETunnelTemp + { + get + { + return _etunneltemp; + } + + set + { + if (_etunneltemp != value) + { + _etunneltemp = value; + + OnETunnelTempChanged(value); + + } + } + } + protected ProcessParametersTablesGroup _processparameterstablesgroup; /// @@ -2771,6 +2804,15 @@ namespace Tango.BL.Entities RaisePropertyChanged(nameof(ESpare5)); } + /// + /// Called when the ETunnelTemp has changed. + /// + protected virtual void OnETunnelTempChanged(Double etunneltemp) + { + ETunnelTempChanged?.Invoke(this, etunneltemp); + RaisePropertyChanged(nameof(ETunnelTemp)); + } + /// /// Called when the ProcessParametersTablesGroup has changed. /// diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/MidTankTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/MidTankTypes.cs index b1255d8ff..b6a497dee 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/MidTankTypes.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/MidTankTypes.cs @@ -37,5 +37,11 @@ namespace Tango.BL.Enumerations [Description("No Mid Tank")] NoMidTank = 3, + /// + /// (Eureka 5L Jerrican) + /// + [Description("Eureka 5L Jerrican")] + Eureka5LJerrican = 4, + } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/PROCESS_PARAMETERS_TABLES.cs b/Software/Visual_Studio/Tango.DAL.Remote/DB/PROCESS_PARAMETERS_TABLES.cs index 414049e23..08830d36d 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/PROCESS_PARAMETERS_TABLES.cs +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/PROCESS_PARAMETERS_TABLES.cs @@ -82,6 +82,7 @@ namespace Tango.DAL.Remote.DB public double E_SPARE3 { get; set; } public double E_SPARE4 { get; set; } public double E_SPARE5 { get; set; } + public double E_TUNNEL_TEMP { get; set; } public virtual PROCESS_PARAMETERS_TABLES_GROUPS PROCESS_PARAMETERS_TABLES_GROUPS { get; set; } } diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx index 770d321c4..8bed67ce6 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -1121,6 +1121,7 @@ + @@ -6815,6 +6816,7 @@ + @@ -10201,6 +10203,7 @@ + diff --git a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram index 5e08c09f4..3a81d86f0 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -5,102 +5,102 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs index 18024c6d7..099069143 100644 --- a/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs +++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/IDSPackLevel.cs @@ -23,13 +23,16 @@ namespace Tango.PMR.MachineStatus { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChJJRFNQYWNrTGV2ZWwucHJvdG8SF1RhbmdvLlBNUi5NYWNoaW5lU3RhdHVz", - "IksKDElEU1BhY2tMZXZlbBINCgVJbmRleBgBIAEoBRIWCg5EaXNwZW5zZXJM", - "ZXZlbBgCIAEoBRIUCgxNaWRUYW5rTGV2ZWwYAyABKAFCIwohY29tLnR3aW5l", - "LnRhbmdvLnBtci5tYWNoaW5lc3RhdHVzYgZwcm90bzM=")); + "IrgBCgxJRFNQYWNrTGV2ZWwSDQoFSW5kZXgYASABKAUSFgoORGlzcGVuc2Vy", + "TGV2ZWwYAiABKAUSFAoMTWlkVGFua0xldmVsGAMgASgBEhcKD0plcnJpY2Fu", + "UHJlc2VudBgEIAEoCBIbChNGaWxsaW5nVGltZW91dEVycm9yGAUgASgIEhQK", + "DE1pZFRhbmtFbXB0eRgGIAEoCBIfChdNaWRUYW5rUmVmaWxsUHVtcEFjdGl2", + "ZRgHIAEoCEIjCiFjb20udHdpbmUudGFuZ28ucG1yLm1hY2hpbmVzdGF0dXNi", + "BnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.IDSPackLevel), global::Tango.PMR.MachineStatus.IDSPackLevel.Parser, new[]{ "Index", "DispenserLevel", "MidTankLevel" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.IDSPackLevel), global::Tango.PMR.MachineStatus.IDSPackLevel.Parser, new[]{ "Index", "DispenserLevel", "MidTankLevel", "JerricanPresent", "FillingTimeoutError", "MidTankEmpty", "MidTankRefillPumpActive" }, null, null, null) })); } #endregion @@ -63,6 +66,10 @@ namespace Tango.PMR.MachineStatus { index_ = other.index_; dispenserLevel_ = other.dispenserLevel_; midTankLevel_ = other.midTankLevel_; + jerricanPresent_ = other.jerricanPresent_; + fillingTimeoutError_ = other.fillingTimeoutError_; + midTankEmpty_ = other.midTankEmpty_; + midTankRefillPumpActive_ = other.midTankRefillPumpActive_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -103,6 +110,50 @@ namespace Tango.PMR.MachineStatus { } } + /// Field number for the "JerricanPresent" field. + public const int JerricanPresentFieldNumber = 4; + private bool jerricanPresent_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool JerricanPresent { + get { return jerricanPresent_; } + set { + jerricanPresent_ = value; + } + } + + /// Field number for the "FillingTimeoutError" field. + public const int FillingTimeoutErrorFieldNumber = 5; + private bool fillingTimeoutError_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool FillingTimeoutError { + get { return fillingTimeoutError_; } + set { + fillingTimeoutError_ = value; + } + } + + /// Field number for the "MidTankEmpty" field. + public const int MidTankEmptyFieldNumber = 6; + private bool midTankEmpty_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool MidTankEmpty { + get { return midTankEmpty_; } + set { + midTankEmpty_ = value; + } + } + + /// Field number for the "MidTankRefillPumpActive" field. + public const int MidTankRefillPumpActiveFieldNumber = 7; + private bool midTankRefillPumpActive_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool MidTankRefillPumpActive { + get { return midTankRefillPumpActive_; } + set { + midTankRefillPumpActive_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as IDSPackLevel); @@ -119,6 +170,10 @@ namespace Tango.PMR.MachineStatus { if (Index != other.Index) return false; if (DispenserLevel != other.DispenserLevel) return false; if (MidTankLevel != other.MidTankLevel) return false; + if (JerricanPresent != other.JerricanPresent) return false; + if (FillingTimeoutError != other.FillingTimeoutError) return false; + if (MidTankEmpty != other.MidTankEmpty) return false; + if (MidTankRefillPumpActive != other.MidTankRefillPumpActive) return false; return true; } @@ -128,6 +183,10 @@ namespace Tango.PMR.MachineStatus { if (Index != 0) hash ^= Index.GetHashCode(); if (DispenserLevel != 0) hash ^= DispenserLevel.GetHashCode(); if (MidTankLevel != 0D) hash ^= MidTankLevel.GetHashCode(); + if (JerricanPresent != false) hash ^= JerricanPresent.GetHashCode(); + if (FillingTimeoutError != false) hash ^= FillingTimeoutError.GetHashCode(); + if (MidTankEmpty != false) hash ^= MidTankEmpty.GetHashCode(); + if (MidTankRefillPumpActive != false) hash ^= MidTankRefillPumpActive.GetHashCode(); return hash; } @@ -150,6 +209,22 @@ namespace Tango.PMR.MachineStatus { output.WriteRawTag(25); output.WriteDouble(MidTankLevel); } + if (JerricanPresent != false) { + output.WriteRawTag(32); + output.WriteBool(JerricanPresent); + } + if (FillingTimeoutError != false) { + output.WriteRawTag(40); + output.WriteBool(FillingTimeoutError); + } + if (MidTankEmpty != false) { + output.WriteRawTag(48); + output.WriteBool(MidTankEmpty); + } + if (MidTankRefillPumpActive != false) { + output.WriteRawTag(56); + output.WriteBool(MidTankRefillPumpActive); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -164,6 +239,18 @@ namespace Tango.PMR.MachineStatus { if (MidTankLevel != 0D) { size += 1 + 8; } + if (JerricanPresent != false) { + size += 1 + 1; + } + if (FillingTimeoutError != false) { + size += 1 + 1; + } + if (MidTankEmpty != false) { + size += 1 + 1; + } + if (MidTankRefillPumpActive != false) { + size += 1 + 1; + } return size; } @@ -181,6 +268,18 @@ namespace Tango.PMR.MachineStatus { if (other.MidTankLevel != 0D) { MidTankLevel = other.MidTankLevel; } + if (other.JerricanPresent != false) { + JerricanPresent = other.JerricanPresent; + } + if (other.FillingTimeoutError != false) { + FillingTimeoutError = other.FillingTimeoutError; + } + if (other.MidTankEmpty != false) { + MidTankEmpty = other.MidTankEmpty; + } + if (other.MidTankRefillPumpActive != false) { + MidTankRefillPumpActive = other.MidTankRefillPumpActive; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -203,6 +302,22 @@ namespace Tango.PMR.MachineStatus { MidTankLevel = input.ReadDouble(); break; } + case 32: { + JerricanPresent = input.ReadBool(); + break; + } + case 40: { + FillingTimeoutError = input.ReadBool(); + break; + } + case 48: { + MidTankEmpty = input.ReadBool(); + break; + } + case 56: { + MidTankRefillPumpActive = input.ReadBool(); + break; + } } } } diff --git a/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs b/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs index 29b8c2d9f..746e8da4d 100644 --- a/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs +++ b/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs @@ -23,7 +23,7 @@ namespace Tango.PMR.Printing { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChdQcm9jZXNzUGFyYW1ldGVycy5wcm90bxISVGFuZ28uUE1SLlByaW50aW5n", - "IvALChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU", + "IoUMChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU", "CgxNaW5JbmtVcHRha2UYAiABKAESFAoMTWF4SW5rVXB0YWtlGAMgASgBEhUK", "DUZlZWRlclRlbnNpb24YBCABKAESFQoNUHVsbGVyVGVuc2lvbhgFIAEoARIV", "Cg1XaW5kZXJUZW5zaW9uGAYgASgBEhEKCU1peGVyVGVtcBgHIAEoARIVCg1I", @@ -56,12 +56,13 @@ namespace Tango.PMR.Printing { "c3RlQWlyRmxvdxg3IAEoARIZChFFV2FzdGVQcmVwYXJlVGltZRg4IAEoARIR", "CglFUHVtcFRlbXAYOSABKAESGAoQRVByZXNzdXJlQnVpbGRVcBg6IAEoARIP", "CgdFU3BhcmUxGDsgASgBEg8KB0VTcGFyZTIYPCABKAESDwoHRVNwYXJlMxg9", - "IAEoARIPCgdFU3BhcmU0GD4gASgBEg8KB0VTcGFyZTUYPyABKAFCHgocY29t", - "LnR3aW5lLnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z")); + "IAEoARIPCgdFU3BhcmU0GD4gASgBEg8KB0VTcGFyZTUYPyABKAESEwoLRVR1", + "bm5lbFRlbXAYQCABKAFCHgocY29tLnR3aW5lLnRhbmdvLnBtci5wcmludGlu", + "Z2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.ProcessParameters), global::Tango.PMR.Printing.ProcessParameters.Parser, new[]{ "DyeingSpeed", "MinInkUptake", "MaxInkUptake", "FeederTension", "PullerTension", "WinderTension", "MixerTemp", "HeadZone1Temp", "HeadZone2Temp", "HeadZone3Temp", "HeadZone4Temp", "HeadZone5Temp", "HeadZone6Temp", "DryerAirFlow", "DryerZone1Temp", "DryerZone2Temp", "DryerZone3Temp", "DryerBufferLength", "HeadAirFlow", "TableIndex", "HeadZone7Temp", "HeadZone8Temp", "HeadZone9Temp", "HeadZone10Temp", "HeadZone11Temp", "HeadZone12Temp", "RBlowerFlow", "RBlowerTemp", "LBlowerFlow", "LBlowerTemp", "PressureBuildUp", "BtsrFeedingTension", "ExitTension", "BtsrThreadLengthOffset", "EWinder1Tension", "EWinder2Tension", "EWinder3Tension", "EWinder4Tension", "EBtsr1FeedingTension", "EBtsr2FeedingTension", "EBtsr3FeedingTension", "EBtsr4FeedingTension", "EMixerTemp", "EHeadZone1Temp", "EHeadZone2Temp", "EHeadZone3Temp", "EDryerZone1Temp", "EDryerZone2Temp", "EDryerZone3Temp", "ELubricantTemp", "EDryerIncomingAirFlow", "EDryerOutgoingAirFlow", "ETunnelIncomingAirFlow", "ETunnelOutgoingAirFlow", "EWasteAirFlow", "EWastePrepareTime", "EPumpTemp", "EPressureBuildUp", "ESpare1", "ESpare2", "ESpare3", "ESpare4", "ESpare5" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Printing.ProcessParameters), global::Tango.PMR.Printing.ProcessParameters.Parser, new[]{ "DyeingSpeed", "MinInkUptake", "MaxInkUptake", "FeederTension", "PullerTension", "WinderTension", "MixerTemp", "HeadZone1Temp", "HeadZone2Temp", "HeadZone3Temp", "HeadZone4Temp", "HeadZone5Temp", "HeadZone6Temp", "DryerAirFlow", "DryerZone1Temp", "DryerZone2Temp", "DryerZone3Temp", "DryerBufferLength", "HeadAirFlow", "TableIndex", "HeadZone7Temp", "HeadZone8Temp", "HeadZone9Temp", "HeadZone10Temp", "HeadZone11Temp", "HeadZone12Temp", "RBlowerFlow", "RBlowerTemp", "LBlowerFlow", "LBlowerTemp", "PressureBuildUp", "BtsrFeedingTension", "ExitTension", "BtsrThreadLengthOffset", "EWinder1Tension", "EWinder2Tension", "EWinder3Tension", "EWinder4Tension", "EBtsr1FeedingTension", "EBtsr2FeedingTension", "EBtsr3FeedingTension", "EBtsr4FeedingTension", "EMixerTemp", "EHeadZone1Temp", "EHeadZone2Temp", "EHeadZone3Temp", "EDryerZone1Temp", "EDryerZone2Temp", "EDryerZone3Temp", "ELubricantTemp", "EDryerIncomingAirFlow", "EDryerOutgoingAirFlow", "ETunnelIncomingAirFlow", "ETunnelOutgoingAirFlow", "EWasteAirFlow", "EWastePrepareTime", "EPumpTemp", "EPressureBuildUp", "ESpare1", "ESpare2", "ESpare3", "ESpare4", "ESpare5", "ETunnelTemp" }, null, null, null) })); } #endregion @@ -155,6 +156,7 @@ namespace Tango.PMR.Printing { eSpare3_ = other.eSpare3_; eSpare4_ = other.eSpare4_; eSpare5_ = other.eSpare5_; + eTunnelTemp_ = other.eTunnelTemp_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -855,6 +857,17 @@ namespace Tango.PMR.Printing { } } + /// Field number for the "ETunnelTemp" field. + public const int ETunnelTempFieldNumber = 64; + private double eTunnelTemp_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double ETunnelTemp { + get { return eTunnelTemp_; } + set { + eTunnelTemp_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as ProcessParameters); @@ -931,6 +944,7 @@ namespace Tango.PMR.Printing { if (ESpare3 != other.ESpare3) return false; if (ESpare4 != other.ESpare4) return false; if (ESpare5 != other.ESpare5) return false; + if (ETunnelTemp != other.ETunnelTemp) return false; return true; } @@ -1000,6 +1014,7 @@ namespace Tango.PMR.Printing { if (ESpare3 != 0D) hash ^= ESpare3.GetHashCode(); if (ESpare4 != 0D) hash ^= ESpare4.GetHashCode(); if (ESpare5 != 0D) hash ^= ESpare5.GetHashCode(); + if (ETunnelTemp != 0D) hash ^= ETunnelTemp.GetHashCode(); return hash; } @@ -1262,6 +1277,10 @@ namespace Tango.PMR.Printing { output.WriteRawTag(249, 3); output.WriteDouble(ESpare5); } + if (ETunnelTemp != 0D) { + output.WriteRawTag(129, 4); + output.WriteDouble(ETunnelTemp); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1456,6 +1475,9 @@ namespace Tango.PMR.Printing { if (ESpare5 != 0D) { size += 2 + 8; } + if (ETunnelTemp != 0D) { + size += 2 + 8; + } return size; } @@ -1653,6 +1675,9 @@ namespace Tango.PMR.Printing { if (other.ESpare5 != 0D) { ESpare5 = other.ESpare5; } + if (other.ETunnelTemp != 0D) { + ETunnelTemp = other.ETunnelTemp; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1915,6 +1940,10 @@ namespace Tango.PMR.Printing { ESpare5 = input.ReadDouble(); break; } + case 513: { + ETunnelTemp = input.ReadDouble(); + break; + } } } } -- cgit v1.3.1