filament_id v4.0: re-converge post-merge drift (Qidi/Snapmaker/re3D)

The 2026-08 main merge brought upstream vendor updates in pre-v3 style;
assign_filament_ids.py --check reported 243 errors. Re-converged per plan
v4 SS1(A)/SS4:

- Qidi X5: 12 brand presets had copied BBL catalog ids (GFB99/GFG99/GFL99);
  re-minted to their product triples (PolyLite PLA converges onto OF5CgdDq).
- Snapmaker U1: fixed empty/lowercase/wrong filament_vendor on 5 bases
  (triple inputs, W3-style); re-minted 24 declarations, resurrecting no
  retired ids (11813638720/141703112701/1417031127011/OGFL99 all re-minted
  away; base2 duplicates converge onto their families' v3.2 ids).
- re3D: rPETG had copied GFG01 (BBL space); re-minted to OFmCOW2Y. The
  GreenGate3D bundle was removed upstream with its product relocated here;
  retired OFSTCno1 -> OFmCOW2Y so shipped references keep resolving.
- validator -f: resolved 34 AMS-match ambiguities using the v3 mechanisms:
  salt-1 ids on the 5 re3D root presets and Snapmaker PLA-CF @U1 0.4
  (duplicate presets of one product; deletion forbidden), own minted ids
  for the 4 cross-family riders (Polymaker General/Silk/Tough PLA Family,
  Snapmaker PLA Full Spectrum).
- Snapshot re-sanctioned (+92 ids incl. 44 new QD_4_* island ids and BBL
  addnorth GF_AN*); ledger +1 entry (OFSTCno1).

Gates: --check 0; orca_extra_profile_check 0/0; 116 script tests OK;
validator base + -f exit 0. Vendor versions bumped (Qidi, Snapmaker, re3D).
This commit is contained in:
SoftFever
2026-08-21 18:13:18 +08:00
parent 71563cc6c6
commit 58d1a3b093
52 changed files with 566 additions and 68 deletions

View File

@@ -4,7 +4,7 @@
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pc",
"filament_id": "OFU3QXL7",
"filament_id": "OFwbsgWj",
"setting_id": "eSR00TZTotTvJs8l",
"filament_settings_id": [
"re3D PC"

View File

@@ -4,7 +4,7 @@
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pet",
"filament_id": "OF3F63OE",
"filament_id": "OFX0etlv",
"setting_id": "msXDK31R8KOvqNqK",
"filament_settings_id": [
"re3D PETG"

View File

@@ -4,7 +4,7 @@
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pla",
"filament_id": "OFRyOsZj",
"filament_id": "OFDdEaoL",
"setting_id": "nPpDwvFg7WQr7K3t",
"filament_settings_id": [
"re3D PLA"

View File

@@ -1,6 +1,6 @@
{
"type": "filament",
"filament_id": "GFG01",
"filament_id": "OFmCOW2Y",
"setting_id": "WlELqPVnuL7DaTxs",
"name": "re3D rPETG @0.8 nozzle",
"from": "system",

View File

@@ -1,6 +1,6 @@
{
"type": "filament",
"filament_id": "GFG01",
"filament_id": "OFmCOW2Y",
"setting_id": "sHzO2S3mmE6Iqs2O",
"name": "re3D rPETG @1.75 nozzle",
"from": "system",

View File

@@ -5,7 +5,7 @@
"renamed_from": "re3D Greengate rPETG",
"instantiation": "true",
"inherits": "fdm_filament_pet",
"filament_id": "GFG01",
"filament_id": "OFD8loeT",
"setting_id": "6aESuJ2S2Kogd4Lq",
"filament_settings_id": [
"re3D rPETG"

View File

@@ -4,7 +4,7 @@
"from": "system",
"instantiation": "true",
"inherits": "fdm_filament_pp",
"filament_id": "OFfHGM1D",
"filament_id": "OFm8rqoY",
"setting_id": "8PB62qm5Cd3SHLf4",
"filament_settings_id": [
"re3D rPP"