From a602eee44163d33ca65943586a81e30315731e4d Mon Sep 17 00:00:00 2001 From: Frank Tackitt Date: Sun, 1 Dec 2024 05:14:44 -0700 Subject: [PATCH 1/7] Add 0.5mm nozzle profiles for Voron printers (#7446) Co-authored-by: Franklyn Tackitt Co-authored-by: SoftFever --- resources/profiles/Voron.json | 60 +++++++++++++++++++ .../Voron/filament/Voron Generic ABS.json | 8 +++ .../Voron/filament/Voron Generic ASA.json | 8 +++ .../Voron/filament/Voron Generic PA-CF.json | 8 +++ .../Voron/filament/Voron Generic PA.json | 8 +++ .../Voron/filament/Voron Generic PC.json | 8 +++ .../Voron/filament/Voron Generic PETG.json | 8 +++ .../Voron/filament/Voron Generic PLA-CF.json | 8 +++ .../Voron/filament/Voron Generic PLA.json | 8 +++ .../Voron/filament/Voron Generic PVA.json | 8 +++ .../Voron/filament/Voron Generic TPU.json | 8 +++ .../Voron/machine/Voron 0.1 0.5 nozzle.json | 29 +++++++++ .../profiles/Voron/machine/Voron 0.1.json | 2 +- .../machine/Voron 2.4 250 0.5 nozzle.json | 27 +++++++++ .../profiles/Voron/machine/Voron 2.4 250.json | 2 +- .../machine/Voron 2.4 300 0.5 nozzle.json | 27 +++++++++ .../profiles/Voron/machine/Voron 2.4 300.json | 2 +- .../machine/Voron 2.4 350 0.5 nozzle.json | 27 +++++++++ .../profiles/Voron/machine/Voron 2.4 350.json | 2 +- .../Voron Switchwire 250 0.5 nozzle.json | 27 +++++++++ .../Voron/machine/Voron Switchwire 250.json | 2 +- .../machine/Voron Trident 250 0.5 nozzle.json | 27 +++++++++ .../Voron/machine/Voron Trident 250.json | 2 +- .../machine/Voron Trident 300 0.5 nozzle.json | 27 +++++++++ .../Voron/machine/Voron Trident 300.json | 2 +- .../machine/Voron Trident 350 0.5 nozzle.json | 27 +++++++++ .../Voron/machine/Voron Trident 350.json | 2 +- .../0.10mm Extra Fine 0.5 nozzle @Voron.json | 11 ++++ .../0.15mm Fine 0.5 nozzle @Voron.json | 11 ++++ .../0.20mm Optimal 0.5 nozzle @Voron.json | 11 ++++ .../0.25mm Standard 0.5 nozzle @Voron.json | 11 ++++ .../0.30mm Draft 0.5 nozzle @Voron.json | 12 ++++ .../0.35mm Extra Draft 0.5 nozzle @Voron.json | 12 ++++ .../process/fdm_process_voron_common_0_5.json | 26 ++++++++ 34 files changed, 460 insertions(+), 8 deletions(-) create mode 100644 resources/profiles/Voron/machine/Voron 0.1 0.5 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron 2.4 250 0.5 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron 2.4 300 0.5 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron 2.4 350 0.5 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Switchwire 250 0.5 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Trident 250 0.5 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Trident 300 0.5 nozzle.json create mode 100644 resources/profiles/Voron/machine/Voron Trident 350 0.5 nozzle.json create mode 100644 resources/profiles/Voron/process/0.10mm Extra Fine 0.5 nozzle @Voron.json create mode 100644 resources/profiles/Voron/process/0.15mm Fine 0.5 nozzle @Voron.json create mode 100644 resources/profiles/Voron/process/0.20mm Optimal 0.5 nozzle @Voron.json create mode 100644 resources/profiles/Voron/process/0.25mm Standard 0.5 nozzle @Voron.json create mode 100644 resources/profiles/Voron/process/0.30mm Draft 0.5 nozzle @Voron.json create mode 100644 resources/profiles/Voron/process/0.35mm Extra Draft 0.5 nozzle @Voron.json create mode 100644 resources/profiles/Voron/process/fdm_process_voron_common_0_5.json diff --git a/resources/profiles/Voron.json b/resources/profiles/Voron.json index 7bfa7c6615..a821cfc7c0 100644 --- a/resources/profiles/Voron.json +++ b/resources/profiles/Voron.json @@ -58,6 +58,10 @@ "name": "fdm_process_voron_common_0_2_5", "sub_path": "process/fdm_process_voron_common_0_2_5.json" }, + { + "name": "fdm_process_voron_common_0_5", + "sub_path": "process/fdm_process_voron_common_0_5.json" + }, { "name": "fdm_process_voron_common_0_6", "sub_path": "process/fdm_process_voron_common_0_6.json" @@ -205,6 +209,30 @@ { "name": "0.80mm Extra Draft 1.0 nozzle @Voron", "sub_path": "process/0.80mm Extra Draft 1.0 nozzle @Voron.json" + }, + { + "name": "0.10mm Extra Fine 0.5 nozzle @Voron", + "sub_path": "process/0.10mm Extra Fine 0.5 nozzle @Voron.json" + }, + { + "name": "0.15mm Fine 0.5 nozzle @Voron", + "sub_path": "process/0.15mm Fine 0.5 nozzle @Voron.json" + }, + { + "name": "0.20mm Optimal 0.5 nozzle @Voron", + "sub_path": "process/0.20mm Optimal 0.5 nozzle @Voron.json" + }, + { + "name": "0.25mm Standard 0.5 nozzle @Voron", + "sub_path": "process/0.25mm Standard 0.5 nozzle @Voron.json" + }, + { + "name": "0.30mm Draft 0.5 nozzle @Voron", + "sub_path": "process/0.30mm Draft 0.5 nozzle @Voron.json" + }, + { + "name": "0.35mm Extra Draft 0.5 nozzle @Voron", + "sub_path": "process/0.35mm Extra Draft 0.5 nozzle @Voron.json" } ], "filament_list": [ @@ -310,6 +338,10 @@ "name": "Voron 2.4 250 0.25 nozzle", "sub_path": "machine/Voron 2.4 250 0.25 nozzle.json" }, + { + "name": "Voron 2.4 250 0.5 nozzle", + "sub_path": "machine/Voron 2.4 250 0.5 nozzle.json" + }, { "name": "Voron 2.4 250 0.6 nozzle", "sub_path": "machine/Voron 2.4 250 0.6 nozzle.json" @@ -338,6 +370,10 @@ "name": "Voron 2.4 300 0.25 nozzle", "sub_path": "machine/Voron 2.4 300 0.25 nozzle.json" }, + { + "name": "Voron 2.4 300 0.5 nozzle", + "sub_path": "machine/Voron 2.4 300 0.5 nozzle.json" + }, { "name": "Voron 2.4 300 0.6 nozzle", "sub_path": "machine/Voron 2.4 300 0.6 nozzle.json" @@ -366,6 +402,10 @@ "name": "Voron 2.4 350 0.25 nozzle", "sub_path": "machine/Voron 2.4 350 0.25 nozzle.json" }, + { + "name": "Voron 2.4 350 0.5 nozzle", + "sub_path": "machine/Voron 2.4 350 0.5 nozzle.json" + }, { "name": "Voron 2.4 350 0.6 nozzle", "sub_path": "machine/Voron 2.4 350 0.6 nozzle.json" @@ -394,6 +434,10 @@ "name": "Voron Trident 250 0.25 nozzle", "sub_path": "machine/Voron Trident 250 0.25 nozzle.json" }, + { + "name": "Voron Trident 250 0.5 nozzle", + "sub_path": "machine/Voron Trident 250 0.5 nozzle.json" + }, { "name": "Voron Trident 250 0.6 nozzle", "sub_path": "machine/Voron Trident 250 0.6 nozzle.json" @@ -422,6 +466,10 @@ "name": "Voron Trident 300 0.25 nozzle", "sub_path": "machine/Voron Trident 300 0.25 nozzle.json" }, + { + "name": "Voron Trident 300 0.5 nozzle", + "sub_path": "machine/Voron Trident 300 0.5 nozzle.json" + }, { "name": "Voron Trident 300 0.6 nozzle", "sub_path": "machine/Voron Trident 300 0.6 nozzle.json" @@ -450,6 +498,10 @@ "name": "Voron Trident 350 0.25 nozzle", "sub_path": "machine/Voron Trident 350 0.25 nozzle.json" }, + { + "name": "Voron Trident 350 0.5 nozzle", + "sub_path": "machine/Voron Trident 350 0.5 nozzle.json" + }, { "name": "Voron Trident 350 0.6 nozzle", "sub_path": "machine/Voron Trident 350 0.6 nozzle.json" @@ -478,6 +530,10 @@ "name": "Voron 0.1 0.25 nozzle", "sub_path": "machine/Voron 0.1 0.25 nozzle.json" }, + { + "name": "Voron 0.1 0.5 nozzle", + "sub_path": "machine/Voron 0.1 0.5 nozzle.json" + }, { "name": "Voron 0.1 0.6 nozzle", "sub_path": "machine/Voron 0.1 0.6 nozzle.json" @@ -506,6 +562,10 @@ "name": "Voron Switchwire 250 0.25 nozzle", "sub_path": "machine/Voron Switchwire 250 0.25 nozzle.json" }, + { + "name": "Voron Switchwire 250 0.5 nozzle", + "sub_path": "machine/Voron Switchwire 250 0.5 nozzle.json" + }, { "name": "Voron Switchwire 250 0.6 nozzle", "sub_path": "machine/Voron Switchwire 250 0.6 nozzle.json" diff --git a/resources/profiles/Voron/filament/Voron Generic ABS.json b/resources/profiles/Voron/filament/Voron Generic ABS.json index a321511ad0..a93df9012f 100644 --- a/resources/profiles/Voron/filament/Voron Generic ABS.json +++ b/resources/profiles/Voron/filament/Voron Generic ABS.json @@ -17,6 +17,7 @@ "Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.2 nozzle", "Voron 2.4 250 0.25 nozzle", + "Voron 2.4 250 0.5 nozzle", "Voron 2.4 250 0.6 nozzle", "Voron 2.4 250 0.8 nozzle", "Voron 2.4 250 1.0 nozzle", @@ -24,6 +25,7 @@ "Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.2 nozzle", "Voron 2.4 300 0.25 nozzle", + "Voron 2.4 300 0.5 nozzle", "Voron 2.4 300 0.6 nozzle", "Voron 2.4 300 0.8 nozzle", "Voron 2.4 300 1.0 nozzle", @@ -31,6 +33,7 @@ "Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.2 nozzle", "Voron 2.4 350 0.25 nozzle", + "Voron 2.4 350 0.5 nozzle", "Voron 2.4 350 0.6 nozzle", "Voron 2.4 350 0.8 nozzle", "Voron 2.4 350 1.0 nozzle", @@ -38,6 +41,7 @@ "Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.5 nozzle", "Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.8 nozzle", "Voron Trident 250 1.0 nozzle", @@ -45,6 +49,7 @@ "Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.5 nozzle", "Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.8 nozzle", "Voron Trident 300 1.0 nozzle", @@ -52,6 +57,7 @@ "Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.5 nozzle", "Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.8 nozzle", "Voron Trident 350 1.0 nozzle", @@ -59,6 +65,7 @@ "Voron 0.1 0.15 nozzle", "Voron 0.1 0.2 nozzle", "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.5 nozzle", "Voron 0.1 0.6 nozzle", "Voron 0.1 0.8 nozzle", "Voron 0.1 1.0 nozzle", @@ -66,6 +73,7 @@ "Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.5 nozzle", "Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 1.0 nozzle" diff --git a/resources/profiles/Voron/filament/Voron Generic ASA.json b/resources/profiles/Voron/filament/Voron Generic ASA.json index 2e32235db1..2c323cb525 100644 --- a/resources/profiles/Voron/filament/Voron Generic ASA.json +++ b/resources/profiles/Voron/filament/Voron Generic ASA.json @@ -17,6 +17,7 @@ "Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.2 nozzle", "Voron 2.4 250 0.25 nozzle", + "Voron 2.4 250 0.5 nozzle", "Voron 2.4 250 0.6 nozzle", "Voron 2.4 250 0.8 nozzle", "Voron 2.4 250 1.0 nozzle", @@ -24,6 +25,7 @@ "Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.2 nozzle", "Voron 2.4 300 0.25 nozzle", + "Voron 2.4 300 0.5 nozzle", "Voron 2.4 300 0.6 nozzle", "Voron 2.4 300 0.8 nozzle", "Voron 2.4 300 1.0 nozzle", @@ -31,6 +33,7 @@ "Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.2 nozzle", "Voron 2.4 350 0.25 nozzle", + "Voron 2.4 350 0.5 nozzle", "Voron 2.4 350 0.6 nozzle", "Voron 2.4 350 0.8 nozzle", "Voron 2.4 350 1.0 nozzle", @@ -38,6 +41,7 @@ "Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.5 nozzle", "Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.8 nozzle", "Voron Trident 250 1.0 nozzle", @@ -45,6 +49,7 @@ "Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.5 nozzle", "Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.8 nozzle", "Voron Trident 300 1.0 nozzle", @@ -52,6 +57,7 @@ "Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.5 nozzle", "Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.8 nozzle", "Voron Trident 350 1.0 nozzle", @@ -59,6 +65,7 @@ "Voron 0.1 0.15 nozzle", "Voron 0.1 0.2 nozzle", "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.5 nozzle", "Voron 0.1 0.6 nozzle", "Voron 0.1 0.8 nozzle", "Voron 0.1 1.0 nozzle", @@ -66,6 +73,7 @@ "Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.5 nozzle", "Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 1.0 nozzle" diff --git a/resources/profiles/Voron/filament/Voron Generic PA-CF.json b/resources/profiles/Voron/filament/Voron Generic PA-CF.json index 868ca5dba6..30e5136fd0 100644 --- a/resources/profiles/Voron/filament/Voron Generic PA-CF.json +++ b/resources/profiles/Voron/filament/Voron Generic PA-CF.json @@ -23,6 +23,7 @@ "Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.2 nozzle", "Voron 2.4 250 0.25 nozzle", + "Voron 2.4 250 0.5 nozzle", "Voron 2.4 250 0.6 nozzle", "Voron 2.4 250 0.8 nozzle", "Voron 2.4 250 1.0 nozzle", @@ -30,6 +31,7 @@ "Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.2 nozzle", "Voron 2.4 300 0.25 nozzle", + "Voron 2.4 300 0.5 nozzle", "Voron 2.4 300 0.6 nozzle", "Voron 2.4 300 0.8 nozzle", "Voron 2.4 300 1.0 nozzle", @@ -37,6 +39,7 @@ "Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.2 nozzle", "Voron 2.4 350 0.25 nozzle", + "Voron 2.4 350 0.5 nozzle", "Voron 2.4 350 0.6 nozzle", "Voron 2.4 350 0.8 nozzle", "Voron 2.4 350 1.0 nozzle", @@ -44,6 +47,7 @@ "Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.5 nozzle", "Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.8 nozzle", "Voron Trident 250 1.0 nozzle", @@ -51,6 +55,7 @@ "Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.5 nozzle", "Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.8 nozzle", "Voron Trident 300 1.0 nozzle", @@ -58,6 +63,7 @@ "Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.5 nozzle", "Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.8 nozzle", "Voron Trident 350 1.0 nozzle", @@ -65,6 +71,7 @@ "Voron 0.1 0.15 nozzle", "Voron 0.1 0.2 nozzle", "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.5 nozzle", "Voron 0.1 0.6 nozzle", "Voron 0.1 0.8 nozzle", "Voron 0.1 1.0 nozzle", @@ -72,6 +79,7 @@ "Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.5 nozzle", "Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 1.0 nozzle" diff --git a/resources/profiles/Voron/filament/Voron Generic PA.json b/resources/profiles/Voron/filament/Voron Generic PA.json index 391f871744..91790d2f80 100644 --- a/resources/profiles/Voron/filament/Voron Generic PA.json +++ b/resources/profiles/Voron/filament/Voron Generic PA.json @@ -20,6 +20,7 @@ "Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.2 nozzle", "Voron 2.4 250 0.25 nozzle", + "Voron 2.4 250 0.5 nozzle", "Voron 2.4 250 0.6 nozzle", "Voron 2.4 250 0.8 nozzle", "Voron 2.4 250 1.0 nozzle", @@ -27,6 +28,7 @@ "Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.2 nozzle", "Voron 2.4 300 0.25 nozzle", + "Voron 2.4 300 0.5 nozzle", "Voron 2.4 300 0.6 nozzle", "Voron 2.4 300 0.8 nozzle", "Voron 2.4 300 1.0 nozzle", @@ -34,6 +36,7 @@ "Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.2 nozzle", "Voron 2.4 350 0.25 nozzle", + "Voron 2.4 350 0.5 nozzle", "Voron 2.4 350 0.6 nozzle", "Voron 2.4 350 0.8 nozzle", "Voron 2.4 350 1.0 nozzle", @@ -41,6 +44,7 @@ "Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.5 nozzle", "Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.8 nozzle", "Voron Trident 250 1.0 nozzle", @@ -48,6 +52,7 @@ "Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.5 nozzle", "Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.8 nozzle", "Voron Trident 300 1.0 nozzle", @@ -55,6 +60,7 @@ "Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.5 nozzle", "Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.8 nozzle", "Voron Trident 350 1.0 nozzle", @@ -62,6 +68,7 @@ "Voron 0.1 0.15 nozzle", "Voron 0.1 0.2 nozzle", "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.5 nozzle", "Voron 0.1 0.6 nozzle", "Voron 0.1 0.8 nozzle", "Voron 0.1 1.0 nozzle", @@ -69,6 +76,7 @@ "Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.5 nozzle", "Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 1.0 nozzle" diff --git a/resources/profiles/Voron/filament/Voron Generic PC.json b/resources/profiles/Voron/filament/Voron Generic PC.json index eec0beb6eb..96de811416 100644 --- a/resources/profiles/Voron/filament/Voron Generic PC.json +++ b/resources/profiles/Voron/filament/Voron Generic PC.json @@ -17,6 +17,7 @@ "Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.2 nozzle", "Voron 2.4 250 0.25 nozzle", + "Voron 2.4 250 0.5 nozzle", "Voron 2.4 250 0.6 nozzle", "Voron 2.4 250 0.8 nozzle", "Voron 2.4 250 1.0 nozzle", @@ -24,6 +25,7 @@ "Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.2 nozzle", "Voron 2.4 300 0.25 nozzle", + "Voron 2.4 300 0.5 nozzle", "Voron 2.4 300 0.6 nozzle", "Voron 2.4 300 0.8 nozzle", "Voron 2.4 300 1.0 nozzle", @@ -31,6 +33,7 @@ "Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.2 nozzle", "Voron 2.4 350 0.25 nozzle", + "Voron 2.4 350 0.5 nozzle", "Voron 2.4 350 0.6 nozzle", "Voron 2.4 350 0.8 nozzle", "Voron 2.4 350 1.0 nozzle", @@ -38,6 +41,7 @@ "Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.5 nozzle", "Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.8 nozzle", "Voron Trident 250 1.0 nozzle", @@ -45,6 +49,7 @@ "Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.5 nozzle", "Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.8 nozzle", "Voron Trident 300 1.0 nozzle", @@ -52,6 +57,7 @@ "Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.5 nozzle", "Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.8 nozzle", "Voron Trident 350 1.0 nozzle", @@ -59,6 +65,7 @@ "Voron 0.1 0.15 nozzle", "Voron 0.1 0.2 nozzle", "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.5 nozzle", "Voron 0.1 0.6 nozzle", "Voron 0.1 0.8 nozzle", "Voron 0.1 1.0 nozzle", @@ -66,6 +73,7 @@ "Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.5 nozzle", "Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 1.0 nozzle" diff --git a/resources/profiles/Voron/filament/Voron Generic PETG.json b/resources/profiles/Voron/filament/Voron Generic PETG.json index ddd396ff4c..6238ed6a3c 100644 --- a/resources/profiles/Voron/filament/Voron Generic PETG.json +++ b/resources/profiles/Voron/filament/Voron Generic PETG.json @@ -47,6 +47,7 @@ "Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.2 nozzle", "Voron 2.4 250 0.25 nozzle", + "Voron 2.4 250 0.5 nozzle", "Voron 2.4 250 0.6 nozzle", "Voron 2.4 250 0.8 nozzle", "Voron 2.4 250 1.0 nozzle", @@ -54,6 +55,7 @@ "Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.2 nozzle", "Voron 2.4 300 0.25 nozzle", + "Voron 2.4 300 0.5 nozzle", "Voron 2.4 300 0.6 nozzle", "Voron 2.4 300 0.8 nozzle", "Voron 2.4 300 1.0 nozzle", @@ -61,6 +63,7 @@ "Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.2 nozzle", "Voron 2.4 350 0.25 nozzle", + "Voron 2.4 350 0.5 nozzle", "Voron 2.4 350 0.6 nozzle", "Voron 2.4 350 0.8 nozzle", "Voron 2.4 350 1.0 nozzle", @@ -68,6 +71,7 @@ "Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.5 nozzle", "Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.8 nozzle", "Voron Trident 250 1.0 nozzle", @@ -75,6 +79,7 @@ "Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.5 nozzle", "Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.8 nozzle", "Voron Trident 300 1.0 nozzle", @@ -82,6 +87,7 @@ "Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.5 nozzle", "Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.8 nozzle", "Voron Trident 350 1.0 nozzle", @@ -89,6 +95,7 @@ "Voron 0.1 0.15 nozzle", "Voron 0.1 0.2 nozzle", "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.5 nozzle", "Voron 0.1 0.6 nozzle", "Voron 0.1 0.8 nozzle", "Voron 0.1 1.0 nozzle", @@ -96,6 +103,7 @@ "Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.5 nozzle", "Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 1.0 nozzle" diff --git a/resources/profiles/Voron/filament/Voron Generic PLA-CF.json b/resources/profiles/Voron/filament/Voron Generic PLA-CF.json index 9de164685b..904e232753 100644 --- a/resources/profiles/Voron/filament/Voron Generic PLA-CF.json +++ b/resources/profiles/Voron/filament/Voron Generic PLA-CF.json @@ -23,6 +23,7 @@ "Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.2 nozzle", "Voron 2.4 250 0.25 nozzle", + "Voron 2.4 250 0.5 nozzle", "Voron 2.4 250 0.6 nozzle", "Voron 2.4 250 0.8 nozzle", "Voron 2.4 250 1.0 nozzle", @@ -30,6 +31,7 @@ "Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.2 nozzle", "Voron 2.4 300 0.25 nozzle", + "Voron 2.4 300 0.5 nozzle", "Voron 2.4 300 0.6 nozzle", "Voron 2.4 300 0.8 nozzle", "Voron 2.4 300 1.0 nozzle", @@ -37,6 +39,7 @@ "Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.2 nozzle", "Voron 2.4 350 0.25 nozzle", + "Voron 2.4 350 0.5 nozzle", "Voron 2.4 350 0.6 nozzle", "Voron 2.4 350 0.8 nozzle", "Voron 2.4 350 1.0 nozzle", @@ -44,6 +47,7 @@ "Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.5 nozzle", "Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.8 nozzle", "Voron Trident 250 1.0 nozzle", @@ -51,6 +55,7 @@ "Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.5 nozzle", "Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.8 nozzle", "Voron Trident 300 1.0 nozzle", @@ -58,6 +63,7 @@ "Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.5 nozzle", "Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.8 nozzle", "Voron Trident 350 1.0 nozzle", @@ -65,6 +71,7 @@ "Voron 0.1 0.15 nozzle", "Voron 0.1 0.2 nozzle", "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.5 nozzle", "Voron 0.1 0.6 nozzle", "Voron 0.1 0.8 nozzle", "Voron 0.1 1.0 nozzle", @@ -72,6 +79,7 @@ "Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.5 nozzle", "Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 1.0 nozzle" diff --git a/resources/profiles/Voron/filament/Voron Generic PLA.json b/resources/profiles/Voron/filament/Voron Generic PLA.json index 699970bf68..1147466761 100644 --- a/resources/profiles/Voron/filament/Voron Generic PLA.json +++ b/resources/profiles/Voron/filament/Voron Generic PLA.json @@ -20,6 +20,7 @@ "Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.2 nozzle", "Voron 2.4 250 0.25 nozzle", + "Voron 2.4 250 0.5 nozzle", "Voron 2.4 250 0.6 nozzle", "Voron 2.4 250 0.8 nozzle", "Voron 2.4 250 1.0 nozzle", @@ -27,6 +28,7 @@ "Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.2 nozzle", "Voron 2.4 300 0.25 nozzle", + "Voron 2.4 300 0.5 nozzle", "Voron 2.4 300 0.6 nozzle", "Voron 2.4 300 0.8 nozzle", "Voron 2.4 300 1.0 nozzle", @@ -34,6 +36,7 @@ "Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.2 nozzle", "Voron 2.4 350 0.25 nozzle", + "Voron 2.4 350 0.5 nozzle", "Voron 2.4 350 0.6 nozzle", "Voron 2.4 350 0.8 nozzle", "Voron 2.4 350 1.0 nozzle", @@ -41,6 +44,7 @@ "Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.5 nozzle", "Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.8 nozzle", "Voron Trident 250 1.0 nozzle", @@ -48,6 +52,7 @@ "Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.5 nozzle", "Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.8 nozzle", "Voron Trident 300 1.0 nozzle", @@ -55,6 +60,7 @@ "Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.5 nozzle", "Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.8 nozzle", "Voron Trident 350 1.0 nozzle", @@ -62,6 +68,7 @@ "Voron 0.1 0.15 nozzle", "Voron 0.1 0.2 nozzle", "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.5 nozzle", "Voron 0.1 0.6 nozzle", "Voron 0.1 0.8 nozzle", "Voron 0.1 1.0 nozzle", @@ -69,6 +76,7 @@ "Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.5 nozzle", "Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 1.0 nozzle" diff --git a/resources/profiles/Voron/filament/Voron Generic PVA.json b/resources/profiles/Voron/filament/Voron Generic PVA.json index 631be1e27a..75cb3f3b22 100644 --- a/resources/profiles/Voron/filament/Voron Generic PVA.json +++ b/resources/profiles/Voron/filament/Voron Generic PVA.json @@ -23,6 +23,7 @@ "Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.2 nozzle", "Voron 2.4 250 0.25 nozzle", + "Voron 2.4 250 0.5 nozzle", "Voron 2.4 250 0.6 nozzle", "Voron 2.4 250 0.8 nozzle", "Voron 2.4 250 1.0 nozzle", @@ -30,6 +31,7 @@ "Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.2 nozzle", "Voron 2.4 300 0.25 nozzle", + "Voron 2.4 300 0.5 nozzle", "Voron 2.4 300 0.6 nozzle", "Voron 2.4 300 0.8 nozzle", "Voron 2.4 300 1.0 nozzle", @@ -37,6 +39,7 @@ "Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.2 nozzle", "Voron 2.4 350 0.25 nozzle", + "Voron 2.4 350 0.5 nozzle", "Voron 2.4 350 0.6 nozzle", "Voron 2.4 350 0.8 nozzle", "Voron 2.4 350 1.0 nozzle", @@ -44,6 +47,7 @@ "Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.5 nozzle", "Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.8 nozzle", "Voron Trident 250 1.0 nozzle", @@ -51,6 +55,7 @@ "Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.5 nozzle", "Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.8 nozzle", "Voron Trident 300 1.0 nozzle", @@ -58,6 +63,7 @@ "Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.5 nozzle", "Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.8 nozzle", "Voron Trident 350 1.0 nozzle", @@ -65,6 +71,7 @@ "Voron 0.1 0.15 nozzle", "Voron 0.1 0.2 nozzle", "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.5 nozzle", "Voron 0.1 0.6 nozzle", "Voron 0.1 0.8 nozzle", "Voron 0.1 1.0 nozzle", @@ -72,6 +79,7 @@ "Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.5 nozzle", "Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 1.0 nozzle" diff --git a/resources/profiles/Voron/filament/Voron Generic TPU.json b/resources/profiles/Voron/filament/Voron Generic TPU.json index 891156cf1d..00ea690e72 100644 --- a/resources/profiles/Voron/filament/Voron Generic TPU.json +++ b/resources/profiles/Voron/filament/Voron Generic TPU.json @@ -14,6 +14,7 @@ "Voron 2.4 250 0.15 nozzle", "Voron 2.4 250 0.2 nozzle", "Voron 2.4 250 0.25 nozzle", + "Voron 2.4 250 0.5 nozzle", "Voron 2.4 250 0.6 nozzle", "Voron 2.4 250 0.8 nozzle", "Voron 2.4 250 1.0 nozzle", @@ -21,6 +22,7 @@ "Voron 2.4 300 0.15 nozzle", "Voron 2.4 300 0.2 nozzle", "Voron 2.4 300 0.25 nozzle", + "Voron 2.4 300 0.5 nozzle", "Voron 2.4 300 0.6 nozzle", "Voron 2.4 300 0.8 nozzle", "Voron 2.4 300 1.0 nozzle", @@ -28,6 +30,7 @@ "Voron 2.4 350 0.15 nozzle", "Voron 2.4 350 0.2 nozzle", "Voron 2.4 350 0.25 nozzle", + "Voron 2.4 350 0.5 nozzle", "Voron 2.4 350 0.6 nozzle", "Voron 2.4 350 0.8 nozzle", "Voron 2.4 350 1.0 nozzle", @@ -35,6 +38,7 @@ "Voron Trident 250 0.15 nozzle", "Voron Trident 250 0.2 nozzle", "Voron Trident 250 0.25 nozzle", + "Voron Trident 250 0.5 nozzle", "Voron Trident 250 0.6 nozzle", "Voron Trident 250 0.8 nozzle", "Voron Trident 250 1.0 nozzle", @@ -42,6 +46,7 @@ "Voron Trident 300 0.15 nozzle", "Voron Trident 300 0.2 nozzle", "Voron Trident 300 0.25 nozzle", + "Voron Trident 300 0.5 nozzle", "Voron Trident 300 0.6 nozzle", "Voron Trident 300 0.8 nozzle", "Voron Trident 300 1.0 nozzle", @@ -49,6 +54,7 @@ "Voron Trident 350 0.15 nozzle", "Voron Trident 350 0.2 nozzle", "Voron Trident 350 0.25 nozzle", + "Voron Trident 350 0.5 nozzle", "Voron Trident 350 0.6 nozzle", "Voron Trident 350 0.8 nozzle", "Voron Trident 350 1.0 nozzle", @@ -56,6 +62,7 @@ "Voron 0.1 0.15 nozzle", "Voron 0.1 0.2 nozzle", "Voron 0.1 0.25 nozzle", + "Voron 0.1 0.5 nozzle", "Voron 0.1 0.6 nozzle", "Voron 0.1 0.8 nozzle", "Voron 0.1 1.0 nozzle", @@ -63,6 +70,7 @@ "Voron Switchwire 250 0.15 nozzle", "Voron Switchwire 250 0.2 nozzle", "Voron Switchwire 250 0.25 nozzle", + "Voron Switchwire 250 0.5 nozzle", "Voron Switchwire 250 0.6 nozzle", "Voron Switchwire 250 0.8 nozzle", "Voron Switchwire 250 1.0 nozzle" diff --git a/resources/profiles/Voron/machine/Voron 0.1 0.5 nozzle.json b/resources/profiles/Voron/machine/Voron 0.1 0.5 nozzle.json new file mode 100644 index 0000000000..7efe30a3c8 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron 0.1 0.5 nozzle.json @@ -0,0 +1,29 @@ +{ + "type": "machine", + "setting_id": "GM003", + "name": "Voron 0.1 0.5 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron 0.1", + "default_print_profile": "0.25mm Standard 0.5 nozzle @Voron", + "max_layer_height": [ + "0.4" + ], + "min_layer_height": [ + "0.1" + ], + "nozzle_diameter": [ + "0.5" + ], + "printable_area": [ + "0x0", + "120x0", + "120x120", + "0x120" + ], + "printable_height": "120", + "nozzle_type": "undefine", + "auxiliary_fan": "0", + "printer_variant": "0.5" +} diff --git a/resources/profiles/Voron/machine/Voron 0.1.json b/resources/profiles/Voron/machine/Voron 0.1.json index d520c09d23..a773f78eda 100644 --- a/resources/profiles/Voron/machine/Voron 0.1.json +++ b/resources/profiles/Voron/machine/Voron 0.1.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Voron 0.1", "model_id": "Voron0", - "nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0", + "nozzle_diameter": "0.4;0.15;0.2;0.25;0.5;0.6;0.8;1.0", "machine_tech": "FFF", "family": "VoronDesign", "bed_model": "Voron_120_build_plate.stl", diff --git a/resources/profiles/Voron/machine/Voron 2.4 250 0.5 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 250 0.5 nozzle.json new file mode 100644 index 0000000000..af60cbe29d --- /dev/null +++ b/resources/profiles/Voron/machine/Voron 2.4 250 0.5 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "machine", + "setting_id": "GM003", + "name": "Voron 2.4 250 0.5 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron 2.4 250", + "default_print_profile": "0.25mm Standard 0.5 nozzle @Voron", + "max_layer_height": [ + "0.4" + ], + "min_layer_height": [ + "0.1" + ], + "nozzle_diameter": [ + "0.5" + ], + "printable_area": [ + "0x0", + "250x0", + "250x250", + "0x250" + ], + "printable_height": "225", + "printer_variant": "0.5" +} diff --git a/resources/profiles/Voron/machine/Voron 2.4 250.json b/resources/profiles/Voron/machine/Voron 2.4 250.json index a0936a3a8f..b032e4e779 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 250.json +++ b/resources/profiles/Voron/machine/Voron 2.4 250.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Voron 2.4 250", "model_id": "Voron2_250", - "nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0", + "nozzle_diameter": "0.4;0.15;0.2;0.25;0.5;0.6;0.8;1.0", "machine_tech": "FFF", "family": "VoronDesign", "bed_model": "Voron_250_build_plate.stl", diff --git a/resources/profiles/Voron/machine/Voron 2.4 300 0.5 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 300 0.5 nozzle.json new file mode 100644 index 0000000000..52fb046b56 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron 2.4 300 0.5 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "machine", + "setting_id": "GM003", + "name": "Voron 2.4 300 0.5 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron 2.4 300", + "default_print_profile": "0.25mm Standard 0.5 nozzle @Voron", + "max_layer_height": [ + "0.4" + ], + "min_layer_height": [ + "0.1" + ], + "nozzle_diameter": [ + "0.5" + ], + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "275", + "printer_variant": "0.5" +} diff --git a/resources/profiles/Voron/machine/Voron 2.4 300.json b/resources/profiles/Voron/machine/Voron 2.4 300.json index 5291f7a2ff..094357baa4 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 300.json +++ b/resources/profiles/Voron/machine/Voron 2.4 300.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Voron 2.4 300", "model_id": "Voron2_300", - "nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0", + "nozzle_diameter": "0.4;0.15;0.2;0.25;0.5;0.6;0.8;1.0", "machine_tech": "FFF", "family": "VoronDesign", "bed_model": "Voron_300_build_plate.stl", diff --git a/resources/profiles/Voron/machine/Voron 2.4 350 0.5 nozzle.json b/resources/profiles/Voron/machine/Voron 2.4 350 0.5 nozzle.json new file mode 100644 index 0000000000..856008d6b2 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron 2.4 350 0.5 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "machine", + "setting_id": "GM003", + "name": "Voron 2.4 350 0.5 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron 2.4 350", + "default_print_profile": "0.25mm Standard 0.5 nozzle @Voron", + "max_layer_height": [ + "0.4" + ], + "min_layer_height": [ + "0.1" + ], + "nozzle_diameter": [ + "0.5" + ], + "printable_area": [ + "0x0", + "350x0", + "350x350", + "0x350" + ], + "printable_height": "325", + "printer_variant": "0.5" +} diff --git a/resources/profiles/Voron/machine/Voron 2.4 350.json b/resources/profiles/Voron/machine/Voron 2.4 350.json index ae772b063d..785831a3a1 100644 --- a/resources/profiles/Voron/machine/Voron 2.4 350.json +++ b/resources/profiles/Voron/machine/Voron 2.4 350.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Voron 2.4 350", "model_id": "Voron2_350", - "nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0", + "nozzle_diameter": "0.4;0.15;0.2;0.25;0.5;0.6;0.8;1.0", "machine_tech": "FFF", "family": "VoronDesign", "bed_model": "Voron_350_build_plate.stl", diff --git a/resources/profiles/Voron/machine/Voron Switchwire 250 0.5 nozzle.json b/resources/profiles/Voron/machine/Voron Switchwire 250 0.5 nozzle.json new file mode 100644 index 0000000000..5b8044a8db --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Switchwire 250 0.5 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "machine", + "setting_id": "GM003", + "name": "Voron Switchwire 250 0.5 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Switchwire 250", + "default_print_profile": "0.25mm Standard 0.5 nozzle @Voron", + "max_layer_height": [ + "0.4" + ], + "min_layer_height": [ + "0.1" + ], + "nozzle_diameter": [ + "0.5" + ], + "printable_area": [ + "0x0", + "250x0", + "250x210", + "0x210" + ], + "printable_height": "240", + "printer_variant": "0.5" +} diff --git a/resources/profiles/Voron/machine/Voron Switchwire 250.json b/resources/profiles/Voron/machine/Voron Switchwire 250.json index 6a3e3de7cc..9955eaa057 100644 --- a/resources/profiles/Voron/machine/Voron Switchwire 250.json +++ b/resources/profiles/Voron/machine/Voron Switchwire 250.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Voron Switchwire 250", "model_id": "Voron_Switchwire_250", - "nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0", + "nozzle_diameter": "0.4;0.15;0.2;0.25;0.5;0.6;0.8;1.0", "machine_tech": "FFF", "family": "VoronDesign", "bed_model": "", diff --git a/resources/profiles/Voron/machine/Voron Trident 250 0.5 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 250 0.5 nozzle.json new file mode 100644 index 0000000000..f7c94d5454 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 250 0.5 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "machine", + "setting_id": "GM003", + "name": "Voron Trident 250 0.5 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 250", + "default_print_profile": "0.25mm Standard 0.5 nozzle @Voron", + "max_layer_height": [ + "0.4" + ], + "min_layer_height": [ + "0.1" + ], + "nozzle_diameter": [ + "0.5" + ], + "printable_area": [ + "0x0", + "250x0", + "250x250", + "0x250" + ], + "printable_height": "250", + "printer_variant": "0.5" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 250.json b/resources/profiles/Voron/machine/Voron Trident 250.json index d3fe9e5b23..614aa804e2 100644 --- a/resources/profiles/Voron/machine/Voron Trident 250.json +++ b/resources/profiles/Voron/machine/Voron Trident 250.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Voron Trident 250", "model_id": "Voron2_Trident_250", - "nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0", + "nozzle_diameter": "0.4;0.15;0.2;0.25;0.5;0.6;0.8;1.0", "machine_tech": "FFF", "family": "VoronDesign", "bed_model": "Voron_250_build_plate.stl", diff --git a/resources/profiles/Voron/machine/Voron Trident 300 0.5 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 300 0.5 nozzle.json new file mode 100644 index 0000000000..b1e47991f0 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 300 0.5 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "machine", + "setting_id": "GM003", + "name": "Voron Trident 300 0.5 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 300", + "default_print_profile": "0.25mm Standard 0.5 nozzle @Voron", + "max_layer_height": [ + "0.4" + ], + "min_layer_height": [ + "0.1" + ], + "nozzle_diameter": [ + "0.5" + ], + "printable_area": [ + "0x0", + "300x0", + "300x300", + "0x300" + ], + "printable_height": "250", + "printer_variant": "0.5" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 300.json b/resources/profiles/Voron/machine/Voron Trident 300.json index 05bb448a2a..9f5ca659ea 100644 --- a/resources/profiles/Voron/machine/Voron Trident 300.json +++ b/resources/profiles/Voron/machine/Voron Trident 300.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Voron Trident 300", "model_id": "Voron2_Trident_300", - "nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0", + "nozzle_diameter": "0.4;0.15;0.2;0.25;0.5;0.6;0.8;1.0", "machine_tech": "FFF", "family": "VoronDesign", "bed_model": "Voron_300_build_plate.stl", diff --git a/resources/profiles/Voron/machine/Voron Trident 350 0.5 nozzle.json b/resources/profiles/Voron/machine/Voron Trident 350 0.5 nozzle.json new file mode 100644 index 0000000000..ef3fcbacd6 --- /dev/null +++ b/resources/profiles/Voron/machine/Voron Trident 350 0.5 nozzle.json @@ -0,0 +1,27 @@ +{ + "type": "machine", + "setting_id": "GM003", + "name": "Voron Trident 350 0.5 nozzle", + "from": "system", + "instantiation": "true", + "inherits": "fdm_klipper_common", + "printer_model": "Voron Trident 350", + "default_print_profile": "0.30mm Standard 0.5 nozzle @Voron", + "max_layer_height": [ + "0.4" + ], + "min_layer_height": [ + "0.1" + ], + "nozzle_diameter": [ + "0.5" + ], + "printable_area": [ + "0x0", + "350x0", + "350x350", + "0x350" + ], + "printable_height": "250", + "printer_variant": "0.5" +} diff --git a/resources/profiles/Voron/machine/Voron Trident 350.json b/resources/profiles/Voron/machine/Voron Trident 350.json index 850c49bb97..7be86f5435 100644 --- a/resources/profiles/Voron/machine/Voron Trident 350.json +++ b/resources/profiles/Voron/machine/Voron Trident 350.json @@ -2,7 +2,7 @@ "type": "machine_model", "name": "Voron Trident 350", "model_id": "Voron2_Trident_350", - "nozzle_diameter": "0.4;0.15;0.2;0.25;0.6;0.8;1.0", + "nozzle_diameter": "0.4;0.15;0.2;0.25;0.5;0.6;0.8;1.0", "machine_tech": "FFF", "family": "VoronDesign", "bed_model": "Voron_350_build_plate.stl", diff --git a/resources/profiles/Voron/process/0.10mm Extra Fine 0.5 nozzle @Voron.json b/resources/profiles/Voron/process/0.10mm Extra Fine 0.5 nozzle @Voron.json new file mode 100644 index 0000000000..f55a77fbc4 --- /dev/null +++ b/resources/profiles/Voron/process/0.10mm Extra Fine 0.5 nozzle @Voron.json @@ -0,0 +1,11 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.10mm Extra Fine 0.5 nozzle @Voron", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_voron_common_0_5", + "layer_height": "0.10", + "bottom_shell_layers": "6", + "top_shell_layers": "8" +} diff --git a/resources/profiles/Voron/process/0.15mm Fine 0.5 nozzle @Voron.json b/resources/profiles/Voron/process/0.15mm Fine 0.5 nozzle @Voron.json new file mode 100644 index 0000000000..13c74e2724 --- /dev/null +++ b/resources/profiles/Voron/process/0.15mm Fine 0.5 nozzle @Voron.json @@ -0,0 +1,11 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.15mm Fine 0.5 nozzle @Voron", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_voron_common_0_5", + "layer_height": "0.15", + "bottom_shell_layers": "4", + "top_shell_layers": "6" +} diff --git a/resources/profiles/Voron/process/0.20mm Optimal 0.5 nozzle @Voron.json b/resources/profiles/Voron/process/0.20mm Optimal 0.5 nozzle @Voron.json new file mode 100644 index 0000000000..dd602f1201 --- /dev/null +++ b/resources/profiles/Voron/process/0.20mm Optimal 0.5 nozzle @Voron.json @@ -0,0 +1,11 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.20mm Optimal 0.5 nozzle @Voron", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_voron_common_0_5", + "layer_height": "0.20", + "bottom_shell_layers": "3", + "top_shell_layers": "4" +} diff --git a/resources/profiles/Voron/process/0.25mm Standard 0.5 nozzle @Voron.json b/resources/profiles/Voron/process/0.25mm Standard 0.5 nozzle @Voron.json new file mode 100644 index 0000000000..9dc9a48ef2 --- /dev/null +++ b/resources/profiles/Voron/process/0.25mm Standard 0.5 nozzle @Voron.json @@ -0,0 +1,11 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.25mm Standard 0.5 nozzle @Voron", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_voron_common_0_5", + "layer_height": "0.25", + "bottom_shell_layers": "3", + "top_shell_layers": "4" +} diff --git a/resources/profiles/Voron/process/0.30mm Draft 0.5 nozzle @Voron.json b/resources/profiles/Voron/process/0.30mm Draft 0.5 nozzle @Voron.json new file mode 100644 index 0000000000..5e56b9e023 --- /dev/null +++ b/resources/profiles/Voron/process/0.30mm Draft 0.5 nozzle @Voron.json @@ -0,0 +1,12 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.30mm Draft 0.5 nozzle @Voron", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_voron_common_0_5", + "layer_height": "0.30", + "top_surface_line_width": "0.55", + "bottom_shell_layers": "3", + "top_shell_layers": "4" +} diff --git a/resources/profiles/Voron/process/0.35mm Extra Draft 0.5 nozzle @Voron.json b/resources/profiles/Voron/process/0.35mm Extra Draft 0.5 nozzle @Voron.json new file mode 100644 index 0000000000..4e21043a99 --- /dev/null +++ b/resources/profiles/Voron/process/0.35mm Extra Draft 0.5 nozzle @Voron.json @@ -0,0 +1,12 @@ +{ + "type": "process", + "setting_id": "GP004", + "name": "0.35mm Extra Draft 0.5 nozzle @Voron", + "from": "system", + "instantiation": "true", + "inherits": "fdm_process_voron_common_0_5", + "layer_height": "0.35", + "top_surface_line_width": "0.55", + "bottom_shell_layers": "3", + "top_shell_layers": "4" +} diff --git a/resources/profiles/Voron/process/fdm_process_voron_common_0_5.json b/resources/profiles/Voron/process/fdm_process_voron_common_0_5.json new file mode 100644 index 0000000000..57f5b7dc86 --- /dev/null +++ b/resources/profiles/Voron/process/fdm_process_voron_common_0_5.json @@ -0,0 +1,26 @@ +{ + "type": "process", + "name": "fdm_process_voron_common_0_5", + "from": "system", + "instantiation": "false", + "inherits": "fdm_process_voron_common", + "initial_layer_line_width": "0.52", + "initial_layer_print_height": "0.25", + "outer_wall_line_width": "0.52", + "line_width": "0.52", + "sparse_infill_line_width": "0.52", + "inner_wall_line_width": "0.52", + "internal_solid_infill_line_width": "0.52", + "support_line_width": "0.52", + "top_surface_line_width": "0.52", + "compatible_printers": [ + "Voron 0.1 0.5 nozzle", + "Voron 2.4 250 0.5 nozzle", + "Voron 2.4 300 0.5 nozzle", + "Voron 2.4 350 0.5 nozzle", + "Voron Trident 250 0.5 nozzle", + "Voron Trident 300 0.5 nozzle", + "Voron Trident 350 0.5 nozzle", + "Voron Switchwire 250 0.5 nozzle" + ] +} From ae07f17ca0f0b11a470f3ecbb6e69eeceb6a87f7 Mon Sep 17 00:00:00 2001 From: Victor Usoltsev Date: Mon, 2 Dec 2024 01:44:43 +1300 Subject: [PATCH 2/7] Differentiates beta releases. Always shows release notes as text. (#7067) --- src/slic3r/GUI/GUI_App.cpp | 2 -- src/slic3r/GUI/ReleaseNote.cpp | 29 ++++++++++++++--------------- 2 files changed, 14 insertions(+), 17 deletions(-) diff --git a/src/slic3r/GUI/GUI_App.cpp b/src/slic3r/GUI/GUI_App.cpp index aedbea2c07..72eed3e7c1 100644 --- a/src/slic3r/GUI/GUI_App.cpp +++ b/src/slic3r/GUI/GUI_App.cpp @@ -4280,7 +4280,6 @@ void GUI_App::check_new_version_sf(bool show_tips, int by_user) best_pre = tag_version; best_pre_url = root.get("html_url"); best_pre_content = root.get("body"); - best_pre.set_prerelease("Preview"); } } else { if (best_release < tag_version) { @@ -4302,7 +4301,6 @@ void GUI_App::check_new_version_sf(bool show_tips, int by_user) best_pre = tag_version; best_pre_url = json_version.second.get("html_url"); best_pre_content = json_version.second.get("body"); - best_pre.set_prerelease("Preview"); } } else { if (best_release < tag_version) { diff --git a/src/slic3r/GUI/ReleaseNote.cpp b/src/slic3r/GUI/ReleaseNote.cpp index 617397f32f..331711a823 100644 --- a/src/slic3r/GUI/ReleaseNote.cpp +++ b/src/slic3r/GUI/ReleaseNote.cpp @@ -502,21 +502,20 @@ std::vector UpdateVersionDialog::splitWithStl(std::string str,std:: void UpdateVersionDialog::update_version_info(wxString release_note, wxString version) { //bbs check whether the web display is used - bool use_web_link = false; - url_line = ""; - auto split_array = splitWithStl(release_note.ToStdString(), "###"); - - if (split_array.size() >= 3) { - for (auto i = 0; i < split_array.size(); i++) { - std::string url = split_array[i]; - if (std::strstr(url.c_str(), "http://") != NULL || std::strstr(url.c_str(), "https://") != NULL) { - use_web_link = true; - url_line = url; - break; - } - } - } - + bool use_web_link = false; + url_line = ""; + // Orca: not used in Orca Slicer + // auto split_array = splitWithStl(release_note.ToStdString(), "###"); + // if (split_array.size() >= 3) { + // for (auto i = 0; i < split_array.size(); i++) { + // std::string url = split_array[i]; + // if (std::strstr(url.c_str(), "http://") != NULL || std::strstr(url.c_str(), "https://") != NULL) { + // use_web_link = true; + // url_line = url; + // break; + // } + // } + // } if (use_web_link) { m_brand->Hide(); From 484c43ca4d795e4856b1001c213d170afa3225e4 Mon Sep 17 00:00:00 2001 From: xiaoyeliu <166936931+womendoushihaoyin@users.noreply.github.com> Date: Sun, 1 Dec 2024 20:49:55 +0800 Subject: [PATCH 3/7] Feature: set different colors to tools on devices with multitools (#7125) For devices with multitools, set the default colors of filaments for each tool to different colors --- src/libslic3r/PresetBundle.cpp | 20 ++++++++++++++++++++ src/libslic3r/PresetBundle.hpp | 1 + src/slic3r/GUI/Tab.cpp | 9 ++++++++- 3 files changed, 29 insertions(+), 1 deletion(-) diff --git a/src/libslic3r/PresetBundle.cpp b/src/libslic3r/PresetBundle.cpp index 92a8069e6e..ae18f5f810 100644 --- a/src/libslic3r/PresetBundle.cpp +++ b/src/libslic3r/PresetBundle.cpp @@ -1851,6 +1851,26 @@ void PresetBundle::export_selections(AppConfig &config) } // BBS +void PresetBundle::set_num_filaments(unsigned int n, std::vector new_colors) { + int old_filament_count = this->filament_presets.size(); + if (n > old_filament_count && old_filament_count != 0) + filament_presets.resize(n, filament_presets.back()); + else { + filament_presets.resize(n); + } + ConfigOptionStrings* filament_color = project_config.option("filament_colour"); + filament_color->resize(n); + ams_multi_color_filment.resize(n); + // BBS set new filament color to new_color + if (old_filament_count < n) { + if (!new_colors.empty()) { + for (int i = old_filament_count; i < n; i++) { + filament_color->values[i] = new_colors[i - old_filament_count]; + } + } + } + update_multi_material_filament_presets(); +} void PresetBundle::set_num_filaments(unsigned int n, std::string new_color) { int old_filament_count = this->filament_presets.size(); diff --git a/src/libslic3r/PresetBundle.hpp b/src/libslic3r/PresetBundle.hpp index 976e654074..2937937920 100644 --- a/src/libslic3r/PresetBundle.hpp +++ b/src/libslic3r/PresetBundle.hpp @@ -111,6 +111,7 @@ public: void export_selections(AppConfig &config); // BBS + void set_num_filaments(unsigned int n, std::vector new_colors); void set_num_filaments(unsigned int n, std::string new_col = ""); unsigned int sync_ams_list(unsigned int & unknowns); //BBS: check whether this is the only edited filament diff --git a/src/slic3r/GUI/Tab.cpp b/src/slic3r/GUI/Tab.cpp index 8d5cbf1c7e..05b741bcb5 100644 --- a/src/slic3r/GUI/Tab.cpp +++ b/src/slic3r/GUI/Tab.cpp @@ -1649,7 +1649,14 @@ void Tab::on_value_change(const std::string& opt_key, const boost::any& value) //Orca: sync filament num if it's a multi tool printer if (opt_key == "extruders_count" && !m_config->opt_bool("single_extruder_multi_material")){ auto num_extruder = boost::any_cast(value); - wxGetApp().preset_bundle->set_num_filaments(num_extruder); + int old_filament_size = wxGetApp().preset_bundle->filament_presets.size(); + std::vector new_colors; + for (int i = old_filament_size; i < num_extruder; ++i) { + wxColour new_col = Plater::get_next_color_for_filament(); + std::string new_color = new_col.GetAsString(wxC2S_HTML_SYNTAX).ToStdString(); + new_colors.push_back(new_color); + } + wxGetApp().preset_bundle->set_num_filaments(num_extruder, new_colors); wxGetApp().plater()->on_filaments_change(num_extruder); wxGetApp().get_tab(Preset::TYPE_PRINT)->update(); wxGetApp().preset_bundle->export_selections(*wxGetApp().app_config); From 30cfa9a9311c29db98e030e6f9d70eeef060b604 Mon Sep 17 00:00:00 2001 From: Andy Date: Sun, 1 Dec 2024 20:07:54 +0700 Subject: [PATCH 4/7] Russian translation update (#7623) Russian translation update OrcaSlicer V2.2.0 Official Release. Translation updates, improved translation, corrected errors. --- localization/i18n/ru/OrcaSlicer_ru.po | 174 ++++++++++++++------------ 1 file changed, 95 insertions(+), 79 deletions(-) diff --git a/localization/i18n/ru/OrcaSlicer_ru.po b/localization/i18n/ru/OrcaSlicer_ru.po index b4a99052f2..f68beeed9b 100644 --- a/localization/i18n/ru/OrcaSlicer_ru.po +++ b/localization/i18n/ru/OrcaSlicer_ru.po @@ -5,18 +5,18 @@ # msgid "" msgstr "" -"Project-Id-Version: OrcaSlicer V2.2.0-beta2\n" +"Project-Id-Version: OrcaSlicer V2.2.0 Official Release\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2024-10-27 23:05+0800\n" -"PO-Revision-Date: 2024-09-25 22:36+0700\n" +"PO-Revision-Date: 2024-11-30 20:56+0700\n" "Last-Translator: \n" "Language-Team: Andylg \n" "Language: ru_RU\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n" -"%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && " +"n%10<=4 && (n%100<12 || n%100>14) ? 1 : 2);\n" "X-Generator: Poedit 3.5\n" msgid "Supports Painting" @@ -101,8 +101,9 @@ msgstr "Позволяет рисовать на выбранных гранях msgid "Highlight faces according to overhang angle." msgstr "Выделение граней по углу свеса." +# это в рисование поддержки идет после - Выделение граней по углу свеса. msgid "No auto support" -msgstr "Откл. автоподдержку" +msgstr "Автоподдержка отключена." msgid "Support Generated" msgstr "Поддержка сгенерирована" @@ -361,17 +362,17 @@ msgid "" "Click to flip the cut plane\n" "Drag to move the cut plane" msgstr "" -"Нажмите, чтобы перевернуть секущую плоскость\n" -"Двигайте, чтобы переместить секущую плоскость" +"Нажмите, чтобы перевернуть секущую плоскость.\n" +"Двигайте, чтобы переместить секущую плоскость." msgid "" "Click to flip the cut plane\n" "Drag to move the cut plane\n" "Right-click a part to assign it to the other side" msgstr "" -"Нажмите, чтобы перевернуть секущую плоскость\n" -"Двигайте, чтобы переместить секущую плоскость\n" -"Правая кнопка мыши на части модели для переназначения стороны" +"Нажмите, чтобы перевернуть секущую плоскость.\n" +"Двигайте, чтобы переместить секущую плоскость.\n" +"Для переназначения стороны части модели используйте правую кнопку мыши." msgid "Move cut plane" msgstr "Перемещение секущей плоскости" @@ -507,16 +508,16 @@ msgstr "Обнаружены недопустимые соединения" #, c-format, boost-format msgid "%1$d connector is out of cut contour" msgid_plural "%1$d connectors are out of cut contour" -msgstr[0] "%1$d соединение выходит за контур модели" -msgstr[1] "%1$d соединения выходит за контур модели" -msgstr[2] "%1$d соединений выходит за контур модели" +msgstr[0] "%1$d соединение выходит за контур модели." +msgstr[1] "%1$d соединения выходит за контур модели." +msgstr[2] "%1$d соединений выходит за контур модели." #, c-format, boost-format msgid "%1$d connector is out of object" msgid_plural "%1$d connectors are out of object" -msgstr[0] "%1$d соединение находится за пределами модели" -msgstr[1] "%1$d соединения находится за пределами модели" -msgstr[2] "%1$d соединений находится за пределами модели" +msgstr[0] "%1$d соединение находится за пределами модели." +msgstr[1] "%1$d соединения находится за пределами модели." +msgstr[2] "%1$d соединений находится за пределами модели." msgid "Some connectors are overlapped" msgstr "Имеются пересекающие соединения" @@ -605,7 +606,6 @@ msgstr "Показывать каркас" msgid "%1%" msgstr "%1%" -# ??? msgid "Can't apply when process preview." msgstr "Невозможно применить при предпросмотре нарезки." @@ -1247,10 +1247,10 @@ msgstr "" "Блокировка/разблокировка угла поворота при перетаскивании над поверхностью." msgid "Mirror vertically" -msgstr "Зеркалировать по вертикали" +msgstr "Отзеркалить по вертикали" msgid "Mirror horizontally" -msgstr "Зеркалировать по горизонтали" +msgstr "Отзеркалить по горизонтали" #. TRN: This is the name of the action that shows in undo/redo stack (changing part type from SVG to something else). msgid "Change SVG Type" @@ -2446,11 +2446,11 @@ msgstr "Автодозаправка" msgid "AMS not connected" msgstr "АСПП не подключена" -# ???? кнопка в интерфейсе? Extrude - Выдавить - Load +# ??? кнопка в интерфейсе? Extrude - Выдавить - Load msgid "Load" msgstr "Выдавить" -# ???? кнопка в интерфейсе? retract - Втянуть - Unload (Выгрузить, Вырузка) +# ??? кнопка в интерфейсе? retract - Втянуть - Unload (Выгрузить, Вырузка) msgid "Unload" msgstr "Втянуть" @@ -2483,6 +2483,7 @@ msgstr "Отменить калибровку" msgid "Idling..." msgstr "Простой..." +# При выгрузке/загрузке прутка справа отображается процесс msgid "Heat the nozzle" msgstr "Нагрев сопла" @@ -3877,6 +3878,7 @@ msgstr "Пауза при неисправности температуры ст msgid "Filament unloading" msgstr "Выгрузка прутка" +# ??? msgid "Skip step pause" msgstr "Пропуск команды паузы" @@ -3889,6 +3891,7 @@ msgstr "Калибровка шума двигателя" msgid "Paused due to AMS lost" msgstr "Печать приостановлена из-за потери связи с АСПП" +# ??? Печать приостановлена из-за низкой скорости вентилятора радиатора головы msgid "Paused due to low speed of the heat break fan" msgstr "" "Печать приостановлена из-за низкой скорости вентилятора обдува радиатора " @@ -4610,7 +4613,7 @@ msgstr "Авторизация" msgid "Preview" msgstr "Предпросмотр нарезки" -# ??? Управ. принтерами, Управ. устройствами, менеджер устройств, Диспетчер устройств, Принтеры +# ??? Управ. принтерами, менеджер принтеров, Диспетчер принтеров msgid "Multi-device" msgstr "Принтеры" @@ -5070,7 +5073,7 @@ msgid "File is missing" msgstr "Файл отсутствует" msgid "The project is no longer available." -msgstr "Проект больше не доступен." +msgstr "Проект больше недоступен." msgid "Filament Settings" msgstr "Настройки прутка" @@ -5152,7 +5155,7 @@ msgstr "" msgid "The printer has been logged out and cannot connect." msgstr "Принтер вышел из системы и не может подключиться." -# ??? Трансляция, видеотрансляция остановлена +# ??? видеотрансляция остановлена msgid "Stopped." msgstr "Трансляция с камеры остановлена." @@ -5784,8 +5787,8 @@ msgstr "Безопасное извлечение устройства." msgid "%1$d Object has custom supports." msgid_plural "%1$d Objects have custom supports." msgstr[0] "%1$d модель имеет пользовательскую поддержку." -msgstr[1] "%1$d модели имеют пользовательские поддержки." -msgstr[2] "%1$d моделей имеют пользовательские поддержки." +msgstr[1] "%1$d модели имеют пользовательскую поддержку." +msgstr[2] "%1$d моделей имеют пользовательскую поддержку." #, c-format, boost-format msgid "%1$d Object has color painting." @@ -5958,7 +5961,7 @@ msgid "View all object's settings" msgstr "Просмотр всех настроек модели" msgid "Material settings" -msgstr "Параметры материала" +msgstr "Настройки материала" msgid "Remove current plate (if not last one)" msgstr "Удалить текущую печатную пластину (кроме последней)" @@ -6120,7 +6123,7 @@ msgid "" "nozzle hardness of the printer. Please replace the hardened nozzle or " "filament, otherwise, the nozzle will be attrited or damaged." msgstr "" -"Твердость сопла, установленного по умолчанию, не достаточна для печати " +"Твердость сопла, установленного по умолчанию, недостаточна для печати " "данной пластиковой нитью. Замените сопло на закалённое или смените " "пластиковую нить. В противном случае сопло будет изношено или повреждено." @@ -6510,15 +6513,17 @@ msgid "" "will be kept. You may fix the meshes and try again." msgstr "" "Невозможно выполнить булеву операцию над сетками модели. Будут сохранены " -"только положительные части. Вы можете исправить сетки и попробовать снова." +"только положительные части. Попробуйте починить сетку модели и попробовать " +"снова." #, boost-format msgid "Reason: part \"%1%\" is empty." msgstr "Причина: часть \"%1%\" пустая." +# ??? не формирует объем, не имеет замкнутой геометрии #, boost-format msgid "Reason: part \"%1%\" does not bound a volume." -msgstr "Причина: часть \"%1%\" не ограничивает объём." +msgstr "Причина: часть \"%1%\" не формирует замкнутый объём." #, boost-format msgid "Reason: part \"%1%\" has self intersection." @@ -6532,6 +6537,8 @@ msgid "" "Unable to perform boolean operation on model meshes. Only positive parts " "will be exported." msgstr "" +"Невозможно выполнить булеву операцию над сетками модели. Будут " +"экспортированы только положительные части." msgid "" "Are you sure you want to store original SVGs with their local paths into the " @@ -7091,14 +7098,13 @@ msgstr "Создать принтер" msgid "The selected preset is null!" msgstr "Выбранный профиль пуст!" -# ?????? В двух местах - в одном месте кнопка в другом Конечный слой +# ?????? В двух местах - в одном месте кнопка в другом Конечный слой. В V2.2.0beta2 пока не исправлено msgid "End" msgstr "End" msgid "Customize" msgstr "Настройка" -# ??? layer? msgid "Other layer filament sequence" msgstr "Последовательность прутков на других слоях" @@ -7801,8 +7807,8 @@ msgstr "" msgid "" "When recording timelapse without toolhead, it is recommended to add a " "\"Timelapse Wipe Tower\" \n" -"by right-click the empty position of build plate and choose \"Add Primitive" -"\"->\"Timelapse Wipe Tower\"." +"by right-click the empty position of build plate and choose \"Add " +"Primitive\"->\"Timelapse Wipe Tower\"." msgstr "" "При записи таймлапса без видимости головы рекомендуется добавить «Черновая " "башня таймлапса». \n" @@ -7956,7 +7962,7 @@ msgid "Flow ratio and Pressure Advance" msgstr "Коэффициент потока и Pressure Advance" msgid "Print chamber temperature" -msgstr "Температура в камере" +msgstr "Температура в термокамере при печати" msgid "Print temperature" msgstr "Температура печати" @@ -8061,7 +8067,7 @@ msgstr "" "расчётное время печати слоя меньше установленного значения." msgid "Auxiliary part cooling fan" -msgstr "Вспомогательный вентилятор для охлаждения моделей" +msgstr "Вспомогательный вентилятор модели" msgid "Exhaust fan" msgstr "Вытяжной вентилятор" @@ -8192,10 +8198,6 @@ msgstr "Диаметр сопла" msgid "Wipe tower" msgstr "Черновая башня" -# ????2 Параметры замены материала в одноэкструдерном ММ принтере -# ???? Параметры экструдера в одноэкструдерном мультиматериальном принтере -# ???? Параметры для экструдера в одноэкструдерном мультиматериальном принтере -# ???? Параметры для одноэкструдерной мультиматериальном печати msgid "Single extruder multi-material parameters" msgstr "Параметры одноэкструдерного мультиматериального принтера" @@ -8772,7 +8774,9 @@ msgid "" "objects, it just orientates the selected ones.Otherwise, it will orientates " "all objects in the current disk." msgstr "" -"Автоориентация моделей (ориентация выбранного, иначе всего на текущем столе)" +"Автоориентация выбранных или всех моделей. Если выбраны отдельные модели, " +"ориентация будет применена только к ним; в противном случае ко всем моделям " +"на текущем столе." msgid "Shift+Tab" msgstr "Shift+Tab" @@ -8940,10 +8944,10 @@ msgid "Select the object/part and press space to change the name" msgstr "Выберите модель/часть и нажмите пробел, чтобы изменить имя" msgid "Mouse click" -msgstr "Щелчок кнопкой мыши" +msgstr "Левая кнопка мыши" msgid "Select the object/part and mouse click to change the name" -msgstr "Выберите модель/часть и нажмите клавишу мыши, чтобы изменить имя" +msgstr "Выберите модель/часть и нажмите левую клавишу мыши, чтобы изменить имя" msgid "Objects List" msgstr "Список моделей" @@ -10133,7 +10137,6 @@ msgstr "" msgid "Cooling overhang threshold" msgstr "Порог включения обдува на нависаниях" -#, fuzzy, c-format msgid "" "Force cooling fan to be specific speed when overhang degree of printed part " "exceeds this value. Expressed as percentage which indicates how much width " @@ -10394,6 +10397,7 @@ msgstr "Порог для реверса" msgid "Overhang reversal threshold" msgstr "Порог разворота на свесах" +# ????? #, no-c-format, no-boost-format msgid "" "Number of mm the overhang need to be for the reversal to be considered " @@ -10402,6 +10406,14 @@ msgid "" "When Detect overhang wall is not enabled, this option is ignored and " "reversal happens on every even layers regardless." msgstr "" +"Величина свеса периметра при которой она считается достаточной для активации " +"функции реверса печати нависаний. Может быть в мм или в % от ширины " +"периметра.\n" +"При нуле разворот будет на каждом чётном слое, независимо от величина " +"свеса.\n" +"Если «Определять нависающие периметры» не включено, этот параметр " +"игнорируется, и разворот происходит на каждом чётном слое без " +"исключений." msgid "Classic mode" msgstr "Классический режим" @@ -10928,7 +10940,7 @@ msgid "" "\n" " " msgstr "" -"Последовательность печати внутреннего/внешнего периметров.\n" +"Последовательность печати внутреннего и внешнего периметров.\n" "\n" "Используйте порядок печати периметров «Внутренний/Внешний» для получения " "наилучших нависаний. Однако этот вариант приводит к небольшому снижению " @@ -11117,7 +11129,6 @@ msgstr "" "Используется только в качестве визуальной помощи в пользовательском " "интерфейсе" -# ??? Смещение экструдера по осям X/Y msgid "Extruder offset" msgstr "Смещение координат экструдера" @@ -11834,8 +11845,8 @@ msgstr "" "две ближайшие линии заполнения с коротким отрезком периметра. Если не " "найдено такого отрезка периметра короче этого параметра, линия заполнения " "соединяется с отрезком периметра только с одной стороны, а длина отрезка " -"периметра ограничена значением «Длина привязок разреженного " -"заполнения» (infill_anchor), но не больше этого параметра.\n" +"периметра ограничена значением «Длина привязок разреженного заполнения» " +"(infill_anchor), но не больше этого параметра.\n" "Если установить 0, то будет использоваться старый алгоритм для соединения " "заполнения, который даёт такой же результат, как и при значениях 1000 и 0." @@ -11900,7 +11911,7 @@ msgstr "Вкл. ограничение ускорения зигзагов" msgid "Klipper's max_accel_to_decel will be adjusted automatically" msgstr "" -"Значение ограничение ускорения зигзагов (max_accel_to_decel) в Klipper будет " +"Значение Klipper-а ограничение ускорения зигзагов (max_accel_to_decel) будет " "скорректировано автоматически.\n" "\n" "Параметр предназначен для ограничения влияния экстремальных переходов от " @@ -11914,8 +11925,8 @@ msgstr "Ограничение ускорение зигзагов" msgid "" "Klipper's max_accel_to_decel will be adjusted to this %% of acceleration" msgstr "" -"Значение ограничение ускорения зигзагов (max_accel_to_decel) в Klipper будет " -"скорректировано на заданный процент ускорения." +"Значение Klipper-а ограничение ускорения зигзагов (max_accel_to_decel) будет " +"скорректировано на данный процент ускорения." msgid "Jerk of outer walls" msgstr "Рывок для внешних периметров." @@ -11990,17 +12001,17 @@ msgstr "Полная скорость вентилятора на слое" msgid "" "Fan speed will be ramped up linearly from zero at layer " -"\"close_fan_the_first_x_layers\" to maximum at layer \"full_fan_speed_layer" -"\". \"full_fan_speed_layer\" will be ignored if lower than " -"\"close_fan_the_first_x_layers\", in which case the fan will be running at " -"maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1." +"\"close_fan_the_first_x_layers\" to maximum at layer " +"\"full_fan_speed_layer\". \"full_fan_speed_layer\" will be ignored if lower " +"than \"close_fan_the_first_x_layers\", in which case the fan will be running " +"at maximum allowed speed at layer \"close_fan_the_first_x_layers\" + 1." msgstr "" "Скорость вентилятора будет нарастать линейно от нуля на слое " -"\"close_fan_the_first_x_layers\" до максимума на слое \"full_fan_speed_layer" -"\". Значение \"full_fan_speed_layer\" будет игнорироваться, если оно меньше " -"значения \"close_fan_the_first_x_layers\", в этом случае вентилятор будет " -"работать на максимально допустимой скорости на слое " -"\"close_fan_the_first_x_layers\" + 1." +"\"close_fan_the_first_x_layers\" до максимума на слое " +"\"full_fan_speed_layer\". Значение \"full_fan_speed_layer\" будет " +"игнорироваться, если оно меньше значения \"close_fan_the_first_x_layers\", в " +"этом случае вентилятор будет работать на максимально допустимой скорости на " +"слое \"close_fan_the_first_x_layers\" + 1." msgid "layer" msgstr "слой" @@ -12088,7 +12099,7 @@ msgid "" "printed more slowly" msgstr "" "Скорость заполнения пробелов. Пробелы обычно имеют неравномерную ширину " -"линии и должен печататься медленнее." +"линии и должны печататься медленнее." msgid "Precise Z height" msgstr "Точная высота по Z" @@ -12311,7 +12322,7 @@ msgstr "Включите, если хотите использовать нес # ?????? Название моделей msgid "Label objects" -msgstr "Помечать объекты" +msgstr "Помечать модели" # ?????? msgid "" @@ -12321,7 +12332,8 @@ msgid "" "setup and Wipe into Object / Wipe into Infill." msgstr "" "Отвечает за присвоение уникальных меток или названий каждой модели или " -"элементу, что позволяет отменять печать любого из них по вашему выбору." +"элементу, что позволяет отменять печать любого из них по вашему выбору.\n" +"\n" "Включите эту опцию, чтобы добавить комментарии в G-код с указанием того, к " "какой модели он принадлежит, что полезно для плагина Octoprint CancelObject. " "Эта настройка не совместима с настройкой «Одноэкструдерный " @@ -12329,11 +12341,11 @@ msgstr "" "модели»." msgid "Exclude objects" -msgstr "Исключить модели" +msgstr "Исключение моделей" msgid "Enable this option to add EXCLUDE OBJECT command in g-code" msgstr "" -"Включите эту опцию, чтобы добавить команду EXCLUDE OBJECT (исключения " +"Включите эту опцию, чтобы добавить команду EXCLUDE OBJECT (исключение " "моделей) в G-код для принтера с прошивкой Klipper." msgid "Verbose G-code" @@ -13151,7 +13163,7 @@ msgstr "Расширение первого слоя" msgid "Expand the first raft or support layer to improve bed plate adhesion" msgstr "" "Расширение первого слоя подложки или поддержки в плоскости XY для улучшения " -"адгезии с материалами склонными к отлипанию и закручиванию." +"адгезии при печати материалами склонными к отлипанию и закручиванию." msgid "Raft layers" msgstr "Слоёв в подложке" @@ -13542,7 +13554,7 @@ msgid "" "scarf." msgstr "" "Длина клиновидного шва. Установка этого параметра на ноль фактически " -"отключает шарф." +"отключает клиновидный шов." msgid "Scarf steps" msgstr "Шагов клиновидного шва" @@ -13816,9 +13828,9 @@ msgid "" "zero value." msgstr "" "Разница температур, которая будет применяться, когда экструдер не активен. " -"Значение не используется, если для параметра «Температура " -"ожидания» ('idle_temperature') в настройках пластиковой нити установлено " -"ненулевое значение." +"Значение не используется, если для параметра «Температура ожидания» " +"('idle_temperature') в настройках пластиковой нити установлено ненулевое " +"значение." msgid "Preheat time" msgstr "Время преднагрева" @@ -14375,8 +14387,8 @@ msgstr "Вкл. контроль температуры" msgid "" "Enable this option for automated chamber temperature control. This option " -"activates the emitting of an M191 command before the \"machine_start_gcode" -"\"\n" +"activates the emitting of an M191 command before the " +"\"machine_start_gcode\"\n" " which sets the chamber temperature and waits until it is reached. In " "addition, it emits an M141 command at the end of the print to turn off the " "chamber heater, if present. \n" @@ -14832,9 +14844,12 @@ msgid "" msgstr "" "Движок классического генератора периметров создаёт их с постоянной шириной " "экструзии, а для очень тонких участков используется параметр «Заполнять " -"щели». Движок Arachne же создаёт периметры с переменной шириной экструзии, " -"что позволяет печатать без щелей, лучше пропечатывать мелкие элементы (при " -"условии, что у вас правильно откалиброван LA/PA)." +"щели».\n" +"\n" +"Движок Arachne же создаёт периметры с переменной шириной экструзии, что " +"позволяет печатать без щелей, лучше пропечатывать мелкие элементы (при " +"условии, что у вас правильно откалиброван LA/PA). Этот параметр также влияет " +"на концентрическое заполнение." msgid "Classic" msgstr "Классический" @@ -16288,8 +16303,9 @@ msgstr "Пересечение" msgid "Source Volume" msgstr "Исходный объём" +# ??? msgid "Tool Volume" -msgstr "" +msgstr "Объём инструмента" msgid "Subtract from" msgstr "Главный" @@ -16455,8 +16471,8 @@ msgstr "" "Хотите перезаписать его?" msgid "" -"We would rename the presets as \"Vendor Type Serial @printer you selected" -"\". \n" +"We would rename the presets as \"Vendor Type Serial @printer you " +"selected\". \n" "To add preset for more printers, Please go to printer selection" msgstr "" "Мы переименуем профиль в \"Производитель Тип Серия @выбранный принтер\".\n" @@ -17439,7 +17455,7 @@ msgid "" "Auxiliary fan\n" "Did you know that OrcaSlicer supports Auxiliary part cooling fan?" msgstr "" -"Вспомогательный вентилятор для охлаждения моделей\n" +"Вспомогательный вентилятор модели\n" "Знаете ли вы, что OrcaSlicer поддерживает управление вспомогательным " "вентилятором для охлаждения моделей?" From 719f09e2f2b231f3ac231a39ad401280ec83924d Mon Sep 17 00:00:00 2001 From: Patrick Uven Date: Sun, 1 Dec 2024 14:18:31 +0100 Subject: [PATCH 5/7] Provide reasonable default layer heights (#7384) Using my Ender 3 V3 SE I noticed weird printing behaviour. Searching for the cause, I found that the default layer height for a 0.2mm nozzle for the printer was set to 0.08mm min and 0.32mm max, which are the default 20%/80% values for a 0.4mm nozzle. This commit changes the values for all Creality printer which had not a reasonable default value for 0.2mm, 0.6mm and 0.8mm nozzles to 20% min and 80% max. Co-authored-by: SoftFever --- .../Creality/machine/Creality CR-10 SE 0.2 nozzle.json | 6 +++--- .../Creality/machine/Creality CR-10 SE 0.6 nozzle.json | 6 +++--- .../Creality/machine/Creality CR-10 SE 0.8 nozzle.json | 6 +++--- .../Creality/machine/Creality Ender-3 0.2 nozzle.json | 6 +++--- .../Creality/machine/Creality Ender-3 0.6 nozzle.json | 6 +++--- .../Creality/machine/Creality Ender-3 0.8 nozzle.json | 6 +++--- .../Creality/machine/Creality Ender-3 Pro 0.2 nozzle.json | 6 +++--- .../Creality/machine/Creality Ender-3 Pro 0.6 nozzle.json | 6 +++--- .../Creality/machine/Creality Ender-3 Pro 0.8 nozzle.json | 6 +++--- .../machine/Creality Ender-3 S1 Plus 0.2 nozzle.json | 6 +++--- .../machine/Creality Ender-3 S1 Plus 0.6 nozzle.json | 6 +++--- .../machine/Creality Ender-3 S1 Plus 0.8 nozzle.json | 6 +++--- .../Creality/machine/Creality Ender-3 V3 SE 0.2 nozzle.json | 4 ++-- .../Creality/machine/Creality Ender-3 V3 SE 0.6 nozzle.json | 4 ++-- .../Creality/machine/Creality Ender-3 V3 SE 0.8 nozzle.json | 4 ++-- .../profiles/Creality/machine/Creality K1 (0.8 nozzle).json | 4 ++-- .../Creality/machine/Creality K1 Max (0.8 nozzle).json | 4 ++-- .../profiles/Creality/machine/Creality K1C 0.8 nozzle.json | 4 ++-- .../Creality/machine/Creality K2 Plus 0.8 nozzle.json | 2 +- 19 files changed, 49 insertions(+), 49 deletions(-) diff --git a/resources/profiles/Creality/machine/Creality CR-10 SE 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality CR-10 SE 0.2 nozzle.json index 1ecafe3f8d..4911adffb7 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 SE 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-10 SE 0.2 nozzle.json @@ -88,10 +88,10 @@ "2" ], "max_layer_height": [ - "0.32" + "0.16" ], "min_layer_height": [ - "0.08" + "0.04" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ @@ -125,4 +125,4 @@ "96x96", "300x300" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality CR-10 SE 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality CR-10 SE 0.6 nozzle.json index 5f56e1ff87..fbcb5d3921 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 SE 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-10 SE 0.6 nozzle.json @@ -88,10 +88,10 @@ "2" ], "max_layer_height": [ - "0.32" + "0.48" ], "min_layer_height": [ - "0.08" + "0.12" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ @@ -125,4 +125,4 @@ "96x96", "300x300" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality CR-10 SE 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality CR-10 SE 0.8 nozzle.json index 00d3f3ff44..71fa0f5db4 100644 --- a/resources/profiles/Creality/machine/Creality CR-10 SE 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality CR-10 SE 0.8 nozzle.json @@ -88,10 +88,10 @@ "2" ], "max_layer_height": [ - "0.32" + "0.64" ], "min_layer_height": [ - "0.08" + "0.16" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ @@ -125,4 +125,4 @@ "96x96", "300x300" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality Ender-3 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 0.2 nozzle.json index 84b0aa585b..020a23436d 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 0.2 nozzle.json @@ -81,10 +81,10 @@ "0.4" ], "max_layer_height": [ - "0.36" + "0.16" ], "min_layer_height": [ - "0.08" + "0.04" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ @@ -111,4 +111,4 @@ "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", "scan_first_layer": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality Ender-3 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 0.6 nozzle.json index 3cd5410693..3ca555c031 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 0.6 nozzle.json @@ -81,10 +81,10 @@ "0.4" ], "max_layer_height": [ - "0.36" + "0.48" ], "min_layer_height": [ - "0.08" + "0.12" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ @@ -111,4 +111,4 @@ "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", "scan_first_layer": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality Ender-3 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 0.8 nozzle.json index 5d0f0b674f..1f6e3c34ef 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 0.8 nozzle.json @@ -81,10 +81,10 @@ "0.4" ], "max_layer_height": [ - "0.36" + "0.64" ], "min_layer_height": [ - "0.08" + "0.16" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ @@ -111,4 +111,4 @@ "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", "scan_first_layer": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.2 nozzle.json index 9cd139b34e..bef8c38f3d 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.2 nozzle.json @@ -81,10 +81,10 @@ "0.4" ], "max_layer_height": [ - "0.36" + "0.16" ], "min_layer_height": [ - "0.08" + "0.04" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ @@ -111,4 +111,4 @@ "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", "scan_first_layer": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.6 nozzle.json index 759243c2b7..268a063383 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.6 nozzle.json @@ -81,10 +81,10 @@ "0.4" ], "max_layer_height": [ - "0.36" + "0.48" ], "min_layer_height": [ - "0.08" + "0.12" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ @@ -111,4 +111,4 @@ "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", "scan_first_layer": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.8 nozzle.json index e807d8f2f0..b49092d49e 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 Pro 0.8 nozzle.json @@ -81,10 +81,10 @@ "0.4" ], "max_layer_height": [ - "0.36" + "0.64" ], "min_layer_height": [ - "0.08" + "0.16" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ @@ -111,4 +111,4 @@ "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nG4 S10 ; allow partial nozzle warmup\nG28 ; home all axis\nG1 Z50 F240\nG1 X2 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 F5000\nG92 E0\nG1 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", "scan_first_layer": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.2 nozzle.json index 158e30b6e7..b8fc2bc851 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.2 nozzle.json @@ -78,10 +78,10 @@ "0.4" ], "max_layer_height": [ - "0.36" + "0.16" ], "min_layer_height": [ - "0.08" + "0.04" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ @@ -111,4 +111,4 @@ "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis and restore leveling \nM420 S1; Enable mesh leveling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", "scan_first_layer": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.6 nozzle.json index 445e0b0bc3..f774ae2713 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.6 nozzle.json @@ -78,10 +78,10 @@ "0.4" ], "max_layer_height": [ - "0.36" + "0.48" ], "min_layer_height": [ - "0.08" + "0.12" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ @@ -111,4 +111,4 @@ "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis and restore leveling\nM420 S1; Enable mesh leveling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", "scan_first_layer": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.8 nozzle.json index f8930b0d96..bd4add3b08 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 S1 Plus 0.8 nozzle.json @@ -79,10 +79,10 @@ "0.4" ], "max_layer_height": [ - "0.36" + "0.64" ], "min_layer_height": [ - "0.08" + "0.16" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ @@ -112,4 +112,4 @@ "machine_start_gcode": "G90 ; use absolute coordinates\nM83 ; extruder relative mode\nM104 S150 ; set temporary nozzle temp to prevent oozing during homing\nM140 S[bed_temperature_initial_layer_single] ; set final bed temp\nG4 S30 ; allow partial nozzle warmup\nG28 ; home all axis and restore leveling\nM420 S1; Enable mesh leveling\nG1 Z50 F240\nG1 X2.0 Y10 F3000\nM104 S[nozzle_temperature_initial_layer] ; set final nozzle temp\nM190 S[bed_temperature_initial_layer_single] ; wait for bed temp to stabilize\nM109 S[nozzle_temperature_initial_layer] ; wait for nozzle temp to stabilize\nG1 Z0.28 F240\nG92 E0\nG1 X2.0 Y140 E10 F1500 ; prime the nozzle\nG1 X2.3 Y140 F5000\nG92 E0\nG1 X2.3 Y10 E10 F1200 ; prime the nozzle\nG92 E0", "machine_end_gcode": "{if max_layer_z < printable_height}G1 Z{z_offset+min(max_layer_z+2, printable_height)} F600 ; Move print head up{endif}\nG1 X5 Y{print_bed_max[1]*0.8} F{travel_speed*60} ; present print\n{if max_layer_z < printable_height-10}G1 Z{z_offset+min(max_layer_z+70, printable_height-10)} F600 ; Move print head further up{endif}\n{if max_layer_z < max_print_height*0.6}G1 Z{printable_height*0.6} F600 ; Move print head further up{endif}\nM140 S0 ; turn off heatbed\nM104 S0 ; turn off temperature\nM107 ; turn off fan\nM84 X Y E ; disable motors", "scan_first_layer": "0" -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.2 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.2 nozzle.json index 5c8c2b73b6..b9a5d7fc8b 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.2 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.2 nozzle.json @@ -84,10 +84,10 @@ "0.4" ], "max_layer_height": [ - "0.32" + "0.16" ], "min_layer_height": [ - "0.08" + "0.04" ], "retraction_minimum_travel": [ "2" diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.6 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.6 nozzle.json index ccc53b8c90..ae639af95a 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.6 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.6 nozzle.json @@ -84,10 +84,10 @@ "0.4" ], "max_layer_height": [ - "0.32" + "0.48" ], "min_layer_height": [ - "0.08" + "0.12" ], "retraction_minimum_travel": [ "2" diff --git a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.8 nozzle.json index f5e565f0cd..8833fd9ecd 100644 --- a/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality Ender-3 V3 SE 0.8 nozzle.json @@ -84,10 +84,10 @@ "0.4" ], "max_layer_height": [ - "0.32" + "0.64" ], "min_layer_height": [ - "0.08" + "0.16" ], "retraction_minimum_travel": [ "2" diff --git a/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json b/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json index 2c980a66aa..0a15d1d0d9 100644 --- a/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json +++ b/resources/profiles/Creality/machine/Creality K1 (0.8 nozzle).json @@ -86,7 +86,7 @@ "0.5" ], "min_layer_height": [ - "0.08" + "0.16" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ @@ -130,4 +130,4 @@ "100x100", "320x320" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json b/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json index e31c188086..c7520321c5 100644 --- a/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json +++ b/resources/profiles/Creality/machine/Creality K1 Max (0.8 nozzle).json @@ -87,7 +87,7 @@ "0.5" ], "min_layer_height": [ - "0.08" + "0.16" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ @@ -131,4 +131,4 @@ "100x100", "320x320" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json index 6788e0c5ec..d96df6c6d3 100644 --- a/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K1C 0.8 nozzle.json @@ -87,7 +87,7 @@ "0.5" ], "min_layer_height": [ - "0.08" + "0.16" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ @@ -131,4 +131,4 @@ "100x100", "320x320" ] -} \ No newline at end of file +} diff --git a/resources/profiles/Creality/machine/Creality K2 Plus 0.8 nozzle.json b/resources/profiles/Creality/machine/Creality K2 Plus 0.8 nozzle.json index bdd7bb0473..2461c90711 100644 --- a/resources/profiles/Creality/machine/Creality K2 Plus 0.8 nozzle.json +++ b/resources/profiles/Creality/machine/Creality K2 Plus 0.8 nozzle.json @@ -87,7 +87,7 @@ "0.56" ], "min_layer_height": [ - "0.08" + "0.16" ], "printer_settings_id": "Creality", "retraction_minimum_travel": [ From 776901005c3e005cd144174c0c088925bc3bb18e Mon Sep 17 00:00:00 2001 From: EnderPy <46741213+EnderPy@users.noreply.github.com> Date: Sun, 1 Dec 2024 23:44:30 +1000 Subject: [PATCH 6/7] Disable priming extruders on Anycubic Kobra 2 / 3 (#7450) * Disable priming all extruders on start for Anycubic Kobra 3 * Disable prime all extruders for Anycubic Kobra 2 Pro / Plus / Max / Neo --- .../0.08mm HighDetail @Anycubic Kobra 3 0.4 nozzle.json | 2 +- .../process/0.10mm Detail @Anycubic Kobra 3 0.2 nozzle.json | 2 +- .../process/0.12mm Detail @Anycubic Kobra 3 0.4 nozzle.json | 2 +- .../0.16mm Optimal @Anycubic Kobra 2 Pro 0.4 nozzle.json | 2 +- .../process/0.16mm Optimal @Anycubic Kobra 3 0.4 nozzle.json | 2 +- .../0.20mm Standard @Anycubic Kobra 2 Max 0.4 nozzle.json | 2 +- .../0.20mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle.json | 2 +- .../0.20mm Standard @Anycubic Kobra 2 Plus 0.4 nozzle.json | 2 +- .../0.20mm Standard @Anycubic Kobra 2 Pro 0.4 nozzle.json | 2 +- .../process/0.20mm Standard @Anycubic Kobra 3 0.4 nozzle.json | 2 +- .../process/0.24mm Draft @Anycubic Kobra 3 0.4 nozzle.json | 2 +- .../0.28mm Draft @Anycubic Kobra 2 Pro 0.4 nozzle.json | 2 +- .../0.28mm SuperDraft @Anycubic Kobra 3 0.4 nozzle.json | 2 +- .../process/0.30mm Standard @Anycubic Kobra 3 0.6 nozzle.json | 2 +- .../process/0.40mm Standard @Anycubic Kobra 3 0.8 nozzle.json | 4 ++-- 15 files changed, 16 insertions(+), 16 deletions(-) diff --git a/resources/profiles/Anycubic/process/0.08mm HighDetail @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.08mm HighDetail @Anycubic Kobra 3 0.4 nozzle.json index 0c28cba87a..76c221347a 100644 --- a/resources/profiles/Anycubic/process/0.08mm HighDetail @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.08mm HighDetail @Anycubic Kobra 3 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.10mm Detail @Anycubic Kobra 3 0.2 nozzle.json b/resources/profiles/Anycubic/process/0.10mm Detail @Anycubic Kobra 3 0.2 nozzle.json index 5f94f3e8fe..13884c2625 100644 --- a/resources/profiles/Anycubic/process/0.10mm Detail @Anycubic Kobra 3 0.2 nozzle.json +++ b/resources/profiles/Anycubic/process/0.10mm Detail @Anycubic Kobra 3 0.2 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.12mm Detail @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.12mm Detail @Anycubic Kobra 3 0.4 nozzle.json index 35745292d2..3febe3b3c5 100644 --- a/resources/profiles/Anycubic/process/0.12mm Detail @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.12mm Detail @Anycubic Kobra 3 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.16mm Optimal @Anycubic Kobra 2 Pro 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.16mm Optimal @Anycubic Kobra 2 Pro 0.4 nozzle.json index 48c5d85af3..d59311f740 100644 --- a/resources/profiles/Anycubic/process/0.16mm Optimal @Anycubic Kobra 2 Pro 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.16mm Optimal @Anycubic Kobra 2 Pro 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.16mm Optimal @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.16mm Optimal @Anycubic Kobra 3 0.4 nozzle.json index 9e1873775c..bdd93e6fdc 100644 --- a/resources/profiles/Anycubic/process/0.16mm Optimal @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.16mm Optimal @Anycubic Kobra 3 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Max 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Max 0.4 nozzle.json index 073a4e6b63..0802e64e3b 100644 --- a/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Max 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Max 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle.json index d6573bf139..ce8d3f9bd9 100644 --- a/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Neo 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Plus 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Plus 0.4 nozzle.json index f619dd5bc9..557d6bc75d 100644 --- a/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Plus 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Plus 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Pro 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Pro 0.4 nozzle.json index dd7c9fc714..b510830392 100644 --- a/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Pro 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 2 Pro 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 3 0.4 nozzle.json index 35a958e81b..3eac0335a9 100644 --- a/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.20mm Standard @Anycubic Kobra 3 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.24mm Draft @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.24mm Draft @Anycubic Kobra 3 0.4 nozzle.json index 49701d0f2e..5ba4c7c387 100644 --- a/resources/profiles/Anycubic/process/0.24mm Draft @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.24mm Draft @Anycubic Kobra 3 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.28mm Draft @Anycubic Kobra 2 Pro 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.28mm Draft @Anycubic Kobra 2 Pro 0.4 nozzle.json index 0808f0b1d0..5493230ccb 100644 --- a/resources/profiles/Anycubic/process/0.28mm Draft @Anycubic Kobra 2 Pro 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.28mm Draft @Anycubic Kobra 2 Pro 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.28mm SuperDraft @Anycubic Kobra 3 0.4 nozzle.json b/resources/profiles/Anycubic/process/0.28mm SuperDraft @Anycubic Kobra 3 0.4 nozzle.json index 83d0a1b842..53059f57d7 100644 --- a/resources/profiles/Anycubic/process/0.28mm SuperDraft @Anycubic Kobra 3 0.4 nozzle.json +++ b/resources/profiles/Anycubic/process/0.28mm SuperDraft @Anycubic Kobra 3 0.4 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.30mm Standard @Anycubic Kobra 3 0.6 nozzle.json b/resources/profiles/Anycubic/process/0.30mm Standard @Anycubic Kobra 3 0.6 nozzle.json index 9ce20fd9fa..4190d23daa 100644 --- a/resources/profiles/Anycubic/process/0.30mm Standard @Anycubic Kobra 3 0.6 nozzle.json +++ b/resources/profiles/Anycubic/process/0.30mm Standard @Anycubic Kobra 3 0.6 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", diff --git a/resources/profiles/Anycubic/process/0.40mm Standard @Anycubic Kobra 3 0.8 nozzle.json b/resources/profiles/Anycubic/process/0.40mm Standard @Anycubic Kobra 3 0.8 nozzle.json index dfd05c6d22..913402bcaf 100644 --- a/resources/profiles/Anycubic/process/0.40mm Standard @Anycubic Kobra 3 0.8 nozzle.json +++ b/resources/profiles/Anycubic/process/0.40mm Standard @Anycubic Kobra 3 0.8 nozzle.json @@ -162,7 +162,7 @@ "seam_slope_start_height": "0", "seam_slope_steps": "10", "seam_slope_type": "none", - "single_extruder_multi_material_priming": "1", + "single_extruder_multi_material_priming": "0", "skirt_distance": "2", "skirt_height": "1", "skirt_loops": "0", @@ -289,4 +289,4 @@ ], "xy_contour_compensation": "0", "xy_hole_compensation": "0" -} \ No newline at end of file +} From 5178fee0f3f6db426896d24f36096b2de127fa8c Mon Sep 17 00:00:00 2001 From: xiaoyeliu <166936931+womendoushihaoyin@users.noreply.github.com> Date: Sun, 1 Dec 2024 21:50:10 +0800 Subject: [PATCH 7/7] fix: the 'all' and 'clear all' btns do not make sense when choosing printers (#7465) fix: the 'all' and 'clear all' btns do not make sense when choosing or adding printers Co-authored-by: meiliang1123 --- resources/web/guide/21/21.js | 6 ++++++ resources/web/guide/24/24.js | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/resources/web/guide/21/21.js b/resources/web/guide/21/21.js index 131420dbdd..d7a4d640dc 100644 --- a/resources/web/guide/21/21.js +++ b/resources/web/guide/21/21.js @@ -303,12 +303,18 @@ function FilterModelList(keyword) { function SelectPrinterAll( sVendor ) { $("input[vendor='"+sVendor+"']").prop("checked", true); + $("input[vendor='"+sVendor+"']").each(function() { + CheckBoxOnclick(this); + }); } function SelectPrinterNone( sVendor ) { $("input[vendor='"+sVendor+"']").prop("checked", false); + $("input[vendor='"+sVendor+"']").each(function() { + CheckBoxOnclick(this); + }); } diff --git a/resources/web/guide/24/24.js b/resources/web/guide/24/24.js index bc3e33820d..611020f704 100644 --- a/resources/web/guide/24/24.js +++ b/resources/web/guide/24/24.js @@ -303,12 +303,18 @@ function FilterModelList(keyword) { function SelectPrinterAll( sVendor ) { $("input[vendor='"+sVendor+"']").prop("checked", true); + $("input[vendor='"+sVendor+"']").each(function() { + CheckBoxOnclick(this); + }); } function SelectPrinterNone( sVendor ) { $("input[vendor='"+sVendor+"']").prop("checked", false); + $("input[vendor='"+sVendor+"']").each(function() { + CheckBoxOnclick(this); + }); } function OnExitFilter() {