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

1 files changed, 8 insertions, 0 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 820950290..768f93de1 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
@@ -140,6 +140,12 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             set { _machineUpdatesViewVM = value; RaisePropertyChangedAuto(); }
         }
 
+        private TupViewVM _tupViewVM;
+        public TupViewVM TupViewVM
+        {
+            get { return _tupViewVM; }
+            set { _tupViewVM = value; RaisePropertyChangedAuto(); }
+        }
 
         #endregion
 
@@ -233,6 +239,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
             ResetDeviceRegistrationCommand = new RelayCommand(ResetDeviceRegistration);
 
             MachineUpdatesViewVM = new MachineUpdatesViewVM(_notification);
+            TupViewVM = new TupViewVM(_notification);
         }
 
         #endregion
@@ -478,6 +485,7 @@ namespace Tango.MachineStudio.MachineDesigner.ViewModels
                     HardwareConfigurationViewVM.Init(ActiveMachine.Configuration);
 
                     await MachineUpdatesViewVM.Init(ActiveMachine, ActiveMachineAdapter.Context);
+                    TupViewVM.Init(ActiveMachine);
 
 
                     ActiveMachine.Configuration.HardwareVersionChanged += Configuration_HardwareVersionChanged;