diff options
| author | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-07-12 14:03:47 +0300 |
|---|---|---|
| committer | Roy Ben-Shabat <Roy@Twine-s.com> | 2018-07-12 14:03:47 +0300 |
| commit | 856a23723afcc9d48c0f019dc33a259ac6c279ed (patch) | |
| tree | 6cc82030ee2d9c74bd7f841bfdc6a0c163def97d /Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs | |
| parent | 70fe7f13b519df86420f8c2b97cf8eb3ab67e9a5 (diff) | |
| download | Tango-856a23723afcc9d48c0f019dc33a259ac6c279ed.tar.gz Tango-856a23723afcc9d48c0f019dc33a259ac6c279ed.zip | |
Implemented continuous request timeouts.
Implemented continuous request abort exception.
Added log object for real time logs.
Some work on PPC & Machine Studio.
Diffstat (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs')
| -rw-r--r-- | Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs | 10 |
1 files changed, 10 insertions, 0 deletions
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 8eaa1f360..fd28d5b1e 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/ViewModels/MainViewVM.cs @@ -444,6 +444,11 @@ namespace Tango.MachineStudio.UI.ViewModels { try { + if (!x.SelectedMachine.EnableDiagnostics) + { + x.SelectedMachine.EnableEmbeddedDebugging = false; + } + await x.SelectedMachine.Connect(); var authenticated = await x.SelectedMachine.As<IExternalBridgeSecureClient>().Authenticate(login.Password); @@ -479,6 +484,11 @@ namespace Tango.MachineStudio.UI.ViewModels { try { + if (!x.SelectedMachine.EnableDiagnostics) + { + x.SelectedMachine.EnableEmbeddedDebugging = false; + } + await x.SelectedMachine.Connect(); x.SelectedMachine.SerialNumber = vm.SelectedMachine.SerialNumber; ApplicationManager.ConnectedMachine = x.SelectedMachine; |