diff options
Diffstat (limited to 'Software/Visual_Studio')
14 files changed, 489 insertions, 30 deletions
diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs index 1279a0ba4..ae08f7f19 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/ViewModels/MaintenanceViewVM.cs @@ -92,6 +92,13 @@ namespace Tango.PPC.Maintenance.ViewModels set { _wasteStates = value; RaisePropertyChangedAuto(); } } + private bool _isInkAutoFillingDisabled; + public bool IsInkAutoFillingDisabled + { + get { return _isInkAutoFillingDisabled; } + set { _isInkAutoFillingDisabled = value; RaisePropertyChangedAuto(); OnInkAutoFillingChanged(); } + } + public RelayCommand ExportLogsCommand { get; set; } public OpenCloseDyeingHeadCommand OpenCloseDyeingHeadCommand { get; set; } @@ -180,6 +187,8 @@ namespace Tango.PPC.Maintenance.ViewModels UpdateMidTankLevels(status); OverallTemperature.Temperature = status.OverallTemperature; SpoolState = status.SpoolState; + _isInkAutoFillingDisabled = status.AutoInkFillingDisabled; + RaisePropertyChanged(nameof(IsInkAutoFillingDisabled)); InvalidateRelayCommands(); } @@ -320,5 +329,53 @@ namespace Tango.PPC.Maintenance.ViewModels { await NotificationProvider.ShowDialog<CleanerDispensingViewVM>(); } + + private async void OnInkAutoFillingChanged() + { + if (IsInkAutoFillingDisabled) + { + try + { + NotificationProvider.SetGlobalBusyMessage("Disabling auto ink filling..."); + await MachineProvider.MachineOperator.SendRequest<SetInkAutoFillingModeRequest, SetInkAutoFillingModeResponse>(new SetInkAutoFillingModeRequest() + { + Disabled = true + }); + } + catch (Exception ex) + { + LogManager.Log(ex, "Error disabling ink filling."); + _isInkAutoFillingDisabled = false; + RaisePropertyChanged(nameof(IsInkAutoFillingDisabled)); + await NotificationProvider.ShowError($"Error disabling auto ink filling.\n{ex.Message}"); + } + finally + { + NotificationProvider.ReleaseGlobalBusyMessage(); + } + } + else + { + try + { + NotificationProvider.SetGlobalBusyMessage("Enabling auto ink filling..."); + await MachineProvider.MachineOperator.SendRequest<SetInkAutoFillingModeRequest, SetInkAutoFillingModeResponse>(new SetInkAutoFillingModeRequest() + { + Disabled = false + }); + } + catch (Exception ex) + { + LogManager.Log(ex, "Error enabling ink filling."); + _isInkAutoFillingDisabled = true; + RaisePropertyChanged(nameof(IsInkAutoFillingDisabled)); + await NotificationProvider.ShowError($"Error enabling auto ink filling.\n{ex.Message}"); + } + finally + { + NotificationProvider.ReleaseGlobalBusyMessage(); + } + } + } } } diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml index 9d88f59ca..5534b1315 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.Maintenance/Views/MaintenanceView.xaml @@ -258,6 +258,8 @@ <touch:TouchButton Margin="20" CornerRadius="25" Height="50" FontSize="18" Style="{StaticResource TangoHollowButton}" Command="{Binding DispenseCleanerLiquidCommand}">DISPENSE CLEANING LIQUID</touch:TouchButton> <touch:TouchButton Margin="20" CornerRadius="25" Height="50" FontSize="18" Style="{StaticResource TangoHollowButton}" Command="{Binding ExportLogsCommand}" Visibility="{Binding ApplicationManager.IsInTechnicianMode,Converter={StaticResource BooleanToVisibilityConverter}}">EXPORT SYSTEM LOGS</touch:TouchButton> + + <touch:TouchToggleButton EnableDropShadow="False" Background="Transparent" BorderThickness="2" BorderBrush="{StaticResource TangoPrimaryAccentBrush}" Margin="20" CornerRadius="25" Height="50" FontSize="18" IsChecked="{Binding IsInkAutoFillingDisabled}" IsEnabled="{Binding MachineProvider.IsConnected}" Content="DISABLE AUTO INK FILLING" CheckedContent="ENABLE AUTO INK FILLING" Foreground="{StaticResource TangoPrimaryAccentBrush}"></touch:TouchToggleButton> </UniformGrid> </StackPanel> </StackPanel> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityView.xaml index ad1c2ece3..d2fe31387 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityView.xaml @@ -6,11 +6,16 @@ xmlns:touch="clr-namespace:Tango.Touch.Controls;assembly=Tango.Touch" xmlns:local="clr-namespace:Tango.PPC.UI.Dialogs" mc:Ignorable="d" - Background="{StaticResource TangoPrimaryBackgroundBrush}" Width="700" Height="800" d:DataContext="{d:DesignInstance Type=local:InsufficientLiquidQuantityViewVM, IsDesignTimeCreatable=False}"> + Background="{StaticResource TangoPrimaryBackgroundBrush}" Width="700" Height="900" d:DataContext="{d:DesignInstance Type=local:InsufficientLiquidQuantityViewVM, IsDesignTimeCreatable=False}"> <Grid Margin="20"> <DockPanel> <Grid DockPanel.Dock="Bottom"> <touch:TouchButton HorizontalAlignment="Right" CornerRadius="25" Command="{Binding OKCommand}" Style="{StaticResource TangoHollowButton}" Width="150" Height="50" VerticalAlignment="Bottom">CLOSE</touch:TouchButton> + + <StackPanel HorizontalAlignment="Left" Visibility="{Binding IsAutoInkFillingDisabled,Converter={StaticResource BooleanToVisibilityConverter}}"> + <TextBlock HorizontalAlignment="Center" Foreground="{StaticResource TangoErrorBrush}">Auto ink filling is disabled</TextBlock> + <touch:TouchButton CornerRadius="25" Margin="0 5 0 0" Command="{Binding EnableAutoInkFillingCommand}" Style="{StaticResource TangoHollowButton}" Width="300" Height="50" VerticalAlignment="Bottom">ENABLE AUTO INK FILLING</touch:TouchButton> + </StackPanel> </Grid> <StackPanel DockPanel.Dock="Top"> <Image Source="/Images/cartridge_validation.png" RenderOptions.BitmapScalingMode="Fant" Stretch="Uniform" Height="120"></Image> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityViewVM.cs index 8b15d2e00..6d4c90e21 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityViewVM.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Dialogs/InsufficientLiquidQuantityViewVM.cs @@ -3,6 +3,7 @@ using System.Collections.Generic; using System.Linq; using System.Text; using System.Threading.Tasks; +using Tango.Core.Commands; using Tango.Integration.Operation; using Tango.SharedUI; @@ -12,9 +13,23 @@ namespace Tango.PPC.UI.Dialogs { public InsufficientLiquidQuantityException Exception { get; set; } - public InsufficientLiquidQuantityViewVM(InsufficientLiquidQuantityException ex) + public bool IsAutoInkFillingDisabled { get; set; } + + public bool EnableAutoInkFillingOnExit { get; set; } + + public RelayCommand EnableAutoInkFillingCommand { get; set; } + + public InsufficientLiquidQuantityViewVM(InsufficientLiquidQuantityException ex,bool isAutoInkFillingDisabled) { Exception = ex; + IsAutoInkFillingDisabled = isAutoInkFillingDisabled; + EnableAutoInkFillingCommand = new RelayCommand(EnableAutoInkFilling); + } + + private void EnableAutoInkFilling() + { + EnableAutoInkFillingOnExit = true; + Accept(); } } } diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs index 9e84275d6..ed1a0253d 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Printing/DefaultPrintingManager.cs @@ -9,6 +9,7 @@ using Tango.BL.Enumerations; using Tango.Core; using Tango.Core.DI; using Tango.Integration.Operation; +using Tango.PMR.MachineStatus; using Tango.PPC.Common; using Tango.PPC.Common.Connection; using Tango.PPC.Common.Messages; @@ -82,7 +83,30 @@ namespace Tango.PPC.UI.Printing { _notificationProvider.ReleaseGlobalBusyMessage(); LogManager.Log(ex); - await _notificationProvider.ShowDialog(new InsufficientLiquidQuantityViewVM(ex)); + + var vm = await _notificationProvider.ShowDialog(new InsufficientLiquidQuantityViewVM(ex, _machineProvider.MachineOperator.MachineStatus.AutoInkFillingDisabled)); + + if (vm.EnableAutoInkFillingOnExit) + { + try + { + _notificationProvider.SetGlobalBusyMessage("Enabling auto ink filling..."); + await _machineProvider.MachineOperator.SendRequest<SetInkAutoFillingModeRequest, SetInkAutoFillingModeResponse>(new SetInkAutoFillingModeRequest() + { + Disabled = false + }); + } + catch (Exception exx) + { + LogManager.Log(exx, "Error enabling ink filling."); + await _notificationProvider.ShowError($"Error enabling auto ink filling.\n{ex.Message}"); + } + finally + { + _notificationProvider.ReleaseGlobalBusyMessage(); + } + } + throw ex; } catch (Exception ex) diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml index 5c5b86140..d7ff1d89e 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Views/LayoutView.xaml @@ -287,6 +287,23 @@ <touch:TouchButton Margin="40 0 0 0" Height="65" Padding="50 0" MinWidth="200" CornerRadius="35" BlurRadius="20" Command="{Binding NotificationProvider.CurrentAppButton.Command}" IsEnabled="{Binding NotificationProvider.CurrentAppButton.IsEnabled}" Content="{Binding NotificationProvider.CurrentAppButton.Text}" Visibility="{Binding NotificationProvider.CurrentAppButton,Converter={StaticResource IsNullToVisibilityConverter}}"></touch:TouchButton> </StackPanel> + + <Grid IsHitTestVisible="False"> + <Grid.Style> + <Style TargetType="Grid"> + <Setter Property="Visibility" Value="Hidden"></Setter> + <Style.Triggers> + <DataTrigger Binding="{Binding MachineProvider.MachineOperator.MachineStatus.AutoInkFillingDisabled}" Value="True"> + <Setter Property="Visibility" Value="Visible"></Setter> + </DataTrigger> + <DataTrigger Binding="{Binding MachineProvider.MachineOperator.IsConnected}" Value="False"> + <Setter Property="Visibility" Value="Hidden"></Setter> + </DataTrigger> + </Style.Triggers> + </Style> + </Grid.Style> + <touch:TouchIcon Icon="LightningBoltOutline" Foreground="#151515" Width="24" Height="24" HorizontalAlignment="Right" VerticalAlignment="Top" Margin="0 3 20 0"></touch:TouchIcon> + </Grid> </Grid> <Grid> diff --git a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs index ca8bacaa4..f4a71c9d0 100644 --- a/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs +++ b/Software/Visual_Studio/Tango.Emulations/Emulators/MachineEmulator.cs @@ -476,6 +476,9 @@ namespace Tango.Emulations.Emulators case MessageType.DataStoreItemModifiedRequest: HandleDataStoreItemModifiedRequest(MessageFactory.ParseTangoMessageFromContainer<DataStoreItemModifiedRequest>(container)); break; + case MessageType.SetInkAutoFillingModeRequest: + HandleSetInkAutoFillingModeRequest(MessageFactory.ParseTangoMessageFromContainer<SetInkAutoFillingModeRequest>(container)); + break; } } @@ -1768,6 +1771,13 @@ namespace Tango.Emulations.Emulators }); } + private async void HandleSetInkAutoFillingModeRequest(TangoMessage<SetInkAutoFillingModeRequest> request) + { + await Task.Delay(1000); + MachineStatus.AutoInkFillingDisabled = request.Message.Disabled; + await Transporter.SendResponse<SetInkAutoFillingModeResponse>(new SetInkAutoFillingModeResponse(), request.Container.Token); + } + #endregion #region Public Methods diff --git a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs index 03b9e40bf..d616a26ac 100644 --- a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs +++ b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs @@ -22,7 +22,7 @@ namespace Tango.PMR.Common { static MessageTypeReflection() { byte[] descriptorData = global::System.Convert.FromBase64String( string.Concat( - "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiqVPwoLTWVz", + "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbircPwoLTWVz", "c2FnZVR5cGUSCAoETm9uZRAAEhEKDUVycm9yUmVzcG9uc2UQARIUChBDYWxj", "dWxhdGVSZXF1ZXN0EAMSFQoRQ2FsY3VsYXRlUmVzcG9uc2UQBBITCg9Qcm9n", "cmVzc1JlcXVlc3QQBRIUChBQcm9ncmVzc1Jlc3BvbnNlEAYSHAoYU3R1YkNh", @@ -183,27 +183,28 @@ namespace Tango.PMR.Common { "b25zZRDHPhIkCh9TdGFydE1hY2hpbmVTdGF0dXNVcGRhdGVSZXF1ZXN0EKhG", "EiUKIFN0YXJ0TWFjaGluZVN0YXR1c1VwZGF0ZVJlc3BvbnNlEKlGEiMKHlN0", "b3BNYWNoaW5lU3RhdHVzVXBkYXRlUmVxdWVzdBCqRhIkCh9TdG9wTWFjaGlu", - "ZVN0YXR1c1VwZGF0ZVJlc3BvbnNlEKtGEhoKFVN0YXJ0UG93ZXJEb3duUmVx", - "dWVzdBCQThIbChZTdGFydFBvd2VyRG93blJlc3BvbnNlEJFOEhoKFUFib3J0", - "UG93ZXJEb3duUmVxdWVzdBCSThIbChZBYm9ydFBvd2VyRG93blJlc3BvbnNl", - "EJNOEhgKE1N0YXJ0UG93ZXJVcFJlcXVlc3QQlE4SGQoUU3RhcnRQb3dlclVw", - "UmVzcG9uc2UQlU4SGAoTQWJvcnRQb3dlclVwUmVxdWVzdBCWThIZChRBYm9y", - "dFBvd2VyVXBSZXNwb25zZRCXThITCg5TdGFuZEJ5UmVxdWVzdBCYThIUCg9T", - "dGFuZEJ5UmVzcG9uc2UQmU4SHgoZU3RhcnRUaHJlYWRMb2FkaW5nUmVxdWVz", - "dBD4VRIfChpTdGFydFRocmVhZExvYWRpbmdSZXNwb25zZRD5VRIhChxDb250", - "aW51ZVRocmVhZExvYWRpbmdSZXF1ZXN0EPpVEiIKHUNvbnRpbnVlVGhyZWFk", - "TG9hZGluZ1Jlc3BvbnNlEPtVEh0KGFN0b3BUaHJlYWRMb2FkaW5nUmVxdWVz", - "dBD8VRIeChlTdG9wVGhyZWFkTG9hZGluZ1Jlc3BvbnNlEP1VEhwKF1RyeVRo", - "cmVhZExvYWRpbmdSZXF1ZXN0EP5VEh0KGFRyeVRocmVhZExvYWRpbmdSZXNw", - "b25zZRD/VRIgChtBdHRlbXB0VGhyZWFkSm9nZ2luZ1JlcXVlc3QQgFYSIQoc", - "QXR0ZW1wdFRocmVhZEpvZ2dpbmdSZXNwb25zZRCBVhIhChxTdGFydElua0Zp", - "bGxpbmdTdGF0dXNSZXF1ZXN0EOBdEiIKHVN0YXJ0SW5rRmlsbGluZ1N0YXR1", - "c1Jlc3BvbnNlEOFdEhwKF1B1dERhdGFTdG9yZUl0ZW1SZXF1ZXN0EMhlEh0K", - "GFB1dERhdGFTdG9yZUl0ZW1SZXNwb25zZRDJZRIcChdHZXREYXRhU3RvcmVJ", - "dGVtUmVxdWVzdBDKZRIdChhHZXREYXRhU3RvcmVJdGVtUmVzcG9uc2UQy2US", - "IQocRGF0YVN0b3JlSXRlbU1vZGlmaWVkUmVxdWVzdBDMZRIiCh1EYXRhU3Rv", - "cmVJdGVtTW9kaWZpZWRSZXNwb25zZRDNZUIcChpjb20udHdpbmUudGFuZ28u", - "cG1yLmNvbW1vbmIGcHJvdG8z")); + "ZVN0YXR1c1VwZGF0ZVJlc3BvbnNlEKtGEiEKHFNldElua0F1dG9GaWxsaW5n", + "TW9kZVJlcXVlc3QQrEYSIgodU2V0SW5rQXV0b0ZpbGxpbmdNb2RlUmVzcG9u", + "c2UQrUYSGgoVU3RhcnRQb3dlckRvd25SZXF1ZXN0EJBOEhsKFlN0YXJ0UG93", + "ZXJEb3duUmVzcG9uc2UQkU4SGgoVQWJvcnRQb3dlckRvd25SZXF1ZXN0EJJO", + "EhsKFkFib3J0UG93ZXJEb3duUmVzcG9uc2UQk04SGAoTU3RhcnRQb3dlclVw", + "UmVxdWVzdBCUThIZChRTdGFydFBvd2VyVXBSZXNwb25zZRCVThIYChNBYm9y", + "dFBvd2VyVXBSZXF1ZXN0EJZOEhkKFEFib3J0UG93ZXJVcFJlc3BvbnNlEJdO", + "EhMKDlN0YW5kQnlSZXF1ZXN0EJhOEhQKD1N0YW5kQnlSZXNwb25zZRCZThIe", + "ChlTdGFydFRocmVhZExvYWRpbmdSZXF1ZXN0EPhVEh8KGlN0YXJ0VGhyZWFk", + "TG9hZGluZ1Jlc3BvbnNlEPlVEiEKHENvbnRpbnVlVGhyZWFkTG9hZGluZ1Jl", + "cXVlc3QQ+lUSIgodQ29udGludWVUaHJlYWRMb2FkaW5nUmVzcG9uc2UQ+1US", + "HQoYU3RvcFRocmVhZExvYWRpbmdSZXF1ZXN0EPxVEh4KGVN0b3BUaHJlYWRM", + "b2FkaW5nUmVzcG9uc2UQ/VUSHAoXVHJ5VGhyZWFkTG9hZGluZ1JlcXVlc3QQ", + "/lUSHQoYVHJ5VGhyZWFkTG9hZGluZ1Jlc3BvbnNlEP9VEiAKG0F0dGVtcHRU", + "aHJlYWRKb2dnaW5nUmVxdWVzdBCAVhIhChxBdHRlbXB0VGhyZWFkSm9nZ2lu", + "Z1Jlc3BvbnNlEIFWEiEKHFN0YXJ0SW5rRmlsbGluZ1N0YXR1c1JlcXVlc3QQ", + "4F0SIgodU3RhcnRJbmtGaWxsaW5nU3RhdHVzUmVzcG9uc2UQ4V0SHAoXUHV0", + "RGF0YVN0b3JlSXRlbVJlcXVlc3QQyGUSHQoYUHV0RGF0YVN0b3JlSXRlbVJl", + "c3BvbnNlEMllEhwKF0dldERhdGFTdG9yZUl0ZW1SZXF1ZXN0EMplEh0KGEdl", + "dERhdGFTdG9yZUl0ZW1SZXNwb25zZRDLZRIhChxEYXRhU3RvcmVJdGVtTW9k", + "aWZpZWRSZXF1ZXN0EMxlEiIKHURhdGFTdG9yZUl0ZW1Nb2RpZmllZFJlc3Bv", + "bnNlEM1lQhwKGmNvbS50d2luZS50YW5nby5wbXIuY29tbW9uYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Common.MessageType), }, null)); @@ -499,6 +500,8 @@ namespace Tango.PMR.Common { [pbr::OriginalName("StartMachineStatusUpdateResponse")] StartMachineStatusUpdateResponse = 9001, [pbr::OriginalName("StopMachineStatusUpdateRequest")] StopMachineStatusUpdateRequest = 9002, [pbr::OriginalName("StopMachineStatusUpdateResponse")] StopMachineStatusUpdateResponse = 9003, + [pbr::OriginalName("SetInkAutoFillingModeRequest")] SetInkAutoFillingModeRequest = 9004, + [pbr::OriginalName("SetInkAutoFillingModeResponse")] SetInkAutoFillingModeResponse = 9005, /// <summary> ///Power /// </summary> diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs index dc2713128..ccc02e572 100644 --- a/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs +++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/MachineStatus.cs @@ -24,17 +24,17 @@ namespace Tango.PMR.MachineStatus { string.Concat( "ChNNYWNoaW5lU3RhdHVzLnByb3RvEhdUYW5nby5QTVIuTWFjaGluZVN0YXR1", "cxoSTWFjaGluZVN0YXRlLnByb3RvGhJJRFNQYWNrTGV2ZWwucHJvdG8aEFNw", - "b29sU3RhdGUucHJvdG8i2QEKDU1hY2hpbmVTdGF0dXMSNAoFU3RhdGUYASAB", + "b29sU3RhdGUucHJvdG8i+QEKDU1hY2hpbmVTdGF0dXMSNAoFU3RhdGUYASAB", "KA4yJS5UYW5nby5QTVIuTWFjaGluZVN0YXR1cy5NYWNoaW5lU3RhdGUSPQoO", "SURTUGFja3NMZXZlbHMYAiADKAsyJS5UYW5nby5QTVIuTWFjaGluZVN0YXR1", "cy5JRFNQYWNrTGV2ZWwSGgoST3ZlcmFsbFRlbXBlcmF0dXJlGAMgASgBEjcK", "ClNwb29sU3RhdGUYBCABKA4yIy5UYW5nby5QTVIuTWFjaGluZVN0YXR1cy5T", - "cG9vbFN0YXRlQiMKIWNvbS50d2luZS50YW5nby5wbXIubWFjaGluZXN0YXR1", - "c2IGcHJvdG8z")); + "cG9vbFN0YXRlEh4KFkF1dG9JbmtGaWxsaW5nRGlzYWJsZWQYBSABKAhCIwoh", + "Y29tLnR3aW5lLnRhbmdvLnBtci5tYWNoaW5lc3RhdHVzYgZwcm90bzM=")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { global::Tango.PMR.MachineStatus.MachineStateReflection.Descriptor, global::Tango.PMR.MachineStatus.IDSPackLevelReflection.Descriptor, global::Tango.PMR.MachineStatus.SpoolStateReflection.Descriptor, }, new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { - new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.MachineStatus), global::Tango.PMR.MachineStatus.MachineStatus.Parser, new[]{ "State", "IDSPacksLevels", "OverallTemperature", "SpoolState" }, null, null, null) + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.MachineStatus), global::Tango.PMR.MachineStatus.MachineStatus.Parser, new[]{ "State", "IDSPacksLevels", "OverallTemperature", "SpoolState", "AutoInkFillingDisabled" }, null, null, null) })); } #endregion @@ -69,6 +69,7 @@ namespace Tango.PMR.MachineStatus { iDSPacksLevels_ = other.iDSPacksLevels_.Clone(); overallTemperature_ = other.overallTemperature_; spoolState_ = other.spoolState_; + autoInkFillingDisabled_ = other.autoInkFillingDisabled_; } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -119,6 +120,17 @@ namespace Tango.PMR.MachineStatus { } } + /// <summary>Field number for the "AutoInkFillingDisabled" field.</summary> + public const int AutoInkFillingDisabledFieldNumber = 5; + private bool autoInkFillingDisabled_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool AutoInkFillingDisabled { + get { return autoInkFillingDisabled_; } + set { + autoInkFillingDisabled_ = value; + } + } + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] public override bool Equals(object other) { return Equals(other as MachineStatus); @@ -136,6 +148,7 @@ namespace Tango.PMR.MachineStatus { if(!iDSPacksLevels_.Equals(other.iDSPacksLevels_)) return false; if (OverallTemperature != other.OverallTemperature) return false; if (SpoolState != other.SpoolState) return false; + if (AutoInkFillingDisabled != other.AutoInkFillingDisabled) return false; return true; } @@ -146,6 +159,7 @@ namespace Tango.PMR.MachineStatus { hash ^= iDSPacksLevels_.GetHashCode(); if (OverallTemperature != 0D) hash ^= OverallTemperature.GetHashCode(); if (SpoolState != 0) hash ^= SpoolState.GetHashCode(); + if (AutoInkFillingDisabled != false) hash ^= AutoInkFillingDisabled.GetHashCode(); return hash; } @@ -169,6 +183,10 @@ namespace Tango.PMR.MachineStatus { output.WriteRawTag(32); output.WriteEnum((int) SpoolState); } + if (AutoInkFillingDisabled != false) { + output.WriteRawTag(40); + output.WriteBool(AutoInkFillingDisabled); + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -184,6 +202,9 @@ namespace Tango.PMR.MachineStatus { if (SpoolState != 0) { size += 1 + pb::CodedOutputStream.ComputeEnumSize((int) SpoolState); } + if (AutoInkFillingDisabled != false) { + size += 1 + 1; + } return size; } @@ -202,6 +223,9 @@ namespace Tango.PMR.MachineStatus { if (other.SpoolState != 0) { SpoolState = other.SpoolState; } + if (other.AutoInkFillingDisabled != false) { + AutoInkFillingDisabled = other.AutoInkFillingDisabled; + } } [global::System.Diagnostics.DebuggerNonUserCodeAttribute] @@ -228,6 +252,10 @@ namespace Tango.PMR.MachineStatus { spoolState_ = (global::Tango.PMR.MachineStatus.SpoolState) input.ReadEnum(); break; } + case 40: { + AutoInkFillingDisabled = input.ReadBool(); + break; + } } } } diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/SetInkAutoFillingModeRequest.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/SetInkAutoFillingModeRequest.cs new file mode 100644 index 000000000..d41234d99 --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/SetInkAutoFillingModeRequest.cs @@ -0,0 +1,160 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: SetInkAutoFillingModeRequest.proto +#pragma warning disable 1591, 0612, 3021 +#region Designer generated code + +using pb = global::Google.Protobuf; +using pbc = global::Google.Protobuf.Collections; +using pbr = global::Google.Protobuf.Reflection; +using scg = global::System.Collections.Generic; +namespace Tango.PMR.MachineStatus { + + /// <summary>Holder for reflection information generated from SetInkAutoFillingModeRequest.proto</summary> + public static partial class SetInkAutoFillingModeRequestReflection { + + #region Descriptor + /// <summary>File descriptor for SetInkAutoFillingModeRequest.proto</summary> + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static SetInkAutoFillingModeRequestReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "CiJTZXRJbmtBdXRvRmlsbGluZ01vZGVSZXF1ZXN0LnByb3RvEhdUYW5nby5Q", + "TVIuTWFjaGluZVN0YXR1cyIwChxTZXRJbmtBdXRvRmlsbGluZ01vZGVSZXF1", + "ZXN0EhAKCERpc2FibGVkGAEgASgIQiMKIWNvbS50d2luZS50YW5nby5wbXIu", + "bWFjaGluZXN0YXR1c2IGcHJvdG8z")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.SetInkAutoFillingModeRequest), global::Tango.PMR.MachineStatus.SetInkAutoFillingModeRequest.Parser, new[]{ "Disabled" }, null, null, null) + })); + } + #endregion + + } + #region Messages + public sealed partial class SetInkAutoFillingModeRequest : pb::IMessage<SetInkAutoFillingModeRequest> { + private static readonly pb::MessageParser<SetInkAutoFillingModeRequest> _parser = new pb::MessageParser<SetInkAutoFillingModeRequest>(() => new SetInkAutoFillingModeRequest()); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser<SetInkAutoFillingModeRequest> Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Tango.PMR.MachineStatus.SetInkAutoFillingModeRequestReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public SetInkAutoFillingModeRequest() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public SetInkAutoFillingModeRequest(SetInkAutoFillingModeRequest other) : this() { + disabled_ = other.disabled_; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public SetInkAutoFillingModeRequest Clone() { + return new SetInkAutoFillingModeRequest(this); + } + + /// <summary>Field number for the "Disabled" field.</summary> + public const int DisabledFieldNumber = 1; + private bool disabled_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Disabled { + get { return disabled_; } + set { + disabled_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as SetInkAutoFillingModeRequest); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(SetInkAutoFillingModeRequest other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (Disabled != other.Disabled) return false; + return true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (Disabled != false) hash ^= Disabled.GetHashCode(); + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void WriteTo(pb::CodedOutputStream output) { + if (Disabled != false) { + output.WriteRawTag(8); + output.WriteBool(Disabled); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (Disabled != false) { + size += 1 + 1; + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(SetInkAutoFillingModeRequest other) { + if (other == null) { + return; + } + if (other.Disabled != false) { + Disabled = other.Disabled; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + input.SkipLastField(); + break; + case 8: { + Disabled = input.ReadBool(); + break; + } + } + } + } + + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/SetInkAutoFillingModeResponse.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/SetInkAutoFillingModeResponse.cs new file mode 100644 index 000000000..c59108eb1 --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/SetInkAutoFillingModeResponse.cs @@ -0,0 +1,132 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: SetInkAutoFillingModeResponse.proto +#pragma warning disable 1591, 0612, 3021 +#region Designer generated code + +using pb = global::Google.Protobuf; +using pbc = global::Google.Protobuf.Collections; +using pbr = global::Google.Protobuf.Reflection; +using scg = global::System.Collections.Generic; +namespace Tango.PMR.MachineStatus { + + /// <summary>Holder for reflection information generated from SetInkAutoFillingModeResponse.proto</summary> + public static partial class SetInkAutoFillingModeResponseReflection { + + #region Descriptor + /// <summary>File descriptor for SetInkAutoFillingModeResponse.proto</summary> + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static SetInkAutoFillingModeResponseReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "CiNTZXRJbmtBdXRvRmlsbGluZ01vZGVSZXNwb25zZS5wcm90bxIXVGFuZ28u", + "UE1SLk1hY2hpbmVTdGF0dXMiHwodU2V0SW5rQXV0b0ZpbGxpbmdNb2RlUmVz", + "cG9uc2VCIwohY29tLnR3aW5lLnRhbmdvLnBtci5tYWNoaW5lc3RhdHVzYgZw", + "cm90bzM=")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.SetInkAutoFillingModeResponse), global::Tango.PMR.MachineStatus.SetInkAutoFillingModeResponse.Parser, null, null, null, null) + })); + } + #endregion + + } + #region Messages + public sealed partial class SetInkAutoFillingModeResponse : pb::IMessage<SetInkAutoFillingModeResponse> { + private static readonly pb::MessageParser<SetInkAutoFillingModeResponse> _parser = new pb::MessageParser<SetInkAutoFillingModeResponse>(() => new SetInkAutoFillingModeResponse()); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser<SetInkAutoFillingModeResponse> Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Tango.PMR.MachineStatus.SetInkAutoFillingModeResponseReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public SetInkAutoFillingModeResponse() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public SetInkAutoFillingModeResponse(SetInkAutoFillingModeResponse other) : this() { + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public SetInkAutoFillingModeResponse Clone() { + return new SetInkAutoFillingModeResponse(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as SetInkAutoFillingModeResponse); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(SetInkAutoFillingModeResponse other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + return true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + return hash; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override string ToString() { + return pb::JsonFormatter.ToDiagnosticString(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void WriteTo(pb::CodedOutputStream output) { + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(SetInkAutoFillingModeResponse other) { + if (other == null) { + return; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(pb::CodedInputStream input) { + uint tag; + while ((tag = input.ReadTag()) != 0) { + switch(tag) { + default: + input.SkipLastField(); + break; + } + } + } + + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj index 72418fe91..0dca03c8f 100644 --- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj +++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj @@ -282,6 +282,8 @@ <Compile Include="MachineStatus\IDSPackLevel.cs" /> <Compile Include="MachineStatus\MachineState.cs" /> <Compile Include="MachineStatus\MachineStatus.cs" /> + <Compile Include="MachineStatus\SetInkAutoFillingModeRequest.cs" /> + <Compile Include="MachineStatus\SetInkAutoFillingModeResponse.cs" /> <Compile Include="MachineStatus\SpoolState.cs" /> <Compile Include="MachineStatus\StartMachineStatusUpdateRequest.cs" /> <Compile Include="MachineStatus\StartMachineStatusUpdateResponse.cs" /> @@ -493,7 +495,7 @@ </PropertyGroup> <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.Touch/Controls/TouchIcon.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchIcon.cs index de5b8e90e..4d9a8bf75 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/TouchIcon.cs +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchIcon.cs @@ -3788,6 +3788,8 @@ namespace Tango.Touch.Controls {TouchIconKind.YoastBrands, "M91.3 76h186l-7 18.9h-179c-39.7 0-71.9 31.6-71.9 70.3v205.4c0 35.4 24.9 70.3 84 70.3V460H91.3C41.2 460 0 419.8 0 370.5V165.2C0 115.9 40.7 76 91.3 76zm229.1-56h66.5C243.1 398.1 241.2 418.9 202.2 459.3c-20.8 21.6-49.3 31.7-78.3 32.7v-51.1c49.2-7.7 64.6-49.9 64.6-75.3 0-20.1.6-12.6-82.1-223.2h61.4L218.2 299 320.4 20zM448 161.5V460H234c6.6-9.6 10.7-16.3 12.1-19.4h182.5V161.5c0-32.5-17.1-51.9-48.2-62.9l6.7-17.6c41.7 13.6 60.9 43.1 60.9 80.5z"}, {TouchIconKind.YoutubeBrands, "M549.655 124.083c-6.281-23.65-24.787-42.276-48.284-48.597C458.781 64 288 64 288 64S117.22 64 74.629 75.486c-23.497 6.322-42.003 24.947-48.284 48.597-11.412 42.867-11.412 132.305-11.412 132.305s0 89.438 11.412 132.305c6.281 23.65 24.787 41.5 48.284 47.821C117.22 448 288 448 288 448s170.78 0 213.371-11.486c23.497-6.321 42.003-24.171 48.284-47.821 11.412-42.867 11.412-132.305 11.412-132.305s0-89.438-11.412-132.305zm-317.51 213.508V175.185l142.739 81.205-142.739 81.201z"}, {TouchIconKind.YoutubeSquareBrands, "M186.8 202.1l95.2 54.1-95.2 54.1V202.1zM448 80v352c0 26.5-21.5 48-48 48H48c-26.5 0-48-21.5-48-48V80c0-26.5 21.5-48 48-48h352c26.5 0 48 21.5 48 48zm-42 176.3s0-59.6-7.6-88.2c-4.2-15.8-16.5-28.2-32.2-32.4C337.9 128 224 128 224 128s-113.9 0-142.2 7.7c-15.7 4.2-28 16.6-32.2 32.4-7.6 28.5-7.6 88.2-7.6 88.2s0 59.6 7.6 88.2c4.2 15.8 16.5 27.7 32.2 31.9C110.1 384 224 384 224 384s113.9 0 142.2-7.7c15.7-4.2 28-16.1 32.2-31.9 7.6-28.5 7.6-88.1 7.6-88.1z"}, + {TouchIconKind.LightningBolt, "M11 15H6L13 1V9H18L11 23V15Z"}, + {TouchIconKind.LightningBoltOutline, "M11 9.47V11H14.76L13 14.53V13H9.24L11 9.47M13 1L6 15H11V23L18 9H13V1Z"}, }; } diff --git a/Software/Visual_Studio/Tango.Touch/Controls/TouchIconKind.cs b/Software/Visual_Studio/Tango.Touch/Controls/TouchIconKind.cs index 550b6f5e5..86baca19a 100644 --- a/Software/Visual_Studio/Tango.Touch/Controls/TouchIconKind.cs +++ b/Software/Visual_Studio/Tango.Touch/Controls/TouchIconKind.cs @@ -3759,5 +3759,7 @@ namespace Tango.Touch.Controls [Description("Yoast (f2b1)")] YoastBrands, [Description("YouTube (f167, film, video, youtube-play, youtube-square)")] YoutubeBrands, [Description("YouTube Square (f431)")] YoutubeSquareBrands, + LightningBolt, + LightningBoltOutline, } } |