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

1 files changed, 4 insertions, 1 deletions

diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
index f265c5dbf..01e67d3ce 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
@@ -10,6 +10,7 @@ using Tango.Core.Helpers;
 using Tango.Explorer;
 using Tango.PPC.Common;
 using Tango.PPC.Common.MachineUpdate;
+using Tango.PPC.Common.Web;
 using Tango.PPC.UI.Dialogs;
 using Tango.PPC.UI.ViewsContracts;
 
@@ -34,6 +35,7 @@ namespace Tango.PPC.UI.ViewModels
         private MachineUpdateResult _update_result;
         private DbCompareResult _db_compare_result;
         private bool _isChecking;
+        private CheckForUpdateResponse _checkUpdateResponse;
 
         #region Properties
 
@@ -149,6 +151,7 @@ namespace Tango.PPC.UI.ViewModels
                 }
 
                 var response = await MachineUpdateManager.CheckForUpdate(MachineProvider.Machine.SerialNumber);
+                _checkUpdateResponse = response;
 
                 if (response.IsUpdateAvailable)
                 {
@@ -192,7 +195,7 @@ namespace Tango.PPC.UI.ViewModels
 
                 try
                 {
-                    _update_result = await MachineUpdateManager.Update(MachineProvider.Machine.SerialNumber);
+                    _update_result = await MachineUpdateManager.Update(MachineProvider.Machine.SerialNumber, _checkUpdateResponse.SetupFirmware, _checkUpdateResponse.SetupFPGA);
                     LogManager.Log("Machine update completed.");
                     await NavigateTo(MachineUpdateView.UpdateCompletedView);
                 }