From 856a23723afcc9d48c0f019dc33a259ac6c279ed Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Thu, 12 Jul 2018 14:03:47 +0300 Subject: Implemented continuous request timeouts. Implemented continuous request abort exception. Added log object for real time logs. Some work on PPC & Machine Studio. --- .../Tango.MachineStudio.UI/Resources/BuildDate.txt | 2 +- .../Tango.MachineStudio.UI/ViewModels/MainViewVM.cs | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI') diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt index 60d433d99..a64fd8b3d 100644 --- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt +++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UI/Resources/BuildDate.txt @@ -1 +1 @@ -Wed 07/11/2018 16:02:40.40 +Thu 07/12/2018 13:56:47.00 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().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; -- cgit v1.3.1