Grotti 2.10.0: Orca-Senden, Slice-Ordner, ED-Strom, Hygiene.

Slice-Watch mit Ordnern/Filtern, Orca-Nachbearbeitung, Cockpit-Verlauf
mit ED, Zeitzone im Browser. Tasten-Grenze und README-API angeglichen,
toter Code entfernt, Requirements gepinnt.

grotti/moonraker.py

@@ -50,31 +50,6 @@ def _raw_matrix(points):
     return []
 
 
-def fetch_bed_mesh(host):
-    """Roh-Bettnetz von Moonraker (ohne UI-Spiegelung)."""
-    url = "http://%s/printer/objects/query?bed_mesh" % host
-    payload = fetch_json(url, timeout=10)
-    status = (payload.get("result") or {}).get("status") or {}
-    mesh = status.get("bed_mesh") or {}
-    matrix = _raw_matrix(mesh.get("probed_matrix"))
-    if not matrix:
-        matrix = _raw_matrix(mesh.get("mesh_matrix"))
-    mesh_min = mesh.get("mesh_min")
-    mesh_max = mesh.get("mesh_max")
-    if not (isinstance(mesh_min, (list, tuple)) and len(mesh_min) >= 2):
-        mesh_min = None
-    if not (isinstance(mesh_max, (list, tuple)) and len(mesh_max) >= 2):
-        mesh_max = None
-    if not matrix or mesh_min is None or mesh_max is None:
-        return None
-    return {
-        "matrix": matrix,
-        "mesh_min": [float(mesh_min[0]), float(mesh_min[1])],
-        "mesh_max": [float(mesh_max[0]), float(mesh_max[1])],
-        "profile": mesh.get("profile_name") or "",
-    }
-
-
 def store_mesh(host, shown, profile=""):
     if not shown:
         return
@@ -118,11 +93,6 @@ class PrinterError(Exception):
         self.message = message
 
 
-def is_timeout(exc):
-    text = (getattr(exc, "message", None) or str(exc) or "").lower()
-    return "zu lange nicht geantwortet" in text or "timed out" in text
-
-
 def fetch_json(url, timeout=4):
     request = urllib.request.Request(url, headers={"Accept": "application/json"})
     with urllib.request.urlopen(request, timeout=timeout) as response:
@@ -776,6 +746,16 @@ def fan_values(status):
     return speed, rpm
 
 
+def _heater_power(entry):
+    """Klipper-Einschaltdauer 0…1 (ED), sonst None."""
+    if not isinstance(entry, dict):
+        return None
+    power = entry.get("power")
+    if isinstance(power, (int, float)) and not isinstance(power, bool):
+        return max(0.0, min(1.0, float(power)))
+    return None
+
+
 def _object_names(host):
     now = time.time()
     cached = OBJECT_CACHE.get(host)
@@ -1078,8 +1058,10 @@ def query(host):
         "elapsed": stats.get("print_duration") or 0,
         "nozzle": extruder.get("temperature"),
         "nozzle_target": extruder.get("target"),
+        "nozzle_power": _heater_power(extruder),
         "bed": bed.get("temperature"),
         "bed_target": bed.get("target"),
+        "bed_power": _heater_power(bed),
         "chamber": chamber,
         "chamber_target": chamber_target,
         "filament_used": filament_used,