diff --git a/CHANGELOG.de.md b/CHANGELOG.de.md index 11c89ef..aaf3713 100644 --- a/CHANGELOG.de.md +++ b/CHANGELOG.de.md @@ -1,5 +1,29 @@ # Changelog +## [0.9.10] – 2026-05-17 + +> **Hinweis:** Mit diesem Release wird der Fokus von neuen Features auf +> **Stabilisierung und Bugfixing** verlagert. Die Kern-Workflows +> (Multi-Printer, Drucker hinzufügen/entfernen, Filament-Dialog, +> Skip-Objekte, Standalone-Binaries) sind funktional ausreichend — ab jetzt +> steht Robustheit vor neuen Features. Größere Feature-Wünsche (ACE Pro 2, +> Home-Assistant-Integration vervollständigen, …) bleiben vorerst im Backlog. + +### Neu +- **Objekte überspringen (vor und während des Drucks):** Aus dem AnycubicSlicerNext-Workbench-Bundle rekonstruiert — der Kobra X kann das nativ über sein Protokoll, der Anycubic-Slicer bietet es bloß nicht im UI an. Die Bridge schon, in zwei Varianten: + - **Vor dem Druck:** beim Starten eines Multi-Object-Drucks aus dem Browser-Tab hat der Filament-Dialog jetzt einen zusätzlichen Abschnitt „Objekte". Einzelne Objekte abwählen (oder Polygon direkt im Build-Plate-SVG anklicken) — sie werden vor dem Druck herausgenommen. + - **Während des Drucks:** neuer ✂-Button im Dashboard (nur während eines laufenden Drucks sichtbar). Öffnet einen Dialog mit derselben interaktiven SVG-Vorschau — Teil anklicken, bestätigen, der Drucker druckt es nicht weiter. Bereits übersprungene Teile bleiben ausgegraut, der Dialog aktualisiert sich live damit man sieht welche schon weg sind. +- **Filament-Dialog – farbige Kanal- und Slot-Marker (Issue #23):** Die GCode-Kanal-Nummer sitzt jetzt in einer farbigen Box links (Hintergrund = Kanal-Farbe, Auto-Kontrast-Text statt des alten kleinen Punktes), der zugewiesene AMS-Slot bekommt rechts neben dem Dropdown denselben Look — aktualisiert sich live wenn man die Auswahl ändert. Funktioniert mit 4 Kanälen; das Layout iteriert sauber für mehr, aber >4 echte Filament-Slots brauchen eine ACE-Pro-2-Box und sind ohne entsprechende Hardware nicht durchgängig testbar (geparkt als Feature-Request, Issues #22 und #23). + +### Intern +- Neue Helfer `kobrax_client.skip_objects(names)` / `query_skip_objects()`. +- Neue Endpunkte: `GET /kx/files/{id}/objects`, `POST /kx/skip`, `POST /kx/skip/query`, `GET /kx/skip/state`. +- SQLite-Schema: `gcode_files` bekommt die Spalten `objects_skip_parts` und `svg_image` (Auto-Migration auf bestehenden DBs). +- `_on_file` extrahiert die vom Drucker gelieferte Objektliste + SVG-Vorschau und speichert sie pro Datei. +- `_on_skip`-Callback verfolgt, welche Objekte der Drucker aktuell als übersprungen meldet. + +--- + ## [0.9.9] – 2026-05-14 ### Fixes diff --git a/CHANGELOG.md b/CHANGELOG.md index 5f28954..a4b51e9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,29 @@ # Changelog +## [0.9.10] – 2026-05-17 + +> **Heads-up:** with this release the focus shifts from new features to +> **stabilization and bug-fixing**. The core flows (multi-printer, add/remove, +> filament dialog, skip objects, standalone binaries) are feature-complete +> enough — from now on the priority is making them rock-solid before adding +> more on top. Bigger feature requests (ACE Pro 2, Home Assistant integration +> completeness, …) stay on the backlog for now. + +### New +- **Skip objects (pre-print and mid-print):** Reverse-engineered from the AnycubicSlicerNext Workbench bundle — the Kobra X actually supports object skipping over its native protocol, but the Anycubic slicer doesn't expose it. The bridge does now, in both flavors: + - **Pre-print:** when starting a multi-object print from the Browser tab, the filament dialog now has an additional "Objects" section. Uncheck individual objects (or click the polygon directly on the build-plate SVG preview) and they're stripped from the print before it starts. + - **Mid-print:** new ✂ button on the dashboard (only visible during an active print). Opens a dialog with the same interactive SVG preview — click a part to mark it for skipping, hit confirm, and the printer drops it from the rest of the run. Already-skipped parts stay greyed out and the dialog refreshes live so you can see which ones are gone. +- **Filament dialog – colored channel and slot markers (Issue #23):** the GCode channel number now sits in a colored box on the left (background = channel color, auto-contrast text instead of the old tiny dot), and the assigned AMS slot gets the same treatment on the right of the dropdown — updates live as you change the selection. Plays well with 4 channels; the layout iterates so more channels render correctly, but >4 actual filament slots still need an ACE Pro 2 hub to be testable end-to-end (parked as a feature request, Issues #22 and #23). + +### Internal +- New `kobrax_client.skip_objects(names)` / `query_skip_objects()` helpers. +- New endpoints: `GET /kx/files/{id}/objects`, `POST /kx/skip`, `POST /kx/skip/query`, `GET /kx/skip/state`. +- SQLite schema: `gcode_files` gained `objects_skip_parts` and `svg_image` columns (auto-migrates on existing DBs). +- `_on_file` now extracts the printer-provided object list + SVG preview and persists them per file. +- `_on_skip` callback tracks which objects the printer reports as currently skipped. + +--- + ## [0.9.9] – 2026-05-14 ### Fixes diff --git a/VERSION b/VERSION index 7e310ba..56f3151 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.9.9 +0.9.10 diff --git a/kobrax_client.py b/kobrax_client.py index afd9f6c..46cb099 100644 --- a/kobrax_client.py +++ b/kobrax_client.py @@ -458,6 +458,20 @@ class KobraXClient: def stop_print(self, taskid: str = "-1") -> dict | None: return self.publish("print", "stop", {"taskid": taskid}) + # -- Part-Skip ("Exclude Object") --------------------------------------- + + def query_skip_objects(self) -> dict | None: + """Fragt den Drucker nach der aktuellen Objekt-/Skip-Liste.""" + return self.publish("skip", "query_obj") + + def skip_objects(self, names: list[str]) -> dict | None: + """Überspringt die genannten Objekte – auch mid-print möglich. + + Namen entsprechen den EXCLUDE_OBJECT_DEFINE NAME=… Einträgen + im GCode-Header bzw. file_details.objects_skip_parts. + """ + return self.publish("skip", "start", {"objects_skip_parts": list(names)}) + # -- G-Code Upload ------------------------------------------------------- def upload_gcode(self, filepath: str, remote_filename: str | None = None, diff --git a/kobrax_moonraker_bridge.py b/kobrax_moonraker_bridge.py index 9cab173..3a9c73a 100644 --- a/kobrax_moonraker_bridge.py +++ b/kobrax_moonraker_bridge.py @@ -267,7 +267,9 @@ class GCodeStore: est_print_time_sec INTEGER, filament_used_mm REAL, layer_count INTEGER, - gcode_filaments TEXT + gcode_filaments TEXT, + objects_skip_parts TEXT, + svg_image TEXT ); CREATE TABLE IF NOT EXISTS print_jobs ( id TEXT PRIMARY KEY, @@ -287,6 +289,13 @@ class GCodeStore: self._conn.commit() except Exception: pass + # Migration: Spalten objects_skip_parts + svg_image (Part-Skip-Feature, v0.9.10) + for col, typ in (("objects_skip_parts", "TEXT"), ("svg_image", "TEXT")): + try: + self._conn.execute(f"ALTER TABLE gcode_files ADD COLUMN {col} {typ}") + self._conn.commit() + except Exception: + pass def save_file(self, file_id: str, filename: str, data: bytes, est_time_sec: int = 0, thumbnail_b64: str = "", @@ -330,6 +339,18 @@ class GCodeStore: ).fetchone() return dict(row) if row else None + def update_file_objects(self, filename: str, objects: list, svg: str = "") -> None: + """Speichert Objekt-Liste + optionales SVG zu einer Datei (matcht via filename).""" + if not filename: + return + with self._lock: + self._conn.execute( + "UPDATE gcode_files SET objects_skip_parts=?, svg_image=? " + "WHERE filename=?", + (json.dumps(objects), svg or "", filename), + ) + self._conn.commit() + def delete_file(self, file_id: str) -> bool: row = self.get_file(file_id) if not row: @@ -435,6 +456,9 @@ class KobraXBridge: self._thumbnail_b64: str = "" + # Part-Skip: zuletzt vom Drucker gemeldete Skip-Liste (v0.9.10) + self._skip_state: dict = {"objects": [], "skipped": [], "ts": 0} + # Register MQTT push callbacks client.callbacks["tempature/report"] = self._on_temp client.callbacks["print/report"] = self._on_print @@ -442,6 +466,7 @@ class KobraXBridge: client.callbacks["file/report"] = self._on_file client.callbacks["multiColorBox/report"] = self._on_multicolor_box client.callbacks["light/report"] = self._on_light + client.callbacks["skip/report"] = self._on_skip # ------------------------------------------------------------------------- # MQTT callbacks (called from reader thread) @@ -539,6 +564,23 @@ class KobraXBridge: self._state["print_speed_mode"] = int(speed_mode) self._push_status_update() + def _on_skip(self, payload: dict): + """skip/report-Callback (Part-Skip-Feature, v0.9.10). + + Drucker meldet hier IMMER die Liste der bereits geskippten Objekte + zurück (objects_skip_parts), egal ob auf query_obj oder nach skip/start. + Die Gesamt-Objektliste kommt aus file/report. + """ + d = payload.get("data") or {} + skipped = d.get("objects_skip_parts") or d.get("skipped") or d.get("skipped_parts") or [] + # Liste immer (auch leer) übernehmen – sonst bleibt sie auf alten Stand + self._skip_state = { + "skipped": list(skipped), + "ts": int(time.time()), + } + if payload.get("state") == "done" or payload.get("code") == 200: + log.info(f"Skip-Antwort: state={payload.get('state')} code={payload.get('code')} skipped={skipped}") + def _on_file(self, payload: dict): d = payload.get("data") or {} details = d.get("file_details") or {} @@ -546,6 +588,17 @@ class KobraXBridge: if thumb: self._thumbnail_b64 = thumb log.info(f"Vorschaubild empfangen: {len(thumb)} Zeichen base64") + # Part-Skip: Objekt-Liste + optionales SVG (v0.9.10) + objs = details.get("objects_skip_parts") or [] + svg = details.get("svg_image") or "" + if objs: + filename = d.get("filename") or details.get("filename") or self._last_uploaded_file + if filename: + try: + self._store.update_file_objects(filename, objs, svg) + log.info(f"Skip-Objekte für {filename}: {len(objs)} ({'mit SVG' if svg else 'ohne SVG'})") + except Exception as e: + log.warning(f"update_file_objects fehlgeschlagen: {e}") self._push_status_update() def _on_multicolor_box(self, payload: dict): @@ -805,6 +858,91 @@ class KobraXBridge: jobs = self._store.list_jobs(limit=limit, offset=offset) return self._json_cors({"result": jobs}) + async def handle_kx_file_objects(self, request): + """Liefert die Objekt-Liste + optionales SVG für eine Datei. + + GET /kx/files/{id}/objects → {"names": [...], "svg_b64": "..."} + Wenn Datei noch keine Objekte hat (alter Eintrag): file/fileDetails + beim Drucker abfragen und Antwort abwarten ist Aufgabe des Frontends + (Reload nach Upload). Hier nur Datenbankstand zurückgeben. + """ + fid = request.match_info.get("id", "") + f = self._store.get_file(fid) + if not f: + return self._json_cors({"error": "file not found"}, status=404) + try: + names = json.loads(f.get("objects_skip_parts") or "[]") + except Exception: + names = [] + return self._json_cors({ + "result": { + "names": names, + "svg_b64": f.get("svg_image") or "", + } + }) + + async def handle_kx_skip(self, request): + """Mid-Print Skip auslösen. + + POST /kx/skip body={"names": ["..", ".."]} + """ + try: + body = await request.json() + except Exception: + return self._json_cors({"error": "invalid json"}, status=400) + names = body.get("names") or [] + if not isinstance(names, list) or not all(isinstance(n, str) for n in names): + return self._json_cors({"error": "names must be list[str]"}, status=400) + try: + loop = asyncio.get_event_loop() + await loop.run_in_executor(None, lambda: self.client.skip_objects(names)) + except Exception as e: + return self._json_cors({"error": str(e)}, status=502) + return self._json_cors({"result": "ok", "names": names}) + + async def handle_kx_skip_query(self, request): + """Druck-Objektliste vom Drucker neu abfragen. + + POST /kx/skip/query → triggert skip/query_obj, gibt zuletzt bekannten + Stand zurück (skip/report kommt async, Frontend pollt /kx/skip/state). + """ + try: + loop = asyncio.get_event_loop() + await loop.run_in_executor(None, lambda: self.client.query_skip_objects()) + except Exception as e: + return self._json_cors({"error": str(e)}, status=502) + return self._json_cors({"result": self._skip_state}) + + async def handle_kx_skip_state(self, request): + """Aktueller Skip-State. + + Kombiniert: + - Gesamt-Objektliste: aus dem GCode-Store, gematcht über den aktuell + laufenden filename (file/report beim Druckstart hat die Liste gefüllt). + skip/query_obj liefert nämlich NUR die bereits geskippten zurück, + nicht die Gesamtliste. + - Geskippt: aus self._skip_state (von skip/report aktualisiert). + """ + filename = self._state.get("filename", "") + all_objects: list[str] = [] + svg = "" + if filename: + try: + f = self._store.get_file_by_name(filename) + if f: + all_objects = json.loads(f.get("objects_skip_parts") or "[]") + svg = f.get("svg_image") or "" + except Exception as e: + log.warning(f"skip_state lookup failed: {e}") + result = { + "objects": all_objects, + "skipped": list(self._skip_state.get("skipped", [])), + "svg_b64": svg, + "ts": self._skip_state.get("ts", 0), + "filename": filename, + } + return self._json_cors({"result": result}) + async def handle_kx_printers(self, request): # Aktive Drucker (mit IP) sammeln active = [(pid, br) for pid, br in self._all_bridges.items() @@ -848,6 +986,10 @@ class KobraXBridge: # filament_assignments: [{slot_index, material, color_hex}, …] assignments = body.get("filament_assignments") + # excluded_objects: ["name1","name2",...] – Pre-Print Skip (v0.9.10) + excluded_objects = body.get("excluded_objects") or [] + if not isinstance(excluded_objects, list): + excluded_objects = [] if assignments: ams_box_mapping = [ @@ -912,11 +1054,11 @@ class KobraXBridge: "ai_settings": {"status": 0, "count": 0, "type": 1}, "timelapse": {"status": 0, "count": 0, "type": 64}, "drying_settings": {"status": 0, "target_temp": 0, "duration": 0, "remain_time": 0}, - "model_objects_skip_parts": [], + "model_objects_skip_parts": excluded_objects, }, } - log.info(f"KX-Store Druckstart: {filename} ams={len(ams_box_mapping)} slots assignments={bool(assignments)}") + log.info(f"KX-Store Druckstart: {filename} ams={len(ams_box_mapping)} slots assignments={bool(assignments)} excluded={len(excluded_objects)}") loop = asyncio.get_event_loop() result = await loop.run_in_executor( None, lambda: self.client.publish("print", "start", payload, timeout=15.0) @@ -1210,6 +1352,10 @@ class KobraXBridge: # Optionale Slot-Auswahl aus dem Filament-Dialog filament_assignments = body.get("filament_assignments") + # Pre-Print Skip (v0.9.10) + excluded_objects = body.get("excluded_objects") or [] + if not isinstance(excluded_objects, list): + excluded_objects = [] if filament_assignments is not None: ams_box_mapping = [ { @@ -1271,7 +1417,7 @@ class KobraXBridge: "ai_settings": {"status": 0, "count": 0, "type": 0}, "timelapse": {"status": 0, "count": 0, "type": 0}, "drying_settings": {"status": 0, "target_temp": 0, "duration": 0, "remain_time": 0}, - "model_objects_skip_parts": [], + "model_objects_skip_parts": excluded_objects, }, } @@ -1423,6 +1569,7 @@ main{flex:1;overflow-y:auto;padding:20px} .btn-start{background:var(--ok);color:#0d2010} .btn-pause{background:var(--raised);color:var(--txt);border:1px solid var(--border)} .btn-resume{background:#0d2d1a;color:var(--ok);border:1px solid var(--ok)} +.btn-skip{background:var(--raised);color:var(--warn);border:1px solid var(--warn)} .btn-cancel{background:#2d0d0d;color:var(--err);border:1px solid var(--err)} .btn-accent{background:var(--accent);color:#001a24} .btn-sm{padding:7px 12px;font-size:12px} @@ -1817,6 +1964,7 @@ nav.bottom-nav{display:none;position:fixed;bottom:0;left:0;right:0;
GCode-Kanal → AMS-Slot zuweisen:
+GCode-Kanal → AMS-Slot zuweisen:
+