Merge branch 'main' into PP-491_Improve_top_surface_quality_PC_CPEplus

.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

@@ -49,7 +49,7 @@
  "material_print_temp_wait": { "default_value": false },
  "retraction_amount": { "default_value": 0.8 },
  "retraction_combing": { "value": "no_outer_surfaces" },
- "retraction_combing_max_distance": { "default_value": 5.0 },
+ "retraction_combing_max_distance": { "value": 5.0 },
  "retraction_extrusion_window": { "value": "retraction_amount" },
  "retraction_min_travel": { "value": 2.0 },
  "retraction_speed": { "default_value": 40 },

resources/definitions/fdmprinter.def.json

@@ -4372,6 +4372,7 @@
  "unit": "mm",
  "type": "float",
  "default_value": 0.0,
+ "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))",
  "minimum_value": "machine_width / -2 if machine_center_is_zero else 0",
  "settable_per_mesh": false,
  "settable_per_extruder": true,
@@ -4384,6 +4385,7 @@
  "unit": "mm",
  "type": "float",
  "default_value": 0.0,
+ "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))",
  "minimum_value": "machine_depth / -2 if machine_center_is_zero else 0",
  "settable_per_mesh": false,
  "settable_per_extruder": true,

resources/definitions/strateo3d.def.json

@@ -157,8 +157,6 @@
  "value": "jerk_wall * 5 / 10"
  },
  "jerk_wall_x": { "maximum_value_warning": "0.01" },
- "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
- "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
  "machine_acceleration": { "default_value": 1500 },
  "machine_center_is_zero": { "default_value": false },
  "machine_depth": { "default_value": 420 },

resources/definitions/ultimaker.def.json

@@ -89,6 +89,9 @@
  },
  "meshfix_maximum_deviation": { "value": "machine_nozzle_size / 10" },
  "meshfix_maximum_resolution": { "value": "max(speed_wall_0 / 75, 0.5)" },
+ "prime_tower_base_curve_magnitude": { "value": 2 },
+ "prime_tower_base_height": { "value": 6 },
+ "prime_tower_base_size": { "value": 10 },
  "raft_base_speed": { "value": "raft_speed" },
  "raft_base_thickness": { "value": "min(machine_nozzle_size * 0.75, 0.3)" },
  "raft_interface_fan_speed": { "value": "(raft_base_fan_speed + raft_surface_fan_speed) / 2" },
@@ -126,6 +129,7 @@
  "support_line_distance": { "minimum_value_warning": "0 if support_structure == 'tree' else support_line_width" },
  "support_tower_maximum_supported_diameter": { "value": "support_tower_diameter" },
  "support_tower_roof_angle": { "value": "0 if support_interface_enable else 65" },
+ "support_use_towers": { "value": false },
  "support_wall_count": { "value": "1 if support_structure == 'tree' else 0" },
  "support_xy_distance_overhang": { "value": "0.2" },
  "support_z_distance": { "value": "0" },

resources/definitions/ultimaker3.def.json

@@ -70,8 +70,6 @@
  "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" },
  "infill_wipe_dist": { "value": "0" },
  "jerk_enabled": { "value": "True" },
- "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
- "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
  "machine_acceleration": { "default_value": 3000 },
  "machine_depth": { "default_value": 215 },
  "machine_disallowed_areas":

resources/definitions/ultimaker_factor4.def.json

@@ -104,8 +104,6 @@
  },
  "jerk_travel_enabled": { "value": "True" },
  "layer_height": { "value": "min(min(extruderValues('machine_nozzle_size')) / 2, 0.2)" },
- "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
- "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
  "machine_acceleration": { "default_value": 3000 },
  "machine_depth": { "default_value": 240 },
  "machine_end_gcode": { "default_value": "" },

resources/definitions/ultimaker_method_base.def.json

@@ -315,8 +315,6 @@
  "enabled": false,
  "value": "jerk_print"
  },
- "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
- "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
  "machine_acceleration": { "default_value": 3000 },
  "machine_center_is_zero": { "value": true },
  "machine_end_gcode": { "default_value": "" },

resources/definitions/ultimaker_s3.def.json

@@ -70,8 +70,6 @@
  "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" },
  "infill_wipe_dist": { "value": "0" },
  "jerk_enabled": { "value": "True" },
- "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
- "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
  "machine_acceleration": { "default_value": 3000 },
  "machine_depth": { "default_value": 190 },
  "machine_end_gcode": { "default_value": "" },

resources/definitions/ultimaker_s5.def.json

@@ -74,8 +74,6 @@
  "infill_pattern": { "value": "'zigzag' if infill_sparse_density > 80 else 'triangles'" },
  "infill_wipe_dist": { "value": "0" },
  "jerk_enabled": { "value": "True" },
- "layer_start_x": { "value": "sum(extruderValues('machine_extruder_start_pos_x')) / len(extruderValues('machine_extruder_start_pos_x'))" },
- "layer_start_y": { "value": "sum(extruderValues('machine_extruder_start_pos_y')) / len(extruderValues('machine_extruder_start_pos_y'))" },
  "machine_acceleration": { "default_value": 3000 },
  "machine_depth": { "default_value": 240 },
  "machine_end_gcode": { "default_value": "" },

resources/definitions/voron2_stealthchanger_250.def.json

@@ -0,0 +1,18 @@
+{
+ "version": 2,
+ "name": "Voron2 StealthChanger 250",
+ "inherits": "voron2_stealthchanger_base",
+ "metadata":
+ {
+ "visible": true,
+ "platform": "voron2_250_bed.3mf",
+ "quality_definition": "voron2_base"
+ },
+ "overrides":
+ {
+ "machine_depth": { "default_value": 250 },
+ "machine_height": { "default_value": 250 },
+ "machine_name": { "default_value": "VORON2 StealthChanger 250" },
+ "machine_width": { "default_value": 250 }
+ }
+}

resources/definitions/voron2_stealthchanger_300.def.json

@@ -0,0 +1,18 @@
+{
+ "version": 2,
+ "name": "Voron2 StealthChanger 300",
+ "inherits": "voron2_stealthchanger_base",
+ "metadata":
+ {
+ "visible": true,
+ "platform": "voron2_300_bed.3mf",
+ "quality_definition": "voron2_base"
+ },
+ "overrides":
+ {
+ "machine_depth": { "default_value": 300 },
+ "machine_height": { "default_value": 300 },
+ "machine_name": { "default_value": "VORON2 StealthChanger 300" },
+ "machine_width": { "default_value": 300 }
+ }
+}

resources/definitions/voron2_stealthchanger_350.def.json

@@ -0,0 +1,18 @@
+{
+ "version": 2,
+ "name": "Voron2 StealthChanger 350",
+ "inherits": "voron2_stealthchanger_base",
+ "metadata":
+ {
+ "visible": true,
+ "platform": "voron2_350_bed.3mf",
+ "quality_definition": "voron2_base"
+ },
+ "overrides":
+ {
+ "machine_depth": { "default_value": 350 },
+ "machine_height": { "default_value": 350 },
+ "machine_name": { "default_value": "VORON2 StealthChanger 350" },
+ "machine_width": { "default_value": 350 }
+ }
+}

resources/definitions/voron2_stealthchanger_base.def.json

@@ -0,0 +1,29 @@
+{
+ "version": 2,
+ "name": "Voron2 StealthChanger Base",
+ "inherits": "voron2_base",
+ "metadata":
+ {
+ "visible": false,
+ "author": "Thessien",
+ "manufacturer": "DraftShift Design",
+ "machine_extruder_trains":
+ {
+ "0": "voron2_stealthchanger_extruder_0",
+ "1": "voron2_stealthchanger_extruder_1",
+ "2": "voron2_stealthchanger_extruder_2",
+ "3": "voron2_stealthchanger_extruder_3",
+ "4": "voron2_stealthchanger_extruder_4",
+ "5": "voron2_stealthchanger_extruder_5",
+ "6": "voron2_stealthchanger_extruder_6",
+ "7": "voron2_stealthchanger_extruder_7"
+ }
+ },
+ "overrides":
+ {
+ "machine_end_gcode": { "default_value": "PRINT_END" },
+ "machine_extruder_count": { "default_value": 1 },
+ "machine_name": { "default_value": "VORON2 StealthChanger" },
+ "machine_start_gcode": { "default_value": "PRINT_START TOOL_TEMP={material_print_temperature_layer_0} T{initial_extruder_nr}_TEMP={material_print_temperature_layer_0} BED_TEMP={material_bed_temperature_layer_0} TOOL={initial_extruder_nr}" }
+ }
+}

resources/definitions/weedo_f150s.def.json

@@ -0,0 +1,32 @@
+{
+ "version": 2,
+ "name": "WEEDO F150S",
+ "inherits": "weedo_base",
+ "metadata":
+ {
+ "visible": true,
+ "author": "WEEDO",
+ "manufacturer": "WEEDO",
+ "file_formats": "text/x-gcode",
+ "platform_offset": [
+ 0,
+ 0,
+ 0
+ ]
+ },
+ "overrides":
+ {
+ "machine_depth": { "default_value": 150 },
+ "machine_end_gcode": { "default_value": ";(**** end.gcode for 150s****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680 ; Reduce filament pressure\nG28 Z F1500; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" },
+ "machine_height": { "default_value": 150 },
+ "machine_name": { "default_value": "WEEDO F150S" },
+ "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for (150S)****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG1 Z140 F300\nG28 Z\nG29\nG1 Z15 F100\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z5" },
+ "machine_width": { "default_value": 200 },
+ "material_bed_temperature":
+ {
+ "maximum_value": "90",
+ "maximum_value_warning": "70"
+ },
+ "retraction_amount": { "default_value": 1.2 }
+ }
+}

resources/definitions/weedo_f152s.def.json

@@ -0,0 +1,27 @@
+{
+ "version": 2,
+ "name": "WEEDO F152S",
+ "inherits": "weedo_base",
+ "metadata":
+ {
+ "visible": true,
+ "author": "WEEDO",
+ "manufacturer": "WEEDO",
+ "file_formats": "text/x-gcode",
+ "platform_offset": [
+ 0,
+ 0,
+ 0
+ ]
+ },
+ "overrides":
+ {
+ "machine_depth": { "default_value": 185 },
+ "machine_end_gcode": { "default_value": ";(**** end.gcode for F152S****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" },
+ "machine_height": { "default_value": 195 },
+ "machine_name": { "default_value": "WEEDO F152S" },
+ "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for F152S ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z5" },
+ "machine_width": { "default_value": 200 },
+ "retraction_amount": { "default_value": 1.2 }
+ }
+}

resources/definitions/weedo_f370.def.json

@@ -0,0 +1,27 @@
+{
+ "version": 2,
+ "name": "WEEDO F370",
+ "inherits": "weedo_base",
+ "metadata":
+ {
+ "visible": true,
+ "author": "WEEDO",
+ "manufacturer": "WEEDO",
+ "file_formats": "text/x-gcode",
+ "platform_offset": [
+ 0,
+ 0,
+ 0
+ ]
+ },
+ "overrides":
+ {
+ "machine_depth": { "default_value": 310 },
+ "machine_end_gcode": { "default_value": ";(**** end.gcode for F370****)\nM203 Z15\nG1 X170 Y130 F3000\nG92 E0\nG1 E-10 F1680\nG28 Z F400; Get extruder out of way. Uncomment to use!\nM107 ; Turn off fan\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" },
+ "machine_height": { "default_value": 370 },
+ "machine_name": { "default_value": "WEEDO F370" },
+ "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for 370 ****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nG1 Z20\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E25 F1000\nG92 E0\nM203 Z2" },
+ "machine_width": { "default_value": 310 },
+ "retraction_amount": { "default_value": 1.2 }
+ }
+}

resources/definitions/weedo_me40.def.json

@@ -0,0 +1,30 @@
+{
+ "version": 2,
+ "name": "WEEDO ME40",
+ "inherits": "weedo_base",
+ "metadata":
+ {
+ "visible": true,
+ "author": "WEEDO",
+ "manufacturer": "WEEDO",
+ "file_formats": "text/x-gcode",
+ "platform_offset": [
+ 0,
+ 0,
+ 0
+ ]
+ },
+ "overrides":
+ {
+ "machine_depth": { "default_value": 300 },
+ "machine_end_gcode": { "default_value": ";(**** end.gcode for ME40****)\nM203 Z15\nG1 X0 Y150 F3000\nG28 Z\nG92 E0\nG1 E-1 F1680 ; Reduce filament pressure\nM107 ; Turn off fan\n; Disable all extruder\nM104 T0 S0\nG90 ; Absolute positioning\nG92 E0 ; Reset extruder position\nM140 S0 ; Disable heated bed\nM84 ; Turn steppers off" },
+ "machine_height": { "default_value": 400 },
+ "machine_name": { "default_value": "WEEDO ME40" },
+ "machine_start_gcode": { "default_value": ";MachineType:{machine_name}\n;FilamentType:{material_type}\n;InfillDensity:{infill_sparse_density}\n;Extruder0Temperature:{material_print_temperature}\n;BedTemperature:{material_bed_temperature}\n\n;(**** start.gcode for ME40****)\nM203 Z15\nM104 S170\nG28 ; Home extruder\nG29\nG1 Z15\nM107 ; Turn off fan\nG90 ; Absolute positioning\nM82 ; Extruder in absolute mode\nM109 S{material_print_temperature_layer_0}\nG92 E0 ; Reset extruder position\nG1 X140 Y7 Z0.27 F4000\nG1 X40 Y7 Z0.27 E23 F1000\nG92 E0\nM203 Z8" },
+ "machine_width": { "default_value": 300 },
+ "speed_print": { "value": 60.0 },
+ "speed_support": { "value": "round(speed_print * 0.96, 1)" },
+ "speed_topbottom": { "value": "round(speed_print * 0.58, 1)" },
+ "speed_wall": { "value": "speed_print / 2" }
+ }
+}