Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added additional filament vendors. #5461

Merged
merged 1 commit into from
May 26, 2024

Conversation

anselor
Copy link
Contributor

@anselor anselor commented May 25, 2024

Added Anker printers to filament presets dialog.
Added helper to generate formatted hard-coded strings in the dialog from the available profile JSON files.

Description

Many popular/common filament vendors are now pre-populated in the custom filament vendor list.
Now entries are sorted alphabetically rather than randomly.

Screenshots/Recordings/Graphs

image
image

Output from the helper script:

Scripts dir: /home/anselor/source/OrcaSlicer/scripts
Looking in /home/anselor/source/OrcaSlicer/resources/profiles
    {"Anker",              "Anycubic",           "Artillery",          "Bambulab",           "BIQU",
     "Comgrow",            "CONSTRUCT3D",        "Creality",           "Custom Printer",     "Dremel",
     "Elegoo",             "Flashforge",         "FLSun",              "FlyingBear",         "Folgertech",
     "InfiMech",           "Kingroon",           "MagicMaker",         "Orca Arena Printer", "Peopoly",
     "Prusa",              "Qidi",               "Raise3D",            "RatRig",             "SecKit",
     "Snapmaker",          "Sovol",              "Tronxy",             "TwoTrees",           "UltiMaker",
     "Vivedino",           "Voron",              "Voxelab",            "Vzbot",              "Wanhao"}
    {{"Anker",             {"Anker M5",                   "Anker M5 All-Metal Hot End", "Anker M5C"}},
     {"Anycubic",          {"Anycubic i3 Mega S",  "Anycubic Chiron",     "Anycubic Vyper",      "Anycubic Kobra Max",  "Anycubic Kobra Plus",
                            "Anycubic 4Max Pro",   "Anycubic 4Max Pro 2", "Anycubic Kobra 2"}},
     {"Artillery",         {"Artillery Sidewinder X1", "Artillery Genius",        "Artillery Genius Pro",    "Artillery Sidewinder X2", "Artillery Hornet"}},
     {"Bambulab",          {"Bambu Lab X1 Carbon", "Bambu Lab X1",        "Bambu Lab X1E",       "Bambu Lab P1P",       "Bambu Lab P1S",
                            "Bambu Lab A1 mini",   "Bambu Lab A1"}},
     {"BIQU",              {"BIQU B1",      "BIQU BX",      "BIQU Hurakan"}},
     {"Comgrow",           {"Comgrow T500"}},
     {"CONSTRUCT3D",       {"Construct 1 XL", "Construct 1"}},
     {"Creality",          {"Creality CR-10 V2",           "Creality CR-10 Max",          "Creality CR-10 SE",           "Creality CR-6 SE",            "Creality CR-6 Max",
                            "Creality Ender-3 V2",         "Creality Ender-3 V2 Neo",     "Creality Ender-3 S1",         "Creality Ender-3",            "Creality Ender-3 Pro",
                            "Creality Ender-3 S1 Pro",     "Creality Ender-3 S1 Plus",    "Creality Ender-3 V3 SE",      "Creality Ender-3 V3 KE",      "Creality Ender-3 V3",
                            "Creality Ender-5",            "Creality Ender-5 Plus",       "Creality Ender-5 Pro (2019)", "Creality Ender-5S",           "Creality Ender-5 S1",
                            "Creality Ender-6",            "Creality Sermoon V1",         "Creality K1",                 "Creality K1C",                "Creality K1 Max"}},
     {"Custom Printer",    {"Generic Klipper Printer", "Generic Marlin Printer",  "Generic RRF Printer"}},
     {"Dremel",            {"Dremel 3D20", "Dremel 3D40", "Dremel 3D45"}},
     {"Elegoo",            {"Elegoo Neptune",        "Elegoo Neptune X",      "Elegoo Neptune 2",      "Elegoo Neptune 2S",     "Elegoo Neptune 2D",
                            "Elegoo Neptune 3",      "Elegoo Neptune 3 Pro",  "Elegoo Neptune 3 Plus", "Elegoo Neptune 3 Max",  "Elegoo Neptune 4 Pro",
                            "Elegoo Neptune 4",      "Elegoo Neptune 4 Max",  "Elegoo Neptune 4 Plus"}},
     {"Flashforge",        {"Flashforge Adventurer 5M",       "Flashforge Adventurer 5M Pro",   "Flashforge Adventurer 3 Series", "Flashforge Guider 3 Ultra"}},
     {"FLSun",             {"FLSun Q5",       "FLSun QQ-S Pro", "FLSun V400"}},
     {"FlyingBear",        {"FlyingBear Reborn3", "FlyingBear S1"}},
     {"Folgertech",        {"Folgertech i3",   "Folgertech FT-5", "Folgertech FT-6"}},
     {"InfiMech",          {"InfiMech TX"}},
     {"Kingroon",          {"Kingroon KP3S PRO S1", "Kingroon KP3S PRO V2", "Kingroon KP3S 3.0"}},
     {"MagicMaker",        {"MM hqs hj",   "MM hqs SF",   "MM hj SK",    "MM BoneKing", "MM slb"}},
     {"Orca Arena Printer",{"Orca Arena X1 Carbon"}},
     {"Peopoly",           {"Peopoly Magneto X"}},
     {"Prusa",             {"MK4IS",  "MINIIS", "MK3S",   "MINI"}},
     {"Qidi",              {"Qidi Q1 Pro",    "Qidi X-Max 3",   "Qidi X-Plus 3",  "Qidi X-Smart 3", "Qidi X-Plus",
                            "Qidi X-Max",     "Qidi X-CF Pro"}},
     {"Raise3D",           {"Raise3D Pro3",      "Raise3D Pro3 Plus"}},
     {"RatRig",            {"RatRig V-Core 3 200", "RatRig V-Core 3 300", "RatRig V-Core 3 400", "RatRig V-Core 3 500", "RatRig V-Minion",
                            "RatRig V-Cast"}},
     {"SecKit",            {"SecKit SK-Tank", "Seckit Go3"}},
     {"Snapmaker",         {"Snapmaker J1",                 "Snapmaker A250",               "Snapmaker A350",               "Snapmaker A250 Dual",          "Snapmaker A350 Dual",
                            "Snapmaker A250 QSKit",         "Snapmaker A350 QSKit",         "Snapmaker A250 BKit",          "Snapmaker A350 BKit",          "Snapmaker A250 QS+B Kit",
                            "Snapmaker A350 QS+B Kit",      "Snapmaker A250 Dual QSKit",    "Snapmaker A350 Dual QSKit",    "Snapmaker A250 Dual BKit",     "Snapmaker A350 Dual BKit",
                            "Snapmaker A250 Dual QS+B Kit", "Snapmaker A350 Dual QS+B Kit", "Snapmaker Artisan"}},
     {"Sovol",             {"Sovol SV01 Pro",  "Sovol SV02",      "Sovol SV05",      "Sovol SV06",      "Sovol SV06 Plus",
                            "Sovol SV07",      "Sovol SV07 Plus"}},
     {"Tronxy",            {"Tronxy X5SA 400 Marlin Firmware"}},
     {"TwoTrees",          {"TwoTrees SP-5 Klipper", "TwoTrees SK1"}},
     {"UltiMaker",         {"UltiMaker 2"}},
     {"Vivedino",          {"Troodon 2.0 - RRF",     "Troodon 2.0 - Klipper"}},
     {"Voron",             {"Voron 2.4 250",        "Voron 2.4 300",        "Voron 2.4 350",        "Voron Trident 250",    "Voron Trident 300",
                            "Voron Trident 350",    "Voron 0.1",            "Voron Switchwire 250"}},
     {"Voxelab",           {"Voxelab Aquila X2"}},
     {"Vzbot",             {"Vzbot 235 AWD", "Vzbot 330 AWD"}},
     {"Wanhao",            {"Wanhao D12-300"}}
    {"3Dgenius",               "3DJake",                 "3DXTECH",                "3D BEST-Q",              "3D Hero",
     "3D-Fuel",                "Aceaddity",              "AddNorth",               "Amazon Basics",          "AMOLEN",
     "Ankermake",              "Anycubic",               "Atomic",                 "AzureFilm",              "BASF",
     "Bblife",                 "BCN3D",                  "Beyond Plastic",         "California Filament",    "Capricorn",
     "CC3D",                   "colorFabb",              "Comgrow",                "Cookiecad",              "Creality",
     "Das Filament",           "DO3D",                   "DOW",                    "DSM",                    "Duramic",
     "ELEGOO",                 "Eryone",                 "Essentium",              "eSUN",                   "Extrudr",
     "Fiberforce",             "Fiberlogy",              "FilaCube",               "Filamentive",            "Fillamentum",
     "FLASHFORGE",             "Formfortura",            "Francofil",              "GEEETECH",               "Giantarm",
     "Gizmo Dorks",            "GreenGate3D",            "HATCHBOX",               "Hello3D",                "IC3D",
     "IEMAI",                  "IIID Max",               "INLAND",                 "iProspect",              "iSANMATE",
     "Justmaker",              "Keene Village Plastics", "Kexcelled",              "MakerBot",               "MatterHackers",
     "MIKA3D",                 "NinjaTek",               "Nobufil",                "Novamaker",              "OVERTURE",
     "OVVNYXE",                "Polymaker",              "Priline",                "Printed Solid",          "Protopasta",
     "Prusament",              "Push Plastic",           "R3D",                    "Re-pet3D",               "Recreus",
     "Regen",                  "Sain SMART",             "SliceWorx",              "Snapmaker",              "SnoLabs",
     "Spectrum",               "SUNLU",                  "TTYT3D",                 "UltiMaker",              "Verbatim",
     "VO3D",                   "Voxelab",                "YOOPAI",                 "Yousu",                  "Ziro",
     "Zyltech"};

Tests

Loaded the dialog and verified the names are present. Created a new filament type using a preset. Verified custom filaments are still present after a restart.

Added Anker printers to filament presets dialog.
Added helper to generate formatted strings for dialog from profile JSON files.
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is sweet 👍

Copy link
Owner

@SoftFever SoftFever left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you.
This is fantastic!

@SoftFever SoftFever merged commit a1b4e0c into SoftFever:main May 26, 2024
13 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants