Some more work on idle and power down request.

2 files changed, 29 insertions, 24 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));
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 a1414f60c..3e2eff01c 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
@@ -30,7 +30,7 @@
         <ObjectDataProvider x:Key="PowerDownTimes" MethodName="GetValues"
                             ObjectType="{x:Type sys:Enum}">
             <ObjectDataProvider.MethodParameters>
-                <x:Type TypeName="common:PowerDownMinutes"/>
+                <x:Type TypeName="common:PowerSavingModes"/>
             </ObjectDataProvider.MethodParameters>
         </ObjectDataProvider>
     </UserControl.Resources>
@@ -367,16 +367,11 @@
                                 <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>
+                                            <TextBlock VerticalAlignment="Center">Machine goes to idle mode automatically after</TextBlock>
+                                            <touch:TouchComboBox VerticalAlignment="Top" HorizontalAlignment="Right" Width="250" ItemsSource="{Binding PowerSavingModes}" SelectedItem="{Binding SelectedIdleTime}" ValuePath="Minutes" DisplayMemberPath="Name"></touch:TouchComboBox>
 
+                                            <TextBlock VerticalAlignment="Center">Power off the machine when idle for</TextBlock>
+                                            <touch:TouchComboBox VerticalAlignment="Top" HorizontalAlignment="Right" Width="250" ItemsSource="{Binding PowerSavingModes}" SelectedItem="{Binding SelectedPowerOffTime}" ValuePath="Minutes" DisplayMemberPath="Name"></touch:TouchComboBox>
                                         </controls:TableGrid>
 
                                         <!--<DockPanel Margin="10 -50 0 0">