Merge branch 'main' into PP-489_Reduce_oozing_in_dual_extrusion_print…

…ing_F4

.github/workflows/macos.yml

@@ -40,7 +40,6 @@ on:
         options:
           - self-hosted-X64
           - self-hosted-ARM64
-          - macos-11
           - macos-12
 
 jobs:
@@ -53,4 +52,4 @@ jobs:
       staging: ${{ inputs.staging }}
       architecture: ${{ inputs.architecture }}
       operating_system: ${{ inputs.operating_system }}
-    secrets: inherit
+    secrets: inherit

conandata.yml

@@ -5,11 +5,10 @@ requirements:
   - "curaengine/(latest)@ultimaker/testing"
   - "cura_binary_data/(latest)@ultimaker/testing"
   - "fdm_materials/(latest)@ultimaker/testing"
-  - "curaengine_plugin_gradual_flow/0.1.0-beta.3"
+  - "curaengine_plugin_gradual_flow/0.1.1-beta.3"
   - "dulcificum/latest@ultimaker/testing"
   - "pysavitar/5.3.0"
   - "pynest2d/5.3.0"
-  - "curaengine_grpc_definitions/0.2.0"
   - "native_cad_plugin/2.0.0"
 requirements_internal:
   - "fdm_materials/(latest)@internal/testing"

conanfile.py

@@ -329,7 +329,6 @@ def configure(self):
         self.options["cpython"].shared = True
         self.options["boost"].header_only = True
         if self.settings.os == "Linux":
-            self.options["curaengine_grpc_definitions"].shared = True
             self.options["openssl"].shared = True
         if self.conf.get("user.curaengine:sentry_url", "", check_type=str) != "":
             self.options["curaengine"].enable_sentry = True

cura/Machines/Models/IntentTranslations.py

@@ -24,6 +24,10 @@
     "name": catalog.i18nc("@label", "Draft"),
     "description": catalog.i18nc("@text", "The draft profile is designed to print initial prototypes and concept validation with the intent of significant print time reduction.")
 }
+intent_translations["annealing"] = {
+    "name": catalog.i18nc("@label", "Annealing"),
+    "description": catalog.i18nc("@text", "The annealing profile requires post-processing in an oven after the print is finished. This profile retains the dimensional accuracy of the printed part after annealing and improves strength, stiffness, and thermal resistance.")
+}
 intent_translations["solid"] = {
     "name": catalog.i18nc("@label", "Solid"),
     "description": catalog.i18nc("@text",

printer-linter/src/printerlinter/linters/formulas.py

@@ -51,9 +51,17 @@ def __init__(self, file: Path, settings: dict) -> None:
         self._definition = {}
 
     def getCuraSettingList(self) -> list:
+        settings_list = []
+
         with open(os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", "resources", "definitions", "fdmprinter.def.json")) as data:
             json_data = json.load(data)
-        return self.extractKeys(json_data)
+        settings_list += self.extractKeys(json_data)
+
+        with open(os.path.join(os.path.dirname(__file__), "..", "..", "..", "..", "resources", "definitions", "fdmextruder.def.json")) as data:
+            json_data = json.load(data)
+        settings_list += self.extractKeys(json_data)
+
+        return settings_list
 
     def extractKeys(self, json_obj, parent_key=''):
         keys_with_value = []

resources/definitions/creality_ender3v3ke.def.json

@@ -0,0 +1,59 @@
+{
+    "version": 2,
+    "name": "Creality Ender-3 V3 KE",
+    "inherits": "creality_base",
+    "metadata":
+    {
+        "visible": true,
+        "manufacturer": "Creality3D",
+        "file_formats": "text/x-gcode",
+        "platform": "creality_ender3.3mf",
+        "first_start_actions": [ "MachineSettingsAction" ],
+        "has_machine_quality": true,
+        "has_materials": true,
+        "has_variants": true,
+        "machine_extruder_trains": { "0": "creality_base_extruder_0" },
+        "preferred_material": "generic_pla",
+        "preferred_quality_type": "standard",
+        "preferred_variant_name": "0.4mm Nozzle",
+        "quality_definition": "creality_base",
+        "variants_name": "Nozzle Size"
+    },
+    "overrides":
+    {
+        "gantry_height": { "value": 38 },
+        "machine_depth": { "default_value": 220 },
+        "machine_end_gcode": { "default_value": "G91 ;Relative positionning\nG1 E-2 F2700 ;Retract a bit\nG1 E-2 Z0.2 F2400 ;Retract and raise Z\nG1 X5 Y5 F3000 ;Wipe out\nG1 Z5 ;Raise Z more\nG90 ;Absolute positionning\n\nG1 X2 Y218 F3000 ;Present print\nM106 S0 ;Turn-off fan\nM104 S0 ;Turn-off hotend\nM140 S0 ;Turn-off bed\n\nM84 X Y E ;Disable all steppers but Z" },
+        "machine_head_with_fans_polygon":
+        {
+            "default_value": [
+                [-20, 10],
+                [10, 10],
+                [10, -10],
+                [-20, -10]
+            ]
+        },
+        "machine_heated_bed": { "default_value": true },
+        "machine_height": { "default_value": 240 },
+        "machine_max_acceleration_e": { "value": 5000 },
+        "machine_max_acceleration_x": { "value": 8000.0 },
+        "machine_max_acceleration_y": { "value": 8000.0 },
+        "machine_max_acceleration_z": { "value": 500.0 },
+        "machine_max_feedrate_e": { "value": 100 },
+        "machine_max_feedrate_x": { "value": 500 },
+        "machine_max_feedrate_y": { "value": 500 },
+        "machine_max_feedrate_z": { "value": 30 },
+        "machine_name": { "default_value": "Creality Ender-3 V3 KE" },
+        "machine_start_gcode": { "default_value": "M220 S100 ;Reset Feedrate\nM221 S100 ;Reset Flowrate\n\nG28 ;Home\n\nG92 E0 ;Reset Extruder\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 X-2.0 Y20 Z0.28 F5000.0 ;Move to start position\nM109 S{material_print_temperature_layer_0}\nG1 X-2.0 Y145.0 Z0.28 F1500.0 E15 ;Draw the first line\nG1 X-1.7 Y145.0 Z0.28 F5000.0 ;Move to side a little\nG1 X-1.7 Y20 Z0.28 F1500.0 E30 ;Draw the second line\nG92 E0 ;Reset Extruder\nG1 E-1 F1800 ;Retract a bit\nG1 Z2.0 F3000 ;Move Z Axis up\nG1 E0 F1800" },
+        "machine_width": { "default_value": 220 },
+        "material_print_temp_wait": { "default_value": false },
+        "retraction_amount": { "default_value": 0.8 },
+        "retraction_combing": { "value": "no_outer_surfaces" },
+        "retraction_combing_max_distance": { "value": 5.0 },
+        "retraction_extrusion_window": { "value": "retraction_amount" },
+        "retraction_min_travel": { "value": 2.0 },
+        "retraction_speed": { "default_value": 40 },
+        "speed_layer_0": { "value": 100 },
+        "speed_print": { "value": 300 }
+    }
+}