diff options
Diffstat (limited to 'deckit/modules')
| -rw-r--r-- | deckit/modules/k1c.py | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/deckit/modules/k1c.py b/deckit/modules/k1c.py index bc7c439..8481e91 100644 --- a/deckit/modules/k1c.py +++ b/deckit/modules/k1c.py @@ -31,7 +31,7 @@ from ..module import Module, ModuleError QUERY = ("/printer/objects/query?webhooks&print_stats&virtual_sdcard" "&extruder=temperature,target,power&heater_bed=temperature,target,power" - "&fan=speed&toolhead=position,homed_axes&gcode_move=speed_factor") + "&fan=speed&output_pin%20fan0=value&toolhead=position,homed_axes&gcode_move=speed_factor") BACKOFF = 10 # seconds between tries while the printer is off @@ -60,6 +60,10 @@ def _thumbnail(base: str, filename: str, meta: dict) -> str | None: return f"{base}/server/files/gcodes/{urllib.parse.quote(path)}" +def _first(*values): + return next((v for v in values if v is not None), None) + + def summarize(status: dict, snapshot: str | None = None) -> dict: """The panel's state from Moonraker's object status.""" ps = status.get("print_stats") or {} @@ -89,7 +93,10 @@ def summarize(status: dict, snapshot: str | None = None) -> dict: "filament": ps.get("filament_used"), "extruder": heater("extruder"), "bed": heater("heater_bed"), - "fan": (status.get("fan") or {}).get("speed"), + # Creality's firmware drives the part fan as `output_pin fan0` and + # leaves the standard `fan` object empty. + "fan": _first((status.get("fan") or {}).get("speed"), + (status.get("output_pin fan0") or {}).get("value")), "position": ((status.get("toolhead") or {}).get("position") or [None] * 3)[:3], "speed_factor": (status.get("gcode_move") or {}).get("speed_factor"), "snapshot": snapshot, |