Compare commits
13 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 618f1039c3 | |||
| e98a3706be | |||
| e8bd362d34 | |||
| 377a7a4984 | |||
| 9279036c51 | |||
| ce63cc5e7a | |||
| 5c83cc6df0 | |||
| be11217896 | |||
| 0292785fd8 | |||
| 50419fb487 | |||
| f196b8d29a | |||
| 1d3c5a7e1b | |||
| c22296d880 |
@@ -21,3 +21,4 @@ DEVICE_ID=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
|
|||||||
|
|
||||||
# Modell-ID (Kobra X Standard: 20030)
|
# Modell-ID (Kobra X Standard: 20030)
|
||||||
MODE_ID=20030
|
MODE_ID=20030
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,65 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [0.9.7] – 2026-05-08
|
||||||
|
|
||||||
|
### Neu
|
||||||
|
- **fetch_credentials-Tool:** Ruft MQTT-Credentials direkt vom Drucker per HTTP ab — kein laufender Anycubic Slicer nötig, nur die Drucker-IP. Linux-Binary und Windows-EXE im Release enthalten. (Beitrag von bebu, PR #19)
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
- **Upload großer GCode-Dateien:** Dateien >1 MB wurden mit HTTP 413 abgelehnt — aiohttp `client_max_size` auf 256 MB erhöht
|
||||||
|
- **Upload-Timeout:** Socket-Timeout nach GCode-Upload von 10s auf 120s erhöht — große Dateien führten zu einem Absturz der Bridge mit leerer Antwort während der Drucker noch verarbeitete
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## [0.9.6] – 2026-05-02
|
||||||
|
|
||||||
|
### Neu
|
||||||
|
- **Licht-Status-Synchronisierung:** Ein/Aus-Zustand und Helligkeit des Druckerlichts werden jetzt live über `light/report` MQTT gelesen — der Licht-Toggle in der UI spiegelt den echten Druckerstatus wider
|
||||||
|
- **Zeit-Minicards:** Fortschritts-Panel zeigt jetzt drei Karten — Verstrichen, Restzeit und Slicer-Schätzung — sowie einen Layer-Badge neben dem Fortschrittsbalken
|
||||||
|
- **Slicer-Schätzzeit aus GCode:** Geschätzte Druckzeit wird direkt aus der hochgeladenen GCode-Datei gelesen (OrcaSlicer: `; total estimated time:` am Dateiende, PrusaSlicer: `; estimated printing time` im Header)
|
||||||
|
- **Erweiterte Druckerstatus-Strings:** `pausing`, `paused`, `resuming`, `resumed`, `stopping`, `stopped` hinzugefügt — fehlten bisher und ließen die UI rohe Status-Codes bei Pause/Fortsetzen/Stopp anzeigen
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
- **file_ready-Banner:** Upload-Banner wird nach Stopp oder Abbruch eines Drucks nicht mehr angezeigt
|
||||||
|
- **Zeitanzeige bei Stopp/Abbruch:** Verstrichen-, Restzeit- und Slicer-Schätzung werden auf null zurückgesetzt wenn ein Druck gestoppt oder abgebrochen wird
|
||||||
|
- **start.sh:** `config/`-Verzeichnis und `config.ini.example` werden beim ersten Start automatisch angelegt wenn sie fehlen (Issue #15)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## [0.9.5] – 2026-05-01
|
||||||
|
|
||||||
|
### Neu
|
||||||
|
- **Upload-Banner:** Nach „Nur hochladen" erscheint ein grüner Banner mit Dateiname — „▶ Druck starten" startet den Druck direkt, „✕ Abbrechen" schließt den Banner
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
- **Auto-Print:** `auto_print` wurde nach dem Multipart-Loop immer auf `False` zurückgesetzt — OrcaSlicer „Hochladen und drucken" startete den Druck nie automatisch
|
||||||
|
- **Thumbnail:** Vorschaubild wird jetzt auch bei „Nur hochladen" angezeigt — Bridge fragt `fileDetails` direkt nach dem Upload an
|
||||||
|
- **Log Auto-Scroll:** Scroll-Position bleibt erhalten wenn Auto-Scroll deaktiviert ist — kein ungewollter Sprung nach oben mehr
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## [0.9.4] – 2026-05-01
|
||||||
|
|
||||||
|
### Neu
|
||||||
|
- **AMS-Slot-Editor:** Slot im AMS-Panel anklicken → Dialog mit Farbpicker und Material-Auswahl (Schnellbuttons: PLA/PETG/ABS/ASA/TPU/PA/PC/HIPS oder Freitext) direkt im Browser
|
||||||
|
- **Verbessertes Log-Panel:** Vollständige MQTT-Payloads (keine Kürzung mehr), Richtungsfilter (Alle/RX/TX) und Topic-Schnellfilter (AMS / print / info / status)
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
- **i18n:** Kamera-Placeholder-Text und Log-Richtungs-Button „Alle" werden jetzt korrekt beim Sprachwechsel übersetzt
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## [0.9.3] – 2026-05-01
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
- **Update-Check:** Stable-User erhalten keine Dev-Pre-Releases mehr — `STABLE_RELEASE_API` hatte `pre-release=true`, wodurch stabile Installationen Dev-Builds statt stabiler Releases fanden (Issue #14)
|
||||||
|
- **Version nach Update:** `VERSION`-Datei wird jetzt im Docker-Image mitgeliefert (`COPY VERSION .`) — `_write_version()` benötigt eine vorhandene Datei, ohne die wurde die Version nach dem Self-Update nie aktualisiert (Issue #14)
|
||||||
|
|
||||||
|
### Neu
|
||||||
|
- **Version im Header:** Laufende Version wird im Web-UI-Header neben dem Druckernamen angezeigt — kein Öffnen der Einstellungen nötig (Issue #14)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## [0.9.2] – 2026-04-29
|
## [0.9.2] – 2026-04-29
|
||||||
|
|
||||||
### ⚠️ Breaking Change: Konfiguration wechselt von `.env` zu `config/config.ini`
|
### ⚠️ Breaking Change: Konfiguration wechselt von `.env` zu `config/config.ini`
|
||||||
|
|||||||
60
CHANGELOG.md
60
CHANGELOG.md
@@ -1,5 +1,65 @@
|
|||||||
# Changelog
|
# Changelog
|
||||||
|
|
||||||
|
## [0.9.7] – 2026-05-08
|
||||||
|
|
||||||
|
### New
|
||||||
|
- **fetch_credentials tool:** Fetches and decrypts MQTT credentials directly from the printer via HTTP — no running Anycubic Slicer required, only the printer IP needed. Linux binary and Windows EXE included in release. (Contributed by bebu, PR #19)
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
- **Large GCode upload:** Files >1 MB were rejected with HTTP 413 — aiohttp `client_max_size` raised to 256 MB
|
||||||
|
- **Upload timeout:** Socket timeout after GCode upload raised from 10s to 120s — large files caused the bridge to crash with an empty response while the printer was still processing
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## [0.9.6] – 2026-05-02
|
||||||
|
|
||||||
|
### New
|
||||||
|
- **Light status sync:** Light on/off state and brightness are now read live from the printer via `light/report` MQTT message — the light toggle in the UI reflects the actual printer state
|
||||||
|
- **Time mini-cards:** Progress panel now shows three cards — Elapsed, Remaining and Slicer estimate — with a layer counter badge next to the progress bar
|
||||||
|
- **Slicer estimate from GCode:** Estimated print time is parsed directly from the uploaded GCode file (OrcaSlicer: `; total estimated time:` at end of file, PrusaSlicer: `; estimated printing time` in header)
|
||||||
|
- **Extended printer status strings:** Added `pausing`, `paused`, `resuming`, `resumed`, `stopping`, `stopped` states — previously missing, causing the UI to show raw status codes during pause/resume/stop transitions
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
- **file_ready banner:** Upload banner is no longer shown after print stop or cancel
|
||||||
|
- **Timers on stop/cancel:** Elapsed, remaining and slicer estimate times are reset to zero when a print is stopped or cancelled
|
||||||
|
- **start.sh:** `config/` directory and `config.ini.example` are now created automatically on first run if missing (Issue #15)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## [0.9.5] – 2026-05-01
|
||||||
|
|
||||||
|
### New
|
||||||
|
- **Upload banner:** After "Upload only", a green banner appears with the filename — "▶ Start Print" starts the print directly, "✕ Cancel" dismisses the banner
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
- **Auto-print:** `auto_print` was always reset to `False` after the multipart loop — OrcaSlicer "Upload and print" never started the print automatically
|
||||||
|
- **Thumbnail:** Preview image is now shown after "Upload only" — bridge requests `fileDetails` immediately after upload
|
||||||
|
- **Log auto-scroll:** Scroll position is preserved when auto-scroll is disabled — no more unwanted jump to top
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## [0.9.4] – 2026-05-01
|
||||||
|
|
||||||
|
### New
|
||||||
|
- **AMS slot editor:** Click any slot in the AMS panel to open an edit dialog — set color (color picker) and material (preset buttons: PLA/PETG/ABS/ASA/TPU/PA/PC/HIPS or free text) directly from the browser
|
||||||
|
- **Improved log panel:** Full MQTT payloads (no truncation), direction filter (All/RX/TX) and topic quick-filter buttons (AMS / print / info / status)
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
- **i18n:** Camera placeholder text and log direction "All" button now correctly translated on language switch
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## [0.9.3] – 2026-05-01
|
||||||
|
|
||||||
|
### Fixes
|
||||||
|
- **Update check:** Stable users no longer receive dev pre-releases — `STABLE_RELEASE_API` had `pre-release=true` which caused stable installs to find dev builds instead of stable releases (Issue #14)
|
||||||
|
- **Version after update:** `VERSION` file is now included in the Docker image (`COPY VERSION .`) — `_write_version()` requires the file to exist, without it the version was never updated after self-update (Issue #14)
|
||||||
|
|
||||||
|
### New
|
||||||
|
- **Version in header:** Running version shown in the Web-UI header next to the printer name — no need to open Settings to check (Issue #14)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## [0.9.2] – 2026-04-29
|
## [0.9.2] – 2026-04-29
|
||||||
|
|
||||||
### ⚠️ Breaking Change: Configuration moves from `.env` to `config/config.ini`
|
### ⚠️ Breaking Change: Configuration moves from `.env` to `config/config.ini`
|
||||||
|
|||||||
16
Dockerfile
16
Dockerfile
@@ -2,17 +2,17 @@ FROM python:3.11-slim
|
|||||||
|
|
||||||
WORKDIR /app
|
WORKDIR /app
|
||||||
|
|
||||||
COPY bridge/requirements.txt .
|
COPY requirements.txt .
|
||||||
RUN pip install --no-cache-dir -r requirements.txt
|
RUN pip install --no-cache-dir -r requirements.txt
|
||||||
|
|
||||||
COPY bridge/kobrax_moonraker_bridge.py .
|
COPY kobrax_moonraker_bridge.py .
|
||||||
COPY bridge/config_loader.py .
|
COPY config_loader.py .
|
||||||
COPY bridge/env_loader.py .
|
COPY env_loader.py .
|
||||||
COPY bridge/kobrax_client.py .
|
COPY kobrax_client.py .
|
||||||
COPY VERSION .
|
COPY VERSION .
|
||||||
COPY bridge/anycubic_slicer.crt .
|
COPY anycubic_slicer.crt .
|
||||||
COPY bridge/anycubic_slicer.key .
|
COPY anycubic_slicer.key .
|
||||||
COPY bridge/config/config.ini.example /app/config/config.ini.example
|
COPY config/config.ini.example /app/config/config.ini.example
|
||||||
|
|
||||||
# config/ ist ein Volume-Mountpoint – beim Start wird config.ini aus .env migriert
|
# config/ ist ein Volume-Mountpoint – beim Start wird config.ini aus .env migriert
|
||||||
# falls noch keine config.ini vorhanden ist.
|
# falls noch keine config.ini vorhanden ist.
|
||||||
|
|||||||
37
README.de.md
37
README.de.md
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
# KX-Bridge – Anycubic Kobra X
|
# KX-Bridge – Anycubic Kobra X
|
||||||
|
|
||||||
**Version:** 0.9.2
|
**Version:** 0.9.7
|
||||||
|
|
||||||
Steuere deinen **Anycubic Kobra X** mit OrcaSlicer — ohne Klipper, ohne Raspberry Pi.
|
Steuere deinen **Anycubic Kobra X** mit OrcaSlicer — ohne Klipper, ohne Raspberry Pi.
|
||||||
KX-Bridge ist eine Moonraker-kompatible Bridge die direkt mit dem Drucker kommuniziert.
|
KX-Bridge ist eine Moonraker-kompatible Bridge die direkt mit dem Drucker kommuniziert.
|
||||||
@@ -18,13 +18,23 @@ Den Kobra X in den LAN-Modus versetzen:
|
|||||||
|
|
||||||
### Schritt 2 – Credentials holen
|
### Schritt 2 – Credentials holen
|
||||||
|
|
||||||
Die MQTT-Zugangsdaten sind druckerspezifisch. So holst du sie:
|
Die MQTT-Zugangsdaten sind druckerspezifisch und an die Hardware gebunden.
|
||||||
|
|
||||||
|
**Option A – fetch_credentials (empfohlen):**
|
||||||
|
|
||||||
|
```bash
|
||||||
|
fetch_credentials --ip 192.168.x.x --write-config
|
||||||
|
```
|
||||||
|
|
||||||
|
Holt die Credentials direkt per HTTP vom Drucker und schreibt sie automatisch in `config/config.ini`. Benötigt nur die Drucker-IP — kein Slicer nötig.
|
||||||
|
|
||||||
|
**Option B – extract_credentials (wenn Drucker-IP unbekannt):**
|
||||||
|
|
||||||
1. **AnycubicSlicerNext** öffnen und Drucker verbinden (bis Status angezeigt wird)
|
1. **AnycubicSlicerNext** öffnen und Drucker verbinden (bis Status angezeigt wird)
|
||||||
2. **`extract_credentials.exe`** (Windows) oder **`extract_credentials`** (Linux) ausführen — gibt Username, Password, Device-ID und Drucker-IP aus
|
2. **`extract_credentials`** ausführen — gibt Username, Password, Device-ID und Drucker-IP aus
|
||||||
3. Werte merken / kopieren
|
3. Werte im Web-UI eintragen (⚙-Menü)
|
||||||
|
|
||||||
> **Download:** [gitea.it-drui.de/viewit/KX-Bridge-Release/releases](https://gitea.it-drui.de/viewit/KX-Bridge-Release/releases) → `extract_credentials.exe` (Windows) / `extract_credentials` (Linux) im jeweiligen Release-Asset
|
> **Download:** [gitea.it-drui.de/viewit/KX-Bridge-Release/releases](https://gitea.it-drui.de/viewit/KX-Bridge-Release/releases) → `fetch_credentials` / `extract_credentials` (Linux & Windows) im jeweiligen Release-Asset
|
||||||
|
|
||||||
### Schritt 3 – Bridge starten
|
### Schritt 3 – Bridge starten
|
||||||
|
|
||||||
@@ -36,7 +46,7 @@ Das Skript baut das Docker-Image automatisch beim ersten Aufruf.
|
|||||||
|
|
||||||
**Web-UI öffnen:** `http://BRIDGE-IP:7125`
|
**Web-UI öffnen:** `http://BRIDGE-IP:7125`
|
||||||
→ Das ⚙-Menü öffnet sich beim ersten Start automatisch
|
→ Das ⚙-Menü öffnet sich beim ersten Start automatisch
|
||||||
→ Credentials aus Schritt 2 eintragen → **Speichern & Neustart**
|
→ Bei Option B: Credentials aus Schritt 2 eintragen → **Speichern & Neustart**
|
||||||
|
|
||||||
**OrcaSlicer verbinden:**
|
**OrcaSlicer verbinden:**
|
||||||
Drucker → Verbindungstyp **Moonraker** → Host: `http://BRIDGE-IP:7125`
|
Drucker → Verbindungstyp **Moonraker** → Host: `http://BRIDGE-IP:7125`
|
||||||
@@ -46,6 +56,12 @@ Drucker → Verbindungstyp **Moonraker** → Host: `http://BRIDGE-IP:7125`
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## 📺 Video Tutorial
|
||||||
|
|
||||||
|
[](https://www.youtube.com/watch?v=1Ql4wfH27fM)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## ⚠️ Update von 0.9.1 oder älter
|
## ⚠️ Update von 0.9.1 oder älter
|
||||||
|
|
||||||
Ab **0.9.2** speichert KX-Bridge Einstellungen in `config/config.ini` statt in `.env`.
|
Ab **0.9.2** speichert KX-Bridge Einstellungen in `config/config.ini` statt in `.env`.
|
||||||
@@ -110,7 +126,8 @@ docker-compose down
|
|||||||
## Fehlerbehebung
|
## Fehlerbehebung
|
||||||
|
|
||||||
**„Falsche MQTT-Zugangsdaten"** beim Start:
|
**„Falsche MQTT-Zugangsdaten"** beim Start:
|
||||||
- AnycubicSlicerNext neu starten, Drucker verbinden, `extract_credentials` erneut ausführen
|
- `fetch_credentials --ip <Drucker-IP> --write-config` erneut ausführen und Bridge neu starten
|
||||||
|
- Wenn IP unbekannt: AnycubicSlicerNext neu starten, Drucker verbinden, `extract_credentials` erneut ausführen
|
||||||
- Nur die IP-Adresse ins Feld eintragen, keinen Port (✗ `192.168.1.102:9883` → ✓ `192.168.1.102`)
|
- Nur die IP-Adresse ins Feld eintragen, keinen Port (✗ `192.168.1.102:9883` → ✓ `192.168.1.102`)
|
||||||
|
|
||||||
**Drucker nicht gefunden / kein LAN-Modus:**
|
**Drucker nicht gefunden / kein LAN-Modus:**
|
||||||
@@ -135,3 +152,9 @@ sudo usermod -aG docker $USER # dann neu einloggen
|
|||||||
## Lizenz & Rechtliches
|
## Lizenz & Rechtliches
|
||||||
|
|
||||||
Interoperabilitätsforschung gem. §69e UrhG — ausschließlich private, nicht-kommerzielle Nutzung.
|
Interoperabilitätsforschung gem. §69e UrhG — ausschließlich private, nicht-kommerzielle Nutzung.
|
||||||
|
|
||||||
|
<p align="center">
|
||||||
|
<a href="https://ko-fi.com/viewitde">
|
||||||
|
<img src="https://ko-fi.com/img/githubbutton_sm.svg" alt="Ko-fi Support"/>
|
||||||
|
</a>
|
||||||
|
</p>
|
||||||
|
|||||||
14
README.md
14
README.md
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
# KX-Bridge – Anycubic Kobra X
|
# KX-Bridge – Anycubic Kobra X
|
||||||
|
|
||||||
**Version:** 0.9.2
|
**Version:** 0.9.7
|
||||||
|
|
||||||
Control your **Anycubic Kobra X** with OrcaSlicer — no Klipper, no Raspberry Pi.
|
Control your **Anycubic Kobra X** with OrcaSlicer — no Klipper, no Raspberry Pi.
|
||||||
KX-Bridge is a Moonraker-compatible bridge that communicates directly with the printer.
|
KX-Bridge is a Moonraker-compatible bridge that communicates directly with the printer.
|
||||||
@@ -46,6 +46,12 @@ Printer → Connection type **Moonraker** → Host: `http://BRIDGE-IP:7125`
|
|||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
|
## 📺 Video Tutorial
|
||||||
|
|
||||||
|
[](https://www.youtube.com/watch?v=1Ql4wfH27fM)
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
## ⚠️ Upgrading from 0.9.1 or earlier
|
## ⚠️ Upgrading from 0.9.1 or earlier
|
||||||
|
|
||||||
Starting with **0.9.2**, KX-Bridge stores settings in `config/config.ini` instead of `.env`.
|
Starting with **0.9.2**, KX-Bridge stores settings in `config/config.ini` instead of `.env`.
|
||||||
@@ -135,3 +141,9 @@ sudo usermod -aG docker $USER # then log out and back in
|
|||||||
## License
|
## License
|
||||||
|
|
||||||
Interoperability research under §69e UrhG — private, non-commercial use only.
|
Interoperability research under §69e UrhG — private, non-commercial use only.
|
||||||
|
|
||||||
|
<p align="center">
|
||||||
|
<a href="https://ko-fi.com/viewitde">
|
||||||
|
<img src="https://ko-fi.com/img/githubbutton_sm.svg" alt="Ko-fi Support"/>
|
||||||
|
</a>
|
||||||
|
</p>
|
||||||
|
|||||||
397
fetch_credentials.py
Normal file
397
fetch_credentials.py
Normal file
@@ -0,0 +1,397 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
|
"""
|
||||||
|
fetch_credentials.py – Fetches and decrypts Anycubic Kobra X credentials via HTTP API.
|
||||||
|
|
||||||
|
Original approach by bebu (PR #19, KX-Bridge-Release).
|
||||||
|
Reverse engineered from the Vue project embedded in libWorkbench.so (Anycubic Slicer Next).
|
||||||
|
No running slicer required — only the printer IP in LAN.
|
||||||
|
|
||||||
|
Algorithm: AES-256-CBC
|
||||||
|
Key: token[16:32] from /info response
|
||||||
|
IV: response token from /ctrl response
|
||||||
|
|
||||||
|
Usage:
|
||||||
|
python3 fetch_credentials.py --ip 192.168.x.x
|
||||||
|
python3 fetch_credentials.py --ip 192.168.x.x --write-config
|
||||||
|
python3 fetch_credentials.py --ip 192.168.x.x --write-config --config-file ../config/config.ini
|
||||||
|
python3 fetch_credentials.py --ctrl ctrl.json --info info.json
|
||||||
|
"""
|
||||||
|
|
||||||
|
import json
|
||||||
|
import sys
|
||||||
|
import base64
|
||||||
|
import hashlib
|
||||||
|
import argparse
|
||||||
|
import os
|
||||||
|
import time
|
||||||
|
import random
|
||||||
|
import string
|
||||||
|
import requests
|
||||||
|
from pathlib import Path
|
||||||
|
from Crypto.Cipher import AES
|
||||||
|
from Crypto.Util.Padding import unpad
|
||||||
|
|
||||||
|
|
||||||
|
def evp_bytes_to_key(password, salt, key_len, iv_len):
|
||||||
|
"""
|
||||||
|
Derive key and IV from password and salt using OpenSSL EVP_BytesToKey
|
||||||
|
This mimics the CryptoJS default key derivation
|
||||||
|
"""
|
||||||
|
m = []
|
||||||
|
i = 0
|
||||||
|
while len(b''.join(m)) < (key_len + iv_len):
|
||||||
|
md5 = hashlib.md5()
|
||||||
|
data = password + salt
|
||||||
|
if i > 0:
|
||||||
|
data = m[i - 1] + password + salt
|
||||||
|
md5.update(data)
|
||||||
|
m.append(md5.digest())
|
||||||
|
i += 1
|
||||||
|
ms = b''.join(m)
|
||||||
|
return ms[:key_len], ms[key_len:key_len + iv_len]
|
||||||
|
|
||||||
|
|
||||||
|
def generate_signature(token, ts, nonce):
|
||||||
|
"""
|
||||||
|
Generate MD5 signature for /ctrl endpoint
|
||||||
|
Signature = md5(md5(token[0:16]) + ts + nonce)
|
||||||
|
"""
|
||||||
|
# First MD5: token.slice(0, 16)
|
||||||
|
first_md5 = hashlib.md5(token[:16].encode('utf-8')).hexdigest()
|
||||||
|
# Second MD5: first_md5 + ts + nonce
|
||||||
|
signature_data = first_md5 + str(ts) + nonce
|
||||||
|
signature = hashlib.md5(signature_data.encode('utf-8')).hexdigest()
|
||||||
|
return signature
|
||||||
|
|
||||||
|
|
||||||
|
def generate_nonce(length=6):
|
||||||
|
"""Generate a random alphanumeric nonce"""
|
||||||
|
chars = string.ascii_letters + string.digits
|
||||||
|
return ''.join(random.choice(chars) for _ in range(length))
|
||||||
|
|
||||||
|
|
||||||
|
def fetch_from_http(ip, port, endpoint, token=None, did="random", verbose=False):
|
||||||
|
"""
|
||||||
|
Fetch data from HTTP endpoint on the printer
|
||||||
|
|
||||||
|
Args:
|
||||||
|
ip (str): IP address of the printer
|
||||||
|
port (int): Port number (default 18910)
|
||||||
|
endpoint (str): Either 'info' or 'ctrl'
|
||||||
|
token (str): Device token (required for /ctrl endpoint)
|
||||||
|
did (str): Device ID (required for /ctrl endpoint)
|
||||||
|
verbose (bool): Print debug information
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
dict: JSON response data
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
if endpoint == 'info':
|
||||||
|
url = f"http://{ip}:{port}/info"
|
||||||
|
if verbose:
|
||||||
|
print(f"Fetching: {url}")
|
||||||
|
response = requests.get(url, timeout=10)
|
||||||
|
response.raise_for_status()
|
||||||
|
return response.json()
|
||||||
|
|
||||||
|
elif endpoint == 'ctrl':
|
||||||
|
if not token:
|
||||||
|
raise ValueError("Token is required for /ctrl endpoint")
|
||||||
|
|
||||||
|
# Generate signature parameters
|
||||||
|
ts = int(time.time() * 1000) # Current timestamp in ms
|
||||||
|
nonce = generate_nonce(6)
|
||||||
|
signature = generate_signature(token, ts, nonce)
|
||||||
|
|
||||||
|
url = f"http://{ip}:{port}/ctrl"
|
||||||
|
params = {
|
||||||
|
'ts': ts,
|
||||||
|
'nonce': nonce,
|
||||||
|
'sign': signature,
|
||||||
|
'did': did
|
||||||
|
}
|
||||||
|
|
||||||
|
if verbose:
|
||||||
|
print(f"Fetching: {url}")
|
||||||
|
print(f" Parameters:")
|
||||||
|
print(f" ts: {ts}")
|
||||||
|
print(f" nonce: {nonce}")
|
||||||
|
print(f" sign: {signature}")
|
||||||
|
print(f" did: {did}")
|
||||||
|
|
||||||
|
response = requests.post(url, params=params, timeout=10)
|
||||||
|
response.raise_for_status()
|
||||||
|
return response.json()
|
||||||
|
|
||||||
|
else:
|
||||||
|
raise ValueError(f"Unknown endpoint: {endpoint}")
|
||||||
|
|
||||||
|
except requests.exceptions.RequestException as e:
|
||||||
|
raise Exception(f"HTTP request failed for {endpoint}: {e}")
|
||||||
|
except json.JSONDecodeError as e:
|
||||||
|
raise Exception(f"Invalid JSON response from {endpoint}: {e}")
|
||||||
|
|
||||||
|
|
||||||
|
def decrypt_text(encrypted_data, key, iv):
|
||||||
|
"""
|
||||||
|
Decrypt data using AES-256-CBC
|
||||||
|
Handles CryptoJS-style encrypted data (OpenSSL format with salt)
|
||||||
|
|
||||||
|
Args:
|
||||||
|
encrypted_data (str): Encrypted data string (CryptoJS format)
|
||||||
|
key (str): Decryption key string
|
||||||
|
iv (str): Initialization vector string
|
||||||
|
|
||||||
|
Returns:
|
||||||
|
dict: Decrypted JSON data
|
||||||
|
"""
|
||||||
|
try:
|
||||||
|
# Convert key and IV to bytes
|
||||||
|
key_bytes = key.encode('utf-8')
|
||||||
|
iv_bytes = iv.encode('utf-8')
|
||||||
|
|
||||||
|
# Decrypt using direct key and IV (as per the original code)
|
||||||
|
cipher = AES.new(key_bytes, AES.MODE_CBC, iv_bytes)
|
||||||
|
|
||||||
|
# The encrypted_data might be base64 or hex encoded
|
||||||
|
# Try base64 first
|
||||||
|
try:
|
||||||
|
encrypted_bytes = base64.b64decode(encrypted_data)
|
||||||
|
except:
|
||||||
|
try:
|
||||||
|
# Try as hex
|
||||||
|
encrypted_bytes = bytes.fromhex(encrypted_data)
|
||||||
|
except:
|
||||||
|
# If all else fails, encode as UTF-8
|
||||||
|
encrypted_bytes = encrypted_data.encode('utf-8')
|
||||||
|
|
||||||
|
# Decrypt
|
||||||
|
decrypted = cipher.decrypt(encrypted_bytes)
|
||||||
|
|
||||||
|
# Try to unpad
|
||||||
|
try:
|
||||||
|
unpadded = unpad(decrypted, AES.block_size)
|
||||||
|
except ValueError:
|
||||||
|
# If unpadding fails, use as-is
|
||||||
|
unpadded = decrypted
|
||||||
|
|
||||||
|
plaintext = unpadded.decode('utf-8')
|
||||||
|
|
||||||
|
# Parse JSON
|
||||||
|
return json.loads(plaintext)
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
return {"error": str(e), "error_type": type(e).__name__}
|
||||||
|
|
||||||
|
|
||||||
|
def main():
|
||||||
|
"""Main function to decrypt printer data"""
|
||||||
|
|
||||||
|
# Parse command-line arguments
|
||||||
|
parser = argparse.ArgumentParser(
|
||||||
|
description='Fetch and decrypt Anycubic Kobra X credentials via HTTP API',
|
||||||
|
)
|
||||||
|
# HTTP mode
|
||||||
|
parser.add_argument('--ip', help='IP address of the printer')
|
||||||
|
parser.add_argument('--port', type=int, default=18910, help='Printer HTTP port (default: 18910)')
|
||||||
|
|
||||||
|
# File mode
|
||||||
|
parser.add_argument('--ctrl', default='ctrl.json', help='Path to ctrl.json (default: ctrl.json)')
|
||||||
|
parser.add_argument('--info', default='info.json', help='Path to info.json (default: info.json)')
|
||||||
|
|
||||||
|
# Output
|
||||||
|
parser.add_argument('--output', default=None, help='Save raw decrypted JSON to file (optional)')
|
||||||
|
parser.add_argument('--write-config', action='store_true',
|
||||||
|
help='Write credentials to config.ini')
|
||||||
|
parser.add_argument('--config-file', default=None,
|
||||||
|
help='Path to config.ini (default: ../config/config.ini relative to this script)')
|
||||||
|
parser.add_argument('--verbose', '-v', action='store_true', help='Verbose output')
|
||||||
|
|
||||||
|
args = parser.parse_args()
|
||||||
|
|
||||||
|
# Determine mode: HTTP or file
|
||||||
|
if args.ip:
|
||||||
|
# HTTP mode: fetch from printer
|
||||||
|
if args.verbose:
|
||||||
|
print("=" * 70)
|
||||||
|
print("Fetching configuration from printer via HTTP")
|
||||||
|
print("=" * 70)
|
||||||
|
print(f"Printer IP: {args.ip}:{args.port}")
|
||||||
|
print()
|
||||||
|
|
||||||
|
try:
|
||||||
|
# Fetch info.json
|
||||||
|
if args.verbose:
|
||||||
|
print("Step 1: Fetching device info...")
|
||||||
|
info = fetch_from_http(args.ip, args.port, 'info', verbose=args.verbose)
|
||||||
|
|
||||||
|
# Get token from info
|
||||||
|
token = info.get('token')
|
||||||
|
if not token:
|
||||||
|
print("Error: No token found in /info response", file=sys.stderr)
|
||||||
|
return 1
|
||||||
|
|
||||||
|
# Fetch data.json (encrypted config) from /ctrl endpoint
|
||||||
|
if args.verbose:
|
||||||
|
print("\nStep 2: Fetching encrypted configuration from /ctrl...")
|
||||||
|
data = fetch_from_http(args.ip, args.port, 'ctrl', token=token, verbose=args.verbose)
|
||||||
|
|
||||||
|
if args.verbose:
|
||||||
|
print("\nData fetched successfully!")
|
||||||
|
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error: {e}", file=sys.stderr)
|
||||||
|
return 1
|
||||||
|
|
||||||
|
else:
|
||||||
|
# File mode: load from disk
|
||||||
|
if args.verbose:
|
||||||
|
print("=" * 70)
|
||||||
|
print("Loading configuration from files")
|
||||||
|
print("=" * 70)
|
||||||
|
|
||||||
|
# Check if input files exist
|
||||||
|
if not Path(args.ctrl).exists():
|
||||||
|
print(f"Error: {args.ctrl} not found", file=sys.stderr)
|
||||||
|
return 1
|
||||||
|
if not Path(args.info).exists():
|
||||||
|
print(f"Error: {args.info} not found", file=sys.stderr)
|
||||||
|
return 1
|
||||||
|
|
||||||
|
# Read ctrl.json
|
||||||
|
try:
|
||||||
|
with open(args.ctrl, 'r') as f:
|
||||||
|
data = json.load(f)
|
||||||
|
except json.JSONDecodeError as e:
|
||||||
|
print(f"Error reading {args.ctrl}: {e}", file=sys.stderr)
|
||||||
|
return 1
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error reading {args.ctrl}: {e}", file=sys.stderr)
|
||||||
|
return 1
|
||||||
|
|
||||||
|
# Read info.json
|
||||||
|
try:
|
||||||
|
with open(args.info, 'r') as f:
|
||||||
|
info = json.load(f)
|
||||||
|
except json.JSONDecodeError as e:
|
||||||
|
print(f"Error reading {args.info}: {e}", file=sys.stderr)
|
||||||
|
return 1
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error reading {args.info}: {e}", file=sys.stderr)
|
||||||
|
return 1
|
||||||
|
|
||||||
|
# Extract values
|
||||||
|
try:
|
||||||
|
encrypted_info = data['data']['info']
|
||||||
|
response_token = data['data']['token']
|
||||||
|
full_token = info['token']
|
||||||
|
except KeyError as e:
|
||||||
|
print(f"Error: Missing required key {e}", file=sys.stderr)
|
||||||
|
return 1
|
||||||
|
|
||||||
|
# Generate decryption key and IV
|
||||||
|
key_part = full_token[16:32]
|
||||||
|
|
||||||
|
if args.verbose:
|
||||||
|
print("=" * 70)
|
||||||
|
print("Printer Configuration Decryption")
|
||||||
|
print("=" * 70)
|
||||||
|
print(f"Input data file: {args.ctrl}")
|
||||||
|
print(f"Input info file: {args.info}")
|
||||||
|
print(f"Output file: {args.output}")
|
||||||
|
print()
|
||||||
|
print("Decryption Parameters:")
|
||||||
|
print(f" Encrypted data length: {len(encrypted_info)} bytes")
|
||||||
|
print(f" Full token: {full_token}")
|
||||||
|
print(f" Full token length: {len(full_token)} characters")
|
||||||
|
print(f" Response token (IV): {response_token}")
|
||||||
|
print(f" Decryption key: {key_part}")
|
||||||
|
print(f" Key length: {len(key_part)} characters")
|
||||||
|
print(f" IV length: {len(response_token)} characters")
|
||||||
|
print()
|
||||||
|
|
||||||
|
# Decrypt
|
||||||
|
if args.verbose:
|
||||||
|
print("Decrypting...")
|
||||||
|
|
||||||
|
result = decrypt_text(encrypted_info, key_part, response_token)
|
||||||
|
|
||||||
|
if 'error' in result:
|
||||||
|
print(f"Error during decryption: {result.get('error')}", file=sys.stderr)
|
||||||
|
return 1
|
||||||
|
|
||||||
|
# Show result
|
||||||
|
print()
|
||||||
|
print("=" * 55)
|
||||||
|
print(" CREDENTIALS")
|
||||||
|
print("=" * 55)
|
||||||
|
print(f" {'Printer IP':12s} {result.get('ip', 'n/a')}")
|
||||||
|
print(f" {'Username':12s} {result.get('username', 'n/a')}")
|
||||||
|
print(f" {'Password':12s} {result.get('password', 'n/a')}")
|
||||||
|
print(f" {'Device-ID':12s} {result.get('deviceId', 'n/a')}")
|
||||||
|
print(f" {'Mode-ID':12s} {result.get('modeId', 'n/a')}")
|
||||||
|
print(f" {'Model':12s} {result.get('modelName', 'n/a')}")
|
||||||
|
print(f" {'Broker':12s} {result.get('broker', 'n/a')}")
|
||||||
|
print("=" * 55)
|
||||||
|
|
||||||
|
if args.verbose:
|
||||||
|
print()
|
||||||
|
print("Full decrypted config:")
|
||||||
|
# Strip certs/keys from verbose output to avoid cluttering terminal
|
||||||
|
display = {k: v for k, v in result.items() if k not in ('devicecrt', 'devicepk')}
|
||||||
|
print(json.dumps(display, indent=2))
|
||||||
|
|
||||||
|
# Optionally save raw JSON
|
||||||
|
if args.output:
|
||||||
|
try:
|
||||||
|
with open(args.output, 'w') as f:
|
||||||
|
json.dump(result, f, indent=2)
|
||||||
|
print(f"\nRaw config saved to: {args.output}")
|
||||||
|
except Exception as e:
|
||||||
|
print(f"Error writing to {args.output}: {e}", file=sys.stderr)
|
||||||
|
return 1
|
||||||
|
|
||||||
|
# Write config.ini
|
||||||
|
if args.write_config:
|
||||||
|
if args.config_file:
|
||||||
|
config_path = args.config_file
|
||||||
|
else:
|
||||||
|
config_path = os.path.join(os.path.dirname(os.path.abspath(__file__)),
|
||||||
|
'..', 'config', 'config.ini')
|
||||||
|
config_path = os.path.normpath(config_path)
|
||||||
|
|
||||||
|
_write_config_ini(result, config_path)
|
||||||
|
else:
|
||||||
|
print(f"\nTip: pass --write-config to write credentials directly to config.ini")
|
||||||
|
|
||||||
|
return 0
|
||||||
|
|
||||||
|
|
||||||
|
def _write_config_ini(result: dict, config_path: str):
|
||||||
|
"""Write fetched credentials into config.ini, preserving existing non-credential keys."""
|
||||||
|
import configparser
|
||||||
|
|
||||||
|
cfg = configparser.ConfigParser()
|
||||||
|
|
||||||
|
if os.path.isfile(config_path):
|
||||||
|
cfg.read(config_path)
|
||||||
|
|
||||||
|
if not cfg.has_section('connection'):
|
||||||
|
cfg.add_section('connection')
|
||||||
|
|
||||||
|
cfg.set('connection', 'printer_ip', result.get('ip', ''))
|
||||||
|
cfg.set('connection', 'mqtt_port', '9883')
|
||||||
|
cfg.set('connection', 'username', result.get('username', ''))
|
||||||
|
cfg.set('connection', 'password', result.get('password', ''))
|
||||||
|
cfg.set('connection', 'device_id', result.get('deviceId', ''))
|
||||||
|
cfg.set('connection', 'mode_id', result.get('modeId', '20030'))
|
||||||
|
|
||||||
|
os.makedirs(os.path.dirname(config_path), exist_ok=True)
|
||||||
|
with open(config_path, 'w') as f:
|
||||||
|
cfg.write(f)
|
||||||
|
|
||||||
|
print(f"\n✓ Credentials written to '{config_path}'.")
|
||||||
|
|
||||||
|
|
||||||
|
if __name__ == '__main__':
|
||||||
|
sys.exit(main())
|
||||||
@@ -309,7 +309,7 @@ class KobraXClient:
|
|||||||
data.get("curr_hotbed_temp", "?"), data.get("target_hotbed_temp", 0))
|
data.get("curr_hotbed_temp", "?"), data.get("target_hotbed_temp", 0))
|
||||||
else:
|
else:
|
||||||
log.info("RX %-25s state=%-12s data=%s",
|
log.info("RX %-25s state=%-12s data=%s",
|
||||||
suffix, state, json.dumps(payload.get("data"), ensure_ascii=False)[:120])
|
suffix, state, json.dumps(payload.get("data"), ensure_ascii=False))
|
||||||
|
|
||||||
# Resolve by report topic suffix (e.g. "info/report")
|
# Resolve by report topic suffix (e.g. "info/report")
|
||||||
if suffix in self._pending_report:
|
if suffix in self._pending_report:
|
||||||
@@ -366,7 +366,7 @@ class KobraXClient:
|
|||||||
topic = self._pub_topic(msg_type)
|
topic = self._pub_topic(msg_type)
|
||||||
log.info("TX %-25s action=%-12s data=%s",
|
log.info("TX %-25s action=%-12s data=%s",
|
||||||
f"{msg_type}/request", action,
|
f"{msg_type}/request", action,
|
||||||
json.dumps(data, ensure_ascii=False)[:120] if data else "null")
|
json.dumps(data, ensure_ascii=False) if data else "null")
|
||||||
try:
|
try:
|
||||||
with self._lock:
|
with self._lock:
|
||||||
self._sock.sendall(_build_publish(topic, payload))
|
self._sock.sendall(_build_publish(topic, payload))
|
||||||
@@ -414,7 +414,7 @@ class KobraXClient:
|
|||||||
topic = self._web_topic(msg_type)
|
topic = self._web_topic(msg_type)
|
||||||
log.info("TX(web) %-23s action=%-12s data=%s",
|
log.info("TX(web) %-23s action=%-12s data=%s",
|
||||||
f"{msg_type}/request", action,
|
f"{msg_type}/request", action,
|
||||||
json.dumps(data, ensure_ascii=False)[:120] if data else "null")
|
json.dumps(data, ensure_ascii=False) if data else "null")
|
||||||
try:
|
try:
|
||||||
with self._lock:
|
with self._lock:
|
||||||
self._sock.sendall(_build_publish(topic, payload))
|
self._sock.sendall(_build_publish(topic, payload))
|
||||||
@@ -523,7 +523,7 @@ class KobraXClient:
|
|||||||
|
|
||||||
sock = socket.create_connection((self.host, 18910), timeout=30)
|
sock = socket.create_connection((self.host, 18910), timeout=30)
|
||||||
sock.sendall(headers + body)
|
sock.sendall(headers + body)
|
||||||
sock.settimeout(10)
|
sock.settimeout(120) # große GCode-Dateien brauchen Zeit bis der Drucker antwortet
|
||||||
response = b""
|
response = b""
|
||||||
try:
|
try:
|
||||||
while True:
|
while True:
|
||||||
|
|||||||
@@ -108,11 +108,17 @@ KLIPPER_VERSION = "v0.12.0-1"
|
|||||||
|
|
||||||
|
|
||||||
def _parse_gcode_estimated_time(data: bytes) -> int:
|
def _parse_gcode_estimated_time(data: bytes) -> int:
|
||||||
"""Liest '; estimated printing time (normal mode) = Xh Ym Zs' aus GCode-Header.
|
"""Liest geschätzte Druckzeit aus GCode (OrcaSlicer + PrusaSlicer).
|
||||||
Gibt Sekunden zurück, 0 wenn nicht gefunden. Sucht nur in den ersten 8KB."""
|
Gibt Sekunden zurück, 0 wenn nicht gefunden.
|
||||||
|
PrusaSlicer schreibt die Zeit ins Header (erste 16KB),
|
||||||
|
OrcaSlicer schreibt sie ans Ende der Datei (letzte 16KB)."""
|
||||||
import re
|
import re
|
||||||
header = data[:8192].decode("utf-8", errors="ignore")
|
# Anfang + Ende der Datei durchsuchen (OrcaSlicer schreibt Zeit am Ende)
|
||||||
m = re.search(r";\s*estimated printing time \(normal mode\)\s*=\s*(.*)", header)
|
search_text = (data[:16384] + data[-65536:]).decode("utf-8", errors="ignore")
|
||||||
|
# OrcaSlicer: ; total estimated time: 9m 20s
|
||||||
|
# PrusaSlicer: ; estimated printing time (normal mode) = 1h 9m 20s
|
||||||
|
m = (re.search(r";\s*total estimated time:\s*(.*)", search_text) or
|
||||||
|
re.search(r";\s*estimated printing time \(normal mode\)\s*=\s*(.*)", search_text))
|
||||||
if not m:
|
if not m:
|
||||||
return 0
|
return 0
|
||||||
parts = re.findall(r"(\d+)\s*([hms])", m.group(1))
|
parts = re.findall(r"(\d+)\s*([hms])", m.group(1))
|
||||||
@@ -121,6 +127,8 @@ def _parse_gcode_estimated_time(data: bytes) -> int:
|
|||||||
if unit == "h": secs += int(val) * 3600
|
if unit == "h": secs += int(val) * 3600
|
||||||
elif unit == "m": secs += int(val) * 60
|
elif unit == "m": secs += int(val) * 60
|
||||||
elif unit == "s": secs += int(val)
|
elif unit == "s": secs += int(val)
|
||||||
|
if secs:
|
||||||
|
log.info(f"Slicer-Schätzzeit: {secs}s ({m.group(1).strip()})")
|
||||||
return secs
|
return secs
|
||||||
|
|
||||||
|
|
||||||
@@ -154,6 +162,7 @@ class KobraXBridge:
|
|||||||
"taskid": "-1",
|
"taskid": "-1",
|
||||||
"print_speed_mode": 2,
|
"print_speed_mode": 2,
|
||||||
"connection_error": "",
|
"connection_error": "",
|
||||||
|
"file_ready": "",
|
||||||
}
|
}
|
||||||
self._ams_slots: list[dict] = []
|
self._ams_slots: list[dict] = []
|
||||||
self._ams_loaded_slot: int = -1
|
self._ams_loaded_slot: int = -1
|
||||||
@@ -169,6 +178,7 @@ class KobraXBridge:
|
|||||||
client.callbacks["info/report"] = self._on_info
|
client.callbacks["info/report"] = self._on_info
|
||||||
client.callbacks["file/report"] = self._on_file
|
client.callbacks["file/report"] = self._on_file
|
||||||
client.callbacks["multiColorBox/report"] = self._on_multicolor_box
|
client.callbacks["multiColorBox/report"] = self._on_multicolor_box
|
||||||
|
client.callbacks["light/report"] = self._on_light
|
||||||
|
|
||||||
# -------------------------------------------------------------------------
|
# -------------------------------------------------------------------------
|
||||||
# MQTT callbacks (called from reader thread)
|
# MQTT callbacks (called from reader thread)
|
||||||
@@ -191,6 +201,11 @@ class KobraXBridge:
|
|||||||
if kobra_state in ("stoped", "canceled"):
|
if kobra_state in ("stoped", "canceled"):
|
||||||
self._state["progress"] = 0.0
|
self._state["progress"] = 0.0
|
||||||
self._state["filename"] = ""
|
self._state["filename"] = ""
|
||||||
|
self._state["file_ready"] = ""
|
||||||
|
self._state["print_duration"] = 0
|
||||||
|
self._state["remain_time"] = 0
|
||||||
|
self._state["slicer_time"] = 0
|
||||||
|
self._thumbnail_b64 = ""
|
||||||
self._state["filename"] = d.get("filename", self._state["filename"])
|
self._state["filename"] = d.get("filename", self._state["filename"])
|
||||||
if "progress" in d:
|
if "progress" in d:
|
||||||
self._state["progress"] = float(d["progress"]) / 100.0
|
self._state["progress"] = float(d["progress"]) / 100.0
|
||||||
@@ -275,6 +290,12 @@ class KobraXBridge:
|
|||||||
log.info(f"AMS-Slots empfangen: {len(slots)}, loaded_slot={self._ams_loaded_slot}")
|
log.info(f"AMS-Slots empfangen: {len(slots)}, loaded_slot={self._ams_loaded_slot}")
|
||||||
self._push_status_update()
|
self._push_status_update()
|
||||||
|
|
||||||
|
def _on_light(self, payload: dict):
|
||||||
|
d = payload.get("data") or {}
|
||||||
|
self._state["light_on"] = bool(d.get("status", 0))
|
||||||
|
self._state["light_brightness"] = int(d.get("brightness", 80))
|
||||||
|
self._push_status_update()
|
||||||
|
|
||||||
# OrcaSlicer filament preset IDs (MoonrakerPrinterAgent.cpp mapping)
|
# OrcaSlicer filament preset IDs (MoonrakerPrinterAgent.cpp mapping)
|
||||||
_TRAY_INFO_IDX = {
|
_TRAY_INFO_IDX = {
|
||||||
"PLA": "OGFL99", "PLA-CF": "OGFL98", "PLA SILK": "OGFL96",
|
"PLA": "OGFL99", "PLA-CF": "OGFL98", "PLA SILK": "OGFL96",
|
||||||
@@ -503,6 +524,7 @@ class KobraXBridge:
|
|||||||
ct = request.headers.get("Content-Type", "")
|
ct = request.headers.get("Content-Type", "")
|
||||||
if "multipart" not in ct:
|
if "multipart" not in ct:
|
||||||
return web.json_response({"error": "expected multipart"}, status=400)
|
return web.json_response({"error": "expected multipart"}, status=400)
|
||||||
|
auto_print = False
|
||||||
reader = await request.multipart()
|
reader = await request.multipart()
|
||||||
file_data = None
|
file_data = None
|
||||||
remote_filename = self._last_uploaded_file or "upload.gcode"
|
remote_filename = self._last_uploaded_file or "upload.gcode"
|
||||||
@@ -516,6 +538,9 @@ class KobraXBridge:
|
|||||||
val = (await part.read()).decode("utf-8", errors="replace").strip()
|
val = (await part.read()).decode("utf-8", errors="replace").strip()
|
||||||
if val:
|
if val:
|
||||||
remote_filename = val
|
remote_filename = val
|
||||||
|
elif part.name == "print":
|
||||||
|
val = (await part.read()).decode("utf-8", errors="replace").strip().lower()
|
||||||
|
auto_print = val == "true"
|
||||||
else:
|
else:
|
||||||
log.debug(f"Unbekanntes Multipart-Feld: {part.name}")
|
log.debug(f"Unbekanntes Multipart-Feld: {part.name}")
|
||||||
|
|
||||||
@@ -553,9 +578,24 @@ class KobraXBridge:
|
|||||||
|
|
||||||
# Druck starten mit vollständigem Payload (inkl. serve-URL + md5 + size)
|
# Druck starten mit vollständigem Payload (inkl. serve-URL + md5 + size)
|
||||||
serve_url = f"http://{request.host}/serve/{remote_filename}"
|
serve_url = f"http://{request.host}/serve/{remote_filename}"
|
||||||
log.info(f"Starte Druck automatisch: {remote_filename}")
|
|
||||||
|
# print=true im Multipart-Formular (Moonraker) oder Query-String → Druck starten
|
||||||
|
# print=false oder fehlt → nur hochladen
|
||||||
|
if not auto_print:
|
||||||
|
auto_print = request.rel_url.query.get("print", "false").lower() == "true"
|
||||||
|
|
||||||
|
# Thumbnail immer anfordern (Drucker antwortet async mit file/report)
|
||||||
|
self._thumbnail_b64 = ""
|
||||||
|
self.client.publish("file", "fileDetails", {"root": "local", "filename": remote_filename}, timeout=0)
|
||||||
|
|
||||||
|
if auto_print:
|
||||||
|
log.info(f"Upload+Print (print=true): {remote_filename}")
|
||||||
|
self._state["file_ready"] = ""
|
||||||
loop = asyncio.get_event_loop()
|
loop = asyncio.get_event_loop()
|
||||||
loop.run_in_executor(None, lambda: self._start_print(remote_filename, serve_url, file_md5, file_size))
|
loop.run_in_executor(None, lambda: self._start_print(remote_filename, serve_url, file_md5, file_size))
|
||||||
|
else:
|
||||||
|
log.info(f"Nur hochgeladen (print=false): {remote_filename}")
|
||||||
|
self._state["file_ready"] = remote_filename
|
||||||
|
|
||||||
# OctoPrint-kompatibler Response (OrcaSlicer wertet refs aus)
|
# OctoPrint-kompatibler Response (OrcaSlicer wertet refs aus)
|
||||||
return web.json_response({
|
return web.json_response({
|
||||||
@@ -578,6 +618,7 @@ class KobraXBridge:
|
|||||||
}, status=201)
|
}, status=201)
|
||||||
|
|
||||||
def _start_print(self, filename: str, url: str = "", md5: str = "", filesize: int = 0):
|
def _start_print(self, filename: str, url: str = "", md5: str = "", filesize: int = 0):
|
||||||
|
self._state["file_ready"] = ""
|
||||||
default_slot = getattr(self._args, "default_ams_slot", "auto")
|
default_slot = getattr(self._args, "default_ams_slot", "auto")
|
||||||
all_loaded = [(i, s) for i, s in enumerate(self._ams_slots) if s.get("status") == 5]
|
all_loaded = [(i, s) for i, s in enumerate(self._ams_slots) if s.get("status") == 5]
|
||||||
if default_slot != "auto":
|
if default_slot != "auto":
|
||||||
@@ -628,11 +669,6 @@ class KobraXBridge:
|
|||||||
"model_objects_skip_parts": [],
|
"model_objects_skip_parts": [],
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
# Thumbnail vorab anfordern (Drucker antwortet async auf file/report)
|
|
||||||
self._thumbnail_b64 = ""
|
|
||||||
self.client.publish("file", "fileDetails",
|
|
||||||
{"root": "local", "filename": filename}, timeout=0)
|
|
||||||
|
|
||||||
log.info(f"print/start → {filename} url={url} ams={len(self._ams_slots)} slots")
|
log.info(f"print/start → {filename} url={url} ams={len(self._ams_slots)} slots")
|
||||||
result = self.client.publish("print", "start", payload, timeout=15.0)
|
result = self.client.publish("print", "start", payload, timeout=15.0)
|
||||||
if result:
|
if result:
|
||||||
@@ -645,7 +681,9 @@ class KobraXBridge:
|
|||||||
body = await request.json()
|
body = await request.json()
|
||||||
except Exception:
|
except Exception:
|
||||||
body = {}
|
body = {}
|
||||||
filename = body.get("filename") or self._last_uploaded_file
|
filename = (request.rel_url.query.get("filename")
|
||||||
|
or body.get("filename")
|
||||||
|
or self._last_uploaded_file)
|
||||||
if not filename:
|
if not filename:
|
||||||
return web.json_response({"error": "no filename"}, status=400)
|
return web.json_response({"error": "no filename"}, status=400)
|
||||||
|
|
||||||
@@ -718,6 +756,12 @@ class KobraXBridge:
|
|||||||
await loop.run_in_executor(None, lambda: self.client.stop_print(taskid))
|
await loop.run_in_executor(None, lambda: self.client.stop_print(taskid))
|
||||||
return web.json_response({"result": "ok"})
|
return web.json_response({"result": "ok"})
|
||||||
|
|
||||||
|
async def handle_api_file_ready_clear(self, request):
|
||||||
|
self._state["file_ready"] = ""
|
||||||
|
self._thumbnail_b64 = ""
|
||||||
|
self._push_status_update()
|
||||||
|
return web.json_response({"result": "ok"})
|
||||||
|
|
||||||
async def handle_octoprint_version(self, request):
|
async def handle_octoprint_version(self, request):
|
||||||
return web.json_response({
|
return web.json_response({
|
||||||
"api": "0.1",
|
"api": "0.1",
|
||||||
@@ -845,6 +889,11 @@ main{flex:1;overflow-y:auto;padding:20px}
|
|||||||
.spd-bar{height:4px;border-radius:2px;background:var(--border);margin-top:10px;overflow:hidden}
|
.spd-bar{height:4px;border-radius:2px;background:var(--border);margin-top:10px;overflow:hidden}
|
||||||
.spd-bar-fill{height:100%;border-radius:2px;background:linear-gradient(90deg,var(--accent2),var(--accent));transition:width .3s}
|
.spd-bar-fill{height:100%;border-radius:2px;background:linear-gradient(90deg,var(--accent2),var(--accent));transition:width .3s}
|
||||||
|
|
||||||
|
/* ── TIME CARDS ── */
|
||||||
|
.time-grid{display:grid;grid-template-columns:1fr 1fr 1fr;gap:8px;margin-top:8px}
|
||||||
|
.time-block{background:var(--raised);border-radius:10px;padding:10px 12px}
|
||||||
|
.time-label{font-size:10px;text-transform:uppercase;letter-spacing:.08em;color:var(--txt2);margin-bottom:4px}
|
||||||
|
.time-val{font-size:20px;font-weight:700;font-family:var(--mono);color:var(--txt)}
|
||||||
/* ── TEMPS ── */
|
/* ── TEMPS ── */
|
||||||
.temp-pair{display:grid;grid-template-columns:1fr 1fr;gap:12px}
|
.temp-pair{display:grid;grid-template-columns:1fr 1fr;gap:12px}
|
||||||
.temp-card-inner{display:grid;grid-template-columns:1fr 1fr;gap:12px}
|
.temp-card-inner{display:grid;grid-template-columns:1fr 1fr;gap:12px}
|
||||||
@@ -1010,6 +1059,13 @@ nav.bottom-nav{display:none;position:fixed;bottom:0;left:0;right:0;
|
|||||||
<body>
|
<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="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="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">
|
||||||
|
<span>📄 <span id="file-ready-name"></span></span>
|
||||||
|
<button id="file-ready-btn" onclick="startReadyFile()"
|
||||||
|
style="padding:5px 16px;background:#fff;color:#1a6e3c;border:none;border-radius:6px;font-weight:700;cursor:pointer;font-size:13px"></button>
|
||||||
|
<button id="file-cancel-btn" onclick="cancelReadyFile()"
|
||||||
|
style="padding:5px 16px;background:rgba(255,255,255,0.15);color:#fff;border:1px solid rgba(255,255,255,0.5);border-radius:6px;font-weight:700;cursor:pointer;font-size:13px"></button>
|
||||||
|
</div>
|
||||||
|
|
||||||
<header>
|
<header>
|
||||||
<div class="logo">⬡ KX-Bridge</div>
|
<div class="logo">⬡ KX-Bridge</div>
|
||||||
@@ -1102,6 +1158,34 @@ nav.bottom-nav{display:none;position:fixed;bottom:0;left:0;right:0;
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<!-- ═══ AMS SLOT EDIT DIALOG ═══ -->
|
||||||
|
<div class="modal-overlay" id="slot-edit-modal" onclick="if(event.target===this)closeSlotEdit()">
|
||||||
|
<div class="modal-box" style="max-width:340px">
|
||||||
|
<div style="display:flex;justify-content:space-between;align-items:center;margin-bottom:16px">
|
||||||
|
<span class="modal-title" id="slot-edit-title"></span>
|
||||||
|
<button onclick="closeSlotEdit()" style="background:none;border:none;color:var(--txt2);font-size:20px;cursor:pointer;line-height:1">✕</button>
|
||||||
|
</div>
|
||||||
|
<div style="display:flex;align-items:center;gap:16px;margin-bottom:20px">
|
||||||
|
<div id="slot-edit-preview" style="width:56px;height:56px;border-radius:50%;border:3px solid rgba(255,255,255,.2);flex-shrink:0"></div>
|
||||||
|
<div style="flex:1">
|
||||||
|
<div style="font-size:11px;color:var(--txt2);margin-bottom:4px" id="lbl-slot-color"></div>
|
||||||
|
<input type="color" id="slot-edit-color"
|
||||||
|
oninput="document.getElementById('slot-edit-preview').style.background=this.value"
|
||||||
|
style="width:100%;height:36px;border:1px solid var(--border);border-radius:6px;background:var(--raised);cursor:pointer;padding:2px">
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div style="margin-bottom:20px">
|
||||||
|
<div style="font-size:11px;color:var(--txt2);margin-bottom:6px" id="lbl-slot-material"></div>
|
||||||
|
<div style="display:flex;flex-wrap:wrap;gap:6px" id="slot-mat-btns">
|
||||||
|
</div>
|
||||||
|
<input type="text" id="slot-edit-mat"
|
||||||
|
oninput="highlightMatBtn(this.value)"
|
||||||
|
style="margin-top:8px;width:100%;padding:6px 10px;background:var(--raised);border:1px solid var(--border);border-radius:6px;color:var(--txt);font-size:13px;box-sizing:border-box">
|
||||||
|
</div>
|
||||||
|
<button class="modal-save" id="btn-slot-edit-save" onclick="saveSlotEdit()"></button>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
<div class="layout">
|
<div class="layout">
|
||||||
<nav class="sidebar">
|
<nav class="sidebar">
|
||||||
<button class="nav-btn active" onclick="showPanel('dashboard')" id="nb-dashboard">
|
<button class="nav-btn active" onclick="showPanel('dashboard')" id="nb-dashboard">
|
||||||
@@ -1128,7 +1212,7 @@ nav.bottom-nav{display:none;position:fixed;bottom:0;left:0;right:0;
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="cam-wrap" id="cam-wrap">
|
<div class="cam-wrap" id="cam-wrap">
|
||||||
<div class="cam-placeholder" id="cam-placeholder">📷 Kamera nicht gestartet</div>
|
<div class="cam-placeholder" id="cam-placeholder"><span id="cam-placeholder-txt">📷 Kamera nicht gestartet</span></div>
|
||||||
<div class="cam-spinner" id="cam-spinner"></div>
|
<div class="cam-spinner" id="cam-spinner"></div>
|
||||||
<img id="cam-img" style="display:none;width:100%;height:auto" alt="Kamera">
|
<img id="cam-img" style="display:none;width:100%;height:auto" alt="Kamera">
|
||||||
<div class="cam-overlay" id="cam-overlay" style="display:none">
|
<div class="cam-overlay" id="cam-overlay" style="display:none">
|
||||||
@@ -1143,14 +1227,26 @@ nav.bottom-nav{display:none;position:fixed;bottom:0;left:0;right:0;
|
|||||||
<div class="card-title"><span>◉</span> <span id="d-card-progress">Fortschritt</span></div>
|
<div class="card-title"><span>◉</span> <span id="d-card-progress">Fortschritt</span></div>
|
||||||
<img id="d-thumbnail" src="" alt="" style="display:none;width:100%;max-height:160px;object-fit:contain;border-radius:8px;background:#111;margin-bottom:10px">
|
<img id="d-thumbnail" src="" alt="" style="display:none;width:100%;max-height:160px;object-fit:contain;border-radius:8px;background:#111;margin-bottom:10px">
|
||||||
<div class="pct-big"><span id="d-pct">0</span><small>%</small></div>
|
<div class="pct-big"><span id="d-pct">0</span><small>%</small></div>
|
||||||
<div class="progress-bar" style="margin:8px 0"><div class="progress-fill" id="d-pbar" style="width:0%"></div></div>
|
<div style="display:flex;align-items:center;gap:10px;margin:8px 0">
|
||||||
<div class="meta-row" style="margin-top:6px">
|
<div class="progress-bar" style="flex:1;margin:0"><div class="progress-fill" id="d-pbar" style="width:0%"></div></div>
|
||||||
<span id="d-elapsed">–</span>
|
<div class="time-block" style="padding:6px 10px;min-width:72px;text-align:center;flex-shrink:0">
|
||||||
<span id="d-remain" style="color:var(--acc)">–</span>
|
<div class="time-label" id="d-lbl-layers"></div>
|
||||||
<span id="d-layers" class="layer-badge">–</span>
|
<div class="time-val" style="font-size:16px" id="d-layers">–</div>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
<div class="time-grid">
|
||||||
|
<div class="time-block">
|
||||||
|
<div class="time-label" id="d-lbl-elapsed"></div>
|
||||||
|
<div class="time-val" id="d-elapsed">–</div>
|
||||||
|
</div>
|
||||||
|
<div class="time-block" id="d-slicer-row" style="display:none">
|
||||||
|
<div class="time-label" id="d-slicer-label"></div>
|
||||||
|
<div class="time-val" id="d-slicer-time">–</div>
|
||||||
|
</div>
|
||||||
|
<div class="time-block" style="color:var(--acc)">
|
||||||
|
<div class="time-label" id="d-lbl-remain"></div>
|
||||||
|
<div class="time-val" id="d-remain" style="color:var(--acc)">–</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="meta-row" style="margin-top:4px;font-size:0.82em;opacity:0.7" id="d-slicer-row">
|
|
||||||
<span id="d-slicer-label"></span><span id="d-slicer-time" style="margin-left:4px">–</span>
|
|
||||||
</div>
|
</div>
|
||||||
<div class="fname" id="d-fname" title="" style="margin-top:6px">–</div>
|
<div class="fname" id="d-fname" title="" style="margin-top:6px">–</div>
|
||||||
<div class="ctrl-btns" id="d-ctrl-btns" style="margin-top:12px">
|
<div class="ctrl-btns" id="d-ctrl-btns" style="margin-top:12px">
|
||||||
@@ -1308,7 +1404,7 @@ nav.bottom-nav{display:none;position:fixed;bottom:0;left:0;right:0;
|
|||||||
<a id="btn-log-dl" href="/api/log/download" download="kx-bridge.log"
|
<a id="btn-log-dl" href="/api/log/download" download="kx-bridge.log"
|
||||||
style="font-size:12px;padding:4px 10px;background:var(--raised);border-radius:6px;color:var(--txt2);text-decoration:none">⬇ Download</a>
|
style="font-size:12px;padding:4px 10px;background:var(--raised);border-radius:6px;color:var(--txt2);text-decoration:none">⬇ Download</a>
|
||||||
</div>
|
</div>
|
||||||
<div style="display:flex;gap:8px;margin-bottom:8px;flex-wrap:wrap;align-items:center">
|
<div style="display:flex;gap:6px;margin-bottom:6px;flex-wrap:wrap;align-items:center">
|
||||||
<input id="log-filter" type="text" placeholder="Filter…"
|
<input id="log-filter" type="text" placeholder="Filter…"
|
||||||
oninput="renderLog()"
|
oninput="renderLog()"
|
||||||
style="flex:1;min-width:120px;padding:5px 10px;background:var(--raised);border:1px solid var(--border);border-radius:6px;color:var(--txt);font-size:12px;font-family:var(--mono)">
|
style="flex:1;min-width:120px;padding:5px 10px;background:var(--raised);border:1px solid var(--border);border-radius:6px;color:var(--txt);font-size:12px;font-family:var(--mono)">
|
||||||
@@ -1317,7 +1413,18 @@ nav.bottom-nav{display:none;position:fixed;bottom:0;left:0;right:0;
|
|||||||
<button onclick="consoleLogs=[];renderLog()"
|
<button onclick="consoleLogs=[];renderLog()"
|
||||||
style="font-size:12px;padding:5px 10px;border-radius:6px;border:1px solid var(--border);background:var(--raised);color:var(--txt2);cursor:pointer">✕ Clear</button>
|
style="font-size:12px;padding:5px 10px;border-radius:6px;border:1px solid var(--border);background:var(--raised);color:var(--txt2);cursor:pointer">✕ Clear</button>
|
||||||
</div>
|
</div>
|
||||||
<div class="console" id="console-log" style="height:calc(100vh - 220px);min-height:200px" onscroll="onLogScroll()"></div>
|
<div style="display:flex;gap:5px;margin-bottom:8px;flex-wrap:wrap">
|
||||||
|
<span style="font-size:11px;color:var(--txt2);align-self:center;margin-right:2px">Dir:</span>
|
||||||
|
<button class="log-dir-btn active" id="logdir-all" onclick="setLogDir('all')" style="font-size:11px;padding:3px 9px;border-radius:5px;border:1px solid var(--border);cursor:pointer"></button>
|
||||||
|
<button class="log-dir-btn" id="logdir-rx" onclick="setLogDir('rx')" style="font-size:11px;padding:3px 9px;border-radius:5px;border:1px solid var(--border);cursor:pointer">RX</button>
|
||||||
|
<button class="log-dir-btn" id="logdir-tx" onclick="setLogDir('tx')" style="font-size:11px;padding:3px 9px;border-radius:5px;border:1px solid var(--border);cursor:pointer">TX</button>
|
||||||
|
<span style="font-size:11px;color:var(--txt2);align-self:center;margin-left:6px;margin-right:2px">Topic:</span>
|
||||||
|
<button class="log-topic-btn" data-topic="multiColorBox" onclick="setLogTopic('multiColorBox')" style="font-size:11px;padding:3px 9px;border-radius:5px;border:1px solid var(--border);cursor:pointer">AMS</button>
|
||||||
|
<button class="log-topic-btn" data-topic="print" onclick="setLogTopic('print')" style="font-size:11px;padding:3px 9px;border-radius:5px;border:1px solid var(--border);cursor:pointer">print</button>
|
||||||
|
<button class="log-topic-btn" data-topic="info" onclick="setLogTopic('info')" style="font-size:11px;padding:3px 9px;border-radius:5px;border:1px solid var(--border);cursor:pointer">info</button>
|
||||||
|
<button class="log-topic-btn" data-topic="status" onclick="setLogTopic('status')" style="font-size:11px;padding:3px 9px;border-radius:5px;border:1px solid var(--border);cursor:pointer">status</button>
|
||||||
|
</div>
|
||||||
|
<div class="console" id="console-log" style="height:calc(100vh - 260px);min-height:160px" onscroll="onLogScroll()"></div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</main>
|
</main>
|
||||||
@@ -1352,7 +1459,7 @@ var LANG_DE={
|
|||||||
header_status_standby:'Bereit',header_status_printing:'Druckt',header_status_complete:'Fertig',header_status_error:'Fehler',
|
header_status_standby:'Bereit',header_status_printing:'Druckt',header_status_complete:'Fertig',header_status_error:'Fehler',
|
||||||
kobra_free:'Bereit',kobra_busy:'Beschäftigt',kobra_printing:'Druckt',kobra_preheating:'Aufheizen',kobra_auto_leveling:'Nivellierung',kobra_checking:'Prüfung',kobra_updated:'Aktualisierung',kobra_init:'Initialisierung',kobra_pausing:'Pausiert...',kobra_paused:'Pausiert',kobra_resuming:'Fortsetzen...',kobra_resumed:'Fortgesetzt',kobra_stopping:'Stoppt...',kobra_stoped:'Gestoppt',kobra_finished:'Abgeschlossen',kobra_failed:'Fehler',kobra_canceled:'Abgebrochen',kobra_offline:'Offline',
|
kobra_free:'Bereit',kobra_busy:'Beschäftigt',kobra_printing:'Druckt',kobra_preheating:'Aufheizen',kobra_auto_leveling:'Nivellierung',kobra_checking:'Prüfung',kobra_updated:'Aktualisierung',kobra_init:'Initialisierung',kobra_pausing:'Pausiert...',kobra_paused:'Pausiert',kobra_resuming:'Fortsetzen...',kobra_resumed:'Fortgesetzt',kobra_stopping:'Stoppt...',kobra_stoped:'Gestoppt',kobra_finished:'Abgeschlossen',kobra_failed:'Fehler',kobra_canceled:'Abgebrochen',kobra_offline:'Offline',
|
||||||
nav_dashboard:'Dashboard',nav_print:'Druck',nav_temps:'Temperaturen',nav_motion:'Achsen',nav_ams:'AMS',nav_extras:'Licht / Lüfter',nav_console:'Konsole',
|
nav_dashboard:'Dashboard',nav_print:'Druck',nav_temps:'Temperaturen',nav_motion:'Achsen',nav_ams:'AMS',nav_extras:'Licht / Lüfter',nav_console:'Konsole',
|
||||||
card_progress:'Fortschritt',card_temps:'Temperaturen',card_light_fan:'Lüfter',card_speed:'Druckgeschwindigkeit',card_cam:'Kamera',lbl_elapsed:'Verstrichen',lbl_remaining:'verbleibend',lbl_slicer_time:'Slicer-Schätzung:',
|
card_progress:'Fortschritt',card_temps:'Temperaturen',card_light_fan:'Lüfter',card_speed:'Druckgeschwindigkeit',card_cam:'Kamera',lbl_elapsed:'Verstrichen:',lbl_remaining:'Restzeit:',lbl_slicer_time:'Slicer-Schätzung:',lbl_layers:'Layer',
|
||||||
speed_silent:'🐢 Leise',speed_normal:'⚡ Normal',speed_sport:'🚀 Sport',
|
speed_silent:'🐢 Leise',speed_normal:'⚡ Normal',speed_sport:'🚀 Sport',
|
||||||
lbl_light:'💡 Licht',lbl_feed:'Einziehen',lbl_unload:'Ausziehen',
|
lbl_light:'💡 Licht',lbl_feed:'Einziehen',lbl_unload:'Ausziehen',
|
||||||
cam_placeholder:'📷 Kamera nicht gestartet',btn_cam_start:'▶ Kamera',btn_cam_stop:'◼ Kamera',
|
cam_placeholder:'📷 Kamera nicht gestartet',btn_cam_start:'▶ Kamera',btn_cam_stop:'◼ Kamera',
|
||||||
@@ -1374,13 +1481,19 @@ var LANG_DE={
|
|||||||
update_check:'Auf Updates prüfen',update_checking:'Prüfe...',update_available:'verfügbar',update_none:'Bereits aktuell',
|
update_check:'Auf Updates prüfen',update_checking:'Prüfe...',update_available:'verfügbar',update_none:'Bereits aktuell',
|
||||||
update_apply:'Jetzt installieren',update_applying:'Lade herunter...',update_restarting:'Starte neu...',update_error:'Fehler',
|
update_apply:'Jetzt installieren',update_applying:'Lade herunter...',update_restarting:'Starte neu...',update_error:'Fehler',
|
||||||
btn_connect:'⚡ Verbinden',btn_disconnect:'✕ Trennen',
|
btn_connect:'⚡ Verbinden',btn_disconnect:'✕ Trennen',
|
||||||
lbl_conn_error:'Verbindungsfehler:'
|
lbl_conn_error:'Verbindungsfehler:',
|
||||||
|
slot_edit_title:'Slot bearbeiten',slot_edit_color:'Farbe',slot_edit_material:'Material',
|
||||||
|
slot_edit_save:'💾 Speichern',slot_edit_custom:'z.B. PLA, PETG, ABS…',
|
||||||
|
slot_edit_ok:'AMS Slot',
|
||||||
|
log_dir_all:'Alle',
|
||||||
|
file_ready_btn:'▶ Druck starten',
|
||||||
|
file_cancel_btn:'✕ Abbrechen'
|
||||||
};
|
};
|
||||||
var LANG_EN={
|
var LANG_EN={
|
||||||
header_status_standby:'Ready',header_status_printing:'Printing',header_status_complete:'Complete',header_status_error:'Error',
|
header_status_standby:'Ready',header_status_printing:'Printing',header_status_complete:'Complete',header_status_error:'Error',
|
||||||
kobra_free:'Ready',kobra_busy:'Busy',kobra_printing:'Printing',kobra_preheating:'Preheating',kobra_auto_leveling:'Auto Leveling',kobra_checking:'Checking',kobra_updated:'Updating',kobra_init:'Initializing',kobra_pausing:'Pausing...',kobra_paused:'Paused',kobra_resuming:'Resuming...',kobra_resumed:'Resumed',kobra_stopping:'Stopping...',kobra_stoped:'Stopped',kobra_finished:'Finished',kobra_failed:'Error',kobra_canceled:'Cancelled',kobra_offline:'Offline',
|
kobra_free:'Ready',kobra_busy:'Busy',kobra_printing:'Printing',kobra_preheating:'Preheating',kobra_auto_leveling:'Auto Leveling',kobra_checking:'Checking',kobra_updated:'Updating',kobra_init:'Initializing',kobra_pausing:'Pausing...',kobra_paused:'Paused',kobra_resuming:'Resuming...',kobra_resumed:'Resumed',kobra_stopping:'Stopping...',kobra_stoped:'Stopped',kobra_finished:'Finished',kobra_failed:'Error',kobra_canceled:'Cancelled',kobra_offline:'Offline',
|
||||||
nav_dashboard:'Dashboard',nav_print:'Print',nav_temps:'Temperatures',nav_motion:'Motion',nav_ams:'AMS',nav_extras:'Light / Fan',nav_console:'Console',
|
nav_dashboard:'Dashboard',nav_print:'Print',nav_temps:'Temperatures',nav_motion:'Motion',nav_ams:'AMS',nav_extras:'Light / Fan',nav_console:'Console',
|
||||||
card_progress:'Progress',card_temps:'Temperatures',card_light_fan:'Fan',card_speed:'Print Speed',card_cam:'Camera',lbl_elapsed:'Elapsed',lbl_remaining:'remaining',lbl_slicer_time:'Slicer estimate:',
|
card_progress:'Progress',card_temps:'Temperatures',card_light_fan:'Fan',card_speed:'Print Speed',card_cam:'Camera',lbl_elapsed:'Elapsed:',lbl_remaining:'Remaining:',lbl_slicer_time:'Slicer estimate:',lbl_layers:'Layer',
|
||||||
speed_silent:'🐢 Silent',speed_normal:'⚡ Normal',speed_sport:'🚀 Sport',
|
speed_silent:'🐢 Silent',speed_normal:'⚡ Normal',speed_sport:'🚀 Sport',
|
||||||
lbl_light:'💡 Light',lbl_feed:'Load',lbl_unload:'Unload',
|
lbl_light:'💡 Light',lbl_feed:'Load',lbl_unload:'Unload',
|
||||||
cam_placeholder:'📷 Camera not started',btn_cam_start:'▶ Camera',btn_cam_stop:'◼ Camera',
|
cam_placeholder:'📷 Camera not started',btn_cam_start:'▶ Camera',btn_cam_stop:'◼ Camera',
|
||||||
@@ -1402,7 +1515,13 @@ var LANG_EN={
|
|||||||
update_check:'Check for Updates',update_checking:'Checking...',update_available:'available',update_none:'Already up to date',
|
update_check:'Check for Updates',update_checking:'Checking...',update_available:'available',update_none:'Already up to date',
|
||||||
update_apply:'Install Now',update_applying:'Downloading...',update_restarting:'Restarting...',update_error:'Error',
|
update_apply:'Install Now',update_applying:'Downloading...',update_restarting:'Restarting...',update_error:'Error',
|
||||||
btn_connect:'⚡ Connect',btn_disconnect:'✕ Disconnect',
|
btn_connect:'⚡ Connect',btn_disconnect:'✕ Disconnect',
|
||||||
lbl_conn_error:'Connection error:'
|
lbl_conn_error:'Connection error:',
|
||||||
|
slot_edit_title:'Edit Slot',slot_edit_color:'Color',slot_edit_material:'Material',
|
||||||
|
slot_edit_save:'💾 Save',slot_edit_custom:'e.g. PLA, PETG, ABS…',
|
||||||
|
slot_edit_ok:'AMS Slot',
|
||||||
|
log_dir_all:'All',
|
||||||
|
file_ready_btn:'▶ Start Print',
|
||||||
|
file_cancel_btn:'✕ Cancel'
|
||||||
};
|
};
|
||||||
var currentLang='de';
|
var currentLang='de';
|
||||||
var T=LANG_DE;
|
var T=LANG_DE;
|
||||||
@@ -1428,6 +1547,10 @@ function applyLang(){
|
|||||||
setText('d-card-speed',T.card_speed);
|
setText('d-card-speed',T.card_speed);
|
||||||
setText('d-card-cam',T.card_cam);
|
setText('d-card-cam',T.card_cam);
|
||||||
setText('d-card-ams',T.panel_ams_title);
|
setText('d-card-ams',T.panel_ams_title);
|
||||||
|
setText('d-lbl-elapsed',T.lbl_elapsed);
|
||||||
|
setText('d-lbl-remain',T.lbl_remaining);
|
||||||
|
setText('d-slicer-label',T.lbl_slicer_time);
|
||||||
|
setText('d-lbl-layers',T.lbl_layers);
|
||||||
setText('d-lbl-light',T.lbl_light);
|
setText('d-lbl-light',T.lbl_light);
|
||||||
setText('d-lbl-bed',T.label_bed);
|
setText('d-lbl-bed',T.label_bed);
|
||||||
// Dashboard buttons
|
// Dashboard buttons
|
||||||
@@ -1479,6 +1602,14 @@ function applyLang(){
|
|||||||
document.querySelectorAll('.lbl-unload').forEach(e=>e.textContent=T.lbl_unload);
|
document.querySelectorAll('.lbl-unload').forEach(e=>e.textContent=T.lbl_unload);
|
||||||
// conn-btn text (nur wenn nicht im Übergangszustand)
|
// conn-btn text (nur wenn nicht im Übergangszustand)
|
||||||
updateConnBtn();
|
updateConnBtn();
|
||||||
|
// Slot-Edit-Dialog
|
||||||
|
setText('lbl-slot-color',T.slot_edit_color);
|
||||||
|
setText('lbl-slot-material',T.slot_edit_material);
|
||||||
|
setText('btn-slot-edit-save',T.slot_edit_save);
|
||||||
|
var mi=document.getElementById('slot-edit-mat');if(mi)mi.setAttribute('placeholder',T.slot_edit_custom);
|
||||||
|
setText('logdir-all',T.log_dir_all);
|
||||||
|
setText('file-ready-btn',T.file_ready_btn);
|
||||||
|
setText('file-cancel-btn',T.file_cancel_btn);
|
||||||
}
|
}
|
||||||
function setText(id,txt){var el=document.getElementById(id);if(el)el.textContent=txt;}
|
function setText(id,txt){var el=document.getElementById(id);if(el)el.textContent=txt;}
|
||||||
(function(){
|
(function(){
|
||||||
@@ -1510,6 +1641,8 @@ function showPanel(id){
|
|||||||
var consoleLogs=[];
|
var consoleLogs=[];
|
||||||
var logAutoScroll=true;
|
var logAutoScroll=true;
|
||||||
var logBadgeCount=0;
|
var logBadgeCount=0;
|
||||||
|
var logDirFilter='all'; // 'all'|'rx'|'tx'
|
||||||
|
var logTopicFilter=''; // '' = no topic filter
|
||||||
|
|
||||||
function clog(msg,cls){
|
function clog(msg,cls){
|
||||||
cls=cls||'msg-info';
|
cls=cls||'msg-info';
|
||||||
@@ -1535,14 +1668,41 @@ function _appendLog(entry,forceCls){
|
|||||||
}
|
}
|
||||||
renderLog();
|
renderLog();
|
||||||
}
|
}
|
||||||
|
function setLogDir(dir){
|
||||||
|
logDirFilter=dir;
|
||||||
|
document.querySelectorAll('.log-dir-btn').forEach(function(b){
|
||||||
|
b.style.background=b.id==='logdir-'+dir?'var(--accent)':'var(--raised)';
|
||||||
|
b.style.color=b.id==='logdir-'+dir?'#fff':'var(--txt2)';
|
||||||
|
});
|
||||||
|
renderLog();
|
||||||
|
}
|
||||||
|
function setLogTopic(topic){
|
||||||
|
var inp=document.getElementById('log-filter');
|
||||||
|
var active=inp.value===topic;
|
||||||
|
inp.value=active?'':topic;
|
||||||
|
document.querySelectorAll('.log-topic-btn').forEach(function(b){
|
||||||
|
var on=!active&&b.getAttribute('data-topic')===topic;
|
||||||
|
b.style.background=on?'var(--accent)':'var(--raised)';
|
||||||
|
b.style.color=on?'#fff':'var(--txt2)';
|
||||||
|
});
|
||||||
|
renderLog();
|
||||||
|
}
|
||||||
function renderLog(){
|
function renderLog(){
|
||||||
var el=document.getElementById('console-log');
|
var el=document.getElementById('console-log');
|
||||||
if(!el)return;
|
if(!el)return;
|
||||||
var filter=(document.getElementById('log-filter')||{}).value||'';
|
var filter=(document.getElementById('log-filter')||{}).value||'';
|
||||||
var fl=filter.toLowerCase();
|
var fl=filter.toLowerCase();
|
||||||
var rows=fl?consoleLogs.filter(l=>l.msg.toLowerCase().includes(fl)):consoleLogs;
|
var rows=consoleLogs.filter(function(l){
|
||||||
|
var m=l.msg;
|
||||||
|
if(logDirFilter==='rx'&&!/ RX[ (]/.test(m))return false;
|
||||||
|
if(logDirFilter==='tx'&&!/ TX[ (]/.test(m))return false;
|
||||||
|
if(fl&&!m.toLowerCase().includes(fl))return false;
|
||||||
|
return true;
|
||||||
|
});
|
||||||
|
var savedScroll=logAutoScroll?null:el.scrollTop;
|
||||||
el.innerHTML=rows.map(l=>`<div><span class="ts">${l.ts}</span><span class="${l.cls}">${escHtml(l.msg)}</span></div>`).join('');
|
el.innerHTML=rows.map(l=>`<div><span class="ts">${l.ts}</span><span class="${l.cls}">${escHtml(l.msg)}</span></div>`).join('');
|
||||||
if(logAutoScroll)el.scrollTop=el.scrollHeight;
|
if(logAutoScroll)el.scrollTop=el.scrollHeight;
|
||||||
|
else if(savedScroll!==null)el.scrollTop=savedScroll;
|
||||||
}
|
}
|
||||||
function onLogScroll(){
|
function onLogScroll(){
|
||||||
var el=document.getElementById('console-log');
|
var el=document.getElementById('console-log');
|
||||||
@@ -1585,6 +1745,13 @@ function applyState(){
|
|||||||
// connection error banner
|
// connection error banner
|
||||||
var banner=document.getElementById('conn-error-banner');
|
var banner=document.getElementById('conn-error-banner');
|
||||||
if(banner){if(s.connection_error){banner.textContent='⚠ '+(T.lbl_conn_error||'Connection error:')+' '+s.connection_error;banner.style.display='block';}else{banner.style.display='none';}}
|
if(banner){if(s.connection_error){banner.textContent='⚠ '+(T.lbl_conn_error||'Connection error:')+' '+s.connection_error;banner.style.display='block';}else{banner.style.display='none';}}
|
||||||
|
var frb=document.getElementById('file-ready-banner');
|
||||||
|
if(frb){
|
||||||
|
if(s.file_ready&&s.print_state==='standby'){
|
||||||
|
document.getElementById('file-ready-name').textContent=s.file_ready;
|
||||||
|
frb.style.display='flex';
|
||||||
|
}else{frb.style.display='none';}
|
||||||
|
}
|
||||||
// header
|
// header
|
||||||
var b=document.getElementById('h-badge');
|
var b=document.getElementById('h-badge');
|
||||||
b.className='hbadge '+s.print_state;
|
b.className='hbadge '+s.print_state;
|
||||||
@@ -1611,16 +1778,12 @@ function applyState(){
|
|||||||
var layers=s.curr_layer&&s.total_layers?'L '+s.curr_layer+' / '+s.total_layers:'–';
|
var layers=s.curr_layer&&s.total_layers?'L '+s.curr_layer+' / '+s.total_layers:'–';
|
||||||
var dlayers=document.getElementById('d-layers');if(dlayers)dlayers.textContent=layers;
|
var dlayers=document.getElementById('d-layers');if(dlayers)dlayers.textContent=layers;
|
||||||
|
|
||||||
var elapsed=fmtTime(s.print_duration);
|
var delapsed=document.getElementById('d-elapsed');if(delapsed)delapsed.textContent=fmtTime(s.print_duration);
|
||||||
var delapsed=document.getElementById('d-elapsed');if(delapsed)delapsed.textContent=elapsed;
|
var dremain=document.getElementById('d-remain');if(dremain)dremain.textContent=s.remain_time>0?fmtTime(s.remain_time):'–';
|
||||||
var remain=s.remain_time>0?'≈ '+fmtTime(s.remain_time)+' '+T.lbl_remaining:'';
|
|
||||||
var dremain=document.getElementById('d-remain');if(dremain)dremain.textContent=remain;
|
|
||||||
|
|
||||||
var dslrow=document.getElementById('d-slicer-row');
|
var dslrow=document.getElementById('d-slicer-row');
|
||||||
var dsltime=document.getElementById('d-slicer-time');
|
var dsltime=document.getElementById('d-slicer-time');
|
||||||
var dsllbl=document.getElementById('d-slicer-label');
|
|
||||||
if(dslrow&&dsltime){
|
if(dslrow&&dsltime){
|
||||||
if(s.slicer_time>0){dslrow.style.display='';if(dsllbl)dsllbl.textContent=T.lbl_slicer_time;dsltime.textContent=fmtTime(s.slicer_time);}
|
if(s.slicer_time>0){dslrow.style.display='';dsltime.textContent=fmtTime(s.slicer_time);}
|
||||||
else{dslrow.style.display='none';}
|
else{dslrow.style.display='none';}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1657,6 +1820,7 @@ function applyState(){
|
|||||||
|
|
||||||
// AMS
|
// AMS
|
||||||
if(s.ams_slots&&s.ams_slots.length){
|
if(s.ams_slots&&s.ams_slots.length){
|
||||||
|
window._amsSlots=s.ams_slots;
|
||||||
var html='';
|
var html='';
|
||||||
s.ams_slots.forEach(function(slot,i){
|
s.ams_slots.forEach(function(slot,i){
|
||||||
var empty=slot.status!==5;
|
var empty=slot.status!==5;
|
||||||
@@ -1664,11 +1828,13 @@ function applyState(){
|
|||||||
var col='rgb('+rgb[0]+','+rgb[1]+','+rgb[2]+')';
|
var col='rgb('+rgb[0]+','+rgb[1]+','+rgb[2]+')';
|
||||||
var active=slot.status===1||slot.active;
|
var active=slot.status===1||slot.active;
|
||||||
var pct=empty?T.ams_empty:(slot.consumables_percent!=null?slot.consumables_percent+'%':'–');
|
var pct=empty?T.ams_empty:(slot.consumables_percent!=null?slot.consumables_percent+'%':'–');
|
||||||
html+='<div class="ams-slot'+(active?' active':'')+(empty?' empty':'')+ '" style="--slot-color:'+col+';opacity:'+(empty?0.4:1)+'">'
|
var idx=slot.index!=null?slot.index:i;
|
||||||
|
html+='<div class="ams-slot'+(active?' active':'')+(empty?' empty':'')+ '" style="--slot-color:'+col+';opacity:'+(empty?0.4:1)+';cursor:pointer" onclick="openSlotEdit('+i+')">'
|
||||||
+'<div class="slot-circle" style="background:'+col+'"></div>'
|
+'<div class="slot-circle" style="background:'+col+'"></div>'
|
||||||
+'<div class="slot-material">'+(empty?'–':(slot.type||slot.material_type||'–'))+'</div>'
|
+'<div class="slot-material">'+(empty?'–':(slot.type||slot.material_type||'–'))+'</div>'
|
||||||
+'<div class="slot-label">Slot '+(slot.index!=null?slot.index+1:i+1)+'</div>'
|
+'<div class="slot-label">Slot '+(idx+1)+'</div>'
|
||||||
+'<div class="slot-label" style="font-size:10px;color:var(--txt2)">'+pct+'</div>'
|
+'<div class="slot-label" style="font-size:10px;color:var(--txt2)">'+pct+'</div>'
|
||||||
|
+'<div style="font-size:9px;color:var(--txt2);margin-top:2px">✏</div>'
|
||||||
+'</div>';
|
+'</div>';
|
||||||
});
|
});
|
||||||
document.getElementById('ams-slots').innerHTML=html;
|
document.getElementById('ams-slots').innerHTML=html;
|
||||||
@@ -1767,6 +1933,78 @@ function openSettings(){
|
|||||||
function closeSettings(){
|
function closeSettings(){
|
||||||
document.getElementById('settings-modal').classList.remove('open');
|
document.getElementById('settings-modal').classList.remove('open');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// ── AMS Slot Edit ──
|
||||||
|
var _slotEditIndex=-1;
|
||||||
|
var _MAT_PRESETS=['PLA','PETG','ABS','ASA','TPU','PA','PC','HIPS'];
|
||||||
|
function openSlotEdit(i){
|
||||||
|
var slot=(window._amsSlots||[])[i]||{};
|
||||||
|
var index=slot.index!=null?slot.index:i;
|
||||||
|
_slotEditIndex=index;
|
||||||
|
document.getElementById('slot-edit-title').textContent=T.slot_edit_title+' '+(index+1);
|
||||||
|
var rgb=Array.isArray(slot.color)?slot.color:[128,128,128];
|
||||||
|
var hex='#'+rgb.map(function(v){return('0'+Math.min(255,v).toString(16)).slice(-2)}).join('');
|
||||||
|
var ci=document.getElementById('slot-edit-color');
|
||||||
|
ci.value=hex;
|
||||||
|
document.getElementById('slot-edit-preview').style.background=hex;
|
||||||
|
var mat=(slot.type||'PLA').toUpperCase();
|
||||||
|
document.getElementById('slot-edit-mat').value=mat;
|
||||||
|
var btns=document.getElementById('slot-mat-btns');
|
||||||
|
btns.innerHTML=_MAT_PRESETS.map(function(m){
|
||||||
|
return '<button class="mat-preset-btn" data-mat="'+m+'" onclick="selectMatPreset(\''+m+'\')" '
|
||||||
|
+'style="padding:4px 10px;border-radius:6px;border:1px solid var(--border);cursor:pointer;font-size:12px;'
|
||||||
|
+(m===mat?'background:var(--accent);color:#fff':'background:var(--raised);color:var(--txt2)')+'">'+m+'</button>';
|
||||||
|
}).join('');
|
||||||
|
document.getElementById('slot-edit-modal').classList.add('open');
|
||||||
|
}
|
||||||
|
function closeSlotEdit(){
|
||||||
|
document.getElementById('slot-edit-modal').classList.remove('open');
|
||||||
|
}
|
||||||
|
function startReadyFile(){
|
||||||
|
var btn=document.getElementById('file-ready-btn');
|
||||||
|
if(btn){btn.disabled=true;btn.textContent='…';}
|
||||||
|
post('/printer/print/start',{filename:S.file_ready})
|
||||||
|
.then(function(r){return r.json();})
|
||||||
|
.then(function(r){
|
||||||
|
document.getElementById('file-ready-banner').style.display='none';
|
||||||
|
if(btn){btn.disabled=false;setText('file-ready-btn',T.file_ready_btn);}
|
||||||
|
})
|
||||||
|
.catch(function(e){
|
||||||
|
clog((T.log_error||'Error:')+' '+e,'msg-err');
|
||||||
|
if(btn){btn.disabled=false;setText('file-ready-btn',T.file_ready_btn);}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
function cancelReadyFile(){
|
||||||
|
post('/api/file_ready/clear',{})
|
||||||
|
.then(function(){document.getElementById('file-ready-banner').style.display='none';});
|
||||||
|
}
|
||||||
|
function selectMatPreset(m){
|
||||||
|
document.getElementById('slot-edit-mat').value=m;
|
||||||
|
highlightMatBtn(m);
|
||||||
|
}
|
||||||
|
function highlightMatBtn(val){
|
||||||
|
document.querySelectorAll('.mat-preset-btn').forEach(function(b){
|
||||||
|
var on=b.getAttribute('data-mat')===val.toUpperCase();
|
||||||
|
b.style.background=on?'var(--accent)':'var(--raised)';
|
||||||
|
b.style.color=on?'#fff':'var(--txt2)';
|
||||||
|
});
|
||||||
|
}
|
||||||
|
function hexToRgb(hex){
|
||||||
|
var r=parseInt(hex.slice(1,3),16),g=parseInt(hex.slice(3,5),16),b=parseInt(hex.slice(5,7),16);
|
||||||
|
return[r,g,b];
|
||||||
|
}
|
||||||
|
function saveSlotEdit(){
|
||||||
|
var hex=document.getElementById('slot-edit-color').value;
|
||||||
|
var mat=document.getElementById('slot-edit-mat').value.trim().toUpperCase()||'PLA';
|
||||||
|
var color=hexToRgb(hex);
|
||||||
|
post('/api/ams/set_slot',{index:_slotEditIndex,type:mat,color:color})
|
||||||
|
.then(function(r){return r.json();})
|
||||||
|
.then(function(r){
|
||||||
|
closeSlotEdit();
|
||||||
|
clog((T.slot_edit_ok||'AMS Slot')+' '+(_slotEditIndex+1)+': '+mat+' '+hex,'msg-ok');
|
||||||
|
})
|
||||||
|
.catch(function(e){clog('Fehler: '+e,'msg-err');});
|
||||||
|
}
|
||||||
document.addEventListener('DOMContentLoaded',function(){
|
document.addEventListener('DOMContentLoaded',function(){
|
||||||
document.getElementById('s-printer-ip').addEventListener('input',function(){
|
document.getElementById('s-printer-ip').addEventListener('input',function(){
|
||||||
var hint=document.getElementById('lbl-ip-hint');
|
var hint=document.getElementById('lbl-ip-hint');
|
||||||
@@ -2084,6 +2322,35 @@ function toggleCam(){if(camOn)camStop();else camStart()}
|
|||||||
self._state["print_speed_mode"] = mode
|
self._state["print_speed_mode"] = mode
|
||||||
return web.json_response({"result": "ok"})
|
return web.json_response({"result": "ok"})
|
||||||
|
|
||||||
|
async def handle_api_ams_set_slot(self, request):
|
||||||
|
try:
|
||||||
|
body = await request.json()
|
||||||
|
except Exception:
|
||||||
|
body = {}
|
||||||
|
index = int(body.get("index", 0))
|
||||||
|
mat = str(body.get("type", "PLA")).upper()
|
||||||
|
color = body.get("color", [255, 255, 255])
|
||||||
|
if not (isinstance(color, list) and len(color) == 3):
|
||||||
|
return web.json_response({"error": "color must be [r,g,b]"}, status=400)
|
||||||
|
loop = asyncio.get_event_loop()
|
||||||
|
def _send():
|
||||||
|
resp = self.client.publish(
|
||||||
|
"multiColorBox", "setInfo",
|
||||||
|
{"multi_color_box": [{"id": -1, "slots": [{"index": index, "type": mat, "color": color}]}]},
|
||||||
|
timeout=5
|
||||||
|
)
|
||||||
|
log.info(f"setInfo slot={index} type={mat} color={color} → {resp}")
|
||||||
|
return resp
|
||||||
|
resp = await loop.run_in_executor(None, _send)
|
||||||
|
if resp and resp.get("code") == 200:
|
||||||
|
# Update cached slot immediately
|
||||||
|
for s in self._ams_slots:
|
||||||
|
if s.get("index") == index:
|
||||||
|
s["type"] = mat
|
||||||
|
s["color"] = color
|
||||||
|
break
|
||||||
|
return web.json_response({"result": "ok"})
|
||||||
|
|
||||||
async def handle_api_ams_feed(self, request):
|
async def handle_api_ams_feed(self, request):
|
||||||
try:
|
try:
|
||||||
body = await request.json()
|
body = await request.json()
|
||||||
@@ -2336,6 +2603,7 @@ function toggleCam(){if(camOn)camStop();else camStart()}
|
|||||||
"ams_loaded_slot": self._ams_loaded_slot,
|
"ams_loaded_slot": self._ams_loaded_slot,
|
||||||
"thumbnail": self._thumbnail_b64,
|
"thumbnail": self._thumbnail_b64,
|
||||||
"connection_error": s["connection_error"],
|
"connection_error": s["connection_error"],
|
||||||
|
"file_ready": s["file_ready"],
|
||||||
"version": self._read_version(),
|
"version": self._read_version(),
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -2816,7 +3084,7 @@ def _mqtt_error_msg(exc: Exception) -> str:
|
|||||||
|
|
||||||
|
|
||||||
def build_app(bridge: KobraXBridge) -> web.Application:
|
def build_app(bridge: KobraXBridge) -> web.Application:
|
||||||
app = web.Application()
|
app = web.Application(client_max_size=256 * 1024 * 1024) # 256 MB für große GCode-Dateien
|
||||||
r = app.router
|
r = app.router
|
||||||
|
|
||||||
# Moonraker API
|
# Moonraker API
|
||||||
@@ -2850,6 +3118,7 @@ def build_app(bridge: KobraXBridge) -> web.Application:
|
|||||||
r.add_post("/api/disconnect", bridge.handle_api_disconnect)
|
r.add_post("/api/disconnect", bridge.handle_api_disconnect)
|
||||||
r.add_post("/api/speed", bridge.handle_api_speed)
|
r.add_post("/api/speed", bridge.handle_api_speed)
|
||||||
r.add_post("/api/ams/feed", bridge.handle_api_ams_feed)
|
r.add_post("/api/ams/feed", bridge.handle_api_ams_feed)
|
||||||
|
r.add_post("/api/ams/set_slot", bridge.handle_api_ams_set_slot)
|
||||||
r.add_post("/api/axis", bridge.handle_api_axis)
|
r.add_post("/api/axis", bridge.handle_api_axis)
|
||||||
r.add_post("/api/temperature", bridge.handle_api_temperature)
|
r.add_post("/api/temperature", bridge.handle_api_temperature)
|
||||||
r.add_get("/api/camera", bridge.handle_api_camera)
|
r.add_get("/api/camera", bridge.handle_api_camera)
|
||||||
@@ -2862,6 +3131,7 @@ def build_app(bridge: KobraXBridge) -> web.Application:
|
|||||||
r.add_post("/api/settings", bridge.handle_api_settings_post)
|
r.add_post("/api/settings", bridge.handle_api_settings_post)
|
||||||
r.add_get("/api/update/check", bridge.handle_api_update_check)
|
r.add_get("/api/update/check", bridge.handle_api_update_check)
|
||||||
r.add_post("/api/update/apply", bridge.handle_api_update_apply)
|
r.add_post("/api/update/apply", bridge.handle_api_update_apply)
|
||||||
|
r.add_post("/api/file_ready/clear", bridge.handle_api_file_ready_clear)
|
||||||
r.add_get("/api/log/stream", bridge.handle_api_log_stream)
|
r.add_get("/api/log/stream", bridge.handle_api_log_stream)
|
||||||
r.add_get("/api/log/download", bridge.handle_api_log_download)
|
r.add_get("/api/log/download", bridge.handle_api_log_download)
|
||||||
r.add_get("/serve/{filename}", bridge.handle_serve_file)
|
r.add_get("/serve/{filename}", bridge.handle_serve_file)
|
||||||
|
|||||||
@@ -1,2 +1,4 @@
|
|||||||
aiohttp>=3.9
|
aiohttp>=3.9
|
||||||
imageio-ffmpeg>=0.4.9
|
imageio-ffmpeg>=0.4.9
|
||||||
|
requests>=2.30.0
|
||||||
|
pycryptodome>=3.20.0
|
||||||
|
|||||||
9
start.sh
9
start.sh
@@ -15,6 +15,15 @@ if [[ ! -f .env ]]; then
|
|||||||
fi
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
# config/ Verzeichnis und config.ini.example anlegen falls nicht vorhanden
|
||||||
|
mkdir -p config
|
||||||
|
if [[ ! -f config/config.ini ]] && [[ ! -f config/config.ini.example ]]; then
|
||||||
|
if [[ -f config.ini.example ]]; then
|
||||||
|
cp config.ini.example config/config.ini.example
|
||||||
|
echo "[start] config/config.ini.example aus config.ini.example erstellt"
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
# Docker verfügbar?
|
# Docker verfügbar?
|
||||||
if ! docker info > /dev/null 2>&1; then
|
if ! docker info > /dev/null 2>&1; then
|
||||||
echo "[start] Docker nicht gefunden – bitte Docker installieren."
|
echo "[start] Docker nicht gefunden – bitte Docker installieren."
|
||||||
|
|||||||
Reference in New Issue
Block a user