fixed import of WebSocketError, minor change to init.d script screen messages

pull/1/head
Peter Shanks 2019-04-26 15:41:03 +10:00
rodzic 8be1d79e14
commit ebf27c9d7b
4 zmienionych plików z 11 dodań i 8 usunięć

1
.gitignore vendored
Wyświetl plik

@ -8,3 +8,4 @@ thumbs.db
storage/profiles
config.py
.idea/*
kilnController.sh

Wyświetl plik

@ -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")

Wyświetl plik

@ -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
;;

Wyświetl plik

@ -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: