From ebf27c9d7bfe9cf0185f3130cfe0ef130dd66d06 Mon Sep 17 00:00:00 2001
From: Peter Shanks <botheredbybees@gmail.com>
Date: Fri, 26 Apr 2019 15:41:03 +1000
Subject: [PATCH] fixed import of WebSocketError, minor change to init.d script
 screen messages

---
 .gitignore              |  1 +
 kilncontrollerd.py      | 11 ++++++-----
 lib/init/kilncontroller |  4 ++--
 lib/max31855.py         |  3 ++-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/.gitignore b/.gitignore
index 53b63f4..6628769 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,4 @@ thumbs.db
 storage/profiles
 config.py
 .idea/*
+kilnController.sh
diff --git a/kilncontrollerd.py b/kilncontrollerd.py
index 71ab2d2..3860421 100644
--- a/kilncontrollerd.py
+++ b/kilncontrollerd.py
@@ -9,7 +9,8 @@ import bottle
 import gevent
 import geventwebsocket
 from gevent.pywsgi import WSGIServer
-from geventwebsocket.handler import WebSocketHandler
+# from geventwebsocket.handler import WebSocketHandler # not floating my boat (Peter)
+from geventwebsocket import WebSocketError
 
 try:
     sys.dont_write_bytecode = True
@@ -87,7 +88,7 @@ def handle_control():
             elif msgdict.get("cmd") == "STOP":
                 log.info("Stop command received")
                 oven.abort_run()
-        except WebSocketError:
+        except WebSocketHandler.WebSocketError:
             break
     log.info("websocket (control) closed")
 
@@ -132,7 +133,7 @@ def handle_storage():
 
                     wsock.send(json.dumps(msgdict))
                     wsock.send(get_profiles())
-        except WebSocketError:
+        except WebSocketHandler.WebSocketError:
             break
     log.info("websocket (storage) closed")
 
@@ -145,7 +146,7 @@ def handle_config():
         try:
             message = wsock.receive()
             wsock.send(get_config())
-        except WebSocketError:
+        except WebSocketHandler.WebSocketError:
             break
     log.info("websocket (config) closed")
 
@@ -159,7 +160,7 @@ def handle_status():
         try:
             message = wsock.receive()
             wsock.send("Your message was: %r" % message)
-        except WebSocketError:
+        except WebSocketHandler.WebSocketError:
             break
     log.info("websocket (status) closed")
 
diff --git a/lib/init/kilncontroller b/lib/init/kilncontroller
index 184133c..7372d5d 100644
--- a/lib/init/kilncontroller
+++ b/lib/init/kilncontroller
@@ -16,11 +16,11 @@
 export HOME
 case "$1" in
     start)
-        echo "Starting Reflow Server"
+        echo "Starting kiln controller Server"
         /home/pi/kilnController/kilncontrollerd.py  2>&1 &
     ;;
     stop)
-        echo "Stopping Reflow Server"
+        echo "Stopping kiln controller Server"
         reflow_PID=`ps auxwww | grep kilncontrollerd.py | head -1 | awk '{print $2}'`
         kill -9 $reflow_PID
     ;;
diff --git a/lib/max31855.py b/lib/max31855.py
index 69334d2..57541fe 100644
--- a/lib/max31855.py
+++ b/lib/max31855.py
@@ -73,7 +73,8 @@ class MAX31855(object):
         shortToVCC = (data_32 & 0x00000004) != 0         # SCV bit, D2
         if anyErrors:
             if noConnection:
-                raise MAX31855Error("No Connection")
+                # raise MAX31855Error("No Connection")
+                print("MAX31855Error(No Connection)")
             elif shortToGround:
                 raise MAX31855Error("Thermocouple short to ground")
             elif shortToVCC: