diff options
Diffstat (limited to 'klippy/webhooks.py')
| -rw-r--r-- | klippy/webhooks.py | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/klippy/webhooks.py b/klippy/webhooks.py index 6c44b012..0379e3ab 100644 --- a/klippy/webhooks.py +++ b/klippy/webhooks.py @@ -8,7 +8,6 @@ import socket import errno import json import homing -from klippy import message_startup, message_ready SOCKET_LOCATION = "/tmp/moonraker" @@ -252,15 +251,14 @@ class WebHooks: if web_request.get_method() != 'GET': raise web_request.error("Invalid Request Method") start_args = self.printer.get_start_args() - state_message = self.printer.get_state_message() + state_message, msg_type = self.printer.get_state_message() version = start_args['software_version'] cpu_info = start_args['cpu_info'] - error = state_message != message_startup and \ - state_message != message_ready + error = msg_type == "error" web_request.send( {'cpu': cpu_info, 'version': version, 'hostname': socket.gethostname(), - 'is_ready': state_message == message_ready, + 'is_ready': msg_type == "ready", 'error_detected': error, 'message': state_message}) |