mirror of
https://github.com/maziggy/bambuddy.git
synced 2026-10-09 07:25:44 +02:00
maziggy
a7b563334e
A slicer preset is bound to a printer model: "Bambu PLA Basic @BBL X1C" is not the same preset as "@BBL H2C", and Bambu names a nozzle size in it as well. A spool carried exactly one, which was right until the same spool was used on a second machine -- the AMS slot on the other one was then configured with a preset that machine has no profile for. K profiles had the matching gap from the other side: the tables have always been keyed per hotend, but the picker could not express it. spool_filament_preset and its Spoolman twin store the exceptions, keyed (spool, printer_model, nozzle_diameter). Model rather than printer because the preset is a property of the model -- "@BBL X1C" is the same preset on every X1C, and asking per machine would mean picking the identical value twice. K profiles stay on printer_id, because a K value is measured on one physical hotend and two machines of the same model legitimately differ. Resolution is exact (model, diameter) -> (model, "") -> the spool's own preset, so a spool nobody has configured behaves exactly as it did before. The form writes one row per nozzle size and never the "" row; that level is kept for API clients wanting one value to cover a model. Both halves cover every standard nozzle size rather than the size currently fitted, because a spool is configured once and nozzles get swapped. The PA Profile tab becomes a Printers tab: a model list beside a detail pane holding a preset row per size and a K-profile grid of size by hotend. Each model is offered only the presets that name it, through the same matcher the Configure AMS Slot modal filters with, which moves out of that component into utils/slicerPrinterMatch. Presets whose name identifies no model -- most user-authored and OrcaSlicer ones -- stay offered everywhere, as does whatever is already selected, so a saved override cannot vanish from the control that shows it. Every preset carries an origin badge in the wording and colours that modal already uses. Every path that configures a slot now respects both: manual assign in either inventory mode, RFID auto-assign, the Spoolman tag link, the re-fire when a slot goes empty to loaded, the re-apply after a calibration-table refresh, and the re-selection when a Filament Track Switch moves an AMS to the other nozzle. Which nozzle a slot feeds, and how wide it is, was worked out independently in seven of those places, each reading nozzles[0] for every slot on the machine -- correct on a single-nozzle printer and on a dual-nozzle printer with matching nozzles, wrong the moment two sizes are fitted. That resolution is now services/slot_nozzle. Which array entry belongs to which hotend is no longer inferred. Measured on an H2D fitted with a 0.4 high flow on the left and a 0.6 on the right, nozzles[0] reads the right hotend, so the array is indexed by extruder id and the H2/X2 parser's convention is the one that holds. The legacy parser's opposite convention never governs a real dual-nozzle machine: every model in DUAL_NOZZLE_MODELS reports device.nozzle.info, and left_nozzle_diameter appears in no log or wire capture. Two comments that said otherwise were wrong and are fixed; amsHelpers' code was right all along and only its comment lied. Four defects surfaced while wiring it, all pre-existing except the last. The picker identified a chosen calibration by cali_idx alone, and the printer numbers its calibration table per nozzle -- on a dual-nozzle machine the same index exists on both hotends meaning different things, so saving could persist the other hotend's K value and diameter; SpoolBuddy's write-tag page carried a verbatim copy and gets the same fix. RFID auto-assign chose a K profile with no extruder test at all, so a spool calibrated on both hotends had a coin toss decide which pressure-advance value the slot got, on the path that runs unattended every time a Bambu spool is loaded. The Spoolman tag-link path resolved no preset whatsoever, configuring every linked slot with a generic material id and discarding a preset set in inventory -- the same defect #1713 fixed on the assign path, one function over. And an FTS inlet move re-selected K for nozzle 0 rather than for the nozzle the AMS had just been moved to. The last one is new here: a per-model override can be a cloud USER preset, whose PFUS-prefixed id the slicer rejects, and passing it straight into extrusion_cali_sel would silently lose the K-profile link. Reached the printer only where such an override exists, which is why nothing in the suite caught it. printer_safe_filament_id falls through to the spool's own preset and then the tray's RFID value instead. Reading a printer's calibration table asks for one nozzle size at a time. H2-series firmware answers only the first one or two of a concurrent burst of extrusion_cali_get and silently drops the rest, each dropped request costing a five-second timeout before its retry: measured at 11 and 23 seconds on an H2C and an H2D for four parallel requests, against roughly one second in series. An X1C answers all four at once, which is why this only ever surfaced on dual-diameter printers. Printers themselves are read in parallel -- separate machines are separate connections. The Configure AMS Slot dialog opens on the spool's own configured values, falling back to the slot's last manual configuration and then the tray's RFID data. The spool form is wider for the two-pane layout, colour, weight, cost and location move to their own tab in two columns, and a printer card in expanded view lists every fitted nozzle size rather than the first entry alone.
91 lines
4.6 KiB
Python
91 lines
4.6 KiB
Python
from datetime import datetime
|
|
|
|
from sqlalchemy import DateTime, ForeignKey, Integer, String, UniqueConstraint, func
|
|
from sqlalchemy.orm import Mapped, mapped_column, relationship
|
|
|
|
from backend.app.core.database import Base
|
|
|
|
|
|
class SpoolFilamentPreset(Base):
|
|
"""Per-printer-model override of a spool's slicer filament preset.
|
|
|
|
``Spool.slicer_filament`` holds ONE preset, and that is deliberate -- the
|
|
spool form is printer-agnostic and the user picks the variant they want
|
|
(see ``spool-form/utils.ts``). It stops being enough as soon as the same
|
|
spool is used on two different printer models: a cloud or Orca preset is
|
|
bound to a model (``@BBL X1C``), so the spool that carries an X1C variant
|
|
configures an AMS slot on an H2C with a preset that machine has no profile
|
|
for.
|
|
|
|
Keyed on the printer MODEL, not the printer: ``@BBL X1C`` is the same
|
|
preset on every X1C the user owns, and keying per machine would make them
|
|
pick the identical value once per printer. (K profiles are the opposite --
|
|
a K value is measured on one individual hotend -- which is why
|
|
``spool_k_profile`` keys on ``printer_id`` and this does not.)
|
|
|
|
``nozzle_diameter`` is part of the key because the preset lands on an AMS
|
|
slot, and a slot feeds exactly one nozzle: on a dual-nozzle machine with
|
|
two different diameters fitted, one preset per model cannot be right for
|
|
both hotends, and diameter-specific presets genuinely exist
|
|
(``Bambu PLA Basic @BBL A1M 0.2 nozzle``). Empty string means "any nozzle
|
|
of this model". The spool form does not write that row -- it offers one row
|
|
per nozzle size and nothing above them, because a preset lands on an AMS
|
|
slot and a slot feeds exactly one nozzle -- but the level is kept in the
|
|
cascade for API clients that want one value to cover a whole model.
|
|
Resolution order is
|
|
|
|
exact (model, diameter) -> (model, "") -> ``Spool.slicer_filament``
|
|
|
|
which is what ``services.spool_filament_preset.resolve_spool_preset``
|
|
implements. Empty string rather than NULL because NULLs compare distinct
|
|
in a UNIQUE constraint on both SQLite and PostgreSQL, so a nullable
|
|
column would happily store the same "any nozzle" row twice.
|
|
"""
|
|
|
|
__tablename__ = "spool_filament_preset"
|
|
|
|
__table_args__ = (UniqueConstraint("spool_id", "printer_model", "nozzle_diameter"),)
|
|
|
|
id: Mapped[int] = mapped_column(primary_key=True)
|
|
spool_id: Mapped[int] = mapped_column(ForeignKey("spool.id", ondelete="CASCADE"), index=True)
|
|
# Matches ``printers.model`` ("X1C", "H2D", "A1 mini"), not a display name.
|
|
printer_model: Mapped[str] = mapped_column(String(50))
|
|
# "" = any nozzle of this model; otherwise the bare decimal the printer
|
|
# reports ("0.4", "0.2"), the same form ``spool_k_profile`` stores.
|
|
nozzle_diameter: Mapped[str] = mapped_column(String(10), default="")
|
|
# Wider than ``Spool.slicer_filament`` (String(50)) on purpose: the same
|
|
# values reach the Spoolman path, whose write schema already allows 128 /
|
|
# 255, and a preset id that fits there must not truncate here.
|
|
slicer_filament: Mapped[str | None] = mapped_column(String(128))
|
|
slicer_filament_name: Mapped[str | None] = mapped_column(String(255))
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now())
|
|
|
|
spool: Mapped["Spool"] = relationship(back_populates="filament_presets")
|
|
|
|
|
|
class SpoolmanFilamentPreset(Base):
|
|
"""``SpoolFilamentPreset`` for a Spoolman-managed spool.
|
|
|
|
Mirrors ``SpoolmanKProfile``: Spoolman owns the spool, Bambuddy owns this
|
|
override, so the row is local and keyed by the remote spool id with no
|
|
foreign key to enforce it. Kept in a Bambuddy table rather than in the
|
|
spool's Spoolman ``extra`` dict for the same reason the K profiles are --
|
|
it is Bambu-specific data that no other Spoolman client can use, and the
|
|
extra dict cannot express a per-model list without hand-rolled JSON.
|
|
"""
|
|
|
|
__tablename__ = "spoolman_filament_preset"
|
|
|
|
__table_args__ = (UniqueConstraint("spoolman_spool_id", "printer_model", "nozzle_diameter"),)
|
|
|
|
id: Mapped[int] = mapped_column(primary_key=True)
|
|
spoolman_spool_id: Mapped[int] = mapped_column(Integer, nullable=False, index=True)
|
|
printer_model: Mapped[str] = mapped_column(String(50))
|
|
nozzle_diameter: Mapped[str] = mapped_column(String(10), default="")
|
|
slicer_filament: Mapped[str | None] = mapped_column(String(128))
|
|
slicer_filament_name: Mapped[str | None] = mapped_column(String(255))
|
|
created_at: Mapped[datetime] = mapped_column(DateTime, server_default=func.now())
|
|
|
|
|
|
from backend.app.models.spool import Spool # noqa: E402, F401
|