diff options
Diffstat (limited to 'Software')
21 files changed, 2170 insertions, 534 deletions
diff --git a/Software/Graphics/Mobile/cone-empty.png b/Software/Graphics/Mobile/cone-empty.png Binary files differnew file mode 100644 index 000000000..d65b8f793 --- /dev/null +++ b/Software/Graphics/Mobile/cone-empty.png diff --git a/Software/Graphics/Mobile/cone-empty@2x.png b/Software/Graphics/Mobile/cone-empty@2x.png Binary files differnew file mode 100644 index 000000000..17c3225ed --- /dev/null +++ b/Software/Graphics/Mobile/cone-empty@2x.png diff --git a/Software/Graphics/Mobile/cone-empty@3x.png b/Software/Graphics/Mobile/cone-empty@3x.png Binary files differnew file mode 100644 index 000000000..1c2a0e123 --- /dev/null +++ b/Software/Graphics/Mobile/cone-empty@3x.png diff --git a/Software/Graphics/Mobile/cone-full.png b/Software/Graphics/Mobile/cone-full.png Binary files differnew file mode 100644 index 000000000..c42abf56e --- /dev/null +++ b/Software/Graphics/Mobile/cone-full.png diff --git a/Software/Graphics/Mobile/cone-full@2x.png b/Software/Graphics/Mobile/cone-full@2x.png Binary files differnew file mode 100644 index 000000000..b4ed45d1e --- /dev/null +++ b/Software/Graphics/Mobile/cone-full@2x.png diff --git a/Software/Graphics/Mobile/cone-full@3x.png b/Software/Graphics/Mobile/cone-full@3x.png Binary files differnew file mode 100644 index 000000000..d5c20b1e7 --- /dev/null +++ b/Software/Graphics/Mobile/cone-full@3x.png diff --git a/Software/PMR/Messages/MachineStatus/MachineStatus.proto b/Software/PMR/Messages/MachineStatus/MachineStatus.proto index 03671356c..312e26e01 100644 --- a/Software/PMR/Messages/MachineStatus/MachineStatus.proto +++ b/Software/PMR/Messages/MachineStatus/MachineStatus.proto @@ -2,6 +2,7 @@ syntax = "proto3"; import "MachineState.proto"; import "IDSPackLevel.proto"; +import "SpoolState.proto"; package Tango.PMR.MachineStatus; option java_package = "com.twine.tango.pmr.machinestatus"; @@ -11,4 +12,5 @@ message MachineStatus MachineState State = 1; repeated IDSPackLevel IDSPacksLevels = 2; double OverallTemperature = 3; + SpoolState SpoolState = 4; }
\ No newline at end of file diff --git a/Software/PMR/Messages/MachineStatus/SpoolState.proto b/Software/PMR/Messages/MachineStatus/SpoolState.proto new file mode 100644 index 000000000..dbc92f172 --- /dev/null +++ b/Software/PMR/Messages/MachineStatus/SpoolState.proto @@ -0,0 +1,10 @@ +syntax = "proto3"; + +package Tango.PMR.MachineStatus; +option java_package = "com.twine.tango.pmr.machinestatus"; + +enum SpoolState +{ + Absent = 0; + Present = 1; +} diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/cone-empty.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/cone-empty.png Binary files differindex d65b8f793..17c3225ed 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/cone-empty.png +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/cone-empty.png diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/cone-full.png b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/cone-full.png Binary files differindex c42abf56e..b4ed45d1e 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/cone-full.png +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Images/cone-full.png diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Tango.PPC.Maintenance.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Tango.PPC.Maintenance.csproj index 94dcf8247..7e5c52725 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Tango.PPC.Maintenance.csproj +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Tango.PPC.Maintenance.csproj @@ -281,17 +281,19 @@ </ItemGroup> <ItemGroup> <Resource Include="Images\cl-full.png" /> - <Resource Include="Images\cone-empty.png" /> - <Resource Include="Images\cone-full.png" /> <Resource Include="Images\l-full.png" /> </ItemGroup> <ItemGroup> <Resource Include="Images\head_cleaning.png" /> </ItemGroup> + <ItemGroup> + <Resource Include="Images\cone-empty.png" /> + <Resource Include="Images\cone-full.png" /> + </ItemGroup> <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs index 4bd63e9a6..f613d6f43 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs @@ -56,6 +56,21 @@ namespace Tango.PPC.Maintenance.ViewModels set { _totalDyeMeters = value; RaisePropertyChangedAuto(); } } + private SpoolState _spoolState; + public SpoolState SpoolState + { + get { return _spoolState; } + set + { + if (_spoolState != value) + { + _spoolState = value; + RaisePropertyChangedAuto(); + } + } + } + + public RelayCommand ExportLogsCommand { get; set; } public OpenCloseDyeingHeadCommand OpenCloseDyeingHeadCommand { get; set; } @@ -105,6 +120,7 @@ namespace Tango.PPC.Maintenance.ViewModels { UpdateMidTankLevels(status); OverallTemperature.Temperature = status.OverallTemperature; + SpoolState = status.SpoolState; InvalidateRelayCommands(); } diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml index f49bdebe4..acbda9daa 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml @@ -155,10 +155,22 @@ </ItemsControl> </Grid> - <!--<Image Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center" Source="../Images/cone-full.png" Margin="30"></Image>--> + <Image Grid.Column="2" VerticalAlignment="Center" HorizontalAlignment="Center" Margin="15" RenderOptions.BitmapScalingMode="Fant"> + <Image.Style> + <Style TargetType="Image"> + <Setter Property="Source" Value="../Images/cone-empty.png"></Setter> + <Style.Triggers> + <DataTrigger Binding="{Binding SpoolState}" Value="Present"> + <Setter Property="Source" Value="../Images/cone-full.png"></Setter> + </DataTrigger> + </Style.Triggers> + </Style> + </Image.Style> + </Image> <TextBlock Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Temperature</TextBlock> <TextBlock Grid.Column="1" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Inks</TextBlock> + <TextBlock Grid.Column="2" Grid.Row="1" HorizontalAlignment="Center" VerticalAlignment="Center" FontSize="{StaticResource TangoTitleFontSize}">Cone</TextBlock> </Grid> </StackPanel> </StackPanel> diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs index a077f2207..dc2713128 100644 --- a/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs +++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs @@ -23,16 +23,18 @@ namespace Tango.PMR.MachineStatus { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChNNYWNoaW5lU3RhdHVzLnByb3RvEhdUYW5nby5QTVIuTWFjaGluZVN0YXR1", - "cxoSTWFjaGluZVN0YXRlLnByb3RvGhJJRFNQYWNrTGV2ZWwucHJvdG8ioAEK", - "DU1hY2hpbmVTdGF0dXMSNAoFU3RhdGUYASABKA4yJS5UYW5nby5QTVIuTWFj", - "aGluZVN0YXR1cy5NYWNoaW5lU3RhdGUSPQoOSURTUGFja3NMZXZlbHMYAiAD", - "KAsyJS5UYW5nby5QTVIuTWFjaGluZVN0YXR1cy5JRFNQYWNrTGV2ZWwSGgoS", - "T3ZlcmFsbFRlbXBlcmF0dXJlGAMgASgBQiMKIWNvbS50d2luZS50YW5nby5w", - "bXIubWFjaGluZXN0YXR1c2IGcHJvdG8z")); + "cxoSTWFjaGluZVN0YXRlLnByb3RvGhJJRFNQYWNrTGV2ZWwucHJvdG8aEFNw", + "b29sU3RhdGUucHJvdG8i2QEKDU1hY2hpbmVTdGF0dXMSNAoFU3RhdGUYASAB", + "KA4yJS5UYW5nby5QTVIuTWFjaGluZVN0YXR1cy5NYWNoaW5lU3RhdGUSPQoO", + "SURTUGFja3NMZXZlbHMYAiADKAsyJS5UYW5nby5QTVIuTWFjaGluZVN0YXR1", + "cy5JRFNQYWNrTGV2ZWwSGgoST3ZlcmFsbFRlbXBlcmF0dXJlGAMgASgBEjcK", + "ClNwb29sU3RhdGUYBCABKA4yIy5UYW5nby5QTVIuTWFjaGluZVN0YXR1cy5T", + "cG9vbFN0YXRlQiMKIWNvbS50d2luZS50YW5nby5wbXIubWFjaGluZXN0YXR1", + "c2IGcHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { global::Tango.PMR.MachineStatus.MachineStateReflection.Descriptor, global::Tango.PMR.MachineStatus.IDSPackLevelReflection.Descriptor, }, + new pbr::FileDescriptor[] { global::Tango.PMR.MachineStatus.MachineStateReflection.Descriptor, global::Tango.PMR.MachineStatus.IDSPackLevelReflection.Descriptor, global::Tango.PMR.MachineStatus.SpoolStateReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.MachineStatus), global::Tango.PMR.MachineStatus.MachineStatus.Parser, new[]{ "State", "IDSPacksLevels", "OverallTemperature" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.MachineStatus), global::Tango.PMR.MachineStatus.MachineStatus.Parser, new[]{ "State", "IDSPacksLevels", "OverallTemperature", "SpoolState" }, null, null, null) })); } #endregion @@ -66,6 +68,7 @@ namespace Tango.PMR.MachineStatus { state_ = other.state_; iDSPacksLevels_ = other.iDSPacksLevels_.Clone(); overallTemperature_ = other.overallTemperature_; + spoolState_ = other.spoolState_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -105,6 +108,17 @@ namespace Tango.PMR.MachineStatus { } } + /// <summary>Field number for the "SpoolState" field.</summary> + public const int SpoolStateFieldNumber = 4; + private global::Tango.PMR.MachineStatus.SpoolState spoolState_ = 0; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public global::Tango.PMR.MachineStatus.SpoolState SpoolState { + get { return spoolState_; } + set { + spoolState_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as MachineStatus); @@ -121,6 +135,7 @@ namespace Tango.PMR.MachineStatus { if (State != other.State) return false; if(!iDSPacksLevels_.Equals(other.iDSPacksLevels_)) return false; if (OverallTemperature != other.OverallTemperature) return false; + if (SpoolState != other.SpoolState) return false; return true; } @@ -130,6 +145,7 @@ namespace Tango.PMR.MachineStatus { if (State != 0) hash ^= State.GetHashCode(); hash ^= iDSPacksLevels_.GetHashCode(); if (OverallTemperature != 0D) hash ^= OverallTemperature.GetHashCode(); + if (SpoolState != 0) hash ^= SpoolState.GetHashCode(); return hash; } @@ -149,6 +165,10 @@ namespace Tango.PMR.MachineStatus { output.WriteRawTag(25); output.WriteDouble(OverallTemperature); } + if (SpoolState != 0) { + output.WriteRawTag(32); + output.WriteEnum((int) SpoolState); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -161,6 +181,9 @@ namespace Tango.PMR.MachineStatus { if (OverallTemperature != 0D) { size += 1 + 8; } + if (SpoolState != 0) { + size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) SpoolState); + } return size; } @@ -176,6 +199,9 @@ namespace Tango.PMR.MachineStatus { if (other.OverallTemperature != 0D) { OverallTemperature = other.OverallTemperature; } + if (other.SpoolState != 0) { + SpoolState = other.SpoolState; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -198,6 +224,10 @@ namespace Tango.PMR.MachineStatus { OverallTemperature = input.ReadDouble(); break; } + case 32: { + spoolState_ = (global::Tango.PMR.MachineStatus.SpoolState) input.ReadEnum(); + break; + } } } } diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/SpoolState.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/SpoolState.cs new file mode 100644 index 000000000..cd1b5c48c --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/SpoolState.cs @@ -0,0 +1,45 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: SpoolState.proto +#pragma warning disable 1591, 0612, 3021 +#region Designer generated code + +using pb = global::Google.Protobuf; +using pbc = global::Google.Protobuf.Collections; +using pbr = global::Google.Protobuf.Reflection; +using scg = global::System.Collections.Generic; +namespace Tango.PMR.MachineStatus { + + /// <summary>Holder for reflection information generated from SpoolState.proto</summary> + public static partial class SpoolStateReflection { + + #region Descriptor + /// <summary>File descriptor for SpoolState.proto</summary> + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static SpoolStateReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "ChBTcG9vbFN0YXRlLnByb3RvEhdUYW5nby5QTVIuTWFjaGluZVN0YXR1cyol", + "CgpTcG9vbFN0YXRlEgoKBkFic2VudBAAEgsKB1ByZXNlbnQQAUIjCiFjb20u", + "dHdpbmUudGFuZ28ucG1yLm1hY2hpbmVzdGF0dXNiBnByb3RvMw==")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.MachineStatus.SpoolState), }, null)); + } + #endregion + + } + #region Enums + public enum SpoolState { + [pbr::OriginalName("Absent")] Absent = 0, + [pbr::OriginalName("Present")] Present = 1, + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeReadResponse.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeReadResponse.cs index fd2427a6c..a956a4fb5 100644 --- a/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeReadResponse.cs +++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeReadResponse.cs @@ -23,15 +23,14 @@ namespace Tango.PMR.Stubs { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "Ch9TdHViQ2FydHJpZGdlUmVhZFJlc3BvbnNlLnByb3RvEg9UYW5nby5QTVIu", - "U3R1YnMitAEKGVN0dWJDYXJ0cmlkZ2VSZWFkUmVzcG9uc2USEwoLQ2FydHJp", - "ZGdlSWQYASABKA0SFgoOQ2FydHJpZGdlQ29sb3IYAiABKA0SGAoQQ2FydHJp", - "ZGdlVmVyc2lvbhgDIAEoDRIVCg1DYXJ0cmlkZ2VEYXRhGAQgASgFEhUKDUNh", - "cnRyaWRnZVVzZWQYBSABKAgSDgoGU3RhdHVzGAYgASgJEhIKClN0YXR1c1dv", - "cmQYByABKA1CGwoZY29tLnR3aW5lLnRhbmdvLnBtci5zdHVic2IGcHJvdG8z")); + "U3R1YnMaD0NhcnRyaWRnZS5wcm90byJQChlTdHViQ2FydHJpZGdlUmVhZFJl", + "c3BvbnNlEjMKCUNhcnRyaWRnZRgBIAEoCzIgLlRhbmdvLlBNUi5EaWFnbm9z", + "dGljcy5DYXJ0cmlkZ2VCGwoZY29tLnR3aW5lLnRhbmdvLnBtci5zdHVic2IG", + "cHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, + new pbr::FileDescriptor[] { global::Tango.PMR.Diagnostics.CartridgeReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubCartridgeReadResponse), global::Tango.PMR.Stubs.StubCartridgeReadResponse.Parser, new[]{ "CartridgeId", "CartridgeColor", "CartridgeVersion", "CartridgeData", "CartridgeUsed", "Status", "StatusWord" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubCartridgeReadResponse), global::Tango.PMR.Stubs.StubCartridgeReadResponse.Parser, new[]{ "Cartridge" }, null, null, null) })); } #endregion @@ -62,13 +61,7 @@ namespace Tango.PMR.Stubs { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public StubCartridgeReadResponse(StubCartridgeReadResponse other) : this() { - cartridgeId_ = other.cartridgeId_; - cartridgeColor_ = other.cartridgeColor_; - cartridgeVersion_ = other.cartridgeVersion_; - cartridgeData_ = other.cartridgeData_; - cartridgeUsed_ = other.cartridgeUsed_; - status_ = other.status_; - statusWord_ = other.statusWord_; + Cartridge = other.cartridge_ != null ? other.Cartridge.Clone() : null; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -76,86 +69,14 @@ namespace Tango.PMR.Stubs { return new StubCartridgeReadResponse(this); } - /// <summary>Field number for the "CartridgeId" field.</summary> - public const int CartridgeIdFieldNumber = 1; - private uint cartridgeId_; + /// <summary>Field number for the "Cartridge" field.</summary> + public const int CartridgeFieldNumber = 1; + private global::Tango.PMR.Diagnostics.Cartridge cartridge_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint CartridgeId { - get { return cartridgeId_; } + public global::Tango.PMR.Diagnostics.Cartridge Cartridge { + get { return cartridge_; } set { - cartridgeId_ = value; - } - } - - /// <summary>Field number for the "CartridgeColor" field.</summary> - public const int CartridgeColorFieldNumber = 2; - private uint cartridgeColor_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint CartridgeColor { - get { return cartridgeColor_; } - set { - cartridgeColor_ = value; - } - } - - /// <summary>Field number for the "CartridgeVersion" field.</summary> - public const int CartridgeVersionFieldNumber = 3; - private uint cartridgeVersion_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint CartridgeVersion { - get { return cartridgeVersion_; } - set { - cartridgeVersion_ = value; - } - } - - /// <summary>Field number for the "CartridgeData" field.</summary> - public const int CartridgeDataFieldNumber = 4; - private int cartridgeData_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public int CartridgeData { - get { return cartridgeData_; } - set { - cartridgeData_ = value; - } - } - - /// <summary>Field number for the "CartridgeUsed" field.</summary> - public const int CartridgeUsedFieldNumber = 5; - private bool cartridgeUsed_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool CartridgeUsed { - get { return cartridgeUsed_; } - set { - cartridgeUsed_ = value; - } - } - - /// <summary>Field number for the "Status" field.</summary> - public const int StatusFieldNumber = 6; - private string status_ = ""; - /// <summary> - /// Passed/Failed - /// </summary> - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string Status { - get { return status_; } - set { - status_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// <summary>Field number for the "StatusWord" field.</summary> - public const int StatusWordFieldNumber = 7; - private uint statusWord_; - /// <summary> - /// Error number/bit when the status is Failed - /// </summary> - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint StatusWord { - get { return statusWord_; } - set { - statusWord_ = value; + cartridge_ = value; } } @@ -172,26 +93,14 @@ namespace Tango.PMR.Stubs { if (ReferenceEquals(other, this)) { return true; } - if (CartridgeId != other.CartridgeId) return false; - if (CartridgeColor != other.CartridgeColor) return false; - if (CartridgeVersion != other.CartridgeVersion) return false; - if (CartridgeData != other.CartridgeData) return false; - if (CartridgeUsed != other.CartridgeUsed) return false; - if (Status != other.Status) return false; - if (StatusWord != other.StatusWord) return false; + if (!object.Equals(Cartridge, other.Cartridge)) return false; return true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override int GetHashCode() { int hash = 1; - if (CartridgeId != 0) hash ^= CartridgeId.GetHashCode(); - if (CartridgeColor != 0) hash ^= CartridgeColor.GetHashCode(); - if (CartridgeVersion != 0) hash ^= CartridgeVersion.GetHashCode(); - if (CartridgeData != 0) hash ^= CartridgeData.GetHashCode(); - if (CartridgeUsed != false) hash ^= CartridgeUsed.GetHashCode(); - if (Status.Length != 0) hash ^= Status.GetHashCode(); - if (StatusWord != 0) hash ^= StatusWord.GetHashCode(); + if (cartridge_ != null) hash ^= Cartridge.GetHashCode(); return hash; } @@ -202,59 +111,17 @@ namespace Tango.PMR.Stubs { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public void WriteTo(pb::CodedOutputStream output) { - if (CartridgeId != 0) { - output.WriteRawTag(8); - output.WriteUInt32(CartridgeId); - } - if (CartridgeColor != 0) { - output.WriteRawTag(16); - output.WriteUInt32(CartridgeColor); - } - if (CartridgeVersion != 0) { - output.WriteRawTag(24); - output.WriteUInt32(CartridgeVersion); - } - if (CartridgeData != 0) { - output.WriteRawTag(32); - output.WriteInt32(CartridgeData); - } - if (CartridgeUsed != false) { - output.WriteRawTag(40); - output.WriteBool(CartridgeUsed); - } - if (Status.Length != 0) { - output.WriteRawTag(50); - output.WriteString(Status); - } - if (StatusWord != 0) { - output.WriteRawTag(56); - output.WriteUInt32(StatusWord); + if (cartridge_ != null) { + output.WriteRawTag(10); + output.WriteMessage(Cartridge); } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public int CalculateSize() { int size = 0; - if (CartridgeId != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CartridgeId); - } - if (CartridgeColor != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CartridgeColor); - } - if (CartridgeVersion != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CartridgeVersion); - } - if (CartridgeData != 0) { - size += 1 + pb::CodedOutputStream.ComputeInt32Size(CartridgeData); - } - if (CartridgeUsed != false) { - size += 1 + 1; - } - if (Status.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(Status); - } - if (StatusWord != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(StatusWord); + if (cartridge_ != null) { + size += 1 + pb::CodedOutputStream.ComputeMessageSize(Cartridge); } return size; } @@ -264,26 +131,11 @@ namespace Tango.PMR.Stubs { if (other == null) { return; } - if (other.CartridgeId != 0) { - CartridgeId = other.CartridgeId; - } - if (other.CartridgeColor != 0) { - CartridgeColor = other.CartridgeColor; - } - if (other.CartridgeVersion != 0) { - CartridgeVersion = other.CartridgeVersion; - } - if (other.CartridgeData != 0) { - CartridgeData = other.CartridgeData; - } - if (other.CartridgeUsed != false) { - CartridgeUsed = other.CartridgeUsed; - } - if (other.Status.Length != 0) { - Status = other.Status; - } - if (other.StatusWord != 0) { - StatusWord = other.StatusWord; + if (other.cartridge_ != null) { + if (cartridge_ == null) { + cartridge_ = new global::Tango.PMR.Diagnostics.Cartridge(); + } + Cartridge.MergeFrom(other.Cartridge); } } @@ -295,32 +147,11 @@ namespace Tango.PMR.Stubs { default: input.SkipLastField(); break; - case 8: { - CartridgeId = input.ReadUInt32(); - break; - } - case 16: { - CartridgeColor = input.ReadUInt32(); - break; - } - case 24: { - CartridgeVersion = input.ReadUInt32(); - break; - } - case 32: { - CartridgeData = input.ReadInt32(); - break; - } - case 40: { - CartridgeUsed = input.ReadBool(); - break; - } - case 50: { - Status = input.ReadString(); - break; - } - case 56: { - StatusWord = input.ReadUInt32(); + case 10: { + if (cartridge_ == null) { + cartridge_ = new global::Tango.PMR.Diagnostics.Cartridge(); + } + input.ReadMessage(cartridge_); break; } } diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeWriteRequest.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeWriteRequest.cs index e529784c5..f69bd91c1 100644 --- a/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeWriteRequest.cs +++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeWriteRequest.cs @@ -23,15 +23,14 @@ namespace Tango.PMR.Stubs { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "Ch9TdHViQ2FydHJpZGdlV3JpdGVSZXF1ZXN0LnByb3RvEg9UYW5nby5QTVIu", - "U3R1YnMikAEKGVN0dWJDYXJ0cmlkZ2VXcml0ZVJlcXVlc3QSEwoLQ2FydHJp", - "ZGdlSWQYASABKA0SFgoOQ2FydHJpZGdlQ29sb3IYAiABKA0SGAoQQ2FydHJp", - "ZGdlVmVyc2lvbhgDIAEoDRIVCg1DYXJ0cmlkZ2VEYXRhGAQgASgNEhUKDUNh", - "cnRyaWRnZVVzZWQYBSABKAhCGwoZY29tLnR3aW5lLnRhbmdvLnBtci5zdHVi", - "c2IGcHJvdG8z")); + "U3R1YnMaD0NhcnRyaWRnZS5wcm90byJQChlTdHViQ2FydHJpZGdlV3JpdGVS", + "ZXF1ZXN0EjMKCUNhcnRyaWRnZRgBIAEoCzIgLlRhbmdvLlBNUi5EaWFnbm9z", + "dGljcy5DYXJ0cmlkZ2VCGwoZY29tLnR3aW5lLnRhbmdvLnBtci5zdHVic2IG", + "cHJvdG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, - new pbr::FileDescriptor[] { }, + new pbr::FileDescriptor[] { global::Tango.PMR.Diagnostics.CartridgeReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubCartridgeWriteRequest), global::Tango.PMR.Stubs.StubCartridgeWriteRequest.Parser, new[]{ "CartridgeId", "CartridgeColor", "CartridgeVersion", "CartridgeData", "CartridgeUsed" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubCartridgeWriteRequest), global::Tango.PMR.Stubs.StubCartridgeWriteRequest.Parser, new[]{ "Cartridge" }, null, null, null) })); } #endregion @@ -62,11 +61,7 @@ namespace Tango.PMR.Stubs { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public StubCartridgeWriteRequest(StubCartridgeWriteRequest other) : this() { - cartridgeId_ = other.cartridgeId_; - cartridgeColor_ = other.cartridgeColor_; - cartridgeVersion_ = other.cartridgeVersion_; - cartridgeData_ = other.cartridgeData_; - cartridgeUsed_ = other.cartridgeUsed_; + Cartridge = other.cartridge_ != null ? other.Cartridge.Clone() : null; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -74,66 +69,14 @@ namespace Tango.PMR.Stubs { return new StubCartridgeWriteRequest(this); } - /// <summary>Field number for the "CartridgeId" field.</summary> - public const int CartridgeIdFieldNumber = 1; - private uint cartridgeId_; - /// <summary> - ///0..7 - /// </summary> + /// <summary>Field number for the "Cartridge" field.</summary> + public const int CartridgeFieldNumber = 1; + private global::Tango.PMR.Diagnostics.Cartridge cartridge_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint CartridgeId { - get { return cartridgeId_; } + public global::Tango.PMR.Diagnostics.Cartridge Cartridge { + get { return cartridge_; } set { - cartridgeId_ = value; - } - } - - /// <summary>Field number for the "CartridgeColor" field.</summary> - public const int CartridgeColorFieldNumber = 2; - private uint cartridgeColor_; - /// <summary> - /// </summary> - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint CartridgeColor { - get { return cartridgeColor_; } - set { - cartridgeColor_ = value; - } - } - - /// <summary>Field number for the "CartridgeVersion" field.</summary> - public const int CartridgeVersionFieldNumber = 3; - private uint cartridgeVersion_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint CartridgeVersion { - get { return cartridgeVersion_; } - set { - cartridgeVersion_ = value; - } - } - - /// <summary>Field number for the "CartridgeData" field.</summary> - public const int CartridgeDataFieldNumber = 4; - private uint cartridgeData_; - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint CartridgeData { - get { return cartridgeData_; } - set { - cartridgeData_ = value; - } - } - - /// <summary>Field number for the "CartridgeUsed" field.</summary> - public const int CartridgeUsedFieldNumber = 5; - private bool cartridgeUsed_; - /// <summary> - /// 0 - new 1- used - /// </summary> - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public bool CartridgeUsed { - get { return cartridgeUsed_; } - set { - cartridgeUsed_ = value; + cartridge_ = value; } } @@ -150,22 +93,14 @@ namespace Tango.PMR.Stubs { if (ReferenceEquals(other, this)) { return true; } - if (CartridgeId != other.CartridgeId) return false; - if (CartridgeColor != other.CartridgeColor) return false; - if (CartridgeVersion != other.CartridgeVersion) return false; - if (CartridgeData != other.CartridgeData) return false; - if (CartridgeUsed != other.CartridgeUsed) return false; + if (!object.Equals(Cartridge, other.Cartridge)) return false; return true; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override int GetHashCode() { int hash = 1; - if (CartridgeId != 0) hash ^= CartridgeId.GetHashCode(); - if (CartridgeColor != 0) hash ^= CartridgeColor.GetHashCode(); - if (CartridgeVersion != 0) hash ^= CartridgeVersion.GetHashCode(); - if (CartridgeData != 0) hash ^= CartridgeData.GetHashCode(); - if (CartridgeUsed != false) hash ^= CartridgeUsed.GetHashCode(); + if (cartridge_ != null) hash ^= Cartridge.GetHashCode(); return hash; } @@ -176,45 +111,17 @@ namespace Tango.PMR.Stubs { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public void WriteTo(pb::CodedOutputStream output) { - if (CartridgeId != 0) { - output.WriteRawTag(8); - output.WriteUInt32(CartridgeId); - } - if (CartridgeColor != 0) { - output.WriteRawTag(16); - output.WriteUInt32(CartridgeColor); - } - if (CartridgeVersion != 0) { - output.WriteRawTag(24); - output.WriteUInt32(CartridgeVersion); - } - if (CartridgeData != 0) { - output.WriteRawTag(32); - output.WriteUInt32(CartridgeData); - } - if (CartridgeUsed != false) { - output.WriteRawTag(40); - output.WriteBool(CartridgeUsed); + if (cartridge_ != null) { + output.WriteRawTag(10); + output.WriteMessage(Cartridge); } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public int CalculateSize() { int size = 0; - if (CartridgeId != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CartridgeId); - } - if (CartridgeColor != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CartridgeColor); - } - if (CartridgeVersion != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CartridgeVersion); - } - if (CartridgeData != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CartridgeData); - } - if (CartridgeUsed != false) { - size += 1 + 1; + if (cartridge_ != null) { + size += 1 + pb::CodedOutputStream.ComputeMessageSize(Cartridge); } return size; } @@ -224,20 +131,11 @@ namespace Tango.PMR.Stubs { if (other == null) { return; } - if (other.CartridgeId != 0) { - CartridgeId = other.CartridgeId; - } - if (other.CartridgeColor != 0) { - CartridgeColor = other.CartridgeColor; - } - if (other.CartridgeVersion != 0) { - CartridgeVersion = other.CartridgeVersion; - } - if (other.CartridgeData != 0) { - CartridgeData = other.CartridgeData; - } - if (other.CartridgeUsed != false) { - CartridgeUsed = other.CartridgeUsed; + if (other.cartridge_ != null) { + if (cartridge_ == null) { + cartridge_ = new global::Tango.PMR.Diagnostics.Cartridge(); + } + Cartridge.MergeFrom(other.Cartridge); } } @@ -249,24 +147,11 @@ namespace Tango.PMR.Stubs { default: input.SkipLastField(); break; - case 8: { - CartridgeId = input.ReadUInt32(); - break; - } - case 16: { - CartridgeColor = input.ReadUInt32(); - break; - } - case 24: { - CartridgeVersion = input.ReadUInt32(); - break; - } - case 32: { - CartridgeData = input.ReadUInt32(); - break; - } - case 40: { - CartridgeUsed = input.ReadBool(); + case 10: { + if (cartridge_ == null) { + cartridge_ = new global::Tango.PMR.Diagnostics.Cartridge(); + } + input.ReadMessage(cartridge_); break; } } diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeWriteResponse.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeWriteResponse.cs index 881f4ec4f..ac541e47d 100644 --- a/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeWriteResponse.cs +++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubCartridgeWriteResponse.cs @@ -23,13 +23,13 @@ namespace Tango.PMR.Stubs { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "CiBTdHViQ2FydHJpZGdlV3JpdGVSZXNwb25zZS5wcm90bxIPVGFuZ28uUE1S", - "LlN0dWJzIlUKGlN0dWJDYXJ0cmlkZ2VXcml0ZVJlc3BvbnNlEhMKC0NhcnRy", - "aWRnZUlkGAEgASgNEg4KBlN0YXR1cxgCIAEoCRISCgpTdGF0dXNXb3JkGAMg", - "ASgNQhsKGWNvbS50d2luZS50YW5nby5wbXIuc3R1YnNiBnByb3RvMw==")); + "LlN0dWJzIjEKGlN0dWJDYXJ0cmlkZ2VXcml0ZVJlc3BvbnNlEhMKC0NhcnRy", + "aWRnZUlkGAEgASgNQhsKGWNvbS50d2luZS50YW5nby5wbXIuc3R1YnNiBnBy", + "b3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubCartridgeWriteResponse), global::Tango.PMR.Stubs.StubCartridgeWriteResponse.Parser, new[]{ "CartridgeId", "Status", "StatusWord" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubCartridgeWriteResponse), global::Tango.PMR.Stubs.StubCartridgeWriteResponse.Parser, new[]{ "CartridgeId" }, null, null, null) })); } #endregion @@ -61,8 +61,6 @@ namespace Tango.PMR.Stubs { [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public StubCartridgeWriteResponse(StubCartridgeWriteResponse other) : this() { cartridgeId_ = other.cartridgeId_; - status_ = other.status_; - statusWord_ = other.statusWord_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -81,34 +79,6 @@ namespace Tango.PMR.Stubs { } } - /// <summary>Field number for the "Status" field.</summary> - public const int StatusFieldNumber = 2; - private string status_ = ""; - /// <summary> - /// Passed/Failed - /// </summary> - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string Status { - get { return status_; } - set { - status_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); - } - } - - /// <summary>Field number for the "StatusWord" field.</summary> - public const int StatusWordFieldNumber = 3; - private uint statusWord_; - /// <summary> - /// Error number/bit when the status is Failed - /// </summary> - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint StatusWord { - get { return statusWord_; } - set { - statusWord_ = value; - } - } - [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as StubCartridgeWriteResponse); @@ -123,8 +93,6 @@ namespace Tango.PMR.Stubs { return true; } if (CartridgeId != other.CartridgeId) return false; - if (Status != other.Status) return false; - if (StatusWord != other.StatusWord) return false; return true; } @@ -132,8 +100,6 @@ namespace Tango.PMR.Stubs { public override int GetHashCode() { int hash = 1; if (CartridgeId != 0) hash ^= CartridgeId.GetHashCode(); - if (Status.Length != 0) hash ^= Status.GetHashCode(); - if (StatusWord != 0) hash ^= StatusWord.GetHashCode(); return hash; } @@ -148,14 +114,6 @@ namespace Tango.PMR.Stubs { output.WriteRawTag(8); output.WriteUInt32(CartridgeId); } - if (Status.Length != 0) { - output.WriteRawTag(18); - output.WriteString(Status); - } - if (StatusWord != 0) { - output.WriteRawTag(24); - output.WriteUInt32(StatusWord); - } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -164,12 +122,6 @@ namespace Tango.PMR.Stubs { if (CartridgeId != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(CartridgeId); } - if (Status.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(Status); - } - if (StatusWord != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(StatusWord); - } return size; } @@ -181,12 +133,6 @@ namespace Tango.PMR.Stubs { if (other.CartridgeId != 0) { CartridgeId = other.CartridgeId; } - if (other.Status.Length != 0) { - Status = other.Status; - } - if (other.StatusWord != 0) { - StatusWord = other.StatusWord; - } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -201,14 +147,6 @@ namespace Tango.PMR.Stubs { CartridgeId = input.ReadUInt32(); break; } - case 18: { - Status = input.ReadString(); - break; - } - case 24: { - StatusWord = input.ReadUInt32(); - break; - } } } } diff --git a/Software/Visual_Studio/Tango.PMR/Stubs/StubWhsEEpromData.cs b/Software/Visual_Studio/Tango.PMR/Stubs/StubWhsEEpromData.cs index f34cebdc9..21aaf0e68 100644 --- a/Software/Visual_Studio/Tango.PMR/Stubs/StubWhsEEpromData.cs +++ b/Software/Visual_Studio/Tango.PMR/Stubs/StubWhsEEpromData.cs @@ -22,22 +22,63 @@ namespace Tango.PMR.Stubs { static StubWhsEEpromDataReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChdTdHViV2hzRUVwcm9tRGF0YS5wcm90bxIPVGFuZ28uUE1SLlN0dWJzIrgD", - "ChFTdHViV2hzRUVwcm9tRGF0YRIOCgZIZWFkZXIYASABKA0SEwoLVGFibGVM", - "ZW5ndGgYAiABKA0SFAoMVGFibGV2ZXJzaW9uGAMgASgNEg4KBldoc1BfThgE", - "IAEoCRIOCgZQQ0JTX04YBSABKAkSFQoNUENCUGFydE51bWJlchgGIAEoCRIO", - "CgZXaHNTX04YByABKAkSFAoMT3JpZmljZTFGbG93GAggASgBEhUKDU9yaWZp", - "Y2UxU2xvcGUYCSABKAESFAoMT3JpZmljZTJGbG93GAogASgBEhUKDU9yaWZp", - "Y2UyU2xvcGUYCyABKAESFAoMT3JpZmljZTNGbG93GAwgASgBEhUKDU9yaWZp", - "Y2UzU2xvcGUYDSABKAESGAoQT3JpZmljZVZhbHZlRmxvdxgOIAEoARIZChFP", - "cmlmaWNlVmFsdmVTbG9wZRgPIAEoARIbChNWT0NJbnN0YWxsYXRpb25EYXRl", - "GBAgASgJEh4KFkZpbHRlckluc3RhbGxhdGlvbkRhdGUYESABKAkSFgoOUHJv", - "ZHVjdGlvbkRhdGUYEiABKAkSEAoIQ2hlY2tTdW0YEyABKA1CGwoZY29tLnR3", - "aW5lLnRhbmdvLnBtci5zdHVic2IGcHJvdG8z")); + "ChdTdHViV2hzRUVwcm9tRGF0YS5wcm90bxIPVGFuZ28uUE1SLlN0dWJzIv4R", + "ChFTdHViV2hzRUVwcm9tRGF0YRIOCgZIZWFkZXIYASABKA0SFAoMVGFibGVf", + "TGVuZ3RoGAIgASgNEhUKDVRhYmxlX3ZlcnNpb24YAyABKA0SDgoGV0hTX1NO", + "GAQgASgJEg4KBlBDQl9TThgFIAEoCRIXCg9XSFNfUGFydF9OdW1iZXIYBiAB", + "KAkSFwoPUENCX1BhcnRfTnVtYmVyGAcgASgJEhQKDFJ1bm5pbmdIb3VycxgI", + "IAEoDRISCgpTV19SZXNlcnZlGAkgASgNEhwKFFByb2R1Y3Rpb25fVGVzdF9E", + "YXRlGAogASgJEhQKDFRlc3RQYXNzRmFpbBgLIAEoCRIUCgxBVFNfTG9jYXRp", + "b24YDCABKA0SIQoZT3JpZmljZV9XYXN0ZV9MZXZlbF9WMF9tbBgNIAEoARIf", + "ChdmbG93X2NhbGNfY29lZmZpY2llbnRfQxgOIAEoARIUCgxPcmlmaWNlMUZs", + "b3cYDyABKAESFQoNT3JpZmljZTFTbG9wZRgQIAEoARIbChNPcmlmaWNlMU1h", + "eFByZXNzdXJlGBEgASgBEiEKGU9yaWZpY2UxQ2FsaWJyYXRpb25GYWN0b3IY", + "EiABKAESFAoMT3JpZmljZTJGbG93GBMgASgBEhUKDU9yaWZpY2UyU2xvcGUY", + "FCABKAESGwoTT3JpZmljZTJNYXhQcmVzc3VyZRgVIAEoARIhChlPcmlmaWNl", + "MkNhbGlicmF0aW9uRmFjdG9yGBYgASgBEhQKDE9yaWZpY2UzRmxvdxgXIAEo", + "ARIVCg1PcmlmaWNlM1Nsb3BlGBggASgBEhsKE09yaWZpY2UzTWF4UHJlc3N1", + "cmUYGSABKAESIQoZT3JpZmljZTNDYWxpYnJhdGlvbkZhY3RvchgaIAEoARIY", + "ChBPcmlmaWNlVmFsdmVGbG93GBsgASgBEhkKEU9yaWZpY2VWYWx2ZVNsb3Bl", + "GBwgASgBEh8KF09yaWZpY2VWYWx2ZU1heFByZXNzdXJlGB0gASgBEiUKHU9y", + "aWZpY2VWYWx2ZUNhbGlicmF0aW9uRmFjdG9yGB4gASgBEhwKFEZhbnNfMV80", + "X1BXTV9taW5fUGN0GB8gASgBEhwKFEZhbnNfMV80X1JQTV9QV01fbWluGCAg", + "ASgBEhwKFEZhbnNfMV80X1BXTV9tYXhfUGN0GCEgASgBEhwKFEZhbnNfMV80", + "X1JQTV9QV01fbWF4GCIgASgBEhwKFEZhbnNfMV80X05vbV9QV01fUGN0GCMg", + "ASgBEhgKEEZhbnNfMV80X05vbV9SUE0YJCABKAESKAogRmFuc18xXzRfUlBN", + "X0xpbWl0X1BjdF9iZWxvd19Ob20YJSABKAESJQodRmFuc18xXzRfUHVsc2Vf", + "UGVyX1Jldm9sdXRpb24YJiABKAESFwoPRmFuc18xXzRfU3BhcmUxGCcgASgB", + "EhcKD0ZhbnNfMV80X1NwYXJlMhgoIAEoARIYChBGYW5zXzVfNl9Ob21fUlBN", + "GCkgASgBEigKIEZhbnNfNV82X1JQTV9MaW1pdF9QY3RfYmVsb3dfTm9tGCog", + "ASgBEiUKHUZhbnNfNV82X1B1bHNlX1Blcl9SZXZvbHV0aW9uGCsgASgBEhcK", + "D0ZhbnNfNV82X1NwYXJlMRgsIAEoARIXCg9GYW5zXzVfNl9TcGFyZTIYLSAB", + "KAESFQoNQmxvd2VyX1BfR2FpbhguIAEoARIZChFCbG93ZXJfQ0ZNUlBNX21p", + "bhgvIAEoARIaChJCbG93ZXJfUlBNX0NGTV9tYXgYMCABKAESIQoZQmxvd2Vy", + "X0NhbGlicmF0aW9uX2ZhY3RvchgxIAEoARIVCg1CbG93ZXJfU3BhcmUxGDIg", + "ASgBEhUKDUJsb3dlcl9TcGFyZTIYMyABKAESEQoJVk9DX2xpbWl0GDQgASgB", + "EhIKClZPQ19TcGFyZTEYNSABKAESEgoKVk9DX1NwYXJlMhg2IAEoARIcChRD", + "b250cm9sbGVyX0NvbW1fVHlwZRg3IAEoARIXCg9Db250cm9sbGVyX1R5cGUY", + "OCABKAESEwoLU2Vuc29yX3R5cGUYOSABKAESEgoKQ29vbGVyX0NfRhg6IAEo", + "ARIRCglDb29sZXJfU1YYOyABKAESEAoIQ29vbGVyX1AYPCABKAESEAoIQ29v", + "bGVyX0kYPSABKAESEAoIQ29vbGVyX0QYPiABKAESIgoaV2FybmluZ19jb25m", + "aWd1cmF0aW9uX1BhcjEYPyABKAESIgoaV2FybmluZ19jb25maWd1cmF0aW9u", + "X1BhcjIYQCABKAESIgoaV2FybmluZ19jb25maWd1cmF0aW9uX1BhcjMYQSAB", + "KAESIgoaV2FybmluZ19jb25maWd1cmF0aW9uX1BhcjQYQiABKAESIgoaV2Fy", + "bmluZ19jb25maWd1cmF0aW9uX1BhcjUYQyABKAESIgoaV2FybmluZ19jb25m", + "aWd1cmF0aW9uX1BhcjYYRCABKAESGQoRV2FybmluZ190aHJlc2hvbGQYRSAB", + "KAESGQoRQ29udHJvbGxlcl9TcGFyZTEYRiABKAESGQoRQ29udHJvbGxlcl9T", + "cGFyZTIYRyABKAESGQoRQ29udHJvbGxlcl9TcGFyZTMYSCABKAESGQoRQ29u", + "dHJvbGxlcl9TcGFyZTQYSSABKAESGQoRQ29udHJvbGxlcl9TcGFyZTUYSiAB", + "KAESEQoJVGVzdF9EYXRlGEsgASgBEgwKBFRlc3QYTCABKAkSJgoeV2FzdGVf", + "UHVtcF9GbG93X3ZvbHVtZV9wZXJfc2VjGE0gASgBEicKH1dhc3RlX1B1bXBf", + "Rmxvd19WX3Blcl9zZWNfTGltaXQYTiABKAESHAoURmlsdGVyX21heF9saWZl", + "X3NwYW4YTyABKAESGgoSRmlsdGVyX3VzYWdlX2hvdXJzGFAgASgBEhsKE1ZP", + "Q0luc3RhbGxhdGlvbkRhdGUYUSABKAkSHgoWRmlsdGVySW5zdGFsbGF0aW9u", + "RGF0ZRhSIAEoCRIWCg5Qcm9kdWN0aW9uRGF0ZRhTIAEoCRIQCghDaGVja1N1", + "bRhUIAEoDUIbChljb20udHdpbmUudGFuZ28ucG1yLnN0dWJzYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubWhsEEpromData), global::Tango.PMR.Stubs.StubWhsEEpromData.Parser, new[]{ "Header", "TableLength", "Tableversion", "WhsPN", "PCBSN", "PCBPartNumber", "WhsSN", "Orifice1Flow", "Orifice1Slope", "Orifice2Flow", "Orifice2Slope", "Orifice3Flow", "Orifice3Slope", "OrificeValveFlow", "OrificeValveSlope", "VOCInstallationDate", "FilterInstallationDate", "ProductionDate", "CheckSum" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.Stubs.StubWhsEEpromData), global::Tango.PMR.Stubs.StubWhsEEpromData.Parser, new[]{ "Header", "TableLength", "TableVersion", "WHSSN", "PCBSN", "WHSPartNumber", "PCBPartNumber", "RunningHours", "SWReserve", "ProductionTestDate", "TestPassFail", "ATSLocation", "OrificeWasteLevelV0Ml", "FlowCalcCoefficientC", "Orifice1Flow", "Orifice1Slope", "Orifice1MaxPressure", "Orifice1CalibrationFactor", "Orifice2Flow", "Orifice2Slope", "Orifice2MaxPressure", "Orifice2CalibrationFactor", "Orifice3Flow", "Orifice3Slope", "Orifice3MaxPressure", "Orifice3CalibrationFactor", "OrificeValveFlow", "OrificeValveSlope", "OrificeValveMaxPressure", "OrificeValveCalibrationFactor", "Fans14PWMMinPct", "Fans14RPMPWMMin", "Fans14PWMMaxPct", "Fans14RPMPWMMax", "Fans14NomPWMPct", "Fans14NomRPM", "Fans14RPMLimitPctBelowNom", "Fans14PulsePerRevolution", "Fans14Spare1", "Fans14Spare2", "Fans56NomRPM", "Fans56RPMLimitPctBelowNom", "Fans56PulsePerRevolution", "Fans56Spare1", "Fans56Spare2", "BlowerPGain", "BlowerCFMRPMMin", "BlowerRPMCFMMax", "BlowerCalibrationFactor", "BlowerSpare1", "BlowerSpare2", "VOCLimit", "VOCSpare1", "VOCSpare2", "ControllerCommType", "ControllerType", "SensorType", "CoolerCF", "CoolerSV", "CoolerP", "CoolerI", "CoolerD", "WarningConfigurationPar1", "WarningConfigurationPar2", "WarningConfigurationPar3", "WarningConfigurationPar4", "WarningConfigurationPar5", "WarningConfigurationPar6", "WarningThreshold", "ControllerSpare1", "ControllerSpare2", "ControllerSpare3", "ControllerSpare4", "ControllerSpare5", "TestDate", "Test", "WastePumpFlowVolumePerSec", "WastePumpFlowVPerSecLimit", "FilterMaxLifeSpan", "FilterUsageHours", "VOCInstallationDate", "FilterInstallationDate", "ProductionDate", "CheckSum" }, null, null, null) })); } #endregion @@ -70,19 +111,84 @@ namespace Tango.PMR.Stubs { public StubWhsEEpromData(StubWhsEEpromData other) : this() { header_ = other.header_; tableLength_ = other.tableLength_; - tableversion_ = other.tableversion_; - whsPN_ = other.whsPN_; + tableVersion_ = other.tableVersion_; + wHSSN_ = other.wHSSN_; pCBSN_ = other.pCBSN_; + wHSPartNumber_ = other.wHSPartNumber_; pCBPartNumber_ = other.pCBPartNumber_; - whsSN_ = other.whsSN_; + runningHours_ = other.runningHours_; + sWReserve_ = other.sWReserve_; + productionTestDate_ = other.productionTestDate_; + testPassFail_ = other.testPassFail_; + aTSLocation_ = other.aTSLocation_; + orificeWasteLevelV0Ml_ = other.orificeWasteLevelV0Ml_; + flowCalcCoefficientC_ = other.flowCalcCoefficientC_; orifice1Flow_ = other.orifice1Flow_; orifice1Slope_ = other.orifice1Slope_; + orifice1MaxPressure_ = other.orifice1MaxPressure_; + orifice1CalibrationFactor_ = other.orifice1CalibrationFactor_; orifice2Flow_ = other.orifice2Flow_; orifice2Slope_ = other.orifice2Slope_; + orifice2MaxPressure_ = other.orifice2MaxPressure_; + orifice2CalibrationFactor_ = other.orifice2CalibrationFactor_; orifice3Flow_ = other.orifice3Flow_; orifice3Slope_ = other.orifice3Slope_; + orifice3MaxPressure_ = other.orifice3MaxPressure_; + orifice3CalibrationFactor_ = other.orifice3CalibrationFactor_; orificeValveFlow_ = other.orificeValveFlow_; orificeValveSlope_ = other.orificeValveSlope_; + orificeValveMaxPressure_ = other.orificeValveMaxPressure_; + orificeValveCalibrationFactor_ = other.orificeValveCalibrationFactor_; + fans14PWMMinPct_ = other.fans14PWMMinPct_; + fans14RPMPWMMin_ = other.fans14RPMPWMMin_; + fans14PWMMaxPct_ = other.fans14PWMMaxPct_; + fans14RPMPWMMax_ = other.fans14RPMPWMMax_; + fans14NomPWMPct_ = other.fans14NomPWMPct_; + fans14NomRPM_ = other.fans14NomRPM_; + fans14RPMLimitPctBelowNom_ = other.fans14RPMLimitPctBelowNom_; + fans14PulsePerRevolution_ = other.fans14PulsePerRevolution_; + fans14Spare1_ = other.fans14Spare1_; + fans14Spare2_ = other.fans14Spare2_; + fans56NomRPM_ = other.fans56NomRPM_; + fans56RPMLimitPctBelowNom_ = other.fans56RPMLimitPctBelowNom_; + fans56PulsePerRevolution_ = other.fans56PulsePerRevolution_; + fans56Spare1_ = other.fans56Spare1_; + fans56Spare2_ = other.fans56Spare2_; + blowerPGain_ = other.blowerPGain_; + blowerCFMRPMMin_ = other.blowerCFMRPMMin_; + blowerRPMCFMMax_ = other.blowerRPMCFMMax_; + blowerCalibrationFactor_ = other.blowerCalibrationFactor_; + blowerSpare1_ = other.blowerSpare1_; + blowerSpare2_ = other.blowerSpare2_; + vOCLimit_ = other.vOCLimit_; + vOCSpare1_ = other.vOCSpare1_; + vOCSpare2_ = other.vOCSpare2_; + controllerCommType_ = other.controllerCommType_; + controllerType_ = other.controllerType_; + sensorType_ = other.sensorType_; + coolerCF_ = other.coolerCF_; + coolerSV_ = other.coolerSV_; + coolerP_ = other.coolerP_; + coolerI_ = other.coolerI_; + coolerD_ = other.coolerD_; + warningConfigurationPar1_ = other.warningConfigurationPar1_; + warningConfigurationPar2_ = other.warningConfigurationPar2_; + warningConfigurationPar3_ = other.warningConfigurationPar3_; + warningConfigurationPar4_ = other.warningConfigurationPar4_; + warningConfigurationPar5_ = other.warningConfigurationPar5_; + warningConfigurationPar6_ = other.warningConfigurationPar6_; + warningThreshold_ = other.warningThreshold_; + controllerSpare1_ = other.controllerSpare1_; + controllerSpare2_ = other.controllerSpare2_; + controllerSpare3_ = other.controllerSpare3_; + controllerSpare4_ = other.controllerSpare4_; + controllerSpare5_ = other.controllerSpare5_; + testDate_ = other.testDate_; + test_ = other.test_; + wastePumpFlowVolumePerSec_ = other.wastePumpFlowVolumePerSec_; + wastePumpFlowVPerSecLimit_ = other.wastePumpFlowVPerSecLimit_; + filterMaxLifeSpan_ = other.filterMaxLifeSpan_; + filterUsageHours_ = other.filterUsageHours_; vOCInstallationDate_ = other.vOCInstallationDate_; filterInstallationDate_ = other.filterInstallationDate_; productionDate_ = other.productionDate_; @@ -105,7 +211,7 @@ namespace Tango.PMR.Stubs { } } - /// <summary>Field number for the "TableLength" field.</summary> + /// <summary>Field number for the "Table_Length" field.</summary> public const int TableLengthFieldNumber = 2; private uint tableLength_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -116,29 +222,29 @@ namespace Tango.PMR.Stubs { } } - /// <summary>Field number for the "Tableversion" field.</summary> - public const int TableversionFieldNumber = 3; - private uint tableversion_; + /// <summary>Field number for the "Table_version" field.</summary> + public const int TableVersionFieldNumber = 3; + private uint tableVersion_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public uint Tableversion { - get { return tableversion_; } + public uint TableVersion { + get { return tableVersion_; } set { - tableversion_ = value; + tableVersion_ = value; } } - /// <summary>Field number for the "WhsP_N" field.</summary> - public const int WhsPNFieldNumber = 4; - private string whsPN_ = ""; + /// <summary>Field number for the "WHS_SN" field.</summary> + public const int WHSSNFieldNumber = 4; + private string wHSSN_ = ""; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string WhsPN { - get { return whsPN_; } + public string WHSSN { + get { return wHSSN_; } set { - whsPN_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + wHSSN_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); } } - /// <summary>Field number for the "PCBS_N" field.</summary> + /// <summary>Field number for the "PCB_SN" field.</summary> public const int PCBSNFieldNumber = 5; private string pCBSN_ = ""; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -149,8 +255,19 @@ namespace Tango.PMR.Stubs { } } - /// <summary>Field number for the "PCBPartNumber" field.</summary> - public const int PCBPartNumberFieldNumber = 6; + /// <summary>Field number for the "WHS_Part_Number" field.</summary> + public const int WHSPartNumberFieldNumber = 6; + private string wHSPartNumber_ = ""; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public string WHSPartNumber { + get { return wHSPartNumber_; } + set { + wHSPartNumber_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// <summary>Field number for the "PCB_Part_Number" field.</summary> + public const int PCBPartNumberFieldNumber = 7; private string pCBPartNumber_ = ""; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public string PCBPartNumber { @@ -160,19 +277,85 @@ namespace Tango.PMR.Stubs { } } - /// <summary>Field number for the "WhsS_N" field.</summary> - public const int WhsSNFieldNumber = 7; - private string whsSN_ = ""; + /// <summary>Field number for the "RunningHours" field.</summary> + public const int RunningHoursFieldNumber = 8; + private uint runningHours_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint RunningHours { + get { return runningHours_; } + set { + runningHours_ = value; + } + } + + /// <summary>Field number for the "SW_Reserve" field.</summary> + public const int SWReserveFieldNumber = 9; + private uint sWReserve_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint SWReserve { + get { return sWReserve_; } + set { + sWReserve_ = value; + } + } + + /// <summary>Field number for the "Production_Test_Date" field.</summary> + public const int ProductionTestDateFieldNumber = 10; + private string productionTestDate_ = ""; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] - public string WhsSN { - get { return whsSN_; } + public string ProductionTestDate { + get { return productionTestDate_; } set { - whsSN_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + productionTestDate_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// <summary>Field number for the "TestPassFail" field.</summary> + public const int TestPassFailFieldNumber = 11; + private string testPassFail_ = ""; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public string TestPassFail { + get { return testPassFail_; } + set { + testPassFail_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// <summary>Field number for the "ATS_Location" field.</summary> + public const int ATSLocationFieldNumber = 12; + private uint aTSLocation_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public uint ATSLocation { + get { return aTSLocation_; } + set { + aTSLocation_ = value; + } + } + + /// <summary>Field number for the "Orifice_Waste_Level_V0_ml" field.</summary> + public const int OrificeWasteLevelV0MlFieldNumber = 13; + private double orificeWasteLevelV0Ml_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double OrificeWasteLevelV0Ml { + get { return orificeWasteLevelV0Ml_; } + set { + orificeWasteLevelV0Ml_ = value; + } + } + + /// <summary>Field number for the "flow_calc_coefficient_C" field.</summary> + public const int FlowCalcCoefficientCFieldNumber = 14; + private double flowCalcCoefficientC_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double FlowCalcCoefficientC { + get { return flowCalcCoefficientC_; } + set { + flowCalcCoefficientC_ = value; } } /// <summary>Field number for the "Orifice1Flow" field.</summary> - public const int Orifice1FlowFieldNumber = 8; + public const int Orifice1FlowFieldNumber = 15; private double orifice1Flow_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public double Orifice1Flow { @@ -183,7 +366,7 @@ namespace Tango.PMR.Stubs { } /// <summary>Field number for the "Orifice1Slope" field.</summary> - public const int Orifice1SlopeFieldNumber = 9; + public const int Orifice1SlopeFieldNumber = 16; private double orifice1Slope_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public double Orifice1Slope { @@ -193,8 +376,30 @@ namespace Tango.PMR.Stubs { } } + /// <summary>Field number for the "Orifice1MaxPressure" field.</summary> + public const int Orifice1MaxPressureFieldNumber = 17; + private double orifice1MaxPressure_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double Orifice1MaxPressure { + get { return orifice1MaxPressure_; } + set { + orifice1MaxPressure_ = value; + } + } + + /// <summary>Field number for the "Orifice1CalibrationFactor" field.</summary> + public const int Orifice1CalibrationFactorFieldNumber = 18; + private double orifice1CalibrationFactor_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double Orifice1CalibrationFactor { + get { return orifice1CalibrationFactor_; } + set { + orifice1CalibrationFactor_ = value; + } + } + /// <summary>Field number for the "Orifice2Flow" field.</summary> - public const int Orifice2FlowFieldNumber = 10; + public const int Orifice2FlowFieldNumber = 19; private double orifice2Flow_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public double Orifice2Flow { @@ -205,7 +410,7 @@ namespace Tango.PMR.Stubs { } /// <summary>Field number for the "Orifice2Slope" field.</summary> - public const int Orifice2SlopeFieldNumber = 11; + public const int Orifice2SlopeFieldNumber = 20; private double orifice2Slope_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public double Orifice2Slope { @@ -215,8 +420,30 @@ namespace Tango.PMR.Stubs { } } + /// <summary>Field number for the "Orifice2MaxPressure" field.</summary> + public const int Orifice2MaxPressureFieldNumber = 21; + private double orifice2MaxPressure_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double Orifice2MaxPressure { + get { return orifice2MaxPressure_; } + set { + orifice2MaxPressure_ = value; + } + } + + /// <summary>Field number for the "Orifice2CalibrationFactor" field.</summary> + public const int Orifice2CalibrationFactorFieldNumber = 22; + private double orifice2CalibrationFactor_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double Orifice2CalibrationFactor { + get { return orifice2CalibrationFactor_; } + set { + orifice2CalibrationFactor_ = value; + } + } + /// <summary>Field number for the "Orifice3Flow" field.</summary> - public const int Orifice3FlowFieldNumber = 12; + public const int Orifice3FlowFieldNumber = 23; private double orifice3Flow_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public double Orifice3Flow { @@ -227,7 +454,7 @@ namespace Tango.PMR.Stubs { } /// <summary>Field number for the "Orifice3Slope" field.</summary> - public const int Orifice3SlopeFieldNumber = 13; + public const int Orifice3SlopeFieldNumber = 24; private double orifice3Slope_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public double Orifice3Slope { @@ -237,8 +464,30 @@ namespace Tango.PMR.Stubs { } } + /// <summary>Field number for the "Orifice3MaxPressure" field.</summary> + public const int Orifice3MaxPressureFieldNumber = 25; + private double orifice3MaxPressure_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double Orifice3MaxPressure { + get { return orifice3MaxPressure_; } + set { + orifice3MaxPressure_ = value; + } + } + + /// <summary>Field number for the "Orifice3CalibrationFactor" field.</summary> + public const int Orifice3CalibrationFactorFieldNumber = 26; + private double orifice3CalibrationFactor_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double Orifice3CalibrationFactor { + get { return orifice3CalibrationFactor_; } + set { + orifice3CalibrationFactor_ = value; + } + } + /// <summary>Field number for the "OrificeValveFlow" field.</summary> - public const int OrificeValveFlowFieldNumber = 14; + public const int OrificeValveFlowFieldNumber = 27; private double orificeValveFlow_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public double OrificeValveFlow { @@ -249,7 +498,7 @@ namespace Tango.PMR.Stubs { } /// <summary>Field number for the "OrificeValveSlope" field.</summary> - public const int OrificeValveSlopeFieldNumber = 15; + public const int OrificeValveSlopeFieldNumber = 28; private double orificeValveSlope_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public double OrificeValveSlope { @@ -259,8 +508,580 @@ namespace Tango.PMR.Stubs { } } + /// <summary>Field number for the "OrificeValveMaxPressure" field.</summary> + public const int OrificeValveMaxPressureFieldNumber = 29; + private double orificeValveMaxPressure_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double OrificeValveMaxPressure { + get { return orificeValveMaxPressure_; } + set { + orificeValveMaxPressure_ = value; + } + } + + /// <summary>Field number for the "OrificeValveCalibrationFactor" field.</summary> + public const int OrificeValveCalibrationFactorFieldNumber = 30; + private double orificeValveCalibrationFactor_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double OrificeValveCalibrationFactor { + get { return orificeValveCalibrationFactor_; } + set { + orificeValveCalibrationFactor_ = value; + } + } + + /// <summary>Field number for the "Fans_1_4_PWM_min_Pct" field.</summary> + public const int Fans14PWMMinPctFieldNumber = 31; + private double fans14PWMMinPct_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double Fans14PWMMinPct { + get { return fans14PWMMinPct_; } + set { + fans14PWMMinPct_ = value; + } + } + + /// <summary>Field number for the "Fans_1_4_RPM_PWM_min" field.</summary> + public const int Fans14RPMPWMMinFieldNumber = 32; + private double fans14RPMPWMMin_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double Fans14RPMPWMMin { + get { return fans14RPMPWMMin_; } + set { + fans14RPMPWMMin_ = value; + } + } + + /// <summary>Field number for the "Fans_1_4_PWM_max_Pct" field.</summary> + public const int Fans14PWMMaxPctFieldNumber = 33; + private double fans14PWMMaxPct_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double Fans14PWMMaxPct { + get { return fans14PWMMaxPct_; } + set { + fans14PWMMaxPct_ = value; + } + } + + /// <summary>Field number for the "Fans_1_4_RPM_PWM_max" field.</summary> + public const int Fans14RPMPWMMaxFieldNumber = 34; + private double fans14RPMPWMMax_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double Fans14RPMPWMMax { + get { return fans14RPMPWMMax_; } + set { + fans14RPMPWMMax_ = value; + } + } + + /// <summary>Field number for the "Fans_1_4_Nom_PWM_Pct" field.</summary> + public const int Fans14NomPWMPctFieldNumber = 35; + private double fans14NomPWMPct_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double Fans14NomPWMPct { + get { return fans14NomPWMPct_; } + set { + fans14NomPWMPct_ = value; + } + } + + /// <summary>Field number for the "Fans_1_4_Nom_RPM" field.</summary> + public const int Fans14NomRPMFieldNumber = 36; + private double fans14NomRPM_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double Fans14NomRPM { + get { return fans14NomRPM_; } + set { + fans14NomRPM_ = value; + } + } + + /// <summary>Field number for the "Fans_1_4_RPM_Limit_Pct_below_Nom" field.</summary> + public const int Fans14RPMLimitPctBelowNomFieldNumber = 37; + private double fans14RPMLimitPctBelowNom_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double Fans14RPMLimitPctBelowNom { + get { return fans14RPMLimitPctBelowNom_; } + set { + fans14RPMLimitPctBelowNom_ = value; + } + } + + /// <summary>Field number for the "Fans_1_4_Pulse_Per_Revolution" field.</summary> + public const int Fans14PulsePerRevolutionFieldNumber = 38; + private double fans14PulsePerRevolution_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double Fans14PulsePerRevolution { + get { return fans14PulsePerRevolution_; } + set { + fans14PulsePerRevolution_ = value; + } + } + + /// <summary>Field number for the "Fans_1_4_Spare1" field.</summary> + public const int Fans14Spare1FieldNumber = 39; + private double fans14Spare1_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double Fans14Spare1 { + get { return fans14Spare1_; } + set { + fans14Spare1_ = value; + } + } + + /// <summary>Field number for the "Fans_1_4_Spare2" field.</summary> + public const int Fans14Spare2FieldNumber = 40; + private double fans14Spare2_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double Fans14Spare2 { + get { return fans14Spare2_; } + set { + fans14Spare2_ = value; + } + } + + /// <summary>Field number for the "Fans_5_6_Nom_RPM" field.</summary> + public const int Fans56NomRPMFieldNumber = 41; + private double fans56NomRPM_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double Fans56NomRPM { + get { return fans56NomRPM_; } + set { + fans56NomRPM_ = value; + } + } + + /// <summary>Field number for the "Fans_5_6_RPM_Limit_Pct_below_Nom" field.</summary> + public const int Fans56RPMLimitPctBelowNomFieldNumber = 42; + private double fans56RPMLimitPctBelowNom_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double Fans56RPMLimitPctBelowNom { + get { return fans56RPMLimitPctBelowNom_; } + set { + fans56RPMLimitPctBelowNom_ = value; + } + } + + /// <summary>Field number for the "Fans_5_6_Pulse_Per_Revolution" field.</summary> + public const int Fans56PulsePerRevolutionFieldNumber = 43; + private double fans56PulsePerRevolution_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double Fans56PulsePerRevolution { + get { return fans56PulsePerRevolution_; } + set { + fans56PulsePerRevolution_ = value; + } + } + + /// <summary>Field number for the "Fans_5_6_Spare1" field.</summary> + public const int Fans56Spare1FieldNumber = 44; + private double fans56Spare1_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double Fans56Spare1 { + get { return fans56Spare1_; } + set { + fans56Spare1_ = value; + } + } + + /// <summary>Field number for the "Fans_5_6_Spare2" field.</summary> + public const int Fans56Spare2FieldNumber = 45; + private double fans56Spare2_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double Fans56Spare2 { + get { return fans56Spare2_; } + set { + fans56Spare2_ = value; + } + } + + /// <summary>Field number for the "Blower_P_Gain" field.</summary> + public const int BlowerPGainFieldNumber = 46; + private double blowerPGain_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double BlowerPGain { + get { return blowerPGain_; } + set { + blowerPGain_ = value; + } + } + + /// <summary>Field number for the "Blower_CFMRPM_min" field.</summary> + public const int BlowerCFMRPMMinFieldNumber = 47; + private double blowerCFMRPMMin_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double BlowerCFMRPMMin { + get { return blowerCFMRPMMin_; } + set { + blowerCFMRPMMin_ = value; + } + } + + /// <summary>Field number for the "Blower_RPM_CFM_max" field.</summary> + public const int BlowerRPMCFMMaxFieldNumber = 48; + private double blowerRPMCFMMax_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double BlowerRPMCFMMax { + get { return blowerRPMCFMMax_; } + set { + blowerRPMCFMMax_ = value; + } + } + + /// <summary>Field number for the "Blower_Calibration_factor" field.</summary> + public const int BlowerCalibrationFactorFieldNumber = 49; + private double blowerCalibrationFactor_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double BlowerCalibrationFactor { + get { return blowerCalibrationFactor_; } + set { + blowerCalibrationFactor_ = value; + } + } + + /// <summary>Field number for the "Blower_Spare1" field.</summary> + public const int BlowerSpare1FieldNumber = 50; + private double blowerSpare1_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double BlowerSpare1 { + get { return blowerSpare1_; } + set { + blowerSpare1_ = value; + } + } + + /// <summary>Field number for the "Blower_Spare2" field.</summary> + public const int BlowerSpare2FieldNumber = 51; + private double blowerSpare2_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double BlowerSpare2 { + get { return blowerSpare2_; } + set { + blowerSpare2_ = value; + } + } + + /// <summary>Field number for the "VOC_limit" field.</summary> + public const int VOCLimitFieldNumber = 52; + private double vOCLimit_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double VOCLimit { + get { return vOCLimit_; } + set { + vOCLimit_ = value; + } + } + + /// <summary>Field number for the "VOC_Spare1" field.</summary> + public const int VOCSpare1FieldNumber = 53; + private double vOCSpare1_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double VOCSpare1 { + get { return vOCSpare1_; } + set { + vOCSpare1_ = value; + } + } + + /// <summary>Field number for the "VOC_Spare2" field.</summary> + public const int VOCSpare2FieldNumber = 54; + private double vOCSpare2_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double VOCSpare2 { + get { return vOCSpare2_; } + set { + vOCSpare2_ = value; + } + } + + /// <summary>Field number for the "Controller_Comm_Type" field.</summary> + public const int ControllerCommTypeFieldNumber = 55; + private double controllerCommType_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double ControllerCommType { + get { return controllerCommType_; } + set { + controllerCommType_ = value; + } + } + + /// <summary>Field number for the "Controller_Type" field.</summary> + public const int ControllerTypeFieldNumber = 56; + private double controllerType_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double ControllerType { + get { return controllerType_; } + set { + controllerType_ = value; + } + } + + /// <summary>Field number for the "Sensor_type" field.</summary> + public const int SensorTypeFieldNumber = 57; + private double sensorType_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double SensorType { + get { return sensorType_; } + set { + sensorType_ = value; + } + } + + /// <summary>Field number for the "Cooler_C_F" field.</summary> + public const int CoolerCFFieldNumber = 58; + private double coolerCF_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double CoolerCF { + get { return coolerCF_; } + set { + coolerCF_ = value; + } + } + + /// <summary>Field number for the "Cooler_SV" field.</summary> + public const int CoolerSVFieldNumber = 59; + private double coolerSV_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double CoolerSV { + get { return coolerSV_; } + set { + coolerSV_ = value; + } + } + + /// <summary>Field number for the "Cooler_P" field.</summary> + public const int CoolerPFieldNumber = 60; + private double coolerP_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double CoolerP { + get { return coolerP_; } + set { + coolerP_ = value; + } + } + + /// <summary>Field number for the "Cooler_I" field.</summary> + public const int CoolerIFieldNumber = 61; + private double coolerI_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double CoolerI { + get { return coolerI_; } + set { + coolerI_ = value; + } + } + + /// <summary>Field number for the "Cooler_D" field.</summary> + public const int CoolerDFieldNumber = 62; + private double coolerD_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double CoolerD { + get { return coolerD_; } + set { + coolerD_ = value; + } + } + + /// <summary>Field number for the "Warning_configuration_Par1" field.</summary> + public const int WarningConfigurationPar1FieldNumber = 63; + private double warningConfigurationPar1_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double WarningConfigurationPar1 { + get { return warningConfigurationPar1_; } + set { + warningConfigurationPar1_ = value; + } + } + + /// <summary>Field number for the "Warning_configuration_Par2" field.</summary> + public const int WarningConfigurationPar2FieldNumber = 64; + private double warningConfigurationPar2_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double WarningConfigurationPar2 { + get { return warningConfigurationPar2_; } + set { + warningConfigurationPar2_ = value; + } + } + + /// <summary>Field number for the "Warning_configuration_Par3" field.</summary> + public const int WarningConfigurationPar3FieldNumber = 65; + private double warningConfigurationPar3_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double WarningConfigurationPar3 { + get { return warningConfigurationPar3_; } + set { + warningConfigurationPar3_ = value; + } + } + + /// <summary>Field number for the "Warning_configuration_Par4" field.</summary> + public const int WarningConfigurationPar4FieldNumber = 66; + private double warningConfigurationPar4_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double WarningConfigurationPar4 { + get { return warningConfigurationPar4_; } + set { + warningConfigurationPar4_ = value; + } + } + + /// <summary>Field number for the "Warning_configuration_Par5" field.</summary> + public const int WarningConfigurationPar5FieldNumber = 67; + private double warningConfigurationPar5_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double WarningConfigurationPar5 { + get { return warningConfigurationPar5_; } + set { + warningConfigurationPar5_ = value; + } + } + + /// <summary>Field number for the "Warning_configuration_Par6" field.</summary> + public const int WarningConfigurationPar6FieldNumber = 68; + private double warningConfigurationPar6_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double WarningConfigurationPar6 { + get { return warningConfigurationPar6_; } + set { + warningConfigurationPar6_ = value; + } + } + + /// <summary>Field number for the "Warning_threshold" field.</summary> + public const int WarningThresholdFieldNumber = 69; + private double warningThreshold_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double WarningThreshold { + get { return warningThreshold_; } + set { + warningThreshold_ = value; + } + } + + /// <summary>Field number for the "Controller_Spare1" field.</summary> + public const int ControllerSpare1FieldNumber = 70; + private double controllerSpare1_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double ControllerSpare1 { + get { return controllerSpare1_; } + set { + controllerSpare1_ = value; + } + } + + /// <summary>Field number for the "Controller_Spare2" field.</summary> + public const int ControllerSpare2FieldNumber = 71; + private double controllerSpare2_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double ControllerSpare2 { + get { return controllerSpare2_; } + set { + controllerSpare2_ = value; + } + } + + /// <summary>Field number for the "Controller_Spare3" field.</summary> + public const int ControllerSpare3FieldNumber = 72; + private double controllerSpare3_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double ControllerSpare3 { + get { return controllerSpare3_; } + set { + controllerSpare3_ = value; + } + } + + /// <summary>Field number for the "Controller_Spare4" field.</summary> + public const int ControllerSpare4FieldNumber = 73; + private double controllerSpare4_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double ControllerSpare4 { + get { return controllerSpare4_; } + set { + controllerSpare4_ = value; + } + } + + /// <summary>Field number for the "Controller_Spare5" field.</summary> + public const int ControllerSpare5FieldNumber = 74; + private double controllerSpare5_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double ControllerSpare5 { + get { return controllerSpare5_; } + set { + controllerSpare5_ = value; + } + } + + /// <summary>Field number for the "Test_Date" field.</summary> + public const int TestDateFieldNumber = 75; + private double testDate_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double TestDate { + get { return testDate_; } + set { + testDate_ = value; + } + } + + /// <summary>Field number for the "Test" field.</summary> + public const int TestFieldNumber = 76; + private string test_ = ""; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public string Test { + get { return test_; } + set { + test_ = pb::ProtoPreconditions.CheckNotNull(value, "value"); + } + } + + /// <summary>Field number for the "Waste_Pump_Flow_volume_per_sec" field.</summary> + public const int WastePumpFlowVolumePerSecFieldNumber = 77; + private double wastePumpFlowVolumePerSec_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double WastePumpFlowVolumePerSec { + get { return wastePumpFlowVolumePerSec_; } + set { + wastePumpFlowVolumePerSec_ = value; + } + } + + /// <summary>Field number for the "Waste_Pump_Flow_V_per_sec_Limit" field.</summary> + public const int WastePumpFlowVPerSecLimitFieldNumber = 78; + private double wastePumpFlowVPerSecLimit_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double WastePumpFlowVPerSecLimit { + get { return wastePumpFlowVPerSecLimit_; } + set { + wastePumpFlowVPerSecLimit_ = value; + } + } + + /// <summary>Field number for the "Filter_max_life_span" field.</summary> + public const int FilterMaxLifeSpanFieldNumber = 79; + private double filterMaxLifeSpan_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double FilterMaxLifeSpan { + get { return filterMaxLifeSpan_; } + set { + filterMaxLifeSpan_ = value; + } + } + + /// <summary>Field number for the "Filter_usage_hours" field.</summary> + public const int FilterUsageHoursFieldNumber = 80; + private double filterUsageHours_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public double FilterUsageHours { + get { return filterUsageHours_; } + set { + filterUsageHours_ = value; + } + } + /// <summary>Field number for the "VOCInstallationDate" field.</summary> - public const int VOCInstallationDateFieldNumber = 16; + public const int VOCInstallationDateFieldNumber = 81; private string vOCInstallationDate_ = ""; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public string VOCInstallationDate { @@ -271,7 +1092,7 @@ namespace Tango.PMR.Stubs { } /// <summary>Field number for the "FilterInstallationDate" field.</summary> - public const int FilterInstallationDateFieldNumber = 17; + public const int FilterInstallationDateFieldNumber = 82; private string filterInstallationDate_ = ""; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public string FilterInstallationDate { @@ -282,7 +1103,7 @@ namespace Tango.PMR.Stubs { } /// <summary>Field number for the "ProductionDate" field.</summary> - public const int ProductionDateFieldNumber = 18; + public const int ProductionDateFieldNumber = 83; private string productionDate_ = ""; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public string ProductionDate { @@ -293,7 +1114,7 @@ namespace Tango.PMR.Stubs { } /// <summary>Field number for the "CheckSum" field.</summary> - public const int CheckSumFieldNumber = 19; + public const int CheckSumFieldNumber = 84; private uint checkSum_; [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public uint CheckSum { @@ -318,19 +1139,84 @@ namespace Tango.PMR.Stubs { } if (Header != other.Header) return false; if (TableLength != other.TableLength) return false; - if (Tableversion != other.Tableversion) return false; - if (WhsPN != other.WhsPN) return false; + if (TableVersion != other.TableVersion) return false; + if (WHSSN != other.WHSSN) return false; if (PCBSN != other.PCBSN) return false; + if (WHSPartNumber != other.WHSPartNumber) return false; if (PCBPartNumber != other.PCBPartNumber) return false; - if (WhsSN != other.WhsSN) return false; + if (RunningHours != other.RunningHours) return false; + if (SWReserve != other.SWReserve) return false; + if (ProductionTestDate != other.ProductionTestDate) return false; + if (TestPassFail != other.TestPassFail) return false; + if (ATSLocation != other.ATSLocation) return false; + if (OrificeWasteLevelV0Ml != other.OrificeWasteLevelV0Ml) return false; + if (FlowCalcCoefficientC != other.FlowCalcCoefficientC) return false; if (Orifice1Flow != other.Orifice1Flow) return false; if (Orifice1Slope != other.Orifice1Slope) return false; + if (Orifice1MaxPressure != other.Orifice1MaxPressure) return false; + if (Orifice1CalibrationFactor != other.Orifice1CalibrationFactor) return false; if (Orifice2Flow != other.Orifice2Flow) return false; if (Orifice2Slope != other.Orifice2Slope) return false; + if (Orifice2MaxPressure != other.Orifice2MaxPressure) return false; + if (Orifice2CalibrationFactor != other.Orifice2CalibrationFactor) return false; if (Orifice3Flow != other.Orifice3Flow) return false; if (Orifice3Slope != other.Orifice3Slope) return false; + if (Orifice3MaxPressure != other.Orifice3MaxPressure) return false; + if (Orifice3CalibrationFactor != other.Orifice3CalibrationFactor) return false; if (OrificeValveFlow != other.OrificeValveFlow) return false; if (OrificeValveSlope != other.OrificeValveSlope) return false; + if (OrificeValveMaxPressure != other.OrificeValveMaxPressure) return false; + if (OrificeValveCalibrationFactor != other.OrificeValveCalibrationFactor) return false; + if (Fans14PWMMinPct != other.Fans14PWMMinPct) return false; + if (Fans14RPMPWMMin != other.Fans14RPMPWMMin) return false; + if (Fans14PWMMaxPct != other.Fans14PWMMaxPct) return false; + if (Fans14RPMPWMMax != other.Fans14RPMPWMMax) return false; + if (Fans14NomPWMPct != other.Fans14NomPWMPct) return false; + if (Fans14NomRPM != other.Fans14NomRPM) return false; + if (Fans14RPMLimitPctBelowNom != other.Fans14RPMLimitPctBelowNom) return false; + if (Fans14PulsePerRevolution != other.Fans14PulsePerRevolution) return false; + if (Fans14Spare1 != other.Fans14Spare1) return false; + if (Fans14Spare2 != other.Fans14Spare2) return false; + if (Fans56NomRPM != other.Fans56NomRPM) return false; + if (Fans56RPMLimitPctBelowNom != other.Fans56RPMLimitPctBelowNom) return false; + if (Fans56PulsePerRevolution != other.Fans56PulsePerRevolution) return false; + if (Fans56Spare1 != other.Fans56Spare1) return false; + if (Fans56Spare2 != other.Fans56Spare2) return false; + if (BlowerPGain != other.BlowerPGain) return false; + if (BlowerCFMRPMMin != other.BlowerCFMRPMMin) return false; + if (BlowerRPMCFMMax != other.BlowerRPMCFMMax) return false; + if (BlowerCalibrationFactor != other.BlowerCalibrationFactor) return false; + if (BlowerSpare1 != other.BlowerSpare1) return false; + if (BlowerSpare2 != other.BlowerSpare2) return false; + if (VOCLimit != other.VOCLimit) return false; + if (VOCSpare1 != other.VOCSpare1) return false; + if (VOCSpare2 != other.VOCSpare2) return false; + if (ControllerCommType != other.ControllerCommType) return false; + if (ControllerType != other.ControllerType) return false; + if (SensorType != other.SensorType) return false; + if (CoolerCF != other.CoolerCF) return false; + if (CoolerSV != other.CoolerSV) return false; + if (CoolerP != other.CoolerP) return false; + if (CoolerI != other.CoolerI) return false; + if (CoolerD != other.CoolerD) return false; + if (WarningConfigurationPar1 != other.WarningConfigurationPar1) return false; + if (WarningConfigurationPar2 != other.WarningConfigurationPar2) return false; + if (WarningConfigurationPar3 != other.WarningConfigurationPar3) return false; + if (WarningConfigurationPar4 != other.WarningConfigurationPar4) return false; + if (WarningConfigurationPar5 != other.WarningConfigurationPar5) return false; + if (WarningConfigurationPar6 != other.WarningConfigurationPar6) return false; + if (WarningThreshold != other.WarningThreshold) return false; + if (ControllerSpare1 != other.ControllerSpare1) return false; + if (ControllerSpare2 != other.ControllerSpare2) return false; + if (ControllerSpare3 != other.ControllerSpare3) return false; + if (ControllerSpare4 != other.ControllerSpare4) return false; + if (ControllerSpare5 != other.ControllerSpare5) return false; + if (TestDate != other.TestDate) return false; + if (Test != other.Test) return false; + if (WastePumpFlowVolumePerSec != other.WastePumpFlowVolumePerSec) return false; + if (WastePumpFlowVPerSecLimit != other.WastePumpFlowVPerSecLimit) return false; + if (FilterMaxLifeSpan != other.FilterMaxLifeSpan) return false; + if (FilterUsageHours != other.FilterUsageHours) return false; if (VOCInstallationDate != other.VOCInstallationDate) return false; if (FilterInstallationDate != other.FilterInstallationDate) return false; if (ProductionDate != other.ProductionDate) return false; @@ -343,19 +1229,84 @@ namespace Tango.PMR.Stubs { int hash = 1; if (Header != 0) hash ^= Header.GetHashCode(); if (TableLength != 0) hash ^= TableLength.GetHashCode(); - if (Tableversion != 0) hash ^= Tableversion.GetHashCode(); - if (WhsPN.Length != 0) hash ^= WhsPN.GetHashCode(); + if (TableVersion != 0) hash ^= TableVersion.GetHashCode(); + if (WHSSN.Length != 0) hash ^= WHSSN.GetHashCode(); if (PCBSN.Length != 0) hash ^= PCBSN.GetHashCode(); + if (WHSPartNumber.Length != 0) hash ^= WHSPartNumber.GetHashCode(); if (PCBPartNumber.Length != 0) hash ^= PCBPartNumber.GetHashCode(); - if (WhsSN.Length != 0) hash ^= WhsSN.GetHashCode(); + if (RunningHours != 0) hash ^= RunningHours.GetHashCode(); + if (SWReserve != 0) hash ^= SWReserve.GetHashCode(); + if (ProductionTestDate.Length != 0) hash ^= ProductionTestDate.GetHashCode(); + if (TestPassFail.Length != 0) hash ^= TestPassFail.GetHashCode(); + if (ATSLocation != 0) hash ^= ATSLocation.GetHashCode(); + if (OrificeWasteLevelV0Ml != 0D) hash ^= OrificeWasteLevelV0Ml.GetHashCode(); + if (FlowCalcCoefficientC != 0D) hash ^= FlowCalcCoefficientC.GetHashCode(); if (Orifice1Flow != 0D) hash ^= Orifice1Flow.GetHashCode(); if (Orifice1Slope != 0D) hash ^= Orifice1Slope.GetHashCode(); + if (Orifice1MaxPressure != 0D) hash ^= Orifice1MaxPressure.GetHashCode(); + if (Orifice1CalibrationFactor != 0D) hash ^= Orifice1CalibrationFactor.GetHashCode(); if (Orifice2Flow != 0D) hash ^= Orifice2Flow.GetHashCode(); if (Orifice2Slope != 0D) hash ^= Orifice2Slope.GetHashCode(); + if (Orifice2MaxPressure != 0D) hash ^= Orifice2MaxPressure.GetHashCode(); + if (Orifice2CalibrationFactor != 0D) hash ^= Orifice2CalibrationFactor.GetHashCode(); if (Orifice3Flow != 0D) hash ^= Orifice3Flow.GetHashCode(); if (Orifice3Slope != 0D) hash ^= Orifice3Slope.GetHashCode(); + if (Orifice3MaxPressure != 0D) hash ^= Orifice3MaxPressure.GetHashCode(); + if (Orifice3CalibrationFactor != 0D) hash ^= Orifice3CalibrationFactor.GetHashCode(); if (OrificeValveFlow != 0D) hash ^= OrificeValveFlow.GetHashCode(); if (OrificeValveSlope != 0D) hash ^= OrificeValveSlope.GetHashCode(); + if (OrificeValveMaxPressure != 0D) hash ^= OrificeValveMaxPressure.GetHashCode(); + if (OrificeValveCalibrationFactor != 0D) hash ^= OrificeValveCalibrationFactor.GetHashCode(); + if (Fans14PWMMinPct != 0D) hash ^= Fans14PWMMinPct.GetHashCode(); + if (Fans14RPMPWMMin != 0D) hash ^= Fans14RPMPWMMin.GetHashCode(); + if (Fans14PWMMaxPct != 0D) hash ^= Fans14PWMMaxPct.GetHashCode(); + if (Fans14RPMPWMMax != 0D) hash ^= Fans14RPMPWMMax.GetHashCode(); + if (Fans14NomPWMPct != 0D) hash ^= Fans14NomPWMPct.GetHashCode(); + if (Fans14NomRPM != 0D) hash ^= Fans14NomRPM.GetHashCode(); + if (Fans14RPMLimitPctBelowNom != 0D) hash ^= Fans14RPMLimitPctBelowNom.GetHashCode(); + if (Fans14PulsePerRevolution != 0D) hash ^= Fans14PulsePerRevolution.GetHashCode(); + if (Fans14Spare1 != 0D) hash ^= Fans14Spare1.GetHashCode(); + if (Fans14Spare2 != 0D) hash ^= Fans14Spare2.GetHashCode(); + if (Fans56NomRPM != 0D) hash ^= Fans56NomRPM.GetHashCode(); + if (Fans56RPMLimitPctBelowNom != 0D) hash ^= Fans56RPMLimitPctBelowNom.GetHashCode(); + if (Fans56PulsePerRevolution != 0D) hash ^= Fans56PulsePerRevolution.GetHashCode(); + if (Fans56Spare1 != 0D) hash ^= Fans56Spare1.GetHashCode(); + if (Fans56Spare2 != 0D) hash ^= Fans56Spare2.GetHashCode(); + if (BlowerPGain != 0D) hash ^= BlowerPGain.GetHashCode(); + if (BlowerCFMRPMMin != 0D) hash ^= BlowerCFMRPMMin.GetHashCode(); + if (BlowerRPMCFMMax != 0D) hash ^= BlowerRPMCFMMax.GetHashCode(); + if (BlowerCalibrationFactor != 0D) hash ^= BlowerCalibrationFactor.GetHashCode(); + if (BlowerSpare1 != 0D) hash ^= BlowerSpare1.GetHashCode(); + if (BlowerSpare2 != 0D) hash ^= BlowerSpare2.GetHashCode(); + if (VOCLimit != 0D) hash ^= VOCLimit.GetHashCode(); + if (VOCSpare1 != 0D) hash ^= VOCSpare1.GetHashCode(); + if (VOCSpare2 != 0D) hash ^= VOCSpare2.GetHashCode(); + if (ControllerCommType != 0D) hash ^= ControllerCommType.GetHashCode(); + if (ControllerType != 0D) hash ^= ControllerType.GetHashCode(); + if (SensorType != 0D) hash ^= SensorType.GetHashCode(); + if (CoolerCF != 0D) hash ^= CoolerCF.GetHashCode(); + if (CoolerSV != 0D) hash ^= CoolerSV.GetHashCode(); + if (CoolerP != 0D) hash ^= CoolerP.GetHashCode(); + if (CoolerI != 0D) hash ^= CoolerI.GetHashCode(); + if (CoolerD != 0D) hash ^= CoolerD.GetHashCode(); + if (WarningConfigurationPar1 != 0D) hash ^= WarningConfigurationPar1.GetHashCode(); + if (WarningConfigurationPar2 != 0D) hash ^= WarningConfigurationPar2.GetHashCode(); + if (WarningConfigurationPar3 != 0D) hash ^= WarningConfigurationPar3.GetHashCode(); + if (WarningConfigurationPar4 != 0D) hash ^= WarningConfigurationPar4.GetHashCode(); + if (WarningConfigurationPar5 != 0D) hash ^= WarningConfigurationPar5.GetHashCode(); + if (WarningConfigurationPar6 != 0D) hash ^= WarningConfigurationPar6.GetHashCode(); + if (WarningThreshold != 0D) hash ^= WarningThreshold.GetHashCode(); + if (ControllerSpare1 != 0D) hash ^= ControllerSpare1.GetHashCode(); + if (ControllerSpare2 != 0D) hash ^= ControllerSpare2.GetHashCode(); + if (ControllerSpare3 != 0D) hash ^= ControllerSpare3.GetHashCode(); + if (ControllerSpare4 != 0D) hash ^= ControllerSpare4.GetHashCode(); + if (ControllerSpare5 != 0D) hash ^= ControllerSpare5.GetHashCode(); + if (TestDate != 0D) hash ^= TestDate.GetHashCode(); + if (Test.Length != 0) hash ^= Test.GetHashCode(); + if (WastePumpFlowVolumePerSec != 0D) hash ^= WastePumpFlowVolumePerSec.GetHashCode(); + if (WastePumpFlowVPerSecLimit != 0D) hash ^= WastePumpFlowVPerSecLimit.GetHashCode(); + if (FilterMaxLifeSpan != 0D) hash ^= FilterMaxLifeSpan.GetHashCode(); + if (FilterUsageHours != 0D) hash ^= FilterUsageHours.GetHashCode(); if (VOCInstallationDate.Length != 0) hash ^= VOCInstallationDate.GetHashCode(); if (FilterInstallationDate.Length != 0) hash ^= FilterInstallationDate.GetHashCode(); if (ProductionDate.Length != 0) hash ^= ProductionDate.GetHashCode(); @@ -378,72 +1329,332 @@ namespace Tango.PMR.Stubs { output.WriteRawTag(16); output.WriteUInt32(TableLength); } - if (Tableversion != 0) { + if (TableVersion != 0) { output.WriteRawTag(24); - output.WriteUInt32(Tableversion); + output.WriteUInt32(TableVersion); } - if (WhsPN.Length != 0) { + if (WHSSN.Length != 0) { output.WriteRawTag(34); - output.WriteString(WhsPN); + output.WriteString(WHSSN); } if (PCBSN.Length != 0) { output.WriteRawTag(42); output.WriteString(PCBSN); } - if (PCBPartNumber.Length != 0) { + if (WHSPartNumber.Length != 0) { output.WriteRawTag(50); - output.WriteString(PCBPartNumber); + output.WriteString(WHSPartNumber); } - if (WhsSN.Length != 0) { + if (PCBPartNumber.Length != 0) { output.WriteRawTag(58); - output.WriteString(WhsSN); + output.WriteString(PCBPartNumber); + } + if (RunningHours != 0) { + output.WriteRawTag(64); + output.WriteUInt32(RunningHours); + } + if (SWReserve != 0) { + output.WriteRawTag(72); + output.WriteUInt32(SWReserve); + } + if (ProductionTestDate.Length != 0) { + output.WriteRawTag(82); + output.WriteString(ProductionTestDate); + } + if (TestPassFail.Length != 0) { + output.WriteRawTag(90); + output.WriteString(TestPassFail); + } + if (ATSLocation != 0) { + output.WriteRawTag(96); + output.WriteUInt32(ATSLocation); + } + if (OrificeWasteLevelV0Ml != 0D) { + output.WriteRawTag(105); + output.WriteDouble(OrificeWasteLevelV0Ml); + } + if (FlowCalcCoefficientC != 0D) { + output.WriteRawTag(113); + output.WriteDouble(FlowCalcCoefficientC); } if (Orifice1Flow != 0D) { - output.WriteRawTag(65); + output.WriteRawTag(121); output.WriteDouble(Orifice1Flow); } if (Orifice1Slope != 0D) { - output.WriteRawTag(73); + output.WriteRawTag(129, 1); output.WriteDouble(Orifice1Slope); } + if (Orifice1MaxPressure != 0D) { + output.WriteRawTag(137, 1); + output.WriteDouble(Orifice1MaxPressure); + } + if (Orifice1CalibrationFactor != 0D) { + output.WriteRawTag(145, 1); + output.WriteDouble(Orifice1CalibrationFactor); + } if (Orifice2Flow != 0D) { - output.WriteRawTag(81); + output.WriteRawTag(153, 1); output.WriteDouble(Orifice2Flow); } if (Orifice2Slope != 0D) { - output.WriteRawTag(89); + output.WriteRawTag(161, 1); output.WriteDouble(Orifice2Slope); } + if (Orifice2MaxPressure != 0D) { + output.WriteRawTag(169, 1); + output.WriteDouble(Orifice2MaxPressure); + } + if (Orifice2CalibrationFactor != 0D) { + output.WriteRawTag(177, 1); + output.WriteDouble(Orifice2CalibrationFactor); + } if (Orifice3Flow != 0D) { - output.WriteRawTag(97); + output.WriteRawTag(185, 1); output.WriteDouble(Orifice3Flow); } if (Orifice3Slope != 0D) { - output.WriteRawTag(105); + output.WriteRawTag(193, 1); output.WriteDouble(Orifice3Slope); } + if (Orifice3MaxPressure != 0D) { + output.WriteRawTag(201, 1); + output.WriteDouble(Orifice3MaxPressure); + } + if (Orifice3CalibrationFactor != 0D) { + output.WriteRawTag(209, 1); + output.WriteDouble(Orifice3CalibrationFactor); + } if (OrificeValveFlow != 0D) { - output.WriteRawTag(113); + output.WriteRawTag(217, 1); output.WriteDouble(OrificeValveFlow); } if (OrificeValveSlope != 0D) { - output.WriteRawTag(121); + output.WriteRawTag(225, 1); output.WriteDouble(OrificeValveSlope); } + if (OrificeValveMaxPressure != 0D) { + output.WriteRawTag(233, 1); + output.WriteDouble(OrificeValveMaxPressure); + } + if (OrificeValveCalibrationFactor != 0D) { + output.WriteRawTag(241, 1); + output.WriteDouble(OrificeValveCalibrationFactor); + } + if (Fans14PWMMinPct != 0D) { + output.WriteRawTag(249, 1); + output.WriteDouble(Fans14PWMMinPct); + } + if (Fans14RPMPWMMin != 0D) { + output.WriteRawTag(129, 2); + output.WriteDouble(Fans14RPMPWMMin); + } + if (Fans14PWMMaxPct != 0D) { + output.WriteRawTag(137, 2); + output.WriteDouble(Fans14PWMMaxPct); + } + if (Fans14RPMPWMMax != 0D) { + output.WriteRawTag(145, 2); + output.WriteDouble(Fans14RPMPWMMax); + } + if (Fans14NomPWMPct != 0D) { + output.WriteRawTag(153, 2); + output.WriteDouble(Fans14NomPWMPct); + } + if (Fans14NomRPM != 0D) { + output.WriteRawTag(161, 2); + output.WriteDouble(Fans14NomRPM); + } + if (Fans14RPMLimitPctBelowNom != 0D) { + output.WriteRawTag(169, 2); + output.WriteDouble(Fans14RPMLimitPctBelowNom); + } + if (Fans14PulsePerRevolution != 0D) { + output.WriteRawTag(177, 2); + output.WriteDouble(Fans14PulsePerRevolution); + } + if (Fans14Spare1 != 0D) { + output.WriteRawTag(185, 2); + output.WriteDouble(Fans14Spare1); + } + if (Fans14Spare2 != 0D) { + output.WriteRawTag(193, 2); + output.WriteDouble(Fans14Spare2); + } + if (Fans56NomRPM != 0D) { + output.WriteRawTag(201, 2); + output.WriteDouble(Fans56NomRPM); + } + if (Fans56RPMLimitPctBelowNom != 0D) { + output.WriteRawTag(209, 2); + output.WriteDouble(Fans56RPMLimitPctBelowNom); + } + if (Fans56PulsePerRevolution != 0D) { + output.WriteRawTag(217, 2); + output.WriteDouble(Fans56PulsePerRevolution); + } + if (Fans56Spare1 != 0D) { + output.WriteRawTag(225, 2); + output.WriteDouble(Fans56Spare1); + } + if (Fans56Spare2 != 0D) { + output.WriteRawTag(233, 2); + output.WriteDouble(Fans56Spare2); + } + if (BlowerPGain != 0D) { + output.WriteRawTag(241, 2); + output.WriteDouble(BlowerPGain); + } + if (BlowerCFMRPMMin != 0D) { + output.WriteRawTag(249, 2); + output.WriteDouble(BlowerCFMRPMMin); + } + if (BlowerRPMCFMMax != 0D) { + output.WriteRawTag(129, 3); + output.WriteDouble(BlowerRPMCFMMax); + } + if (BlowerCalibrationFactor != 0D) { + output.WriteRawTag(137, 3); + output.WriteDouble(BlowerCalibrationFactor); + } + if (BlowerSpare1 != 0D) { + output.WriteRawTag(145, 3); + output.WriteDouble(BlowerSpare1); + } + if (BlowerSpare2 != 0D) { + output.WriteRawTag(153, 3); + output.WriteDouble(BlowerSpare2); + } + if (VOCLimit != 0D) { + output.WriteRawTag(161, 3); + output.WriteDouble(VOCLimit); + } + if (VOCSpare1 != 0D) { + output.WriteRawTag(169, 3); + output.WriteDouble(VOCSpare1); + } + if (VOCSpare2 != 0D) { + output.WriteRawTag(177, 3); + output.WriteDouble(VOCSpare2); + } + if (ControllerCommType != 0D) { + output.WriteRawTag(185, 3); + output.WriteDouble(ControllerCommType); + } + if (ControllerType != 0D) { + output.WriteRawTag(193, 3); + output.WriteDouble(ControllerType); + } + if (SensorType != 0D) { + output.WriteRawTag(201, 3); + output.WriteDouble(SensorType); + } + if (CoolerCF != 0D) { + output.WriteRawTag(209, 3); + output.WriteDouble(CoolerCF); + } + if (CoolerSV != 0D) { + output.WriteRawTag(217, 3); + output.WriteDouble(CoolerSV); + } + if (CoolerP != 0D) { + output.WriteRawTag(225, 3); + output.WriteDouble(CoolerP); + } + if (CoolerI != 0D) { + output.WriteRawTag(233, 3); + output.WriteDouble(CoolerI); + } + if (CoolerD != 0D) { + output.WriteRawTag(241, 3); + output.WriteDouble(CoolerD); + } + if (WarningConfigurationPar1 != 0D) { + output.WriteRawTag(249, 3); + output.WriteDouble(WarningConfigurationPar1); + } + if (WarningConfigurationPar2 != 0D) { + output.WriteRawTag(129, 4); + output.WriteDouble(WarningConfigurationPar2); + } + if (WarningConfigurationPar3 != 0D) { + output.WriteRawTag(137, 4); + output.WriteDouble(WarningConfigurationPar3); + } + if (WarningConfigurationPar4 != 0D) { + output.WriteRawTag(145, 4); + output.WriteDouble(WarningConfigurationPar4); + } + if (WarningConfigurationPar5 != 0D) { + output.WriteRawTag(153, 4); + output.WriteDouble(WarningConfigurationPar5); + } + if (WarningConfigurationPar6 != 0D) { + output.WriteRawTag(161, 4); + output.WriteDouble(WarningConfigurationPar6); + } + if (WarningThreshold != 0D) { + output.WriteRawTag(169, 4); + output.WriteDouble(WarningThreshold); + } + if (ControllerSpare1 != 0D) { + output.WriteRawTag(177, 4); + output.WriteDouble(ControllerSpare1); + } + if (ControllerSpare2 != 0D) { + output.WriteRawTag(185, 4); + output.WriteDouble(ControllerSpare2); + } + if (ControllerSpare3 != 0D) { + output.WriteRawTag(193, 4); + output.WriteDouble(ControllerSpare3); + } + if (ControllerSpare4 != 0D) { + output.WriteRawTag(201, 4); + output.WriteDouble(ControllerSpare4); + } + if (ControllerSpare5 != 0D) { + output.WriteRawTag(209, 4); + output.WriteDouble(ControllerSpare5); + } + if (TestDate != 0D) { + output.WriteRawTag(217, 4); + output.WriteDouble(TestDate); + } + if (Test.Length != 0) { + output.WriteRawTag(226, 4); + output.WriteString(Test); + } + if (WastePumpFlowVolumePerSec != 0D) { + output.WriteRawTag(233, 4); + output.WriteDouble(WastePumpFlowVolumePerSec); + } + if (WastePumpFlowVPerSecLimit != 0D) { + output.WriteRawTag(241, 4); + output.WriteDouble(WastePumpFlowVPerSecLimit); + } + if (FilterMaxLifeSpan != 0D) { + output.WriteRawTag(249, 4); + output.WriteDouble(FilterMaxLifeSpan); + } + if (FilterUsageHours != 0D) { + output.WriteRawTag(129, 5); + output.WriteDouble(FilterUsageHours); + } if (VOCInstallationDate.Length != 0) { - output.WriteRawTag(130, 1); + output.WriteRawTag(138, 5); output.WriteString(VOCInstallationDate); } if (FilterInstallationDate.Length != 0) { - output.WriteRawTag(138, 1); + output.WriteRawTag(146, 5); output.WriteString(FilterInstallationDate); } if (ProductionDate.Length != 0) { - output.WriteRawTag(146, 1); + output.WriteRawTag(154, 5); output.WriteString(ProductionDate); } if (CheckSum != 0) { - output.WriteRawTag(152, 1); + output.WriteRawTag(160, 5); output.WriteUInt32(CheckSum); } } @@ -457,44 +1668,239 @@ namespace Tango.PMR.Stubs { if (TableLength != 0) { size += 1 + pb::CodedOutputStream.ComputeUInt32Size(TableLength); } - if (Tableversion != 0) { - size += 1 + pb::CodedOutputStream.ComputeUInt32Size(Tableversion); + if (TableVersion != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(TableVersion); } - if (WhsPN.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(WhsPN); + if (WHSSN.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(WHSSN); } if (PCBSN.Length != 0) { size += 1 + pb::CodedOutputStream.ComputeStringSize(PCBSN); } + if (WHSPartNumber.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(WHSPartNumber); + } if (PCBPartNumber.Length != 0) { size += 1 + pb::CodedOutputStream.ComputeStringSize(PCBPartNumber); } - if (WhsSN.Length != 0) { - size += 1 + pb::CodedOutputStream.ComputeStringSize(WhsSN); + if (RunningHours != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(RunningHours); + } + if (SWReserve != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(SWReserve); + } + if (ProductionTestDate.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(ProductionTestDate); + } + if (TestPassFail.Length != 0) { + size += 1 + pb::CodedOutputStream.ComputeStringSize(TestPassFail); + } + if (ATSLocation != 0) { + size += 1 + pb::CodedOutputStream.ComputeUInt32Size(ATSLocation); + } + if (OrificeWasteLevelV0Ml != 0D) { + size += 1 + 8; + } + if (FlowCalcCoefficientC != 0D) { + size += 1 + 8; } if (Orifice1Flow != 0D) { size += 1 + 8; } if (Orifice1Slope != 0D) { - size += 1 + 8; + size += 2 + 8; + } + if (Orifice1MaxPressure != 0D) { + size += 2 + 8; + } + if (Orifice1CalibrationFactor != 0D) { + size += 2 + 8; } if (Orifice2Flow != 0D) { - size += 1 + 8; + size += 2 + 8; } if (Orifice2Slope != 0D) { - size += 1 + 8; + size += 2 + 8; + } + if (Orifice2MaxPressure != 0D) { + size += 2 + 8; + } + if (Orifice2CalibrationFactor != 0D) { + size += 2 + 8; } if (Orifice3Flow != 0D) { - size += 1 + 8; + size += 2 + 8; } if (Orifice3Slope != 0D) { - size += 1 + 8; + size += 2 + 8; + } + if (Orifice3MaxPressure != 0D) { + size += 2 + 8; + } + if (Orifice3CalibrationFactor != 0D) { + size += 2 + 8; } if (OrificeValveFlow != 0D) { - size += 1 + 8; + size += 2 + 8; } if (OrificeValveSlope != 0D) { - size += 1 + 8; + size += 2 + 8; + } + if (OrificeValveMaxPressure != 0D) { + size += 2 + 8; + } + if (OrificeValveCalibrationFactor != 0D) { + size += 2 + 8; + } + if (Fans14PWMMinPct != 0D) { + size += 2 + 8; + } + if (Fans14RPMPWMMin != 0D) { + size += 2 + 8; + } + if (Fans14PWMMaxPct != 0D) { + size += 2 + 8; + } + if (Fans14RPMPWMMax != 0D) { + size += 2 + 8; + } + if (Fans14NomPWMPct != 0D) { + size += 2 + 8; + } + if (Fans14NomRPM != 0D) { + size += 2 + 8; + } + if (Fans14RPMLimitPctBelowNom != 0D) { + size += 2 + 8; + } + if (Fans14PulsePerRevolution != 0D) { + size += 2 + 8; + } + if (Fans14Spare1 != 0D) { + size += 2 + 8; + } + if (Fans14Spare2 != 0D) { + size += 2 + 8; + } + if (Fans56NomRPM != 0D) { + size += 2 + 8; + } + if (Fans56RPMLimitPctBelowNom != 0D) { + size += 2 + 8; + } + if (Fans56PulsePerRevolution != 0D) { + size += 2 + 8; + } + if (Fans56Spare1 != 0D) { + size += 2 + 8; + } + if (Fans56Spare2 != 0D) { + size += 2 + 8; + } + if (BlowerPGain != 0D) { + size += 2 + 8; + } + if (BlowerCFMRPMMin != 0D) { + size += 2 + 8; + } + if (BlowerRPMCFMMax != 0D) { + size += 2 + 8; + } + if (BlowerCalibrationFactor != 0D) { + size += 2 + 8; + } + if (BlowerSpare1 != 0D) { + size += 2 + 8; + } + if (BlowerSpare2 != 0D) { + size += 2 + 8; + } + if (VOCLimit != 0D) { + size += 2 + 8; + } + if (VOCSpare1 != 0D) { + size += 2 + 8; + } + if (VOCSpare2 != 0D) { + size += 2 + 8; + } + if (ControllerCommType != 0D) { + size += 2 + 8; + } + if (ControllerType != 0D) { + size += 2 + 8; + } + if (SensorType != 0D) { + size += 2 + 8; + } + if (CoolerCF != 0D) { + size += 2 + 8; + } + if (CoolerSV != 0D) { + size += 2 + 8; + } + if (CoolerP != 0D) { + size += 2 + 8; + } + if (CoolerI != 0D) { + size += 2 + 8; + } + if (CoolerD != 0D) { + size += 2 + 8; + } + if (WarningConfigurationPar1 != 0D) { + size += 2 + 8; + } + if (WarningConfigurationPar2 != 0D) { + size += 2 + 8; + } + if (WarningConfigurationPar3 != 0D) { + size += 2 + 8; + } + if (WarningConfigurationPar4 != 0D) { + size += 2 + 8; + } + if (WarningConfigurationPar5 != 0D) { + size += 2 + 8; + } + if (WarningConfigurationPar6 != 0D) { + size += 2 + 8; + } + if (WarningThreshold != 0D) { + size += 2 + 8; + } + if (ControllerSpare1 != 0D) { + size += 2 + 8; + } + if (ControllerSpare2 != 0D) { + size += 2 + 8; + } + if (ControllerSpare3 != 0D) { + size += 2 + 8; + } + if (ControllerSpare4 != 0D) { + size += 2 + 8; + } + if (ControllerSpare5 != 0D) { + size += 2 + 8; + } + if (TestDate != 0D) { + size += 2 + 8; + } + if (Test.Length != 0) { + size += 2 + pb::CodedOutputStream.ComputeStringSize(Test); + } + if (WastePumpFlowVolumePerSec != 0D) { + size += 2 + 8; + } + if (WastePumpFlowVPerSecLimit != 0D) { + size += 2 + 8; + } + if (FilterMaxLifeSpan != 0D) { + size += 2 + 8; + } + if (FilterUsageHours != 0D) { + size += 2 + 8; } if (VOCInstallationDate.Length != 0) { size += 2 + pb::CodedOutputStream.ComputeStringSize(VOCInstallationDate); @@ -522,20 +1928,41 @@ namespace Tango.PMR.Stubs { if (other.TableLength != 0) { TableLength = other.TableLength; } - if (other.Tableversion != 0) { - Tableversion = other.Tableversion; + if (other.TableVersion != 0) { + TableVersion = other.TableVersion; } - if (other.WhsPN.Length != 0) { - WhsPN = other.WhsPN; + if (other.WHSSN.Length != 0) { + WHSSN = other.WHSSN; } if (other.PCBSN.Length != 0) { PCBSN = other.PCBSN; } + if (other.WHSPartNumber.Length != 0) { + WHSPartNumber = other.WHSPartNumber; + } if (other.PCBPartNumber.Length != 0) { PCBPartNumber = other.PCBPartNumber; } - if (other.WhsSN.Length != 0) { - WhsSN = other.WhsSN; + if (other.RunningHours != 0) { + RunningHours = other.RunningHours; + } + if (other.SWReserve != 0) { + SWReserve = other.SWReserve; + } + if (other.ProductionTestDate.Length != 0) { + ProductionTestDate = other.ProductionTestDate; + } + if (other.TestPassFail.Length != 0) { + TestPassFail = other.TestPassFail; + } + if (other.ATSLocation != 0) { + ATSLocation = other.ATSLocation; + } + if (other.OrificeWasteLevelV0Ml != 0D) { + OrificeWasteLevelV0Ml = other.OrificeWasteLevelV0Ml; + } + if (other.FlowCalcCoefficientC != 0D) { + FlowCalcCoefficientC = other.FlowCalcCoefficientC; } if (other.Orifice1Flow != 0D) { Orifice1Flow = other.Orifice1Flow; @@ -543,24 +1970,198 @@ namespace Tango.PMR.Stubs { if (other.Orifice1Slope != 0D) { Orifice1Slope = other.Orifice1Slope; } + if (other.Orifice1MaxPressure != 0D) { + Orifice1MaxPressure = other.Orifice1MaxPressure; + } + if (other.Orifice1CalibrationFactor != 0D) { + Orifice1CalibrationFactor = other.Orifice1CalibrationFactor; + } if (other.Orifice2Flow != 0D) { Orifice2Flow = other.Orifice2Flow; } if (other.Orifice2Slope != 0D) { Orifice2Slope = other.Orifice2Slope; } + if (other.Orifice2MaxPressure != 0D) { + Orifice2MaxPressure = other.Orifice2MaxPressure; + } + if (other.Orifice2CalibrationFactor != 0D) { + Orifice2CalibrationFactor = other.Orifice2CalibrationFactor; + } if (other.Orifice3Flow != 0D) { Orifice3Flow = other.Orifice3Flow; } if (other.Orifice3Slope != 0D) { Orifice3Slope = other.Orifice3Slope; } + if (other.Orifice3MaxPressure != 0D) { + Orifice3MaxPressure = other.Orifice3MaxPressure; + } + if (other.Orifice3CalibrationFactor != 0D) { + Orifice3CalibrationFactor = other.Orifice3CalibrationFactor; + } if (other.OrificeValveFlow != 0D) { OrificeValveFlow = other.OrificeValveFlow; } if (other.OrificeValveSlope != 0D) { OrificeValveSlope = other.OrificeValveSlope; } + if (other.OrificeValveMaxPressure != 0D) { + OrificeValveMaxPressure = other.OrificeValveMaxPressure; + } + if (other.OrificeValveCalibrationFactor != 0D) { + OrificeValveCalibrationFactor = other.OrificeValveCalibrationFactor; + } + if (other.Fans14PWMMinPct != 0D) { + Fans14PWMMinPct = other.Fans14PWMMinPct; + } + if (other.Fans14RPMPWMMin != 0D) { + Fans14RPMPWMMin = other.Fans14RPMPWMMin; + } + if (other.Fans14PWMMaxPct != 0D) { + Fans14PWMMaxPct = other.Fans14PWMMaxPct; + } + if (other.Fans14RPMPWMMax != 0D) { + Fans14RPMPWMMax = other.Fans14RPMPWMMax; + } + if (other.Fans14NomPWMPct != 0D) { + Fans14NomPWMPct = other.Fans14NomPWMPct; + } + if (other.Fans14NomRPM != 0D) { + Fans14NomRPM = other.Fans14NomRPM; + } + if (other.Fans14RPMLimitPctBelowNom != 0D) { + Fans14RPMLimitPctBelowNom = other.Fans14RPMLimitPctBelowNom; + } + if (other.Fans14PulsePerRevolution != 0D) { + Fans14PulsePerRevolution = other.Fans14PulsePerRevolution; + } + if (other.Fans14Spare1 != 0D) { + Fans14Spare1 = other.Fans14Spare1; + } + if (other.Fans14Spare2 != 0D) { + Fans14Spare2 = other.Fans14Spare2; + } + if (other.Fans56NomRPM != 0D) { + Fans56NomRPM = other.Fans56NomRPM; + } + if (other.Fans56RPMLimitPctBelowNom != 0D) { + Fans56RPMLimitPctBelowNom = other.Fans56RPMLimitPctBelowNom; + } + if (other.Fans56PulsePerRevolution != 0D) { + Fans56PulsePerRevolution = other.Fans56PulsePerRevolution; + } + if (other.Fans56Spare1 != 0D) { + Fans56Spare1 = other.Fans56Spare1; + } + if (other.Fans56Spare2 != 0D) { + Fans56Spare2 = other.Fans56Spare2; + } + if (other.BlowerPGain != 0D) { + BlowerPGain = other.BlowerPGain; + } + if (other.BlowerCFMRPMMin != 0D) { + BlowerCFMRPMMin = other.BlowerCFMRPMMin; + } + if (other.BlowerRPMCFMMax != 0D) { + BlowerRPMCFMMax = other.BlowerRPMCFMMax; + } + if (other.BlowerCalibrationFactor != 0D) { + BlowerCalibrationFactor = other.BlowerCalibrationFactor; + } + if (other.BlowerSpare1 != 0D) { + BlowerSpare1 = other.BlowerSpare1; + } + if (other.BlowerSpare2 != 0D) { + BlowerSpare2 = other.BlowerSpare2; + } + if (other.VOCLimit != 0D) { + VOCLimit = other.VOCLimit; + } + if (other.VOCSpare1 != 0D) { + VOCSpare1 = other.VOCSpare1; + } + if (other.VOCSpare2 != 0D) { + VOCSpare2 = other.VOCSpare2; + } + if (other.ControllerCommType != 0D) { + ControllerCommType = other.ControllerCommType; + } + if (other.ControllerType != 0D) { + ControllerType = other.ControllerType; + } + if (other.SensorType != 0D) { + SensorType = other.SensorType; + } + if (other.CoolerCF != 0D) { + CoolerCF = other.CoolerCF; + } + if (other.CoolerSV != 0D) { + CoolerSV = other.CoolerSV; + } + if (other.CoolerP != 0D) { + CoolerP = other.CoolerP; + } + if (other.CoolerI != 0D) { + CoolerI = other.CoolerI; + } + if (other.CoolerD != 0D) { + CoolerD = other.CoolerD; + } + if (other.WarningConfigurationPar1 != 0D) { + WarningConfigurationPar1 = other.WarningConfigurationPar1; + } + if (other.WarningConfigurationPar2 != 0D) { + WarningConfigurationPar2 = other.WarningConfigurationPar2; + } + if (other.WarningConfigurationPar3 != 0D) { + WarningConfigurationPar3 = other.WarningConfigurationPar3; + } + if (other.WarningConfigurationPar4 != 0D) { + WarningConfigurationPar4 = other.WarningConfigurationPar4; + } + if (other.WarningConfigurationPar5 != 0D) { + WarningConfigurationPar5 = other.WarningConfigurationPar5; + } + if (other.WarningConfigurationPar6 != 0D) { + WarningConfigurationPar6 = other.WarningConfigurationPar6; + } + if (other.WarningThreshold != 0D) { + WarningThreshold = other.WarningThreshold; + } + if (other.ControllerSpare1 != 0D) { + ControllerSpare1 = other.ControllerSpare1; + } + if (other.ControllerSpare2 != 0D) { + ControllerSpare2 = other.ControllerSpare2; + } + if (other.ControllerSpare3 != 0D) { + ControllerSpare3 = other.ControllerSpare3; + } + if (other.ControllerSpare4 != 0D) { + ControllerSpare4 = other.ControllerSpare4; + } + if (other.ControllerSpare5 != 0D) { + ControllerSpare5 = other.ControllerSpare5; + } + if (other.TestDate != 0D) { + TestDate = other.TestDate; + } + if (other.Test.Length != 0) { + Test = other.Test; + } + if (other.WastePumpFlowVolumePerSec != 0D) { + WastePumpFlowVolumePerSec = other.WastePumpFlowVolumePerSec; + } + if (other.WastePumpFlowVPerSecLimit != 0D) { + WastePumpFlowVPerSecLimit = other.WastePumpFlowVPerSecLimit; + } + if (other.FilterMaxLifeSpan != 0D) { + FilterMaxLifeSpan = other.FilterMaxLifeSpan; + } + if (other.FilterUsageHours != 0D) { + FilterUsageHours = other.FilterUsageHours; + } if (other.VOCInstallationDate.Length != 0) { VOCInstallationDate = other.VOCInstallationDate; } @@ -592,11 +2193,11 @@ namespace Tango.PMR.Stubs { break; } case 24: { - Tableversion = input.ReadUInt32(); + TableVersion = input.ReadUInt32(); break; } case 34: { - WhsPN = input.ReadString(); + WHSSN = input.ReadString(); break; } case 42: { @@ -604,58 +2205,318 @@ namespace Tango.PMR.Stubs { break; } case 50: { - PCBPartNumber = input.ReadString(); + WHSPartNumber = input.ReadString(); break; } case 58: { - WhsSN = input.ReadString(); + PCBPartNumber = input.ReadString(); + break; + } + case 64: { + RunningHours = input.ReadUInt32(); + break; + } + case 72: { + SWReserve = input.ReadUInt32(); + break; + } + case 82: { + ProductionTestDate = input.ReadString(); + break; + } + case 90: { + TestPassFail = input.ReadString(); + break; + } + case 96: { + ATSLocation = input.ReadUInt32(); break; } - case 65: { + case 105: { + OrificeWasteLevelV0Ml = input.ReadDouble(); + break; + } + case 113: { + FlowCalcCoefficientC = input.ReadDouble(); + break; + } + case 121: { Orifice1Flow = input.ReadDouble(); break; } - case 73: { + case 129: { Orifice1Slope = input.ReadDouble(); break; } - case 81: { + case 137: { + Orifice1MaxPressure = input.ReadDouble(); + break; + } + case 145: { + Orifice1CalibrationFactor = input.ReadDouble(); + break; + } + case 153: { Orifice2Flow = input.ReadDouble(); break; } - case 89: { + case 161: { Orifice2Slope = input.ReadDouble(); break; } - case 97: { + case 169: { + Orifice2MaxPressure = input.ReadDouble(); + break; + } + case 177: { + Orifice2CalibrationFactor = input.ReadDouble(); + break; + } + case 185: { Orifice3Flow = input.ReadDouble(); break; } - case 105: { + case 193: { Orifice3Slope = input.ReadDouble(); break; } - case 113: { + case 201: { + Orifice3MaxPressure = input.ReadDouble(); + break; + } + case 209: { + Orifice3CalibrationFactor = input.ReadDouble(); + break; + } + case 217: { OrificeValveFlow = input.ReadDouble(); break; } - case 121: { + case 225: { OrificeValveSlope = input.ReadDouble(); break; } - case 130: { + case 233: { + OrificeValveMaxPressure = input.ReadDouble(); + break; + } + case 241: { + OrificeValveCalibrationFactor = input.ReadDouble(); + break; + } + case 249: { + Fans14PWMMinPct = input.ReadDouble(); + break; + } + case 257: { + Fans14RPMPWMMin = input.ReadDouble(); + break; + } + case 265: { + Fans14PWMMaxPct = input.ReadDouble(); + break; + } + case 273: { + Fans14RPMPWMMax = input.ReadDouble(); + break; + } + case 281: { + Fans14NomPWMPct = input.ReadDouble(); + break; + } + case 289: { + Fans14NomRPM = input.ReadDouble(); + break; + } + case 297: { + Fans14RPMLimitPctBelowNom = input.ReadDouble(); + break; + } + case 305: { + Fans14PulsePerRevolution = input.ReadDouble(); + break; + } + case 313: { + Fans14Spare1 = input.ReadDouble(); + break; + } + case 321: { + Fans14Spare2 = input.ReadDouble(); + break; + } + case 329: { + Fans56NomRPM = input.ReadDouble(); + break; + } + case 337: { + Fans56RPMLimitPctBelowNom = input.ReadDouble(); + break; + } + case 345: { + Fans56PulsePerRevolution = input.ReadDouble(); + break; + } + case 353: { + Fans56Spare1 = input.ReadDouble(); + break; + } + case 361: { + Fans56Spare2 = input.ReadDouble(); + break; + } + case 369: { + BlowerPGain = input.ReadDouble(); + break; + } + case 377: { + BlowerCFMRPMMin = input.ReadDouble(); + break; + } + case 385: { + BlowerRPMCFMMax = input.ReadDouble(); + break; + } + case 393: { + BlowerCalibrationFactor = input.ReadDouble(); + break; + } + case 401: { + BlowerSpare1 = input.ReadDouble(); + break; + } + case 409: { + BlowerSpare2 = input.ReadDouble(); + break; + } + case 417: { + VOCLimit = input.ReadDouble(); + break; + } + case 425: { + VOCSpare1 = input.ReadDouble(); + break; + } + case 433: { + VOCSpare2 = input.ReadDouble(); + break; + } + case 441: { + ControllerCommType = input.ReadDouble(); + break; + } + case 449: { + ControllerType = input.ReadDouble(); + break; + } + case 457: { + SensorType = input.ReadDouble(); + break; + } + case 465: { + CoolerCF = input.ReadDouble(); + break; + } + case 473: { + CoolerSV = input.ReadDouble(); + break; + } + case 481: { + CoolerP = input.ReadDouble(); + break; + } + case 489: { + CoolerI = input.ReadDouble(); + break; + } + case 497: { + CoolerD = input.ReadDouble(); + break; + } + case 505: { + WarningConfigurationPar1 = input.ReadDouble(); + break; + } + case 513: { + WarningConfigurationPar2 = input.ReadDouble(); + break; + } + case 521: { + WarningConfigurationPar3 = input.ReadDouble(); + break; + } + case 529: { + WarningConfigurationPar4 = input.ReadDouble(); + break; + } + case 537: { + WarningConfigurationPar5 = input.ReadDouble(); + break; + } + case 545: { + WarningConfigurationPar6 = input.ReadDouble(); + break; + } + case 553: { + WarningThreshold = input.ReadDouble(); + break; + } + case 561: { + ControllerSpare1 = input.ReadDouble(); + break; + } + case 569: { + ControllerSpare2 = input.ReadDouble(); + break; + } + case 577: { + ControllerSpare3 = input.ReadDouble(); + break; + } + case 585: { + ControllerSpare4 = input.ReadDouble(); + break; + } + case 593: { + ControllerSpare5 = input.ReadDouble(); + break; + } + case 601: { + TestDate = input.ReadDouble(); + break; + } + case 610: { + Test = input.ReadString(); + break; + } + case 617: { + WastePumpFlowVolumePerSec = input.ReadDouble(); + break; + } + case 625: { + WastePumpFlowVPerSecLimit = input.ReadDouble(); + break; + } + case 633: { + FilterMaxLifeSpan = input.ReadDouble(); + break; + } + case 641: { + FilterUsageHours = input.ReadDouble(); + break; + } + case 650: { VOCInstallationDate = input.ReadString(); break; } - case 138: { + case 658: { FilterInstallationDate = input.ReadString(); break; } - case 146: { + case 666: { ProductionDate = input.ReadString(); break; } - case 152: { + case 672: { CheckSum = input.ReadUInt32(); break; } diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj index 3152d3a3f..8ee68347a 100644 --- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj +++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj @@ -252,6 +252,7 @@ <Compile Include="MachineStatus\IDSPackLevel.cs" /> <Compile Include="MachineStatus\MachineState.cs" /> <Compile Include="MachineStatus\MachineStatus.cs" /> + <Compile Include="MachineStatus\SpoolState.cs" /> <Compile Include="MachineStatus\StartMachineStatusUpdateRequest.cs" /> <Compile Include="MachineStatus\StartMachineStatusUpdateResponse.cs" /> <Compile Include="MachineStatus\Status.cs" /> @@ -445,7 +446,7 @@ </PropertyGroup> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> + <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml index 23154aafd..4dad04d28 100644 --- a/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml +++ b/Software/Visual_Studio/Utilities/Tango.MachineEM.UI/Views/MainView.xaml @@ -127,6 +127,9 @@ <Run Text="{Binding ElementName=sliderTemperature,Path=Value,StringFormat='0.0',Mode=OneWay}"></Run> </TextBlock> <Slider x:Name="sliderTemperature" Margin="0 5 0 0" Minimum="0" Maximum="60" Value="{Binding Emulator.MachineStatus.OverallTemperature,Mode=TwoWay}"></Slider> + + <TextBlock Margin="0 10 0 0">SPOOL STATE</TextBlock> + <ComboBox Margin="0 5 0 0" Width="150" ItemsSource="{Binding Source={x:Type pmr:SpoolState},Converter={StaticResource EnumToItemsSourceConverter}}" SelectedValue="{Binding Emulator.MachineStatus.SpoolState,Mode=TwoWay}" SelectedValuePath="Value" DisplayMemberPath="DisplayName"></ComboBox> </StackPanel> </StackPanel> </Border> |
