Merge branch 'master' into test_bottle_drop_paul

This commit is contained in:
Lorenz Meier 2014-08-12 08:22:05 +02:00
commit 32e1bd15b8
1 changed files with 1 additions and 1 deletions

View File

@ -180,7 +180,7 @@ class uploader(object):
def __init__(self, portname, baudrate):
# open the port, keep the default timeout short so we can poll quickly
self.port = serial.Serial(portname, baudrate, timeout=0.5)
self.port = serial.Serial(portname, baudrate, timeout=2.0)
self.otp = b''
self.sn = b''