Fix the issue with tos-deluge not timing out properly.

[tinyos-2.x.git] / support / sdk / python / tos.py

diff --git a/support/sdk/python/tos.py b/support/sdk/python/tos.py
index ea140385938ecca4e2e5a93a7802a93ea2687ba9..dee4de43af77364e5d3abbcfeb4d61ce6222d280 100644 (file)
--- a/support/sdk/python/tos.py
+++ b/support/sdk/python/tos.py
@@ -90,6 +90,11 @@ class Serial:
         self.ackTimeout = ackTimeout
         self._ts = None
 
+        if port.startswith('COM') or port.startswith('com'):
+            port = int(port[3:]) - 1
+        elif port.isdigit():
+            port = int(port) - 1
+
         self._s = serial.Serial(port, int(baudrate), rtscts=0, timeout=0.5)
         self._s.flushInput()
         if flush:
@@ -443,6 +448,8 @@ class AM(SimpleAM):
         r = super(AM, self).write(packet, amId, timeout, blocking)
         while not r:
             r = super(AM, self).write(packet, amId, timeout, blocking, inc=0)
+            if timeout and not r:
+               raise Timeout
         return True