3D-printing/klipper
1
0
Fork 0
mirror of https://github.com/Klipper3d/klipper.git synced 2025-07-07 23:17:37 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

klippy: return message category in get_state_message()

Browse source 
Signed-off-by:  Eric Callahan <arksine.code@gmail.com>
This commit is contained in:
Arksine 2020-06-23 07:56:50 -04:00 • committed by KevinOConnor
parent 2d2c09a0a3
commit 014c06f8a2
3 changed files with 12 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

8
klippy/webhooks.py
View file

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