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

1 files changed, 12 insertions, 1 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
index 5fd086198..820950290 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.MachineDesigner/ViewModels/MainViewVM.cs
@@ -123,7 +123,6 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
         }
 
         private HardwareConfigurationViewVM _hardwareConfigurationViewVM;
-
         public HardwareConfigurationViewVM HardwareConfigurationViewVM
         {
             get { return _hardwareConfigurationViewVM; }
@@ -134,6 +133,13 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             }
         }
 
+        private MachineUpdatesViewVM _machineUpdatesViewVM;
+        public MachineUpdatesViewVM MachineUpdatesViewVM
+        {
+            get { return _machineUpdatesViewVM; }
+            set { _machineUpdatesViewVM = value; RaisePropertyChangedAuto(); }
+        }
+
 
         #endregion
 
@@ -225,6 +231,8 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             RemoveSpoolCommand = new RelayCommand(RemoveSpool, () => SelectedSpool != null);
             CloneMachineCommand = new RelayCommand(CloneMachine, () => SelectedMachine != null);
             ResetDeviceRegistrationCommand = new RelayCommand(ResetDeviceRegistration);
+
+            MachineUpdatesViewVM = new MachineUpdatesViewVM(_notification);
         }
 
         #endregion
@@ -469,6 +477,9 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     HardwareConfigurationViewVM = new HardwareConfigurationViewVM(_notification);
                     HardwareConfigurationViewVM.Init(ActiveMachine.Configuration);
 
+                    await MachineUpdatesViewVM.Init(ActiveMachine, ActiveMachineAdapter.Context);
+
+
                     ActiveMachine.Configuration.HardwareVersionChanged += Configuration_HardwareVersionChanged;
 
                     View.NavigateTo(MachineDesignerNavigationView.MachineDetailsView);