aboutsummaryrefslogtreecommitdiffstats
path: root/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication
diff options
context:
space:
mode:
authorAvi Levkovich <avi@twine-s.com>2018-07-12 09:46:44 +0300
committerAvi Levkovich <avi@twine-s.com>2018-07-12 09:46:44 +0300
commitdec3cd03aec51dca67150e2f6ba76c7eda7f11a4 (patch)
tree97f8ee8efd166ab9578f1a4baf1b73c45961abb1 /Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication
parent86b7dbca112046dea1d3dd7d2904440afc2acb7d (diff)
parent1fe6f6b50598fff4d52273138936031f3dee7866 (diff)
downloadTango-dec3cd03aec51dca67150e2f6ba76c7eda7f11a4.tar.gz
Tango-dec3cd03aec51dca67150e2f6ba76c7eda7f11a4.zip
Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango
Diffstat (limited to 'Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication')
-rw-r--r--Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs2
1 files changed, 1 insertions, 1 deletions
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
index 4978fa6e0..c67e83fc6 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/PPCApplication/DefaultPPCApplicationManager.cs
@@ -194,7 +194,7 @@ namespace Tango.PPC.UI.PPCApplication
private async void ConnectToMachine()
{
Transport.Discovery.UsbCommunicationScanner<ConnectRequest, ConnectResponse> scanner = new Transport.Discovery.UsbCommunicationScanner<ConnectRequest, ConnectResponse>(UsbSerialBaudRates.BR_9600);
- var response = await scanner.Scan(new ConnectRequest() { Password = "1234" }, TimeSpan.FromSeconds(60));
+ var response = await scanner.Scan(new ConnectRequest() { Password = "1234" }, TimeSpan.FromSeconds(10));
var machine = new MachineOperator(response.Adapter);
await machine.Connect();