From 55277d56b12307c22f0f81480dd2de3e0b2fd964 Mon Sep 17 00:00:00 2001
From: Juergen Weigert <jw@owncloud.com>
Date: Tue, 17 May 2016 14:41:22 +0200
Subject: [PATCH] 1.17, no dev.reset per default.

---
 sendto_silhouette.inx  |  4 ++--
 sendto_silhouette.py   |  4 +++-
 silhouette/Graphtec.py | 20 ++++++++++++--------
 3 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/sendto_silhouette.inx b/sendto_silhouette.inx
index 92c63ff7..40fe434e 100644
--- a/sendto_silhouette.inx
+++ b/sendto_silhouette.inx
@@ -75,8 +75,8 @@
     
     <page name='about' _gui-text='About'>
       <param name="about_who" type="description">inkscape-silhouette extension from https://github.com/jnweiger/inkscape-silhouette by Jürgen Weigert [juewei@fabmail.org] and contributors</param>
-      <!-- Keep in sync with sendto_silhouette.py line 103 __version__ = ... -->
-      <param name="about_version" type="description">Version 1.16</param>
+      <!-- Keep in sync with sendto_silhouette.py line 78 __version__ = ... -->
+      <param name="about_version" type="description">Version 1.17</param>
     </page>
   </param>
 
diff --git a/sendto_silhouette.py b/sendto_silhouette.py
index 4a11291e..584a590f 100644
--- a/sendto_silhouette.py
+++ b/sendto_silhouette.py
@@ -72,8 +72,10 @@
 #                         Added misc/silhouette_move.py misc/silhouette_cut.py, misc/endless_clock.py
 # 2016-01-15 jw, v1.15 -- ubuntu loads the wrong usb library.
 # 2016-05-15 jw, v1.16 -- merged regmarks code from https://github.com/fablabnbg/inkscape-silhouette/pull/23
+# 2016-05-17 jw, v1.17 -- fix avoid dev.reset in Graphtec.py, fix helps with 
+#                         https://github.com/fablabnbg/inkscape-silhouette/issues/10
 
-__version__ = '1.16'	# Keep in sync with sendto_silhouette.inx ca line 42
+__version__ = '1.17'	# Keep in sync with sendto_silhouette.inx ca line 79
 __author__ = 'Juergen Weigert <juewei@fabmail.org> and contributors'
 
 import sys, os, shutil, time, logging, tempfile
diff --git a/silhouette/Graphtec.py b/silhouette/Graphtec.py
index cd741c13..47d47a28 100644
--- a/silhouette/Graphtec.py
+++ b/silhouette/Graphtec.py
@@ -13,10 +13,13 @@
 #             plot(bboxonly=None) is now the special case for not doing anything. False is normal plot.
 # 2015-06-05  Renamed cut_bbox() to find_bbox(). It does not cut anything.
 # 2015-06-06  refactored plot_cmds() from plot().
+# 2016-05-16  no reset per default, this helps usbip.
 
 from __future__ import print_function
 import sys, time, re
 
+usb_reset_needed = False	# https://github.com/fablabnbg/inkscape-silhouette/issues/10
+
 sys_platform = sys.platform.lower()
 if sys_platform.startswith('win'):
   import usb.core
@@ -225,14 +228,15 @@ def __init__(self, log=sys.stderr, no_device=False, progress_cb=None):
             print(msg, file=sys.stderr)
           sys.exit(0)
 
-        for i in range(5):
-          try:
-            dev.reset();
-            break
-          except usb.core.USBError as e:
-            print("reset failed: ", e, file=self.log)
-            print("retrying reset in 5 sec", file=self.log)
-            time.sleep(5)
+	if usb_reset_needed:
+          for i in range(5):
+            try:
+              dev.reset();
+              break
+            except usb.core.USBError as e:
+              print("reset failed: ", e, file=self.log)
+              print("retrying reset in 5 sec", file=self.log)
+              time.sleep(5)
 
         dev.set_configuration()
         try: