merge

1 files changed, 33 insertions, 0 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
index 51b7168ed..7737911e0 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MachineConnectionViewVM.cs
@@ -52,6 +52,8 @@ namespace Tango.MachineStudio.UI.ViewModels
         /// <param name="scanner">The scanner.</param>
         public MachineConnectionViewVM(ExternalBridgeScanner scanner)
         {
+            EnableDiagnostics = true;
+            UploadHardwareConfiguration = true;
             Scanner = scanner;
             ConnectCommand = new RelayCommand(Connect, (x) => SelectedMachine != null);
         }
@@ -97,5 +99,36 @@ namespace Tango.MachineStudio.UI.ViewModels
             Scanner.AvailableMachines.Add(_emulator);
             Scanner.Start();
         }
+
+        private bool _enableDiagnostics;
+        /// <summary>
+        /// Gets or sets a value indicating whether to enable diagnostics after connection.
+        /// </summary>
+        public bool EnableDiagnostics
+        {
+            get { return _enableDiagnostics; }
+            set { _enableDiagnostics = value; RaisePropertyChangedAuto(); }
+        }
+
+        private bool _uploadHardwareConfiguration;
+        /// <summary>
+        /// Gets or sets a value indicating whether to upload hardware configuration after connection.
+        /// </summary>
+        public bool UploadHardwareConfiguration
+        {
+            get { return _uploadHardwareConfiguration; }
+            set { _uploadHardwareConfiguration = value; RaisePropertyChangedAuto(); }
+        }
+
+        private bool _enableKeepAlive;
+        /// <summary>
+        /// Gets or sets a value indicating whether to use the keep alive mechanism.
+        /// </summary>
+        public bool EnableKeepAlive
+        {
+            get { return _enableKeepAlive; }
+            set { _enableKeepAlive = value; RaisePropertyChangedAuto(); }
+        }
+
     }
 }