Bootloader: Allow to set i2c addr

[pyshared.git] / net.py

diff --git a/net.py b/net.py
index 90929369c991f84ae14415d1de0ea91a2b65d7a1..61655fca4146ff26f22d92371735c8f421a78040 100755 (executable)
--- a/net.py
+++ b/net.py
@@ -6,7 +6,7 @@ import logging
 import traceback
 from threading import Thread
 from time import sleep
-from protocoll import *
+from protocol import *
 
 logger = logging.getLogger(__name__)
 
@@ -35,7 +35,7 @@ class NetServer(Thread):
                        except:
                                continue
                        logger.debug("New Connection")
-                       proto = Protocoll(NetWrapper(conn))
+                       proto = Protocol(NetWrapper(conn))
                        if self.handler_connect:
                                self.handler_connect(proto)
                        while True:
@@ -85,7 +85,7 @@ class NetWrapper:
        def close(self):
                return self.sck.close()
 
-class NetClient(Protocoll, Thread):
+class NetClient(Protocol, Thread):
        def __init__(self, kTarget, handler=None):
                Thread.__init__(self)
                self.setDaemon(True)
@@ -93,7 +93,7 @@ class NetClient(Protocoll, Thread):
                self.comm.connect(kTarget)
                self.comm.setblocking(0)
                self.comm.settimeout(0.01)
-               Protocoll.__init__(self, NetWrapper(self.comm))
+               Protocol.__init__(self, NetWrapper(self.comm))
                self.handler = handler
                self.bRun = False
 
@@ -124,7 +124,7 @@ class NetClient(Protocoll, Thread):
                 while True:
                         i+=1
                         try:
-                                return Protocoll.receive(self)
+                                return Protocol.receive(self)
                         except:
                                 if i > 300:
                                         raise