From 5e032f7d2c542327e6359a21a6937ebe25ed7b94 Mon Sep 17 00:00:00 2001 From: T9Air <163940743+T9Air@users.noreply.github.com> Date: Mon, 25 Mar 2024 13:52:08 -0400 Subject: [PATCH 1/5] Update creality_ender3v3se.def.json Edited max acceleration values to 2500 --- resources/definitions/creality_ender3v3se.def.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/definitions/creality_ender3v3se.def.json b/resources/definitions/creality_ender3v3se.def.json index 86d6818166..ed9fe1cad6 100644 --- a/resources/definitions/creality_ender3v3se.def.json +++ b/resources/definitions/creality_ender3v3se.def.json @@ -37,8 +37,8 @@ "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 250 }, "machine_max_acceleration_e": { "value": 5000 }, - "machine_max_acceleration_x": { "value": 5000.0 }, - "machine_max_acceleration_y": { "value": 5000.0 }, + "machine_max_acceleration_x": { "value": 2500.0 }, + "machine_max_acceleration_y": { "value": 2500.0 }, "machine_max_acceleration_z": { "value": 500.0 }, "machine_max_feedrate_e": { "value": 100 }, "machine_max_feedrate_x": { "value": 500 }, @@ -52,4 +52,4 @@ "speed_layer_0": { "value": 30 }, "speed_print": { "value": 180 } } -} \ No newline at end of file +} From d72863c2f47ed1566da197700185cdd5c43f1d66 Mon Sep 17 00:00:00 2001 From: T9Air <163940743+T9Air@users.noreply.github.com> Date: Wed, 27 Mar 2024 21:19:54 -0400 Subject: [PATCH 2/5] Update creality_ender3v3se.def.json --- resources/definitions/creality_ender3v3se.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/creality_ender3v3se.def.json b/resources/definitions/creality_ender3v3se.def.json index ed9fe1cad6..c822e7906a 100644 --- a/resources/definitions/creality_ender3v3se.def.json +++ b/resources/definitions/creality_ender3v3se.def.json @@ -36,7 +36,7 @@ }, "machine_heated_bed": { "default_value": true }, "machine_height": { "default_value": 250 }, - "machine_max_acceleration_e": { "value": 5000 }, + "machine_max_acceleration_e": { "value": 2500 }, "machine_max_acceleration_x": { "value": 2500.0 }, "machine_max_acceleration_y": { "value": 2500.0 }, "machine_max_acceleration_z": { "value": 500.0 }, From a18da5c9bd44f758ea0ab0179d0195d454a8cb36 Mon Sep 17 00:00:00 2001 From: Frederic Meeuwissen <13856291+Frederic98@users.noreply.github.com> Date: Mon, 26 Aug 2024 13:12:03 +0200 Subject: [PATCH 3/5] Only convert to yes/no if value is a boolean --- plugins/XmlMaterialProfile/XmlMaterialProfile.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 49b5e7661d..13111c1c7a 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -1084,9 +1084,8 @@ class XmlMaterialProfile(InstanceContainer): # Skip material properties (eg diameter) or metadata (eg GUID) return - truth_map = { True: "yes", False: "no" } - if tag_name != "cura:setting" and instance.value in truth_map: - data = truth_map[instance.value] + if tag_name != "cura:setting" and isinstance(instance.value, bool): + data = "yes" if instance.value else "no" else: data = str(instance.value) From 84359a24383db0e91bb9de23ae73d1175178bd68 Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 30 Aug 2024 11:02:30 +0200 Subject: [PATCH 4/5] nozzle variants based on creality_base --- .../variants/creality/creality_crm4_0.2.inst.cfg | 13 +++++++++++++ .../variants/creality/creality_crm4_0.3.inst.cfg | 13 +++++++++++++ .../variants/creality/creality_crm4_0.4.inst.cfg | 13 +++++++++++++ .../variants/creality/creality_crm4_0.5.inst.cfg | 13 +++++++++++++ .../variants/creality/creality_crm4_0.6.inst.cfg | 13 +++++++++++++ .../variants/creality/creality_crm4_0.8.inst.cfg | 13 +++++++++++++ .../variants/creality/creality_crm4_1.0.inst.cfg | 13 +++++++++++++ 7 files changed, 91 insertions(+) create mode 100644 resources/variants/creality/creality_crm4_0.2.inst.cfg create mode 100644 resources/variants/creality/creality_crm4_0.3.inst.cfg create mode 100644 resources/variants/creality/creality_crm4_0.4.inst.cfg create mode 100644 resources/variants/creality/creality_crm4_0.5.inst.cfg create mode 100644 resources/variants/creality/creality_crm4_0.6.inst.cfg create mode 100644 resources/variants/creality/creality_crm4_0.8.inst.cfg create mode 100644 resources/variants/creality/creality_crm4_1.0.inst.cfg diff --git a/resources/variants/creality/creality_crm4_0.2.inst.cfg b/resources/variants/creality/creality_crm4_0.2.inst.cfg new file mode 100644 index 0000000000..4f9f76ac7a --- /dev/null +++ b/resources/variants/creality/creality_crm4_0.2.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_crm4 +name = 0.2mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.2 + diff --git a/resources/variants/creality/creality_crm4_0.3.inst.cfg b/resources/variants/creality/creality_crm4_0.3.inst.cfg new file mode 100644 index 0000000000..f4145b1c5c --- /dev/null +++ b/resources/variants/creality/creality_crm4_0.3.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_crm4 +name = 0.3mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.3 + diff --git a/resources/variants/creality/creality_crm4_0.4.inst.cfg b/resources/variants/creality/creality_crm4_0.4.inst.cfg new file mode 100644 index 0000000000..083efae740 --- /dev/null +++ b/resources/variants/creality/creality_crm4_0.4.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_crm4 +name = 0.4mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.4 + diff --git a/resources/variants/creality/creality_crm4_0.5.inst.cfg b/resources/variants/creality/creality_crm4_0.5.inst.cfg new file mode 100644 index 0000000000..1eea25e779 --- /dev/null +++ b/resources/variants/creality/creality_crm4_0.5.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_crm4 +name = 0.5mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.5 + diff --git a/resources/variants/creality/creality_crm4_0.6.inst.cfg b/resources/variants/creality/creality_crm4_0.6.inst.cfg new file mode 100644 index 0000000000..d24f24eece --- /dev/null +++ b/resources/variants/creality/creality_crm4_0.6.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_crm4 +name = 0.6mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.6 + diff --git a/resources/variants/creality/creality_crm4_0.8.inst.cfg b/resources/variants/creality/creality_crm4_0.8.inst.cfg new file mode 100644 index 0000000000..f76a54078b --- /dev/null +++ b/resources/variants/creality/creality_crm4_0.8.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_crm4 +name = 0.8mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 0.8 + diff --git a/resources/variants/creality/creality_crm4_1.0.inst.cfg b/resources/variants/creality/creality_crm4_1.0.inst.cfg new file mode 100644 index 0000000000..f8734d6f3c --- /dev/null +++ b/resources/variants/creality/creality_crm4_1.0.inst.cfg @@ -0,0 +1,13 @@ +[general] +definition = creality_crm4 +name = 1.0mm Nozzle +version = 4 + +[metadata] +hardware_type = nozzle +setting_version = 23 +type = variant + +[values] +machine_nozzle_size = 1.0 + From aff3872893fbd50debdc86260b3eec9918509e8b Mon Sep 17 00:00:00 2001 From: HellAholic Date: Fri, 30 Aug 2024 09:19:22 +0000 Subject: [PATCH 5/5] Applied printer-linter format --- resources/definitions/creality_ender3v3se.def.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/resources/definitions/creality_ender3v3se.def.json b/resources/definitions/creality_ender3v3se.def.json index 445afe2274..6248e5c851 100644 --- a/resources/definitions/creality_ender3v3se.def.json +++ b/resources/definitions/creality_ender3v3se.def.json @@ -52,4 +52,4 @@ "speed_layer_0": { "value": 30 }, "speed_print": { "value": 180 } } -} +} \ No newline at end of file