diff options
Diffstat (limited to 'Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs')
| -rw-r--r-- | Software/Visual_Studio/PPC/Modules/Tango.PPC.MachineSettings/ViewModels/MainViewVM.cs | 38 |
1 files changed, 24 insertions, 14 deletions
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 594d3f5c9..f6b31d93c 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 @@ -46,7 +46,7 @@ namespace Tango.PPC.MachineSettings.ViewModels public class PowerDownTime { - public PowerDownMinutes Minutes { get; set; } + public PowerSavingModes Minutes { get; set; } public String Name { @@ -292,13 +292,20 @@ namespace Tango.PPC.MachineSettings.ViewModels set { _manualFineTuningLength = value; RaisePropertyChangedAuto(); } } - public List<PowerDownTime> PowerDownTimes { get; set; } + public List<PowerDownTime> PowerSavingModes { get; set; } - private PowerDownTime _selectedPowerDownTime; - public PowerDownTime SelectedPowerDownTime + private PowerDownTime _selectedPoweroffTime; + public PowerDownTime SelectedPowerOffTime { - get { return _selectedPowerDownTime; } - set { _selectedPowerDownTime = value; RaisePropertyChangedAuto(); } + get { return _selectedPoweroffTime; } + set { _selectedPoweroffTime = value; RaisePropertyChangedAuto(); } + } + + private PowerDownTime _selectedIdleTime; + public PowerDownTime SelectedIdleTime + { + get { return _selectedIdleTime; } + set { _selectedIdleTime = value; RaisePropertyChangedAuto(); } } @@ -330,12 +337,12 @@ namespace Tango.PPC.MachineSettings.ViewModels DiscardCommand = new RelayCommand(Discard); SynchronizeCommand = new RelayCommand(Synchronize, () => !MachineDataSynchronizer.IsSynchronizing && IsFree); - PowerDownTimes = new List<PowerDownTime>() + PowerSavingModes = new List<PowerDownTime>() { - new PowerDownTime() { Minutes = PowerDownMinutes.Minimum }, - new PowerDownTime() { Minutes = PowerDownMinutes.Default }, - new PowerDownTime() { Minutes = PowerDownMinutes.Maximum }, - new PowerDownTime() { Minutes = PowerDownMinutes.Never }, + new PowerDownTime() { Minutes = Common.PowerSavingModes.Minimum }, + new PowerDownTime() { Minutes = Common.PowerSavingModes.Default }, + new PowerDownTime() { Minutes = Common.PowerSavingModes.Maximum }, + new PowerDownTime() { Minutes = Common.PowerSavingModes.Never }, }; } @@ -369,7 +376,9 @@ 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; + + Settings.PowerSavingModeIdle = SelectedIdleTime.Minutes; + Settings.PowerSavingModePowerOff = SelectedPowerOffTime.Minutes; MachineDataSynchronizer.IsEnabled = SynchronizeJobs || SynchronizeDiagnostics; @@ -391,7 +400,7 @@ namespace Tango.PPC.MachineSettings.ViewModels { try { - await MachineProvider.MachineOperator.SetPowerDownTime((int)Settings.PowerSavingMode); + await MachineProvider.MachineOperator.SetPowerSavingMode((int)Settings.PowerSavingModeIdle, (int)Settings.PowerSavingModePowerOff); } catch { } } @@ -561,7 +570,8 @@ namespace Tango.PPC.MachineSettings.ViewModels ExternalBridgePassword = Settings.ExternalBridgePassword; - SelectedPowerDownTime = PowerDownTimes.FirstOrDefault(x => x.Minutes == Settings.PowerSavingMode); + SelectedIdleTime = PowerSavingModes.FirstOrDefault(x => x.Minutes == Settings.PowerSavingModeIdle); + SelectedPowerOffTime = PowerSavingModes.FirstOrDefault(x => x.Minutes == Settings.PowerSavingModePowerOff); _enableRemoteAssistance = RemoteAssistanceProvider.IsEnabled; RaisePropertyChanged(nameof(EnableRemoteAssistance)); |