Compare commits
42 Commits
v0.9.1-bet
...
feature/th
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
dc3722c803 | ||
| 9f6b6a8518 | |||
| 5eda8a241f | |||
| 2aaaa5bbbe | |||
| 374457fb07 | |||
| 618f1039c3 | |||
| e98a3706be | |||
| e8bd362d34 | |||
| 377a7a4984 | |||
| 9279036c51 | |||
| ce63cc5e7a | |||
| 5c83cc6df0 | |||
| be11217896 | |||
| 0292785fd8 | |||
| 50419fb487 | |||
| f196b8d29a | |||
| 1d3c5a7e1b | |||
| c22296d880 | |||
| d9d3581e22 | |||
| 966d421016 | |||
| 2a12ecca51 | |||
| ae4777187f | |||
| 8ccafb96c4 | |||
| 21f340271b | |||
| 2f56a1f056 | |||
| c3a62a13c5 | |||
| 4f1eaf7e93 | |||
| fc681316fc | |||
| 23756b82a9 | |||
| 3df73e89e3 | |||
| 4026fcc60c | |||
| 3687c28239 | |||
| 68b282d170 | |||
| f265a30994 | |||
| 3d2ac7b931 | |||
| 98303f1197 | |||
| 808ac13ce0 | |||
| 14400dd799 | |||
| 0fb9a71390 | |||
| e81cdefd71 | |||
| a7469cce9a | |||
| 8394f77767 |
@@ -21,3 +21,4 @@ DEVICE_ID=xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
|
||||
|
||||
# Modell-ID (Kobra X Standard: 20030)
|
||||
MODE_ID=20030
|
||||
|
||||
|
||||
304
CHANGELOG.de.md
Normal file
304
CHANGELOG.de.md
Normal file
@@ -0,0 +1,304 @@
|
||||
# Changelog
|
||||
|
||||
## [0.9.9] – 2026-05-14
|
||||
|
||||
### Fixes
|
||||
- **„Failed to fetch"-Schleife in der UI (Issue #21):** Wenn die Web-UI über die LAN-IP geöffnet wurde, lieferte `/kx/printers` `bridge_url: http://localhost:7125` zurück. Der Browser machte daraufhin Cross-Origin-Requests von der LAN-IP nach `localhost` — die wurden vom Browser blockiert und produzierten eine Flut aus `TypeError: Failed to fetch`-Poll-Fehlern. Die Bridge liefert jetzt im Einzel-Drucker-Modus eine leere `bridge_url`, sodass das Frontend relative Pfade gegen dieselbe Origin wie die UI nutzt. Im Multi-Printer-Modus werden `localhost`/`127.0.0.1` als Bridge-Hosts herausgefiltert.
|
||||
- **Windows-EXE crasht beim Start (Issue #21):** Die v0.9.8-`kx-bridge.exe` wurde mit einer veralteten `config_loader.py` aus einem früheren Release gebaut und stürzte mit `AttributeError: module 'config_loader' has no attribute 'list_printers'` ab. `release.sh` synct jetzt `config_loader.py` zusammen mit den anderen Quellen ins Windows-Build-Repository.
|
||||
|
||||
---
|
||||
|
||||
## [0.9.8] – 2026-05-12
|
||||
|
||||
### Neu
|
||||
- **Multi-Printer in einer Bridge-Instanz:** Ein Prozess verwaltet jetzt mehrere Drucker gleichzeitig — N MQTT-Verbindungen + N HTTP-Listener (Ports 7125, 7126, …), geteilte SQLite + GCode-Store. Konfiguration über `[printer_1]`-, `[printer_2]`-… Sektionen in `config.ini`. Einzel-Modus (`[connection]`) funktioniert unverändert weiter. `docker-compose.yml` exposed einen Port-Range `7125-7130`.
|
||||
- **Drucker per UI hinzufügen:** „+ Drucker hinzufügen"-Button im Drucker-Tab — nur die IP eingeben, Zugangsdaten (Username, Passwort, Device-ID) werden automatisch vom Drucker geholt und entschlüsselt. Weitere Drucker bekommen den nächsten freien Port (7126, 7127, …).
|
||||
- **Drucker per UI entfernen:** „✕"-Button auf jeder Drucker-Karte mit Bestätigung — entfernt die `[printer_N]`-Sektion und nummeriert die übrigen um. Beim Entfernen des letzten Druckers wird auch `[connection]` geleert (leerer Zustand).
|
||||
- **GCode Store:** Hochgeladene Dateien werden in SQLite gespeichert, inkl. Thumbnail-Extraktion. Neue `/kx/files`-API.
|
||||
- **Browser-Tab:** Grid-Ansicht aller hochgeladenen Dateien — Thumbnail, Status-Badge (✓/✗), letzte Druckdauer, plus Suche, Filter und Sortierung.
|
||||
- **Druckhistorie:** Druckaufträge (Start/Ende/Status) werden in SQLite protokolliert, Status pro Datei im Browser-Tab sichtbar.
|
||||
- **Filament-Dialog:** Per-Kanal-Remapping vor dem Druckstart — jeder GCode-Farbkanal wird einem physischen AMS-Slot zugewiesen (wie im Anycubic Slicer). Verfügbar im Browser-Tab und im Upload-Banner.
|
||||
- **MMU-Emulation:** `GET /printer/objects/query?mmu` liefert eine Happy-Hare-kompatible Struktur, damit OrcaSlicers Filament-Sync die AMS-Slots erkennt.
|
||||
- **Drucker-Tab:** Live-Status aller Drucker-Instanzen, IP auf jeder Karte, „Wechseln →"-Button.
|
||||
- **Editierbarer Drucker-Name:** Eigener Name in den Einstellungen (gespeichert in `[bridge] printer_name`, hat Vorrang vor dem vom Drucker gemeldeten Namen).
|
||||
- **Standalone-tauglich:** Linux-Binary / Windows-EXE laufen ohne Docker — `config/` und `data/` liegen neben dem Programm (portabel). Erststart ohne konfigurierten Drucker zeigt den Drucker-Tab mit „+ Drucker hinzufügen" statt des Einstellungs-Dialogs.
|
||||
- **i18n:** Alle neuen UI-Elemente auf Deutsch und Englisch.
|
||||
|
||||
### Fixes
|
||||
- **CORS:** CORS-Middleware auf allen Endpunkten — Cross-Instance-Fetches in der Multi-Printer-UI funktionieren zuverlässig.
|
||||
- **Einstellungen / Update-Check** zeigen im Multi-Printer-Modus jetzt die aktive Bridge-Instanz (via `_apiUrl`).
|
||||
- **Bridge-Neustart:** Config-abhängige Umgebungsvariablen werden vor einem Neustart gelöscht (der Config-Loader cachte sie, wodurch Config-Änderungen erst nach einem Kaltstart sichtbar wurden). Der Neustart ist jetzt plattformabhängig: Docker/systemd → Prozess-Exit (Supervisor startet neu), Linux standalone → `os.execv`, Windows → detachter Subprozess.
|
||||
- **`--data-dir`-Default** ist jetzt plattformabhängig — der `/app/data`-Default greift nur in Docker (per `ENV` gesetzt), Standalone-Binaries nutzen `<exe-dir>/data`. Behebt einen Startup-Crash beim Ausführen ohne Docker.
|
||||
|
||||
---
|
||||
|
||||
## [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
|
||||
|
||||
### ⚠️ Breaking Change: Konfiguration wechselt von `.env` zu `config/config.ini`
|
||||
|
||||
**Migration erfolgt automatisch** beim ersten Start — keine manuelle Aktion nötig.
|
||||
|
||||
- Einstellungen werden ab sofort aus `config/config.ini` gelesen statt aus `.env`
|
||||
- Beim ersten Start ohne `config.ini` wird die Datei automatisch aus `.env` erstellt
|
||||
- **Docker:** Volume `./config:/app/config` in `docker-compose.yml` ist der persistente Speicherort — Einstellungen überleben `docker-compose restart` und Updates
|
||||
- **Standalone:** `config/config.ini` liegt neben der Binary und wird bei Updates nicht überschrieben
|
||||
- `.env` bleibt als read-only Fallback gemountet — kann liegen bleiben
|
||||
- Zum manuellen Anlegen einer `config.ini`: Vorlage unter `config/config.ini.example`
|
||||
|
||||
### Neu
|
||||
- **Persistente Einstellungen:** `config/config.ini` ersetzt `.env` — Einstellungen gehen nach `docker-compose restart` nicht mehr verloren (Issue #9)
|
||||
- **Verbindungsfehler-Banner:** Roter Banner oben in der Web-UI wenn MQTT-Verbindung fehlschlägt (z.B. falsches Passwort, Drucker nicht erreichbar) (Issue #11)
|
||||
- **Slicer-Schätzzeit:** Geschätzte Gesamtdruckzeit aus dem GCode-Header wird im Fortschritts-Panel angezeigt
|
||||
|
||||
### Fixes
|
||||
- README: OrcaSlicer-Verbindung explizit mit `http://` und Port `:7125` dokumentiert (Issue #12)
|
||||
- README: Direkter Download-Link für `extract_credentials` auf Gitea-Releases (Issue #13)
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-dev] – laufend (dev-Branch)
|
||||
|
||||
### Neu
|
||||
- **Dev-Branch-Infrastruktur:** Versionsschema `0.9.1-dev+<hash>` — jeder Build eindeutig identifizierbar
|
||||
- **Separater Update-Kanal:** Dev-Versionen prüfen auf Gitea Pre-Releases mit `-dev+` im Tag
|
||||
- **AMS-Slot-Auswahl:** Einstellung „Standard-Slot (Einfarbdruck)" im Settings-Modal — fixiert einen bestimmten AMS-Kanal oder Auto (alle belegten Slots)
|
||||
- **Auto-Leveling:** Checkbox im Settings-Modal — steuert `task_settings.auto_leveling` beim Druckstart
|
||||
- **MQTT-Logging:** Strukturiertes TX/RX-Log mit Duplikat-Filter (`kobrax.mqtt` Logger)
|
||||
- **Server-Log im Browser:** Live-Stream via SSE (`/api/log/stream`) — alle Server-Logs erscheinen im Log-Tab der UI
|
||||
- **Log-Tab Verbesserungen:**
|
||||
- Auto-Scroll ein/aus — deaktiviert sich beim manuellen Hochscrollen, Button zum Reaktivieren
|
||||
- Textfilter — Live-Filterung der Log-Einträge
|
||||
- Error-Badge — roter Zähler im Tab-Button bei Fehlern/Warnungen
|
||||
- Clear-Button — Buffer leeren
|
||||
- Download-Button — letzte 500 Einträge als `kx-bridge.log`
|
||||
- Log-Fenster füllt den gesamten verfügbaren Platz (statt fester Höhe 160px)
|
||||
- **Log-Buffer:** 500 Einträge (Server + Browser vereinheitlicht)
|
||||
- **Changelog im Update-Dialog:** Release-Notes aus Gitea werden direkt im Update-Dialog angezeigt
|
||||
- **Slicer-Schätzzeit:** Geschätzte Gesamtdruckzeit aus dem GCode-Header im Fortschritts-Panel
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta15] – 2026-04-26
|
||||
|
||||
### Fixes
|
||||
- AMS: Leere Slots werden beim Druckstart übersprungen — kein `filament runout` mehr bei unbelegten Kanälen (Issue #5)
|
||||
- AMS: Material-Typ wird jetzt korrekt aus dem Drucker-Protokoll gelesen (Feld `type` statt `material_type`)
|
||||
- AMS UI: Leere Slots werden grau/transparent mit „Leer"-Label dargestellt
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta14] – 2026-04-26
|
||||
|
||||
### Fixes
|
||||
- Z-Achse: ▲ fährt jetzt aufwärts (Z+), ▼ abwärts (Z−) — Pfeile waren vertauscht (Issue #4)
|
||||
- Home All: korrekter Achsen-Code 5 — homed alle Achsen XYZ (Issue #4)
|
||||
- Neuer Button „Home XY" (axis=4) in der UI
|
||||
- Neuer Button „Motoren aus" (axis turnOff) in der UI
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta13] – 2026-04-26
|
||||
|
||||
### Fixes (Windows)
|
||||
- Self-Update / Settings-Neustart: `os.execv` funktioniert jetzt korrekt in der PyInstaller-Binary
|
||||
- Kamera: `ffmpeg nicht gefunden` crasht nicht mehr — saubere 503-Antwort wenn ffmpeg fehlt
|
||||
- Reconnect-Loop: Kurze leere TCP-Reads unter Windows lösen keine sofortigen Reconnects mehr aus
|
||||
|
||||
### Struktur
|
||||
- `bridge/`: Bridge-Dateien aus `05_scripts/` herausgelöst
|
||||
- `tools/`: `extract_credentials.py` als eigenständiges Tool mit eigenem README
|
||||
- `_archive/`: RE-Forschungsordner, Analyse-Tools und alte Release-Checksums archiviert
|
||||
- README komplett neu: klarer 3-Schritte-Schnellstart
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta12] – 2026-04-25
|
||||
|
||||
### Fixes
|
||||
- Falsche MQTT-Zugangsdaten zeigen jetzt eine verständliche Fehlermeldung statt des kryptischen `CONNACK failed: 20020005`
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta11] – 2026-04-25
|
||||
|
||||
### Fixes
|
||||
- Drucker-IP wird automatisch bereinigt wenn der Nutzer versehentlich den Port miteingibt (z.B. `192.168.1.102:9883` → `192.168.1.102`)
|
||||
- Settings-Modal: Hinweis erscheint wenn ein `:` in der IP erkannt wird
|
||||
- `docker-compose.yml`: `.env` als Volume gemountet — Einstellungen bleiben nach `docker-compose restart` erhalten
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta10] – 2026-04-25
|
||||
|
||||
### Neu
|
||||
- `start.sh` — startet die Bridge per Docker, baut das Image automatisch beim ersten Aufruf
|
||||
- Tests: pytest-Suite (19 Tests) für API-State, Moonraker-Endpunkte, Settings; Installations-Smoke-Test (`test_install.sh`)
|
||||
- Settings-Modal öffnet sich beim ersten Start automatisch wenn keine Zugangsdaten hinterlegt sind
|
||||
|
||||
### Geändert
|
||||
- README: Schnellstart zeigt jetzt `./start.sh` statt manuellem `docker build`
|
||||
- README: LAN-Modus korrekt als Drucker-Menüoption beschrieben
|
||||
- README: Versionsnummer wird ab jetzt automatisch bei jedem Release aktualisiert
|
||||
- `extract_credentials`: `--write-env` nicht mehr empfohlen — Werte im ⚙-Menü eintragen
|
||||
- Dockerfile im Release-Repo: Pfade ohne `05_scripts/`-Präfix
|
||||
- `release.sh`: Dockerfile für Release-Repo automatisch per `sed` angepasst
|
||||
|
||||
### Fixes
|
||||
- Restdruckzeit (`remain_time`) wird jetzt korrekt aus `print/report` übernommen und in der UI angezeigt
|
||||
- Übersetzungen: „Schrittweite" und „Ziel"-Placeholder in Temperatureingaben korrekt übersetzt
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta9] – 2026-04-25
|
||||
|
||||
### Neu
|
||||
- OrcaSlicer-Profil (`kobra_x_orcaslicer_preset.zip`) als Release-Asset
|
||||
- `release.sh`: OrcaSlicer-Profil wird automatisch ins Release-Repo kopiert und hochgeladen
|
||||
|
||||
### Geändert
|
||||
- README: `extract_credentials` ohne `--write-env`, Werte manuell im ⚙-Menü eintragen
|
||||
- README: Docker-Schnellstart vereinfacht
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta8] – 2026-04-25
|
||||
|
||||
### Neu
|
||||
- Restdruckzeit-Anzeige in der UI (≈ Xh Ym verbleibend) aus `remain_time`-Feld
|
||||
- Settings-Modal: Verbindungseinstellungen und Self-Update direkt im Browser
|
||||
- Self-Update: Bridge prüft Gitea-Release-API auf neue Versionen und aktualisiert sich selbst
|
||||
|
||||
### Geändert
|
||||
- Bridge startet im Offline-Modus wenn Drucker nicht erreichbar (kein Absturz)
|
||||
- Verbinden/Trennen-Button im Header
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta7] – 2026-04-22
|
||||
|
||||
### Neu
|
||||
- Offline-Start: Bridge läuft auch ohne MQTT-Verbindung, verbindet automatisch sobald Drucker erreichbar
|
||||
- Verbinden/Trennen-Button im Header
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta6] – 2026-04-20
|
||||
|
||||
### Neu
|
||||
- Release-ZIPs: `kx-bridge-linux.zip`, `kx-bridge-windows.zip`, `anycubic-certs.zip` mit Zertifikaten
|
||||
|
||||
### Fixes
|
||||
- PyInstaller frozen-Binary: `__file__` durch `sys.executable`-Pfad ersetzt (Cert-Pfad-Fix)
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta5] – 2026-04-19
|
||||
|
||||
### Neu
|
||||
- `kx-bridge.exe` (Windows) wird automatisch via GitHub Actions gebaut
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta4] – 2026-04-18
|
||||
|
||||
### Neu
|
||||
- `release.sh`: baut Linux-Binary und Windows-EXE, lädt alle Assets auf Gitea hoch
|
||||
- Englische README (`README.en.md`)
|
||||
|
||||
### Fixes
|
||||
- `progress` und `filename` werden bei `stoped`/`canceled` korrekt auf 0 zurückgesetzt
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta3] – 2026-04-17
|
||||
|
||||
### Neu
|
||||
- Druckgeschwindigkeit-Karte (Leise / Normal / Sport)
|
||||
- Übersetzungen (DE/EN) vervollständigt
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta2] – 2026-04-17
|
||||
|
||||
### Fixes
|
||||
- Temperatursteuerung während eines laufenden Drucks
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta1] – 2026-04-17
|
||||
|
||||
### Neu
|
||||
- UI-Komplettüberarbeitung: Settings-Modal, Self-Update, Dashboard, Responsive Design
|
||||
- Neue Drucker-Zustände: `pausing`, `paused`, `resuming`, `resumed`, `stopping`
|
||||
- `release.sh`: Version-Bump und Release-Sync Skript
|
||||
|
||||
---
|
||||
|
||||
## [0.9.0-beta1] – 2026-04-10
|
||||
|
||||
### Neu
|
||||
- Erster öffentlicher Release
|
||||
- Docker-Deployment, Linux-Binary, `extract_credentials`-Tool
|
||||
- Moonraker-kompatible HTTP/WebSocket-Bridge für den Anycubic Kobra X
|
||||
- AMS Einziehen/Ausziehen, Licht- und Lüftersteuerung
|
||||
- Web-UI mit Dashboard, Temperaturkarten, Achsensteuerung
|
||||
304
CHANGELOG.md
Normal file
304
CHANGELOG.md
Normal file
@@ -0,0 +1,304 @@
|
||||
# Changelog
|
||||
|
||||
## [0.9.9] – 2026-05-14
|
||||
|
||||
### Fixes
|
||||
- **"Failed to fetch" loop in the UI (Issue #21):** When the web UI was opened via the LAN IP, `/kx/printers` was returning `bridge_url: http://localhost:7125`, which caused the browser to fire cross-origin requests from the LAN IP to `localhost` — these were silently blocked, producing a flood of `TypeError: Failed to fetch` poll errors. The bridge now sends an empty `bridge_url` in single-printer mode so the frontend uses relative paths against the same origin as the UI. In multi-printer mode, `localhost`/`127.0.0.1` are filtered out as bridge hosts.
|
||||
- **Windows EXE startup crash (Issue #21):** The v0.9.8 `kx-bridge.exe` was built with a stale `config_loader.py` from an earlier release and crashed on startup with `AttributeError: module 'config_loader' has no attribute 'list_printers'`. `release.sh` now syncs `config_loader.py` into the Windows build repository together with the other source files.
|
||||
|
||||
---
|
||||
|
||||
## [0.9.8] – 2026-05-12
|
||||
|
||||
### New
|
||||
- **Multi-printer in a single bridge instance:** One process now manages multiple printers — N MQTT connections + N HTTP listeners (ports 7125, 7126, …), shared SQLite + GCode store. Configure via `[printer_1]`, `[printer_2]` … sections in `config.ini`. Single-printer mode (`[connection]` only) keeps working unchanged. `docker-compose.yml` exposes a port range `7125-7130`.
|
||||
- **Add printer from the UI:** "+ Add printer" button in the Printers tab — just enter the printer IP, the credentials (username, password, device ID) are fetched and decrypted from the printer automatically. Adding more printers assigns the next free port (7126, 7127, …).
|
||||
- **Remove printer from the UI:** "✕" button on each printer card with a confirmation dialog — removes the `[printer_N]` section and renumbers the rest. Removing the last printer clears `[connection]` too, leaving an empty state.
|
||||
- **GCode Store:** Uploaded files are persisted in SQLite with thumbnail extraction. New `/kx/files` API.
|
||||
- **Browser tab:** Grid view of all uploaded files — thumbnail, status badge (✓/✗), last print duration, plus search, filter and sort.
|
||||
- **Print history:** Print jobs (start/end/status) are recorded in SQLite, status shown per file in the Browser tab.
|
||||
- **Filament dialog:** Per-channel remapping before print start — assign each GCode color channel to a physical AMS slot (like the Anycubic Slicer does). Available in the Browser tab and the upload banner.
|
||||
- **MMU emulation:** `GET /printer/objects/query?mmu` returns a Happy-Hare-compatible structure so OrcaSlicer's filament sync detects the AMS slots.
|
||||
- **Printers tab:** Live status of all printer instances, IP shown on each card, "Switch →" button.
|
||||
- **Editable printer name:** Set a custom name in Settings (stored in `[bridge] printer_name`, takes precedence over the MQTT-reported name).
|
||||
- **Standalone friendly:** Linux binary / Windows EXE run without Docker — `config/` and `data/` are placed next to the executable (portable). First start with no printer configured shows the Printers tab with "+ Add printer" instead of the settings modal.
|
||||
- **i18n:** All new UI elements available in German and English.
|
||||
|
||||
### Fixes
|
||||
- **CORS:** CORS middleware added to all endpoints — cross-instance fetches in the multi-printer UI work reliably.
|
||||
- **Settings / update check** now reflect the active bridge instance in multi-printer mode (via `_apiUrl`).
|
||||
- **Bridge restart:** Config-dependent environment variables are cleared before a restart (the config loader cached them, which made config changes invisible until the next cold start). Restart is now platform-aware: Docker/systemd → process exit (supervisor restarts), Linux standalone → `os.execv`, Windows → detached subprocess.
|
||||
- **`--data-dir` default** is now platform-dependent — the `/app/data` default only applies inside Docker (set via `ENV`), standalone binaries use `<exe-dir>/data`. Fixes a startup crash when running the binary without Docker.
|
||||
|
||||
---
|
||||
|
||||
## [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
|
||||
|
||||
### ⚠️ Breaking Change: Configuration moves from `.env` to `config/config.ini`
|
||||
|
||||
**Migration is automatic** on first start — no manual action required.
|
||||
|
||||
- Settings are now read from `config/config.ini` instead of `.env`
|
||||
- On first start without `config.ini`, the file is created automatically from `.env`
|
||||
- **Docker:** Volume `./config:/app/config` in `docker-compose.yml` is the persistent storage — settings survive `docker-compose restart` and updates
|
||||
- **Standalone:** `config/config.ini` sits next to the binary and is not overwritten on update
|
||||
- `.env` stays mounted read-only as a migration source — you can leave it in place
|
||||
- To create a `config.ini` manually: copy `config/config.ini.example`
|
||||
|
||||
### New
|
||||
- **Persistent settings:** `config/config.ini` replaces `.env` — settings no longer lost after `docker-compose restart` (Issue #9)
|
||||
- **Connection error banner:** Red banner at the top of the Web-UI when MQTT connection fails (e.g. wrong password, printer unreachable) (Issue #11)
|
||||
- **Slicer estimated time:** Estimated total print time from GCode header shown in the progress panel
|
||||
|
||||
### Fixes
|
||||
- README: OrcaSlicer connection documented explicitly with `http://` and port `:7125` (Issue #12)
|
||||
- README: Direct download link for `extract_credentials` pointing to Gitea releases (Issue #13)
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-dev] – ongoing (dev branch)
|
||||
|
||||
### New
|
||||
- **Dev branch infrastructure:** Version scheme `0.9.1-dev+<hash>` — every build uniquely identifiable
|
||||
- **Separate update channel:** Dev versions check for Gitea pre-releases with `-dev+` in the tag
|
||||
- **AMS slot selection:** Setting "Default slot (single color)" in the Settings modal — pins a specific AMS channel or Auto (all loaded slots)
|
||||
- **Auto-leveling:** Checkbox in Settings modal — controls `task_settings.auto_leveling` on print start
|
||||
- **MQTT logging:** Structured TX/RX log with duplicate filter (`kobrax.mqtt` logger)
|
||||
- **Server log in browser console:** Live stream via SSE (`/api/log/stream`) — all server logs appear in the Log tab
|
||||
- **Log tab improvements:**
|
||||
- Auto-scroll on/off — disables automatically on manual scroll-up, button to re-enable
|
||||
- Text filter — live filtering of log entries
|
||||
- Error badge — red counter on the tab button when errors/warnings occur while on another tab
|
||||
- Clear button — empty the buffer
|
||||
- Download button — last 500 entries as `kx-bridge.log`
|
||||
- Log window now fills all available space (instead of fixed 160px height)
|
||||
- **Log buffer:** 500 entries (server + browser unified)
|
||||
- **Changelog in update dialog:** Release notes from Gitea loaded and shown directly in the update dialog
|
||||
- **Slicer estimated time:** Estimated total print time from GCode header shown in the progress panel
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta15] – 2026-04-26
|
||||
|
||||
### Fixes
|
||||
- AMS: Empty slots are skipped on print start — no more `filament runout` for unloaded channels (Issue #5)
|
||||
- AMS: Material type is now correctly read from the printer protocol (field `type` instead of `material_type`)
|
||||
- AMS UI: Empty slots shown grey/transparent with "Empty" label
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta14] – 2026-04-26
|
||||
|
||||
### Fixes
|
||||
- Z axis: ▲ now moves up (Z+), ▼ moves down (Z−) — arrows were reversed (Issue #4)
|
||||
- Home All: correct axis code 5 — homes all axes XYZ (Issue #4)
|
||||
- New "Home XY" button (axis=4) in the UI
|
||||
- New "Motors Off" button (axis turnOff) in the UI
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta13] – 2026-04-26
|
||||
|
||||
### Fixes (Windows)
|
||||
- Self-update / Settings restart: `os.execv` now works correctly in PyInstaller binary
|
||||
- Camera: `ffmpeg not found` no longer crashes — clean 503 response when ffmpeg is not installed
|
||||
- Reconnect loop: Short empty TCP reads on Windows no longer trigger immediate reconnects
|
||||
|
||||
### Structure
|
||||
- `bridge/`: Bridge files extracted from `05_scripts/`
|
||||
- `tools/`: `extract_credentials.py` as standalone tool with its own README
|
||||
- `_archive/`: RE research folders, analysis tools and old release checksums archived
|
||||
- README fully rewritten: clear 3-step quick start
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta12] – 2026-04-25
|
||||
|
||||
### Fixes
|
||||
- Wrong MQTT credentials now shows a human-readable error instead of cryptic `CONNACK failed: 20020005`
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta11] – 2026-04-25
|
||||
|
||||
### Fixes
|
||||
- Printer IP is automatically cleaned if the user accidentally includes the port (e.g. `192.168.1.102:9883` → `192.168.1.102`)
|
||||
- Settings modal: hint shown when `:` is detected in the IP field
|
||||
- `docker-compose.yml`: `.env` mounted as volume into the container — settings persist after `docker-compose restart`
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta10] – 2026-04-25
|
||||
|
||||
### New
|
||||
- `start.sh` — starts the bridge via Docker, builds the image automatically on first run
|
||||
- Tests: pytest suite (19 tests) for API state, Moonraker endpoints, settings; install smoke test (`test_install.sh`)
|
||||
- Settings modal opens automatically on first start when no credentials are configured
|
||||
|
||||
### Changed
|
||||
- README: Quick start now shows `./start.sh` instead of manual `docker build`
|
||||
- README: LAN mode correctly described as a printer menu option
|
||||
- README: Version number now updated automatically on each release
|
||||
- `extract_credentials`: `--write-env` no longer recommended — enter values in the ⚙ menu
|
||||
- Dockerfile in release repo: paths without `05_scripts/` prefix
|
||||
- `release.sh`: Dockerfile for release repo automatically patched via `sed`
|
||||
|
||||
### Fixes
|
||||
- Remaining print time (`remain_time`) now correctly taken from `print/report` and shown in UI
|
||||
- Translation: "Step size" and "Target" placeholders in temperature inputs now correctly translated
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta9] – 2026-04-25
|
||||
|
||||
### New
|
||||
- OrcaSlicer profile (`kobra_x_orcaslicer_preset.zip`) as release asset
|
||||
- `release.sh`: OrcaSlicer profile automatically copied to release repo and uploaded
|
||||
|
||||
### Changed
|
||||
- README: `extract_credentials` without `--write-env`, values entered manually in the ⚙ menu
|
||||
- README: Docker quick start simplified
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta8] – 2026-04-25
|
||||
|
||||
### New
|
||||
- Remaining print time display in UI (≈ Xh Ym remaining) from `remain_time` field
|
||||
- Settings modal: connection settings and self-update directly in the browser
|
||||
- Self-update: bridge checks Gitea release API for new versions and updates itself
|
||||
|
||||
### Changed
|
||||
- Bridge starts in offline mode when printer is unreachable (no crash)
|
||||
- Connect/Disconnect button in header
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta7] – 2026-04-22
|
||||
|
||||
### New
|
||||
- Offline start: bridge runs without MQTT connection, reconnects automatically when printer is reachable
|
||||
- Connect/Disconnect button in header
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta6] – 2026-04-20
|
||||
|
||||
### New
|
||||
- Release ZIPs: `kx-bridge-linux.zip`, `kx-bridge-windows.zip`, `anycubic-certs.zip` with certificates
|
||||
|
||||
### Fixes
|
||||
- PyInstaller frozen binary: `__file__` replaced with `sys.executable` path (cert path fix)
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta5] – 2026-04-19
|
||||
|
||||
### New
|
||||
- `kx-bridge.exe` (Windows) built automatically via GitHub Actions
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta4] – 2026-04-18
|
||||
|
||||
### New
|
||||
- `release.sh`: builds Linux binary and Windows EXE, uploads all assets to Gitea
|
||||
- English README (`README.en.md`)
|
||||
|
||||
### Fixes
|
||||
- `progress` and `filename` correctly reset to 0 on `stoped`/`canceled`
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta3] – 2026-04-17
|
||||
|
||||
### New
|
||||
- Print speed card (Silent / Normal / Sport)
|
||||
- Translations (DE/EN) completed
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta2] – 2026-04-17
|
||||
|
||||
### Fixes
|
||||
- Temperature control during an active print
|
||||
|
||||
---
|
||||
|
||||
## [0.9.1-beta1] – 2026-04-17
|
||||
|
||||
### New
|
||||
- Complete UI overhaul: Settings modal, self-update, dashboard, responsive design
|
||||
- New printer states: `pausing`, `paused`, `resuming`, `resumed`, `stopping`
|
||||
- `release.sh`: version bump and release sync script
|
||||
|
||||
---
|
||||
|
||||
## [0.9.0-beta1] – 2026-04-10
|
||||
|
||||
### New
|
||||
- First public release
|
||||
- Docker deployment, Linux binary, `extract_credentials` tool
|
||||
- Moonraker-compatible HTTP/WebSocket bridge for the Anycubic Kobra X
|
||||
- AMS load/unload, light and fan control
|
||||
- Web-UI with dashboard, temperature cards, motion control
|
||||
23
Dockerfile
23
Dockerfile
@@ -2,12 +2,27 @@ FROM python:3.11-slim
|
||||
|
||||
WORKDIR /app
|
||||
|
||||
COPY 05_scripts/requirements.txt .
|
||||
COPY requirements.txt .
|
||||
RUN pip install --no-cache-dir -r requirements.txt
|
||||
|
||||
COPY 05_scripts/kobrax_moonraker_bridge.py .
|
||||
COPY 05_scripts/env_loader.py .
|
||||
COPY 05_scripts/kobrax_client.py .
|
||||
COPY kobrax_moonraker_bridge.py .
|
||||
COPY web ./web
|
||||
COPY config_loader.py .
|
||||
COPY env_loader.py .
|
||||
COPY kobrax_client.py .
|
||||
COPY VERSION .
|
||||
COPY anycubic_slicer.crt .
|
||||
COPY anycubic_slicer.key .
|
||||
COPY config/config.ini.example /app/config/config.ini.example
|
||||
|
||||
# config/ ist ein Volume-Mountpoint – beim Start wird config.ini aus .env migriert
|
||||
# falls noch keine config.ini vorhanden ist.
|
||||
RUN mkdir -p /app/config && mkdir -p /app/data
|
||||
|
||||
# Daten-Verzeichnis fest auf /app/data (sonst würde der Binary-Default <exe-dir>/data greifen)
|
||||
# und Container-Erkennung für den Bridge-Restart (Supervisor startet neu statt subprocess).
|
||||
ENV KX_DATA_DIR=/app/data
|
||||
ENV KX_IN_DOCKER=1
|
||||
|
||||
EXPOSE 7125
|
||||
|
||||
|
||||
182
README.de.md
Normal file
182
README.de.md
Normal file
@@ -0,0 +1,182 @@
|
||||
<div align="center">
|
||||
|
||||
<img src="knlogo.png" alt="KX-Bridge" width="160"/>
|
||||
|
||||
# KX-Bridge
|
||||
|
||||
**Steuere deinen Anycubic Kobra X mit OrcaSlicer — ohne Klipper, ohne Raspberry Pi.**
|
||||
|
||||
Eine Moonraker-kompatible Bridge, die direkt mit dem Drucker spricht.
|
||||
|
||||
<sub>🇬🇧 <a href="README.md">English version</a></sub>
|
||||
|
||||
<br>
|
||||
|
||||
[](https://ko-fi.com/viewitde)
|
||||
|
||||
[](https://gitea.it-drui.de/viewit/KX-Bridge-Release/releases)
|
||||
|
||||
[](https://www.youtube.com/watch?v=1Ql4wfH27fM)
|
||||
|
||||
<sub>Gefällt dir KX-Bridge? Ein Kaffee auf <a href="https://ko-fi.com/viewitde">Ko-fi</a> hält das Projekt am Leben. ☕</sub>
|
||||
|
||||
</div>
|
||||
|
||||
---
|
||||
|
||||
## ✨ Was kann KX-Bridge?
|
||||
|
||||
| | Feature |
|
||||
|---|---|
|
||||
| 🖨️ | **Druckersteuerung** — Start, Pause, Resume, Abbruch, Temperaturen, Druckgeschwindigkeit |
|
||||
| 📊 | **Live-Status** — Temperatur, Fortschritt, Layer, Restzeit, Kamera-Stream |
|
||||
| 🎨 | **AMS / Multicolor** — Filament-Slots, Per-Kanal-Remapping, MMU-Emulation für OrcaSlicer Filament-Sync |
|
||||
| 🗂️ | **GCode-Browser** — hochgeladene Dateien mit Thumbnail, Druckhistorie, Suche & Filter |
|
||||
| 🧩 | **Multi-Printer** — mehrere Drucker in **einer** Bridge-Instanz, Umschalten per Dropdown |
|
||||
| ➕ | **Drucker hinzufügen per Klick** — nur die IP eingeben, Zugangsdaten werden automatisch importiert |
|
||||
| 🔄 | **Self-Update** — neue Versionen direkt im Browser installieren |
|
||||
| 🌐 | **OrcaSlicer** — volles Moonraker-Protokoll (HTTP + WebSocket), DE/EN UI |
|
||||
|
||||
---
|
||||
|
||||
## 🚀 Schnellstart
|
||||
|
||||
### 1. Drucker vorbereiten
|
||||
|
||||
LAN-Modus am Kobra X aktivieren:
|
||||
**Drucker-Display → Einstellungen → LAN-Modus aktivieren**
|
||||
|
||||
### 2. Bridge starten
|
||||
|
||||
**Docker (empfohlen):**
|
||||
```bash
|
||||
docker compose up -d
|
||||
```
|
||||
|
||||
**Linux-Binary (kein Docker):**
|
||||
```bash
|
||||
chmod +x kx-bridge && ./kx-bridge
|
||||
```
|
||||
|
||||
**Windows-EXE (kein Docker):**
|
||||
```
|
||||
kx-bridge.exe
|
||||
```
|
||||
> `config\` und `data\` werden neben der EXE angelegt — portabel.
|
||||
|
||||
> Bei Linux- und Windows-Binary liegen `config/` und `data/` (Einstellungen, SQLite,
|
||||
> GCode-Store) jeweils neben dem Programm. Einfach den ganzen Ordner kopieren = umziehen.
|
||||
|
||||
**Python direkt:**
|
||||
```bash
|
||||
pip install -r bridge/requirements.txt
|
||||
python bridge/kobrax_moonraker_bridge.py
|
||||
```
|
||||
|
||||
### 3. Drucker einrichten
|
||||
|
||||
Web-UI öffnen: **`http://BRIDGE-IP:7125`**
|
||||
|
||||
Beim Erststart erscheint der **Drucker-Tab** mit *„+ Drucker hinzufügen"* — einfach die
|
||||
IP-Adresse des Druckers eingeben, der Rest (Username, Passwort, Device-ID) wird automatisch
|
||||
vom Drucker geholt und entschlüsselt. Fertig.
|
||||
|
||||
> Mehrere Drucker? Einfach mehrfach *„+ Drucker hinzufügen"* — jeder bekommt seinen eigenen
|
||||
> Port (7125, 7126, …) und ist im Header-Dropdown auswählbar.
|
||||
|
||||
### 4. OrcaSlicer verbinden
|
||||
|
||||
Drucker → Verbindungstyp **Moonraker** → Host: `http://BRIDGE-IP:7125`
|
||||
|
||||
> ⚠️ Verbindungstyp muss **Moonraker** sein (nicht „Bambu" oder „Klipper").
|
||||
> Vollständige URL inkl. `http://` und Port `:7125` im Host-Feld eintragen.
|
||||
|
||||
---
|
||||
|
||||
## 📺 Video-Tutorial
|
||||
|
||||
[](https://www.youtube.com/watch?v=1Ql4wfH27fM)
|
||||
|
||||
---
|
||||
|
||||
## 🔧 Zugangsdaten manuell ermitteln
|
||||
|
||||
Normalerweise nicht nötig — *„+ Drucker hinzufügen"* macht das automatisch. Falls doch:
|
||||
|
||||
```bash
|
||||
fetch_credentials --ip 192.168.x.x --write-config
|
||||
```
|
||||
Holt die Zugangsdaten per HTTP direkt vom Drucker und schreibt sie in `config/config.ini`.
|
||||
Nur die Drucker-IP nötig, kein Slicer.
|
||||
|
||||
Alternativ (wenn die IP unbekannt ist): AnycubicSlicerNext öffnen, Drucker verbinden,
|
||||
dann `extract_credentials` ausführen → gibt Username, Passwort, Device-ID und IP aus.
|
||||
|
||||
> **Downloads:** [Releases](https://gitea.it-drui.de/viewit/KX-Bridge-Release/releases) → `fetch_credentials` / `extract_credentials` (Linux & Windows)
|
||||
|
||||
---
|
||||
|
||||
## ⚙️ Nützliche Befehle
|
||||
|
||||
```bash
|
||||
docker compose logs -f # Logs anzeigen
|
||||
docker compose down # Bridge stoppen
|
||||
docker compose up -d --build # Bridge neu bauen & starten (nach Update)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
## 🩹 Troubleshooting
|
||||
|
||||
<details>
|
||||
<summary><b>"Falsche MQTT-Zugangsdaten" beim Start</b></summary>
|
||||
|
||||
- Drucker über *„+ Drucker hinzufügen"* erneut hinzufügen, oder
|
||||
`fetch_credentials --ip <ip> --write-config` ausführen und Bridge neu starten
|
||||
- Nur die IP-Adresse eingeben, ohne Port (✗ `192.168.1.102:9883` → ✓ `192.168.1.102`)
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><b>Drucker nicht gefunden / kein LAN-Modus</b></summary>
|
||||
|
||||
- Am Drucker-Display: Einstellungen → LAN-Modus aktivieren
|
||||
- Drucker und Bridge müssen im selben Netzwerk sein
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><b>Docker: Permission denied</b></summary>
|
||||
|
||||
```bash
|
||||
sudo usermod -aG docker $USER # danach aus- und wieder einloggen
|
||||
```
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><b>Upgrade von 0.9.1 oder älter</b></summary>
|
||||
|
||||
Ab 0.9.2 speichert KX-Bridge die Einstellungen in `config/config.ini` statt `.env`.
|
||||
Die Migration läuft automatisch beim ersten Start nach dem Upgrade — keine Aktion nötig.
|
||||
</details>
|
||||
|
||||
---
|
||||
|
||||
## 🔒 Sicherheit
|
||||
|
||||
- Die Bridge ist im lokalen Netzwerk unter `http://<host-IP>:7125` erreichbar — **nicht** ins Internet exposen
|
||||
- `config/config.ini` enthält Drucker-Zugangsdaten — nicht öffentlich teilen
|
||||
- Die Zugangsdaten geben **keinen** Zugriff auf Anycubic-Cloud-Dienste
|
||||
|
||||
---
|
||||
|
||||
## 📄 Lizenz
|
||||
|
||||
Interoperabilitätsforschung gem. §69e UrhG — private, nicht-kommerzielle Nutzung.
|
||||
|
||||
<div align="center">
|
||||
<br>
|
||||
|
||||
**Wenn dir KX-Bridge hilft, freut sich das Projekt über Unterstützung:**
|
||||
|
||||
[](https://ko-fi.com/viewitde)
|
||||
|
||||
</div>
|
||||
275
README.md
275
README.md
@@ -1,185 +1,182 @@
|
||||
<div align="center">
|
||||
|
||||
<img src="knlogo.png" alt="KX-Bridge" width="160"/>
|
||||
|
||||
# KX-Bridge
|
||||
|
||||
Verbindet den Anycubic Kobra X mit OrcaSlicer – ohne Klipper, ohne Raspberry Pi.
|
||||
**Control your Anycubic Kobra X with OrcaSlicer — no Klipper, no Raspberry Pi.**
|
||||
|
||||
KX-Bridge läuft auf deinem PC oder NAS und stellt eine Schnittstelle bereit, über die OrcaSlicer den Drucker direkt steuern kann: Druckstart, Temperatur, Fortschritt, AMS-Farbwechsel.
|
||||
A Moonraker-compatible bridge that talks directly to the printer.
|
||||
|
||||
<sub>🇩🇪 <a href="README.de.md">Deutsche Version</a></sub>
|
||||
|
||||
<br>
|
||||
|
||||
[](https://ko-fi.com/viewitde)
|
||||
|
||||
[](https://gitea.it-drui.de/viewit/KX-Bridge-Release/releases)
|
||||
|
||||
[](https://www.youtube.com/watch?v=1Ql4wfH27fM)
|
||||
|
||||
<sub>Like KX-Bridge? A coffee on <a href="https://ko-fi.com/viewitde">Ko-fi</a> keeps the project alive. ☕</sub>
|
||||
|
||||
</div>
|
||||
|
||||
---
|
||||
|
||||
## Enthaltene Dateien
|
||||
## ✨ Features
|
||||
|
||||
| Datei | Beschreibung |
|
||||
|-------|-------------|
|
||||
| `kobrax_moonraker_bridge.py` | Bridge-Hauptprogramm |
|
||||
| `extract_credentials.exe` | Zugangsdaten aus AnycubicSlicerNext auslesen (Windows) |
|
||||
| `extract_credentials` | Zugangsdaten aus AnycubicSlicerNext auslesen (Linux) |
|
||||
| `kobra_x_orcaslicer_preset.zip` | OrcaSlicer-Druckerprofil für den Kobra X |
|
||||
| `bridge.sh` | Service-Manager für Linux |
|
||||
| `Dockerfile` / `docker-compose.yml` | Docker-Deployment |
|
||||
| `.env.example` | Konfigurationsvorlage |
|
||||
| | |
|
||||
|---|---|
|
||||
| 🖨️ | **Printer control** — start, pause, resume, cancel, temperatures, print speed |
|
||||
| 📊 | **Live status** — temperature, progress, layers, remaining time, camera stream |
|
||||
| 🎨 | **AMS / multicolor** — filament slots, per-channel remapping, MMU emulation for OrcaSlicer filament sync |
|
||||
| 🗂️ | **GCode browser** — uploaded files with thumbnails, print history, search & filter |
|
||||
| 🧩 | **Multi-printer** — multiple printers in **one** bridge instance, switch via dropdown |
|
||||
| ➕ | **Add a printer with one click** — just enter the IP, credentials are imported automatically |
|
||||
| 🔄 | **Self-update** — install new versions directly in the browser |
|
||||
| 🌐 | **OrcaSlicer** — full Moonraker protocol (HTTP + WebSocket), EN/DE UI |
|
||||
|
||||
---
|
||||
|
||||
## Voraussetzungen
|
||||
## 🚀 Quick Start
|
||||
|
||||
- Anycubic Kobra X im LAN-Modus (Drucker muss über LAN erreichbar sein, nicht nur über Anycubic-Cloud)
|
||||
- PC, NAS oder Server im gleichen Netzwerk (Windows oder Linux)
|
||||
- Docker oder Python 3.9+
|
||||
- MQTT-Zugangsdaten des Druckers → [Schritt 1](#schritt-1-zugangsdaten-ermitteln)
|
||||
### 1. Prepare the printer
|
||||
|
||||
---
|
||||
Enable LAN mode on the Kobra X:
|
||||
**Printer display → Settings → Enable LAN mode**
|
||||
|
||||
## Schnellstart
|
||||
### 2. Start the bridge
|
||||
|
||||
### Schritt 1: Zugangsdaten ermitteln
|
||||
|
||||
Die Bridge benötigt druckerspezifische MQTT-Zugangsdaten.
|
||||
|
||||
> Wichtig: Der Drucker muss sich im LAN-Modus befinden. Nur wenn der Drucker direkt über LAN (nicht ausschließlich über die Anycubic-Cloud) erreichbar ist, können die Zugangsdaten ermittelt und die Bridge genutzt werden.
|
||||
|
||||
Die Zugangsdaten werden mit `extract_credentials` aus dem laufenden AnycubicSlicerNext ausgelesen.
|
||||
|
||||
Vorbereitung: AnycubicSlicerNext starten und mit dem Drucker verbinden (bis der Drucker-Status angezeigt wird).
|
||||
|
||||
Windows:
|
||||
```
|
||||
extract_credentials.exe --write-env
|
||||
```
|
||||
|
||||
Linux:
|
||||
```bash
|
||||
chmod +x extract_credentials
|
||||
./extract_credentials --write-env
|
||||
```
|
||||
|
||||
Die Zugangsdaten werden automatisch in `.env` gespeichert.
|
||||
|
||||
> Falls das Ergebnis unsicher wirkt: `--verbose` zeigt alle gefundenen Kandidaten. Den richtigen Wert manuell in `.env` eintragen.
|
||||
|
||||
---
|
||||
|
||||
### Schritt 2: Konfiguration prüfen
|
||||
|
||||
```bash
|
||||
cp .env.example .env
|
||||
# .env öffnen und Werte kontrollieren
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Schritt 3: Bridge starten
|
||||
|
||||
Option A – Docker (empfohlen):
|
||||
**Docker (recommended):**
|
||||
```bash
|
||||
docker compose up -d
|
||||
```
|
||||
Läuft im Hintergrund, startet automatisch nach Systemneustart.
|
||||
|
||||
Option B – Linux Binary:
|
||||
**Linux binary (no Docker):**
|
||||
```bash
|
||||
chmod +x kx-bridge
|
||||
./kx-bridge
|
||||
# Oder mit Service-Manager:
|
||||
./bridge.sh start
|
||||
chmod +x kx-bridge && ./kx-bridge
|
||||
```
|
||||
|
||||
Option C – Python direkt:
|
||||
**Windows EXE (no Docker):**
|
||||
```
|
||||
kx-bridge.exe
|
||||
```
|
||||
> `config\` and `data\` are created next to the EXE — portable.
|
||||
|
||||
> With the Linux and Windows binaries, `config/` and `data/` (settings, SQLite, GCode store)
|
||||
> live next to the program. Copy the whole folder = move the installation.
|
||||
|
||||
**Python directly:**
|
||||
```bash
|
||||
pip install aiohttp
|
||||
python kobrax_moonraker_bridge.py
|
||||
pip install -r bridge/requirements.txt
|
||||
python bridge/kobrax_moonraker_bridge.py
|
||||
```
|
||||
|
||||
### 3. Set up the printer
|
||||
|
||||
Open the Web UI: **`http://BRIDGE-IP:7125`**
|
||||
|
||||
On first start the **Printers tab** shows *"+ Add printer"* — just enter the printer's IP
|
||||
address, the rest (username, password, device ID) is fetched from the printer and decrypted
|
||||
automatically. Done.
|
||||
|
||||
> More than one printer? Just click *"+ Add printer"* again — each gets its own port
|
||||
> (7125, 7126, …) and is selectable from the header dropdown.
|
||||
|
||||
### 4. Connect OrcaSlicer
|
||||
|
||||
Printer → Connection type **Moonraker** → Host: `http://BRIDGE-IP:7125`
|
||||
|
||||
> ⚠️ Connection type must be **Moonraker** (not "Bambu" or "Klipper").
|
||||
> Enter the full URL including `http://` and port `:7125` in the host field.
|
||||
|
||||
---
|
||||
|
||||
## 📺 Video Tutorial
|
||||
|
||||
[](https://www.youtube.com/watch?v=1Ql4wfH27fM)
|
||||
|
||||
---
|
||||
|
||||
## 🔧 Getting credentials manually
|
||||
|
||||
Normally not needed — *"+ Add printer"* does this automatically. If you do need it:
|
||||
|
||||
```bash
|
||||
fetch_credentials --ip 192.168.x.x --write-config
|
||||
```
|
||||
Fetches the credentials directly from the printer via HTTP and writes them to `config/config.ini`.
|
||||
Only the printer IP is required, no slicer.
|
||||
|
||||
Alternatively (if the IP is unknown): open AnycubicSlicerNext, connect the printer, then run
|
||||
`extract_credentials` → outputs username, password, device ID and the printer IP.
|
||||
|
||||
> **Downloads:** [Releases](https://gitea.it-drui.de/viewit/KX-Bridge-Release/releases) → `fetch_credentials` / `extract_credentials` (Linux & Windows)
|
||||
|
||||
---
|
||||
|
||||
## ⚙️ Useful commands
|
||||
|
||||
```bash
|
||||
docker compose logs -f # show logs
|
||||
docker compose down # stop the bridge
|
||||
docker compose up -d --build # rebuild & start (after an update)
|
||||
```
|
||||
|
||||
---
|
||||
|
||||
### Schritt 4: OrcaSlicer-Profil installieren
|
||||
## 🩹 Troubleshooting
|
||||
|
||||
1. `kobra_x_orcaslicer_preset.zip` in OrcaSlicer importieren:
|
||||
Datei → Konfigurationen importieren → ZIP auswählen
|
||||
2. Anycubic Kobra X als Drucker auswählen
|
||||
<details>
|
||||
<summary><b>"Wrong MQTT credentials" on start</b></summary>
|
||||
|
||||
---
|
||||
- Re-add the printer via *"+ Add printer"*, or run
|
||||
`fetch_credentials --ip <ip> --write-config` and restart the bridge
|
||||
- Enter only the IP address, no port (✗ `192.168.1.102:9883` → ✓ `192.168.1.102`)
|
||||
</details>
|
||||
|
||||
### Schritt 5: OrcaSlicer verbinden
|
||||
<details>
|
||||
<summary><b>Printer not found / no LAN mode</b></summary>
|
||||
|
||||
1. Drucker-Einstellungen öffnen
|
||||
2. Verbindungstyp: Moonraker
|
||||
3. Adresse: `http://IP-DES-BRIDGE-PC:7125` eintragen
|
||||
4. Auf "Test" klicken – bei erfolgreicher Verbindung erscheint eine Bestätigungsmeldung
|
||||
- On the printer display: Settings → Enable LAN mode
|
||||
- Printer and bridge must be on the same network
|
||||
</details>
|
||||
|
||||
---
|
||||
|
||||
## bridge.sh – Service-Manager (Linux)
|
||||
<details>
|
||||
<summary><b>Docker: Permission denied</b></summary>
|
||||
|
||||
```bash
|
||||
./bridge.sh start # Im Hintergrund starten
|
||||
./bridge.sh stop # Beenden
|
||||
./bridge.sh restart # Neustarten
|
||||
./bridge.sh status # Status anzeigen
|
||||
./bridge.sh log 50 # Letzte 50 Log-Zeilen
|
||||
sudo usermod -aG docker $USER # then log out and back in
|
||||
```
|
||||
</details>
|
||||
|
||||
<details>
|
||||
<summary><b>Upgrading from 0.9.1 or earlier</b></summary>
|
||||
|
||||
Starting with 0.9.2, KX-Bridge stores settings in `config/config.ini` instead of `.env`.
|
||||
Migration runs automatically on first start after the upgrade — no action required.
|
||||
</details>
|
||||
|
||||
---
|
||||
|
||||
## Docker – Nützliche Befehle
|
||||
## 🔒 Security
|
||||
|
||||
```bash
|
||||
docker compose up -d # Starten
|
||||
docker compose down # Stoppen
|
||||
docker compose logs -f # Logs verfolgen
|
||||
docker compose pull && docker compose up -d # Update
|
||||
```
|
||||
- The bridge is reachable on the local network at `http://<host-IP>:7125` — **do not** expose it to the internet
|
||||
- `config/config.ini` contains printer credentials — do not share publicly
|
||||
- The credentials do **not** grant access to Anycubic cloud services
|
||||
|
||||
---
|
||||
|
||||
## Fehlerbehebung
|
||||
## 📄 License
|
||||
|
||||
Port 7125 belegt:
|
||||
```bash
|
||||
./bridge.sh stop
|
||||
./bridge.sh start
|
||||
```
|
||||
Interoperability research under §69e UrhG — private, non-commercial use only.
|
||||
|
||||
Verbindungstest in OrcaSlicer schlägt fehl:
|
||||
- Firewall prüfen: Port 7125 muss erreichbar sein
|
||||
- Bridge-Log prüfen: `./bridge.sh log` oder `docker compose logs`
|
||||
- Drucker-IP in `.env` korrekt?
|
||||
<div align="center">
|
||||
<br>
|
||||
|
||||
Zugangsdaten werden abgelehnt:
|
||||
- AnycubicSlicerNext starten, mit Drucker verbinden
|
||||
- `extract_credentials --verbose` ausführen und alle Kandidaten prüfen
|
||||
- Richtigen Wert manuell in `.env` eintragen, Bridge neu starten
|
||||
**If KX-Bridge helps you, the project appreciates your support:**
|
||||
|
||||
Docker: Permission denied:
|
||||
```bash
|
||||
sudo usermod -aG docker $USER
|
||||
# Neu einloggen, dann erneut versuchen
|
||||
```
|
||||
[](https://ko-fi.com/viewitde)
|
||||
|
||||
---
|
||||
|
||||
## Konfigurationsreferenz (.env)
|
||||
|
||||
| Parameter | Beschreibung | Beispiel |
|
||||
|-----------|-------------|---------|
|
||||
| `PRINTER_IP` | IP-Adresse des Druckers | `192.168.1.100` |
|
||||
| `MQTT_PORT` | MQTT-Port (nicht ändern) | `9883` |
|
||||
| `MQTT_USERNAME` | Benutzername (beginnt mit „user") | `userXXXXXXXXXX` |
|
||||
| `MQTT_PASSWORD` | Passwort (~15 Zeichen) | `***` |
|
||||
| `DEVICE_ID` | Geräte-ID (32 Hex-Zeichen) | `xxxxxxxx...` |
|
||||
| `MODE_ID` | Modell-ID (Kobra X Standard) | `20030` |
|
||||
|
||||
---
|
||||
|
||||
## Sicherheitshinweise
|
||||
|
||||
- Alle Zugangsdaten werden ausschließlich lokal verarbeitet
|
||||
|
||||
---
|
||||
|
||||
## Hinweis zur Nutzung
|
||||
|
||||
Dieses Projekt dient der privaten Nutzung und der Herstellung von Interoperabilität zwischen dem Anycubic Kobra X und freier Software (OrcaSlicer).
|
||||
|
||||
`extract_credentials` liest ausschließlich den Arbeitsspeicher des auf deinem eigenen PC laufenden AnycubicSlicerNext-Prozesses. Es werden keine Daten übertragen oder gespeichert, außer in die lokale `.env`-Datei. Das Tool funktioniert nur für den Prozess des Druckers, dem du selbst gehörst.
|
||||
|
||||
Das Projekt steht in keiner Verbindung zu Anycubic und wird nicht kommerziell betrieben.
|
||||
</div>
|
||||
|
||||
24
anycubic_slicer.crt
Normal file
24
anycubic_slicer.crt
Normal file
@@ -0,0 +1,24 @@
|
||||
-----BEGIN CERTIFICATE-----
|
||||
MIIEDTCCAvWgAwIBAgICAZAwDQYJKoZIhvcNAQEFBQAwgZsxCzAJBgNVBAYTAkNO
|
||||
MRIwEAYDVQQIDAlHdWFuZ2RvbmcxETAPBgNVBAcMCFNoZW56aGVuMREwDwYDVQQK
|
||||
DAhBbnljdWJpYzERMA8GA1UECwwIQW55Y3ViaWMxEzARBgNVBAMMCkFDIFJvb3Qg
|
||||
Q0ExKjAoBgkqhkiG9w0BCQEWG2FueWN1YmljX2Nsb3VkQGFueWN1YmljLmNvbTAg
|
||||
Fw0yMzA3MjAwMzI3NTFaGA8yMTIzMDcyMTAzMjc1MVowgZ8xCzAJBgNVBAYTAkNO
|
||||
MRIwEAYDVQQIDAlHdWFuZ2RvbmcxETAPBgNVBAcMCFNoZW56aGVuMREwDwYDVQQK
|
||||
DAhBbnljdWJpYzERMA8GA1UECwwIQW55Y3ViaWMxFzAVBgNVBAMMDkFueWN1Ymlj
|
||||
U2xpY2VyMSowKAYJKoZIhvcNAQkBFhthbnljdWJpY19jbG91ZEBhbnljdWJpYy5j
|
||||
b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDdoQ7g2F/yecfpdlqT
|
||||
b8W/84r3vQ4ZEWx2PbSTBcGD55HmzJp2lwABHFHbn4CltT9YzoJWpOiVMHYnyPep
|
||||
43tkNUIcGm7z0jrTD5djyYjVAzEitkNzJspKK/xcVmZe/V7Q3IAWXtzgWCd0YpVk
|
||||
K3J0HqoqJvcTSnYe4VXxbIGwbpeYyji9W/DuG1M4Z+sFiPDWeR9xo5IXRU5ZwaTP
|
||||
8OiCCLSBbeKgf0UFWTIZdJ1JXJ7efbbstZOjf5L9LhBIC0hLdL4jlMpF7r0ThecJ
|
||||
cTx9Bnw/hhy+i32rJTRzZDIaLhKg/bka9ZrORZdxxQRiPoMjLjoxtr4+AUaeLWkI
|
||||
ajSJAgMBAAGjUzBRMB0GA1UdDgQWBBRI4P3/uKdYYFPEcFIwYxdv1p9gETAfBgNV
|
||||
HSMEGDAWgBQlkDqpFERfr3u1rR9gNbNKtgrHIjAPBgNVHRMBAf8EBTADAQH/MA0G
|
||||
CSqGSIb3DQEBBQUAA4IBAQBP3ws80Y9eBR2lpjYP3rVvH8kA6+LnEXT4PpHj+fSw
|
||||
jciaNskzpiwNvBy00m32ACR5YKlMUjevlQuyyw+LQbTUwAEOwyy9SDQpiXdjL6q3
|
||||
SPQ4aB4A57nFXOGrthc/nb9yFcteWrZrKbwvVUu2vqU7U8n7lJKjhVuFRWSXS3SV
|
||||
sPc9JZ21kpPYWKbGtfD6jUlW0Ip+PurLw9FrbVwnEcOMf/ezSlrH5c8mfJyo8pVk
|
||||
aC/6PpReqijusOSRZ5oLyhPvtgddXseJFByun1Ud0CDlFA05nGGPmnVcXD+GMnHH
|
||||
i6baCTeifwp5Jpdzv4imcCPvayKUNuX32vYNfNkWC/R5
|
||||
-----END CERTIFICATE-----
|
||||
28
anycubic_slicer.key
Normal file
28
anycubic_slicer.key
Normal file
@@ -0,0 +1,28 @@
|
||||
-----BEGIN PRIVATE KEY-----
|
||||
MIIEvgIBADANBgkqhkiG9w0BAQEFAASCBKgwggSkAgEAAoIBAQDdoQ7g2F/yecfp
|
||||
dlqTb8W/84r3vQ4ZEWx2PbSTBcGD55HmzJp2lwABHFHbn4CltT9YzoJWpOiVMHYn
|
||||
yPep43tkNUIcGm7z0jrTD5djyYjVAzEitkNzJspKK/xcVmZe/V7Q3IAWXtzgWCd0
|
||||
YpVkK3J0HqoqJvcTSnYe4VXxbIGwbpeYyji9W/DuG1M4Z+sFiPDWeR9xo5IXRU5Z
|
||||
waTP8OiCCLSBbeKgf0UFWTIZdJ1JXJ7efbbstZOjf5L9LhBIC0hLdL4jlMpF7r0T
|
||||
hecJcTx9Bnw/hhy+i32rJTRzZDIaLhKg/bka9ZrORZdxxQRiPoMjLjoxtr4+AUae
|
||||
LWkIajSJAgMBAAECggEASwRkC9lRiLqN30kvWW5g6hsec8KrTfLm2pMCVy2AlgxB
|
||||
B3VD51YvKzERyBwSKITT/1RPK9K/4xe3NrpAkmGsd3vLd8W+vorvXFePr7gct7VP
|
||||
4Wb+J7D+keKXlg2sswRiHqI0PN45Nzq/iBaCaJiIMiPbB0+PHBl9J/Cv7XsD3tq+
|
||||
9WKhvXf2g1g9GMrLaCCcWXWCqcu0LlbqJnw3yMnJLSltmyFTmlVLjDHM75bMVz97
|
||||
4emQzOlnRN2yA5cWWCaM+mgjNM2aWwUsXBZzCgwSqSaj1QD4B/epCuDBORWHS9D6
|
||||
jL15w8xjly9q8OS+4d6beR5h9GiPyMK4Ff2wXImCXQKBgQDwXxtrL+kVZrQ/qftj
|
||||
24F3+QDN0j5Z3lUMTfZPn6ng/E/aBfn8KcWJHj2vYkKZdB5wOXJr56BYe3Hukzfp
|
||||
QF0E2+g1WAGskF1mb/vVab54geox5Y6CA+ionRn2kcCwybVkktR/0JK2UV9Qjb/z
|
||||
k1WU+RUhNrW/GDBqYulaadnR+wKBgQDsCf2/yKGPxj4pIvAtn5RFSlfscddgkSnc
|
||||
ouBkDXEp5ta+5PGrlrdzS/F0vFhvBPbfbVJxVwRnM/Oqj8c0/bj7oc5RpPxirciO
|
||||
AaovKVPTiORaviytnB2HgkflkJfy5vdXv4ZQahAV/UwtSmLwBshe+Ya68MAFrQRa
|
||||
7M4z6k4QSwKBgQCm7OVVoofzXMeADsONrTpT3pA4XvD95/CYAuwyj2ah35Z0igH4
|
||||
o+mSN3YO/eXSO1mIBdz4Inqv98o/K+2ABjqSzUSNBvjipb63DL2Oj0i+1zmUPR6i
|
||||
G6TOs4r8OGvgWbOmjHEV8fpwskHG5ymONZsRQYjy79N3SY0V1GrJZwjlUQKBgD0x
|
||||
AeWcP7YkMK09b4KEYk3sTgrwIGPafj3Cw+VsTrAMNhPbCoPvWLO9NmWLBmoRoWae
|
||||
0sarRmry3vKSv5QPSsuBURl9aiiy4NFfwRzk2+R1Eq4rqy1+0XD152muKJZCJlFL
|
||||
R6jFNlJdDkiXhjqvp3ZnvfPswfs2tXBU/8gZsA8tAoGBALXfc5m9I5R1l1zN7tpa
|
||||
ncA0S3EKzqmuCc3KzlS6OS0e9Lz1MsmfEsvxvW3w4SrdfTbwQpEy9RNg89dlgPtc
|
||||
rdId1QdN2eWPY5M4lz9n9EYdzi9ufoKAEYu2a0lP+qz690JwmL1Jx49bvQEn5Nu0
|
||||
4swn72uwBRlhjAw46MF77SBQ
|
||||
-----END PRIVATE KEY-----
|
||||
34
config.ini.example
Normal file
34
config.ini.example
Normal file
@@ -0,0 +1,34 @@
|
||||
# KX-Bridge Konfigurationsdatei
|
||||
# Kopiere diese Datei nach config.ini und trage deine Werte ein:
|
||||
# cp config.ini.example config.ini
|
||||
#
|
||||
# Credentials mit extract_credentials.exe (Windows) oder
|
||||
# extract_credentials (Linux) aus dem laufenden AnycubicSlicerNext auslesen.
|
||||
|
||||
[connection]
|
||||
# IP-Adresse des Druckers im lokalen Netzwerk
|
||||
printer_ip = 192.168.x.x
|
||||
|
||||
# MQTT-Port (Anycubic Kobra X Standard: 9883)
|
||||
mqtt_port = 9883
|
||||
|
||||
# MQTT-Zugangsdaten (druckerspezifisch, beginnt mit "user")
|
||||
username = userXXXXXXXXXX
|
||||
password = XXXXXXXXXXXXXXX
|
||||
|
||||
# Geräte-ID (32-stelliger Hex-String, druckerspezifisch)
|
||||
device_id = xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
|
||||
|
||||
# Modell-ID (Kobra X Standard: 20030)
|
||||
mode_id = 20030
|
||||
|
||||
[print]
|
||||
# Standard-AMS-Slot für Einfarbdruck (auto = alle belegten Slots, 0-3 = fixer Slot)
|
||||
default_ams_slot = auto
|
||||
|
||||
# Auto-Leveling vor jedem Druck (1 = an, 0 = aus)
|
||||
auto_leveling = 1
|
||||
|
||||
[bridge]
|
||||
# Poll-Intervall in Sekunden
|
||||
poll_interval = 3
|
||||
36
config/config.ini.example
Normal file
36
config/config.ini.example
Normal file
@@ -0,0 +1,36 @@
|
||||
# KX-Bridge Konfigurationsdatei
|
||||
# Kopiere diese Datei nach config.ini und trage deine Werte ein:
|
||||
# cp config.ini.example config.ini
|
||||
#
|
||||
# Credentials automatisch eintragen:
|
||||
# python3 tools/fetch_credentials.py --ip 192.168.x.x --write-config
|
||||
# Alternativ (Windows, ohne Drucker-IP bekannt):
|
||||
# extract_credentials.exe --write-env (liest aus laufendem AnycubicSlicerNext)
|
||||
|
||||
[connection]
|
||||
# IP-Adresse des Druckers im lokalen Netzwerk
|
||||
printer_ip = 192.168.x.x
|
||||
|
||||
# MQTT-Port (Anycubic Kobra X Standard: 9883)
|
||||
mqtt_port = 9883
|
||||
|
||||
# MQTT-Zugangsdaten (druckerspezifisch, beginnt mit "user")
|
||||
username = userXXXXXXXXXX
|
||||
password = XXXXXXXXXXXXXXX
|
||||
|
||||
# Geräte-ID (32-stelliger Hex-String, druckerspezifisch)
|
||||
device_id = xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
|
||||
|
||||
# Modell-ID (Kobra X Standard: 20030)
|
||||
mode_id = 20030
|
||||
|
||||
[print]
|
||||
# Standard-AMS-Slot für Einfarbdruck (auto = alle belegten Slots, 0-3 = fixer Slot)
|
||||
default_ams_slot = auto
|
||||
|
||||
# Auto-Leveling vor jedem Druck (1 = an, 0 = aus)
|
||||
auto_leveling = 1
|
||||
|
||||
[bridge]
|
||||
# Poll-Intervall in Sekunden
|
||||
poll_interval = 3
|
||||
177
config_loader.py
Normal file
177
config_loader.py
Normal file
@@ -0,0 +1,177 @@
|
||||
"""
|
||||
config_loader.py – lädt Verbindungsparameter aus config/config.ini (primär)
|
||||
oder .env (Fallback / Migration).
|
||||
Umgebungsvariablen haben immer Vorrang.
|
||||
"""
|
||||
import os
|
||||
import sys
|
||||
import pathlib
|
||||
import configparser
|
||||
|
||||
_BASE = pathlib.Path(sys.executable).parent if getattr(sys, "frozen", False) else pathlib.Path(__file__).parent
|
||||
|
||||
CONFIG_SECTION_CONNECTION = "connection"
|
||||
CONFIG_SECTION_PRINT = "print"
|
||||
CONFIG_SECTION_BRIDGE = "bridge"
|
||||
|
||||
|
||||
def _find_config_file() -> pathlib.Path | None:
|
||||
for base in (_BASE, _BASE.parent):
|
||||
p = base / "config" / "config.ini"
|
||||
if p.is_file():
|
||||
return p
|
||||
return None
|
||||
|
||||
|
||||
def _find_env_file() -> pathlib.Path | None:
|
||||
for base in (_BASE, _BASE.parent):
|
||||
p = base / ".env"
|
||||
if p.is_file():
|
||||
return p
|
||||
return None
|
||||
|
||||
|
||||
def _load_env_file(path: pathlib.Path):
|
||||
"""Lädt .env-Datei als Fallback – setzt nur Keys die noch nicht in os.environ sind."""
|
||||
with open(path, encoding="utf-8") as f:
|
||||
for line in f:
|
||||
line = line.strip()
|
||||
if not line or line.startswith("#") or "=" not in line:
|
||||
continue
|
||||
key, _, val = line.partition("=")
|
||||
key = key.strip()
|
||||
val = val.strip()
|
||||
if key and key not in os.environ:
|
||||
os.environ[key] = val
|
||||
|
||||
|
||||
def _load_config_file(path: pathlib.Path):
|
||||
"""Lädt config.ini und setzt Keys in os.environ (nur wenn nicht bereits gesetzt)."""
|
||||
cfg = configparser.ConfigParser()
|
||||
cfg.read(path, encoding="utf-8")
|
||||
|
||||
mapping = {
|
||||
"PRINTER_IP": (CONFIG_SECTION_CONNECTION, "printer_ip"),
|
||||
"MQTT_PORT": (CONFIG_SECTION_CONNECTION, "mqtt_port"),
|
||||
"MQTT_USERNAME": (CONFIG_SECTION_CONNECTION, "username"),
|
||||
"MQTT_PASSWORD": (CONFIG_SECTION_CONNECTION, "password"),
|
||||
"MODE_ID": (CONFIG_SECTION_CONNECTION, "mode_id"),
|
||||
"DEVICE_ID": (CONFIG_SECTION_CONNECTION, "device_id"),
|
||||
"DEFAULT_AMS_SLOT": (CONFIG_SECTION_PRINT, "default_ams_slot"),
|
||||
"AUTO_LEVELING": (CONFIG_SECTION_PRINT, "auto_leveling"),
|
||||
"BRIDGE_PRINTER_NAME": (CONFIG_SECTION_BRIDGE, "printer_name"),
|
||||
}
|
||||
for env_key, (section, option) in mapping.items():
|
||||
if env_key not in os.environ:
|
||||
try:
|
||||
val = cfg.get(section, option)
|
||||
if val:
|
||||
os.environ[env_key] = val
|
||||
except (configparser.NoSectionError, configparser.NoOptionError):
|
||||
pass
|
||||
|
||||
|
||||
def migrate_env_to_config(env_path: pathlib.Path, config_path: pathlib.Path):
|
||||
"""Einmalige Migration: .env → config.ini anlegen."""
|
||||
env_vals: dict[str, str] = {}
|
||||
with open(env_path, encoding="utf-8") as f:
|
||||
for line in f:
|
||||
line = line.strip()
|
||||
if not line or line.startswith("#") or "=" not in line:
|
||||
continue
|
||||
k, _, v = line.partition("=")
|
||||
env_vals[k.strip()] = v.strip()
|
||||
|
||||
config_path.parent.mkdir(parents=True, exist_ok=True)
|
||||
cfg = configparser.ConfigParser()
|
||||
cfg[CONFIG_SECTION_CONNECTION] = {
|
||||
"printer_ip": env_vals.get("PRINTER_IP", ""),
|
||||
"mqtt_port": env_vals.get("MQTT_PORT", "9883"),
|
||||
"username": env_vals.get("MQTT_USERNAME", ""),
|
||||
"password": env_vals.get("MQTT_PASSWORD", ""),
|
||||
"mode_id": env_vals.get("MODE_ID", ""),
|
||||
"device_id": env_vals.get("DEVICE_ID", ""),
|
||||
}
|
||||
cfg[CONFIG_SECTION_PRINT] = {
|
||||
"default_ams_slot": env_vals.get("DEFAULT_AMS_SLOT", "auto"),
|
||||
"auto_leveling": env_vals.get("AUTO_LEVELING", "1"),
|
||||
}
|
||||
cfg[CONFIG_SECTION_BRIDGE] = {
|
||||
"poll_interval": "3",
|
||||
}
|
||||
with open(config_path, "w", encoding="utf-8") as f:
|
||||
f.write("# KX-Bridge Konfigurationsdatei\n")
|
||||
f.write("# Automatisch migriert aus .env\n\n")
|
||||
cfg.write(f)
|
||||
|
||||
|
||||
def find_config_path() -> pathlib.Path:
|
||||
"""Gibt den Pfad zur config.ini zurück (auch wenn sie noch nicht existiert)."""
|
||||
for base in (_BASE, _BASE.parent):
|
||||
config_dir = base / "config"
|
||||
if config_dir.is_dir():
|
||||
return config_dir / "config.ini"
|
||||
return _BASE / "config" / "config.ini"
|
||||
|
||||
|
||||
# ─── Laden ───────────────────────────────────────────────────────────────────
|
||||
|
||||
_config_path = _find_config_file()
|
||||
_env_path = _find_env_file()
|
||||
|
||||
if _config_path:
|
||||
_load_config_file(_config_path)
|
||||
elif _env_path:
|
||||
# Kein config.ini vorhanden → aus .env migrieren
|
||||
_target = find_config_path()
|
||||
migrate_env_to_config(_env_path, _target)
|
||||
_load_config_file(_target)
|
||||
_config_path = _target
|
||||
|
||||
|
||||
def list_printers() -> list[dict]:
|
||||
"""Liest alle [printer_N]-Sektionen aus config.ini.
|
||||
|
||||
Jede Sektion kann folgende Keys haben:
|
||||
name, printer_ip, mqtt_port, username, password, mode_id, device_id,
|
||||
bridge_url, default_ams_slot, auto_leveling
|
||||
|
||||
Gibt eine leere Liste zurück wenn keine [printer_N]-Sektionen vorhanden sind
|
||||
(Single-Printer-Betrieb via [connection]).
|
||||
"""
|
||||
path = _find_config_file()
|
||||
if not path:
|
||||
return []
|
||||
cfg = configparser.ConfigParser()
|
||||
cfg.read(path, encoding="utf-8")
|
||||
printers: list[dict] = []
|
||||
idx = 1
|
||||
while True:
|
||||
section = f"printer_{idx}"
|
||||
if not cfg.has_section(section):
|
||||
break
|
||||
p = dict(cfg[section])
|
||||
p.setdefault("id", str(idx))
|
||||
if "mqtt_port" in p:
|
||||
try:
|
||||
p["mqtt_port"] = int(p["mqtt_port"])
|
||||
except ValueError:
|
||||
p["mqtt_port"] = 9883
|
||||
printers.append(p)
|
||||
idx += 1
|
||||
return printers
|
||||
|
||||
|
||||
def get(key: str, default: str = "") -> str:
|
||||
return os.environ.get(key, default)
|
||||
|
||||
|
||||
# Häufig verwendete Shortcuts
|
||||
PRINTER_IP = get("PRINTER_IP", "")
|
||||
MQTT_PORT = int(get("MQTT_PORT", "9883"))
|
||||
USERNAME = get("MQTT_USERNAME", "")
|
||||
PASSWORD = get("MQTT_PASSWORD", "")
|
||||
MODE_ID = get("MODE_ID", "")
|
||||
DEVICE_ID = get("DEVICE_ID", "")
|
||||
DEFAULT_AMS_SLOT = get("DEFAULT_AMS_SLOT", "auto")
|
||||
AUTO_LEVELING = int(get("AUTO_LEVELING","1"))
|
||||
@@ -2,9 +2,12 @@ services:
|
||||
kx-bridge:
|
||||
image: kx-bridge:latest
|
||||
build: .
|
||||
env_file: .env
|
||||
volumes:
|
||||
- ./config:/app/config
|
||||
- ./data:/app/data
|
||||
- ./.env:/app/.env:ro
|
||||
ports:
|
||||
- "7125:7125"
|
||||
- "7125-7130:7125-7130"
|
||||
restart: unless-stopped
|
||||
logging:
|
||||
driver: json-file
|
||||
|
||||
@@ -3,12 +3,14 @@ env_loader.py – lädt Verbindungsparameter aus .env (Repo-Root oder Arbeitsver
|
||||
Umgebungsvariablen haben Vorrang vor .env-Werten.
|
||||
"""
|
||||
import os
|
||||
import sys
|
||||
import pathlib
|
||||
|
||||
_BASE = pathlib.Path(sys.executable).parent if getattr(sys, "frozen", False) else pathlib.Path(__file__).parent
|
||||
|
||||
|
||||
def _find_env_file() -> pathlib.Path | None:
|
||||
# Suche .env im selben Verzeichnis, dann im Parent (Repo-Root)
|
||||
for base in (pathlib.Path(__file__).parent, pathlib.Path(__file__).parent.parent):
|
||||
for base in (_BASE, _BASE.parent):
|
||||
p = base / ".env"
|
||||
if p.is_file():
|
||||
return p
|
||||
@@ -38,9 +40,11 @@ def get(key: str, default: str = "") -> str:
|
||||
|
||||
|
||||
# Häufig verwendete Shortcuts
|
||||
PRINTER_IP = get("PRINTER_IP", "")
|
||||
MQTT_PORT = int(get("MQTT_PORT", "9883"))
|
||||
USERNAME = get("MQTT_USERNAME", "")
|
||||
PASSWORD = get("MQTT_PASSWORD", "")
|
||||
MODE_ID = get("MODE_ID", "")
|
||||
DEVICE_ID = get("DEVICE_ID", "")
|
||||
PRINTER_IP = get("PRINTER_IP", "")
|
||||
MQTT_PORT = int(get("MQTT_PORT", "9883"))
|
||||
USERNAME = get("MQTT_USERNAME", "")
|
||||
PASSWORD = get("MQTT_PASSWORD", "")
|
||||
MODE_ID = get("MODE_ID", "")
|
||||
DEVICE_ID = get("DEVICE_ID", "")
|
||||
DEFAULT_AMS_SLOT = get("DEFAULT_AMS_SLOT", "auto")
|
||||
AUTO_LEVELING = int(get("AUTO_LEVELING", "1"))
|
||||
|
||||
@@ -1,23 +1,23 @@
|
||||
"""
|
||||
extract_credentials.py – Extrahiert Anycubic LAN-MQTT-Credentials aus dem RAM
|
||||
des laufenden AnycubicSlicerNext-Prozesses.
|
||||
extract_credentials.py – Extracts Anycubic LAN-MQTT credentials from the RAM
|
||||
of the running AnycubicSlicerNext process.
|
||||
|
||||
Voraussetzungen:
|
||||
- AnycubicSlicerNext läuft und ist mit dem Drucker verbunden
|
||||
- Gleiches Benutzerkonto wie der Slicer-Prozess (kein Admin nötig)
|
||||
Requirements:
|
||||
- AnycubicSlicerNext is running and connected to the printer
|
||||
- Same user account as the slicer process (no admin required)
|
||||
|
||||
Verwendung:
|
||||
Usage:
|
||||
python3 extract_credentials.py [--write-env] [--env-file ../.env]
|
||||
|
||||
Funktionsweise:
|
||||
1. Prozess "AnycubicSlicer.exe" (Windows) bzw. "AnycubicSlicer" (Linux) finden
|
||||
2. Speicherseiten des Prozesses durchsuchen (nur r/rw, keine Exec-Pages)
|
||||
3. Nach MQTT-Credential-Patterns suchen:
|
||||
How it works:
|
||||
1. Find process "AnycubicSlicer.exe" (Windows) or "AnycubicSlicer" (Linux)
|
||||
2. Scan memory pages of the process (only r/rw, no exec pages)
|
||||
3. Search for MQTT credential patterns:
|
||||
Username: user[A-Za-z0-9]{8,12}
|
||||
Password: [A-Za-z0-9+/]{13,18}
|
||||
Drucker-IP: d{1,3}.d{1,3}.d{1,3}.d{1,3}
|
||||
4. Kandidaten nach Plausibilität filtern und ausgeben
|
||||
5. Optional: .env-Datei schreiben
|
||||
Printer IP: d{1,3}.d{1,3}.d{1,3}.d{1,3}
|
||||
4. Filter candidates by plausibility and print results
|
||||
5. Optionally write .env file
|
||||
"""
|
||||
|
||||
import argparse
|
||||
@@ -28,48 +28,48 @@ import sys
|
||||
import platform
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Plattform-Erkennung
|
||||
# Platform detection
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
IS_WINDOWS = platform.system() == "Windows"
|
||||
IS_LINUX = platform.system() == "Linux"
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Pattern
|
||||
# Patterns
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
# Username: "user" + 8–12 alphanumerische Zeichen (drucker-generiert)
|
||||
# Username: "user" + 8–12 alphanumeric characters (printer-generated)
|
||||
RE_USERNAME = re.compile(rb'user[A-Za-z0-9]{8,12}(?=[^A-Za-z0-9]|$)')
|
||||
|
||||
# Password: 13–20 alphanumerische Zeichen (kein / da kein RTSP-Pfad)
|
||||
# Anycubic-Passwörter: gemischte Groß/Klein/Ziffern, kein Slash
|
||||
# Password: 13–20 alphanumeric characters (no / since no RTSP path)
|
||||
# Anycubic passwords: mixed upper/lower/digits, no slash
|
||||
RE_PASSWORD = re.compile(rb'[A-Za-z0-9]{13,20}(?=[^A-Za-z0-9]|$)')
|
||||
|
||||
# Kontext-Pattern: sucht Passwort das direkt nach "password" im Speicher steht
|
||||
# Context pattern: password directly following "password" in memory
|
||||
RE_PASSWORD_CTX = re.compile(rb'(?:password|passwd|Password)\x00{0,4}([A-Za-z0-9]{10,25})(?=[^A-Za-z0-9]|$)', re.IGNORECASE)
|
||||
|
||||
# Proximity-Pattern: Username gefolgt von Passwort in naher Umgebung (<512 Bytes)
|
||||
# Proximity pattern: username followed by password within close range (<512 bytes)
|
||||
RE_USER_PASS_PROXIMITY = re.compile(
|
||||
rb'(user[A-Za-z0-9]{8,12}).{1,512}?([A-Za-z0-9]{13,20})(?=[^A-Za-z0-9]|$)',
|
||||
re.DOTALL
|
||||
)
|
||||
|
||||
# IPv4-Adresse (kein localhost, kein Broadcast)
|
||||
# IPv4 address (no localhost, no broadcast)
|
||||
RE_IP = re.compile(rb'(?<![.\d])(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})(?![.\d])')
|
||||
|
||||
# mode_id: 5-stellige Zahl (z.B. 20030)
|
||||
# mode_id: 5-digit number (e.g. 20030)
|
||||
RE_MODE_ID = re.compile(rb'(?<!\d)(2\d{4})(?!\d)')
|
||||
|
||||
# device_id: 32 Hex-Zeichen (MD5-Format)
|
||||
# device_id: 32 hex characters (MD5 format)
|
||||
RE_DEVICE_ID = re.compile(rb'[0-9a-f]{32}(?=[^0-9a-f]|$)')
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Windows – Speicher lesen via ctypes / ReadProcessMemory
|
||||
# Windows – read memory via ctypes / ReadProcessMemory
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def _win_find_pid(name: str) -> "int | None":
|
||||
"""Findet die PID eines Prozesses anhand des Namens (case-insensitive)."""
|
||||
"""Find the PID of a process by name (case-insensitive)."""
|
||||
import ctypes
|
||||
import ctypes.wintypes
|
||||
|
||||
@@ -110,15 +110,15 @@ def _win_find_pid(name: str) -> "int | None":
|
||||
|
||||
|
||||
def _win_read_memory(pid: int, chunk_size: int = 0x10000) -> "list[bytes]":
|
||||
"""Liest alle lesbaren Speicherseiten eines Windows-Prozesses."""
|
||||
"""Read all readable memory pages of a Windows process."""
|
||||
import ctypes
|
||||
import ctypes.wintypes
|
||||
|
||||
PROCESS_VM_READ = 0x0010
|
||||
PROCESS_VM_READ = 0x0010
|
||||
PROCESS_QUERY_INFORMATION = 0x0400
|
||||
MEM_COMMIT = 0x1000
|
||||
PAGE_NOACCESS = 0x01
|
||||
PAGE_GUARD = 0x100
|
||||
MEM_COMMIT = 0x1000
|
||||
PAGE_NOACCESS = 0x01
|
||||
PAGE_GUARD = 0x100
|
||||
|
||||
class MEMORY_BASIC_INFORMATION(ctypes.Structure):
|
||||
_fields_ = [
|
||||
@@ -134,7 +134,7 @@ def _win_read_memory(pid: int, chunk_size: int = 0x10000) -> "list[bytes]":
|
||||
k32 = ctypes.windll.kernel32
|
||||
handle = k32.OpenProcess(PROCESS_VM_READ | PROCESS_QUERY_INFORMATION, False, pid)
|
||||
if not handle:
|
||||
raise PermissionError(f"OpenProcess fehlgeschlagen (PID {pid}): {ctypes.GetLastError()}")
|
||||
raise PermissionError(f"OpenProcess failed (PID {pid}): {ctypes.GetLastError()}")
|
||||
|
||||
chunks = []
|
||||
addr = 0
|
||||
@@ -147,7 +147,7 @@ def _win_read_memory(pid: int, chunk_size: int = 0x10000) -> "list[bytes]":
|
||||
mbi.State != MEM_COMMIT or
|
||||
mbi.Protect & PAGE_NOACCESS or
|
||||
mbi.Protect & PAGE_GUARD or
|
||||
mbi.RegionSize > 256 * 1024 * 1024 # >256 MB überspringen
|
||||
mbi.RegionSize > 256 * 1024 * 1024 # skip >256 MB regions
|
||||
)
|
||||
if not skip:
|
||||
buf = ctypes.create_string_buffer(mbi.RegionSize)
|
||||
@@ -156,7 +156,7 @@ def _win_read_memory(pid: int, chunk_size: int = 0x10000) -> "list[bytes]":
|
||||
buf, mbi.RegionSize, ctypes.byref(read)):
|
||||
chunks.append(bytes(buf[:read.value]))
|
||||
addr += mbi.RegionSize
|
||||
if addr >= 0x7FFFFFFFFFFF: # Ende des User-Space (64-bit)
|
||||
if addr >= 0x7FFFFFFFFFFF: # end of user space (64-bit)
|
||||
break
|
||||
finally:
|
||||
k32.CloseHandle(handle)
|
||||
@@ -165,11 +165,11 @@ def _win_read_memory(pid: int, chunk_size: int = 0x10000) -> "list[bytes]":
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Linux – Speicher lesen via /proc/{pid}/mem
|
||||
# Linux – read memory via /proc/{pid}/mem
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def _linux_find_pid(name: str) -> "int | None":
|
||||
"""Findet PID anhand des Prozessnamens in /proc."""
|
||||
"""Find PID by process name in /proc."""
|
||||
for entry in os.listdir("/proc"):
|
||||
if not entry.isdigit():
|
||||
continue
|
||||
@@ -183,7 +183,7 @@ def _linux_find_pid(name: str) -> "int | None":
|
||||
|
||||
|
||||
def _linux_read_memory(pid: int) -> "list[bytes]":
|
||||
"""Liest lesbare Speichersegmente aus /proc/{pid}/mem."""
|
||||
"""Read readable memory segments from /proc/{pid}/mem."""
|
||||
chunks = []
|
||||
maps_path = f"/proc/{pid}/maps"
|
||||
mem_path = f"/proc/{pid}/mem"
|
||||
@@ -193,8 +193,8 @@ def _linux_read_memory(pid: int) -> "list[bytes]":
|
||||
mem = open(mem_path, "rb")
|
||||
except PermissionError:
|
||||
raise PermissionError(
|
||||
f"Kein Zugriff auf /proc/{pid}/mem — "
|
||||
"Script als gleicher Benutzer wie der Slicer starten."
|
||||
f"No access to /proc/{pid}/mem — "
|
||||
"run the script as the same user as the slicer process."
|
||||
)
|
||||
|
||||
for line in maps:
|
||||
@@ -202,16 +202,16 @@ def _linux_read_memory(pid: int) -> "list[bytes]":
|
||||
if len(parts) < 2:
|
||||
continue
|
||||
perms = parts[1]
|
||||
if "r" not in perms: # nur lesbare Seiten
|
||||
if "r" not in perms: # readable pages only
|
||||
continue
|
||||
if "x" in perms: # Code-Seiten überspringen (keine Strings)
|
||||
if "x" in perms: # skip code pages (no strings)
|
||||
continue
|
||||
try:
|
||||
start, end = [int(x, 16) for x in parts[0].split("-")]
|
||||
except ValueError:
|
||||
continue
|
||||
size = end - start
|
||||
if size > 256 * 1024 * 1024: # >256 MB überspringen
|
||||
if size > 256 * 1024 * 1024: # skip >256 MB regions
|
||||
continue
|
||||
try:
|
||||
mem.seek(start)
|
||||
@@ -226,7 +226,7 @@ def _linux_read_memory(pid: int) -> "list[bytes]":
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Pattern-Suche
|
||||
# Pattern search
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
def _is_valid_ip(ip_bytes: bytes) -> bool:
|
||||
@@ -245,7 +245,7 @@ def _is_valid_ip(ip_bytes: bytes) -> bool:
|
||||
|
||||
|
||||
def search_chunks(chunks: "list[bytes]") -> dict:
|
||||
"""Durchsucht Speicher-Chunks nach Credential-Patterns."""
|
||||
"""Search memory chunks for credential patterns."""
|
||||
usernames = {} # value → count
|
||||
passwords = {}
|
||||
ips = {}
|
||||
@@ -256,12 +256,12 @@ def search_chunks(chunks: "list[bytes]") -> dict:
|
||||
if i % 50 == 0 or i == total - 1:
|
||||
pct = (i + 1) * 100 // total
|
||||
mb_done = sum(len(c) for c in chunks[:i+1]) / 1024 / 1024
|
||||
print(f"\r[*] Analysiere ... {pct:3d}% ({mb_done:.0f} MB)", end="", flush=True)
|
||||
print(f"\r[*] Scanning ... {pct:3d}% ({mb_done:.0f} MB)", end="", flush=True)
|
||||
for m in RE_USERNAME.finditer(chunk):
|
||||
v = m.group().decode("ascii", errors="replace")
|
||||
usernames[v] = usernames.get(v, 0) + 1
|
||||
|
||||
# Proximity: Passwort das innerhalb von 512 Bytes nach einem Username steht
|
||||
# Proximity: password within 512 bytes after a username
|
||||
for m in RE_USER_PASS_PROXIMITY.finditer(chunk):
|
||||
pw = m.group(2).decode("ascii", errors="replace")
|
||||
has_upper = any(c.isupper() for c in pw)
|
||||
@@ -272,7 +272,7 @@ def search_chunks(chunks: "list[bytes]") -> dict:
|
||||
|
||||
for m in RE_PASSWORD.finditer(chunk):
|
||||
v = m.group().decode("ascii", errors="replace")
|
||||
# Filter: mindestens 2 Großbuchstaben + 2 Kleinbuchstaben + 1 Ziffer
|
||||
# Filter: at least 2 uppercase + 2 lowercase + 1 digit
|
||||
has_upper = sum(1 for c in v if c.isupper()) >= 2
|
||||
has_lower = sum(1 for c in v if c.islower()) >= 2
|
||||
has_digit = sum(1 for c in v if c.isdigit()) >= 1
|
||||
@@ -289,9 +289,9 @@ def search_chunks(chunks: "list[bytes]") -> dict:
|
||||
v = m.group().decode("ascii")
|
||||
device_ids[v] = device_ids.get(v, 0) + 1
|
||||
|
||||
print() # Zeilenumbruch nach Fortschrittszeile
|
||||
print() # newline after progress line
|
||||
|
||||
# Nach Häufigkeit sortieren, häufigste zuerst
|
||||
# Sort by frequency, most frequent first
|
||||
def top(d, n=10):
|
||||
return sorted(d.items(), key=lambda x: -x[1])[:n]
|
||||
|
||||
@@ -304,7 +304,7 @@ def search_chunks(chunks: "list[bytes]") -> dict:
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# Hauptprogramm
|
||||
# Main
|
||||
# ---------------------------------------------------------------------------
|
||||
|
||||
SLICER_NAMES = [
|
||||
@@ -359,95 +359,95 @@ def write_env(results: dict, env_path: str,
|
||||
|
||||
with open(env_path, "w") as f:
|
||||
f.writelines(lines)
|
||||
print(f"\n✓ Credentials in '{env_path}' gespeichert.")
|
||||
print(f"\n✓ Credentials saved to '{env_path}'.")
|
||||
|
||||
|
||||
def main():
|
||||
parser = argparse.ArgumentParser(
|
||||
description="Extrahiert MQTT-Credentials aus dem RAM des AnycubicSlicer-Prozesses"
|
||||
description="Extract MQTT credentials from the AnycubicSlicer process RAM"
|
||||
)
|
||||
parser.add_argument("--write-env", action="store_true",
|
||||
help="Gefundene Credentials in .env schreiben")
|
||||
help="Write found credentials to .env file")
|
||||
parser.add_argument("--env-file", default=None,
|
||||
help="Pfad zur .env-Datei (Standard: ../. env relativ zu diesem Script)")
|
||||
help="Path to .env file (default: ../.env relative to this script)")
|
||||
parser.add_argument("--pid", type=int, default=None,
|
||||
help="Prozess-PID direkt angeben (überspringt Auto-Erkennung)")
|
||||
help="Specify process PID directly (skips auto-detection)")
|
||||
parser.add_argument("--verbose", action="store_true",
|
||||
help="Alle Kandidaten ausgeben, nicht nur den besten")
|
||||
help="Show all candidates, not just the best match")
|
||||
args = parser.parse_args()
|
||||
|
||||
# .env-Pfad bestimmen
|
||||
# Determine .env path
|
||||
if args.env_file:
|
||||
env_path = args.env_file
|
||||
else:
|
||||
env_path = os.path.join(os.path.dirname(__file__), "..", ".env")
|
||||
env_path = os.path.normpath(env_path)
|
||||
|
||||
# Prozess finden
|
||||
# Find process
|
||||
if args.pid:
|
||||
pid, proc_name = args.pid, f"PID {args.pid}"
|
||||
else:
|
||||
print("[*] Suche AnycubicSlicer-Prozess ...")
|
||||
print("[*] Searching for AnycubicSlicer process ...")
|
||||
pid, proc_name = find_slicer_pid()
|
||||
if not pid:
|
||||
print("✗ AnycubicSlicer nicht gefunden. Bitte den Slicer starten und "
|
||||
"mit dem Drucker verbinden, dann erneut ausführen.")
|
||||
print("✗ AnycubicSlicer not found. Please start the slicer, connect it "
|
||||
"to the printer, then run this script again.")
|
||||
sys.exit(1)
|
||||
|
||||
print(f"[*] Prozess gefunden: {proc_name} (PID {pid})")
|
||||
print(f"[*] Lese Prozess-Speicher ...")
|
||||
print(f"[*] Process found: {proc_name} (PID {pid})")
|
||||
print(f"[*] Reading process memory ...")
|
||||
|
||||
try:
|
||||
chunks = read_process(pid)
|
||||
except PermissionError as e:
|
||||
print(f"✗ Zugriffsfehler: {e}")
|
||||
print(f"✗ Permission error: {e}")
|
||||
sys.exit(1)
|
||||
|
||||
total_mb = sum(len(c) for c in chunks) / 1024 / 1024
|
||||
print(f"[*] {len(chunks)} Speichersegmente gelesen ({total_mb:.1f} MB)")
|
||||
print(f"[*] Durchsuche nach Credentials ...")
|
||||
print(f"[*] {len(chunks)} memory segments read ({total_mb:.1f} MB)")
|
||||
print(f"[*] Searching for credentials ...")
|
||||
|
||||
results = search_chunks(chunks)
|
||||
|
||||
# Ausgabe
|
||||
# Output
|
||||
print("\n" + "="*55)
|
||||
print(" ERGEBNISSE")
|
||||
print(" RESULTS")
|
||||
print("="*55)
|
||||
|
||||
def show(label, items, verbose):
|
||||
if not items:
|
||||
print(f" {label:12s} — nicht gefunden")
|
||||
print(f" {label:12s} — not found")
|
||||
return items[0][0] if items else ""
|
||||
best = items[0][0]
|
||||
print(f" {label:12s} {best} (Treffer: {items[0][1]})")
|
||||
print(f" {label:12s} {best} (matches: {items[0][1]})")
|
||||
if verbose and len(items) > 1:
|
||||
for val, cnt in items[1:]:
|
||||
print(f" {'':12s} {val} (Treffer: {cnt})")
|
||||
print(f" {'':12s} {val} (matches: {cnt})")
|
||||
return best
|
||||
|
||||
best_user = show("Username", results["usernames"], args.verbose)
|
||||
best_pass = show("Password", results["passwords"], args.verbose)
|
||||
best_device = show("Device-ID", results["device_ids"], args.verbose)
|
||||
best_user = show("Username", results["usernames"], args.verbose)
|
||||
best_pass = show("Password", results["passwords"], args.verbose)
|
||||
best_device = show("Device-ID", results["device_ids"], args.verbose)
|
||||
|
||||
# IP: 192.168.x.x bevorzugen
|
||||
# IP: prefer 192.168.x.x
|
||||
lan_ips = [(ip, cnt) for ip, cnt in results["ips"]
|
||||
if ip.startswith("192.168.") or ip.startswith("10.") or ip.startswith("172.")]
|
||||
if not lan_ips:
|
||||
lan_ips = results["ips"]
|
||||
best_ip = show("Drucker-IP", lan_ips, args.verbose)
|
||||
best_ip = show("Printer IP", lan_ips, args.verbose)
|
||||
|
||||
print("="*55)
|
||||
|
||||
if not best_user or not best_pass:
|
||||
print("\n⚠ Keine vollständigen Credentials gefunden.")
|
||||
print(" Stelle sicher dass der Slicer MIT dem Drucker verbunden ist.")
|
||||
print("\n⚠ No complete credentials found.")
|
||||
print(" Make sure the slicer is connected to the printer.")
|
||||
sys.exit(1)
|
||||
|
||||
if args.write_env:
|
||||
write_env(results, env_path, best_user, best_pass, best_ip,
|
||||
device_id=best_device)
|
||||
else:
|
||||
print(f"\nHinweis: --write-env übergeben um Credentials in '{env_path}' zu speichern.")
|
||||
print(f"\nTip: pass --write-env to save credentials to '{env_path}'.")
|
||||
|
||||
|
||||
if __name__ == "__main__":
|
||||
|
||||
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())
|
||||
BIN
knlogo.png
Normal file
BIN
knlogo.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 1.7 MiB |
@@ -16,10 +16,13 @@ Verwendung:
|
||||
client.disconnect()
|
||||
"""
|
||||
|
||||
import hashlib
|
||||
import json
|
||||
import logging
|
||||
import os
|
||||
import socket
|
||||
import ssl
|
||||
import sys
|
||||
import threading
|
||||
import time
|
||||
import uuid
|
||||
@@ -27,7 +30,9 @@ from datetime import datetime
|
||||
|
||||
import env_loader
|
||||
|
||||
_SCRIPT_DIR = os.path.dirname(os.path.abspath(__file__))
|
||||
log = logging.getLogger("kobrax.mqtt")
|
||||
|
||||
_SCRIPT_DIR = os.path.dirname(sys.executable) if getattr(sys, "frozen", False) else os.path.dirname(os.path.abspath(__file__))
|
||||
CERT_FILE = os.path.join(_SCRIPT_DIR, "anycubic_slicer.crt")
|
||||
KEY_FILE = os.path.join(_SCRIPT_DIR, "anycubic_slicer.key")
|
||||
|
||||
@@ -118,6 +123,13 @@ class KobraXClient:
|
||||
# Optional callbacks: topic_suffix → callable(payload_dict)
|
||||
self.callbacks: dict[str, callable] = {}
|
||||
|
||||
# Dedup: last hash per topic suffix to suppress repeated identical messages
|
||||
self._last_rx_hash: dict[str, str] = {}
|
||||
# Fields that change every tick and should be stripped before dedup-hashing
|
||||
_VOLATILE = {"timestamp", "msgid", "progress", "curr_layer",
|
||||
"curr_nozzle_temp", "curr_hotbed_temp",
|
||||
"target_nozzle_temp", "target_hotbed_temp"}
|
||||
|
||||
# -- Topics --------------------------------------------------------------
|
||||
|
||||
def _pub_topic(self, msg_type: str) -> str:
|
||||
@@ -143,18 +155,19 @@ class KobraXClient:
|
||||
|
||||
raw = socket.create_connection((self.host, self.port), timeout=5)
|
||||
self._sock = ctx.wrap_socket(raw)
|
||||
print(f"[kobrax] TLS: {self._sock.cipher()[0]}")
|
||||
log.info("TLS connected cipher=%s", self._sock.cipher()[0])
|
||||
|
||||
self._sock.sendall(_build_connect(self.client_id, self.username, self.password))
|
||||
self._sock.settimeout(3)
|
||||
r = self._sock.recv(64)
|
||||
if len(r) < 4 or r[0] != 0x20 or r[3] != 0:
|
||||
raise RuntimeError(f"CONNACK failed: {r.hex()}")
|
||||
print(f"[kobrax] CONNACK rc=0")
|
||||
log.info("CONNACK rc=0")
|
||||
|
||||
self._sock.settimeout(0.2)
|
||||
self._buf = b""
|
||||
self._subscribe(self._sub_topic())
|
||||
log.debug("MQTT connected to %s:%s", self.host, self.port)
|
||||
|
||||
def connect(self):
|
||||
self._do_connect()
|
||||
@@ -171,7 +184,7 @@ class KobraXClient:
|
||||
pass
|
||||
|
||||
def _reconnect(self):
|
||||
print("[kobrax] Verbindung verloren – reconnect…")
|
||||
log.warning("Verbindung verloren – reconnect…")
|
||||
try:
|
||||
self._sock.close()
|
||||
except Exception:
|
||||
@@ -179,10 +192,10 @@ class KobraXClient:
|
||||
for delay in [2, 4, 8, 15, 30]:
|
||||
try:
|
||||
self._do_connect()
|
||||
print("[kobrax] Reconnect erfolgreich")
|
||||
log.info("Reconnect erfolgreich")
|
||||
return True
|
||||
except Exception as e:
|
||||
print(f"[kobrax] Reconnect fehlgeschlagen ({e}), warte {delay}s…")
|
||||
log.warning("Reconnect fehlgeschlagen (%s), warte %ss…", e, delay)
|
||||
time.sleep(delay)
|
||||
return False
|
||||
|
||||
@@ -191,12 +204,13 @@ class KobraXClient:
|
||||
pid = self._pid
|
||||
self._pid += 1
|
||||
self._sock.sendall(_build_subscribe(topic, pid))
|
||||
print(f"[kobrax] SUB {topic}")
|
||||
log.info("SUB %s", topic)
|
||||
|
||||
# -- Read loop -----------------------------------------------------------
|
||||
|
||||
def _read_loop(self):
|
||||
last_ping = time.time()
|
||||
_empty_count = 0
|
||||
while self._running:
|
||||
if time.time() - last_ping > 30:
|
||||
with self._lock:
|
||||
@@ -211,7 +225,12 @@ class KobraXClient:
|
||||
try:
|
||||
data = self._sock.recv(65536)
|
||||
if not data:
|
||||
raise ConnectionResetError("EOF")
|
||||
# Windows SSL kann kurzzeitig b"" liefern ohne echten EOF
|
||||
_empty_count += 1
|
||||
if _empty_count >= 5:
|
||||
raise ConnectionResetError("EOF")
|
||||
continue
|
||||
_empty_count = 0
|
||||
self._buf += data
|
||||
self._drain()
|
||||
except ssl.SSLWantReadError:
|
||||
@@ -220,7 +239,7 @@ class KobraXClient:
|
||||
continue
|
||||
except Exception as e:
|
||||
if self._running:
|
||||
print(f"[kobrax] reader error: {e}")
|
||||
log.warning("reader error: %s", e)
|
||||
if not self._reconnect():
|
||||
break
|
||||
last_ping = time.time()
|
||||
@@ -259,9 +278,40 @@ class KobraXClient:
|
||||
|
||||
self._buf = buf[idx:]
|
||||
|
||||
def _dedup_hash(self, suffix: str, payload: dict) -> str:
|
||||
"""Hash payload ignoring volatile per-tick fields for dedup check."""
|
||||
stable = {k: v for k, v in payload.items()
|
||||
if k not in {"timestamp", "msgid", "progress", "curr_layer",
|
||||
"curr_nozzle_temp", "curr_hotbed_temp",
|
||||
"target_nozzle_temp", "target_hotbed_temp"}}
|
||||
return hashlib.md5(json.dumps(stable, sort_keys=True).encode(), usedforsecurity=False).hexdigest()
|
||||
|
||||
def _dispatch(self, topic: str, payload: dict):
|
||||
# Resolve by report topic suffix (e.g. "info/report")
|
||||
suffix = "/".join(topic.split("/")[-2:])
|
||||
|
||||
# Structured RX log with dedup suppression
|
||||
h = self._dedup_hash(suffix, payload)
|
||||
is_dup = self._last_rx_hash.get(suffix) == h
|
||||
self._last_rx_hash[suffix] = h
|
||||
if is_dup:
|
||||
log.debug("RX [dup] %-25s state=%-12s", suffix, payload.get("state", ""))
|
||||
else:
|
||||
data = payload.get("data") or {}
|
||||
state = payload.get("state", "")
|
||||
if "progress" in data:
|
||||
log.info("RX %-25s state=%-12s progress=%s%% layer=%s/%s",
|
||||
suffix, state, data["progress"],
|
||||
data.get("curr_layer", "?"), data.get("total_layers", "?"))
|
||||
elif "curr_nozzle_temp" in data:
|
||||
log.info("RX %-25s nozzle=%s°C/%s°C bed=%s°C/%s°C",
|
||||
suffix,
|
||||
data["curr_nozzle_temp"], data.get("target_nozzle_temp", 0),
|
||||
data.get("curr_hotbed_temp", "?"), data.get("target_hotbed_temp", 0))
|
||||
else:
|
||||
log.info("RX %-25s state=%-12s data=%s",
|
||||
suffix, state, json.dumps(payload.get("data"), ensure_ascii=False))
|
||||
|
||||
# Resolve by report topic suffix (e.g. "info/report")
|
||||
if suffix in self._pending_report:
|
||||
entry = self._pending_report[suffix]
|
||||
entry["result"] = payload
|
||||
@@ -275,19 +325,18 @@ class KobraXClient:
|
||||
entry["event"].set()
|
||||
|
||||
# User callbacks by topic suffix (last two path components)
|
||||
suffix = "/".join(topic.split("/")[-2:])
|
||||
if suffix in self.callbacks:
|
||||
try:
|
||||
self.callbacks[suffix](payload)
|
||||
except Exception as e:
|
||||
print(f"[kobrax] callback error for {suffix}: {e}")
|
||||
log.error("callback error for %s: %s", suffix, e)
|
||||
|
||||
# Generic wildcard callback
|
||||
if "*" in self.callbacks:
|
||||
try:
|
||||
self.callbacks["*"](topic, payload)
|
||||
except Exception as e:
|
||||
print(f"[kobrax] wildcard callback error: {e}")
|
||||
log.error("wildcard callback error: %s", e)
|
||||
|
||||
# -- Publish + request/response ------------------------------------------
|
||||
|
||||
@@ -315,11 +364,14 @@ class KobraXClient:
|
||||
report_registered = True
|
||||
|
||||
topic = self._pub_topic(msg_type)
|
||||
log.info("TX %-25s action=%-12s data=%s",
|
||||
f"{msg_type}/request", action,
|
||||
json.dumps(data, ensure_ascii=False) if data else "null")
|
||||
try:
|
||||
with self._lock:
|
||||
self._sock.sendall(_build_publish(topic, payload))
|
||||
except Exception as e:
|
||||
print(f"[kobrax] send error: {e}, reconnecting…")
|
||||
log.error("send error: %s, reconnecting…", e)
|
||||
self._pending_msgid.pop(msgid, None)
|
||||
if report_registered:
|
||||
self._pending_report.pop(report_key, None)
|
||||
@@ -360,11 +412,14 @@ class KobraXClient:
|
||||
"data": data,
|
||||
}, separators=(",", ":"))
|
||||
topic = self._web_topic(msg_type)
|
||||
log.info("TX(web) %-23s action=%-12s data=%s",
|
||||
f"{msg_type}/request", action,
|
||||
json.dumps(data, ensure_ascii=False) if data else "null")
|
||||
try:
|
||||
with self._lock:
|
||||
self._sock.sendall(_build_publish(topic, payload))
|
||||
except Exception as e:
|
||||
print(f"[kobrax] web send error: {e}")
|
||||
log.error("web send error: %s", e)
|
||||
|
||||
# -- High-level commands -------------------------------------------------
|
||||
|
||||
@@ -394,14 +449,14 @@ class KobraXClient:
|
||||
def stop_camera(self) -> dict | None:
|
||||
return self.publish("video", "stopCapture")
|
||||
|
||||
def pause_print(self) -> dict | None:
|
||||
return self.publish("print", "pause")
|
||||
def pause_print(self, taskid: str = "-1") -> dict | None:
|
||||
return self.publish("print", "pause", {"taskid": taskid})
|
||||
|
||||
def resume_print(self) -> dict | None:
|
||||
return self.publish("print", "resume")
|
||||
def resume_print(self, taskid: str = "-1") -> dict | None:
|
||||
return self.publish("print", "resume", {"taskid": taskid})
|
||||
|
||||
def stop_print(self) -> dict | None:
|
||||
return self.publish("print", "stop")
|
||||
def stop_print(self, taskid: str = "-1") -> dict | None:
|
||||
return self.publish("print", "stop", {"taskid": taskid})
|
||||
|
||||
# -- G-Code Upload -------------------------------------------------------
|
||||
|
||||
@@ -468,7 +523,7 @@ class KobraXClient:
|
||||
|
||||
sock = socket.create_connection((self.host, 18910), timeout=30)
|
||||
sock.sendall(headers + body)
|
||||
sock.settimeout(10)
|
||||
sock.settimeout(120) # große GCode-Dateien brauchen Zeit bis der Drucker antwortet
|
||||
response = b""
|
||||
try:
|
||||
while True:
|
||||
|
||||
File diff suppressed because it is too large
Load Diff
@@ -1 +1,4 @@
|
||||
aiohttp>=3.9
|
||||
imageio-ffmpeg>=0.4.9
|
||||
requests>=2.30.0
|
||||
pycryptodome>=3.20.0
|
||||
|
||||
76
start.sh
Executable file
76
start.sh
Executable file
@@ -0,0 +1,76 @@
|
||||
#!/usr/bin/env bash
|
||||
# start.sh – KX-Bridge starten (baut Docker-Image automatisch wenn nötig)
|
||||
|
||||
set -euo pipefail
|
||||
|
||||
cd "$(dirname "$0")"
|
||||
|
||||
# .env anlegen falls nicht vorhanden
|
||||
if [[ ! -f .env ]]; then
|
||||
if [[ -f .env.example ]]; then
|
||||
cp .env.example .env
|
||||
echo "[start] .env aus .env.example erstellt"
|
||||
else
|
||||
touch .env
|
||||
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?
|
||||
if ! docker info > /dev/null 2>&1; then
|
||||
echo "[start] Docker nicht gefunden – bitte Docker installieren."
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# Prüfen ob Build nötig ist
|
||||
NEEDS_BUILD=0
|
||||
if ! docker image inspect kx-bridge:latest > /dev/null 2>&1; then
|
||||
echo "[start] Image nicht vorhanden – baue kx-bridge:latest ..."
|
||||
NEEDS_BUILD=1
|
||||
else
|
||||
# Image-Erstellungszeit in Unix-Sekunden
|
||||
IMAGE_TS=$(docker inspect --format='{{.Created}}' kx-bridge:latest \
|
||||
| python3 -c "import sys,datetime; s=sys.stdin.read().strip(); \
|
||||
s=s[:26].rstrip('Z').replace('T',' '); \
|
||||
print(int(datetime.datetime.fromisoformat(s).replace(tzinfo=datetime.timezone.utc).timestamp()))" 2>/dev/null || echo 0)
|
||||
|
||||
for f in Dockerfile \
|
||||
bridge/kobrax_moonraker_bridge.py \
|
||||
bridge/kobrax_client.py \
|
||||
bridge/env_loader.py \
|
||||
bridge/requirements.txt \
|
||||
bridge/anycubic_slicer.crt \
|
||||
bridge/anycubic_slicer.key; do
|
||||
if [[ -f "$f" ]]; then
|
||||
FILE_TS=$(python3 -c "import os; print(int(os.path.getmtime('$f')))" 2>/dev/null || echo 0)
|
||||
if [[ $FILE_TS -gt $IMAGE_TS ]]; then
|
||||
echo "[start] '$f' ist neuer als das Image – baue neu ..."
|
||||
NEEDS_BUILD=1
|
||||
break
|
||||
fi
|
||||
fi
|
||||
done
|
||||
fi
|
||||
|
||||
if [[ $NEEDS_BUILD -eq 1 ]]; then
|
||||
docker build -t kx-bridge:latest .
|
||||
fi
|
||||
|
||||
# Container starten
|
||||
echo "[start] Starte KX-Bridge ..."
|
||||
docker-compose down 2>/dev/null || true
|
||||
docker-compose up -d
|
||||
|
||||
echo ""
|
||||
echo " ✓ KX-Bridge läuft"
|
||||
echo " Web-UI : http://$(hostname -I | awk '{print $1}'):7125"
|
||||
echo " Logs : docker-compose logs -f"
|
||||
echo " Stop : docker-compose down"
|
||||
338
web/themes/THEME-ID-CHECKLIST.md
Normal file
338
web/themes/THEME-ID-CHECKLIST.md
Normal file
@@ -0,0 +1,338 @@
|
||||
# KX-Bridge Theme – Element-ID-Checkliste
|
||||
|
||||
Alle IDs, die `default/app.js` erwartet oder nutzt. Beim Umbau eines Themes (`new1`, …) müssen diese **IDs beibehalten** werden, sonst brechen Features still (null-Check) oder mit Fehler (ohne null-Check).
|
||||
|
||||
**Legende**
|
||||
|
||||
| Symbol | Bedeutung |
|
||||
|--------|-----------|
|
||||
| **Pflicht** | Fehlt → Laufzeitfehler oder zentraler Ablauf bricht |
|
||||
| **Empfohlen** | Fehlt → Feature funktioniert nicht (meist mit `if(el)` abgesichert) |
|
||||
| **Optional** | Nur i18n, Dekoration oder rein HTML-seitig |
|
||||
|
||||
**Quelle:** automatisch aus `default/app.js` extrahiert + Abgleich mit `default/index.html`
|
||||
|
||||
---
|
||||
|
||||
## Navigation & Panels
|
||||
|
||||
| ID | Pflicht | Verwendung in app.js |
|
||||
|----|---------|----------------------|
|
||||
| `panel-dashboard` | **Pflicht** | `showPanel('dashboard')` |
|
||||
| `panel-printers` | **Pflicht** | `showPanel('printers')` |
|
||||
| `panel-store` | **Pflicht** | `showPanel('store')` |
|
||||
| `panel-console` | **Pflicht** | `showPanel('console')` |
|
||||
| `nb-dashboard` | Empfohlen | Sidebar active + i18n `.nav-text` |
|
||||
| `nb-printers` | Empfohlen | Sidebar active + i18n |
|
||||
| `nb-store` | Empfohlen | Sidebar active + i18n |
|
||||
| `nb-console` | Empfohlen | Sidebar active + i18n + `#log-badge` |
|
||||
| `bnb-dashboard` | Empfohlen | Bottom-Nav active + i18n |
|
||||
| `bnb-printers` | Empfohlen | Bottom-Nav |
|
||||
| `bnb-store` | Empfohlen | Bottom-Nav |
|
||||
| `bnb-console` | Empfohlen | Bottom-Nav + `#log-badge-bot` |
|
||||
| `log-badge` | Empfohlen | Fehler-Badge Sidebar-Konsole |
|
||||
| `log-badge-bot` | Empfohlen | Fehler-Badge Bottom-Nav |
|
||||
|
||||
**CSS-Klassen:** `.panel`, `.nav-btn`, `.bnav-btn`, `.nav-text` (in Sidebar-Buttons)
|
||||
|
||||
---
|
||||
|
||||
## Header & Banner
|
||||
|
||||
| ID | Pflicht | Verwendung |
|
||||
|----|---------|------------|
|
||||
| `lang-btn` | **Pflicht** | Sprachumschalter (ohne null-Check) |
|
||||
| `conn-btn` | **Pflicht** | Verbinden/Trennen, `updateConnBtn()` |
|
||||
| `settings-btn` | Optional | Nur HTML – `openSettings()` per onclick |
|
||||
| `printer-dropdown-wrap` | Empfohlen | Multi-Drucker UI |
|
||||
| `printer-dropdown-btn` | Optional | Nur HTML-onclick |
|
||||
| `printer-dropdown-menu` | Empfohlen | Dropdown-Inhalt |
|
||||
| `h-pname` | Empfohlen | Druckername (Multi-Modus) |
|
||||
| `h-pname-single` | Empfohlen | Druckername (Einzel-Modus) |
|
||||
| `h-version` | Empfohlen | Bridge-Version aus `/api/state` |
|
||||
| `h-badge` | Empfohlen | Status-Badge CSS-Klasse |
|
||||
| `h-state` | Empfohlen | Status-Text |
|
||||
| `conn-error-banner` | Empfohlen | MQTT-Verbindungsfehler |
|
||||
| `file-ready-banner` | Empfohlen | Slicer-Upload bereit |
|
||||
| `file-ready-name` | Empfohlen | Dateiname im Banner |
|
||||
| `file-ready-btn` | Empfohlen | Druck starten |
|
||||
| `file-slots-btn` | Empfohlen | Slots wählen |
|
||||
| `file-cancel-btn` | Empfohlen | Banner abbrechen |
|
||||
|
||||
---
|
||||
|
||||
## Dashboard – Kamera
|
||||
|
||||
| ID | Pflicht | Verwendung |
|
||||
|----|---------|------------|
|
||||
| `d-light-toggle` | **Pflicht** | Licht sync in `applyState()` (`.checked`) |
|
||||
| `cam-toggle-btn` | Empfohlen | Start/Stop-Label |
|
||||
| `cam-img` | Empfohlen | MJPEG-Stream |
|
||||
| `cam-placeholder` | Empfohlen | Platzhalter sichtbar/unsichtbar |
|
||||
| `cam-placeholder-txt` | Empfohlen | i18n Platzhaltertext |
|
||||
| `cam-spinner` | Empfohlen | Lade-Animation |
|
||||
| `cam-overlay` | Empfohlen | Dateiname über Video |
|
||||
| `cam-fname` | Empfohlen | Dateiname in Overlay |
|
||||
| `cam-wrap` | Optional | Nur HTML/CSS |
|
||||
|
||||
---
|
||||
|
||||
## Dashboard – Fortschritt & Druck
|
||||
|
||||
| ID | Pflicht | Verwendung |
|
||||
|----|---------|------------|
|
||||
| `d-pct` | Empfohlen | Prozent-Anzeige |
|
||||
| `d-pbar` | Empfohlen | Fortschrittsbalken |
|
||||
| `d-layers` | Empfohlen | Layer X / Y |
|
||||
| `d-elapsed` | Empfohlen | Verstrichene Zeit |
|
||||
| `d-remain` | Empfohlen | Restzeit |
|
||||
| `d-slicer-row` | Empfohlen | Slicer-Schätzung ein/aus |
|
||||
| `d-slicer-time` | Empfohlen | Slicer-Zeitwert |
|
||||
| `d-fname` | Empfohlen | Aktueller Dateiname |
|
||||
| `d-thumbnail` | Empfohlen | GCode-Vorschaubild |
|
||||
| `d-btn-pause` | Empfohlen | i18n + onclick |
|
||||
| `d-btn-resume` | Empfohlen | i18n + onclick |
|
||||
| `d-btn-cancel` | Empfohlen | i18n + onclick |
|
||||
| `d-ctrl-btns` | Optional | Nur Layout |
|
||||
| `p-fname` | Optional | Legacy/Print-Panel (falls vorhanden) |
|
||||
| `d-card-progress` | Optional | i18n Kartentitel |
|
||||
| `d-lbl-elapsed` | Optional | i18n |
|
||||
| `d-lbl-remain` | Optional | i18n |
|
||||
| `d-lbl-layers` | Optional | i18n |
|
||||
| `d-slicer-label` | Optional | i18n |
|
||||
|
||||
---
|
||||
|
||||
## Dashboard – Temperaturen
|
||||
|
||||
| ID | Pflicht | Verwendung |
|
||||
|----|---------|------------|
|
||||
| `d-nt` | Empfohlen | Ist-Temperatur Düse |
|
||||
| `d-nt-t` | Empfohlen | Soll-Temperatur Düse |
|
||||
| `d-bt` | Empfohlen | Ist-Temperatur Bett |
|
||||
| `d-bt-t` | Empfohlen | Soll-Temperatur Bett |
|
||||
| `d-ntbar` | Empfohlen | Fortschrittsbalken Düse |
|
||||
| `d-btbar` | Empfohlen | Fortschrittsbalken Bett |
|
||||
| `p-nozzle-inp` | Empfohlen | Eingabe Ziel Düse (`setNozzle`) |
|
||||
| `p-bed-inp` | Empfohlen | Eingabe Ziel Bett (`setBed`) |
|
||||
| `d-chart` | Empfohlen | Canvas Temperatur-Verlauf |
|
||||
| `d-chart-label` | Optional | i18n |
|
||||
| `d-card-temps` | Optional | i18n |
|
||||
| `d-lbl-bed` | Optional | i18n |
|
||||
|
||||
**CSS-Klassen:** `.lbl-set`, `.lbl-off`, `.temp-input`
|
||||
|
||||
---
|
||||
|
||||
## Dashboard – Achsen & Schrittweite
|
||||
|
||||
| ID | Pflicht | Verwendung |
|
||||
|----|---------|------------|
|
||||
| `step-display` | Empfohlen | Anzeige aktuelle Schrittweite |
|
||||
| `ptitle-motion-xy` | Optional | i18n |
|
||||
| `ptitle-motion-z` | Optional | i18n |
|
||||
|
||||
**CSS-Klassen:** `.step-btn`, `.joy`, `.lbl-home-z`, `.lbl-home-xy`, `.lbl-home-all`, `.lbl-disable-motors`, `.lbl-step`
|
||||
|
||||
---
|
||||
|
||||
## Dashboard – Geschwindigkeit & Lüfter
|
||||
|
||||
| ID | Pflicht | Verwendung |
|
||||
|----|---------|------------|
|
||||
| `d-spd-1` | Empfohlen | Speed-Modus Leise |
|
||||
| `d-spd-2` | Empfohlen | Speed-Modus Normal |
|
||||
| `d-spd-3` | Empfohlen | Speed-Modus Sport |
|
||||
| `d-spd-bar` | Empfohlen | Speed-Balken |
|
||||
| `d-fan` | Empfohlen | Lüfter-Slider |
|
||||
| `d-fan-val` | Empfohlen | Lüfter-Prozent-Anzeige |
|
||||
| `d-card-speed` | Optional | i18n |
|
||||
| `d-card-lightfan` | Optional | i18n |
|
||||
| `d-spd-lbl-1` | Optional | i18n |
|
||||
| `d-spd-lbl-2` | Optional | i18n |
|
||||
| `d-spd-lbl-3` | Optional | i18n |
|
||||
| `d-lbl-light` | Optional | i18n |
|
||||
|
||||
**CSS-Klassen:** `.lbl-feed`, `.lbl-unload` (AMS-Bereich)
|
||||
|
||||
---
|
||||
|
||||
## Dashboard – AMS
|
||||
|
||||
| ID | Pflicht | Verwendung |
|
||||
|----|---------|------------|
|
||||
| `ams-slots` | **Pflicht** | Container für dynamische Slot-Kacheln |
|
||||
| `ams-slot-sel` | Empfohlen | Slot-Auswahl für Feed/Unload |
|
||||
| `ams-slot-label` | Optional | Nur HTML-oninput Label |
|
||||
| `ams-no-data` | Optional | Platzhalter (wird durch JS ersetzt) |
|
||||
| `btn-unload` | Optional | Nur HTML |
|
||||
| `d-card-ams` | Optional | i18n |
|
||||
| `d-card-cam` | Optional | i18n |
|
||||
|
||||
---
|
||||
|
||||
## Einstellungen (`#settings-modal`)
|
||||
|
||||
| ID | Pflicht | Verwendung |
|
||||
|----|---------|------------|
|
||||
| `settings-modal` | **Pflicht** | Modal open/close (`.classList`) |
|
||||
| `s-printer-name` | Empfohlen | Config-Feld |
|
||||
| `s-printer-ip` | **Pflicht** | Config + IP-Hinweis-Listener |
|
||||
| `s-mqtt-port` | Empfohlen | Config |
|
||||
| `s-username` | Empfohlen | Config |
|
||||
| `s-password` | Empfohlen | Config |
|
||||
| `s-device-id` | Empfohlen | Config |
|
||||
| `s-mode-id` | Empfohlen | Config |
|
||||
| `s-default-slot` | Empfohlen | AMS-Standard-Slot |
|
||||
| `s-auto-leveling` | Empfohlen | Checkbox Auto-Leveling |
|
||||
| `poll-1` | Empfohlen | Poll 1 s |
|
||||
| `poll-2` | Empfohlen | Poll 2 s |
|
||||
| `poll-5` | Empfohlen | Poll 5 s |
|
||||
| `s-version-label` | Empfohlen | Versionsanzeige |
|
||||
| `update-status` | Empfohlen | Update-Status-Text |
|
||||
| `btn-update-apply` | Empfohlen | Update installieren |
|
||||
| `update-changelog` | Empfohlen | Changelog-Anzeige |
|
||||
| `btn-save-settings` | Empfohlen | Speichern |
|
||||
| `btn-update-check` | Optional | Nur HTML-onclick |
|
||||
| `lbl-ip-hint` | Empfohlen | IP-Format-Warnung |
|
||||
| `modal-title-settings` | Optional | i18n |
|
||||
| `modal-sec-connection` | Optional | i18n |
|
||||
| `modal-sec-print` | Optional | i18n |
|
||||
| `modal-sec-poll` | Optional | i18n |
|
||||
| `modal-sec-version` | Optional | i18n |
|
||||
| `lbl-printer-name` … `lbl-mode-id` | Optional | i18n Labels |
|
||||
| `lbl-default-slot` | Optional | i18n |
|
||||
| `lbl-auto-leveling` | Optional | i18n |
|
||||
| `opt-slot-auto` | Optional | i18n |
|
||||
| `opt-slot-0` … `opt-slot-3` | Optional | Nur HTML |
|
||||
| `lbl-update-check` | Optional | i18n |
|
||||
| `lbl-update-apply` | Optional | i18n |
|
||||
|
||||
**CSS-Klasse:** `.poll-btn`
|
||||
|
||||
---
|
||||
|
||||
## AMS-Slot-Dialog (`#slot-edit-modal`)
|
||||
|
||||
| ID | Pflicht | Verwendung |
|
||||
|----|---------|------------|
|
||||
| `slot-edit-modal` | **Pflicht** | Modal open/close |
|
||||
| `slot-edit-title` | Empfohlen | Dialogtitel |
|
||||
| `slot-edit-color` | Empfohlen | Farbwähler |
|
||||
| `slot-edit-preview` | Empfohlen | Farbvorschau |
|
||||
| `slot-edit-mat` | Empfohlen | Material-Text |
|
||||
| `slot-mat-btns` | Empfohlen | Preset-Buttons (dynamisch) |
|
||||
| `btn-slot-edit-save` | Empfohlen | Speichern |
|
||||
| `lbl-slot-color` | Optional | i18n |
|
||||
| `lbl-slot-material` | Optional | i18n |
|
||||
|
||||
**CSS-Klasse:** `.mat-preset-btn` (dynamisch)
|
||||
|
||||
---
|
||||
|
||||
## Filament-Druck-Dialog (`#filament-dialog`)
|
||||
|
||||
| ID | Pflicht | Verwendung |
|
||||
|----|---------|------------|
|
||||
| `filament-dialog` | **Pflicht** | Modal open/close |
|
||||
| `fd-title` | Empfohlen | Dateiname im Titel |
|
||||
| `fd-slots` | Empfohlen | Kanal→Slot-Zuordnung (dynamisch) |
|
||||
|
||||
---
|
||||
|
||||
## Drucker hinzufügen (`#add-printer-dialog`)
|
||||
|
||||
| ID | Pflicht | Verwendung |
|
||||
|----|---------|------------|
|
||||
| `add-printer-dialog` | **Pflicht** | Modal open/close |
|
||||
| `apd-ip` | Empfohlen | IP-Eingabe |
|
||||
| `apd-name` | Empfohlen | Name optional |
|
||||
| `apd-status` | Empfohlen | Status/Fehlermeldung |
|
||||
| `apd-confirm` | Empfohlen | Bestätigen |
|
||||
| `apd-title` | Optional | i18n |
|
||||
| `apd-lbl-ip` | Optional | i18n |
|
||||
| `apd-lbl-name` | Optional | i18n |
|
||||
| `add-printer-btn-label` | Optional | i18n |
|
||||
|
||||
---
|
||||
|
||||
## Drucker-Tab
|
||||
|
||||
| ID | Pflicht | Verwendung |
|
||||
|----|---------|------------|
|
||||
| `printers-grid` | Empfohlen | Container Drucker-Karten |
|
||||
| `printers-panel-title` | Optional | i18n |
|
||||
|
||||
---
|
||||
|
||||
## Datei-Browser
|
||||
|
||||
| ID | Pflicht | Verwendung |
|
||||
|----|---------|------------|
|
||||
| `store-grid` | Empfohlen | Datei-Karten (dynamisch) |
|
||||
| `store-empty` | Empfohlen | Leer-/Kein-Treffer-Hinweis |
|
||||
| `store-search` | Empfohlen | Suche |
|
||||
| `store-filter` | Empfohlen | Filter Select |
|
||||
| `store-sort` | Empfohlen | Sortierung Select |
|
||||
| `store-refresh-btn` | Optional | i18n Button-Text |
|
||||
| `store-panel-title` | Optional | i18n |
|
||||
| `sf-all`, `sf-ok`, `sf-err`, `sf-new` | Optional | i18n Optionen |
|
||||
| `ss-date`, `ss-name`, `ss-dur` | Optional | i18n Optionen |
|
||||
|
||||
---
|
||||
|
||||
## Konsole
|
||||
|
||||
| ID | Pflicht | Verwendung |
|
||||
|----|---------|------------|
|
||||
| `console-log` | Empfohlen | Log-Ausgabe |
|
||||
| `log-filter` | Empfohlen | Textfilter |
|
||||
| `btn-autoscroll` | Empfohlen | Auto-Scroll Toggle |
|
||||
| `logdir-all` | Empfohlen | Filter Alle |
|
||||
| `logdir-rx` | Empfohlen | Filter RX |
|
||||
| `logdir-tx` | Empfohlen | Filter TX |
|
||||
| `ptitle-console` | Optional | i18n |
|
||||
| `btn-log-dl` | Optional | Nur HTML – Download-Link `/api/log/download` |
|
||||
|
||||
**CSS-Klassen:** `.log-dir-btn`, `.log-topic-btn` (Topic-Buttons nutzen `data-topic`, keine festen IDs)
|
||||
|
||||
---
|
||||
|
||||
## IDs nur in HTML (nicht in app.js)
|
||||
|
||||
Diese IDs sind im Default-Theme vorhanden, werden von `app.js` aber nicht per `getElementById` angesprochen:
|
||||
|
||||
| ID | Anmerkung |
|
||||
|----|-----------|
|
||||
| `settings-btn` | Nur `onclick="openSettings()"` |
|
||||
| `printer-dropdown-btn` | Nur onclick |
|
||||
| `btn-update-check` | Nur onclick |
|
||||
| `opt-slot-0` … `opt-slot-3` | Option-Labels statisch |
|
||||
| `cam-wrap` | Layout |
|
||||
| `d-ctrl-btns` | Layout |
|
||||
| `ams-no-data` | Initial-Platzhalter, wird von JS überschrieben |
|
||||
| `ams-slot-label` | Nur inline oninput |
|
||||
| `btn-unload` | Nur HTML |
|
||||
| `btn-log-dl` | Statischer Download-Link |
|
||||
|
||||
---
|
||||
|
||||
## Schnell-Check vor Theme-Release
|
||||
|
||||
- [ ] Alle vier `panel-*` vorhanden und in `.panel` gewrappt
|
||||
- [ ] `lang-btn`, `conn-btn`, `d-light-toggle`, `settings-modal`, `ams-slots` vorhanden
|
||||
- [ ] Alle Modals: `settings-modal`, `slot-edit-modal`, `filament-dialog`, `add-printer-dialog`
|
||||
- [ ] Navigation: `nb-*` / `bnb-*` für `dashboard`, `printers`, `store`, `console`
|
||||
- [ ] Dashboard-Kern: Temps, Progress, Fan, Speed, AMS-Container
|
||||
- [ ] Store: `store-grid`, `store-search`, `store-filter`, `store-sort`
|
||||
- [ ] Konsole: `console-log`, `log-filter`
|
||||
- [ ] `index.html` bindet `/kx/ui/style.css` und `/kx/ui/app.js` ein
|
||||
- [ ] Alle `onclick`-Handler aus [THEME-JS-HOOKS.md](./THEME-JS-HOOKS.md) gesetzt oder ersetzt
|
||||
|
||||
---
|
||||
|
||||
## Siehe auch
|
||||
|
||||
- [THEME-JS-HOOKS.md](./THEME-JS-HOOKS.md) – alle JS-Funktionsaufrufe mit Kontext
|
||||
- Theme-Ordner: `web/themes/<name>/` mit `index.html`, `style.css`, `app.js`
|
||||
- Aktivierung: `--ui-theme <name>` oder `KX_UI_THEME=<name>`
|
||||
290
web/themes/THEME-JS-HOOKS.md
Normal file
290
web/themes/THEME-JS-HOOKS.md
Normal file
@@ -0,0 +1,290 @@
|
||||
# KX-Bridge Theme – JavaScript-Hooks
|
||||
|
||||
Referenz für eigenes Theme-Layout (`index.html` + gemeinsames `app.js`).
|
||||
|
||||
**Quelle:** `default/index.html` und `default/app.js`
|
||||
**Stand:** Theme-Struktur mit getrennten Dateien (`index.html`, `style.css`, `app.js`)
|
||||
|
||||
---
|
||||
|
||||
## Hinweise für Theme-Entwickler
|
||||
|
||||
- Alle `onclick`-Handler rufen **globale Funktionen** aus `app.js` auf – Namen beibehalten oder in eigenem JS neu binden.
|
||||
- `app.js` wird unter `/kx/ui/app.js` geladen und ist pro Theme austauschbar; die Standard-Implementierung erwartet die Hooks unten.
|
||||
- Dynamisch erzeugtes HTML (AMS-Slots, Datei-Karten, Drucker-Karten) setzt zusätzliche `onclick`-Handler – siehe Abschnitt **Dynamisch aus app.js**.
|
||||
|
||||
---
|
||||
|
||||
## Globale / Header
|
||||
|
||||
| Aufruf | HTML-Element | Kontext |
|
||||
|--------|--------------|---------|
|
||||
| `startReadyFile()` | `#file-ready-btn` | GCode vom Slicer bereit → sofort drucken |
|
||||
| `startReadyFileWithSlots()` | `#file-slots-btn` | Druck mit AMS-Slot-Zuordnung |
|
||||
| `cancelReadyFile()` | `#file-cancel-btn` | Upload-Banner schließen |
|
||||
| `togglePrinterDropdown()` | `#printer-dropdown-btn` | Multi-Drucker-Dropdown |
|
||||
| `toggleTheme()` | Theme-Button | Hell/Dunkel (`data-theme`, localStorage) |
|
||||
| `toggleLang()` | `#lang-btn` | DE/EN umschalten |
|
||||
| `openSettings()` | `#settings-btn` | Einstellungs-Modal |
|
||||
| `toggleConnection()` | `#conn-btn` | MQTT verbinden / trennen |
|
||||
|
||||
---
|
||||
|
||||
## Einstellungs-Modal (`#settings-modal`)
|
||||
|
||||
| Aufruf | HTML-Element | Kontext |
|
||||
|--------|--------------|---------|
|
||||
| `closeSettings()` | Overlay (Backdrop), Schließen-Button | Modal schließen |
|
||||
| `setPoll(1000)` | `#poll-1` | Status-Poll 1 s |
|
||||
| `setPoll(2000)` | `#poll-2` | Status-Poll 2 s |
|
||||
| `setPoll(5000)` | `#poll-5` | Status-Poll 5 s |
|
||||
| `checkUpdate()` | `#btn-update-check` | Update prüfen |
|
||||
| `applyUpdate()` | `#btn-update-apply` | Update installieren |
|
||||
| `saveSettings()` | `#btn-save-settings` | Config speichern → Neustart |
|
||||
|
||||
**Ohne `onclick` in HTML:** IP-Hinweis für `#s-printer-ip` wird in `app.js` per `addEventListener('input', …)` gebunden.
|
||||
|
||||
---
|
||||
|
||||
## AMS-Slot bearbeiten (`#slot-edit-modal`)
|
||||
|
||||
| Aufruf | HTML-Element | Kontext |
|
||||
|--------|--------------|---------|
|
||||
| `closeSlotEdit()` | Overlay, ✕ | Dialog schließen |
|
||||
| `highlightMatBtn(this.value)` | `#slot-edit-mat` `oninput` | Material-Presets hervorheben |
|
||||
| `saveSlotEdit()` | `#btn-slot-edit-save` | Farbe/Material speichern |
|
||||
|
||||
**Inline (keine benannte Funktion):**
|
||||
|
||||
| Code | Element | Zweck |
|
||||
|------|---------|--------|
|
||||
| `document.getElementById('slot-edit-preview').style.background=this.value` | `#slot-edit-color` | Farbvorschau |
|
||||
|
||||
**Dynamisch aus `app.js`:**
|
||||
|
||||
| Aufruf | Kontext |
|
||||
|--------|---------|
|
||||
| `openSlotEdit(i)` | Klick auf AMS-Kachel in `#ams-slots` |
|
||||
| `selectMatPreset('PLA'…)` | Material-Preset-Buttons in `#slot-mat-btns` |
|
||||
|
||||
---
|
||||
|
||||
## Navigation (Sidebar + Bottom-Nav)
|
||||
|
||||
| Aufruf | HTML-Element | Kontext |
|
||||
|--------|--------------|---------|
|
||||
| `showPanel('dashboard')` | `#nb-dashboard`, `#bnb-dashboard` | Dashboard |
|
||||
| `showPanel('printers'); loadPrinterTab()` | `#nb-printers`, `#bnb-printers` | Drucker-Tab |
|
||||
| `showPanel('store'); loadStore()` | `#nb-store`, `#bnb-store` | Datei-Browser |
|
||||
| `showPanel('console'); clearLogBadge()` | `#nb-console`, `#bnb-console` | Konsole, Badge leeren |
|
||||
|
||||
**Erforderliche Panel-IDs:** `panel-dashboard`, `panel-printers`, `panel-store`, `panel-console`
|
||||
**Nav-IDs:** `nb-*` und `bnb-*` mit gleichem Suffix (`dashboard`, `printers`, `store`, `console`)
|
||||
|
||||
---
|
||||
|
||||
## Dashboard – Kamera
|
||||
|
||||
| Aufruf | HTML-Element | Kontext |
|
||||
|--------|--------------|---------|
|
||||
| `setLight()` | `#d-light-toggle` `onchange` | Drucker-Licht |
|
||||
| `toggleCam()` | `#cam-toggle-btn` | Stream starten/stoppen |
|
||||
|
||||
Intern: `toggleCam()` → `camStart()` / `camStop()` (nur in `app.js`).
|
||||
|
||||
---
|
||||
|
||||
## Dashboard – Drucksteuerung
|
||||
|
||||
| Aufruf | HTML-Element | Kontext |
|
||||
|--------|--------------|---------|
|
||||
| `printAction('pause')` | `#d-btn-pause` | Pausieren |
|
||||
| `printAction('resume')` | `#d-btn-resume` | Fortsetzen |
|
||||
| `confirmCancel()` | `#d-btn-cancel` | Bestätigung → `printAction('cancel')` |
|
||||
|
||||
---
|
||||
|
||||
## Dashboard – Temperaturen
|
||||
|
||||
| Aufruf | HTML-Element | Kontext |
|
||||
|--------|--------------|---------|
|
||||
| `setNozzle()` | Set-Button Nozzle | Zieltemperatur Düse (`#p-nozzle-inp`) |
|
||||
| `setBed()` | Set-Button Bett | Zieltemperatur Bett (`#p-bed-inp`) |
|
||||
|
||||
**Inline:** Aus-Button setzt Input auf `0`, dann `setNozzle()` bzw. `setBed()`.
|
||||
|
||||
---
|
||||
|
||||
## Dashboard – Achsensteuerung
|
||||
|
||||
| Aufruf | HTML-Element | Kontext |
|
||||
|--------|--------------|---------|
|
||||
| `move(1, 1, getStep())` | Joypad ▲ | Y+ |
|
||||
| `move(1, -1, getStep())` | Joypad ▼ | Y− |
|
||||
| `move(0, -1, getStep())` | Joypad ◀ | X− |
|
||||
| `move(0, 1, getStep())` | Joypad ▶ | X+ |
|
||||
| `move(2, 1, getStep())` | Z ▲ | Z+ |
|
||||
| `move(2, -1, getStep())` | Z ▼ | Z− |
|
||||
| `homeAll()` | Joypad ⌂, Home-All | Referenzfahrt alle Achsen |
|
||||
| `homeZ()` | Home Z | Nur Z |
|
||||
| `homeXY()` | Home XY | Nur X/Y |
|
||||
| `disableMotors()` | Motors Off | Motoren aus |
|
||||
| `setStep(this, 0.1\|1\|5\|10)` | Schrittweiten-Buttons | Jog-Schrittweite |
|
||||
| `getStep()` | in allen `move(…)` | Aktuelle Schrittweite (Hilfsfunktion) |
|
||||
|
||||
---
|
||||
|
||||
## Dashboard – Druckgeschwindigkeit
|
||||
|
||||
| Aufruf | HTML-Element | Kontext |
|
||||
|--------|--------------|---------|
|
||||
| `setSpeed(1)` | `#d-spd-1` | Leise |
|
||||
| `setSpeed(2)` | `#d-spd-2` | Normal |
|
||||
| `setSpeed(3)` | `#d-spd-3` | Sport |
|
||||
|
||||
---
|
||||
|
||||
## Dashboard – Lüfter
|
||||
|
||||
| Aufruf | HTML-Element | Kontext |
|
||||
|--------|--------------|---------|
|
||||
| `setFan()` | `#d-fan` `onchange` | Slider-Wert senden |
|
||||
| `quickFan(0\|25\|50\|75\|100)` | Schnell-Buttons | Vordefinierte Stufen |
|
||||
|
||||
**Inline:** `#d-fan` `oninput` → `#d-fan-val` aktualisieren.
|
||||
|
||||
---
|
||||
|
||||
## Dashboard – AMS / Filament
|
||||
|
||||
| Aufruf | HTML-Element | Kontext |
|
||||
|--------|--------------|---------|
|
||||
| `amsFeed(1)` | Einziehen | Filament laden |
|
||||
| `amsFeed(2)` | Ausziehen | Filament entladen |
|
||||
|
||||
**Inline:** `#ams-slot-sel` `oninput` → `#ams-slot-label` („Slot 1…4“).
|
||||
|
||||
---
|
||||
|
||||
## Drucker-Tab (`#panel-printers`)
|
||||
|
||||
| Aufruf | HTML-Element | Kontext |
|
||||
|--------|--------------|---------|
|
||||
| `openAddPrinterDialog()` | „+ Drucker hinzufügen“ | Dialog öffnen |
|
||||
| `loadPrinterTab()` | ↻-Button | Liste neu laden |
|
||||
|
||||
**Dynamisch:** `removePrinter(id, name)` auf Drucker-Karten in `#printers-grid`.
|
||||
|
||||
---
|
||||
|
||||
## Datei-Browser (`#panel-store`)
|
||||
|
||||
| Aufruf | HTML-Element | Kontext |
|
||||
|--------|--------------|---------|
|
||||
| `loadStore()` | `#store-refresh-btn` | Dateiliste laden |
|
||||
| `renderStore()` | `#store-search`, `#store-filter`, `#store-sort` | Filtern/Sortieren |
|
||||
|
||||
**Dynamisch:** `storePrint(fileId, filename)`, `storeDelete(fileId)` auf Karten in `#store-grid`.
|
||||
|
||||
---
|
||||
|
||||
## Konsole (`#panel-console`)
|
||||
|
||||
| Aufruf | HTML-Element | Kontext |
|
||||
|--------|--------------|---------|
|
||||
| `renderLog()` | `#log-filter` `oninput`, Clear-Button | Filtern / leeren |
|
||||
| `toggleAutoScroll()` | `#btn-autoscroll` | Auto-Scroll |
|
||||
| `setLogDir('all'\|'rx'\|'tx')` | `#logdir-all`, `#logdir-rx`, `#logdir-tx` | Richtungsfilter |
|
||||
| `setLogTopic('multiColorBox'\|'print'\|'info'\|'status')` | Topic-Buttons | MQTT-Topic |
|
||||
| `onLogScroll()` | `#console-log` `onscroll` | Auto-Scroll bei manuellem Scroll deaktivieren |
|
||||
|
||||
**Inline Clear:** `consoleLogs=[]; renderLog()` (keine eigene Funktion).
|
||||
|
||||
---
|
||||
|
||||
## Filament-Dialog (`#filament-dialog`)
|
||||
|
||||
| Aufruf | HTML-Element | Kontext |
|
||||
|--------|--------------|---------|
|
||||
| `closeFilamentDialog()` | Overlay, Abbrechen, ✕ | Schließen |
|
||||
| `confirmFilamentPrint()` | „▶ Drucken“ | Slot-Zuordnung bestätigen |
|
||||
|
||||
Inhalt von `#fd-slots` wird von `openFilamentDialog()` befüllt (nach `startReadyFileWithSlots()` / `storePrint()`).
|
||||
|
||||
---
|
||||
|
||||
## Drucker-hinzufügen-Dialog (`#add-printer-dialog`)
|
||||
|
||||
| Aufruf | HTML-Element | Kontext |
|
||||
|--------|--------------|---------|
|
||||
| `closeAddPrinterDialog()` | Overlay, Abbrechen, ✕ | Schließen |
|
||||
| `confirmAddPrinter()` | `#apd-confirm` | IP/Name senden → Neustart |
|
||||
|
||||
---
|
||||
|
||||
## Modal-Backdrop-Muster
|
||||
|
||||
Mehrere Overlays nutzen:
|
||||
|
||||
```html
|
||||
onclick="if(event.target===this)closeSettings()"
|
||||
```
|
||||
|
||||
| Funktion | Modal-ID |
|
||||
|----------|----------|
|
||||
| `closeSettings()` | `#settings-modal` |
|
||||
| `closeSlotEdit()` | `#slot-edit-modal` |
|
||||
| `closeFilamentDialog()` | `#filament-dialog` |
|
||||
| `closeAddPrinterDialog()` | `#add-printer-dialog` |
|
||||
|
||||
---
|
||||
|
||||
## Funktionen ohne HTML-Hook (automatisch)
|
||||
|
||||
| Funktion | Wann / wofür |
|
||||
|----------|----------------|
|
||||
| `poll()` | Periodisch `/api/state` – Dashboard-Update |
|
||||
| `applyState()` | Poll-Daten ins DOM schreiben |
|
||||
| `initPrinters()` | Multi-Drucker-Liste beim Start |
|
||||
| `renderPrinterDropdown()` | Header-Dropdown |
|
||||
| `applyLang()` | Übersetzungen (Start + nach `toggleLang()`) |
|
||||
| `updateConnBtn()` | Verbindungs-Button |
|
||||
| `updateHistory()` / `drawChart()` | Temperatur-Verlauf `#d-chart` |
|
||||
| `connect()` (SSE) | Live-Server-Log |
|
||||
| `openFilamentDialog()` | Multi-Farben-Druck |
|
||||
| `openSlotEdit()` | AMS-Kacheln |
|
||||
| `storePrint()` / `storeDelete()` | Datei-Karten |
|
||||
| `removePrinter()` | Drucker-Karten |
|
||||
| `camStart()` / `camStop()` | Kamera (auch auto bei Druckstart) |
|
||||
|
||||
---
|
||||
|
||||
## CSS-Klassen (keine IDs, aber von app.js genutzt)
|
||||
|
||||
| Klasse | Verwendung |
|
||||
|--------|------------|
|
||||
| `.panel` | Tab-Panels (`showPanel`) |
|
||||
| `.nav-btn`, `.bnav-btn` | Navigation active-State |
|
||||
| `.nav-text` | Sidebar-Label (i18n) |
|
||||
| `.lbl-set`, `.lbl-off` | Temp-Button-Texte |
|
||||
| `.lbl-home-z`, `.lbl-home-xy`, `.lbl-home-all`, `.lbl-disable-motors` | Home-Buttons |
|
||||
| `.lbl-step` | Schrittweiten-Label |
|
||||
| `.lbl-feed`, `.lbl-unload` | AMS-Buttons |
|
||||
| `.temp-input` | Placeholder i18n |
|
||||
| `.step-btn` | Schrittweiten-Auswahl |
|
||||
| `.poll-btn` | Poll-Intervall |
|
||||
| `.log-dir-btn`, `.log-topic-btn` | Log-Filter |
|
||||
| `.mat-preset-btn` | Slot-Material (dynamisch) |
|
||||
| `.ams-slot` | AMS-Kacheln (dynamisch) |
|
||||
|
||||
---
|
||||
|
||||
## Theme aktivieren
|
||||
|
||||
```bash
|
||||
python kobrax_moonraker_bridge.py … --ui-theme default
|
||||
# oder
|
||||
KX_UI_THEME=new1 python kobrax_moonraker_bridge.py …
|
||||
```
|
||||
|
||||
Pro Theme-Ordner: `index.html`, `style.css`, `app.js` unter `web/themes/<name>/`.
|
||||
1267
web/themes/default/app.js
Normal file
1267
web/themes/default/app.js
Normal file
File diff suppressed because it is too large
Load Diff
492
web/themes/default/index.html
Normal file
492
web/themes/default/index.html
Normal file
@@ -0,0 +1,492 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="de" data-theme="dark">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1">
|
||||
<title>KX-Bridge</title>
|
||||
<link rel="stylesheet" href="/kx/ui/style.css?v=__UI_ASSETS_VER__">
|
||||
</head>
|
||||
<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="file-ready-banner" style="display:none;background:#1a6e3c;color:#fff;padding:10px 18px;font-size:14px;text-align:center;position:sticky;top:0;z-index:998;display:none;align-items:center;justify-content:center;gap:12px;flex-wrap:wrap">
|
||||
<span>📄 <span id="file-ready-name"></span></span>
|
||||
<button id="file-ready-btn" onclick="startReadyFile()"
|
||||
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-slots-btn" onclick="startReadyFileWithSlots()"
|
||||
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>
|
||||
<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>
|
||||
<div class="logo">⬡ KX-Bridge</div>
|
||||
<div style="flex:1"></div>
|
||||
<div id="printer-dropdown-wrap" style="display:none;position:relative">
|
||||
<button id="printer-dropdown-btn" onclick="togglePrinterDropdown()" style="background:var(--raised);border:1px solid var(--border);border-radius:6px;padding:4px 10px;color:var(--txt);cursor:pointer;font-size:13px;display:flex;align-items:center;gap:6px">
|
||||
<span id="h-pname">Anycubic Kobra X</span><span style="opacity:.5">▾</span>
|
||||
</button>
|
||||
<div id="printer-dropdown-menu" style="display:none;position:absolute;top:calc(100% + 4px);right:0;background:var(--card);border:1px solid var(--border);border-radius:8px;min-width:200px;z-index:200;box-shadow:0 4px 16px #0006;overflow:hidden">
|
||||
</div>
|
||||
</div>
|
||||
<div id="h-pname-single" class="hname">Anycubic Kobra X</div>
|
||||
<span id="h-version" style="font-size:11px;opacity:.5;margin-left:6px"></span>
|
||||
<div class="hbadge" id="h-badge"><span class="dot"></span><span id="h-state">Standby</span></div>
|
||||
<button class="theme-btn" onclick="toggleTheme()">☀ / ☾</button>
|
||||
<button class="theme-btn" onclick="toggleLang()" id="lang-btn">EN</button>
|
||||
<button class="theme-btn" onclick="openSettings()" id="settings-btn" title="Einstellungen">⚙</button>
|
||||
<button class="conn-btn disconnected" id="conn-btn" onclick="toggleConnection()">⚡ Verbinden</button>
|
||||
</header>
|
||||
|
||||
<!-- ═══ SETTINGS MODAL ═══ -->
|
||||
<div class="modal-overlay" id="settings-modal" onclick="if(event.target===this)closeSettings()">
|
||||
<div class="modal-box">
|
||||
<div class="modal-header">
|
||||
<span class="modal-title" id="modal-title-settings">Einstellungen</span>
|
||||
<button class="modal-close" onclick="closeSettings()">✕</button>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="modal-field" style="margin-bottom:12px">
|
||||
<label id="lbl-printer-name" style="font-weight:600">Drucker-Name</label>
|
||||
<input type="text" id="s-printer-name" placeholder="z.B. Kobra X Links">
|
||||
</div>
|
||||
<div class="modal-section" id="modal-sec-connection">Verbindung</div>
|
||||
<div class="modal-field">
|
||||
<label id="lbl-printer-ip">Drucker-IP</label>
|
||||
<input type="text" id="s-printer-ip" placeholder="192.168.x.x">
|
||||
<small id="lbl-ip-hint" style="color:#f80;display:none"></small>
|
||||
</div>
|
||||
<div class="modal-field">
|
||||
<label id="lbl-mqtt-port">MQTT-Port</label>
|
||||
<input type="number" id="s-mqtt-port" placeholder="9883">
|
||||
</div>
|
||||
<div class="modal-field">
|
||||
<label id="lbl-username">MQTT-Benutzername</label>
|
||||
<input type="text" id="s-username" placeholder="userXXXXXXXX" autocomplete="new-password">
|
||||
</div>
|
||||
<div class="modal-field">
|
||||
<label id="lbl-password">MQTT-Passwort</label>
|
||||
<input type="password" id="s-password" autocomplete="new-password">
|
||||
</div>
|
||||
<div class="modal-field">
|
||||
<label id="lbl-device-id">Device-ID</label>
|
||||
<input type="text" id="s-device-id" placeholder="32 Hex-Zeichen">
|
||||
</div>
|
||||
<div class="modal-field">
|
||||
<label id="lbl-mode-id">Mode-ID</label>
|
||||
<input type="text" id="s-mode-id" placeholder="20030">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="modal-section" id="modal-sec-print">Druckeinstellungen</div>
|
||||
<div class="modal-field">
|
||||
<label id="lbl-default-slot">Standard-Slot (Einfarbdruck)</label>
|
||||
<select id="s-default-slot">
|
||||
<option value="auto" id="opt-slot-auto">Auto (alle belegten Slots)</option>
|
||||
<option value="0" id="opt-slot-0">Slot 1</option>
|
||||
<option value="1" id="opt-slot-1">Slot 2</option>
|
||||
<option value="2" id="opt-slot-2">Slot 3</option>
|
||||
<option value="3" id="opt-slot-3">Slot 4</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="modal-field" style="flex-direction:row;align-items:center;gap:10px">
|
||||
<input type="checkbox" id="s-auto-leveling" style="width:auto;margin:0">
|
||||
<label id="lbl-auto-leveling" style="margin:0;cursor:pointer" for="s-auto-leveling">Auto-Leveling vor Druck</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="modal-section" id="modal-sec-poll">Poll-Intervall</div>
|
||||
<div class="poll-btns">
|
||||
<button class="poll-btn" onclick="setPoll(1000)" id="poll-1">1s</button>
|
||||
<button class="poll-btn active" onclick="setPoll(2000)" id="poll-2">2s</button>
|
||||
<button class="poll-btn" onclick="setPoll(5000)" id="poll-5">5s</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="modal-section" id="modal-sec-version">Version</div>
|
||||
<div class="update-row">
|
||||
<span id="s-version-label" style="font-size:13px;color:var(--txt)">–</span>
|
||||
<button class="btn btn-sm" style="background:var(--raised);color:var(--txt)" onclick="checkUpdate()" id="btn-update-check">🔄 <span id="lbl-update-check">Auf Updates prüfen</span></button>
|
||||
</div>
|
||||
<div class="update-status" id="update-status" style="margin-top:6px"></div>
|
||||
<button class="btn btn-sm btn-accent" id="btn-update-apply" style="display:none;margin-top:8px" onclick="applyUpdate()">
|
||||
<span id="lbl-update-apply">Jetzt installieren</span>
|
||||
</button>
|
||||
<div id="update-changelog" style="display:none;margin-top:10px;background:var(--raised);border-radius:6px;padding:10px;font-size:11px;font-family:var(--mono);color:var(--txt2);white-space:pre-wrap;max-height:180px;overflow-y:auto;line-height:1.6"></div>
|
||||
</div>
|
||||
|
||||
<button class="modal-save" onclick="saveSettings()" id="btn-save-settings">Speichern & Neustart</button>
|
||||
</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">
|
||||
<nav class="sidebar">
|
||||
<button class="nav-btn active" onclick="showPanel('dashboard')" id="nb-dashboard">
|
||||
<span class="nav-icon">⊞</span><span class="nav-text">Dashboard</span></button>
|
||||
<button class="nav-btn" onclick="showPanel('printers');loadPrinterTab()" id="nb-printers">
|
||||
<span class="nav-icon">🖨</span><span class="nav-text">Drucker</span></button>
|
||||
<button class="nav-btn" onclick="showPanel('store');loadStore()" id="nb-store">
|
||||
<span class="nav-icon">🗂</span><span class="nav-text">Browser</span></button>
|
||||
<button class="nav-btn" onclick="showPanel('console');clearLogBadge()" id="nb-console">
|
||||
<span class="nav-icon">≡</span><span class="nav-text">Konsole</span><span id="log-badge" style="display:none;margin-left:4px;background:var(--err);color:#fff;border-radius:10px;font-size:10px;padding:1px 5px;font-weight:700"></span></button>
|
||||
</nav>
|
||||
|
||||
<main>
|
||||
<!-- ═══ DASHBOARD ═══ -->
|
||||
<div class="panel active" id="panel-dashboard">
|
||||
<div class="grid">
|
||||
<!-- Kamera -->
|
||||
<div class="card" style="grid-column:1/-1">
|
||||
<div style="display:flex;align-items:center;justify-content:space-between;margin-bottom:10px">
|
||||
<div class="card-title" style="margin-bottom:0"><span>📷</span> <span id="d-card-cam">Kamera</span></div>
|
||||
<div style="display:flex;align-items:center;gap:10px">
|
||||
<span id="d-lbl-light" style="font-size:12px;color:var(--txt2)">💡 Licht</span>
|
||||
<label class="toggle">
|
||||
<input type="checkbox" id="d-light-toggle" onchange="setLight()">
|
||||
<span class="toggle-track"></span>
|
||||
<span class="toggle-thumb"></span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="cam-wrap" id="cam-wrap">
|
||||
<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>
|
||||
<img id="cam-img" style="display:none;width:100%;height:auto" alt="Kamera">
|
||||
<div class="cam-overlay" id="cam-overlay" style="display:none">
|
||||
<div style="font-size:12px;color:#fff" id="cam-fname"></div>
|
||||
</div>
|
||||
<button class="cam-toggle" onclick="toggleCam()" id="cam-toggle-btn">▶ Kamera</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Fortschritt -->
|
||||
<div class="card" style="grid-column:1/-1">
|
||||
<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">
|
||||
<div class="pct-big"><span id="d-pct">0</span><small>%</small></div>
|
||||
<div style="display:flex;align-items:center;gap:10px;margin:8px 0">
|
||||
<div class="progress-bar" style="flex:1;margin:0"><div class="progress-fill" id="d-pbar" style="width:0%"></div></div>
|
||||
<div class="time-block" style="padding:6px 10px;min-width:72px;text-align:center;flex-shrink:0">
|
||||
<div class="time-label" id="d-lbl-layers"></div>
|
||||
<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="fname" id="d-fname" title="" style="margin-top:6px">–</div>
|
||||
<div class="ctrl-btns" id="d-ctrl-btns" style="margin-top:12px">
|
||||
<button class="btn btn-pause btn-sm" id="d-btn-pause" onclick="printAction('pause')">⏸ Pause</button>
|
||||
<button class="btn btn-resume btn-sm" id="d-btn-resume" onclick="printAction('resume')">▶ Weiter</button>
|
||||
<button class="btn btn-cancel btn-sm" id="d-btn-cancel" onclick="confirmCancel()">✕ Stopp</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Temperatursteuerung + Verlauf -->
|
||||
<div class="card" style="grid-column:1/-1">
|
||||
<div class="card-title"><span>⊙</span> <span id="d-card-temps">Temperaturen</span></div>
|
||||
<div class="temp-card-inner">
|
||||
<div class="temp-block">
|
||||
<div class="temp-label">Nozzle</div>
|
||||
<div class="temp-row">
|
||||
<div class="temp-val" id="d-nt">–</div>
|
||||
<div class="temp-unit">°C</div>
|
||||
</div>
|
||||
<div class="temp-target">→ <span id="d-nt-t">0</span>°C</div>
|
||||
<div class="progress-bar" style="margin:8px 0 0">
|
||||
<div class="progress-fill" id="d-ntbar" style="width:0%;background:linear-gradient(90deg,var(--accent2),#ffb020)"></div>
|
||||
</div>
|
||||
<div class="temp-edit" style="margin-top:10px">
|
||||
<input type="number" class="temp-input" id="p-nozzle-inp" placeholder="Ziel" min="0" max="300" style="flex:1">
|
||||
<button class="btn btn-sm btn-accent" onclick="setNozzle()"><span class="lbl-set">Set</span></button>
|
||||
<button class="btn btn-sm" style="background:var(--raised);color:var(--txt)" onclick="document.getElementById('p-nozzle-inp').value=0;setNozzle()"><span class="lbl-off">Aus</span></button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="temp-block">
|
||||
<div class="temp-label" id="d-lbl-bed">Bett</div>
|
||||
<div class="temp-row">
|
||||
<div class="temp-val" id="d-bt">–</div>
|
||||
<div class="temp-unit">°C</div>
|
||||
</div>
|
||||
<div class="temp-target">→ <span id="d-bt-t">0</span>°C</div>
|
||||
<div class="progress-bar" style="margin:8px 0 0">
|
||||
<div class="progress-fill" id="d-btbar" style="width:0%;background:linear-gradient(90deg,#ff6b35,var(--warn))"></div>
|
||||
</div>
|
||||
<div class="temp-edit" style="margin-top:10px">
|
||||
<input type="number" class="temp-input" id="p-bed-inp" placeholder="Ziel" min="0" max="120" style="flex:1">
|
||||
<button class="btn btn-sm btn-accent" onclick="setBed()"><span class="lbl-set">Set</span></button>
|
||||
<button class="btn btn-sm" style="background:var(--raised);color:var(--txt)" onclick="document.getElementById('p-bed-inp').value=0;setBed()"><span class="lbl-off">Aus</span></button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div style="margin-top:14px">
|
||||
<div style="font-size:10px;color:var(--txt2);margin-bottom:4px" id="d-chart-label">Verlauf (letzte 60 Messungen)</div>
|
||||
<canvas id="d-chart" width="800" height="120" style="width:100%;height:120px;background:var(--raised);border-radius:8px"></canvas>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Achsensteuerung -->
|
||||
<div class="card">
|
||||
<div class="card-title"><span>✛</span> <span id="ptitle-motion-xy">XY-Achsen</span></div>
|
||||
<div class="joypad">
|
||||
<div></div>
|
||||
<button class="joy" onclick="move(1,1,getStep())" title="Y+">▲</button>
|
||||
<div></div>
|
||||
<button class="joy" onclick="move(0,-1,getStep())" title="X−">◀</button>
|
||||
<button class="joy home" onclick="homeAll()" title="Home All">⌂</button>
|
||||
<button class="joy" onclick="move(0,1,getStep())" title="X+">▶</button>
|
||||
<div></div>
|
||||
<button class="joy" onclick="move(1,-1,getStep())" title="Y−">▼</button>
|
||||
<div></div>
|
||||
</div>
|
||||
<div class="step-btns">
|
||||
<button class="step-btn" onclick="setStep(this,0.1)">0.1</button>
|
||||
<button class="step-btn active" onclick="setStep(this,1)">1</button>
|
||||
<button class="step-btn" onclick="setStep(this,5)">5</button>
|
||||
<button class="step-btn" onclick="setStep(this,10)">10 mm</button>
|
||||
</div>
|
||||
<div class="home-btns">
|
||||
<button class="btn btn-sm" style="background:var(--raised);color:var(--txt)" onclick="homeZ()"><span class="lbl-home-z">Home Z</span></button>
|
||||
<button class="btn btn-sm" style="background:var(--raised);color:var(--txt)" onclick="homeXY()"><span class="lbl-home-xy">Home XY</span></button>
|
||||
<button class="btn btn-sm btn-accent" onclick="homeAll()"><span class="lbl-home-all">Home All</span></button>
|
||||
<button class="btn btn-sm" style="background:var(--raised);color:var(--txt)" onclick="disableMotors()"><span class="lbl-disable-motors">Motors Off</span></button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card">
|
||||
<div class="card-title"><span>↕</span> <span id="ptitle-motion-z">Z-Achse</span></div>
|
||||
<div class="joypad" style="grid-template-columns:52px;grid-template-rows:repeat(2,52px)">
|
||||
<button class="joy" onclick="move(2,1,getStep())" title="Z+">▲</button>
|
||||
<button class="joy" onclick="move(2,-1,getStep())" title="Z−">▼</button>
|
||||
</div>
|
||||
<div style="text-align:center;margin-top:8px;font-size:12px;color:var(--txt2)"><span class="lbl-step">Schrittweite:</span> <span id="step-display">1</span> mm</div>
|
||||
</div>
|
||||
|
||||
<!-- Print Speed -->
|
||||
<div class="card">
|
||||
<div class="card-title"><span>🏎</span> <span id="d-card-speed">Druckgeschwindigkeit</span></div>
|
||||
<div style="display:flex;gap:8px;margin-top:4px">
|
||||
<button class="spd-btn" id="d-spd-1" onclick="setSpeed(1)">
|
||||
<span class="spd-icon">🐢</span>
|
||||
<span id="d-spd-lbl-1">Leise</span>
|
||||
</button>
|
||||
<button class="spd-btn spd-active" id="d-spd-2" onclick="setSpeed(2)">
|
||||
<span class="spd-icon">⚡</span>
|
||||
<span id="d-spd-lbl-2">Normal</span>
|
||||
</button>
|
||||
<button class="spd-btn" id="d-spd-3" onclick="setSpeed(3)">
|
||||
<span class="spd-icon">🚀</span>
|
||||
<span id="d-spd-lbl-3">Sport</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="spd-bar" style="margin-top:12px">
|
||||
<div class="spd-bar-fill" id="d-spd-bar" style="width:50%"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Lüfter -->
|
||||
<div class="card">
|
||||
<div class="card-title"><span>🌀</span> <span id="d-card-lightfan">Lüfter</span></div>
|
||||
<div class="slider-row">
|
||||
<input type="range" class="slider" min="0" max="100" value="0" id="d-fan" oninput="document.getElementById('d-fan-val').textContent=this.value" onchange="setFan()">
|
||||
<span class="slider-val" id="d-fan-val">0</span>
|
||||
</div>
|
||||
<div style="margin-top:12px;display:flex;gap:8px;flex-wrap:wrap">
|
||||
<button class="btn btn-sm" style="background:var(--raised);color:var(--txt)" onclick="quickFan(0)">Aus</button>
|
||||
<button class="btn btn-sm" style="background:var(--raised);color:var(--txt)" onclick="quickFan(25)">25%</button>
|
||||
<button class="btn btn-sm" style="background:var(--raised);color:var(--txt)" onclick="quickFan(50)">50%</button>
|
||||
<button class="btn btn-sm" style="background:var(--raised);color:var(--txt)" onclick="quickFan(75)">75%</button>
|
||||
<button class="btn btn-sm btn-accent" onclick="quickFan(100)">100%</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- AMS -->
|
||||
<div class="card" style="grid-column:1/-1" id="d-ams-card">
|
||||
<div class="card-title"><span>◫</span> <span id="d-card-ams">AMS / Filamentbox</span></div>
|
||||
<div class="ams-slots" id="ams-slots">
|
||||
<div style="grid-column:1/-1;text-align:center;color:var(--txt2);padding:20px" id="ams-no-data">Keine AMS-Daten empfangen</div>
|
||||
</div>
|
||||
<div id="ams-controls" style="margin-top:16px;display:flex;flex-direction:column;gap:10px">
|
||||
<div style="font-size:12px;color:var(--txt2);margin-bottom:2px" id="ams-slot-lbl">Slot auswählen</div>
|
||||
<div style="display:flex;align-items:center;gap:10px">
|
||||
<input type="range" id="ams-slot-sel" min="0" max="3" step="1" value="0"
|
||||
class="slider" style="flex:1"
|
||||
oninput="document.getElementById('ams-slot-label').textContent='Slot '+(parseInt(this.value)+1)">
|
||||
<span id="ams-slot-label" style="min-width:48px;font-size:13px;font-weight:600">Slot 1</span>
|
||||
</div>
|
||||
<div style="display:flex;gap:10px">
|
||||
<button class="btn" style="flex:1" onclick="amsFeed(1)">⬇ <span class="lbl-feed">Einziehen</span></button>
|
||||
<button id="btn-unload" class="btn" style="flex:1" onclick="amsFeed(2)">⬆ <span class="lbl-unload">Ausziehen</span></button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- ═══ CONSOLE ═══ -->
|
||||
<!-- ═══ DRUCKER ═══ -->
|
||||
<div class="panel" id="panel-printers">
|
||||
<div class="card">
|
||||
<div class="card-title" style="display:flex;justify-content:space-between;align-items:center;margin-bottom:12px">
|
||||
<span id="printers-panel-title">🖨 Drucker</span>
|
||||
<div style="display:flex;gap:8px">
|
||||
<button onclick="openAddPrinterDialog()" style="font-size:12px;padding:4px 12px;background:var(--accent);border:none;border-radius:6px;color:#fff;cursor:pointer;font-weight:600">+ <span id="add-printer-btn-label">Drucker hinzufügen</span></button>
|
||||
<button onclick="loadPrinterTab()" style="font-size:12px;padding:4px 12px;background:var(--raised);border:1px solid var(--border);border-radius:6px;color:var(--txt2);cursor:pointer">↻</button>
|
||||
</div>
|
||||
</div>
|
||||
<div id="printers-grid" style="display:grid;grid-template-columns:repeat(auto-fill,minmax(260px,1fr));gap:14px"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- ═══ GCODE STORE ═══ -->
|
||||
<div class="panel" id="panel-store">
|
||||
<div class="card">
|
||||
<div class="card-title" style="display:flex;justify-content:space-between;align-items:center;margin-bottom:10px">
|
||||
<span id="store-panel-title">🗂 Datei-Browser</span>
|
||||
<button id="store-refresh-btn" onclick="loadStore()" style="font-size:12px;padding:4px 12px;background:var(--raised);border:1px solid var(--border);border-radius:6px;color:var(--txt2);cursor:pointer">↻ Aktualisieren</button>
|
||||
</div>
|
||||
<div style="display:flex;gap:8px;margin-bottom:12px;flex-wrap:wrap">
|
||||
<input id="store-search" type="text" placeholder="🔍 Suche…" oninput="renderStore()"
|
||||
style="flex:1;min-width:140px;padding:6px 10px;background:var(--raised);border:1px solid var(--border);border-radius:6px;color:var(--txt);font-size:13px">
|
||||
<select id="store-filter" onchange="renderStore()"
|
||||
style="padding:6px 8px;background:var(--raised);border:1px solid var(--border);border-radius:6px;color:var(--txt);font-size:13px">
|
||||
<option value="all" id="sf-all">Alle</option>
|
||||
<option value="completed" id="sf-ok">✓ Erfolgreich</option>
|
||||
<option value="failed" id="sf-err">✗ Fehler</option>
|
||||
<option value="never" id="sf-new">Neu</option>
|
||||
</select>
|
||||
<select id="store-sort" onchange="renderStore()"
|
||||
style="padding:6px 8px;background:var(--raised);border:1px solid var(--border);border-radius:6px;color:var(--txt);font-size:13px">
|
||||
<option value="date_desc" id="ss-date">↓ Datum</option>
|
||||
<option value="name_asc" id="ss-name">A–Z Name</option>
|
||||
<option value="duration_asc" id="ss-dur">⏱ Druckzeit</option>
|
||||
</select>
|
||||
</div>
|
||||
<div id="store-empty" style="display:none;color:var(--txt2);text-align:center;padding:40px 0;font-size:14px">
|
||||
</div>
|
||||
<div id="store-grid" style="display:grid;grid-template-columns:repeat(auto-fill,minmax(200px,1fr));gap:14px"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="panel" id="panel-console">
|
||||
<div class="card">
|
||||
<div class="card-title" style="display:flex;justify-content:space-between;align-items:center">
|
||||
<span><span>≡</span> <span id="ptitle-console">Ereignis-Log</span></span>
|
||||
<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>
|
||||
</div>
|
||||
<div style="display:flex;gap:6px;margin-bottom:6px;flex-wrap:wrap;align-items:center">
|
||||
<input id="log-filter" type="text" placeholder="Filter…"
|
||||
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)">
|
||||
<button id="btn-autoscroll" onclick="toggleAutoScroll()"
|
||||
style="font-size:12px;padding:5px 10px;border-radius:6px;border:1px solid var(--border);background:var(--accent);color:#fff;cursor:pointer;white-space:nowrap">⬇ Auto</button>
|
||||
<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>
|
||||
</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>
|
||||
</main>
|
||||
</div>
|
||||
|
||||
<nav class="bottom-nav">
|
||||
<button class="bnav-btn active" onclick="showPanel('dashboard')" id="bnb-dashboard"><span class="bnav-icon">⊞</span>Dashboard</button>
|
||||
<button class="bnav-btn" onclick="showPanel('printers');loadPrinterTab()" id="bnb-printers"><span class="bnav-icon">🖨</span>Drucker</button>
|
||||
<button class="bnav-btn" onclick="showPanel('store');loadStore()" id="bnb-store"><span class="bnav-icon">🗂</span>Browser</button>
|
||||
<button class="bnav-btn" onclick="showPanel('console');clearLogBadge()" id="bnb-console"><span class="bnav-icon">≡</span>Log<span id="log-badge-bot" style="display:none;margin-left:3px;background:var(--err);color:#fff;border-radius:10px;font-size:10px;padding:1px 4px;font-weight:700"></span></button>
|
||||
</nav>
|
||||
|
||||
<!-- Filament-Slot-Dialog -->
|
||||
<div class="modal-overlay" id="filament-dialog" onclick="if(event.target===this)closeFilamentDialog()">
|
||||
<div class="modal-box" style="max-width:380px;width:100%">
|
||||
<div class="modal-header" style="margin-bottom:14px">
|
||||
<span class="modal-title" id="fd-title" style="font-size:14px;word-break:break-all"></span>
|
||||
<button onclick="closeFilamentDialog()" style="background:none;border:none;font-size:18px;cursor:pointer;color:var(--txt2)">✕</button>
|
||||
</div>
|
||||
<p style="font-size:12px;color:var(--txt2);margin-bottom:10px">GCode-Kanal → AMS-Slot zuweisen:</p>
|
||||
<div id="fd-slots" style="display:flex;flex-direction:column;gap:8px;margin-bottom:16px"></div>
|
||||
<div style="display:flex;gap:8px;justify-content:flex-end">
|
||||
<button onclick="closeFilamentDialog()" style="padding:8px 16px;background:var(--raised);border:1px solid var(--border);border-radius:8px;color:var(--txt);cursor:pointer">Abbrechen</button>
|
||||
<button onclick="confirmFilamentPrint()" style="padding:8px 18px;background:var(--accent);color:#fff;border:none;border-radius:8px;cursor:pointer;font-weight:600">▶ Drucken</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Drucker-hinzufügen-Dialog -->
|
||||
<div class="modal-overlay" id="add-printer-dialog" onclick="if(event.target===this)closeAddPrinterDialog()">
|
||||
<div class="modal-box" style="max-width:380px;width:100%">
|
||||
<div class="modal-header" style="margin-bottom:14px">
|
||||
<span class="modal-title" id="apd-title">Drucker hinzufügen</span>
|
||||
<button onclick="closeAddPrinterDialog()" style="background:none;border:none;font-size:18px;cursor:pointer;color:var(--txt2)">✕</button>
|
||||
</div>
|
||||
<label id="apd-lbl-ip" style="display:block;font-size:12px;color:var(--txt2);margin-bottom:4px">Drucker-IP</label>
|
||||
<input type="text" id="apd-ip" placeholder="192.168.1.100" style="width:100%;box-sizing:border-box;padding:8px;background:var(--raised);border:1px solid var(--border);border-radius:6px;color:var(--txt);margin-bottom:10px">
|
||||
<label id="apd-lbl-name" style="display:block;font-size:12px;color:var(--txt2);margin-bottom:4px">Name (optional)</label>
|
||||
<input type="text" id="apd-name" placeholder="z.B. Kobra X Wohnzimmer" style="width:100%;box-sizing:border-box;padding:8px;background:var(--raised);border:1px solid var(--border);border-radius:6px;color:var(--txt);margin-bottom:6px">
|
||||
<div id="apd-status" style="font-size:12px;margin:8px 0;min-height:16px;color:var(--txt2)"></div>
|
||||
<div style="display:flex;gap:8px;justify-content:flex-end">
|
||||
<button onclick="closeAddPrinterDialog()" style="padding:8px 16px;background:var(--raised);border:1px solid var(--border);border-radius:8px;color:var(--txt);cursor:pointer">Abbrechen</button>
|
||||
<button id="apd-confirm" onclick="confirmAddPrinter()" style="padding:8px 18px;background:var(--accent);color:#fff;border:none;border-radius:8px;cursor:pointer;font-weight:600">Hinzufügen</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer style="text-align:center;padding:12px;font-size:11px;color:var(--txt2);border-top:1px solid var(--border);margin-top:auto">
|
||||
© ViewIT 2026
|
||||
</footer>
|
||||
<script src="/kx/ui/app.js?v=__UI_ASSETS_VER__"></script>
|
||||
</body>
|
||||
</html>
|
||||
277
web/themes/default/style.css
Normal file
277
web/themes/default/style.css
Normal file
@@ -0,0 +1,277 @@
|
||||
:root{
|
||||
--bg:#1a1a1f;--card:#24242c;--raised:#2e2e3a;--border:#3a3a4a;
|
||||
--txt:#f0f0f5;--txt2:#8888aa;--accent:#00c8ff;--accent2:#ff6b35;
|
||||
--ok:#4cde80;--err:#ff4d6d;--warn:#ffb020;
|
||||
--font:-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;
|
||||
--mono:"JetBrains Mono","Fira Code",monospace;
|
||||
}
|
||||
[data-theme=light]{
|
||||
--bg:#f0f0f5;--card:#fff;--raised:#e8e8f0;--border:#d0d0e0;
|
||||
--txt:#1a1a2e;--txt2:#666680;
|
||||
}
|
||||
*{box-sizing:border-box;margin:0;padding:0}
|
||||
body{background:var(--bg);color:var(--txt);font-family:var(--font);font-size:14px;min-height:100vh;display:flex;flex-direction:column}
|
||||
a{color:var(--accent);text-decoration:none}
|
||||
|
||||
/* ── HEADER ── */
|
||||
header{background:var(--card);border-bottom:1px solid var(--border);
|
||||
display:flex;align-items:center;gap:12px;padding:0 20px;height:52px;
|
||||
position:sticky;top:0;z-index:100}
|
||||
.logo{font-size:18px;font-weight:700;color:var(--accent);letter-spacing:-.02em}
|
||||
.hname{font-size:13px;color:var(--txt2)}
|
||||
.hbadge{display:flex;align-items:center;gap:6px;font-size:12px;font-weight:600;
|
||||
padding:4px 10px;border-radius:20px;background:var(--raised);color:var(--txt2);
|
||||
text-transform:uppercase;letter-spacing:.04em}
|
||||
.hbadge.printing{background:#0d2d1a;color:var(--ok)}
|
||||
.hbadge.complete{background:#0d1f38;color:#60b0ff}
|
||||
.hbadge.error{background:#2d0d0d;color:var(--err)}
|
||||
.hbadge .dot{width:7px;height:7px;border-radius:50%;background:currentColor}
|
||||
.hbadge.printing .dot{animation:pulse 1.4s infinite}
|
||||
@keyframes pulse{0%,100%{opacity:1}50%{opacity:.25}}
|
||||
.theme-btn{background:none;border:1px solid var(--border);color:var(--txt2);
|
||||
border-radius:8px;padding:6px 10px;cursor:pointer;font-size:13px;transition:.15s}
|
||||
.theme-btn:hover{border-color:var(--accent);color:var(--accent)}
|
||||
.conn-btn{border-radius:8px;padding:6px 12px;cursor:pointer;font-size:13px;
|
||||
font-weight:600;border:none;transition:.15s}
|
||||
.conn-btn.disconnected{background:var(--accent);color:#fff}
|
||||
.conn-btn.disconnected:hover{opacity:.85}
|
||||
.conn-btn.connected{background:transparent;border:1px solid var(--border);color:var(--txt2)}
|
||||
.conn-btn.connected:hover{border-color:#e05;color:#e05}
|
||||
|
||||
/* ── LAYOUT ── */
|
||||
.layout{display:flex;flex:1;min-height:0}
|
||||
nav.sidebar{width:200px;background:var(--card);border-right:1px solid var(--border);
|
||||
display:flex;flex-direction:column;padding:12px 8px;gap:2px;flex-shrink:0}
|
||||
.nav-btn{background:none;border:none;color:var(--txt2);text-align:left;
|
||||
padding:9px 12px;border-radius:8px;cursor:pointer;font-size:13px;
|
||||
display:flex;align-items:center;gap:10px;transition:.12s;width:100%}
|
||||
.nav-btn:hover{background:var(--raised);color:var(--txt)}
|
||||
.nav-btn.active{background:var(--raised);color:var(--accent)}
|
||||
.nav-icon{font-size:16px;width:20px;text-align:center}
|
||||
main{flex:1;overflow-y:auto;padding:20px}
|
||||
.grid{display:grid;grid-template-columns:repeat(auto-fill,minmax(320px,1fr));gap:16px}
|
||||
|
||||
/* ── CARD ── */
|
||||
.card{background:var(--card);border:1px solid var(--border);border-radius:12px;
|
||||
padding:18px;transition:box-shadow .15s,transform .15s}
|
||||
.card:hover{box-shadow:0 4px 20px rgba(0,0,0,.3);transform:translateY(-1px)}
|
||||
.card-title{font-size:11px;text-transform:uppercase;letter-spacing:.1em;color:var(--txt2);
|
||||
margin-bottom:14px;display:flex;align-items:center;gap:8px}
|
||||
.card-title span{font-size:14px}
|
||||
|
||||
/* ── HERO ── */
|
||||
.hero{grid-column:1/-1;display:grid;grid-template-columns:1fr 320px;gap:16px}
|
||||
@media(max-width:900px){.hero{grid-template-columns:1fr}}
|
||||
.cam-wrap{background:#0a0a0e;border-radius:10px;overflow:hidden;
|
||||
min-height:180px;max-height:320px;display:flex;align-items:center;justify-content:center;position:relative}
|
||||
.cam-wrap img,.cam-wrap video{width:100%;max-height:320px;height:auto;display:block;object-fit:contain}
|
||||
.cam-placeholder{color:var(--txt2);font-size:13px;text-align:center;padding:20px}
|
||||
@keyframes spin{to{transform:rotate(360deg)}}
|
||||
.cam-spinner{width:40px;height:40px;border:3px solid rgba(255,255,255,.15);
|
||||
border-top-color:var(--accent);border-radius:50%;animation:spin .8s linear infinite;display:none}
|
||||
.cam-overlay{position:absolute;bottom:0;left:0;right:0;
|
||||
background:linear-gradient(transparent,rgba(0,0,0,.75));padding:14px}
|
||||
.cam-toggle{position:absolute;top:10px;right:10px;background:rgba(0,0,0,.5);
|
||||
border:1px solid rgba(255,255,255,.2);color:#fff;border-radius:8px;
|
||||
padding:6px 10px;cursor:pointer;font-size:12px;backdrop-filter:blur(4px)}
|
||||
.cam-toggle:hover{background:rgba(0,0,0,.7)}
|
||||
|
||||
/* ── PROGRESS ── */
|
||||
.hero-info{display:flex;flex-direction:column;gap:12px}
|
||||
.pct-big{font-size:52px;font-weight:700;line-height:1;color:var(--txt)}
|
||||
.pct-big small{font-size:20px;font-weight:400;color:var(--txt2)}
|
||||
.progress-bar{height:8px;background:var(--raised);border-radius:4px;overflow:hidden;margin:4px 0}
|
||||
.progress-fill{height:100%;background:linear-gradient(90deg,var(--accent),#0080cc);
|
||||
border-radius:4px;transition:width .6s ease}
|
||||
.meta-row{display:flex;justify-content:space-between;font-size:12px;color:var(--txt2)}
|
||||
.layer-badge{background:var(--raised);border-radius:6px;padding:4px 8px;
|
||||
font-family:var(--mono);font-size:12px;color:var(--txt)}
|
||||
.fname{font-size:12px;color:var(--txt2);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;
|
||||
background:var(--raised);border-radius:6px;padding:6px 8px}
|
||||
|
||||
/* ── PRINT CONTROLS ── */
|
||||
.ctrl-btns{display:flex;gap:8px;flex-wrap:wrap}
|
||||
.btn{border:none;border-radius:8px;padding:10px 16px;font-size:13px;font-weight:600;
|
||||
cursor:pointer;transition:opacity .15s,transform .1s;white-space:nowrap}
|
||||
.btn:hover{opacity:.85;transform:translateY(-1px)}
|
||||
.btn:active{transform:translateY(0)}
|
||||
.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-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}
|
||||
.spd-btn{flex:1;border:1.5px solid var(--border);background:var(--raised);color:var(--txt);
|
||||
border-radius:10px;padding:14px 8px;font-size:13px;font-weight:600;cursor:pointer;
|
||||
transition:all .15s;display:flex;flex-direction:column;align-items:center;gap:4px}
|
||||
.spd-btn:hover{border-color:var(--accent);color:var(--accent)}
|
||||
.spd-btn.spd-active{border-color:var(--accent);background:rgba(0,200,255,.12);color:var(--accent)}
|
||||
.spd-btn .spd-icon{font-size:22px}
|
||||
.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}
|
||||
|
||||
/* ── 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 ── */
|
||||
.temp-pair{display:grid;grid-template-columns:1fr 1fr;gap:12px}
|
||||
.temp-card-inner{display:grid;grid-template-columns:1fr 1fr;gap:12px}
|
||||
.temp-block{background:var(--raised);border-radius:10px;padding:14px;position:relative}
|
||||
.temp-label{font-size:11px;text-transform:uppercase;letter-spacing:.08em;color:var(--txt2);margin-bottom:6px}
|
||||
.temp-row{display:flex;align-items:baseline;gap:6px}
|
||||
.temp-val{font-size:30px;font-weight:700;font-family:var(--mono)}
|
||||
.temp-unit{font-size:14px;color:var(--txt2)}
|
||||
.temp-target{font-size:11px;color:var(--txt2);margin-top:2px}
|
||||
.temp-arc{position:absolute;top:12px;right:12px}
|
||||
.temp-edit{display:flex;gap:6px;margin-top:10px}
|
||||
.temp-input{background:var(--bg);border:1px solid var(--border);color:var(--txt);
|
||||
border-radius:6px;padding:5px 8px;font-size:13px;font-family:var(--mono);width:70px}
|
||||
.temp-input:focus{outline:none;border-color:var(--accent)}
|
||||
.chart-wrap{margin-top:12px}
|
||||
canvas.tchart{width:100%;height:60px;display:block;border-radius:6px;background:var(--raised)}
|
||||
|
||||
/* ── MOTION ── */
|
||||
.joypad{display:grid;grid-template-columns:repeat(3,52px);
|
||||
grid-template-rows:repeat(3,52px);gap:6px;justify-content:center;margin:8px auto}
|
||||
.joy{background:var(--raised);border:1px solid var(--border);color:var(--txt);
|
||||
border-radius:10px;font-size:18px;cursor:pointer;transition:.12s;
|
||||
display:flex;align-items:center;justify-content:center}
|
||||
.joy:hover{background:var(--accent);color:#001a24;border-color:var(--accent)}
|
||||
.joy:active{transform:scale(.93)}
|
||||
.joy.home{font-size:14px;background:var(--bg)}
|
||||
.step-btns{display:flex;gap:6px;justify-content:center;flex-wrap:wrap;margin-top:10px}
|
||||
.step-btn{background:var(--raised);border:1px solid var(--border);color:var(--txt2);
|
||||
border-radius:6px;padding:5px 10px;font-size:12px;cursor:pointer;transition:.12s}
|
||||
.step-btn.active,.step-btn:hover{background:var(--accent);color:#001a24;border-color:var(--accent)}
|
||||
.home-btns{display:flex;gap:6px;flex-wrap:wrap;margin-top:10px;justify-content:center}
|
||||
|
||||
/* ── AMS ── */
|
||||
.ams-slots{display:grid;grid-template-columns:repeat(4,1fr);gap:8px}
|
||||
.ams-slot{background:var(--raised);border-radius:10px;padding:10px;text-align:center;
|
||||
border:2px solid transparent;transition:.2s;position:relative}
|
||||
.ams-slot.active{border-color:var(--slot-color,var(--accent));
|
||||
box-shadow:0 0 12px rgba(var(--slot-rgb,0,200,255),.3)}
|
||||
.slot-circle{width:36px;height:36px;border-radius:50%;margin:0 auto 6px;border:2px solid rgba(255,255,255,.15)}
|
||||
.slot-label{font-size:11px;color:var(--txt2);font-family:var(--mono)}
|
||||
.slot-material{font-size:12px;font-weight:600;margin-bottom:2px}
|
||||
|
||||
/* ── LIGHT + FAN ── */
|
||||
.toggle-row{display:flex;align-items:center;justify-content:space-between;margin-bottom:14px}
|
||||
.toggle-label{font-size:13px;font-weight:600}
|
||||
.toggle{position:relative;width:44px;height:24px;cursor:pointer}
|
||||
.toggle input{opacity:0;width:0;height:0;position:absolute}
|
||||
.toggle-track{width:44px;height:24px;background:var(--raised);border-radius:12px;
|
||||
border:1px solid var(--border);transition:.25s;display:block}
|
||||
.toggle input:checked+.toggle-track{background:var(--accent)}
|
||||
.toggle-thumb{position:absolute;top:3px;left:3px;width:18px;height:18px;
|
||||
background:#fff;border-radius:50%;transition:.25s;pointer-events:none}
|
||||
.toggle input:checked~.toggle-thumb{transform:translateX(20px)}
|
||||
.slider-row{display:flex;align-items:center;gap:10px;margin-top:8px}
|
||||
.slider-label{font-size:12px;color:var(--txt2);width:80px}
|
||||
.slider{flex:1;-webkit-appearance:none;height:4px;border-radius:2px;
|
||||
background:var(--raised);outline:none;cursor:pointer}
|
||||
.slider::-webkit-slider-thumb{-webkit-appearance:none;width:16px;height:16px;
|
||||
border-radius:50%;background:var(--accent);cursor:pointer;transition:.1s}
|
||||
.slider::-webkit-slider-thumb:hover{transform:scale(1.2)}
|
||||
.slider-val{font-family:var(--mono);font-size:12px;color:var(--txt);width:30px;text-align:right}
|
||||
|
||||
/* ── CONSOLE ── */
|
||||
.console{background:#0a0a0e;border-radius:8px;padding:10px;font-family:var(--mono);
|
||||
font-size:11px;color:#8888aa;overflow-y:auto;line-height:1.6}
|
||||
.console .ts{color:#444;margin-right:6px}
|
||||
.console .msg-info{color:#8888aa}
|
||||
.console .msg-ok{color:var(--ok)}
|
||||
.console .msg-err{color:var(--err)}
|
||||
.console .msg-warn{color:var(--warn)}
|
||||
|
||||
/* ── PANELS ── */
|
||||
.panel{display:none}
|
||||
.panel.active{display:block}
|
||||
|
||||
/* ── MODAL ── */
|
||||
.modal-overlay{display:none;position:fixed;inset:0;background:rgba(0,0,0,.6);
|
||||
z-index:200;align-items:center;justify-content:center;padding:16px}
|
||||
.modal-overlay.open{display:flex}
|
||||
.modal-box{background:var(--card);border:1px solid var(--border);border-radius:14px;
|
||||
width:100%;max-width:480px;max-height:90vh;overflow-y:auto;padding:24px;
|
||||
display:flex;flex-direction:column;gap:18px}
|
||||
.modal-header{display:flex;align-items:center;justify-content:space-between}
|
||||
.modal-title{font-size:15px;font-weight:700;color:var(--txt)}
|
||||
.modal-close{background:none;border:none;color:var(--txt2);font-size:20px;
|
||||
cursor:pointer;padding:4px 8px;border-radius:6px}
|
||||
.modal-close:hover{background:var(--raised);color:var(--txt)}
|
||||
.modal-section{font-size:10px;text-transform:uppercase;letter-spacing:.1em;
|
||||
color:var(--txt2);margin-bottom:6px;margin-top:4px}
|
||||
.modal-field{display:flex;flex-direction:column;gap:4px;margin-bottom:10px}
|
||||
.modal-field label{font-size:12px;color:var(--txt2)}
|
||||
.modal-field input{background:var(--raised);border:1px solid var(--border);
|
||||
border-radius:7px;color:var(--txt);padding:7px 10px;font-size:13px;width:100%}
|
||||
.modal-field input:focus{outline:none;border-color:var(--accent)}
|
||||
.poll-btns{display:flex;gap:8px}
|
||||
.poll-btn{flex:1;padding:7px;background:var(--raised);border:1px solid var(--border);
|
||||
border-radius:7px;color:var(--txt2);cursor:pointer;font-size:13px;transition:all .15s}
|
||||
.poll-btn.active{background:var(--accent);border-color:var(--accent);color:#000;font-weight:600}
|
||||
.update-row{display:flex;align-items:center;gap:10px;flex-wrap:wrap}
|
||||
.update-status{font-size:12px;color:var(--txt2);flex:1;min-width:0}
|
||||
.modal-save{width:100%;padding:10px;background:var(--accent);border:none;
|
||||
border-radius:8px;color:#000;font-weight:700;font-size:14px;cursor:pointer;margin-top:4px}
|
||||
.modal-save:hover{opacity:.88}
|
||||
|
||||
/* ── BOTTOM NAV (mobile) ── */
|
||||
nav.bottom-nav{display:none;position:fixed;bottom:0;left:0;right:0;
|
||||
background:var(--card);border-top:1px solid var(--border);
|
||||
justify-content:space-around;padding:8px 0 max(8px,env(safe-area-inset-bottom))}
|
||||
.bnav-btn{background:none;border:none;color:var(--txt2);display:flex;
|
||||
flex-direction:column;align-items:center;gap:3px;cursor:pointer;font-size:10px;padding:4px 8px}
|
||||
.bnav-btn.active{color:var(--accent)}
|
||||
.bnav-icon{font-size:20px}
|
||||
|
||||
/* ── Tablet (769–1100px): schmale Sidebar ── */
|
||||
@media(min-width:769px) and (max-width:1100px){
|
||||
nav.sidebar{width:52px;padding:12px 4px}
|
||||
.nav-btn .nav-text{display:none}
|
||||
.nav-btn{justify-content:center;padding:10px}
|
||||
.nav-icon{width:auto}
|
||||
.grid{grid-template-columns:repeat(2,1fr)}
|
||||
.hero{grid-template-columns:1fr}
|
||||
}
|
||||
|
||||
/* ── Mobile (≤768px): Bottom-Nav, 1-Spalte ── */
|
||||
@media(max-width:768px){
|
||||
nav.sidebar{display:none}
|
||||
nav.bottom-nav{display:flex}
|
||||
main{padding:10px;padding-bottom:72px}
|
||||
|
||||
/* Header kompakt */
|
||||
header{padding:0 12px;gap:8px}
|
||||
.hname{display:none}
|
||||
|
||||
/* 1-Spalten-Grid, full-width spans funktionieren weiterhin */
|
||||
.grid{grid-template-columns:1fr;gap:12px}
|
||||
|
||||
/* Hero: Kamera über Info */
|
||||
.hero{grid-template-columns:1fr}
|
||||
.cam-wrap{max-height:220px}
|
||||
|
||||
/* Temp-Pair und Temp-Card übereinander */
|
||||
.temp-pair{grid-template-columns:1fr}
|
||||
.temp-card-inner{grid-template-columns:1fr}
|
||||
|
||||
/* AMS: 2 Spalten */
|
||||
.ams-slots{grid-template-columns:repeat(2,1fr)}
|
||||
|
||||
/* Joypad etwas kleiner */
|
||||
.joypad{grid-template-columns:repeat(3,44px);grid-template-rows:repeat(3,44px);gap:5px}
|
||||
.joy{font-size:16px}
|
||||
|
||||
/* Buttons größere Touch-Targets */
|
||||
.btn{padding:10px 14px;font-size:13px}
|
||||
.btn-sm{padding:8px 12px}
|
||||
.step-btn{padding:8px 12px;font-size:13px}
|
||||
|
||||
/* Modal vollbreite auf kleinen Screens */
|
||||
.modal-box{padding:16px;border-radius:10px}
|
||||
.poll-btns{gap:6px}
|
||||
}
|
||||
1267
web/themes/new1/app.js
Normal file
1267
web/themes/new1/app.js
Normal file
File diff suppressed because it is too large
Load Diff
492
web/themes/new1/index.html
Normal file
492
web/themes/new1/index.html
Normal file
@@ -0,0 +1,492 @@
|
||||
<!DOCTYPE html>
|
||||
<html lang="de" data-theme="dark">
|
||||
<head>
|
||||
<meta charset="utf-8">
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1">
|
||||
<title>KX-Bridge</title>
|
||||
<link rel="stylesheet" href="/kx/ui/style.css?v=__UI_ASSETS_VER__">
|
||||
</head>
|
||||
<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="file-ready-banner" style="display:none;background:#1a6e3c;color:#fff;padding:10px 18px;font-size:14px;text-align:center;position:sticky;top:0;z-index:998;display:none;align-items:center;justify-content:center;gap:12px;flex-wrap:wrap">
|
||||
<span>📄 <span id="file-ready-name"></span></span>
|
||||
<button id="file-ready-btn" onclick="startReadyFile()"
|
||||
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-slots-btn" onclick="startReadyFileWithSlots()"
|
||||
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>
|
||||
<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>
|
||||
<div class="logo">⬡ KX-Bridge (new1)</div>
|
||||
<div style="flex:1"></div>
|
||||
<div id="printer-dropdown-wrap" style="display:none;position:relative">
|
||||
<button id="printer-dropdown-btn" onclick="togglePrinterDropdown()" style="background:var(--raised);border:1px solid var(--border);border-radius:6px;padding:4px 10px;color:var(--txt);cursor:pointer;font-size:13px;display:flex;align-items:center;gap:6px">
|
||||
<span id="h-pname">Anycubic Kobra X</span><span style="opacity:.5">▾</span>
|
||||
</button>
|
||||
<div id="printer-dropdown-menu" style="display:none;position:absolute;top:calc(100% + 4px);right:0;background:var(--card);border:1px solid var(--border);border-radius:8px;min-width:200px;z-index:200;box-shadow:0 4px 16px #0006;overflow:hidden">
|
||||
</div>
|
||||
</div>
|
||||
<div id="h-pname-single" class="hname">Anycubic Kobra X</div>
|
||||
<span id="h-version" style="font-size:11px;opacity:.5;margin-left:6px"></span>
|
||||
<div class="hbadge" id="h-badge"><span class="dot"></span><span id="h-state">Standby</span></div>
|
||||
<button class="theme-btn" onclick="toggleTheme()">☀ / ☾</button>
|
||||
<button class="theme-btn" onclick="toggleLang()" id="lang-btn">EN</button>
|
||||
<button class="theme-btn" onclick="openSettings()" id="settings-btn" title="Einstellungen">⚙</button>
|
||||
<button class="conn-btn disconnected" id="conn-btn" onclick="toggleConnection()">⚡ Verbinden</button>
|
||||
</header>
|
||||
|
||||
<!-- ═══ SETTINGS MODAL ═══ -->
|
||||
<div class="modal-overlay" id="settings-modal" onclick="if(event.target===this)closeSettings()">
|
||||
<div class="modal-box">
|
||||
<div class="modal-header">
|
||||
<span class="modal-title" id="modal-title-settings">Einstellungen</span>
|
||||
<button class="modal-close" onclick="closeSettings()">✕</button>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="modal-field" style="margin-bottom:12px">
|
||||
<label id="lbl-printer-name" style="font-weight:600">Drucker-Name</label>
|
||||
<input type="text" id="s-printer-name" placeholder="z.B. Kobra X Links">
|
||||
</div>
|
||||
<div class="modal-section" id="modal-sec-connection">Verbindung</div>
|
||||
<div class="modal-field">
|
||||
<label id="lbl-printer-ip">Drucker-IP</label>
|
||||
<input type="text" id="s-printer-ip" placeholder="192.168.x.x">
|
||||
<small id="lbl-ip-hint" style="color:#f80;display:none"></small>
|
||||
</div>
|
||||
<div class="modal-field">
|
||||
<label id="lbl-mqtt-port">MQTT-Port</label>
|
||||
<input type="number" id="s-mqtt-port" placeholder="9883">
|
||||
</div>
|
||||
<div class="modal-field">
|
||||
<label id="lbl-username">MQTT-Benutzername</label>
|
||||
<input type="text" id="s-username" placeholder="userXXXXXXXX" autocomplete="new-password">
|
||||
</div>
|
||||
<div class="modal-field">
|
||||
<label id="lbl-password">MQTT-Passwort</label>
|
||||
<input type="password" id="s-password" autocomplete="new-password">
|
||||
</div>
|
||||
<div class="modal-field">
|
||||
<label id="lbl-device-id">Device-ID</label>
|
||||
<input type="text" id="s-device-id" placeholder="32 Hex-Zeichen">
|
||||
</div>
|
||||
<div class="modal-field">
|
||||
<label id="lbl-mode-id">Mode-ID</label>
|
||||
<input type="text" id="s-mode-id" placeholder="20030">
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="modal-section" id="modal-sec-print">Druckeinstellungen</div>
|
||||
<div class="modal-field">
|
||||
<label id="lbl-default-slot">Standard-Slot (Einfarbdruck)</label>
|
||||
<select id="s-default-slot">
|
||||
<option value="auto" id="opt-slot-auto">Auto (alle belegten Slots)</option>
|
||||
<option value="0" id="opt-slot-0">Slot 1</option>
|
||||
<option value="1" id="opt-slot-1">Slot 2</option>
|
||||
<option value="2" id="opt-slot-2">Slot 3</option>
|
||||
<option value="3" id="opt-slot-3">Slot 4</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="modal-field" style="flex-direction:row;align-items:center;gap:10px">
|
||||
<input type="checkbox" id="s-auto-leveling" style="width:auto;margin:0">
|
||||
<label id="lbl-auto-leveling" style="margin:0;cursor:pointer" for="s-auto-leveling">Auto-Leveling vor Druck</label>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="modal-section" id="modal-sec-poll">Poll-Intervall</div>
|
||||
<div class="poll-btns">
|
||||
<button class="poll-btn" onclick="setPoll(1000)" id="poll-1">1s</button>
|
||||
<button class="poll-btn active" onclick="setPoll(2000)" id="poll-2">2s</button>
|
||||
<button class="poll-btn" onclick="setPoll(5000)" id="poll-5">5s</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div>
|
||||
<div class="modal-section" id="modal-sec-version">Version</div>
|
||||
<div class="update-row">
|
||||
<span id="s-version-label" style="font-size:13px;color:var(--txt)">–</span>
|
||||
<button class="btn btn-sm" style="background:var(--raised);color:var(--txt)" onclick="checkUpdate()" id="btn-update-check">🔄 <span id="lbl-update-check">Auf Updates prüfen</span></button>
|
||||
</div>
|
||||
<div class="update-status" id="update-status" style="margin-top:6px"></div>
|
||||
<button class="btn btn-sm btn-accent" id="btn-update-apply" style="display:none;margin-top:8px" onclick="applyUpdate()">
|
||||
<span id="lbl-update-apply">Jetzt installieren</span>
|
||||
</button>
|
||||
<div id="update-changelog" style="display:none;margin-top:10px;background:var(--raised);border-radius:6px;padding:10px;font-size:11px;font-family:var(--mono);color:var(--txt2);white-space:pre-wrap;max-height:180px;overflow-y:auto;line-height:1.6"></div>
|
||||
</div>
|
||||
|
||||
<button class="modal-save" onclick="saveSettings()" id="btn-save-settings">Speichern & Neustart</button>
|
||||
</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">
|
||||
<nav class="sidebar">
|
||||
<button class="nav-btn active" onclick="showPanel('dashboard')" id="nb-dashboard">
|
||||
<span class="nav-icon">⊞</span><span class="nav-text">Dashboard</span></button>
|
||||
<button class="nav-btn" onclick="showPanel('printers');loadPrinterTab()" id="nb-printers">
|
||||
<span class="nav-icon">🖨</span><span class="nav-text">Drucker</span></button>
|
||||
<button class="nav-btn" onclick="showPanel('store');loadStore()" id="nb-store">
|
||||
<span class="nav-icon">🗂</span><span class="nav-text">Browser</span></button>
|
||||
<button class="nav-btn" onclick="showPanel('console');clearLogBadge()" id="nb-console">
|
||||
<span class="nav-icon">≡</span><span class="nav-text">Konsole</span><span id="log-badge" style="display:none;margin-left:4px;background:var(--err);color:#fff;border-radius:10px;font-size:10px;padding:1px 5px;font-weight:700"></span></button>
|
||||
</nav>
|
||||
|
||||
<main>
|
||||
<!-- ═══ DASHBOARD ═══ -->
|
||||
<div class="panel active" id="panel-dashboard">
|
||||
<div class="grid">
|
||||
<!-- Kamera -->
|
||||
<div class="card" style="grid-column:1/-1">
|
||||
<div style="display:flex;align-items:center;justify-content:space-between;margin-bottom:10px">
|
||||
<div class="card-title" style="margin-bottom:0"><span>📷</span> <span id="d-card-cam">Kamera</span></div>
|
||||
<div style="display:flex;align-items:center;gap:10px">
|
||||
<span id="d-lbl-light" style="font-size:12px;color:var(--txt2)">💡 Licht</span>
|
||||
<label class="toggle">
|
||||
<input type="checkbox" id="d-light-toggle" onchange="setLight()">
|
||||
<span class="toggle-track"></span>
|
||||
<span class="toggle-thumb"></span>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
<div class="cam-wrap" id="cam-wrap">
|
||||
<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>
|
||||
<img id="cam-img" style="display:none;width:100%;height:auto" alt="Kamera">
|
||||
<div class="cam-overlay" id="cam-overlay" style="display:none">
|
||||
<div style="font-size:12px;color:#fff" id="cam-fname"></div>
|
||||
</div>
|
||||
<button class="cam-toggle" onclick="toggleCam()" id="cam-toggle-btn">▶ Kamera</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Fortschritt -->
|
||||
<div class="card" style="grid-column:1/-1">
|
||||
<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">
|
||||
<div class="pct-big"><span id="d-pct">0</span><small>%</small></div>
|
||||
<div style="display:flex;align-items:center;gap:10px;margin:8px 0">
|
||||
<div class="progress-bar" style="flex:1;margin:0"><div class="progress-fill" id="d-pbar" style="width:0%"></div></div>
|
||||
<div class="time-block" style="padding:6px 10px;min-width:72px;text-align:center;flex-shrink:0">
|
||||
<div class="time-label" id="d-lbl-layers"></div>
|
||||
<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="fname" id="d-fname" title="" style="margin-top:6px">–</div>
|
||||
<div class="ctrl-btns" id="d-ctrl-btns" style="margin-top:12px">
|
||||
<button class="btn btn-pause btn-sm" id="d-btn-pause" onclick="printAction('pause')">⏸ Pause</button>
|
||||
<button class="btn btn-resume btn-sm" id="d-btn-resume" onclick="printAction('resume')">▶ Weiter</button>
|
||||
<button class="btn btn-cancel btn-sm" id="d-btn-cancel" onclick="confirmCancel()">✕ Stopp</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Temperatursteuerung + Verlauf -->
|
||||
<div class="card" style="grid-column:1/-1">
|
||||
<div class="card-title"><span>⊙</span> <span id="d-card-temps">Temperaturen</span></div>
|
||||
<div class="temp-card-inner">
|
||||
<div class="temp-block">
|
||||
<div class="temp-label">Nozzle</div>
|
||||
<div class="temp-row">
|
||||
<div class="temp-val" id="d-nt">–</div>
|
||||
<div class="temp-unit">°C</div>
|
||||
</div>
|
||||
<div class="temp-target">→ <span id="d-nt-t">0</span>°C</div>
|
||||
<div class="progress-bar" style="margin:8px 0 0">
|
||||
<div class="progress-fill" id="d-ntbar" style="width:0%;background:linear-gradient(90deg,var(--accent2),#ffb020)"></div>
|
||||
</div>
|
||||
<div class="temp-edit" style="margin-top:10px">
|
||||
<input type="number" class="temp-input" id="p-nozzle-inp" placeholder="Ziel" min="0" max="300" style="flex:1">
|
||||
<button class="btn btn-sm btn-accent" onclick="setNozzle()"><span class="lbl-set">Set</span></button>
|
||||
<button class="btn btn-sm" style="background:var(--raised);color:var(--txt)" onclick="document.getElementById('p-nozzle-inp').value=0;setNozzle()"><span class="lbl-off">Aus</span></button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="temp-block">
|
||||
<div class="temp-label" id="d-lbl-bed">Bett</div>
|
||||
<div class="temp-row">
|
||||
<div class="temp-val" id="d-bt">–</div>
|
||||
<div class="temp-unit">°C</div>
|
||||
</div>
|
||||
<div class="temp-target">→ <span id="d-bt-t">0</span>°C</div>
|
||||
<div class="progress-bar" style="margin:8px 0 0">
|
||||
<div class="progress-fill" id="d-btbar" style="width:0%;background:linear-gradient(90deg,#ff6b35,var(--warn))"></div>
|
||||
</div>
|
||||
<div class="temp-edit" style="margin-top:10px">
|
||||
<input type="number" class="temp-input" id="p-bed-inp" placeholder="Ziel" min="0" max="120" style="flex:1">
|
||||
<button class="btn btn-sm btn-accent" onclick="setBed()"><span class="lbl-set">Set</span></button>
|
||||
<button class="btn btn-sm" style="background:var(--raised);color:var(--txt)" onclick="document.getElementById('p-bed-inp').value=0;setBed()"><span class="lbl-off">Aus</span></button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div style="margin-top:14px">
|
||||
<div style="font-size:10px;color:var(--txt2);margin-bottom:4px" id="d-chart-label">Verlauf (letzte 60 Messungen)</div>
|
||||
<canvas id="d-chart" width="800" height="120" style="width:100%;height:120px;background:var(--raised);border-radius:8px"></canvas>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Achsensteuerung -->
|
||||
<div class="card">
|
||||
<div class="card-title"><span>✛</span> <span id="ptitle-motion-xy">XY-Achsen</span></div>
|
||||
<div class="joypad">
|
||||
<div></div>
|
||||
<button class="joy" onclick="move(1,1,getStep())" title="Y+">▲</button>
|
||||
<div></div>
|
||||
<button class="joy" onclick="move(0,-1,getStep())" title="X−">◀</button>
|
||||
<button class="joy home" onclick="homeAll()" title="Home All">⌂</button>
|
||||
<button class="joy" onclick="move(0,1,getStep())" title="X+">▶</button>
|
||||
<div></div>
|
||||
<button class="joy" onclick="move(1,-1,getStep())" title="Y−">▼</button>
|
||||
<div></div>
|
||||
</div>
|
||||
<div class="step-btns">
|
||||
<button class="step-btn" onclick="setStep(this,0.1)">0.1</button>
|
||||
<button class="step-btn active" onclick="setStep(this,1)">1</button>
|
||||
<button class="step-btn" onclick="setStep(this,5)">5</button>
|
||||
<button class="step-btn" onclick="setStep(this,10)">10 mm</button>
|
||||
</div>
|
||||
<div class="home-btns">
|
||||
<button class="btn btn-sm" style="background:var(--raised);color:var(--txt)" onclick="homeZ()"><span class="lbl-home-z">Home Z</span></button>
|
||||
<button class="btn btn-sm" style="background:var(--raised);color:var(--txt)" onclick="homeXY()"><span class="lbl-home-xy">Home XY</span></button>
|
||||
<button class="btn btn-sm btn-accent" onclick="homeAll()"><span class="lbl-home-all">Home All</span></button>
|
||||
<button class="btn btn-sm" style="background:var(--raised);color:var(--txt)" onclick="disableMotors()"><span class="lbl-disable-motors">Motors Off</span></button>
|
||||
</div>
|
||||
</div>
|
||||
<div class="card">
|
||||
<div class="card-title"><span>↕</span> <span id="ptitle-motion-z">Z-Achse</span></div>
|
||||
<div class="joypad" style="grid-template-columns:52px;grid-template-rows:repeat(2,52px)">
|
||||
<button class="joy" onclick="move(2,1,getStep())" title="Z+">▲</button>
|
||||
<button class="joy" onclick="move(2,-1,getStep())" title="Z−">▼</button>
|
||||
</div>
|
||||
<div style="text-align:center;margin-top:8px;font-size:12px;color:var(--txt2)"><span class="lbl-step">Schrittweite:</span> <span id="step-display">1</span> mm</div>
|
||||
</div>
|
||||
|
||||
<!-- Print Speed -->
|
||||
<div class="card">
|
||||
<div class="card-title"><span>🏎</span> <span id="d-card-speed">Druckgeschwindigkeit</span></div>
|
||||
<div style="display:flex;gap:8px;margin-top:4px">
|
||||
<button class="spd-btn" id="d-spd-1" onclick="setSpeed(1)">
|
||||
<span class="spd-icon">🐢</span>
|
||||
<span id="d-spd-lbl-1">Leise</span>
|
||||
</button>
|
||||
<button class="spd-btn spd-active" id="d-spd-2" onclick="setSpeed(2)">
|
||||
<span class="spd-icon">⚡</span>
|
||||
<span id="d-spd-lbl-2">Normal</span>
|
||||
</button>
|
||||
<button class="spd-btn" id="d-spd-3" onclick="setSpeed(3)">
|
||||
<span class="spd-icon">🚀</span>
|
||||
<span id="d-spd-lbl-3">Sport</span>
|
||||
</button>
|
||||
</div>
|
||||
<div class="spd-bar" style="margin-top:12px">
|
||||
<div class="spd-bar-fill" id="d-spd-bar" style="width:50%"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- Lüfter -->
|
||||
<div class="card">
|
||||
<div class="card-title"><span>🌀</span> <span id="d-card-lightfan">Lüfter</span></div>
|
||||
<div class="slider-row">
|
||||
<input type="range" class="slider" min="0" max="100" value="0" id="d-fan" oninput="document.getElementById('d-fan-val').textContent=this.value" onchange="setFan()">
|
||||
<span class="slider-val" id="d-fan-val">0</span>
|
||||
</div>
|
||||
<div style="margin-top:12px;display:flex;gap:8px;flex-wrap:wrap">
|
||||
<button class="btn btn-sm" style="background:var(--raised);color:var(--txt)" onclick="quickFan(0)">Aus</button>
|
||||
<button class="btn btn-sm" style="background:var(--raised);color:var(--txt)" onclick="quickFan(25)">25%</button>
|
||||
<button class="btn btn-sm" style="background:var(--raised);color:var(--txt)" onclick="quickFan(50)">50%</button>
|
||||
<button class="btn btn-sm" style="background:var(--raised);color:var(--txt)" onclick="quickFan(75)">75%</button>
|
||||
<button class="btn btn-sm btn-accent" onclick="quickFan(100)">100%</button>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- AMS -->
|
||||
<div class="card" style="grid-column:1/-1" id="d-ams-card">
|
||||
<div class="card-title"><span>◫</span> <span id="d-card-ams">AMS / Filamentbox</span></div>
|
||||
<div class="ams-slots" id="ams-slots">
|
||||
<div style="grid-column:1/-1;text-align:center;color:var(--txt2);padding:20px" id="ams-no-data">Keine AMS-Daten empfangen</div>
|
||||
</div>
|
||||
<div id="ams-controls" style="margin-top:16px;display:flex;flex-direction:column;gap:10px">
|
||||
<div style="font-size:12px;color:var(--txt2);margin-bottom:2px" id="ams-slot-lbl">Slot auswählen</div>
|
||||
<div style="display:flex;align-items:center;gap:10px">
|
||||
<input type="range" id="ams-slot-sel" min="0" max="3" step="1" value="0"
|
||||
class="slider" style="flex:1"
|
||||
oninput="document.getElementById('ams-slot-label').textContent='Slot '+(parseInt(this.value)+1)">
|
||||
<span id="ams-slot-label" style="min-width:48px;font-size:13px;font-weight:600">Slot 1</span>
|
||||
</div>
|
||||
<div style="display:flex;gap:10px">
|
||||
<button class="btn" style="flex:1" onclick="amsFeed(1)">⬇ <span class="lbl-feed">Einziehen</span></button>
|
||||
<button id="btn-unload" class="btn" style="flex:1" onclick="amsFeed(2)">⬆ <span class="lbl-unload">Ausziehen</span></button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- ═══ CONSOLE ═══ -->
|
||||
<!-- ═══ DRUCKER ═══ -->
|
||||
<div class="panel" id="panel-printers">
|
||||
<div class="card">
|
||||
<div class="card-title" style="display:flex;justify-content:space-between;align-items:center;margin-bottom:12px">
|
||||
<span id="printers-panel-title">🖨 Drucker</span>
|
||||
<div style="display:flex;gap:8px">
|
||||
<button onclick="openAddPrinterDialog()" style="font-size:12px;padding:4px 12px;background:var(--accent);border:none;border-radius:6px;color:#fff;cursor:pointer;font-weight:600">+ <span id="add-printer-btn-label">Drucker hinzufügen</span></button>
|
||||
<button onclick="loadPrinterTab()" style="font-size:12px;padding:4px 12px;background:var(--raised);border:1px solid var(--border);border-radius:6px;color:var(--txt2);cursor:pointer">↻</button>
|
||||
</div>
|
||||
</div>
|
||||
<div id="printers-grid" style="display:grid;grid-template-columns:repeat(auto-fill,minmax(260px,1fr));gap:14px"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- ═══ GCODE STORE ═══ -->
|
||||
<div class="panel" id="panel-store">
|
||||
<div class="card">
|
||||
<div class="card-title" style="display:flex;justify-content:space-between;align-items:center;margin-bottom:10px">
|
||||
<span id="store-panel-title">🗂 Datei-Browser</span>
|
||||
<button id="store-refresh-btn" onclick="loadStore()" style="font-size:12px;padding:4px 12px;background:var(--raised);border:1px solid var(--border);border-radius:6px;color:var(--txt2);cursor:pointer">↻ Aktualisieren</button>
|
||||
</div>
|
||||
<div style="display:flex;gap:8px;margin-bottom:12px;flex-wrap:wrap">
|
||||
<input id="store-search" type="text" placeholder="🔍 Suche…" oninput="renderStore()"
|
||||
style="flex:1;min-width:140px;padding:6px 10px;background:var(--raised);border:1px solid var(--border);border-radius:6px;color:var(--txt);font-size:13px">
|
||||
<select id="store-filter" onchange="renderStore()"
|
||||
style="padding:6px 8px;background:var(--raised);border:1px solid var(--border);border-radius:6px;color:var(--txt);font-size:13px">
|
||||
<option value="all" id="sf-all">Alle</option>
|
||||
<option value="completed" id="sf-ok">✓ Erfolgreich</option>
|
||||
<option value="failed" id="sf-err">✗ Fehler</option>
|
||||
<option value="never" id="sf-new">Neu</option>
|
||||
</select>
|
||||
<select id="store-sort" onchange="renderStore()"
|
||||
style="padding:6px 8px;background:var(--raised);border:1px solid var(--border);border-radius:6px;color:var(--txt);font-size:13px">
|
||||
<option value="date_desc" id="ss-date">↓ Datum</option>
|
||||
<option value="name_asc" id="ss-name">A–Z Name</option>
|
||||
<option value="duration_asc" id="ss-dur">⏱ Druckzeit</option>
|
||||
</select>
|
||||
</div>
|
||||
<div id="store-empty" style="display:none;color:var(--txt2);text-align:center;padding:40px 0;font-size:14px">
|
||||
</div>
|
||||
<div id="store-grid" style="display:grid;grid-template-columns:repeat(auto-fill,minmax(200px,1fr));gap:14px"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="panel" id="panel-console">
|
||||
<div class="card">
|
||||
<div class="card-title" style="display:flex;justify-content:space-between;align-items:center">
|
||||
<span><span>≡</span> <span id="ptitle-console">Ereignis-Log</span></span>
|
||||
<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>
|
||||
</div>
|
||||
<div style="display:flex;gap:6px;margin-bottom:6px;flex-wrap:wrap;align-items:center">
|
||||
<input id="log-filter" type="text" placeholder="Filter…"
|
||||
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)">
|
||||
<button id="btn-autoscroll" onclick="toggleAutoScroll()"
|
||||
style="font-size:12px;padding:5px 10px;border-radius:6px;border:1px solid var(--border);background:var(--accent);color:#fff;cursor:pointer;white-space:nowrap">⬇ Auto</button>
|
||||
<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>
|
||||
</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>
|
||||
</main>
|
||||
</div>
|
||||
|
||||
<nav class="bottom-nav">
|
||||
<button class="bnav-btn active" onclick="showPanel('dashboard')" id="bnb-dashboard"><span class="bnav-icon">⊞</span>Dashboard</button>
|
||||
<button class="bnav-btn" onclick="showPanel('printers');loadPrinterTab()" id="bnb-printers"><span class="bnav-icon">🖨</span>Drucker</button>
|
||||
<button class="bnav-btn" onclick="showPanel('store');loadStore()" id="bnb-store"><span class="bnav-icon">🗂</span>Browser</button>
|
||||
<button class="bnav-btn" onclick="showPanel('console');clearLogBadge()" id="bnb-console"><span class="bnav-icon">≡</span>Log<span id="log-badge-bot" style="display:none;margin-left:3px;background:var(--err);color:#fff;border-radius:10px;font-size:10px;padding:1px 4px;font-weight:700"></span></button>
|
||||
</nav>
|
||||
|
||||
<!-- Filament-Slot-Dialog -->
|
||||
<div class="modal-overlay" id="filament-dialog" onclick="if(event.target===this)closeFilamentDialog()">
|
||||
<div class="modal-box" style="max-width:380px;width:100%">
|
||||
<div class="modal-header" style="margin-bottom:14px">
|
||||
<span class="modal-title" id="fd-title" style="font-size:14px;word-break:break-all"></span>
|
||||
<button onclick="closeFilamentDialog()" style="background:none;border:none;font-size:18px;cursor:pointer;color:var(--txt2)">✕</button>
|
||||
</div>
|
||||
<p style="font-size:12px;color:var(--txt2);margin-bottom:10px">GCode-Kanal → AMS-Slot zuweisen:</p>
|
||||
<div id="fd-slots" style="display:flex;flex-direction:column;gap:8px;margin-bottom:16px"></div>
|
||||
<div style="display:flex;gap:8px;justify-content:flex-end">
|
||||
<button onclick="closeFilamentDialog()" style="padding:8px 16px;background:var(--raised);border:1px solid var(--border);border-radius:8px;color:var(--txt);cursor:pointer">Abbrechen</button>
|
||||
<button onclick="confirmFilamentPrint()" style="padding:8px 18px;background:var(--accent);color:#fff;border:none;border-radius:8px;cursor:pointer;font-weight:600">▶ Drucken</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<!-- Drucker-hinzufügen-Dialog -->
|
||||
<div class="modal-overlay" id="add-printer-dialog" onclick="if(event.target===this)closeAddPrinterDialog()">
|
||||
<div class="modal-box" style="max-width:380px;width:100%">
|
||||
<div class="modal-header" style="margin-bottom:14px">
|
||||
<span class="modal-title" id="apd-title">Drucker hinzufügen</span>
|
||||
<button onclick="closeAddPrinterDialog()" style="background:none;border:none;font-size:18px;cursor:pointer;color:var(--txt2)">✕</button>
|
||||
</div>
|
||||
<label id="apd-lbl-ip" style="display:block;font-size:12px;color:var(--txt2);margin-bottom:4px">Drucker-IP</label>
|
||||
<input type="text" id="apd-ip" placeholder="192.168.1.100" style="width:100%;box-sizing:border-box;padding:8px;background:var(--raised);border:1px solid var(--border);border-radius:6px;color:var(--txt);margin-bottom:10px">
|
||||
<label id="apd-lbl-name" style="display:block;font-size:12px;color:var(--txt2);margin-bottom:4px">Name (optional)</label>
|
||||
<input type="text" id="apd-name" placeholder="z.B. Kobra X Wohnzimmer" style="width:100%;box-sizing:border-box;padding:8px;background:var(--raised);border:1px solid var(--border);border-radius:6px;color:var(--txt);margin-bottom:6px">
|
||||
<div id="apd-status" style="font-size:12px;margin:8px 0;min-height:16px;color:var(--txt2)"></div>
|
||||
<div style="display:flex;gap:8px;justify-content:flex-end">
|
||||
<button onclick="closeAddPrinterDialog()" style="padding:8px 16px;background:var(--raised);border:1px solid var(--border);border-radius:8px;color:var(--txt);cursor:pointer">Abbrechen</button>
|
||||
<button id="apd-confirm" onclick="confirmAddPrinter()" style="padding:8px 18px;background:var(--accent);color:#fff;border:none;border-radius:8px;cursor:pointer;font-weight:600">Hinzufügen</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<footer style="text-align:center;padding:12px;font-size:11px;color:var(--txt2);border-top:1px solid var(--border);margin-top:auto">
|
||||
© ViewIT 2026
|
||||
</footer>
|
||||
<script src="/kx/ui/app.js?v=__UI_ASSETS_VER__"></script>
|
||||
</body>
|
||||
</html>
|
||||
277
web/themes/new1/style.css
Normal file
277
web/themes/new1/style.css
Normal file
@@ -0,0 +1,277 @@
|
||||
:root{
|
||||
--bg:#1a1a1f;--card:#24242c;--raised:#2e2e3a;--border:#3a3a4a;
|
||||
--txt:#f0f0f5;--txt2:#8888aa;--accent:#00c8ff;--accent2:#ff6b35;
|
||||
--ok:#4cde80;--err:#ff4d6d;--warn:#ffb020;
|
||||
--font:-apple-system,BlinkMacSystemFont,"Segoe UI",sans-serif;
|
||||
--mono:"JetBrains Mono","Fira Code",monospace;
|
||||
}
|
||||
[data-theme=light]{
|
||||
--bg:#f0f0f5;--card:#fff;--raised:#e8e8f0;--border:#d0d0e0;
|
||||
--txt:#1a1a2e;--txt2:#666680;
|
||||
}
|
||||
*{box-sizing:border-box;margin:0;padding:0}
|
||||
body{background:var(--bg);color:var(--txt);font-family:var(--font);font-size:14px;min-height:100vh;display:flex;flex-direction:column}
|
||||
a{color:var(--accent);text-decoration:none}
|
||||
|
||||
/* ── HEADER ── */
|
||||
header{background:var(--card);border-bottom:1px solid var(--border);
|
||||
display:flex;align-items:center;gap:12px;padding:0 20px;height:52px;
|
||||
position:sticky;top:0;z-index:100}
|
||||
.logo{font-size:18px;font-weight:700;color:var(--accent);letter-spacing:-.02em}
|
||||
.hname{font-size:13px;color:var(--txt2)}
|
||||
.hbadge{display:flex;align-items:center;gap:6px;font-size:12px;font-weight:600;
|
||||
padding:4px 10px;border-radius:20px;background:var(--raised);color:var(--txt2);
|
||||
text-transform:uppercase;letter-spacing:.04em}
|
||||
.hbadge.printing{background:#0d2d1a;color:var(--ok)}
|
||||
.hbadge.complete{background:#0d1f38;color:#60b0ff}
|
||||
.hbadge.error{background:#2d0d0d;color:var(--err)}
|
||||
.hbadge .dot{width:7px;height:7px;border-radius:50%;background:currentColor}
|
||||
.hbadge.printing .dot{animation:pulse 1.4s infinite}
|
||||
@keyframes pulse{0%,100%{opacity:1}50%{opacity:.25}}
|
||||
.theme-btn{background:none;border:1px solid var(--border);color:var(--txt2);
|
||||
border-radius:8px;padding:6px 10px;cursor:pointer;font-size:13px;transition:.15s}
|
||||
.theme-btn:hover{border-color:var(--accent);color:var(--accent)}
|
||||
.conn-btn{border-radius:8px;padding:6px 12px;cursor:pointer;font-size:13px;
|
||||
font-weight:600;border:none;transition:.15s}
|
||||
.conn-btn.disconnected{background:var(--accent);color:#fff}
|
||||
.conn-btn.disconnected:hover{opacity:.85}
|
||||
.conn-btn.connected{background:transparent;border:1px solid var(--border);color:var(--txt2)}
|
||||
.conn-btn.connected:hover{border-color:#e05;color:#e05}
|
||||
|
||||
/* ── LAYOUT ── */
|
||||
.layout{display:flex;flex:1;min-height:0}
|
||||
nav.sidebar{width:200px;background:var(--card);border-right:1px solid var(--border);
|
||||
display:flex;flex-direction:column;padding:12px 8px;gap:2px;flex-shrink:0}
|
||||
.nav-btn{background:none;border:none;color:var(--txt2);text-align:left;
|
||||
padding:9px 12px;border-radius:8px;cursor:pointer;font-size:13px;
|
||||
display:flex;align-items:center;gap:10px;transition:.12s;width:100%}
|
||||
.nav-btn:hover{background:var(--raised);color:var(--txt)}
|
||||
.nav-btn.active{background:var(--raised);color:var(--accent)}
|
||||
.nav-icon{font-size:16px;width:20px;text-align:center}
|
||||
main{flex:1;overflow-y:auto;padding:20px}
|
||||
.grid{display:grid;grid-template-columns:repeat(auto-fill,minmax(320px,1fr));gap:16px}
|
||||
|
||||
/* ── CARD ── */
|
||||
.card{background:var(--card);border:1px solid var(--border);border-radius:12px;
|
||||
padding:18px;transition:box-shadow .15s,transform .15s}
|
||||
.card:hover{box-shadow:0 4px 20px rgba(0,0,0,.3);transform:translateY(-1px)}
|
||||
.card-title{font-size:11px;text-transform:uppercase;letter-spacing:.1em;color:var(--txt2);
|
||||
margin-bottom:14px;display:flex;align-items:center;gap:8px}
|
||||
.card-title span{font-size:14px}
|
||||
|
||||
/* ── HERO ── */
|
||||
.hero{grid-column:1/-1;display:grid;grid-template-columns:1fr 320px;gap:16px}
|
||||
@media(max-width:900px){.hero{grid-template-columns:1fr}}
|
||||
.cam-wrap{background:#0a0a0e;border-radius:10px;overflow:hidden;
|
||||
min-height:180px;max-height:320px;display:flex;align-items:center;justify-content:center;position:relative}
|
||||
.cam-wrap img,.cam-wrap video{width:100%;max-height:320px;height:auto;display:block;object-fit:contain}
|
||||
.cam-placeholder{color:var(--txt2);font-size:13px;text-align:center;padding:20px}
|
||||
@keyframes spin{to{transform:rotate(360deg)}}
|
||||
.cam-spinner{width:40px;height:40px;border:3px solid rgba(255,255,255,.15);
|
||||
border-top-color:var(--accent);border-radius:50%;animation:spin .8s linear infinite;display:none}
|
||||
.cam-overlay{position:absolute;bottom:0;left:0;right:0;
|
||||
background:linear-gradient(transparent,rgba(0,0,0,.75));padding:14px}
|
||||
.cam-toggle{position:absolute;top:10px;right:10px;background:rgba(0,0,0,.5);
|
||||
border:1px solid rgba(255,255,255,.2);color:#fff;border-radius:8px;
|
||||
padding:6px 10px;cursor:pointer;font-size:12px;backdrop-filter:blur(4px)}
|
||||
.cam-toggle:hover{background:rgba(0,0,0,.7)}
|
||||
|
||||
/* ── PROGRESS ── */
|
||||
.hero-info{display:flex;flex-direction:column;gap:12px}
|
||||
.pct-big{font-size:52px;font-weight:700;line-height:1;color:var(--txt)}
|
||||
.pct-big small{font-size:20px;font-weight:400;color:var(--txt2)}
|
||||
.progress-bar{height:8px;background:var(--raised);border-radius:4px;overflow:hidden;margin:4px 0}
|
||||
.progress-fill{height:100%;background:linear-gradient(90deg,var(--accent),#0080cc);
|
||||
border-radius:4px;transition:width .6s ease}
|
||||
.meta-row{display:flex;justify-content:space-between;font-size:12px;color:var(--txt2)}
|
||||
.layer-badge{background:var(--raised);border-radius:6px;padding:4px 8px;
|
||||
font-family:var(--mono);font-size:12px;color:var(--txt)}
|
||||
.fname{font-size:12px;color:var(--txt2);white-space:nowrap;overflow:hidden;text-overflow:ellipsis;
|
||||
background:var(--raised);border-radius:6px;padding:6px 8px}
|
||||
|
||||
/* ── PRINT CONTROLS ── */
|
||||
.ctrl-btns{display:flex;gap:8px;flex-wrap:wrap}
|
||||
.btn{border:none;border-radius:8px;padding:10px 16px;font-size:13px;font-weight:600;
|
||||
cursor:pointer;transition:opacity .15s,transform .1s;white-space:nowrap}
|
||||
.btn:hover{opacity:.85;transform:translateY(-1px)}
|
||||
.btn:active{transform:translateY(0)}
|
||||
.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-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}
|
||||
.spd-btn{flex:1;border:1.5px solid var(--border);background:var(--raised);color:var(--txt);
|
||||
border-radius:10px;padding:14px 8px;font-size:13px;font-weight:600;cursor:pointer;
|
||||
transition:all .15s;display:flex;flex-direction:column;align-items:center;gap:4px}
|
||||
.spd-btn:hover{border-color:var(--accent);color:var(--accent)}
|
||||
.spd-btn.spd-active{border-color:var(--accent);background:rgba(0,200,255,.12);color:var(--accent)}
|
||||
.spd-btn .spd-icon{font-size:22px}
|
||||
.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}
|
||||
|
||||
/* ── 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 ── */
|
||||
.temp-pair{display:grid;grid-template-columns:1fr 1fr;gap:12px}
|
||||
.temp-card-inner{display:grid;grid-template-columns:1fr 1fr;gap:12px}
|
||||
.temp-block{background:var(--raised);border-radius:10px;padding:14px;position:relative}
|
||||
.temp-label{font-size:11px;text-transform:uppercase;letter-spacing:.08em;color:var(--txt2);margin-bottom:6px}
|
||||
.temp-row{display:flex;align-items:baseline;gap:6px}
|
||||
.temp-val{font-size:30px;font-weight:700;font-family:var(--mono)}
|
||||
.temp-unit{font-size:14px;color:var(--txt2)}
|
||||
.temp-target{font-size:11px;color:var(--txt2);margin-top:2px}
|
||||
.temp-arc{position:absolute;top:12px;right:12px}
|
||||
.temp-edit{display:flex;gap:6px;margin-top:10px}
|
||||
.temp-input{background:var(--bg);border:1px solid var(--border);color:var(--txt);
|
||||
border-radius:6px;padding:5px 8px;font-size:13px;font-family:var(--mono);width:70px}
|
||||
.temp-input:focus{outline:none;border-color:var(--accent)}
|
||||
.chart-wrap{margin-top:12px}
|
||||
canvas.tchart{width:100%;height:60px;display:block;border-radius:6px;background:var(--raised)}
|
||||
|
||||
/* ── MOTION ── */
|
||||
.joypad{display:grid;grid-template-columns:repeat(3,52px);
|
||||
grid-template-rows:repeat(3,52px);gap:6px;justify-content:center;margin:8px auto}
|
||||
.joy{background:var(--raised);border:1px solid var(--border);color:var(--txt);
|
||||
border-radius:10px;font-size:18px;cursor:pointer;transition:.12s;
|
||||
display:flex;align-items:center;justify-content:center}
|
||||
.joy:hover{background:var(--accent);color:#001a24;border-color:var(--accent)}
|
||||
.joy:active{transform:scale(.93)}
|
||||
.joy.home{font-size:14px;background:var(--bg)}
|
||||
.step-btns{display:flex;gap:6px;justify-content:center;flex-wrap:wrap;margin-top:10px}
|
||||
.step-btn{background:var(--raised);border:1px solid var(--border);color:var(--txt2);
|
||||
border-radius:6px;padding:5px 10px;font-size:12px;cursor:pointer;transition:.12s}
|
||||
.step-btn.active,.step-btn:hover{background:var(--accent);color:#001a24;border-color:var(--accent)}
|
||||
.home-btns{display:flex;gap:6px;flex-wrap:wrap;margin-top:10px;justify-content:center}
|
||||
|
||||
/* ── AMS ── */
|
||||
.ams-slots{display:grid;grid-template-columns:repeat(4,1fr);gap:8px}
|
||||
.ams-slot{background:var(--raised);border-radius:10px;padding:10px;text-align:center;
|
||||
border:2px solid transparent;transition:.2s;position:relative}
|
||||
.ams-slot.active{border-color:var(--slot-color,var(--accent));
|
||||
box-shadow:0 0 12px rgba(var(--slot-rgb,0,200,255),.3)}
|
||||
.slot-circle{width:36px;height:36px;border-radius:50%;margin:0 auto 6px;border:2px solid rgba(255,255,255,.15)}
|
||||
.slot-label{font-size:11px;color:var(--txt2);font-family:var(--mono)}
|
||||
.slot-material{font-size:12px;font-weight:600;margin-bottom:2px}
|
||||
|
||||
/* ── LIGHT + FAN ── */
|
||||
.toggle-row{display:flex;align-items:center;justify-content:space-between;margin-bottom:14px}
|
||||
.toggle-label{font-size:13px;font-weight:600}
|
||||
.toggle{position:relative;width:44px;height:24px;cursor:pointer}
|
||||
.toggle input{opacity:0;width:0;height:0;position:absolute}
|
||||
.toggle-track{width:44px;height:24px;background:var(--raised);border-radius:12px;
|
||||
border:1px solid var(--border);transition:.25s;display:block}
|
||||
.toggle input:checked+.toggle-track{background:var(--accent)}
|
||||
.toggle-thumb{position:absolute;top:3px;left:3px;width:18px;height:18px;
|
||||
background:#fff;border-radius:50%;transition:.25s;pointer-events:none}
|
||||
.toggle input:checked~.toggle-thumb{transform:translateX(20px)}
|
||||
.slider-row{display:flex;align-items:center;gap:10px;margin-top:8px}
|
||||
.slider-label{font-size:12px;color:var(--txt2);width:80px}
|
||||
.slider{flex:1;-webkit-appearance:none;height:4px;border-radius:2px;
|
||||
background:var(--raised);outline:none;cursor:pointer}
|
||||
.slider::-webkit-slider-thumb{-webkit-appearance:none;width:16px;height:16px;
|
||||
border-radius:50%;background:var(--accent);cursor:pointer;transition:.1s}
|
||||
.slider::-webkit-slider-thumb:hover{transform:scale(1.2)}
|
||||
.slider-val{font-family:var(--mono);font-size:12px;color:var(--txt);width:30px;text-align:right}
|
||||
|
||||
/* ── CONSOLE ── */
|
||||
.console{background:#0a0a0e;border-radius:8px;padding:10px;font-family:var(--mono);
|
||||
font-size:11px;color:#8888aa;overflow-y:auto;line-height:1.6}
|
||||
.console .ts{color:#444;margin-right:6px}
|
||||
.console .msg-info{color:#8888aa}
|
||||
.console .msg-ok{color:var(--ok)}
|
||||
.console .msg-err{color:var(--err)}
|
||||
.console .msg-warn{color:var(--warn)}
|
||||
|
||||
/* ── PANELS ── */
|
||||
.panel{display:none}
|
||||
.panel.active{display:block}
|
||||
|
||||
/* ── MODAL ── */
|
||||
.modal-overlay{display:none;position:fixed;inset:0;background:rgba(0,0,0,.6);
|
||||
z-index:200;align-items:center;justify-content:center;padding:16px}
|
||||
.modal-overlay.open{display:flex}
|
||||
.modal-box{background:var(--card);border:1px solid var(--border);border-radius:14px;
|
||||
width:100%;max-width:480px;max-height:90vh;overflow-y:auto;padding:24px;
|
||||
display:flex;flex-direction:column;gap:18px}
|
||||
.modal-header{display:flex;align-items:center;justify-content:space-between}
|
||||
.modal-title{font-size:15px;font-weight:700;color:var(--txt)}
|
||||
.modal-close{background:none;border:none;color:var(--txt2);font-size:20px;
|
||||
cursor:pointer;padding:4px 8px;border-radius:6px}
|
||||
.modal-close:hover{background:var(--raised);color:var(--txt)}
|
||||
.modal-section{font-size:10px;text-transform:uppercase;letter-spacing:.1em;
|
||||
color:var(--txt2);margin-bottom:6px;margin-top:4px}
|
||||
.modal-field{display:flex;flex-direction:column;gap:4px;margin-bottom:10px}
|
||||
.modal-field label{font-size:12px;color:var(--txt2)}
|
||||
.modal-field input{background:var(--raised);border:1px solid var(--border);
|
||||
border-radius:7px;color:var(--txt);padding:7px 10px;font-size:13px;width:100%}
|
||||
.modal-field input:focus{outline:none;border-color:var(--accent)}
|
||||
.poll-btns{display:flex;gap:8px}
|
||||
.poll-btn{flex:1;padding:7px;background:var(--raised);border:1px solid var(--border);
|
||||
border-radius:7px;color:var(--txt2);cursor:pointer;font-size:13px;transition:all .15s}
|
||||
.poll-btn.active{background:var(--accent);border-color:var(--accent);color:#000;font-weight:600}
|
||||
.update-row{display:flex;align-items:center;gap:10px;flex-wrap:wrap}
|
||||
.update-status{font-size:12px;color:var(--txt2);flex:1;min-width:0}
|
||||
.modal-save{width:100%;padding:10px;background:var(--accent);border:none;
|
||||
border-radius:8px;color:#000;font-weight:700;font-size:14px;cursor:pointer;margin-top:4px}
|
||||
.modal-save:hover{opacity:.88}
|
||||
|
||||
/* ── BOTTOM NAV (mobile) ── */
|
||||
nav.bottom-nav{display:none;position:fixed;bottom:0;left:0;right:0;
|
||||
background:var(--card);border-top:1px solid var(--border);
|
||||
justify-content:space-around;padding:8px 0 max(8px,env(safe-area-inset-bottom))}
|
||||
.bnav-btn{background:none;border:none;color:var(--txt2);display:flex;
|
||||
flex-direction:column;align-items:center;gap:3px;cursor:pointer;font-size:10px;padding:4px 8px}
|
||||
.bnav-btn.active{color:var(--accent)}
|
||||
.bnav-icon{font-size:20px}
|
||||
|
||||
/* ── Tablet (769–1100px): schmale Sidebar ── */
|
||||
@media(min-width:769px) and (max-width:1100px){
|
||||
nav.sidebar{width:52px;padding:12px 4px}
|
||||
.nav-btn .nav-text{display:none}
|
||||
.nav-btn{justify-content:center;padding:10px}
|
||||
.nav-icon{width:auto}
|
||||
.grid{grid-template-columns:repeat(2,1fr)}
|
||||
.hero{grid-template-columns:1fr}
|
||||
}
|
||||
|
||||
/* ── Mobile (≤768px): Bottom-Nav, 1-Spalte ── */
|
||||
@media(max-width:768px){
|
||||
nav.sidebar{display:none}
|
||||
nav.bottom-nav{display:flex}
|
||||
main{padding:10px;padding-bottom:72px}
|
||||
|
||||
/* Header kompakt */
|
||||
header{padding:0 12px;gap:8px}
|
||||
.hname{display:none}
|
||||
|
||||
/* 1-Spalten-Grid, full-width spans funktionieren weiterhin */
|
||||
.grid{grid-template-columns:1fr;gap:12px}
|
||||
|
||||
/* Hero: Kamera über Info */
|
||||
.hero{grid-template-columns:1fr}
|
||||
.cam-wrap{max-height:220px}
|
||||
|
||||
/* Temp-Pair und Temp-Card übereinander */
|
||||
.temp-pair{grid-template-columns:1fr}
|
||||
.temp-card-inner{grid-template-columns:1fr}
|
||||
|
||||
/* AMS: 2 Spalten */
|
||||
.ams-slots{grid-template-columns:repeat(2,1fr)}
|
||||
|
||||
/* Joypad etwas kleiner */
|
||||
.joypad{grid-template-columns:repeat(3,44px);grid-template-rows:repeat(3,44px);gap:5px}
|
||||
.joy{font-size:16px}
|
||||
|
||||
/* Buttons größere Touch-Targets */
|
||||
.btn{padding:10px 14px;font-size:13px}
|
||||
.btn-sm{padding:8px 12px}
|
||||
.step-btn{padding:8px 12px;font-size:13px}
|
||||
|
||||
/* Modal vollbreite auf kleinen Screens */
|
||||
.modal-box{padding:16px;border-radius:10px}
|
||||
.poll-btns{gap:6px}
|
||||
}
|
||||
Reference in New Issue
Block a user