aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio
diff options
context:
space:
mode:
authorRoy Ben-Shabat <Roy@Twine-s.com>2018-11-27 17:12:41 +0200
committerRoy Ben-Shabat <Roy@Twine-s.com>2018-11-27 17:12:41 +0200
commitb43cfe7dc6bcf2028fe358026e52b5dbc3dc8a71 (patch)
treeb3786625aa1ada778ed5422901e182d7183eeba5 /Software/Visual_Studio
parentf1fc087859a5839fb6c2b76fa083bd720b68bcc2 (diff)
downloadTango-b43cfe7dc6bcf2028fe358026e52b5dbc3dc8a71.tar.gz
Tango-b43cfe7dc6bcf2028fe358026e52b5dbc3dc8a71.zip
Fixed issue with stubs UI.
Diffstat (limited to 'Software/Visual_Studio')
-rw-r--r--Software/Visual_Studio/Build/Shortcuts/Stubs Execution GUI.lnkbin1322 -> 1470 bytes
-rw-r--r--Software/Visual_Studio/Tango.Stubs/ViewModels/StubsViewVM.cs5
-rw-r--r--Software/Visual_Studio/Utilities/Tango.Stubs.UI/App.config4
3 files changed, 7 insertions, 2 deletions
diff --git a/Software/Visual_Studio/Build/Shortcuts/Stubs Execution GUI.lnk b/Software/Visual_Studio/Build/Shortcuts/Stubs Execution GUI.lnk
index e18f6dfe5..80ef9607e 100644
--- a/Software/Visual_Studio/Build/Shortcuts/Stubs Execution GUI.lnk
+++ b/Software/Visual_Studio/Build/Shortcuts/Stubs Execution GUI.lnk
Binary files differ
diff --git a/Software/Visual_Studio/Tango.Stubs/ViewModels/StubsViewVM.cs b/Software/Visual_Studio/Tango.Stubs/ViewModels/StubsViewVM.cs
index fd210dc1a..d165877e1 100644
--- a/Software/Visual_Studio/Tango.Stubs/ViewModels/StubsViewVM.cs
+++ b/Software/Visual_Studio/Tango.Stubs/ViewModels/StubsViewVM.cs
@@ -616,6 +616,11 @@ namespace Tango.Stubs.ViewModels
Mouse.OverrideCursor = Cursors.Wait;
AppendTextLog("Connecting..." + Environment.NewLine);
_machineOperator = new MachineOperator();
+ _machineOperator.EnableDiagnostics = false;
+ _machineOperator.EnableEmbeddedDebugging = false;
+ _machineOperator.EnableEventsNotification = false;
+ _machineOperator.EnableJobResume = false;
+ _machineOperator.UseKeepAlive = false;
_machineOperator.Adapter = new UsbTransportAdapter(SelectedPort, BaudRate);
await _machineOperator.Connect();
IsConnected = true;
diff --git a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/App.config b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/App.config
index 5131950bd..5ea2123d1 100644
--- a/Software/Visual_Studio/Utilities/Tango.Stubs.UI/App.config
+++ b/Software/Visual_Studio/Utilities/Tango.Stubs.UI/App.config
@@ -57,7 +57,7 @@
<assemblyIdentity name="System.Data.SQLite" publicKeyToken="db937bc2d44ff139" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.0.108.0" newVersion="1.0.108.0" />
</dependentAssembly>-->
- <dependentAssembly>
+ <!--<dependentAssembly>
<assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-1.2.2.0" newVersion="1.2.2.0" />
</dependentAssembly>
@@ -100,7 +100,7 @@
<dependentAssembly>
<assemblyIdentity name="System.Reactive.Core" publicKeyToken="94bc3704cddfc263" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-3.0.3000.0" newVersion="3.0.3000.0" />
- </dependentAssembly>
+ </dependentAssembly>-->
</assemblyBinding>
</runtime>
</configuration> \ No newline at end of file