v3.1: OrcaFilamentLibrary re-mint under the product-triple rule

Phase v3.1 of filament_id_plan_v3.md: every OFL-declared filament_id
re-derives from its product triple; the succession ledger absorbs the old
ids. Config-equivalence verified: flattened effective configs differ ONLY
in filament_id (284 consistent old->new changes tree-wide, including every
vendor preset that rides an OFL family), zero config/compatible_printers/
setting_id drift.

Structural pre-step (id-value-neutral, verified): OFL generic family ids
move from the shared fdm_filament_* template bases onto the product-named
"Generic X @System" presets, so the v3 triple's family component is the
product name, not an internal file name (12 relocations; 2 dead duplicate
declarations on fdm_filament_pa/pet pruned; every consumer chain itemized
first - the +12 instantiated_with_id entries are this deliberate pattern,
matching the 11 generics that already declared on @System).
fdm_filament_pc keeps its declaration this phase: 7 Prusa presets (Prusa
Generic PC, Prusament PC Blend) inherit it directly and re-home in the
v3.2 Prusa worksheet; its transitional id is documented in the plan.

Re-mint: 301 declarations re-derived (e.g. Generic PLA OGFL99 ->
OFDSrzZ8 = mint("filament_product/Generic/PLA/Generic PLA")). Snapshot:
1477 ids (+300/-292). Ledger:
- 230 shipped ids retired with mode-rule successors (OGF* library ids,
  OFLSBS99, DREMC/FILAR/AliZ/eSUN/... legacy strings). DREMC010 had been
  shared by a PPA-CF and a TPU family - a data bug this split resolves;
  its successor follows its only shipped claim (DREMC PPA-CF).
- 25 GF-shaped ids OFL had copied from the Bambu catalog (GFOT00x
  Overture, GFSEP0xx) are RELEASED to the BBL island space with hints at
  the re-minted families - never retired, so a future legitimate BBL
  catalog addition is never blocked; plus an explicit GFOT001 ->
  OFxA1p01 hint (Overture PLA Pro, still live in BBL).
- 37 never-shipped v1 branch mints dropped from lineage
  (--forget-never-shipped; they exist in no release, no forwarding
  needed).
- OGFC99/OGFG99/OGFL96/OGFN99/OGFSNL08 stay live (still declared by
  vendor bundles); they retire in v3.2 when those declarers re-mint.

Gates: 106 unit tests OK; --check exit 0; orca_extra_profile_check exit 0;
validator -l 2 / -f tree-wide / -r BBL+Qidi exit 0; Moonraker OFL map
check resolves all 29 aliases against the re-minted presets; flatten
equivalence pre/post as above; snapshot regen idempotent.
This commit is contained in:
SoftFever
2026-07-04 16:41:41 +08:00
parent 2c0867619c
commit acd5dd0794
318 changed files with 4636 additions and 5098 deletions

View File

@@ -3,7 +3,6 @@
"name": "fdm_filament_bvoh",
"inherits": "fdm_filament_common",
"from": "system",
"filament_id": "OGFS97",
"instantiation": "false",
"additional_cooling_fan_speed": [
"70"

View File

@@ -3,7 +3,6 @@
"name": "fdm_filament_cope",
"inherits": "fdm_filament_common",
"from": "system",
"filament_id": "OGFLC99",
"instantiation": "false",
"filament_type": [
"CoPE"

View File

@@ -3,7 +3,6 @@
"name": "fdm_filament_eva",
"inherits": "fdm_filament_common",
"from": "system",
"filament_id": "OGFR99",
"instantiation": "false",
"filament_type": [
"EVA"

View File

@@ -3,7 +3,6 @@
"name": "fdm_filament_hips",
"inherits": "fdm_filament_common",
"from": "system",
"filament_id": "OGFS98",
"instantiation": "false",
"cool_plate_temp": [
"0"

View File

@@ -3,7 +3,6 @@
"name": "fdm_filament_pa",
"inherits": "fdm_filament_common",
"from": "system",
"filament_id": "OGFN99",
"instantiation": "false",
"activate_air_filtration": [
"0"

View File

@@ -3,7 +3,7 @@
"name": "fdm_filament_pc",
"inherits": "fdm_filament_common",
"from": "system",
"filament_id": "OGFC99",
"filament_id": "OFtcKVgP",
"instantiation": "false",
"supertack_plate_temp": [
"0"

View File

@@ -3,7 +3,6 @@
"name": "fdm_filament_pctg",
"inherits": "fdm_filament_common",
"from": "system",
"filament_id": "OGFG97",
"instantiation": "false",
"eng_plate_temp": [
"0"

View File

@@ -3,7 +3,6 @@
"name": "fdm_filament_pe",
"inherits": "fdm_filament_common",
"from": "system",
"filament_id": "OGFP99",
"instantiation": "false",
"additional_cooling_fan_speed": [
"70"

View File

@@ -3,7 +3,6 @@
"name": "fdm_filament_pet",
"inherits": "fdm_filament_common",
"from": "system",
"filament_id": "OGFG99",
"instantiation": "false",
"eng_plate_temp": [
"0"

View File

@@ -3,7 +3,6 @@
"name": "fdm_filament_pha",
"inherits": "fdm_filament_common",
"from": "system",
"filament_id": "OGFR98",
"instantiation": "false",
"additional_cooling_fan_speed": [
"70"

View File

@@ -3,7 +3,6 @@
"name": "fdm_filament_pla",
"inherits": "fdm_filament_common",
"from": "system",
"filament_id": "OGFL99",
"instantiation": "false",
"additional_cooling_fan_speed": [
"70"

View File

@@ -3,7 +3,6 @@
"name": "fdm_filament_pla_silk",
"inherits": "fdm_filament_pla",
"from": "system",
"filament_id": "OGFL96",
"instantiation": "false",
"description": "To make the prints get higher gloss, please dry the filament before use, and set the outer wall speed to be 40 to 60 mm/s when slicing.",
"filament_flow_ratio": [

View File

@@ -3,7 +3,6 @@
"name": "fdm_filament_pp",
"inherits": "fdm_filament_common",
"from": "system",
"filament_id": "OGFP97",
"instantiation": "false",
"additional_cooling_fan_speed": [
"70"

View File

@@ -3,7 +3,6 @@
"name": "fdm_filament_ppa",
"inherits": "fdm_filament_common",
"from": "system",
"filament_id": "OGFN97",
"instantiation": "false",
"activate_air_filtration": [
"0"

View File

@@ -3,7 +3,6 @@
"name": "fdm_filament_sbs",
"inherits": "fdm_filament_common",
"from": "system",
"filament_id": "OFLSBS99",
"instantiation": "false",
"fan_cooling_layer_time": [
"100"