Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 9 insertions, 17 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs
index 35a4b0e9d..5467c53a0 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs
@@ -20,6 +20,7 @@ namespace Tango.MachineStudio.UI.ViewModels
             Disconnect,
             UploadHardwareConfig,
             Reset,
+            TurnOffHeaters
         }
 
         private IStudioApplicationManager _applicationManager;
@@ -45,31 +46,22 @@ namespace Tango.MachineStudio.UI.ViewModels
 
         public RelayCommand ResetCommand { get; set; }
 
+        public RelayCommand TurnOffHeatersCommand { get; set; }
+
         public ConnectedMachineViewVM(IStudioApplicationManager application, IDiagnosticsFrameProvider frameProvider)
         {
             ApplicationManager = application;
-            DisconnectCommand = new RelayCommand(Disconnect);
-            UploadHardwareConfigurationCommand = new RelayCommand(UploadHardwareConfiguration);
-            ResetCommand = new RelayCommand(Reset);
+            DisconnectCommand = new RelayCommand(() => AcceptResult(ConnectedMachineVMResult.Disconnect));
+            UploadHardwareConfigurationCommand = new RelayCommand(() => AcceptResult(ConnectedMachineVMResult.UploadHardwareConfig));
+            ResetCommand = new RelayCommand(() => AcceptResult(ConnectedMachineVMResult.Reset));
+            TurnOffHeatersCommand = new RelayCommand(() => AcceptResult(ConnectedMachineVMResult.TurnOffHeaters));
 
             DiagnosticsFrameProvider = frameProvider;
         }
 
-        private void Reset()
-        {
-            Result = ConnectedMachineVMResult.Reset;
-            Accept();
-        }
-
-        private void UploadHardwareConfiguration()
-        {
-            Result = ConnectedMachineVMResult.UploadHardwareConfig;
-            Accept();
-        }
-
-        private void Disconnect()
+        private void AcceptResult(ConnectedMachineVMResult result)
         {
-            Result = ConnectedMachineVMResult.Disconnect;
+            Result = result;
             Accept();
         }
     }