From 795814d50b15769e1149acf520d71acd54af30fa Mon Sep 17 00:00:00 2001 From: Ghostkeeper Date: Thu, 30 Jun 2022 09:45:45 +0200 Subject: [PATCH] Store unmapped settings in a separate set We don't want to create actual settings for all of these. Just store them in the profile metadata and restore them. Serialising and deserialising these is a bit more work than what I could do now in 5 minutes so we'll have to do that a bit later, but at least for now we have the complete list. Contributes to issue CURA-9432. --- .../XmlMaterialProfile/XmlMaterialProfile.py | 28 +++++++++++++++++-- resources/definitions/fdmprinter.def.json | 16 ----------- 2 files changed, 25 insertions(+), 19 deletions(-) diff --git a/plugins/XmlMaterialProfile/XmlMaterialProfile.py b/plugins/XmlMaterialProfile/XmlMaterialProfile.py index 20efccc236..9dba3fb465 100644 --- a/plugins/XmlMaterialProfile/XmlMaterialProfile.py +++ b/plugins/XmlMaterialProfile/XmlMaterialProfile.py @@ -1139,14 +1139,36 @@ class XmlMaterialProfile(InstanceContainer): "maximum park duration": "material_maximum_park_duration", "no load move factor": "material_no_load_move_factor", "break speed": "material_break_speed", - "break temperature": "material_break_temperature", - "tainted print core max temperature": "max_degradation_temperature", - "recommend cleaning after n prints": "recommended_cleaning_after_n_prints" + "break temperature": "material_break_temperature" } # type: Dict[str, str] __unmapped_settings = [ "hardware compatible", "hardware recommended" ] + __keep_serialized_settings = { # Settings irrelevant to Cura, but that could be present in the files so we must store them and keep them serialized. + "relative extrusion", + "flow sensor detection margin", + "different material purge volume", + "same material purge volume", + "end of print purge volume", + "end of filament purge volume", + "purge anti ooze retract position", + "purge drop retract position", + "purge retract speed", + "purge unretract speed", + "purge anti ooze dwell time", + "purge drop dwell time", + "dwell time before break preparation move", + "pressure release dwell time", + "tainted print core max temperature", + "recommended cleaning after n prints", + + "maximum heated bed temperature", + "material bed adhesion temperature", + "maximum heated chamber temperature", + "shrinkage percentage", + "move to die distance", + } __material_properties_setting_map = { "diameter": "material_diameter" } diff --git a/resources/definitions/fdmprinter.def.json b/resources/definitions/fdmprinter.def.json index 4bcdd3d5ff..52b20da473 100644 --- a/resources/definitions/fdmprinter.def.json +++ b/resources/definitions/fdmprinter.def.json @@ -2755,22 +2755,6 @@ "default_value": 0.940860215, "enabled": false }, - "max_degradation_temperature": - { - "label": "Max Degradation Temperature", - "description": "Maximum temperature that the material can reach before it starts degrading and requiring a purge.", - "type": "float", - "default_value": 265, - "enabled": false - }, - "recommended_cleaning_after_n_prints": - { - "label": "Recommended Clean After Prints", - "description": "After how many prints should the extruder be cleaned?", - "type": "int", - "default_value": 10, - "enabled": false - }, "material_flow": { "label": "Flow",