From 1b61682f5a478c5649be7220f57a65032e5688d8 Mon Sep 17 00:00:00 2001
From: Vyacheslav Struk <sla237@gmail.com>
Date: Thu, 1 Nov 2018 20:12:05 +0300
Subject: [PATCH 1/2] Websocket connectivity didn't work with the current
 websocket-client. Fixed.

---
 mp/conwebsock.py | 6 +++---
 requirements.txt | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/mp/conwebsock.py b/mp/conwebsock.py
index 591d0b4..7532de7 100644
--- a/mp/conwebsock.py
+++ b/mp/conwebsock.py
@@ -71,7 +71,7 @@ def run(self):
     def __del__(self):
         self.close()
 
-    def on_message(self, ws, message):
+    def on_message(self, message):
         self.fifo.extend(message)
 
         try:
@@ -79,7 +79,7 @@ def on_message(self, ws, message):
         except:
             pass
 
-    def on_error(self, ws, error):
+    def on_error(self, error):
         logging.error("websocket error: %s" % error)
 
         try:
@@ -87,7 +87,7 @@ def on_error(self, ws, error):
         except:
             pass
 
-    def on_close(self, ws):
+    def on_close(self):
         logging.info("websocket closed")
 
         try:
diff --git a/requirements.txt b/requirements.txt
index 4a46e32..de774e6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,3 +1,3 @@
 pyserial ~= 2.7
 colorama ~= 0.3.6
-websocket_client ~= 0.35.0
+websocket_client ~= 0.53.0

From b6a0ea5b28c67ae32e27099a098dd84bf8b250e3 Mon Sep 17 00:00:00 2001
From: Vyacheslav Struk <sla237@gmail.com>
Date: Thu, 1 Nov 2018 20:12:40 +0300
Subject: [PATCH 2/2] Logging fixed

---
 mp/conwebsock.py | 2 +-
 mp/mpfshell.py   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mp/conwebsock.py b/mp/conwebsock.py
index 7532de7..80db644 100644
--- a/mp/conwebsock.py
+++ b/mp/conwebsock.py
@@ -44,7 +44,7 @@ def __init__(self, ip, password):
         self.fifo = deque()
         self.fifo_lock = threading.Lock()
 
-        # websocket.enableTrace(logging.root.getEffectiveLevel() < logging.INFO)
+        websocket.enableTrace(logging.root.getEffectiveLevel() < logging.INFO)
         self.ws = websocket.WebSocketApp("ws://%s:8266" % ip,
                                          on_message=self.on_message,
                                          on_error=self.on_error,
diff --git a/mp/mpfshell.py b/mp/mpfshell.py
index e5a7ebb..a9ef24f 100644
--- a/mp/mpfshell.py
+++ b/mp/mpfshell.py
@@ -654,7 +654,7 @@ def main():
     if args.logfile is not None:
         logging.basicConfig(format=format, filename=args.logfile,level=args.loglevel)
     else:
-        logging.basicConfig(format=format, level=logging.CRITICAL)
+        logging.basicConfig(format=format, level=args.loglevel)
 
     logging.info('Micropython File Shell v%s started' % version.FULL)
     logging.info('Running on Python %d.%d using PySerial %s' \