Resolve the 4 proto-refactored conflicts (Preset.cpp, Print.cpp,
PrintConfig.cpp, Tab.cpp) by keeping the branch's generated-include
versions; auto-merged non-conflict changes from main are preserved.
Reconcile main's new settings into the proto schema. main added 52 new
active init_fff_params settings not present in the proto; ported them all
(type/label/tooltip/default/enum/preset) into print/filament/printer.proto
so the config registers, profiles load, and the GUI does not crash on
missing defs. Added GuiType.plugin_picker to config_metadata.proto and
regenerated config_metadata_pb2.py.
Codegen: run_codegen validate PASSED (712 fields). UI layout (layout.yaml
placement) for the 52 new settings is a follow-up; they are registered and
serialized but not yet placed in GUI tabs.
Reconcile main's config changes with the protobuf codegen:
- New settings ported to proto schema (already present) and verified in
generated PrintConfigDef/Preset_options/TabLayout + PrintConfig.hpp:
small_support_perimeter_speed, small_support_perimeter_threshold,
top_layer_direction, bottom_layer_direction, hole_to_polyhole_max_edges
- Ported main's label/tooltip updates for adaptive_pressure_advance_overhangs
and adaptive_pressure_advance_bridges into filament.proto (were dropped in
the conflict resolution) and regenerated.
- Kept main's non-generated logic (Preset.cpp nullable filament override
force-emit).
Codegen validated (python tools/run_codegen.py --validate-only): PASSED.
