feat: pull image from registry instead of local build, ask stable/nightly

start.sh now pulls gitea.it-drui.de/viewit/kx-bridge:latest or :nightly
depending on user choice (interactive prompt or ./start.sh <channel>
argument), instead of building the image locally from source.

NIGHTLY_CHANGELOG.md

@@ -1,4 +1,8 @@
 ## Changes in this build
 
-- Fix: wrong filament slot used in multicolor prints when T0 is unused — AMS box mapping now includes placeholder entries for all paint indices so the printer correctly matches T1/T2/T3 tool changes to the right slots (Issue #78)
-- Fix: Spoolman spool-slot assignment now persisted to config.ini and restored on bridge restart
+- Fix: the poll interval setting was saved to config.ini but never actually applied — the poll loop always used a hardcoded 3s wait
+- Fix: Spoolman status showed a green "connected" dot even when the server was unreachable — reachability is now rechecked periodically and shown accurately (green/red)
+- Fix: **settings could silently revert after saving** — the bridge restart that applies settings didn't clean up all the relevant environment variables, so the old value could win over the one just saved (affected poll interval, resonance compensation, Docker host IP, and the new HTTP log toggle below). Fixed at the root so this class of bug can't recur for future settings.
+- Feat: new "Log every HTTP request (verbose)" toggle in Settings — off by default, since aiohttp's per-request access log was drowning out the bridge's own logs with the frontend's 2s polling
+
+**A stable release is coming soon** with the fixes and features from the last several nightly builds. As usual it will be published as ready-to-run binaries (Linux amd64/arm64, Windows) alongside the Docker image.

config.ini.example

@@ -41,6 +41,21 @@ web_upload_warning = 1
 # Poll-Intervall in Sekunden
 poll_interval    = 3
 
+# ─── Spoolman (optional) ───────────────────────────────────────────────────────
+# Verfolgt den Filamentverbrauch je AMS-Slot und bucht ihn automatisch vom
+# passenden Spool ab (mm-basiert, wie Moonraker; Spoolman rechnet mm→Gramm).
+# [spoolman]
+# # Server-URL der Spoolman-Instanz (aus Sicht des Bridge-Containers erreichbar):
+# server    = http://192.168.x.x:7912
+# # 0 = nur am Druckende abbuchen, >0 = alle N Sekunden während des Drucks:
+# sync_rate = 0
+#
+# Die AMS-Slot → Spool-Zuordnung wird in der Weboberfläche gesetzt und je Drucker
+# automatisch persistiert (nicht von Hand eintragen):
+#   Einzeldrucker : [spoolman]   slot_spools = 0:42,1:17
+#   Multi-Printer : [spoolman_1] slot_spools = 0:42,1:17
+#                   [spoolman_2] slot_spools = 0:5,1:6
+
 # ─── Multi-Printer (optional) ──────────────────────────────────────────────────
 # Mehrere Drucker können als [printer_1], [printer_2], … definiert werden.
 # Jede Bridge-Instanz verbindet sich mit einem Drucker (je eigener Port).

config_loader.py

@@ -1,7 +1,7 @@
 """
-config_loader.py – lädt Verbindungsparameter aus config/config.ini (primär)
-oder .env (Fallback / Migration).
-Umgebungsvariablen haben immer Vorrang.
+config_loader.py - loads connection parameters from config/config.ini (primary)
+or .env (fallback / migration).
+Environment variables always take precedence.
 """
 import os
 import sys
@@ -34,7 +34,7 @@ def _find_env_file() -> pathlib.Path | None:
 
 
 def _load_env_file(path: pathlib.Path):
-    """Lädt .env-Datei als Fallback – setzt nur Keys die noch nicht in os.environ sind."""
+    """Loads the .env file as a fallback - only sets keys not yet in os.environ."""
     with open(path, encoding="utf-8") as f:
         for line in f:
             line = line.strip()
@@ -47,28 +47,39 @@ def _load_env_file(path: pathlib.Path):
                 os.environ[key] = val
 
 
+# Single source of truth for env-var <-> config.ini mapping. _restart_bridge()
+# in kobrax_moonraker_bridge.py clears exactly these keys from os.environ
+# before restarting, so a value removed here or in the UI settings save can
+# never survive as a stale env var read by the new process. Add new settings
+# here ONLY - no second list to keep in sync.
+CONFIG_ENV_MAPPING = {
+    "PRINTER_IP":       (CONFIG_SECTION_CONNECTION, "printer_ip"),
+    "MQTT_PORT":        (CONFIG_SECTION_CONNECTION, "mqtt_port"),
+    "MQTT_USERNAME":    (CONFIG_SECTION_CONNECTION, "username"),
+    "MQTT_PASSWORD":    (CONFIG_SECTION_CONNECTION, "password"),
+    "MODE_ID":          (CONFIG_SECTION_CONNECTION, "mode_id"),
+    "DEVICE_ID":        (CONFIG_SECTION_CONNECTION, "device_id"),
+    "DEFAULT_AMS_SLOT":     (CONFIG_SECTION_PRINT,   "default_ams_slot"),
+    "AUTO_LEVELING":            (CONFIG_SECTION_PRINT,   "auto_leveling"),
+    "VIBRATION_COMPENSATION":   (CONFIG_SECTION_PRINT,   "vibration_compensation"),
+    "CAMERA_ON_PRINT":          (CONFIG_SECTION_PRINT,   "camera_on_print"),
+    "WEB_UPLOAD_WARNING":   (CONFIG_SECTION_PRINT,   "web_upload_warning"),
+    "PRINT_START_DIALOG":   (CONFIG_SECTION_PRINT,   "print_start_dialog"),
+    "BRIDGE_PRINTER_NAME":  (CONFIG_SECTION_BRIDGE,  "printer_name"),
+    "BRIDGE_HOST_IP":       (CONFIG_SECTION_BRIDGE,  "host_ip"),
+    "POLL_INTERVAL":        (CONFIG_SECTION_BRIDGE,  "poll_interval"),
+    "VERBOSE_HTTP_LOG":     (CONFIG_SECTION_BRIDGE,  "verbose_http_log"),
+    "SPOOLMAN_SERVER":      (CONFIG_SECTION_SPOOLMAN, "server"),
+    "SPOOLMAN_SYNC_RATE":   (CONFIG_SECTION_SPOOLMAN, "sync_rate"),
+}
+
+
 def _load_config_file(path: pathlib.Path):
-    """Lädt config.ini und setzt Keys in os.environ (nur wenn nicht bereits gesetzt)."""
+    """Loads config.ini and sets keys in os.environ (only if not already set)."""
     cfg = configparser.ConfigParser()
     cfg.read(path, encoding="utf-8")
 
-    mapping = {
-        "PRINTER_IP":       (CONFIG_SECTION_CONNECTION, "printer_ip"),
-        "MQTT_PORT":        (CONFIG_SECTION_CONNECTION, "mqtt_port"),
-        "MQTT_USERNAME":    (CONFIG_SECTION_CONNECTION, "username"),
-        "MQTT_PASSWORD":    (CONFIG_SECTION_CONNECTION, "password"),
-        "MODE_ID":          (CONFIG_SECTION_CONNECTION, "mode_id"),
-        "DEVICE_ID":        (CONFIG_SECTION_CONNECTION, "device_id"),
-        "DEFAULT_AMS_SLOT":     (CONFIG_SECTION_PRINT,   "default_ams_slot"),
-        "AUTO_LEVELING":        (CONFIG_SECTION_PRINT,   "auto_leveling"),
-        "CAMERA_ON_PRINT":      (CONFIG_SECTION_PRINT,   "camera_on_print"),
-        "WEB_UPLOAD_WARNING":   (CONFIG_SECTION_PRINT,   "web_upload_warning"),
-        "PRINT_START_DIALOG":   (CONFIG_SECTION_PRINT,   "print_start_dialog"),
-        "BRIDGE_PRINTER_NAME":  (CONFIG_SECTION_BRIDGE,  "printer_name"),
-        "SPOOLMAN_SERVER":      (CONFIG_SECTION_SPOOLMAN, "server"),
-        "SPOOLMAN_SYNC_RATE":   (CONFIG_SECTION_SPOOLMAN, "sync_rate"),
-    }
-    for env_key, (section, option) in mapping.items():
+    for env_key, (section, option) in CONFIG_ENV_MAPPING.items():
         if env_key not in os.environ:
             try:
                 val = cfg.get(section, option)
@@ -113,8 +124,9 @@ 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"),
+        "auto_leveling":          env_vals.get("AUTO_LEVELING",           "1"),
+        "vibration_compensation": env_vals.get("VIBRATION_COMPENSATION",  "0"),
+        "camera_on_print":        env_vals.get("CAMERA_ON_PRINT",         "0"),
         "web_upload_warning": env_vals.get("WEB_UPLOAD_WARNING", "1"),
     }
     cfg[CONFIG_SECTION_BRIDGE] = {
@@ -122,12 +134,12 @@ def migrate_env_to_config(env_path: pathlib.Path, config_path: pathlib.Path):
     }
     with open(config_path, "w", encoding="utf-8") as f:
         f.write("# KX-Bridge Konfigurationsdatei\n")
-        f.write("# Automatisch migriert aus .env\n\n")
+        f.write("# Automatically migrated from .env\n\n")
         cfg.write(f)
 
 
 def find_config_path() -> pathlib.Path:
-    """Gibt den Pfad zur config.ini zurück (auch wenn sie noch nicht existiert)."""
+    """Returns the path to config.ini (even if it does not exist yet)."""
     for base in (_BASE, _BASE.parent):
         config_dir = base / "config"
         if config_dir.is_dir():
@@ -143,7 +155,7 @@ _env_path    = _find_env_file()
 if _config_path:
     _load_config_file(_config_path)
 elif _env_path:
-    # Kein config.ini vorhanden → aus .env migrieren
+    # No config.ini present -> migrate from .env
     _target = find_config_path()
     migrate_env_to_config(_env_path, _target)
     _load_config_file(_target)
@@ -151,13 +163,13 @@ elif _env_path:
 
 
 def list_printers() -> list[dict]:
-    """Liest alle [printer_N]-Sektionen aus config.ini.
+    """Reads all [printer_N] sections from config.ini.
 
-    Jede Sektion kann folgende Keys haben:
+    Each section may contain the following keys:
       name, printer_ip, mqtt_port, username, password, mode_id, device_id,
       bridge_url, default_ams_slot, auto_leveling
 
-    Gibt eine leere Liste zurück wenn keine [printer_N]-Sektionen vorhanden sind
+    Returns an empty list when no [printer_N] sections exist
     (Single-Printer-Betrieb via [connection]).
     """
     path = _find_config_file()
@@ -198,28 +210,28 @@ def _filament_section(printer_id: Optional[str] = None) -> str:
 
 
 def list_filament_profiles(printer_id: Optional[str] = None) -> dict[int, dict]:
-    """Liest die [filament_profiles]-Sektion aus config.ini.
+    """Reads the [filament_profiles] section from config.ini.
 
     With ``printer_id`` set, reads the per-printer ``[filament_profiles_<id>]``
     section and falls back to the legacy global ``[filament_profiles]`` while
     that printer has no own section yet.
 
-    Format pro AMS-Slot — primärer Selector ist (vendor, name), die `id` wird
-    aus der orca_filaments.json beim Speichern nachgeschlagen und mitgeführt
-    (als Hint für OrcaSlicer; das Orca-Datenmodell hat ~136 Profile mit
-    derselben filament_id wie 'OGFL99', d.h. die ID ist nicht eindeutig):
+    Format per AMS slot - the primary selector is (vendor, name); the `id` is
+    looked up from orca_filaments.json on save and carried along
+    (as a hint for OrcaSlicer; the Orca data model has ~136 profiles sharing
+    the same filament_id like 'OGFL99', i.e. the ID is not unique):
 
       [filament_profiles]
       slot_0_vendor = Polymaker
       slot_0_name   = PolyTerra PLA
       slot_0_id     = OGFL01
 
-    Gibt einen Dict {slot_index: {"id": ..., "vendor": ..., "name": ...}}
-    zurück. Leere/fehlende Slots werden NICHT aufgenommen — das Default-Mapping
-    (per filament_type) in der Bridge bleibt dann aktiv.
+    Returns a dict {slot_index: {"id": ..., "vendor": ..., "name": ...}}.
+    Empty/missing slots are NOT included - the default mapping
+    (per filament_type) in the bridge then stays active.
 
-    Backwards-Kompat: alte Configs mit nur (vendor, id) bleiben lesbar; `name`
-    fehlt dann und der Aufrufer kann optional aus der orca_filaments.json
+    Backwards compat: old configs with only (vendor, id) stay readable; `name`
+    is then missing and the caller can optionally resolve it from orca_filaments.json
     rekonstruieren.
     """
     path = _find_config_file()
@@ -234,7 +246,7 @@ def list_filament_profiles(printer_id: Optional[str] = None) -> dict[int, dict]:
         return {}
     result: dict[int, dict] = {}
     for key, value in cfg.items(section):
-        # Erwartet: slot_<idx>_id oder slot_<idx>_vendor oder slot_<idx>_name
+        # Expects: slot_<idx>_id or slot_<idx>_vendor or slot_<idx>_name
         if not key.startswith("slot_"):
             continue
         parts = key.split("_", 2)
@@ -254,11 +266,11 @@ def list_filament_profiles(printer_id: Optional[str] = None) -> dict[int, dict]:
 
 
 def save_filament_profiles(profiles: dict[int, dict], printer_id: Optional[str] = None) -> bool:
-    """Schreibt die übergebenen Slot-Profile in die [filament_profiles]-
-    Sektion der config.ini. Existierende Einträge werden komplett ersetzt.
+    """Writes the given slot profiles into the [filament_profiles]
+    section of config.ini. Existing entries are completely replaced.
 
     profiles: {slot_index: {"id": "OGFL01", "vendor": "Polymaker", "name": "PolyTerra PLA"}}
-    Mindestens vendor+name müssen gesetzt sein; id ist optional (Hint).
+    At least vendor+name must be set; id is optional (hint).
 
     With ``printer_id`` set, writes the per-printer ``[filament_profiles_<id>]``
     section only — other printers and the legacy global section are untouched.
@@ -269,8 +281,8 @@ def save_filament_profiles(profiles: dict[int, dict], printer_id: Optional[str]
     cfg = configparser.ConfigParser()
     cfg.read(path, encoding="utf-8")
     section = _filament_section(printer_id)
-    # visible_vendors (Issue #41) ist kein Slot-Mapping — beim Ersetzen der
-    # Sektion erhalten, sonst geht der Vendor-Filter beim Slot-Save verloren.
+    # visible_vendors (Issue #41) is not a slot mapping - preserve it when
+    # replacing the section, otherwise the vendor filter is lost on slot save.
     # First save of a per-printer section inherits the legacy global filter.
     preserved_vendors = None
     if cfg.has_option(section, "visible_vendors"):
@@ -297,10 +309,10 @@ def save_filament_profiles(profiles: dict[int, dict], printer_id: Optional[str]
 
 
 def list_visible_vendors(printer_id: Optional[str] = None) -> list[str]:
-    """Liest [filament_profiles] visible_vendors (komma-separiert) aus config.ini.
+    """Reads [filament_profiles] visible_vendors (comma-separated) from config.ini.
 
-    Vendor-Sichtbarkeitsfilter für das Slot-Profil-Dropdown (Issue #41 Option A).
-    Leere Liste = keine Einschränkung (rückwärtskompatibel: alle Vendoren).
+    Vendor visibility filter for the slot profile dropdown (Issue #41 option A).
+    Empty list = no restriction (backwards compatible: all vendors).
 
     With ``printer_id`` set, reads the per-printer section and falls back to the
     legacy global ``[filament_profiles]`` filter.
@@ -320,7 +332,7 @@ def list_visible_vendors(printer_id: Optional[str] = None) -> list[str]:
 
 
 def save_visible_vendors(vendors: list[str], printer_id: Optional[str] = None) -> bool:
-    """Schreibt visible_vendors in [filament_profiles], ohne die Slot-Mappings
+    """Writes visible_vendors into [filament_profiles] without touching the
     (slot_N_*) zu verlieren. Leere Liste entfernt den Key wieder.
 
     With ``printer_id`` set, writes the per-printer section. When that section is
@@ -349,11 +361,87 @@ def save_visible_vendors(vendors: list[str], printer_id: Optional[str] = None) -
     return True
 
 
+def _spoolman_map_section(printer_id: Optional[str] = None) -> str:
+    """Section name holding a printer's AMS-slot → Spoolman-spool map.
+
+    Multi-printer (one bridge, N printers): each printer keeps its map in its
+    own ``[spoolman_<id>]`` section so two AMS units cannot overwrite each
+    other's mapping. ``printer_id is None`` (single-printer / legacy callers)
+    uses the original ``[spoolman] slot_spools`` key — full backward
+    compatibility. The global ``[spoolman]`` section keeps ``server`` /
+    ``sync_rate`` regardless.
+    """
+    pid = str(printer_id).strip() if printer_id is not None else ""
+    if pid and pid != "0":
+        return f"{CONFIG_SECTION_SPOOLMAN}_{pid}"
+    return CONFIG_SECTION_SPOOLMAN
+
+
+def _parse_slot_spools(raw: str) -> dict[int, int]:
+    """Parse ``"0:42,1:17"`` → ``{0: 42, 1: 17}`` (positive spool ids only)."""
+    result: dict[int, int] = {}
+    for pair in (raw or "").split(","):
+        pair = pair.strip()
+        if ":" not in pair:
+            continue
+        k, _, v = pair.partition(":")
+        k, v = k.strip(), v.strip()
+        if k.isdigit() and v.lstrip("-").isdigit() and int(v) > 0:
+            result[int(k)] = int(v)
+    return result
+
+
+def list_spool_map(printer_id: Optional[str] = None) -> dict[int, int]:
+    """Read the AMS-slot → Spoolman-spool-id map from config.ini.
+
+    With ``printer_id`` set, reads the per-printer ``[spoolman_<id>]
+    slot_spools`` key and falls back to the legacy global ``[spoolman]
+    slot_spools`` while that printer has no own section yet. Returns
+    ``{slot_index: spool_id}`` (only positive ids).
+    """
+    path = _find_config_file()
+    if not path:
+        return {}
+    cfg = configparser.ConfigParser()
+    cfg.read(path, encoding="utf-8")
+    section = _spoolman_map_section(printer_id)
+    if cfg.has_option(section, "slot_spools"):
+        return _parse_slot_spools(cfg.get(section, "slot_spools", fallback=""))
+    if cfg.has_option(CONFIG_SECTION_SPOOLMAN, "slot_spools"):   # legacy global fallback
+        return _parse_slot_spools(cfg.get(CONFIG_SECTION_SPOOLMAN, "slot_spools", fallback=""))
+    return {}
+
+
+def save_spool_map(slot_spools: dict[int, int], printer_id: Optional[str] = None) -> bool:
+    """Persist the AMS-slot → Spoolman-spool-id map to config.ini.
+
+    With ``printer_id`` set, writes only the per-printer ``[spoolman_<id>]``
+    section so other printers and the global ``[spoolman]`` server config stay
+    untouched. An empty map clears the key.
+    """
+    path = _find_config_file()
+    if not path:
+        return False
+    cfg = configparser.ConfigParser()
+    cfg.read(path, encoding="utf-8")
+    section = _spoolman_map_section(printer_id)
+    clean = {int(k): int(v) for k, v in (slot_spools or {}).items() if int(v) > 0}
+    if clean:
+        if not cfg.has_section(section):
+            cfg.add_section(section)
+        cfg[section]["slot_spools"] = ",".join(f"{k}:{v}" for k, v in sorted(clean.items()))
+    elif cfg.has_option(section, "slot_spools"):
+        cfg.remove_option(section, "slot_spools")
+    with open(path, "w", encoding="utf-8") as f:
+        cfg.write(f)
+    return True
+
+
 def get(key: str, default: str = "") -> str:
     return os.environ.get(key, default)
 
 
-# Häufig verwendete Shortcuts
+# Frequently used shortcuts
 PRINTER_IP       = get("PRINTER_IP",       "")
 MQTT_PORT        = int(get("MQTT_PORT",    "9883"))
 USERNAME         = get("MQTT_USERNAME",    "")
@@ -361,9 +449,13 @@ PASSWORD         = get("MQTT_PASSWORD",    "")
 MODE_ID          = get("MODE_ID",          "")
 DEVICE_ID        = get("DEVICE_ID",        "")
 DEFAULT_AMS_SLOT = get("DEFAULT_AMS_SLOT", "auto")
-AUTO_LEVELING    = int(get("AUTO_LEVELING","1"))
-CAMERA_ON_PRINT  = int(get("CAMERA_ON_PRINT","0"))
+AUTO_LEVELING           = int(get("AUTO_LEVELING",          "1"))
+VIBRATION_COMPENSATION  = int(get("VIBRATION_COMPENSATION", "0"))
+CAMERA_ON_PRINT         = int(get("CAMERA_ON_PRINT",        "0"))
 WEB_UPLOAD_WARNING = int(get("WEB_UPLOAD_WARNING", "1"))
 PRINT_START_DIALOG = int(get("PRINT_START_DIALOG", get("FILE_READY_DIALOG", "1")))
 SPOOLMAN_SERVER    = get("SPOOLMAN_SERVER",    "")
 SPOOLMAN_SYNC_RATE = int(get("SPOOLMAN_SYNC_RATE", "0"))
+BRIDGE_HOST_IP     = get("BRIDGE_HOST_IP",     "")
+POLL_INTERVAL      = int(get("POLL_INTERVAL",  "3"))
+VERBOSE_HTTP_LOG   = int(get("VERBOSE_HTTP_LOG", "0"))

docker-compose.yml

@@ -10,6 +10,8 @@ services:
       - ./.env:/app/.env:ro
     ports:
       - "7125-7130:7125-7130"
+    # environment:
+    #   - BRIDGE_HOST_IP=192.168.1.100   # LAN-IP des Docker-Hosts (für korrekte Log-Anzeige)
     restart: unless-stopped
     logging:
       driver: json-file

env_loader.py

@@ -1,6 +1,6 @@
 """
-env_loader.py – lädt Verbindungsparameter aus .env (Repo-Root oder Arbeitsverzeichnis).
-Umgebungsvariablen haben Vorrang vor .env-Werten.
+env_loader.py - loads connection parameters from .env (repo root or working directory).
+Environment variables take precedence over .env values.
 """
 import os
 import sys
@@ -39,7 +39,7 @@ def get(key: str, default: str = "") -> str:
     return os.environ.get(key, default)
 
 
-# Häufig verwendete Shortcuts
+# Frequently used shortcuts
 PRINTER_IP       = get("PRINTER_IP",       "")
 MQTT_PORT        = int(get("MQTT_PORT", "9883"))
 USERNAME         = get("MQTT_USERNAME",    "")
@@ -47,7 +47,9 @@ PASSWORD         = get("MQTT_PASSWORD",    "")
 MODE_ID          = get("MODE_ID",          "")
 DEVICE_ID        = get("DEVICE_ID",        "")
 DEFAULT_AMS_SLOT = get("DEFAULT_AMS_SLOT", "auto")
-AUTO_LEVELING    = int(get("AUTO_LEVELING", "1"))
-CAMERA_ON_PRINT  = int(get("CAMERA_ON_PRINT", "0"))
+AUTO_LEVELING            = int(get("AUTO_LEVELING", "1"))
+VIBRATION_COMPENSATION   = int(get("VIBRATION_COMPENSATION", "0"))
+CAMERA_ON_PRINT          = int(get("CAMERA_ON_PRINT", "0"))
 WEB_UPLOAD_WARNING = int(get("WEB_UPLOAD_WARNING", "1"))
 PRINT_START_DIALOG = int(get("PRINT_START_DIALOG", get("FILE_READY_DIALOG", "1")))
+BRIDGE_HOST_IP   = get("BRIDGE_HOST_IP", "")

kobrax_client.py

@@ -1,10 +1,10 @@
 """
 kobrax_client.py – Anycubic Kobra X LAN-MQTT-Client
 
-Protokoll vollständig rekonstruiert via Sniffer 2026-04-17 (953 Nachrichten).
+Protocol fully reconstructed via sniffer 2026-04-17 (953 messages).
 
 Voraussetzungen:
-  - /tmp/anycubic_slicer.crt und .key (aus cloud_mqtt.dll @ 0x2ed5b0 / 0x2edce0)
+  - /tmp/anycubic_slicer.crt and .key (from cloud_mqtt.dll @ 0x2ed5b0 / 0x2edce0)
   - Drucker im LAN-Modus erreichbar auf Port 9883
 
 Verwendung:
@@ -121,9 +121,9 @@ class KobraXClient:
         self._buf     = b""
         self._pid     = 1
         self._lock    = threading.Lock()
-        # Generations-Marker: wird bei jedem Socket-Swap/Close erhöht, damit der
-        # Reader-Thread erkennt wenn _reconnect/_do_connect den Socket unter ihm
-        # ersetzt hat (Issue #53). Schützt gegen recv auf einem stale fd.
+        # Generation marker: incremented on every socket swap/close so the
+        # reader thread notices when _reconnect/_do_connect swapped the socket
+        # underneath it (Issue #53). Protects against recv on a stale fd.
         self._sock_gen = 0
         self._running = False
 
@@ -162,9 +162,9 @@ class KobraXClient:
         if not os.path.exists(CERT_FILE) or not os.path.exists(KEY_FILE):
             raise FileNotFoundError(
                 f"TLS-Zertifikate fehlen: anycubic_slicer.crt + anycubic_slicer.key "
-                f"müssen neben der kx-bridge Binary liegen ({_SCRIPT_DIR}/). "
-                f"Lade anycubic-certs.zip vom Gitea-Release herunter und entpacke "
-                f"die Dateien dorthin."
+                f"must sit next to the kx-bridge binary ({_SCRIPT_DIR}/). "
+                f"Download anycubic-certs.zip from the Gitea release and extract "
+                f"the files there."
             )
         ctx = ssl.SSLContext(ssl.PROTOCOL_TLS_CLIENT)
         ctx.check_hostname = False
@@ -172,9 +172,9 @@ class KobraXClient:
         ctx.set_ciphers("DEFAULT:@SECLEVEL=0")
         ctx.load_cert_chain(CERT_FILE, KEY_FILE)
 
-        # Socket als lokale Variable aufbauen — der Handshake (Connect + CONNACK)
-        # läuft OHNE gehaltenes Lock, damit ein langsamer Connect die Sender nicht
-        # einfriert. Erst der fertige Socket wird unter Lock eingeschwenkt (#53).
+        # Build the socket as a local variable - the handshake (connect + CONNACK)
+        # runs WITHOUT holding the lock so a slow connect does not freeze
+        # senders. Only the finished socket is swapped in under the lock (#53).
         _ai      = socket.getaddrinfo(self.host, self.port, socket.AF_INET, socket.SOCK_STREAM)
         raw      = socket.create_connection(_ai[0][4], timeout=5)
         new_sock = ctx.wrap_socket(raw)
@@ -196,7 +196,7 @@ class KobraXClient:
             self._sock = new_sock
             self._sock_gen += 1
             self._buf = b""
-        self._subscribe(self._sub_topic())  # nimmt das Lock selbst — nicht verschachteln
+        self._subscribe(self._sub_topic())  # takes the lock itself - do not nest
         log.debug("MQTT connected to %s:%s", self.host, self.port)
 
     def connect(self):
@@ -206,10 +206,10 @@ class KobraXClient:
         time.sleep(0.3)
 
     def _ensure_reader(self):
-        """Stellt sicher dass der Reader-Thread lebt. Wenn der Reader nach einer
-        früheren disconnect/reconnect-Sequenz oder einem unbehandelten Fehler
-        gestorben ist, würden empfangene Replies sonst nie ankommen — publish()
-        würde dann zwar senden, aber auf Antworten ewig warten."""
+        """Ensures the reader thread is alive. If the reader died after a
+        previous disconnect/reconnect sequence or an unhandled error,
+        received replies would never arrive - publish()
+        would still send but wait for replies forever."""
         if not self._running:
             return  # gewollter disconnect
         t = getattr(self, "_reader_thread", None)
@@ -232,13 +232,13 @@ class KobraXClient:
             self._sock_gen += 1
 
     def _reconnect(self):
-        """Persistenter Reconnect: versucht endlos weiter bis der Drucker wieder
-        antwortet oder disconnect() gerufen wurde. Backoff cappt bei 60 s. Die
-        ersten 5 Versuche loggen als WARNING (akute Verbindungsstörung), danach
-        nur DEBUG um Log-Spam bei langem Drucker-Ausfall (z.B. über Nacht
+        """Persistent reconnect: keeps retrying forever until the printer is
+        responds or disconnect() was called. Backoff caps at 60 s. The
+        first 5 attempts log as WARNING (acute connection issue), afterwards
+        only DEBUG to avoid log spam during long printer outages (e.g. switched
         ausgeschaltet) zu vermeiden."""
-        log.warning("Verbindung verloren – reconnect…")
-        # Close + Invalidierung unter Lock, damit kein Sender mitten im sendall
+        log.warning("Connection lost - reconnecting...")
+        # Close + invalidation under the lock so no sender is mid-sendall
         # auf den gerade geschlossenen Socket trifft (Issue #53).
         with self._lock:
             try:
@@ -254,18 +254,18 @@ class KobraXClient:
             delay = delays[min(attempt, len(delays) - 1)]
             try:
                 self._do_connect()
-                log.info("Reconnect erfolgreich (nach %d Versuchen)", attempt + 1)
+                log.info("Reconnect successful (after %d attempts)", attempt + 1)
                 return True
             except Exception as e:
                 attempt += 1
                 lvl = log.warning if attempt <= 5 else log.debug
                 lvl("Reconnect fehlgeschlagen (%s, Versuch %d), warte %ss…", e, attempt, delay)
-                # Geteiltes Sleep damit disconnect() den Loop schneller bricht.
+                # Split sleep so disconnect() breaks the loop faster.
                 slept = 0.0
                 while slept < delay and self._running:
                     time.sleep(min(0.5, delay - slept))
                     slept += 0.5
-        return False  # nur wenn disconnect() gerufen wurde
+        return False  # only when disconnect() was called
 
     def _subscribe(self, topic: str):
         with self._lock:
@@ -290,15 +290,15 @@ class KobraXClient:
                             ping_ok = True
                     except Exception:
                         ping_ok = False
-                # _reconnect() AUSSERHALB des Locks aufrufen — es nimmt das Lock
-                # selbst, und threading.Lock ist nicht reentrant (sonst Deadlock).
+                # Call _reconnect() OUTSIDE the lock - it takes the lock
+                # itself, and threading.Lock is not reentrant (deadlock otherwise).
                 if not ping_ok:
                     if self._running and not self._reconnect():
                         break
                 last_ping = time.time()
-            # Aktuellen Socket + Generation unter Lock greifen, damit ein
-            # paralleler _reconnect/_do_connect-Swap uns nicht auf einem stale
-            # fd pollen lässt (Issue #53).
+            # Grab the current socket + generation under the lock so a
+            # parallel _reconnect/_do_connect swap does not leave us polling
+            # a stale fd (Issue #53).
             with self._lock:
                 sock = self._sock
                 gen  = self._sock_gen
@@ -306,37 +306,37 @@ class KobraXClient:
                 time.sleep(0.05)
                 continue
 
-            # Idle-Wartezeit OHNE Lock — select probt nur die Bereitschaft, so
-            # blockiert der Reader während Leerlauf nie das gemeinsame Lock.
+            # Idle wait WITHOUT the lock - select only probes readiness, so
+            # the reader never blocks the shared lock while idle.
             try:
                 ready, _, _ = select.select([sock], [], [], 0.2)
             except (OSError, ValueError):
-                # fd geschlossen/ungültig (Reconnect oder Disconnect mitten im select)
+                # fd closed/invalid (reconnect or disconnect mid-select)
                 if not self._running:
                     break
                 time.sleep(0.05)
                 continue
             if not ready:
-                continue  # Leerlauf, kein Lock gehalten
+                continue  # idle, no lock held
 
-            # Daten liegen an: Lock kurz greifen für das eine recv, serialisiert
-            # gegen alle sendall-Caller. recv blockiert nicht lange (select sagte
-            # ready, Socket-Timeout ist 0.2s).
+            # Data pending: briefly take the lock for the single recv, serialized
+            # against all sendall callers. recv does not block long (select said
+            # ready, socket timeout is 0.2s).
             try:
                 with self._lock:
-                    # Socket könnte zwischen select und hier ersetzt worden sein.
+                    # The socket could have been swapped between select and here.
                     if self._sock_gen != gen or self._sock is not sock:
                         continue
                     data = sock.recv(65536)
                 if not data:
-                    # Windows SSL kann kurzzeitig b"" liefern ohne echten EOF
+                    # Windows SSL can briefly return b"" without a real EOF
                     _empty_count += 1
                     if _empty_count >= 5:
                         raise ConnectionResetError("EOF")
                     continue
                 _empty_count = 0
                 self._buf += data
-                self._drain()  # außerhalb des Locks — Dispatch/event.set() bleibt prompt
+                self._drain()  # outside the lock - dispatch/event.set() stays prompt
             except ssl.SSLWantReadError:
                 continue
             except socket.timeout:
@@ -445,8 +445,8 @@ class KobraXClient:
     # -- Publish + request/response ------------------------------------------
 
     def publish(self, msg_type: str, action: str, data=None, timeout: float = 5.0) -> dict | None:
-        # Falls Reader-Thread aus historischen Gründen tot ist, wiederbeleben —
-        # sonst würden Replies nie ankommen und event.wait() läuft ins Timeout.
+        # If the reader thread is dead for historical reasons, revive it -
+        # otherwise replies would never arrive and event.wait() would time out.
         self._ensure_reader()
         msgid   = str(uuid.uuid4())
         payload = json.dumps({
@@ -471,7 +471,7 @@ class KobraXClient:
             report_registered = True
 
         topic = self._pub_topic(msg_type)
-        # Status-Poll-TX (query/getInfo) ist reines Rauschen (alle paar Sekunden) →
+        # Status poll TX (query/getInfo) is pure noise (every few seconds) ->
         # 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",
@@ -531,8 +531,8 @@ class KobraXClient:
                 self._sock.sendall(_build_publish(topic, payload))
         except Exception as e:
             log.error("web send error: %s, reconnecting…", e)
-            # Reconnect triggern (analog zu publish()); ohne Retry weil
-            # fire-and-forget — der nächste Aufruf wird auf den frischen Socket
+            # Trigger a reconnect (like publish()); no retry because it is
+            # fire-and-forget - the next call will hit the fresh socket
             # treffen.
             try:
                 self._reconnect()
@@ -579,13 +579,13 @@ class KobraXClient:
     # -- Part-Skip ("Exclude Object") ---------------------------------------
 
     def query_skip_objects(self) -> dict | None:
-        """Fragt den Drucker nach der aktuellen Objekt-/Skip-Liste."""
+        """Asks the printer for the current object/skip list."""
         return self.publish("skip", "query_obj")
 
     def skip_objects(self, names: list[str]) -> dict | None:
-        """Überspringt die genannten Objekte – auch mid-print möglich.
+        """Skips the named objects - also possible mid-print.
 
-        Namen entsprechen den EXCLUDE_OBJECT_DEFINE NAME=… Einträgen
+        Names correspond to the EXCLUDE_OBJECT_DEFINE NAME=... entries
         im GCode-Header bzw. file_details.objects_skip_parts.
         """
         return self.publish("skip", "start", {"objects_skip_parts": list(names)})
@@ -653,14 +653,14 @@ class KobraXClient:
             f"Connection: close\r\n\r\n"
         ).encode()
 
-        # Connect-Timeout kurz (LAN). Während sendall() darf der Socket so
-        # lange brauchen wie nötig — bei großen Dateien (>100 MB) und
-        # langsamerem WLAN am Drucker dauert das Schieben sonst >30 s und
-        # würde den Connect-Timeout fälschlich auslösen. Read-Timeout danach
-        # generös (Drucker verarbeitet die Datei bevor er antwortet).
+        # Short connect timeout (LAN). During sendall() the socket may take
+        # as long as needed - with large files (>100 MB) and slower WiFi
+        # at the printer, pushing otherwise takes >30 s and would falsely
+        # trip the connect timeout. The read timeout afterwards is generous
+        # (the printer processes the file before replying).
         _ai  = socket.getaddrinfo(self.host, 18910, socket.AF_INET, socket.SOCK_STREAM)
         sock = socket.create_connection(_ai[0][4], timeout=10)
-        sock.settimeout(None)  # blocking während Send
+        sock.settimeout(None)  # blocking during send
         sock.sendall(headers + body)
         sock.settimeout(180)
         response = b""
@@ -717,7 +717,7 @@ if __name__ == "__main__":
     parser.add_argument("--mode-id",   default=env_loader.MODE_ID)
     parser.add_argument("--device-id", default=env_loader.DEVICE_ID)
     parser.add_argument("--monitor",   action="store_true",
-                        help="Dauerhaft mithören und alle Reports ausgeben")
+                        help="Listen continuously and print all reports")
     args = parser.parse_args()
 
     client = KobraXClient(
@@ -741,7 +741,7 @@ if __name__ == "__main__":
 
         client.callbacks["*"] = on_msg
         client.connect()
-        print("[kobrax] Monitor-Modus aktiv (Ctrl-C zum Beenden)")
+        print("[kobrax] Monitor mode active (Ctrl-C to stop)")
         try:
             while True:
                 time.sleep(1)
@@ -755,7 +755,7 @@ if __name__ == "__main__":
         info = client.query_info()
         if info:
             d = info.get("data", {})
-            print(f"  Drucker:  {d.get('printerName')}  FW {d.get('version')}")
+            print(f"  Printer:  {d.get('printerName')}  FW {d.get('version')}")
             print(f"  Status:   {d.get('state')}")
             t = d.get("temp", {})
             print(f"  Nozzle:   {t.get('curr_nozzle_temp')}°C → {t.get('target_nozzle_temp')}°C")
@@ -764,6 +764,6 @@ if __name__ == "__main__":
             print(f"  Upload:   {urls.get('fileUploadurl')}")
             print(f"  Kamera:   {urls.get('rtspUrl')}")
         else:
-            print("  Keine Antwort")
+            print("  No response")
 
         client.disconnect()

orca_filaments.py

@@ -1,10 +1,10 @@
 """OrcaSlicer Filament-Profil Parser.
 
-Geteilt zwischen dem Generator (tools/gen_orca_filament_list.py) und dem
+Shared between the generator (tools/gen_orca_filament_list.py) and the
 Custom-Profile-Import-Endpoint (bridge/kobrax_moonraker_bridge.py).
 
-Liest Orca-Filament-JSON-Dateien (System- oder User-Profile) und gibt
-sie als normalisierte Liste mit (id, name, vendor, type, color) zurück.
+Reads Orca filament JSON files (system or user profiles) and returns
+them as a normalized list with (id, name, vendor, type, color).
 """
 from __future__ import annotations
 
@@ -13,8 +13,8 @@ import re
 
 
 def first_str(value, default: str = "") -> str:
-    """Orca-Profile speichern manche Felder als ['wert']. Liefert erstes
-    Element als String."""
+    """Orca profiles store some fields as ['value']. Returns the first
+    element as a string."""
     if isinstance(value, list):
         return str(value[0]) if value else default
     if isinstance(value, str):
@@ -37,34 +37,34 @@ def parse_profile(data: dict, by_name: dict | None = None,
                   path_vendor: str | None = None,
                   source_path: str = "",
                   system_index: list | None = None) -> dict | None:
-    """Parsed ein einzelnes Orca-Filament-Profil zum Bridge-Schema.
+    """Parses a single Orca filament profile into the bridge schema.
 
-    `by_name` ist optional ein {name: [profile, …]}-Index für Inherits-Resolve
-    aus dem rohen Source-Tree (Generator). Bei Single-File-Import (User-Datei
-    aus OrcaSlicer-User-Dir) reichen wir stattdessen `system_index` rein —
-    die fertige System-Profile-Liste aus orca_filaments.json. Damit können
-    wir filament_id/vendor/type/color über die `inherits`-Kette aus dem
-    System-Parent ableiten, auch wenn das User-Profil diese Felder nicht
-    selbst setzt (typisch: User-Override-Profile haben nur Tweaks).
+    `by_name` is optionally a {name: [profile, ...]} index for inherits resolution
+    from the raw source tree (generator). For single-file imports (user file
+    from the OrcaSlicer user dir) we pass `system_index` instead -
+    the finished system profile list from orca_filaments.json. This lets
+    us derive filament_id/vendor/type/color via the `inherits` chain from
+    the system parent even when the user profile does not set these
+    fields itself (typically: user override profiles only contain tweaks).
 
-    Liefert {id, name, vendor, type, color} oder None wenn das Profil
-    keine filament_id hat (z.B. abstrakte @base-Templates).
+    Returns {id, name, vendor, type, color} or None when the profile
+    has no filament_id (e.g. abstract @base templates).
     """
     if not isinstance(data, dict):
         return None
-    # User-Profile aus dem OrcaSlicer-User-Dir setzen oft KEIN "type"-Feld —
-    # das kommt vom System-Parent. Wir akzeptieren das wenn entweder "type"
-    # explizit "filament" ist ODER ein "inherits" auf ein anderes Profil zeigt.
+    # User profiles from the OrcaSlicer user dir often set NO "type" field -
+    # it comes from the system parent. We accept that when either "type"
+    # is explicitly "filament" OR an "inherits" points to another profile.
     if data.get("type") not in (None, "filament") and not data.get("inherits"):
         return None
     if data.get("type") == "filament" and data.get("inherits") is None and not data.get("filament_id"):
-        # type=filament aber kein parent + keine ID → wertloses Stub
+        # type=filament but no parent + no ID -> worthless stub
         return None
     inst = data.get("instantiation", "true")
     if isinstance(inst, str) and inst.lower() == "false":
         return None
 
-    # Build system-name-Index für den fallback-Lookup wenn system_index gesetzt.
+    # Build the system name index for the fallback lookup when system_index is set.
     sys_by_name: dict[str, dict] = {}
     if system_index:
         for p in system_index:
@@ -92,7 +92,7 @@ def parse_profile(data: dict, by_name: dict | None = None,
         return None
 
     def _resolve_via_system_index(key: str):
-        """Inherits-Kette über system_index (clean_name-Match)."""
+        """Inherits chain via system_index (clean_name match)."""
         parent_raw = data.get("inherits")
         if not parent_raw or not sys_by_name:
             return None
@@ -100,7 +100,7 @@ def parse_profile(data: dict, by_name: dict | None = None,
         sys_p = sys_by_name.get(parent_clean)
         if not sys_p:
             return None
-        # System-JSON benutzt schon das normalisierte Schema
+        # The system JSON already uses the normalized schema
         mapping = {
             "filament_id":              "id",
             "filament_vendor":          "vendor",
@@ -136,10 +136,10 @@ def parse_profile(data: dict, by_name: dict | None = None,
 
 def parse_profile_bytes(blob: bytes, source_name: str = "",
                         system_index: list | None = None) -> dict | None:
-    """Liest ein einzelnes Profil aus JSON-Bytes. Für File-Upload-Pfad.
-    `system_index` ist optional die fertige Liste aus orca_filaments.json —
-    wird für die Inherits-Resolve von User-Profilen genutzt die das volle
-    Schema vom System-Parent erben."""
+    """Reads a single profile from JSON bytes. For the file upload path.
+    `system_index` is optionally the finished list from orca_filaments.json -
+    used for the inherits resolution of user profiles that do not carry the full
+    schema from the system parent."""
     try:
         data = json.loads(blob.decode("utf-8", errors="replace"))
     except Exception:

start.sh

@@ -1,10 +1,12 @@
 #!/usr/bin/env bash
-# start.sh – KX-Bridge starten (baut Docker-Image automatisch wenn nötig)
+# start.sh – KX-Bridge starten (zieht das fertige Image aus der Registry)
 
 set -euo pipefail
 
 cd "$(dirname "$0")"
 
+IMAGE_BASE="gitea.it-drui.de/viewit/kx-bridge"
+
 # .env anlegen falls nicht vorhanden
 if [[ ! -f .env ]]; then
     if [[ -f .env.example ]]; then
@@ -30,38 +32,38 @@ if ! docker info > /dev/null 2>&1; then
     exit 1
 fi
 
-# Prüfen ob Build nötig ist
-NEEDS_BUILD=0
-if ! docker image inspect kx-bridge:latest > /dev/null 2>&1; then
-    echo "[start] Image nicht vorhanden – baue kx-bridge:latest ..."
-    NEEDS_BUILD=1
+# Release-Kanal abfragen
+CHANNEL=""
+if [[ "${1:-}" == "stable" || "${1:-}" == "nightly" ]]; then
+    CHANNEL="$1"
 else
-    # Image-Erstellungszeit in Unix-Sekunden
-    IMAGE_TS=$(docker inspect --format='{{.Created}}' kx-bridge:latest \
-        | python3 -c "import sys,datetime; s=sys.stdin.read().strip(); \
-          s=s[:26].rstrip('Z').replace('T',' '); \
-          print(int(datetime.datetime.fromisoformat(s).replace(tzinfo=datetime.timezone.utc).timestamp()))" 2>/dev/null || echo 0)
-
-    for f in Dockerfile \
-              bridge/kobrax_moonraker_bridge.py \
-              bridge/kobrax_client.py \
-              bridge/env_loader.py \
-              bridge/requirements.txt \
-              bridge/anycubic_slicer.crt \
-              bridge/anycubic_slicer.key; do
-        if [[ -f "$f" ]]; then
-            FILE_TS=$(python3 -c "import os; print(int(os.path.getmtime('$f')))" 2>/dev/null || echo 0)
-            if [[ $FILE_TS -gt $IMAGE_TS ]]; then
-                echo "[start] '$f' ist neuer als das Image – baue neu ..."
-                NEEDS_BUILD=1
-                break
-            fi
-        fi
-    done
+    echo ""
+    echo "  Welchen Release-Kanal möchtest du starten?"
+    echo "    1) stable   (empfohlen)"
+    echo "    2) nightly  (getestete Vorabversion)"
+    echo -n "  Auswahl [1]: "
+    read -r CHOICE
+    case "$CHOICE" in
+        2) CHANNEL="nightly" ;;
+        *) CHANNEL="stable" ;;
+    esac
 fi
 
-if [[ $NEEDS_BUILD -eq 1 ]]; then
-    docker build -t kx-bridge:latest .
+if [[ "$CHANNEL" == "nightly" ]]; then
+    IMAGE_TAG="nightly"
+else
+    IMAGE_TAG="latest"
+fi
+IMAGE="$IMAGE_BASE:$IMAGE_TAG"
+
+echo "[start] Kanal: $CHANNEL  →  Image: $IMAGE"
+echo "[start] Ziehe aktuelles Image ..."
+docker pull "$IMAGE"
+
+# docker-compose.yml auf den gewählten Kanal umschreiben (nur die image-Zeile)
+if [[ -f docker-compose.yml ]]; then
+    sed -i.bak -E "s#^(\s*image:\s*).*#\1$IMAGE#" docker-compose.yml
+    rm -f docker-compose.yml.bak
 fi
 
 # Container starten
@@ -70,7 +72,7 @@ docker-compose down 2>/dev/null || true
 docker-compose up -d
 
 echo ""
-echo "  ✓ KX-Bridge läuft"
+echo "  ✓ KX-Bridge läuft ($CHANNEL)"
 echo "  Web-UI : http://$(hostname -I | awk '{print $1}'):7125"
 echo "  Logs   : docker-compose logs -f"
 echo "  Stop   : docker-compose down"

tests/test_spoolman_slot_map.py

@@ -0,0 +1,100 @@
+"""Per-printer Spoolman slot-map isolation + persistence (config_loader).
+
+Regression test for two bugs in the Spoolman slot→spool persistence:
+
+  1. The bridge referenced ``config_loader`` while the module alias is
+     ``env_loader`` → ``NameError`` swallowed by a bare ``except``, so the map
+     was never loaded nor saved (persistence looked implemented but was dead).
+  2. The map lived in a single global ``[spoolman] slot_spools`` key, so two
+     printers/two AMS units overwrote each other (same class as issue #74/#75).
+
+Each printer now uses its own ``[spoolman_<id>]`` section, with a read-fallback
+to the legacy global key for backward compatibility. The global ``[spoolman]``
+section keeps ``server`` / ``sync_rate``.
+"""
+import sys
+import pathlib
+import configparser
+
+sys.path.insert(0, str(pathlib.Path(__file__).resolve().parent.parent))  # repo root
+import config_loader  # noqa: E402
+
+BASE_INI = (
+    "[printer_1]\nname = K1\n\n"
+    "[printer_2]\nname = K2\n\n"
+    "[spoolman]\n"
+    "server = http://192.168.3.200:7912\n"
+    "sync_rate = 0\n"
+    "slot_spools = 0:1,1:2\n"
+)
+
+
+def _use_ini(monkeypatch, tmp_path, text=BASE_INI):
+    path = tmp_path / "config.ini"
+    path.write_text(text, encoding="utf-8")
+    monkeypatch.setattr(config_loader, "_find_config_file", lambda: path)
+    return path
+
+
+def test_legacy_global_read(tmp_path, monkeypatch):
+    """No printer_id -> original global [spoolman] slot_spools (back-compat)."""
+    _use_ini(monkeypatch, tmp_path)
+    assert config_loader.list_spool_map() == {0: 1, 1: 2}
+
+
+def test_read_falls_back_to_global_until_first_save(tmp_path, monkeypatch):
+    """Before any per-printer save, both printers see the global mapping."""
+    _use_ini(monkeypatch, tmp_path)
+    assert config_loader.list_spool_map("1") == {0: 1, 1: 2}
+    assert config_loader.list_spool_map("2") == {0: 1, 1: 2}
+
+
+def test_saving_one_printer_does_not_touch_the_other(tmp_path, monkeypatch):
+    """Core regression: mapping printer 1 must not change printer 2."""
+    _use_ini(monkeypatch, tmp_path)
+    config_loader.save_spool_map({0: 42, 1: 17}, "1")
+    assert config_loader.list_spool_map("1") == {0: 42, 1: 17}
+    # printer 2 has no own section yet -> still the global fallback
+    assert config_loader.list_spool_map("2") == {0: 1, 1: 2}
+    # legacy global key preserved untouched
+    assert config_loader.list_spool_map() == {0: 1, 1: 2}
+
+
+def test_both_printers_isolated_after_each_saves(tmp_path, monkeypatch):
+    _use_ini(monkeypatch, tmp_path)
+    config_loader.save_spool_map({0: 42, 1: 17}, "1")
+    config_loader.save_spool_map({0: 5, 1: 6}, "2")
+    assert config_loader.list_spool_map("1") == {0: 42, 1: 17}
+    assert config_loader.list_spool_map("2") == {0: 5, 1: 6}
+
+
+def test_save_preserves_server_and_sync_rate(tmp_path, monkeypatch):
+    """Writing a per-printer map must not clobber [spoolman] server/sync_rate."""
+    path = _use_ini(monkeypatch, tmp_path)
+    config_loader.save_spool_map({0: 42}, "1")
+    cfg = configparser.ConfigParser()
+    cfg.read(path, encoding="utf-8")
+    assert cfg.get("spoolman", "server") == "http://192.168.3.200:7912"
+    assert cfg.get("spoolman", "sync_rate") == "0"
+    assert cfg.get("spoolman_1", "slot_spools") == "0:42"
+
+
+def test_persistence_round_trips(tmp_path, monkeypatch):
+    """Save then read back (simulates a bridge restart) — the map survives."""
+    _use_ini(monkeypatch, tmp_path, text="[spoolman]\nserver = http://x:7912\n")
+    config_loader.save_spool_map({0: 7, 2: 9}, "1")
+    assert config_loader.list_spool_map("1") == {0: 7, 2: 9}
+
+
+def test_empty_map_clears_the_key(tmp_path, monkeypatch):
+    _use_ini(monkeypatch, tmp_path)
+    config_loader.save_spool_map({0: 42}, "1")
+    config_loader.save_spool_map({}, "1")            # clear
+    # per-printer key gone -> falls back to the legacy global map
+    assert config_loader.list_spool_map("1") == {0: 1, 1: 2}
+
+
+def test_parse_ignores_malformed_and_nonpositive(tmp_path, monkeypatch):
+    _use_ini(monkeypatch, tmp_path,
+             text="[spoolman]\nslot_spools = 0:1, x:y, 2:0, 3:-4, 4:5, junk\n")
+    assert config_loader.list_spool_map() == {0: 1, 4: 5}

web/themes/default/app.js

@@ -45,7 +45,7 @@ var ACE_DRY_PRESETS={
 };
 
 // Spoolman state
-var _spoolmanStatus={configured:false,server:'',sync_rate:0,slot_spools:{}};
+var _spoolmanStatus={configured:false,reachable:false,server:'',sync_rate:0,slot_spools:{}};
 var _spoolmanSpools=[];
 var _slotSpoolMap={};  // {String(global_index): spoolman_spool_id} — last committed assignment
 
@@ -67,10 +67,12 @@ function _updateSpoolmanStatusDot(){
   var dot=document.getElementById('spoolman-status-dot');
   var lbl=document.getElementById('spoolman-status-lbl');
   if(!dot||!lbl)return;
-  if(_spoolmanStatus.configured){
+  if(!_spoolmanStatus.configured){
+    dot.style.color='var(--txt2)';lbl.textContent='nicht konfiguriert';
+  } else if(_spoolmanStatus.reachable){
     dot.style.color='var(--ok)';lbl.textContent=_spoolmanStatus.server||'verbunden';
   } else {
-    dot.style.color='var(--txt2)';lbl.textContent='nicht konfiguriert';
+    dot.style.color='var(--err)';lbl.textContent=(_spoolmanStatus.server||'')+' (nicht erreichbar)';
   }
 }
 
@@ -100,7 +102,7 @@ function _buildSpoolmanSection(){
       var currentSpool=_slotSpoolMap[String(idx)]||'';
       var opts='<option value="">–</option>'+_spoolmanSpools.map(function(sp){
         var rem=sp.remaining_weight!=null?' ('+sp.remaining_weight.toFixed(0)+'g)':'';
-        var vendor=sp.filament&&sp.filament.vendor?sp.filament.vendor+' ':'';
+        var vendor=sp.filament&&sp.filament.vendor?sp.filament.vendor.name+' ':'';
         var name=sp.filament&&sp.filament.name?sp.filament.name:'Spool';
         return '<option value="'+sp.id+'"'+(sp.id==currentSpool?' selected':'')+'>'+
                escHtml('#'+sp.id+' '+vendor+name+rem)+'</option>';
@@ -406,6 +408,7 @@ function applyLang(){
   setText('lbl-set-lang',T.settings_cat_language||'Sprache');
   setText('lbl-set-theme',T.settings_cat_theme||'Hell / Dunkel umschalten');
   setText('lbl-poll-interval',T.settings_poll||'Poll-Intervall (Sekunden)');
+  setText('lbl-verbose-http-log',T.settings_verbose_http_log||'Log every HTTP request (verbose)');
   setText('lbl-filament-mapping',T.settings_filament_mapping||'Filament-Profil-Mapping (pro Slot)');
   setText('lbl-filament-mapping-save',T.settings_filament_mapping_save||'Mapping speichern');
   setText('lbl-visible-vendors',T.settings_visible_vendors||'Sichtbare Hersteller (Profil-Dropdown)');
@@ -433,6 +436,7 @@ function applyLang(){
   setText('lbl-default-slot',T.settings_default_slot);
   setText('opt-slot-auto',T.settings_slot_auto);
   setText('lbl-auto-leveling',T.settings_auto_leveling);
+  setText('lbl-vibration-compensation',T.settings_vibration_compensation);
   setText('lbl-file-ready-mode',T.settings_file_ready_mode);
   setText('opt-file-ready-dialog',T.settings_file_ready_dialog);
   setText('opt-file-ready-banner',T.settings_file_ready_banner);
@@ -1086,6 +1090,7 @@ function openSettings(){
     document.getElementById('s-mode-id').value=d.mode_id||'';
     document.getElementById('s-default-slot').value=d.default_ams_slot||'auto';
     document.getElementById('s-auto-leveling').checked=(d.auto_leveling===undefined?true:!!d.auto_leveling);
+    var vc=document.getElementById('s-vibration-compensation');if(vc)vc.checked=!!d.vibration_compensation;
     var cop=document.getElementById('s-camera-on-print');if(cop)cop.checked=!!d.camera_on_print;
     var frm=document.getElementById('s-file-ready-mode');if(frm)frm.value=(d.print_start_dialog===undefined?'1':String(d.print_start_dialog?1:0));
     var wuw=document.getElementById('s-web-upload-warning');if(wuw)wuw.checked=(d.web_upload_warning===undefined?true:!!d.web_upload_warning);
@@ -1095,6 +1100,7 @@ function openSettings(){
       var sec=d.poll_interval||Math.round((parseInt(localStorage.getItem('pollInterval')||'2000'))/1000)||3;
       pi.value=sec;
     }
+    var vhl=document.getElementById('s-verbose-http-log');if(vhl)vhl.checked=!!d.verbose_http_log;
     renderFilamentMapping(d.filament_profiles||{});
     renderSpoolmanSlotCard();
     // Spoolman
@@ -1413,7 +1419,14 @@ function doProfileImportUpload(files){
 // ── AMS Slot Edit ──
 var _slotEditIndex=-1;
 var _slotEditLoaded=false;
-var _MAT_PRESETS=['PLA','PETG','ABS','ASA','TPU','PA','PC','HIPS'];
+var _MAT_PRESETS=['PLA','PLA+','PLA SILK','PLA MATTE','PETG','ABS','ASA','TPU','PA','PC','HIPS'];
+function _normalizeMat(m){
+  var s=m.toUpperCase().trim().replace(/-/g,' ').replace(/_/g,' ');
+  var aliases={'PLAPLUS':'PLA+','PLA PLUS':'PLA+','SILK PLA':'PLA SILK','PLASILK':'PLA SILK',
+    'PLA MATTE':'PLA','PLA MARBLE':'PLA','PLA WOOD':'PLA','TPE':'TPU',
+    'PETG PLUS':'PETG+','PA6':'PA','PA12':'PA','PA66':'PA'};
+  return aliases[s]||s;
+}
 var _BASE_MATERIAL_TYPES=['PLA','PETG','ABS','ASA','TPU','TPE','PA','PC','HIPS','PEI','PEEK'];
 function updateSlotEditFeedButton(){
   var btn=document.getElementById('btn-slot-edit-feed');
@@ -1454,10 +1467,21 @@ function _fillSlotProfileDropdown(material, currentVendor, currentName){
   _loadOrcaFilaments(function(profiles){
     // Type-Filter: nur Profile vom passenden material zeigen (z.B. PLA → alle PLA-Varianten)
     var matU=(material||'').toUpperCase().trim();
+    // PLA-Varianten: Drucker meldet "PLA SILK"/"PLA+"/"PLA MATTE", OrcaSlicer
+    // speichert alle unter type=PLA — Namens-Keyword als Zusatzfilter.
+    var _PLA_VARIANT_KW={'PLA SILK':'silk','PLA+':'pla+','PLA MATTE':'matte',
+      'PLA MARBLE':'marble','PLA WOOD':'wood'};
+    var variantKw=_PLA_VARIANT_KW[matU]||null;
+    var baseMat=variantKw?'PLA':matU;
     var matched=profiles.filter(function(p){
       var pt=(p.type||'').toUpperCase();
-      // PLA-CF, PLA-SILK etc. zählen auch zu PLA
-      return matU==='' || pt===matU || pt.startsWith(matU+'-') || pt.startsWith(matU+' ');
+      var nameL=(p.name||'').toLowerCase();
+      // Basis-Typ muss passen
+      var typeOk=baseMat===''||pt===baseMat||pt.startsWith(baseMat+'-')||pt.startsWith(baseMat+' ');
+      if(!typeOk) return false;
+      // Bei Variante: Name muss Keyword enthalten (z.B. "silk", "matte", "pla+")
+      if(variantKw) return nameL.indexOf(variantKw)!==-1;
+      return true;
     });
     sel.innerHTML='<option value="">'+tr('slot_edit_profile_default')+'</option>';
     // User-Profile (is_user) zuerst — eigene Optgroup '★ Eigene' an erster Stelle.
@@ -1619,11 +1643,14 @@ function openSlotEdit(i){
   _renderCopyFromSlot(globalIdx);
   var mat=(slot.type||'PLA').toUpperCase();
   document.getElementById('slot-edit-mat').value=mat;
+  // Normalisieren für Button-Highlighting: PLA-Varianten auf nächsten Preset mappen
+  var matNorm=_normalizeMat(mat);
   var btns=document.getElementById('slot-mat-btns');
   btns.innerHTML=_MAT_PRESETS.map(function(m){
+    var active=m===mat||m===matNorm;
     return '<button class="mat-preset-btn" data-mat="'+m+'" onclick="selectMatPreset(\''+m+'\')" '
       +'style="padding:4px 10px;border-radius:6px;border:1px solid var(--border);cursor:pointer;font-size:12px;'
-      +(m===mat?'background:var(--accent);color:#fff':'background:var(--raised);color:var(--txt2)')+'">'+m+'</button>';
+      +(active?'background:var(--accent);color:#fff':'background:var(--raised);color:var(--txt2)')+'">'+m+'</button>';
   }).join('');
   // OrcaSlicer-Profil-Dropdown: aktuellen User-Override für diesen Slot
   // aus /kx/filament/slots holen (enthält vendor+name+id).
@@ -1830,11 +1857,13 @@ function saveSettings(){
     device_id:        document.getElementById('s-device-id').value,
     mode_id:          document.getElementById('s-mode-id').value,
     default_ams_slot: document.getElementById('s-default-slot').value,
-    auto_leveling:    document.getElementById('s-auto-leveling').checked?1:0,
-    camera_on_print:  (document.getElementById('s-camera-on-print')||{}).checked?1:0,
+    auto_leveling:           document.getElementById('s-auto-leveling').checked?1:0,
+    vibration_compensation:  (document.getElementById('s-vibration-compensation')||{}).checked?1:0,
+    camera_on_print:         (document.getElementById('s-camera-on-print')||{}).checked?1:0,
     print_start_dialog: parseInt((document.getElementById('s-file-ready-mode')||{}).value||'1',10),
     web_upload_warning:webUploadWarning,
     poll_interval:    Math.min(60,Math.max(1,parseInt((document.getElementById('s-poll-interval')||{}).value,10)||3)),
+    verbose_http_log: (document.getElementById('s-verbose-http-log')||{}).checked?1:0,
     spoolman_server:  (document.getElementById('s-spoolman-url')||{}).value||'',
     spoolman_sync_rate: Math.max(0,parseInt((document.getElementById('s-spoolman-sync-rate')||{}).value||'30',10)),
   }).then(function(){
@@ -1941,6 +1970,7 @@ var pollTimer;
     });
   }).catch(function(){});
   poll();pollTimer=setInterval(poll,ms);
+  setInterval(_loadSpoolmanStatus,30000);
 })();
 
 // ── Print actions ──

web/themes/default/index.html

@@ -509,6 +509,10 @@
                 <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-vibration-compensation" style="width:auto;margin:0">
+                <label id="lbl-vibration-compensation" style="margin:0;cursor:pointer" for="s-vibration-compensation">Resonance compensation before print</label>
+              </div>
               <div class="modal-field">
                 <label id="lbl-file-ready-mode">Nach Upload: Druckstart-Verhalten</label>
                 <select id="s-file-ready-mode">
@@ -550,6 +554,10 @@
                 <input type="number" id="s-poll-interval" min="1" max="60" step="1" placeholder="3" oninput="onPollIntervalInput()">
                 <small style="color:var(--txt2)" id="lbl-poll-hint">Wie oft die Bridge den Drucker-Status abfragt</small>
               </div>
+              <div class="modal-field" style="flex-direction:row;align-items:center;gap:10px">
+                <input type="checkbox" id="s-verbose-http-log" style="width:auto;margin:0">
+                <label id="lbl-verbose-http-log" style="margin:0;cursor:pointer" for="s-verbose-http-log">Log every HTTP request (verbose)</label>
+              </div>
             </div>
           </div>
 

web/translations/de.json

@@ -212,6 +212,7 @@
   "progress_action_slots": "Slots zuordnen",
   "settings_auto_leveling": "Auto-Leveling vor Druck",
   "settings_auto_leveling_label": "Auto-Leveling vor dem Druck",
+  "settings_vibration_compensation": "Resonanzkompensation",
   "settings_btn_tooltip": "Einstellungen",
   "settings_camera_on_print": "Kamera bei Druckstart einschalten",
   "settings_cat_connection": "Verbindung",
@@ -245,6 +246,7 @@
   "settings_password": "MQTT-Passwort",
   "settings_poll": "Poll-Intervall (Sekunden)",
   "settings_poll_interval_hint": "Wie oft die Bridge den Druckerstatus abfragt",
+  "settings_verbose_http_log": "Jede HTTP-Anfrage loggen (ausführlich)",
   "settings_poll_interval_label": "Poll-Intervall (Sekunden)",
   "settings_print": "Druckeinstellungen",
   "settings_printer_ip": "Drucker-IP",

web/translations/en.json

@@ -212,6 +212,7 @@
   "progress_action_slots": "Map slots",
   "settings_auto_leveling": "Auto-Leveling Default",
   "settings_auto_leveling_label": "Auto-Leveling before print",
+  "settings_vibration_compensation": "Resonance Compensation",
   "settings_btn_tooltip": "Settings",
   "settings_camera_on_print": "Turn camera on at print start",
   "settings_cat_connection": "Connection",
@@ -245,6 +246,7 @@
   "settings_password": "MQTT Password",
   "settings_poll": "Poll Interval (seconds)",
   "settings_poll_interval_hint": "How often the bridge queries printer status",
+  "settings_verbose_http_log": "Log every HTTP request (verbose)",
   "settings_poll_interval_label": "Poll Interval (seconds)",
   "settings_print": "Print Settings",
   "settings_printer_ip": "Printer IP",

web/translations/es.json

@@ -212,6 +212,7 @@
   "progress_action_slots": "Asignar ranuras",
   "settings_auto_leveling": "Autonivelado antes de imprimir",
   "settings_auto_leveling_label": "Autonivelado antes de imprimir",
+  "settings_vibration_compensation": "Compensación de resonancia",
   "settings_btn_tooltip": "Ajustes",
   "settings_camera_on_print": "Encender cámara al iniciar impresión",
   "settings_cat_connection": "Conexión",
@@ -245,6 +246,7 @@
   "settings_password": "Contraseña MQTT",
   "settings_poll": "Intervalo de sondeo (segundos)",
   "settings_poll_interval_hint": "Con qué frecuencia el bridge consulta el estado de la impresora",
+  "settings_verbose_http_log": "Registrar cada solicitud HTTP (detallado)",
   "settings_poll_interval_label": "Intervalo de sondeo (segundos)",
   "settings_print": "Ajustes de impresión",
   "settings_printer_ip": "IP de impresora",

web/translations/zh-cn.json

@@ -212,6 +212,7 @@
   "progress_action_slots": "分配槽位",
   "settings_auto_leveling": "打印前自动调平",
   "settings_auto_leveling_label": "打印前自动调平",
+  "settings_vibration_compensation": "打印前共振补偿",
   "settings_btn_tooltip": "设置",
   "settings_camera_on_print": "打印开始时开启相机",
   "settings_cat_connection": "连接",
@@ -245,6 +246,7 @@
   "settings_password": "MQTT 密码",
   "settings_poll": "轮询间隔（秒）",
   "settings_poll_interval_hint": "Bridge 查询打印机状态的频率",
+  "settings_verbose_http_log": "记录每个 HTTP 请求（详细模式）",
   "settings_poll_interval_label": "轮询间隔（秒）",
   "settings_print": "打印设置",
   "settings_printer_ip": "打印机 IP",