diff options
16 files changed, 488 insertions, 36 deletions
diff --git a/Software/PMR/Messages/Common/MessageType.proto b/Software/PMR/Messages/Common/MessageType.proto index 0c70eca00..6140e7506 100644 --- a/Software/PMR/Messages/Common/MessageType.proto +++ b/Software/PMR/Messages/Common/MessageType.proto @@ -295,6 +295,8 @@ enum MessageType SetInkAutoFillingModeResponse = 9005; SpoolTypeChangedRequest = 9006; SpoolTypeChangedResponse = 9007; + SetPowerDownTimeRequest = 9008; + SetPowerDownTimeResponse = 9009; //Power StartPowerDownRequest = 10000; diff --git a/Software/PMR/Messages/MachineStatus/SetPowerDownTimeRequest.proto b/Software/PMR/Messages/MachineStatus/SetPowerDownTimeRequest.proto new file mode 100644 index 000000000..e5c683999 --- /dev/null +++ b/Software/PMR/Messages/MachineStatus/SetPowerDownTimeRequest.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +package Tango.PMR.MachineStatus; +option java_package = "com.twine.tango.pmr.machinestatus"; + +message SetPowerDownTimeRequest +{ + int32 TimeoutMinutes = 1; +}
\ No newline at end of file diff --git a/Software/PMR/Messages/MachineStatus/SetPowerDownTimeResponse.proto b/Software/PMR/Messages/MachineStatus/SetPowerDownTimeResponse.proto new file mode 100644 index 000000000..42d0c74b2 --- /dev/null +++ b/Software/PMR/Messages/MachineStatus/SetPowerDownTimeResponse.proto @@ -0,0 +1,9 @@ +syntax = "proto3"; + +package Tango.PMR.MachineStatus; +option java_package = "com.twine.tango.pmr.machinestatus"; + +message SetPowerDownTimeResponse +{ + +}
\ No newline at end of file diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs index c3d6136af..8f886e073 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.JobsV2/ViewModels/JobsViewVM.cs @@ -1049,6 +1049,15 @@ namespace Tango.PPC.Jobs.ViewModels job.WindingMethodGuid = Adapter.WindingMethods.FirstOrDefault().Guid; job.SpoolTypeGuid = Settings.SpoolTypeGuid != null ? Settings.SpoolTypeGuid : Adapter.SpoolTypes.FirstOrDefault().Guid; + if (BuildProvider.IsEureka) + { + job.EnableInterSegment = false; + job.InterSegmentLength = 0; + job.NumberOfSpools = 4; + job.NumberOfUnits = 1; + } + + foreach (var segment in segments) { segment.Job = job; diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj index 30e2bf8c2..d6bacb50c 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Tango.PPC.MachineSettings.csproj @@ -170,7 +170,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.MachineSettings/ViewModels/MainViewVM.cs b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs index 6787136be..594d3f5c9 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs @@ -44,6 +44,16 @@ namespace Tango.PPC.MachineSettings.ViewModels #region Classes + public class PowerDownTime + { + public PowerDownMinutes Minutes { get; set; } + + public String Name + { + get { return Minutes.ToDescription(); } + } + } + public class RmlLubricationLevelSettings : RmlLubricationLevel { public String Name { get; set; } @@ -282,6 +292,15 @@ namespace Tango.PPC.MachineSettings.ViewModels set { _manualFineTuningLength = value; RaisePropertyChangedAuto(); } } + public List<PowerDownTime> PowerDownTimes { get; set; } + + private PowerDownTime _selectedPowerDownTime; + public PowerDownTime SelectedPowerDownTime + { + get { return _selectedPowerDownTime; } + set { _selectedPowerDownTime = value; RaisePropertyChangedAuto(); } + } + #endregion @@ -310,6 +329,14 @@ namespace Tango.PPC.MachineSettings.ViewModels SaveCommand = new RelayCommand(Save); DiscardCommand = new RelayCommand(Discard); SynchronizeCommand = new RelayCommand(Synchronize, () => !MachineDataSynchronizer.IsSynchronizing && IsFree); + + PowerDownTimes = new List<PowerDownTime>() + { + new PowerDownTime() { Minutes = PowerDownMinutes.Minimum }, + new PowerDownTime() { Minutes = PowerDownMinutes.Default }, + new PowerDownTime() { Minutes = PowerDownMinutes.Maximum }, + new PowerDownTime() { Minutes = PowerDownMinutes.Never }, + }; } private void Discard() @@ -342,6 +369,7 @@ namespace Tango.PPC.MachineSettings.ViewModels Settings.LubricationLevels = LubricationLevels.Where(x => x.LubricationLevel != LubricationLevel.Standard).Select(x => x.ToRmlLubricationLevel()).ToList(); Settings.DefaultTabColorSpace = DefaultTabColorSpace; Settings.FineTuningTrialLengthMeters = FineTuningLength; + Settings.PowerSavingMode = SelectedPowerDownTime.Minutes; MachineDataSynchronizer.IsEnabled = SynchronizeJobs || SynchronizeDiagnostics; @@ -359,6 +387,15 @@ namespace Tango.PPC.MachineSettings.ViewModels await MachineProvider.MachineOperator.SetSpoolType((PMR.Printing.JobSpoolType)SelectedSpoolType.Code); } + if (MachineProvider.IsConnected) + { + try + { + await MachineProvider.MachineOperator.SetPowerDownTime((int)Settings.PowerSavingMode); + } + catch { } + } + if (_previousTimeZone.ToStringSafe() != SelectedTimeZone.ToStringSafe()) { if (await NotificationProvider.ShowQuestion("Changing the time zone requires the application to restart. Do you wish to restart the application?")) @@ -524,6 +561,8 @@ namespace Tango.PPC.MachineSettings.ViewModels ExternalBridgePassword = Settings.ExternalBridgePassword; + SelectedPowerDownTime = PowerDownTimes.FirstOrDefault(x => x.Minutes == Settings.PowerSavingMode); + _enableRemoteAssistance = RemoteAssistanceProvider.IsEnabled; RaisePropertyChanged(nameof(EnableRemoteAssistance)); diff --git a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml index 7de2818f8..a1414f60c 100644 --- a/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml +++ b/Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/Views/MainView.xaml @@ -14,6 +14,7 @@ xmlns:global="clr-namespace:Tango.PPC.MachineSettings" xmlns:integrationPMR="clr-namespace:Tango.PMR.Integration;assembly=Tango.PMR" xmlns:lubrication="clr-namespace:Tango.PPC.Common.Lubrication;assembly=Tango.PPC.Common" + xmlns:common="clr-namespace:Tango.PPC.Common;assembly=Tango.PPC.Common" xmlns:local="clr-namespace:Tango.PPC.MachineSettings.Views" mc:Ignorable="d" d:DesignHeight="4500" d:DesignWidth="800" d:DataContext="{d:DesignInstance Type=vm:MainViewVM, IsDesignTimeCreatable=False}" DataContext="{x:Static global:ViewModelLocator.MainViewVM}"> @@ -25,6 +26,13 @@ <x:Type TypeName="lubrication:LubricationLevel"/> </ObjectDataProvider.MethodParameters> </ObjectDataProvider> + + <ObjectDataProvider x:Key="PowerDownTimes" MethodName="GetValues" + ObjectType="{x:Type sys:Enum}"> + <ObjectDataProvider.MethodParameters> + <x:Type TypeName="common:PowerDownMinutes"/> + </ObjectDataProvider.MethodParameters> + </ObjectDataProvider> </UserControl.Resources> @@ -355,6 +363,31 @@ </StackPanel> </touch:TouchExpander> + <!--POWER SAVER--> + <touch:TouchExpander Margin="0 20 0 0" Header="Power Saving" IsExpanded="True" FontSize="{StaticResource TangoExpanderHeaderFontSize}" Visibility="{Binding BuildProvider.IsEureka,Converter={StaticResource BooleanToVisibilityConverter}}"> + <StackPanel> + <controls:TableGrid Margin="10" RowHeight="60" MakeFirstColumnVerticalAlignmentBottom="False" TextElement.FontSize="{StaticResource TangoDefaultFontSize}"> + <TextBlock VerticalAlignment="Center"> + <Run> + Automatically turn off the machine on idle time after + </Run> + </TextBlock> + + <touch:TouchComboBox VerticalAlignment="Top" HorizontalAlignment="Right" Width="250" ItemsSource="{Binding PowerDownTimes}" SelectedItem="{Binding SelectedPowerDownTime}" ValuePath="Minutes" DisplayMemberPath="Name"> + + </touch:TouchComboBox> + + </controls:TableGrid> + + <!--<DockPanel Margin="10 -50 0 0"> + <touch:TouchIcon VerticalAlignment="Top" Icon="InformationOutline" Foreground="{StaticResource TangoGrayTextBrush}"></touch:TouchIcon> + <TextBlock Margin="10 0 0 0" VerticalAlignment="Top" TextWrapping="Wrap" FontSize="{StaticResource TangoSmallFontSize}" Foreground="{StaticResource TangoGrayTextBrush}"> + You can activate the screen anytime by pressing + </TextBlock> + </DockPanel>--> + </StackPanel> + </touch:TouchExpander> + <!--TECHNICIAN--> <touch:TouchExpander Visibility="{Binding ApplicationManager.IsInTechnicianMode,Converter={StaticResource BooleanToVisibilityConverter}}" Margin="0 20 0 0" Header="Advanced" IsExpanded="True" FontSize="{StaticResource TangoExpanderHeaderFontSize}"> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs index 7f67a4444..7a5a14ede 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Connection/DefaultMachineProvider.cs @@ -442,10 +442,18 @@ namespace Tango.PPC.Common.Connection /// <summary> /// Called when the machine has connected. /// </summary> - protected virtual void OnMachineConnected() + protected async virtual void OnMachineConnected() { IsConnected = true; + MachineConnected?.Invoke(this, new EventArgs()); + + try + { + var settings = SettingsManager.Default.GetOrCreate<PPCSettings>(); + await MachineOperator.SetPowerDownTime((int)settings.PowerSavingMode); + } + catch { } } /// <summary> diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs index 03215553b..711443da5 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs +++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/PPCSettings.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; using System.ServiceModel; using System.Text; @@ -22,6 +23,18 @@ namespace Tango.PPC.Common ExternalTCP, } + public enum PowerDownMinutes + { + [Description("30 Minutes")] + Minimum = 30, + [Description("1 Hour")] + Default = 60, + [Description("2 Hours")] + Maximum = 240, + [Description("Never")] + Never = 0, + } + /// <summary> /// Represents the main PPC settings. /// </summary> @@ -385,10 +398,16 @@ namespace Tango.PPC.Common } /// <summary> + /// Gets or sets the device power saving mode. + /// </summary> + public PowerDownMinutes PowerSavingMode { get; set; } + + /// <summary> /// Initializes a new instance of the <see cref="PPCSettings"/> class. /// </summary> public PPCSettings() { + PowerSavingMode = PowerDownMinutes.Default; EmulatorMode = EmulatorMode.InMemory; LubricationLevels = new List<RmlLubricationLevel>(); JobUploadStrategy = JobUploadStrategy.JobDescriptionFile; diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest index d72e75011..efc5f8179 100644 --- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest +++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest @@ -16,7 +16,7 @@ Remove this element if your application requires this virtualization for backwards compatibility. --> - <requestedExecutionLevel level="requireAdministrator" uiAccess="false" /> + <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />--> </requestedPrivileges> </security> </trustInfo> diff --git a/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs index 7951bc584..0e2a0e40c 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/IMachineOperator.cs @@ -612,5 +612,12 @@ namespace Tango.Integration.Operation /// <param name="cardID">The card identifier.</param> /// <returns></returns> Task ResetCard(int cardID); + + /// <summary> + /// Sets the firmware device time to auto power down. + /// </summary> + /// <param name="minutes">Timeout Minutes.</param> + /// <returns></returns> + Task SetPowerDownTime(int minutes); } } diff --git a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs index 93cb7bbb8..527c063fb 100644 --- a/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs +++ b/Software/Visual_Studio/Tango.Integration/Operation/MachineOperator.cs @@ -1441,6 +1441,8 @@ namespace Tango.Integration.Operation _eventsSent = false; _machineStatusSent = false; + MachineStatus = null; + if (Status != MachineStatuses.Disconnected) { UpdateStatus(MachineStatuses.Disconnected); @@ -3287,16 +3289,16 @@ namespace Tango.Integration.Operation if (response.Message.Status.Progress > 0) if (oldKeepAlive != UseKeepAlive) - { { - UseKeepAlive = oldKeepAlive; - } + { + UseKeepAlive = oldKeepAlive; + } - if (_jobActualStartDate == null) - { - _jobActualStartDate = DateTime.UtcNow; + if (_jobActualStartDate == null) + { + _jobActualStartDate = DateTime.UtcNow; + } } - } if (!responseLogged) { @@ -4700,6 +4702,25 @@ namespace Tango.Integration.Operation return SendRequest<ResetCardRequest, ResetCardResponse>(new ResetCardRequest() { CardID = cardID }, new TransportRequestConfig() { Timeout = TimeSpan.FromSeconds(3) }); } + /// <summary> + /// Sets the firmware device time to auto power down. + /// </summary> + /// <param name="minutes">Timeout Minutes.</param> + /// <returns></returns> + public async Task SetPowerDownTime(int minutes) + { + try + { + LogManager.Log($"Settings machine auto power down time to {minutes} minutes..."); + var r = await SendRequest<SetPowerDownTimeRequest, SetPowerDownTimeResponse>(new SetPowerDownTimeRequest() { TimeoutMinutes = minutes }); + } + catch (Exception ex) + { + LogManager.Log(ex, $"Error setting down power down time to {minutes} minutes."); + throw ex; + } + } + #endregion } } diff --git a/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs b/Software/Visual_Studio/Tango.PMR/Common/MessageType.cs index a75ed1705..d289ba7f0 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( - "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbiqoQwoLTWVz", + "ChFNZXNzYWdlVHlwZS5wcm90bxIQVGFuZ28uUE1SLkNvbW1vbirlQwoLTWVz", "c2FnZVR5cGUSCAoETm9uZRAAEhEKDUVycm9yUmVzcG9uc2UQARIUChBDYWxj", "dWxhdGVSZXF1ZXN0EAMSFQoRQ2FsY3VsYXRlUmVzcG9uc2UQBBITCg9Qcm9n", "cmVzc1JlcXVlc3QQBRIUChBQcm9ncmVzc1Jlc3BvbnNlEAYSHAoYU3R1YkNh", @@ -191,31 +191,32 @@ namespace Tango.PMR.Common { "ZGF0ZVJlc3BvbnNlEKtGEiEKHFNldElua0F1dG9GaWxsaW5nTW9kZVJlcXVl", "c3QQrEYSIgodU2V0SW5rQXV0b0ZpbGxpbmdNb2RlUmVzcG9uc2UQrUYSHAoX", "U3Bvb2xUeXBlQ2hhbmdlZFJlcXVlc3QQrkYSHQoYU3Bvb2xUeXBlQ2hhbmdl", - "ZFJlc3BvbnNlEK9GEhoKFVN0YXJ0UG93ZXJEb3duUmVxdWVzdBCQThIbChZT", - "dGFydFBvd2VyRG93blJlc3BvbnNlEJFOEhoKFUFib3J0UG93ZXJEb3duUmVx", - "dWVzdBCSThIbChZBYm9ydFBvd2VyRG93blJlc3BvbnNlEJNOEhgKE1N0YXJ0", - "UG93ZXJVcFJlcXVlc3QQlE4SGQoUU3RhcnRQb3dlclVwUmVzcG9uc2UQlU4S", - "GAoTQWJvcnRQb3dlclVwUmVxdWVzdBCWThIZChRBYm9ydFBvd2VyVXBSZXNw", - "b25zZRCXThITCg5TdGFuZEJ5UmVxdWVzdBCYThIUCg9TdGFuZEJ5UmVzcG9u", - "c2UQmU4SHgoZU3RhcnRUaHJlYWRMb2FkaW5nUmVxdWVzdBD4VRIfChpTdGFy", - "dFRocmVhZExvYWRpbmdSZXNwb25zZRD5VRIhChxDb250aW51ZVRocmVhZExv", - "YWRpbmdSZXF1ZXN0EPpVEiIKHUNvbnRpbnVlVGhyZWFkTG9hZGluZ1Jlc3Bv", - "bnNlEPtVEh0KGFN0b3BUaHJlYWRMb2FkaW5nUmVxdWVzdBD8VRIeChlTdG9w", - "VGhyZWFkTG9hZGluZ1Jlc3BvbnNlEP1VEhwKF1RyeVRocmVhZExvYWRpbmdS", - "ZXF1ZXN0EP5VEh0KGFRyeVRocmVhZExvYWRpbmdSZXNwb25zZRD/VRIgChtB", - "dHRlbXB0VGhyZWFkSm9nZ2luZ1JlcXVlc3QQgFYSIQocQXR0ZW1wdFRocmVh", - "ZEpvZ2dpbmdSZXNwb25zZRCBVhIeChlBYm9ydFRocmVhZExvYWRpbmdSZXF1", - "ZXN0EIJWEh8KGkFib3J0VGhyZWFkTG9hZGluZ1Jlc3BvbnNlEINWEiEKHFN0", - "YXJ0SW5rRmlsbGluZ1N0YXR1c1JlcXVlc3QQ4F0SIgodU3RhcnRJbmtGaWxs", - "aW5nU3RhdHVzUmVzcG9uc2UQ4V0SHgoZSW5pdGlhdGVJbmtGaWxsaW5nUmVx", - "dWVzdBDiXRIfChpJbml0aWF0ZUlua0ZpbGxpbmdSZXNwb25zZRDjXRIYChNX", - "YXN0ZVJlcGxhY2VSZXF1ZXN0EORdEhkKFFdhc3RlUmVwbGFjZVJlc3BvbnNl", - "EOVdEhwKF1B1dERhdGFTdG9yZUl0ZW1SZXF1ZXN0EMhlEh0KGFB1dERhdGFT", - "dG9yZUl0ZW1SZXNwb25zZRDJZRIcChdHZXREYXRhU3RvcmVJdGVtUmVxdWVz", - "dBDKZRIdChhHZXREYXRhU3RvcmVJdGVtUmVzcG9uc2UQy2USIQocRGF0YVN0", - "b3JlSXRlbU1vZGlmaWVkUmVxdWVzdBDMZRIiCh1EYXRhU3RvcmVJdGVtTW9k", - "aWZpZWRSZXNwb25zZRDNZUIcChpjb20udHdpbmUudGFuZ28ucG1yLmNvbW1v", - "bmIGcHJvdG8z")); + "ZFJlc3BvbnNlEK9GEhwKF1NldFBvd2VyRG93blRpbWVSZXF1ZXN0ELBGEh0K", + "GFNldFBvd2VyRG93blRpbWVSZXNwb25zZRCxRhIaChVTdGFydFBvd2VyRG93", + "blJlcXVlc3QQkE4SGwoWU3RhcnRQb3dlckRvd25SZXNwb25zZRCRThIaChVB", + "Ym9ydFBvd2VyRG93blJlcXVlc3QQkk4SGwoWQWJvcnRQb3dlckRvd25SZXNw", + "b25zZRCTThIYChNTdGFydFBvd2VyVXBSZXF1ZXN0EJROEhkKFFN0YXJ0UG93", + "ZXJVcFJlc3BvbnNlEJVOEhgKE0Fib3J0UG93ZXJVcFJlcXVlc3QQlk4SGQoU", + "QWJvcnRQb3dlclVwUmVzcG9uc2UQl04SEwoOU3RhbmRCeVJlcXVlc3QQmE4S", + "FAoPU3RhbmRCeVJlc3BvbnNlEJlOEh4KGVN0YXJ0VGhyZWFkTG9hZGluZ1Jl", + "cXVlc3QQ+FUSHwoaU3RhcnRUaHJlYWRMb2FkaW5nUmVzcG9uc2UQ+VUSIQoc", + "Q29udGludWVUaHJlYWRMb2FkaW5nUmVxdWVzdBD6VRIiCh1Db250aW51ZVRo", + "cmVhZExvYWRpbmdSZXNwb25zZRD7VRIdChhTdG9wVGhyZWFkTG9hZGluZ1Jl", + "cXVlc3QQ/FUSHgoZU3RvcFRocmVhZExvYWRpbmdSZXNwb25zZRD9VRIcChdU", + "cnlUaHJlYWRMb2FkaW5nUmVxdWVzdBD+VRIdChhUcnlUaHJlYWRMb2FkaW5n", + "UmVzcG9uc2UQ/1USIAobQXR0ZW1wdFRocmVhZEpvZ2dpbmdSZXF1ZXN0EIBW", + "EiEKHEF0dGVtcHRUaHJlYWRKb2dnaW5nUmVzcG9uc2UQgVYSHgoZQWJvcnRU", + "aHJlYWRMb2FkaW5nUmVxdWVzdBCCVhIfChpBYm9ydFRocmVhZExvYWRpbmdS", + "ZXNwb25zZRCDVhIhChxTdGFydElua0ZpbGxpbmdTdGF0dXNSZXF1ZXN0EOBd", + "EiIKHVN0YXJ0SW5rRmlsbGluZ1N0YXR1c1Jlc3BvbnNlEOFdEh4KGUluaXRp", + "YXRlSW5rRmlsbGluZ1JlcXVlc3QQ4l0SHwoaSW5pdGlhdGVJbmtGaWxsaW5n", + "UmVzcG9uc2UQ410SGAoTV2FzdGVSZXBsYWNlUmVxdWVzdBDkXRIZChRXYXN0", + "ZVJlcGxhY2VSZXNwb25zZRDlXRIcChdQdXREYXRhU3RvcmVJdGVtUmVxdWVz", + "dBDIZRIdChhQdXREYXRhU3RvcmVJdGVtUmVzcG9uc2UQyWUSHAoXR2V0RGF0", + "YVN0b3JlSXRlbVJlcXVlc3QQymUSHQoYR2V0RGF0YVN0b3JlSXRlbVJlc3Bv", + "bnNlEMtlEiEKHERhdGFTdG9yZUl0ZW1Nb2RpZmllZFJlcXVlc3QQzGUSIgod", + "RGF0YVN0b3JlSXRlbU1vZGlmaWVkUmVzcG9uc2UQzWVCHAoaY29tLnR3aW5l", + "LnRhbmdvLnBtci5jb21tb25iBnByb3RvMw==")); descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, new pbr::FileDescriptor[] { }, new pbr::GeneratedClrTypeInfo(new[] {typeof(global::Tango.PMR.Common.MessageType), }, null)); @@ -523,6 +524,8 @@ namespace Tango.PMR.Common { [pbr::OriginalName("SetInkAutoFillingModeResponse")] SetInkAutoFillingModeResponse = 9005, [pbr::OriginalName("SpoolTypeChangedRequest")] SpoolTypeChangedRequest = 9006, [pbr::OriginalName("SpoolTypeChangedResponse")] SpoolTypeChangedResponse = 9007, + [pbr::OriginalName("SetPowerDownTimeRequest")] SetPowerDownTimeRequest = 9008, + [pbr::OriginalName("SetPowerDownTimeResponse")] SetPowerDownTimeResponse = 9009, /// <summary> ///Power /// </summary> diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/SetPowerDownTimeRequest.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/SetPowerDownTimeRequest.cs new file mode 100644 index 000000000..6f645401f --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/SetPowerDownTimeRequest.cs @@ -0,0 +1,160 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: SetPowerDownTimeRequest.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 SetPowerDownTimeRequest.proto</summary> + public static partial class SetPowerDownTimeRequestReflection { + + #region Descriptor + /// <summary>File descriptor for SetPowerDownTimeRequest.proto</summary> + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static SetPowerDownTimeRequestReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "Ch1TZXRQb3dlckRvd25UaW1lUmVxdWVzdC5wcm90bxIXVGFuZ28uUE1SLk1h", + "Y2hpbmVTdGF0dXMiMQoXU2V0UG93ZXJEb3duVGltZVJlcXVlc3QSFgoOVGlt", + "ZW91dE1pbnV0ZXMYASABKAVCIwohY29tLnR3aW5lLnRhbmdvLnBtci5tYWNo", + "aW5lc3RhdHVzYgZwcm90bzM=")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.SetPowerDownTimeRequest), global::Tango.PMR.MachineStatus.SetPowerDownTimeRequest.Parser, new[]{ "TimeoutMinutes" }, null, null, null) + })); + } + #endregion + + } + #region Messages + public sealed partial class SetPowerDownTimeRequest : pb::IMessage<SetPowerDownTimeRequest> { + private static readonly pb::MessageParser<SetPowerDownTimeRequest> _parser = new pb::MessageParser<SetPowerDownTimeRequest>(() => new SetPowerDownTimeRequest()); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser<SetPowerDownTimeRequest> Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Tango.PMR.MachineStatus.SetPowerDownTimeRequestReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public SetPowerDownTimeRequest() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public SetPowerDownTimeRequest(SetPowerDownTimeRequest other) : this() { + timeoutMinutes_ = other.timeoutMinutes_; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public SetPowerDownTimeRequest Clone() { + return new SetPowerDownTimeRequest(this); + } + + /// <summary>Field number for the "TimeoutMinutes" field.</summary> + public const int TimeoutMinutesFieldNumber = 1; + private int timeoutMinutes_; + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int TimeoutMinutes { + get { return timeoutMinutes_; } + set { + timeoutMinutes_ = value; + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as SetPowerDownTimeRequest); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(SetPowerDownTimeRequest other) { + if (ReferenceEquals(other, null)) { + return false; + } + if (ReferenceEquals(other, this)) { + return true; + } + if (TimeoutMinutes != other.TimeoutMinutes) return false; + return true; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override int GetHashCode() { + int hash = 1; + if (TimeoutMinutes != 0) hash ^= TimeoutMinutes.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 (TimeoutMinutes != 0) { + output.WriteRawTag(8); + output.WriteInt32(TimeoutMinutes); + } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public int CalculateSize() { + int size = 0; + if (TimeoutMinutes != 0) { + size += 1 + pb::CodedOutputStream.ComputeInt32Size(TimeoutMinutes); + } + return size; + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public void MergeFrom(SetPowerDownTimeRequest other) { + if (other == null) { + return; + } + if (other.TimeoutMinutes != 0) { + TimeoutMinutes = other.TimeoutMinutes; + } + } + + [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: { + TimeoutMinutes = input.ReadInt32(); + break; + } + } + } + } + + } + + #endregion + +} + +#endregion Designer generated code diff --git a/Software/Visual_Studio/Tango.PMR/MachineStatus/SetPowerDownTimeResponse.cs b/Software/Visual_Studio/Tango.PMR/MachineStatus/SetPowerDownTimeResponse.cs new file mode 100644 index 000000000..051179bd1 --- /dev/null +++ b/Software/Visual_Studio/Tango.PMR/MachineStatus/SetPowerDownTimeResponse.cs @@ -0,0 +1,131 @@ +// Generated by the protocol buffer compiler. DO NOT EDIT! +// source: SetPowerDownTimeResponse.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 SetPowerDownTimeResponse.proto</summary> + public static partial class SetPowerDownTimeResponseReflection { + + #region Descriptor + /// <summary>File descriptor for SetPowerDownTimeResponse.proto</summary> + public static pbr::FileDescriptor Descriptor { + get { return descriptor; } + } + private static pbr::FileDescriptor descriptor; + + static SetPowerDownTimeResponseReflection() { + byte[] descriptorData = global::System.Convert.FromBase64String( + string.Concat( + "Ch5TZXRQb3dlckRvd25UaW1lUmVzcG9uc2UucHJvdG8SF1RhbmdvLlBNUi5N", + "YWNoaW5lU3RhdHVzIhoKGFNldFBvd2VyRG93blRpbWVSZXNwb25zZUIjCiFj", + "b20udHdpbmUudGFuZ28ucG1yLm1hY2hpbmVzdGF0dXNiBnByb3RvMw==")); + descriptor = pbr::FileDescriptor.FromGeneratedCode(descriptorData, + new pbr::FileDescriptor[] { }, + new pbr::GeneratedClrTypeInfo(null, new pbr::GeneratedClrTypeInfo[] { + new pbr::GeneratedClrTypeInfo(typeof(global::Tango.PMR.MachineStatus.SetPowerDownTimeResponse), global::Tango.PMR.MachineStatus.SetPowerDownTimeResponse.Parser, null, null, null, null) + })); + } + #endregion + + } + #region Messages + public sealed partial class SetPowerDownTimeResponse : pb::IMessage<SetPowerDownTimeResponse> { + private static readonly pb::MessageParser<SetPowerDownTimeResponse> _parser = new pb::MessageParser<SetPowerDownTimeResponse>(() => new SetPowerDownTimeResponse()); + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pb::MessageParser<SetPowerDownTimeResponse> Parser { get { return _parser; } } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public static pbr::MessageDescriptor Descriptor { + get { return global::Tango.PMR.MachineStatus.SetPowerDownTimeResponseReflection.Descriptor.MessageTypes[0]; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + pbr::MessageDescriptor pb::IMessage.Descriptor { + get { return Descriptor; } + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public SetPowerDownTimeResponse() { + OnConstruction(); + } + + partial void OnConstruction(); + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public SetPowerDownTimeResponse(SetPowerDownTimeResponse other) : this() { + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public SetPowerDownTimeResponse Clone() { + return new SetPowerDownTimeResponse(this); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public override bool Equals(object other) { + return Equals(other as SetPowerDownTimeResponse); + } + + [global::System.Diagnostics.DebuggerNonUserCodeAttribute] + public bool Equals(SetPowerDownTimeResponse 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(SetPowerDownTimeResponse 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 a7fe17a56..ac425cb03 100644 --- a/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj +++ b/Software/Visual_Studio/Tango.PMR/Tango.PMR.csproj @@ -305,6 +305,8 @@ <Compile Include="MachineStatus\MachineStatus.cs" /> <Compile Include="MachineStatus\SetInkAutoFillingModeRequest.cs" /> <Compile Include="MachineStatus\SetInkAutoFillingModeResponse.cs" /> + <Compile Include="MachineStatus\SetPowerDownTimeRequest.cs" /> + <Compile Include="MachineStatus\SetPowerDownTimeResponse.cs" /> <Compile Include="MachineStatus\SpoolState.cs" /> <Compile Include="MachineStatus\SpoolTypeChangedRequest.cs" /> <Compile Include="MachineStatus\SpoolTypeChangedResponse.cs" /> |