diff options
| author | Roy <Roy.mail.net@gmail.com> | 2023-09-05 09:48:16 +0300 |
|---|---|---|
| committer | Roy <Roy.mail.net@gmail.com> | 2023-09-05 09:48:16 +0300 |
| commit | 1c116952716422cce38b4e36dd3193d0700debdb (patch) | |
| tree | 6e5263d2da8f6d6d0d106fe0566f5126f565c26e /Software | |
| parent | 26d233c28e78b20fc9b19fbb51bc2585e7cab5d1 (diff) | |
| download | Tango-1c116952716422cce38b4e36dd3193d0700debdb.tar.gz Tango-1c116952716422cce38b4e36dd3193d0700debdb.zip | |
Added Btsr 5-8
Diffstat (limited to 'Software')
16 files changed, 1837 insertions, 136 deletions
diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf Binary files differindex ff8e11bbf..4f1fc2550 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 f35e4270c..d943c41b1 100644 --- a/Software/DB/Tango_log.ldf +++ b/Software/DB/Tango_log.ldf diff --git a/Software/PMR/Messages/Diagnostics/DiagnosticsMonitors.proto b/Software/PMR/Messages/Diagnostics/DiagnosticsMonitors.proto index ff15b129f..4e5c9d335 100644 --- a/Software/PMR/Messages/Diagnostics/DiagnosticsMonitors.proto +++ b/Software/PMR/Messages/Diagnostics/DiagnosticsMonitors.proto @@ -606,4 +606,64 @@ message DiagnosticsMonitors //Eureka Spare 4 (Min = 0, Max = 10000, PPF = 10) repeated double EuSpare4 = 196; + //Eureka BTSR 5 Tension (Min = 0, Max = 100, PPF = 10) + repeated double EuBtsr5DispAv = 197; + + //Eureka BTSR 6 Tension (Min = 0, Max = 100, PPF = 10) + repeated double EuBtsr6DispAv = 198; + + //Eureka BTSR 7 Tension (Min = 0, Max = 100, PPF = 10) + repeated double EuBtsr7DispAv = 199; + + //Eureka BTSR 8 Tension (Min = 0, Max = 100, PPF = 10) + repeated double EuBtsr8DispAv = 200; + + //Eureka BTSR 5 Peak Max (Min = 0, Max = 100, PPF = 10) + repeated double EuBtsr5PeakMax = 201; + + //Eureka BTSR 6 Peak Max (Min = 0, Max = 100, PPF = 10) + repeated double EuBtsr6PeakMax = 202; + + //Eureka BTSR 7 Peak Max (Min = 0, Max = 100, PPF = 10) + repeated double EuBtsr7PeakMax = 203; + + //Eureka BTSR 8 Peak Max (Min = 0, Max = 100, PPF = 10) + repeated double EuBtsr8PeakMax = 204; + + //Eureka BTSR 5 Peak Min (Min = 0, Max = 100, PPF = 10) + repeated double EuBtsr5PeakMin = 205; + + //Eureka BTSR 6 Peak Min (Min = 0, Max = 100, PPF = 10) + repeated double EuBtsr6PeakMin = 206; + + //Eureka BTSR 7 Peak Min (Min = 0, Max = 100, PPF = 10) + repeated double EuBtsr7PeakMin = 207; + + //Eureka BTSR 8 Peak Min (Min = 0, Max = 100, PPF = 10) + repeated double EuBtsr8PeakMin = 208; + + //Eureka BTSR 5 Speed (Min = 0, Max = 100, PPF = 10) + repeated double EuBtsr5Speed = 209; + + //Eureka BTSR 6 Speed (Min = 0, Max = 100, PPF = 10) + repeated double EuBtsr6Speed = 210; + + //Eureka BTSR 7 Speed (Min = 0, Max = 100, PPF = 10) + repeated double EuBtsr7Speed = 211; + + //Eureka BTSR 8 Speed (Min = 0, Max = 100, PPF = 10) + repeated double EuBtsr8Speed = 212; + + //Eureka BTSR 5 Speed Average (Min = 0, Max = 100, PPF = 10) + repeated double EuBtsr5SpeedAv = 213; + + //Eureka BTSR 6 Speed Average (Min = 0, Max = 100, PPF = 10) + repeated double EuBtsr6SpeedAv = 214; + + //Eureka BTSR 7 Speed Average (Min = 0, Max = 100, PPF = 10) + repeated double EuBtsr7SpeedAv = 215; + + //Eureka BTSR 8 Speed Average (Min = 0, Max = 100, PPF = 10) + repeated double EuBtsr8SpeedAv = 216; + } diff --git a/Software/PMR/Messages/Insights/InsightsMonitors.proto b/Software/PMR/Messages/Insights/InsightsMonitors.proto index 56739835b..e0501252d 100644 --- a/Software/PMR/Messages/Insights/InsightsMonitors.proto +++ b/Software/PMR/Messages/Insights/InsightsMonitors.proto @@ -604,4 +604,64 @@ message InsightsMonitors //Eureka Spare 4 double EuSpare4 = 196; + //Eureka BTSR 5 Tension + double EuBtsr5DispAv = 197; + + //Eureka BTSR 6 Tension + double EuBtsr6DispAv = 198; + + //Eureka BTSR 7 Tension + double EuBtsr7DispAv = 199; + + //Eureka BTSR 8 Tension + double EuBtsr8DispAv = 200; + + //Eureka BTSR 5 Peak Max + double EuBtsr5PeakMax = 201; + + //Eureka BTSR 6 Peak Max + double EuBtsr6PeakMax = 202; + + //Eureka BTSR 7 Peak Max + double EuBtsr7PeakMax = 203; + + //Eureka BTSR 8 Peak Max + double EuBtsr8PeakMax = 204; + + //Eureka BTSR 5 Peak Min + double EuBtsr5PeakMin = 205; + + //Eureka BTSR 6 Peak Min + double EuBtsr6PeakMin = 206; + + //Eureka BTSR 7 Peak Min + double EuBtsr7PeakMin = 207; + + //Eureka BTSR 8 Peak Min + double EuBtsr8PeakMin = 208; + + //Eureka BTSR 5 Speed + double EuBtsr5Speed = 209; + + //Eureka BTSR 6 Speed + double EuBtsr6Speed = 210; + + //Eureka BTSR 7 Speed + double EuBtsr7Speed = 211; + + //Eureka BTSR 8 Speed + double EuBtsr8Speed = 212; + + //Eureka BTSR 5 Speed Average + double EuBtsr5SpeedAv = 213; + + //Eureka BTSR 6 Speed Average + double EuBtsr6SpeedAv = 214; + + //Eureka BTSR 7 Speed Average + double EuBtsr7SpeedAv = 215; + + //Eureka BTSR 8 Speed Average + double EuBtsr8SpeedAv = 216; + } diff --git a/Software/PMR/Messages/Printing/ProcessParameters.proto b/Software/PMR/Messages/Printing/ProcessParameters.proto index 03d41174e..91ad8d65e 100644 --- a/Software/PMR/Messages/Printing/ProcessParameters.proto +++ b/Software/PMR/Messages/Printing/ProcessParameters.proto @@ -144,4 +144,12 @@ message ProcessParameters double ETunnelTemp = 64; + double EBtsr5FeedingTension = 65; + + double EBtsr6FeedingTension = 66; + + double EBtsr7FeedingTension = 67; + + double EBtsr8FeedingTension = 68; + } diff --git a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs index 9ee86e42a..a7133707a 100644 --- a/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs +++ b/Software/Visual_Studio/Tango.BL/DTO/ProcessParametersTableDTOBase.cs @@ -549,5 +549,37 @@ namespace Tango.BL.DTO get; set; } + /// <summary> + /// e btsr5 feeding tension + /// </summary> + public Double EBtsr5FeedingTension + { + get; set; + } + + /// <summary> + /// e btsr6 feeding tension + /// </summary> + public Double EBtsr6FeedingTension + { + get; set; + } + + /// <summary> + /// e btsr7 feeding tension + /// </summary> + public Double EBtsr7FeedingTension + { + get; set; + } + + /// <summary> + /// e btsr8 feeding tension + /// </summary> + public Double EBtsr8FeedingTension + { + get; set; + } + } } diff --git a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs index 3fe1cacee..aa19210b8 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/ProcessParametersTableBase.cs @@ -157,6 +157,14 @@ namespace Tango.BL.Entities public event EventHandler<Double> ETunnelTempChanged; + public event EventHandler<Double> EBtsr5FeedingTensionChanged; + + public event EventHandler<Double> EBtsr6FeedingTensionChanged; + + public event EventHandler<Double> EBtsr7FeedingTensionChanged; + + public event EventHandler<Double> EBtsr8FeedingTensionChanged; + public event EventHandler<ProcessParametersTablesGroup> ProcessParametersTablesGroupChanged; protected String _name; @@ -1493,7 +1501,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(47)] + [PropertyIndex(48)] public Double EBtsr4FeedingTension { @@ -1524,7 +1532,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(48)] + [PropertyIndex(53)] public Double EMixerTemp { @@ -1555,7 +1563,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(49)] + [PropertyIndex(54)] public Double EHeadZone1Temp { @@ -1586,7 +1594,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(50)] + [PropertyIndex(55)] public Double EHeadZone2Temp { @@ -1617,7 +1625,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(51)] + [PropertyIndex(56)] public Double EHeadZone3Temp { @@ -1648,7 +1656,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(52)] + [PropertyIndex(57)] public Double EDryerZone1Temp { @@ -1679,7 +1687,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(53)] + [PropertyIndex(58)] public Double EDryerZone2Temp { @@ -1710,7 +1718,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(54)] + [PropertyIndex(59)] public Double EDryerZone3Temp { @@ -1741,7 +1749,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(55)] + [PropertyIndex(59)] public Double ELubricantTemp { @@ -1772,7 +1780,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(56)] + [PropertyIndex(60)] public Double EDryerIncomingAirFlow { @@ -1803,7 +1811,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(57)] + [PropertyIndex(61)] public Double EDryerOutgoingAirFlow { @@ -1834,7 +1842,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(58)] + [PropertyIndex(62)] public Double ETunnelIncomingAirFlow { @@ -1865,7 +1873,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(59)] + [PropertyIndex(63)] public Double ETunnelOutgoingAirFlow { @@ -1896,7 +1904,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(60)] + [PropertyIndex(64)] public Double EWasteAirFlow { @@ -1927,7 +1935,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(61)] + [PropertyIndex(65)] public Double EWastePrepareTime { @@ -1958,7 +1966,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(62)] + [PropertyIndex(66)] public Double EPumpTemp { @@ -1989,7 +1997,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(63)] + [PropertyIndex(67)] public Double EPressureBuildUp { @@ -2020,7 +2028,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(65)] + [PropertyIndex(68)] public Double ESpare1 { @@ -2051,7 +2059,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(66)] + [PropertyIndex(69)] public Double ESpare2 { @@ -2082,7 +2090,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(67)] + [PropertyIndex(70)] public Double ESpare3 { @@ -2113,7 +2121,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(68)] + [PropertyIndex(71)] public Double ESpare4 { @@ -2144,7 +2152,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(69)] + [PropertyIndex(72)] public Double ESpare5 { @@ -2175,7 +2183,7 @@ namespace Tango.BL.Entities [StringFormat("0.0")] - [PropertyIndex(64)] + [PropertyIndex(70)] public Double ETunnelTemp { @@ -2196,6 +2204,130 @@ namespace Tango.BL.Entities } } + protected Double _ebtsr5feedingtension; + + /// <summary> + /// Gets or sets the processparameterstablebase e btsr5 feeding tension. + /// </summary> + + [Column("E_BTSR5_FEEDING_TENSION")] + + [StringFormat("0.0")] + + [PropertyIndex(48)] + + public Double EBtsr5FeedingTension + { + get + { + return _ebtsr5feedingtension; + } + + set + { + if (_ebtsr5feedingtension != value) + { + _ebtsr5feedingtension = value; + + OnEBtsr5FeedingTensionChanged(value); + + } + } + } + + protected Double _ebtsr6feedingtension; + + /// <summary> + /// Gets or sets the processparameterstablebase e btsr6 feeding tension. + /// </summary> + + [Column("E_BTSR6_FEEDING_TENSION")] + + [StringFormat("0.0")] + + [PropertyIndex(49)] + + public Double EBtsr6FeedingTension + { + get + { + return _ebtsr6feedingtension; + } + + set + { + if (_ebtsr6feedingtension != value) + { + _ebtsr6feedingtension = value; + + OnEBtsr6FeedingTensionChanged(value); + + } + } + } + + protected Double _ebtsr7feedingtension; + + /// <summary> + /// Gets or sets the processparameterstablebase e btsr7 feeding tension. + /// </summary> + + [Column("E_BTSR7_FEEDING_TENSION")] + + [StringFormat("0.0")] + + [PropertyIndex(50)] + + public Double EBtsr7FeedingTension + { + get + { + return _ebtsr7feedingtension; + } + + set + { + if (_ebtsr7feedingtension != value) + { + _ebtsr7feedingtension = value; + + OnEBtsr7FeedingTensionChanged(value); + + } + } + } + + protected Double _ebtsr8feedingtension; + + /// <summary> + /// Gets or sets the processparameterstablebase e btsr8 feeding tension. + /// </summary> + + [Column("E_BTSR8_FEEDING_TENSION")] + + [StringFormat("0.0")] + + [PropertyIndex(51)] + + public Double EBtsr8FeedingTension + { + get + { + return _ebtsr8feedingtension; + } + + set + { + if (_ebtsr8feedingtension != value) + { + _ebtsr8feedingtension = value; + + OnEBtsr8FeedingTensionChanged(value); + + } + } + } + protected ProcessParametersTablesGroup _processparameterstablesgroup; /// <summary> @@ -2814,6 +2946,42 @@ namespace Tango.BL.Entities } /// <summary> + /// Called when the EBtsr5FeedingTension has changed. + /// </summary> + protected virtual void OnEBtsr5FeedingTensionChanged(Double ebtsr5feedingtension) + { + EBtsr5FeedingTensionChanged?.Invoke(this, ebtsr5feedingtension); + RaisePropertyChanged(nameof(EBtsr5FeedingTension)); + } + + /// <summary> + /// Called when the EBtsr6FeedingTension has changed. + /// </summary> + protected virtual void OnEBtsr6FeedingTensionChanged(Double ebtsr6feedingtension) + { + EBtsr6FeedingTensionChanged?.Invoke(this, ebtsr6feedingtension); + RaisePropertyChanged(nameof(EBtsr6FeedingTension)); + } + + /// <summary> + /// Called when the EBtsr7FeedingTension has changed. + /// </summary> + protected virtual void OnEBtsr7FeedingTensionChanged(Double ebtsr7feedingtension) + { + EBtsr7FeedingTensionChanged?.Invoke(this, ebtsr7feedingtension); + RaisePropertyChanged(nameof(EBtsr7FeedingTension)); + } + + /// <summary> + /// Called when the EBtsr8FeedingTension has changed. + /// </summary> + protected virtual void OnEBtsr8FeedingTensionChanged(Double ebtsr8feedingtension) + { + EBtsr8FeedingTensionChanged?.Invoke(this, ebtsr8feedingtension); + RaisePropertyChanged(nameof(EBtsr8FeedingTension)); + } + + /// <summary> /// Called when the ProcessParametersTablesGroup has changed. /// </summary> protected virtual void OnProcessParametersTablesGroupChanged(ProcessParametersTablesGroup processparameterstablesgroup) diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs b/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs index c3c88f409..00d63da76 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/TechMonitors.cs @@ -350,6 +350,126 @@ namespace Tango.BL.Enumerations EuBtsr4SpeedAv = 1049, /// <summary> + /// (Eureka BTSR 5 Tension) + /// </summary> + [Description("Eureka BTSR 5 Tension")] + EuBtsr5DispAv = 1200, + + /// <summary> + /// (Eureka BTSR 5 Peak Max) + /// </summary> + [Description("Eureka BTSR 5 Peak Max")] + EuBtsr5PeakMax = 1204, + + /// <summary> + /// (Eureka BTSR 5 Peak Min) + /// </summary> + [Description("Eureka BTSR 5 Peak Min")] + EuBtsr5PeakMin = 1208, + + /// <summary> + /// (Eureka BTSR 5 Speed) + /// </summary> + [Description("Eureka BTSR 5 Speed")] + EuBtsr5Speed = 1212, + + /// <summary> + /// (Eureka BTSR 5 Speed Average) + /// </summary> + [Description("Eureka BTSR 5 Speed Average")] + EuBtsr5SpeedAv = 1216, + + /// <summary> + /// (Eureka BTSR 6 Tension) + /// </summary> + [Description("Eureka BTSR 6 Tension")] + EuBtsr6DispAv = 1201, + + /// <summary> + /// (Eureka BTSR 6 Peak Max) + /// </summary> + [Description("Eureka BTSR 6 Peak Max")] + EuBtsr6PeakMax = 1205, + + /// <summary> + /// (Eureka BTSR 6 Peak Min) + /// </summary> + [Description("Eureka BTSR 6 Peak Min")] + EuBtsr6PeakMin = 1209, + + /// <summary> + /// (Eureka BTSR 6 Speed) + /// </summary> + [Description("Eureka BTSR 6 Speed")] + EuBtsr6Speed = 1213, + + /// <summary> + /// (Eureka BTSR 6 Speed Average) + /// </summary> + [Description("Eureka BTSR 6 Speed Average")] + EuBtsr6SpeedAv = 1217, + + /// <summary> + /// (Eureka BTSR 7 Tension) + /// </summary> + [Description("Eureka BTSR 7 Tension")] + EuBtsr7DispAv = 1202, + + /// <summary> + /// (Eureka BTSR 7 Peak Max) + /// </summary> + [Description("Eureka BTSR 7 Peak Max")] + EuBtsr7PeakMax = 1206, + + /// <summary> + /// (Eureka BTSR 7 Peak Min) + /// </summary> + [Description("Eureka BTSR 7 Peak Min")] + EuBtsr7PeakMin = 1210, + + /// <summary> + /// (Eureka BTSR 7 Speed) + /// </summary> + [Description("Eureka BTSR 7 Speed")] + EuBtsr7Speed = 1214, + + /// <summary> + /// (Eureka BTSR 7 Speed Average) + /// </summary> + [Description("Eureka BTSR 7 Speed Average")] + EuBtsr7SpeedAv = 1218, + + /// <summary> + /// (Eureka BTSR 8 Tension) + /// </summary> + [Description("Eureka BTSR 8 Tension")] + EuBtsr8DispAv = 1203, + + /// <summary> + /// (Eureka BTSR 8 Peak Max) + /// </summary> + [Description("Eureka BTSR 8 Peak Max")] + EuBtsr8PeakMax = 1207, + + /// <summary> + /// (Eureka BTSR 8 Peak Min) + /// </summary> + [Description("Eureka BTSR 8 Peak Min")] + EuBtsr8PeakMin = 1211, + + /// <summary> + /// (Eureka BTSR 8 Speed) + /// </summary> + [Description("Eureka BTSR 8 Speed")] + EuBtsr8Speed = 1215, + + /// <summary> + /// (Eureka BTSR 8 Speed Average) + /// </summary> + [Description("Eureka BTSR 8 Speed Average")] + EuBtsr8SpeedAv = 1219, + + /// <summary> /// (Eureka Chiller Temperature) /// </summary> [Description("Eureka Chiller Temperature")] 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 08830d36d..bfb1b36e2 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 @@ -83,6 +83,10 @@ namespace Tango.DAL.Remote.DB public double E_SPARE4 { get; set; } public double E_SPARE5 { get; set; } public double E_TUNNEL_TEMP { get; set; } + public double E_BTSR5_FEEDING_TENSION { get; set; } + public double E_BTSR6_FEEDING_TENSION { get; set; } + public double E_BTSR7_FEEDING_TENSION { get; set; } + public double E_BTSR8_FEEDING_TENSION { 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 8bed67ce6..049c4a131 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx @@ -1122,6 +1122,10 @@ <Property Name="E_SPARE4" Type="float" Nullable="false" /> <Property Name="E_SPARE5" Type="float" Nullable="false" /> <Property Name="E_TUNNEL_TEMP" Type="float" Nullable="false" /> + <Property Name="E_BTSR5_FEEDING_TENSION" Type="float" Nullable="false" /> + <Property Name="E_BTSR6_FEEDING_TENSION" Type="float" Nullable="false" /> + <Property Name="E_BTSR7_FEEDING_TENSION" Type="float" Nullable="false" /> + <Property Name="E_BTSR8_FEEDING_TENSION" Type="float" Nullable="false" /> </EntityType> <EntityType Name="PROCESS_PARAMETERS_TABLES_GROUPS"> <Key> @@ -6817,6 +6821,10 @@ <Property Name="E_SPARE4" Type="Double" Nullable="false" /> <Property Name="E_SPARE5" Type="Double" Nullable="false" /> <Property Name="E_TUNNEL_TEMP" Type="Double" Nullable="false" /> + <Property Name="E_BTSR5_FEEDING_TENSION" Type="Double" Nullable="false" /> + <Property Name="E_BTSR6_FEEDING_TENSION" Type="Double" Nullable="false" /> + <Property Name="E_BTSR7_FEEDING_TENSION" Type="Double" Nullable="false" /> + <Property Name="E_BTSR8_FEEDING_TENSION" Type="Double" Nullable="false" /> <NavigationProperty Name="PROCESS_PARAMETERS_TABLES_GROUPS" Relationship="RemoteModel.FK_PROCESS_PARAMETERS_TABLES_PROCESS_PARAMETERS_TABLES_GROUPS" FromRole="PROCESS_PARAMETERS_TABLES" ToRole="PROCESS_PARAMETERS_TABLES_GROUPS" /> </EntityType> <EntityType Name="PROCESS_PARAMETERS_TABLES_GROUPS"> @@ -10203,6 +10211,10 @@ <EntitySetMapping Name="PROCESS_PARAMETERS_TABLES"> <EntityTypeMapping TypeName="RemoteModel.PROCESS_PARAMETERS_TABLES"> <MappingFragment StoreEntitySet="PROCESS_PARAMETERS_TABLES"> + <ScalarProperty Name="E_BTSR8_FEEDING_TENSION" ColumnName="E_BTSR8_FEEDING_TENSION" /> + <ScalarProperty Name="E_BTSR7_FEEDING_TENSION" ColumnName="E_BTSR7_FEEDING_TENSION" /> + <ScalarProperty Name="E_BTSR6_FEEDING_TENSION" ColumnName="E_BTSR6_FEEDING_TENSION" /> + <ScalarProperty Name="E_BTSR5_FEEDING_TENSION" ColumnName="E_BTSR5_FEEDING_TENSION" /> <ScalarProperty Name="E_TUNNEL_TEMP" ColumnName="E_TUNNEL_TEMP" /> <ScalarProperty Name="E_SPARE5" ColumnName="E_SPARE5" /> <ScalarProperty Name="E_SPARE4" ColumnName="E_SPARE4" /> 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 3a81d86f0..f21f85e35 100644 --- a/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram +++ b/Software/Visual_Studio/Tango.DAL.Remote/DB/RemoteADO.edmx.diagram @@ -4,103 +4,103 @@ <edmx:Designer xmlns="http://schemas.microsoft.com/ado/2009/11/edmx"> <!-- Diagram content (shape and connector positions) --> <edmx:Diagrams> - <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1" ZoomLevel="87"> - <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="12.375" /> - <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="73" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="1.5" PointY="77.125" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="98.5" /> - <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="1.5" PointY="91" /> - <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="5.75" PointY="10.625" /> - <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="22.125" /> - <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="26" /> - <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="36.5" /> - <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="3" PointY="47.375" /> - <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="5.25" PointY="21.75" /> - <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="30.25" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="101.625" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="0.75" PointY="7.125" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="3" PointY="0.75" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="5.25" PointY="25.625" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="7.75" PointY="10.625" /> - <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="36" /> - <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="0.75" PointY="82.875" /> - <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="69.125" /> - <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="29.75" /> - <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="5.25" PointY="69.375" /> - <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="0.75" PointY="106.875" /> - <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="3" PointY="106.25" /> - <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="88" /> - <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="66.25" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="33.5" /> - <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="39.75" /> - <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="33.625" /> - <EntityTypeShape EntityType="RemoteModel.GBD" Width="1.5" PointX="0.75" PointY="45.875" /> - <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="2.75" PointY="12.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="1.5" PointY="118.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="3.75" PointY="99.25" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="7.5" PointY="100.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="9.75" PointY="94.375" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="1.5" PointY="114.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="3.75" PointY="93.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="7.5" PointY="84.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="9.75" PointY="84.25" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="4.5" PointY="81.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="6.75" PointY="92.75" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="1.5" PointY="110.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="3.75" PointY="89.375" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="1.5" PointY="93.875" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="4.5" PointY="85.625" /> - <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="6.75" PointY="88.5" /> - <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="3" PointY="40.75" /> - <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="5.25" PointY="45.125" /> - <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="16.75" PointY="2.625" /> - <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="22" /> - <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="12.125" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="3" PointY="7.5" /> - <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="25.875" /> - <EntityTypeShape EntityType="RemoteModel.LUB" Width="1.5" PointX="0.75" PointY="21" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="13.75" PointY="11.625" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="18.125" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="0.75" PointY="65.5" /> - <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="3" PointY="57.25" /> - <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="39.625" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="18" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="42.75" /> - <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="15.125" /> - <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="3" PointY="44" /> - <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="51.125" /> - <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="4.25" /> - <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="50.25" /> - <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="56.125" /> - <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="5.75" PointY="6.875" /> - <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="8" PointY="7" /> - <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="8" PointY="2.875" /> - <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="19.625" /> - <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="8.25" PointY="21.375" /> - <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="12" PointY="8.125" /> - <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="8.25" /> - <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="16.75" PointY="13.625" /> - <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="25.75" /> - <EntityTypeShape EntityType="RemoteModel.SEGMENTS_GROUPS" Width="1.5" PointX="13.5" PointY="26" /> - <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="35.75" /> - <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="5.25" PointY="66.25" /> - <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="30.125" /> - <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="14.25" PointY="30.125" /> - <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="6" PointY="16" /> - <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="8.25" PointY="40.375" /> - <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="2.75" PointY="16.625" /> - <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="16.75" PointY="17.625" /> - <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="39.5" /> - <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="13.75" PointY="19.625" /> - <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="18.75" PointY="2.625" /> - <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="18.75" PointY="5.625" /> - <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="18.75" PointY="8.625" /> - <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="18.75" PointY="13.625" /> - <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="18.75" PointY="18.625" /> - <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="14.75" /> - <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="14.25" PointY="16.25" /> - <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="5.75" PointY="3.375" /> - <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="32.875" /> + <Diagram DiagramId="f9ae01d708754bbd997add25a4bacc79" Name="Diagram1" ZoomLevel="58"> + <EntityTypeShape EntityType="RemoteModel.ACTION_LOGS" Width="1.5" PointX="11.25" PointY="17.875" /> + <EntityTypeShape EntityType="RemoteModel.ADDRESS" Width="1.5" PointX="1.5" PointY="59.125" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_DISPLAY_PANEL_VERSIONS" Width="1.5" PointX="4.5" PointY="76.5" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="66" /> + <EntityTypeShape EntityType="RemoteModel.APPLICATION_OS_VERSIONS" Width="1.5" PointX="4.5" PointY="79.375" /> + <EntityTypeShape EntityType="RemoteModel.BIT_TYPES" Width="1.5" PointX="0.75" PointY="1.75" /> + <EntityTypeShape EntityType="RemoteModel.BRUSH_STOPS" Width="1.5" PointX="18" PointY="21.75" /> + <EntityTypeShape EntityType="RemoteModel.BTSR_APPLICATION_TYPES" Width="1.5" PointX="0.75" PointY="14.625" /> + <EntityTypeShape EntityType="RemoteModel.BTSR_YARN_TYPES" Width="1.5" PointX="0.75" PointY="29.25" /> + <EntityTypeShape EntityType="RemoteModel.CARTRIDGE_TYPES" Width="1.5" PointX="7.75" PointY="40.625" /> + <EntityTypeShape EntityType="RemoteModel.CAT" Width="1.5" PointX="8.25" PointY="29.25" /> + <EntityTypeShape EntityType="RemoteModel.CCT" Width="1.5" PointX="0.75" PointY="20.875" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS" Width="1.5" PointX="1.5" PointY="6.125" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_GROUPS" Width="1.5" PointX="3.75" PointY="6.625" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS" Width="1.5" PointX="6" PointY="5.375" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_CATALOGS_ITEMS_RECIPES" Width="1.5" PointX="8.25" PointY="21.25" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_PROCESS_INK_UPTAKE" Width="1.5" PointX="2.75" PointY="1.75" /> + <EntityTypeShape EntityType="RemoteModel.COLOR_SPACES" Width="1.5" PointX="9" PointY="6.875" /> + <EntityTypeShape EntityType="RemoteModel.CONFIGURATION" Width="1.5" PointX="6.75" PointY="71.75" /> + <EntityTypeShape EntityType="RemoteModel.CONTACT" Width="1.5" PointX="1.5" PointY="55.25" /> + <EntityTypeShape EntityType="RemoteModel.CUSTOMER" Width="1.5" PointX="9" PointY="17.75" /> + <EntityTypeShape EntityType="RemoteModel.DATA_STORE_ITEMS" Width="1.5" PointX="11.25" PointY="82.25" /> + <EntityTypeShape EntityType="RemoteModel.DISPENSER_TYPES" Width="1.5" PointX="5.5" PointY="44.875" /> + <EntityTypeShape EntityType="RemoteModel.DISPENSER" Width="1.5" PointX="7.75" PointY="44.375" /> + <EntityTypeShape EntityType="RemoteModel.EMBEDDED_FIRMWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="68.875" /> + <EntityTypeShape EntityType="RemoteModel.EVENT_TYPES" Width="1.5" PointX="9" PointY="97.625" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SHAPES" Width="1.5" PointX="0.75" PointY="11.75" /> + <EntityTypeShape EntityType="RemoteModel.FIBER_SYNTHS" Width="1.5" PointX="0.75" PointY="35.875" /> + <EntityTypeShape EntityType="RemoteModel.FSE_VERSIONS" Width="1.5" PointX="11.25" PointY="7.125" /> + <EntityTypeShape EntityType="RemoteModel.GBD" Width="1.5" PointX="0.75" PointY="25.625" /> + <EntityTypeShape EntityType="RemoteModel.GLOBAL_DATA_STORE_ITEMS" Width="1.5" PointX="4.75" PointY="1.75" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWER_TYPES" Width="1.5" PointX="4.5" PointY="82.625" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BLOWERS" Width="1.5" PointX="6.75" PointY="77.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSOR_TYPES" Width="1.5" PointX="9.5" PointY="107.625" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_BREAK_SENSORS" Width="1.5" PointX="11.75" PointY="78.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCER_TYPES" Width="1.5" PointX="10.5" PointY="62.625" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_DANCERS" Width="1.5" PointX="12.75" PointY="64.5" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTOR_TYPES" Width="1.5" PointX="12.5" PointY="86.5" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_MOTORS" Width="1.5" PointX="14.75" PointY="70.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROL_TYPES" Width="1.5" PointX="9.5" PointY="103.625" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_PID_CONTROLS" Width="1.5" PointX="11.75" PointY="70.625" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSOR_TYPES" Width="1.5" PointX="4.5" PointY="62.625" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_SPEED_SENSORS" Width="1.5" PointX="6.75" PointY="67.25" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_VERSIONS" Width="1.5" PointX="4.5" PointY="71.875" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDER_TYPES" Width="1.5" PointX="7.5" PointY="86.625" /> + <EntityTypeShape EntityType="RemoteModel.HARDWARE_WINDERS" Width="1.5" PointX="9.75" PointY="66.375" /> + <EntityTypeShape EntityType="RemoteModel.IDS_PACK_FORMULAS" Width="1.5" PointX="7.75" PointY="93.875" /> + <EntityTypeShape EntityType="RemoteModel.IDS_PACKS" Width="1.5" PointX="10" PointY="50.75" /> + <EntityTypeShape EntityType="RemoteModel.JOB_RUNS" Width="1.5" PointX="13.75" PointY="5.75" /> + <EntityTypeShape EntityType="RemoteModel.JOB" Width="1.5" PointX="11.25" PointY="21.625" /> + <EntityTypeShape EntityType="RemoteModel.LINEAR_MASS_DENSITY_UNITS" Width="1.5" PointX="0.75" PointY="44.75" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES" Width="1.5" PointX="6" PointY="29.875" /> + <EntityTypeShape EntityType="RemoteModel.LIQUID_TYPES_RMLS" Width="1.5" PointX="8.25" PointY="25.5" /> + <EntityTypeShape EntityType="RemoteModel.LUB" Width="1.5" PointX="0.75" PointY="32.5" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_PROTOTYPES" Width="1.5" PointX="2.75" PointY="15.75" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_STUDIO_VERSIONS" Width="1.5" PointX="11.25" PointY="10.75" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE_VERSIONS" Width="1.5" PointX="6.75" PointY="82.375" /> + <EntityTypeShape EntityType="RemoteModel.MACHINE" Width="1.5" PointX="9" PointY="70" /> + <EntityTypeShape EntityType="RemoteModel.MACHINES_EVENTS" Width="1.5" PointX="11.25" PointY="39" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_CONDITIONS" Width="1.5" PointX="0.75" PointY="41.875" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_MATERIALS" Width="1.5" PointX="0.75" PointY="38.75" /> + <EntityTypeShape EntityType="RemoteModel.MEDIA_PURPOSES" Width="1.5" PointX="0.75" PointY="18" /> + <EntityTypeShape EntityType="RemoteModel.MID_TANK_TYPES" Width="1.5" PointX="7.75" PointY="90.5" /> + <EntityTypeShape EntityType="RemoteModel.ORGANIZATION" Width="1.5" PointX="0.75" PointY="50.25" /> + <EntityTypeShape EntityType="RemoteModel.PERMISSION" Width="1.5" PointX="12" PointY="56.25" /> + <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES" Width="1.5" PointX="7.5" PointY="49.5" /> + <EntityTypeShape EntityType="RemoteModel.PROCESS_PARAMETERS_TABLES_GROUPS" Width="1.5" PointX="5.25" PointY="55.75" /> + <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS" Width="1.5" PointX="13.75" PointY="2" /> + <EntityTypeShape EntityType="RemoteModel.PUBLISHED_PROCEDURE_PROJECTS_VERSIONS" Width="1.5" PointX="16" PointY="2.125" /> + <EntityTypeShape EntityType="RemoteModel.RML_EXTENSION_TEST_WASHING_RESULTS" Width="1.5" PointX="5" PointY="12" /> + <EntityTypeShape EntityType="RemoteModel.RML" Width="1.5" PointX="3" PointY="19.25" /> + <EntityTypeShape EntityType="RemoteModel.RMLS_SPOOLS" Width="1.5" PointX="5.25" PointY="25" /> + <EntityTypeShape EntityType="RemoteModel.ROLE" Width="1.5" PointX="9" PointY="37.125" /> + <EntityTypeShape EntityType="RemoteModel.ROLES_PERMISSIONS" Width="1.5" PointX="14.25" PointY="37.25" /> + <EntityTypeShape EntityType="RemoteModel.RUBBING_RESULTS" Width="1.5" PointX="5.75" PointY="15.75" /> + <EntityTypeShape EntityType="RemoteModel.SEGMENT" Width="1.5" PointX="15.75" PointY="25.25" /> + <EntityTypeShape EntityType="RemoteModel.SEGMENTS_GROUPS" Width="1.5" PointX="13.5" PointY="25.625" /> + <EntityTypeShape EntityType="RemoteModel.SITE" Width="1.5" PointX="3" PointY="50.375" /> + <EntityTypeShape EntityType="RemoteModel.SITES_CATALOGS" Width="1.5" PointX="5.25" PointY="34.5" /> + <EntityTypeShape EntityType="RemoteModel.SITES_RMLS" Width="1.5" PointX="5.25" PointY="21.625" /> + <EntityTypeShape EntityType="RemoteModel.SITES_SPOOL_TYPES" Width="1.5" PointX="11.25" PointY="33.625" /> + <EntityTypeShape EntityType="RemoteModel.SPOOL_TYPES" Width="1.5" PointX="9" PointY="10.375" /> + <EntityTypeShape EntityType="RemoteModel.SPOOL" Width="1.5" PointX="11.25" PointY="43.875" /> + <EntityTypeShape EntityType="RemoteModel.sysdiagram" Width="1.5" PointX="15.75" PointY="5.75" /> + <EntityTypeShape EntityType="RemoteModel.TANGO_UPDATES" Width="1.5" PointX="15.75" PointY="8.75" /> + <EntityTypeShape EntityType="RemoteModel.TANGO_VERSIONS" Width="1.5" PointX="14.25" PointY="41" /> + <EntityTypeShape EntityType="RemoteModel.TECH_CONTROLLERS" Width="1.5" PointX="15.75" PointY="13.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_DISPENSERS" Width="1.5" PointX="13.75" PointY="17.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_HEATERS" Width="1.5" PointX="15.75" PointY="17.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_IOS" Width="1.5" PointX="17.75" PointY="5.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_MONITORS" Width="1.5" PointX="17.75" PointY="10.75" /> + <EntityTypeShape EntityType="RemoteModel.TECH_VALVES" Width="1.5" PointX="17.75" PointY="15.75" /> + <EntityTypeShape EntityType="RemoteModel.USER" Width="1.5" PointX="9" PointY="0.75" /> + <EntityTypeShape EntityType="RemoteModel.USERS_ROLES" Width="1.5" PointX="11.25" PointY="2.25" /> + <EntityTypeShape EntityType="RemoteModel.WASHING_TEST_MATERIALS" Width="1.5" PointX="2.75" PointY="12.5" /> + <EntityTypeShape EntityType="RemoteModel.WINDING_METHODS" Width="1.5" PointX="9" PointY="33.875" /> <AssociationConnector Association="RemoteModel.FK_ACTION_LOGS_USERS" /> <AssociationConnector Association="RemoteModel.FK_ORGANIZATIONS_ADDRESSES" /> <AssociationConnector Association="RemoteModel.FK_USERS_ADDRESSES" /> diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs index 06deacb53..5d90214f5 100644 --- a/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs +++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/DiagnosticsMonitors.cs @@ -23,7 +23,7 @@ namespace Tango.PMR.Diagnostics { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChlEaWFnbm9zdGljc01vbml0b3JzLnByb3RvEhVUYW5nby5QTVIuRGlhZ25v", - "c3RpY3MaEURvdWJsZUFycmF5LnByb3RvIt4tChNEaWFnbm9zdGljc01vbml0", + "c3RpY3MaEURvdWJsZUFycmF5LnByb3RvIsYxChNEaWFnbm9zdGljc01vbml0", "b3JzEhQKDERhbmNlcjFBbmdsZRgBIAMoARIUCgxEYW5jZXIyQW5nbGUYAiAD", "KAESFAoMRGFuY2VyM0FuZ2xlGAMgAygBEhwKFEZlZWRlck1vdG9yRnJlcXVl", "bmN5GAQgAygBEhIKCkRyeWVyTW90b3IYBSADKAESEwoLUG9sbGVyTW90b3IY", @@ -153,12 +153,23 @@ namespace Tango.PMR.Diagnostics { "ZnRWb2x0YWdlGL0BIAMoARIXCg5FdURyeWVyQWlyRmxvdxi+ASADKAESGAoP", "RXVCbG93ZXJWb2x0YWdlGL8BIAMoARIVCgxFdVdhc3RlTGV2ZWwYwAEgAygB", "EhEKCEV1U3BhcmUxGMEBIAMoARIRCghFdVNwYXJlMhjCASADKAESEQoIRXVT", - "cGFyZTMYwwEgAygBEhEKCEV1U3BhcmU0GMQBIAMoAUIhCh9jb20udHdpbmUu", - "dGFuZ28ucG1yLmRpYWdub3N0aWNzYgZwcm90bzM=")); + "cGFyZTMYwwEgAygBEhEKCEV1U3BhcmU0GMQBIAMoARIWCg1FdUJ0c3I1RGlz", + "cEF2GMUBIAMoARIWCg1FdUJ0c3I2RGlzcEF2GMYBIAMoARIWCg1FdUJ0c3I3", + "RGlzcEF2GMcBIAMoARIWCg1FdUJ0c3I4RGlzcEF2GMgBIAMoARIXCg5FdUJ0", + "c3I1UGVha01heBjJASADKAESFwoORXVCdHNyNlBlYWtNYXgYygEgAygBEhcK", + "DkV1QnRzcjdQZWFrTWF4GMsBIAMoARIXCg5FdUJ0c3I4UGVha01heBjMASAD", + "KAESFwoORXVCdHNyNVBlYWtNaW4YzQEgAygBEhcKDkV1QnRzcjZQZWFrTWlu", + "GM4BIAMoARIXCg5FdUJ0c3I3UGVha01pbhjPASADKAESFwoORXVCdHNyOFBl", + "YWtNaW4Y0AEgAygBEhUKDEV1QnRzcjVTcGVlZBjRASADKAESFQoMRXVCdHNy", + "NlNwZWVkGNIBIAMoARIVCgxFdUJ0c3I3U3BlZWQY0wEgAygBEhUKDEV1QnRz", + "cjhTcGVlZBjUASADKAESFwoORXVCdHNyNVNwZWVkQXYY1QEgAygBEhcKDkV1", + "QnRzcjZTcGVlZEF2GNYBIAMoARIXCg5FdUJ0c3I3U3BlZWRBdhjXASADKAES", + "FwoORXVCdHNyOFNwZWVkQXYY2AEgAygBQiEKH2NvbS50d2luZS50YW5nby5w", + "bXIuZGlhZ25vc3RpY3NiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Tango.PMR.Diagnostics.DoubleArrayReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.DiagnosticsMonitors), global::Tango.PMR.Diagnostics.DiagnosticsMonitors.Parser, new[]{ "Dancer1Angle", "Dancer2Angle", "Dancer3Angle", "FeederMotorFrequency", "DryerMotor", "PollerMotor", "WinderMotor", "ScrewMotor", "ThreadSpeed", "MixerTemperature", "HeadZone1Temperature", "HeadZone2Temperature", "HeadZone3Temperature", "HeadAirFlow", "FeederTension", "PullerTension", "DryerZone1Temperature", "DryerZone2Temperature", "DryerZone3Temperature", "DryerAirFlow", "WinderTension", "DispensersMotorsFrequency", "DispensersAngularEncoders", "DispensersLinearPositions", "DispensersPressure", "FilterDeltaPressure", "ChillerTemperature", "Dispenser1MotorFrequency", "Dispenser2MotorFrequency", "Dispenser3MotorFrequency", "Dispenser4MotorFrequency", "Dispenser5MotorFrequency", "Dispenser6MotorFrequency", "Dispenser7MotorFrequency", "Dispenser8MotorFrequency", "HeadZone4Temperature", "HeadZone5Temperature", "HeadZone6Temperature", "BlowerVoltage", "Dispenser1Pressure", "Dispenser2Pressure", "Dispenser3Pressure", "Dispenser4Pressure", "Dispenser5Pressure", "Dispenser6Pressure", "Dispenser7Pressure", "Dispenser8Pressure", "MidTank1Level", "MidTank2Level", "MidTank3Level", "MidTank4Level", "MidTank5Level", "MidTank6Level", "MidTank7Level", "MidTank8Level", "DrierZone1HeaterCurrent", "DrierZone2HeaterCurrent", "HeadZone1HeaterCurrent", "HeadZone2HeaterCurrent", "HeadZone3HeaterCurrent", "HeadZone4HeaterCurrent", "HeadZone56HeaterCurrent", "Mixer1HeaterCurrent", "DispensersInkLevel", "MidTanksInkLevel", "OverallTemperature", "HeadZone7HeaterCurrent", "HeadZone7Temperature", "HeadZone8HeaterCurrent", "HeadZone8Temperature", "HeadZone9HeaterCurrent", "HeadZone9Temperature", "HeadZone10HeaterCurrent", "HeadZone10Temperature", "HeadZone11HeaterCurrent", "HeadZone11Temperature", "HeadZone12HeaterCurrent", "HeadZone12Temperature", "HeadBlowerVoltage1", "HeadBlowerVoltage2", "HeadCoverHeater1Current", "HeadCoverHeater1Temperature", "HeadCoverHeater2Current", "HeadCoverHeater2Temperature", "WHSBlower2Voltage", "GasSensor", "IncomingVoltage", "WasteLevel", "HeadBlower1AirFlow", "HeadBlower2AirFlow", "ShinkoSetValue", "ShinkoCurrentValue", "TotalWHSFlow", "EuWinder1Dancer", "EuWinder2Dancer", "EuWinder3Dancer", "EuWinder4Dancer", "EuWinder1Motor", "EuWinder2Motor", "EuWinder3Motor", "EuWinder4Motor", "EuDryerMotorVelocity", "EuDryerMotorTargetVelocity", "EuDryerMotorCurrent", "EuPullerDancer", "EuPullerMotor", "EuDryerZone1Temperature", "EuDryerZone2Temperature", "EuDryerZone3Temperature", "EuHeadZone1Temperature", "EuHeadZone2Temperature", "EuHeadZone3Temperature", "EuMixerTemperature", "EuTunnelTemperature", "EuLubricantTemperature", "EuAmbientTemperature", "EuElectricalCabinetTemperature", "EuDryerZone1Current", "EuDryerZone2Current", "EuDryerZone3Current", "EuHeadZone1Current", "EuHeadZone2Current", "EuHeadZone3Current", "EuMixerCurrent", "EuTunnelCurrent", "EuLubricantCurrent", "EuBtsr1Speed", "EuBtsr1SpeedAv", "EuBtsr1DispAv", "EuBtsr1PeakMin", "EuBtsr1PeakMax", "EuBtsr2Speed", "EuBtsr2SpeedAv", "EuBtsr2DispAv", "EuBtsr2PeakMin", "EuBtsr2PeakMax", "EuBtsr3Speed", "EuBtsr3SpeedAv", "EuBtsr3DispAv", "EuBtsr3PeakMin", "EuBtsr3PeakMax", "EuBtsr4Speed", "EuBtsr4SpeedAv", "EuBtsr4PeakMin", "EuBtsr4PeakMax", "EuBtsr4DispAv", "EuTemperatureLoggers", "EuPumpFlows", "EuInkLinesPressure", "EuSpareDataArray", "EuDispenser1Voltage", "EuDispenser2Voltage", "EuDispenser3Voltage", "EuDispenser4Voltage", "EuDispenser5Voltage", "EuDispenser6Voltage", "EuDispenser7Voltage", "EuDispenser8Voltage", "EuDispenser9Voltage", "EuDispenser10Voltage", "EuDispenser11Voltage", "EuDispenser12Voltage", "EuDispenser13Voltage", "EuDispenser14Voltage", "EuDispenser15Voltage", "EuDispenser16Voltage", "EuLubricantPumpVoltage", "EuDispenser1Pressure", "EuDispenser2Pressure", "EuDispenser3Pressure", "EuDispenser4Pressure", "EuDispenser5Pressure", "EuDispenser6Pressure", "EuDispenser7Pressure", "EuDispenser8Pressure", "EuLubricantPressure", "EuMidTank1Level", "EuMidTank2Level", "EuMidTank3Level", "EuMidTank4Level", "EuMidTank5Level", "EuMidTank6Level", "EuMidTank7Level", "EuMidTank8Level", "EuChillerTemperature", "EuHeadRightAirFlow", "EuHeadLeftAirFlow", "EuHeadRightVoltage", "EuHeadLeftVoltage", "EuDryerAirFlow", "EuBlowerVoltage", "EuWasteLevel", "EuSpare1", "EuSpare2", "EuSpare3", "EuSpare4" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Diagnostics.DiagnosticsMonitors), global::Tango.PMR.Diagnostics.DiagnosticsMonitors.Parser, new[]{ "Dancer1Angle", "Dancer2Angle", "Dancer3Angle", "FeederMotorFrequency", "DryerMotor", "PollerMotor", "WinderMotor", "ScrewMotor", "ThreadSpeed", "MixerTemperature", "HeadZone1Temperature", "HeadZone2Temperature", "HeadZone3Temperature", "HeadAirFlow", "FeederTension", "PullerTension", "DryerZone1Temperature", "DryerZone2Temperature", "DryerZone3Temperature", "DryerAirFlow", "WinderTension", "DispensersMotorsFrequency", "DispensersAngularEncoders", "DispensersLinearPositions", "DispensersPressure", "FilterDeltaPressure", "ChillerTemperature", "Dispenser1MotorFrequency", "Dispenser2MotorFrequency", "Dispenser3MotorFrequency", "Dispenser4MotorFrequency", "Dispenser5MotorFrequency", "Dispenser6MotorFrequency", "Dispenser7MotorFrequency", "Dispenser8MotorFrequency", "HeadZone4Temperature", "HeadZone5Temperature", "HeadZone6Temperature", "BlowerVoltage", "Dispenser1Pressure", "Dispenser2Pressure", "Dispenser3Pressure", "Dispenser4Pressure", "Dispenser5Pressure", "Dispenser6Pressure", "Dispenser7Pressure", "Dispenser8Pressure", "MidTank1Level", "MidTank2Level", "MidTank3Level", "MidTank4Level", "MidTank5Level", "MidTank6Level", "MidTank7Level", "MidTank8Level", "DrierZone1HeaterCurrent", "DrierZone2HeaterCurrent", "HeadZone1HeaterCurrent", "HeadZone2HeaterCurrent", "HeadZone3HeaterCurrent", "HeadZone4HeaterCurrent", "HeadZone56HeaterCurrent", "Mixer1HeaterCurrent", "DispensersInkLevel", "MidTanksInkLevel", "OverallTemperature", "HeadZone7HeaterCurrent", "HeadZone7Temperature", "HeadZone8HeaterCurrent", "HeadZone8Temperature", "HeadZone9HeaterCurrent", "HeadZone9Temperature", "HeadZone10HeaterCurrent", "HeadZone10Temperature", "HeadZone11HeaterCurrent", "HeadZone11Temperature", "HeadZone12HeaterCurrent", "HeadZone12Temperature", "HeadBlowerVoltage1", "HeadBlowerVoltage2", "HeadCoverHeater1Current", "HeadCoverHeater1Temperature", "HeadCoverHeater2Current", "HeadCoverHeater2Temperature", "WHSBlower2Voltage", "GasSensor", "IncomingVoltage", "WasteLevel", "HeadBlower1AirFlow", "HeadBlower2AirFlow", "ShinkoSetValue", "ShinkoCurrentValue", "TotalWHSFlow", "EuWinder1Dancer", "EuWinder2Dancer", "EuWinder3Dancer", "EuWinder4Dancer", "EuWinder1Motor", "EuWinder2Motor", "EuWinder3Motor", "EuWinder4Motor", "EuDryerMotorVelocity", "EuDryerMotorTargetVelocity", "EuDryerMotorCurrent", "EuPullerDancer", "EuPullerMotor", "EuDryerZone1Temperature", "EuDryerZone2Temperature", "EuDryerZone3Temperature", "EuHeadZone1Temperature", "EuHeadZone2Temperature", "EuHeadZone3Temperature", "EuMixerTemperature", "EuTunnelTemperature", "EuLubricantTemperature", "EuAmbientTemperature", "EuElectricalCabinetTemperature", "EuDryerZone1Current", "EuDryerZone2Current", "EuDryerZone3Current", "EuHeadZone1Current", "EuHeadZone2Current", "EuHeadZone3Current", "EuMixerCurrent", "EuTunnelCurrent", "EuLubricantCurrent", "EuBtsr1Speed", "EuBtsr1SpeedAv", "EuBtsr1DispAv", "EuBtsr1PeakMin", "EuBtsr1PeakMax", "EuBtsr2Speed", "EuBtsr2SpeedAv", "EuBtsr2DispAv", "EuBtsr2PeakMin", "EuBtsr2PeakMax", "EuBtsr3Speed", "EuBtsr3SpeedAv", "EuBtsr3DispAv", "EuBtsr3PeakMin", "EuBtsr3PeakMax", "EuBtsr4Speed", "EuBtsr4SpeedAv", "EuBtsr4PeakMin", "EuBtsr4PeakMax", "EuBtsr4DispAv", "EuTemperatureLoggers", "EuPumpFlows", "EuInkLinesPressure", "EuSpareDataArray", "EuDispenser1Voltage", "EuDispenser2Voltage", "EuDispenser3Voltage", "EuDispenser4Voltage", "EuDispenser5Voltage", "EuDispenser6Voltage", "EuDispenser7Voltage", "EuDispenser8Voltage", "EuDispenser9Voltage", "EuDispenser10Voltage", "EuDispenser11Voltage", "EuDispenser12Voltage", "EuDispenser13Voltage", "EuDispenser14Voltage", "EuDispenser15Voltage", "EuDispenser16Voltage", "EuLubricantPumpVoltage", "EuDispenser1Pressure", "EuDispenser2Pressure", "EuDispenser3Pressure", "EuDispenser4Pressure", "EuDispenser5Pressure", "EuDispenser6Pressure", "EuDispenser7Pressure", "EuDispenser8Pressure", "EuLubricantPressure", "EuMidTank1Level", "EuMidTank2Level", "EuMidTank3Level", "EuMidTank4Level", "EuMidTank5Level", "EuMidTank6Level", "EuMidTank7Level", "EuMidTank8Level", "EuChillerTemperature", "EuHeadRightAirFlow", "EuHeadLeftAirFlow", "EuHeadRightVoltage", "EuHeadLeftVoltage", "EuDryerAirFlow", "EuBlowerVoltage", "EuWasteLevel", "EuSpare1", "EuSpare2", "EuSpare3", "EuSpare4", "EuBtsr5DispAv", "EuBtsr6DispAv", "EuBtsr7DispAv", "EuBtsr8DispAv", "EuBtsr5PeakMax", "EuBtsr6PeakMax", "EuBtsr7PeakMax", "EuBtsr8PeakMax", "EuBtsr5PeakMin", "EuBtsr6PeakMin", "EuBtsr7PeakMin", "EuBtsr8PeakMin", "EuBtsr5Speed", "EuBtsr6Speed", "EuBtsr7Speed", "EuBtsr8Speed", "EuBtsr5SpeedAv", "EuBtsr6SpeedAv", "EuBtsr7SpeedAv", "EuBtsr8SpeedAv" }, null, null, null) })); } #endregion @@ -385,6 +396,26 @@ namespace Tango.PMR.Diagnostics { euSpare2_ = other.euSpare2_.Clone(); euSpare3_ = other.euSpare3_.Clone(); euSpare4_ = other.euSpare4_.Clone(); + euBtsr5DispAv_ = other.euBtsr5DispAv_.Clone(); + euBtsr6DispAv_ = other.euBtsr6DispAv_.Clone(); + euBtsr7DispAv_ = other.euBtsr7DispAv_.Clone(); + euBtsr8DispAv_ = other.euBtsr8DispAv_.Clone(); + euBtsr5PeakMax_ = other.euBtsr5PeakMax_.Clone(); + euBtsr6PeakMax_ = other.euBtsr6PeakMax_.Clone(); + euBtsr7PeakMax_ = other.euBtsr7PeakMax_.Clone(); + euBtsr8PeakMax_ = other.euBtsr8PeakMax_.Clone(); + euBtsr5PeakMin_ = other.euBtsr5PeakMin_.Clone(); + euBtsr6PeakMin_ = other.euBtsr6PeakMin_.Clone(); + euBtsr7PeakMin_ = other.euBtsr7PeakMin_.Clone(); + euBtsr8PeakMin_ = other.euBtsr8PeakMin_.Clone(); + euBtsr5Speed_ = other.euBtsr5Speed_.Clone(); + euBtsr6Speed_ = other.euBtsr6Speed_.Clone(); + euBtsr7Speed_ = other.euBtsr7Speed_.Clone(); + euBtsr8Speed_ = other.euBtsr8Speed_.Clone(); + euBtsr5SpeedAv_ = other.euBtsr5SpeedAv_.Clone(); + euBtsr6SpeedAv_ = other.euBtsr6SpeedAv_.Clone(); + euBtsr7SpeedAv_ = other.euBtsr7SpeedAv_.Clone(); + euBtsr8SpeedAv_ = other.euBtsr8SpeedAv_.Clone(); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -2940,6 +2971,266 @@ namespace Tango.PMR.Diagnostics { get { return euSpare4_; } } + /// <summary>Field number for the "EuBtsr5DispAv" field.</summary> + public const int EuBtsr5DispAvFieldNumber = 197; + private static readonly pb::FieldCodec<double> _repeated_euBtsr5DispAv_codec + = pb::FieldCodec.ForDouble(1578); + private readonly pbc::RepeatedField<double> euBtsr5DispAv_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka BTSR 5 Tension (Min = 0, Max = 100, PPF = 10) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuBtsr5DispAv { + get { return euBtsr5DispAv_; } + } + + /// <summary>Field number for the "EuBtsr6DispAv" field.</summary> + public const int EuBtsr6DispAvFieldNumber = 198; + private static readonly pb::FieldCodec<double> _repeated_euBtsr6DispAv_codec + = pb::FieldCodec.ForDouble(1586); + private readonly pbc::RepeatedField<double> euBtsr6DispAv_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka BTSR 6 Tension (Min = 0, Max = 100, PPF = 10) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuBtsr6DispAv { + get { return euBtsr6DispAv_; } + } + + /// <summary>Field number for the "EuBtsr7DispAv" field.</summary> + public const int EuBtsr7DispAvFieldNumber = 199; + private static readonly pb::FieldCodec<double> _repeated_euBtsr7DispAv_codec + = pb::FieldCodec.ForDouble(1594); + private readonly pbc::RepeatedField<double> euBtsr7DispAv_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka BTSR 7 Tension (Min = 0, Max = 100, PPF = 10) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuBtsr7DispAv { + get { return euBtsr7DispAv_; } + } + + /// <summary>Field number for the "EuBtsr8DispAv" field.</summary> + public const int EuBtsr8DispAvFieldNumber = 200; + private static readonly pb::FieldCodec<double> _repeated_euBtsr8DispAv_codec + = pb::FieldCodec.ForDouble(1602); + private readonly pbc::RepeatedField<double> euBtsr8DispAv_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka BTSR 8 Tension (Min = 0, Max = 100, PPF = 10) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuBtsr8DispAv { + get { return euBtsr8DispAv_; } + } + + /// <summary>Field number for the "EuBtsr5PeakMax" field.</summary> + public const int EuBtsr5PeakMaxFieldNumber = 201; + private static readonly pb::FieldCodec<double> _repeated_euBtsr5PeakMax_codec + = pb::FieldCodec.ForDouble(1610); + private readonly pbc::RepeatedField<double> euBtsr5PeakMax_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka BTSR 5 Peak Max (Min = 0, Max = 100, PPF = 10) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuBtsr5PeakMax { + get { return euBtsr5PeakMax_; } + } + + /// <summary>Field number for the "EuBtsr6PeakMax" field.</summary> + public const int EuBtsr6PeakMaxFieldNumber = 202; + private static readonly pb::FieldCodec<double> _repeated_euBtsr6PeakMax_codec + = pb::FieldCodec.ForDouble(1618); + private readonly pbc::RepeatedField<double> euBtsr6PeakMax_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka BTSR 6 Peak Max (Min = 0, Max = 100, PPF = 10) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuBtsr6PeakMax { + get { return euBtsr6PeakMax_; } + } + + /// <summary>Field number for the "EuBtsr7PeakMax" field.</summary> + public const int EuBtsr7PeakMaxFieldNumber = 203; + private static readonly pb::FieldCodec<double> _repeated_euBtsr7PeakMax_codec + = pb::FieldCodec.ForDouble(1626); + private readonly pbc::RepeatedField<double> euBtsr7PeakMax_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka BTSR 7 Peak Max (Min = 0, Max = 100, PPF = 10) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuBtsr7PeakMax { + get { return euBtsr7PeakMax_; } + } + + /// <summary>Field number for the "EuBtsr8PeakMax" field.</summary> + public const int EuBtsr8PeakMaxFieldNumber = 204; + private static readonly pb::FieldCodec<double> _repeated_euBtsr8PeakMax_codec + = pb::FieldCodec.ForDouble(1634); + private readonly pbc::RepeatedField<double> euBtsr8PeakMax_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka BTSR 8 Peak Max (Min = 0, Max = 100, PPF = 10) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuBtsr8PeakMax { + get { return euBtsr8PeakMax_; } + } + + /// <summary>Field number for the "EuBtsr5PeakMin" field.</summary> + public const int EuBtsr5PeakMinFieldNumber = 205; + private static readonly pb::FieldCodec<double> _repeated_euBtsr5PeakMin_codec + = pb::FieldCodec.ForDouble(1642); + private readonly pbc::RepeatedField<double> euBtsr5PeakMin_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka BTSR 5 Peak Min (Min = 0, Max = 100, PPF = 10) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuBtsr5PeakMin { + get { return euBtsr5PeakMin_; } + } + + /// <summary>Field number for the "EuBtsr6PeakMin" field.</summary> + public const int EuBtsr6PeakMinFieldNumber = 206; + private static readonly pb::FieldCodec<double> _repeated_euBtsr6PeakMin_codec + = pb::FieldCodec.ForDouble(1650); + private readonly pbc::RepeatedField<double> euBtsr6PeakMin_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka BTSR 6 Peak Min (Min = 0, Max = 100, PPF = 10) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuBtsr6PeakMin { + get { return euBtsr6PeakMin_; } + } + + /// <summary>Field number for the "EuBtsr7PeakMin" field.</summary> + public const int EuBtsr7PeakMinFieldNumber = 207; + private static readonly pb::FieldCodec<double> _repeated_euBtsr7PeakMin_codec + = pb::FieldCodec.ForDouble(1658); + private readonly pbc::RepeatedField<double> euBtsr7PeakMin_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka BTSR 7 Peak Min (Min = 0, Max = 100, PPF = 10) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuBtsr7PeakMin { + get { return euBtsr7PeakMin_; } + } + + /// <summary>Field number for the "EuBtsr8PeakMin" field.</summary> + public const int EuBtsr8PeakMinFieldNumber = 208; + private static readonly pb::FieldCodec<double> _repeated_euBtsr8PeakMin_codec + = pb::FieldCodec.ForDouble(1666); + private readonly pbc::RepeatedField<double> euBtsr8PeakMin_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka BTSR 8 Peak Min (Min = 0, Max = 100, PPF = 10) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuBtsr8PeakMin { + get { return euBtsr8PeakMin_; } + } + + /// <summary>Field number for the "EuBtsr5Speed" field.</summary> + public const int EuBtsr5SpeedFieldNumber = 209; + private static readonly pb::FieldCodec<double> _repeated_euBtsr5Speed_codec + = pb::FieldCodec.ForDouble(1674); + private readonly pbc::RepeatedField<double> euBtsr5Speed_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka BTSR 5 Speed (Min = 0, Max = 100, PPF = 10) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuBtsr5Speed { + get { return euBtsr5Speed_; } + } + + /// <summary>Field number for the "EuBtsr6Speed" field.</summary> + public const int EuBtsr6SpeedFieldNumber = 210; + private static readonly pb::FieldCodec<double> _repeated_euBtsr6Speed_codec + = pb::FieldCodec.ForDouble(1682); + private readonly pbc::RepeatedField<double> euBtsr6Speed_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka BTSR 6 Speed (Min = 0, Max = 100, PPF = 10) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuBtsr6Speed { + get { return euBtsr6Speed_; } + } + + /// <summary>Field number for the "EuBtsr7Speed" field.</summary> + public const int EuBtsr7SpeedFieldNumber = 211; + private static readonly pb::FieldCodec<double> _repeated_euBtsr7Speed_codec + = pb::FieldCodec.ForDouble(1690); + private readonly pbc::RepeatedField<double> euBtsr7Speed_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka BTSR 7 Speed (Min = 0, Max = 100, PPF = 10) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuBtsr7Speed { + get { return euBtsr7Speed_; } + } + + /// <summary>Field number for the "EuBtsr8Speed" field.</summary> + public const int EuBtsr8SpeedFieldNumber = 212; + private static readonly pb::FieldCodec<double> _repeated_euBtsr8Speed_codec + = pb::FieldCodec.ForDouble(1698); + private readonly pbc::RepeatedField<double> euBtsr8Speed_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka BTSR 8 Speed (Min = 0, Max = 100, PPF = 10) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuBtsr8Speed { + get { return euBtsr8Speed_; } + } + + /// <summary>Field number for the "EuBtsr5SpeedAv" field.</summary> + public const int EuBtsr5SpeedAvFieldNumber = 213; + private static readonly pb::FieldCodec<double> _repeated_euBtsr5SpeedAv_codec + = pb::FieldCodec.ForDouble(1706); + private readonly pbc::RepeatedField<double> euBtsr5SpeedAv_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka BTSR 5 Speed Average (Min = 0, Max = 100, PPF = 10) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuBtsr5SpeedAv { + get { return euBtsr5SpeedAv_; } + } + + /// <summary>Field number for the "EuBtsr6SpeedAv" field.</summary> + public const int EuBtsr6SpeedAvFieldNumber = 214; + private static readonly pb::FieldCodec<double> _repeated_euBtsr6SpeedAv_codec + = pb::FieldCodec.ForDouble(1714); + private readonly pbc::RepeatedField<double> euBtsr6SpeedAv_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka BTSR 6 Speed Average (Min = 0, Max = 100, PPF = 10) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuBtsr6SpeedAv { + get { return euBtsr6SpeedAv_; } + } + + /// <summary>Field number for the "EuBtsr7SpeedAv" field.</summary> + public const int EuBtsr7SpeedAvFieldNumber = 215; + private static readonly pb::FieldCodec<double> _repeated_euBtsr7SpeedAv_codec + = pb::FieldCodec.ForDouble(1722); + private readonly pbc::RepeatedField<double> euBtsr7SpeedAv_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka BTSR 7 Speed Average (Min = 0, Max = 100, PPF = 10) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuBtsr7SpeedAv { + get { return euBtsr7SpeedAv_; } + } + + /// <summary>Field number for the "EuBtsr8SpeedAv" field.</summary> + public const int EuBtsr8SpeedAvFieldNumber = 216; + private static readonly pb::FieldCodec<double> _repeated_euBtsr8SpeedAv_codec + = pb::FieldCodec.ForDouble(1730); + private readonly pbc::RepeatedField<double> euBtsr8SpeedAv_ = new pbc::RepeatedField<double>(); + /// <summary> + ///Eureka BTSR 8 Speed Average (Min = 0, Max = 100, PPF = 10) + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public pbc::RepeatedField<double> EuBtsr8SpeedAv { + get { return euBtsr8SpeedAv_; } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as DiagnosticsMonitors); @@ -3149,6 +3440,26 @@ namespace Tango.PMR.Diagnostics { if(!euSpare2_.Equals(other.euSpare2_)) return false; if(!euSpare3_.Equals(other.euSpare3_)) return false; if(!euSpare4_.Equals(other.euSpare4_)) return false; + if(!euBtsr5DispAv_.Equals(other.euBtsr5DispAv_)) return false; + if(!euBtsr6DispAv_.Equals(other.euBtsr6DispAv_)) return false; + if(!euBtsr7DispAv_.Equals(other.euBtsr7DispAv_)) return false; + if(!euBtsr8DispAv_.Equals(other.euBtsr8DispAv_)) return false; + if(!euBtsr5PeakMax_.Equals(other.euBtsr5PeakMax_)) return false; + if(!euBtsr6PeakMax_.Equals(other.euBtsr6PeakMax_)) return false; + if(!euBtsr7PeakMax_.Equals(other.euBtsr7PeakMax_)) return false; + if(!euBtsr8PeakMax_.Equals(other.euBtsr8PeakMax_)) return false; + if(!euBtsr5PeakMin_.Equals(other.euBtsr5PeakMin_)) return false; + if(!euBtsr6PeakMin_.Equals(other.euBtsr6PeakMin_)) return false; + if(!euBtsr7PeakMin_.Equals(other.euBtsr7PeakMin_)) return false; + if(!euBtsr8PeakMin_.Equals(other.euBtsr8PeakMin_)) return false; + if(!euBtsr5Speed_.Equals(other.euBtsr5Speed_)) return false; + if(!euBtsr6Speed_.Equals(other.euBtsr6Speed_)) return false; + if(!euBtsr7Speed_.Equals(other.euBtsr7Speed_)) return false; + if(!euBtsr8Speed_.Equals(other.euBtsr8Speed_)) return false; + if(!euBtsr5SpeedAv_.Equals(other.euBtsr5SpeedAv_)) return false; + if(!euBtsr6SpeedAv_.Equals(other.euBtsr6SpeedAv_)) return false; + if(!euBtsr7SpeedAv_.Equals(other.euBtsr7SpeedAv_)) return false; + if(!euBtsr8SpeedAv_.Equals(other.euBtsr8SpeedAv_)) return false; return true; } @@ -3351,6 +3662,26 @@ namespace Tango.PMR.Diagnostics { hash ^= euSpare2_.GetHashCode(); hash ^= euSpare3_.GetHashCode(); hash ^= euSpare4_.GetHashCode(); + hash ^= euBtsr5DispAv_.GetHashCode(); + hash ^= euBtsr6DispAv_.GetHashCode(); + hash ^= euBtsr7DispAv_.GetHashCode(); + hash ^= euBtsr8DispAv_.GetHashCode(); + hash ^= euBtsr5PeakMax_.GetHashCode(); + hash ^= euBtsr6PeakMax_.GetHashCode(); + hash ^= euBtsr7PeakMax_.GetHashCode(); + hash ^= euBtsr8PeakMax_.GetHashCode(); + hash ^= euBtsr5PeakMin_.GetHashCode(); + hash ^= euBtsr6PeakMin_.GetHashCode(); + hash ^= euBtsr7PeakMin_.GetHashCode(); + hash ^= euBtsr8PeakMin_.GetHashCode(); + hash ^= euBtsr5Speed_.GetHashCode(); + hash ^= euBtsr6Speed_.GetHashCode(); + hash ^= euBtsr7Speed_.GetHashCode(); + hash ^= euBtsr8Speed_.GetHashCode(); + hash ^= euBtsr5SpeedAv_.GetHashCode(); + hash ^= euBtsr6SpeedAv_.GetHashCode(); + hash ^= euBtsr7SpeedAv_.GetHashCode(); + hash ^= euBtsr8SpeedAv_.GetHashCode(); return hash; } @@ -3557,6 +3888,26 @@ namespace Tango.PMR.Diagnostics { euSpare2_.WriteTo(output, _repeated_euSpare2_codec); euSpare3_.WriteTo(output, _repeated_euSpare3_codec); euSpare4_.WriteTo(output, _repeated_euSpare4_codec); + euBtsr5DispAv_.WriteTo(output, _repeated_euBtsr5DispAv_codec); + euBtsr6DispAv_.WriteTo(output, _repeated_euBtsr6DispAv_codec); + euBtsr7DispAv_.WriteTo(output, _repeated_euBtsr7DispAv_codec); + euBtsr8DispAv_.WriteTo(output, _repeated_euBtsr8DispAv_codec); + euBtsr5PeakMax_.WriteTo(output, _repeated_euBtsr5PeakMax_codec); + euBtsr6PeakMax_.WriteTo(output, _repeated_euBtsr6PeakMax_codec); + euBtsr7PeakMax_.WriteTo(output, _repeated_euBtsr7PeakMax_codec); + euBtsr8PeakMax_.WriteTo(output, _repeated_euBtsr8PeakMax_codec); + euBtsr5PeakMin_.WriteTo(output, _repeated_euBtsr5PeakMin_codec); + euBtsr6PeakMin_.WriteTo(output, _repeated_euBtsr6PeakMin_codec); + euBtsr7PeakMin_.WriteTo(output, _repeated_euBtsr7PeakMin_codec); + euBtsr8PeakMin_.WriteTo(output, _repeated_euBtsr8PeakMin_codec); + euBtsr5Speed_.WriteTo(output, _repeated_euBtsr5Speed_codec); + euBtsr6Speed_.WriteTo(output, _repeated_euBtsr6Speed_codec); + euBtsr7Speed_.WriteTo(output, _repeated_euBtsr7Speed_codec); + euBtsr8Speed_.WriteTo(output, _repeated_euBtsr8Speed_codec); + euBtsr5SpeedAv_.WriteTo(output, _repeated_euBtsr5SpeedAv_codec); + euBtsr6SpeedAv_.WriteTo(output, _repeated_euBtsr6SpeedAv_codec); + euBtsr7SpeedAv_.WriteTo(output, _repeated_euBtsr7SpeedAv_codec); + euBtsr8SpeedAv_.WriteTo(output, _repeated_euBtsr8SpeedAv_codec); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -3758,6 +4109,26 @@ namespace Tango.PMR.Diagnostics { size += euSpare2_.CalculateSize(_repeated_euSpare2_codec); size += euSpare3_.CalculateSize(_repeated_euSpare3_codec); size += euSpare4_.CalculateSize(_repeated_euSpare4_codec); + size += euBtsr5DispAv_.CalculateSize(_repeated_euBtsr5DispAv_codec); + size += euBtsr6DispAv_.CalculateSize(_repeated_euBtsr6DispAv_codec); + size += euBtsr7DispAv_.CalculateSize(_repeated_euBtsr7DispAv_codec); + size += euBtsr8DispAv_.CalculateSize(_repeated_euBtsr8DispAv_codec); + size += euBtsr5PeakMax_.CalculateSize(_repeated_euBtsr5PeakMax_codec); + size += euBtsr6PeakMax_.CalculateSize(_repeated_euBtsr6PeakMax_codec); + size += euBtsr7PeakMax_.CalculateSize(_repeated_euBtsr7PeakMax_codec); + size += euBtsr8PeakMax_.CalculateSize(_repeated_euBtsr8PeakMax_codec); + size += euBtsr5PeakMin_.CalculateSize(_repeated_euBtsr5PeakMin_codec); + size += euBtsr6PeakMin_.CalculateSize(_repeated_euBtsr6PeakMin_codec); + size += euBtsr7PeakMin_.CalculateSize(_repeated_euBtsr7PeakMin_codec); + size += euBtsr8PeakMin_.CalculateSize(_repeated_euBtsr8PeakMin_codec); + size += euBtsr5Speed_.CalculateSize(_repeated_euBtsr5Speed_codec); + size += euBtsr6Speed_.CalculateSize(_repeated_euBtsr6Speed_codec); + size += euBtsr7Speed_.CalculateSize(_repeated_euBtsr7Speed_codec); + size += euBtsr8Speed_.CalculateSize(_repeated_euBtsr8Speed_codec); + size += euBtsr5SpeedAv_.CalculateSize(_repeated_euBtsr5SpeedAv_codec); + size += euBtsr6SpeedAv_.CalculateSize(_repeated_euBtsr6SpeedAv_codec); + size += euBtsr7SpeedAv_.CalculateSize(_repeated_euBtsr7SpeedAv_codec); + size += euBtsr8SpeedAv_.CalculateSize(_repeated_euBtsr8SpeedAv_codec); return size; } @@ -3962,6 +4333,26 @@ namespace Tango.PMR.Diagnostics { euSpare2_.Add(other.euSpare2_); euSpare3_.Add(other.euSpare3_); euSpare4_.Add(other.euSpare4_); + euBtsr5DispAv_.Add(other.euBtsr5DispAv_); + euBtsr6DispAv_.Add(other.euBtsr6DispAv_); + euBtsr7DispAv_.Add(other.euBtsr7DispAv_); + euBtsr8DispAv_.Add(other.euBtsr8DispAv_); + euBtsr5PeakMax_.Add(other.euBtsr5PeakMax_); + euBtsr6PeakMax_.Add(other.euBtsr6PeakMax_); + euBtsr7PeakMax_.Add(other.euBtsr7PeakMax_); + euBtsr8PeakMax_.Add(other.euBtsr8PeakMax_); + euBtsr5PeakMin_.Add(other.euBtsr5PeakMin_); + euBtsr6PeakMin_.Add(other.euBtsr6PeakMin_); + euBtsr7PeakMin_.Add(other.euBtsr7PeakMin_); + euBtsr8PeakMin_.Add(other.euBtsr8PeakMin_); + euBtsr5Speed_.Add(other.euBtsr5Speed_); + euBtsr6Speed_.Add(other.euBtsr6Speed_); + euBtsr7Speed_.Add(other.euBtsr7Speed_); + euBtsr8Speed_.Add(other.euBtsr8Speed_); + euBtsr5SpeedAv_.Add(other.euBtsr5SpeedAv_); + euBtsr6SpeedAv_.Add(other.euBtsr6SpeedAv_); + euBtsr7SpeedAv_.Add(other.euBtsr7SpeedAv_); + euBtsr8SpeedAv_.Add(other.euBtsr8SpeedAv_); } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -4942,6 +5333,106 @@ namespace Tango.PMR.Diagnostics { euSpare4_.AddEntriesFrom(input, _repeated_euSpare4_codec); break; } + case 1578: + case 1577: { + euBtsr5DispAv_.AddEntriesFrom(input, _repeated_euBtsr5DispAv_codec); + break; + } + case 1586: + case 1585: { + euBtsr6DispAv_.AddEntriesFrom(input, _repeated_euBtsr6DispAv_codec); + break; + } + case 1594: + case 1593: { + euBtsr7DispAv_.AddEntriesFrom(input, _repeated_euBtsr7DispAv_codec); + break; + } + case 1602: + case 1601: { + euBtsr8DispAv_.AddEntriesFrom(input, _repeated_euBtsr8DispAv_codec); + break; + } + case 1610: + case 1609: { + euBtsr5PeakMax_.AddEntriesFrom(input, _repeated_euBtsr5PeakMax_codec); + break; + } + case 1618: + case 1617: { + euBtsr6PeakMax_.AddEntriesFrom(input, _repeated_euBtsr6PeakMax_codec); + break; + } + case 1626: + case 1625: { + euBtsr7PeakMax_.AddEntriesFrom(input, _repeated_euBtsr7PeakMax_codec); + break; + } + case 1634: + case 1633: { + euBtsr8PeakMax_.AddEntriesFrom(input, _repeated_euBtsr8PeakMax_codec); + break; + } + case 1642: + case 1641: { + euBtsr5PeakMin_.AddEntriesFrom(input, _repeated_euBtsr5PeakMin_codec); + break; + } + case 1650: + case 1649: { + euBtsr6PeakMin_.AddEntriesFrom(input, _repeated_euBtsr6PeakMin_codec); + break; + } + case 1658: + case 1657: { + euBtsr7PeakMin_.AddEntriesFrom(input, _repeated_euBtsr7PeakMin_codec); + break; + } + case 1666: + case 1665: { + euBtsr8PeakMin_.AddEntriesFrom(input, _repeated_euBtsr8PeakMin_codec); + break; + } + case 1674: + case 1673: { + euBtsr5Speed_.AddEntriesFrom(input, _repeated_euBtsr5Speed_codec); + break; + } + case 1682: + case 1681: { + euBtsr6Speed_.AddEntriesFrom(input, _repeated_euBtsr6Speed_codec); + break; + } + case 1690: + case 1689: { + euBtsr7Speed_.AddEntriesFrom(input, _repeated_euBtsr7Speed_codec); + break; + } + case 1698: + case 1697: { + euBtsr8Speed_.AddEntriesFrom(input, _repeated_euBtsr8Speed_codec); + break; + } + case 1706: + case 1705: { + euBtsr5SpeedAv_.AddEntriesFrom(input, _repeated_euBtsr5SpeedAv_codec); + break; + } + case 1714: + case 1713: { + euBtsr6SpeedAv_.AddEntriesFrom(input, _repeated_euBtsr6SpeedAv_codec); + break; + } + case 1722: + case 1721: { + euBtsr7SpeedAv_.AddEntriesFrom(input, _repeated_euBtsr7SpeedAv_codec); + break; + } + case 1730: + case 1729: { + euBtsr8SpeedAv_.AddEntriesFrom(input, _repeated_euBtsr8SpeedAv_codec); + break; + } } } } diff --git a/Software/Visual_Studio/Tango.PMR/Insights/InsightsMonitors.cs b/Software/Visual_Studio/Tango.PMR/Insights/InsightsMonitors.cs index 24a8239af..1be58b308 100644 --- a/Software/Visual_Studio/Tango.PMR/Insights/InsightsMonitors.cs +++ b/Software/Visual_Studio/Tango.PMR/Insights/InsightsMonitors.cs @@ -23,7 +23,7 @@ namespace Tango.PMR.Insights { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChZJbnNpZ2h0c01vbml0b3JzLnByb3RvEhJUYW5nby5QTVIuSW5zaWdodHMi", - "8yoKEEluc2lnaHRzTW9uaXRvcnMSFAoMRGFuY2VyMUFuZ2xlGAEgASgBEhQK", + "2y4KEEluc2lnaHRzTW9uaXRvcnMSFAoMRGFuY2VyMUFuZ2xlGAEgASgBEhQK", "DERhbmNlcjJBbmdsZRgCIAEoARIUCgxEYW5jZXIzQW5nbGUYAyABKAESHAoU", "RmVlZGVyTW90b3JGcmVxdWVuY3kYBCABKAESEgoKRHJ5ZXJNb3RvchgFIAEo", "ARITCgtQb2xsZXJNb3RvchgGIAEoARITCgtXaW5kZXJNb3RvchgHIAEoARIS", @@ -145,11 +145,22 @@ namespace Tango.PMR.Insights { "aXJGbG93GL4BIAEoARIYCg9FdUJsb3dlclZvbHRhZ2UYvwEgASgBEhUKDEV1", "V2FzdGVMZXZlbBjAASABKAESEQoIRXVTcGFyZTEYwQEgASgBEhEKCEV1U3Bh", "cmUyGMIBIAEoARIRCghFdVNwYXJlMxjDASABKAESEQoIRXVTcGFyZTQYxAEg", - "ASgBQh4KHGNvbS50d2luZS50YW5nby5wbXIuaW5zaWdodHNiBnByb3RvMw==")); + "ASgBEhYKDUV1QnRzcjVEaXNwQXYYxQEgASgBEhYKDUV1QnRzcjZEaXNwQXYY", + "xgEgASgBEhYKDUV1QnRzcjdEaXNwQXYYxwEgASgBEhYKDUV1QnRzcjhEaXNw", + "QXYYyAEgASgBEhcKDkV1QnRzcjVQZWFrTWF4GMkBIAEoARIXCg5FdUJ0c3I2", + "UGVha01heBjKASABKAESFwoORXVCdHNyN1BlYWtNYXgYywEgASgBEhcKDkV1", + "QnRzcjhQZWFrTWF4GMwBIAEoARIXCg5FdUJ0c3I1UGVha01pbhjNASABKAES", + "FwoORXVCdHNyNlBlYWtNaW4YzgEgASgBEhcKDkV1QnRzcjdQZWFrTWluGM8B", + "IAEoARIXCg5FdUJ0c3I4UGVha01pbhjQASABKAESFQoMRXVCdHNyNVNwZWVk", + "GNEBIAEoARIVCgxFdUJ0c3I2U3BlZWQY0gEgASgBEhUKDEV1QnRzcjdTcGVl", + "ZBjTASABKAESFQoMRXVCdHNyOFNwZWVkGNQBIAEoARIXCg5FdUJ0c3I1U3Bl", + "ZWRBdhjVASABKAESFwoORXVCdHNyNlNwZWVkQXYY1gEgASgBEhcKDkV1QnRz", + "cjdTcGVlZEF2GNcBIAEoARIXCg5FdUJ0c3I4U3BlZWRBdhjYASABKAFCHgoc", + "Y29tLnR3aW5lLnRhbmdvLnBtci5pbnNpZ2h0c2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Insights.InsightsMonitors), global::Tango.PMR.Insights.InsightsMonitors.Parser, new[]{ "Dancer1Angle", "Dancer2Angle", "Dancer3Angle", "FeederMotorFrequency", "DryerMotor", "PollerMotor", "WinderMotor", "ScrewMotor", "ThreadSpeed", "MixerTemperature", "HeadZone1Temperature", "HeadZone2Temperature", "HeadZone3Temperature", "HeadAirFlow", "FeederTension", "PullerTension", "DryerZone1Temperature", "DryerZone2Temperature", "DryerZone3Temperature", "DryerAirFlow", "WinderTension", "DispensersMotorsFrequency", "DispensersAngularEncoders", "DispensersLinearPositions", "DispensersPressure", "FilterDeltaPressure", "ChillerTemperature", "Dispenser1MotorFrequency", "Dispenser2MotorFrequency", "Dispenser3MotorFrequency", "Dispenser4MotorFrequency", "Dispenser5MotorFrequency", "Dispenser6MotorFrequency", "Dispenser7MotorFrequency", "Dispenser8MotorFrequency", "HeadZone4Temperature", "HeadZone5Temperature", "HeadZone6Temperature", "BlowerVoltage", "Dispenser1Pressure", "Dispenser2Pressure", "Dispenser3Pressure", "Dispenser4Pressure", "Dispenser5Pressure", "Dispenser6Pressure", "Dispenser7Pressure", "Dispenser8Pressure", "MidTank1Level", "MidTank2Level", "MidTank3Level", "MidTank4Level", "MidTank5Level", "MidTank6Level", "MidTank7Level", "MidTank8Level", "DrierZone1HeaterCurrent", "DrierZone2HeaterCurrent", "HeadZone1HeaterCurrent", "HeadZone2HeaterCurrent", "HeadZone3HeaterCurrent", "HeadZone4HeaterCurrent", "HeadZone56HeaterCurrent", "Mixer1HeaterCurrent", "DispensersInkLevel", "MidTanksInkLevel", "OverallTemperature", "HeadZone7HeaterCurrent", "HeadZone7Temperature", "HeadZone8HeaterCurrent", "HeadZone8Temperature", "HeadZone9HeaterCurrent", "HeadZone9Temperature", "HeadZone10HeaterCurrent", "HeadZone10Temperature", "HeadZone11HeaterCurrent", "HeadZone11Temperature", "HeadZone12HeaterCurrent", "HeadZone12Temperature", "HeadBlowerVoltage1", "HeadBlowerVoltage2", "HeadCoverHeater1Current", "HeadCoverHeater1Temperature", "HeadCoverHeater2Current", "HeadCoverHeater2Temperature", "WHSBlower2Voltage", "GasSensor", "IncomingVoltage", "WasteLevel", "HeadBlower1AirFlow", "HeadBlower2AirFlow", "ShinkoSetValue", "ShinkoCurrentValue", "TotalWHSFlow", "EuWinder1Dancer", "EuWinder2Dancer", "EuWinder3Dancer", "EuWinder4Dancer", "EuWinder1Motor", "EuWinder2Motor", "EuWinder3Motor", "EuWinder4Motor", "EuDryerMotorVelocity", "EuDryerMotorTargetVelocity", "EuDryerMotorCurrent", "EuPullerDancer", "EuPullerMotor", "EuDryerZone1Temperature", "EuDryerZone2Temperature", "EuDryerZone3Temperature", "EuHeadZone1Temperature", "EuHeadZone2Temperature", "EuHeadZone3Temperature", "EuMixerTemperature", "EuTunnelTemperature", "EuLubricantTemperature", "EuAmbientTemperature", "EuElectricalCabinetTemperature", "EuDryerZone1Current", "EuDryerZone2Current", "EuDryerZone3Current", "EuHeadZone1Current", "EuHeadZone2Current", "EuHeadZone3Current", "EuMixerCurrent", "EuTunnelCurrent", "EuLubricantCurrent", "EuBtsr1Speed", "EuBtsr1SpeedAv", "EuBtsr1DispAv", "EuBtsr1PeakMin", "EuBtsr1PeakMax", "EuBtsr2Speed", "EuBtsr2SpeedAv", "EuBtsr2DispAv", "EuBtsr2PeakMin", "EuBtsr2PeakMax", "EuBtsr3Speed", "EuBtsr3SpeedAv", "EuBtsr3DispAv", "EuBtsr3PeakMin", "EuBtsr3PeakMax", "EuBtsr4Speed", "EuBtsr4SpeedAv", "EuBtsr4PeakMin", "EuBtsr4PeakMax", "EuBtsr4DispAv", "EuTemperatureLoggers", "EuPumpFlows", "EuInkLinesPressure", "EuSpareDataArray", "EuDispenser1Voltage", "EuDispenser2Voltage", "EuDispenser3Voltage", "EuDispenser4Voltage", "EuDispenser5Voltage", "EuDispenser6Voltage", "EuDispenser7Voltage", "EuDispenser8Voltage", "EuDispenser9Voltage", "EuDispenser10Voltage", "EuDispenser11Voltage", "EuDispenser12Voltage", "EuDispenser13Voltage", "EuDispenser14Voltage", "EuDispenser15Voltage", "EuDispenser16Voltage", "EuLubricantPumpVoltage", "EuDispenser1Pressure", "EuDispenser2Pressure", "EuDispenser3Pressure", "EuDispenser4Pressure", "EuDispenser5Pressure", "EuDispenser6Pressure", "EuDispenser7Pressure", "EuDispenser8Pressure", "EuLubricantPressure", "EuMidTank1Level", "EuMidTank2Level", "EuMidTank3Level", "EuMidTank4Level", "EuMidTank5Level", "EuMidTank6Level", "EuMidTank7Level", "EuMidTank8Level", "EuChillerTemperature", "EuHeadRightAirFlow", "EuHeadLeftAirFlow", "EuHeadRightVoltage", "EuHeadLeftVoltage", "EuDryerAirFlow", "EuBlowerVoltage", "EuWasteLevel", "EuSpare1", "EuSpare2", "EuSpare3", "EuSpare4" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Insights.InsightsMonitors), global::Tango.PMR.Insights.InsightsMonitors.Parser, new[]{ "Dancer1Angle", "Dancer2Angle", "Dancer3Angle", "FeederMotorFrequency", "DryerMotor", "PollerMotor", "WinderMotor", "ScrewMotor", "ThreadSpeed", "MixerTemperature", "HeadZone1Temperature", "HeadZone2Temperature", "HeadZone3Temperature", "HeadAirFlow", "FeederTension", "PullerTension", "DryerZone1Temperature", "DryerZone2Temperature", "DryerZone3Temperature", "DryerAirFlow", "WinderTension", "DispensersMotorsFrequency", "DispensersAngularEncoders", "DispensersLinearPositions", "DispensersPressure", "FilterDeltaPressure", "ChillerTemperature", "Dispenser1MotorFrequency", "Dispenser2MotorFrequency", "Dispenser3MotorFrequency", "Dispenser4MotorFrequency", "Dispenser5MotorFrequency", "Dispenser6MotorFrequency", "Dispenser7MotorFrequency", "Dispenser8MotorFrequency", "HeadZone4Temperature", "HeadZone5Temperature", "HeadZone6Temperature", "BlowerVoltage", "Dispenser1Pressure", "Dispenser2Pressure", "Dispenser3Pressure", "Dispenser4Pressure", "Dispenser5Pressure", "Dispenser6Pressure", "Dispenser7Pressure", "Dispenser8Pressure", "MidTank1Level", "MidTank2Level", "MidTank3Level", "MidTank4Level", "MidTank5Level", "MidTank6Level", "MidTank7Level", "MidTank8Level", "DrierZone1HeaterCurrent", "DrierZone2HeaterCurrent", "HeadZone1HeaterCurrent", "HeadZone2HeaterCurrent", "HeadZone3HeaterCurrent", "HeadZone4HeaterCurrent", "HeadZone56HeaterCurrent", "Mixer1HeaterCurrent", "DispensersInkLevel", "MidTanksInkLevel", "OverallTemperature", "HeadZone7HeaterCurrent", "HeadZone7Temperature", "HeadZone8HeaterCurrent", "HeadZone8Temperature", "HeadZone9HeaterCurrent", "HeadZone9Temperature", "HeadZone10HeaterCurrent", "HeadZone10Temperature", "HeadZone11HeaterCurrent", "HeadZone11Temperature", "HeadZone12HeaterCurrent", "HeadZone12Temperature", "HeadBlowerVoltage1", "HeadBlowerVoltage2", "HeadCoverHeater1Current", "HeadCoverHeater1Temperature", "HeadCoverHeater2Current", "HeadCoverHeater2Temperature", "WHSBlower2Voltage", "GasSensor", "IncomingVoltage", "WasteLevel", "HeadBlower1AirFlow", "HeadBlower2AirFlow", "ShinkoSetValue", "ShinkoCurrentValue", "TotalWHSFlow", "EuWinder1Dancer", "EuWinder2Dancer", "EuWinder3Dancer", "EuWinder4Dancer", "EuWinder1Motor", "EuWinder2Motor", "EuWinder3Motor", "EuWinder4Motor", "EuDryerMotorVelocity", "EuDryerMotorTargetVelocity", "EuDryerMotorCurrent", "EuPullerDancer", "EuPullerMotor", "EuDryerZone1Temperature", "EuDryerZone2Temperature", "EuDryerZone3Temperature", "EuHeadZone1Temperature", "EuHeadZone2Temperature", "EuHeadZone3Temperature", "EuMixerTemperature", "EuTunnelTemperature", "EuLubricantTemperature", "EuAmbientTemperature", "EuElectricalCabinetTemperature", "EuDryerZone1Current", "EuDryerZone2Current", "EuDryerZone3Current", "EuHeadZone1Current", "EuHeadZone2Current", "EuHeadZone3Current", "EuMixerCurrent", "EuTunnelCurrent", "EuLubricantCurrent", "EuBtsr1Speed", "EuBtsr1SpeedAv", "EuBtsr1DispAv", "EuBtsr1PeakMin", "EuBtsr1PeakMax", "EuBtsr2Speed", "EuBtsr2SpeedAv", "EuBtsr2DispAv", "EuBtsr2PeakMin", "EuBtsr2PeakMax", "EuBtsr3Speed", "EuBtsr3SpeedAv", "EuBtsr3DispAv", "EuBtsr3PeakMin", "EuBtsr3PeakMax", "EuBtsr4Speed", "EuBtsr4SpeedAv", "EuBtsr4PeakMin", "EuBtsr4PeakMax", "EuBtsr4DispAv", "EuTemperatureLoggers", "EuPumpFlows", "EuInkLinesPressure", "EuSpareDataArray", "EuDispenser1Voltage", "EuDispenser2Voltage", "EuDispenser3Voltage", "EuDispenser4Voltage", "EuDispenser5Voltage", "EuDispenser6Voltage", "EuDispenser7Voltage", "EuDispenser8Voltage", "EuDispenser9Voltage", "EuDispenser10Voltage", "EuDispenser11Voltage", "EuDispenser12Voltage", "EuDispenser13Voltage", "EuDispenser14Voltage", "EuDispenser15Voltage", "EuDispenser16Voltage", "EuLubricantPumpVoltage", "EuDispenser1Pressure", "EuDispenser2Pressure", "EuDispenser3Pressure", "EuDispenser4Pressure", "EuDispenser5Pressure", "EuDispenser6Pressure", "EuDispenser7Pressure", "EuDispenser8Pressure", "EuLubricantPressure", "EuMidTank1Level", "EuMidTank2Level", "EuMidTank3Level", "EuMidTank4Level", "EuMidTank5Level", "EuMidTank6Level", "EuMidTank7Level", "EuMidTank8Level", "EuChillerTemperature", "EuHeadRightAirFlow", "EuHeadLeftAirFlow", "EuHeadRightVoltage", "EuHeadLeftVoltage", "EuDryerAirFlow", "EuBlowerVoltage", "EuWasteLevel", "EuSpare1", "EuSpare2", "EuSpare3", "EuSpare4", "EuBtsr5DispAv", "EuBtsr6DispAv", "EuBtsr7DispAv", "EuBtsr8DispAv", "EuBtsr5PeakMax", "EuBtsr6PeakMax", "EuBtsr7PeakMax", "EuBtsr8PeakMax", "EuBtsr5PeakMin", "EuBtsr6PeakMin", "EuBtsr7PeakMin", "EuBtsr8PeakMin", "EuBtsr5Speed", "EuBtsr6Speed", "EuBtsr7Speed", "EuBtsr8Speed", "EuBtsr5SpeedAv", "EuBtsr6SpeedAv", "EuBtsr7SpeedAv", "EuBtsr8SpeedAv" }, null, null, null) })); } #endregion @@ -376,6 +387,26 @@ namespace Tango.PMR.Insights { euSpare2_ = other.euSpare2_; euSpare3_ = other.euSpare3_; euSpare4_ = other.euSpare4_; + euBtsr5DispAv_ = other.euBtsr5DispAv_; + euBtsr6DispAv_ = other.euBtsr6DispAv_; + euBtsr7DispAv_ = other.euBtsr7DispAv_; + euBtsr8DispAv_ = other.euBtsr8DispAv_; + euBtsr5PeakMax_ = other.euBtsr5PeakMax_; + euBtsr6PeakMax_ = other.euBtsr6PeakMax_; + euBtsr7PeakMax_ = other.euBtsr7PeakMax_; + euBtsr8PeakMax_ = other.euBtsr8PeakMax_; + euBtsr5PeakMin_ = other.euBtsr5PeakMin_; + euBtsr6PeakMin_ = other.euBtsr6PeakMin_; + euBtsr7PeakMin_ = other.euBtsr7PeakMin_; + euBtsr8PeakMin_ = other.euBtsr8PeakMin_; + euBtsr5Speed_ = other.euBtsr5Speed_; + euBtsr6Speed_ = other.euBtsr6Speed_; + euBtsr7Speed_ = other.euBtsr7Speed_; + euBtsr8Speed_ = other.euBtsr8Speed_; + euBtsr5SpeedAv_ = other.euBtsr5SpeedAv_; + euBtsr6SpeedAv_ = other.euBtsr6SpeedAv_; + euBtsr7SpeedAv_ = other.euBtsr7SpeedAv_; + euBtsr8SpeedAv_ = other.euBtsr8SpeedAv_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -3117,6 +3148,286 @@ namespace Tango.PMR.Insights { } } + /// <summary>Field number for the "EuBtsr5DispAv" field.</summary> + public const int EuBtsr5DispAvFieldNumber = 197; + private double euBtsr5DispAv_; + /// <summary> + ///Eureka BTSR 5 Tension + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuBtsr5DispAv { + get { return euBtsr5DispAv_; } + set { + euBtsr5DispAv_ = value; + } + } + + /// <summary>Field number for the "EuBtsr6DispAv" field.</summary> + public const int EuBtsr6DispAvFieldNumber = 198; + private double euBtsr6DispAv_; + /// <summary> + ///Eureka BTSR 6 Tension + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuBtsr6DispAv { + get { return euBtsr6DispAv_; } + set { + euBtsr6DispAv_ = value; + } + } + + /// <summary>Field number for the "EuBtsr7DispAv" field.</summary> + public const int EuBtsr7DispAvFieldNumber = 199; + private double euBtsr7DispAv_; + /// <summary> + ///Eureka BTSR 7 Tension + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuBtsr7DispAv { + get { return euBtsr7DispAv_; } + set { + euBtsr7DispAv_ = value; + } + } + + /// <summary>Field number for the "EuBtsr8DispAv" field.</summary> + public const int EuBtsr8DispAvFieldNumber = 200; + private double euBtsr8DispAv_; + /// <summary> + ///Eureka BTSR 8 Tension + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuBtsr8DispAv { + get { return euBtsr8DispAv_; } + set { + euBtsr8DispAv_ = value; + } + } + + /// <summary>Field number for the "EuBtsr5PeakMax" field.</summary> + public const int EuBtsr5PeakMaxFieldNumber = 201; + private double euBtsr5PeakMax_; + /// <summary> + ///Eureka BTSR 5 Peak Max + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuBtsr5PeakMax { + get { return euBtsr5PeakMax_; } + set { + euBtsr5PeakMax_ = value; + } + } + + /// <summary>Field number for the "EuBtsr6PeakMax" field.</summary> + public const int EuBtsr6PeakMaxFieldNumber = 202; + private double euBtsr6PeakMax_; + /// <summary> + ///Eureka BTSR 6 Peak Max + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuBtsr6PeakMax { + get { return euBtsr6PeakMax_; } + set { + euBtsr6PeakMax_ = value; + } + } + + /// <summary>Field number for the "EuBtsr7PeakMax" field.</summary> + public const int EuBtsr7PeakMaxFieldNumber = 203; + private double euBtsr7PeakMax_; + /// <summary> + ///Eureka BTSR 7 Peak Max + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuBtsr7PeakMax { + get { return euBtsr7PeakMax_; } + set { + euBtsr7PeakMax_ = value; + } + } + + /// <summary>Field number for the "EuBtsr8PeakMax" field.</summary> + public const int EuBtsr8PeakMaxFieldNumber = 204; + private double euBtsr8PeakMax_; + /// <summary> + ///Eureka BTSR 8 Peak Max + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuBtsr8PeakMax { + get { return euBtsr8PeakMax_; } + set { + euBtsr8PeakMax_ = value; + } + } + + /// <summary>Field number for the "EuBtsr5PeakMin" field.</summary> + public const int EuBtsr5PeakMinFieldNumber = 205; + private double euBtsr5PeakMin_; + /// <summary> + ///Eureka BTSR 5 Peak Min + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuBtsr5PeakMin { + get { return euBtsr5PeakMin_; } + set { + euBtsr5PeakMin_ = value; + } + } + + /// <summary>Field number for the "EuBtsr6PeakMin" field.</summary> + public const int EuBtsr6PeakMinFieldNumber = 206; + private double euBtsr6PeakMin_; + /// <summary> + ///Eureka BTSR 6 Peak Min + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuBtsr6PeakMin { + get { return euBtsr6PeakMin_; } + set { + euBtsr6PeakMin_ = value; + } + } + + /// <summary>Field number for the "EuBtsr7PeakMin" field.</summary> + public const int EuBtsr7PeakMinFieldNumber = 207; + private double euBtsr7PeakMin_; + /// <summary> + ///Eureka BTSR 7 Peak Min + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuBtsr7PeakMin { + get { return euBtsr7PeakMin_; } + set { + euBtsr7PeakMin_ = value; + } + } + + /// <summary>Field number for the "EuBtsr8PeakMin" field.</summary> + public const int EuBtsr8PeakMinFieldNumber = 208; + private double euBtsr8PeakMin_; + /// <summary> + ///Eureka BTSR 8 Peak Min + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuBtsr8PeakMin { + get { return euBtsr8PeakMin_; } + set { + euBtsr8PeakMin_ = value; + } + } + + /// <summary>Field number for the "EuBtsr5Speed" field.</summary> + public const int EuBtsr5SpeedFieldNumber = 209; + private double euBtsr5Speed_; + /// <summary> + ///Eureka BTSR 5 Speed + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuBtsr5Speed { + get { return euBtsr5Speed_; } + set { + euBtsr5Speed_ = value; + } + } + + /// <summary>Field number for the "EuBtsr6Speed" field.</summary> + public const int EuBtsr6SpeedFieldNumber = 210; + private double euBtsr6Speed_; + /// <summary> + ///Eureka BTSR 6 Speed + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuBtsr6Speed { + get { return euBtsr6Speed_; } + set { + euBtsr6Speed_ = value; + } + } + + /// <summary>Field number for the "EuBtsr7Speed" field.</summary> + public const int EuBtsr7SpeedFieldNumber = 211; + private double euBtsr7Speed_; + /// <summary> + ///Eureka BTSR 7 Speed + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuBtsr7Speed { + get { return euBtsr7Speed_; } + set { + euBtsr7Speed_ = value; + } + } + + /// <summary>Field number for the "EuBtsr8Speed" field.</summary> + public const int EuBtsr8SpeedFieldNumber = 212; + private double euBtsr8Speed_; + /// <summary> + ///Eureka BTSR 8 Speed + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuBtsr8Speed { + get { return euBtsr8Speed_; } + set { + euBtsr8Speed_ = value; + } + } + + /// <summary>Field number for the "EuBtsr5SpeedAv" field.</summary> + public const int EuBtsr5SpeedAvFieldNumber = 213; + private double euBtsr5SpeedAv_; + /// <summary> + ///Eureka BTSR 5 Speed Average + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuBtsr5SpeedAv { + get { return euBtsr5SpeedAv_; } + set { + euBtsr5SpeedAv_ = value; + } + } + + /// <summary>Field number for the "EuBtsr6SpeedAv" field.</summary> + public const int EuBtsr6SpeedAvFieldNumber = 214; + private double euBtsr6SpeedAv_; + /// <summary> + ///Eureka BTSR 6 Speed Average + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuBtsr6SpeedAv { + get { return euBtsr6SpeedAv_; } + set { + euBtsr6SpeedAv_ = value; + } + } + + /// <summary>Field number for the "EuBtsr7SpeedAv" field.</summary> + public const int EuBtsr7SpeedAvFieldNumber = 215; + private double euBtsr7SpeedAv_; + /// <summary> + ///Eureka BTSR 7 Speed Average + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuBtsr7SpeedAv { + get { return euBtsr7SpeedAv_; } + set { + euBtsr7SpeedAv_ = value; + } + } + + /// <summary>Field number for the "EuBtsr8SpeedAv" field.</summary> + public const int EuBtsr8SpeedAvFieldNumber = 216; + private double euBtsr8SpeedAv_; + /// <summary> + ///Eureka BTSR 8 Speed Average + /// </summary> + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EuBtsr8SpeedAv { + get { return euBtsr8SpeedAv_; } + set { + euBtsr8SpeedAv_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as InsightsMonitors); @@ -3326,6 +3637,26 @@ namespace Tango.PMR.Insights { if (EuSpare2 != other.EuSpare2) return false; if (EuSpare3 != other.EuSpare3) return false; if (EuSpare4 != other.EuSpare4) return false; + if (EuBtsr5DispAv != other.EuBtsr5DispAv) return false; + if (EuBtsr6DispAv != other.EuBtsr6DispAv) return false; + if (EuBtsr7DispAv != other.EuBtsr7DispAv) return false; + if (EuBtsr8DispAv != other.EuBtsr8DispAv) return false; + if (EuBtsr5PeakMax != other.EuBtsr5PeakMax) return false; + if (EuBtsr6PeakMax != other.EuBtsr6PeakMax) return false; + if (EuBtsr7PeakMax != other.EuBtsr7PeakMax) return false; + if (EuBtsr8PeakMax != other.EuBtsr8PeakMax) return false; + if (EuBtsr5PeakMin != other.EuBtsr5PeakMin) return false; + if (EuBtsr6PeakMin != other.EuBtsr6PeakMin) return false; + if (EuBtsr7PeakMin != other.EuBtsr7PeakMin) return false; + if (EuBtsr8PeakMin != other.EuBtsr8PeakMin) return false; + if (EuBtsr5Speed != other.EuBtsr5Speed) return false; + if (EuBtsr6Speed != other.EuBtsr6Speed) return false; + if (EuBtsr7Speed != other.EuBtsr7Speed) return false; + if (EuBtsr8Speed != other.EuBtsr8Speed) return false; + if (EuBtsr5SpeedAv != other.EuBtsr5SpeedAv) return false; + if (EuBtsr6SpeedAv != other.EuBtsr6SpeedAv) return false; + if (EuBtsr7SpeedAv != other.EuBtsr7SpeedAv) return false; + if (EuBtsr8SpeedAv != other.EuBtsr8SpeedAv) return false; return true; } @@ -3528,6 +3859,26 @@ namespace Tango.PMR.Insights { if (EuSpare2 != 0D) hash ^= EuSpare2.GetHashCode(); if (EuSpare3 != 0D) hash ^= EuSpare3.GetHashCode(); if (EuSpare4 != 0D) hash ^= EuSpare4.GetHashCode(); + if (EuBtsr5DispAv != 0D) hash ^= EuBtsr5DispAv.GetHashCode(); + if (EuBtsr6DispAv != 0D) hash ^= EuBtsr6DispAv.GetHashCode(); + if (EuBtsr7DispAv != 0D) hash ^= EuBtsr7DispAv.GetHashCode(); + if (EuBtsr8DispAv != 0D) hash ^= EuBtsr8DispAv.GetHashCode(); + if (EuBtsr5PeakMax != 0D) hash ^= EuBtsr5PeakMax.GetHashCode(); + if (EuBtsr6PeakMax != 0D) hash ^= EuBtsr6PeakMax.GetHashCode(); + if (EuBtsr7PeakMax != 0D) hash ^= EuBtsr7PeakMax.GetHashCode(); + if (EuBtsr8PeakMax != 0D) hash ^= EuBtsr8PeakMax.GetHashCode(); + if (EuBtsr5PeakMin != 0D) hash ^= EuBtsr5PeakMin.GetHashCode(); + if (EuBtsr6PeakMin != 0D) hash ^= EuBtsr6PeakMin.GetHashCode(); + if (EuBtsr7PeakMin != 0D) hash ^= EuBtsr7PeakMin.GetHashCode(); + if (EuBtsr8PeakMin != 0D) hash ^= EuBtsr8PeakMin.GetHashCode(); + if (EuBtsr5Speed != 0D) hash ^= EuBtsr5Speed.GetHashCode(); + if (EuBtsr6Speed != 0D) hash ^= EuBtsr6Speed.GetHashCode(); + if (EuBtsr7Speed != 0D) hash ^= EuBtsr7Speed.GetHashCode(); + if (EuBtsr8Speed != 0D) hash ^= EuBtsr8Speed.GetHashCode(); + if (EuBtsr5SpeedAv != 0D) hash ^= EuBtsr5SpeedAv.GetHashCode(); + if (EuBtsr6SpeedAv != 0D) hash ^= EuBtsr6SpeedAv.GetHashCode(); + if (EuBtsr7SpeedAv != 0D) hash ^= EuBtsr7SpeedAv.GetHashCode(); + if (EuBtsr8SpeedAv != 0D) hash ^= EuBtsr8SpeedAv.GetHashCode(); return hash; } @@ -4292,6 +4643,86 @@ namespace Tango.PMR.Insights { output.WriteRawTag(161, 12); output.WriteDouble(EuSpare4); } + if (EuBtsr5DispAv != 0D) { + output.WriteRawTag(169, 12); + output.WriteDouble(EuBtsr5DispAv); + } + if (EuBtsr6DispAv != 0D) { + output.WriteRawTag(177, 12); + output.WriteDouble(EuBtsr6DispAv); + } + if (EuBtsr7DispAv != 0D) { + output.WriteRawTag(185, 12); + output.WriteDouble(EuBtsr7DispAv); + } + if (EuBtsr8DispAv != 0D) { + output.WriteRawTag(193, 12); + output.WriteDouble(EuBtsr8DispAv); + } + if (EuBtsr5PeakMax != 0D) { + output.WriteRawTag(201, 12); + output.WriteDouble(EuBtsr5PeakMax); + } + if (EuBtsr6PeakMax != 0D) { + output.WriteRawTag(209, 12); + output.WriteDouble(EuBtsr6PeakMax); + } + if (EuBtsr7PeakMax != 0D) { + output.WriteRawTag(217, 12); + output.WriteDouble(EuBtsr7PeakMax); + } + if (EuBtsr8PeakMax != 0D) { + output.WriteRawTag(225, 12); + output.WriteDouble(EuBtsr8PeakMax); + } + if (EuBtsr5PeakMin != 0D) { + output.WriteRawTag(233, 12); + output.WriteDouble(EuBtsr5PeakMin); + } + if (EuBtsr6PeakMin != 0D) { + output.WriteRawTag(241, 12); + output.WriteDouble(EuBtsr6PeakMin); + } + if (EuBtsr7PeakMin != 0D) { + output.WriteRawTag(249, 12); + output.WriteDouble(EuBtsr7PeakMin); + } + if (EuBtsr8PeakMin != 0D) { + output.WriteRawTag(129, 13); + output.WriteDouble(EuBtsr8PeakMin); + } + if (EuBtsr5Speed != 0D) { + output.WriteRawTag(137, 13); + output.WriteDouble(EuBtsr5Speed); + } + if (EuBtsr6Speed != 0D) { + output.WriteRawTag(145, 13); + output.WriteDouble(EuBtsr6Speed); + } + if (EuBtsr7Speed != 0D) { + output.WriteRawTag(153, 13); + output.WriteDouble(EuBtsr7Speed); + } + if (EuBtsr8Speed != 0D) { + output.WriteRawTag(161, 13); + output.WriteDouble(EuBtsr8Speed); + } + if (EuBtsr5SpeedAv != 0D) { + output.WriteRawTag(169, 13); + output.WriteDouble(EuBtsr5SpeedAv); + } + if (EuBtsr6SpeedAv != 0D) { + output.WriteRawTag(177, 13); + output.WriteDouble(EuBtsr6SpeedAv); + } + if (EuBtsr7SpeedAv != 0D) { + output.WriteRawTag(185, 13); + output.WriteDouble(EuBtsr7SpeedAv); + } + if (EuBtsr8SpeedAv != 0D) { + output.WriteRawTag(193, 13); + output.WriteDouble(EuBtsr8SpeedAv); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -4865,6 +5296,66 @@ namespace Tango.PMR.Insights { if (EuSpare4 != 0D) { size += 2 + 8; } + if (EuBtsr5DispAv != 0D) { + size += 2 + 8; + } + if (EuBtsr6DispAv != 0D) { + size += 2 + 8; + } + if (EuBtsr7DispAv != 0D) { + size += 2 + 8; + } + if (EuBtsr8DispAv != 0D) { + size += 2 + 8; + } + if (EuBtsr5PeakMax != 0D) { + size += 2 + 8; + } + if (EuBtsr6PeakMax != 0D) { + size += 2 + 8; + } + if (EuBtsr7PeakMax != 0D) { + size += 2 + 8; + } + if (EuBtsr8PeakMax != 0D) { + size += 2 + 8; + } + if (EuBtsr5PeakMin != 0D) { + size += 2 + 8; + } + if (EuBtsr6PeakMin != 0D) { + size += 2 + 8; + } + if (EuBtsr7PeakMin != 0D) { + size += 2 + 8; + } + if (EuBtsr8PeakMin != 0D) { + size += 2 + 8; + } + if (EuBtsr5Speed != 0D) { + size += 2 + 8; + } + if (EuBtsr6Speed != 0D) { + size += 2 + 8; + } + if (EuBtsr7Speed != 0D) { + size += 2 + 8; + } + if (EuBtsr8Speed != 0D) { + size += 2 + 8; + } + if (EuBtsr5SpeedAv != 0D) { + size += 2 + 8; + } + if (EuBtsr6SpeedAv != 0D) { + size += 2 + 8; + } + if (EuBtsr7SpeedAv != 0D) { + size += 2 + 8; + } + if (EuBtsr8SpeedAv != 0D) { + size += 2 + 8; + } return size; } @@ -5441,6 +5932,66 @@ namespace Tango.PMR.Insights { if (other.EuSpare4 != 0D) { EuSpare4 = other.EuSpare4; } + if (other.EuBtsr5DispAv != 0D) { + EuBtsr5DispAv = other.EuBtsr5DispAv; + } + if (other.EuBtsr6DispAv != 0D) { + EuBtsr6DispAv = other.EuBtsr6DispAv; + } + if (other.EuBtsr7DispAv != 0D) { + EuBtsr7DispAv = other.EuBtsr7DispAv; + } + if (other.EuBtsr8DispAv != 0D) { + EuBtsr8DispAv = other.EuBtsr8DispAv; + } + if (other.EuBtsr5PeakMax != 0D) { + EuBtsr5PeakMax = other.EuBtsr5PeakMax; + } + if (other.EuBtsr6PeakMax != 0D) { + EuBtsr6PeakMax = other.EuBtsr6PeakMax; + } + if (other.EuBtsr7PeakMax != 0D) { + EuBtsr7PeakMax = other.EuBtsr7PeakMax; + } + if (other.EuBtsr8PeakMax != 0D) { + EuBtsr8PeakMax = other.EuBtsr8PeakMax; + } + if (other.EuBtsr5PeakMin != 0D) { + EuBtsr5PeakMin = other.EuBtsr5PeakMin; + } + if (other.EuBtsr6PeakMin != 0D) { + EuBtsr6PeakMin = other.EuBtsr6PeakMin; + } + if (other.EuBtsr7PeakMin != 0D) { + EuBtsr7PeakMin = other.EuBtsr7PeakMin; + } + if (other.EuBtsr8PeakMin != 0D) { + EuBtsr8PeakMin = other.EuBtsr8PeakMin; + } + if (other.EuBtsr5Speed != 0D) { + EuBtsr5Speed = other.EuBtsr5Speed; + } + if (other.EuBtsr6Speed != 0D) { + EuBtsr6Speed = other.EuBtsr6Speed; + } + if (other.EuBtsr7Speed != 0D) { + EuBtsr7Speed = other.EuBtsr7Speed; + } + if (other.EuBtsr8Speed != 0D) { + EuBtsr8Speed = other.EuBtsr8Speed; + } + if (other.EuBtsr5SpeedAv != 0D) { + EuBtsr5SpeedAv = other.EuBtsr5SpeedAv; + } + if (other.EuBtsr6SpeedAv != 0D) { + EuBtsr6SpeedAv = other.EuBtsr6SpeedAv; + } + if (other.EuBtsr7SpeedAv != 0D) { + EuBtsr7SpeedAv = other.EuBtsr7SpeedAv; + } + if (other.EuBtsr8SpeedAv != 0D) { + EuBtsr8SpeedAv = other.EuBtsr8SpeedAv; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -6245,6 +6796,86 @@ namespace Tango.PMR.Insights { EuSpare4 = input.ReadDouble(); break; } + case 1577: { + EuBtsr5DispAv = input.ReadDouble(); + break; + } + case 1585: { + EuBtsr6DispAv = input.ReadDouble(); + break; + } + case 1593: { + EuBtsr7DispAv = input.ReadDouble(); + break; + } + case 1601: { + EuBtsr8DispAv = input.ReadDouble(); + break; + } + case 1609: { + EuBtsr5PeakMax = input.ReadDouble(); + break; + } + case 1617: { + EuBtsr6PeakMax = input.ReadDouble(); + break; + } + case 1625: { + EuBtsr7PeakMax = input.ReadDouble(); + break; + } + case 1633: { + EuBtsr8PeakMax = input.ReadDouble(); + break; + } + case 1641: { + EuBtsr5PeakMin = input.ReadDouble(); + break; + } + case 1649: { + EuBtsr6PeakMin = input.ReadDouble(); + break; + } + case 1657: { + EuBtsr7PeakMin = input.ReadDouble(); + break; + } + case 1665: { + EuBtsr8PeakMin = input.ReadDouble(); + break; + } + case 1673: { + EuBtsr5Speed = input.ReadDouble(); + break; + } + case 1681: { + EuBtsr6Speed = input.ReadDouble(); + break; + } + case 1689: { + EuBtsr7Speed = input.ReadDouble(); + break; + } + case 1697: { + EuBtsr8Speed = input.ReadDouble(); + break; + } + case 1705: { + EuBtsr5SpeedAv = input.ReadDouble(); + break; + } + case 1713: { + EuBtsr6SpeedAv = input.ReadDouble(); + break; + } + case 1721: { + EuBtsr7SpeedAv = input.ReadDouble(); + break; + } + case 1729: { + EuBtsr8SpeedAv = input.ReadDouble(); + break; + } } } } diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineState.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineState.cs index 8f421e04d..397d87c5f 100644 --- a/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineState.cs +++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineState.cs @@ -23,10 +23,10 @@ namespace Tango.PMR.MachineStatus { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChJNYWNoaW5lU3RhdGUucHJvdG8SF1RhbmdvLlBNUi5NYWNoaW5lU3RhdHVz", - "KmwKDE1hY2hpbmVTdGF0ZRILCgdQb3dlclVwEAASCQoFUmVhZHkQARIJCgVT", - "bGVlcBACEgkKBUVycm9yEAMSDAoIUG93ZXJPZmYQBBIQCgxQcmVwYXJpbmdK", - "b2IQBRIOCgpSdW5uaW5nSm9iEAZCIwohY29tLnR3aW5lLnRhbmdvLnBtci5t", - "YWNoaW5lc3RhdHVzYgZwcm90bzM=")); + "Kn8KDE1hY2hpbmVTdGF0ZRILCgdQb3dlclVwEAASCQoFUmVhZHkQARIJCgVT", + "bGVlcBACEgkKBUVycm9yEAMSEAoMU2h1dHRpbmdEb3duEAQSEAoMUHJlcGFy", + "aW5nSm9iEAUSDgoKUnVubmluZ0pvYhAGEg0KCVBvd2VyRG93bhAHQiMKIWNv", + "bS50d2luZS50YW5nby5wbXIubWFjaGluZXN0YXR1c2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.MachineStatus.MachineState), }, null)); @@ -40,9 +40,10 @@ namespace Tango.PMR.MachineStatus { [pbr::OriginalName("Ready")] Ready = 1, [pbr::OriginalName("Sleep")] Sleep = 2, [pbr::OriginalName("Error")] Error = 3, - [pbr::OriginalName("PowerOff")] PowerOff = 4, + [pbr::OriginalName("ShuttingDown")] ShuttingDown = 4, [pbr::OriginalName("PreparingJob")] PreparingJob = 5, [pbr::OriginalName("RunningJob")] RunningJob = 6, + [pbr::OriginalName("PowerDown")] PowerDown = 7, } #endregion diff --git a/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs b/Software/Visual_Studio/Tango.PMR/Printing/ProcessParameters.cs index 746e8da4d..6795ef2b0 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", - "IoUMChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU", + "Iv0MChFQcm9jZXNzUGFyYW1ldGVycxITCgtEeWVpbmdTcGVlZBgBIAEoARIU", "CgxNaW5JbmtVcHRha2UYAiABKAESFAoMTWF4SW5rVXB0YWtlGAMgASgBEhUK", "DUZlZWRlclRlbnNpb24YBCABKAESFQoNUHVsbGVyVGVuc2lvbhgFIAEoARIV", "Cg1XaW5kZXJUZW5zaW9uGAYgASgBEhEKCU1peGVyVGVtcBgHIAEoARIVCg1I", @@ -57,12 +57,14 @@ namespace Tango.PMR.Printing { "CglFUHVtcFRlbXAYOSABKAESGAoQRVByZXNzdXJlQnVpbGRVcBg6IAEoARIP", "CgdFU3BhcmUxGDsgASgBEg8KB0VTcGFyZTIYPCABKAESDwoHRVNwYXJlMxg9", "IAEoARIPCgdFU3BhcmU0GD4gASgBEg8KB0VTcGFyZTUYPyABKAESEwoLRVR1", - "bm5lbFRlbXAYQCABKAFCHgocY29tLnR3aW5lLnRhbmdvLnBtci5wcmludGlu", - "Z2IGcHJvdG8z")); + "bm5lbFRlbXAYQCABKAESHAoURUJ0c3I1RmVlZGluZ1RlbnNpb24YQSABKAES", + "HAoURUJ0c3I2RmVlZGluZ1RlbnNpb24YQiABKAESHAoURUJ0c3I3RmVlZGlu", + "Z1RlbnNpb24YQyABKAESHAoURUJ0c3I4RmVlZGluZ1RlbnNpb24YRCABKAFC", + "HgocY29tLnR3aW5lLnRhbmdvLnBtci5wcmludGluZ2IGcHJvdG8z")); 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", "ETunnelTemp" }, 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", "EBtsr5FeedingTension", "EBtsr6FeedingTension", "EBtsr7FeedingTension", "EBtsr8FeedingTension" }, null, null, null) })); } #endregion @@ -157,6 +159,10 @@ namespace Tango.PMR.Printing { eSpare4_ = other.eSpare4_; eSpare5_ = other.eSpare5_; eTunnelTemp_ = other.eTunnelTemp_; + eBtsr5FeedingTension_ = other.eBtsr5FeedingTension_; + eBtsr6FeedingTension_ = other.eBtsr6FeedingTension_; + eBtsr7FeedingTension_ = other.eBtsr7FeedingTension_; + eBtsr8FeedingTension_ = other.eBtsr8FeedingTension_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -868,6 +874,50 @@ namespace Tango.PMR.Printing { } } + /// <summary>Field number for the "EBtsr5FeedingTension" field.</summary> + public const int EBtsr5FeedingTensionFieldNumber = 65; + private double eBtsr5FeedingTension_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EBtsr5FeedingTension { + get { return eBtsr5FeedingTension_; } + set { + eBtsr5FeedingTension_ = value; + } + } + + /// <summary>Field number for the "EBtsr6FeedingTension" field.</summary> + public const int EBtsr6FeedingTensionFieldNumber = 66; + private double eBtsr6FeedingTension_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EBtsr6FeedingTension { + get { return eBtsr6FeedingTension_; } + set { + eBtsr6FeedingTension_ = value; + } + } + + /// <summary>Field number for the "EBtsr7FeedingTension" field.</summary> + public const int EBtsr7FeedingTensionFieldNumber = 67; + private double eBtsr7FeedingTension_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EBtsr7FeedingTension { + get { return eBtsr7FeedingTension_; } + set { + eBtsr7FeedingTension_ = value; + } + } + + /// <summary>Field number for the "EBtsr8FeedingTension" field.</summary> + public const int EBtsr8FeedingTensionFieldNumber = 68; + private double eBtsr8FeedingTension_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double EBtsr8FeedingTension { + get { return eBtsr8FeedingTension_; } + set { + eBtsr8FeedingTension_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as ProcessParameters); @@ -945,6 +995,10 @@ namespace Tango.PMR.Printing { if (ESpare4 != other.ESpare4) return false; if (ESpare5 != other.ESpare5) return false; if (ETunnelTemp != other.ETunnelTemp) return false; + if (EBtsr5FeedingTension != other.EBtsr5FeedingTension) return false; + if (EBtsr6FeedingTension != other.EBtsr6FeedingTension) return false; + if (EBtsr7FeedingTension != other.EBtsr7FeedingTension) return false; + if (EBtsr8FeedingTension != other.EBtsr8FeedingTension) return false; return true; } @@ -1015,6 +1069,10 @@ namespace Tango.PMR.Printing { if (ESpare4 != 0D) hash ^= ESpare4.GetHashCode(); if (ESpare5 != 0D) hash ^= ESpare5.GetHashCode(); if (ETunnelTemp != 0D) hash ^= ETunnelTemp.GetHashCode(); + if (EBtsr5FeedingTension != 0D) hash ^= EBtsr5FeedingTension.GetHashCode(); + if (EBtsr6FeedingTension != 0D) hash ^= EBtsr6FeedingTension.GetHashCode(); + if (EBtsr7FeedingTension != 0D) hash ^= EBtsr7FeedingTension.GetHashCode(); + if (EBtsr8FeedingTension != 0D) hash ^= EBtsr8FeedingTension.GetHashCode(); return hash; } @@ -1281,6 +1339,22 @@ namespace Tango.PMR.Printing { output.WriteRawTag(129, 4); output.WriteDouble(ETunnelTemp); } + if (EBtsr5FeedingTension != 0D) { + output.WriteRawTag(137, 4); + output.WriteDouble(EBtsr5FeedingTension); + } + if (EBtsr6FeedingTension != 0D) { + output.WriteRawTag(145, 4); + output.WriteDouble(EBtsr6FeedingTension); + } + if (EBtsr7FeedingTension != 0D) { + output.WriteRawTag(153, 4); + output.WriteDouble(EBtsr7FeedingTension); + } + if (EBtsr8FeedingTension != 0D) { + output.WriteRawTag(161, 4); + output.WriteDouble(EBtsr8FeedingTension); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1478,6 +1552,18 @@ namespace Tango.PMR.Printing { if (ETunnelTemp != 0D) { size += 2 + 8; } + if (EBtsr5FeedingTension != 0D) { + size += 2 + 8; + } + if (EBtsr6FeedingTension != 0D) { + size += 2 + 8; + } + if (EBtsr7FeedingTension != 0D) { + size += 2 + 8; + } + if (EBtsr8FeedingTension != 0D) { + size += 2 + 8; + } return size; } @@ -1678,6 +1764,18 @@ namespace Tango.PMR.Printing { if (other.ETunnelTemp != 0D) { ETunnelTemp = other.ETunnelTemp; } + if (other.EBtsr5FeedingTension != 0D) { + EBtsr5FeedingTension = other.EBtsr5FeedingTension; + } + if (other.EBtsr6FeedingTension != 0D) { + EBtsr6FeedingTension = other.EBtsr6FeedingTension; + } + if (other.EBtsr7FeedingTension != 0D) { + EBtsr7FeedingTension = other.EBtsr7FeedingTension; + } + if (other.EBtsr8FeedingTension != 0D) { + EBtsr8FeedingTension = other.EBtsr8FeedingTension; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -1944,6 +2042,22 @@ namespace Tango.PMR.Printing { ETunnelTemp = input.ReadDouble(); break; } + case 521: { + EBtsr5FeedingTension = input.ReadDouble(); + break; + } + case 529: { + EBtsr6FeedingTension = input.ReadDouble(); + break; + } + case 537: { + EBtsr7FeedingTension = input.ReadDouble(); + break; + } + case 545: { + EBtsr8FeedingTension = input.ReadDouble(); + break; + } } } } diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml Binary files differindex c1cc02432..99fb198b2 100644 --- a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml +++ b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/OverrideData.xml |
