diff options
| author | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-02-11 00:08:58 +0200 |
|---|---|---|
| committer | Roy Ben Shabat <Roy.mail.net@gmail.com> | 2021-02-11 00:08:58 +0200 |
| commit | e0a8363b3037e47f73360353a59a36c4e3a1f965 (patch) | |
| tree | c2b533e1df70ec3e020f697410bd1c649aab6d39 /Software/Visual_Studio | |
| parent | 7e5b28e34c6410b7000a5a26e037e33a363970ff (diff) | |
| download | Tango-e0a8363b3037e47f73360353a59a36c4e3a1f965.tar.gz Tango-e0a8363b3037e47f73360353a59a36c4e3a1f965.zip | |
Updated events table DB & PMR & BL.
Implemented Dynamic event liquid type on PPC & FSE.
Diffstat (limited to 'Software/Visual_Studio')
32 files changed, 1246 insertions, 671 deletions
diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.c index 3c1230489..0defc9edf 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.c +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.c @@ -52,7 +52,7 @@ void conversion_input__free_unpacked assert(message->base.descriptor == &conversion_input__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor conversion_input__field_descriptors[12] = +static const ProtobufCFieldDescriptor conversion_input__field_descriptors[14] = { { "ThreadL", @@ -198,6 +198,30 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[12] = 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, + { + "UseLightInks", + 13, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_BOOL, + offsetof(ConversionInput, has_uselightinks), + offsetof(ConversionInput, uselightinks), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "VMax", + 14, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_DOUBLE, + offsetof(ConversionInput, has_vmax), + offsetof(ConversionInput, vmax), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, }; static const unsigned conversion_input__field_indices_by_name[] = { 3, /* field[3] = ColorSpace */ @@ -212,11 +236,13 @@ static const unsigned conversion_input__field_indices_by_name[] = { 1, /* field[1] = ThreadA */ 2, /* field[2] = ThreadB */ 0, /* field[0] = ThreadL */ + 12, /* field[12] = UseLightInks */ + 13, /* field[13] = VMax */ }; static const ProtobufCIntRange conversion_input__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 12 } + { 0, 14 } }; const ProtobufCMessageDescriptor conversion_input__descriptor = { @@ -226,7 +252,7 @@ const ProtobufCMessageDescriptor conversion_input__descriptor = "ConversionInput", "", sizeof(ConversionInput), - 12, + 14, conversion_input__field_descriptors, conversion_input__field_indices_by_name, 1, conversion_input__number_ranges, diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.h index 15c30fc10..794ddaaac 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.h +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v1/PMR/ColorLab/ConversionInput.pb-c.h @@ -52,10 +52,14 @@ struct _ConversionInput ProcessRange **processranges; protobuf_c_boolean has_generatehive; protobuf_c_boolean generatehive; + protobuf_c_boolean has_uselightinks; + protobuf_c_boolean uselightinks; + protobuf_c_boolean has_vmax; + double vmax; }; #define CONVERSION_INPUT__INIT \ { PROTOBUF_C_MESSAGE_INIT (&conversion_input__descriptor) \ - , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0,NULL, 0, 0 } + , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0, 0 } /* ConversionInput methods */ diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.c index 3c1230489..0defc9edf 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.c +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.c @@ -52,7 +52,7 @@ void conversion_input__free_unpacked assert(message->base.descriptor == &conversion_input__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor conversion_input__field_descriptors[12] = +static const ProtobufCFieldDescriptor conversion_input__field_descriptors[14] = { { "ThreadL", @@ -198,6 +198,30 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[12] = 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, + { + "UseLightInks", + 13, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_BOOL, + offsetof(ConversionInput, has_uselightinks), + offsetof(ConversionInput, uselightinks), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "VMax", + 14, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_DOUBLE, + offsetof(ConversionInput, has_vmax), + offsetof(ConversionInput, vmax), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, }; static const unsigned conversion_input__field_indices_by_name[] = { 3, /* field[3] = ColorSpace */ @@ -212,11 +236,13 @@ static const unsigned conversion_input__field_indices_by_name[] = { 1, /* field[1] = ThreadA */ 2, /* field[2] = ThreadB */ 0, /* field[0] = ThreadL */ + 12, /* field[12] = UseLightInks */ + 13, /* field[13] = VMax */ }; static const ProtobufCIntRange conversion_input__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 12 } + { 0, 14 } }; const ProtobufCMessageDescriptor conversion_input__descriptor = { @@ -226,7 +252,7 @@ const ProtobufCMessageDescriptor conversion_input__descriptor = "ConversionInput", "", sizeof(ConversionInput), - 12, + 14, conversion_input__field_descriptors, conversion_input__field_indices_by_name, 1, conversion_input__number_ranges, diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.h index 15c30fc10..794ddaaac 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.h +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v2/PMR/ColorLab/ConversionInput.pb-c.h @@ -52,10 +52,14 @@ struct _ConversionInput ProcessRange **processranges; protobuf_c_boolean has_generatehive; protobuf_c_boolean generatehive; + protobuf_c_boolean has_uselightinks; + protobuf_c_boolean uselightinks; + protobuf_c_boolean has_vmax; + double vmax; }; #define CONVERSION_INPUT__INIT \ { PROTOBUF_C_MESSAGE_INIT (&conversion_input__descriptor) \ - , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0,NULL, 0, 0 } + , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0, 0 } /* ConversionInput methods */ diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.c b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.c index 3c1230489..0defc9edf 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.c +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.c @@ -52,7 +52,7 @@ void conversion_input__free_unpacked assert(message->base.descriptor == &conversion_input__descriptor); protobuf_c_message_free_unpacked ((ProtobufCMessage*)message, allocator); } -static const ProtobufCFieldDescriptor conversion_input__field_descriptors[12] = +static const ProtobufCFieldDescriptor conversion_input__field_descriptors[14] = { { "ThreadL", @@ -198,6 +198,30 @@ static const ProtobufCFieldDescriptor conversion_input__field_descriptors[12] = 0, /* flags */ 0,NULL,NULL /* reserved1,reserved2, etc */ }, + { + "UseLightInks", + 13, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_BOOL, + offsetof(ConversionInput, has_uselightinks), + offsetof(ConversionInput, uselightinks), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, + { + "VMax", + 14, + PROTOBUF_C_LABEL_OPTIONAL, + PROTOBUF_C_TYPE_DOUBLE, + offsetof(ConversionInput, has_vmax), + offsetof(ConversionInput, vmax), + NULL, + NULL, + 0, /* flags */ + 0,NULL,NULL /* reserved1,reserved2, etc */ + }, }; static const unsigned conversion_input__field_indices_by_name[] = { 3, /* field[3] = ColorSpace */ @@ -212,11 +236,13 @@ static const unsigned conversion_input__field_indices_by_name[] = { 1, /* field[1] = ThreadA */ 2, /* field[2] = ThreadB */ 0, /* field[0] = ThreadL */ + 12, /* field[12] = UseLightInks */ + 13, /* field[13] = VMax */ }; static const ProtobufCIntRange conversion_input__number_ranges[1 + 1] = { { 1, 0 }, - { 0, 12 } + { 0, 14 } }; const ProtobufCMessageDescriptor conversion_input__descriptor = { @@ -226,7 +252,7 @@ const ProtobufCMessageDescriptor conversion_input__descriptor = "ConversionInput", "", sizeof(ConversionInput), - 12, + 14, conversion_input__field_descriptors, conversion_input__field_indices_by_name, 1, conversion_input__number_ranges, diff --git a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.h b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.h index 15c30fc10..794ddaaac 100644 --- a/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.h +++ b/Software/Visual_Studio/ColorLib/Tango.ColorLib_v3/PMR/ColorLab/ConversionInput.pb-c.h @@ -52,10 +52,14 @@ struct _ConversionInput ProcessRange **processranges; protobuf_c_boolean has_generatehive; protobuf_c_boolean generatehive; + protobuf_c_boolean has_uselightinks; + protobuf_c_boolean uselightinks; + protobuf_c_boolean has_vmax; + double vmax; }; #define CONVERSION_INPUT__INIT \ { PROTOBUF_C_MESSAGE_INIT (&conversion_input__descriptor) \ - , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0,NULL, 0, 0 } + , 0, 0, 0, 0, 0, 0, 0, COLOR_SPACE__Volume, NULL, 0, {0,NULL}, 0, {0,NULL}, 0, 0, 0, 0, 0, 0, 0,NULL, 0, 0, 0, 0, 0, 0 } /* ConversionInput methods */ diff --git a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Themes/Generic.xaml b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Themes/Generic.xaml index 068090b31..abed2be24 100644 --- a/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Themes/Generic.xaml +++ b/Software/Visual_Studio/FSE/Modules/Tango.FSE.Insights/Themes/Generic.xaml @@ -123,7 +123,7 @@ <Run>Time:</Run> <Run Text="{Binding Time,Converter={StaticResource DateTimeUtcToLocalDateTime},StringFormat='MM/dd/yyyy hh:mm:ss'}"></Run> <LineBreak/> - <Run Text="{Binding EventType.TechnicalDescription}"></Run> + <Run Text="{Binding EventType,Converter={StaticResource EventTypeTechnicalDescriptionConverter}}"></Run> </TextBlock> <StackPanel Margin="0 5 0 0" Visibility="{Binding HasDescription,Converter={StaticResource BooleanToVisibilityConverter}}"> <TextBlock Foreground="{StaticResource FSE_ErrorBrush}">Error</TextBlock> diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Converters/EventTypeDescriptionConverter.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Converters/EventTypeDescriptionConverter.cs new file mode 100644 index 000000000..2636e9588 --- /dev/null +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Converters/EventTypeDescriptionConverter.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; +using Tango.BL.Entities; +using Tango.Core.DI; + +namespace Tango.FSE.Common.Converters +{ + public class EventTypeDescriptionConverter : EventTypeTitleConverter + { + protected override string GetText(EventType evType, Machine machine) + { + return evType.GetEventText(EventType.EventTextType.Description, machine); + } + } +} diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Converters/EventTypeTechnicalDescriptionConverter.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Converters/EventTypeTechnicalDescriptionConverter.cs new file mode 100644 index 000000000..f9d741424 --- /dev/null +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Converters/EventTypeTechnicalDescriptionConverter.cs @@ -0,0 +1,20 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; +using Tango.BL.Entities; +using Tango.Core.DI; + +namespace Tango.FSE.Common.Converters +{ + public class EventTypeTechnicalDescriptionConverter : EventTypeTitleConverter + { + protected override string GetText(EventType evType, Machine machine) + { + return evType.GetEventText(EventType.EventTextType.TechnicalDescription, machine); + } + } +} diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Converters/EventTypeTitleConverter.cs b/Software/Visual_Studio/FSE/Tango.FSE.Common/Converters/EventTypeTitleConverter.cs new file mode 100644 index 000000000..5aed80ec7 --- /dev/null +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Converters/EventTypeTitleConverter.cs @@ -0,0 +1,52 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; +using Tango.BL.Entities; +using Tango.Core.DI; +using Tango.FSE.Common.Connection; + +namespace Tango.FSE.Common.Converters +{ + public class EventTypeTitleConverter : IValueConverter + { + private static IMachineProvider _machineProvider; + + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + if (_machineProvider == null) + { + _machineProvider = TangoIOC.Default.GetInstance<IMachineProvider>(); + } + + EventType evType = value as EventType; + + if (evType != null) + { + if (_machineProvider != null) + { + return GetText(evType, _machineProvider.Machine); + } + else + { + return GetText(evType, null); + } + } + + return value; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + + protected virtual String GetText(EventType evType, Machine machine) + { + return evType.GetEventText(EventType.EventTextType.Title, machine); + } + } +} diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Converters.xaml b/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Converters.xaml index 54f8e5d63..e37f48821 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Converters.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Resources/Converters.xaml @@ -49,4 +49,7 @@ <localConverters:LiquidTypeToShortNameConverter x:Key="LiquidTypeToShortNameConverter" /> <converters:IsEqualConverter x:Key="IsEqualConverter" /> <converters:IsNotConverter x:Key="IsNotConverter" /> + <localConverters:EventTypeTitleConverter x:Key="EventTypeTitleConverter" /> + <localConverters:EventTypeDescriptionConverter x:Key="EventTypeDescriptionConverter" /> + <localConverters:EventTypeTechnicalDescriptionConverter x:Key="EventTypeTechnicalDescriptionConverter" /> </ResourceDictionary>
\ No newline at end of file diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj b/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj index 9a43bb5fb..ce56e2daf 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj +++ b/Software/Visual_Studio/FSE/Tango.FSE.Common/Tango.FSE.Common.csproj @@ -182,6 +182,9 @@ <Compile Include="Controls\ToggleIconButton.cs" /> <Compile Include="Converters\DateTimeUtcHumanizeConverter.cs" /> <Compile Include="Converters\DoubleToChartValuesConverter.cs" /> + <Compile Include="Converters\EventTypeTechnicalDescriptionConverter.cs" /> + <Compile Include="Converters\EventTypeDescriptionConverter.cs" /> + <Compile Include="Converters\EventTypeTitleConverter.cs" /> <Compile Include="Converters\FilePathToIconConverter.cs" /> <Compile Include="Converters\JobProgressToPositionConverter.cs" /> <Compile Include="Converters\LiquidTypeToShortNameConverter.cs" /> diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/EmulateMachineEventDialogView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/EmulateMachineEventDialogView.xaml index 63d25e706..55c11ce8a 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/EmulateMachineEventDialogView.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Dialogs/EmulateMachineEventDialogView.xaml @@ -43,7 +43,7 @@ <Run></Run> <Run Text="{Binding Name}"></Run> <LineBreak/> - <Run Text="{Binding Title}" FontSize="{StaticResource FSE_SmallerFontSize}" Foreground="{StaticResource FSE_GrayBrush}"></Run> + <Run Text="{Binding Converter={StaticResource EventTypeTitleConverter}}" FontSize="{StaticResource FSE_SmallerFontSize}" Foreground="{StaticResource FSE_GrayBrush}"></Run> </TextBlock> </StackPanel> </DockPanel> diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Events/DefaultEventsProvider.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/Events/DefaultEventsProvider.cs index a4ff03fc5..c7023f265 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Events/DefaultEventsProvider.cs +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Events/DefaultEventsProvider.cs @@ -206,9 +206,9 @@ namespace Tango.FSE.UI.Events var item = NotificationProvider.PushSnackbarItem( messageType, - ev.EventType.Title, + ev.EventType.GetEventText(Tango.BL.Entities.EventType.EventTextType.Title, MachineProvider.Machine), true, - ev.EventType.Name + "\n" + ev.EventType.Description, + ev.EventType.Name + "\n" + ev.EventType.GetEventText(Tango.BL.Entities.EventType.EventTextType.Description, MachineProvider.Machine), timeout, null, () => diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/EventsView.xaml b/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/EventsView.xaml index 58b194163..0560240c9 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/EventsView.xaml +++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Views/EventsView.xaml @@ -46,7 +46,7 @@ <DockPanel VerticalAlignment="Center"> <TextBlock FontSize="{StaticResource FSE_SmallFontSize}" DockPanel.Dock="Right" Text="{Binding DateTime,Converter={StaticResource DateTimeUtcToLocalDateTime},StringFormat='HH:mm:ss'}" ToolTip="{Binding DateTime,Converter={StaticResource DateTimeUtcHumanizeConverter}}"></TextBlock> - <TextBlock Text="{Binding EventType.Title}"> + <TextBlock Text="{Binding EventType,Converter={StaticResource EventTypeTitleConverter}}"> <TextBlock.Style> <Style TargetType="TextBlock"> <Setter Property="Foreground" Value="{StaticResource FSE_PrimaryForegroundBrush}"></Setter> @@ -70,7 +70,7 @@ <DockPanel TextElement.FontSize="{StaticResource FSE_SmallFontSize}" TextElement.Foreground="{StaticResource FSE_GrayBrush}"> <TextBlock DockPanel.Dock="Right"><Run>#</Run><Run Text="{Binding EventType.Code}"></Run></TextBlock> - <TextBlock Text="{Binding EventType.TechnicalDescription}" Margin="0 0 10 0" TextWrapping="Wrap"></TextBlock> + <TextBlock Text="{Binding EventType,Converter={StaticResource EventTypeTechnicalDescriptionConverter}}" Margin="0 0 10 0" TextWrapping="Wrap"></TextBlock> </DockPanel> <StackPanel Margin="0 5 0 0" TextElement.FontSize="{StaticResource FSE_SmallerFontSize}" TextElement.Foreground="{StaticResource FSE_GrayBrush}"> <!--<TextBlock Text="{Binding EventType.Name}"></TextBlock>--> @@ -105,7 +105,7 @@ <StackPanel Margin="10 0 0 0"> <DockPanel VerticalAlignment="Center"> <TextBlock FontSize="{StaticResource FSE_SmallFontSize}" DockPanel.Dock="Right" Text="{Binding DateTime,Converter={StaticResource DateTimeUtcToLocalDateTime},StringFormat='HH:mm:ss'}" ToolTip="{Binding DateTime,Converter={StaticResource DateTimeUtcHumanizeConverter}}"></TextBlock> - <TextBlock Text="{Binding EventType.Title}"></TextBlock> + <TextBlock Text="{Binding EventType,Converter={StaticResource EventTypeTitleConverter}}"></TextBlock> </DockPanel> <Rectangle Margin="0 5 0 5" DockPanel.Dock="Top" VerticalAlignment="Bottom" StrokeThickness="1"> <Rectangle.Stroke> @@ -118,7 +118,7 @@ <DockPanel TextElement.FontSize="{StaticResource FSE_SmallFontSize}" TextElement.Foreground="{StaticResource FSE_GrayBrush}"> <TextBlock DockPanel.Dock="Right"><Run>#</Run><Run Text="{Binding EventType.Code}"></Run></TextBlock> - <TextBlock Text="{Binding EventType.TechnicalDescription}" Margin="0 0 10 0" TextWrapping="Wrap"></TextBlock> + <TextBlock Text="{Binding EventType,Converter={StaticResource EventTypeTechnicalDescriptionConverter}}" Margin="0 0 10 0" TextWrapping="Wrap"></TextBlock> </DockPanel> <StackPanel Margin="0 5 0 0" TextElement.FontSize="{StaticResource FSE_SmallerFontSize}" TextElement.Foreground="{StaticResource FSE_GrayBrush}"> <!--<TextBlock Text="{Binding EventType.Name}"></TextBlock>--> diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/EventsViews/GeneralView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/EventsViews/GeneralView.xaml index 8ba021afb..3610a2850 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/EventsViews/GeneralView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/EventsViews/GeneralView.xaml @@ -11,10 +11,10 @@ <DockPanel> <Image Stretch="None" Margin="20" DockPanel.Dock="Right" Source="../Images/machine_small.png" RenderOptions.BitmapScalingMode="Fant" /> <DockPanel Margin="35 20 20 20"> - <TextBlock FontSize="{StaticResource TangoTitleFontSize}" FontWeight="SemiBold" DockPanel.Dock="Top" Text="{Binding EventType.Title,FallbackValue='Unknown Event'}"></TextBlock> + <TextBlock FontSize="{StaticResource TangoTitleFontSize}" FontWeight="SemiBold" DockPanel.Dock="Top" Text="{Binding EventType,Converter={StaticResource EventTypeTitleConverter},FallbackValue='Unknown Event'}"></TextBlock> <StackPanel Margin="0 30 0 0"> - <TextBlock TextWrapping="Wrap" FontWeight="SemiBold" Text="{Binding EventType.Description,FallbackValue='No Description'}"></TextBlock> + <TextBlock TextWrapping="Wrap" FontWeight="SemiBold" Text="{Binding EventType,Converter={StaticResource EventTypeDescriptionConverter},FallbackValue='No Description'}"></TextBlock> <Rectangle Margin="0 5 0 10" StrokeThickness="2" Stroke="{StaticResource TangoDividerBrush}" /> <ItemsControl ItemsSource="{Binding EventType.Guidance,Converter={StaticResource StringToLinesConverter}}"> diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Tango.PPC.Events.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Tango.PPC.Events.csproj index e8d4683ee..61485b00b 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Tango.PPC.Events.csproj +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/Tango.PPC.Events.csproj @@ -187,7 +187,7 @@ <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.Events/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/ViewModels/MainViewVM.cs index a6e6b7a4e..46f6cd1ee 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Events/ViewModels/MainViewVM.cs @@ -138,8 +138,8 @@ namespace Tango.PPC.Events.ViewModels var notificationItem = new MessageNotificationItem(); notificationItem.CanClose = ev.EventType.Persistent; - notificationItem.Message = ev.EventType.Title; - notificationItem.ExpandedMessage = ev.EventType.Description; + notificationItem.Message = ev.EventType.GetEventText(EventType.EventTextType.Title, MachineProvider.Machine); + notificationItem.ExpandedMessage = ev.EventType.GetEventText(EventType.EventTextType.Description, MachineProvider.Machine); notificationItem.Pressed += async (_, __) => { if (!ev.EventType.Persistent) diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Converters/EventTypeDescriptionConverter.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Converters/EventTypeDescriptionConverter.cs new file mode 100644 index 000000000..ad39581f4 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Converters/EventTypeDescriptionConverter.cs @@ -0,0 +1,21 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; +using Tango.BL.Entities; +using Tango.Core.DI; +using Tango.PPC.Common.Connection; + +namespace Tango.PPC.Common.Converters +{ + public class EventTypeDescriptionConverter : EventTypeTitleConverter + { + protected override string GetText(EventType evType, Machine machine) + { + return evType.GetEventText(EventType.EventTextType.Description, machine); + } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Converters/EventTypeTitleConverter.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Converters/EventTypeTitleConverter.cs new file mode 100644 index 000000000..25e620535 --- /dev/null +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Converters/EventTypeTitleConverter.cs @@ -0,0 +1,48 @@ +using System; +using System.Collections.Generic; +using System.Globalization; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using System.Windows.Data; +using Tango.BL.Entities; +using Tango.Core.DI; +using Tango.PPC.Common.Connection; + +namespace Tango.PPC.Common.Converters +{ + public class EventTypeTitleConverter : IValueConverter + { + private static IMachineProvider _machineProvider; + + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + if (_machineProvider == null) + { + _machineProvider = TangoIOC.Default.GetInstance<IMachineProvider>(); + } + + if (_machineProvider != null && _machineProvider.Machine != null) + { + EventType evType = value as EventType; + + if (evType != null) + { + return GetText(evType, _machineProvider.Machine); + } + } + + return value; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + + protected virtual String GetText(EventType evType, Machine machine) + { + return evType.GetEventText(EventType.EventTextType.Title, machine); + } + } +} diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml index 09762d7ce..b742c3b73 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Resources/Merged.xaml @@ -1,6 +1,7 @@ <ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" + xmlns:converters="clr-namespace:Tango.SharedUI.Converters;assembly=Tango.SharedUI" + xmlns:localConverter="clr-namespace:Tango.PPC.Common.Converters" xmlns:local="clr-namespace:Tango.PPC.Common.Resources"> <ResourceDictionary.MergedDictionaries> @@ -61,6 +62,8 @@ <converters:BooleanToYesNoConverter x:Key="BooleanToYesNoConverter" /> <converters:IsEqualToVisibilityConverter x:Key="IsEqualToVisibilityConverter" /> <converters:IsToStringEqualToVisibilityConverter x:Key="IsToStringEqualToVisibilityConverter" /> + <localConverter:EventTypeDescriptionConverter x:Key="EventTypeDescriptionConverter" /> + <localConverter:EventTypeTitleConverter x:Key="EventTypeTitleConverter" /> <Style TargetType="FrameworkElement"> <Setter Property="TextElement.FontFamily" Value="{StaticResource TangoFlexoFontFamily}"></Setter> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj index 44e25d624..736fd321c 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Tango.PPC.Common.csproj @@ -151,6 +151,8 @@ <DependentUpon>TwineCatalogControl.xaml</DependentUpon> </Compile> <Compile Include="Controls\TwineCatalogRenderer.cs" /> + <Compile Include="Converters\EventTypeDescriptionConverter.cs" /> + <Compile Include="Converters\EventTypeTitleConverter.cs" /> <Compile Include="Converters\HeightToOpacityConverter.cs" /> <Compile Include="DataStore\DefaultDataStoreService.cs" /> <Compile Include="DataStore\IDataStoreService.cs" /> @@ -522,7 +524,7 @@ </Target> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev29_draft_6.xlsx b/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev29_draft_6.xlsx Binary files differnew file mode 100644 index 000000000..740ab8cf2 --- /dev/null +++ b/Software/Visual_Studio/Resources/Events Revisions/Tango alarm events handling chart_Rev29_draft_6.xlsx diff --git a/Software/Visual_Studio/Tango.BL/Entities/EventType.cs b/Software/Visual_Studio/Tango.BL/Entities/EventType.cs index 985187886..9ed853ca2 100644 --- a/Software/Visual_Studio/Tango.BL/Entities/EventType.cs +++ b/Software/Visual_Studio/Tango.BL/Entities/EventType.cs @@ -7,6 +7,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; using Tango.BL.Enumerations; +using Tango.BL.Helpers; namespace Tango.BL.Entities { @@ -73,5 +74,33 @@ namespace Tango.BL.Entities { } + + public enum EventTextType + { + Title, + Description, + TechnicalDescription + } + + /// <summary> + /// Replaces the selected text type '@' char with the liquid type name by the component index of this event type and the machine ids configuration. + /// </summary> + /// <param name="textType">Type of the text.</param> + /// <param name="machine">The machine.</param> + /// <returns></returns> + public String GetEventText(EventTextType textType, Machine machine) + { + switch (textType) + { + case EventTextType.Title: + return machine != null ? EventTypeTextConverter.ReplaceText(machine, Title, ComponentIndex) : Title; + case EventTextType.Description: + return machine != null ? EventTypeTextConverter.ReplaceText(machine, Description, ComponentIndex) : Description; + case EventTextType.TechnicalDescription: + return machine != null ? EventTypeTextConverter.ReplaceText(machine, TechnicalDescription, ComponentIndex) : TechnicalDescription; + default: + return EventTypeTextConverter.ReplaceText(machine, Title, ComponentIndex); + } + } } } diff --git a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypes.cs b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypes.cs index 92096878e..6fde6abb6 100644 --- a/Software/Visual_Studio/Tango.BL/Enumerations/EventTypes.cs +++ b/Software/Visual_Studio/Tango.BL/Enumerations/EventTypes.cs @@ -272,46 +272,46 @@ namespace Tango.BL.Enumerations WINDER_CONE_DOES_NOT_EXIST = 3002, /// <summary> - /// (The feeder motor current is too high. Cannot execute job) + /// (Feeder motor malfunction. Cannot execute job) /// </summary> - [Description("The feeder motor current is too high. Cannot execute job")] - FEEDER_MOTOR_OVERCURRENT = 3003, + [Description("Feeder motor malfunction. Cannot execute job")] + FEEDER_MOTOR_MALFUNCTION = 3003, /// <summary> - /// (The current in the right loader motor is too high. Cannot execute job) + /// (Right loader motor malfunction. Cannot execute job) /// </summary> - [Description("The current in the right loader motor is too high. Cannot execute job")] - RIGHT_LOADER_MOTOR_OVERCURRENT = 3004, + [Description("Right loader motor malfunction. Cannot execute job")] + RIGHT_LOADER_MOTOR_MALFUNCTION = 3004, /// <summary> - /// (The puller motor current is too high. Cannot execute job ) + /// (Puller motor malfunction. Cannot execute job ) /// </summary> - [Description("The puller motor current is too high. Cannot execute job ")] - PULLER_MOTOR_OVERCURRENT = 3005, + [Description("Puller motor malfunction. Cannot execute job ")] + PULLER_MOTOR_MALFUNCTION = 3005, /// <summary> - /// (The left loader motor current is too high. Cannot execute job) + /// (Left loader motor malfunction. Cannot execute job) /// </summary> - [Description("The left loader motor current is too high. Cannot execute job")] - LEFT_LOADER_MOTOR_OVERCURRENT = 3006, + [Description("Left loader motor malfunction. Cannot execute job")] + LEFT_LOADER_MOTOR_MALFUNCTION = 3006, /// <summary> - /// (The winder motor current is too high. Cannot execute job) + /// (Winder motor malfunction. Cannot execute job) /// </summary> - [Description("The winder motor current is too high. Cannot execute job")] - WINDER_MOTOR_OVERCURRENT = 3007, + [Description("Winder motor malfunction. Cannot execute job")] + WINDER_MOTOR_MALFUNCTION = 3007, /// <summary> - /// (The screw motor current is too high. Cannot execute job) + /// (Screw motor malfunction. Cannot execute job) /// </summary> - [Description("The screw motor current is too high. Cannot execute job")] - SCREW_MOTOR_OVERCURRENT = 3008, + [Description("Screw motor malfunction. Cannot execute job")] + SCREW_MOTOR_MALFUNCTION = 3008, /// <summary> - /// (The loading arm motor current is too high. Cannot execute job) + /// (Loading arm motor malfunction. Cannot execute job) /// </summary> - [Description("The loading arm motor current is too high. Cannot execute job")] - LOADING_ARM_MOTOR_OVERCURRENT = 3009, + [Description("Loading arm motor malfunction. Cannot execute job")] + LOADING_ARM_MOTOR_MALFUNCTION = 3009, /// <summary> /// (The feeder motor temperature is too high. Cannot execute job) @@ -470,22 +470,22 @@ namespace Tango.BL.Enumerations SCREW_MOTOR_LIMIT_TIMEOUT = 3035, /// <summary> - /// (The winder dancer motor current is too high. Cannot execute job) + /// (Winder dancer motor malfunction. Cannot execute job) /// </summary> - [Description("The winder dancer motor current is too high. Cannot execute job")] - WINDER_DANCER_MOTOR_OVERCURRENT = 3036, + [Description("Winder dancer motor malfunction. Cannot execute job")] + WINDER_DANCER_MOTOR_MALFUNCTION = 3036, /// <summary> - /// (The puller dancer motor current is too high. Cannot execute job) + /// (Puller dancer motor malfunction. Cannot execute job) /// </summary> - [Description("The puller dancer motor current is too high. Cannot execute job")] - PULLER_DANCER_MOTOR_OVERCURRENT = 3037, + [Description("Puller dancer motor malfunction. Cannot execute job")] + PULLER_DANCER_MOTOR_MALFUNCTION = 3037, /// <summary> - /// (The feeder dancer motor current is too high. Cannot execute job) + /// (Feeder dancer motor malfunction. Cannot execute job) /// </summary> - [Description("The feeder dancer motor current is too high. Cannot execute job")] - FEEDER_DANCER_MOTOR_OVERCURRENT = 3038, + [Description("Feeder dancer motor malfunction. Cannot execute job")] + FEEDER_DANCER_MOTOR_MALFUNCTION = 3038, /// <summary> /// (The winder dancer motor temperature is too high. Cannot execute job) @@ -566,10 +566,34 @@ namespace Tango.BL.Enumerations THREAD_LOADING_ERROR = 3051, /// <summary> - /// (The dryer motor current is too high. Cannot execute job) + /// (Cannot communicate with BTSR. Cannot execute job) /// </summary> - [Description("The dryer motor current is too high. Cannot execute job")] - DRYER_MOTOR_OVERCURRENT = 4000, + [Description("Cannot communicate with BTSR. Cannot execute job")] + NO_COMMUNICATION_WITH_BTSR = 3052, + + /// <summary> + /// (BTSR malfunction. Cannot execute job.) + /// </summary> + [Description("BTSR malfunction. Cannot execute job.")] + BTSR_MALFUNCTION = 3053, + + /// <summary> + /// (Tension in BTSR is out of range. Cannot execute job) + /// </summary> + [Description("Tension in BTSR is out of range. Cannot execute job")] + TENSION_IN_BTSR_OUT_OF_RANGE = 3054, + + /// <summary> + /// (Gripper malfunction. Thread caught in gripper. Cannot execute job) + /// </summary> + [Description("Gripper malfunction. Thread caught in gripper. Cannot execute job")] + GRIPPER_MALFUNCTION = 3055, + + /// <summary> + /// (Dryer motor malfunction. Cannot execute job) + /// </summary> + [Description("Dryer motor malfunction. Cannot execute job")] + DRYER_MOTOR_MALFUNCTION = 4000, /// <summary> /// (The dryer motor temperature is too high. Cannot execute jobs) @@ -668,10 +692,10 @@ namespace Tango.BL.Enumerations DRYER_FAN_STOPPED = 4016, /// <summary> - /// (The current in dryer lid motor is too high. Cannot execute job) + /// (Dryer lid motor malfunction. Cannot execute job) /// </summary> - [Description("The current in dryer lid motor is too high. Cannot execute job")] - DRYER_LID_MOTOR_OVERCURRENT = 4017, + [Description("Dryer lid motor malfunction. Cannot execute job")] + DRYER_LID_MOTOR_MALFUNCTION = 4017, /// <summary> /// (The temperature in the dryer lid motor is too high. Cannot execute job) @@ -884,10 +908,10 @@ namespace Tango.BL.Enumerations DYEING_HEAD_COVER_CLOSE_TIMEOUT = 5030, /// <summary> - /// (The current in the dyeing head cover motor is too high. Cannot execute job) + /// (Dyeing head cover motor malfunction. Cannot execute job) /// </summary> - [Description("The current in the dyeing head cover motor is too high. Cannot execute job")] - DYEING_HEAD_COVER_MOTOR_OVERCURRENT = 5031, + [Description("Dyeing head cover motor malfunction. Cannot execute job")] + DYEING_HEAD_COVER_MOTOR_MALFUNCTION = 5031, /// <summary> /// (The temperature in the dyeing head cover motor is too high. Cannot execute job) @@ -908,10 +932,10 @@ namespace Tango.BL.Enumerations DYEING_HEAD_COVER_MOTOR_UNDERVOLTAGE = 5034, /// <summary> - /// (The current in the dyeing head cleaning mechanism motor is too high. Cannot execute job) + /// (Dyeing head cleaning mechanism motor malfunction. Cannot execute job) /// </summary> - [Description("The current in the dyeing head cleaning mechanism motor is too high. Cannot execute job")] - DYEING_HEAD_CLEANING_MECHANISM_MOTOR_OVERCURRENT = 5035, + [Description("Dyeing head cleaning mechanism motor malfunction. Cannot execute job")] + DYEING_HEAD_CLEANING_MECHANISM_MOTOR_MALFUNCTION = 5035, /// <summary> /// (The temperature in the dyeing head cleaning mechanism motor is too high. Cannot execute job) @@ -932,10 +956,10 @@ namespace Tango.BL.Enumerations DYEING_HEAD_CLEANING_MECHANISM_MOTOR_UNDERVOLTAGE = 5038, /// <summary> - /// (The current in the dyeing head cleaning head motor is too high. Cannot execute job) + /// (Dyeing head cleaning head motor malfunction. Cannot execute job) /// </summary> - [Description("The current in the dyeing head cleaning head motor is too high. Cannot execute job")] - DYEING_HEAD_CLEANING_HEAD_MOTOR_OVERCURRENT = 5039, + [Description("Dyeing head cleaning head motor malfunction. Cannot execute job")] + DYEING_HEAD_CLEANING_HEAD_MOTOR_MALFUNCTION = 5039, /// <summary> /// (The temperature in the dyeing head cleaning head motor is too high. Cannot execute job) @@ -1334,244 +1358,244 @@ namespace Tango.BL.Enumerations MIXER_CURRENT_LOOP_BREAK = 6005, /// <summary> - /// (Overpressure in black dispenser . Cannot execute job) + /// (Overpressure in @ dispenser . Cannot execute job) /// </summary> - [Description("Overpressure in black dispenser . Cannot execute job")] + [Description("Overpressure in @ dispenser . Cannot execute job")] DISPENSER_1_OVERPRESSURE = 7000, /// <summary> - /// (Overpressure in cyan dispenser. Cannot execute job ) + /// (Overpressure in @ dispenser. Cannot execute job ) /// </summary> - [Description("Overpressure in cyan dispenser. Cannot execute job ")] + [Description("Overpressure in @ dispenser. Cannot execute job ")] DISPENSER_2_OVERPRESSURE = 7001, /// <summary> - /// (Overpressure in magenta dispenser. Cannot execute job ) + /// (Overpressure in @ dispenser. Cannot execute job ) /// </summary> - [Description("Overpressure in magenta dispenser. Cannot execute job ")] + [Description("Overpressure in @ dispenser. Cannot execute job ")] DISPENSER_3_OVERPRESSURE = 7002, /// <summary> - /// (Overpressure in yellow dispenser. Cannot execute job ) + /// (Overpressure in @ dispenser. Cannot execute job ) /// </summary> - [Description("Overpressure in yellow dispenser. Cannot execute job ")] + [Description("Overpressure in @ dispenser. Cannot execute job ")] DISPENSER_4_OVERPRESSURE = 7003, /// <summary> - /// (Overpressure in transparent ink dispenser. Cannot execute job ) + /// (Overpressure in @ dispenser. Cannot execute job ) /// </summary> - [Description("Overpressure in transparent ink dispenser. Cannot execute job ")] + [Description("Overpressure in @ dispenser. Cannot execute job ")] DISPENSER_5_OVERPRESSURE = 7004, /// <summary> - /// (Overpressure in spot color 1 dispenser. Cannot execute job ) + /// (Overpressure in @ dispenser. Cannot execute job ) /// </summary> - [Description("Overpressure in spot color 1 dispenser. Cannot execute job ")] + [Description("Overpressure in @ dispenser. Cannot execute job ")] DISPENSER_6_OVERPRESSURE = 7005, /// <summary> - /// (Overpressure in cleaner dispenser. Cannot execute job ) + /// (Overpressure in @ dispenser. Cannot execute job ) /// </summary> - [Description("Overpressure in cleaner dispenser. Cannot execute job ")] + [Description("Overpressure in @ dispenser. Cannot execute job ")] DISPENSER_7_OVERPRESSURE = 7006, /// <summary> - /// (Overpressure in lubricant dispenser. Cannot execute job) + /// (Overpressure in @ dispenser. Cannot execute job) /// </summary> - [Description("Overpressure in lubricant dispenser. Cannot execute job")] + [Description("Overpressure in @ dispenser. Cannot execute job")] DISPENSER_8_OVERPRESSURE = 7007, /// <summary> - /// (The pressure in black dispenser is too low. Cannot execute job) + /// (The pressure in @ dispenser is too low. Cannot execute job) /// </summary> - [Description("The pressure in black dispenser is too low. Cannot execute job")] + [Description("The pressure in @ dispenser is too low. Cannot execute job")] DISPENSER_1_UNDERPRESSURE = 7008, /// <summary> - /// (The pressure in cyan dispenser is too low. Cannot execute job) + /// (The pressure in @ dispenser is too low. Cannot execute job) /// </summary> - [Description("The pressure in cyan dispenser is too low. Cannot execute job")] + [Description("The pressure in @ dispenser is too low. Cannot execute job")] DISPENSER_2_UNDERPRESSURE = 7009, /// <summary> - /// (The pressure in magenta dispenser is too low. Cannot execute job) + /// (The pressure in @ dispenser is too low. Cannot execute job) /// </summary> - [Description("The pressure in magenta dispenser is too low. Cannot execute job")] + [Description("The pressure in @ dispenser is too low. Cannot execute job")] DISPENSER_3_UNDERPRESSURE = 7010, /// <summary> - /// (The pressure in yellow dispenser is too low. Cannot execute job) + /// (The pressure in @ dispenser is too low. Cannot execute job) /// </summary> - [Description("The pressure in yellow dispenser is too low. Cannot execute job")] + [Description("The pressure in @ dispenser is too low. Cannot execute job")] DISPENSER_4_UNDERPRESSURE = 7011, /// <summary> - /// (The pressure in transparent ink dispenser is too low. Cannot execute job) + /// (The pressure in @ dispenser is too low. Cannot execute job) /// </summary> - [Description("The pressure in transparent ink dispenser is too low. Cannot execute job")] + [Description("The pressure in @ dispenser is too low. Cannot execute job")] DISPENSER_5_UNDERPRESSURE = 7012, /// <summary> - /// (The pressure in spot color 1 dispenser is too low. Cannot execute job) + /// (The pressure in @ dispenser is too low. Cannot execute job) /// </summary> - [Description("The pressure in spot color 1 dispenser is too low. Cannot execute job")] + [Description("The pressure in @ dispenser is too low. Cannot execute job")] DISPENSER_6_UNDERPRESSURE = 7013, /// <summary> - /// (The pressure in cleaner dispenser is too low. Cannot execute job) + /// (The pressure in @ dispenser is too low. Cannot execute job) /// </summary> - [Description("The pressure in cleaner dispenser is too low. Cannot execute job")] + [Description("The pressure in @ dispenser is too low. Cannot execute job")] DISPENSER_7_UNDERPRESSURE = 7014, /// <summary> - /// (The pressure in lubricant dispenser is too low. Cannot execute job) + /// (The pressure in @ dispenser is too low. Cannot execute job) /// </summary> - [Description("The pressure in lubricant dispenser is too low. Cannot execute job")] + [Description("The pressure in @ dispenser is too low. Cannot execute job")] DISPENSER_8_UNDERPRESSURE = 7015, /// <summary> - /// (Black dispenser is empty) + /// (The @ dispenser is empty) /// </summary> - [Description("Black dispenser is empty")] + [Description("The @ dispenser is empty")] DISPENSER_1_EMPTY = 7016, /// <summary> - /// (Cyan dispenser is empty) + /// (The @ dispenser is empty) /// </summary> - [Description("Cyan dispenser is empty")] + [Description("The @ dispenser is empty")] DISPENSER_2_EMPTY = 7017, /// <summary> - /// (Magenta dispenser is empty) + /// (The @ dispenser is empty) /// </summary> - [Description("Magenta dispenser is empty")] + [Description("The @ dispenser is empty")] DISPENSER_3_EMPTY = 7018, /// <summary> - /// (Yellow dispenser is empty) + /// (The @ dispenser is empty) /// </summary> - [Description("Yellow dispenser is empty")] + [Description("The @ dispenser is empty")] DISPENSER_4_EMPTY = 7019, /// <summary> - /// (Transparent ink dispenser is empty) + /// (The @ dispenser is empty) /// </summary> - [Description("Transparent ink dispenser is empty")] + [Description("The @ dispenser is empty")] DISPENSER_5_EMPTY = 7020, /// <summary> - /// (Spot color 1 dispenser is empty) + /// (The @ dispenser is empty) /// </summary> - [Description("Spot color 1 dispenser is empty")] + [Description("The @ dispenser is empty")] DISPENSER_6_EMPTY = 7021, /// <summary> - /// (Cleaner dispenser is empty) + /// (The @ dispenser is empty) /// </summary> - [Description("Cleaner dispenser is empty")] + [Description("The @ dispenser is empty")] DISPENSER_7_EMPTY = 7022, /// <summary> - /// (Lubricant dispenser is empty) + /// (The @ dispenser is empty) /// </summary> - [Description("Lubricant dispenser is empty")] + [Description("The @ dispenser is empty")] DISPENSER_8_EMPTY = 7023, /// <summary> - /// (Dispenser problem. Cannot execute job) + /// (Problem in the @ dispenser. Cannot execute job) /// </summary> - [Description("Dispenser problem. Cannot execute job")] + [Description("Problem in the @ dispenser. Cannot execute job")] DISPENSER_1_REFILL_FAILURE = 7024, /// <summary> - /// (Dispenser problem. Cannot execute job) + /// (Problem in the @ dispenser. Cannot execute job) /// </summary> - [Description("Dispenser problem. Cannot execute job")] + [Description("Problem in the @ dispenser. Cannot execute job")] DISPENSER_2_REFILL_FAILURE = 7025, /// <summary> - /// (Dispenser problem. Cannot execute job) + /// (Problem in the @ dispenser. Cannot execute job) /// </summary> - [Description("Dispenser problem. Cannot execute job")] + [Description("Problem in the @ dispenser. Cannot execute job")] DISPENSER_3_REFILL_FAILURE = 7026, /// <summary> - /// (Dispenser problem. Cannot execute job) + /// (Problem in the @ dispenser. Cannot execute job) /// </summary> - [Description("Dispenser problem. Cannot execute job")] + [Description("Problem in the @ dispenser. Cannot execute job")] DISPENSER_4_REFILL_FAILURE = 7027, /// <summary> - /// (Dispenser problem. Cannot execute job) + /// (Problem in the @ dispenser. Cannot execute job) /// </summary> - [Description("Dispenser problem. Cannot execute job")] + [Description("Problem in the @ dispenser. Cannot execute job")] DISPENSER_5_REFILL_FAILURE = 7028, /// <summary> - /// (Dispenser problem. Cannot execute job) + /// (Problem in the @ dispenser. Cannot execute job) /// </summary> - [Description("Dispenser problem. Cannot execute job")] + [Description("Problem in the @ dispenser. Cannot execute job")] DISPENSER_6_REFILL_FAILURE = 7029, /// <summary> - /// (Dispenser problem. Cannot execute job) + /// (Problem in the @ dispenser. Cannot execute job) /// </summary> - [Description("Dispenser problem. Cannot execute job")] + [Description("Problem in the @ dispenser. Cannot execute job")] DISPENSER_7_REFILL_FAILURE = 7030, /// <summary> - /// (Dispenser problem. Cannot execute job) + /// (Problem in the @ dispenser. Cannot execute job) /// </summary> - [Description("Dispenser problem. Cannot execute job")] + [Description("Problem in the @ dispenser. Cannot execute job")] DISPENSER_8_REFILL_FAILURE = 7031, /// <summary> - /// (Black dispenser motor current is too high. Cannot execute job) + /// (Malfunction in @ dispenser motor. Cannot execute job) /// </summary> - [Description("Black dispenser motor current is too high. Cannot execute job")] - DISPENSER_1_MOTOR_OVERCURRENT = 7032, + [Description("Malfunction in @ dispenser motor. Cannot execute job")] + DISPENSER_1_MOTOR_MALFUNCTION = 7032, /// <summary> - /// (Cyan dispenser motor current is too high. Cannot execute job) + /// (Malfunction in @ dispenser motor. Cannot execute job) /// </summary> - [Description("Cyan dispenser motor current is too high. Cannot execute job")] - DISPENSER_2_MOTOR_OVERCURRENT = 7033, + [Description("Malfunction in @ dispenser motor. Cannot execute job")] + DISPENSER_2_MOTOR_MALFUNCTION = 7033, /// <summary> - /// (Magenta dispenser motor current is too high. Cannot execute job) + /// (Malfunction in @ dispenser motor. Cannot execute job) /// </summary> - [Description("Magenta dispenser motor current is too high. Cannot execute job")] - DISPENSER_3_MOTOR_OVERCURRENT = 7034, + [Description("Malfunction in @ dispenser motor. Cannot execute job")] + DISPENSER_3_MOTOR_MALFUNCTION = 7034, /// <summary> - /// (Yellow dispenser motor current is too high. Cannot execute job) + /// (Malfunction in @ dispenser motor. Cannot execute job) /// </summary> - [Description("Yellow dispenser motor current is too high. Cannot execute job")] - DISPENSER_4_MOTOR_OVERCURRENT = 7035, + [Description("Malfunction in @ dispenser motor. Cannot execute job")] + DISPENSER_4_MOTOR_MALFUNCTION = 7035, /// <summary> - /// (Transparent ink dispenser motor current is too high. Cannot execute job) + /// (Malfunction in @ dispenser motor. Cannot execute job) /// </summary> - [Description("Transparent ink dispenser motor current is too high. Cannot execute job")] - DISPENSER_5_MOTOR_OVERCURRENT = 7036, + [Description("Malfunction in @ dispenser motor. Cannot execute job")] + DISPENSER_5_MOTOR_MALFUNCTION = 7036, /// <summary> - /// (Spot color 1 dispenser motor current is too high. Cannot execute job) + /// (Malfunction in @ dispenser motor. Cannot execute job) /// </summary> - [Description("Spot color 1 dispenser motor current is too high. Cannot execute job")] - DISPENSER_6_MOTOR_OVERCURRENT = 7037, + [Description("Malfunction in @ dispenser motor. Cannot execute job")] + DISPENSER_6_MOTOR_MALFUNCTION = 7037, /// <summary> - /// (Cleaner dispenser motor current is too high. Cannot execute job) + /// (Malfunction in @ dispenser motor. Cannot execute job) /// </summary> - [Description("Cleaner dispenser motor current is too high. Cannot execute job")] - DISPENSER_7_MOTOR_OVERCURRENT = 7038, + [Description("Malfunction in @ dispenser motor. Cannot execute job")] + DISPENSER_7_MOTOR_MALFUNCTION = 7038, /// <summary> - /// (Lubricant dispenser motor current is too high. Cannot execute job) + /// (Malfunction in @ dispenser motor. Cannot execute job) /// </summary> - [Description("Lubricant dispenser motor current is too high. Cannot execute job")] - DISPENSER_8_MOTOR_OVERCURRENT = 7039, + [Description("Malfunction in @ dispenser motor. Cannot execute job")] + DISPENSER_8_MOTOR_MALFUNCTION = 7039, /// <summary> /// (Black dispenser motor temperature is too high. Cannot execute job) @@ -1718,342 +1742,438 @@ namespace Tango.BL.Enumerations DISPENSER_8_MOTOR_UNDERVOLTAGE = 7063, /// <summary> - /// (Black dispenser is at the upper limit. Cannot execute job) + /// (The @ dispenser is at upper limit. Cannot execute job) /// </summary> - [Description("Black dispenser is at the upper limit. Cannot execute job")] + [Description("The @ dispenser is at upper limit. Cannot execute job")] DISPENSER_1_UPPER_HARD_LIMIT = 7064, /// <summary> - /// (Cyan dispenser is at the upper limit. Cannot execute job) + /// (The @ dispenser is at upper limit. Cannot execute job) /// </summary> - [Description("Cyan dispenser is at the upper limit. Cannot execute job")] + [Description("The @ dispenser is at upper limit. Cannot execute job")] DISPENSER_2_UPPER_HARD_LIMIT = 7065, /// <summary> - /// (Magenta dispenser is at the upper limit. Cannot execute job) + /// (The @ dispenser is at upper limit. Cannot execute job) /// </summary> - [Description("Magenta dispenser is at the upper limit. Cannot execute job")] + [Description("The @ dispenser is at upper limit. Cannot execute job")] DISPENSER_3_UPPER_HARD_LIMIT = 7066, /// <summary> - /// (Yellow dispenser is at the upper limit. Cannot execute job) + /// (The @ dispenser is at upper limit. Cannot execute job) /// </summary> - [Description("Yellow dispenser is at the upper limit. Cannot execute job")] + [Description("The @ dispenser is at upper limit. Cannot execute job")] DISPENSER_4_UPPER_HARD_LIMIT = 7067, /// <summary> - /// (Transparent ink dispenser is at the upper limit. Cannot execute job) + /// (The @ dispenser is at upper limit. Cannot execute job) /// </summary> - [Description("Transparent ink dispenser is at the upper limit. Cannot execute job")] + [Description("The @ dispenser is at upper limit. Cannot execute job")] DISPENSER_5_UPPER_HARD_LIMIT = 7068, /// <summary> - /// (Spot color 1 dispenser is at the upper limit. Cannot execute job) + /// (The @ dispenser is at upper limit. Cannot execute job) /// </summary> - [Description("Spot color 1 dispenser is at the upper limit. Cannot execute job")] + [Description("The @ dispenser is at upper limit. Cannot execute job")] DISPENSER_6_UPPER_HARD_LIMIT = 7069, /// <summary> - /// (Cleaner dispenser is at the upper limit. Cannot execute job) + /// (The @ dispenser is at upper limit. Cannot execute job) /// </summary> - [Description("Cleaner dispenser is at the upper limit. Cannot execute job")] + [Description("The @ dispenser is at upper limit. Cannot execute job")] DISPENSER_7_UPPER_HARD_LIMIT = 7070, /// <summary> - /// (Lubricant dispenser is at the upper limit. Cannot execute job) + /// (The @ dispenser is at upper limit. Cannot execute job) /// </summary> - [Description("Lubricant dispenser is at the upper limit. Cannot execute job")] + [Description("The @ dispenser is at upper limit. Cannot execute job")] DISPENSER_8_UPPER_HARD_LIMIT = 7071, /// <summary> - /// (Black dispenser is at the lower limit. Cannot execute job) + /// (The @ dispenser is at lower limit. Cannot execute job) /// </summary> - [Description("Black dispenser is at the lower limit. Cannot execute job")] + [Description("The @ dispenser is at lower limit. Cannot execute job")] DISPENSER_1_LOWER_HARD_LIMIT = 7072, /// <summary> - /// (Cyan dispenser is at the lower limit. Cannot execute job) + /// (The @ dispenser is at lower limit. Cannot execute job) /// </summary> - [Description("Cyan dispenser is at the lower limit. Cannot execute job")] + [Description("The @ dispenser is at lower limit. Cannot execute job")] DISPENSER_2_LOWER_HARD_LIMIT = 7073, /// <summary> - /// (Magenta dispenser is at the lower limit. Cannot execute job) + /// (The @ dispenser is at lower limit. Cannot execute job) /// </summary> - [Description("Magenta dispenser is at the lower limit. Cannot execute job")] + [Description("The @ dispenser is at lower limit. Cannot execute job")] DISPENSER_3_LOWER_HARD_LIMIT = 7074, /// <summary> - /// (Yellow dispenser is at the lower limit. Cannot execute job) + /// (The @ dispenser is at lower limit. Cannot execute job) /// </summary> - [Description("Yellow dispenser is at the lower limit. Cannot execute job")] + [Description("The @ dispenser is at lower limit. Cannot execute job")] DISPENSER_4_LOWER_HARD_LIMIT = 7075, /// <summary> - /// (Transparent ink dispenser is at the lower limit. Cannot execute job) + /// (The @ dispenser is at lower limit. Cannot execute job) /// </summary> - [Description("Transparent ink dispenser is at the lower limit. Cannot execute job")] + [Description("The @ dispenser is at lower limit. Cannot execute job")] DISPENSER_5_LOWER_HARD_LIMIT = 7076, /// <summary> - /// (Spot color 1 dispenser is at the lower limit. Cannot execute job) + /// (The @ dispenser is at lower limit. Cannot execute job) /// </summary> - [Description("Spot color 1 dispenser is at the lower limit. Cannot execute job")] + [Description("The @ dispenser is at lower limit. Cannot execute job")] DISPENSER_6_LOWER_HARD_LIMIT = 7077, /// <summary> - /// (Cleaner dispenser is at the lower limit. Cannot execute job) + /// (The @ dispenser is at lower limit. Cannot execute job) /// </summary> - [Description("Cleaner dispenser is at the lower limit. Cannot execute job")] + [Description("The @ dispenser is at lower limit. Cannot execute job")] DISPENSER_7_LOWER_HARD_LIMIT = 7078, /// <summary> - /// (Lubricant dispenser is at the lower limit. Cannot execute job) + /// (The @ dispenser is at lower limit. Cannot execute job) /// </summary> - [Description("Lubricant dispenser is at the lower limit. Cannot execute job")] + [Description("The @ dispenser is at lower limit. Cannot execute job")] DISPENSER_8_LOWER_HARD_LIMIT = 7079, /// <summary> - /// (Pressure in black dispenser is too high. Cannot execute job) + /// (Pressure in @ dispenser is too high. Cannot execute job) /// </summary> - [Description("Pressure in black dispenser is too high. Cannot execute job")] + [Description("Pressure in @ dispenser is too high. Cannot execute job")] DISPENSER_1_HIGH_PRESSURE = 7080, /// <summary> - /// (Pressure in cyan dispenser is too high. Cannot execute job) + /// (Pressure in @ dispenser is too high. Cannot execute job) /// </summary> - [Description("Pressure in cyan dispenser is too high. Cannot execute job")] + [Description("Pressure in @ dispenser is too high. Cannot execute job")] DISPENSER_2_HIGH_PRESSURE = 7081, /// <summary> - /// (Pressure in magenta dispenser is too high. Cannot execute job) + /// (Pressure in @ dispenser is too high. Cannot execute job) /// </summary> - [Description("Pressure in magenta dispenser is too high. Cannot execute job")] + [Description("Pressure in @ dispenser is too high. Cannot execute job")] DISPENSER_3_HIGH_PRESSURE = 7082, /// <summary> - /// (Pressure in yellow dispenser is too high. Cannot execute job) + /// (Pressure in @ dispenser is too high. Cannot execute job) /// </summary> - [Description("Pressure in yellow dispenser is too high. Cannot execute job")] + [Description("Pressure in @ dispenser is too high. Cannot execute job")] DISPENSER_4_HIGH_PRESSURE = 7083, /// <summary> - /// (Pressure in transparent ink dispenser is too high. Cannot execue job) + /// (Pressure in @ dispenser is too high. Cannot execue job) /// </summary> - [Description("Pressure in transparent ink dispenser is too high. Cannot execue job")] + [Description("Pressure in @ dispenser is too high. Cannot execue job")] DISPENSER_5_HIGH_PRESSURE = 7084, /// <summary> - /// (Pressure in spot color 1 dispenser is too high. Cannot execute job) + /// (Pressure in@ dispenser is too high. Cannot execute job) /// </summary> - [Description("Pressure in spot color 1 dispenser is too high. Cannot execute job")] + [Description("Pressure in@ dispenser is too high. Cannot execute job")] DISPENSER_6_HIGH_PRESSURE = 7085, /// <summary> - /// (Pressure in cleaner dispenser is too high. Cannot execute job) + /// (Pressure in @ dispenser is too high. Cannot execute job) /// </summary> - [Description("Pressure in cleaner dispenser is too high. Cannot execute job")] + [Description("Pressure in @ dispenser is too high. Cannot execute job")] DISPENSER_7_HIGH_PRESSURE = 7086, /// <summary> - /// (Pressure in lubricant dispenser is too high. Cannot execute job) + /// (Pressure in @ dispenser is too high. Cannot execute job) /// </summary> - [Description("Pressure in lubricant dispenser is too high. Cannot execute job")] + [Description("Pressure in @ dispenser is too high. Cannot execute job")] DISPENSER_8_HIGH_PRESSURE = 7087, /// <summary> - /// (Black ink level is low) + /// (Overpressure in @. Cannot execute job) + /// </summary> + [Description("Overpressure in @. Cannot execute job")] + DISPENSER_9_OVERPRESSURE = 7088, + + /// <summary> + /// (Pressure in @ is too low. Cannot execute job) + /// </summary> + [Description("Pressure in @ is too low. Cannot execute job")] + DISPENSER_9_UNDERPRESSURE = 7089, + + /// <summary> + /// (Overpressure in @. Cannot execute job) + /// </summary> + [Description("Overpressure in @. Cannot execute job")] + DISPENSER_10_OVERPRESSURE = 7090, + + /// <summary> + /// (Pressure in @ is too low. Cannot execute job) + /// </summary> + [Description("Pressure in @ is too low. Cannot execute job")] + DISPENSER_10_UNDERPRESSURE = 7091, + + /// <summary> + /// (Malfunction in @ motor 1. Cannot execute job) + /// </summary> + [Description("Malfunction in @ motor 1. Cannot execute job")] + DISPENSER_9_MOTOR_1_MALFUNCTION = 7092, + + /// <summary> + /// (Malfunction in @ motor 2. Cannot execute job) + /// </summary> + [Description("Malfunction in @ motor 2. Cannot execute job")] + DISPENSER_9_MOTOR_2_MALFUNCTION = 7093, + + /// <summary> + /// (Malfunction in @ motor 1. Cannot execute job) /// </summary> - [Description("Black ink level is low")] + [Description("Malfunction in @ motor 1. Cannot execute job")] + DISPENSER_10_MOTOR_1_MALFUNCTION = 7094, + + /// <summary> + /// (Malfunction in @ motor 2. Cannot execute job) + /// </summary> + [Description("Malfunction in @ motor 2. Cannot execute job")] + DISPENSER_10_MOTOR_2_MALFUNCTION = 7095, + + /// <summary> + /// (Level of @ ink is low) + /// </summary> + [Description("Level of @ ink is low")] MID_TANK_1_LOW_LEVEL = 8000, /// <summary> - /// (Cyan ink level is low) + /// (Level of @ ink is low) /// </summary> - [Description("Cyan ink level is low")] + [Description("Level of @ ink is low")] MID_TANK_2_LOW_LEVEL = 8001, /// <summary> - /// (Magenta ink level is low) + /// (Level of @ ink is low) /// </summary> - [Description("Magenta ink level is low")] + [Description("Level of @ ink is low")] MID_TANK_3_LOW_LEVEL = 8002, /// <summary> - /// (Yellow ink level is low) + /// (Level of @ ink is low) /// </summary> - [Description("Yellow ink level is low")] + [Description("Level of @ ink is low")] MID_TANK_4_LOW_LEVEL = 8003, /// <summary> - /// (Transparent ink level is low) + /// (Level of @ ink is low) /// </summary> - [Description("Transparent ink level is low")] + [Description("Level of @ ink is low")] MID_TANK_5_LOW_LEVEL = 8004, /// <summary> - /// (Spot color I level is low) + /// (Level of @ ink is low) /// </summary> - [Description("Spot color I level is low")] + [Description("Level of @ ink is low")] MID_TANK_6_LOW_LEVEL = 8005, /// <summary> - /// (Cleaner level is low) + /// (Level of @ ink is low) /// </summary> - [Description("Cleaner level is low")] + [Description("Level of @ ink is low")] MID_TANK_7_LOW_LEVEL = 8006, /// <summary> - /// (Lubricant level is low) + /// (Level of @ ink is low) /// </summary> - [Description("Lubricant level is low")] + [Description("Level of @ ink is low")] MID_TANK_8_LOW_LEVEL = 8007, /// <summary> - /// (Black ink is empty. Cannnot execute job) + /// (The @ ink is empty. Cannot execute job) /// </summary> - [Description("Black ink is empty. Cannnot execute job")] + [Description("The @ ink is empty. Cannot execute job")] MID_TANK_1_EMPTY = 8008, /// <summary> - /// (Cyan ink is empty. Cannot execute job) + /// (The @ ink is empty. Cannot execute job) /// </summary> - [Description("Cyan ink is empty. Cannot execute job")] + [Description("The @ ink is empty. Cannot execute job")] MID_TANK_2_EMPTY = 8009, /// <summary> - /// (Magenta ink is empty. Cannot execute job) + /// (The @ ink is empty. Cannot execute job) /// </summary> - [Description("Magenta ink is empty. Cannot execute job")] + [Description("The @ ink is empty. Cannot execute job")] MID_TANK_3_EMPTY = 8010, /// <summary> - /// (Yellow ink is empty. Cannot execute job) + /// (The @ ink is empty. Cannot execute job) /// </summary> - [Description("Yellow ink is empty. Cannot execute job")] + [Description("The @ ink is empty. Cannot execute job")] MID_TANK_4_EMPTY = 8011, /// <summary> - /// (Transparent ink is empty. Cannot execute job) + /// (The @ ink is empty. Cannot execute job) /// </summary> - [Description("Transparent ink is empty. Cannot execute job")] + [Description("The @ ink is empty. Cannot execute job")] MID_TANK_5_EMPTY = 8012, /// <summary> - /// (Spot color I is empty. Cannot execute job) + /// (The @ ink is empty. Cannot execute job) /// </summary> - [Description("Spot color I is empty. Cannot execute job")] + [Description("The @ ink is empty. Cannot execute job")] MID_TANK_6_EMPTY = 8013, /// <summary> - /// (Cleaner is empty. Cannot execute job) + /// (The @ ink is empty. Cannot execute job) /// </summary> - [Description("Cleaner is empty. Cannot execute job")] + [Description("The @ ink is empty. Cannot execute job")] MID_TANK_7_EMPTY = 8014, /// <summary> - /// (Lubricant is empty. Cannot execute job) + /// (The @ ink is empty. Cannot execute job) /// </summary> - [Description("Lubricant is empty. Cannot execute job")] + [Description("The @ ink is empty. Cannot execute job")] MID_TANK_8_EMPTY = 8015, /// <summary> - /// (Black ink overflow. Cannot execute job) + /// (Overflow in @ ink. Cannot execute job) /// </summary> - [Description("Black ink overflow. Cannot execute job")] + [Description("Overflow in @ ink. Cannot execute job")] MID_TANK_1_OVERFLOW = 8016, /// <summary> - /// (Cyan ink overflow. Cannot execute job) + /// (Overflow in @ ink. Cannot execute job) /// </summary> - [Description("Cyan ink overflow. Cannot execute job")] + [Description("Overflow in @ ink. Cannot execute job")] MID_TANK_2_OVERFLOW = 8017, /// <summary> - /// (Magenta ink overflow. Cannot execute job) + /// (Overflow in @ ink. Cannot execute job) /// </summary> - [Description("Magenta ink overflow. Cannot execute job")] + [Description("Overflow in @ ink. Cannot execute job")] MID_TANK_3_OVERFLOW = 8018, /// <summary> - /// (Yellow ink overflow. Cannot execute job) + /// (Overflow in @ ink. Cannot execute job) /// </summary> - [Description("Yellow ink overflow. Cannot execute job")] + [Description("Overflow in @ ink. Cannot execute job")] MID_TANK_4_OVERFLOW = 8019, /// <summary> - /// (Transparent ink overflow. Cannot execute job) + /// (Overflow in @ ink. Cannot execute job) /// </summary> - [Description("Transparent ink overflow. Cannot execute job")] + [Description("Overflow in @ ink. Cannot execute job")] MID_TANK_5_OVERFLOW = 8020, /// <summary> - /// (Spot color 1 overflow. Cannot execute job) + /// (Overflow in @ ink. Cannot execute job) /// </summary> - [Description("Spot color 1 overflow. Cannot execute job")] + [Description("Overflow in @ ink. Cannot execute job")] MID_TANK_6_OVERFLOW = 8021, /// <summary> - /// (Cleaner overflow. Cannot execute job) + /// (Overflow in @ ink. Cannot execute job) /// </summary> - [Description("Cleaner overflow. Cannot execute job")] + [Description("Overflow in @ ink. Cannot execute job")] MID_TANK_7_OVERFLOW = 8022, /// <summary> - /// (Lubricant overflow. Cannot execute job) + /// (Overflow in @ ink. Cannot execute job) /// </summary> - [Description("Lubricant overflow. Cannot execute job")] + [Description("Overflow in @ ink. Cannot execute job")] MID_TANK_8_OVERFLOW = 8023, /// <summary> - /// (Failed to fill black ink. Cannot execute job) + /// (Failed to fill @ ink. Cannot execute job) /// </summary> - [Description("Failed to fill black ink. Cannot execute job")] + [Description("Failed to fill @ ink. Cannot execute job")] MID_TANK_1_FILL_TIMEOUT = 8024, /// <summary> - /// (Failed to fill cyan ink. Cannot execute job) + /// (Failed to fill @ ink. Cannot execute job) /// </summary> - [Description("Failed to fill cyan ink. Cannot execute job")] + [Description("Failed to fill @ ink. Cannot execute job")] MID_TANK_2_FILL_TIMEOUT = 8025, /// <summary> - /// (Failed to fill magenta ink. Cannot execute job) + /// (Failed to fill @ ink. Cannot execute job) /// </summary> - [Description("Failed to fill magenta ink. Cannot execute job")] + [Description("Failed to fill @ ink. Cannot execute job")] MID_TANK_3_FILL_TIMEOUT = 8026, /// <summary> - /// (Failed to fill yellow ink. Cannot execute job) + /// (Failed to fill @ ink. Cannot execute job) /// </summary> - [Description("Failed to fill yellow ink. Cannot execute job")] + [Description("Failed to fill @ ink. Cannot execute job")] MID_TANK_4_FILL_TIMEOUT = 8027, /// <summary> - /// (Failed to fill transparent ink. Canot execute job) + /// (Failed to fill @ ink. Canot execute job) /// </summary> - [Description("Failed to fill transparent ink. Canot execute job")] + [Description("Failed to fill @ ink. Canot execute job")] MID_TANK_5_FILL_TIMEOUT = 8028, /// <summary> - /// (Failed to fill spot color 1 ink. Cannot execute job) + /// (Failed to fill @ ink. Cannot execute job) /// </summary> - [Description("Failed to fill spot color 1 ink. Cannot execute job")] + [Description("Failed to fill @ ink. Cannot execute job")] MID_TANK_6_FILL_TIMEOUT = 8029, /// <summary> - /// (Failed to fill cleaner. Cannot execute job) + /// (Failed to fill @ ink. Cannot execute job) /// </summary> - [Description("Failed to fill cleaner. Cannot execute job")] + [Description("Failed to fill @ ink. Cannot execute job")] MID_TANK_7_FILL_TIMEOUT = 8030, /// <summary> - /// (Failed to fill lubricant. Cannot execute job) + /// (Failed to fill @ ink. Cannot execute job) /// </summary> - [Description("Failed to fill lubricant. Cannot execute job")] + [Description("Failed to fill @ ink. Cannot execute job")] MID_TANK_8_FILL_TIMEOUT = 8031, /// <summary> + /// (Level of @ is low) + /// </summary> + [Description("Level of @ is low")] + MID_TANK_9_LOW_LEVEL = 8032, + + /// <summary> + /// (The @ is empty. Cannot execute job) + /// </summary> + [Description("The @ is empty. Cannot execute job")] + MID_TANK_9_EMPTY = 8033, + + /// <summary> + /// (Overflow in @. Cannot execute job) + /// </summary> + [Description("Overflow in @. Cannot execute job")] + MID_TANK_9_OVERFLOW = 8034, + + /// <summary> + /// (Failed to fill @. Cannot execute job) + /// </summary> + [Description("Failed to fill @. Cannot execute job")] + MID_TANK_9_FILL_TIMEOUT = 8035, + + /// <summary> + /// (Level of @ is low) + /// </summary> + [Description("Level of @ is low")] + MID_TANK_10_LOW_LEVEL = 8036, + + /// <summary> + /// (The @ is empty. Cannot execute job) + /// </summary> + [Description("The @ is empty. Cannot execute job")] + MID_TANK_10_EMPTY = 8037, + + /// <summary> + /// (Overflow in @. Cannot execute job) + /// </summary> + [Description("Overflow in @. Cannot execute job")] + MID_TANK_10_OVERFLOW = 8038, + + /// <summary> + /// (Failed to fill @. Cannot execute job) + /// </summary> + [Description("Failed to fill @. Cannot execute job")] + MID_TANK_10_FILL_TIMEOUT = 8039, + + /// <summary> /// (Cannot detect air filter. Cannot execute job ) /// </summary> [Description("Cannot detect air filter. Cannot execute job ")] diff --git a/Software/Visual_Studio/Tango.BL/Helpers/EventTypeTextConverter.cs b/Software/Visual_Studio/Tango.BL/Helpers/EventTypeTextConverter.cs new file mode 100644 index 000000000..fb7d753cd --- /dev/null +++ b/Software/Visual_Studio/Tango.BL/Helpers/EventTypeTextConverter.cs @@ -0,0 +1,62 @@ +using System; +using System.Collections.Generic; +using System.Diagnostics; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Tango.BL.Entities; + +namespace Tango.BL.Helpers +{ + public static class EventTypeTextConverter + { + private static Machine _machine; + private static List<String> _liquidNames; + + public static String ReplaceText(Machine machine, String text, int componentIndex) + { + try + { + if (_machine != machine) + { + _machine = machine; + + _liquidNames = new List<string>(); + + foreach (var idsPack in _machine.Configuration.IdsPacks.OrderBy(x => x.PackIndex).ToList()) + { + if (idsPack.LiquidType != null) + { + _liquidNames.Add(idsPack.LiquidType.Name); + } + else + { + _liquidNames.Add("Undefined"); + } + } + } + + if (componentIndex > -1 && _liquidNames != null && _liquidNames.Count > 0) + { + if (text != null) + { + if (text.Contains("@")) + { + if (componentIndex < _liquidNames.Count) + { + return text.Replace("@", _liquidNames[componentIndex]); + } + } + } + } + + return text; + } + catch (Exception ex) + { + Debug.WriteLine(ex); + return text; + } + } + } +} diff --git a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj index 26836e893..967726d4c 100644 --- a/Software/Visual_Studio/Tango.BL/Tango.BL.csproj +++ b/Software/Visual_Studio/Tango.BL/Tango.BL.csproj @@ -430,6 +430,7 @@ <Compile Include="Enumerations\TangoUpdateStatuses.cs" /> <Compile Include="Enumerations\RmlQualifications.cs" /> <Compile Include="ExtensionMethods\ColorCatalogItemsExtensions.cs" /> + <Compile Include="Helpers\EventTypeTextConverter.cs" /> <Compile Include="Helpers\SegmentsCsvHelper.cs" /> <Compile Include="IObservableEntityDTO.cs" /> <Compile Include="ObservableDTOPropertyAttribute.cs" /> @@ -653,7 +654,7 @@ </Target> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs b/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs index 800780c32..d69fb761b 100644 --- a/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs +++ b/Software/Visual_Studio/Tango.PMR/Diagnostics/EventType.cs @@ -22,7 +22,7 @@ namespace Tango.PMR.Diagnostics { static EventTypeReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "Cg9FdmVudFR5cGUucHJvdG8SFVRhbmdvLlBNUi5EaWFnbm9zdGljcyreaAoJ", + "Cg9FdmVudFR5cGUucHJvdG8SFVRhbmdvLlBNUi5EaWFnbm9zdGljcyrFbQoJ", "RXZlbnRUeXBlEggKBE5vbmUQABIRCgxSRVFVRVNUX1NFTlQQ6AcSFgoRUkVT", "UE9OU0VfUkVDRUlWRUQQ6QcSEwoOUkVRVUVTVF9GQUlMRUQQ6gcSGgoVQVBQ", "TElDQVRJT05fRVhDRVBUSU9OEOsHEhwKF0FQUExJQ0FUSU9OX0lORk9STUFU", @@ -51,11 +51,11 @@ namespace Tango.PMR.Diagnostics { "RlVOQ1RJT05fV0FTVEVfU0xPVF8yEOgPEhEKDFRIUkVBRF9CUkVBSxC4FxIx", "CixUSFJFQURfVEVOU0lPTl9DT05UUk9MX0ZBSUxVUkVfRkVFREVSX0RBTkNF", "UhC5FxIfChpXSU5ERVJfQ09ORV9ET0VTX05PVF9FWElTVBC6FxIdChhGRUVE", - "RVJfTU9UT1JfT1ZFUkNVUlJFTlQQuxcSIwoeUklHSFRfTE9BREVSX01PVE9S", - "X09WRVJDVVJSRU5UELwXEh0KGFBVTExFUl9NT1RPUl9PVkVSQ1VSUkVOVBC9", - "FxIiCh1MRUZUX0xPQURFUl9NT1RPUl9PVkVSQ1VSUkVOVBC+FxIdChhXSU5E", - "RVJfTU9UT1JfT1ZFUkNVUlJFTlQQvxcSHAoXU0NSRVdfTU9UT1JfT1ZFUkNV", - "UlJFTlQQwBcSIgodTE9BRElOR19BUk1fTU9UT1JfT1ZFUkNVUlJFTlQQwRcS", + "RVJfTU9UT1JfTUFMRlVOQ1RJT04QuxcSIwoeUklHSFRfTE9BREVSX01PVE9S", + "X01BTEZVTkNUSU9OELwXEh0KGFBVTExFUl9NT1RPUl9NQUxGVU5DVElPThC9", + "FxIiCh1MRUZUX0xPQURFUl9NT1RPUl9NQUxGVU5DVElPThC+FxIdChhXSU5E", + "RVJfTU9UT1JfTUFMRlVOQ1RJT04QvxcSHAoXU0NSRVdfTU9UT1JfTUFMRlVO", + "Q1RJT04QwBcSIgodTE9BRElOR19BUk1fTU9UT1JfTUFMRlVOQ1RJT04QwRcS", "IQocRkVFREVSX01PVE9SX09WRVJURU1QRVJBVFVSRRDCFxInCiJSSUdIVF9M", "T0FERVJfTU9UT1JfT1ZFUlRFTVBFUkFUVVJFEMMXEiEKHFBVTExFUl9NT1RP", "Ul9PVkVSVEVNUEVSQVRVUkUQxBcSJgohTEVGVF9MT0FERVJfTU9UT1JfT1ZF", @@ -74,9 +74,9 @@ namespace Tango.PMR.Diagnostics { "REVSVk9MVEFHRRDWFxIUCg9MVEZVX1VQX1RJTUVPVVQQ1xcSFgoRTFRGVV9E", "T1dOX1RJTUVPVVQQ2BcSFAoPUlRGVV9VUF9USU1FT1VUENkXEhYKEVJURlVf", "RE9XTl9USU1FT1VUENoXEh4KGVNDUkVXX01PVE9SX0xJTUlUX1RJTUVPVVQQ", - "2xcSJAofV0lOREVSX0RBTkNFUl9NT1RPUl9PVkVSQ1VSUkVOVBDcFxIkCh9Q", - "VUxMRVJfREFOQ0VSX01PVE9SX09WRVJDVVJSRU5UEN0XEiQKH0ZFRURFUl9E", - "QU5DRVJfTU9UT1JfT1ZFUkNVUlJFTlQQ3hcSKAojV0lOREVSX0RBTkNFUl9N", + "2xcSJAofV0lOREVSX0RBTkNFUl9NT1RPUl9NQUxGVU5DVElPThDcFxIkCh9Q", + "VUxMRVJfREFOQ0VSX01PVE9SX01BTEZVTkNUSU9OEN0XEiQKH0ZFRURFUl9E", + "QU5DRVJfTU9UT1JfTUFMRlVOQ1RJT04Q3hcSKAojV0lOREVSX0RBTkNFUl9N", "T1RPUl9PVkVSVEVNUEVSQVRVUkUQ3xcSKAojUFVMTEVSX0RBTkNFUl9NT1RP", "Ul9PVkVSVEVNUEVSQVRVUkUQ4BcSKAojRkVFREVSX0RBTkNFUl9NT1RPUl9P", "VkVSVEVNUEVSQVRVUkUQ4RcSHgoZV0lOREVSX0RBTkNFUl9NT1RPUl9TVEFM", @@ -87,241 +87,255 @@ namespace Tango.PMR.Diagnostics { "R0UQ5xcSMQosVEhSRUFEX1RFTlNJT05fQ09OVFJPTF9GQUlMVVJFX1BVTExF", "Ul9EQU5DRVIQ6BcSMQosVEhSRUFEX1RFTlNJT05fQ09OVFJPTF9GQUlMVVJF", "X1dJTkRFUl9EQU5DRVIQ6RcSJQogTUFDSElORV9TVEFURV9OT19USFJFQURf", - "REVURUNURUQQ6hcSGQoUVEhSRUFEX0xPQURJTkdfRVJST1IQ6xcSHAoXRFJZ", - "RVJfTU9UT1JfT1ZFUkNVUlJFTlQQoB8SIAobRFJZRVJfTU9UT1JfT1ZFUlRF", - "TVBFUkFUVVJFEKEfEhYKEURSWUVSX01PVE9SX1NUQUxMEKIfEh0KGERSWUVS", - "X01PVE9SX1VOREVSVk9MVEFHRRCjHxIUCg9EUllFUl9ET09SX09QRU4QpB8S", - "IQocRFJZRVJfWk9ORV8xX09WRVJURU1QRVJBVFVSRRClHxIhChxEUllFUl9a", - "T05FXzJfT1ZFUlRFTVBFUkFUVVJFEKYfEiQKH0RSWUVSX1pPTkVfMV9VTkRF", - "UlRFTVBFUkFUVVJFX0EQpx8SJAofRFJZRVJfWk9ORV8xX1VOREVSVEVNUEVS", - "QVRVUkVfQhCoHxIkCh9EUllFUl9aT05FXzJfVU5ERVJURU1QRVJBVFVSRV9C", - "EKkfEhkKFERSWUVSX1RIRVJNQUxfQ1VUT0ZGEKofEi4KKURSWUVSX0hFQVRF", - "UlNfWk9ORV8xX0NVUlJFTlRfT1VUX09GX1JBTkdFEKsfEi4KKURSWUVSX0hF", - "QVRFUlNfWk9ORV8yX0NVUlJFTlRfT1VUX09GX1JBTkdFEKwfEiwKJ0RSWUVS", - "X0hFQVRFUlNfWk9ORV8xX0NVUlJFTlRfTE9PUF9CUkVBSxCtHxIsCidEUllF", - "Ul9IRUFURVJTX1pPTkVfMl9DVVJSRU5UX0xPT1BfQlJFQUsQrh8SGgoVRFJZ", - "RVJfRkFOX1JQTV9UT09fTE9XEK8fEhYKEURSWUVSX0ZBTl9TVE9QUEVEELAf", - "EiAKG0RSWUVSX0xJRF9NT1RPUl9PVkVSQ1VSUkVOVBCxHxIkCh9EUllFUl9M", - "SURfTU9UT1JfT1ZFUlRFTVBFUkFUVVJFELIfEhoKFURSWUVSX0xJRF9NT1RP", - "Ul9TVEFMTBCzHxIhChxEUllFUl9MSURfTU9UT1JfVU5ERVJWT0xUQUdFELQf", - "EiQKH0RSWUVSX1pPTkVfMl9VTkRFUlRFTVBFUkFUVVJFX0EQtR8SJwoiRFlF", - "SU5HX0hFQURfWk9ORV8xX09WRVJURU1QRVJBVFVSRRCIJxInCiJEWUVJTkdf", - "SEVBRF9aT05FXzJfT1ZFUlRFTVBFUkFUVVJFEIknEicKIkRZRUlOR19IRUFE", - "X1pPTkVfM19PVkVSVEVNUEVSQVRVUkUQiicSJwoiRFlFSU5HX0hFQURfWk9O", - "RV80X09WRVJURU1QRVJBVFVSRRCLJxInCiJEWUVJTkdfSEVBRF9aT05FXzVf", - "T1ZFUlRFTVBFUkFUVVJFEIwnEicKIkRZRUlOR19IRUFEX1pPTkVfNl9PVkVS", - "VEVNUEVSQVRVUkUQjScSKgolRFlFSU5HX0hFQURfWk9ORV8xX1VOREVSVEVN", - "UEVSQVRVUkVfQRCOJxIqCiVEWUVJTkdfSEVBRF9aT05FXzJfVU5ERVJURU1Q", - "RVJBVFVSRV9BEI8nEioKJURZRUlOR19IRUFEX1pPTkVfM19VTkRFUlRFTVBF", - "UkFUVVJFX0EQkCcSKgolRFlFSU5HX0hFQURfWk9ORV80X1VOREVSVEVNUEVS", - "QVRVUkVfQRCRJxIqCiVEWUVJTkdfSEVBRF9aT05FXzVfVU5ERVJURU1QRVJB", - "VFVSRV9BEJInEioKJURZRUlOR19IRUFEX1pPTkVfNl9VTkRFUlRFTVBFUkFU", - "VVJFX0EQkycSKgolRFlFSU5HX0hFQURfWk9ORV8xX1VOREVSVEVNUEVSQVRV", - "UkVfQhCUJxIqCiVEWUVJTkdfSEVBRF9aT05FXzJfVU5ERVJURU1QRVJBVFVS", - "RV9CEJUnEioKJURZRUlOR19IRUFEX1pPTkVfM19VTkRFUlRFTVBFUkFUVVJF", - "X0IQlicSKgolRFlFSU5HX0hFQURfWk9ORV80X1VOREVSVEVNUEVSQVRVUkVf", - "QhCXJxIqCiVEWUVJTkdfSEVBRF9aT05FXzVfVU5ERVJURU1QRVJBVFVSRV9C", - "EJgnEioKJURZRUlOR19IRUFEX1pPTkVfNl9VTkRFUlRFTVBFUkFUVVJFX0IQ", - "mScSLAonRFlFSU5HX0hFQURfWk9ORV8xX0NVUlJFTlRfT1VUX09GX1JBTkdF", - "EJonEiwKJ0RZRUlOR19IRUFEX1pPTkVfMl9DVVJSRU5UX09VVF9PRl9SQU5H", - "RRCbJxIsCidEWUVJTkdfSEVBRF9aT05FXzNfQ1VSUkVOVF9PVVRfT0ZfUkFO", - "R0UQnCcSLAonRFlFSU5HX0hFQURfWk9ORV80X0NVUlJFTlRfT1VUX09GX1JB", - "TkdFEJ0nEiwKJ0RZRUlOR19IRUFEX1pPTkVfNV9DVVJSRU5UX09VVF9PRl9S", - "QU5HRRCeJxIqCiVEWUVJTkdfSEVBRF9aT05FXzFfQ1VSUkVOVF9MT09QX0JS", - "RUFLEJ8nEioKJURZRUlOR19IRUFEX1pPTkVfMl9DVVJSRU5UX0xPT1BfQlJF", - "QUsQoCcSKgolRFlFSU5HX0hFQURfWk9ORV8zX0NVUlJFTlRfTE9PUF9CUkVB", - "SxChJxIqCiVEWUVJTkdfSEVBRF9aT05FXzRfQ1VSUkVOVF9MT09QX0JSRUFL", - "EKInEioKJURZRUlOR19IRUFEX1pPTkVfNV9DVVJSRU5UX0xPT1BfQlJFQUsQ", - "oycSHwoaRFlFSU5HX0hFQURfVEhFUk1BTF9DVVRPRkYQpCcSIwoeRFlFSU5H", - "X0hFQURfQ09WRVJfT1BFTl9USU1FT1VUEKUnEiQKH0RZRUlOR19IRUFEX0NP", - "VkVSX0NMT1NFX1RJTUVPVVQQpicSKAojRFlFSU5HX0hFQURfQ09WRVJfTU9U", - "T1JfT1ZFUkNVUlJFTlQQpycSLAonRFlFSU5HX0hFQURfQ09WRVJfTU9UT1Jf", - "T1ZFUlRFTVBFUkFUVVJFEKgnEiIKHURZRUlOR19IRUFEX0NPVkVSX01PVE9S", - "X1NUQUxMEKknEikKJERZRUlOR19IRUFEX0NPVkVSX01PVE9SX1VOREVSVk9M", - "VEFHRRCqJxI1CjBEWUVJTkdfSEVBRF9DTEVBTklOR19NRUNIQU5JU01fTU9U", - "T1JfT1ZFUkNVUlJFTlQQqycSOQo0RFlFSU5HX0hFQURfQ0xFQU5JTkdfTUVD", - "SEFOSVNNX01PVE9SX09WRVJURU1QRVJBVFVSRRCsJxIvCipEWUVJTkdfSEVB", - "RF9DTEVBTklOR19NRUNIQU5JU01fTU9UT1JfU1RBTEwQrScSNgoxRFlFSU5H", - "X0hFQURfQ0xFQU5JTkdfTUVDSEFOSVNNX01PVE9SX1VOREVSVk9MVEFHRRCu", - "JxIwCitEWUVJTkdfSEVBRF9DTEVBTklOR19IRUFEX01PVE9SX09WRVJDVVJS", - "RU5UEK8nEjQKL0RZRUlOR19IRUFEX0NMRUFOSU5HX0hFQURfTU9UT1JfT1ZF", - "UlRFTVBFUkFUVVJFELAnEioKJURZRUlOR19IRUFEX0NMRUFOSU5HX0hFQURf", - "TU9UT1JfU1RBTEwQsScSMQosRFlFSU5HX0hFQURfQ0xFQU5JTkdfSEVBRF9N", - "T1RPUl9VTkRFUlZPTFRBR0UQsicSJwoiRFlFSU5HX0hFQURfWk9ORV83X09W", - "RVJURU1QRVJBVFVSRRCzJxInCiJEWUVJTkdfSEVBRF9aT05FXzhfT1ZFUlRF", - "TVBFUkFUVVJFELQnEicKIkRZRUlOR19IRUFEX1pPTkVfOV9PVkVSVEVNUEVS", - "QVRVUkUQtScSKAojRFlFSU5HX0hFQURfWk9ORV8xMF9PVkVSVEVNUEVSQVRV", - "UkUQticSKAojRFlFSU5HX0hFQURfWk9ORV8xMV9PVkVSVEVNUEVSQVRVUkUQ", - "tycSKAojRFlFSU5HX0hFQURfWk9ORV8xMl9PVkVSVEVNUEVSQVRVUkUQuCcS", - "KgolRFlFSU5HX0hFQURfWk9ORV83X1VOREVSVEVNUEVSQVRVUkVfQRC5JxIq", - "CiVEWUVJTkdfSEVBRF9aT05FXzhfVU5ERVJURU1QRVJBVFVSRV9BELonEioK", - "JURZRUlOR19IRUFEX1pPTkVfOV9VTkRFUlRFTVBFUkFUVVJFX0EQuycSKwom", - "RFlFSU5HX0hFQURfWk9ORV8xMF9VTkRFUlRFTVBFUkFUVVJFX0EQvCcSKwom", - "RFlFSU5HX0hFQURfWk9ORV8xMV9VTkRFUlRFTVBFUkFUVVJFX0EQvScSKwom", - "RFlFSU5HX0hFQURfWk9ORV8xMl9VTkRFUlRFTVBFUkFUVVJFX0EQvicSKgol", - "RFlFSU5HX0hFQURfWk9ORV83X1VOREVSVEVNUEVSQVRVUkVfQhC/JxIqCiVE", - "WUVJTkdfSEVBRF9aT05FXzhfVU5ERVJURU1QRVJBVFVSRV9CEMAnEioKJURZ", - "RUlOR19IRUFEX1pPTkVfOV9VTkRFUlRFTVBFUkFUVVJFX0IQwScSKwomRFlF", - "SU5HX0hFQURfWk9ORV8xMF9VTkRFUlRFTVBFUkFUVVJFX0IQwicSKwomRFlF", - "SU5HX0hFQURfWk9ORV8xMV9VTkRFUlRFTVBFUkFUVVJFX0IQwycSKwomRFlF", - "SU5HX0hFQURfWk9ORV8xMl9VTkRFUlRFTVBFUkFUVVJFX0IQxCcSLAonRFlF", - "SU5HX0hFQURfWk9ORV82X0NVUlJFTlRfT1VUX09GX1JBTkdFEMUnEiwKJ0RZ", - "RUlOR19IRUFEX1pPTkVfN19DVVJSRU5UX09VVF9PRl9SQU5HRRDGJxIsCidE", - "WUVJTkdfSEVBRF9aT05FXzhfQ1VSUkVOVF9PVVRfT0ZfUkFOR0UQxycSLAon", - "RFlFSU5HX0hFQURfWk9ORV85X0NVUlJFTlRfT1VUX09GX1JBTkdFEMgnEi0K", - "KERZRUlOR19IRUFEX1pPTkVfMTBfQ1VSUkVOVF9PVVRfT0ZfUkFOR0UQyScS", - "LQooRFlFSU5HX0hFQURfWk9ORV8xMV9DVVJSRU5UX09VVF9PRl9SQU5HRRDK", - "JxItCihEWUVJTkdfSEVBRF9aT05FXzEyX0NVUlJFTlRfT1VUX09GX1JBTkdF", - "EMsnEioKJURZRUlOR19IRUFEX1pPTkVfNl9DVVJSRU5UX0xPT1BfQlJFQUsQ", - "zCcSKgolRFlFSU5HX0hFQURfWk9ORV83X0NVUlJFTlRfTE9PUF9CUkVBSxDN", - "JxIqCiVEWUVJTkdfSEVBRF9aT05FXzhfQ1VSUkVOVF9MT09QX0JSRUFLEM4n", - "EioKJURZRUlOR19IRUFEX1pPTkVfOV9DVVJSRU5UX0xPT1BfQlJFQUsQzycS", - "KwomRFlFSU5HX0hFQURfWk9ORV8xMF9DVVJSRU5UX0xPT1BfQlJFQUsQ0CcS", - "KwomRFlFSU5HX0hFQURfWk9ORV8xMV9DVVJSRU5UX0xPT1BfQlJFQUsQ0ScS", - "KwomRFlFSU5HX0hFQURfWk9ORV8xMl9DVVJSRU5UX0xPT1BfQlJFQUsQ0icS", - "KQokRFlFSU5HX0hFQURfQkxPV0VSXzFfT1ZFUlRFTVBFUkFUVVJFENMnEikK", - "JERZRUlOR19IRUFEX0JMT1dFUl8yX09WRVJURU1QRVJBVFVSRRDUJxIsCidE", - "WUVJTkdfSEVBRF9CTE9XRVJfMV9VTkRFUlRFTVBFUkFUVVJFX0EQ1ScSLAon", - "RFlFSU5HX0hFQURfQkxPV0VSXzJfVU5ERVJURU1QRVJBVFVSRV9BENYnEiwK", - "J0RZRUlOR19IRUFEX0JMT1dFUl8xX1VOREVSVEVNUEVSQVRVUkVfQhDXJxIs", - "CidEWUVJTkdfSEVBRF9CTE9XRVJfMl9VTkRFUlRFTVBFUkFUVVJFX0IQ2CcS", - "LgopRFlFSU5HX0hFQURfQkxPV0VSXzFfQ1VSUkVOVF9PVVRfT0ZfUkFOR0UQ", - "2ScSLgopRFlFSU5HX0hFQURfQkxPV0VSXzJfQ1VSUkVOVF9PVVRfT0ZfUkFO", - "R0UQ2icSLAonRFlFSU5HX0hFQURfQkxPV0VSXzFfQ1VSUkVOVF9MT09QX0JS", - "RUFLENsnEiwKJ0RZRUlOR19IRUFEX0JMT1dFUl8yX0NVUlJFTlRfTE9PUF9C", - "UkVBSxDcJxIlCiBEWUVJTkdfSEVBRF9CTE9XRVJfMV9GQU5fU1RPUFBFRBDd", - "JxIlCiBEWUVJTkdfSEVBRF9CTE9XRVJfMl9GQU5fU1RPUFBFRBDeJxIpCiRE", - "WUVJTkdfSEVBRF9CTE9XRVJfMV9GQU5fUlBNX1RPT19MT1cQ3ycSKQokRFlF", - "SU5HX0hFQURfQkxPV0VSXzJfRkFOX1JQTV9UT09fTE9XEOAnEioKJURZRUlO", - "R19IRUFEX1JJR0hUX0FDVFVBVE9SX1VQX1RJTUVPVVQQ4ScSKQokRFlFSU5H", - "X0hFQURfTEVGVF9BQ1RVQVRPUl9VUF9USU1FT1VUEOInEiwKJ0RZRUlOR19I", - "RUFEX1JJR0hUX0FDVFVBVE9SX0RPV05fVElNRU9VVBDjJxIrCiZEWUVJTkdf", - "SEVBRF9MRUZUX0FDVFVBVE9SX0RPV05fVElNRU9VVBDkJxInCiJEWUVJTkdf", - "SEVBRF9CTE9XRVJfMV9GTE9XX1RPT19ISUdIEOUnEicKIkRZRUlOR19IRUFE", - "X0JMT1dFUl8yX0ZMT1dfVE9PX0hJR0gQ5icSJgohRFlFSU5HX0hFQURfQkxP", - "V0VSXzFfRkxPV19UT09fTE9XEOcnEiYKIURZRUlOR19IRUFEX0JMT1dFUl8y", - "X0ZMT1dfVE9PX0xPVxDoJxIgChtEWUVJTkdfSEVBRF9BUkNfTElEX0lTX09Q", - "RU4Q6ScSIwoeRFlFSU5HX0hFQURfVFVOTkVMX0xJRF9JU19PUEVOEOonEh4K", - "GURZRUlOR19IRUFEX0NPVkVSX0lTX09QRU4Q6ycSGgoVTUlYRVJfT1ZFUlRF", - "TVBFUkFUVVJFEPAuEh0KGE1JWEVSX1VOREVSVEVNUEVSQVRVUkVfQRDxLhId", - "ChhNSVhFUl9VTkRFUlRFTVBFUkFUVVJFX0IQ8i4SGQoUTUlYRVJfVEhFUk1B", - "TF9DVVRPRkYQ8y4SHwoaTUlYRVJfQ1VSUkVOVF9PVVRfT0ZfUkFOR0UQ9C4S", - "HQoYTUlYRVJfQ1VSUkVOVF9MT09QX0JSRUFLEPUuEh0KGERJU1BFTlNFUl8x", - "X09WRVJQUkVTU1VSRRDYNhIdChhESVNQRU5TRVJfMl9PVkVSUFJFU1NVUkUQ", - "2TYSHQoYRElTUEVOU0VSXzNfT1ZFUlBSRVNTVVJFENo2Eh0KGERJU1BFTlNF", - "Ul80X09WRVJQUkVTU1VSRRDbNhIdChhESVNQRU5TRVJfNV9PVkVSUFJFU1NV", - "UkUQ3DYSHQoYRElTUEVOU0VSXzZfT1ZFUlBSRVNTVVJFEN02Eh0KGERJU1BF", - "TlNFUl83X09WRVJQUkVTU1VSRRDeNhIdChhESVNQRU5TRVJfOF9PVkVSUFJF", - "U1NVUkUQ3zYSHgoZRElTUEVOU0VSXzFfVU5ERVJQUkVTU1VSRRDgNhIeChlE", - "SVNQRU5TRVJfMl9VTkRFUlBSRVNTVVJFEOE2Eh4KGURJU1BFTlNFUl8zX1VO", - "REVSUFJFU1NVUkUQ4jYSHgoZRElTUEVOU0VSXzRfVU5ERVJQUkVTU1VSRRDj", - "NhIeChlESVNQRU5TRVJfNV9VTkRFUlBSRVNTVVJFEOQ2Eh4KGURJU1BFTlNF", - "Ul82X1VOREVSUFJFU1NVUkUQ5TYSHgoZRElTUEVOU0VSXzdfVU5ERVJQUkVT", - "U1VSRRDmNhIeChlESVNQRU5TRVJfOF9VTkRFUlBSRVNTVVJFEOc2EhYKEURJ", - "U1BFTlNFUl8xX0VNUFRZEOg2EhYKEURJU1BFTlNFUl8yX0VNUFRZEOk2EhYK", - "EURJU1BFTlNFUl8zX0VNUFRZEOo2EhYKEURJU1BFTlNFUl80X0VNUFRZEOs2", - "EhYKEURJU1BFTlNFUl81X0VNUFRZEOw2EhYKEURJU1BFTlNFUl82X0VNUFRZ", - "EO02EhYKEURJU1BFTlNFUl83X0VNUFRZEO42EhYKEURJU1BFTlNFUl84X0VN", - "UFRZEO82Eh8KGkRJU1BFTlNFUl8xX1JFRklMTF9GQUlMVVJFEPA2Eh8KGkRJ", - "U1BFTlNFUl8yX1JFRklMTF9GQUlMVVJFEPE2Eh8KGkRJU1BFTlNFUl8zX1JF", - "RklMTF9GQUlMVVJFEPI2Eh8KGkRJU1BFTlNFUl80X1JFRklMTF9GQUlMVVJF", - "EPM2Eh8KGkRJU1BFTlNFUl81X1JFRklMTF9GQUlMVVJFEPQ2Eh8KGkRJU1BF", - "TlNFUl82X1JFRklMTF9GQUlMVVJFEPU2Eh8KGkRJU1BFTlNFUl83X1JFRklM", - "TF9GQUlMVVJFEPY2Eh8KGkRJU1BFTlNFUl84X1JFRklMTF9GQUlMVVJFEPc2", - "EiIKHURJU1BFTlNFUl8xX01PVE9SX09WRVJDVVJSRU5UEPg2EiIKHURJU1BF", - "TlNFUl8yX01PVE9SX09WRVJDVVJSRU5UEPk2EiIKHURJU1BFTlNFUl8zX01P", - "VE9SX09WRVJDVVJSRU5UEPo2EiIKHURJU1BFTlNFUl80X01PVE9SX09WRVJD", - "VVJSRU5UEPs2EiIKHURJU1BFTlNFUl81X01PVE9SX09WRVJDVVJSRU5UEPw2", - "EiIKHURJU1BFTlNFUl82X01PVE9SX09WRVJDVVJSRU5UEP02EiIKHURJU1BF", - "TlNFUl83X01PVE9SX09WRVJDVVJSRU5UEP42EiIKHURJU1BFTlNFUl84X01P", - "VE9SX09WRVJDVVJSRU5UEP82EiYKIURJU1BFTlNFUl8xX01PVE9SX09WRVJU", - "RU1QRVJBVFVSRRCANxImCiFESVNQRU5TRVJfMl9NT1RPUl9PVkVSVEVNUEVS", - "QVRVUkUQgTcSJgohRElTUEVOU0VSXzNfTU9UT1JfT1ZFUlRFTVBFUkFUVVJF", - "EII3EiYKIURJU1BFTlNFUl80X01PVE9SX09WRVJURU1QRVJBVFVSRRCDNxIm", - "CiFESVNQRU5TRVJfNV9NT1RPUl9PVkVSVEVNUEVSQVRVUkUQhDcSJgohRElT", - "UEVOU0VSXzZfTU9UT1JfT1ZFUlRFTVBFUkFUVVJFEIU3EiYKIURJU1BFTlNF", - "Ul83X01PVE9SX09WRVJURU1QRVJBVFVSRRCGNxImCiFESVNQRU5TRVJfOF9N", - "T1RPUl9PVkVSVEVNUEVSQVRVUkUQhzcSHAoXRElTUEVOU0VSXzFfTU9UT1Jf", - "U1RBTEwQiDcSHAoXRElTUEVOU0VSXzJfTU9UT1JfU1RBTEwQiTcSHAoXRElT", - "UEVOU0VSXzNfTU9UT1JfU1RBTEwQijcSHAoXRElTUEVOU0VSXzRfTU9UT1Jf", - "U1RBTEwQizcSHAoXRElTUEVOU0VSXzVfTU9UT1JfU1RBTEwQjDcSHAoXRElT", - "UEVOU0VSXzZfTU9UT1JfU1RBTEwQjTcSHAoXRElTUEVOU0VSXzdfTU9UT1Jf", - "U1RBTEwQjjcSHAoXRElTUEVOU0VSXzhfTU9UT1JfU1RBTEwQjzcSIwoeRElT", - "UEVOU0VSXzFfTU9UT1JfVU5ERVJWT0xUQUdFEJA3EiMKHkRJU1BFTlNFUl8y", - "X01PVE9SX1VOREVSVk9MVEFHRRCRNxIjCh5ESVNQRU5TRVJfM19NT1RPUl9V", - "TkRFUlZPTFRBR0UQkjcSIwoeRElTUEVOU0VSXzRfTU9UT1JfVU5ERVJWT0xU", - "QUdFEJM3EiMKHkRJU1BFTlNFUl81X01PVE9SX1VOREVSVk9MVEFHRRCUNxIj", - "Ch5ESVNQRU5TRVJfNl9NT1RPUl9VTkRFUlZPTFRBR0UQlTcSIwoeRElTUEVO", - "U0VSXzdfTU9UT1JfVU5ERVJWT0xUQUdFEJY3EiMKHkRJU1BFTlNFUl84X01P", - "VE9SX1VOREVSVk9MVEFHRRCXNxIhChxESVNQRU5TRVJfMV9VUFBFUl9IQVJE", - "X0xJTUlUEJg3EiEKHERJU1BFTlNFUl8yX1VQUEVSX0hBUkRfTElNSVQQmTcS", - "IQocRElTUEVOU0VSXzNfVVBQRVJfSEFSRF9MSU1JVBCaNxIhChxESVNQRU5T", - "RVJfNF9VUFBFUl9IQVJEX0xJTUlUEJs3EiEKHERJU1BFTlNFUl81X1VQUEVS", - "X0hBUkRfTElNSVQQnDcSIQocRElTUEVOU0VSXzZfVVBQRVJfSEFSRF9MSU1J", - "VBCdNxIhChxESVNQRU5TRVJfN19VUFBFUl9IQVJEX0xJTUlUEJ43EiEKHERJ", - "U1BFTlNFUl84X1VQUEVSX0hBUkRfTElNSVQQnzcSIQocRElTUEVOU0VSXzFf", - "TE9XRVJfSEFSRF9MSU1JVBCgNxIhChxESVNQRU5TRVJfMl9MT1dFUl9IQVJE", - "X0xJTUlUEKE3EiEKHERJU1BFTlNFUl8zX0xPV0VSX0hBUkRfTElNSVQQojcS", - "IQocRElTUEVOU0VSXzRfTE9XRVJfSEFSRF9MSU1JVBCjNxIhChxESVNQRU5T", - "RVJfNV9MT1dFUl9IQVJEX0xJTUlUEKQ3EiEKHERJU1BFTlNFUl82X0xPV0VS", - "X0hBUkRfTElNSVQQpTcSIQocRElTUEVOU0VSXzdfTE9XRVJfSEFSRF9MSU1J", - "VBCmNxIhChxESVNQRU5TRVJfOF9MT1dFUl9IQVJEX0xJTUlUEKc3Eh4KGURJ", - "U1BFTlNFUl8xX0hJR0hfUFJFU1NVUkUQqDcSHgoZRElTUEVOU0VSXzJfSElH", - "SF9QUkVTU1VSRRCpNxIeChlESVNQRU5TRVJfM19ISUdIX1BSRVNTVVJFEKo3", - "Eh4KGURJU1BFTlNFUl80X0hJR0hfUFJFU1NVUkUQqzcSHgoZRElTUEVOU0VS", - "XzVfSElHSF9QUkVTU1VSRRCsNxIeChlESVNQRU5TRVJfNl9ISUdIX1BSRVNT", - "VVJFEK03Eh4KGURJU1BFTlNFUl83X0hJR0hfUFJFU1NVUkUQrjcSHgoZRElT", - "UEVOU0VSXzhfSElHSF9QUkVTU1VSRRCvNxIZChRNSURfVEFOS18xX0xPV19M", - "RVZFTBDAPhIZChRNSURfVEFOS18yX0xPV19MRVZFTBDBPhIZChRNSURfVEFO", - "S18zX0xPV19MRVZFTBDCPhIZChRNSURfVEFOS180X0xPV19MRVZFTBDDPhIZ", - "ChRNSURfVEFOS181X0xPV19MRVZFTBDEPhIZChRNSURfVEFOS182X0xPV19M", - "RVZFTBDFPhIZChRNSURfVEFOS183X0xPV19MRVZFTBDGPhIZChRNSURfVEFO", - "S184X0xPV19MRVZFTBDHPhIVChBNSURfVEFOS18xX0VNUFRZEMg+EhUKEE1J", - "RF9UQU5LXzJfRU1QVFkQyT4SFQoQTUlEX1RBTktfM19FTVBUWRDKPhIVChBN", - "SURfVEFOS180X0VNUFRZEMs+EhUKEE1JRF9UQU5LXzVfRU1QVFkQzD4SFQoQ", - "TUlEX1RBTktfNl9FTVBUWRDNPhIVChBNSURfVEFOS183X0VNUFRZEM4+EhUK", - "EE1JRF9UQU5LXzhfRU1QVFkQzz4SGAoTTUlEX1RBTktfMV9PVkVSRkxPVxDQ", - "PhIYChNNSURfVEFOS18yX09WRVJGTE9XENE+EhgKE01JRF9UQU5LXzNfT1ZF", - "UkZMT1cQ0j4SGAoTTUlEX1RBTktfNF9PVkVSRkxPVxDTPhIYChNNSURfVEFO", - "S181X09WRVJGTE9XENQ+EhgKE01JRF9UQU5LXzZfT1ZFUkZMT1cQ1T4SGAoT", - "TUlEX1RBTktfN19PVkVSRkxPVxDWPhIYChNNSURfVEFOS184X09WRVJGTE9X", - "ENc+EhwKF01JRF9UQU5LXzFfRklMTF9USU1FT1VUENg+EhwKF01JRF9UQU5L", - "XzJfRklMTF9USU1FT1VUENk+EhwKF01JRF9UQU5LXzNfRklMTF9USU1FT1VU", - "ENo+EhwKF01JRF9UQU5LXzRfRklMTF9USU1FT1VUENs+EhwKF01JRF9UQU5L", - "XzVfRklMTF9USU1FT1VUENw+EhwKF01JRF9UQU5LXzZfRklMTF9USU1FT1VU", - "EN0+EhwKF01JRF9UQU5LXzdfRklMTF9USU1FT1VUEN4+EhwKF01JRF9UQU5L", - "XzhfRklMTF9USU1FT1VUEN8+Eh0KGEFJUl9GSUxURVJfTk9UX0lOU1RBTExF", - "RBCoRhIXChJBSVJfRklMVEVSX0NMT0dHRUQQqUYSJQogV0FTVEVfQ09OVEFJ", - "TkVSX0VNUFRZSU5HX1RJTUVPVVQQqkYSFAoPTk9fQUlSX1BSRVNTVVJFEKtG", - "Eh0KGFdBU1RFX0NPTlRBSU5FUl9PVkVSRkxPVxCsRhIaChVWT0NfU0VOU09S", - "X0FMQVJNX1RJTUUQrUYSGAoTQ0hJTExFUl9EUllfQ09OVEFDVBCuRhIaChVJ", - "TlNVRkZJQ0lFTlRfQUlSX0ZMT1cQr0YSGwoWVk9DX1NFTlNPUl9BTEFSTV9T", - "TE9QRRCwRhIdChhQUkVfQ09PTEVSX0ZBTl8xX1NUT1BQRUQQsUYSHQoYUFJF", - "X0NPT0xFUl9GQU5fMl9TVE9QUEVEELJGEhkKFENPT0xFUl9GQU5fMV9TVE9Q", - "UEVEELNGEhkKFENPT0xFUl9GQU5fMl9TVE9QUEVEELRGEhkKFENPT0xFUl9G", - "QU5fM19TVE9QUEVEELVGEhkKFENPT0xFUl9GQU5fNF9TVE9QUEVEELZGEiEK", - "HFBSRV9DT09MRVJfRkFOXzFfUlBNX1RPT19MT1cQt0YSIQocUFJFX0NPT0xF", - "Ul9GQU5fMl9SUE1fVE9PX0xPVxC4RhIdChhDT09MRVJfRkFOXzFfUlBNX1RP", - "T19MT1cQuUYSHQoYQ09PTEVSX0ZBTl8yX1JQTV9UT09fTE9XELpGEh0KGENP", - "T0xFUl9GQU5fM19SUE1fVE9PX0xPVxC7RhIdChhDT09MRVJfRkFOXzRfUlBN", - "X1RPT19MT1cQvEYSIAobQ09PTEVSX1RFTVBFUkFUVVJFX1RPT19ISUdIEL1G", - "Eh8KGkNPT0xFUl9URU1QRVJBVFVSRV9UT09fTE9XEL5GEioKJUlOS19DQVJU", - "UklER0VfUFJFU0VOQ0VfU0VOU09SX1RJTUVPVVQQkE4SHwoaSU5LX0NBUlRS", - "SURHRV9SRklEX1RJTUVPVVQQkU4SIQocTk9fV0FTVEVfQ0FSVFJJREdFX0FW", - "QUlMQUJMRRCSThIeChlBTExfV0FTVEVfQ0FSVFJJREdFU19GVUxMEJNOEiwK", - "J1dBU1RFX0NBUlRSSURHRV9QUkVTRU5DRV9TRU5TT1JfVElNRU9VVBCUThIh", - "ChxXQVNURV9DQVJUUklER0VfUkZJRF9USU1FT1VUEJVOEioKJUlOS19DQVJU", - "UklER0VfUkZJRF9UQUdfQ0FOTk9UX0JFX1JFQUQQlk4SLAonV0FTVEVfQ0FS", - "VFJJREdFX1JGSURfVEFHX0NBTk5PVF9CRV9SRUFEEJdOEigKI0lOS19DQVJU", - "UklER0VfUkZJRF9UQUdfSVNfTk9UX1ZBTElEEJhOEioKJVdBU1RFX0NBUlRS", - "SURHRV9SRklEX1RBR19JU19OT1RfVkFMSUQQmU4SKAojSU5LX0NBUlRSSURH", - "RV9BVVRIRU5USUNBVElPTl9GQUlMRUQQmk4SKgolV0FTVEVfQ0FSVFJJREdF", - "X0FVVEhFTlRJQ0FUSU9OX0ZBSUxFRBCbThIdChhJTktfQ0FSVFJJREdFX0lT", - "X0JMT0NLRUQQnE4SHwoaV0FTVEVfQ0FSVFJJREdFX0lTX0JMT0NLRUQQnU4S", - "LQooSU5LX0NBUlRSSURHRV9SRklEX1RBR19DQU5OT1RfQkVfVVBEQVRFRBCe", - "ThIvCipXQVNURV9DQVJUUklER0VfUkZJRF9UQUdfQ0FOTk9UX0JFX1VQREFU", - "RUQQn04SIAobSU5LX0lOX0NBUlRSSURHRV9JU19FWFBJUkVEEKBOQiEKH2Nv", - "bS50d2luZS50YW5nby5wbXIuZGlhZ25vc3RpY3NiBnByb3RvMw==")); + "REVURUNURUQQ6hcSGQoUVEhSRUFEX0xPQURJTkdfRVJST1IQ6xcSHwoaTk9f", + "Q09NTVVOSUNBVElPTl9XSVRIX0JUU1IQ7BcSFQoQQlRTUl9NQUxGVU5DVElP", + "ThDtFxIhChxURU5TSU9OX0lOX0JUU1JfT1VUX09GX1JBTkdFEO4XEhgKE0dS", + "SVBQRVJfTUFMRlVOQ1RJT04Q7xcSHAoXRFJZRVJfTU9UT1JfTUFMRlVOQ1RJ", + "T04QoB8SIAobRFJZRVJfTU9UT1JfT1ZFUlRFTVBFUkFUVVJFEKEfEhYKEURS", + "WUVSX01PVE9SX1NUQUxMEKIfEh0KGERSWUVSX01PVE9SX1VOREVSVk9MVEFH", + "RRCjHxIUCg9EUllFUl9ET09SX09QRU4QpB8SIQocRFJZRVJfWk9ORV8xX09W", + "RVJURU1QRVJBVFVSRRClHxIhChxEUllFUl9aT05FXzJfT1ZFUlRFTVBFUkFU", + "VVJFEKYfEiQKH0RSWUVSX1pPTkVfMV9VTkRFUlRFTVBFUkFUVVJFX0EQpx8S", + "JAofRFJZRVJfWk9ORV8xX1VOREVSVEVNUEVSQVRVUkVfQhCoHxIkCh9EUllF", + "Ul9aT05FXzJfVU5ERVJURU1QRVJBVFVSRV9CEKkfEhkKFERSWUVSX1RIRVJN", + "QUxfQ1VUT0ZGEKofEi4KKURSWUVSX0hFQVRFUlNfWk9ORV8xX0NVUlJFTlRf", + "T1VUX09GX1JBTkdFEKsfEi4KKURSWUVSX0hFQVRFUlNfWk9ORV8yX0NVUlJF", + "TlRfT1VUX09GX1JBTkdFEKwfEiwKJ0RSWUVSX0hFQVRFUlNfWk9ORV8xX0NV", + "UlJFTlRfTE9PUF9CUkVBSxCtHxIsCidEUllFUl9IRUFURVJTX1pPTkVfMl9D", + "VVJSRU5UX0xPT1BfQlJFQUsQrh8SGgoVRFJZRVJfRkFOX1JQTV9UT09fTE9X", + "EK8fEhYKEURSWUVSX0ZBTl9TVE9QUEVEELAfEiAKG0RSWUVSX0xJRF9NT1RP", + "Ul9NQUxGVU5DVElPThCxHxIkCh9EUllFUl9MSURfTU9UT1JfT1ZFUlRFTVBF", + "UkFUVVJFELIfEhoKFURSWUVSX0xJRF9NT1RPUl9TVEFMTBCzHxIhChxEUllF", + "Ul9MSURfTU9UT1JfVU5ERVJWT0xUQUdFELQfEiQKH0RSWUVSX1pPTkVfMl9V", + "TkRFUlRFTVBFUkFUVVJFX0EQtR8SJwoiRFlFSU5HX0hFQURfWk9ORV8xX09W", + "RVJURU1QRVJBVFVSRRCIJxInCiJEWUVJTkdfSEVBRF9aT05FXzJfT1ZFUlRF", + "TVBFUkFUVVJFEIknEicKIkRZRUlOR19IRUFEX1pPTkVfM19PVkVSVEVNUEVS", + "QVRVUkUQiicSJwoiRFlFSU5HX0hFQURfWk9ORV80X09WRVJURU1QRVJBVFVS", + "RRCLJxInCiJEWUVJTkdfSEVBRF9aT05FXzVfT1ZFUlRFTVBFUkFUVVJFEIwn", + "EicKIkRZRUlOR19IRUFEX1pPTkVfNl9PVkVSVEVNUEVSQVRVUkUQjScSKgol", + "RFlFSU5HX0hFQURfWk9ORV8xX1VOREVSVEVNUEVSQVRVUkVfQRCOJxIqCiVE", + "WUVJTkdfSEVBRF9aT05FXzJfVU5ERVJURU1QRVJBVFVSRV9BEI8nEioKJURZ", + "RUlOR19IRUFEX1pPTkVfM19VTkRFUlRFTVBFUkFUVVJFX0EQkCcSKgolRFlF", + "SU5HX0hFQURfWk9ORV80X1VOREVSVEVNUEVSQVRVUkVfQRCRJxIqCiVEWUVJ", + "TkdfSEVBRF9aT05FXzVfVU5ERVJURU1QRVJBVFVSRV9BEJInEioKJURZRUlO", + "R19IRUFEX1pPTkVfNl9VTkRFUlRFTVBFUkFUVVJFX0EQkycSKgolRFlFSU5H", + "X0hFQURfWk9ORV8xX1VOREVSVEVNUEVSQVRVUkVfQhCUJxIqCiVEWUVJTkdf", + "SEVBRF9aT05FXzJfVU5ERVJURU1QRVJBVFVSRV9CEJUnEioKJURZRUlOR19I", + "RUFEX1pPTkVfM19VTkRFUlRFTVBFUkFUVVJFX0IQlicSKgolRFlFSU5HX0hF", + "QURfWk9ORV80X1VOREVSVEVNUEVSQVRVUkVfQhCXJxIqCiVEWUVJTkdfSEVB", + "RF9aT05FXzVfVU5ERVJURU1QRVJBVFVSRV9CEJgnEioKJURZRUlOR19IRUFE", + "X1pPTkVfNl9VTkRFUlRFTVBFUkFUVVJFX0IQmScSLAonRFlFSU5HX0hFQURf", + "Wk9ORV8xX0NVUlJFTlRfT1VUX09GX1JBTkdFEJonEiwKJ0RZRUlOR19IRUFE", + "X1pPTkVfMl9DVVJSRU5UX09VVF9PRl9SQU5HRRCbJxIsCidEWUVJTkdfSEVB", + "RF9aT05FXzNfQ1VSUkVOVF9PVVRfT0ZfUkFOR0UQnCcSLAonRFlFSU5HX0hF", + "QURfWk9ORV80X0NVUlJFTlRfT1VUX09GX1JBTkdFEJ0nEiwKJ0RZRUlOR19I", + "RUFEX1pPTkVfNV9DVVJSRU5UX09VVF9PRl9SQU5HRRCeJxIqCiVEWUVJTkdf", + "SEVBRF9aT05FXzFfQ1VSUkVOVF9MT09QX0JSRUFLEJ8nEioKJURZRUlOR19I", + "RUFEX1pPTkVfMl9DVVJSRU5UX0xPT1BfQlJFQUsQoCcSKgolRFlFSU5HX0hF", + "QURfWk9ORV8zX0NVUlJFTlRfTE9PUF9CUkVBSxChJxIqCiVEWUVJTkdfSEVB", + "RF9aT05FXzRfQ1VSUkVOVF9MT09QX0JSRUFLEKInEioKJURZRUlOR19IRUFE", + "X1pPTkVfNV9DVVJSRU5UX0xPT1BfQlJFQUsQoycSHwoaRFlFSU5HX0hFQURf", + "VEhFUk1BTF9DVVRPRkYQpCcSIwoeRFlFSU5HX0hFQURfQ09WRVJfT1BFTl9U", + "SU1FT1VUEKUnEiQKH0RZRUlOR19IRUFEX0NPVkVSX0NMT1NFX1RJTUVPVVQQ", + "picSKAojRFlFSU5HX0hFQURfQ09WRVJfTU9UT1JfTUFMRlVOQ1RJT04QpycS", + "LAonRFlFSU5HX0hFQURfQ09WRVJfTU9UT1JfT1ZFUlRFTVBFUkFUVVJFEKgn", + "EiIKHURZRUlOR19IRUFEX0NPVkVSX01PVE9SX1NUQUxMEKknEikKJERZRUlO", + "R19IRUFEX0NPVkVSX01PVE9SX1VOREVSVk9MVEFHRRCqJxI1CjBEWUVJTkdf", + "SEVBRF9DTEVBTklOR19NRUNIQU5JU01fTU9UT1JfTUFMRlVOQ1RJT04QqycS", + "OQo0RFlFSU5HX0hFQURfQ0xFQU5JTkdfTUVDSEFOSVNNX01PVE9SX09WRVJU", + "RU1QRVJBVFVSRRCsJxIvCipEWUVJTkdfSEVBRF9DTEVBTklOR19NRUNIQU5J", + "U01fTU9UT1JfU1RBTEwQrScSNgoxRFlFSU5HX0hFQURfQ0xFQU5JTkdfTUVD", + "SEFOSVNNX01PVE9SX1VOREVSVk9MVEFHRRCuJxIwCitEWUVJTkdfSEVBRF9D", + "TEVBTklOR19IRUFEX01PVE9SX01BTEZVTkNUSU9OEK8nEjQKL0RZRUlOR19I", + "RUFEX0NMRUFOSU5HX0hFQURfTU9UT1JfT1ZFUlRFTVBFUkFUVVJFELAnEioK", + "JURZRUlOR19IRUFEX0NMRUFOSU5HX0hFQURfTU9UT1JfU1RBTEwQsScSMQos", + "RFlFSU5HX0hFQURfQ0xFQU5JTkdfSEVBRF9NT1RPUl9VTkRFUlZPTFRBR0UQ", + "sicSJwoiRFlFSU5HX0hFQURfWk9ORV83X09WRVJURU1QRVJBVFVSRRCzJxIn", + "CiJEWUVJTkdfSEVBRF9aT05FXzhfT1ZFUlRFTVBFUkFUVVJFELQnEicKIkRZ", + "RUlOR19IRUFEX1pPTkVfOV9PVkVSVEVNUEVSQVRVUkUQtScSKAojRFlFSU5H", + "X0hFQURfWk9ORV8xMF9PVkVSVEVNUEVSQVRVUkUQticSKAojRFlFSU5HX0hF", + "QURfWk9ORV8xMV9PVkVSVEVNUEVSQVRVUkUQtycSKAojRFlFSU5HX0hFQURf", + "Wk9ORV8xMl9PVkVSVEVNUEVSQVRVUkUQuCcSKgolRFlFSU5HX0hFQURfWk9O", + "RV83X1VOREVSVEVNUEVSQVRVUkVfQRC5JxIqCiVEWUVJTkdfSEVBRF9aT05F", + "XzhfVU5ERVJURU1QRVJBVFVSRV9BELonEioKJURZRUlOR19IRUFEX1pPTkVf", + "OV9VTkRFUlRFTVBFUkFUVVJFX0EQuycSKwomRFlFSU5HX0hFQURfWk9ORV8x", + "MF9VTkRFUlRFTVBFUkFUVVJFX0EQvCcSKwomRFlFSU5HX0hFQURfWk9ORV8x", + "MV9VTkRFUlRFTVBFUkFUVVJFX0EQvScSKwomRFlFSU5HX0hFQURfWk9ORV8x", + "Ml9VTkRFUlRFTVBFUkFUVVJFX0EQvicSKgolRFlFSU5HX0hFQURfWk9ORV83", + "X1VOREVSVEVNUEVSQVRVUkVfQhC/JxIqCiVEWUVJTkdfSEVBRF9aT05FXzhf", + "VU5ERVJURU1QRVJBVFVSRV9CEMAnEioKJURZRUlOR19IRUFEX1pPTkVfOV9V", + "TkRFUlRFTVBFUkFUVVJFX0IQwScSKwomRFlFSU5HX0hFQURfWk9ORV8xMF9V", + "TkRFUlRFTVBFUkFUVVJFX0IQwicSKwomRFlFSU5HX0hFQURfWk9ORV8xMV9V", + "TkRFUlRFTVBFUkFUVVJFX0IQwycSKwomRFlFSU5HX0hFQURfWk9ORV8xMl9V", + "TkRFUlRFTVBFUkFUVVJFX0IQxCcSLAonRFlFSU5HX0hFQURfWk9ORV82X0NV", + "UlJFTlRfT1VUX09GX1JBTkdFEMUnEiwKJ0RZRUlOR19IRUFEX1pPTkVfN19D", + "VVJSRU5UX09VVF9PRl9SQU5HRRDGJxIsCidEWUVJTkdfSEVBRF9aT05FXzhf", + "Q1VSUkVOVF9PVVRfT0ZfUkFOR0UQxycSLAonRFlFSU5HX0hFQURfWk9ORV85", + "X0NVUlJFTlRfT1VUX09GX1JBTkdFEMgnEi0KKERZRUlOR19IRUFEX1pPTkVf", + "MTBfQ1VSUkVOVF9PVVRfT0ZfUkFOR0UQyScSLQooRFlFSU5HX0hFQURfWk9O", + "RV8xMV9DVVJSRU5UX09VVF9PRl9SQU5HRRDKJxItCihEWUVJTkdfSEVBRF9a", + "T05FXzEyX0NVUlJFTlRfT1VUX09GX1JBTkdFEMsnEioKJURZRUlOR19IRUFE", + "X1pPTkVfNl9DVVJSRU5UX0xPT1BfQlJFQUsQzCcSKgolRFlFSU5HX0hFQURf", + "Wk9ORV83X0NVUlJFTlRfTE9PUF9CUkVBSxDNJxIqCiVEWUVJTkdfSEVBRF9a", + "T05FXzhfQ1VSUkVOVF9MT09QX0JSRUFLEM4nEioKJURZRUlOR19IRUFEX1pP", + "TkVfOV9DVVJSRU5UX0xPT1BfQlJFQUsQzycSKwomRFlFSU5HX0hFQURfWk9O", + "RV8xMF9DVVJSRU5UX0xPT1BfQlJFQUsQ0CcSKwomRFlFSU5HX0hFQURfWk9O", + "RV8xMV9DVVJSRU5UX0xPT1BfQlJFQUsQ0ScSKwomRFlFSU5HX0hFQURfWk9O", + "RV8xMl9DVVJSRU5UX0xPT1BfQlJFQUsQ0icSKQokRFlFSU5HX0hFQURfQkxP", + "V0VSXzFfT1ZFUlRFTVBFUkFUVVJFENMnEikKJERZRUlOR19IRUFEX0JMT1dF", + "Ul8yX09WRVJURU1QRVJBVFVSRRDUJxIsCidEWUVJTkdfSEVBRF9CTE9XRVJf", + "MV9VTkRFUlRFTVBFUkFUVVJFX0EQ1ScSLAonRFlFSU5HX0hFQURfQkxPV0VS", + "XzJfVU5ERVJURU1QRVJBVFVSRV9BENYnEiwKJ0RZRUlOR19IRUFEX0JMT1dF", + "Ul8xX1VOREVSVEVNUEVSQVRVUkVfQhDXJxIsCidEWUVJTkdfSEVBRF9CTE9X", + "RVJfMl9VTkRFUlRFTVBFUkFUVVJFX0IQ2CcSLgopRFlFSU5HX0hFQURfQkxP", + "V0VSXzFfQ1VSUkVOVF9PVVRfT0ZfUkFOR0UQ2ScSLgopRFlFSU5HX0hFQURf", + "QkxPV0VSXzJfQ1VSUkVOVF9PVVRfT0ZfUkFOR0UQ2icSLAonRFlFSU5HX0hF", + "QURfQkxPV0VSXzFfQ1VSUkVOVF9MT09QX0JSRUFLENsnEiwKJ0RZRUlOR19I", + "RUFEX0JMT1dFUl8yX0NVUlJFTlRfTE9PUF9CUkVBSxDcJxIlCiBEWUVJTkdf", + "SEVBRF9CTE9XRVJfMV9GQU5fU1RPUFBFRBDdJxIlCiBEWUVJTkdfSEVBRF9C", + "TE9XRVJfMl9GQU5fU1RPUFBFRBDeJxIpCiREWUVJTkdfSEVBRF9CTE9XRVJf", + "MV9GQU5fUlBNX1RPT19MT1cQ3ycSKQokRFlFSU5HX0hFQURfQkxPV0VSXzJf", + "RkFOX1JQTV9UT09fTE9XEOAnEioKJURZRUlOR19IRUFEX1JJR0hUX0FDVFVB", + "VE9SX1VQX1RJTUVPVVQQ4ScSKQokRFlFSU5HX0hFQURfTEVGVF9BQ1RVQVRP", + "Ul9VUF9USU1FT1VUEOInEiwKJ0RZRUlOR19IRUFEX1JJR0hUX0FDVFVBVE9S", + "X0RPV05fVElNRU9VVBDjJxIrCiZEWUVJTkdfSEVBRF9MRUZUX0FDVFVBVE9S", + "X0RPV05fVElNRU9VVBDkJxInCiJEWUVJTkdfSEVBRF9CTE9XRVJfMV9GTE9X", + "X1RPT19ISUdIEOUnEicKIkRZRUlOR19IRUFEX0JMT1dFUl8yX0ZMT1dfVE9P", + "X0hJR0gQ5icSJgohRFlFSU5HX0hFQURfQkxPV0VSXzFfRkxPV19UT09fTE9X", + "EOcnEiYKIURZRUlOR19IRUFEX0JMT1dFUl8yX0ZMT1dfVE9PX0xPVxDoJxIg", + "ChtEWUVJTkdfSEVBRF9BUkNfTElEX0lTX09QRU4Q6ScSIwoeRFlFSU5HX0hF", + "QURfVFVOTkVMX0xJRF9JU19PUEVOEOonEh4KGURZRUlOR19IRUFEX0NPVkVS", + "X0lTX09QRU4Q6ycSGgoVTUlYRVJfT1ZFUlRFTVBFUkFUVVJFEPAuEh0KGE1J", + "WEVSX1VOREVSVEVNUEVSQVRVUkVfQRDxLhIdChhNSVhFUl9VTkRFUlRFTVBF", + "UkFUVVJFX0IQ8i4SGQoUTUlYRVJfVEhFUk1BTF9DVVRPRkYQ8y4SHwoaTUlY", + "RVJfQ1VSUkVOVF9PVVRfT0ZfUkFOR0UQ9C4SHQoYTUlYRVJfQ1VSUkVOVF9M", + "T09QX0JSRUFLEPUuEh0KGERJU1BFTlNFUl8xX09WRVJQUkVTU1VSRRDYNhId", + "ChhESVNQRU5TRVJfMl9PVkVSUFJFU1NVUkUQ2TYSHQoYRElTUEVOU0VSXzNf", + "T1ZFUlBSRVNTVVJFENo2Eh0KGERJU1BFTlNFUl80X09WRVJQUkVTU1VSRRDb", + "NhIdChhESVNQRU5TRVJfNV9PVkVSUFJFU1NVUkUQ3DYSHQoYRElTUEVOU0VS", + "XzZfT1ZFUlBSRVNTVVJFEN02Eh0KGERJU1BFTlNFUl83X09WRVJQUkVTU1VS", + "RRDeNhIdChhESVNQRU5TRVJfOF9PVkVSUFJFU1NVUkUQ3zYSHgoZRElTUEVO", + "U0VSXzFfVU5ERVJQUkVTU1VSRRDgNhIeChlESVNQRU5TRVJfMl9VTkRFUlBS", + "RVNTVVJFEOE2Eh4KGURJU1BFTlNFUl8zX1VOREVSUFJFU1NVUkUQ4jYSHgoZ", + "RElTUEVOU0VSXzRfVU5ERVJQUkVTU1VSRRDjNhIeChlESVNQRU5TRVJfNV9V", + "TkRFUlBSRVNTVVJFEOQ2Eh4KGURJU1BFTlNFUl82X1VOREVSUFJFU1NVUkUQ", + "5TYSHgoZRElTUEVOU0VSXzdfVU5ERVJQUkVTU1VSRRDmNhIeChlESVNQRU5T", + "RVJfOF9VTkRFUlBSRVNTVVJFEOc2EhYKEURJU1BFTlNFUl8xX0VNUFRZEOg2", + "EhYKEURJU1BFTlNFUl8yX0VNUFRZEOk2EhYKEURJU1BFTlNFUl8zX0VNUFRZ", + "EOo2EhYKEURJU1BFTlNFUl80X0VNUFRZEOs2EhYKEURJU1BFTlNFUl81X0VN", + "UFRZEOw2EhYKEURJU1BFTlNFUl82X0VNUFRZEO02EhYKEURJU1BFTlNFUl83", + "X0VNUFRZEO42EhYKEURJU1BFTlNFUl84X0VNUFRZEO82Eh8KGkRJU1BFTlNF", + "Ul8xX1JFRklMTF9GQUlMVVJFEPA2Eh8KGkRJU1BFTlNFUl8yX1JFRklMTF9G", + "QUlMVVJFEPE2Eh8KGkRJU1BFTlNFUl8zX1JFRklMTF9GQUlMVVJFEPI2Eh8K", + "GkRJU1BFTlNFUl80X1JFRklMTF9GQUlMVVJFEPM2Eh8KGkRJU1BFTlNFUl81", + "X1JFRklMTF9GQUlMVVJFEPQ2Eh8KGkRJU1BFTlNFUl82X1JFRklMTF9GQUlM", + "VVJFEPU2Eh8KGkRJU1BFTlNFUl83X1JFRklMTF9GQUlMVVJFEPY2Eh8KGkRJ", + "U1BFTlNFUl84X1JFRklMTF9GQUlMVVJFEPc2EiIKHURJU1BFTlNFUl8xX01P", + "VE9SX01BTEZVTkNUSU9OEPg2EiIKHURJU1BFTlNFUl8yX01PVE9SX01BTEZV", + "TkNUSU9OEPk2EiIKHURJU1BFTlNFUl8zX01PVE9SX01BTEZVTkNUSU9OEPo2", + "EiIKHURJU1BFTlNFUl80X01PVE9SX01BTEZVTkNUSU9OEPs2EiIKHURJU1BF", + "TlNFUl81X01PVE9SX01BTEZVTkNUSU9OEPw2EiIKHURJU1BFTlNFUl82X01P", + "VE9SX01BTEZVTkNUSU9OEP02EiIKHURJU1BFTlNFUl83X01PVE9SX01BTEZV", + "TkNUSU9OEP42EiIKHURJU1BFTlNFUl84X01PVE9SX01BTEZVTkNUSU9OEP82", + "EiYKIURJU1BFTlNFUl8xX01PVE9SX09WRVJURU1QRVJBVFVSRRCANxImCiFE", + "SVNQRU5TRVJfMl9NT1RPUl9PVkVSVEVNUEVSQVRVUkUQgTcSJgohRElTUEVO", + "U0VSXzNfTU9UT1JfT1ZFUlRFTVBFUkFUVVJFEII3EiYKIURJU1BFTlNFUl80", + "X01PVE9SX09WRVJURU1QRVJBVFVSRRCDNxImCiFESVNQRU5TRVJfNV9NT1RP", + "Ul9PVkVSVEVNUEVSQVRVUkUQhDcSJgohRElTUEVOU0VSXzZfTU9UT1JfT1ZF", + "UlRFTVBFUkFUVVJFEIU3EiYKIURJU1BFTlNFUl83X01PVE9SX09WRVJURU1Q", + "RVJBVFVSRRCGNxImCiFESVNQRU5TRVJfOF9NT1RPUl9PVkVSVEVNUEVSQVRV", + "UkUQhzcSHAoXRElTUEVOU0VSXzFfTU9UT1JfU1RBTEwQiDcSHAoXRElTUEVO", + "U0VSXzJfTU9UT1JfU1RBTEwQiTcSHAoXRElTUEVOU0VSXzNfTU9UT1JfU1RB", + "TEwQijcSHAoXRElTUEVOU0VSXzRfTU9UT1JfU1RBTEwQizcSHAoXRElTUEVO", + "U0VSXzVfTU9UT1JfU1RBTEwQjDcSHAoXRElTUEVOU0VSXzZfTU9UT1JfU1RB", + "TEwQjTcSHAoXRElTUEVOU0VSXzdfTU9UT1JfU1RBTEwQjjcSHAoXRElTUEVO", + "U0VSXzhfTU9UT1JfU1RBTEwQjzcSIwoeRElTUEVOU0VSXzFfTU9UT1JfVU5E", + "RVJWT0xUQUdFEJA3EiMKHkRJU1BFTlNFUl8yX01PVE9SX1VOREVSVk9MVEFH", + "RRCRNxIjCh5ESVNQRU5TRVJfM19NT1RPUl9VTkRFUlZPTFRBR0UQkjcSIwoe", + "RElTUEVOU0VSXzRfTU9UT1JfVU5ERVJWT0xUQUdFEJM3EiMKHkRJU1BFTlNF", + "Ul81X01PVE9SX1VOREVSVk9MVEFHRRCUNxIjCh5ESVNQRU5TRVJfNl9NT1RP", + "Ul9VTkRFUlZPTFRBR0UQlTcSIwoeRElTUEVOU0VSXzdfTU9UT1JfVU5ERVJW", + "T0xUQUdFEJY3EiMKHkRJU1BFTlNFUl84X01PVE9SX1VOREVSVk9MVEFHRRCX", + "NxIhChxESVNQRU5TRVJfMV9VUFBFUl9IQVJEX0xJTUlUEJg3EiEKHERJU1BF", + "TlNFUl8yX1VQUEVSX0hBUkRfTElNSVQQmTcSIQocRElTUEVOU0VSXzNfVVBQ", + "RVJfSEFSRF9MSU1JVBCaNxIhChxESVNQRU5TRVJfNF9VUFBFUl9IQVJEX0xJ", + "TUlUEJs3EiEKHERJU1BFTlNFUl81X1VQUEVSX0hBUkRfTElNSVQQnDcSIQoc", + "RElTUEVOU0VSXzZfVVBQRVJfSEFSRF9MSU1JVBCdNxIhChxESVNQRU5TRVJf", + "N19VUFBFUl9IQVJEX0xJTUlUEJ43EiEKHERJU1BFTlNFUl84X1VQUEVSX0hB", + "UkRfTElNSVQQnzcSIQocRElTUEVOU0VSXzFfTE9XRVJfSEFSRF9MSU1JVBCg", + "NxIhChxESVNQRU5TRVJfMl9MT1dFUl9IQVJEX0xJTUlUEKE3EiEKHERJU1BF", + "TlNFUl8zX0xPV0VSX0hBUkRfTElNSVQQojcSIQocRElTUEVOU0VSXzRfTE9X", + "RVJfSEFSRF9MSU1JVBCjNxIhChxESVNQRU5TRVJfNV9MT1dFUl9IQVJEX0xJ", + "TUlUEKQ3EiEKHERJU1BFTlNFUl82X0xPV0VSX0hBUkRfTElNSVQQpTcSIQoc", + "RElTUEVOU0VSXzdfTE9XRVJfSEFSRF9MSU1JVBCmNxIhChxESVNQRU5TRVJf", + "OF9MT1dFUl9IQVJEX0xJTUlUEKc3Eh4KGURJU1BFTlNFUl8xX0hJR0hfUFJF", + "U1NVUkUQqDcSHgoZRElTUEVOU0VSXzJfSElHSF9QUkVTU1VSRRCpNxIeChlE", + "SVNQRU5TRVJfM19ISUdIX1BSRVNTVVJFEKo3Eh4KGURJU1BFTlNFUl80X0hJ", + "R0hfUFJFU1NVUkUQqzcSHgoZRElTUEVOU0VSXzVfSElHSF9QUkVTU1VSRRCs", + "NxIeChlESVNQRU5TRVJfNl9ISUdIX1BSRVNTVVJFEK03Eh4KGURJU1BFTlNF", + "Ul83X0hJR0hfUFJFU1NVUkUQrjcSHgoZRElTUEVOU0VSXzhfSElHSF9QUkVT", + "U1VSRRCvNxIdChhESVNQRU5TRVJfOV9PVkVSUFJFU1NVUkUQsDcSHgoZRElT", + "UEVOU0VSXzlfVU5ERVJQUkVTU1VSRRCxNxIeChlESVNQRU5TRVJfMTBfT1ZF", + "UlBSRVNTVVJFELI3Eh8KGkRJU1BFTlNFUl8xMF9VTkRFUlBSRVNTVVJFELM3", + "EiQKH0RJU1BFTlNFUl85X01PVE9SXzFfTUFMRlVOQ1RJT04QtDcSJAofRElT", + "UEVOU0VSXzlfTU9UT1JfMl9NQUxGVU5DVElPThC1NxIlCiBESVNQRU5TRVJf", + "MTBfTU9UT1JfMV9NQUxGVU5DVElPThC2NxIlCiBESVNQRU5TRVJfMTBfTU9U", + "T1JfMl9NQUxGVU5DVElPThC3NxIZChRNSURfVEFOS18xX0xPV19MRVZFTBDA", + "PhIZChRNSURfVEFOS18yX0xPV19MRVZFTBDBPhIZChRNSURfVEFOS18zX0xP", + "V19MRVZFTBDCPhIZChRNSURfVEFOS180X0xPV19MRVZFTBDDPhIZChRNSURf", + "VEFOS181X0xPV19MRVZFTBDEPhIZChRNSURfVEFOS182X0xPV19MRVZFTBDF", + "PhIZChRNSURfVEFOS183X0xPV19MRVZFTBDGPhIZChRNSURfVEFOS184X0xP", + "V19MRVZFTBDHPhIVChBNSURfVEFOS18xX0VNUFRZEMg+EhUKEE1JRF9UQU5L", + "XzJfRU1QVFkQyT4SFQoQTUlEX1RBTktfM19FTVBUWRDKPhIVChBNSURfVEFO", + "S180X0VNUFRZEMs+EhUKEE1JRF9UQU5LXzVfRU1QVFkQzD4SFQoQTUlEX1RB", + "TktfNl9FTVBUWRDNPhIVChBNSURfVEFOS183X0VNUFRZEM4+EhUKEE1JRF9U", + "QU5LXzhfRU1QVFkQzz4SGAoTTUlEX1RBTktfMV9PVkVSRkxPVxDQPhIYChNN", + "SURfVEFOS18yX09WRVJGTE9XENE+EhgKE01JRF9UQU5LXzNfT1ZFUkZMT1cQ", + "0j4SGAoTTUlEX1RBTktfNF9PVkVSRkxPVxDTPhIYChNNSURfVEFOS181X09W", + "RVJGTE9XENQ+EhgKE01JRF9UQU5LXzZfT1ZFUkZMT1cQ1T4SGAoTTUlEX1RB", + "TktfN19PVkVSRkxPVxDWPhIYChNNSURfVEFOS184X09WRVJGTE9XENc+EhwK", + "F01JRF9UQU5LXzFfRklMTF9USU1FT1VUENg+EhwKF01JRF9UQU5LXzJfRklM", + "TF9USU1FT1VUENk+EhwKF01JRF9UQU5LXzNfRklMTF9USU1FT1VUENo+EhwK", + "F01JRF9UQU5LXzRfRklMTF9USU1FT1VUENs+EhwKF01JRF9UQU5LXzVfRklM", + "TF9USU1FT1VUENw+EhwKF01JRF9UQU5LXzZfRklMTF9USU1FT1VUEN0+EhwK", + "F01JRF9UQU5LXzdfRklMTF9USU1FT1VUEN4+EhwKF01JRF9UQU5LXzhfRklM", + "TF9USU1FT1VUEN8+EhkKFE1JRF9UQU5LXzlfTE9XX0xFVkVMEOA+EhUKEE1J", + "RF9UQU5LXzlfRU1QVFkQ4T4SGAoTTUlEX1RBTktfOV9PVkVSRkxPVxDiPhIc", + "ChdNSURfVEFOS185X0ZJTExfVElNRU9VVBDjPhIaChVNSURfVEFOS18xMF9M", + "T1dfTEVWRUwQ5D4SFgoRTUlEX1RBTktfMTBfRU1QVFkQ5T4SGQoUTUlEX1RB", + "TktfMTBfT1ZFUkZMT1cQ5j4SHQoYTUlEX1RBTktfMTBfRklMTF9USU1FT1VU", + "EOc+Eh0KGEFJUl9GSUxURVJfTk9UX0lOU1RBTExFRBCoRhIXChJBSVJfRklM", + "VEVSX0NMT0dHRUQQqUYSJQogV0FTVEVfQ09OVEFJTkVSX0VNUFRZSU5HX1RJ", + "TUVPVVQQqkYSFAoPTk9fQUlSX1BSRVNTVVJFEKtGEh0KGFdBU1RFX0NPTlRB", + "SU5FUl9PVkVSRkxPVxCsRhIaChVWT0NfU0VOU09SX0FMQVJNX1RJTUUQrUYS", + "GAoTQ0hJTExFUl9EUllfQ09OVEFDVBCuRhIaChVJTlNVRkZJQ0lFTlRfQUlS", + "X0ZMT1cQr0YSGwoWVk9DX1NFTlNPUl9BTEFSTV9TTE9QRRCwRhIdChhQUkVf", + "Q09PTEVSX0ZBTl8xX1NUT1BQRUQQsUYSHQoYUFJFX0NPT0xFUl9GQU5fMl9T", + "VE9QUEVEELJGEhkKFENPT0xFUl9GQU5fMV9TVE9QUEVEELNGEhkKFENPT0xF", + "Ul9GQU5fMl9TVE9QUEVEELRGEhkKFENPT0xFUl9GQU5fM19TVE9QUEVEELVG", + "EhkKFENPT0xFUl9GQU5fNF9TVE9QUEVEELZGEiEKHFBSRV9DT09MRVJfRkFO", + "XzFfUlBNX1RPT19MT1cQt0YSIQocUFJFX0NPT0xFUl9GQU5fMl9SUE1fVE9P", + "X0xPVxC4RhIdChhDT09MRVJfRkFOXzFfUlBNX1RPT19MT1cQuUYSHQoYQ09P", + "TEVSX0ZBTl8yX1JQTV9UT09fTE9XELpGEh0KGENPT0xFUl9GQU5fM19SUE1f", + "VE9PX0xPVxC7RhIdChhDT09MRVJfRkFOXzRfUlBNX1RPT19MT1cQvEYSIAob", + "Q09PTEVSX1RFTVBFUkFUVVJFX1RPT19ISUdIEL1GEh8KGkNPT0xFUl9URU1Q", + "RVJBVFVSRV9UT09fTE9XEL5GEioKJUlOS19DQVJUUklER0VfUFJFU0VOQ0Vf", + "U0VOU09SX1RJTUVPVVQQkE4SHwoaSU5LX0NBUlRSSURHRV9SRklEX1RJTUVP", + "VVQQkU4SIQocTk9fV0FTVEVfQ0FSVFJJREdFX0FWQUlMQUJMRRCSThIeChlB", + "TExfV0FTVEVfQ0FSVFJJREdFU19GVUxMEJNOEiwKJ1dBU1RFX0NBUlRSSURH", + "RV9QUkVTRU5DRV9TRU5TT1JfVElNRU9VVBCUThIhChxXQVNURV9DQVJUUklE", + "R0VfUkZJRF9USU1FT1VUEJVOEioKJUlOS19DQVJUUklER0VfUkZJRF9UQUdf", + "Q0FOTk9UX0JFX1JFQUQQlk4SLAonV0FTVEVfQ0FSVFJJREdFX1JGSURfVEFH", + "X0NBTk5PVF9CRV9SRUFEEJdOEigKI0lOS19DQVJUUklER0VfUkZJRF9UQUdf", + "SVNfTk9UX1ZBTElEEJhOEioKJVdBU1RFX0NBUlRSSURHRV9SRklEX1RBR19J", + "U19OT1RfVkFMSUQQmU4SKAojSU5LX0NBUlRSSURHRV9BVVRIRU5USUNBVElP", + "Tl9GQUlMRUQQmk4SKgolV0FTVEVfQ0FSVFJJREdFX0FVVEhFTlRJQ0FUSU9O", + "X0ZBSUxFRBCbThIdChhJTktfQ0FSVFJJREdFX0lTX0JMT0NLRUQQnE4SHwoa", + "V0FTVEVfQ0FSVFJJREdFX0lTX0JMT0NLRUQQnU4SLQooSU5LX0NBUlRSSURH", + "RV9SRklEX1RBR19DQU5OT1RfQkVfVVBEQVRFRBCeThIvCipXQVNURV9DQVJU", + "UklER0VfUkZJRF9UQUdfQ0FOTk9UX0JFX1VQREFURUQQn04SIAobSU5LX0lO", + "X0NBUlRSSURHRV9JU19FWFBJUkVEEKBOQiEKH2NvbS50d2luZS50YW5nby5w", + "bXIuZGlhZ25vc3RpY3NiBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Diagnostics.EventType), }, null)); @@ -504,33 +518,33 @@ namespace Tango.PMR.Diagnostics { /// </summary> [pbr::OriginalName("WINDER_CONE_DOES_NOT_EXIST")] WinderConeDoesNotExist = 3002, /// <summary> - ///The feeder motor current is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning) + ///Feeder motor malfunction. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning) /// </summary> - [pbr::OriginalName("FEEDER_MOTOR_OVERCURRENT")] FeederMotorOvercurrent = 3003, + [pbr::OriginalName("FEEDER_MOTOR_MALFUNCTION")] FeederMotorMalfunction = 3003, /// <summary> - ///The current in the right loader motor is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning) + ///Right loader motor malfunction. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning) /// </summary> - [pbr::OriginalName("RIGHT_LOADER_MOTOR_OVERCURRENT")] RightLoaderMotorOvercurrent = 3004, + [pbr::OriginalName("RIGHT_LOADER_MOTOR_MALFUNCTION")] RightLoaderMotorMalfunction = 3004, /// <summary> - ///The puller motor current is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning) + ///Puller motor malfunction. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning) /// </summary> - [pbr::OriginalName("PULLER_MOTOR_OVERCURRENT")] PullerMotorOvercurrent = 3005, + [pbr::OriginalName("PULLER_MOTOR_MALFUNCTION")] PullerMotorMalfunction = 3005, /// <summary> - ///The left loader motor current is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning) + ///Left loader motor malfunction. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning) /// </summary> - [pbr::OriginalName("LEFT_LOADER_MOTOR_OVERCURRENT")] LeftLoaderMotorOvercurrent = 3006, + [pbr::OriginalName("LEFT_LOADER_MOTOR_MALFUNCTION")] LeftLoaderMotorMalfunction = 3006, /// <summary> - ///The winder motor current is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning) + ///Winder motor malfunction. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning) /// </summary> - [pbr::OriginalName("WINDER_MOTOR_OVERCURRENT")] WinderMotorOvercurrent = 3007, + [pbr::OriginalName("WINDER_MOTOR_MALFUNCTION")] WinderMotorMalfunction = 3007, /// <summary> - ///The screw motor current is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning) + ///Screw motor malfunction. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning) /// </summary> - [pbr::OriginalName("SCREW_MOTOR_OVERCURRENT")] ScrewMotorOvercurrent = 3008, + [pbr::OriginalName("SCREW_MOTOR_MALFUNCTION")] ScrewMotorMalfunction = 3008, /// <summary> - ///The loading arm motor current is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning) + ///Loading arm motor malfunction. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning) /// </summary> - [pbr::OriginalName("LOADING_ARM_MOTOR_OVERCURRENT")] LoadingArmMotorOvercurrent = 3009, + [pbr::OriginalName("LOADING_ARM_MOTOR_MALFUNCTION")] LoadingArmMotorMalfunction = 3009, /// <summary> ///The feeder motor temperature is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning) /// </summary> @@ -636,17 +650,17 @@ namespace Tango.PMR.Diagnostics { /// </summary> [pbr::OriginalName("SCREW_MOTOR_LIMIT_TIMEOUT")] ScrewMotorLimitTimeout = 3035, /// <summary> - ///The winder dancer motor current is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning) + ///Winder dancer motor malfunction. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning) /// </summary> - [pbr::OriginalName("WINDER_DANCER_MOTOR_OVERCURRENT")] WinderDancerMotorOvercurrent = 3036, + [pbr::OriginalName("WINDER_DANCER_MOTOR_MALFUNCTION")] WinderDancerMotorMalfunction = 3036, /// <summary> - ///The puller dancer motor current is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning) + ///Puller dancer motor malfunction. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning) /// </summary> - [pbr::OriginalName("PULLER_DANCER_MOTOR_OVERCURRENT")] PullerDancerMotorOvercurrent = 3037, + [pbr::OriginalName("PULLER_DANCER_MOTOR_MALFUNCTION")] PullerDancerMotorMalfunction = 3037, /// <summary> - ///The feeder dancer motor current is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning) + ///Feeder dancer motor malfunction. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning) /// </summary> - [pbr::OriginalName("FEEDER_DANCER_MOTOR_OVERCURRENT")] FeederDancerMotorOvercurrent = 3038, + [pbr::OriginalName("FEEDER_DANCER_MOTOR_MALFUNCTION")] FeederDancerMotorMalfunction = 3038, /// <summary> ///The winder dancer motor temperature is too high. Cannot execute job (Group = ThreadFeedingSystem, Category = Warning) /// </summary> @@ -700,9 +714,25 @@ namespace Tango.PMR.Diagnostics { /// </summary> [pbr::OriginalName("THREAD_LOADING_ERROR")] ThreadLoadingError = 3051, /// <summary> - ///The dryer motor current is too high. Cannot execute job (Group = Dryer, Category = Warning) + ///Cannot communicate with BTSR. Cannot execute job (Group = ThreadFeedingSystem, Category = Error) /// </summary> - [pbr::OriginalName("DRYER_MOTOR_OVERCURRENT")] DryerMotorOvercurrent = 4000, + [pbr::OriginalName("NO_COMMUNICATION_WITH_BTSR")] NoCommunicationWithBtsr = 3052, + /// <summary> + ///BTSR malfunction. Cannot execute job. (Group = ThreadFeedingSystem, Category = Error) + /// </summary> + [pbr::OriginalName("BTSR_MALFUNCTION")] BtsrMalfunction = 3053, + /// <summary> + ///Tension in BTSR is out of range. Cannot execute job (Group = ThreadFeedingSystem, Category = Error) + /// </summary> + [pbr::OriginalName("TENSION_IN_BTSR_OUT_OF_RANGE")] TensionInBtsrOutOfRange = 3054, + /// <summary> + ///Gripper malfunction. Thread caught in gripper. Cannot execute job (Group = ThreadFeedingSystem, Category = Error) + /// </summary> + [pbr::OriginalName("GRIPPER_MALFUNCTION")] GripperMalfunction = 3055, + /// <summary> + ///Dryer motor malfunction. Cannot execute job (Group = Dryer, Category = Warning) + /// </summary> + [pbr::OriginalName("DRYER_MOTOR_MALFUNCTION")] DryerMotorMalfunction = 4000, /// <summary> ///The dryer motor temperature is too high. Cannot execute jobs (Group = Dryer, Category = Warning) /// </summary> @@ -768,9 +798,9 @@ namespace Tango.PMR.Diagnostics { /// </summary> [pbr::OriginalName("DRYER_FAN_STOPPED")] DryerFanStopped = 4016, /// <summary> - ///The current in dryer lid motor is too high. Cannot execute job (Group = Dryer, Category = Warning) + ///Dryer lid motor malfunction. Cannot execute job (Group = Dryer, Category = Warning) /// </summary> - [pbr::OriginalName("DRYER_LID_MOTOR_OVERCURRENT")] DryerLidMotorOvercurrent = 4017, + [pbr::OriginalName("DRYER_LID_MOTOR_MALFUNCTION")] DryerLidMotorMalfunction = 4017, /// <summary> ///The temperature in the dryer lid motor is too high. Cannot execute job (Group = Dryer, Category = Warning) /// </summary> @@ -912,9 +942,9 @@ namespace Tango.PMR.Diagnostics { /// </summary> [pbr::OriginalName("DYEING_HEAD_COVER_CLOSE_TIMEOUT")] DyeingHeadCoverCloseTimeout = 5030, /// <summary> - ///The current in the dyeing head cover motor is too high. Cannot execute job (Group = DyeingHead, Category = Warning) + ///Dyeing head cover motor malfunction. Cannot execute job (Group = DyeingHead, Category = Warning) /// </summary> - [pbr::OriginalName("DYEING_HEAD_COVER_MOTOR_OVERCURRENT")] DyeingHeadCoverMotorOvercurrent = 5031, + [pbr::OriginalName("DYEING_HEAD_COVER_MOTOR_MALFUNCTION")] DyeingHeadCoverMotorMalfunction = 5031, /// <summary> ///The temperature in the dyeing head cover motor is too high. Cannot execute job (Group = DyeingHead, Category = Warning) /// </summary> @@ -928,9 +958,9 @@ namespace Tango.PMR.Diagnostics { /// </summary> [pbr::OriginalName("DYEING_HEAD_COVER_MOTOR_UNDERVOLTAGE")] DyeingHeadCoverMotorUndervoltage = 5034, /// <summary> - ///The current in the dyeing head cleaning mechanism motor is too high. Cannot execute job (Group = DyeingHead, Category = Warning) + ///Dyeing head cleaning mechanism motor malfunction. Cannot execute job (Group = DyeingHead, Category = Warning) /// </summary> - [pbr::OriginalName("DYEING_HEAD_CLEANING_MECHANISM_MOTOR_OVERCURRENT")] DyeingHeadCleaningMechanismMotorOvercurrent = 5035, + [pbr::OriginalName("DYEING_HEAD_CLEANING_MECHANISM_MOTOR_MALFUNCTION")] DyeingHeadCleaningMechanismMotorMalfunction = 5035, /// <summary> ///The temperature in the dyeing head cleaning mechanism motor is too high. Cannot execute job (Group = DyeingHead, Category = Warning) /// </summary> @@ -944,9 +974,9 @@ namespace Tango.PMR.Diagnostics { /// </summary> [pbr::OriginalName("DYEING_HEAD_CLEANING_MECHANISM_MOTOR_UNDERVOLTAGE")] DyeingHeadCleaningMechanismMotorUndervoltage = 5038, /// <summary> - ///The current in the dyeing head cleaning head motor is too high. Cannot execute job (Group = DyeingHead, Category = Warning) + ///Dyeing head cleaning head motor malfunction. Cannot execute job (Group = DyeingHead, Category = Warning) /// </summary> - [pbr::OriginalName("DYEING_HEAD_CLEANING_HEAD_MOTOR_OVERCURRENT")] DyeingHeadCleaningHeadMotorOvercurrent = 5039, + [pbr::OriginalName("DYEING_HEAD_CLEANING_HEAD_MOTOR_MALFUNCTION")] DyeingHeadCleaningHeadMotorMalfunction = 5039, /// <summary> ///The temperature in the dyeing head cleaning head motor is too high. Cannot execute job (Group = DyeingHead, Category = Warning) /// </summary> @@ -1212,165 +1242,165 @@ namespace Tango.PMR.Diagnostics { /// </summary> [pbr::OriginalName("MIXER_CURRENT_LOOP_BREAK")] MixerCurrentLoopBreak = 6005, /// <summary> - ///Overpressure in black dispenser . Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in @ dispenser . Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_1_OVERPRESSURE")] Dispenser1Overpressure = 7000, /// <summary> - ///Overpressure in cyan dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_2_OVERPRESSURE")] Dispenser2Overpressure = 7001, /// <summary> - ///Overpressure in magenta dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_3_OVERPRESSURE")] Dispenser3Overpressure = 7002, /// <summary> - ///Overpressure in yellow dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_4_OVERPRESSURE")] Dispenser4Overpressure = 7003, /// <summary> - ///Overpressure in transparent ink dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_5_OVERPRESSURE")] Dispenser5Overpressure = 7004, /// <summary> - ///Overpressure in spot color 1 dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_6_OVERPRESSURE")] Dispenser6Overpressure = 7005, /// <summary> - ///Overpressure in cleaner dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_7_OVERPRESSURE")] Dispenser7Overpressure = 7006, /// <summary> - ///Overpressure in lubricant dispenser. Cannot execute job (Group = Dispensers, Category = Critical) + ///Overpressure in @ dispenser. Cannot execute job (Group = Dispensers, Category = Critical) /// </summary> [pbr::OriginalName("DISPENSER_8_OVERPRESSURE")] Dispenser8Overpressure = 7007, /// <summary> - ///The pressure in black dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_1_UNDERPRESSURE")] Dispenser1Underpressure = 7008, /// <summary> - ///The pressure in cyan dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_2_UNDERPRESSURE")] Dispenser2Underpressure = 7009, /// <summary> - ///The pressure in magenta dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_3_UNDERPRESSURE")] Dispenser3Underpressure = 7010, /// <summary> - ///The pressure in yellow dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_4_UNDERPRESSURE")] Dispenser4Underpressure = 7011, /// <summary> - ///The pressure in transparent ink dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_5_UNDERPRESSURE")] Dispenser5Underpressure = 7012, /// <summary> - ///The pressure in spot color 1 dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_6_UNDERPRESSURE")] Dispenser6Underpressure = 7013, /// <summary> - ///The pressure in cleaner dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_7_UNDERPRESSURE")] Dispenser7Underpressure = 7014, /// <summary> - ///The pressure in lubricant dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) + ///The pressure in @ dispenser is too low. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_8_UNDERPRESSURE")] Dispenser8Underpressure = 7015, /// <summary> - ///Black dispenser is empty (Group = Dispensers, Category = Error) + ///The @ dispenser is empty (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_1_EMPTY")] Dispenser1Empty = 7016, /// <summary> - ///Cyan dispenser is empty (Group = Dispensers, Category = Error) + ///The @ dispenser is empty (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_2_EMPTY")] Dispenser2Empty = 7017, /// <summary> - ///Magenta dispenser is empty (Group = Dispensers, Category = Error) + ///The @ dispenser is empty (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_3_EMPTY")] Dispenser3Empty = 7018, /// <summary> - ///Yellow dispenser is empty (Group = Dispensers, Category = Error) + ///The @ dispenser is empty (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_4_EMPTY")] Dispenser4Empty = 7019, /// <summary> - ///Transparent ink dispenser is empty (Group = Dispensers, Category = Error) + ///The @ dispenser is empty (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_5_EMPTY")] Dispenser5Empty = 7020, /// <summary> - ///Spot color 1 dispenser is empty (Group = Dispensers, Category = Error) + ///The @ dispenser is empty (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_6_EMPTY")] Dispenser6Empty = 7021, /// <summary> - ///Cleaner dispenser is empty (Group = Dispensers, Category = Error) + ///The @ dispenser is empty (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_7_EMPTY")] Dispenser7Empty = 7022, /// <summary> - ///Lubricant dispenser is empty (Group = Dispensers, Category = Error) + ///The @ dispenser is empty (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_8_EMPTY")] Dispenser8Empty = 7023, /// <summary> - ///Dispenser problem. Cannot execute job (Group = Dispensers, Category = Error) + ///Problem in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_1_REFILL_FAILURE")] Dispenser1RefillFailure = 7024, /// <summary> - ///Dispenser problem. Cannot execute job (Group = Dispensers, Category = Error) + ///Problem in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_2_REFILL_FAILURE")] Dispenser2RefillFailure = 7025, /// <summary> - ///Dispenser problem. Cannot execute job (Group = Dispensers, Category = Error) + ///Problem in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_3_REFILL_FAILURE")] Dispenser3RefillFailure = 7026, /// <summary> - ///Dispenser problem. Cannot execute job (Group = Dispensers, Category = Error) + ///Problem in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_4_REFILL_FAILURE")] Dispenser4RefillFailure = 7027, /// <summary> - ///Dispenser problem. Cannot execute job (Group = Dispensers, Category = Error) + ///Problem in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_5_REFILL_FAILURE")] Dispenser5RefillFailure = 7028, /// <summary> - ///Dispenser problem. Cannot execute job (Group = Dispensers, Category = Error) + ///Problem in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_6_REFILL_FAILURE")] Dispenser6RefillFailure = 7029, /// <summary> - ///Dispenser problem. Cannot execute job (Group = Dispensers, Category = Error) + ///Problem in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_7_REFILL_FAILURE")] Dispenser7RefillFailure = 7030, /// <summary> - ///Dispenser problem. Cannot execute job (Group = Dispensers, Category = Error) + ///Problem in the @ dispenser. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_8_REFILL_FAILURE")] Dispenser8RefillFailure = 7031, /// <summary> - ///Black dispenser motor current is too high. Cannot execute job (Group = Dispensers, Category = Warning) + ///Malfunction in @ dispenser motor. Cannot execute job (Group = Dispensers, Category = Warning) /// </summary> - [pbr::OriginalName("DISPENSER_1_MOTOR_OVERCURRENT")] Dispenser1MotorOvercurrent = 7032, + [pbr::OriginalName("DISPENSER_1_MOTOR_MALFUNCTION")] Dispenser1MotorMalfunction = 7032, /// <summary> - ///Cyan dispenser motor current is too high. Cannot execute job (Group = Dispensers, Category = Warning) + ///Malfunction in @ dispenser motor. Cannot execute job (Group = Dispensers, Category = Warning) /// </summary> - [pbr::OriginalName("DISPENSER_2_MOTOR_OVERCURRENT")] Dispenser2MotorOvercurrent = 7033, + [pbr::OriginalName("DISPENSER_2_MOTOR_MALFUNCTION")] Dispenser2MotorMalfunction = 7033, /// <summary> - ///Magenta dispenser motor current is too high. Cannot execute job (Group = Dispensers, Category = Warning) + ///Malfunction in @ dispenser motor. Cannot execute job (Group = Dispensers, Category = Warning) /// </summary> - [pbr::OriginalName("DISPENSER_3_MOTOR_OVERCURRENT")] Dispenser3MotorOvercurrent = 7034, + [pbr::OriginalName("DISPENSER_3_MOTOR_MALFUNCTION")] Dispenser3MotorMalfunction = 7034, /// <summary> - ///Yellow dispenser motor current is too high. Cannot execute job (Group = Dispensers, Category = Warning) + ///Malfunction in @ dispenser motor. Cannot execute job (Group = Dispensers, Category = Warning) /// </summary> - [pbr::OriginalName("DISPENSER_4_MOTOR_OVERCURRENT")] Dispenser4MotorOvercurrent = 7035, + [pbr::OriginalName("DISPENSER_4_MOTOR_MALFUNCTION")] Dispenser4MotorMalfunction = 7035, /// <summary> - ///Transparent ink dispenser motor current is too high. Cannot execute job (Group = Dispensers, Category = Warning) + ///Malfunction in @ dispenser motor. Cannot execute job (Group = Dispensers, Category = Warning) /// </summary> - [pbr::OriginalName("DISPENSER_5_MOTOR_OVERCURRENT")] Dispenser5MotorOvercurrent = 7036, + [pbr::OriginalName("DISPENSER_5_MOTOR_MALFUNCTION")] Dispenser5MotorMalfunction = 7036, /// <summary> - ///Spot color 1 dispenser motor current is too high. Cannot execute job (Group = Dispensers, Category = Warning) + ///Malfunction in @ dispenser motor. Cannot execute job (Group = Dispensers, Category = Warning) /// </summary> - [pbr::OriginalName("DISPENSER_6_MOTOR_OVERCURRENT")] Dispenser6MotorOvercurrent = 7037, + [pbr::OriginalName("DISPENSER_6_MOTOR_MALFUNCTION")] Dispenser6MotorMalfunction = 7037, /// <summary> - ///Cleaner dispenser motor current is too high. Cannot execute job (Group = Dispensers, Category = Warning) + ///Malfunction in @ dispenser motor. Cannot execute job (Group = Dispensers, Category = Warning) /// </summary> - [pbr::OriginalName("DISPENSER_7_MOTOR_OVERCURRENT")] Dispenser7MotorOvercurrent = 7038, + [pbr::OriginalName("DISPENSER_7_MOTOR_MALFUNCTION")] Dispenser7MotorMalfunction = 7038, /// <summary> - ///Lubricant dispenser motor current is too high. Cannot execute job (Group = Dispensers, Category = Warning) + ///Malfunction in @ dispenser motor. Cannot execute job (Group = Dispensers, Category = Warning) /// </summary> - [pbr::OriginalName("DISPENSER_8_MOTOR_OVERCURRENT")] Dispenser8MotorOvercurrent = 7039, + [pbr::OriginalName("DISPENSER_8_MOTOR_MALFUNCTION")] Dispenser8MotorMalfunction = 7039, /// <summary> ///Black dispenser motor temperature is too high. Cannot execute job (Group = Dispensers, Category = Warning) /// </summary> @@ -1468,230 +1498,294 @@ namespace Tango.PMR.Diagnostics { /// </summary> [pbr::OriginalName("DISPENSER_8_MOTOR_UNDERVOLTAGE")] Dispenser8MotorUndervoltage = 7063, /// <summary> - ///Black dispenser is at the upper limit. Cannot execute job (Group = Dispensers, Category = Error) + ///The @ dispenser is at upper limit. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_1_UPPER_HARD_LIMIT")] Dispenser1UpperHardLimit = 7064, /// <summary> - ///Cyan dispenser is at the upper limit. Cannot execute job (Group = Dispensers, Category = Error) + ///The @ dispenser is at upper limit. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_2_UPPER_HARD_LIMIT")] Dispenser2UpperHardLimit = 7065, /// <summary> - ///Magenta dispenser is at the upper limit. Cannot execute job (Group = Dispensers, Category = Error) + ///The @ dispenser is at upper limit. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_3_UPPER_HARD_LIMIT")] Dispenser3UpperHardLimit = 7066, /// <summary> - ///Yellow dispenser is at the upper limit. Cannot execute job (Group = Dispensers, Category = Error) + ///The @ dispenser is at upper limit. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_4_UPPER_HARD_LIMIT")] Dispenser4UpperHardLimit = 7067, /// <summary> - ///Transparent ink dispenser is at the upper limit. Cannot execute job (Group = Dispensers, Category = Error) + ///The @ dispenser is at upper limit. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_5_UPPER_HARD_LIMIT")] Dispenser5UpperHardLimit = 7068, /// <summary> - ///Spot color 1 dispenser is at the upper limit. Cannot execute job (Group = Dispensers, Category = Error) + ///The @ dispenser is at upper limit. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_6_UPPER_HARD_LIMIT")] Dispenser6UpperHardLimit = 7069, /// <summary> - ///Cleaner dispenser is at the upper limit. Cannot execute job (Group = Dispensers, Category = Error) + ///The @ dispenser is at upper limit. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_7_UPPER_HARD_LIMIT")] Dispenser7UpperHardLimit = 7070, /// <summary> - ///Lubricant dispenser is at the upper limit. Cannot execute job (Group = Dispensers, Category = Error) + ///The @ dispenser is at upper limit. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_8_UPPER_HARD_LIMIT")] Dispenser8UpperHardLimit = 7071, /// <summary> - ///Black dispenser is at the lower limit. Cannot execute job (Group = Dispensers, Category = Error) + ///The @ dispenser is at lower limit. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_1_LOWER_HARD_LIMIT")] Dispenser1LowerHardLimit = 7072, /// <summary> - ///Cyan dispenser is at the lower limit. Cannot execute job (Group = Dispensers, Category = Error) + ///The @ dispenser is at lower limit. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_2_LOWER_HARD_LIMIT")] Dispenser2LowerHardLimit = 7073, /// <summary> - ///Magenta dispenser is at the lower limit. Cannot execute job (Group = Dispensers, Category = Error) + ///The @ dispenser is at lower limit. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_3_LOWER_HARD_LIMIT")] Dispenser3LowerHardLimit = 7074, /// <summary> - ///Yellow dispenser is at the lower limit. Cannot execute job (Group = Dispensers, Category = Error) + ///The @ dispenser is at lower limit. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_4_LOWER_HARD_LIMIT")] Dispenser4LowerHardLimit = 7075, /// <summary> - ///Transparent ink dispenser is at the lower limit. Cannot execute job (Group = Dispensers, Category = Error) + ///The @ dispenser is at lower limit. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_5_LOWER_HARD_LIMIT")] Dispenser5LowerHardLimit = 7076, /// <summary> - ///Spot color 1 dispenser is at the lower limit. Cannot execute job (Group = Dispensers, Category = Error) + ///The @ dispenser is at lower limit. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_6_LOWER_HARD_LIMIT")] Dispenser6LowerHardLimit = 7077, /// <summary> - ///Cleaner dispenser is at the lower limit. Cannot execute job (Group = Dispensers, Category = Error) + ///The @ dispenser is at lower limit. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_7_LOWER_HARD_LIMIT")] Dispenser7LowerHardLimit = 7078, /// <summary> - ///Lubricant dispenser is at the lower limit. Cannot execute job (Group = Dispensers, Category = Error) + ///The @ dispenser is at lower limit. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_8_LOWER_HARD_LIMIT")] Dispenser8LowerHardLimit = 7079, /// <summary> - ///Pressure in black dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_1_HIGH_PRESSURE")] Dispenser1HighPressure = 7080, /// <summary> - ///Pressure in cyan dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_2_HIGH_PRESSURE")] Dispenser2HighPressure = 7081, /// <summary> - ///Pressure in magenta dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_3_HIGH_PRESSURE")] Dispenser3HighPressure = 7082, /// <summary> - ///Pressure in yellow dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_4_HIGH_PRESSURE")] Dispenser4HighPressure = 7083, /// <summary> - ///Pressure in transparent ink dispenser is too high. Cannot execue job (Group = Dispensers, Category = Error) + ///Pressure in @ dispenser is too high. Cannot execue job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_5_HIGH_PRESSURE")] Dispenser5HighPressure = 7084, /// <summary> - ///Pressure in spot color 1 dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///Pressure in@ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_6_HIGH_PRESSURE")] Dispenser6HighPressure = 7085, /// <summary> - ///Pressure in cleaner dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_7_HIGH_PRESSURE")] Dispenser7HighPressure = 7086, /// <summary> - ///Pressure in lubricant dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) + ///Pressure in @ dispenser is too high. Cannot execute job (Group = Dispensers, Category = Error) /// </summary> [pbr::OriginalName("DISPENSER_8_HIGH_PRESSURE")] Dispenser8HighPressure = 7087, /// <summary> - ///Black ink level is low (Group = InkDeliverySystem, Category = Warning) + ///Overpressure in @. Cannot execute job (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_9_OVERPRESSURE")] Dispenser9Overpressure = 7088, + /// <summary> + ///Pressure in @ is too low. Cannot execute job (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_9_UNDERPRESSURE")] Dispenser9Underpressure = 7089, + /// <summary> + ///Overpressure in @. Cannot execute job (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_10_OVERPRESSURE")] Dispenser10Overpressure = 7090, + /// <summary> + ///Pressure in @ is too low. Cannot execute job (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_10_UNDERPRESSURE")] Dispenser10Underpressure = 7091, + /// <summary> + ///Malfunction in @ motor 1. Cannot execute job (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_9_MOTOR_1_MALFUNCTION")] Dispenser9Motor1Malfunction = 7092, + /// <summary> + ///Malfunction in @ motor 2. Cannot execute job (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_9_MOTOR_2_MALFUNCTION")] Dispenser9Motor2Malfunction = 7093, + /// <summary> + ///Malfunction in @ motor 1. Cannot execute job (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_10_MOTOR_1_MALFUNCTION")] Dispenser10Motor1Malfunction = 7094, + /// <summary> + ///Malfunction in @ motor 2. Cannot execute job (Group = Dispensers, Category = Error) + /// </summary> + [pbr::OriginalName("DISPENSER_10_MOTOR_2_MALFUNCTION")] Dispenser10Motor2Malfunction = 7095, + /// <summary> + ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_1_LOW_LEVEL")] MidTank1LowLevel = 8000, /// <summary> - ///Cyan ink level is low (Group = InkDeliverySystem, Category = Warning) + ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_2_LOW_LEVEL")] MidTank2LowLevel = 8001, /// <summary> - ///Magenta ink level is low (Group = InkDeliverySystem, Category = Warning) + ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_3_LOW_LEVEL")] MidTank3LowLevel = 8002, /// <summary> - ///Yellow ink level is low (Group = InkDeliverySystem, Category = Warning) + ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_4_LOW_LEVEL")] MidTank4LowLevel = 8003, /// <summary> - ///Transparent ink level is low (Group = InkDeliverySystem, Category = Warning) + ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_5_LOW_LEVEL")] MidTank5LowLevel = 8004, /// <summary> - ///Spot color I level is low (Group = InkDeliverySystem, Category = Warning) + ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_6_LOW_LEVEL")] MidTank6LowLevel = 8005, /// <summary> - ///Cleaner level is low (Group = InkDeliverySystem, Category = Warning) + ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_7_LOW_LEVEL")] MidTank7LowLevel = 8006, /// <summary> - ///Lubricant level is low (Group = InkDeliverySystem, Category = Warning) + ///Level of @ ink is low (Group = InkDeliverySystem, Category = Warning) /// </summary> [pbr::OriginalName("MID_TANK_8_LOW_LEVEL")] MidTank8LowLevel = 8007, /// <summary> - ///Black ink is empty. Cannnot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_1_EMPTY")] MidTank1Empty = 8008, /// <summary> - ///Cyan ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_2_EMPTY")] MidTank2Empty = 8009, /// <summary> - ///Magenta ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_3_EMPTY")] MidTank3Empty = 8010, /// <summary> - ///Yellow ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_4_EMPTY")] MidTank4Empty = 8011, /// <summary> - ///Transparent ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_5_EMPTY")] MidTank5Empty = 8012, /// <summary> - ///Spot color I is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_6_EMPTY")] MidTank6Empty = 8013, /// <summary> - ///Cleaner is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_7_EMPTY")] MidTank7Empty = 8014, /// <summary> - ///Lubricant is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///The @ ink is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_8_EMPTY")] MidTank8Empty = 8015, /// <summary> - ///Black ink overflow. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_1_OVERFLOW")] MidTank1Overflow = 8016, /// <summary> - ///Cyan ink overflow. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_2_OVERFLOW")] MidTank2Overflow = 8017, /// <summary> - ///Magenta ink overflow. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_3_OVERFLOW")] MidTank3Overflow = 8018, /// <summary> - ///Yellow ink overflow. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_4_OVERFLOW")] MidTank4Overflow = 8019, /// <summary> - ///Transparent ink overflow. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_5_OVERFLOW")] MidTank5Overflow = 8020, /// <summary> - ///Spot color 1 overflow. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_6_OVERFLOW")] MidTank6Overflow = 8021, /// <summary> - ///Cleaner overflow. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_7_OVERFLOW")] MidTank7Overflow = 8022, /// <summary> - ///Lubricant overflow. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Overflow in @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_8_OVERFLOW")] MidTank8Overflow = 8023, /// <summary> - ///Failed to fill black ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_1_FILL_TIMEOUT")] MidTank1FillTimeout = 8024, /// <summary> - ///Failed to fill cyan ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_2_FILL_TIMEOUT")] MidTank2FillTimeout = 8025, /// <summary> - ///Failed to fill magenta ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_3_FILL_TIMEOUT")] MidTank3FillTimeout = 8026, /// <summary> - ///Failed to fill yellow ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_4_FILL_TIMEOUT")] MidTank4FillTimeout = 8027, /// <summary> - ///Failed to fill transparent ink. Canot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ ink. Canot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_5_FILL_TIMEOUT")] MidTank5FillTimeout = 8028, /// <summary> - ///Failed to fill spot color 1 ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_6_FILL_TIMEOUT")] MidTank6FillTimeout = 8029, /// <summary> - ///Failed to fill cleaner. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_7_FILL_TIMEOUT")] MidTank7FillTimeout = 8030, /// <summary> - ///Failed to fill lubricant. Cannot execute job (Group = InkDeliverySystem, Category = Error) + ///Failed to fill @ ink. Cannot execute job (Group = InkDeliverySystem, Category = Error) /// </summary> [pbr::OriginalName("MID_TANK_8_FILL_TIMEOUT")] MidTank8FillTimeout = 8031, /// <summary> + ///Level of @ is low (Group = InkDeliverySystem, Category = Warning) + /// </summary> + [pbr::OriginalName("MID_TANK_9_LOW_LEVEL")] MidTank9LowLevel = 8032, + /// <summary> + ///The @ is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + /// </summary> + [pbr::OriginalName("MID_TANK_9_EMPTY")] MidTank9Empty = 8033, + /// <summary> + ///Overflow in @. Cannot execute job (Group = InkDeliverySystem, Category = Error) + /// </summary> + [pbr::OriginalName("MID_TANK_9_OVERFLOW")] MidTank9Overflow = 8034, + /// <summary> + ///Failed to fill @. Cannot execute job (Group = InkDeliverySystem, Category = Error) + /// </summary> + [pbr::OriginalName("MID_TANK_9_FILL_TIMEOUT")] MidTank9FillTimeout = 8035, + /// <summary> + ///Level of @ is low (Group = InkDeliverySystem, Category = Warning) + /// </summary> + [pbr::OriginalName("MID_TANK_10_LOW_LEVEL")] MidTank10LowLevel = 8036, + /// <summary> + ///The @ is empty. Cannot execute job (Group = InkDeliverySystem, Category = Error) + /// </summary> + [pbr::OriginalName("MID_TANK_10_EMPTY")] MidTank10Empty = 8037, + /// <summary> + ///Overflow in @. Cannot execute job (Group = InkDeliverySystem, Category = Error) + /// </summary> + [pbr::OriginalName("MID_TANK_10_OVERFLOW")] MidTank10Overflow = 8038, + /// <summary> + ///Failed to fill @. Cannot execute job (Group = InkDeliverySystem, Category = Error) + /// </summary> + [pbr::OriginalName("MID_TANK_10_FILL_TIMEOUT")] MidTank10FillTimeout = 8039, + /// <summary> ///Cannot detect air filter. Cannot execute job (Group = WasteHandlingSystem, Category = Critical) /// </summary> [pbr::OriginalName("AIR_FILTER_NOT_INSTALLED")] AirFilterNotInstalled = 9000, @@ -1784,11 +1878,11 @@ namespace Tango.PMR.Diagnostics { /// </summary> [pbr::OriginalName("COOLER_TEMPERATURE_TOO_LOW")] CoolerTemperatureTooLow = 9022, /// <summary> - ///Cannot detect ink cartridge. Cannot execute job (Group = InkFillingSystem, Category = Error) + ///Cannot detect ink cartridge. Cannot execute job (Group = InkFillingSystem, Category = Warning) /// </summary> [pbr::OriginalName("INK_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT")] InkCartridgePresenceSensorTimeout = 10000, /// <summary> - ///Cannot identify ink cartridge. Cannot execute job (Group = InkFillingSystem, Category = Error) + ///Cannot identify ink cartridge. Cannot execute job (Group = InkFillingSystem, Category = Warning) /// </summary> [pbr::OriginalName("INK_CARTRIDGE_RFID_TIMEOUT")] InkCartridgeRfidTimeout = 10001, /// <summary> @@ -1800,51 +1894,51 @@ namespace Tango.PMR.Diagnostics { /// </summary> [pbr::OriginalName("ALL_WASTE_CARTRIDGES_FULL")] AllWasteCartridgesFull = 10003, /// <summary> - ///Cannot detect waste cartridge. Cannot execute job (Group = InkFillingSystem, Category = Error) + ///Cannot detect waste cartridge. Cannot execute job (Group = InkFillingSystem, Category = Warning) /// </summary> [pbr::OriginalName("WASTE_CARTRIDGE_PRESENCE_SENSOR_TIMEOUT")] WasteCartridgePresenceSensorTimeout = 10004, /// <summary> - ///Cannot identify waste cartridge. Cannot execute job (Group = InkFillingSystem, Category = Error) + ///Cannot identify waste cartridge. Cannot execute job (Group = InkFillingSystem, Category = Warning) /// </summary> [pbr::OriginalName("WASTE_CARTRIDGE_RFID_TIMEOUT")] WasteCartridgeRfidTimeout = 10005, /// <summary> - ///Ink cartridge failure. Cannot perform ink filling (Group = InkFillingSystem, Category = Error) + ///Ink cartridge failure. Cannot perform ink filling (Group = InkFillingSystem, Category = Warning) /// </summary> [pbr::OriginalName("INK_CARTRIDGE_RFID_TAG_CANNOT_BE_READ")] InkCartridgeRfidTagCannotBeRead = 10006, /// <summary> - ///Waste cartridge failure. Cannot replace waste cartridge (Group = InkFillingSystem, Category = Error) + ///Waste cartridge failure. Cannot replace waste cartridge (Group = InkFillingSystem, Category = Warning) /// </summary> [pbr::OriginalName("WASTE_CARTRIDGE_RFID_TAG_CANNOT_BE_READ")] WasteCartridgeRfidTagCannotBeRead = 10007, /// <summary> - ///Ink cartridge failure. Cannot perform ink filling (Group = InkFillingSystem, Category = Error) + ///Ink cartridge failure. Cannot perform ink filling (Group = InkFillingSystem, Category = Warning) /// </summary> [pbr::OriginalName("INK_CARTRIDGE_RFID_TAG_IS_NOT_VALID")] InkCartridgeRfidTagIsNotValid = 10008, /// <summary> - ///Waste cartridge failure. Cannot replace waste cartridge (Group = InkFillingSystem, Category = Error) + ///Waste cartridge failure. Cannot replace waste cartridge (Group = InkFillingSystem, Category = Warning) /// </summary> [pbr::OriginalName("WASTE_CARTRIDGE_RFID_TAG_IS_NOT_VALID")] WasteCartridgeRfidTagIsNotValid = 10009, /// <summary> - ///Ink cartridge failure. Cannot perform ink filling (Group = InkFillingSystem, Category = Error) + ///Ink cartridge failure. Cannot perform ink filling (Group = InkFillingSystem, Category = Warning) /// </summary> [pbr::OriginalName("INK_CARTRIDGE_AUTHENTICATION_FAILED")] InkCartridgeAuthenticationFailed = 10010, /// <summary> - ///Waste cartridge failure. Cannot replace waste cartridge (Group = InkFillingSystem, Category = Error) + ///Waste cartridge failure. Cannot replace waste cartridge (Group = InkFillingSystem, Category = Warning) /// </summary> [pbr::OriginalName("WASTE_CARTRIDGE_AUTHENTICATION_FAILED")] WasteCartridgeAuthenticationFailed = 10011, /// <summary> - ///Ink cartridge failure. Cannot perform ink filling (Group = InkFillingSystem, Category = Error) + ///Ink cartridge failure. Cannot perform ink filling (Group = InkFillingSystem, Category = Warning) /// </summary> [pbr::OriginalName("INK_CARTRIDGE_IS_BLOCKED")] InkCartridgeIsBlocked = 10012, /// <summary> - ///Waste cartridge failure. Cannot replace waste cartridge (Group = InkFillingSystem, Category = Error) + ///Waste cartridge failure. Cannot replace waste cartridge (Group = InkFillingSystem, Category = Warning) /// </summary> [pbr::OriginalName("WASTE_CARTRIDGE_IS_BLOCKED")] WasteCartridgeIsBlocked = 10013, /// <summary> - ///Ink cartridge failure. Cannot perform ink filling (Group = InkFillingSystem, Category = Error) + ///Ink cartridge failure. Cannot perform ink filling (Group = InkFillingSystem, Category = Warning) /// </summary> [pbr::OriginalName("INK_CARTRIDGE_RFID_TAG_CANNOT_BE_UPDATED")] InkCartridgeRfidTagCannotBeUpdated = 10014, /// <summary> - ///Waste cartridge failure. Cannot replace waste cartridge (Group = InkFillingSystem, Category = Error) + ///Waste cartridge failure. Cannot replace waste cartridge (Group = InkFillingSystem, Category = Warning) /// </summary> [pbr::OriginalName("WASTE_CARTRIDGE_RFID_TAG_CANNOT_BE_UPDATED")] WasteCartridgeRfidTagCannotBeUpdated = 10015, /// <summary> diff --git a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareDispenserType.cs b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareDispenserType.cs index 68f1b2b22..5d5bd99a4 100644 --- a/Software/Visual_Studio/Tango.PMR/Hardware/HardwareDispenserType.cs +++ b/Software/Visual_Studio/Tango.PMR/Hardware/HardwareDispenserType.cs @@ -23,9 +23,10 @@ namespace Tango.PMR.Hardware { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( "ChtIYXJkd2FyZURpc3BlbnNlclR5cGUucHJvdG8SElRhbmdvLlBNUi5IYXJk", - "d2FyZSouChVIYXJkd2FyZURpc3BlbnNlclR5cGUSFQoRU3RhbmRhcmREaXNw", - "ZW5zZXIQAEIeChxjb20udHdpbmUudGFuZ28ucG1yLmhhcmR3YXJlYgZwcm90", - "bzM=")); + "d2FyZSpcChVIYXJkd2FyZURpc3BlbnNlclR5cGUSFQoRU3RhbmRhcmREaXNw", + "ZW5zZXIQABIWChJMdWJyaWNhbnREaXNwZW5zZXIQARIUChBDbGVhbmVyRGlz", + "cGVuc2VyEAJCHgocY29tLnR3aW5lLnRhbmdvLnBtci5oYXJkd2FyZWIGcHJv", + "dG8z")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Hardware.HardwareDispenserType), }, null)); @@ -36,6 +37,8 @@ namespace Tango.PMR.Hardware { #region Enums public enum HardwareDispenserType { [pbr::OriginalName("StandardDispenser")] StandardDispenser = 0, + [pbr::OriginalName("LubricantDispenser")] LubricantDispenser = 1, + [pbr::OriginalName("CleanerDispenser")] CleanerDispenser = 2, } #endregion diff --git a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj index 5d9592a26..c2071d296 100644 --- a/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj +++ b/Software/Visual_Studio/Tango.SharedUI/Tango.SharedUI.csproj @@ -262,7 +262,7 @@ <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> <ProjectExtensions> <VisualStudio> - <UserProperties BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UseGlobalSettings="False" BuildVersion_StartDate="2000/1/1" /> + <UserProperties BuildVersion_StartDate="2000/1/1" BuildVersion_UseGlobalSettings="False" BuildVersion_BuildVersioningStyle="None.None.Increment.TimeStamp" BuildVersion_UpdateAssemblyVersion="True" BuildVersion_AssemblyInfoFilename="Properties\AssemblyInfo.cs" /> </VisualStudio> </ProjectExtensions> </Project>
\ No newline at end of file diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs index ae7bae072..1486dc0d3 100644 --- a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs +++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Program.cs @@ -16,7 +16,7 @@ namespace Tango.EventsTypesGenerator { class Program { - private static string EVENTS_FILE = "Tango alarm events handling chart_Rev28.xlsx"; + private static string EVENTS_FILE = "Tango alarm events handling chart_Rev29_draft_6.xlsx"; private class ExcelEventType { @@ -156,7 +156,7 @@ namespace Tango.EventsTypesGenerator ev.Title = evx.Title; ev.Description = evx.Description; ev.TechnicalDescription = evx.TechnicalDescription; - ev.ComponentIndex = evx.Index != null ? int.Parse(evx.Index) : 0; + ev.ComponentIndex = evx.Index.IsNotNullOrEmpty() ? int.Parse(evx.Index) : -1; ev.Category = (EventTypeCategories)Enum.Parse(typeof(EventTypeCategories), evx.Category.Replace(" ", ""), true); ev.Group = (EventTypeGroups)Enum.Parse(typeof(EventTypeGroups), evx.Group.Replace(" ", ""), true); ev.NotificationTime = (EventTypeNotificationTimes)Enum.Parse(typeof(EventTypeNotificationTimes), evx.NotificationTime.Replace(" ", ""), true); diff --git a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj index ea00f8746..a7c10ce6c 100644 --- a/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj +++ b/Software/Visual_Studio/Utilities/Tango.EventsTypesGenerator/Tango.EventsTypesGenerator.csproj @@ -60,6 +60,10 @@ <Link>Tango alarm events handling chart_Rev28.xlsx</Link> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> </None> + <None Include="..\..\Resources\Events Revisions\Tango alarm events handling chart_Rev29_draft_6.xlsx"> + <Link>Tango alarm events handling chart_Rev29_draft_6.xlsx</Link> + <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> + </None> <None Include="App.config" /> <None Include="packages.config" /> </ItemGroup> |