From 26a8b7347b2474ae5bb287091ddff2d2aa8db873 Mon Sep 17 00:00:00 2001 From: Kamil Sopko Date: Sun, 10 Apr 2016 11:10:25 +0200 Subject: [PATCH] change default timeout fix outname bug in drillcncjob --- tclCommands/TclCommand.py | 4 ++-- tclCommands/TclCommandDrillcncjob.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/tclCommands/TclCommand.py b/tclCommands/TclCommand.py index 24f8295f..bc7cd2c2 100644 --- a/tclCommands/TclCommand.py +++ b/tclCommands/TclCommand.py @@ -291,8 +291,8 @@ class TclCommandSignaled(TclCommand): it handles all neccessary stuff about blocking and passing exeptions """ - # default timeout for operation is 10 sec, but it can be much more - default_timeout = 10000 + # default timeout for operation is 300000 sec, but it can be much more + default_timeout = 300000 output = None diff --git a/tclCommands/TclCommandDrillcncjob.py b/tclCommands/TclCommandDrillcncjob.py index f65931fd..783b6599 100644 --- a/tclCommands/TclCommandDrillcncjob.py +++ b/tclCommands/TclCommandDrillcncjob.py @@ -78,4 +78,4 @@ class TclCommandDrillcncjob(TclCommand.TclCommandSignaled): job_obj.gcode_parse() job_obj.create_geometry() - self.app.new_object("cncjob", name, job_init) + self.app.new_object("cncjob", args['outname'], job_init)