Prusa: move filament_ids off shared templates onto family roots

Phase 2 of the filament_id cleanup (31 collision groups, all one mechanism:
material-class ids on shared fdm_filament_* templates collapsing HF/-CF/
Prusament lines onto one id, plus 3 overclaims). 18 new @base family roots
(owner generic keeps the legacy id, 12 impostor families get deterministic
mints), 72 config-neutral inherits repoints, 6 template filament_id keys
removed (only where every id-less inheritor is covered by a new root;
fdm_filament_asa/pc keep theirs for the frozen Prusament @XL riders),
3 compatible_printers trims on MINIIS printers covered by dedicated @MINIIS
variants. Frozen name-shaped and _NN per-variant ids stay byte-identical.

Verified: config-equivalence gate zero unexpected diffs; extra check exit 0;
--check exit 0; validator -l 2 exit 0; extended -f -v Prusa exit 0 (was 31
groups / 1035 printer-level errors on the pre-apply copy).
This commit is contained in:
SoftFever
2026-07-03 00:09:05 +08:00
parent 674344b3c1
commit 095fd9fba4
98 changed files with 340 additions and 125 deletions

View File

@@ -1448,6 +1448,10 @@
"name": "fdm_filament_tpu",
"sub_path": "filament/fdm_filament_tpu.json"
},
{
"name": "Prusa Generic ABS @base",
"sub_path": "filament/Prusa Generic ABS @base.json"
},
{
"name": "Prusa Generic ABS",
"sub_path": "filament/Prusa Generic ABS.json"
@@ -1504,6 +1508,10 @@
"name": "Prusa Generic ABS @XL 5T",
"sub_path": "filament/Prusa Generic ABS @XL 5T.json"
},
{
"name": "Prusa Generic ABS HF @base",
"sub_path": "filament/Prusa Generic ABS HF @base.json"
},
{
"name": "Prusa Generic ABS HF @MINIIS",
"sub_path": "filament/Prusa Generic ABS HF @MINIIS.json"
@@ -1576,6 +1584,10 @@
"name": "Prusa Generic ASA @MK4S",
"sub_path": "filament/Prusa Generic ASA @MK4S.json"
},
{
"name": "Prusa Generic ASA HF @base",
"sub_path": "filament/Prusa Generic ASA HF @base.json"
},
{
"name": "Prusa Generic ASA HF @MINIIS",
"sub_path": "filament/Prusa Generic ASA HF @MINIIS.json"
@@ -1624,6 +1636,10 @@
"name": "Prusa Generic TPU @CORE One",
"sub_path": "filament/Prusa Generic TPU @CORE One.json"
},
{
"name": "Prusa Generic PA @base",
"sub_path": "filament/Prusa Generic PA @base.json"
},
{
"name": "Prusa Generic PA",
"sub_path": "filament/Prusa Generic PA.json"
@@ -1660,6 +1676,10 @@
"name": "Prusa Generic PA @MK3.5 0.8",
"sub_path": "filament/Prusa Generic PA @MK3.5 0.8.json"
},
{
"name": "Prusa Generic PA-CF @base",
"sub_path": "filament/Prusa Generic PA-CF @base.json"
},
{
"name": "Prusa Generic PA-CF",
"sub_path": "filament/Prusa Generic PA-CF.json"
@@ -1744,6 +1764,10 @@
"name": "Prusa Generic PC @MK3.5 0.8",
"sub_path": "filament/Prusa Generic PC @MK3.5 0.8.json"
},
{
"name": "Prusa Generic PC HF @base",
"sub_path": "filament/Prusa Generic PC HF @base.json"
},
{
"name": "Prusa Generic PC HF @MINIIS",
"sub_path": "filament/Prusa Generic PC HF @MINIIS.json"
@@ -1792,6 +1816,10 @@
"name": "Prusament PC-CF @XL 5T",
"sub_path": "filament/Prusament PC-CF @XL 5T.json"
},
{
"name": "Prusa Generic PETG @base",
"sub_path": "filament/Prusa Generic PETG @base.json"
},
{
"name": "Prusa Generic PETG",
"sub_path": "filament/Prusa Generic PETG.json"
@@ -1848,6 +1876,10 @@
"name": "Prusa Generic PETG @XL 5T",
"sub_path": "filament/Prusa Generic PETG @XL 5T.json"
},
{
"name": "Prusa Generic PETG HF @base",
"sub_path": "filament/Prusa Generic PETG HF @base.json"
},
{
"name": "Prusa Generic PETG HF @MINIIS",
"sub_path": "filament/Prusa Generic PETG HF @MINIIS.json"
@@ -1876,6 +1908,10 @@
"name": "Prusament PETG @CORE One",
"sub_path": "filament/Prusament PETG @CORE One.json"
},
{
"name": "Prusament PETG @base",
"sub_path": "filament/Prusament PETG @base.json"
},
{
"name": "Prusament PETG @XL",
"sub_path": "filament/Prusament PETG @XL.json"
@@ -1884,6 +1920,10 @@
"name": "Prusament PETG @XL 5T",
"sub_path": "filament/Prusament PETG @XL 5T.json"
},
{
"name": "Prusa Generic PLA @base",
"sub_path": "filament/Prusa Generic PLA @base.json"
},
{
"name": "Prusa Generic PLA",
"sub_path": "filament/Prusa Generic PLA.json"
@@ -1940,6 +1980,10 @@
"name": "Prusa Generic PLA @XL 5T",
"sub_path": "filament/Prusa Generic PLA @XL 5T.json"
},
{
"name": "Prusa Generic PLA HF @base",
"sub_path": "filament/Prusa Generic PLA HF @base.json"
},
{
"name": "Prusa Generic PLA HF @MINIIS",
"sub_path": "filament/Prusa Generic PLA HF @MINIIS.json"
@@ -1968,6 +2012,10 @@
"name": "Prusa Generic PLA Silk @CORE One",
"sub_path": "filament/Prusa Generic PLA Silk @CORE One.json"
},
{
"name": "Prusa Generic PLA-CF @base",
"sub_path": "filament/Prusa Generic PLA-CF @base.json"
},
{
"name": "Prusa Generic PLA-CF",
"sub_path": "filament/Prusa Generic PLA-CF.json"
@@ -2008,6 +2056,10 @@
"name": "Prusament PLA @CORE One",
"sub_path": "filament/Prusament PLA @CORE One.json"
},
{
"name": "Prusament PLA @base",
"sub_path": "filament/Prusament PLA @base.json"
},
{
"name": "Prusament PLA @XL",
"sub_path": "filament/Prusament PLA @XL.json"
@@ -2020,6 +2072,10 @@
"name": "Prusament rPLA @CORE One",
"sub_path": "filament/Prusament rPLA @CORE One.json"
},
{
"name": "Prusament rPLA @base",
"sub_path": "filament/Prusament rPLA @base.json"
},
{
"name": "Prusament rPLA @XL",
"sub_path": "filament/Prusament rPLA @XL.json"
@@ -2028,6 +2084,10 @@
"name": "Prusament rPLA @XL 5T",
"sub_path": "filament/Prusament rPLA @XL 5T.json"
},
{
"name": "Prusa Generic PVA @base",
"sub_path": "filament/Prusa Generic PVA @base.json"
},
{
"name": "Prusa Generic PVA",
"sub_path": "filament/Prusa Generic PVA.json"
@@ -2064,6 +2124,10 @@
"name": "Prusa Generic PVA @MK3.5 0.8",
"sub_path": "filament/Prusa Generic PVA @MK3.5 0.8.json"
},
{
"name": "Prusa Generic PVA HF @base",
"sub_path": "filament/Prusa Generic PVA HF @base.json"
},
{
"name": "Prusa Generic PVA HF @MINIIS",
"sub_path": "filament/Prusa Generic PVA HF @MINIIS.json"
@@ -2100,6 +2164,10 @@
"name": "Prusament PVB @XL 5T",
"sub_path": "filament/Prusament PVB @XL 5T.json"
},
{
"name": "Prusa Generic TPU @base",
"sub_path": "filament/Prusa Generic TPU @base.json"
},
{
"name": "Prusa Generic TPU",
"sub_path": "filament/Prusa Generic TPU.json"
@@ -2120,6 +2188,10 @@
"name": "Prusa Generic TPU @MK4S",
"sub_path": "filament/Prusa Generic TPU @MK4S.json"
},
{
"name": "Prusa Generic TPU HF @base",
"sub_path": "filament/Prusa Generic TPU HF @base.json"
},
{
"name": "Prusa Generic TPU HF @MINIIS",
"sub_path": "filament/Prusa Generic TPU HF @MINIIS.json"