Merge branch 'pr92' into nightly

2026-07-16 21:37:09 +02:00
parent 03089db6af cd4a8ce48e
commit e1b9480098
9 changed files with 33 additions and 0 deletions
--- a/kobrax_moonraker_bridge.py
+++ b/kobrax_moonraker_bridge.py
@@ -893,6 +893,8 @@ class KobraXBridge:
          "filament_mode":      "toolhead",
          "supplies_usage":     0,
          "ace_drying": {"status": 0, "target_temp": 0, "duration": 0, "remain_time": 0, "humidity": None, "current_temp": None},
+          "error_code":         0,
+          "pause_msg":          "",
        }
        self._ams_slots: list[dict] = []       # flat global list; each entry has global_index + box_id
        self._ams_loaded_slot: int = -1        # global slot index of currently loaded slot
@@ -1205,6 +1207,17 @@ class KobraXBridge:
        elif kobra_state in ("free", "finished", "stoped", "canceled"):
            self._camera_autostarted = False
            self._camera_user_stopped = False  # release for the next print
+        
+        if kobra_state in ("pause", "paused"):
+            pause_msg = payload.get("msg", "")
+            if pause_msg:
+                error_code = payload.get("code", 0)
+                self._state["error_code"] = error_code
+                self._state["pause_msg"] = pause_msg
+                log.warning(f"Printer paused: [{error_code}] {pause_msg}")
+        elif kobra_state in ("resuming", "resumed", "printing", "finished", "stoped", "canceled"):
+            self._state["error_code"] = 0
+            self._state["pause_msg"] = ""

        # Job-History: Druckstart erkennen
        if kobra_state == "printing" and not self._current_job_id:
@@ -4359,6 +4372,8 @@ class KobraXBridge:
            "file_ready":       s["file_ready"],
            "print_start_dialog": s.get("print_start_dialog", getattr(self._args, "print_start_dialog", 1)),
            "version":          self._read_version(),
+            "pause_msg":        s.get("pause_msg", ""),
+            "error_code":       s.get("error_code", 0),
        })

    async def handle_moonraker_database(self, request):
--- a/web/themes/default/app.js
+++ b/web/themes/default/app.js
@@ -746,6 +746,17 @@ function applyState(){
  // connection error banner – nur wenn überhaupt ein Drucker konfiguriert ist
  var banner=document.getElementById('conn-error-banner');
  if(banner){if(s.connection_error&&_printers.length>0){banner.textContent='⚠ '+tr('lbl_conn_error')+' '+s.connection_error;banner.style.display='block';}else{banner.style.display='none';}}
+  var pauseBanner=document.getElementById('pause-msg-banner');
+  if(pauseBanner){
+    if(s.pause_msg && s.print_state==='paused'){
+      var codePart = (s.error_code==0) ? ' ' :
+        ' [<a href="https://wiki.anycubic.com/en/error-codes/'+s.error_code+'-code" target="_blank">'+s.error_code+'</a>] ';
+      pauseBanner.innerHTML='⏸ '+tr('lbl_pause_reason')+codePart+s.pause_msg;
+      pauseBanner.style.display='block';
+    }else{
+      pauseBanner.style.display='none';
+    }
+  }
  var bannerVisible=false;
  var frb=document.getElementById('file-ready-banner');
  if(frb){
--- a/web/themes/default/index.html
+++ b/web/themes/default/index.html
@@ -12,6 +12,7 @@
 <body>

 <div id="conn-error-banner" style="display:none;background:#c0392b;color:#fff;padding:10px 18px;font-size:14px;text-align:center;position:sticky;top:0;z-index:999;"></div>
+<div id="pause-msg-banner" style="display:none;background:#b8860b;color:#fff;padding:10px 18px;font-size:14px;text-align:center;position:sticky;top:0;z-index:997;"></div>
 <div id="file-ready-banner" style="display:none;background:#1a6e3c;color:#fff;padding:10px 18px;font-size:14px;text-align:center;position:sticky;top:0;z-index:998;display:none;align-items:center;justify-content:center;gap:12px;flex-wrap:wrap">
  <span>📄 <span id="file-ready-name"></span></span>
  <button id="file-ready-btn" onclick="startReadyFile()"
--- a/web/translations/de.json
+++ b/web/translations/de.json
@@ -121,6 +121,7 @@
  "lbl_feed": "Einziehen",
  "lbl_layers": "Layer",
  "lbl_light": "💡 Licht",
+  "lbl_pause_reason": "Druck pausiert:",
  "lbl_remaining": "Restzeit:",
  "lbl_slicer_time": "Slicer-Schätzung:",
  "lbl_spoolman_sync_rate": "Sync-Rate (s, 0=Druckende)",
--- a/web/translations/en.json
+++ b/web/translations/en.json
@@ -121,6 +121,7 @@
  "lbl_feed": "Load",
  "lbl_layers": "Layer",
  "lbl_light": "💡 Light",
+  "lbl_pause_reason": "Print paused:",
  "lbl_remaining": "Remaining:",
  "lbl_slicer_time": "Slicer estimate:",
  "lbl_spoolman_sync_rate": "Sync rate (s, 0=end of print)",
--- a/web/translations/es.json
+++ b/web/translations/es.json
@@ -121,6 +121,7 @@
  "lbl_feed": "Cargar",
  "lbl_layers": "Capa",
  "lbl_light": "💡 Luz",
+  "lbl_pause_reason": "Impresión pausada:",
  "lbl_remaining": "Restante:",
  "lbl_slicer_time": "Estimación del slicer:",
  "lbl_spoolman_sync_rate": "Tasa de sincronización (s, 0=fin impresión)",
--- a/web/translations/fr.json
+++ b/web/translations/fr.json
@@ -121,6 +121,7 @@
  "lbl_feed": "Charger",
  "lbl_layers": "Couche",
  "lbl_light": "💡 Lumière",
+  "lbl_pause_reason": "Impression en pause :",
  "lbl_remaining": "Restant :",
  "lbl_slicer_time": "Estimation slicer :",
  "lbl_spoolman_sync_rate": "Taux de sync. (s, 0=fin impression)",
--- a/web/translations/it.json
+++ b/web/translations/it.json
@@ -121,6 +121,7 @@
  "lbl_feed": "Carica",
  "lbl_layers": "Layer",
  "lbl_light": "💡 Luce",
+  "lbl_pause_reason": "Stampa in pausa:",
  "lbl_remaining": "Rimanente:",
  "lbl_slicer_time": "Stima slicer:",
  "lbl_spoolman_sync_rate": "Frequenza sync (s, 0=fine stampa)",
--- a/web/translations/zh-cn.json
+++ b/web/translations/zh-cn.json
@@ -121,6 +121,7 @@
  "lbl_feed": "进料",
  "lbl_layers": "层",
  "lbl_light": "💡 灯光",
+  "lbl_pause_reason": "打印已暂停：",
  "lbl_remaining": "剩余时间:",
  "lbl_slicer_time": "切片预估:",
  "lbl_spoolman_sync_rate": "同步频率（秒，0=打印结束）",