merge

2 files changed, 29 insertions, 0 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 76e138e0e..8034ceb69 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/ConnectedMachineViewVM.cs
@@ -18,6 +18,7 @@ namespace Tango.MachineStudio.UI.ViewModels
             Cancel,
             Disconnect,
             UploadHardwareConfig,
+            Reset,
         }
 
         private IStudioApplicationManager _applicationManager;
@@ -33,11 +34,20 @@ namespace Tango.MachineStudio.UI.ViewModels
 
         public RelayCommand UploadHardwareConfigurationCommand { get; set; }
 
+        public RelayCommand ResetCommand { get; set; }
+
         public ConnectedMachineViewVM(IStudioApplicationManager application)
         {
             ApplicationManager = application;
             DisconnectCommand = new RelayCommand(Disconnect);
             UploadHardwareConfigurationCommand = new RelayCommand(UploadHardwareConfiguration);
+            ResetCommand = new RelayCommand(Reset);
+        }
+
+        private void Reset()
+        {
+            Result = ConnectedMachineVMResult.Reset;
+            Accept();
         }
 
         private void UploadHardwareConfiguration()
diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
index a7762a5e6..278926de9 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs
@@ -545,6 +545,25 @@ namespace Tango.MachineStudio.UI.ViewModels
                             }
                         }
                     }
+                    else if (x.Result == ConnectedMachineViewVM.ConnectedMachineVMResult.Reset)
+                    {
+                        if (NotificationProvider.ShowQuestion("This will reset the embedded device. Are you sure?"))
+                        {
+                            using (NotificationProvider.PushTaskItem("Uploading hardware configuration..."))
+                            {
+                                try
+                                {
+                                    await ApplicationManager.ConnectedMachine.Reset();
+                                    NotificationProvider.ShowInfo("Embedded device has been restarted.");
+                                }
+                                catch (Exception ex)
+                                {
+                                    LogManager.Log(ex, "Error resetting embedded device.");
+                                    NotificationProvider.ShowError("Error resetting embedded device." + Environment.NewLine + ex.Message);
+                                }
+                            }
+                        }
+                    }
                 });
             }