Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 40a27a47fc | |||
| 7815c66a82 | |||
| 312b4083d2 | |||
| 534ea41816 | |||
| f1bfab969c |
2
.gitignore
vendored
2
.gitignore
vendored
@@ -7,3 +7,5 @@ dist/
|
||||
releases/*/kx-bridge
|
||||
releases/*/extract_credentials
|
||||
releases/*/extract_credentials.exe
|
||||
|
||||
!kx-bridge.spec
|
||||
|
||||
110
CHANGELOG.de.md
110
CHANGELOG.de.md
@@ -1,5 +1,115 @@
|
||||
# Changelog
|
||||
|
||||
## [0.9.16] – 2026-05-22
|
||||
|
||||
### Neu
|
||||
- **Kamera bei Druckstart automatisch einschalten:** neue Einstellung „Kamera bei
|
||||
Druckstart einschalten" — die Bridge startet den Kamera-Stream automatisch, wenn
|
||||
ein Druck beginnt (für OrcaSlicer und die Bridge-UI).
|
||||
|
||||
### Fixes
|
||||
- **Einfarbiger Druck durch leeren AMS-Slot blockiert:** OrcaSlicer schreibt alle
|
||||
konfigurierten Filamente in den GCode-Header, auch wenn das Modell nur eines
|
||||
nutzt — die Bridge meldete dem Drucker dadurch alle Farben als nötig, und ein
|
||||
leerer ungenutzter Slot brach den Druck ab. Die Bridge mappt jetzt nur die im
|
||||
GCode tatsächlich genutzten Filamente.
|
||||
- **Filament-Sync jetzt positionstreu:** Bei einem leeren Slot in der Mitte
|
||||
(z.B. Slot 1 gelb, 2 leer, 3 rot, 4 weiß) zeigte OrcaSlicer die Farben auf den
|
||||
falschen Slots. Behoben — leere Slots behalten ihre Position, und das
|
||||
Sync-Farbformat folgt der Happy-Hare-Konvention (RRGGBB ohne `#`).
|
||||
- **Slicer-Zeit + Thumbnail fehlten nach Browser-Reload** (oder bei Druckstart
|
||||
direkt aus OrcaSlicer): beide werden jetzt aus dem GCode-Store anhand des
|
||||
Dateinamens wiederhergestellt statt aus flüchtigem State.
|
||||
- **Deutsche Übersetzungslücken** im ACE-Trockner-Dialog behoben.
|
||||
|
||||
### Logging
|
||||
- Wiederholte Log-Zeilen werden als Zähler („×N") zusammengefasst statt zu spammen;
|
||||
Status-Poll-Verkehr wird nicht mehr auf INFO geloggt.
|
||||
- Neuer Level-Filter (Alle / Fehler / Warnungen), Toast bei neuen Fehlern, volle
|
||||
Tracebacks im Browser-Log und ein Download-Dateiname mit Zeitstempel.
|
||||
|
||||
## [0.9.15] – 2026-05-21
|
||||
|
||||
### Fixes (Issue #29)
|
||||
- **UI im OrcaSlicer-Device-Tab kaputt:** OrcaSlicers eingebetteter Webview lädt
|
||||
nur das nackte HTML und ignoriert externe `<script>`/`<link>`-Tags — nach der
|
||||
v0.9.14-Theme-Auslagerung funktionierte dort kein Button mehr. Die Bridge
|
||||
bettet CSS + JS jetzt inline in die Seite ein — funktioniert in Browser UND
|
||||
OrcaSlicer-Webview.
|
||||
- **Dropdowns unlesbar (weiß auf weiß) im OrcaSlicer-Webview:** `color-scheme` +
|
||||
explizite `select`/`option`-Farben ergänzt, damit die nativen Dropdowns in
|
||||
Hell- und Dunkel-Theme korrekt dargestellt werden.
|
||||
- **„Select slots"-Button tat direkt nach Upload nichts:** eine fehlende
|
||||
Variablen-Deklaration (`storeFiles`) warf einen `ReferenceError`, wenn vor dem
|
||||
Laden des Browser-Tabs geklickt wurde. Behoben.
|
||||
- **Upload-Banner kam nach abgeschlossenem Druck zurück:** der „file ready"-Status
|
||||
wurde nur bei Stop/Abbruch geleert, nicht bei `finished`. Jetzt auch nach
|
||||
erfolgreichem Druckende geleert.
|
||||
|
||||
## [0.9.14] – 2026-05-21
|
||||
|
||||
### Neu
|
||||
- **Theme-System (Community-Beitrag von @hirnwunde, PR #27):** Die Web-UI liegt
|
||||
jetzt in echten Dateien unter `web/themes/<name>/` (`index.html` + `style.css`
|
||||
+ `app.js`) statt im Python-Quelltext eingebettet. Theme umschalten mit
|
||||
`--ui-theme <name>`. Für Theme-Autoren gibt es eine dokumentierte Hook-Referenz
|
||||
(`web/DOC/THEME-CSS-HOOKS.md`, `THEME-JS-ID-HOOKS.md`). Das Default-Theme
|
||||
enthält die komplette aktuelle UI (ACE2, Objekte überspringen, Filament-Dialog).
|
||||
Für Nutzer keine Änderung — Binaries/Docker-Image liefern das Theme eingebettet.
|
||||
- **Neustart über API (Community-Beitrag von @gangoke, PR #28):** neuer Endpoint
|
||||
`POST /api/restart`, um die Bridge per API neu zu starten — z. B. für einen
|
||||
Neustart-Button in der Home-Assistant-Integration.
|
||||
|
||||
### Intern
|
||||
- Vereinheitlichter PyInstaller-Build (`kx-bridge.spec`) für Linux, Windows und
|
||||
Docker — bindet `web/` (Themes) ins Onefile-Binary ein, zur Laufzeit aus
|
||||
`sys._MEIPASS` gelesen. Theme-Einbettung in Linux-Binary und Windows-EXE verifiziert.
|
||||
- `data/` in `.gitignore` aufgenommen.
|
||||
|
||||
## [0.9.13] – 2026-05-20
|
||||
|
||||
============================================================
|
||||
STOPP — VOR DEM DRÜCKEN VON "UPDATE" LESEN
|
||||
============================================================
|
||||
|
||||
Der "Update"-Button ist in 0.9.11 und 0.9.12 KAPUTT.
|
||||
NICHT benutzen. Stattdessen einmalig manuell updaten —
|
||||
ab 0.9.13 funktioniert er wieder.
|
||||
|
||||
>> WINDOWS-.EXE / LINUX-BINARY-Nutzer — GEFAHR:
|
||||
Update ÜBERSCHREIBT deine kx-bridge.exe / kx-bridge mit
|
||||
einer Textdatei. Das Programm STARTET DANN NICHT MEHR
|
||||
und kann sich nicht selbst reparieren.
|
||||
--> Manuell updaten: die 0.9.13
|
||||
kx-bridge-windows.zip / kx-bridge-linux.zip von der
|
||||
Releases-Seite laden und die alte Datei ersetzen.
|
||||
Deine config/- und data/-Ordner bleiben erhalten.
|
||||
|
||||
>> DOCKER-Nutzer:
|
||||
Update führt zur Crash-Loop des Containers
|
||||
(ModuleNotFoundError: No module named '_web_assets').
|
||||
--> Manuell updaten:
|
||||
docker compose pull (oder docker compose up -d --build)
|
||||
config- + data-Volumes bleiben erhalten.
|
||||
|
||||
Ab 0.9.13 ist der In-App-Updater repariert und wieder sicher.
|
||||
============================================================
|
||||
|
||||
### Fixes
|
||||
- **Self-Update war in 0.9.11 und 0.9.12 kaputt (kritisch):** Der In-App-Updater
|
||||
ersetzte nur `kobrax_moonraker_bridge.py`. Zwei Probleme:
|
||||
- **Binary/EXE-Modus:** Er überschrieb die laufende Programmdatei
|
||||
(`sys.executable`) mit einer Python-Textdatei — übrig blieb ein nicht mehr
|
||||
startbares Programm, das sich nicht selbst reparieren kann (manueller
|
||||
Re-Download nötig).
|
||||
- **Python/Docker-Modus:** Seit 0.9.12 importiert die Hauptdatei das
|
||||
ausgelagerte `_web_assets.py` (gebündeltes Frontend), das der Updater nicht
|
||||
mitlud → `ModuleNotFoundError: No module named '_web_assets'` → Crash-Loop.
|
||||
Der Updater lädt jetzt **alle** Bridge-Module (Hauptdatei + `_web_assets.py` +
|
||||
Client + Loader) erst vollständig herunter, ersetzt sie dann atomar und
|
||||
**verweigert das Self-Update im Binary-Modus** (mit Verweis auf den manuellen
|
||||
Download).
|
||||
|
||||
## [0.9.12] – 2026-05-20
|
||||
|
||||
### Fixes
|
||||
|
||||
107
CHANGELOG.md
107
CHANGELOG.md
@@ -1,5 +1,112 @@
|
||||
# Changelog
|
||||
|
||||
## [0.9.16] – 2026-05-22
|
||||
|
||||
### New
|
||||
- **Auto-start camera on print:** new setting "Turn camera on at print start" —
|
||||
when enabled, the bridge starts the camera stream automatically when a print
|
||||
begins (works for both OrcaSlicer and the Bridge UI).
|
||||
|
||||
### Fixes
|
||||
- **Single-color print blocked by an empty AMS slot:** OrcaSlicer writes all
|
||||
configured filaments into the GCode header even when the model uses only one,
|
||||
so the bridge told the printer it needed every color — and an empty unused slot
|
||||
aborted the print. The bridge now maps only the filaments actually used by the
|
||||
GCode.
|
||||
- **Filament sync now position-accurate:** with an empty slot in the middle
|
||||
(e.g. slot 1 yellow, 2 empty, 3 red, 4 white) OrcaSlicer showed the colors
|
||||
shifted onto the wrong slots. Fixed — empty slots keep their position, and the
|
||||
sync color format follows the Happy Hare convention (RRGGBB without `#`).
|
||||
- **Slicer time + thumbnail missing after a browser reload** (or when a print was
|
||||
started directly from OrcaSlicer): both are now restored from the GCode store
|
||||
by filename instead of relying on volatile state.
|
||||
- **German translation gaps** in the ACE dryer dialog fixed.
|
||||
|
||||
### Logging
|
||||
- Repeated log lines are collapsed into a counter ("×N") instead of spamming the
|
||||
console; status-poll traffic is no longer logged at INFO.
|
||||
- New log level filter (All / Errors / Warnings), a toast on new errors, full
|
||||
tracebacks forwarded to the browser log, and a timestamped download filename.
|
||||
|
||||
## [0.9.15] – 2026-05-21
|
||||
|
||||
### Fixes (Issue #29)
|
||||
- **UI in the OrcaSlicer device tab was broken:** OrcaSlicer's embedded webview
|
||||
only loads the bare HTML and ignores external `<script>`/`<link>` tags, so after
|
||||
the v0.9.14 theme split none of the buttons worked in the device tab. The
|
||||
bridge now inlines CSS + JS into the page — works in both the browser and the
|
||||
OrcaSlicer webview.
|
||||
- **Dropdowns unreadable (white-on-white) in the OrcaSlicer webview:** added
|
||||
`color-scheme` + explicit `select`/`option` colors so the native dropdowns
|
||||
render correctly in dark and light theme.
|
||||
- **"Select slots" button did nothing right after an upload:** a missing variable
|
||||
declaration (`storeFiles`) threw a `ReferenceError` when clicked before the
|
||||
Browser tab had loaded. Fixed.
|
||||
- **Upload banner came back after a finished print:** the "file ready" state was
|
||||
only cleared on stop/cancel, not on `finished`. Now cleared on completion too.
|
||||
|
||||
## [0.9.14] – 2026-05-21
|
||||
|
||||
### New
|
||||
- **Theme system (community contribution by @hirnwunde, PR #27):** the web UI now
|
||||
lives in real files under `web/themes/<name>/` (`index.html` + `style.css` +
|
||||
`app.js`) instead of being embedded in the Python source. Switch themes with
|
||||
`--ui-theme <name>`. Theme authors get a documented hook reference
|
||||
(`web/DOC/THEME-CSS-HOOKS.md`, `THEME-JS-ID-HOOKS.md`). The default theme
|
||||
carries the full current UI (ACE2, skip objects, filament dialog). No change
|
||||
for users — the bundled binaries/Docker image ship the theme embedded.
|
||||
- **Restart over API (community contribution by @gangoke, PR #28):** new
|
||||
`POST /api/restart` endpoint to restart the bridge remotely — e.g. a restart
|
||||
button in the Home Assistant integration.
|
||||
|
||||
### Internal
|
||||
- Unified PyInstaller build (`kx-bridge.spec`) for Linux, Windows and Docker —
|
||||
embeds `web/` (themes) into the one-file binary, read at runtime from
|
||||
`sys._MEIPASS`. Verified the theme ships in the Linux binary and the Windows EXE.
|
||||
- `data/` added to `.gitignore`.
|
||||
|
||||
## [0.9.13] – 2026-05-20
|
||||
|
||||
============================================================
|
||||
STOP — READ THIS BEFORE PRESSING "UPDATE"
|
||||
============================================================
|
||||
|
||||
The in-app "Update" button is BROKEN in 0.9.11 and 0.9.12.
|
||||
Do NOT use it. Update manually instead (one time), then it
|
||||
works again from 0.9.13 onward.
|
||||
|
||||
>> WINDOWS .EXE / LINUX BINARY users — DANGER:
|
||||
Pressing Update OVERWRITES your kx-bridge.exe / kx-bridge
|
||||
with a text file. The program will NOT start anymore.
|
||||
It cannot repair itself.
|
||||
--> Update manually: download the 0.9.13
|
||||
kx-bridge-windows.zip / kx-bridge-linux.zip from the
|
||||
Releases page and replace your old file.
|
||||
Your config/ and data/ folders are kept.
|
||||
|
||||
>> DOCKER users:
|
||||
Pressing Update makes the container crash-loop
|
||||
(ModuleNotFoundError: No module named '_web_assets').
|
||||
--> Update manually:
|
||||
docker compose pull (or docker compose up -d --build)
|
||||
Your config + data volumes are kept.
|
||||
|
||||
From 0.9.13 on, the in-app updater is fixed and safe again.
|
||||
============================================================
|
||||
|
||||
### Fixes
|
||||
- **Self-update was broken in 0.9.11 and 0.9.12 (critical):** the in-app updater
|
||||
only replaced `kobrax_moonraker_bridge.py`. Two problems:
|
||||
- **Binary/EXE mode:** it overwrote the running executable (`sys.executable`)
|
||||
with a Python text file, leaving an unstartable program that can't recover
|
||||
itself — manual re-download required.
|
||||
- **Python/Docker mode:** since 0.9.12 the main file imports the extracted
|
||||
`_web_assets.py` (bundled frontend), which the updater didn't fetch →
|
||||
`ModuleNotFoundError: No module named '_web_assets'` → crash loop.
|
||||
The updater now downloads **all** bridge modules (main file + `_web_assets.py`
|
||||
+ client + loaders) fully, then swaps them atomically, and **refuses to
|
||||
self-update in binary mode** (pointing you to the manual download instead).
|
||||
|
||||
## [0.9.12] – 2026-05-20
|
||||
|
||||
### Fixes
|
||||
|
||||
@@ -6,7 +6,7 @@ COPY requirements.txt .
|
||||
RUN pip install --no-cache-dir -r requirements.txt
|
||||
|
||||
COPY kobrax_moonraker_bridge.py .
|
||||
COPY _web_assets.py .
|
||||
COPY web/ ./web/
|
||||
COPY config_loader.py .
|
||||
COPY env_loader.py .
|
||||
COPY kobrax_client.py .
|
||||
|
||||
@@ -59,6 +59,7 @@ def _load_config_file(path: pathlib.Path):
|
||||
"DEVICE_ID": (CONFIG_SECTION_CONNECTION, "device_id"),
|
||||
"DEFAULT_AMS_SLOT": (CONFIG_SECTION_PRINT, "default_ams_slot"),
|
||||
"AUTO_LEVELING": (CONFIG_SECTION_PRINT, "auto_leveling"),
|
||||
"CAMERA_ON_PRINT": (CONFIG_SECTION_PRINT, "camera_on_print"),
|
||||
"BRIDGE_PRINTER_NAME": (CONFIG_SECTION_BRIDGE, "printer_name"),
|
||||
}
|
||||
for env_key, (section, option) in mapping.items():
|
||||
@@ -95,6 +96,7 @@ def migrate_env_to_config(env_path: pathlib.Path, config_path: pathlib.Path):
|
||||
cfg[CONFIG_SECTION_PRINT] = {
|
||||
"default_ams_slot": env_vals.get("DEFAULT_AMS_SLOT", "auto"),
|
||||
"auto_leveling": env_vals.get("AUTO_LEVELING", "1"),
|
||||
"camera_on_print": env_vals.get("CAMERA_ON_PRINT", "0"),
|
||||
}
|
||||
cfg[CONFIG_SECTION_BRIDGE] = {
|
||||
"poll_interval": "3",
|
||||
@@ -175,3 +177,4 @@ 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"))
|
||||
CAMERA_ON_PRINT = int(get("CAMERA_ON_PRINT","0"))
|
||||
|
||||
@@ -371,9 +371,12 @@ 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")
|
||||
# Status-Poll-TX (query/getInfo) ist reines Rauschen (alle paar Sekunden) →
|
||||
# auf DEBUG. Aktions-TX (start/set/control/move/…) bleibt INFO sichtbar.
|
||||
_tx_level = logging.DEBUG if action in ("query", "getInfo") else logging.INFO
|
||||
log.log(_tx_level, "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))
|
||||
|
||||
@@ -44,12 +44,15 @@ import sys
|
||||
import tempfile
|
||||
import time
|
||||
import threading
|
||||
import html
|
||||
|
||||
# Bei PyInstaller-Binary liegt alles neben sys.executable, sonst neben __file__
|
||||
_BASE = os.path.dirname(sys.executable) if getattr(sys, "frozen", False) else os.path.dirname(os.path.abspath(__file__))
|
||||
sys.path.insert(0, _BASE)
|
||||
# Read-Only Web-Assets (Themes) werden im Onefile-Binary via --add-data unter
|
||||
# sys._MEIPASS entpackt; im Script-/Docker-Modus liegen sie neben dieser Datei.
|
||||
_WEB_BASE = getattr(sys, "_MEIPASS", _BASE)
|
||||
from kobrax_client import KobraXClient
|
||||
from _web_assets import INDEX_HTML
|
||||
|
||||
|
||||
try:
|
||||
@@ -130,6 +133,14 @@ logging.basicConfig(level=logging.INFO,
|
||||
datefmt="%H:%M:%S")
|
||||
log = logging.getLogger("bridge")
|
||||
|
||||
# Web-UI: Unterverzeichnis unter web/themes/<name>/index.html
|
||||
_UI_THEME_NAME_RE = re.compile(r"^[a-zA-Z0-9][a-zA-Z0-9_-]{0,63}$")
|
||||
# Erlaubte statische Theme-Dateien unter /kx/ui/<name>
|
||||
_KX_UI_ASSETS: dict[str, str] = {
|
||||
"style.css": "text/css",
|
||||
"app.js": "application/javascript",
|
||||
}
|
||||
|
||||
# Ring-Buffer für Browser-Log-Stream (letzte 200 Einträge)
|
||||
import collections as _collections
|
||||
_log_buffer: "_collections.deque[dict]" = _collections.deque(maxlen=500)
|
||||
@@ -140,11 +151,19 @@ class _BrowserLogHandler(logging.Handler):
|
||||
_fmt = logging.Formatter(datefmt="%H:%M:%S")
|
||||
|
||||
def emit(self, record: logging.LogRecord):
|
||||
msg = record.getMessage()
|
||||
# Exceptions mit Traceback in den Browser durchreichen (sonst sieht der
|
||||
# Nutzer nur "Fehler: X" ohne Kontext).
|
||||
if record.exc_info:
|
||||
try:
|
||||
msg += "\n" + self._fmt.formatException(record.exc_info)
|
||||
except Exception:
|
||||
pass
|
||||
entry = {
|
||||
"ts": self._fmt.formatTime(record, "%H:%M:%S"),
|
||||
"lvl": record.levelname,
|
||||
"name": record.name,
|
||||
"msg": record.getMessage(),
|
||||
"msg": msg,
|
||||
}
|
||||
_log_buffer.append(entry)
|
||||
for q in list(_log_sse_queues):
|
||||
@@ -543,6 +562,7 @@ class KobraXBridge:
|
||||
self._store = store if store is not None else GCodeStore(args.data_dir)
|
||||
self._serve_dir_path: str = self._store._gcode_dir
|
||||
self._current_job_id: str = ""
|
||||
self._camera_autostarted: bool = False
|
||||
|
||||
self._thumbnail_b64: str = ""
|
||||
self._ace_dry_presets: dict[str, dict] = self._load_ace_dry_presets_config()
|
||||
@@ -550,6 +570,15 @@ class KobraXBridge:
|
||||
# Part-Skip: zuletzt vom Drucker gemeldete Skip-Liste (v0.9.10)
|
||||
self._skip_state: dict = {"objects": [], "skipped": [], "ts": 0}
|
||||
|
||||
# Theme-Name prüfen (keine Sonderzeichen oder Umlaute)
|
||||
raw_theme = (getattr(args, "ui_theme", None) or "default").strip()
|
||||
if not _UI_THEME_NAME_RE.match(raw_theme):
|
||||
log.warning("Ungültiger UI-Theme-Name %r – nutze default", raw_theme)
|
||||
raw_theme = "default"
|
||||
self._ui_theme = raw_theme
|
||||
self._index_tpl_cache: str | None = None
|
||||
self._index_tpl_cache_key: tuple[str, float] | None = None
|
||||
|
||||
# Register MQTT push callbacks
|
||||
client.callbacks["tempature/report"] = self._on_temp
|
||||
client.callbacks["print/report"] = self._on_print
|
||||
@@ -645,6 +674,20 @@ class KobraXBridge:
|
||||
if kobra_state:
|
||||
self._state["kobra_state"] = kobra_state
|
||||
|
||||
# Kamera bei Druckstart automatisch einschalten (Settings-Option).
|
||||
# Zentral hier, damit es alle Druck-Startwege abdeckt (OrcaSlicer + UI).
|
||||
# _camera_autostarted verhindert Mehrfach-Trigger pro Druck.
|
||||
if kobra_state == "printing":
|
||||
if getattr(self._args, "camera_on_print", 0) and not getattr(self, "_camera_autostarted", False):
|
||||
self._camera_autostarted = True
|
||||
try:
|
||||
self.client.start_camera()
|
||||
log.info("Kamera bei Druckstart automatisch eingeschaltet")
|
||||
except Exception as e:
|
||||
log.warning(f"Kamera-Autostart fehlgeschlagen: {e}")
|
||||
elif kobra_state in ("free", "finished", "stoped", "canceled"):
|
||||
self._camera_autostarted = False
|
||||
|
||||
# Job-History: Druckstart erkennen
|
||||
if kobra_state == "printing" and not self._current_job_id:
|
||||
filename = d.get("filename", self._state.get("filename", ""))
|
||||
@@ -667,6 +710,11 @@ class KobraXBridge:
|
||||
log.info(f"Job abgebrochen: {self._current_job_id}")
|
||||
self._current_job_id = ""
|
||||
|
||||
# Nach Druckende das Upload-Banner verschwinden lassen (Issue #29): der
|
||||
# Drucker meldet "finished" nach erfolgreichem Druck — file_ready wurde
|
||||
# bisher nur bei stoped/canceled geleert, dadurch kam das Banner zurück.
|
||||
if kobra_state == "finished":
|
||||
self._state["file_ready"] = ""
|
||||
if kobra_state in ("stoped", "canceled"):
|
||||
self._state["progress"] = 0.0
|
||||
self._state["filename"] = ""
|
||||
@@ -708,6 +756,22 @@ class KobraXBridge:
|
||||
if kobra_state:
|
||||
self._state["print_state"] = KOBRA_TO_KLIPPER_STATE.get(kobra_state, "standby")
|
||||
self._state["kobra_state"] = kobra_state
|
||||
# Upload-Banner nach Druckende ausblenden (Issue #29) – der State kommt
|
||||
# je nach Drucker auch über info/report (project.state), nicht nur print/report.
|
||||
if kobra_state in ("finished", "stoped", "canceled"):
|
||||
self._state["file_ready"] = ""
|
||||
# Kamera-Autostart auch hier (OrcaSlicer meldet Start oft via info/report).
|
||||
# _camera_autostarted-Guard verhindert Doppel-Start mit _on_print.
|
||||
if kobra_state == "printing":
|
||||
if getattr(self._args, "camera_on_print", 0) and not getattr(self, "_camera_autostarted", False):
|
||||
self._camera_autostarted = True
|
||||
try:
|
||||
self.client.start_camera()
|
||||
log.info("Kamera bei Druckstart automatisch eingeschaltet")
|
||||
except Exception as e:
|
||||
log.warning(f"Kamera-Autostart fehlgeschlagen: {e}")
|
||||
elif kobra_state in ("free", "finished", "stoped", "canceled"):
|
||||
self._camera_autostarted = False
|
||||
if project:
|
||||
if "filename" in project:
|
||||
self._state["filename"] = project["filename"]
|
||||
@@ -1200,49 +1264,61 @@ class KobraXBridge:
|
||||
}
|
||||
|
||||
def _build_lane_data(self) -> dict:
|
||||
"""Build lane_data for filament sync from loaded, printable slots only.
|
||||
"""Baut BBL-AMS-JSON für OrcaSlicer DevFilaSystemParser::ParseV1_0.
|
||||
|
||||
Slots are compacted in sync order (installed slots first) so Orca/Happy
|
||||
Hare does not infer empty gaps between tray ids.
|
||||
POSITIONSTREU: jeder physische Slot behält seine Position (tray id =
|
||||
Slot-Position). Leere Slots werden als Platzhalter-Tray gemeldet, NICHT
|
||||
weggefiltert/komprimiert — sonst rutschen die Farben auf falsche Positionen
|
||||
(z.B. Slot 1=gelb, 2=leer, 3=rot → rot dürfte nicht auf Position 2 landen).
|
||||
"""
|
||||
loaded_slots = self._loaded_slots_for_print()
|
||||
if not loaded_slots:
|
||||
slots = self._ams_slots
|
||||
total = len(slots)
|
||||
if total == 0:
|
||||
return {"ams": [], "ams_exist_bits": "0", "tray_exist_bits": "0"}
|
||||
|
||||
ams_buckets: dict[int, list[tuple[int, dict]]] = {}
|
||||
tray_exist_bits = 0
|
||||
|
||||
for sync_index, (_global_index, slot) in enumerate(sorted(loaded_slots, key=lambda item: item[0])):
|
||||
ams_id = sync_index // 4
|
||||
slot_id = sync_index % 4
|
||||
tray_exist_bits |= (1 << sync_index)
|
||||
ams_buckets.setdefault(ams_id, []).append((slot_id, slot))
|
||||
|
||||
ams_count = (total + 3) // 4
|
||||
ams_exist_bits = 0
|
||||
tray_exist_bits = 0
|
||||
ams_array = []
|
||||
for ams_id in sorted(ams_buckets.keys()):
|
||||
|
||||
for ams_id in range(ams_count):
|
||||
ams_exist_bits |= (1 << ams_id)
|
||||
tray_array = []
|
||||
for slot_id, slot in sorted(ams_buckets[ams_id], key=lambda item: item[0]):
|
||||
color_raw = slot.get("color", [255, 255, 255])
|
||||
if isinstance(color_raw, list) and len(color_raw) >= 3:
|
||||
color_hex = "{:02X}{:02X}{:02X}FF".format(
|
||||
int(color_raw[0]), int(color_raw[1]), int(color_raw[2])
|
||||
)
|
||||
elif isinstance(color_raw, str) and len(color_raw) >= 6:
|
||||
color_hex = color_raw[:6].upper() + "FF"
|
||||
else:
|
||||
color_hex = "FFFFFFFF"
|
||||
max_slot = min(3, total - ams_id * 4 - 1)
|
||||
for slot_id in range(max_slot + 1):
|
||||
slot_index = ams_id * 4 + slot_id
|
||||
slot = slots[slot_index] if slot_index < total else {}
|
||||
occupied = slot.get("status") == 5
|
||||
|
||||
material = slot.get("type", "PLA").upper()
|
||||
tray_info_idx = self._TRAY_INFO_IDX.get(material, "OGFL99")
|
||||
tray_array.append({
|
||||
"id": str(slot_id),
|
||||
"tag_uid": "0000000000000000",
|
||||
"tray_info_idx": tray_info_idx,
|
||||
"tray_type": material,
|
||||
"tray_color": color_hex,
|
||||
})
|
||||
if occupied:
|
||||
tray_exist_bits |= (1 << slot_index)
|
||||
color_raw = slot.get("color", [255, 255, 255])
|
||||
if isinstance(color_raw, list) and len(color_raw) >= 3:
|
||||
color_hex = "{:02X}{:02X}{:02X}FF".format(
|
||||
int(color_raw[0]), int(color_raw[1]), int(color_raw[2])
|
||||
)
|
||||
elif isinstance(color_raw, str) and len(color_raw) >= 6:
|
||||
color_hex = color_raw[:6].upper() + "FF"
|
||||
else:
|
||||
color_hex = "FFFFFFFF"
|
||||
material = slot.get("type", "PLA").upper()
|
||||
tray_info_idx = self._TRAY_INFO_IDX.get(material, "OGFL99")
|
||||
tray_array.append({
|
||||
"id": str(slot_id),
|
||||
"tag_uid": "0000000000000000",
|
||||
"tray_info_idx": tray_info_idx,
|
||||
"tray_type": material,
|
||||
"tray_color": color_hex,
|
||||
})
|
||||
else:
|
||||
tray_array.append({
|
||||
"id": str(slot_id),
|
||||
"tag_uid": "0000000000000000",
|
||||
"tray_info_idx": "",
|
||||
"tray_type": "",
|
||||
"tray_color": "00000000",
|
||||
"tray_slot_placeholder": "1",
|
||||
})
|
||||
|
||||
ams_array.append({"id": str(ams_id), "info": "0002", "tray": tray_array})
|
||||
|
||||
@@ -1274,24 +1350,34 @@ class KobraXBridge:
|
||||
self.ws_clients -= dead
|
||||
|
||||
def _build_mmu_object(self) -> dict:
|
||||
loaded_slots = sorted(self._loaded_slots_for_print(), key=lambda item: item[0])
|
||||
if not loaded_slots:
|
||||
# POSITIONSTREU: ein Gate je physischem Slot, in Reihenfolge. Leere Slots
|
||||
# bekommen gate_status=0 (statt weggelassen zu werden) – sonst rutschen die
|
||||
# Farben in OrcaSlicer auf falsche Gates (Slot 1=gelb, 2=leer, 3=rot →
|
||||
# rot darf nicht auf Gate 1 landen). gate_status 0=leer, 1=verfügbar.
|
||||
slots = sorted(
|
||||
((int(s.get("global_index", i)), s) for i, s in enumerate(self._ams_slots)),
|
||||
key=lambda item: item[0],
|
||||
)
|
||||
if not slots:
|
||||
return {}
|
||||
|
||||
_TEMP = {"PLA": 210, "PETG": 230, "ABS": 240, "ASA": 250,
|
||||
"TPU": 220, "PA": 260, "PC": 270, "HIPS": 220}
|
||||
num_gates = len(loaded_slots)
|
||||
num_gates = len(slots)
|
||||
gate_status, gate_material, gate_color, gate_temperature, gate_color_rgb = [], [], [], [], []
|
||||
for _global_index, slot in loaded_slots:
|
||||
gate_status.append(1)
|
||||
material = slot.get("type", "PLA").upper()
|
||||
for _global_index, slot in slots:
|
||||
occupied = slot.get("status") == 5
|
||||
gate_status.append(1 if occupied else 0)
|
||||
material = (slot.get("type") or "PLA").upper() if occupied else ""
|
||||
gate_material.append(material)
|
||||
c = slot.get("color", [0, 0, 0])
|
||||
gate_color.append("#{:02X}{:02X}{:02X}".format(*c[:3]))
|
||||
gate_color_rgb.append([round(c[0]/255, 3), round(c[1]/255, 3), round(c[2]/255, 3)])
|
||||
gate_temperature.append(_TEMP.get(material, 210))
|
||||
c = slot.get("color", [0, 0, 0]) if occupied else [0, 0, 0]
|
||||
# Happy Hare erwartet gate_color als RRGGBB OHNE '#' (Klipper-Limitation).
|
||||
# Leerer Gate: leerer String + RGB [0,0,0].
|
||||
gate_color.append("{:02X}{:02X}{:02X}".format(*c[:3]) if occupied else "")
|
||||
gate_color_rgb.append([round(c[0]/255, 3), round(c[1]/255, 3), round(c[2]/255, 3)] if occupied else [0.0, 0.0, 0.0])
|
||||
gate_temperature.append(_TEMP.get(material, 210) if occupied else 0)
|
||||
|
||||
loaded_index_map = {global_index: idx for idx, (global_index, _) in enumerate(loaded_slots)}
|
||||
loaded_index_map = {global_index: idx for idx, (global_index, _) in enumerate(slots)}
|
||||
active_gate = loaded_index_map.get(int(self._ams_loaded_slot), -1)
|
||||
return {
|
||||
"num_gates": num_gates,
|
||||
@@ -1804,7 +1890,7 @@ class KobraXBridge:
|
||||
log.info(f"Upload+Print (print=true): {remote_filename}")
|
||||
self._state["file_ready"] = ""
|
||||
loop = asyncio.get_event_loop()
|
||||
loop.run_in_executor(None, lambda: self._start_print(remote_filename, serve_url, file_md5, file_size))
|
||||
loop.run_in_executor(None, lambda: self._start_print(remote_filename, serve_url, file_md5, file_size, gcode_filaments=gcode_filaments))
|
||||
else:
|
||||
log.info(f"Nur hochgeladen (print=false): {remote_filename}")
|
||||
self._state["file_ready"] = remote_filename
|
||||
@@ -1829,12 +1915,32 @@ class KobraXBridge:
|
||||
}
|
||||
}, status=201)
|
||||
|
||||
def _start_print(self, filename: str, url: str = "", md5: str = "", filesize: int = 0):
|
||||
def _start_print(self, filename: str, url: str = "", md5: str = "", filesize: int = 0,
|
||||
gcode_filaments: list | None = None):
|
||||
self._state["file_ready"] = ""
|
||||
loaded = self._select_loaded_slots_for_print(warn_on_empty_default=True)
|
||||
|
||||
# Nur die im GCode TATSÄCHLICH genutzten Paints auf Slots mappen. OrcaSlicer
|
||||
# schreibt im Header alle konfigurierten Filamente (filament_colour=…;…;…;…),
|
||||
# nutzt aber oft nur eines (z.B. einfarbig → nur T3). Würden wir alle
|
||||
# belegten Slots mappen, erwartet der Drucker alle Farben und blockiert,
|
||||
# wenn ein anderer (ungenutzter) Slot leer ist. Die genutzten Paint-Indizes
|
||||
# liefert _extract_filament_info via is_used (echte T<n>-Tool-Changes).
|
||||
used_paint_indices = None
|
||||
if gcode_filaments:
|
||||
used = [int(f["slot_index"]) for f in gcode_filaments
|
||||
if f.get("is_used") and "slot_index" in f]
|
||||
if used:
|
||||
used_paint_indices = set(used)
|
||||
|
||||
if used_paint_indices is not None:
|
||||
# GCode-Paint-Index N entspricht AMS-Slot N (global_index). Nur belegte
|
||||
# genutzte Slots mappen; nicht-belegte genutzte → später Warnung möglich.
|
||||
loaded = [(gidx, s) for (gidx, s) in loaded if gidx in used_paint_indices]
|
||||
|
||||
use_ams = len(loaded) > 0
|
||||
ams_box_mapping = self._build_auto_ams_box_mapping(loaded_slots=loaded)
|
||||
log.debug(f"AMS-Slots: {len(loaded)}/{len(self._ams_slots)} belegt → {[i for i, _ in loaded]}")
|
||||
log.debug(f"AMS-Slots: {len(loaded)} gemappt (genutzte Paints: {used_paint_indices}) → {[i for i, _ in loaded]}")
|
||||
auto_leveling = getattr(self._args, "auto_leveling", 1)
|
||||
payload = {
|
||||
"taskid": "-1",
|
||||
@@ -1867,6 +1973,30 @@ class KobraXBridge:
|
||||
else:
|
||||
log.warning("Druckstart: keine Antwort vom Drucker")
|
||||
|
||||
def _theme_index_path(self) -> str:
|
||||
return os.path.join(_WEB_BASE, "web", "themes", self._ui_theme, "index.html")
|
||||
|
||||
def _load_index_template_cached(self) -> str:
|
||||
path = self._theme_index_path()
|
||||
mtime = os.path.getmtime(path)
|
||||
key = (path, mtime)
|
||||
if self._index_tpl_cache is not None and self._index_tpl_cache_key == key:
|
||||
return self._index_tpl_cache
|
||||
with open(path, "r", encoding="utf-8") as f:
|
||||
self._index_tpl_cache = f.read()
|
||||
self._index_tpl_cache_key = key
|
||||
return self._index_tpl_cache
|
||||
|
||||
def _ui_asset_cache_buster(self) -> str:
|
||||
base = os.path.join(_WEB_BASE, "web", "themes", self._ui_theme)
|
||||
mt = 0.0
|
||||
for fn in ("index.html", "style.css", "app.js"):
|
||||
try:
|
||||
mt = max(mt, os.path.getmtime(os.path.join(base, fn)))
|
||||
except OSError:
|
||||
pass
|
||||
return str(int(mt)) if mt else "0"
|
||||
|
||||
async def handle_print_start(self, request):
|
||||
try:
|
||||
body = await request.json()
|
||||
@@ -1974,11 +2104,61 @@ class KobraXBridge:
|
||||
"text": "OctoPrint (Kobra X Bridge)",
|
||||
})
|
||||
|
||||
async def handle_kx_ui_asset(self, request):
|
||||
name = request.match_info.get("name", "")
|
||||
ctype = _KX_UI_ASSETS.get(name)
|
||||
if ctype is None:
|
||||
raise web.HTTPNotFound()
|
||||
path = os.path.join(_WEB_BASE, "web", "themes", self._ui_theme, name)
|
||||
try:
|
||||
raw = pathlib.Path(path).read_text(encoding="utf-8")
|
||||
except OSError:
|
||||
raise web.HTTPNotFound()
|
||||
if name == "app.js":
|
||||
raw = raw.replace("'__VERSION__'", f"'{self._read_version()}'")
|
||||
return web.Response(
|
||||
text=raw,
|
||||
content_type=ctype,
|
||||
headers={"Cache-Control": "public, max-age=86400"},
|
||||
)
|
||||
|
||||
async def handle_index(self, request):
|
||||
html = INDEX_HTML
|
||||
version = self._read_version()
|
||||
html = html.replace("'__VERSION__'", f"'{version}'")
|
||||
return web.Response(text=html, content_type="text/html",
|
||||
try:
|
||||
tpl = self._load_index_template_cached()
|
||||
except OSError:
|
||||
p = self._theme_index_path()
|
||||
log.error("Web-UI Theme-Datei fehlt oder nicht lesbar: %s (Theme: %s)", p, self._ui_theme)
|
||||
return web.Response(
|
||||
text="<pre>KX-Bridge: index.html nicht gefunden.\nErwartet:\n"
|
||||
+ html.escape(p, quote=True)
|
||||
+ "</pre>",
|
||||
status=500,
|
||||
content_type="text/html; charset=utf-8",
|
||||
)
|
||||
page = tpl.replace("__UI_ASSETS_VER__", self._ui_asset_cache_buster())
|
||||
|
||||
# CSS + JS INLINE einbetten statt nur zu verlinken. OrcaSlicers
|
||||
# eingebetteter Device-Tab-Webview lädt externe <link>/<script src>
|
||||
# NICHT (nur das nackte HTML) → ohne Inlining funktioniert dort kein
|
||||
# einziger Button (Issue #29). Im normalen Browser ist es ebenso korrekt.
|
||||
base = os.path.join(_WEB_BASE, "web", "themes", self._ui_theme)
|
||||
try:
|
||||
css = pathlib.Path(os.path.join(base, "style.css")).read_text(encoding="utf-8")
|
||||
page = page.replace(
|
||||
'<link rel="stylesheet" href="/kx/ui/style.css">',
|
||||
"<style>\n" + css + "\n</style>")
|
||||
except OSError:
|
||||
pass
|
||||
try:
|
||||
js = pathlib.Path(os.path.join(base, "app.js")).read_text(encoding="utf-8")
|
||||
js = js.replace("'__VERSION__'", f"'{self._read_version()}'")
|
||||
page = page.replace(
|
||||
'<script src="/kx/ui/app.js"></script>',
|
||||
"<script>\n" + js + "\n</script>")
|
||||
except OSError:
|
||||
pass
|
||||
|
||||
return web.Response(text=page, content_type="text/html",
|
||||
headers={"Cache-Control": "no-store, no-cache, must-revalidate"})
|
||||
|
||||
async def handle_api_light(self, request):
|
||||
@@ -2033,6 +2213,12 @@ class KobraXBridge:
|
||||
log.info("Manuell getrennt")
|
||||
return web.json_response({"result": "disconnected"})
|
||||
|
||||
async def handle_api_restart(self, request):
|
||||
log.info("Neustart über API angefordert")
|
||||
response = web.json_response({"status": "restarting"})
|
||||
asyncio.get_event_loop().call_later(0.3, self._restart_bridge)
|
||||
return response
|
||||
|
||||
async def handle_api_speed(self, request):
|
||||
try:
|
||||
body = await request.json()
|
||||
@@ -2429,6 +2615,23 @@ class KobraXBridge:
|
||||
|
||||
async def handle_api_state(self, request):
|
||||
s = self._state
|
||||
# Slicer-Zeit + Thumbnail sind nur flüchtig im State (werden beim Upload
|
||||
# gesetzt). Nach Browser-Reload oder bei OrcaSlicer-Direktdruck (Datei kam
|
||||
# nicht über den UI-Upload) fehlen sie → aus dem GCode-Store anhand des
|
||||
# laufenden Dateinamens nachladen.
|
||||
slicer_time = s["slicer_time"]
|
||||
thumbnail = self._thumbnail_b64
|
||||
fname = s.get("filename", "")
|
||||
if fname and (not slicer_time or not thumbnail):
|
||||
try:
|
||||
gf = self._store.get_file_by_name(fname)
|
||||
if gf:
|
||||
if not slicer_time and gf.get("est_print_time_sec"):
|
||||
slicer_time = int(gf["est_print_time_sec"])
|
||||
if not thumbnail and gf.get("thumbnail_b64"):
|
||||
thumbnail = gf["thumbnail_b64"]
|
||||
except Exception:
|
||||
pass
|
||||
return web.json_response({
|
||||
"printer_name": s["printer_name"],
|
||||
"firmware_version": s["firmware_version"],
|
||||
@@ -2444,7 +2647,7 @@ class KobraXBridge:
|
||||
"curr_layer": s["curr_layer"],
|
||||
"total_layers": s["total_layers"],
|
||||
"filename": s["filename"],
|
||||
"slicer_time": s["slicer_time"],
|
||||
"slicer_time": slicer_time,
|
||||
"camera_url": s["camera_url"],
|
||||
"fan_speed": s["fan_speed"],
|
||||
"print_speed_mode": s["print_speed_mode"],
|
||||
@@ -2457,7 +2660,7 @@ class KobraXBridge:
|
||||
"ace_units": list(self._ace_box_ids),
|
||||
"ace_auto_feed": dict(self._ace_auto_feed),
|
||||
"ace_dry_presets": self._ace_dry_presets,
|
||||
"thumbnail": self._thumbnail_b64,
|
||||
"thumbnail": thumbnail,
|
||||
"connection_error": s["connection_error"],
|
||||
"file_ready": s["file_ready"],
|
||||
"version": self._read_version(),
|
||||
@@ -2539,6 +2742,7 @@ class KobraXBridge:
|
||||
"device_id": self._args.device_id,
|
||||
"default_ams_slot": getattr(self._args, "default_ams_slot", "auto"),
|
||||
"auto_leveling": getattr(self._args, "auto_leveling", 1),
|
||||
"camera_on_print": getattr(self._args, "camera_on_print", 0),
|
||||
"ace_dry_presets": self._ace_dry_presets,
|
||||
})
|
||||
|
||||
@@ -2567,6 +2771,7 @@ class KobraXBridge:
|
||||
cfg.set("connection", "device_id", str(data.get("device_id", self._args.device_id or "")))
|
||||
cfg.set("print", "default_ams_slot", str(data.get("default_ams_slot", getattr(self._args, "default_ams_slot", "auto"))))
|
||||
cfg.set("print", "auto_leveling", str(data.get("auto_leveling", getattr(self._args, "auto_leveling", 1))))
|
||||
cfg.set("print", "camera_on_print", str(int(bool(data.get("camera_on_print", getattr(self._args, "camera_on_print", 0))))))
|
||||
if not cfg.has_option("bridge", "poll_interval"):
|
||||
cfg.set("bridge", "poll_interval", "3")
|
||||
printer_name = str(data.get("printer_name", "")).strip()
|
||||
@@ -2831,12 +3036,15 @@ class KobraXBridge:
|
||||
|
||||
async def handle_api_log_download(self, request):
|
||||
"""Gibt alle gepufferten Log-Einträge als Plaintext zum Download."""
|
||||
lines = [f"[{e['ts']}] {e['lvl']:<5} {e['name']}: {e['msg']}" for e in _log_buffer]
|
||||
text = "\n".join(lines)
|
||||
header = (f"# KX-Bridge Log | Version {self._read_version()} | "
|
||||
f"{time.strftime('%Y-%m-%d %H:%M:%S')} | {len(_log_buffer)} Einträge\n")
|
||||
lines = [f"[{e['ts']}] {e['lvl']:<7} {e['name']}: {e['msg']}" for e in _log_buffer]
|
||||
text = header + "\n".join(lines) + "\n"
|
||||
fname = f"kx-bridge-log_{time.strftime('%Y%m%d-%H%M%S')}.txt"
|
||||
return web.Response(
|
||||
body=text.encode("utf-8"),
|
||||
content_type="text/plain",
|
||||
headers={"Content-Disposition": 'attachment; filename="kx-bridge.log"'},
|
||||
headers={"Content-Disposition": f'attachment; filename="{fname}"'},
|
||||
)
|
||||
|
||||
async def handle_api_update_check(self, request):
|
||||
@@ -2877,26 +3085,52 @@ class KobraXBridge:
|
||||
except Exception as e:
|
||||
return web.json_response({"error": str(e)}, status=502)
|
||||
|
||||
# Bridge-Python-Module, die das Self-Update mitziehen muss. Wird nur die
|
||||
# Hauptdatei ersetzt, crasht die neue Version ggf. mit ModuleNotFoundError.
|
||||
# Hinweis: das Frontend liegt seit dem Theme-System unter web/themes/<name>/
|
||||
# (keine flache .py mehr); Theme-Dateien werden vom Self-Update derzeit NICHT
|
||||
# mitgeladen – Theme-Änderungen kommen über Docker-Image/Binary-Update.
|
||||
_UPDATE_FILES = [
|
||||
"kobrax_moonraker_bridge.py",
|
||||
"kobrax_client.py",
|
||||
"config_loader.py",
|
||||
"env_loader.py",
|
||||
]
|
||||
|
||||
async def handle_api_update_apply(self, request):
|
||||
data = await request.json()
|
||||
download_url = data.get("download_url", "")
|
||||
new_tag = data.get("tag", "")
|
||||
if not download_url:
|
||||
return web.json_response({"error": "download_url fehlt"}, status=400)
|
||||
script_path = pathlib.Path(sys.executable if getattr(sys, "frozen", False) else __file__).resolve()
|
||||
new_tag = data.get("tag", "")
|
||||
if getattr(sys, "frozen", False):
|
||||
return web.json_response(
|
||||
{"error": "Self-Update wird im Binary-Modus nicht unterstützt – "
|
||||
"bitte neue Binary/Docker-Image laden."}, status=400)
|
||||
if not new_tag:
|
||||
return web.json_response({"error": "tag fehlt"}, status=400)
|
||||
|
||||
app_dir = pathlib.Path(__file__).resolve().parent
|
||||
try:
|
||||
# Phase 1: ALLE Dateien herunterladen (in .new), nichts ersetzen.
|
||||
downloaded: list[tuple[pathlib.Path, bytes]] = []
|
||||
async with aiohttp.ClientSession() as session:
|
||||
async with session.get(download_url, timeout=aiohttp.ClientTimeout(total=30)) as resp:
|
||||
if resp.status != 200:
|
||||
return web.json_response({"error": f"Download HTTP {resp.status}"}, status=502)
|
||||
content = await resp.read()
|
||||
# Atomisch ersetzen
|
||||
tmp = script_path.with_suffix(".py.new")
|
||||
tmp.write_bytes(content)
|
||||
os.replace(tmp, script_path)
|
||||
if new_tag:
|
||||
self._write_version(new_tag.lstrip("v"))
|
||||
log.info(f"Update auf {new_tag} installiert, starte neu …")
|
||||
for fname in self._UPDATE_FILES:
|
||||
url = f"{self.GITEA_RAW_BASE}/{new_tag}/{fname}"
|
||||
async with session.get(url, timeout=aiohttp.ClientTimeout(total=30)) as resp:
|
||||
if resp.status != 200:
|
||||
# _web_assets.py o.ä. existiert evtl. in älteren Tags nicht –
|
||||
# Hauptdatei ist Pflicht, optionale dürfen fehlen.
|
||||
if fname == "kobrax_moonraker_bridge.py":
|
||||
return web.json_response(
|
||||
{"error": f"Download {fname}: HTTP {resp.status}"}, status=502)
|
||||
log.warning(f"Update: {fname} nicht im Release ({resp.status}) – übersprungen")
|
||||
continue
|
||||
downloaded.append((app_dir / fname, await resp.read()))
|
||||
# Phase 2: atomar ersetzen (erst nach komplettem, erfolgreichem Download)
|
||||
for path, content in downloaded:
|
||||
tmp = path.with_suffix(path.suffix + ".new")
|
||||
tmp.write_bytes(content)
|
||||
os.replace(tmp, path)
|
||||
self._write_version(new_tag.lstrip("v"))
|
||||
log.info(f"Update auf {new_tag} installiert ({len(downloaded)} Dateien), starte neu …")
|
||||
except Exception as e:
|
||||
return web.json_response({"error": str(e)}, status=502)
|
||||
response = web.json_response({"status": "updating"})
|
||||
@@ -3188,6 +3422,7 @@ def build_app(bridge: KobraXBridge) -> web.Application:
|
||||
r.add_post("/api/fan", bridge.handle_api_fan)
|
||||
r.add_post("/api/connect", bridge.handle_api_connect)
|
||||
r.add_post("/api/disconnect", bridge.handle_api_disconnect)
|
||||
r.add_post("/api/restart", bridge.handle_api_restart)
|
||||
r.add_post("/api/speed", bridge.handle_api_speed)
|
||||
r.add_post("/api/ams/feed", bridge.handle_api_ams_feed)
|
||||
r.add_post("/api/ams/set_slot", bridge.handle_api_ams_set_slot)
|
||||
@@ -3218,6 +3453,7 @@ def build_app(bridge: KobraXBridge) -> web.Application:
|
||||
r.add_delete("/kx/files/{file_id}", bridge.handle_kx_file_delete)
|
||||
r.add_get("/kx/filament/slots", bridge.handle_kx_filament_slots)
|
||||
r.add_get("/kx/history", bridge.handle_kx_history)
|
||||
r.add_get("/kx/ui/{name}", bridge.handle_kx_ui_asset)
|
||||
r.add_get("/kx/files/{id}/objects", bridge.handle_kx_file_objects)
|
||||
r.add_post("/kx/skip", bridge.handle_kx_skip)
|
||||
r.add_post("/kx/skip/query", bridge.handle_kx_skip_query)
|
||||
@@ -3380,6 +3616,7 @@ def main():
|
||||
parser.add_argument("--device-id", default=env_loader.DEVICE_ID)
|
||||
parser.add_argument("--default-ams-slot",default=env_loader.DEFAULT_AMS_SLOT)
|
||||
parser.add_argument("--auto-leveling", type=int, default=env_loader.AUTO_LEVELING)
|
||||
parser.add_argument("--camera-on-print", type=int, default=env_loader.CAMERA_ON_PRINT)
|
||||
|
||||
parser.add_argument("--host", default="0.0.0.0",
|
||||
help="Bind-Adresse für den Bridge-Server")
|
||||
@@ -3387,6 +3624,13 @@ def main():
|
||||
help="HTTP/WS-Port (Moonraker-Standard: 7125)")
|
||||
parser.add_argument("--data-dir", default=_default_data_dir(),
|
||||
help="Persistenz-Verzeichnis für GCode-Store und DB")
|
||||
parser.add_argument(
|
||||
"--ui-theme",
|
||||
default=os.environ.get("KX_UI_THEME", "default"),
|
||||
metavar="NAME",
|
||||
help="Web-UI-Theme (Ordner web/themes/NAME/, Standard: default). "
|
||||
"Alternativ: Umgebungsvariable KX_UI_THEME.",
|
||||
)
|
||||
args = parser.parse_args()
|
||||
if args.printer_ip and ":" in args.printer_ip:
|
||||
args.printer_ip = args.printer_ip.split(":")[0]
|
||||
|
||||
45
kx-bridge.spec
Normal file
45
kx-bridge.spec
Normal file
@@ -0,0 +1,45 @@
|
||||
# PyInstaller-Spec für kx-bridge — plattformneutral (Linux + Windows via PyBuilder).
|
||||
# Wird relativ zum Repo-Root ausgeführt (`pyinstaller kx-bridge.spec`), wo
|
||||
# kobrax_moonraker_bridge.py und web/ flach liegen (Release-Repo-Layout).
|
||||
#
|
||||
# Bindet das Web-Theme-System (web/themes/<name>/ + web/DOC/) ins Onefile-Binary
|
||||
# ein → zur Laufzeit über sys._MEIPASS lesbar (_WEB_BASE in der Bridge).
|
||||
from PyInstaller.utils.hooks import collect_all
|
||||
|
||||
datas = [("web", "web")]
|
||||
binaries = []
|
||||
hiddenimports = []
|
||||
|
||||
# pycryptodome vollständig einsammeln (Krypto für die Drucker-Auth)
|
||||
_d, _b, _h = collect_all("pycryptodome")
|
||||
datas += _d
|
||||
binaries += _b
|
||||
hiddenimports += _h
|
||||
|
||||
a = Analysis(
|
||||
["kobrax_moonraker_bridge.py"],
|
||||
pathex=[],
|
||||
binaries=binaries,
|
||||
datas=datas,
|
||||
hiddenimports=hiddenimports,
|
||||
hookspath=[],
|
||||
runtime_hooks=[],
|
||||
excludes=[],
|
||||
noarchive=False,
|
||||
)
|
||||
pyz = PYZ(a.pure)
|
||||
|
||||
exe = EXE(
|
||||
pyz,
|
||||
a.scripts,
|
||||
a.binaries,
|
||||
a.datas,
|
||||
[],
|
||||
name="kx-bridge",
|
||||
debug=False,
|
||||
bootloader_ignore_signals=False,
|
||||
strip=False,
|
||||
upx=False,
|
||||
console=True,
|
||||
onefile=True,
|
||||
)
|
||||
136
web/DOC/THEME-CSS-HOOKS.md
Normal file
136
web/DOC/THEME-CSS-HOOKS.md
Normal file
@@ -0,0 +1,136 @@
|
||||
# KX-Bridge Theme – CSS-ID-Hooks
|
||||
|
||||
Referenzliste für CSS-/Layout-Anpassungen.
|
||||
|
||||
| ID | Verwendung |
|
||||
|---|---|
|
||||
| `#ace-dry-dialog-custom-name-label` | Hook / Selektor |
|
||||
| `#ace-dry-dialog-custom-name-row` | Hook / Selektor |
|
||||
| `#ace-dry-dialog-temp-label` | Hook / Selektor |
|
||||
| `#ace-dry-dialog-time-label` | Hook / Selektor |
|
||||
| `#ace-dry-dialog-title` | Hook / Selektor |
|
||||
| `#add-printer-btn-label` | Hook / Selektor |
|
||||
| `#ams-no-data` | Hook / Selektor |
|
||||
| `#apd-ip` | Hook / Selektor |
|
||||
| `#apd-lbl-ip` | Hook / Selektor |
|
||||
| `#apd-lbl-name` | Hook / Selektor |
|
||||
| `#apd-name` | Hook / Selektor |
|
||||
| `#apd-status` | Hook / Selektor |
|
||||
| `#apd-title` | Hook / Selektor |
|
||||
| `#btn-log-dl` | Hook / Selektor |
|
||||
| `#cam-fname` | Hook / Selektor |
|
||||
| `#cam-img` | Hook / Selektor |
|
||||
| `#cam-overlay` | Hook / Selektor |
|
||||
| `#cam-placeholder` | Hook / Selektor |
|
||||
| `#cam-placeholder-txt` | Hook / Selektor |
|
||||
| `#cam-spinner` | Hook / Selektor |
|
||||
| `#cam-wrap` | Hook / Selektor |
|
||||
| `#conn-error-banner` | Hook / Selektor |
|
||||
| `#d-ace-dry-grid` | Hook / Selektor |
|
||||
| `#d-ace-dry-wrap` | Hook / Selektor |
|
||||
| `#d-ams-card` | Hook / Selektor |
|
||||
| `#d-bt-t` | Hook / Selektor |
|
||||
| `#d-btbar` | Hook / Selektor |
|
||||
| `#d-btn-skip-label` | Hook / Selektor |
|
||||
| `#d-card-ams` | Hook / Selektor |
|
||||
| `#d-card-cam` | Hook / Selektor |
|
||||
| `#d-card-lightfan` | Hook / Selektor |
|
||||
| `#d-card-progress` | Hook / Selektor |
|
||||
| `#d-card-speed` | Hook / Selektor |
|
||||
| `#d-card-temps` | Hook / Selektor |
|
||||
| `#d-chart-label` | Hook / Selektor |
|
||||
| `#d-ctrl-btns` | Hook / Selektor |
|
||||
| `#d-elapsed` | Hook / Selektor |
|
||||
| `#d-fname` | Hook / Selektor |
|
||||
| `#d-layers` | Hook / Selektor |
|
||||
| `#d-lbl-bed` | Hook / Selektor |
|
||||
| `#d-lbl-elapsed` | Hook / Selektor |
|
||||
| `#d-lbl-layers` | Hook / Selektor |
|
||||
| `#d-lbl-light` | Hook / Selektor |
|
||||
| `#d-lbl-remain` | Hook / Selektor |
|
||||
| `#d-nt` | Hook / Selektor |
|
||||
| `#d-nt-t` | Hook / Selektor |
|
||||
| `#d-ntbar` | Hook / Selektor |
|
||||
| `#d-pbar` | Hook / Selektor |
|
||||
| `#d-pct` | Hook / Selektor |
|
||||
| `#d-remain` | Hook / Selektor |
|
||||
| `#d-slicer-label` | Hook / Selektor |
|
||||
| `#d-slicer-row` | Hook / Selektor |
|
||||
| `#d-slicer-time` | Hook / Selektor |
|
||||
| `#d-spd-bar` | Hook / Selektor |
|
||||
| `#d-spd-lbl-1` | Hook / Selektor |
|
||||
| `#d-spd-lbl-2` | Hook / Selektor |
|
||||
| `#d-spd-lbl-3` | Hook / Selektor |
|
||||
| `#d-thumbnail` | Hook / Selektor |
|
||||
| `#fd-objects` | Hook / Selektor |
|
||||
| `#fd-objects-hint` | Hook / Selektor |
|
||||
| `#fd-objects-section` | Hook / Selektor |
|
||||
| `#fd-objects-svg` | Hook / Selektor |
|
||||
| `#fd-slots-hint` | Hook / Selektor |
|
||||
| `#fd-title` | Hook / Selektor |
|
||||
| `#file-ready-banner` | Hook / Selektor |
|
||||
| `#file-ready-name` | Hook / Selektor |
|
||||
| `#h-badge` | Hook / Selektor |
|
||||
| `#h-pname` | Hook / Selektor |
|
||||
| `#h-pname-single` | Hook / Selektor |
|
||||
| `#h-state` | Hook / Selektor |
|
||||
| `#h-version` | Hook / Selektor |
|
||||
| `#lbl-auto-leveling` | Hook / Selektor |
|
||||
| `#lbl-default-slot` | Hook / Selektor |
|
||||
| `#lbl-device-id` | Hook / Selektor |
|
||||
| `#lbl-ip-hint` | Hook / Selektor |
|
||||
| `#lbl-mode-id` | Hook / Selektor |
|
||||
| `#lbl-mqtt-port` | Hook / Selektor |
|
||||
| `#lbl-password` | Hook / Selektor |
|
||||
| `#lbl-printer-ip` | Hook / Selektor |
|
||||
| `#lbl-printer-name` | Hook / Selektor |
|
||||
| `#lbl-slot-color` | Hook / Selektor |
|
||||
| `#lbl-slot-material` | Hook / Selektor |
|
||||
| `#lbl-update-apply` | Hook / Selektor |
|
||||
| `#lbl-update-check` | Hook / Selektor |
|
||||
| `#lbl-username` | Hook / Selektor |
|
||||
| `#log-badge` | Hook / Selektor |
|
||||
| `#log-badge-bot` | Hook / Selektor |
|
||||
| `#modal-sec-connection` | Hook / Selektor |
|
||||
| `#modal-sec-poll` | Hook / Selektor |
|
||||
| `#modal-sec-print` | Hook / Selektor |
|
||||
| `#modal-sec-version` | Hook / Selektor |
|
||||
| `#modal-title-settings` | Hook / Selektor |
|
||||
| `#opt-slot-0` | Hook / Selektor |
|
||||
| `#opt-slot-1` | Hook / Selektor |
|
||||
| `#opt-slot-2` | Hook / Selektor |
|
||||
| `#opt-slot-3` | Hook / Selektor |
|
||||
| `#opt-slot-auto` | Hook / Selektor |
|
||||
| `#printer-dropdown-menu` | Hook / Selektor |
|
||||
| `#printer-dropdown-wrap` | Hook / Selektor |
|
||||
| `#printers-panel-title` | Hook / Selektor |
|
||||
| `#ptitle-console` | Hook / Selektor |
|
||||
| `#ptitle-motion-xy` | Hook / Selektor |
|
||||
| `#ptitle-motion-z` | Hook / Selektor |
|
||||
| `#s-auto-leveling` | Hook / Selektor |
|
||||
| `#s-default-slot` | Hook / Selektor |
|
||||
| `#s-device-id` | Hook / Selektor |
|
||||
| `#s-mode-id` | Hook / Selektor |
|
||||
| `#s-mqtt-port` | Hook / Selektor |
|
||||
| `#s-password` | Hook / Selektor |
|
||||
| `#s-printer-name` | Hook / Selektor |
|
||||
| `#s-username` | Hook / Selektor |
|
||||
| `#s-version-label` | Hook / Selektor |
|
||||
| `#sf-all` | Hook / Selektor |
|
||||
| `#sf-err` | Hook / Selektor |
|
||||
| `#sf-new` | Hook / Selektor |
|
||||
| `#sf-ok` | Hook / Selektor |
|
||||
| `#skip-hint` | Hook / Selektor |
|
||||
| `#skip-list` | Hook / Selektor |
|
||||
| `#skip-status` | Hook / Selektor |
|
||||
| `#skip-svg` | Hook / Selektor |
|
||||
| `#skip-title` | Hook / Selektor |
|
||||
| `#slot-edit-title` | Hook / Selektor |
|
||||
| `#ss-date` | Hook / Selektor |
|
||||
| `#ss-dur` | Hook / Selektor |
|
||||
| `#ss-name` | Hook / Selektor |
|
||||
| `#step-display` | Hook / Selektor |
|
||||
| `#store-empty` | Hook / Selektor |
|
||||
| `#store-panel-title` | Hook / Selektor |
|
||||
| `#update-changelog` | Hook / Selektor |
|
||||
| `#update-status` | Hook / Selektor |
|
||||
90
web/DOC/THEME-JS-ID-HOOKS.md
Normal file
90
web/DOC/THEME-JS-ID-HOOKS.md
Normal file
@@ -0,0 +1,90 @@
|
||||
# KX-Bridge Theme – JavaScript-ID-Hooks
|
||||
|
||||
Referenzliste für JavaScript-/DOM-Hooks.
|
||||
|
||||
| ID | Verwendung |
|
||||
|---|---|
|
||||
| `#ace-dry-dialog` | Hook / Selektor |
|
||||
| `#ace-dry-dialog-cancel` | Hook / Selektor |
|
||||
| `#ace-dry-dialog-confirm` | Hook / Selektor |
|
||||
| `#ace-dry-dialog-custom-name` | Hook / Selektor |
|
||||
| `#ace-dry-dialog-h` | Hook / Selektor |
|
||||
| `#ace-dry-dialog-m` | Hook / Selektor |
|
||||
| `#ace-dry-dialog-reset-default` | Hook / Selektor |
|
||||
| `#ace-dry-dialog-s` | Hook / Selektor |
|
||||
| `#ace-dry-dialog-save-preset` | Hook / Selektor |
|
||||
| `#ace-dry-dialog-temp` | Hook / Selektor |
|
||||
| `#add-printer-dialog` | Hook / Selektor |
|
||||
| `#ams-slots` | Hook / Selektor |
|
||||
| `#apd-confirm` | Hook / Selektor |
|
||||
| `#bnb-console` | Hook / Selektor |
|
||||
| `#bnb-dashboard` | Hook / Selektor |
|
||||
| `#bnb-printers` | Hook / Selektor |
|
||||
| `#bnb-store` | Hook / Selektor |
|
||||
| `#btn-autoscroll` | Hook / Selektor |
|
||||
| `#btn-save-settings` | Hook / Selektor |
|
||||
| `#btn-slot-edit-feed` | Hook / Selektor |
|
||||
| `#btn-slot-edit-save` | Hook / Selektor |
|
||||
| `#btn-update-apply` | Hook / Selektor |
|
||||
| `#btn-update-check` | Hook / Selektor |
|
||||
| `#cam-toggle-btn` | Hook / Selektor |
|
||||
| `#conn-btn` | Hook / Selektor |
|
||||
| `#console-log` | Hook / Selektor |
|
||||
| `#d-bt` | Hook / Selektor |
|
||||
| `#d-btn-cancel` | Hook / Selektor |
|
||||
| `#d-btn-pause` | Hook / Selektor |
|
||||
| `#d-btn-resume` | Hook / Selektor |
|
||||
| `#d-btn-skip` | Hook / Selektor |
|
||||
| `#d-chart` | Hook / Selektor |
|
||||
| `#d-fan` | Hook / Selektor |
|
||||
| `#d-fan-val` | Hook / Selektor |
|
||||
| `#d-light-toggle` | Hook / Selektor |
|
||||
| `#d-spd-1` | Hook / Selektor |
|
||||
| `#d-spd-2` | Hook / Selektor |
|
||||
| `#d-spd-3` | Hook / Selektor |
|
||||
| `#fd-cancel` | Hook / Selektor |
|
||||
| `#fd-print` | Hook / Selektor |
|
||||
| `#fd-slots` | Hook / Selektor |
|
||||
| `#filament-dialog` | Hook / Selektor |
|
||||
| `#file-cancel-btn` | Hook / Selektor |
|
||||
| `#file-ready-btn` | Hook / Selektor |
|
||||
| `#file-slots-btn` | Hook / Selektor |
|
||||
| `#lang-btn` | Hook / Selektor |
|
||||
| `#log-filter` | Hook / Selektor |
|
||||
| `#logdir-all` | Hook / Selektor |
|
||||
| `#logdir-rx` | Hook / Selektor |
|
||||
| `#logdir-tx` | Hook / Selektor |
|
||||
| `#log-lbl-level` | i18n-Label "Level:" |
|
||||
| `#loglvl-all` | onclick `setLogLevel('all')` |
|
||||
| `#loglvl-err` | onclick `setLogLevel('err')` — nur Fehler |
|
||||
| `#loglvl-warn` | onclick `setLogLevel('warn')` — Fehler + Warnungen |
|
||||
| `#nb-console` | Hook / Selektor |
|
||||
| `#nb-dashboard` | Hook / Selektor |
|
||||
| `#nb-printers` | Hook / Selektor |
|
||||
| `#nb-store` | Hook / Selektor |
|
||||
| `#p-bed-inp` | Hook / Selektor |
|
||||
| `#p-nozzle-inp` | Hook / Selektor |
|
||||
| `#panel-console` | Hook / Selektor |
|
||||
| `#panel-dashboard` | Hook / Selektor |
|
||||
| `#panel-printers` | Hook / Selektor |
|
||||
| `#panel-store` | Hook / Selektor |
|
||||
| `#poll-1` | Hook / Selektor |
|
||||
| `#poll-2` | Hook / Selektor |
|
||||
| `#poll-5` | Hook / Selektor |
|
||||
| `#printer-dropdown-btn` | Hook / Selektor |
|
||||
| `#printers-grid` | Hook / Selektor |
|
||||
| `#s-printer-ip` | Hook / Selektor |
|
||||
| `#settings-btn` | Hook / Selektor |
|
||||
| `#settings-modal` | Hook / Selektor |
|
||||
| `#skip-confirm` | Hook / Selektor |
|
||||
| `#skip-dialog` | Hook / Selektor |
|
||||
| `#slot-edit-color` | Hook / Selektor |
|
||||
| `#slot-edit-mat` | Hook / Selektor |
|
||||
| `#slot-edit-modal` | Hook / Selektor |
|
||||
| `#slot-edit-preview` | Hook / Selektor |
|
||||
| `#slot-mat-btns` | Hook / Selektor |
|
||||
| `#store-filter` | Hook / Selektor |
|
||||
| `#store-grid` | Hook / Selektor |
|
||||
| `#store-refresh-btn` | Hook / Selektor |
|
||||
| `#store-search` | Hook / Selektor |
|
||||
| `#store-sort` | Hook / Selektor |
|
||||
File diff suppressed because it is too large
Load Diff
568
web/themes/default/index.html
Normal file
568
web/themes/default/index.html
Normal file
@@ -0,0 +1,568 @@
|
||||
<!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">
|
||||
<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 class="modal-field" style="flex-direction:row;align-items:center;gap:10px">
|
||||
<input type="checkbox" id="s-camera-on-print" style="width:auto;margin:0">
|
||||
<label id="lbl-camera-on-print" style="margin:0;cursor:pointer" for="s-camera-on-print">Kamera bei Druckstart einschalten</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="btn" id="btn-slot-edit-feed" style="width:100%;margin-bottom:8px" onclick="slotEditFeed()"></button>
|
||||
<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-skip btn-sm" id="d-btn-skip" onclick="openSkipDialog()" style="display:none">✂ <span id="d-btn-skip-label">Objekte</span></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>
|
||||
|
||||
<div id="d-ace-dry-wrap" style="display:none">
|
||||
<div id="d-ace-dry-grid" style="display:contents"></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">Filament</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>
|
||||
</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
|
||||
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" id="log-lbl-level">Level:</span>
|
||||
<button class="log-lvl-btn active" id="loglvl-all" onclick="setLogLevel('all')" style="font-size:11px;padding:3px 9px;border-radius:5px;border:1px solid var(--border);cursor:pointer"></button>
|
||||
<button class="log-lvl-btn" id="loglvl-err" onclick="setLogLevel('err')" style="font-size:11px;padding:3px 9px;border-radius:5px;border:1px solid var(--border);cursor:pointer">⛔ Errors</button>
|
||||
<button class="log-lvl-btn" id="loglvl-warn" onclick="setLogLevel('warn')" style="font-size:11px;padding:3px 9px;border-radius:5px;border:1px solid var(--border);cursor:pointer">⚠ Warn</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 id="fd-slots-hint" 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 id="fd-objects-section" style="display:none;margin-bottom:16px">
|
||||
<p id="fd-objects-hint" style="font-size:12px;color:var(--txt2);margin-bottom:8px">Objekte überspringen (optional):</p>
|
||||
<div id="fd-objects-svg" style="display:none;background:var(--raised);border:1px solid var(--border);border-radius:8px;padding:6px;margin-bottom:8px;text-align:center"></div>
|
||||
<div id="fd-objects" style="display:flex;flex-direction:column;gap:6px;max-height:140px;overflow-y:auto"></div>
|
||||
</div>
|
||||
<div style="display:flex;gap:8px;justify-content:flex-end">
|
||||
<button id="fd-cancel" 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 id="fd-print" 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>
|
||||
<!-- Mid-Print Skip-Dialog -->
|
||||
<div class="modal-overlay" id="skip-dialog" onclick="if(event.target===this)closeSkipDialog()">
|
||||
<div class="modal-box" style="max-width:420px;width:100%">
|
||||
<div class="modal-header" style="margin-bottom:14px">
|
||||
<span class="modal-title" id="skip-title">✂ Objekte überspringen</span>
|
||||
<button onclick="closeSkipDialog()" style="background:none;border:none;font-size:18px;cursor:pointer;color:var(--txt2)">✕</button>
|
||||
</div>
|
||||
<p id="skip-hint" style="font-size:12px;color:var(--txt2);margin-bottom:10px">Objekte abwählen, die nicht weiter gedruckt werden sollen:</p>
|
||||
<div id="skip-svg" style="display:none;background:var(--raised);border:1px solid var(--border);border-radius:8px;padding:6px;margin-bottom:10px;text-align:center"></div>
|
||||
<div id="skip-list" style="display:flex;flex-direction:column;gap:6px;max-height:200px;overflow-y:auto;margin-bottom:12px"></div>
|
||||
<div id="skip-status" style="font-size:12px;color:var(--txt2);min-height:16px;margin-bottom:8px"></div>
|
||||
<div style="display:flex;gap:8px;justify-content:flex-end">
|
||||
<button onclick="closeSkipDialog()" style="padding:8px 16px;background:var(--raised);border:1px solid var(--border);border-radius:8px;color:var(--txt);cursor:pointer">Abbrechen</button>
|
||||
<button id="skip-confirm" onclick="confirmSkip()" style="padding:8px 18px;background:var(--accent);color:#fff;border:none;border-radius:8px;cursor:pointer;font-weight:600">Überspringen</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<!-- ACE Dryer Temp/Time Settings Dialog -->
|
||||
<div class="modal-overlay" id="ace-dry-dialog" onclick="if(event.target===this)closeAceDryDialog()">
|
||||
<div class="modal-box" style="max-width:560px;width:100%">
|
||||
<div class="modal-header" style="margin-bottom:10px">
|
||||
<span class="modal-title" id="ace-dry-dialog-title">Dryer Temp/Time Settings</span>
|
||||
<button onclick="closeAceDryDialog()" style="background:none;border:none;font-size:18px;cursor:pointer;color:var(--txt2)">✕</button>
|
||||
</div>
|
||||
<div style="display:flex;align-items:center;gap:12px;margin-bottom:8px">
|
||||
<label id="ace-dry-dialog-temp-label" style="min-width:190px;font-size:12px;color:var(--txt)">Temperature (30-80°C)</label>
|
||||
<input id="ace-dry-dialog-temp" type="number" min="30" max="80" step="1"
|
||||
oninput="aceDryDialogInputsChanged()"
|
||||
style="width:130px;padding:8px;background:var(--raised);border:1px solid var(--border);border-radius:6px;color:var(--txt);text-align:center" value="45">
|
||||
</div>
|
||||
<div style="display:flex;align-items:center;gap:12px;margin-bottom:16px">
|
||||
<label id="ace-dry-dialog-time-label" style="min-width:190px;font-size:12px;color:var(--txt)">Rem. Time (h:m:s)</label>
|
||||
<div style="display:flex;align-items:center;gap:8px">
|
||||
<input id="ace-dry-dialog-h" type="number" min="0" max="24" step="1" value="4"
|
||||
oninput="aceDryDialogInputsChanged()"
|
||||
style="width:70px;padding:8px;background:var(--raised);border:1px solid var(--border);border-radius:6px;color:var(--txt);text-align:center">
|
||||
<span style="color:var(--txt2)">:</span>
|
||||
<input id="ace-dry-dialog-m" type="number" min="0" max="59" step="1" value="0"
|
||||
oninput="aceDryDialogInputsChanged()"
|
||||
style="width:70px;padding:8px;background:var(--raised);border:1px solid var(--border);border-radius:6px;color:var(--txt);text-align:center">
|
||||
<span style="color:var(--txt2)">:</span>
|
||||
<input id="ace-dry-dialog-s" type="number" min="0" max="59" step="1" value="0"
|
||||
oninput="aceDryDialogInputsChanged()"
|
||||
style="width:70px;padding:8px;background:var(--raised);border:1px solid var(--border);border-radius:6px;color:var(--txt);text-align:center">
|
||||
</div>
|
||||
</div>
|
||||
<div style="display:grid;grid-template-columns:repeat(3,1fr);gap:8px;margin-bottom:8px">
|
||||
<button class="ace-dry-preset-btn" data-preset="pla" onclick="aceDryDialogPreset('pla')" style="padding:8px;border-radius:8px;border:1px solid var(--border);background:var(--raised);color:var(--txt2);cursor:pointer">PLA</button>
|
||||
<button class="ace-dry-preset-btn" data-preset="pla_plus" onclick="aceDryDialogPreset('pla_plus')" style="padding:8px;border-radius:8px;border:1px solid var(--border);background:var(--raised);color:var(--txt2);cursor:pointer">PLA+</button>
|
||||
<button class="ace-dry-preset-btn" data-preset="petg" onclick="aceDryDialogPreset('petg')" style="padding:8px;border-radius:8px;border:1px solid var(--border);background:var(--raised);color:var(--txt2);cursor:pointer">PETG</button>
|
||||
<button class="ace-dry-preset-btn" data-preset="tpu" onclick="aceDryDialogPreset('tpu')" style="padding:8px;border-radius:8px;border:1px solid var(--border);background:var(--raised);color:var(--txt2);cursor:pointer">TPU</button>
|
||||
<button class="ace-dry-preset-btn" data-preset="abs_asa" onclick="aceDryDialogPreset('abs_asa')" style="padding:8px;border-radius:8px;border:1px solid var(--border);background:var(--raised);color:var(--txt2);cursor:pointer">ABS / ASA</button>
|
||||
<button class="ace-dry-preset-btn" data-preset="pa_pc" onclick="aceDryDialogPreset('pa_pc')" style="padding:8px;border-radius:8px;border:1px solid var(--border);background:var(--raised);color:var(--txt2);cursor:pointer">PA / PC</button>
|
||||
<button class="ace-dry-preset-btn" data-preset="custom_1" onclick="aceDryDialogPreset('custom_1')" style="padding:8px;border-radius:8px;border:1px solid var(--border);background:var(--raised);color:var(--txt2);cursor:pointer">Custom 1</button>
|
||||
<button class="ace-dry-preset-btn" data-preset="custom_2" onclick="aceDryDialogPreset('custom_2')" style="padding:8px;border-radius:8px;border:1px solid var(--border);background:var(--raised);color:var(--txt2);cursor:pointer">Custom 2</button>
|
||||
<button class="ace-dry-preset-btn" data-preset="custom_3" onclick="aceDryDialogPreset('custom_3')" style="padding:8px;border-radius:8px;border:1px solid var(--border);background:var(--raised);color:var(--txt2);cursor:pointer">Custom 3</button>
|
||||
</div>
|
||||
<div id="ace-dry-dialog-custom-name-row" style="display:none;align-items:center;gap:12px;margin-bottom:14px">
|
||||
<label id="ace-dry-dialog-custom-name-label" style="min-width:190px;font-size:12px;color:var(--txt)">Custom Name</label>
|
||||
<input id="ace-dry-dialog-custom-name" type="text" maxlength="32" oninput="aceDryDialogInputsChanged()"
|
||||
style="width:220px;padding:8px;background:var(--raised);border:1px solid var(--border);border-radius:6px;color:var(--txt)">
|
||||
</div>
|
||||
<div style="display:flex;justify-content:flex-end;gap:8px">
|
||||
<button id="ace-dry-dialog-reset-default" onclick="resetAceDryPresetToDefault()" style="display:none;padding:8px 14px;background:var(--raised);border:1px solid var(--border);border-radius:8px;color:var(--txt);cursor:pointer">Reset to Default</button>
|
||||
<button id="ace-dry-dialog-save-preset" onclick="saveAceDryPresetAndRestart()" style="display:none;padding:8px 14px;background:var(--warn);border:1px solid transparent;border-radius:8px;color:#fff;cursor:pointer">Save & Restart</button>
|
||||
<button id="ace-dry-dialog-cancel" onclick="closeAceDryDialog()" style="padding:8px 14px;background:var(--raised);border:1px solid var(--border);border-radius:8px;color:var(--txt);cursor:pointer">Cancel</button>
|
||||
<button id="ace-dry-dialog-confirm" onclick="confirmAceDryDialog()" style="padding:8px 16px;background:var(--accent);color:#fff;border:none;border-radius:8px;cursor:pointer;font-weight:600">Confirm</button>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<script src="/kx/ui/app.js"></script></head>
|
||||
<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>
|
||||
</body>
|
||||
</html>
|
||||
299
web/themes/default/style.css
Normal file
299
web/themes/default/style.css
Normal file
@@ -0,0 +1,299 @@
|
||||
:root{
|
||||
color-scheme:dark; /* native Form-Controls (select) im Webview dunkel rendern */
|
||||
--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]{
|
||||
color-scheme: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}
|
||||
/* select/option-Farben explizit setzen — OrcaSlicers Device-Tab-Webview erbt
|
||||
sie sonst nicht und rendert weiße Schrift auf weißem Grund (Issue #29). */
|
||||
select{background:var(--raised)!important;color:var(--txt)!important}
|
||||
select option{background:var(--card)!important;color:var(--txt)!important}
|
||||
|
||||
/* ── 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-skip{background:var(--raised);color:var(--warn);border:1px solid var(--warn)}
|
||||
.btn-cancel{background:#2d0d0d;color:var(--err);border:1px solid var(--err)}
|
||||
.btn-accent{background:var(--accent);color:#001a24}
|
||||
.btn-sm{padding:7px 12px;font-size:12px}
|
||||
.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:flex;flex-direction:column;gap:12px}
|
||||
.ams-box-group{}
|
||||
.ams-box-label{font-size:11px;font-weight:700;color:var(--txt2);text-transform:uppercase;letter-spacing:.06em;margin-bottom:6px;padding-left:2px}
|
||||
.ams-box-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)}
|
||||
.ams-slot.loaded{border-color:var(--ok)!important;
|
||||
box-shadow:0 0 0 2px rgba(64,220,120,.35),0 0 14px rgba(64,220,120,.35)}
|
||||
.ams-slot.loading{border-color:var(--ok)!important;animation:amsPulseGreen 1s ease-in-out infinite}
|
||||
.ams-slot.unloading{border-color:var(--err)!important;animation:amsPulseRed 1s ease-in-out infinite}
|
||||
@keyframes amsPulseGreen{0%{box-shadow:0 0 0 0 rgba(64,220,120,.55)}50%{box-shadow:0 0 0 4px rgba(64,220,120,.25),0 0 18px rgba(64,220,120,.45)}100%{box-shadow:0 0 0 0 rgba(64,220,120,.55)}}
|
||||
@keyframes amsPulseRed{0%{box-shadow:0 0 0 0 rgba(230,80,80,.55)}50%{box-shadow:0 0 0 4px rgba(230,80,80,.25),0 0 18px rgba(230,80,80,.45)}100%{box-shadow:0 0 0 0 rgba(230,80,80,.55)}}
|
||||
.ams-slot-bridge{display:flex;flex-direction:column;align-items:center;justify-content:center;gap:6px;
|
||||
border:1px dashed var(--border);background:linear-gradient(180deg,rgba(255,255,255,.03),rgba(255,255,255,.01));
|
||||
color:var(--txt2);min-height:106px}
|
||||
.ams-slot-bridge .bridge-chip{width:58px;height:58px;border:1px solid rgba(255,255,255,.14);border-radius:50%;
|
||||
display:flex;align-items:center;justify-content:center;background:rgba(255,255,255,.04);color:var(--txt2);
|
||||
font-size:13px;font-weight:700;letter-spacing:.04em}
|
||||
.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 auf kleinen Screens */
|
||||
.ams-box-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